aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/common.php
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'develop' into feature/merging-style-componentsVjacheslav Trushkin2012-03-311-0/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (175 commits) [feature/ajax] Remove strange non-breaking spaces from approve button [feature/ajax] Add entirely unrelated but nice newlines [feature/ajax] Unify phpbb_json_response instantiation [feature/ajax] Fix acp_styles activate_deactivate ajax callback name [feature/ajax] Send correct activate/deactivate JSON response in acp_profile [ticket/10270] Alter background colors for posts [feature/ajax] Remove not working module enable/disable ajax code [feature/ajax] Replace static call to phpbb_request with OO [feature/ajax] Remove quick-reply AJAX handling until we have something good [ticket/10270] Changing close button for ajax popups [ticket/10270] Disabling links in disappearing content [ticket/10291] Fixed an AJAX bug on quick reply form submit. [ticket/10273] Fixed accepting / denying posts AJAX. [ticket/10272] Removed code that was prevent event propogation in AJAX. [ticket/10291] Fixed a bug in the quick reply AJAX. [feature/ajax] Handle acp_modules error cases with JSON response [feature/ajax] Fix filter check, quick mod tools data-attribute [feature/ajax] Use the error handler [feature/ajax] Generic error handling with a phpbb.alert box [feature/ajax] Change filter semantics, some minor adjustments ... Conflicts: phpBB/adm/style/acp_styles.html phpBB/includes/acp/acp_styles.php
| * \ Merge remote-tracking branch 'upstream/develop' into feature/event-dispatcherIgor Wiedler2012-03-301-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (35 commits) [ticket/10730] Added label tag around "select" text in post splitting UI [ticket/10732] Add config_dev.php and config_test.php to .gitignore [ticket/10586] Added space in if statement [ticket/10586] Tidy up comments [task/php5.3] Updated range of tested PHP versions [task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed to PHP 5.3.2 [task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2 [ticket/10129] Remove apostrophes and plurals in ACP user management -> permissions language file as per ticket. [ticket/10703] Added a condition to check if ext directory exists [ticket/10708] Check converted passwords for multi-byte characters [ticket/10586] Tests finally work (thanks naderman) [ticket/10586] Correctly purge board cache and don't rename install directory [ticket/10586] trying to get tests to work [ticket/10586] more work on getting tests to pass [ticket/10586] Tests are coming along, just a little more to go [ticket/10586] Rename install directory back to install/ after tests [ticket/10586] browse tests now work, but mine dont. at least we are making progress [ticket/10586] initial work on copying fixtures. Note that this depends on 10706 [ticket/10586] Adding the extensions used by the tests [ticket/10586] Now tests run, but fail. But here is what I have. ...
| * | | [feature/event-dispatcher] Change phpbb_event_dispatcher to inheritance, testsIgor Wiedler2012-03-241-1/+1
| | | | | | | | | | | | | | | | PHPBB3-9550
| * | | [feature/event-dispatcher] Add phpbb_event_dispatcher_wrapperIgor Wiedler2012-03-211-1/+1
| | | | | | | | | | | | | | | | PHPBB3-9550
| * | | [feature/event-dispatcher] Delete hard dependency on composer.Oleg Pudeyev2012-03-181-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Applications should not depend on package managers. PHPBB3-9550
| * | | [feature/event-dispatcher] Use real EventDispatcher through composerIgor Wiedler2012-03-111-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * replace the copy-pasta EventDispatcher with the real one from Symfony2 * use composer for managing this dependency, use composer autoloading PHPBB3-9550
| * | | [feature/event-dispatcher] Allow subscribers to be loaded from extensionsIgor Wiedler2012-01-071-0/+4
| | | | | | | | | | | | | | | | PHPBB3-9550
* | | | Merge remote-tracking branch 'upstream/develop' into ↵Vjacheslav Trushkin2012-03-291-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/merging-style-components * upstream/develop: (65 commits) [ticket/10730] Added label tag around "select" text in post splitting UI [ticket/10732] Add config_dev.php and config_test.php to .gitignore [ticket/10586] Added space in if statement [ticket/10586] Tidy up comments [task/php5.3] Updated range of tested PHP versions [task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed to PHP 5.3.2 [task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2 [ticket/10723] Stop Travis running all tests on sqlite [ticket/10703] Added a condition to check if ext directory exists [task/travis] Refactor php version check for dbunit install [task/travis] Exclude functional and slow tests [ticket/10719] Revert "Skip functional tests on PHP 5.2" [task/travis-develop2] Update version from 5.3 to 5.3.2 [task/travis] Dropping support for 5.2 in develop branch [task/travis] Some more small travis fixes [task/travis] Rename travis phpunit config files [task/travis] Fixing some travis issues [ticket/10684] Adjust function and parameter name, minor changes. [task/travis] Add automated testing to readme [task/travis] Removing development information ... Conflicts: phpBB/install/database_update.php
| * | | [task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed ↵David King2012-03-251-1/+1
| |/ / | | | | | | | | | | | | | | | to PHP 5.3.2 PHPBB3-10693
* | | [feature/merging-style-components] Creating style classVjacheslav Trushkin2012-03-151-3/+3
| | | | | | | | | | | | | | | | | | Creating phpbb_style class, changing template initialization to style initialization PHPBB3-10632
* | | [feature/merging-style-components] Renaming template classesVjacheslav Trushkin2012-03-141-3/+3
|/ / | | | | | | | | | | Changing template classes prefixes from phpbb_template to phpbb_style (for classes that will work with styles) or phpbb_style_template (for classes that are specific to templates) PHPBB3-10632
* | [ticket/9916] Updating header license and removing Version $Id$Unknown2011-12-311-2/+1
| | | | | | | | PHPBB3-9916
* | Merge branch 'develop' into feature/extension-managerNils Adermann2011-11-181-9/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (93 commits) [ticket/10157] Add notification to update cpfs when installing a language. [ticket/10185] Always set board startdate on conversion [ticket/10419] Reword the language strings [ticket/9361] View correct error messages when editing account information [ticket/10457] Undefined variable $request, when print-viewing PMs [ticket/10452] Fix xHTML errors when print-viewing PMs [ticket/9066] Move regex into get_preg_expression function and add tests [ticket/10254] Add "phpBB Group" to "Modified by" in prosilver stylesheet.css [ticket/10254] Removing the subsilver2 NOTE, incompatible with phpBB.com. [ticket/10254] Removing the NOTE as it is incompatible with phpBB.com. [ticket/10254] Remove subsilver2 as default style on theme. [ticket/10254] Remove style names from themes and fix some informations on it. [ticket/7138] Allow simple header and footer for trigger_error() messages [ticket/9066] Disallow some database prefix to prevent same errors and problems [ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to read [ticket/10437] Do not display announcements that are waiting for approval [ticket/10087] Organize bans in acp_baninto optgroups [ticket/8616] Include old U_INBOX var for BC [ticket/10435] Remove global announcement from forums total topic count [ticket/10435] Readd local announcements to total topic count in viewforum ... Conflicts: phpBB/install/database_update.php
| * | [ticket/10412] Replace memory_get_usage with memory_get_peak_usageNils Adermann2011-10-141-9/+0
| | | | | | | | | | | | PHPBB3-10412
* | | [feature/extension-manager] Refactoring the structure of extension providerNils Adermann2011-09-291-2/+2
| | | | | | | | | | | | PHPBB3-10323
* | | [feature/extension-manager] Add support for templates in extensions.Nils Adermann2011-09-291-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a template path provider to separate the process of locating (cached) paths in extensions from the template engine. The locator is supplied with a list of paths from the path provider. Admin templates can now be created in ext/<ext>/adm/style/ and regular templates go into ext/<ext>/styles/<style>/template/. Extension templates override regular templates. So if an extension supplies a file with a name used in phpBB, the extension's file will be used. A side-effect of this commit: Locator and Provider are now able to deal with arbitrary levels of template inheritance. So we can expose this through phpbb_template if we choose to, and allow styles to inherit from inherited styles. PHPBB3-10323
* | | [feature/extension-manager] Remove cron's dependency on the extension manager.Nils Adermann2011-09-291-1/+1
| | | | | | | | | | | | | | | | | | | | | Instead a separate cron provider supplies the manager with tasks from the extension finder. PHPBB3-10323
* | | [feature/extension-manager] The class loader no longer knows about extensionsNils Adermann2011-09-291-3/+6
| | | | | | | | | | | | | | | | | | | | | Instead the class loader is instantiated twice. Once with the phpbb_ prefix and once with the phpbb_ext_ prefix. PHPBB3-10323
* | | [feature/extension-manager] Load the extension manager on all pagesNils Adermann2011-09-291-1/+4
| | | | | | | | | | | | PHPBB3-10323
* | | [feature/extension-manager] Extension Manager & FinderNils Adermann2011-09-291-1/+1
|/ / | | | | | | | | | | | | Extensions RFC: http://area51.phpbb.com/phpBB/viewtopic.php?f=84&t=41499 Ticket: http://tracker.phpbb.com/browse/PHPBB3-10323 PHPBB3-10323
* | Merge remote-tracking branch 'github-p/feature/template-engine' into developNils Adermann2011-08-131-2/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-p/feature/template-engine: (87 commits) [feature/template-engine] Delete _get_locator function. [feature/template-engine] Clean up template locator usage in bbcode. [feature/template-engine] Need to call set_template on template. [feature/template-engine] Update installer for template engine changes. [feature/template-engine] Dependency inject locator into template. [feature/template-engine] Delete useless code from set_template. [feature/template-engine] Delete no longer used $template_filename property. [feature/template-engine] Delete useless $template globalization. [feature/template-engine] Use template engine class in bbcode class. [feature/template-engine] Corrected an error message in template locator. [feature/template-engine] Remaining documentation. [feature/template-engine] More documentation for template class. [feature/template-engine] Create load_and_render to reduce code duplication. [feature/template-engine] Get rid of orig_tpl_* in template engine. [feature/template-engine] Delete $style_name param from locator's set_custom_template. [feature/template-engine] Add constructor to template locator. [feature/template-engine] Factor template locator out of template class. [feature/template-engine] Delete $files_template property. [feature/template-engine] Rename is_absolute to phpbb_is_absolute. [feature/template-engine] Test template DEFINE statements across files ... Conflicts: .gitignore phpBB/includes/template.php
| * | [feature/template-engine] Dependency inject locator into template.Oleg Pudeyev2011-08-091-1/+2
| | | | | | | | | | | | PHPBB3-9726
| * | [feature/template-engine] Move template.php to includes/templateIgor Wiedler2011-07-101-1/+0
| | | | | | | | | | | | | | | | | | This allows making use of autoloading. PHPBB3-9726
| * | [feature/template-engine] Replaced globals with dependency injection.Oleg Pudeyev2011-05-121-1/+2
| | | | | | | | | | | | PHPBB3-9726
| * | [feature/template-engine] Delete template class, use phpbb_template instead.Oleg Pudeyev2011-05-041-1/+1
| | | | | | | | | | | | PHPBB3-9726
* | | [ticket/7090] Update documented minimum PHP version to 5.2.0Igor Wiedler2011-07-131-1/+1
| | | | | | | | | | | | PHPBB3-7090
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-151-106/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10218] Prevent startime from being overwritten by deregister_globals() [ticket/10218] Moving global deregistration, etc. to startup.php Conflicts: phpBB/install/database_update.php
| * | [ticket/10218] Moving global deregistration, etc. to startup.phpYuriy Rusko2011-06-141-106/+1
| | | | | | | | | | | | | | | | | | | | | Because startup.php deletes all variables, the constants in database_update are used to preserve settings at the top. PHPBB3-10218
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-031-1/+6
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10149] Skip foreach over GLOBALS cookie values if cookie is scalar
| * | [ticket/10149] Skip foreach over GLOBALS cookie values if cookie is scalarNils Adermann2011-06-031-1/+6
| | | | | | | | | | | | PHPBB3-10149
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-05-101-1/+1
|\ \ \ | |/ / | | / | |/ |/| * develop-olympus: [ticket/10126] Use binary "and not" instead of binary "xor" in error_reporting.
| * [ticket/10126] Use binary "and not" instead of binary "xor" in error_reporting.Andreas Fischer2011-05-111-1/+1
| | | | | | | | | | | | Make what we want to achieve clear by using "and not" instead of "xor". PHPBB3-10126
* | Merge branch 'develop-olympus' into developIgor Wiedler2011-03-121-5/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10046] Do not link bots to cron.php. [ticket/10046] No longer change $phpbb_root_path to an absolute path for cron. [ticket/10046] Call flush() in cron.php [ticket/10046] Remove calls to register_shutdown_function() in cron.php Conflicts: phpBB/cron.php phpBB/includes/functions.php
| * [ticket/10046] No longer change $phpbb_root_path to an absolute path for cron.Andreas Fischer2011-03-121-5/+0
| | | | | | | | | | | | | | This is no longer required because we no longer call register_shutdown_function() which made this change necessary. PHPBB3-10046
* | [feature/system-cron] Cache cron's task names.Nils Adermann2011-02-121-1/+1
| | | | | | | | | | | | | | | | Instead of using a path relative to phpbb_root_path the path to the task directory is directly passed to the cron manager. Dummy tasks are now in the tests directory directly. PHPBB3-9596
* | [feature/system-cron] Use a RecursiveDirectoryIterator instead of readdir.Nils Adermann2011-02-121-1/+1
| | | | | | | | PHPBB3-9596
* | [feature/system-cron] add phpbb_ prefix to all class namesIgor Wiedler2011-02-121-1/+1
| | | | | | | | PHPBB3-9596
* | [feature/system-cron] remove more includes, adjust pathIgor Wiedler2011-02-121-1/+0
| | | | | | | | PHPBB3-9596
* | [feature/system-cron] Fixes to make cron actually run.Oleg Pudeyev2011-02-121-1/+1
| | | | | | | | PHPBB3-9596
* | [feature/system-cron] Updated includes after moving files.Oleg Pudeyev2011-02-121-1/+1
| | | | | | | | PHPBB3-9596
* | [feature/system-cron] WIP on making cron tasks runnable via system cronOleg Pudeyev2011-02-121-0/+6
| | | | | | | | PHPBB3-9596
* | [task/config-class] Do not create multiple cache driver instances.Nils Adermann2011-01-121-2/+2
| | | | | | | | | | | | | | Retrieve the driver from the service instead of creating new ones over and over from the factory. PHPBB3-9988
* | [task/config-class] Always specify the config table to use.Nils Adermann2011-01-121-1/+1
| | | | | | | | PHPBB3-9988
* | [task/config-class] Implemented a config class to replace the global array.Nils Adermann2011-01-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a phpbb_config class which simply holds an array and does not persist any data. It implements ArrayAccess, Countable and IteratorAggregate to allow regular use of configuration as if it was still an array. The phpbb_config_db class depends on an instance of the dbal and a cache driver. It obtains the configuration data from cache and database as necessary and persists data to the database. The functions set_config and set_config_count remain for backward compatability but they only call methods on the new config class now instead of directly manipulating the database and cache. PHPBB3-9988
* | [task/acm-refactor] Cleaning up left over mentions of ACM and fixing tests.Nils Adermann2011-01-091-3/+3
| | | | | | | | PHPBB3-9983
* | [task/acm-refactor] Refactor the ACM classes to have a common interface.Igor Wiedler2011-01-091-6/+6
| | | | | | | | | | | | | | | | | | | | They are now refered to as cache drivers rather than ACM classes. The additional utility functions from the original cache class have been moved to the cache_service. The class loader is now instantiated without a cache instance and passed one as soon as it is constructed to allow autoloading the cache classes. PHPBB3-9983
* | [ticket/9556] Drop php closing tags, add trailing newlineIgor Wiedler2010-11-111-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Closing tags converted using Oleg's script. remove-php-end-tags.py -a . Trailing newlines added using the following where $ext is file extension. find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s; Extensions: php, css, html, js, xml. PHPBB3-9556
* | Merge branch 'develop-olympus' into developIgor Wiedler2010-10-171-4/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/7332] Fix post details expand link rendering on Webkit. [ticket/9162] Prevent notice on unset poll title [ticket/7417] Also focus search keywords and username in subsilver2. [ticket/7417] Focus username field when prosilver login page is loaded. [ticket/7417] Focus search keywords field when prosilver search page is loaded. [ticket/9841] Change "Save" to "Save draft", "Load" to "Load draft". [ticket/9664] Resolve conflict with accesskey="t", change addlitsitem to "y". [ticket/7538] Limit user_login_attempts to prevent SQL errors. [ticket/9848] Add avatars, attachments and store files to .gitignore. [ticket/9822] Correct some style related ACP explain statements. [ticket/9698] Add .htaccess to the includes subdirectory. [ticket/9830] Redirect to install directly when config.php does not exist. [ticket/9816] Remove config.php from repository [ticket/9810] Hide "Select All" of code bbcode on print page
| * [ticket/9830] Redirect to install directly when config.php does not exist.Igor Wiedler2010-09-161-4/+2
| | | | | | | | PHPBB3-9830
| * PHP 5.3 compatibility: Disable E_DEPRECATED on startup to keep ↵Nils Adermann2009-12-061-2/+6
| | | | | | | | | | | | set_magic_quotes_runtime(0) quiet. [Bug #54495] git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10299 89ea8834-ac86-4346-8a33-228a782c2dd0