Commit graph

10371 commits

Author SHA1 Message Date
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
47dc492839 Merge branch 'ticket/callumacrae/9997' into develop-olympus
* ticket/callumacrae/9997:
  [ticket/9997] Fixed an inconsistency in the Moderator Control Panel
2011-02-24 20:43:11 -05:00
Oleg Pudeyev
441755bf17 Merge branch 'ticket/nickvergessen/9874' into develop-olympus
* ticket/nickvergessen/9874:
  [ticket/9874] view_log() performs unneeded count query over all log entries.
2011-02-24 20:30:52 -05:00
Joas Schilling
a25238e0c1 [ticket/9874] view_log() performs unneeded count query over all log entries.
PHPBB3-9874
2011-02-25 00:04:48 +01:00
Igor Wiedler
76ad7c938d Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10058] Initialize $phpbb_root_path in mysql_upgrader.php.
2011-02-24 23:45:55 +01:00
Igor Wiedler
5a5560d200 Merge branch 'ticket/p/10058' into develop-olympus
* ticket/p/10058:
  [ticket/10058] Initialize $phpbb_root_path in mysql_upgrader.php.
2011-02-24 23:44:58 +01:00
Oleg Pudeyev
c4b3d3a089 [ticket/10058] Initialize $phpbb_root_path in mysql_upgrader.php.
Since knowledge base instructions tell users to place this script
in the root of the forum, use './' as phpbb root path. Actual
initialization code copied from check_flash_bbcodes.php.

PHPBB3-10058
2011-02-24 17:31:44 -05:00
Callum Macrae
e4497f4a15 [ticket/9997] Fixed an inconsistency in the Moderator Control Panel
The order of the Approve / Disapprove buttons was inconsistent in the
Moderator Control Panel - while on the main page and the moderation
queue itself the Approve button was to the right of the Disapprove
button, in the post details the Approve button was to the left of the
Disapprove button.

This very simple edit simply switches the position of these two buttons
in the post details page in the mcp.

PHPBB3-9995
2011-02-24 20:06:34 +00:00
Andreas Fischer
cf5253c7b8 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10056] Corrected a typo in Firebird name.
  [ticket/10041] Use send_status_line more in download/file.php

Conflicts:
	phpBB/download/file.php
2011-02-24 10:54:51 +01:00
Andreas Fischer
5e2bbdb22b Merge branch 'ticket/p/10041' into develop-olympus
* ticket/p/10041:
  [ticket/10041] Use send_status_line more in download/file.php
2011-02-24 10:35:27 +01:00
Andreas Fischer
b10654e9a5 Merge branch 'ticket/p/10056' into develop-olympus
* ticket/p/10056:
  [ticket/10056] Corrected a typo in Firebird name.
2011-02-24 10:35:09 +01:00
Oleg Pudeyev
ba41e45f84 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/7778] Update all the schema files
  [ticket/7778] Add the column change to `mysql_upgrader.php`
  [ticket/7778] BBCode single limit

Conflicts:
	phpBB/install/database_update.php
2011-02-23 22:03:42 -05:00
Erik Frèrejean
5dee60e54e [ticket/7778] Update all the schema files
Correct all the schema files to contain the new field type

PHPBB3-7778
2011-02-23 21:15:40 -05:00
Erik Frèrejean
1b88f5a316 [ticket/7778] Add the column change to mysql_upgrader.php
PHPBB3-7778
2011-02-23 21:15:40 -05:00
Erik Frèrejean
a7bc76d246 [ticket/7778] BBCode single limit
There are currently two hard limits for the number of BBCodes
allowed. One is enforced by the type of the `bbcode_id` column,
the other by an hard limit in `acp/acp_bbcode.php`. However this
limit can never be reached due to the size of the database column.

Suggested fix involves adding a new constant to define the max.
number of BBCodes (as with smilies) and chaning the database
column from a tinyint to a smallint to actually allow 1511 BBCodes

PHPBB3-7778
2011-02-23 21:15:40 -05:00
Oleg Pudeyev
a0f6e185ca [ticket/10056] Corrected a typo in Firebird name.
PHPBB3-10056
2011-02-23 20:16:23 -05:00
Oleg Pudeyev
786078d423 [ticket/10041] Use send_status_line more in download/file.php
PHPBB3-10041
2011-02-23 20:16:16 -05:00
Oleg Pudeyev
e3c854288c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9675] Correctly check whether the style/component is still in use.
  [ticket/9675] Put the code into methods to avoid code duplication.
  [ticket/9675] Adjust the language-string to reflect the changes.
  [ticket/9675] Add option to delete template/theme/imageset when deleting style.
2011-02-21 20:47:44 -05:00
Oleg Pudeyev
15a5d2c4bf Merge branch 'ticket/nickvergessen/9675' into develop-olympus
* ticket/nickvergessen/9675:
  [ticket/9675] Correctly check whether the style/component is still in use.
  [ticket/9675] Put the code into methods to avoid code duplication.
  [ticket/9675] Adjust the language-string to reflect the changes.
  [ticket/9675] Add option to delete template/theme/imageset when deleting style.
2011-02-21 20:47:31 -05:00
Oleg Pudeyev
c025d6079b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10047] Do not put session id in URL on posting.php when cookies are on.
2011-02-20 11:40:19 -05:00
Andreas Fischer
aba31aeff9 [ticket/10047] Do not put session id in URL on posting.php when cookies are on.
PHPBB3-10047
2011-02-19 14:30:39 +01:00
Oleg Pudeyev
f24fe7b09e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9944] Add empty line before the while() so you can better read the code
  [ticket/9944] Extension groups naming don't use users' language in ACP

Conflicts:
	phpBB/install/database_update.php
2011-02-17 17:11:55 -05:00
Oleg Pudeyev
676daf3076 Merge branch 'ticket/nickvergessen/9944' into develop-olympus
* ticket/nickvergessen/9944:
  [ticket/9944] Add empty line before the while() so you can better read the code
  [ticket/9944] Extension groups naming don't use users' language in ACP
2011-02-17 17:03:08 -05:00
Joas Schilling
59454ccd99 [ticket/10045] Update version in some more files.
I did not include the docs/INSTALL.html, because we need to do a bit more on that file before releasing 3.1 (Add section how to update from 3.0 to 3.1, ...)

PHPBB3-10045
2011-02-16 16:06:23 +01:00
Joas Schilling
528c54f0f7 [ticket/10045] Database updater version for 3.1-changes should be 3.1.0-dev
PHPBB3-10045
2011-02-16 11:29:49 +01:00
Joas Schilling
bcbbeacaf8 [ticket/9944] Add empty line before the while() so you can better read the code
PHPBB3-9944
2011-02-14 16:40:12 +01:00
Igor Wiedler
1cc5087c36 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8904] Show default value for numeric custom profile fields when editing
2011-02-13 18:33:27 +01:00
Niklas Schmidtmer
c717e44094 [ticket/8904] Show default value for numeric custom profile fields when editing
When displaying the default value for a numeric custom profile field, only use
request_var to obtain the value on creation. When editing, it will always
override the actual value with an empty string, as this is request_var's default
return value.

PHPBB3-8904
2011-02-13 18:32:11 +01:00
Oleg Pudeyev
4e689c522f [feature/system-cron] Added documentation for cron manager constructor.
PHPBB3-9596
2011-02-12 22:05:54 -05:00
Nils Adermann
92c278d39a [feature/system-cron] Remove an unecessary assignment and an unecessary comment
PHPBB3-9596
2011-02-12 22:05:54 -05:00
Nils Adermann
c6a8abb409 [feature/system-cron] Clarify comments about flush() call in cron.
PHPBB3-9596
2011-02-12 22:05:54 -05:00
Nils Adermann
7a2c5e618b [feature/system-cron] preg_match returns int so cast to bool, fix comment
PHPBB3-9596
2011-02-12 22:05:54 -05:00
Nils Adermann
2e47409e80 [feature/system-cron] Rename lock() to acquire and unlock() to release.
PHPBB3-9596
2011-02-12 22:05:54 -05:00
Nils Adermann
09b136272b [feature/system-cron] Cache cron's task names.
Instead of using a path relative to phpbb_root_path the path to the task
directory is directly passed to the cron manager. Dummy tasks are now
in the tests directory directly.

PHPBB3-9596
2011-02-12 22:05:54 -05:00
Nils Adermann
7a8233020b [feature/system-cron] Use a RecursiveDirectoryIterator instead of readdir.
PHPBB3-9596
2011-02-12 22:05:54 -05:00
Nils Adermann
9bc62056b2 [feature/system-cron] Add array type hints if appropriate and remove globals.
PHPBB3-9596
2011-02-12 22:05:53 -05:00
Nils Adermann
165b0ec0b2 [feature/system-cron] Make use of the new config class in locks.
PHPBB3-9596
2011-02-12 22:05:53 -05:00
Nils Adermann
3a3a8bb96d [feature/system-cron] Abstract the database locking mechanism out of cron.
Added a number of tests for the locking mechanism which can now lock
arbitrary config variables.

PHPBB3-9596
2011-02-12 22:05:53 -05:00
Oleg Pudeyev
53dd847dd5 [feature/system-cron] Added @param/@return documentation
Also adjusted some function descriptions for greater informativity.

PHPBB3-9596
2011-02-12 22:05:53 -05:00
Andreas Fischer
47702b8ca7 [feature/system-cron] Add phpDoc documentation for everything else.
PHPBB3-9596
2011-02-12 22:05:53 -05:00
Andreas Fischer
3c0561b68f [feature/system-cron] Cast result in cron_manager::is_valid_name() to bool.
PHPBB3-9596
2011-02-12 22:05:52 -05:00
Andreas Fischer
f4f8523ca3 [feature/system-cron] Add phpDoc documentation for phpbb_cron_manager class.
PHPBB3-9596
2011-02-12 22:05:52 -05:00
Andreas Fischer
134afe36e2 [feature/system-cron] Add phpDoc documentation for phpbb_cron_lock class.
PHPBB3-9596
2011-02-12 22:05:52 -05:00
Andreas Fischer
6fc11184e7 [feature/system-cron] Adjust SQL query style to follow coding guidelines.
PHPBB3-9596
2011-02-12 22:05:52 -05:00
Andreas Fischer
6235957aa1 [feature/system-cron] Fix indention in phpbb_cron_manager::load_tasks()
PHPBB3-9596
2011-02-12 22:05:52 -05:00
Andreas Fischer
afc538366b [feature/system-cron] Remove $Id$ from PHP file header
PHPBB3-9596
2011-02-12 22:05:52 -05:00