1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-30 02:59:29 +02:00

5661 Commits

Author SHA1 Message Date
Joas Schilling
2c4677b79e [feature/new-tz-handling] Remove function getTimestamp() as we require php 5.3
PHPBB3-9558
2012-06-18 15:10:50 +02:00
Joas Schilling
fb77b6b70c [feature/new-tz-handling] Fix documentation in includes/datetime.php
PHPBB3-9558
2012-06-18 15:10:40 +02:00
Joas Schilling
9836efc13c [feature/new-tz-handling] Inject $user to avoid the usage of global
PHPBB3-9558
2012-06-18 15:10:33 +02:00
Joas Schilling
2a880dafdf [feature/new-tz-handling] Do not use underscore as prefix for user
PHPBB3-9558
2012-06-18 15:10:22 +02:00
Joas Schilling
5f96e5d374 [feature/new-tz-handling] Fix timezone option when editing a user in the ACP
PHPBB3-9558
2012-06-18 15:09:45 +02:00
Joas Schilling
435573a9cb [feature/new-tz-handling] Fix Timezone selection on registration page
PHPBB3-9558
2012-06-18 15:09:36 +02:00
Joas Schilling
66f7d45603 [feature/new-tz-handling] Introduce 2 step timezone selection using javascript
PHPBB3-9558
2012-06-18 15:08:57 +02:00
Joas Schilling
3c6272ff04 [feature/new-tz-handling] Remove appearances of board_dst and user_dst
PHPBB3-9558
2012-06-18 15:08:46 +02:00
Joas Schilling
963d4afc2c [feature/new-tz-handling] Replace gmmktime() and mktime() with phpbb_datetime
PHPBB3-9558
2012-06-18 15:08:36 +02:00
Joas Schilling
f9bc825264 [feature/new-tz-handling] Fix timezone validation in ACP user section
PHPBB3-9558
2012-06-18 15:08:23 +02:00
Joas Schilling
66ae9ee2ea [feature/new-tz-handling] Fix timezone selection on registration page
PHPBB3-9558
2012-06-18 15:08:14 +02:00
Joas Schilling
09499fb128 [feature/new-tz-handling] Fix handling of timezone and dst in dateformat_select
PHPBB3-9558
2012-06-18 15:07:58 +02:00
Joas Schilling
00b5e5345d [feature/new-tz-handling] Fix displaying of "All times are" string
PHPBB3-9558
2012-06-18 15:07:44 +02:00
Joas Schilling
50936cb2ef [feature/new-tz-handling] Fix selecting and validating of timezone in UCP
PHPBB3-9558
2012-06-18 15:07:12 +02:00
Joas Schilling
8f027b68d6 Merge branch 'feature/new-tz-handling' of https://github.com/p/phpbb3 into feature/new-tz-handling
Conflicts:
	phpBB/includes/functions_profile_fields.php
	phpBB/includes/session.php
	phpBB/install/database_update.php
2012-06-04 18:09:35 +02:00
Nils Adermann
edefd11087 Merge remote-tracking branch 'github-bantu/ticket/10790' into develop
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10790:
  [ticket/10790] Remove a (kind of) dead code section from submit_pm().
2012-05-31 15:50:32 +02:00
Nils Adermann
b16f3834a3 Merge branch 'develop-olympus' into develop
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
2012-05-31 15:46:23 +02:00
Nils Adermann
7eaedcc8de Merge remote-tracking branch 'github-bantu/ticket/10550' into develop-olympus
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10550:
  [ticket/10550] Sort not installed styles list in the styles section of the ACP.
2012-05-31 15:43:09 +02:00
Nils Adermann
bafaf3700c Merge branch 'develop-olympus' into develop
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.
2012-05-31 15:34:58 +02:00
Nils Adermann
b10757ef14 Merge remote-tracking branch 'github-bantu/ticket/10611' into develop-olympus
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.
2012-05-31 15:34:48 +02:00
Nils Adermann
4a5004781a Merge branch 'develop-olympus' into develop
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.
2012-05-31 15:30:05 +02:00
Nils Adermann
f6f300d3f9 Merge remote-tracking branch 'github-bantu/ticket/10162' into develop-olympus
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.
2012-05-31 15:29:33 +02:00
Nils Adermann
1b73f82430 Merge branch 'develop-olympus' into develop
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
2012-05-31 15:28:08 +02:00
Nils Adermann
b789758f1b Merge remote-tracking branch 'github-bantu/ticket/10751' into develop-olympus
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.
2012-05-31 15:27:32 +02:00
Andreas Fischer
9ab5ad2986 [ticket/10751] Use sql_lower_text() in view_log(). log_data is a text column.
PHPBB3-10751
2012-05-31 12:15:46 +02:00
Andreas Fischer
643a86504a [ticket/10751] Add sql_lower_text() to database abstraction layer.
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
2012-05-31 12:15:46 +02:00
Andreas Fischer
7edb52b9be Merge branch 'develop-olympus' into develop
* 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
2012-05-31 11:55:12 +02:00
Andreas Fischer
0261a9acff Merge remote-tracking branch 'naderman/ticket/10908' into develop-olympus
* 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
2012-05-31 11:54:58 +02:00
Andreas Fischer
037b95eccc [ticket/10162] Increase maximum length of email address TLD from 6 to 63.
Increase maximum length of email address top level domains from 6 to 63.

PHPBB3-10162
2012-05-30 21:11:17 +02:00
Andreas Fischer
9240ddbfa7 [ticket/10611] Filter out not existing database tables when making a backup.
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
2012-05-30 13:45:00 +02:00
Andreas Fischer
515c27270f [ticket/10611] Use phpbb_db_tools::sql_list_tables() instead of get_tables().
get_tables() was deprecated by phpbb_db_tools::sql_list_tables()

This prevents unnecessarily loading functions_install.php

PHPBB3-10611
2012-05-30 13:41:36 +02:00
Andreas Fischer
6036b948ff [ticket/10611] Generate db_tools instance in acp_database module.
PHPBB3-10611
2012-05-30 13:38:41 +02:00
David King
54bd800dab Merge branch 'develop-olympus' into develop
Conflicts:
	phpBB/includes/session.php
2012-05-29 20:36:52 -04:00
David King
275dabbc4f Merge branch 'naderman/ticket/10913' into develop-olympus 2012-05-29 20:24:31 -04:00
Nils Adermann
9ead56acb3 Merge remote-tracking branch 'github-dhruv/ticket/10308' into develop-olympus
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
2012-05-29 16:42:37 +02:00
Nils Adermann
8438b61cef Merge remote-tracking branch 'github-dhruv/ticket/10308' into develop
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
2012-05-29 16:40:00 +02:00
Andreas Fischer
701bf571df [ticket/10550] Sort not installed styles list in the styles section of the ACP.
PHPBB3-10550
2012-05-29 15:29:31 +02:00
Nils Adermann
42dd60edad [ticket/10913] Redirect to index if session id is required but was not sent
PHPBB3-10913
2012-05-29 14:54:04 +02:00
Nils Adermann
13f30e8d9d [ticket/10908] Download files only up to max_upload_filesize if limit is 0
PHPBB3-10908
2012-05-29 14:27:25 +02:00
David King
c31996ea84 [ticket/10912] Default last post subject to empty lacking last post info
PHPBB3-10912
2012-05-26 21:21:22 -04:00
Oleg Pudeyev
3b6ca178aa Merge PR #721 branch 'rahulr92/ticket/10650' into develop
* 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
2012-05-21 23:42:48 -04:00
Oleg Pudeyev
6f6cf20d61 Merge PR #813 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10401] Return correct type when ldap_bind() fails in ldap_login().
2012-05-21 22:35:54 -04:00
Oleg Pudeyev
a97ebe78bf Merge PR #813 branch 'bantu/ticket/10401' into develop-olympus
* bantu/ticket/10401:
  [ticket/10401] Return correct type when ldap_bind() fails in ldap_login().
2012-05-21 22:35:50 -04:00
Oleg Pudeyev
44b3ab102a Merge PR #812 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10565] Add line breaks to query in order to follow coding guidelines.
  [ticket/10565] update_forum_tracking_info(): Remove unnecessary GROUP BY clause
2012-05-21 22:28:37 -04:00
Oleg Pudeyev
3503d7f47b Merge PR #812 branch 'bantu/ticket/10565' into develop-olympus
* bantu/ticket/10565:
  [ticket/10565] Add line breaks to query in order to follow coding guidelines.
  [ticket/10565] update_forum_tracking_info(): Remove unnecessary GROUP BY clause
2012-05-21 22:28:33 -04:00
Oleg Pudeyev
d0e63a4f37 Merge PR #808 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10898] Do not write ?> into config.php to avoid whitespace output.
2012-05-21 22:17:10 -04:00
Andreas Fischer
ea1e2ed362 [ticket/10401] Return correct type when ldap_bind() fails in ldap_login().
ldap_login() is supposed to return an array.

PHPBB3-10401
2012-05-22 03:32:54 +02:00
Andreas Fischer
896b43aa5b [ticket/10565] Add line breaks to query in order to follow coding guidelines.
PHPBB3-10565
2012-05-22 03:11:53 +02:00
Andreas Fischer
efbf14f029 [ticket/10565] update_forum_tracking_info(): Remove unnecessary GROUP BY clause
PHPBB3-10565
2012-05-22 03:08:39 +02:00
Andreas Fischer
ee875c0a43 [ticket/10790] Remove a (kind of) dead code section from submit_pm().
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
2012-05-22 02:24:31 +02:00