aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | | Merge remote-tracking branch 'github-bantu/ticket/10751' into develop-olympusNils Adermann2012-05-315-1/+38
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer * github-bantu/ticket/10751: [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.
| | * | | | | [ticket/10751] Use sql_lower_text() in view_log(). log_data is a text column.Andreas Fischer2012-05-311-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10751
| | * | | | | [ticket/10751] Add sql_lower_text() to database abstraction layer.Andreas Fischer2012-05-314-0/+36
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On MSSQL, LOWER() can only be called on bounded strings (i.e. varchar or char). So, in order to use it on a text column, we have to convert it to an appropriate type. We do so using the SUBSTRING function. PHPBB3-10751
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-311-4/+29
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10908] Document that 0 filesize configuration means limited by PHP [ticket/10908] Download files only up to max_upload_filesize if limit is 0
| * | | | | Merge remote-tracking branch 'naderman/ticket/10908' into develop-olympusAndreas Fischer2012-05-311-4/+29
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | * naderman/ticket/10908: [ticket/10908] Document that 0 filesize configuration means limited by PHP [ticket/10908] Download files only up to max_upload_filesize if limit is 0
| | * | | | [ticket/10908] Download files only up to max_upload_filesize if limit is 0Nils Adermann2012-05-291-4/+29
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-10908
* | | | | Merge branch 'develop-olympus' into developDavid King2012-05-291-2/+10
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: phpBB/includes/session.php
| * | | | Merge branch 'naderman/ticket/10913' into develop-olympusDavid King2012-05-291-2/+9
| |\ \ \ \
| | * | | | [ticket/10913] Redirect to index if session id is required but was not sentNils Adermann2012-05-291-2/+9
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-10913
| * | | | Merge remote-tracking branch 'github-dhruv/ticket/10308' into develop-olympusNils Adermann2012-05-291-0/+8
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Dhruv Goel via Dhruv Goel * github-dhruv/ticket/10308: [ticket/10308] fixes indentation [ticket/10308] fixes language variable name [ticket/10308] makes variable boolean [ticket/10308] fixes sql query, limit it to 1 [ticket/10308] fixes user deletion if no posts [ticket/10308] renames language key to USER_NO_POSTS_DELETE [ticket/10308] fix language and user's total posts [ticket/10308] fixes language entity. [ticket/10308] Displays message to user if there are no posts. [ticket/10308] disable retain/ delete posts option when deleting a user
* | | | | Merge remote-tracking branch 'github-dhruv/ticket/10308' into developNils Adermann2012-05-291-0/+8
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Dhruv Goel via Dhruv Goel * github-dhruv/ticket/10308: [ticket/10308] fixes indentation [ticket/10308] fixes language variable name [ticket/10308] makes variable boolean [ticket/10308] fixes sql query, limit it to 1 [ticket/10308] fixes user deletion if no posts [ticket/10308] renames language key to USER_NO_POSTS_DELETE [ticket/10308] fix language and user's total posts [ticket/10308] fixes language entity. [ticket/10308] Displays message to user if there are no posts. [ticket/10308] disable retain/ delete posts option when deleting a user
| * | | | [ticket/10308] makes variable booleanDhruv Goel2012-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | makes user_row['user_has_posts'] boolean instead of 1 or 0. PHPBB3-10308
| * | | | [ticket/10308] fixes sql query, limit it to 1Dhruv Goel2012-05-101-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of fetching all posts by user we limit the query to 1 to check if a user has posts or not PHPBB3-10308
| * | | | [ticket/10308] fix language and user's total postsDhruv Goel2012-05-101-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | language modified to be clear and select box disappears in case no posts by user. user's total posts are fetched using a new query. PHPBB3-10308
* | | | | [ticket/10912] Default last post subject to empty lacking last post infoDavid King2012-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10912
* | | | | Merge PR #721 branch 'rahulr92/ticket/10650' into developOleg Pudeyev2012-05-212-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rahulr92/ticket/10650: [ticket/10650] Subject is cleared if no permissions exist [ticket/10650] Changed apostrophe to utf8 single quote [ticket/10650] Moving censoring to before truncation [ticket/10650] Added apostrophe in explanation in language file [ticket/10650] Inserted correct utf ELLIPSIS character [ticket/10650] Added space after if and comment [ticket/10650] Added ellipsis to language file [ticket/10650] Added href title to subject link [ticket/10650] Made use of truncate_string() function [ticket/10650] Removed changes from acp_forums.php [ticket/10650]Removed incorrect newline [ticket/10650] Changed acp option from per forum to global [ticket/10650] Added checking for empty subjects [ticket/10650] Corrected intendation [ticket/10650]Added permission checking and utf8 functions [ticket/10650] Cropped subject and inserted newline [ticket/10650] Corrected space before true [ticket/10650] Changed language files and forumlist [ticket/10650] Added static sql files [ticket/10650] Displaying last topic on forum list Conflicts: phpBB/install/database_update.php phpBB/language/en/common.php
| * | | | | [ticket/10650] Subject is cleared if no permissions existRahul R2012-05-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The subject line will be cleared before passing to the template in case the user doesn't have sufficient permissions. PHPBB3-10650
| * | | | | [ticket/10650] Moving censoring to before truncationRahul R2012-04-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The censor_text function is now being applied to the last_post_subject before being truncated. PHPBB3-10650
| * | | | | [ticket/10650] Added ellipsis to language fileRahul R2012-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added ELLIPSIS to language file common.php and also corrected language explanation of ACP option. PHPBB3-10650
| * | | | | [ticket/10650] Made use of truncate_string() functionRahul R2012-04-081-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed manual cropping and used truncate_string function. Also made a new variable so that is preserved. PHPBB3-10650
| * | | | | [ticket/10650] Removed changes from acp_forums.phpRahul R2012-04-081-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed unneccesary changes from acp_forums.php PHPBB3-10650