aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-06-211-2/+15
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.11: [ticket/10935] Limit number of PM rules per user to 5000
| | * | | | | | [ticket/10935] Limit number of PM rules per user to 5000Joas Schilling2012-06-201-2/+15
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | PHPBB3-10935
* | | | | | | Merge PR #844 branch 'dhruvgoel92/ticket/10936' into developOleg Pudeyev2012-06-191-92/+9
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/10936: [ticket/10936] remove PCRE and mbstring support check [ticket/10936] fix language key
| * | | | | | [ticket/10936] remove PCRE and mbstring support checkDhruv Goel2012-06-131-91/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since PCRE UTF8 support already has a global check no need for mbstring or PCRE check here. PHPBB3-10936
| * | | | | | [ticket/10936] fix language keyDhruv Goel2012-06-121-1/+1
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Language key changes from INCOMPATIBLE_VERSION to INCOMPATIBLE_DATABASE to make it more meaningfull. PHPBB3-10936
* | | | | | Merge branch 'develop-olympus' into developNils Adermann2012-06-191-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * develop-olympus: [ticket/9551] uncomment line and change length to 255
| * | | | | Merge remote-tracking branch 'github-dhruvgoel92/ticket/9551' into ↵Nils Adermann2012-06-191-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-dhruvgoel92/ticket/9551: [ticket/9551] uncomment line and change length to 255
| | * | | | | [ticket/9551] uncomment line and change length to 255Dhruv Goel2012-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | incase of partial collation change post_subject field will be changed back to the default collation and length 255. PHPBB3-9551
| * | | | | | [develop-olympus] Incrementing the version to 3.0.12-dev in develop-olympus.Andreas Fischer2012-05-311-1/+1
| | |_|/ / / | |/| | | |
| * | | | | [develop-olympus] Bump version numbers for 3.0.11-RC1 release.Andreas Fischer2012-05-311-1/+1
| | | | | |
| * | | | | Merge remote-tracking branch 'github-bantu/ticket/10790' into develop-olympusNils Adermann2012-05-311-6/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer * github-bantu/ticket/10790: [ticket/10790] Remove a (kind of) dead code section from submit_pm().
* | \ \ \ \ \ Merge PR #571 branch 'unknownbliss/ticket/10640' into developOleg Pudeyev2012-06-181-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * unknownbliss/ticket/10640: [ticket/10640] Change subject length in mcp in subsilver [ticket/10640] Change subject length in MCP [ticket/10640] Do not change default value of truncate_string() [ticket/10640] Change maximum subject length
| * | | | | | | [ticket/10640] Do not change default value of truncate_string()Joas Schilling2012-06-172-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default value should be kept, so we do not change the behaviour for MODs and Extensions that use the function with its default values. PHPBB3-10640
| * | | | | | | [ticket/10640] Change maximum subject lengthMichael Cullum2012-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10640
* | | | | | | | [ticket/10829] Delete T_STYLESHEET_NAME - no longer used.Oleg Pudeyev2012-06-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10829
* | | | | | | | [ticket/10829] $style_name -> $style_path in style class.Oleg Pudeyev2012-06-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Here the style path is taken and the variable name should be $style_path. PHPBB3-10829
* | | | | | | | Merge PR #839 branch 'p/ticket/10743' into developOleg Pudeyev2012-06-115-57/+43
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10743: [ticket/10743] Renaming user->theme [ticket/10743] Changing obtain_cfg_items
| * | | | | | | | [ticket/10743] Renaming user->themeVjacheslav Trushkin2012-06-114-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renaming user->theme to user->style PHPBB3-10743
| * | | | | | | | [ticket/10743] Changing obtain_cfg_itemsVjacheslav Trushkin2012-06-112-36/+22
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing obtain_cfg_items to work only with style because other components no longer exist PHPBB3-10743
* | | | | | | | Merge PR #787 branch 'cyberalien/ticket/10799' into developOleg Pudeyev2012-06-112-3/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/10799: [ticket/10799] Removing global variable from includejs
| * | | | | | | [ticket/10799] Removing global variable from includejsVjacheslav Trushkin2012-05-012-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing global $phpbb_root_path from includejs implementation PHPBB3-10799
* | | | | | | | Merge remote-tracking branch 'github-dhruvgoel92/feature/delete-auto-logins' ↵Nils Adermann2012-06-112-0/+55
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into develop * github-dhruvgoel92/feature/delete-auto-logins: [feature-delete-auto-logins] adds module to database update [feature/delete-auto-logins] fixes style [feature/delete-auto-logins] improves styling [feature/delete-auto-logins] fixes language entry [feature/delete-auto-logins] fix language keys and styling [feature/delete-auto-logins] explain persistent keys in the ucp. [feature/delete-auto-logins] template added for subsilver2 [feature/delete-auto-logins] improved styling and fixes language [feature/delete-auto-logins] using loop for errors [feature/delete-auto-logins] fixes css corners [feature/delete-auto-logins] Fixes language entries [feature/delete-auto-logins] checks form key [feature/delete-auto-logins] Fixes language entries and redirection. [feature/delete-auto-logins] User can view/delete auto logins.
| * | | | | | | | [feature/delete-auto-logins] improved styling and fixes languageDhruv Goel2012-05-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Table ahs been styled. Date is now formatted properly instead of the unix timestamp being displayed earlier. fixes small mistake in language entry PHPBB3-9647
| * | | | | | | | [feature/delete-auto-logins] using loop for errorsDhruv Goel2012-05-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of hardcoding html code into ERROR variable, we use errors array and use loop in template file. PHPBB3-9647
| * | | | | | | | [feature/delete-auto-logins] checks form keyDhruv Goel2012-05-171-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The form key is checked after submission if not correct error is returned. PHPBB3-9647
| * | | | | | | | [feature/delete-auto-logins] Fixes language entries and redirection.Dhruv Goel2012-05-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The user is redirected after deleting auto login session keys. PHPBB3-9647
| * | | | | | | | [feature/delete-auto-logins] User can view/delete auto logins.Dhruv Goel2012-05-172-0/+41
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | User has an extra option in UCP->Profile to view the auto logins and clear them. PHPBB3-9647
* | | | | | | | [ticket/10931] Apply strtolower() correctly, i.e. not on false.Andreas Fischer2012-06-111-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10931
* | | | | | | | [ticket/10931] Make to_numeric function globally available.Andreas Fischer2012-06-112-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10931
* | | | | | | | [ticket/10931] Make sure get_bytes() always returns either an int or a float.Andreas Fischer2012-06-111-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10931
* | | | | | | | [ticket/10931] Correctly handle inputs such as '-k' as invalid in get_bytes().Andreas Fischer2012-06-111-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10931
* | | | | | | | [ticket/10931] Correctly use GNU GPL version 2.Andreas Fischer2012-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10931
* | | | | | | | [ticket/10931] Document that false is also returned if value is not well formedAndreas Fischer2012-06-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10931
* | | | | | | | [ticket/10931] Correct method description of get_string().Andreas Fischer2012-06-111-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10931
* | | | | | | | [ticket/10931] Let us try ini_get() without error suppression.Andreas Fischer2012-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10931
* | | | | | | | [ticket/10931] Add wrapper class for ini_get function.Andreas Fischer2012-06-111-0/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provides easier handling of the different interpretations of ini values. PHPBB3-10931
* | | | | | | | Merge remote-tracking branch 'github-bantu/ticket/10790' into developNils Adermann2012-05-311-6/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer * github-bantu/ticket/10790: [ticket/10790] Remove a (kind of) dead code section from submit_pm().
| * | | | | | | [ticket/10790] Remove a (kind of) dead code section from submit_pm().Andreas Fischer2012-05-221-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The type of $user->data['user_id'] is (almost) guranteed to be integer since session::session_create() casts it to integer. The type of $row['user_id'] is only an integer if the DB driver adjusts the PHP type according to the DB type. This is only done by some of our not-so-popular DB drivers and is not the case for MySQL. As such this comparison is (almost) never true and a PM is also sent to the author itself when it is sent to a group the author is also a member of. Since this behaviour seems to have been accepted by the communty, the dead code is removed and current behaviour is kept. Also, checking this in the loop seems to be a rather bad idea. Introduced by 78b1c4caaa17cc8760b685ad41c19f15f9d89b68. PHPBB3-10790
* | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2012-05-311-1/+1
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer (1) and Nils Adermann (1) * develop-olympus: [ticket/10550] Sort not installed styles list in the styles section of the ACP. Conflicts: phpBB/includes/acp/acp_styles.php
| * | | | | | | Merge remote-tracking branch 'github-bantu/ticket/10550' into develop-olympusNils Adermann2012-05-311-1/+5
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer * github-bantu/ticket/10550: [ticket/10550] Sort not installed styles list in the styles section of the ACP.
| | * | | | | | | [ticket/10550] Sort not installed styles list in the styles section of the ACP.Andreas Fischer2012-05-291-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10550
* | | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2012-05-311-3/+9
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer (1) and Nils Adermann (1) * develop-olympus: [ticket/10611] Filter out not existing database tables when making a backup. [ticket/10611] Use phpbb_db_tools::sql_list_tables() instead of get_tables(). [ticket/10611] Generate db_tools instance in acp_database module.
| * | | | | | | | Merge remote-tracking branch 'github-bantu/ticket/10611' into develop-olympusNils Adermann2012-05-311-3/+9
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer * github-bantu/ticket/10611: [ticket/10611] Filter out not existing database tables when making a backup. [ticket/10611] Use phpbb_db_tools::sql_list_tables() instead of get_tables(). [ticket/10611] Generate db_tools instance in acp_database module.
| | * | | | | | | | [ticket/10611] Filter out not existing database tables when making a backup.Andreas Fischer2012-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using $this->db_tools->sql_list_tables() as the first argument gives us table names as array keys as a by-product which might be useful at some point. PHPBB3-10611
| | * | | | | | | | [ticket/10611] Use phpbb_db_tools::sql_list_tables() instead of get_tables().Andreas Fischer2012-05-301-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get_tables() was deprecated by phpbb_db_tools::sql_list_tables() This prevents unnecessarily loading functions_install.php PHPBB3-10611
| | * | | | | | | | [ticket/10611] Generate db_tools instance in acp_database module.Andreas Fischer2012-05-301-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10611
* | | | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2012-05-311-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer (1) and Nils Adermann (1) * develop-olympus: [ticket/10162] Increase maximum length of email address TLD from 6 to 63. [ticket/10162] Add test cases for top level domain names longer than 6 chars.
| * | | | | | | | | Merge remote-tracking branch 'github-bantu/ticket/10162' into develop-olympusNils Adermann2012-05-311-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer * github-bantu/ticket/10162: [ticket/10162] Increase maximum length of email address TLD from 6 to 63. [ticket/10162] Add test cases for top level domain names longer than 6 chars.
| | * | | | | | | | | [ticket/10162] Increase maximum length of email address TLD from 6 to 63.Andreas Fischer2012-05-301-1/+1
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase maximum length of email address top level domains from 6 to 63. PHPBB3-10162
* | | | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2012-05-315-1/+38
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer (1) and Nils Adermann (1) * develop-olympus: [ticket/10751] Use sql_lower_text() in view_log(). log_data is a text column. [ticket/10751] Add sql_lower_text() to database abstraction layer. Conflicts: phpBB/includes/db/dbal.php