1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-23 07:50:16 +02:00

10058 Commits

Author SHA1 Message Date
Andreas Fischer
31b221ae91 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9712] Future dates can be formatted as 'less than one minute ago'
  [ticket/9659] Signature options in set_user_options
  [ticket/9703] Correct database leak where deleting user did not rm some PM data
  [ticket/9697] Backlink broken when the select parent forum does not exist.
  [ticket/9695] Correct the improper display of user input in mcp_ban.php
  [ticket/9628] _add_module 'after'-parameter does not work correctly.
  [ticket/9578] ACP Posting tab is missing "Post settings" module.
2010-07-08 03:06:41 +02:00
Andreas Fischer
c79df9700d Merge branch 'ticket/nickvergessen/9578' into develop-olympus
* ticket/nickvergessen/9578:
  [ticket/9578] ACP Posting tab is missing "Post settings" module.
2010-07-08 02:20:25 +02:00
Andreas Fischer
c592cab989 Merge branch 'ticket/nickvergessen/9628' into develop-olympus
* ticket/nickvergessen/9628:
  [ticket/9628] _add_module 'after'-parameter does not work correctly.
2010-07-08 02:20:05 +02:00
Andreas Fischer
f22f89888d Merge branch 'ticket/jellydoughnut/9695' into develop-olympus
* ticket/jellydoughnut/9695:
  [ticket/9695] Correct the improper display of user input in mcp_ban.php
2010-07-08 01:41:16 +02:00
Andreas Fischer
c091a04a55 Merge branch 'ticket/nickvergessen/9697' into develop-olympus
* ticket/nickvergessen/9697:
  [ticket/9697] Backlink broken when the select parent forum does not exist.
2010-07-08 01:29:47 +02:00
Andreas Fischer
e3fe4d7b56 Merge branch 'ticket/jellydoughnut/9703' into develop-olympus
* ticket/jellydoughnut/9703:
  [ticket/9703] Correct database leak where deleting user did not rm some PM data
2010-07-08 01:24:18 +02:00
Andreas Fischer
ef753d046d Merge branch 'ticket/cs278/9712' into develop-olympus
* ticket/cs278/9712:
  [ticket/9712] Future dates can be formatted as 'less than one minute ago'
2010-07-08 01:21:55 +02:00
Chris Smith
9764a32138 [ticket/9712] Future dates can be formatted as 'less than one minute ago'
PHPBB3-9712
2010-07-07 23:04:46 +01:00
Andreas Fischer
4ac5d5e352 Merge branch 'ticket/naderman/9659' into develop-olympus
* ticket/naderman/9659:
  [ticket/9659] Signature options in set_user_options
2010-07-07 12:09:04 +02:00
Richard Foote
b64f456c40 [ticket/9659] Signature options in set_user_options
The phpBB3 defaults are being used.

PHPBB3-9659
2010-07-06 14:43:50 +02:00
Nils Adermann
dea1d660fb [feature/auto-loading] Added autoloader to common and ensured compatability
The autoloader is registered in install without caching, since caching is set
up during installation. This provides the same functionality, performance is
not a concern during installation anyway.

In common.php the autoloader is instantiated after the cache is initialised and
is started with the standard cache backend used for other cached values.

A few places in the code using class_exists had to be updated to explicitly
avoid autoloading, since they are used to check whether a file needs to be
included which does not (yet) follow the naming scheme the autoloader follows.

PHPBB3-9682
2010-07-05 15:40:46 +02:00
Nils Adermann
22c3041e12 [feature/auto-loading] Added a phpBB autoloader with caching support.
phpBB class name lookups follow these rules:
 - All classes are prefixed with phpbb_
 - All classes reside in includes/ or a subdirectory thereof
 - Directories must not contain underscores
 - The class name is separated into parts by underscores, the parts
   are checked from first to last, until one is found which is not
   a directory, all remaining parts make up the file name. If no parts
   are left, the last directory name is used.

Examples:
  directory structure:
    includes/
      class_name.php
      dir/
        class_name.php
        dir.php
        subdir/
          class_name.php

  lookups:
    phpbb_class_name            -> includes/class_name.php
    phpbb_dir_class_name        -> includes/dir/class_name.php
    phpbb_dir                   -> includes/dir/dir.php
    phpbb_dir_subdir_class_name -> includes/dir/subdir/class_name.php

Optionally the class can be supplied with a cache instance, either in the
constructor or via set_cache() at a later time. This allows for the lookups to
be cached, so the directories do not have to be traveresed on every request.
This makes it necessary for the cache and its dependency to continue to be
loaded the old way - without autoloading.

The code will not be changed to use autoloading, but it will rather only be
used for new classes where applicable.

PHPBB3-9682
2010-07-05 15:40:46 +02:00
Nils Adermann
55a22363fa Merge branch 'task/coding-guidelines' into develop
* task/coding-guidelines:
  [task/coding-guidelines] Class member qualifier guidelines
  [task/coding-guidelines] Added a section about class names.
  [task/coding-guidelines] Coding guideline update: Class names, eval, VCS, EOF
2010-07-04 16:41:01 +02:00
Nils Adermann
d8ff43c080 [task/coding-guidelines] Class member qualifier guidelines
Use private, protected or public instead of var.
Use static public instead of public static.
Use class constants instead of define().

PHPBB3-9557
2010-07-04 16:16:13 +02:00
Nils Adermann
e7cc707931 [task/coding-guidelines] Added a section about class names.
The class naming / autoloading RFC is located on area51:
    http://area51.phpbb.com/phpBB/viewtopic.php?f=84&t=33237

PHPBB3-9557
2010-07-04 16:04:33 +02:00
Nils Adermann
163a0974a3 [task/coding-guidelines] Coding guideline update: Class names, eval, VCS, EOF
- Class names need to be prefixed with phpbb_
- eval should not be used in any form
- there should be newlines at the end of file
- the closing php tag should be ommited
- array elements should always have a trailing comma
- the phpBB VCS is now git
- removed the coding guidelines changelog

PHPBB3-9557
2010-07-04 16:04:27 +02:00
Josh Woody
24cc3fd0f9 [ticket/9703] Correct database leak where deleting user did not rm some PM data
Users' PM rules and PM folders were being left intact when deleting them.

PHPBB3-9703
2010-07-03 21:21:22 -05:00
Joas Schilling
0db657381b [ticket/9697] Backlink broken when the select parent forum does not exist.
PHPBB3-9697
2010-07-02 12:28:06 +02:00
Josh Woody
0e93d8386b [ticket/9695] Correct the improper display of user input in mcp_ban.php
Correct the improper display of "ban_reason" and "ban_give_reason" in mcp_ban.php

PHPBB3-9695
2010-07-01 17:48:32 -05:00
Andreas Fischer
50f5455d66 Merge branch 'ticket/bantu/8212' into develop
* ticket/bantu/8212:
  [ticket/8212] Tiny 'typo in comment' fix
2010-06-20 22:50:30 +02:00
Andreas Fischer
7d6545bd09 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9653] Valid XHTML with code BBCode in subsilver2 viewtopic signatures
  [ticket/9656] Remove @ from phpinfo() to get correct error_reporting value.
  [ticket/9665] Allow preview of signature when it is the string "0".
  [ticket/9112] Make sure current user can see most active forum/topic.
  [ticket/9655] Pass E_USER_WARNING, so it doesn't look like a successful action.
  [ticket/9643] Only split $port from $sqlserver, if it's not an IPv6 address.

Conflicts:
	phpBB/styles/subsilver2/template/ucp_profile_signature.html
	phpBB/styles/subsilver2/template/viewtopic_body.html
2010-06-20 22:50:10 +02:00
Andreas Fischer
b7ae0fe4e9 Merge branch 'ticket/bantu/9655' into develop-olympus
* ticket/bantu/9655:
  [ticket/9655] Pass E_USER_WARNING, so it doesn't look like a successful action.
2010-06-20 22:46:23 +02:00
Andreas Fischer
352c69f7b2 Merge branch 'ticket/bantu/9665' into develop-olympus
* ticket/bantu/9665:
  [ticket/9665] Allow preview of signature when it is the string "0".
2010-06-20 22:46:14 +02:00
Andreas Fischer
d537dc60ce Merge branch 'ticket/bantu/9656' into develop-olympus
* ticket/bantu/9656:
  [ticket/9656] Remove @ from phpinfo() to get correct error_reporting value.
2010-06-20 22:45:55 +02:00
Andreas Fischer
b91950d413 Merge branch 'ticket/bantu/9653' into develop-olympus
* ticket/bantu/9653:
  [ticket/9653] Valid XHTML with code BBCode in subsilver2 viewtopic signatures
2010-06-20 22:45:47 +02:00
Andreas Fischer
3496948b94 Merge branch 'ticket/bantu/9643' into develop-olympus
* ticket/bantu/9643:
  [ticket/9643] Only split $port from $sqlserver, if it's not an IPv6 address.
2010-06-20 22:45:28 +02:00
Andreas Fischer
6b1f7a2d9d Merge branch 'ticket/bantu/9112' into develop-olympus
* ticket/bantu/9112:
  [ticket/9112] Make sure current user can see most active forum/topic.
2010-06-20 22:45:16 +02:00
Andreas Fischer
ac45f07402 [ticket/9653] Valid XHTML with code BBCode in subsilver2 viewtopic signatures
PHPBB3-9653
2010-06-20 21:48:07 +02:00
Andreas Fischer
52c3b51c95 [ticket/9656] Remove @ from phpinfo() to get correct error_reporting value.
PHPBB3-9656
2010-06-20 21:43:56 +02:00
Andreas Fischer
6221ba4dd1 [ticket/9665] Allow preview of signature when it is the string "0".
Since only the SIGNATURE_PREVIEW parameter is evaluated in the templates
<!-- IF SIGNATURE_PREVIEW --> will not allow the signature to be "0".
<!-- IF SIGNATURE_PREVIEW != '' --> however does allow "0".

PHPBB3-9665
2010-06-20 13:38:36 +02:00
Andreas Fischer
389c24044a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9132] Oracle CLOB support is broken, preventing storage of long strings
  [ticket/9606] Optimize unread search option.
2010-06-17 19:18:18 +02:00
Andreas Fischer
6d248097e5 Merge branch 'ticket/jellydoughnut/9132' into develop-olympus
* ticket/jellydoughnut/9132:
  [ticket/9132] Oracle CLOB support is broken, preventing storage of long strings
2010-06-17 19:15:17 +02:00
Andreas Fischer
4eac7dca6d Merge branch 'ticket/rxu/9606' into develop-olympus
* ticket/rxu/9606:
  [ticket/9606] Optimize unread search option.
2010-06-17 19:10:59 +02:00
Andreas Fischer
cf1b0202da Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9626] Adding tests for the URL regular expression.
  [ticket/9626] Add missing class prefix.
  [ticket/9626] A few tests for the email regular expression.
  [ticket/9626] More IPv6 regex tests.
  [ticket/9626] Adding tests for the IPv4 regular expression.
  [ticket/9626] Adding tests for regular expressions.
2010-06-17 18:56:52 +02:00
Andreas Fischer
876a6e4686 Merge branch 'ticket/bantu/9626' into develop-olympus
* ticket/bantu/9626:
  [ticket/9626] Adding tests for the URL regular expression.
  [ticket/9626] Add missing class prefix.
  [ticket/9626] A few tests for the email regular expression.
  [ticket/9626] More IPv6 regex tests.
  [ticket/9626] Adding tests for the IPv4 regular expression.
  [ticket/9626] Adding tests for regular expressions.
2010-06-17 18:50:41 +02:00
Andreas Fischer
db4ab58d92 Merge branch 'task/naderman/drop-subsilver2' into develop
* task/naderman/drop-subsilver2:
  [task/drop-subsilver2] Removing subsilver2 for Ascraeus development.

Conflicts:
	phpBB/styles/subsilver2/template/ucp_pm_message_footer.html
	phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html
2010-06-17 18:43:05 +02:00
Andreas Fischer
6cb574d03c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9587] Replace '0px' with '0'.
  [ticket/9605] Wrong class added to topiclist, when there's no announcement topic.
2010-06-17 18:37:53 +02:00
Andreas Fischer
26057fe3ff Merge branch 'ticket/bantu/9587' into develop-olympus
* ticket/bantu/9587:
  [ticket/9587] Replace '0px' with '0'.
2010-06-17 18:35:53 +02:00
Andreas Fischer
4bc2158235 [ticket/9587] Replace '0px' with '0'.
This has been introduced by merge of c7a25c58b893fc72ffb3746374ece9de1d388531, which was not supposed to be merged. 1b2a65333b5be1f6086bbd1d438e061041bd2b75 was supposed to be merged instead.

PHPBB3-9587
2010-06-17 17:01:13 +02:00
Andreas Fischer
f9105084b0 Merge branch 'ticket/nickvergessen/9605' into develop-olympus
* ticket/nickvergessen/9605:
  [ticket/9605] Wrong class added to topiclist, when there's no announcement topic.
2010-06-17 16:47:48 +02:00
Andreas Fischer
478f8052ff Merge branch 'develop-olympus' into develop
* develop-olympus:
  [feature/dbal-tests] Follow the coding guidelines and ...
  [feature/dbal-tests] Update data
  [feature/dbal-tests] Multi insert
  [feature/dbal-tests] Delete data
  [feature/dbal-tests] Insert data
  [feature/dbal-tests] Fix SQL-ERROR: invalid input syntax for integer: ""
  [ticket/9587] Prosilver overrides reCaptcha class.
  [ticket/9605] Wrong class added to topiclist, when there's no announcement topic.
2010-06-17 16:33:48 +02:00
Andreas Fischer
9975d24b9d Merge branch 'ticket/nickvergessen/9605' into develop-olympus
* ticket/nickvergessen/9605:
  [ticket/9605] Wrong class added to topiclist, when there's no announcement topic.
2010-06-17 16:31:38 +02:00
Andreas Fischer
84e58260ae Merge branch 'ticket/nickvergessen/9587' into develop-olympus
* ticket/nickvergessen/9587:
  [ticket/9587] Prosilver overrides reCaptcha class.
2010-06-17 16:27:25 +02:00
Andreas Fischer
8d18b98e15 Merge branch 'feature/bantu/dbal-tests' into develop-olympus
* feature/bantu/dbal-tests:
  [feature/dbal-tests] Follow the coding guidelines and ...
  [feature/dbal-tests] Update data
  [feature/dbal-tests] Multi insert
  [feature/dbal-tests] Delete data
  [feature/dbal-tests] Insert data
  [feature/dbal-tests] Fix SQL-ERROR: invalid input syntax for integer: ""
2010-06-17 16:17:06 +02:00
Joas Schilling
ef69f22698 [feature/dbal-tests] Follow the coding guidelines and ...
resolved a bug caused by a missing order-by.

PHPBB3-9625
2010-06-17 16:06:17 +02:00
Joas Schilling
e3420de295 [feature/dbal-tests] Update data
PHPBB3-9625
2010-06-17 16:06:10 +02:00
Joas Schilling
d9c2e6cbcf [feature/dbal-tests] Multi insert
PHPBB3-9625
2010-06-17 16:06:10 +02:00
Joas Schilling
c4b0814c62 [feature/dbal-tests] Delete data
PHPBB3-9625
2010-06-17 16:06:10 +02:00
Joas Schilling
539ae0ffaf [feature/dbal-tests] Insert data
PHPBB3-9625
2010-06-17 16:06:10 +02:00
Joas Schilling
b03a7a2c83 [feature/dbal-tests] Fix SQL-ERROR: invalid input syntax for integer: ""
PHPBB3-9625
2010-06-17 16:06:10 +02:00