aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'nickvergessen/ticket/9361' into develop-olympusAndreas Fischer2011-11-141-6/+6
|\ | | | | | | | | * nickvergessen/ticket/9361: [ticket/9361] View correct error messages when editing account information
| * [ticket/9361] View correct error messages when editing account informationJoas Schilling2011-11-141-6/+6
| | | | | | | | | | | | | | | | | | Currently the "current password" is only checked, when you change something. This means you get "Your profile has been updated." although you enter a wrong password. I also added proper error messages, when you leave the confirm fields empty, and sorted them in the order of the field appearances on the html page. PHPBB3-9361
* | Merge remote-tracking branch 'nickvergessen/ticket/9066' into develop-olympusAndreas Fischer2011-11-141-0/+4
|\ \ | | | | | | | | | | | | | | | * nickvergessen/ticket/9066: [ticket/9066] Move regex into get_preg_expression function and add tests [ticket/9066] Disallow some database prefix to prevent same errors and problems
| * | [ticket/9066] Move regex into get_preg_expression function and add testsJoas Schilling2011-11-141-0/+4
| |/ | | | | | | PHPBB3-9066
* | Merge remote-tracking branch 'igorw/ticket/10087' into develop-olympusAndreas Fischer2011-11-131-5/+29
|\ \ | | | | | | | | | | | | * igorw/ticket/10087: [ticket/10087] Organize bans in acp_baninto optgroups
| * | [ticket/10087] Organize bans in acp_baninto optgroupsIgor Wiedler2011-11-111-5/+29
| |/ | | | | | | PHPBB3-10087
* | Merge remote-tracking branch 'igorw/ticket/8616' into develop-olympusAndreas Fischer2011-11-132-5/+6
|\ \ | | | | | | | | | | | | | | | | | | * igorw/ticket/8616: [ticket/8616] Include old U_INBOX var for BC [ticket/8616] Rename U_INBOX to U_VIEW_MESSAGE [ticket/8616] Direct links in pm notification emails
| * | [ticket/8616] Include old U_INBOX var for BCIgor Wiedler2011-11-111-2/+3
| | | | | | | | | | | | PHPBB3-8616
| * | [ticket/8616] Rename U_INBOX to U_VIEW_MESSAGEIgor Wiedler2011-10-131-1/+1
| | | | | | | | | | | | PHPBB3-8616
| * | [ticket/8616] Direct links in pm notification emailsAlan2011-10-132-4/+4
| | | | | | | | | | | | | | | | | | | | | Import the "Direct links in pm notification emails" modification, version 1.0.1. PHPBB3-8616
* | | Merge remote-tracking branch 'bantu/ticket/10190' into develop-olympusIgor Wiedler2011-11-131-6/+2
|\ \ \ | | | | | | | | | | | | | | | | * bantu/ticket/10190: [ticket/10190] Do not show hint about permissions when editing forum settings.
| * | | [ticket/10190] Do not show hint about permissions when editing forum settings.Andreas Fischer2011-10-291-6/+2
| | | | | | | | | | | | | | | | PHPBB3-10190
* | | | Merge remote-tracking branch 'igorw/ticket/10365' into develop-olympusAndreas Fischer2011-11-132-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/10365: [ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to read [ticket/10365] Require m_report permission to see reports in mcp_post [ticket/10365] Make sure moderators only get mcp_reports link when allowed
| * | | | [ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to readIgor Wiedler2011-11-131-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10365
| * | | | [ticket/10365] Require m_report permission to see reports in mcp_postIgor Wiedler2011-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was exposed to anyone with m_ perms in mcp_post_details. PHPBB3-10365
| * | | | [ticket/10365] Make sure moderators only get mcp_reports link when allowedIgor Wiedler2011-10-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The m_report permission is not not being checked when displaying the link to mcp_reports. PHPBB3-10365
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/10237' into develop-olympusAndreas Fischer2011-11-111-6/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10237: [ticket/10237] Display login-box for guests, when (un)subscribing
| * | | | | [ticket/10237] Display login-box for guests, when (un)subscribingJoas Schilling2011-11-061-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also initialise $is_watching for PHP Notice: Undefined variable is_watching PHPBB3-10237
* | | | | | Merge remote-tracking branch 'nickvergessen/ticket/9036' into develop-olympusAndreas Fischer2011-11-011-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | * nickvergessen/ticket/9036: [ticket/9036] Add template variable 'S_AUTH_READ' to forumlist
| * | | | | [ticket/9036] Add template variable 'S_AUTH_READ' to forumlistJoas Schilling2011-10-291-0/+1
| | |_|_|/ | |/| | | | | | | | | | | | | PHPBB3-9036
* | | | | Merge remote-tracking branch 'cs278/ticket/9307' into develop-olympusIgor Wiedler2011-10-291-2/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cs278/ticket/9307: [ticket/9307] Add config variable to installation schema. [ticket/9307] Remove hardcoded chunk size of mass emails.
| * | | | | [ticket/9307] Remove hardcoded chunk size of mass emails.Chris Smith2011-09-241-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new config option is 'email_max_chunk_size' I have not added an interface option to change this. PHPBB3-9307
* | | | | | Merge remote-tracking branch 'bantu/ticket/10420' into develop-olympusIgor Wiedler2011-10-291-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10420: [ticket/10420] Update includes/startup.php for PHP 5.4.
| * | | | | | [ticket/10420] Update includes/startup.php for PHP 5.4.Andreas Fischer2011-10-181-2/+2
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHP 5.4 dropped support for register globals and magic quotes. Calling set_magic_quotes_runtime() on PHP 5.4 actually results in an E_CORE_ERROR error. PHPBB3-10420
* | | | | | Merge remote-tracking branch 'bantu/ticket/10421' into develop-olympusIgor Wiedler2011-10-291-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10421: [ticket/10421] Correct parameter order for phpbb_check_hash() in acp_users.php
| * | | | | | [ticket/10421] Correct parameter order for phpbb_check_hash() in acp_users.phpAndreas Fischer2011-10-181-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-10421
* | | | | | [ticket/10259] Do not send notifications to user accounts joining free groups.Andreas Fischer2011-10-171-28/+24
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It does not make sense to send notifications to users joining a freely open group. They already know that they were added to the group, because they triggered the actual join. PHPBB3-10259
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/9525' into develop-olympusAndreas Fischer2011-10-171-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/9525: [ticket/9525] Minimum post length 0 is accepted but not working.
| * | | | | [ticket/9525] Minimum post length 0 is accepted but not working.Joas Schilling2011-10-141-1/+1
| | |/ / / | |/| | | | | | | | | | | | | PHPBB3-9525
* | | | | Merge remote-tracking branch 'github-igorw/ticket/10377' into develop-olympusNils Adermann2011-10-141-9/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * github-igorw/ticket/10377: [ticket/10377] Do not allow all moderators to sticky posts
| * | | | | [ticket/10377] Do not allow all moderators to sticky postsIgor Wiedler2011-10-141-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the mcp the change_topic_type does not properly check permissions, allowing moderators to make any post sticky or announced by visiting the correct URL. PHPBB3-10377
* | | | | | Merge remote-tracking branch 'bantu/ticket/10327' into develop-olympusIgor Wiedler2011-10-141-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10327: [ticket/10327] Use $this->tools instead of creating a new instance of db_tools. [ticket/10327] Also change CREATE UNIQUE INDEX to use ALTER TABLE.
| * | | | | | [ticket/10327] Also change CREATE UNIQUE INDEX to use ALTER TABLE.Andreas Fischer2011-10-141-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-10327
* | | | | | [ticket/8240] Add ability to get a list of columns of a tables to db_tools.Andreas Fischer2011-10-141-74/+37
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8240
* | | | | | [ticket/8240] Add ability to get a list of tables to db_tools.Andreas Fischer2011-10-142-49/+68
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-8240
* | | | | Merge remote-tracking branch 'bantu/ticket/10327' into develop-olympusIgor Wiedler2011-10-141-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10327: [ticket/10327] Change CREATE INDEX to ALTER TABLE table ADD INDEX for MySQL.
| * | | | | [ticket/10327] Change CREATE INDEX to ALTER TABLE table ADD INDEX for MySQL.Andreas Fischer2011-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * CREATE INDEX is internally mapped to an ALTER INDEX statement. * CREATE INDEX requires the INDEX permission. * ALTER TABLE requires the (more powerful) ALTER permission. * We require the ALTER permission anyway for operation. * Changing CREATE INDEX to ALTER TABLE thus removes dependency on the INDEX permission which is good because some management software does not give out the INDEX permission by default. http://dev.mysql.com/doc/refman/5.0/en/create-index.html PHPBB3-10327
* | | | | | [ticket/10212] Return a CAPTCHA on incorrect username for ip limited users tooNils Adermann2011-10-141-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10212
* | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/10074' into ↵Nils Adermann2011-10-141-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/10074: [ticket/10074] Change default value of 'Set as special rank' to No
| * | | | | | [ticket/10074] Change default value of 'Set as special rank' to NoJoas Schilling2011-10-141-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | PHPBB3-10074
* | | | | | Merge remote-tracking branch 'github-bantu/ticket/10278' into develop-olympusNils Adermann2011-10-142-2/+13
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10278: [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT. [ticket/10278] Also timeout when receiving data over a slow connection. [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds. [ticket/10278] Return with a timeout error when fread() or fgets() time out. [ticket/10278] Also set timeout on stream in get_remote_file().
| * | | | | [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT.Andreas Fischer2011-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10278
| * | | | | [ticket/10278] Also timeout when receiving data over a slow connection.Andreas Fischer2011-10-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10278
| * | | | | [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds.Andreas Fischer2011-08-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10278
| * | | | | [ticket/10278] Return with a timeout error when fread() or fgets() time out.Andreas Fischer2011-08-251-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10278
| * | | | | [ticket/10278] Also set timeout on stream in get_remote_file().Andreas Fischer2011-08-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From the PHP manual for fsockopen(): If you need to set a timeout for reading/writing data over the socket, use stream_set_timeout(), as the timeout parameter to fsockopen() only applies while connecting the socket. http://www.php.net/manual/en/function.fsockopen.php PHPBB3-10278
* | | | | | Merge remote-tracking branch 'igorw/ticket/10307' into develop-olympusAndreas Fischer2011-10-131-1/+7
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/10307: [ticket/10307] Add a test for PHPBB3-10307 [ticket/10307] Return false in mysqli sql_fetchrow on empty result
| * | | | | [ticket/10307] Return false in mysqli sql_fetchrow on empty resultIgor Wiedler2011-10-131-1/+7
| | |/ / / | |/| | | | | | | | | | | | | PHPBB3-10307
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/10304' into develop-olympusAndreas Fischer2011-10-131-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10304: [ticket/10304] Fix URL for ICQ while view private messages
| * | | | | [ticket/10304] Fix URL for ICQ while view private messagesJoas Schilling2011-10-131-1/+1
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-10304