aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [feature/new-tz-handling] Fix selecting and validating of timezone in UCPJoas Schilling2012-06-183-12/+32
| | | | PHPBB3-9558
* Merge branch 'feature/new-tz-handling' of https://github.com/p/phpbb3 into ↵Joas Schilling2012-06-044-74/+302
|\ | | | | | | | | | | | | | | | | feature/new-tz-handling Conflicts: phpBB/includes/functions_profile_fields.php phpBB/includes/session.php phpBB/install/database_update.php
| * [feature/new-tz-handling] Sort timezones in selector by offset.Oleg Pudeyev2012-03-141-1/+70
| | | | | | | | | | | | | | | | | | | | | | Since the list of timezones is very long, and users are likely to know their current offset but not necessarily which city that is nearby is in the timezone database, sort the list of timezones by offset. UTC is specially handled to show up before other GMT+0 timezones. PHPBB3-9558
| * [feature/new-tz-handling] Correct a bug preventing multiple formats working.Chris Smith2012-03-141-14/+14
| | | | | | | | PHPBB3-9558
| * [feature/new-tz-handling] Remove case mangling, the identifiers are correct.Chris Smith2012-03-141-2/+2
| | | | | | | | PHPBB3-9558
| * [feature/new-tz-handling] Update tz_select() to use the PHP timezone database.Chris Smith2012-03-141-7/+24
| | | | | | | | | | | | | | | | | | tz_select() now uses the PHP timezone database to generate the timezone selection box, it tries to use a translated language string otherwise falls back to a label produced from the timezone identifier. I've done this so new timezones are available immediately without a new language pack. PHPBB3-9558
| * [feature/new-tz-handling] Remove code using legacy timezone properties.Chris Smith2012-03-141-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code accessing the legacy user::$timezone and user::$dst properties has been removed and replaced with code utilising user::create_datetime(). Changed by Oleg: in viewtopic, memberlist and index use getTimestamp() + getOffset(). We show members that have birthdays on the specified date. getTimestamp() returns the current date in UTC. We add getOffset() to obtain the current local time in the viewing user's timezone. Then we find members having birthday on this date. Changed by Oleg again: Take leap year status out of the datetime object we have, this seems like it should work as one would expect. PHPBB3-9558
| * [feature/new-tz-handling] Removed line that was missed in cc312d8.Chris Smith2012-03-141-2/+0
| | | | | | | | PHPBB3-9558
| * [feature/new-tz-handling] Fix bug from 3.0 formatting future dates.Chris Smith2012-03-141-1/+2
| | | | | | | | | | | | | | Future dates can get formatted as 'less than a minute ago' if they occur in the future on the same minute as the current minute. PHPBB3-9558 PHPBB3-9712
| * [feature/new-tz-handling] Check the is_short flag stored inside the format ↵Chris Smith2012-03-141-3/+2
| | | | | | | | | | | | | | | | | | array. Reuse the existing check store in the format array to determine if the date time format supports relative formatting. PHPBB3-9558
| * [feature/new-tz-handling] Fix undefined variable.Chris Smith2012-03-141-0/+2
| | | | | | | | PHPBB3-9558
| * [feature/new-tz-handling] Explained name of phpbb_datetime::getTimestamp()Chris Smith2012-03-141-0/+1
| | | | | | | | | | | | | | phpbb_datetime::getTimestamp() exists purely to support PHP 5.2 which does not implement the method. PHPBB3-9558
| * [feature/new-tz-handling] Added phpbb_datetime::__toString().Chris Smith2012-03-141-0/+10
| | | | | | | | | | | | | | New phpbb_datetime::__toString() magic method that formats the datetime according to the users default settings. PHPBB3-9558
| * [feature/new-tz-handling] Comment and optimise phpbb_datetime::format().Chris Smith2012-03-141-3/+10
| | | | | | | | | | | | | | | | | | - Added comments explaining the complex time computations for rendering relative date times. - Replaced some repeated method invokations with variables. PHPBB3-9558
| * [feature/new-tz-handling] Correct typo in member comment.Chris Smith2012-03-141-1/+1
| | | | | | | | PHPBB3-9558
| * [feature/new-tz-handling] Fixed bug with signature of user::create_datetime().Chris Smith2012-03-141-1/+1
| | | | | | | | | | | | First argument to user::create_datetime() should be optional. PHPBB3-9558
| * [feature/new-tz-handling] Added a user::create_datetime() method.Chris Smith2012-03-141-0/+15
| | | | | | | | | | | | | | New method which handles instantiating new phpbb_datetime objects in the context of the current user. PHPBB3-9558
| * [feature/new-tz-handling] Replace user::$timezone with user::$tz.Chris Smith2012-03-141-6/+13
| | | | | | | | | | | | | | user::$tz will store the new DateTimeZone object representing the users timezone instead of the existing user::$timezone and user::$dst combination. PHPBB3-9558
| * [feature/new-tz-handling] Remove old user::$dst propertyChris Smith2012-03-141-1/+0
| | | | | | | | PHPBB3-9558
| * [feature/new-tz-handling] Correct capitalisation of phpbb_datetime.Chris Smith2012-03-141-1/+1
| | | | | | | | PHPBB3-9558
| * [feature/new-tz-handling] Update user methods to use new date processing class.Chris Smith2012-03-141-63/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | user::setup() now stores a DateTimeZone object in user::$timezone representing the users timezone. For backwards compatibility a numeric value in user/board_timezone will be converted into one of the legacy Etc/GMT±X timezones. This will be used until the user updates his/her timezone in the UCP. user::format_date() is now basically a legacy wrapper that transforms a UTC UNIX timestamp into a formatted localised date using phpbb_datetime::format(). PHPBB3-9558
| * [feature/new-tz-handling] Renamed old variables and removed extra conditional.Chris Smith2012-03-141-24/+19
| | | | | | | | PHPBB3-9558
| * [feature/new-tz-handling] Use phpbb_datetime rather than phpbb_DateTime.Chris Smith2012-03-141-2/+2
| | | | | | | | PHPBB3-9558
| * [feature/new-tz-handling] Wrapper around DateTime for new date time handling.Chris Smith2012-03-141-0/+160
| | | | | | | | | | | | | | Wrapped PHP's DateTime with some extensions for supporting phpBB's relative date formats and provided the DateTime::getTimestamp() method to PHP < 5.3. PHPBB3-9558
* | 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