Commit Graph

4514 Commits

Author SHA1 Message Date
darthgandalf
9fec8f726d Make modpython compiler to fail make on fail of compilation of a python file.
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2244 726aef4b-f618-498e-8847-2d620e286838
2011-01-03 05:09:42 +00:00
darthgandalf
452e3f1824 Modpython compiler should depend on Makefile.
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2243 726aef4b-f618-498e-8847-2d620e286838
2011-01-03 05:09:18 +00:00
psychon
8a1c2a4711 Include @DEFS@ into our compiler call
On most systems, this should only result in some useless defines being added to
the compiler's command line:

-DPACKAGE_NAME=\"znc\" -DPACKAGE_TARNAME=\"znc\" -DPACKAGE_VERSION=\"0.097\"
-DPACKAGE_STRING=\"znc\ 0.097\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\"

However, on some weird arches like e.g. x86, this will make AC_SYS_LARGEFILE
actually work, because that macro adds "-D_FILE_OFFSET_BITS=64" to @DEPS@.

This was found by SilverLeo because modpython didn't compile for him, thanks. :)
(python has "#define _FILE_OFFSET_BITS 64" in pyconfig.h)

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2242 726aef4b-f618-498e-8847-2d620e286838
2011-01-02 17:15:21 +00:00
psychon
44d2816379 Remove some more pointless checks for sPageName.empty()
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2241 726aef4b-f618-498e-8847-2d620e286838
2011-01-02 16:33:42 +00:00
psychon
eb730d72d7 notes: Remove a pointless "if"
When you load /mods/notes/ in your browser, OnWebRequest will be called with
sPageName == "index". So that variable can never actually be empty.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2240 726aef4b-f618-498e-8847-2d620e286838
2011-01-02 10:46:46 +00:00
psychon
fa5b3acc8f webmods: Remove some more useless code
We don't actually have a "modlist" template, so this code would cause a 404.
Going through the "find module with empty name" codepath here has the same
result, so this can be safely removed.

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2239 726aef4b-f618-498e-8847-2d620e286838
2011-01-01 22:59:41 +00:00
psychon
0ca689f2eb webmods: Fix
One of my recent commits made webmods only find user modules instead of global
modules. This worked before because m_sForcedUser was an empty string which made
the code look for global modules. This commit adds an explicit check for global
modules which hopefully fixes all problems.

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2238 726aef4b-f618-498e-8847-2d620e286838
2011-01-01 22:57:54 +00:00
cflakes
8cadb672f0 Add some more infos to the recently introduced znc.conf warning header.
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2237 726aef4b-f618-498e-8847-2d620e286838
2010-12-31 16:45:29 +00:00
psychon
5050b93658 WebMods: Clean some stuff up
This removes two unused methods (ResolveModule() and FillErrorPage()) and marks
some other methods const/static/protected.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2236 726aef4b-f618-498e-8847-2d620e286838
2010-12-31 16:15:53 +00:00
psychon
3f62466751 WebMods: Remove some dead code
Using some module as another user didn't actually work. For user modules, the
following code stops you:

 else if (!pModule->IsGlobal() && pModule->GetUser() != GetSession()->GetUser()) {
     PrintErrorPage(403, "Forbidden", "You must login as " + pModule->GetUser()->GetUserName() + " in order to view this page");

For global modules this didn't work either. Once a "forced" user name was
specified, OnPageRequestInternal() stopped looking at global modules:

 CModule* pModule = CZNC::Get().FindModule(m_sModName, m_sForceUser);
 if (!pModule && m_sForceUser.empty()) {
 [snip]
 if (!pModule) {
     return PAGE_NOTFOUND;

So, whatever m_sForceUser was supposed to do, it never did that.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2235 726aef4b-f618-498e-8847-2d620e286838
2010-12-31 15:52:54 +00:00
cflakes
40d39f222b Don't use a readonly <input> in lastseen's WebadminUser stub template.
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2234 726aef4b-f618-498e-8847-2d620e286838
2010-12-31 15:22:47 +00:00
cflakes
7bb4ed34bd Some grammar and capitalization fixes.
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2233 726aef4b-f618-498e-8847-2d620e286838
2010-12-31 15:20:40 +00:00
cflakes
ba183e461f Perform module:
* Be more const.
* Be more correct: only accept requests to /mods/perform/, not to all URLs starting with that.
* Be more considerate: Use "IRC server" instead of "IRCd".



git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2232 726aef4b-f618-498e-8847-2d620e286838
2010-12-31 15:09:07 +00:00
psychon
89edf703f6 Perform: Also parse stuff like "/msg foo bar" via webmods
Signed-off-by: Uli Schlachter <psychon@znc.in>

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2231 726aef4b-f618-498e-8847-2d620e286838
2010-12-31 14:42:43 +00:00
psychon
c8910c4856 Perform: Provide a webinterface
Signed-off-by: Uli Schlachter <psychon@znc.in>

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2230 726aef4b-f618-498e-8847-2d620e286838
2010-12-31 14:42:28 +00:00
psychon
1e0585c485 webadmin: Add all currently missing global settings
These were MaxBufferSize, ConnectDelay, ServerThrottle and AnonIPLimit.

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2229 726aef4b-f618-498e-8847-2d620e286838
2010-12-31 09:14:21 +00:00
psychon
0456e3f0f2 Add Getter/Setter for ConnectDelay, ServerThrottle and AnonIPLimit
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2228 726aef4b-f618-498e-8847-2d620e286838
2010-12-31 09:14:03 +00:00
psychon
eb263869b0 webadmin: Add a "key" inputbox to channels
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2227 726aef4b-f618-498e-8847-2d620e286838
2010-12-31 08:40:44 +00:00
psychon
570fab6e44 webadmin: Add DCCBindHost
Before this commit, editing some user in webadmin cleared their DCCBindHost.
That's definitely not what we want.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2226 726aef4b-f618-498e-8847-2d620e286838
2010-12-31 08:32:58 +00:00
psychon
853ddc5c2a admin: Add TimestampFormat and StatusPrefix
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2225 726aef4b-f618-498e-8847-2d620e286838
2010-12-31 08:07:39 +00:00
darthgandalf
4c6d52c904 Change a way how .pyc are generated from .py
Now Makefile does the search of .py in the source.
Also change some dependencies between other modpython stuff.

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2224 726aef4b-f618-498e-8847-2d620e286838
2010-12-30 23:45:12 +00:00
darthgandalf
4be057200b Fix out-of-tree builds.
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2223 726aef4b-f618-498e-8847-2d620e286838
2010-12-30 22:40:24 +00:00
darthgandalf
dc8a39db53 Add vim modelines to some files.
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2222 726aef4b-f618-498e-8847-2d620e286838
2010-12-30 22:02:26 +00:00
psychon
128af8e893 Improve debug output for ISpoof
We now generate a DEBUG() message for all errors during ISpoof. Also, the
message from *status "ISpoof could not be written" now includes the expanded
ISpoofFile that we tried writing to.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2221 726aef4b-f618-498e-8847-2d620e286838
2010-12-30 21:11:40 +00:00
darthgandalf
afa16df2bc Fix make clean for modperl and modpython
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2220 726aef4b-f618-498e-8847-2d620e286838
2010-12-30 19:18:24 +00:00
darthgandalf
ece2c885da Moved generation of modperl/functions.cpp to Makefile.
This should fix some compilation issues.

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2219 726aef4b-f618-498e-8847-2d620e286838
2010-12-30 18:29:42 +00:00
darthgandalf
2472ea7a13 Add warning header to znc.conf
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2218 726aef4b-f618-498e-8847-2d620e286838
2010-12-30 18:29:15 +00:00
darthgandalf
e4b48d50b3 Fix for previous commit.
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2217 726aef4b-f618-498e-8847-2d620e286838
2010-12-30 12:16:33 +00:00
darthgandalf
1d103351a9 Make modpython and modperl to work with new OnPart too.
Thanks, SilverLeo.

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2216 726aef4b-f618-498e-8847-2d620e286838
2010-12-30 12:00:52 +00:00
darthgandalf
a0c0b73590 Add new parameter to OnPart module hook: part message.
Sorry for API change :)

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2215 726aef4b-f618-498e-8847-2d620e286838
2010-12-30 11:28:41 +00:00
darthgandalf
644632f915 Fix modpython to work with python 3.2
Thanks to nb for reporting and testing

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2214 726aef4b-f618-498e-8847-2d620e286838
2010-12-25 05:04:21 +00:00
psychon
50b57be5af listsockets: Ignore dereferenced sockets
When someone connects to ZNC, this connection is first handled by an instance of
CIncomingConnection. Once we determined if this is a HTTP or an IRC connection,
the connection is handed of to the appropriate class.

The CIncomingConnection instance that was used first will still linger around
for the next event loop iteration and then be destroyed. Since this socket isn't
a "real" connection anymore (another instance of Csock took over for this one),
listsockets should ignore all sockets in state CLT_DEREFERENCE.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2213 726aef4b-f618-498e-8847-2d620e286838
2010-12-24 22:06:13 +00:00
psychon
144cdf256b Add a web interface to listsockets
Thanks to kylef for the patch and again sorry for svn. ;)


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2212 726aef4b-f618-498e-8847-2d620e286838
2010-12-24 21:56:35 +00:00
psychon
f6935557ce Refactor listsockets, move the logic to get a string for each column into its own function
Patch by kylef and submitted via git. Sorry that we are using subversion and
that subversion is bad at tracking this kind of authorship. :(


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2211 726aef4b-f618-498e-8847-2d620e286838
2010-12-24 21:29:06 +00:00
darthgandalf
d2e5a2416c Fix disabling of modperl, modpython.
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2210 726aef4b-f618-498e-8847-2d620e286838
2010-12-24 19:29:44 +00:00
psychon
40632f46d0 Split up modules/Makefile.in
This splits the modpython, modperl and modtcl specific parts of
modules/Makefile.in into separate files. There shouldn't be any other changes
than this in here (hopefully).


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2209 726aef4b-f618-498e-8847-2d620e286838
2010-12-24 18:30:11 +00:00
darthgandalf
9745dcb4ea Python modules use 'description' attribute of the class now.
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2208 726aef4b-f618-498e-8847-2d620e286838
2010-12-24 16:45:22 +00:00
darthgandalf
517307b96a Remove verbosity from pyc files of Makefile.
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2207 726aef4b-f618-498e-8847-2d620e286838
2010-12-24 16:23:15 +00:00
psychon
11ffe9dbd8 Verify the listener during --makeconf
We will now try to bind() the listener during --makeconf and only accept using
it if this works. This should make this kind of problem less annoying (=you
don't have to recreate the whole config with --makeconf).


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2206 726aef4b-f618-498e-8847-2d620e286838
2010-12-24 16:09:30 +00:00
darthgandalf
d21a1be74a Fix some dependencies of Makefile
Thanks for zynox for finding this

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2205 726aef4b-f618-498e-8847-2d620e286838
2010-12-24 15:30:19 +00:00
darthgandalf
1854e14749 Make NV API to be easier fot python modules.
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2204 726aef4b-f618-498e-8847-2d620e286838
2010-12-24 15:04:23 +00:00
darthgandalf
88c84efc2f Fix error in loading of python modules.
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2203 726aef4b-f618-498e-8847-2d620e286838
2010-12-24 07:31:44 +00:00
darthgandalf
7237b9cb2a OOPish API for timers in modperl.
Existing API still works.

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2202 726aef4b-f618-498e-8847-2d620e286838
2010-12-23 18:18:06 +00:00
psychon
0cc8bebd2b Various fixes for our Makefiles
- Make sure webskins are installed with the correct permissions even though we
  don't use install for installing them.
- Make "make uninstall" use the correct path for webskins.
- Properly clean up the stuff generated by modperl and modpython on "make clean"
- Don't first install modperl/ and modpython/ only to remove them again later
- Use $(wildcard) to expand *.foo to the empty string if nothing matches.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2201 726aef4b-f618-498e-8847-2d620e286838
2010-12-23 14:15:49 +00:00
darthgandalf
18234a9445 Fix ignoring of fails in Makefile.
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2200 726aef4b-f618-498e-8847-2d620e286838
2010-12-23 10:33:42 +00:00
psychon
936b434dbb Add some -Wno flags to modpython
This is now enough that it builds for me! :)


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2199 726aef4b-f618-498e-8847-2d620e286838
2010-12-23 10:24:35 +00:00
psychon
e17348ca3f Fix detection of tcl and python with -Wl,--as-needed
The problem here was that libs where put into $LDFLAGS where they don't belong.
When you also use -Wl,--as-needed, sth like this is called:

  gcc -Wl,--as-needed -ltcl8.4 your.o objects.o here.o

Due to --as-needed, the linker will drop libtcl8.4 because by the time it sees
that option, nothing depends on it. And if nothing depends on some lib, it can
be dropped.

The fix here is obviously to put -ltcl8.4 into $LIBS (which is appended, not
prepended, to the command line).

The same reasoning goes for python.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2198 726aef4b-f618-498e-8847-2d620e286838
2010-12-23 10:03:21 +00:00
darthgandalf
aee8763c5d modpython/codegen.pl had wrong permissions
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2197 726aef4b-f618-498e-8847-2d620e286838
2010-12-23 01:35:56 +00:00
darthgandalf
a564e25c13 Add modpython module which allows to write ZNC modules on python3.
Notice for distro maintainers: perl interpreter is required to compile modpython.

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2196 726aef4b-f618-498e-8847-2d620e286838
2010-12-22 14:52:53 +00:00
darthgandalf
c7c0d1714c Change internal way of making Makefile to know if need to compile modperl or not.
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2195 726aef4b-f618-498e-8847-2d620e286838
2010-12-22 14:51:49 +00:00