aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'p/ticket/11159-develop' into developAndreas Fischer2012-10-305-5/+5
|\ | | | | | | | | * p/ticket/11159-develop: [ticket/11159] static public is the currently approved order.
| * [ticket/11159] static public is the currently approved order.Oleg Pudeyev2012-10-295-5/+5
| | | | | | | | PHPBB3-11159
* | Merge branch 'develop-olympus' into developAndreas Fischer2012-10-291-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | * develop-olympus: [ticket/11158] Require acl_u_sig for ucp signature module. [ticket/11158] Revert old fix in PHPBB3-10186. Conflicts: phpBB/install/database_update.php phpBB/ucp.php
| * [ticket/11158] Require acl_u_sig for ucp signature module.Oleg Pudeyev2012-10-291-1/+1
| | | | | | | | PHPBB3-11158
* | Merge PR #971 branch 'nickvergessen/ticket/11018' into developOleg Pudeyev2012-10-2217-34/+71
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11018: [ticket/11014] Fix old pagination assignment [ticket/11018] Fix several paginations in ACP [ticket/11014] Fix IF statements for new template pagination [ticket/11014] Fix text for previous/next links in Subsilver2 [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968 [ticket/11018] Always display previous/next links if we can display one [ticket/11014] Restore template vars for next/previous links [ticket/11018] Swap prev/next links on pagination to the old order [ticket/11067] Copy prosilver CSS to adm, so the pagination looks the same [ticket/11018] Fix minor issues with CSS in prosilver [ticket/11018] Attempt to fix li.pagination alignment issue
| * | [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968Joas Schilling2012-10-1717-26/+24
| | | | | | | | | | | | PHPBB3-11023
| * | [ticket/11014] Restore template vars for next/previous linksJoas Schilling2012-10-171-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They were dropped while the function was refactored: If the block_var_name is a nested block, we will use the last (most inner) block as a prefix for the template variables. If the last block name is pagination, the prefix is empty. If the rest of the block_var_name is not empty, we will modify the last row of that block and add our pagination items. PHPBB3-11014
| * | [ticket/11018] Swap prev/next links on pagination to the old orderJoas Schilling2012-10-171-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | In the old pagination Prev was left of the pagination and Next right of the pagination. While moving these blocks, I also removed the whitespaces, which were introduced. PHPBB3-11023 PHPBB3-11018
* | | Merge remote-tracking branch 'EXreaction/ticket/8796' into developAndreas Fischer2012-10-182-23/+52
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/8796: [ticket/8796] Prevent setting post_time greater than time() in markread [ticket/8796] Fix a few issues with the previous commits [ticket/8796] Mark read links updated to include time() in url [ticket/8796] Revert changes to $user->data['lastmark'] [ticket/8796] Make function markread obey the $post_time argument
| * | | [ticket/8796] Prevent setting post_time greater than time() in markreadNathan Guse2012-09-301-30/+30
| | | | | | | | | | | | | | | | PHPBB3-8796
| * | | [ticket/8796] Fix a few issues with the previous commitsNathaniel Guse2012-09-032-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Fix an SQL error and the redirect url generated PHPBB3-8796
| * | | [ticket/8796] Mark read links updated to include time() in urlNathaniel Guse2012-09-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Submitting the current time() allows us to mark only the topics and forums read up until a certain time (when the user loaded the page). This means that any new posts or topics posted between when the user opened the page and clicked the link are still shown as unread. PHPBB3-8796
| * | | [ticket/8796] Revert changes to $user->data['lastmark']Nathaniel Guse2012-09-031-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The earlier change might change the way some things work (after looking at viewtopic) and I'd rather not risk introducing new bugs, so I'm going to revert those changes to be safe. PHPBB3-8796
| * | | [ticket/8796] Make function markread obey the $post_time argumentNathaniel Guse2012-09-031-19/+52
| | | | | | | | | | | | | | | | | | | | | | | | Also do a little cleanup of the markread function PHPBB3-8796
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-10-181-0/+30
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10848] Move include up. [ticket/10848] Add phpbb_ prefix. [ticket/10848] Redirect from adm to installer correctly. Conflicts: phpBB/includes/functions.php
| * | | Merge remote-tracking branch 'p/ticket/10848' into develop-olympusAndreas Fischer2012-10-181-0/+30
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10848: [ticket/10848] Move include up. [ticket/10848] Add phpbb_ prefix. [ticket/10848] Redirect from adm to installer correctly.
| | * | | [ticket/10848] Add phpbb_ prefix.Oleg Pudeyev2012-10-171-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10848
| | * | | [ticket/10848] Redirect from adm to installer correctly.Oleg Pudeyev2012-10-171-0/+30
| | | | | | | | | | | | | | | | | | | | PHPBB3-10848
* | | | | Merge PR #918 branch 'develop-olympus' into developOleg Pudeyev2012-10-171-1/+2
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | * develop-olympus: [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm
| * | | Merge PR #918 branch 'Senky/ticket/10568' into develop-olympusOleg Pudeyev2012-10-171-1/+2
| |\ \ \ | | |/ / | |/| | | | | | | | | | * Senky/ticket/10568: [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm
| | * | [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pmSenky2012-08-021-1/+2
| | | | | | | | | | | | | | | | PHPBB3-10568
* | | | Merge PR #624 branch 'develop-olympus' into developOleg Pudeyev2012-10-161-2/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/8743] Include poster´s name in mail notifications
| * | | Merge PR #624 branch 'nickvergessen/ticket/8743' into develop-olympusOleg Pudeyev2012-10-161-2/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/8743: [ticket/8743] Include poster´s name in mail notifications
| | * | | [ticket/8743] Include poster´s name in mail notificationsJoas Schilling2012-03-151-2/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-8743
* | | | | Merge PR #917 branch 'develop-olympus' into developOleg Pudeyev2012-10-161-1/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10967] adding $root_path to posting_get_topic_icons
| * | | | Merge PR #917 branch 'Senky/ticket/10967' into develop-olympusOleg Pudeyev2012-10-161-2/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * Senky/ticket/10967: [ticket/10967] adding $root_path to posting_get_topic_icons
| | * | | | [ticket/10967] adding $root_path to posting_get_topic_iconsSenky2012-10-111-2/+4
| | | |/ / | | |/| | | | | | | | | | | | PHPBB3-10967
* | | | | Merge PR #956 branch 'dhruvgoel92/ticket/11051' into developOleg Pudeyev2012-10-104-12/+132
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11051: [ticket/11051] fix spaces [ticket/11051] add common_words variable [ticket/11051] remove unnecessary comment [ticket/11051] add get_word_len() in sphinx search [ticket/11051] use get_word_length in search backend [ticket/11051] use get_common_words in search backend [ticket/11051] function instead of accessing property in search [ticket/11051] add public functions for public properties
| * | | | | [ticket/11051] fix spacesDhruv2012-10-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11051
| * | | | | [ticket/11051] add get_word_len() in sphinx searchDhruv2012-10-041-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get_word_len() for sphinx search backend returns false always and triggers proper error. PHPBB3-11051
| * | | | | [ticket/11051] add public functions for public propertiesDhruv2012-08-154-12/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | public retrieval functions for all public properties and change the properties to protected in all search backends. PHPBB3-11051
* | | | | | Merge PR #990 branch 'bantu/ticket/11100' into developOleg Pudeyev2012-10-101-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/11100: [ticket/11100] Mark can_use_ssl() and can_use_tls() as static.
| * | | | | | [ticket/11100] Mark can_use_ssl() and can_use_tls() as static.Andreas Fischer2012-09-081-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11100
* | | | | | | Merge PR #993 branch 'bantu/ticket/8713' into developOleg Pudeyev2012-10-108-58/+140
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/8713: [ticket/8713] Update untrimmed_variable() doc block. [ticket/8713] Revert changes to ucp_profile, ucp_register and acp_users. [ticket/8713] Trim password in auth_db to keep compatibility. [ticket/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords. [ticket/8713] Rename untrimed_variable() to untrimmed_variable(). [ticket/8713] DRY: variable() and untrimed_variable() into a protected method. [ticket/8713] Fix type_cast_helper.php doc blocks: Add punctuation etc. [ticket/8713] Always trim array keys. [ticket/8713] Add simple (non-nested) test case for untrimmed set_var(). [ticket/8713] Use \t in double quotes instead of tabs. [ticket/8713] Use correct parameter for nested data. [ticket/8713] Adjust test method name to other recursive_set_var() tests. [ticket/8713] Do not trim login inputs
| * | | | | | | [ticket/8713] Update untrimmed_variable() doc block.Andreas Fischer2012-09-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8713
| * | | | | | | [ticket/8713] Revert changes to ucp_profile, ucp_register and acp_users.Andreas Fischer2012-09-093-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently only auth_db is supported there and the password needs to be trimmed for compatibility because user_password stores phpbb_hash(htmlspecialchars(trim($password))) Setting passwords for other auth modules is currently not supported. Once setting/changing passwords is supported by auth plugins, the untrimmed_variable() should be used here and the result should be passed to the auth plugin. PHPBB3-8713
| * | | | | | | [ticket/8713] Trim password in auth_db to keep compatibility.Andreas Fischer2012-09-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8713
| * | | | | | | [ticket/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords.Andreas Fischer2012-09-081-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8713
| * | | | | | | [ticket/8713] Rename untrimed_variable() to untrimmed_variable().Andreas Fischer2012-09-086-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8713
| * | | | | | | [ticket/8713] DRY: variable() and untrimed_variable() into a protected method.Andreas Fischer2012-09-081-80/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8713
| * | | | | | | [ticket/8713] Fix type_cast_helper.php doc blocks: Add punctuation etc.Andreas Fischer2012-09-081-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8713
| * | | | | | | [ticket/8713] Always trim array keys.Andreas Fischer2012-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8713
| * | | | | | | [ticket/8713] Do not trim login inputsNathaniel Guse2012-09-037-19/+92
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a function to request variables which are not trimmed. All requests for passwords (except forum passwords) now use the untrimmed request function. PHPBB3-8713
* | | | | | | [ticket/11140] Fix an error from an incorrect variable nameNathan Guse2012-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11140
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-10-022-3/+3
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11112] updating links to phpbb.com to use SSL Conflicts: phpBB/adm/index.php
| * | | | | | [ticket/11112] updating links to phpbb.com to use SSLSenky2012-10-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11112
* | | | | | | Merge remote-tracking branch 'EXreaction/ticket/11021' into developAndreas Fischer2012-09-151-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11021: [ticket/11021] Fix the language changes that were lost previously
| * | | | | | | [ticket/11021] Fix the language changes that were lost previouslyNathan Guse2012-09-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change U_HOME to U_SITE_HOME PHPBB3-11021
* | | | | | | | Merge remote-tracking branch 'EXreaction/ticket/11021' into developAndreas Fischer2012-09-152-29/+33
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11021: [ticket/11021] Remove unnecessary line spacing in functions.php [ticket/11021] Use L_SITE_HOME instead of L_HOME [ticket/11021] Better language strings for site home url/text [ticket/11021] subsilver2 support [ticket/11021] Add the option to specify a Site home URL and text
| * | | | | | | [ticket/11021] Remove unnecessary line spacing in functions.phpNathan Guse2012-09-151-29/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11021
generated by cgit v1.2.1 (git 2.21.0) at 2025-04-12 02:21:32 +0000