1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00

119 Commits

Author SHA1 Message Date
Igor Wiedler
a40bc114c0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10112] Replaced a couple occurrences of count() with sizeof()
2011-03-31 20:32:11 +02:00
Callum Macrae
657971754b [ticket/10112] Replaced a couple occurrences of count() with sizeof()
As per the coding guidlines, sizeof() should be used instead of count().

PHPBB3-10112
2011-03-30 11:30:27 +01:00
Andreas Fischer
f0facd4c9d [ticket/9766] Delete delete_code() from CAPTCHA classes as it's never called.
Delete phpbb_default_captcha:delete_code() and phpbb_captcha_qa::delete_code()
methods. We never call it and it has a bogus body.

PHPBB3-9766
2011-03-01 23:28:14 +01:00
Andreas Fischer
bafe3d9484 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9985] 3D Wave CAPTCHA: Pass min/max in the correct order to mt_rand().
  [ticket/9989] Skip PM popup in overall_header.html, if there are no new PMs.
2011-01-30 01:17:06 +01:00
Joas Schilling
b32bf5aa35 [ticket/9985] 3D Wave CAPTCHA: Pass min/max in the correct order to mt_rand().
PHPBB3-9985
2011-01-30 00:49:53 +01:00
Nils Adermann
6b1e343d8d [task/config-class] Always specify the config table to use.
PHPBB3-9988
2011-01-12 00:21:04 +01:00
Nils Adermann
fb2642bbc6 [task/config-class] Implemented a config class to replace the global array.
There is a phpbb_config class which simply holds an array and does not persist
any data. It implements ArrayAccess, Countable and IteratorAggregate to allow
regular use of configuration as if it was still an array. The phpbb_config_db
class depends on an instance of the dbal and a cache driver. It obtains the
configuration data from cache and database as necessary and persists data to
the database.

The functions set_config and set_config_count remain for backward compatability
but they only call methods on the new config class now instead of directly
manipulating the database and cache.

PHPBB3-9988
2011-01-10 04:05:23 +01:00
Igor Wiedler
af5b9a9640 [ticket/9556] Drop php closing tags, add trailing newline
Closing tags converted using Oleg's script.
remove-php-end-tags.py -a .

Trailing newlines added using the following where $ext is file extension.
find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s;

Extensions: php, css, html, js, xml.

PHPBB3-9556
2010-11-11 19:10:55 +01:00
Igor Wiedler
798e62b7b0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9804] Account evil3 renamed to igorw, adjust AUTHORS
  [ticket/9829] Fix error in recaptcha validation.
2010-10-04 17:25:00 +02:00
Cristian Rodriguez
68b35b5845 [ticket/9829] Fix error in recaptcha validation.
The recaptcha plugin falsely accepted error responses by recaptcha as valid
solutions.

PHPBB3-9829
2010-09-19 16:29:12 +02:00
Nils Adermann
2e787fa836 Merge branch 'develop-olympus' into develop
* develop-olympus: (57 commits)
  Revert "[ticket/7716] Data too long for column 'message_subject'"
  [ticket/7716] Data too long for column 'message_subject'
  [ticket/9780] Adding unit tests for gen_rand_string().
  [ticket/9780] Add length check back to gen_rand_string().
  [ticket/7972] Copying topics in the MCP now indexes the new topic.
  [ticket/9782] Board disable radio set on when server load high
  [ticket/9635] Useless parameter $data['post_time'] in function submit_post.
  [ticket/9104] Safari does not display box headers correctly in the ACP.
  [ticket/9777] Print error message in pre-commit hook when php is not installed.
  [ticket/7716] Data too long for column 'message_subject'
  [task/git-tools] Ignore git commit message comments
  [task/git-tools] Adjust the hook to enforce that a ticket is always mentioned
  [task/git-tools] Vastly expanded commit-msg hook.
  [task/git-tools] Beginnings of a syntax checking hook.
  [task/git-tools] Append ticket identifier to commit message prior to editing.
  [ticket/7332] Redirect users back to post details when performing actions.
  [ticket/7332] Collapse post details content down to a maximum of 300px heigh
  [ticket/9771] Remove query string parameters that have no name.
  [ticket/9760] Remove unrestricted wildcards from search terms.
  [ticket/9599] Reimplement phpbb_checkdnsrr() function.
  ...

Conflicts:
	tests/template/template.php
2010-08-21 23:35:43 +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
Andreas Fischer
c2b29c317f [ticket/9612] Introduce new function gen_rand_string_friendly().
Introduce new function gen_rand_string_friendly() for user friendly random
strings like passwords and captcha codes. Strings generated by
gen_rand_string_friendly() will not contain the characters 0 and O.

By adding a new function we can increase the entropy of strings
generated by gen_rand_string() by putting 0 and O back in.

PHPBB3-9612
2010-05-17 09:44:48 +02:00
Andreas Fischer
037aea067b Fix Bug #57455 - Fix problems with firebird by no longer using 'count' as a column alias.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10484 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-08 16:43:39 +00:00
Henry Sudhof
81e62b4da8 okay, now the confirm_id is no longer enough to get a new row into the qa table
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10459 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-26 15:34:21 +00:00
Henry Sudhof
62d7e3c634 erm, that wouldn't work
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10457 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-26 14:58:55 +00:00
Henry Sudhof
8a9c7c92be tuning
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10454 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-26 14:01:20 +00:00
Henry Sudhof
3e224cf856 debug code, begone
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10453 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-26 11:41:43 +00:00
Henry Sudhof
345de34ac1 tuning
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10451 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-26 11:07:47 +00:00
Henry Sudhof
b4c87cc504 ACP usability
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10450 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-26 10:57:00 +00:00
Andreas Fischer
f98ca7ce48 Make sure captcha factory is there. Make sure language array is there.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10431 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-20 00:20:46 +00:00
Chris Smith
af6c5dd41d Load reCAPTCHA over https when using a secure connection to the board. #55755
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10420 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-17 17:25:14 +00:00
Henry Sudhof
df5fa06035 ... and finally
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10239 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-27 13:54:03 +00:00
Henry Sudhof
d53f9a22d6 adding normalization - shouldn't change anything
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10238 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-27 12:36:55 +00:00
Henry Sudhof
44719bd041 #53235 - removing accidental commits
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10237 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-27 12:27:46 +00:00
Meik Sievertsen
b23f6c90ba fix spaces/tabs
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10236 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-27 11:17:53 +00:00
Henry Sudhof
56c8e34145 #53235
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10235 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-27 08:43:00 +00:00
Henry Sudhof
69746fe683 #52875 working around php4 bug 24631 - call_user_func doesn't return references. This causes php4 to create a copy.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10224 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-15 10:52:41 +00:00
Henry Sudhof
2a0a16bca3 #52875 working around php4 bug 24631 - call_user_func doesn't return references. This causes php4 to create a copy.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10223 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-15 10:51:32 +00:00
Henry Sudhof
19b417cee9 Fail without notices when no questions are provided
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10193 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-28 13:08:33 +00:00
Meik Sievertsen
90e1187601 Move add_log() call for captcha "configure" page to the captcha plugin, because only the plugin is able to know if the config got updated or not.
Note to captcha MOD authors: please check if you have a function acp_page() and if an add_log() call is required for your plugin.
Bug #51695

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10177 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-22 10:03:17 +00:00
Henry Sudhof
61c6c07abc #50485
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10173 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-21 11:36:36 +00:00
Meik Sievertsen
02b2cced5a beautify q&a captcha a bit (only slightly)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10116 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-07 11:57:58 +00:00
Andreas Fischer
19086ba572 Some rewording, some typo fixes, some whitespace changes.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10093 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-03 13:56:03 +00:00
Andreas Fischer
46e66c0401 Some cleanup.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10091 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-03 12:45:46 +00:00
Meik Sievertsen
604696f9a8 Correctly assign board administrator email for L_CONFIRM_EXPLAIN in captcha plugins.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10085 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-01 15:08:04 +00:00
Henry Sudhof
20ace274d6 #50025
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10034 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-20 14:42:38 +00:00
Henry Sudhof
ba3e0831ea erm, on the contrary; can that reset call
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9998 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-16 21:11:17 +00:00
Henry Sudhof
6cc55a3436 don't pick a new question without an explicit reset call
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9997 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-16 21:07:11 +00:00
Henry Sudhof
3896638727 append_sid
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9996 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-16 20:49:22 +00:00
Chris Smith
0393a6232b - #49775
- Some coding guidelines fixes


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9993 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-15 19:56:45 +00:00
Henry Sudhof
bc57fdc01c #49755
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9992 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-15 16:10:13 +00:00
Henry Sudhof
7c6229784b add back links
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9976 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-14 10:11:34 +00:00
Henry Sudhof
918e667587 #49675 #49655 - ATTENTION: small captcha API change
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9975 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-14 10:00:30 +00:00
Henry Sudhof
63cbd43b5e That's not supported by php4 and part of the full 3.1 system anyway
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9973 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-14 08:49:46 +00:00
Henry Sudhof
929fd29ce1 some fixes
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9968 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-12 22:03:14 +00:00
Henry Sudhof
af213166f3 some fixes
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9967 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-12 19:57:34 +00:00
Henry Sudhof
2547955b61 class name
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9942 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-10 09:46:38 +00:00
Henry Sudhof
bc8e507c64 include vs include_once
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9940 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-07 15:37:27 +00:00
Andreas Fischer
04263dfa31 Coding guidelines: Tiny whitespace change for an unreleased file.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9939 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-07 14:31:24 +00:00