1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-26 13:04:24 +01:00

10082 Commits

Author SHA1 Message Date
Andreas Fischer
eeb65d2958 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9637] Do not cache SQL server version in all cases
  [ticket/9629] Allow style.php to retrieve its session ID from cookies
  [ticket/9678] Flash attachments are not displayed in subsilver2.
  [ticket/9677] Subsilver2 is missing the bbcode-helpline for inline-attachments.
  [ticket/9650] Do not allow banning the anonymous user by username

Conflicts:
	phpBB/styles/subsilver2/template/attachment.html
	phpBB/styles/subsilver2/template/posting_buttons.html
2010-07-11 01:54:03 +02:00
Andreas Fischer
2d9aa45aef Merge branch 'ticket/jellydoughnut/9637' into develop-olympus
* ticket/jellydoughnut/9637:
  [ticket/9637] Do not cache SQL server version in all cases
2010-07-11 01:44:59 +02:00
Josh Woody
9c61455d26 [ticket/9637] Do not cache SQL server version in all cases
Because the existing cache is global, there is no way to differentiate between
each of two databases which may be two different DBAL objects pointing to
servers with wildly different versions of an RDBMS. phpBB only has this
situation in the UCF, thus only one file changed outside the DBAL. I have
added a second optional parameter, $use_cache to each of the implementations
of dbal::sql_server_info()

PHPBB3-9637
2010-07-11 01:41:38 +02:00
Andreas Fischer
08a34ebe94 Merge branch 'ticket/jellydoughnut/9629' into develop-olympus
* ticket/jellydoughnut/9629:
  [ticket/9629] Allow style.php to retrieve its session ID from cookies
2010-07-11 01:41:22 +02:00
Josh Woody
c40b2c7601 [ticket/9629] Allow style.php to retrieve its session ID from cookies
style.php takes a session ID to ensure it gets the right language for a user,
but that session ID is always passed in GET. This allows change allows the SID
to be read from the cookie, and theoretically makes it friendlier for caching
engines like Varnish.

PHPBB3-9629
2010-07-11 01:35:01 +02:00
Andreas Fischer
e46745ed34 Merge branch 'ticket/nickvergessen/9678' into develop-olympus
* ticket/nickvergessen/9678:
  [ticket/9678] Flash attachments are not displayed in subsilver2.
2010-07-10 21:22:33 +02:00
Andreas Fischer
e629929958 Merge branch 'ticket/nickvergessen/9677' into develop-olympus
* ticket/nickvergessen/9677:
  [ticket/9677] Subsilver2 is missing the bbcode-helpline for inline-attachments.
2010-07-10 21:22:31 +02:00
Andreas Fischer
0c2512bea2 Merge branch 'ticket/jellydoughnut/9650' into develop-olympus
* ticket/jellydoughnut/9650:
  [ticket/9650] Do not allow banning the anonymous user by username
2010-07-10 21:22:16 +02:00
Joas Schilling
df99bdbd53 [ticket/9678] Flash attachments are not displayed in subsilver2.
PHPBB3-9678
2010-07-08 21:22:54 +02:00
Joas Schilling
fc89d5d7db [ticket/9677] Subsilver2 is missing the bbcode-helpline for inline-attachments.
PHPBB3-9677
2010-07-08 21:13:17 +02:00
Josh Woody
ae967d16f1 [ticket/9650] Do not allow banning the anonymous user by username
Banning anonymous can result in bad things, like not being able to log in.  However, it was possible until now.

PHPBB3-9650
2010-07-08 13:24:45 -05:00
Andreas Fischer
a2918fd98e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9704] Fix minor typo in coding guidelines.
  [ticket/9690] Add forthcoming Bing Bot to list of recognized bots
  [ticket/9451] Add optional $can_upload parameter to avatar_process_user().
  [ticket/9593] A readme file for unit tests and running unit tests.
  [ticket/9570] Changed "system" to "guest" timezone in ACP, added explanation.
  [ticket/9589] Added sample nginx configuration file for phpbb.
2010-07-08 20:10:17 +02:00
Andreas Fischer
6da582e8be Merge branch 'ticket/p/9570' into develop-olympus
* ticket/p/9570:
  [ticket/9570] Changed "system" to "guest" timezone in ACP, added explanation.
2010-07-08 20:02:34 +02:00
Andreas Fischer
29716cd5d5 Merge branch 'ticket/p/9589' into develop-olympus
* ticket/p/9589:
  [ticket/9589] Added sample nginx configuration file for phpbb.
2010-07-08 20:01:22 +02:00
Andreas Fischer
7a0b554724 Merge branch 'ticket/p/9593' into develop-olympus
* ticket/p/9593:
  [ticket/9593] A readme file for unit tests and running unit tests.
2010-07-08 20:00:26 +02:00
Andreas Fischer
c3db21bfa2 Merge branch 'ticket/bantu/9451' into develop-olympus
* ticket/bantu/9451:
  [ticket/9451] Add optional $can_upload parameter to avatar_process_user().
2010-07-08 19:52:29 +02:00
Andreas Fischer
f92c96d424 Merge branch 'ticket/jellydoughnut/9690' into develop-olympus
* ticket/jellydoughnut/9690:
  [ticket/9690] Add forthcoming Bing Bot to list of recognized bots
2010-07-08 19:49:22 +02:00
Andreas Fischer
c86f9eb25a Merge branch 'ticket/evil3/9704' into develop-olympus
* ticket/evil3/9704:
  [ticket/9704] Fix minor typo in coding guidelines.
2010-07-08 19:44:39 +02:00
Igor Wiedler
58cb46d344 [ticket/9704] Fix minor typo in coding guidelines.
PHPBB3-9704
2010-07-08 09:15:03 +02:00
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
Josh Woody
d00f2ec183 [ticket/9690] Add forthcoming Bing Bot to list of recognized bots
Microsoft will rename MSN Bot to Bing Bot later this year, and change its user agent.  This updates phpBB to be aware of Bing Bot

PHPBB3-9690
2010-07-07 15:51:31 -05:00
Thatbitextra
e130a6bad9 [ticket/9451] Add optional $can_upload parameter to avatar_process_user().
Avoid unnecessary overhead in avatar_process_user() by optionally passing in
the value of $can_upload.

PHPBB3-9451
2010-07-07 16:45:00 +02:00
Oleg Pudeyev
030f9c03c6 [ticket/9593] A readme file for unit tests and running unit tests.
Added a readme file explaining prerequisites for unit tests, and how to run
unit tests.

PHPBB3-9593
2010-07-07 16:10:13 +02: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
Oleg Pudeyev
097854ca85 [ticket/9570] Changed "system" to "guest" timezone in ACP, added explanation.
PHPBB3-9570
2010-07-06 13:14:04 +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