1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-05 22:14:59 +02:00

4674 Commits

Author SHA1 Message Date
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
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 904bcb86a054ab6256da565098eb9bd8ab20414b.
This was done in PHPBB3-7834.

PHPBB3-9622
2011-05-08 03:19:53 -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 e6ed55a9c1ceb07ab2e87d4a53f9e688fda319c5.
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
a4a9e38007 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9961] Create log entries when users are activated.
2011-04-30 20:44:42 -04:00
Oleg Pudeyev
aa7be58d41 Merge branch 'erikfrerejean/ticket/9961' into develop-olympus
* erikfrerejean/ticket/9961:
  [ticket/9961] Create log entries when users are activated.
2011-04-30 17:41:04 -04:00
Igor Wiedler
835391c83a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10145] Always recompile all templates when DEBUG_EXTRA is defined.
2011-04-26 21:49:31 +02:00
Igor Wiedler
850741ee16 Merge remote branch 'bantu/ticket/10145' into develop-olympus
* bantu/ticket/10145:
  [ticket/10145] Always recompile all templates when DEBUG_EXTRA is defined.
2011-04-26 21:49:21 +02:00
Andreas Fischer
9a4e71ac1a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/7941] Added @return to generate_board_url docstring.
2011-04-26 19:36:48 +02:00
Andreas Fischer
569a4b2091 Merge remote branch 'p/ticket/7941' into develop-olympus
* p/ticket/7941:
  [ticket/7941] Added @return to generate_board_url docstring.
2011-04-26 19:35:49 +02:00
Andreas Fischer
a3a70e13b5 [ticket/10145] Always recompile all templates when DEBUG_EXTRA is defined.
PHPBB3-10145
2011-04-26 12:35:44 +02:00
Oleg Pudeyev
8fc748770a Merge branch 'feature/rxu/attachment-management-no-reassignment' into develop
* feature/rxu/attachment-management-no-reassignment:
  [feature/attachment-management-no-reassignment] Handle privacy and some more.
  [feature/attachment-management-no-reassignment] Further feature adjustments.
  [feature/attachment-management-no-reassignment] Fix some more errors
  [feature/attachment-management-no-reassignment] Fix minor flaws in the code.
  [feature/attachment-management-no-reassignment] Attachments management
2011-04-24 14:29:59 -04:00
rxu
baba66a229 [feature/attachment-management-no-reassignment] Handle privacy and some more.
- restrict files info for PM attachments;
- add an option to resync files stats if wrong;
- replace post_id sorting with post type (PM/regular post) one;
- some language fixes.

PHPBB3-9721
2011-04-24 23:33:51 +08:00
Oleg Pudeyev
dfbbc4797e [ticket/10148] Turn TEMPLATE_BITFIELD into an instance variable.
PHPBB3-10148
2011-04-24 01:35:09 -04:00
Andreas Fischer
513b95642e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10147] Corrected a typo in includes/functions_template.php.
2011-04-23 21:52:04 +02:00
Andreas Fischer
8a97722464 Merge branch 'ticket/p/10147' into develop-olympus
* ticket/p/10147:
  [ticket/10147] Corrected a typo in includes/functions_template.php.
2011-04-23 21:51:49 +02:00
Oleg Pudeyev
a8ecd30fe1 [ticket/10147] Corrected a typo in includes/functions_template.php.
PHPBB3-10147
2011-04-23 15:36:45 -04:00
Andreas Fischer
ca0a066854 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10141] Save a hash lookup when value is not in cache.
  [ticket/10141] Split double-assignment into conditional and unconditional part.
  [ticket/10141] Use a cache in $auth->_fill_acl() for better performance.
2011-04-22 11:17:39 +02:00
Oleg Pudeyev
f49656986c [ticket/10141] Save a hash lookup when value is not in cache.
PHPBB3-10141
2011-04-21 23:15:51 -04:00
Andreas Fischer
b1367bce48 [ticket/10141] Split double-assignment into conditional and unconditional part.
PHPBB3-10141
2011-04-22 00:20:09 +02:00
Bart van Bragt
11dd4b54fa [ticket/10141] Use a cache in $auth->_fill_acl() for better performance.
Many sequences being converted are the same. Use a local cache to
convert each sequence once, speeding up the function.

PHPBB3-10141
2011-04-21 04:21:09 -04:00
Erik Frèrejean
1d2201902f [ticket/9961] Create log entries when users are activated.
* Create log entries when a user activates own account without
   also changing their password.

 * Additionally create admin log entries when an administrator activates
   user accounts.

PHPBB3-9961
2011-04-19 13:11:20 +02:00
Andreas Fischer
2701a587ac [ticket/10139] Make signatures of set_atomic() consistent by using $new_value.
PHPBB3-10139
2011-04-19 10:17:18 +02:00
Andreas Fischer
9241aa79ff [ticket/10139] Rename $cache to $use_cache to avoid confusion with cache object
PHPBB3-10139
2011-04-19 10:13:18 +02:00
Oleg Pudeyev
8fe75aefbb Merge branch 'ticket/erikfrerejean/10006' into develop 2011-04-19 00:28:21 -04:00
Erik Frèrejean
27bbfde243 [ticket/10006] Remove unneeded if statements
Remove some of the additional `if (isset)` checks

PHPBB3-10006
2011-04-18 12:28:47 +02:00
Erik Frèrejean
f93ac340a2 [ticket/10006] Remove return values
Remove some unneeded return values

PHPBB3-10006
2011-04-18 12:28:47 +02:00
Erik Frèrejean
2f67ade05a [ticket/10006] Add phpbb_config::delete
Add the missing `phpbb_config::delete` method to the config class

PHPBB3-10006
2011-04-18 12:28:47 +02:00
Oleg Pudeyev
682814180c [ticket/7941] Added @return to generate_board_url docstring.
PHPBB3-7941
2011-04-17 18:46:03 -04:00
Oleg Pudeyev
9a8a8d41d3 [ticket/7252] Removed an outdated comment pertaining to PHP 4.x.
PHPBB3-7252
2011-04-17 18:41:18 -04:00
Oleg Pudeyev
8c5a9979ad Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10109] Fix "Undefined Index" errors when copying a topic.
2011-04-17 11:09:17 -04:00
Oleg Pudeyev
32bc980ca0 Merge branch 'ticket/nickvergessen/10109' into develop-olympus
* ticket/nickvergessen/10109:
  [ticket/10109] Fix "Undefined Index" errors when copying a topic.
2011-04-17 03:20:22 -04:00
Oleg Pudeyev
76bc4c24a5 Merge branch 'ticket/rxu/10117' into develop-olympus
* ticket/rxu/10117:
  [ticket/10117] Add one more missed 'u' modifier, add code comment
  [ticket/10117] Make smilies to be correctly parsed within unicode text.
2011-04-17 00:31:24 -04:00
Oleg Pudeyev
d4e938b25b Merge branch 'ticket/rxu/10115' into develop-olympus
* ticket/rxu/10115:
  [ticket/10115] Switch UTF-8 mode on for the rest of BBCodes
  [ticket/10115] Make some text oriented BBCodes to properly handle unicode.
2011-04-17 00:12:40 -04:00
rxu
d811820bc1 [feature/attachment-management-no-reassignment] Further feature adjustments.
-add database update entry;
- add files statistics checks;
- improve files deletion procedure;
- improve reversed order for pagination;
- adjust template file;
- add missing comma for orphan key in info module;
- change module mode name;
- fix module explanation text;
- add files comments output;
- change attachments per page amount from posts to topics per page value.

PHPBB3-9721
2011-04-11 20:16:59 +08:00
rxu
d3523f4f87 [feature/attachment-management-no-reassignment] Fix some more errors
Missing comma for orphan key in info module, define $start variable

PHPBB3-9721
2011-04-11 13:06:51 +08:00
Igor Wiedler
6dd0e40d02 Merge remote-tracking branch 'p/ticket/10136' into develop
* p/ticket/10136:
  [ticket/10136] Added missing $request globalizations in functions.php.
2011-04-11 07:01:57 +02:00
Oleg Pudeyev
716f514ee9 Merge branch 'ticket/nickvergessen/9684' into develop
* ticket/nickvergessen/9684:
  [ticket/9684] Also display forum-name in subsilver2 template
  [ticket/9684] Move currently existing GAs to a selectable forum while updating.
  [ticket/9684] View origin-forumname for GAs in topic-list
  [ticket/9684] Fix Forum/Topic-Tracking for global announcements
  [ticket/9684] Fix a SQL-Error in the posting.php
  [ticket/9684] Remove code in some more files especially includes/
  [ticket/9684] Remove code for global announcement in root-files
2011-04-11 00:04:19 -04:00
Oleg Pudeyev
6bb55e80a4 [ticket/10136] Added missing $request globalizations in functions.php.
PHPBB3-10136
2011-04-10 23:50:56 -04:00
Oleg Pudeyev
00a69b4372 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10128] Pass E_USER_WARNING to trigger_error() calls from user_ban().
  [ticket/10123] Change "smilie" to "smiley" as per our coding guidelines.
2011-04-10 19:52:58 -04:00
Oleg Pudeyev
bdb84452f5 Merge branch 'ticket/bantu/10128' into develop-olympus
* ticket/bantu/10128:
  [ticket/10128] Pass E_USER_WARNING to trigger_error() calls from user_ban().
2011-04-10 19:52:06 -04:00
Andreas Fischer
259929ad4e [ticket/10128] Pass E_USER_WARNING to trigger_error() calls from user_ban().
The user_ban() function is shared by the MCP and the ACP.

Mark trigger_error() calls as errors by passing E_USER_WARNING to make the
error message appear on red background (instead of green background) in the
ACP.

PHPBB3-10128
2011-04-11 00:29:48 +02:00
Oleg Pudeyev
2d3dcd43c5 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9581] Fix missing index
  [ticket/9581] Slightly tweaked queries
  [ticket/9581] Make banlist table select optional
  [ticket/9581] Mass e-mail to banned users
2011-04-10 14:17:56 -04:00
Oleg Pudeyev
d3b5df2548 Merge branch 'ticket/erikfrerejean/9581' into develop-olympus
* ticket/erikfrerejean/9581:
  [ticket/9581] Fix missing index
  [ticket/9581] Slightly tweaked queries
  [ticket/9581] Make banlist table select optional
  [ticket/9581] Mass e-mail to banned users
2011-04-10 11:58:29 -04:00