1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-14 11:35:33 +02:00

1610 Commits

Author SHA1 Message Date
Meik Sievertsen
d75616c717 unfortunately we are not able to use db_tools - because we do not know the state it is in, therefore can't rely on it.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9405 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-03-24 12:24:55 +00:00
Meik Sievertsen
4cbf6bc703 Merge most changes from 3.0.x branch since the 25th december.
(Captcha changes for refreshing captcha image not included)

git-svn-id: file:///svn/phpbb/trunk@9404 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-03-22 16:34:26 +00:00
Meik Sievertsen
0f162568f2 Fix duplicate creation of acl options in acl_add_options() under certain conditions. (Bug #38385, #40225)
Add unique key to ACL options table to prevent duplicate permission options. (Bug #41835)


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9400 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-03-20 13:22:19 +00:00
Henry Sudhof
01078bb2fa captcha changes
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9390 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-03-17 16:04:58 +00:00
Chris Smith
3896f64ba5 Removed the major version number from the useragent match of the Ichiro bot, it has been upgraded
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9354 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-03-02 02:33:15 +00:00
Meik Sievertsen
62973fa504 - adjust db_tools again to not remove any schema (they may be required)
- fill dbms version if not yet filled

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9351 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-02-28 19:22:27 +00:00
Meik Sievertsen
bfa4e6038e refactor the database updater:
- no longer support versions prior 3.0.0
- more apparent place for adding schema/data changes
- use db_tools
- added check for wrong schema (MySQL 3x/4x schema on MySQL > 4.0)


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9350 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-02-28 19:20:29 +00:00
Meik Sievertsen
b27add94f8 $template to phpbb::$template
git-svn-id: file:///svn/phpbb/trunk@9337 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-02-22 18:56:09 +00:00
Meik Sievertsen
84f795e9fb $db-> to phpbb::$db->
git-svn-id: file:///svn/phpbb/trunk@9336 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-02-22 18:06:05 +00:00
Meik Sievertsen
794c574969 remove global and change $user-> to phpbb::$user->
git-svn-id: file:///svn/phpbb/trunk@9334 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-02-22 15:29:18 +00:00
Henry Sudhof
f42fe3b024 Actually, this should never happen, ... #41945
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9333 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-02-20 14:50:43 +00:00
Chris Smith
6ebd421299 Fix a problem with r9005
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9325 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-02-09 14:47:21 +00:00
Henry Sudhof
6f486b0499 and another CAPTCHA setting - add new noise shapes to the noise array for more variations.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9320 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-02-08 14:15:49 +00:00
Henry Sudhof
e5f0824e4b As proposed by marshalrusty: re-hash plain MD5s left in the database
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9312 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-02-06 14:51:26 +00:00
Meik Sievertsen
c5b70d5f60 tiny fix for the installer
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9300 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-01-23 12:13:19 +00:00
Meik Sievertsen
950842de5c add some properties
change phpbb_chmod to phpbb::$system->chmod()
also changed chmod behaviour to the most failsafe method. If we are not able to tell the exact outcome, we simply do not mess with it.

git-svn-id: file:///svn/phpbb/trunk@9296 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-01-22 15:59:00 +00:00
Meik Sievertsen
f245579adf adjust schema to support defining types of columns. This is required for dbms being very very strict.
git-svn-id: file:///svn/phpbb/trunk@9292 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-01-22 12:48:13 +00:00
Meik Sievertsen
9f060eba6e some adjustements to the installer
git-svn-id: file:///svn/phpbb/trunk@9284 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-01-21 17:03:00 +00:00
Henry Sudhof
7103900847 New option for the GD VC. Parameters need some more tweaking
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9283 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-01-21 13:37:50 +00:00
Meik Sievertsen
cd4091af43 i am not sure if people will like the config layout i test here... it requires the framework at least being present
git-svn-id: file:///svn/phpbb/trunk@9281 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-01-20 16:54:15 +00:00
Meik Sievertsen
14eb46cda0 Adjust some files to support new methods...
git-svn-id: file:///svn/phpbb/trunk@9279 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-01-19 15:24:24 +00:00
Meik Sievertsen
5a263f76a9 "are you serious?" - "yes, sure" - "wow, install works, you are right" - "i told you"
git-svn-id: file:///svn/phpbb/trunk@9277 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-01-16 17:57:28 +00:00
Meik Sievertsen
46f666556b schema data and schema structure for installations
the schema files could be generated on backups too to allow "pleasant" restores and even migrating from one DBMS to another with ease
the schema data is now replication compatible, no longer relying on set auto increment id's we guessed before. hoooorrraaayyyy

git-svn-id: file:///svn/phpbb/trunk@9274 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-01-16 17:42:46 +00:00
Meik Sievertsen
a111b8798c remove the data sql file ;)
git-svn-id: file:///svn/phpbb/trunk@9273 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-01-16 17:41:25 +00:00
Meik Sievertsen
c16b6c4f1c rename schema_data.php to schema_structure.php because it holds the schema structure and not the schema data
git-svn-id: file:///svn/phpbb/trunk@9262 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-01-15 16:05:56 +00:00
Meik Sievertsen
fce20fd898 TortoiseMerge seems to mess up the newlines... very very annoying bug.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9254 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-01-13 10:55:04 +00:00
Meik Sievertsen
189e7cdf45 - Allow download of conflicting file for later reference in automatic updater
- Default difference view is now 'inline' instead of 'side by side'
- Added new option for merging differences to conflicting files in automatic updater


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9252 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-01-12 16:58:47 +00:00
Meik Sievertsen
19aed179e5 $config to phpbb::$config
git-svn-id: file:///svn/phpbb/trunk@9242 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-28 23:30:09 +00:00
Meik Sievertsen
889fa87140 implement new phpbb::$acm object, replacing $cache global
git-svn-id: file:///svn/phpbb/trunk@9240 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-28 13:27:58 +00:00
Meik Sievertsen
25725c9850 replace constants with class constants.
ACL_YES, ACL_NO, ACL_NEVER, USER_NORMAL, USER_IGNORE, USER_INACTIVE, USER_FOUNDER

git-svn-id: file:///svn/phpbb/trunk@9233 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-27 12:18:04 +00:00
Meik Sievertsen
5b9a3c9a7d add nils' request and super globals class
rename request:: to phpbb_request::

git-svn-id: file:///svn/phpbb/trunk@9230 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-25 14:47:57 +00:00
Meik Sievertsen
3cd007c49d change cache:: to phpbb_cache::
git-svn-id: file:///svn/phpbb/trunk@9226 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-24 14:44:19 +00:00
Meik Sievertsen
e85f9f79bc remove no longer necessary files... hooray
git-svn-id: file:///svn/phpbb/trunk@9221 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-24 13:14:24 +00:00
Meik Sievertsen
6b19ba450e up to 3.0.5-dev
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9209 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-20 13:35:42 +00:00
Meik Sievertsen
0481a574ce Change version number from 3.0.4-RC1 to 3.0.4
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9187 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-12 14:47:03 +00:00
Meik Sievertsen
83839139e6 dumdidum...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9155 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-02 17:13:34 +00:00
Meik Sievertsen
0d92e30b38 extend the style columns (style_id, template_id, imageset_id, image_id...)
No, not only because of possible style demos. :o

git-svn-id: file:///svn/phpbb/trunk@9130 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-27 13:46:54 +00:00
Meik Sievertsen
481e5c193f extend the style columns (style_id, template_id, imageset_id, image_id...)
No, not only because of possible style demos. :o

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9129 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-27 13:44:24 +00:00
Meik Sievertsen
fb77cdd051 Better handling and finer control for custom profile fields visibility options. (Patch by Highway of Life)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9127 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-26 19:58:35 +00:00
Nils Adermann
9954d9c29f - merge r9113: Handle checking for duplicate usernames in chunks (Bug #17285 - Patch by A_Jelly_Doughnut)
git-svn-id: file:///svn/phpbb/trunk@9114 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-24 19:31:44 +00:00
Nils Adermann
05e8d9ee09 Ha- ndle checking for duplicate usernames in chunks (Bug #17285 - Patch by A_Jelly_Doughnut)t)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9113 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-24 19:23:23 +00:00
Nils Adermann
07e9b83a3d - updated all code to use the request class instead of any direct access to
super globals
- disabled super globals in common.php. See commit r9101 for
  more information
- cleaned up/simplified a few lines along the way.

git-svn-id: file:///svn/phpbb/trunk@9102 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-24 00:20:33 +00:00
Meik Sievertsen
d46e8e6f98 merge revisions i missed... hopefully not breaking things - did not check every change.
git-svn-id: file:///svn/phpbb/trunk@9077 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-22 19:38:25 +00:00
Chris Smith
4a38e5cc3f Before we forget
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9066 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-14 02:01:04 +00:00
Chris Smith
ef0c0d4c82 been a while :( ... merge in r8997, r8998, r8999, r9000, r9001, r9002, r9003, r9004, r9005, r9007, r9008, r9009, r9010, r9011, r9012, r9013, r9014, r9015, r9022, r9023, r9029, r9030, r9034, r9048, r9049, r9054, r9056
git-svn-id: file:///svn/phpbb/trunk@9064 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-13 13:04:54 +00:00
Meik Sievertsen
40fa01b9f0 gah, forgot this tiny little thing...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9058 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-12 20:26:36 +00:00
Meik Sievertsen
c185c3b64b Fix Bug #36535 (PHP 5.3 compatibility) + version number updates (if RC2 will be released we will change it again. ;))
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9050 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-08 20:02:22 +00:00
Chris Smith
538acb3db5 Remove deprecated language key and update any references in the database to the correct one.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9049 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-05 22:03:16 +00:00
Meik Sievertsen
f353fd2d57 db_tools from static to non-static due to the db dependancy (#31245)
git-svn-id: file:///svn/phpbb/trunk@9044 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-02 11:36:13 +00:00
Meik Sievertsen
c903b453fa i had these changes sitting... must've been a merge not committed (and because we do not use svn 1.5 as the client version i am not able to say which they were)
git-svn-id: file:///svn/phpbb/trunk@9042 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-02 11:22:30 +00:00