Commit graph

14593 commits

Author SHA1 Message Date
Andreas Fischer
1f4b4aee9d Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10186] UCP signature panel displays when not authed for signatures
2011-05-13 01:29:57 +02:00
RMcGirr83
f6fa52540c [ticket/10186] UCP signature panel displays when not authed for signatures
The signature panel link was displayed even when a user did not have the
auths to create/edit their signature. Clicking on the link gave a
trigger_error of "Not authorised to have a signature". Hide the link
when user does not have permissions to edit their signature.

PHPBB3-10186
2011-05-12 19:25:20 -04:00
Andreas Fischer
bfdb5c413d [ticket/10146] Fix Firebird DECIMAL precision issue on develop.
PHPBB3-10146
2011-05-11 11:32:09 +02:00
Andreas Fischer
6aa2f9e742 [ticket/10173] Use correct variable, checking for $birthday_year was correct.
PHPBB3-10173
2011-05-11 11:21:37 +02:00
Oleg Pudeyev
cc0e6e9912 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10126] Use binary "and not" instead of binary "xor" in error_reporting.
2011-05-10 23:46:24 -04:00
Oleg Pudeyev
0d407f10d0 Merge remote-tracking branch 'bantu/ticket/10126' into develop-olympus
* bantu/ticket/10126:
  [ticket/10126] Use binary "and not" instead of binary "xor" in error_reporting.
2011-05-10 23:42:22 -04:00
Oleg Pudeyev
3f9e9b581b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10170] Fix broken recaptcha verification host.
  [ticket/10170] Include www in hostname in language strings.
  [ticket/10170] Update language entries
  [ticket/10170] reCaptcha API has been moved.
2011-05-10 23:32:27 -04:00
Oleg Pudeyev
f670aefd36 Merge remote-tracking branch 'bantu/ticket/10170' into develop-olympus
* bantu/ticket/10170:
  [ticket/10170] Fix broken recaptcha verification host.
  [ticket/10170] Include www in hostname in language strings.
  [ticket/10170] Update language entries
  [ticket/10170] reCaptcha API has been moved.
2011-05-10 22:06:23 -04:00
Andreas Fischer
5a4a1e3c25 [ticket/10126] Use binary "and not" instead of binary "xor" in error_reporting.
Make what we want to achieve clear by using "and not" instead of "xor".

PHPBB3-10126
2011-05-11 03:56:15 +02:00
Andreas Fischer
eded608a53 [ticket/10170] Fix broken recaptcha verification host.
PHPBB3-10170
2011-05-11 03:26:36 +02:00
Andreas Fischer
2c0c8a580f [ticket/10170] Include www in hostname in language strings.
PHPBB3-10170
2011-05-11 03:14:14 +02:00
Erik Frèrejean
46fcf9c8e4 [ticket/10170] Update language entries
Update the language entries to reflect the reCaptcha
API change.

PHPBB3-10170
2011-05-10 23:34:38 +02:00
Erik Frèrejean
ca981b6d18 [ticket/10170] reCaptcha API has been moved.
The reCaptcha API has been moved from recaptcha.net to
google.com/recaptcha.

PHPBB3-10170
2011-05-10 23:31:41 +02:00
Oleg Pudeyev
6ac6680639 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10154] Move "copy permissions from" to below "parent" on forum creation
2011-05-09 22:36:47 -04:00
Oleg Pudeyev
7faabfb532 Merge remote-tracking branch 'bantu/ticket/10154' into develop-olympus
* bantu/ticket/10154:
  [ticket/10154] Move "copy permissions from" to below "parent" on forum creation
2011-05-09 22:35:19 -04:00
Oleg Pudeyev
7cbbb301e1 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9999] SEARCH_USER_POSTS is also used on viewtopic. Move to common.
  [ticket/9999] Remove broken and unused L_FORUM_FOLDER_ALT variable.
2011-05-09 22:28:35 -04:00
Andreas Fischer
ccb78f74a4 [ticket/9999] SEARCH_USER_POSTS is also used on viewtopic. Move to common.
PHPBB3-9999
2011-05-09 23:20:17 +02:00
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
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
bf27d616e3 [feature/prune-users] Apply 904bcb86a0.
This was done in PHPBB3-7834.

PHPBB3-9622
2011-05-08 03:19:53 -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
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