GitHub/WoltLab/WCF.git
11 years agoProperly handle extending a class with the same name in Sniff
Tim Düsterhus [Sat, 5 Jan 2013 17:26:25 +0000 (18:26 +0100)]
Properly handle extending a class with the same name in Sniff

Fixes #1082

11 years agoFixes coding style
Matthias Schmidt [Sat, 5 Jan 2013 17:08:23 +0000 (18:08 +0100)]
Fixes coding style

11 years agoValidate declaration of methods
Tim Düsterhus [Sat, 5 Jan 2013 16:05:11 +0000 (17:05 +0100)]
Validate declaration of methods

11 years agoEnsure that all classes are imported via use
Tim Düsterhus [Sat, 5 Jan 2013 15:42:56 +0000 (16:42 +0100)]
Ensure that all classes are imported via use

11 years agoForce self:: for own static members
Tim Düsterhus [Sat, 5 Jan 2013 15:05:07 +0000 (16:05 +0100)]
Force self:: for own static members

11 years agoMerge branch 'master' of github.com:WoltLab/WCF
Tim Düsterhus [Sat, 5 Jan 2013 13:04:40 +0000 (14:04 +0100)]
Merge branch 'master' of github.com:WoltLab/WCF

11 years agoDisabling PCRESniff for now
Tim Düsterhus [Sat, 5 Jan 2013 13:04:15 +0000 (14:04 +0100)]
Disabling PCRESniff for now

11 years agoFixes SetupTemplateEngine
Matthias Schmidt [Sat, 5 Jan 2013 12:55:14 +0000 (13:55 +0100)]
Fixes SetupTemplateEngine

11 years agoFurther CodeSniffer adaptions
Matthias Schmidt [Sat, 5 Jan 2013 12:27:41 +0000 (13:27 +0100)]
Further CodeSniffer adaptions

11 years agoMerge branch 'master' of github.com:WoltLab/WCF into travis
Matthias Schmidt [Sat, 5 Jan 2013 12:18:49 +0000 (13:18 +0100)]
Merge branch 'master' of github.com:WoltLab/WCF into travis

11 years agoFixes code to match PHP CodeSniffer rules
Matthias Schmidt [Sat, 5 Jan 2013 12:18:10 +0000 (13:18 +0100)]
Fixes code to match PHP CodeSniffer rules

11 years agoFixes SetupTemplateEngine::getCompiledFilename()
Matthias Schmidt [Sat, 5 Jan 2013 12:01:22 +0000 (13:01 +0100)]
Fixes SetupTemplateEngine::getCompiledFilename()

11 years agoFixed template engine
Marcel Werk [Sat, 5 Jan 2013 00:04:56 +0000 (01:04 +0100)]
Fixed template engine

11 years agoMerge pull request #1080 from Gravatronics/bug/permissionCalculation
Alexander Ebert [Fri, 4 Jan 2013 21:54:11 +0000 (13:54 -0800)]
Merge pull request #1080 from Gravatronics/bug/permissionCalculation

Fixes permission calculation

11 years agoFixes permission calculation
Matthias Schmidt [Fri, 4 Jan 2013 18:52:36 +0000 (19:52 +0100)]
Fixes permission calculation

This fix is relevant for user group option types that can have a list of values (e.g. list of usable attachments). In the database, only the difference between the default value and the user group's value is stored. This difference is calculated by `IUserGroupOptionType::diff()`. When the permissions for a certain type of user groups are calculated, the difference for all relevant user groups have to be merged, which is done by `IUserGroupOptionType::merge()`.

The code of the previous merge function is the same as the code of the new diff function. This worked fine when calculating the difference to store the values. But if the merge of two option values was calculated during the permission calculation for a certain type of user groups, again, the difference was calculated, not the merge. This had the effect, that if, for instance, the default value for the usable attachment types was "gif, jpg" and the value for the administrator group was "foo, jpg", administrators were only allowed to use "foo" attachments (which is the diff of the two) instead of "foo", "gif" and "jpg".

11 years agoMerge branch 'master' of github.com:WoltLab/WCF
Tim Düsterhus [Fri, 4 Jan 2013 16:31:02 +0000 (17:31 +0100)]
Merge branch 'master' of github.com:WoltLab/WCF

11 years agoCheck whether imports are correctly ordered
Tim Düsterhus [Fri, 4 Jan 2013 16:30:23 +0000 (17:30 +0100)]
Check whether imports are correctly ordered

Closes #987

11 years agoFixed template handling in multi-app environment
Alexander Ebert [Fri, 4 Jan 2013 16:17:02 +0000 (17:17 +0100)]
Fixed template handling in multi-app environment

Fixes #1076

11 years agoMerge branch 'master' of github.com:WoltLab/WCF
Marcel Werk [Fri, 4 Jan 2013 15:39:03 +0000 (16:39 +0100)]
Merge branch 'master' of github.com:WoltLab/WCF

11 years agoFixed badges in main menu
Marcel Werk [Fri, 4 Jan 2013 15:38:48 +0000 (16:38 +0100)]
Fixed badges in main menu

11 years agoAdd Sniff that discourages use of raw PCRE
Tim Düsterhus [Fri, 4 Jan 2013 15:35:46 +0000 (16:35 +0100)]
Add Sniff that discourages use of raw PCRE

Closes #1054

11 years agoUseDeclarationSniff checks for newlines between use-statements
Tim Düsterhus [Fri, 4 Jan 2013 15:30:23 +0000 (16:30 +0100)]
UseDeclarationSniff checks for newlines between use-statements

cf. #987

11 years agoValidate declaration of use
Tim Düsterhus [Fri, 4 Jan 2013 15:03:24 +0000 (16:03 +0100)]
Validate declaration of use

11 years agoMerge branch 'master' of github.com:WoltLab/WCF
Tim Düsterhus [Fri, 4 Jan 2013 14:22:14 +0000 (15:22 +0100)]
Merge branch 'master' of github.com:WoltLab/WCF

11 years agoDisallow print, is_null and create_function as well.
Tim Düsterhus [Fri, 4 Jan 2013 14:17:45 +0000 (15:17 +0100)]
Disallow print, is_null and create_function as well.

11 years agoResolves todo in PagesFunctionTemplatePlugin
Matthias Schmidt [Fri, 4 Jan 2013 14:14:21 +0000 (15:14 +0100)]
Resolves todo in PagesFunctionTemplatePlugin

11 years agoMakes Category a ProcessibleDatabaseObject
Matthias Schmidt [Fri, 4 Jan 2013 10:46:28 +0000 (11:46 +0100)]
Makes Category a ProcessibleDatabaseObject

11 years agoEnhances/Fixes categoryList.tpl
Matthias Schmidt [Fri, 4 Jan 2013 10:34:46 +0000 (11:34 +0100)]
Enhances/Fixes categoryList.tpl

Closes #1064

11 years agoMerge branch 'master' of github.com:WoltLab/WCF
Marcel Werk [Fri, 4 Jan 2013 02:37:11 +0000 (03:37 +0100)]
Merge branch 'master' of github.com:WoltLab/WCF

11 years agoSmall category system improvements
Marcel Werk [Fri, 4 Jan 2013 02:37:00 +0000 (03:37 +0100)]
Small category system improvements

11 years agoFixed style description management
Alexander Ebert [Thu, 3 Jan 2013 21:05:27 +0000 (22:05 +0100)]
Fixed style description management

Fixes #890

11 years agoFixed handling of style descriptions
Alexander Ebert [Thu, 3 Jan 2013 20:45:34 +0000 (21:45 +0100)]
Fixed handling of style descriptions

11 years agoFixed typo
Alexander Ebert [Thu, 3 Jan 2013 20:32:05 +0000 (21:32 +0100)]
Fixed typo

11 years agoAdded support for i18n style descriptions (ACP missing)
Alexander Ebert [Thu, 3 Jan 2013 20:22:28 +0000 (21:22 +0100)]
Added support for i18n style descriptions (ACP missing)

See #890

11 years agoUse secure comparing for the access token
Tim Düsterhus [Thu, 3 Jan 2013 17:53:32 +0000 (18:53 +0100)]
Use secure comparing for the access token

11 years agoAdded menuItemController for *Menu-PIPs
Alexander Ebert [Thu, 3 Jan 2013 17:45:08 +0000 (18:45 +0100)]
Added menuItemController for *Menu-PIPs

11 years agoFixed hash creation
Alexander Ebert [Thu, 3 Jan 2013 17:30:17 +0000 (18:30 +0100)]
Fixed hash creation

11 years agoAdded PasswordUtil::secureCompare()
Alexander Ebert [Thu, 3 Jan 2013 17:17:28 +0000 (18:17 +0100)]
Added PasswordUtil::secureCompare()

secureCompare() is invulnerable to timing attacks as the comparison of two strings always takes the same time to finish (no early return).

11 years agoImproved RegEx for bcrypt probing
Alexander Ebert [Thu, 3 Jan 2013 16:20:24 +0000 (17:20 +0100)]
Improved RegEx for bcrypt probing

11 years agoAdded missing support for MyBB 1.x
Alexander Ebert [Thu, 3 Jan 2013 15:39:27 +0000 (16:39 +0100)]
Added missing support for MyBB 1.x

11 years agoUsing bcrypt for passwords and added PasswordUtil
Alexander Ebert [Thu, 3 Jan 2013 15:10:27 +0000 (16:10 +0100)]
Using bcrypt for passwords and added PasswordUtil

11 years agoAdd CONTRIBUTING.md
Tim Düsterhus [Thu, 3 Jan 2013 13:08:00 +0000 (14:08 +0100)]
Add CONTRIBUTING.md

11 years agoFix comment of FileUtil::downloadFileFromHttp()
Tim Düsterhus [Thu, 3 Jan 2013 12:46:39 +0000 (13:46 +0100)]
Fix comment of FileUtil::downloadFileFromHttp()

11 years agoMerge branch 'master' of github.com:WoltLab/WCF
Marcel Werk [Thu, 3 Jan 2013 00:34:32 +0000 (01:34 +0100)]
Merge branch 'master' of github.com:WoltLab/WCF

11 years agoAdded CSS for nested category lists
Marcel Werk [Thu, 3 Jan 2013 00:34:19 +0000 (01:34 +0100)]
Added CSS for nested category lists

11 years agoMinor style improvements
Marcel Werk [Thu, 3 Jan 2013 00:34:06 +0000 (01:34 +0100)]
Minor style improvements

11 years agoAdded missing pointer class
Marcel Werk [Wed, 2 Jan 2013 23:38:51 +0000 (00:38 +0100)]
Added missing pointer class

11 years agoChanged input type
Marcel Werk [Wed, 2 Jan 2013 23:38:34 +0000 (00:38 +0100)]
Changed input type

11 years agoMerge pull request #1071 from MeinAccount/jsToggle/AJAXContent
Alexander Ebert [Wed, 2 Jan 2013 21:37:55 +0000 (13:37 -0800)]
Merge pull request #1071 from MeinAccount/jsToggle/AJAXContent

WCF.Action.Toggle on inserted content

11 years agoAdded support for a confirm message
Magnus Kühn [Wed, 2 Jan 2013 20:22:06 +0000 (21:22 +0100)]
Added support for a confirm message

11 years agoFixed WCF.Action.Toggle
Magnus Kühn [Wed, 2 Jan 2013 18:45:27 +0000 (19:45 +0100)]
Fixed WCF.Action.Toggle

11 years agoMerge branch 'master' into jsToggle/AJAXContent
Magnus Kühn [Wed, 2 Jan 2013 18:44:19 +0000 (19:44 +0100)]
Merge branch 'master' into jsToggle/AJAXContent

11 years agoFixed WCF.Action.Toggle and implemented changes
Magnus Kühn [Wed, 2 Jan 2013 18:32:06 +0000 (19:32 +0100)]
Fixed WCF.Action.Toggle and implemented changes

11 years agoHide style chooser unless two or more styles are given
Alexander Ebert [Wed, 2 Jan 2013 18:09:53 +0000 (19:09 +0100)]
Hide style chooser unless two or more styles are given

Fixes #895

11 years agoIgnoring optionals if already installed
Alexander Ebert [Wed, 2 Jan 2013 18:04:43 +0000 (19:04 +0100)]
Ignoring optionals if already installed

Fixes #1065

11 years agoFixed landing page after package (un-)installation
Alexander Ebert [Wed, 2 Jan 2013 17:48:27 +0000 (18:48 +0100)]
Fixed landing page after package (un-)installation

Fixes #1070

11 years agoMerge branch 'master' of github.com:WoltLab/WCF
Alexander Ebert [Wed, 2 Jan 2013 14:28:03 +0000 (15:28 +0100)]
Merge branch 'master' of github.com:WoltLab/WCF

11 years agoUsing latest version of com.woltlab.wcf.acp.style
Alexander Ebert [Wed, 2 Jan 2013 14:27:38 +0000 (15:27 +0100)]
Using latest version of com.woltlab.wcf.acp.style

11 years agoRemoves unused method Package::getDependencies()
Matthias Schmidt [Wed, 2 Jan 2013 13:34:11 +0000 (14:34 +0100)]
Removes unused method Package::getDependencies()

11 years agoChanged WCF.Action.Toggle to work with inserted content
Magnus Kühn [Wed, 2 Jan 2013 13:31:58 +0000 (14:31 +0100)]
Changed WCF.Action.Toggle to work with inserted content

11 years agoFixes Package::getDependentPackages()
Matthias Schmidt [Wed, 2 Jan 2013 13:29:13 +0000 (14:29 +0100)]
Fixes Package::getDependentPackages()

Also optimizes Package:: getRequiredPackages()

11 years agoRemoves divs to avoid margin problems
Matthias Schmidt [Wed, 2 Jan 2013 10:09:59 +0000 (11:09 +0100)]
Removes divs to avoid margin problems

11 years agoRemoved unsupported parameter 'loadActiveOptions'
Alexander Ebert [Wed, 2 Jan 2013 01:48:11 +0000 (02:48 +0100)]
Removed unsupported parameter 'loadActiveOptions'

Fixes #1013

11 years agoAbstractDatabaseObjectAction now returns action name
Alexander Ebert [Wed, 2 Jan 2013 01:44:07 +0000 (02:44 +0100)]
AbstractDatabaseObjectAction now returns action name

Closes #1026

11 years agoDisallowed application uninstall if not within WCF ACP
Alexander Ebert [Wed, 2 Jan 2013 01:29:39 +0000 (02:29 +0100)]
Disallowed application uninstall if not within WCF ACP

Fixes #1067

11 years agoFixed menu item handling for landing page
Alexander Ebert [Wed, 2 Jan 2013 01:26:21 +0000 (02:26 +0100)]
Fixed menu item handling for landing page

Fixes #1066

11 years agoRemoved obsolete reset buttons
Marcel Werk [Wed, 2 Jan 2013 01:18:59 +0000 (02:18 +0100)]
Removed obsolete reset buttons

11 years agoMerged com.woltlab.wcf.acp.style
Alexander Ebert [Wed, 2 Jan 2013 00:01:31 +0000 (01:01 +0100)]
Merged com.woltlab.wcf.acp.style

11 years agoMerged com.woltlab.wcf.acp.language
Alexander Ebert [Tue, 1 Jan 2013 23:48:03 +0000 (00:48 +0100)]
Merged com.woltlab.wcf.acp.language

11 years agoRevert "Merge remote branch 'acp.style/master'"
Tim Düsterhus [Tue, 1 Jan 2013 23:02:29 +0000 (00:02 +0100)]
Revert "Merge remote branch 'acp.style/master'"

This reverts commit 845907323978d1e5a5d499c4ca1224c8e6529af7, reversing
changes made to 61d1f05a01c0bb5c54a366392c5213fcd5ad175e.

11 years agoRevert "Merge remote branch 'acp.language/master'"
Tim Düsterhus [Tue, 1 Jan 2013 23:02:09 +0000 (00:02 +0100)]
Revert "Merge remote branch 'acp.language/master'"

This reverts commit 9265d52d1e4030c3928145017ddbc3e221549f98, reversing
changes made to 845907323978d1e5a5d499c4ca1224c8e6529af7.

11 years agoMerge remote branch 'acp.language/master'
Tim Düsterhus [Tue, 1 Jan 2013 22:55:05 +0000 (23:55 +0100)]
Merge remote branch 'acp.language/master'

Conflicts:
.gitignore
.travis.yml
acpMenu.xml
language/de.xml
package.xml
userGroupOption.xml

11 years agoMerge remote branch 'acp.style/master'
Tim Düsterhus [Tue, 1 Jan 2013 22:49:20 +0000 (23:49 +0100)]
Merge remote branch 'acp.style/master'

Conflicts:
.travis.yml

11 years agoRenamed PackageListDetailed -> PackageList
Alexander Ebert [Tue, 1 Jan 2013 21:05:50 +0000 (22:05 +0100)]
Renamed PackageListDetailed -> PackageList

11 years agoRemoved PackageListPage, will be replace with "old" list
Alexander Ebert [Tue, 1 Jan 2013 21:01:32 +0000 (22:01 +0100)]
Removed PackageListPage, will be replace with "old" list

11 years agoMerge branch 'master' of github.com:WoltLab/WCF
Alexander Ebert [Tue, 1 Jan 2013 16:49:18 +0000 (17:49 +0100)]
Merge branch 'master' of github.com:WoltLab/WCF

11 years agoFixed landing page and handled infinite loops
Alexander Ebert [Tue, 1 Jan 2013 16:49:03 +0000 (17:49 +0100)]
Fixed landing page and handled infinite loops

Fixes #1063

11 years agoFixes bug in ACPTemplatesFileHandler
Matthias Schmidt [Tue, 1 Jan 2013 16:18:37 +0000 (17:18 +0100)]
Fixes bug in ACPTemplatesFileHandler

11 years agoFixes bug in StylePackageInstallationPlugin if default style is uninstalled
Matthias Schmidt [Tue, 1 Jan 2013 16:16:32 +0000 (17:16 +0100)]
Fixes bug in StylePackageInstallationPlugin if default style is uninstalled

11 years agoRemoves double code
Matthias Schmidt [Tue, 1 Jan 2013 15:17:21 +0000 (16:17 +0100)]
Removes double code

11 years agoFixes ACL JavaScript code
Matthias Schmidt [Tue, 1 Jan 2013 15:14:27 +0000 (16:14 +0100)]
Fixes ACL JavaScript code

11 years agoAdds missing newline at file end
Matthias Schmidt [Tue, 1 Jan 2013 08:28:20 +0000 (09:28 +0100)]
Adds missing newline at file end

11 years agoAdds IPermissionObject
Matthias Schmidt [Tue, 1 Jan 2013 08:15:56 +0000 (09:15 +0100)]
Adds IPermissionObject

11 years agoAdds ICategoryType::getApplication() to fix links
Matthias Schmidt [Mon, 31 Dec 2012 22:42:26 +0000 (23:42 +0100)]
Adds ICategoryType::getApplication() to fix links

11 years agoFixes typo
Matthias Schmidt [Mon, 31 Dec 2012 22:12:54 +0000 (23:12 +0100)]
Fixes typo

11 years agoFixes Package::isRequired()
Matthias Schmidt [Mon, 31 Dec 2012 22:12:02 +0000 (23:12 +0100)]
Fixes Package::isRequired()

11 years agoFixed TabMenu after login
Alexander Ebert [Mon, 31 Dec 2012 21:39:31 +0000 (22:39 +0100)]
Fixed TabMenu after login

11 years agoRemoves obsolete checks
Matthias Schmidt [Mon, 31 Dec 2012 21:18:36 +0000 (22:18 +0100)]
Removes obsolete checks

11 years agoRemoves unused parameter
Matthias Schmidt [Mon, 31 Dec 2012 19:41:26 +0000 (20:41 +0100)]
Removes unused parameter

11 years agoRemoves $usePackageDependencies from ACLHandler
Matthias Schmidt [Mon, 31 Dec 2012 19:30:51 +0000 (20:30 +0100)]
Removes $usePackageDependencies from ACLHandler

11 years agoMerge branch 'master' of github.com:WoltLab/WCF
Matthias Schmidt [Mon, 31 Dec 2012 18:51:28 +0000 (19:51 +0100)]
Merge branch 'master' of github.com:WoltLab/WCF

11 years agoChanges language items for ACL options/option categories
Matthias Schmidt [Mon, 31 Dec 2012 18:48:43 +0000 (19:48 +0100)]
Changes language items for ACL options/option categories

Like in any other language item, the object type is now used, not the package.

11 years agoAdds missing template variable
Matthias Schmidt [Mon, 31 Dec 2012 17:40:58 +0000 (18:40 +0100)]
Adds missing template variable

11 years agoLanding page is now automatically assigned
Alexander Ebert [Mon, 31 Dec 2012 17:03:00 +0000 (18:03 +0100)]
Landing page is now automatically assigned

Fixes #1059

11 years agoMerge pull request #1057 from Gravatronics/bug/userGroupOptionForm
Gravatronics [Mon, 31 Dec 2012 16:48:10 +0000 (08:48 -0800)]
Merge pull request #1057 from Gravatronics/bug/userGroupOptionForm

Removes package dependency handling in UserGroupOptionForm

11 years agoReloads categories after category is created
Matthias Schmidt [Mon, 31 Dec 2012 16:46:24 +0000 (17:46 +0100)]
Reloads categories after category is created

This way the new category is directly available in the parent category select list.

11 years agoEnhances ViewableCategory-classes
Matthias Schmidt [Mon, 31 Dec 2012 16:41:56 +0000 (17:41 +0100)]
Enhances ViewableCategory-classes

11 years agoFixed WCF::getAnchor()
Alexander Ebert [Mon, 31 Dec 2012 16:39:29 +0000 (17:39 +0100)]
Fixed WCF::getAnchor()

Fixes #1060

11 years agoMerge pull request #1058 from Gravatronics/bug/userGroupOptionFormJS
Alexander Ebert [Mon, 31 Dec 2012 15:00:49 +0000 (07:00 -0800)]
Merge pull request #1058 from Gravatronics/bug/userGroupOptionFormJS

Fixes JavaScript of UserGroupOptionForm

11 years agoFixes JavaScript of UserGroupOptionForm
Matthias Schmidt [Mon, 31 Dec 2012 14:16:30 +0000 (15:16 +0100)]
Fixes JavaScript of UserGroupOptionForm

Previously, for an unchecked everybody user group checkbox, null was returned which caused, that no value for the everybody user group was submitted which causes an IllegalLinkException, since that value needs to exist.