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

4534 Commits

Author SHA1 Message Date
Oleg Pudeyev
7554469b6b [ticket/10070] Fixed line endings after ticket/9549.
PHPBB3-10070
2011-03-01 17:47:42 -05:00
Oleg Pudeyev
448df1cdf5 Merge branch 'ticket/9549' into develop
* ticket/9549:
  [ticket/9549] Display users in their primary group instead of their first group
  [ticket/9549] Change default value of "sort legend by group name" to false.
  [ticket/9549] Fix displaying empty groups
  [ticket/9549] Fix language strings.
  [ticket/9549] Only add group to legend/teampage when the checkbox is checked.
  [ticket/9549] New method move() to move a group more than 1 up/down.
  [ticket/9549] Fix some minor issues with descriptions and coding-guidelines.
  [ticket/9549] Throw an error when the given field-name is invalid.
  [ticket/9549] Make the class non static and extend delete_group function.
  [ticket/9549] Add template changes for subsilver2.
  [ticket/9549] Enhance teampage and legend functionality
  [ticket/9549] Add the module and files for the ACP.
  [ticket/9549] Update database with the new config values and columns
  [ticket/9549] Enhance teampage functionality with a new class, group_positions.

Conflicts:
	phpBB/install/database_update.php
2011-03-01 16:57:00 -05:00
Igor Wiedler
597311ba6b [feature/request-class] Fix the error message when accessing superglobal
Adjust the misleading "This error message was generated" text.

PHPBB3-9716
2011-02-28 08:04:40 +01:00
Igor Wiedler
80a063ac34 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10024] Populate unread information to template for styling issues.
2011-02-28 01:03:55 +01:00
Igor Wiedler
bda64edae8 Merge branch 'ticket/nickvergessen/10024' into develop-olympus
* ticket/nickvergessen/10024:
  [ticket/10024] Populate unread information to template for styling issues.
2011-02-28 01:03:44 +01:00
Igor Wiedler
ab3f45c0e9 Merge branch 'ticket/hanakin/10001' into develop
* ticket/hanakin/10001:
  [ticket/10001]  Created the new styles within colours.css to handle the displaying of the forum & topic images
  [ticket/10001]  Created new Template variable to house class names based on $folder_img value, Modified prosilver template files to utilize class for forum & topic images through out template via the newly created Template variable, Created the new styles within colours.css to handle the displaying of the forum & topic images
2011-02-28 00:07:59 +01:00
Philippe Chevrier
ffe691db10 [ticket/10024] Populate unread information to template for styling issues.
PHPBB3-10024
2011-02-28 00:00:56 +01:00
mtrs
1d122f56bb [ticket/8641] Added/removed several commas for consistency in acp_board.php.
PHPBB3-8641
2011-02-26 08:37:01 -05:00
Oleg Pudeyev
bbc531061f Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9912] Fix error in logic. Do not strip SID when user is not a bot.
2011-02-26 08:05:55 -05:00
Andreas Fischer
3b15fe0a5b [ticket/9912] Fix error in logic. Do not strip SID when user is not a bot.
This also moves the code up to the point where we know that the user is a bot.

Regression from d07e152ea7e820c5a0e47aeb8004fa0b5621a314

PHPBB3-9912
2011-02-25 22:24:34 -05:00
Oleg Pudeyev
ee0db1a1d5 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9874] view_log() performs unneeded count query over all log entries.
  [ticket/7834] Topic time didn't update when first post was deleted
  [ticket/9997] Fixed an inconsistency in the Moderator Control Panel
  [ticket/9872] Removed some useless code that broke delete_posts
2011-02-24 20:59:19 -05:00
Oleg Pudeyev
904bcb86a0 Merge branch 'ticket/callumacrae/7834' into develop-olympus
* ticket/callumacrae/7834:
  [ticket/7834] Topic time didn't update when first post was deleted
2011-02-24 20:56:42 -05:00
Oleg Pudeyev
e6ed55a9c1 Merge branch 'ticket/callumacrae/9872' into develop-olympus
* ticket/callumacrae/9872:
  [ticket/9872] Removed some useless code that broke delete_posts
2011-02-24 20:48:17 -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
Callum Macrae
9399c7c46b [ticket/7834] Topic time didn't update when first post was deleted
When the first post of a topic was deleted, the topic time didn't
update - it should have changed to the time of the next post.

This commit simply applies lefty74's patch posted in the ticket. It gets
the post time of the next post from the database, and updates the thread
accordingly.

This patch is not my work at all and all credits go to lefty74, I just
transferred it onto GitHub

PHPBB3-7834
2011-02-24 22:36:35 +00:00
Callum Macrae
e6219c83c7 [ticket/9872] Removed some useless code that broke delete_posts
When in the ACP, there is the option to delete a user and all their
posts. This would then call the user_delete function and define $mode as
'remove'.

On lines 485-521 was some code that would delete their topics, then
after that there would be a call to delete_posts - which would also
delete their topics. It would not update the board statistics, and the
thread count would remain the same, even though several had been
deleted. It stopped delete_topics functioning correctly, so
delete_topics would not update the board statistics either.

My solution to this is to delete lines 485-521 and allow delete_posts
to call delete_topics, thus updating the thread count in the statistics.

PHPBB3-9872
2011-02-24 14:53:44 +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
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
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
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
Joas Schilling
d9f092a18b [ticket/9549] Only add group to legend/teampage when the checkbox is checked.
The checkbox for the teampage was also missing from the template file.

PHPBB3-9549
2011-02-17 23:59:41 +01:00
Joas Schilling
f908a01661 [ticket/9549] New method move() to move a group more than 1 up/down.
PHPBB3-9549
2011-02-16 18:22:32 +01:00
Joas Schilling
d2e2ccf8a4 [ticket/9549] Fix some minor issues with descriptions and coding-guidelines.
PHPBB3-9549
2011-02-16 18:22:31 +01:00
Joas Schilling
ad05f32c49 [ticket/9549] Throw an error when the given field-name is invalid.
Also the code now only appends an adm_back_link, when we are in the ACP.

PHPBB3-9549
2011-02-16 18:22:30 +01:00
Joas Schilling
8d12838aed [ticket/9549] Make the class non static and extend delete_group function.
delete_group() can now be used, so it does not update the actual group.
This can save a query, when you update the group anyway.

PHPBB3-9549
2011-02-16 18:22:29 +01:00
Joas Schilling
4f2b0d9d42 [ticket/9549] Add the module and files for the ACP.
PHPBB3-9549
2011-02-16 18:21:48 +01:00
Joas Schilling
b7d3d57b70 [ticket/9549] Enhance teampage functionality with a new class, group_positions.
PHPBB3-9549
2011-02-16 18:19:51 +01: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
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
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
Igor Wiedler
4302dab5fa [feature/system-cron] coding guidelines adjustments
PHPBB3-9596
2011-02-12 22:05:52 -05:00
Igor Wiedler
e48b850ab5 [feature/system-cron] use phpbb_request instead of plain superglobals
PHPBB3-9596
2011-02-12 22:05:52 -05:00