aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' of https://github.com/phpbb/phpbb3 into ↵Marc Alexander2013-05-171-1/+1
|\ | | | | | | ticket/11538
| * [ticket/11545] Remove DIRECTORY_SEPARATOR dependency from is_absoluteJoas Schilling2013-05-161-1/+1
| | | | | | | | | | | | The given path is an absolute path in general, just not on our current system. PHPBB3-11545
| * [ticket/11546] Fix is_absolute() throws E_NOTICE for empty stringJoas Schilling2013-05-151-1/+1
| | | | | | | | PHPBB3-11546
* | [ticket/11538] Add function phpbb_validate_colour for validating coloursMarc Alexander2013-05-163-3/+25
| | | | | | | | | | | | | | | | | | It will be possible to use this function via the validate_data() function interface that has already been used previously. Thus, this new function will extend the capabilities of validate_data() to checking hex color values. PHPBB3-11538
* | [ticket/11538] Make sure regex doesn't allow multiple color valuesMarc Alexander2013-05-152-2/+2
| | | | | | | | | | | | | | This will now make sure that 'AAFF00' will be matched but strings like 'AAFF00 AABB00' will not. PHPBB3-11538
* | [ticket/11538] Simplify colour value check and remove support for '#'Marc Alexander2013-05-142-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | The input length for the hex color is now limited to 6 characters and the support for colors starting with a '#' has been dropped. The allowed input length of 7 in prosilver seems to have been a relict from old ages of phpBB3. In order to have proper support for correct checking of the colour value, the new code was also ported to the ACP groups manage page. The tests have been modified to reflect the changes to the behavior of the color check. Tests for the ACP will follow. PHPBB3-11538
* | [ticket/11538] Fix incorrect regex and test for duplicate # in color stringMarc Alexander2013-05-141-1/+1
| | | | | | | | PHPBB3-11538
* | [ticket/11538] Use regex for testing color value and improve testsMarc Alexander2013-05-141-5/+9
| | | | | | | | | | | | | | | | | | We are now using a regex with preg_match() in order to properly check if the entered color value is in hex color format or not. A proper error message is triggered if an incorrect color value is entered and the prepended '#' is removed if necessary. PHPBB3-11538
* | [ticket/11538] Make sure group color can't exceed maximum of 6 charactersMarc Alexander2013-05-141-0/+10
|/ | | | | | | In order to prevent future issues with this, a basic set of functional tests for the UCP groups manage page have been added. PHPBB3-11538
* [ticket/11105] Added spaces between ; and "url=" to adhere to w3c conventions.gamerchan2013-05-121-1/+1
| | | | | | | | There was no space between ; and the string "url=". But according to w3c, we should have atleast one space between them. So, added space characters accordingly. PHPBB3-11105
* Merge remote-tracking branch 'MGaetan89/ticket/11144' into develop-olympusAndreas Fischer2013-05-062-7/+5
|\ | | | | | | | | | | * MGaetan89/ticket/11144: [ticket/11144] Add missing {FORUM_NAME} variable [ticket/11144] Add missing {FORUM_NAME} variable
| * [ticket/11144] Add missing {FORUM_NAME} variableGaëtan Muller2013-05-062-7/+5
| | | | | | | | | | | | | | The template variable {FORUM_NAME} was missing from the login page of a password protected forum PHPBB3-11144
* | [ticket/9975] Translate missing style error messageGaëtan Muller2013-04-211-1/+1
|/ | | | | | | The error message about missing style data was not translated PHPBB3-9975
* Merge branch 'ticket/11358' into develop-olympusNils Adermann2013-04-121-41/+42
|\ | | | | | | | | | | * ticket/11358: [ticket/11358] Removed all trailing white spaces. [ticket/11358] Fixed the code according to coding guidlines.
| * [ticket/11358] Removed all trailing white spaces.erangamapa2013-04-121-4/+4
| | | | | | | | | | | | Removed all trailing white spaces with new lines. PHPBB3-11358
| * [ticket/11358] Fixed the code according to coding guidlines.erangamapa2013-04-121-42/+43
| | | | | | | | | | | | | | Added proper indentation and new line after break in switch statement. PHPBB3-11358
* | [ticket/10986] message.id fallback to SERVER_NAME or phpbb.generatedNils Adermann2013-02-241-1/+23
|/ | | | | | | Rather than send invalid message ids with a missing domain part we try to read one from $_SERVER and otherwise use phpbb.generated PHPBB3-10986
* [ticket/11358] Changed the name of post parameter.erangamapa2013-02-241-2/+2
| | | | | | | | Replaced the parameter name 'defaultbylink' to a meaningful name 'set_default_on_all'. Parameter is used for making all users default for selected group in acp_groups.php. PHPBB3-11358
* [ticket/11358] Changed the action parameter value to represent the link.erangamapa2013-02-241-20/+30
| | | | | | | | | Changed the action parameter value to recognize whether 'Make default group for every member' is clicked. If so execute a seperate code block under switch statement for $action and add all the users as default for the group. PHPBB3-11358
* [ticket/11358] Enabled link making all users default for a group.erangamapa2013-02-241-2/+40
| | | | | | | | | Detect whether link is clicked or form is posted for making users default for a group. If form is posted and no users are selected, validation happens and displays an error message. When the link is clicked, all the users will be default users for that group. PHPBB3-11358
* [ticket/11358] Removed redundant code and referred proper variable.erangamapa2013-02-241-40/+2
| | | | | | | | | Error was thrown when no users are selected before executing the code chunk which manually adds all the user to make the group default. Removed this code and referred $mark_ary instead of $name_ary which will not have selected user ids. PHPBB3-11358
* [ticket/11358] Success message even without selecting a user.erangamapa2013-02-241-0/+4
| | | | | | | | | | | In group membership management, if you perform the action 'Make group default for member' without selecting any user, a confirm box will be displayed and will show a success message after confirming. Added a new condition to fix this issue in acp_groups.php. It will check weather any users are selected before performing above action. PHPBB3-11358
* [ticket/11355] Referred proper variable when validating selection.erangamapa2013-02-241-1/+1
| | | | | | | Earlier PR was referring wrong variable $name_ary. Changed it to $mark_ary which actually contains selected user ids. PHPBB3-11355
* [ticket/11355] Wrong error message when no user is selected.erangamapa2013-02-241-1/+5
| | | | | | | | | | | In ACP group membership management, if you select 'remove member from group' without selecting any users and submit,it will display a wrong error after confirmbox. Since no users are selected, this should not go even until confirmbox. Added a new condition to check weather any users are selected when the action is 'deleteusers' in acp_groups.php and disply a correct error. PHPBB3-11355
* Merge remote-tracking branch 'github-bantu/ticket/11361' into develop-olympusNils Adermann2013-02-241-1/+2
|\ | | | | | | | | * github-bantu/ticket/11361: [ticket/11361] Make sure that array passed to strtr() has the proper format.
| * [ticket/11361] Make sure that array passed to strtr() has the proper format.Andreas Fischer2013-02-231-1/+2
| | | | | | | | | | | | | | | | | | | | The array $date_cache[$format]['lang'] passed to strtr() contains a sub-array which results in an E_NOTICE being thrown for 'Array to string conversion' on PHP 5.4. Ensure that the array passed to strtr() is one-dimensional by filtering out non-string values. PHPBB3-11361
* | Merge remote-tracking branch 'github-exreaction/ticket/10896' into ↵Nils Adermann2013-02-241-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-exreaction/ticket/10896: [ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALID [ticket/10896] Adds email validation to email settings in ACP
| * | [ticket/10896] Adds email validation to email settings in ACPDavid Tobin2013-02-041-2/+2
| | | | | | | | | | | | | | | | | | | | | Adds a new validation type to the ACP validate_config_vars function and implements it on the board_contact and board_email settings. PHPBB3-10896
* | | [ticket/7262] Add note about set_config() not updating is_dynamic.Andreas Fischer2013-02-241-0/+3
| | | | | | | | | | | | PHPBB3-7262
* | | [ticket/7262] Add $is_dynamic example to set_config() and set_config_count().Andreas Fischer2013-02-241-4/+6
| | | | | | | | | | | | | | | | | | | | | The logic is the other way around here in comparison to develop's phpbb_config_db class, so add examples to make things more clear. PHPBB3-7262
* | | [ticket/7262] Backport set_config() and set_config_count() docs from develop.Andreas Fischer2013-02-241-2/+16
| |/ |/| | | | | PHPBB3-7262
* | [ticket/11196] Changed 401 response message in session.php.erangamapa2013-02-121-1/+1
|/ | | | | | | In session.php 401 response message was "Not Authorized". I changed it to "Unauthorized". PHPBB3-11196
* [ticket/11233] prohibit selecting anonymous user as a PM recipientDhruv2013-01-301-1/+1
| | | | | | | While composing pm, it should not be allowed to add anonymous user as a PM recipient PHPBB3-11233
* [ticket/11343] Remove spare parentheses.Andreas Fischer2013-01-251-1/+1
| | | | PHPBB3-11343
* [ticket/11343] Remove spare space.Andreas Fischer2013-01-251-1/+1
| | | | PHPBB3-11343
* [ticket/11343] Use === when checking stored user_actkey against user input.Andreas Fischer2013-01-251-1/+1
| | | | | | | Use strict comparison when checking whether stored user_actkey is equal to user input. PHPBB3-11343
* Merge remote-tracking branch 'remotes/Sajaki/ticket/10854' into develop-olympusNathan Guse2013-01-151-0/+16
|\ | | | | | | | | | | | | # By Sajaki # Via Sajaki * remotes/Sajaki/ticket/10854: [ticket/10854] sql server drop default constraint when dropping column
| * [ticket/10854] sql server drop default constraint when dropping columnSajaki2012-04-281-0/+16
| | | | | | | | | | | | drops default columns with T-SQL before attempting drop column to avoids sql exception. This is a huge annoyance in UMIL scripts running under sql server.
* | [ticket/11301] Guidelines: Add spaces in front and after the / operator.Andreas Fischer2013-01-081-1/+1
| | | | | | | | PHPBB3-11301
* | [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.Andreas Fischer2013-01-081-1/+1
| | | | | | | | PHPBB3-11301
* | Merge remote-tracking branch 'gn36/ticket/11292' into develop-olympusAndreas Fischer2013-01-061-0/+1
|\ \ | | | | | | | | | | | | * gn36/ticket/11292: [ticket/11292] Fix: Newlines removed in display of PM reports
| * | [ticket/11292] Fix: Newlines removed in display of PM reportsMartin Beckmann2012-12-241-0/+1
| | | | | | | | | | | | | | | | | | | | | Report text is run through make_clickable and bbcode_nl2br for PMs just as it is for posts. PHPBB3-11292
* | | [ticket/11293] Add a note that mysqli should be in front of mysql.Oleg Pudeyev2012-12-251-0/+2
|/ / | | | | | | | | | | | | php 5.5 alpha 2 deprecated mysql extension, prefer mysqli if both are available. PHPBB3-11293
* | [ticket/10880] The m_approve permisson no longer implies f_noapprove.Andreas Fischer2012-12-191-2/+3
| | | | | | | | PHPBB3-10880
* | [ticket/8610] Update commentNathan Guse2012-12-151-1/+1
| | | | | | | | PHPBB3-8610
* | Merge branch 'develop-olympus' of github.com:phpbb/phpbb3 into ticket/8610Nathan Guse2012-12-133-16/+218
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Oleg Pudeyev (29) and others # Via Andreas Fischer (3) and others * 'develop-olympus' of github.com:phpbb/phpbb3: (36 commits) [ticket/11262] Add .lock in cache directory to .gitignore [ticket/11265] Add assertions for board installation success. [ticket/11162] Reformat. [ticket/10491] Make recreate_database static. [ticket/11162] Rename tricky updates to database helper. [ticket/10491] Install board once per test run. [ticket/10972] Drop user deletion. [ticket/10972] Tweak user addition. [ticket/10972] Add destroy method to mock cache. [ticket/10972] Add mock null cache. [ticket/10972] Backport get_db from develop. [ticket/10972] Added explicit checks for creating duplicate users. [ticket/10972] Moved tests into appropriate places and added comments [ticket/10972] Added methods for creating and deleting basic users [ticket/11162] Use empty($queries). [ticket/11162] Review comments fixed. [ticket/11162] Reformat. [ticket/11162] Newlines to LF. [ticket/11162] Use correct functions. [ticket/11162] Account for notify_status. ... Conflicts: phpBB/includes/mcp/mcp_topic.php
| * \ Merge remote-tracking branch 'p/ticket/11162' into develop-olympusAndreas Fischer2012-12-143-13/+217
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/11162: (22 commits) [ticket/11162] Reformat. [ticket/11162] Rename tricky updates to database helper. [ticket/11162] Use empty($queries). [ticket/11162] Review comments fixed. [ticket/11162] Reformat. [ticket/11162] Newlines to LF. [ticket/11162] Use correct functions. [ticket/11162] Account for notify_status. [ticket/11162] This test really only works for bookmarks. [ticket/11162] The test is not at all trivial. [ticket/11162] Add includes. [ticket/11162] Move to a separate file to avoid blowing out functions.php. [ticket/11162] No whitespace changes in olympus. [ticket/11162] Fix inaccurately copy pasted comment. [ticket/11162] Use phpbb_update_rows_avoiding_duplicates in mcp. [ticket/11162] Clarify that only the two tables actually work. [ticket/11162] Uncomment transactions. [ticket/11162] An implementation that actually works. [ticket/11162] Make count function upper case. [ticket/11162] Rename count variable name to remaining_rows. ...
| | * | [ticket/11162] Rename tricky updates to database helper.Oleg Pudeyev2012-12-123-2/+2
| | | | | | | | | | | | | | | | PHPBB3-11162
| | * | [ticket/11162] Use empty($queries).Oleg Pudeyev2012-12-051-6/+2
| | | | | | | | | | | | | | | | PHPBB3-11162
| | * | [ticket/11162] Review comments fixed.Oleg Pudeyev2012-12-051-6/+6
| | | | | | | | | | | | | | | | PHPBB3-11162
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 16:46:36 +0000