Commit graph

14815 commits

Author SHA1 Message Date
Andreas Fischer
4038091382 [ticket/9999] Remove broken and unused L_FORUM_FOLDER_ALT variable.
L_FORUM_FOLDER_ALT was supposed to be a language variable but the language
variable is never looked up but directly passed as L_FORUM_FOLDER_ALT instead.

Also, the expected functionality is correctly implemented by
FORUM_FOLDER_IMG_ALT.

PHPBB3-9999
2011-05-09 23:11:56 +02:00
Andreas Fischer
2d35e60443 [ticket/10154] Move "copy permissions from" to below "parent" on forum creation
Move "copy permissions from" to below "parent forum" in forum creation form.

PHPBB3-10154
2011-05-09 22:53:08 +02:00
Joas Schilling
437013194a [ticket/10158] Add return-link to folder, when the user replied from a folder.
PHPBB3-10158
2011-05-09 12:46:34 +02:00
Andreas Fischer
a072526890 [ticket/10173] Only calculate age if year is not false as per nn-.
PHPBB3-10173
2011-05-08 21:31:19 +02:00
Oleg Pudeyev
9f32cae5f9 [feature/prune_users] Moved set_config_count out of user loop.
PHPBB3-9622
2011-05-08 13:28:09 -04:00
Oleg Pudeyev
e23868f3e2 [feature/prune-users] Fixed user id check in undelivered users loop.
There is now $user_ids instead of one $user_id.

PHPBB3-9622
2011-05-08 13:17:45 -04:00
Oleg Pudeyev
f65556e6de [feature/prune-users] Call sql_is_set once for author ids in user_delete.
PHPBB3-9622
2011-05-08 13:16:15 -04:00
Oleg Pudeyev
0f17d5d493 [feature/prune-users] Replaced missed occurrences of $user_id with $user_ids.
PHPBB3-9622
2011-05-08 13:13:59 -04:00
Oleg Pudeyev
44f524aa50 [feature/prune-users] Call sql_is_set for user ids once in user_delete.
PHPBB3-9622
2011-05-08 13:08:26 -04:00
Oleg Pudeyev
33c7bb4ec3 [feature/prune-users] Fixed whitespace in language file.
PHPBB3-9622
2011-05-08 12:53:12 -04:00
Andreas Fischer
6a7d7285fb [ticket/10173] Use an array for the legacy birthday list as per rxu.
PHPBB3-10173
2011-05-08 16:43:27 +02:00
Andreas Fischer
208fc76761 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10178] Add path to find command to build packages on FreeBSD.
  [ticket/10177] Add `-f -` to tar command to build packages with bsdtar.
2011-05-08 16:35:11 +02:00
Andreas Fischer
52316bb3f5 Merge remote-tracking branch 'p/ticket/10178' into develop-olympus
* p/ticket/10178:
  [ticket/10178] Add path to find command to build packages on FreeBSD.
2011-05-08 16:34:23 +02:00
Andreas Fischer
4d1f6352e6 Merge remote-tracking branch 'p/ticket/10177' into develop-olympus
* p/ticket/10177:
  [ticket/10177] Add `-f -` to tar command to build packages with bsdtar.
2011-05-08 16:34:21 +02:00
Andreas Fischer
2f458352b8 [ticket/10173] Use a loop var for the birthdays list to allow proper templating
Introduce a loop variable for the list of birthdays to allow templates to
handle how the list is displayed.

We keep the old BIRTHDAY_LIST variable that contains the precompiled list
around for backward compatibility.

PHPBB3-10173
2011-05-08 15:36:27 +02:00
Oleg Pudeyev
49cf28a9c4 [feature/template-engine] Moved template classes to subdirectory.
PHPBB3-9726
2011-05-08 04:06:25 -04:00
Oleg Pudeyev
84bc485ccc [feature/template-engine] Renamed template executor and friends to renderer.
PHPBB3-9726
2011-05-08 04:03:41 -04:00
Oleg Pudeyev
ab44fe5e39 Merge branch 'develop' into feature/prune-users
* develop: (170 commits)
  [ticket/10145] Always recompile all templates when DEBUG_EXTRA is defined.
  [feature/attachment-management-no-reassignment] Handle privacy and some more.
  [ticket/10148] Turn TEMPLATE_BITFIELD into an instance variable.
  [ticket/10147] Corrected a typo in includes/functions_template.php.
  [ticket/10141] Save a hash lookup when value is not in cache.
  [ticket/10143] Added tests for storing a previously deleted value in db cache.
  [ticket/10105] Update AIM express link.
  [ticket/10105] Update AIM application download link.
  [ticket/10137] Remove unintended space at end of PHP_URL_FOPEN_SUPPORT_EXPLAIN.
  [ticket/10141] Split double-assignment into conditional and unconditional part.
  [ticket/10141] Use a cache in $auth->_fill_acl() for better performance.
  [ticket/9961] Create log entries when users are activated.
  [ticket/10139] Make signatures of set_atomic() consistent by using $new_value.
  [ticket/10139] Rename $cache to $use_cache to avoid confusion with cache object
  [ticket/10006] Remove unneeded if statements
  [ticket/10006] Remove return values
  [ticket/10006] More testing
  [ticket/10006] Tweak the tests a bit
  [ticket/10006] Add phpbb_config::delete
  [ticket/7941] Added @return to generate_board_url docstring.
  ...
2011-05-08 03:21:19 -04:00
Oleg Pudeyev
9c6660a225 Merge commit 'ee0db1a1d5f0150016d0971057f889f2366f9856' into feature/prune-users
* commit 'ee0db1a1d5f0150016d0971057f889f2366f9856':
2011-05-08 03:21:13 -04:00
Oleg Pudeyev
92e140ebe8 Merge commit '904bcb86a054ab6256da565098eb9bd8ab20414b' into feature/prune-users
* commit '904bcb86a054ab6256da565098eb9bd8ab20414b':
  [ticket/7834] Topic time didn't update when first post was deleted
2011-05-08 03:20:40 -04:00
Oleg Pudeyev
bf27d616e3 [feature/prune-users] Apply 904bcb86a0.
This was done in PHPBB3-7834.

PHPBB3-9622
2011-05-08 03:19:53 -04:00
Oleg Pudeyev
a93d58adba Merge commit 'e6ed55a9c1ceb07ab2e87d4a53f9e688fda319c5' into feature/prune-users
* commit 'e6ed55a9c1ceb07ab2e87d4a53f9e688fda319c5':
  [ticket/9872] Removed some useless code that broke delete_posts

These changes have already been applied in an earlier commit.
Therefore this commit is empty. Merge was done using 'ours' strategy.
2011-05-08 03:15:07 -04:00
Oleg Pudeyev
21d32f4bbb Merge commit '47dc492839ea44cb9aa3d0ad23f09dd2fd0b4ed9' into feature/prune-users
* commit '47dc492839ea44cb9aa3d0ad23f09dd2fd0b4ed9':
  [ticket/9997] Fixed an inconsistency in the Moderator Control Panel
2011-05-08 03:12:25 -04:00
Oleg Pudeyev
e345c35bc4 Merge commit '441755bf170e49799e311c71b2123ff263970d62' into feature/prune-users
* commit '441755bf170e49799e311c71b2123ff263970d62':
  [ticket/9874] view_log() performs unneeded count query over all log entries.
2011-05-08 03:12:16 -04:00
Josh Woody
fe347ec112 [feature/prune-users] Adjust some language strings for new features
Adjust two language strings for ACP prune feature to include descriptions for
new features.

PHPBB3-9622
2011-05-08 03:03:36 -04:00
Oleg Pudeyev
04a6303527 [feature/prune-users] Apply e6ed55a9c1.
This was done in PHPBB3-9872.

PHPBB3-9622
2011-05-08 03:03:18 -04:00
Josh Woody
e7e0ab9d0b [feature/prune-users] Rework user_delete() functions_user.php
user_delete now uses fewer queries to delete a set of users of size > 1 by
accepting an array of users rather than a single user at a time.  This required
changing the third parameter, however the function retains its former behavior
with the old-style parameters.

PHPBB3-9622
2011-05-08 02:56:45 -04:00
Oleg Pudeyev
d987c0a118 [ticket/10178] Add path to find command to build packages on FreeBSD.
PHPBB3-10178
2011-05-07 22:31:44 -04:00
Oleg Pudeyev
129f70bf95 [ticket/10177] Add -f - to tar command to build packages with bsdtar.
PHPBB3-10177
2011-05-07 22:31:33 -04:00
Oleg Pudeyev
1cba674b9a [feature/template-engine] Added docblocks and boilerplate to new files.
PHPBB3-9726
2011-05-07 17:58:56 -04:00
Oleg Pudeyev
b5444a7d7d [feature/template-engine] Removed more dead code.
PHPBB3-9726
2011-05-07 17:50:48 -04:00
Oleg Pudeyev
0501640d5d [feature/template-engine] Added phpbb_template_context class.
Objects of this class hold variables assigned to templates.

PHPBB3-9726
2011-05-07 17:47:02 -04:00
Oleg Pudeyev
d8122df332 [feature/template-engine] Always call ob_end_clean.
We have to stop output buffering even when rendering fails.

PHPBB3-9726
2011-05-05 19:03:46 -04:00
Andreas Fischer
6a3f34ae61 Merge remote-tracking branch 'p/ticket/9693' into develop
* p/ticket/9693:
  [ticket/9693] Removed useless $auth globalizations.
2011-05-05 19:59:11 +02:00
Andreas Fischer
963a67332a [ticket/9922] Link post subject to the post's anchor in subsilver2.
Link post subject to the post's anchor in subsilver2 to expose full URL to post
which is otherwise only hidden behind the small post icon.

PHPBB3-9922
2011-05-05 19:53:10 +02:00
Joas Schilling
0d234cabf4 [ticket/10171] Fix displaying the "PM marking colours" in Firefox4.
PHPBB3-10171
2011-05-05 15:57:59 +02:00
Nils Adermann
680c3fde48 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10003] Delete EOL at EOF for the benefit of 3.0 modifications.
  [ticket/10003] Ported 1802b9ff92 to db_tools.
  [ticket/10003] Ported 5553cfc2ed to db_tools.
  [ticket/10003] Ported 023760c8b2 to db_tools.
  [ticket/10003] Ported 54c22ae52a to db_tools.
  [ticket/10003] Ported 96a30afcca to db_tools.
  [ticket/10003] Ported d7d96223e7 to db_tools.
2011-05-05 14:48:13 +02:00
Nils Adermann
e7dd37910c Merge branch 'ticket/p/10003' into develop-olympus
* ticket/p/10003:
  [ticket/10003] Delete EOL at EOF for the benefit of 3.0 modifications.
  [ticket/10003] Ported 1802b9ff92 to db_tools.
  [ticket/10003] Ported 5553cfc2ed to db_tools.
  [ticket/10003] Ported 023760c8b2 to db_tools.
  [ticket/10003] Ported 54c22ae52a to db_tools.
  [ticket/10003] Ported 96a30afcca to db_tools.
  [ticket/10003] Ported d7d96223e7 to db_tools.
2011-05-05 14:44:49 +02:00
Joas Schilling
65d956bd81 [ticket/10158] Add "Return to Inbox"-link to "PM send"-message.
PHPBB3-10158
2011-05-05 10:49:54 +02:00
Oleg Pudeyev
b057d7439e [feature/template-engine] Removed some dead code.
PHPBB3-9726
2011-05-04 01:21:45 -04:00
Oleg Pudeyev
d06e59f63b [feature/template-engine] Split template execution logic into classes.
Template executor interface defines a template executor object.
It is an object which can execute (i.e. display/render) a template.
Currently there are two implementations:

 * phpbb_template_executor_include includes php code from a file.
 * phpbb_template_executor_eval eval's php code.

PHPBB3-9726
2011-05-04 01:21:44 -04:00
Oleg Pudeyev
237deb12ce [feature/template-engine] Removed storedb-related logic.
phpBB 3.1 will not provide the option to store templates in the database.

This commit removes code that handles templates stored in database
from the template engine.

PHPBB3-9726
2011-05-04 00:09:39 -04:00
Oleg Pudeyev
87832d06cc [feature/template-engine] Delete template class, use phpbb_template instead.
PHPBB3-9726
2011-05-04 00:08:20 -04:00
Oleg Pudeyev
48691b53a6 [feature/template-engine] Rename template_compile methods for clarity.
PHPBB3-9726
2011-05-04 00:07:58 -04:00
Oleg Pudeyev
c033698815 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9954] Remove unneeded never permission
2011-05-03 00:51:10 -04:00
Oleg Pudeyev
3a70cb478c Merge remote-tracking branch 'erikfrerejean/ticket/9954' into develop-olympus
* erikfrerejean/ticket/9954:
  [ticket/9954] Remove unneeded never permission
2011-05-03 00:24:44 -04:00
Oleg Pudeyev
c651948cb3 [ticket/9630] Make language for moving posts clearer in quickmod/mcp.
PHPBB3-9630
2011-05-02 23:54:35 -04:00
Oleg Pudeyev
d840de560c [feature/template-engine] Extracted compile_stream_to_stream.
PHPBB3-9726
2011-05-01 03:28:53 -04:00
Oleg Pudeyev
63ca4c2104 [feature/template-engine] Close output stream in compile().
There is no need to leave the stream to the garbage collector,
and the amount of data stuck in it may be substantial.

PHPBB3-9726
2011-05-01 03:25:22 -04:00
Oleg Pudeyev
234b891a4b [feature/template-engine] Fixed description of assign_display().
This function returns false on failure, which can happen if
display() failed. Document the failure return value.

PHPBB3-9726
2011-05-01 03:14:11 -04:00