1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-12 10:35:20 +02:00

4728 Commits

Author SHA1 Message Date
Andreas Fischer
57eb50812f Merge remote-tracking branch 'rxu/ticket/10684' into develop-olympus
* rxu/ticket/10684:
  [ticket/10684] Adjust function and parameter name, minor changes.
  [ticket/10684] Rename function phpbb_get_banned_users_ids() parameter
  [ticket/10684] Remove intval mapping for array keys
  [ticket/10684] Adjust pm_notifications() to handle stale bans
  [ticket/10684] Cast user_id to integer
  [ticket/10684] Refactor $sql_ignore_users array update
  [ticket/10684] Remove isset() for $sql_ignore_users update
  [ticket/10684] Fix 2 typos in comment lines.
  [ticket/10684] Send notifications for users with stale bans
2012-03-22 18:14:13 +01:00
rxu
5a9dd1994f [ticket/10684] Adjust function and parameter name, minor changes.
PHPBB3-10684
2012-03-22 21:19:01 +08:00
Andreas Fischer
e5205ba2f8 Merge remote-tracking branch 'p/task/php54-olympus' into develop-olympus
* p/task/php54-olympus:
  [task/php54] Disable E_STRICT in Olympus when running on PHP 5.4.
  [task/php54] Refactor error_reporting call slightly.
2012-03-22 10:49:37 +01:00
Oleg Pudeyev
81eeafbb8d Merge remote-tracking branch 'nickvergessen/ticket/8636' into develop-olympus
* nickvergessen/ticket/8636:
  [ticket/8636] Add resync option to topic_view moderation page
2012-03-16 06:18:29 -04:00
Oleg Pudeyev
5efdbfa5e4 [task/php54] Disable E_STRICT in Olympus when running on PHP 5.4.
We cannot use static in Olympus because it must be PHP 4 compatible.

Therefore disable E_STRICT for Olympus.

This commit should be reverted for Ascraeus.

PHPBB3-10615
2012-03-15 22:47:42 -04:00
Oleg Pudeyev
71afba0ded [task/php54] Refactor error_reporting call slightly.
Separate error level assignment into a variable in this commit
so that the only difference between Olympus and Ascraeus
is the addition of logic altering $level.

PHPBB3-10615
2012-03-15 22:46:06 -04:00
rxu
ff8d523768 [ticket/10684] Rename function phpbb_get_banned_users_ids() parameter
PHPBB3-10684
2012-03-12 01:57:51 +08:00
rxu
da395edbca [ticket/10684] Remove intval mapping for array keys
PHP manual for arrays http://php.net/manual/en/language.types.array.php states
that the following key cast will occur: Strings containing valid integers will
be cast to the integer type. E.g. the key "8" will actually be stored under 8.
Thus, no intval mapping for numeric array keys is needed.

PHPBB3-10684
2012-03-12 01:47:28 +08:00
rxu
321d0d9b56 [ticket/10684] Adjust pm_notifications() to handle stale bans
- Add parameter (array) to the function phpbb_get_banned_users_ids()
- Fix function pm_notification() to handle users with stale bans

PHPBB3-10684
2012-03-12 01:44:00 +08:00
rxu
a79b3490c2 [ticket/10684] Cast user_id to integer
PHPBB3-10684
2012-03-11 00:56:07 +08:00
rxu
89a6cb2886 [ticket/10684] Refactor $sql_ignore_users array update
PHPBB3-10684
2012-03-10 00:17:39 +08:00
rxu
f563647e4b [ticket/10684] Remove isset() for $sql_ignore_users update
PHPBB3-10684
2012-03-09 22:35:13 +08:00
Oleg Pudeyev
bd1fb91dd2 Merge remote-tracking branch 'rxu/ticket/9831' into develop-olympus
* rxu/ticket/9831:
  [ticket/9831] Fix saving unchecked checkbox field value
  [ticket/9831] Correctly store checkbox default value for boolean CPF.
2012-03-09 05:24:03 -05:00
Oleg Pudeyev
0ec8e9dbff Merge remote-tracking branch 'rxu/ticket/9084' into develop-olympus
* rxu/ticket/9084:
  [ticket/9084] Explain the logic.
  [ticket/9084] Don't hide 'non-entered' dropdown CPF value if not required
2012-03-09 04:42:05 -05:00
Oleg Pudeyev
cd61de4bfd [ticket/9084] Explain the logic.
PHPBB3-9084
2012-03-09 04:35:09 -05:00
rxu
ee6783109a [ticket/10684] Fix 2 typos in comment lines.
PHPBB3-10684
2012-03-09 16:41:49 +08:00
rxu
025de9ee19 [ticket/10684] Send notifications for users with stale bans
PHPBB3-10684
2012-03-08 23:28:03 +08:00
Andreas Fischer
c11607bdd1 [ticket/10653] Call get_row_count of base class in mysql get_estimated_row_count
There is no point in fetching the table status again.

PHPBB3-10653
2012-03-08 14:39:03 +01:00
Andreas Fischer
01d90e59a8 [ticket/9813] Only get posts table row count if we detected a fulltext index.
PHPBB3-9813
2012-03-08 14:38:59 +01:00
Andreas Fischer
785c75254e [ticket/9813] Also use estimated row count of posts table for fulltext mysql.
Since this is 'only' for statistics anyway, using an estimated value does no
harm. Also, if MyISAM is the underlying storage engine for the posts table,
the value will actually be exact.

PHPBB3-9813
2012-03-05 00:29:28 +01:00
Andreas Fischer
f9953fc339 [ticket/10653] Add ability to count table rows to database abstraction layer.
PHPBB3-10653
2012-03-03 21:04:01 +01:00
Andreas Fischer
97cf433dea [ticket/9813] Use table status row count only if greater than 100000 or exact.
PHPBB3-9813
2012-03-03 21:03:55 +01:00
Andreas Fischer
efe25a0b49 [ticket/9813] Use SHOW TABLE STATUS to get search stats for native on MySQL.
PHPBB3-9813
2012-03-03 21:03:50 +01:00
Andreas Fischer
d67fae0f09 Merge branch 'ticket/bantu/8652' into develop-olympus
* ticket/bantu/8652:
  [ticket/8652] Comment for also updating forum watch table in user_notification.
  [ticket/8652] Sending 2 emails on 2 replies
2012-03-02 14:22:18 +01:00
Andreas Fischer
b74530259f [ticket/8652] Comment for also updating forum watch table in user_notification.
PHPBB3-8652
2012-03-02 14:20:29 +01:00
Bruno Ais
470b79c9e3 [ticket/8652] Sending 2 emails on 2 replies
This is a fix for the problem of the system sending 2 emails when there are 2
replies to a topic where the user is subscribed in a topic and the forum that
contains the topic.
This simple fix seems to solve the problem. In simple tests I made it shows
it does.

PHPBB3-8652
2012-03-02 11:08:56 +00:00
Andreas Fischer
2f95a67765 Merge remote-tracking branch 'nickvergessen/ticket/10639' into develop-olympus
* nickvergessen/ticket/10639:
  [ticket/10639] Do not allow negative post count as rank's minimum posts
2012-02-28 22:28:54 +01:00
Joas Schilling
8e1e48a7b6 [ticket/8636] Add resync option to topic_view moderation page
PHPBB3-8636
2012-02-23 10:55:57 +01:00
Joas Schilling
ef154b78a1 [ticket/10630] Use sql_like_expression() method instead of hardcoded LIKE '%x%'
PHPBB3-10630
2012-02-20 02:18:48 +01:00
Joas Schilling
afcf9cbc86 [ticket/10630] Perform array_unique on authors array before creating the query
This is needed to avoid an additional appearance for an author for every
post he made.

PHPBB3-10630
2012-02-20 02:17:13 +01:00
Joas Schilling
c3265c9138 [ticket/10639] Do not allow negative post count as rank's minimum posts
PHPBB3-10639
2012-02-20 01:52:33 +01:00
rxu
345e8e084f [ticket/9084] Don't hide 'non-entered' dropdown CPF value if not required
PHPBB3-9084
2012-02-10 00:31:13 +08:00
James King
35d5d527db [ticket/10606] Fix incorrect hidden fields array name in page_header().
Regression from dfb7cc625a37c6345fa647ee3a21f890ba5c9649.

PHPBB3-10606
2012-02-09 15:32:35 +01:00
rxu
f832f5a4ee [ticket/9831] Fix saving unchecked checkbox field value
PHPBB3-9831
2012-02-05 22:03:02 +08:00
Vjacheslav Trushkin
326ff46ef7 [ticket/10616] Add template inheritance to exported template
Add template inheritance when exporting template.cfg

PHPBB3-10616
2012-02-03 16:19:42 +02:00
Vjacheslav Trushkin
4aef6ea979 [ticket/10616] Ignore template inheritance that points to self
Ignore template inheritance if it points to self

PHPBB3-10616
2012-02-03 16:09:48 +02:00
Richard Foote
2cf586a372 [ticket/10580] Remove checking of server timezone and DST when registering
Remove checking of server timezone and DST. It causes a problem by
selecting the wrong timezone when registering when the board_timezone is 1
hour less than the server timezone.

PHPBB3-10580
2012-01-21 15:17:31 -05:00
rxu
99164cd20b [ticket/9831] Correctly store checkbox default value for boolean CPF.
PHPBB3-9831
2012-01-18 22:33:51 +08:00
Oleg Pudeyev
d7aa3aab5e Merge remote-tracking branch 'bantu/ticket/9079' into develop-olympus
* bantu/ticket/9079:
  [ticket/9079] Always log backtrace to error log when logging errors.
  [ticket/9079] Display backtrace on all E_USER_ERROR errors, not only SQL errors
2012-01-12 22:28:45 -05:00
Vjacheslav Trushkin
23363efaaa [ticket/10563] Show deactivated styles below active styles in acp
Separates active and deactivated styles in styles list in acp

PHPBB3-10563
2012-01-02 21:07:40 +02:00
Andreas Fischer
3e7a0a3746 Merge remote-tracking branch 'Dickyf/ticket/10407a' into develop-olympus
* Dickyf/ticket/10407a:
  [ticket/10407] Fix check for empty image paths in convertor
  [ticket/10407] Fix check for empty image paths in convertor
2012-01-02 19:54:14 +01:00
Richard Foote
24cf7f1d29 [ticket/10407] Fix check for empty image paths in convertor
This applies to avatar_path,avatar_gallery_path,smilies_path and
upload_path.
Currently, the convertor gets each path from the config table and adds a
trailing slash. If there is no entry in the config table for the path, the
path can never be empty because of the added trailing slash. This patch
will check the path without the trailing slash to see if the path is
actually empty.

PHPBB3-10407
2012-01-02 13:09:21 -05:00
Richard Foote
d5dc70cbe3 [ticket/10407] Fix check for empty image paths in convertor
This applies to avatar_path,avatar_gallery_path,smilies_path and
upload_path.
Currently, the convertor gets each path from the config table and adds a
trailing slash. If there is no entry in the config table for the path, the
path can never be empty because of the added trailing slash. This patch
will temporarily remove the trailing slash, then check if the path is
empty.

PHPBB3-10407
2011-12-29 16:27:48 -05:00
Igor Wiedler
5cc1eb27c7 Merge remote-tracking branch 'bantu/ticket/10538' into develop-olympus
* bantu/ticket/10538:
  [ticket/10538] Call htmlspecialchars_decode() on Jabber and SMTP passwords.
2011-12-28 16:40:07 +01:00
Andreas Fischer
a45f03a5af Merge remote-tracking branch 'p/ticket/9681' into develop-olympus
* p/ticket/9681:
  [ticket/9681] Add password length to security settings
2011-12-25 15:16:25 +01:00
Andreas Fischer
b0fd3b2bf0 Merge remote-tracking branch 'p/ticket/10428' into develop-olympus
* p/ticket/10428:
  [ticket/10428] Documentation for optionget/optionset functions.
  [ticket/10428] Use phpbb_optionget/set in optionget/set for DRYness.
  [ticket/10428] Dispose of $this->keyvalues cache for optionget.
  [ticket/10428] Compare $data to false strictly.
2011-12-25 15:12:03 +01:00
Oleg Pudeyev
10453b6752 [ticket/10428] Documentation for optionget/optionset functions.
PHPBB3-10428
2011-12-25 01:51:32 -05:00
Oleg Pudeyev
99c102344e [ticket/10428] Use phpbb_optionget/set in optionget/set for DRYness.
PHPBB3-10428
2011-12-25 01:51:32 -05:00
Oleg Pudeyev
16ae99eec8 [ticket/10428] Dispose of $this->keyvalues cache for optionget.
It does not work properly when custom $data is provided, and
making it work will make the code so complicated that any benefits
from having this cache in the first place will be nullified.

Just get rid of it.

PHPBB3-10428
2011-12-25 01:51:32 -05:00
Oleg Pudeyev
38c2d4da35 [ticket/10428] Compare $data to false strictly.
Users may pass 0 or '' for $data, this should cause the
user-specified $data code path to be taken.

PHPBB3-10428
2011-12-25 01:51:20 -05:00