makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 13:58:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
10241 commits 18 branches 192 tags 206 MiB
Commit graph

4416 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
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
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
Oleg Pudeyev
1e2c19f4b4 [ticket/10003] Delete EOL at EOF for the benefit of 3.0 modifications. 
PHPBB3-10003
 2011-04-29 02:16:02 -04:00
Oleg Pudeyev
85549fad83 [ticket/10003] Ported 1802b9ff92 to db_tools. 
Most of it was already in db_tools, these changes could have applied to
code that did not exist in db_tools at the time of the commit.

PHPBB3-10003
 2011-04-29 02:10:42 -04:00
Oleg Pudeyev
55ff5da70b [ticket/10003] Ported 5553cfc2ed to db_tools. 
The diff in database_update was only partially relevant.

PHPBB3-10003
 2011-04-29 02:10:42 -04:00
Oleg Pudeyev
761e3dd36f [ticket/10003] Ported 023760c8b2 to db_tools. 
This was painful. Git wanted to patch hunks in wrong places.
Hopefully I got it right.

PHPBB3-10003
 2011-04-29 02:10:42 -04:00
Oleg Pudeyev
9f34aa0b79 [ticket/10003] Ported 54c22ae52a to db_tools. 
This diff applied cleanly.

PHPBB3-10003
 2011-04-29 02:10:42 -04:00
Oleg Pudeyev
3cb1b90ca6 [ticket/10003] Ported 96a30afcca to db_tools. 
This change is somewhat questionable, maybe it should be reviewed.

PHPBB3-10003
 2011-04-29 02:10:41 -04:00
Oleg Pudeyev
e6eb11bb11 [ticket/10003] Ported d7d96223e7 to db_tools. 
PHPBB3-10003
 2011-04-29 02:10:41 -04: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
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
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
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
Oleg Pudeyev
682814180c [ticket/7941] Added @return to generate_board_url docstring. 
PHPBB3-7941
 2011-04-17 18:46:03 -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
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
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
Joas Schilling
851bb9fcd8 [ticket/10084] Add smilie/icon errors out when file is missing 
PHPBB3-10084
 2011-04-07 20:36:11 +02:00
Joas Schilling
a72fe8acaf [ticket/10109] Fix "Undefined Index" errors when copying a topic. 
PHPBB3-10109
 2011-04-07 14:53:47 +02:00
Joas Schilling
59d75c1ae6 [ticket/10121] Fix ICQ profile link, leading to a dead web-messenger. 
PHPBB3-10121
 2011-04-03 22:11:13 +02:00
rxu
b8adad0d48 [ticket/10117] Add one more missed 'u' modifier, add code comment 
PHPBB3-10117
 2011-04-03 15:28:00 +08:00
rxu
6ddb92c41e [ticket/10115] Switch UTF-8 mode on for the rest of BBCodes 
PHPBB3-10115
 2011-04-03 08:33:33 +08:00
rxu
25ae46b8df [ticket/10117] Make smilies to be correctly parsed within unicode text. 
PHPBB3-10117
 2011-04-03 00:53:00 +08:00
rxu
646d3e10d2 [ticket/10115] Make some text oriented BBCodes to properly handle unicode. 
[quote], [b], [i], [size], [color], [u], [list] are affected.

PHPBB3-10115
 2011-04-02 19:19:30 +08:00
Andreas Fischer
f392f55d9b Merge branch 'ticket/bantu/9751' into develop-olympus 
* ticket/bantu/9751:
  [ticket/9751] Add shortcut logic for pass_complex == PASS_TYPE_ANY.
  [ticket/9751] Compare $password with empty string instead of casting it to bool
  [ticket/9751] Use a switch/case block without break for password complexity.
  [ticket/9751] Password requirement "Must contain letters and numbers" fails
 2011-04-01 15:11:10 +02:00
Andreas Fischer
4dce53628c [ticket/9751] Add shortcut logic for pass_complex == PASS_TYPE_ANY. 
Add shortcut logic for pass_complex because this is the default value phpBB
ships with and there is nothing to do in that function in that case.

PHPBB3-9751
 2011-04-01 15:10:29 +02:00
Andreas Fischer
7cc32d3843 [ticket/9751] Compare $password with empty string instead of casting it to bool 
PHPBB3-9751
 2011-04-01 15:10:29 +02:00
Andreas Fischer
dba8cf12fd [ticket/9751] Use a switch/case block without break for password complexity. 
PHPBB3-9751
 2011-04-01 15:10:29 +02:00
rxu
a835189823 [ticket/9751] Password requirement "Must contain letters and numbers" fails 
PHPBB3-9751
 2011-04-01 15:10:29 +02:00
Igor Wiedler
564ce6c7f6 Merge remote branch 'callumacrae/ticket/10112' into develop-olympus 
* callumacrae/ticket/10112:
  [ticket/10112] Replaced a couple occurrences of count() with sizeof()
 2011-03-31 20:31:58 +02:00
Igor Wiedler
ec5ca9df6b Merge branch 'ticket/haklop/10110' into develop-olympus 
* ticket/haklop/10110:
  [ticket/10110] Remove tab from empty lines
  [ticket/10110] Enable the serialization and add a constant for defined the database
  [ticket/10110] Update comments with a link to the phpredis extension
  [ticket/10110] Add Redis ACM backend
 2011-03-31 20:23:30 +02:00
Eric
ddda094d3a [ticket/10110] Remove tab from empty lines 
PHPBB3-10110
 2011-03-31 20:16:53 +02:00
Eric
9891f5a8d2 [ticket/10110] Enable the serialization and add a constant for 
defined the database

PHPBB3-10110
 2011-03-31 20:16:53 +02:00
Eric
f18d93756c [ticket/10110] Update comments with a link to the phpredis extension 
PHPBB3-10110
 2011-03-31 20:16:53 +02:00
Eric
fad7333e72 [ticket/10110] Add Redis ACM backend 
PHPBB3-10110
 2011-03-31 20:16:52 +02:00
Callum Macrae
657971754b [ticket/10112] Replaced a couple occurrences of count() with sizeof() 
As per the coding guidlines, sizeof() should be used instead of count().

PHPBB3-10112
 2011-03-30 11:30:27 +01:00
Erik Frèrejean
83ca730544 [ticket/9581] Fix missing index 
Add `u.user_lang` to the select statement to prevent "undefined
index" errors.

PHPBB3-9581
 2011-03-24 10:44:36 +01:00
Andreas Fischer
6ac93d8a00 Merge branch 'ticket/jellydoughnut/9946' into develop-olympus 
* ticket/jellydoughnut/9946:
  [ticket/9946] Allow storage of data >4kB on Oracle again
 2011-03-24 09:22:12 +01:00
Joas Schilling
1564c01c38 [ticket/10033] "Disallow usernames" does not check already disallowed names. 
PHPBB3-10033
 2011-03-23 22:48:22 +01:00
Oleg Pudeyev
200c7e3c44 Merge branch 'ticket/igorw/10101' into develop-olympus 
* ticket/igorw/10101:
  [ticket/10101] Add test case for native phpass hashes
  [ticket/10101] Add support for native phpass hashes
 2011-03-22 21:25:00 -04:00
Igor Wiedler
f8384b7302 [ticket/10101] Add support for native phpass hashes 
phpass (the hashing library we use) adds a hash identifier to every
hash. By default this identifier is '$P$'. For some reason we have
changed it to '$H$'.

This patch allows both of them to be used for authentication, so that a
third party system could create users with '$P$' hashes.

PHPBB3-10101
 2011-03-17 23:59:38 +01:00