aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_messenger.php
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11263] Fix PHP Notice: Undefined variable: extension_managerNathan Guse2012-12-131-1/+1
| | | | | | $extension_manager should be $phpbb_extension_manager PHPBB3-11263
* Merge remote-tracking branch 'p/feature/template-events' into developDavid King2012-12-101-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Oleg Pudeyev (36) and others # Via Oleg Pudeyev * p/feature/template-events: (47 commits) [feature/template-events] Pass arguments in correct order. [feature/template-events] Order extensions in mock extension manager. [feature/template-events] Changes per imkingdavid's review. [feature/template-events] Make style names private on template. [feature/template-events] Test for event that is defined in parent style only. [feature/template-events] Specify style names, add inheritance tests. [feature/template-events] Normalize expected directory trees. [feature/template-events] Allow dataset to be correctly selectable. [feature/template-events] Dataset for template event testing with inheritance. [feature/template-events] Use style names array in template filter. [feature/template-events] Generate style names array in set_style. [feature/template-events] Convert a single style name to array of them. [feature/template-events] Chase dependency injection for template context. [feature/template-events] Adjust template events test to use the dataset. [feature/template-events] Create a dataset for template event tests. [feature/template-events] Indentation fix. [feature/template-events] Cosmetic changes. [feature/template-events] Wording: wrongly -> improperly. [feature/template-events] Indentation fix. [feature/template-events] Rename template_name to style_name. ...
| * [feature/template-events] Convert a single style name to array of them.Oleg Pudeyev2012-11-171-1/+1
| | | | | | | | | | | | | | This allows template code to know the entire style hierarchy for templates being rendered. PHPBB3-9550
| * [feature/template-events] Inject extension manager into template class.Oleg Pudeyev2012-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Template class passes extension manager to template compiler. Template compiler passes extension manager to template filter. Template filter will use extension manager to locate hooks as it is compiling templates. All extension manager arguments are optional. If an extension manager is not given, template hooks will not be invoked. PHPBB3-9550
* | Merge branch 'develop-olympus' into developAndreas Fischer2012-12-051-3/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10602] Avoid a race condition. [ticket/10602] Use last_queue_run for its intended purpose. Conflicts: phpBB/includes/functions_messenger.php
| * | [ticket/10602] Avoid a race condition.Oleg Pudeyev2012-12-051-2/+4
| | | | | | | | | | | | PHPBB3-10602
| * | [ticket/10602] Use last_queue_run for its intended purpose.Oleg Pudeyev2012-12-051-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We keep the last queue run time around, therefore for determining whether enough time has passed since the last run we can simply use this config variable. When there is no queue file we consider a queue run successful. Previously queue.php ("cache file") modification time would be used for determining whether enough time has passed since last queue run. The problem was that modification time would be updated whenever anything was added to the queue, creating a situation where if queue is processed less frequently than it is added to that email would not be sent. PHPBB3-10602
* | | [ticket/10103] Use flock lock class in messenger.Oleg Pudeyev2012-12-041-6/+8
| | | | | | | | | | | | PHPBB3-10103
* | | [ticket/10103] Factor out flock lock class.Oleg Pudeyev2012-12-041-58/+0
| |/ |/| | | | | PHPBB3-10103
* | [ticket/10933] Dependency inject template context.Oleg Pudeyev2012-11-021-1/+1
| | | | | | | | PHPBB3-10933
* | [ticket/10756] Renaming phpbb_style_template to phpbb_templateVjacheslav Trushkin2012-04-191-2/+1
| | | | | | | | | | | | Renaming phpbb_style_template to phpbb_template PHPBB3-10756
* | [ticket/10756] Removing path provider from template classVjacheslav Trushkin2012-04-191-1/+3
| | | | | | | | | | | | Removing path provider from template class because it is not used by template class PHPBB3-10756
* | [ticket/10754] Changing $style to $phpbb_styleVjacheslav Trushkin2012-04-031-2/+2
| | | | | | | | | | | | Renaming global variable $style to $phpbb_style PHPBB3-10754
* | [feature/merging-style-components] Moving template initialization out of styleVjacheslav Trushkin2012-03-311-4/+3
| | | | | | | | | | | | Moving template initialization out of style constructor PHPBB3-10632
* | [feature/merging-style-components] Initializing locator and provider separatelyVjacheslav Trushkin2012-03-311-1/+3
| | | | | | | | | | | | Moving locator and path provider initialization out of style class PHPBB3-10632
* | [feature/merging-style-components] Updating style initializationVjacheslav Trushkin2012-03-151-4/+4
| | | | | | | | | | | | Changing template initialization to style initialization. PHPBB3-10632
* | [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/10076] STARTTLS support for SMTP via smtp_class.Andreas Fischer2012-01-281-0/+57
| | | | | | | | PHPBB3-10076
* | [ticket/10076] Move EHLO/HELO code into its own method.Andreas Fischer2012-01-281-23/+39
| | | | | | | | PHPBB3-10076
* | Merge remote-tracking branch 'unknownbliss/ticket/9916' into developAndreas Fischer2012-01-021-2/+1
|\ \ | | | | | | | | | | | | * unknownbliss/ticket/9916: [ticket/9916] Updating header license and removing Version $Id$
| * | [ticket/9916] Updating header license and removing Version $Id$Unknown2011-12-311-2/+1
| | | | | | | | | | | | PHPBB3-9916
* | | Merge branch 'develop-olympus' into developIgor Wiedler2011-12-281-3/+3
|\ \ \ | |/ / |/| / | |/ | | * develop-olympus: [ticket/10538] Call htmlspecialchars_decode() on Jabber and SMTP passwords.
| * [ticket/10538] Call htmlspecialchars_decode() on Jabber and SMTP passwords.Andreas Fischer2011-12-191-3/+3
| | | | | | | | PHPBB3-10538
* | Merge branch 'develop-olympus' into developIgor Wiedler2011-11-201-0/+16
|\ \ | |/ | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10446] Pass $config and $user via parameter to anti_abuse_headers(). [ticket/10446] Remove leftover $headers parameter from anti_abuse_headers(). [ticket/10446] RFC2047 encode user/server names in X-AntiAbuse headers. [ticket/10446] DRY X-AntiAbuse header addition. Conflicts: phpBB/includes/ucp/ucp_register.php
| * [ticket/10446] Pass $config and $user via parameter to anti_abuse_headers().Andreas Fischer2011-11-201-3/+6
| | | | | | | | PHPBB3-10446
| * [ticket/10446] Remove leftover $headers parameter from anti_abuse_headers().Andreas Fischer2011-11-201-1/+2
| | | | | | | | PHPBB3-10446
| * [ticket/10446] RFC2047 encode user/server names in X-AntiAbuse headers.Oleg Pudeyev2011-11-201-2/+2
| | | | | | | | PHPBB3-10446
| * [ticket/10446] DRY X-AntiAbuse header addition.Oleg Pudeyev2011-11-201-0/+12
| | | | | | | | PHPBB3-10446
* | [feature/extension-manager] Refactoring the structure of extension providerNils Adermann2011-09-291-1/+1
| | | | | | | | 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
* | Merge branch 'develop-olympus' into developNils Adermann2011-09-181-5/+21
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10245] Use error_collector instead of ob_start() and ob_get_clean().
| * [ticket/10245] Use error_collector instead of ob_start() and ob_get_clean().Andreas Fischer2011-09-181-5/+21
| | | | | | | | PHPBB3-10245
* | [feature/request-class] Adjust code base to do html decoding manuallyIgor Wiedler2011-08-181-1/+1
| | | | | | | | PHPBB3-9716
* | Merge branch 'develop' into feature/request-classIgor Wiedler2011-08-181-2/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (157 commits) [ticket/10316] Resolve inconsistent move topic behavior [ticket/9297] Add network to class name of unit tests. [ticket/9297] Fix typo in localhost. [ticket/9297] Rename test class to reflect its contents. [ticket/9297] Adjust comment - IPv6 is needed for IPv6 connections to work. [ticket/9297] Fix markTestSkipped call in setUpBeforeClass. [ticket/9608] Remove use of references in topic_review [ticket/9297] Skip FTP PASV/EPSV test if FTP connection fails. [ticket/9297] Separate ipv4 and ipv6 tests into separate functions. [ticket/9297] Update copyright year of unit test file. [feature/template-engine] Delete _get_locator function. [feature/template-engine] Clean up template locator usage in bbcode. [ticket/9297] Make EPSV unit tests work without IPv6. [ticket/9297] Unit tests for ftp_fsock PASV and EPSV. [ticket/9297] Add support for Extended Passive Mode (EPSV) in ftp_fsock class. [ticket/10312] Un-check the shadow option while moving. [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. ... Conflicts: phpBB/includes/functions.php
| * | [feature/template-engine] Dependency inject locator into template.Oleg Pudeyev2011-08-091-1/+2
| | | | | | | | | | | | PHPBB3-9726
| * | [feature/template-engine] Replaced globals with dependency injection.Oleg Pudeyev2011-05-121-2/+2
| | | | | | | | | | | | PHPBB3-9726
| * | [feature/template-engine] Delete template class, use phpbb_template instead.Oleg Pudeyev2011-05-041-1/+1
| | | | | | | | | | | | PHPBB3-9726
* | | [feature/request-class] Add server(), header() and is_ajax() to requestIgor Wiedler2011-07-151-2/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | Extend the request class with helpers for reading server vars (server()) and HTTP request headers (header()). Refactor the existing code base to make use of these helpers, make $_SERVER a deactivated super global. Also introduce an is_ajax() method, which checks the X-Requested-With header for the value 'XMLHttpRequest', which is sent by JavaScript libraries, such as jQuery. PHPBB3-9716
* | [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 'ticket/cs278/9061' into develop-olympusAndreas Fischer2010-10-271-19/+68
|\ | | | | | | | | | | * ticket/cs278/9061: [ticket/9061] Simplify conditional statements by reworking the logic. [ticket/9061] Fixed a race condition in queue locking.
| * [ticket/9061] Simplify conditional statements by reworking the logic.Chris Smith2010-10-271-12/+18
| | | | | | | | PHPBB3-9061
| * [ticket/9061] Fixed a race condition in queue locking.Oleg Pudeyev2010-10-271-19/+62
| | | | | | | | | | | | | | | | | | | | | | Changed queue locking to cover all queue file operations, in particular the check for queue file existince and inclusion of queue file must be done under one lock. Also refactored queue locking and unlocking into separate methods. PHPBB3-9061
* | [ticket/9559] Do not override queue package size in the case of an overflowJosh Woody2010-07-221-0/+7
|/ | | | | | | | This reverts r8025 to includes/functions_messenger.php. That code caused problems on hosters with email limits less than package_size*2.5. And it isn't desirable in general to over-ride the admin's configuration options. PHPBB3-9559
* Do not store email templates in database. [Bug #54505]Nils Adermann2010-01-261-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To explain what this is about, first a short phpBB code history lesson: ;-) r9823 originally introduced the usage of our template class for emails. The messenger class uses set_custom_template() to initialise the template object which neither disables storedb nor inheritance. These two values are set in $user->theme rather than inside a particular template instance (quite a design failure if I may add). Thus the html page that is displayed to the user also determines these settings for the email templates. This obviously causes problems because both emails and other custom templates can quite simply not be stored in the database because the db table only stores the filename, not the path and requires a template id. r9839 then generally disabled storedb and template inheritance for custom templates to fix Bug #40515. This works for custom templates, but not for emails where lots of template objects are created. In such a situation the last call to set(_custom)_template() would now determine the values of storedb and inheritance in _tpl_load. So any page sending emails would neither load its template from the database nor use template inheritance. The same revision also introduced orig_tpl_* variables in set_template() which on their own are very much pointless, but could allow resetting the storedb and inheritance values if they were used to reset $user->theme just before template execution in _tpl_load. In r10150 these orig_tpl_* variables are correctly used to access information about the template of the page being displayed - contrary to the last template used - from within the bbcode, fixing Bug #51285. However r10150 also introduces a pointless $template_mode parameter for set_custom_template(). $template_mode is really just a boolean flag (value you can be 'template' or an arbitrary other value) that if it set circumvents the unsetting of storedb and template inheritance. The very code that had been added to prevent issues with emails and custom templates. Fixing the problem introduced by r8839 but at the same time reintroducing the much greater problem from the original implementation of email templates. And now an explanation of what I did: Based on this I have now changed the set_custom_template method to always disable storedb. It can now properly use inheritance, you simply tell it the path where the parent template can be found, by default the path is false which will turn inheritance off. To make this work the template class now always overwrites $user->theme storedb and inheritance variabbles with orig_tpl_* just before rendering a template in _tpl_load. This way they are guaranteed to always contain the value they had at the time set_template/set_custom_template were called. This fixes [Bug #54505]. In summary, using global state is simply a horrible idea in object oriented programming. Always Pass values, that an object depends on, as parameters - never through magic global variables. Following this principle will safe you from a lot of headaches. Please test this patch as much as possible to make sure templates still work properly for you, focus on multiple languages, missing language files, and custom templates in systems that make use of the template class outside of phpBB itself. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10460 89ea8834-ac86-4346-8a33-228a782c2dd0
* Further fixes for r10447 and r10448. Correctly account for custom language ↵Josh Woody2010-01-261-1/+10
| | | | | | directories (caught by naderman) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10449 89ea8834-ac86-4346-8a33-228a782c2dd0
* Remove needless check (revising r10447)Josh Woody2010-01-261-7/+4
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10448 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fall back to board default language email template if the file does not ↵Josh Woody2010-01-261-2/+8
| | | | | | exist user's preferred language (#35595) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10447 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix getting host for situations where the name/IP is not resolvable. Related ↵Meik Sievertsen2009-09-221-1/+18
| | | | | | | | to Bug #41025 Related revisions: r9387 and r10158 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10178 89ea8834-ac86-4346-8a33-228a782c2dd0
* extend r9387 - check for existance of all functions we use...Meik Sievertsen2009-09-171-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10158 89ea8834-ac86-4346-8a33-228a782c2dd0
generated by cgit v1.2.1 (git 2.21.0) at 2026-03-31 09:30:06 +0000