Commit Graph

215 Commits

Author SHA1 Message Date
Alexey Sokolov
c89771d561 Improve navigation in webadmin: "Save and continue" 2014-04-26 17:47:58 +01: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
uu1101
46975cd9f1 Use absolute URIs in Redirect
Although most browsers seem to accept relative redirects, it is not
allowed by HTTP/1.1.

This commit changes relative URIs to absolute ones when redirecting.
2014-02-16 12:45:10 +01:00
uu1101
88c85b0396 Add URIPrefix listener option 2014-02-16 12:45:09 +01:00
Falk Seidel
f19b4caa43 Welcome to 2014 - year 10 with ZNC 2013-12-31 10:10:55 +01:00
Alexey Sokolov
9e0597fd07 Merge pull request #432 from dgw/out-of-networks-err-sp
Tweak wording of "out of networks" errors
2013-11-21 09:50:51 -08:00
dgw
2b3d40a501 tweak wording of "out of networks" errors 2013-11-21 13:07:17 +04:00
Chris Dennett
054e873bec Added SSL (+) and port in networks list for connected servers. 2013-11-17 16:34:32 +00:00
Ingmar Runge
b5c898eaff modules: add OnAddNetwork, OnDeleteNetwork hooks. 2013-10-18 20:35:21 +02:00
multihunter
ff099097aa Remove unneeded SetSkinName() from webadmin
SetSkinName() was called two times in GetNewUser interface.
Removed the first call because "skin" is a combo box and can't be empty.
2013-08-04 01:23:34 +04:00
Alexey Sokolov
b2dcad5fd4 Change ZNC license to Apache 2.0
The following people agreed with the change, in alphabetical order:
(people who approved in several ways are listed only once)
By email:
- Adam (from Anope)
- Austin Morton
- Brian Campbell
- Christian Walde
- Daniel Holbert
- Daniel Wallace
- Falk Seidel
- Heiko Hund
- Ingmar Runge
- Jim Hull
- Kyle Fuller
- Lee Aylward
- Martin Martimeo
- Matt Harper
- Michael J Edgar
- Michael Ziegler
- Nick Bebout
- Paul Driver
- Perry Nguyen
- Philippe (cycomate)
- Reuben Morais
- Roland Hieber
- Sebastian Ramacher
- Stefan Rado
- Stéphan Kochen
- Thomas Ward
- Toon Schoenmakers
- Veit Wahlich
- Wulf C. Krueger

By IRC:
- CNU
- Jonas Gorski
- Joshua M. Clulow
- Prozac/SHiZNO
- SilverLeo
- Uli Schlachter

At https://github.com/znc/znc/issues/311 :
- Alexey Sokolov
- Elizabeth Myers
- flakes
- Jens-Andre Koch
- Jyzee
- KindOne/ineedalifetoday
- Lee Williams
- Mantas Mikulėnas
- md-5
- Reed Loden

At the last few pull requests' comments:
- Allan Odgaard
- Jacob Baines
- Lluís Batlle i Rossell
- ravomavain
- protomouse

The following commits' authors didn't respond:
Trivial changes:
- f70f1086fd
- 4ca8b50e45

The changes which are not presented in master anymore:
- 5512ed2ea0
- 960a4498f7
- 0f739de2c0
- 7f53cc810b

Fix #311
Fix #218
2013-06-14 00:43:34 +04:00
Alexey Sokolov
a06b6495e8 Revert "Rewrite the JOIN channel logic, dropping MaxJoins"
This reverts commit db7c47f97d.

Too many joined channels at once started to cause disconnect because of
"Max SendQ Exceeded", which is not much better than previous Flood.

Now MaxJoins is 0 by default, which preserves the current behavior of
joining all channels at once. If someone experiences those disconnects
due to SendQ, they can tune MaxJoins.

Fix #329

Conflicts:
	include/znc/User.h
	modules/controlpanel.cpp
	modules/webadmin.cpp
	src/User.cpp
2013-06-09 23:39:10 +04:00
Alexey Sokolov
2bd410ee55 Fix NULL pointer dereference in webadmin.
Triggerable by any non-admin, if webadmin is loaded.

The only affected version is 1.0

Thanks to ChauffeR (Simone Esposito) for reporting this.
2013-05-27 23:52:32 +04:00
Alexey Sokolov
46b28559fc webadmin: Enable embedding network modules and to network pages. 2013-05-19 18:40:12 +04:00
Alexey Sokolov
f2e8738ffc Fix #313 2013-04-05 08:38:21 +07:00
KindOne
2db7307ac3 Remove unneeded headers. 2013-03-08 01:47:57 +07:00
baines
82a708d6a1 Cleaned up more warnings. 2013-02-27 20:53:14 -05:00
Un1matr1x
3a34593359 The same procedure as last year, Miss sophie?
Same procedure as every year, James.
2012-12-31 12:44:31 +01:00
Alexey Sokolov
cf8925c930 Webadmin: don't modify listeners if loaded as user mod
Thanks to TheLordOfTime
2012-12-01 14:28:07 +07:00
Alexey Sokolov
833e63fb64 Allow loading webadmin as user module. 2012-12-01 08:55:41 +07:00
Alexey Sokolov
b0a2a58155 Fix error message at webadmin #239 2012-10-19 22:29:28 +07:00
Alexey Sokolov
9b2898f603 Implement setting "Max number of networks" for user.
Fix #226
2012-09-20 01:24:47 +07:00
Alexey Sokolov
9830be786a Add network and user to Edit channel page in webadmin.
This really needs #227 instead
2012-09-06 23:44:48 +07:00
Alexey Sokolov
c00cc72242 Add details to network table in webadmin.
Fix #222
2012-09-06 23:41:44 +07:00
Alexey Sokolov
0ed928623e webadmin: Show username in Edit Network page. 2012-09-06 23:18:30 +07:00
Alexey Sokolov
58d61539c3 webadmin: Fix using empty value for defaults in user page for buffer size.
Thanks to p3k for finding it.
2012-09-06 19:15:02 +07:00
Kyle Fuller
67299ebfa8 Fix a bunch of conversion warnings #197 2012-08-14 19:31:14 +07:00
Alexey Sokolov
62c9ac1a0b using in headers is evil :( 2012-07-26 20:46:11 +07:00
Alexey Sokolov
38b9525ad3 Fix webadmin to deny setting bindhost not from list. 2012-07-19 01:00:11 +07:00
Alexey Sokolov
cebc093254 Per-network bind hosts.
Fix #147
2012-07-19 00:59:41 +07:00
Alexey Sokolov
27f42d1118 Rename (non-) KeepBuffer to AutoClearChanBuffer.
It should be a less confusing name...
2012-05-09 22:32:12 +07:00
Alexey Sokolov
b496b282b2 Argh, commited wrong stuff... 2012-04-13 02:52:18 +07:00
Alexey Sokolov
87a79f83d9 Fix XML errors on network page in webadmin.
Thanks to thread for reporting it.
2012-04-13 02:49:18 +07:00
Alexey Sokolov
3e458a98e4 Merge some work by Jens-Andre Koch
Only his changes to the core are presented here.
Unfortunately, the skin itself looks ugly on Opera,
and simply doesn't work on Firefox...

Merge branch 'master' into znc-ation

Conflicts:
	modules/data/lastseen/tmpl/lastseen_WebadminUser.tmpl
	modules/data/webadmin/tmpl/settings.tmpl
2012-04-10 23:19:15 +07:00
Alexey Sokolov
6876961b79 Fix crash in webadmin when adding a new user.
My recent patch, which added ability to put arbitrary bindhost when
global list is missing, broke it...

Thanks to Jord for reporting it.
2012-04-08 00:24:26 +07:00
Alexey Sokolov
1a8455b2b9 Ups, commited debug stuff accidentally... 2012-04-01 12:15:33 +07:00
Alexey Sokolov
b8822b8bfb webadmin: allow edit bindhost without global list. 2012-04-01 11:52:31 +07:00
Alexey Sokolov
28f6809af8 Webadmin: edit listen ports 2012-03-31 06:48:24 +07:00
Jens-Andre Koch
bfc829d38d - used CString on Info.GetHasArgs 2012-03-28 16:59:51 +02:00
Jens-Andre Koch
92ec938150 Added Webskin "znc-ation" 2012-03-28 12:24:27 +02:00
Alexey Sokolov
30b99d58f3 Show list of timezones in webadmin. 2012-03-23 01:16:25 +07:00
Alexey Sokolov
1d4d657e23 Deprecate TimezoneOffset 2012-03-22 23:21:25 +07:00
Alexey Sokolov
f0cab46c3f Merge https://github.com/znc/znc/pull/78 (TZ)
Conflicts:
	modules/admin.cpp
	src/User.cpp
2012-03-22 22:58:46 +07:00
Alexey Sokolov
e83efead26 Nicify webadmin interface for flood protection. 2012-03-22 13:22:13 +07:00
Kyle Fuller
db7c47f97d Rewrite the JOIN channel logic, dropping MaxJoins
Instead we fill the JOIN line up with as many channels as we can fit in
an IRC line. Rate limiting is done per command now, making MaxJoins
unnecessary.
2012-03-21 22:06:54 +00:00
Alexey Sokolov
bf25eee520 Merge branch 'master' of github.com:znc/znc 2012-03-21 20:14:59 +07:00
Alexey Sokolov
afaef88807 Edit flood protection in webadmin. 2012-03-21 20:13:53 +07:00
Kyle Fuller
5618cf78d7 webadmin: Ask for confirmation when deleting a network
Closes #142
2012-03-19 00:34:41 +00:00
Kyle Fuller
c54b3d0b87 webadmin: Implement clone user
Closes #127
2012-02-24 17:26:04 +00:00
Kyle Fuller
8863d853c9 Allow disabling the use of adding networks for non admins
Closes #122
2012-02-15 16:27:47 +00:00