Commit Graph

3382 Commits

Author SHA1 Message Date
Alexey Sokolov 2f0bc0c46c Modpython: fix calling overloaded methods with parameter CString& 2014-05-01 22:20:05 +01:00
Alexey Sokolov aea871e656 Travis: fix showing what is exported from travis_after_all.py 2014-05-01 00:33:50 +01:00
Alexey Sokolov a4996c0e0b Finish fixing travis, no-key-leakage test of previous commit passed. 2014-05-01 00:16:20 +01:00
Alexey Sokolov bfc1fef630 Replace travis keys and don't download travis_after_all.py
Old key got leaked due to
https://developer.github.com/changes/2014-04-25-user-content-security/

This commit tests that the key is not leaked anymore
2014-04-30 23:58:29 +01:00
Alexey Sokolov c89771d561 Improve navigation in webadmin: "Save and continue" 2014-04-26 17:47:58 +01:00
Alexey Sokolov a35385db3a Merge branch 'master' of github.com:znc/znc 2014-04-26 16:45:31 +01:00
Alexey Sokolov 0952ee82e0 Don't set ConnectDelay to zero 2014-04-26 16:45:04 +01:00
Kyle Fuller ed7119b5bc Update to latest version of Csocket
Fixes #536
2014-04-24 19:28:37 +01:00
Kyle Fuller e3bb292d25 Merge pull request #535 from anders/qinvite
Q module: Don't send one JOIN per invite.
2014-04-23 17:39:13 +01:00
Anders Bergh 4db8d264bc Q module: Add channels invited to by Q when JoinOnInvite is enabled. 2014-04-23 12:05:45 +02:00
Alexey Sokolov a1800282c2 Fix make-tarball.sh 2014-04-23 07:08:55 +01:00
Alexey Sokolov 29deb32cc2 Travis: tweak commit message again 2014-04-21 11:12:44 +01:00
Alexey Sokolov 90b4c88276 Use make-tarball.sh for nightlies too 2014-04-21 10:55:55 +01:00
Alexey Sokolov 719646306d Use docs.znc.in for docs 2014-04-21 10:14:13 +01:00
Alexey Sokolov 72e80f7b7b Travis: tweak commit message 2014-04-21 10:12:49 +01:00
Alexey Sokolov c2e1fecfb7 Travis: tweak commit message for point at source commit 2014-04-21 08:20:23 +01:00
Alexey Sokolov 4acc292571 Don't put travis configs to release tarballs 2014-04-21 08:13:22 +01:00
Alexey Sokolov 88e51d597a Travis: private key shouldn't be readable by world 2014-04-21 00:41:54 +01:00
Alexey Sokolov 1f54731fd1 Travis: trust github ssh while pushing new docs to it 2014-04-21 00:29:07 +01:00
Alexey Sokolov 8064bda3d8 Merge branch 'master' of github.com:znc/znc 2014-04-21 00:07:17 +01:00
Alexey Sokolov 6db563f4fd Travis: push docs to github.com/znc/docs 2014-04-21 00:05:53 +01:00
Kyle Fuller 5e90bc380b [Csocket] Support and default to TLSv1.2
Updates to 21ac28cc29e9256a21a9aa217e29638360c266d0 of Csocket
2014-04-20 23:35:29 +01:00
Alexey Sokolov ab0f6d941c Merge commit 'refs/pull/533/head' of github.com:znc/znc 2014-04-20 23:31:16 +01:00
Kyle Fuller bc795f03cb [chansaver] Correctly load from all module types 2014-04-20 19:32:49 +01:00
Alexey Sokolov 66ea539165 Show username of every http request in -D output 2014-04-20 15:20:39 +01:00
Richard Schwab ac26170634 Add automatic documentation generation with doxygen via travis 2014-04-20 15:54:27 +02:00
Alexey Sokolov a62af5d89b Try another efnet server in travis config 2014-04-18 07:42:27 +01:00
Kyle Fuller ef5050e3ab [chansaver] Add support for loading as a global module
This also fixes a bug where loading the module as a network causes other
channels in different networks to be saved

Closes #529
2014-04-16 07:02:39 +00:00
Alexey Sokolov 370659895b Increase the version number to 1.5 2014-04-14 22:48:50 +01:00
Uli Schlachter 74c91e8cfa controlpanel: Check if adding a new channel succeeded
Signed-off-by: Uli Schlachter <psychon@znc.in>
2014-04-13 23:12:03 +02:00
Uli Schlachter 5e6e3be32a webadmin/add channel: Correctly handle channel names
The CChan constructor makes sure that the channel name begins with a valid
channel prefix. Thus, this could change the name of the resulting channel.

When you edited an irc network which already had a channel "#foo", were
connected to IRC (so ZNC knows which prefixes are valid) and added a channel
"foo", this would lead to a problem:

Webadmin checks and sees that there is no channel "foo" yet. Webadmin creates a
new CChan instance for "foo". The CChan constructor notices that "f" is not a
valid channel prefix and instead calls itself "#foo". Then,
CIRCNetwork::AddChan() would see that this channel already exists, delete the
given channel and return false.

However, webadmin didn't check this result and would continue changing settings
on an already destroyed CChan instance.

Fix this by checking if the channel exists after CChan had its chance to mess
with the channel name. Also handle failures from CIRCNetwork::AddChan().

Fixes #528.

Signed-off-by: Uli Schlachter <psychon@znc.in>
2014-04-13 20:41:34 +02:00
Alexey Sokolov 6bf48c2c6c Merge pull request #526 from anders/q-nocloakdefault
Q module: Store default NVs and better default host cloak behavior, web page
2014-04-12 16:04:19 +01:00
Anders Bergh 5a7796f0ae Q module: Add web config.
Move Cloak() from the Set command to SetUseCloakedHost() so that the
web config can use it also.
2014-04-12 16:45:26 +02:00
Anders Bergh 0d1481f991 Q module: Don't cloak host on first module load while connected to IRC. 2014-04-12 15:53:14 +02:00
Anders Bergh b5e8ff2599 Q module: Store default NVs on module load. 2014-04-12 15:04:03 +02:00
Alexey Sokolov 8ccd95bc6e Revert "Q module: Don't enable the UseCloakedHost option by default."
This reverts commit a7e8775efe.

Existing setting for existing users (who didn't do SetNV) should not change
Thanks to fred for reporting it

Reopen #525
2014-04-12 09:45:06 +01:00
Alexey Sokolov 9cf61ac6d4 Argh, fuck it. Rename fixed (pointer) versions of OnMode to OnMode2 2014-04-12 08:51:04 +01:00
Alexey Sokolov efafc8ccd2 Merge pull request #525 from anders/q-nocloakdefault
Q module: Don't enable the UseCloakedHost option by default.
2014-04-11 23:23:38 +01:00
Alexey Sokolov 90e1033500 Merge pull request #524 from anders/q-invite
Q module: Add join-on-invite option.
2014-04-11 22:29:10 +01:00
Anders Bergh a7e8775efe Q module: Don't enable the UseCloakedHost option by default.
On QuakeNet's ircd you can't unset user mode +x once set. But loading
the Q module will set it immediately, possibly requiring a reconnect
if you don't want to use a cloaked host.

Signed-off-by: Anders Bergh <anders1@gmail.com>
2014-04-11 17:15:16 +02:00
Anders Bergh dacea9badb Q module: Add join-on-invite option.
Use case: On QuakeNet you can /msg Q CHANLEV #chan <yourself> +j to
be invited once you authenticate. Anyone known on the channel (mode +k)
is able to set/unset chanlev +j for themselves.

Signed-off-by: Anders Bergh <anders1@gmail.com>
2014-04-11 17:07:14 +02:00
Alexey Sokolov 90bc025906 Add encoding to controlpanel's help 2014-04-08 07:39:01 +01:00
Kyle Fuller b396cafdb2 Merge pull request #518 from teward/patch-1
Reword ClearBindHost/ClearUserBindHost success msg
2014-03-27 01:59:25 +00:00
Thomas Ward 12d81e1d4e Reword ClearBindHost/ClearUserBindHost success msg
The ClearBindHost and ClearUserBindHost success messages do not make a distinction on whether it's a network bind host that's being cleared or whether it's a user bind host that's being cleared.  I think that this should be reworded to make the distinction.
2014-03-26 20:10:15 -04:00
Alexey Sokolov 73bc8d5959 Merge pull request #512 from Nothing4You/fix-another-controlpanel-bindhost-issue
Fix *controlpanel not checking whether the bindhost is in the whitelist
2014-03-20 20:42:51 +00:00
Richard Schwab e77edb409e Fix *controlpanel not checking whether the bindhost is in the whitelist 2014-03-18 14:04:15 +01:00
Alexey Sokolov 2cfc6ce979 Merge pull request #510 from Nothing4You/fix-controlpanel-bindhost
Fix BindHost in SetNetwork in *controlpanel to check permissions
2014-03-17 10:14:04 +00:00
Richard Schwab 530bbb5b0d Fix BindHost in SetNetwork in *controlpanel to check permissions 2014-03-17 09:30:04 +01:00
Alexey Sokolov 1925737b84 Merge pull request #509 from Nothing4You/controlpanel-setnetwork-bindhost
Add BindHost to Get/SetNetwork in *controlpanel
2014-03-16 17:17:35 +00:00
Richard Schwab cdd16f3933 Add BindHost to Get/SetNetwork in *controlpanel 2014-03-16 17:12:04 +01:00