diff --git a/inc/functions.php b/inc/functions.php index 80b85a4e..ba911146 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -6,7 +6,7 @@ } require 'inc/events.php'; - require 'contrib/gettext/gettext.inc'; + require 'lib/gettext/gettext.inc'; register_shutdown_function('fatal_error_handler'); mb_internal_encoding('UTF-8'); @@ -156,7 +156,7 @@ openlog('tinyboard', LOG_ODELAY, LOG_SYSLOG); // open a connection to sysem logger if($config['recaptcha']) - require_once 'inc/contrib/recaptcha/recaptchalib.php'; + require_once 'inc/lib/recaptcha/recaptchalib.php'; if($config['cache']['enabled']) require_once 'inc/cache.php'; } @@ -1334,7 +1334,7 @@ } if($config['minify_js']) { - require_once 'inc/contrib/minify/JSMin.php'; + require_once 'inc/lib/minify/JSMin.php'; $script = JSMin::minify($script); } diff --git a/inc/contrib/Twig/Autoloader.php b/inc/lib/Twig/Autoloader.php similarity index 100% rename from inc/contrib/Twig/Autoloader.php rename to inc/lib/Twig/Autoloader.php diff --git a/inc/contrib/Twig/Compiler.php b/inc/lib/Twig/Compiler.php similarity index 100% rename from inc/contrib/Twig/Compiler.php rename to inc/lib/Twig/Compiler.php diff --git a/inc/contrib/Twig/CompilerInterface.php b/inc/lib/Twig/CompilerInterface.php similarity index 100% rename from inc/contrib/Twig/CompilerInterface.php rename to inc/lib/Twig/CompilerInterface.php diff --git a/inc/contrib/Twig/Environment.php b/inc/lib/Twig/Environment.php similarity index 100% rename from inc/contrib/Twig/Environment.php rename to inc/lib/Twig/Environment.php diff --git a/inc/contrib/Twig/Error.php b/inc/lib/Twig/Error.php similarity index 100% rename from inc/contrib/Twig/Error.php rename to inc/lib/Twig/Error.php diff --git a/inc/contrib/Twig/Error/Loader.php b/inc/lib/Twig/Error/Loader.php similarity index 100% rename from inc/contrib/Twig/Error/Loader.php rename to inc/lib/Twig/Error/Loader.php diff --git a/inc/contrib/Twig/Error/Runtime.php b/inc/lib/Twig/Error/Runtime.php similarity index 100% rename from inc/contrib/Twig/Error/Runtime.php rename to inc/lib/Twig/Error/Runtime.php diff --git a/inc/contrib/Twig/Error/Syntax.php b/inc/lib/Twig/Error/Syntax.php similarity index 100% rename from inc/contrib/Twig/Error/Syntax.php rename to inc/lib/Twig/Error/Syntax.php diff --git a/inc/contrib/Twig/ExpressionParser.php b/inc/lib/Twig/ExpressionParser.php similarity index 100% rename from inc/contrib/Twig/ExpressionParser.php rename to inc/lib/Twig/ExpressionParser.php diff --git a/inc/contrib/Twig/Extension.php b/inc/lib/Twig/Extension.php similarity index 100% rename from inc/contrib/Twig/Extension.php rename to inc/lib/Twig/Extension.php diff --git a/inc/contrib/Twig/Extension/Core.php b/inc/lib/Twig/Extension/Core.php similarity index 100% rename from inc/contrib/Twig/Extension/Core.php rename to inc/lib/Twig/Extension/Core.php diff --git a/inc/contrib/Twig/Extension/Escaper.php b/inc/lib/Twig/Extension/Escaper.php similarity index 100% rename from inc/contrib/Twig/Extension/Escaper.php rename to inc/lib/Twig/Extension/Escaper.php diff --git a/inc/contrib/Twig/Extension/Optimizer.php b/inc/lib/Twig/Extension/Optimizer.php similarity index 100% rename from inc/contrib/Twig/Extension/Optimizer.php rename to inc/lib/Twig/Extension/Optimizer.php diff --git a/inc/contrib/Twig/Extension/Sandbox.php b/inc/lib/Twig/Extension/Sandbox.php similarity index 100% rename from inc/contrib/Twig/Extension/Sandbox.php rename to inc/lib/Twig/Extension/Sandbox.php diff --git a/inc/contrib/Twig/ExtensionInterface.php b/inc/lib/Twig/ExtensionInterface.php similarity index 100% rename from inc/contrib/Twig/ExtensionInterface.php rename to inc/lib/Twig/ExtensionInterface.php diff --git a/inc/contrib/Twig/Extensions/Extension/I18n.php b/inc/lib/Twig/Extensions/Extension/I18n.php similarity index 100% rename from inc/contrib/Twig/Extensions/Extension/I18n.php rename to inc/lib/Twig/Extensions/Extension/I18n.php diff --git a/inc/contrib/Twig/Extensions/Extension/Tinyboard.php b/inc/lib/Twig/Extensions/Extension/Tinyboard.php similarity index 100% rename from inc/contrib/Twig/Extensions/Extension/Tinyboard.php rename to inc/lib/Twig/Extensions/Extension/Tinyboard.php diff --git a/inc/contrib/Twig/Extensions/Node/Trans.php b/inc/lib/Twig/Extensions/Node/Trans.php similarity index 100% rename from inc/contrib/Twig/Extensions/Node/Trans.php rename to inc/lib/Twig/Extensions/Node/Trans.php diff --git a/inc/contrib/Twig/Extensions/TokenParser/Trans.php b/inc/lib/Twig/Extensions/TokenParser/Trans.php similarity index 100% rename from inc/contrib/Twig/Extensions/TokenParser/Trans.php rename to inc/lib/Twig/Extensions/TokenParser/Trans.php diff --git a/inc/contrib/Twig/Filter.php b/inc/lib/Twig/Filter.php similarity index 100% rename from inc/contrib/Twig/Filter.php rename to inc/lib/Twig/Filter.php diff --git a/inc/contrib/Twig/Filter/Function.php b/inc/lib/Twig/Filter/Function.php similarity index 100% rename from inc/contrib/Twig/Filter/Function.php rename to inc/lib/Twig/Filter/Function.php diff --git a/inc/contrib/Twig/Filter/Method.php b/inc/lib/Twig/Filter/Method.php similarity index 100% rename from inc/contrib/Twig/Filter/Method.php rename to inc/lib/Twig/Filter/Method.php diff --git a/inc/contrib/Twig/FilterInterface.php b/inc/lib/Twig/FilterInterface.php similarity index 100% rename from inc/contrib/Twig/FilterInterface.php rename to inc/lib/Twig/FilterInterface.php diff --git a/inc/contrib/Twig/Function.php b/inc/lib/Twig/Function.php similarity index 100% rename from inc/contrib/Twig/Function.php rename to inc/lib/Twig/Function.php diff --git a/inc/contrib/Twig/Function/Function.php b/inc/lib/Twig/Function/Function.php similarity index 100% rename from inc/contrib/Twig/Function/Function.php rename to inc/lib/Twig/Function/Function.php diff --git a/inc/contrib/Twig/Function/Method.php b/inc/lib/Twig/Function/Method.php similarity index 100% rename from inc/contrib/Twig/Function/Method.php rename to inc/lib/Twig/Function/Method.php diff --git a/inc/contrib/Twig/FunctionInterface.php b/inc/lib/Twig/FunctionInterface.php similarity index 100% rename from inc/contrib/Twig/FunctionInterface.php rename to inc/lib/Twig/FunctionInterface.php diff --git a/inc/contrib/Twig/Lexer.php b/inc/lib/Twig/Lexer.php similarity index 100% rename from inc/contrib/Twig/Lexer.php rename to inc/lib/Twig/Lexer.php diff --git a/inc/contrib/Twig/LexerInterface.php b/inc/lib/Twig/LexerInterface.php similarity index 100% rename from inc/contrib/Twig/LexerInterface.php rename to inc/lib/Twig/LexerInterface.php diff --git a/inc/contrib/Twig/Loader/Array.php b/inc/lib/Twig/Loader/Array.php similarity index 100% rename from inc/contrib/Twig/Loader/Array.php rename to inc/lib/Twig/Loader/Array.php diff --git a/inc/contrib/Twig/Loader/Chain.php b/inc/lib/Twig/Loader/Chain.php similarity index 100% rename from inc/contrib/Twig/Loader/Chain.php rename to inc/lib/Twig/Loader/Chain.php diff --git a/inc/contrib/Twig/Loader/Filesystem.php b/inc/lib/Twig/Loader/Filesystem.php similarity index 100% rename from inc/contrib/Twig/Loader/Filesystem.php rename to inc/lib/Twig/Loader/Filesystem.php diff --git a/inc/contrib/Twig/Loader/String.php b/inc/lib/Twig/Loader/String.php similarity index 100% rename from inc/contrib/Twig/Loader/String.php rename to inc/lib/Twig/Loader/String.php diff --git a/inc/contrib/Twig/LoaderInterface.php b/inc/lib/Twig/LoaderInterface.php similarity index 100% rename from inc/contrib/Twig/LoaderInterface.php rename to inc/lib/Twig/LoaderInterface.php diff --git a/inc/contrib/Twig/Markup.php b/inc/lib/Twig/Markup.php similarity index 100% rename from inc/contrib/Twig/Markup.php rename to inc/lib/Twig/Markup.php diff --git a/inc/contrib/Twig/Node.php b/inc/lib/Twig/Node.php similarity index 100% rename from inc/contrib/Twig/Node.php rename to inc/lib/Twig/Node.php diff --git a/inc/contrib/Twig/Node/AutoEscape.php b/inc/lib/Twig/Node/AutoEscape.php similarity index 100% rename from inc/contrib/Twig/Node/AutoEscape.php rename to inc/lib/Twig/Node/AutoEscape.php diff --git a/inc/contrib/Twig/Node/Block.php b/inc/lib/Twig/Node/Block.php similarity index 100% rename from inc/contrib/Twig/Node/Block.php rename to inc/lib/Twig/Node/Block.php diff --git a/inc/contrib/Twig/Node/BlockReference.php b/inc/lib/Twig/Node/BlockReference.php similarity index 100% rename from inc/contrib/Twig/Node/BlockReference.php rename to inc/lib/Twig/Node/BlockReference.php diff --git a/inc/contrib/Twig/Node/Expression.php b/inc/lib/Twig/Node/Expression.php similarity index 100% rename from inc/contrib/Twig/Node/Expression.php rename to inc/lib/Twig/Node/Expression.php diff --git a/inc/contrib/Twig/Node/Expression/Array.php b/inc/lib/Twig/Node/Expression/Array.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/Array.php rename to inc/lib/Twig/Node/Expression/Array.php diff --git a/inc/contrib/Twig/Node/Expression/AssignName.php b/inc/lib/Twig/Node/Expression/AssignName.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/AssignName.php rename to inc/lib/Twig/Node/Expression/AssignName.php diff --git a/inc/contrib/Twig/Node/Expression/Binary.php b/inc/lib/Twig/Node/Expression/Binary.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/Binary.php rename to inc/lib/Twig/Node/Expression/Binary.php diff --git a/inc/contrib/Twig/Node/Expression/Binary/Add.php b/inc/lib/Twig/Node/Expression/Binary/Add.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/Binary/Add.php rename to inc/lib/Twig/Node/Expression/Binary/Add.php diff --git a/inc/contrib/Twig/Node/Expression/Binary/And.php b/inc/lib/Twig/Node/Expression/Binary/And.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/Binary/And.php rename to inc/lib/Twig/Node/Expression/Binary/And.php diff --git a/inc/contrib/Twig/Node/Expression/Binary/BitwiseAnd.php b/inc/lib/Twig/Node/Expression/Binary/BitwiseAnd.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/Binary/BitwiseAnd.php rename to inc/lib/Twig/Node/Expression/Binary/BitwiseAnd.php diff --git a/inc/contrib/Twig/Node/Expression/Binary/BitwiseOr.php b/inc/lib/Twig/Node/Expression/Binary/BitwiseOr.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/Binary/BitwiseOr.php rename to inc/lib/Twig/Node/Expression/Binary/BitwiseOr.php diff --git a/inc/contrib/Twig/Node/Expression/Binary/BitwiseXor.php b/inc/lib/Twig/Node/Expression/Binary/BitwiseXor.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/Binary/BitwiseXor.php rename to inc/lib/Twig/Node/Expression/Binary/BitwiseXor.php diff --git a/inc/contrib/Twig/Node/Expression/Binary/Concat.php b/inc/lib/Twig/Node/Expression/Binary/Concat.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/Binary/Concat.php rename to inc/lib/Twig/Node/Expression/Binary/Concat.php diff --git a/inc/contrib/Twig/Node/Expression/Binary/Div.php b/inc/lib/Twig/Node/Expression/Binary/Div.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/Binary/Div.php rename to inc/lib/Twig/Node/Expression/Binary/Div.php diff --git a/inc/contrib/Twig/Node/Expression/Binary/Equal.php b/inc/lib/Twig/Node/Expression/Binary/Equal.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/Binary/Equal.php rename to inc/lib/Twig/Node/Expression/Binary/Equal.php diff --git a/inc/contrib/Twig/Node/Expression/Binary/FloorDiv.php b/inc/lib/Twig/Node/Expression/Binary/FloorDiv.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/Binary/FloorDiv.php rename to inc/lib/Twig/Node/Expression/Binary/FloorDiv.php diff --git a/inc/contrib/Twig/Node/Expression/Binary/Greater.php b/inc/lib/Twig/Node/Expression/Binary/Greater.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/Binary/Greater.php rename to inc/lib/Twig/Node/Expression/Binary/Greater.php diff --git a/inc/contrib/Twig/Node/Expression/Binary/GreaterEqual.php b/inc/lib/Twig/Node/Expression/Binary/GreaterEqual.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/Binary/GreaterEqual.php rename to inc/lib/Twig/Node/Expression/Binary/GreaterEqual.php diff --git a/inc/contrib/Twig/Node/Expression/Binary/In.php b/inc/lib/Twig/Node/Expression/Binary/In.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/Binary/In.php rename to inc/lib/Twig/Node/Expression/Binary/In.php diff --git a/inc/contrib/Twig/Node/Expression/Binary/Less.php b/inc/lib/Twig/Node/Expression/Binary/Less.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/Binary/Less.php rename to inc/lib/Twig/Node/Expression/Binary/Less.php diff --git a/inc/contrib/Twig/Node/Expression/Binary/LessEqual.php b/inc/lib/Twig/Node/Expression/Binary/LessEqual.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/Binary/LessEqual.php rename to inc/lib/Twig/Node/Expression/Binary/LessEqual.php diff --git a/inc/contrib/Twig/Node/Expression/Binary/Mod.php b/inc/lib/Twig/Node/Expression/Binary/Mod.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/Binary/Mod.php rename to inc/lib/Twig/Node/Expression/Binary/Mod.php diff --git a/inc/contrib/Twig/Node/Expression/Binary/Mul.php b/inc/lib/Twig/Node/Expression/Binary/Mul.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/Binary/Mul.php rename to inc/lib/Twig/Node/Expression/Binary/Mul.php diff --git a/inc/contrib/Twig/Node/Expression/Binary/NotEqual.php b/inc/lib/Twig/Node/Expression/Binary/NotEqual.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/Binary/NotEqual.php rename to inc/lib/Twig/Node/Expression/Binary/NotEqual.php diff --git a/inc/contrib/Twig/Node/Expression/Binary/NotIn.php b/inc/lib/Twig/Node/Expression/Binary/NotIn.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/Binary/NotIn.php rename to inc/lib/Twig/Node/Expression/Binary/NotIn.php diff --git a/inc/contrib/Twig/Node/Expression/Binary/Or.php b/inc/lib/Twig/Node/Expression/Binary/Or.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/Binary/Or.php rename to inc/lib/Twig/Node/Expression/Binary/Or.php diff --git a/inc/contrib/Twig/Node/Expression/Binary/Power.php b/inc/lib/Twig/Node/Expression/Binary/Power.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/Binary/Power.php rename to inc/lib/Twig/Node/Expression/Binary/Power.php diff --git a/inc/contrib/Twig/Node/Expression/Binary/Range.php b/inc/lib/Twig/Node/Expression/Binary/Range.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/Binary/Range.php rename to inc/lib/Twig/Node/Expression/Binary/Range.php diff --git a/inc/contrib/Twig/Node/Expression/Binary/Sub.php b/inc/lib/Twig/Node/Expression/Binary/Sub.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/Binary/Sub.php rename to inc/lib/Twig/Node/Expression/Binary/Sub.php diff --git a/inc/contrib/Twig/Node/Expression/BlockReference.php b/inc/lib/Twig/Node/Expression/BlockReference.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/BlockReference.php rename to inc/lib/Twig/Node/Expression/BlockReference.php diff --git a/inc/contrib/Twig/Node/Expression/Conditional.php b/inc/lib/Twig/Node/Expression/Conditional.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/Conditional.php rename to inc/lib/Twig/Node/Expression/Conditional.php diff --git a/inc/contrib/Twig/Node/Expression/Constant.php b/inc/lib/Twig/Node/Expression/Constant.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/Constant.php rename to inc/lib/Twig/Node/Expression/Constant.php diff --git a/inc/contrib/Twig/Node/Expression/ExtensionReference.php b/inc/lib/Twig/Node/Expression/ExtensionReference.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/ExtensionReference.php rename to inc/lib/Twig/Node/Expression/ExtensionReference.php diff --git a/inc/contrib/Twig/Node/Expression/Filter.php b/inc/lib/Twig/Node/Expression/Filter.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/Filter.php rename to inc/lib/Twig/Node/Expression/Filter.php diff --git a/inc/contrib/Twig/Node/Expression/Function.php b/inc/lib/Twig/Node/Expression/Function.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/Function.php rename to inc/lib/Twig/Node/Expression/Function.php diff --git a/inc/contrib/Twig/Node/Expression/GetAttr.php b/inc/lib/Twig/Node/Expression/GetAttr.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/GetAttr.php rename to inc/lib/Twig/Node/Expression/GetAttr.php diff --git a/inc/contrib/Twig/Node/Expression/Name.php b/inc/lib/Twig/Node/Expression/Name.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/Name.php rename to inc/lib/Twig/Node/Expression/Name.php diff --git a/inc/contrib/Twig/Node/Expression/Parent.php b/inc/lib/Twig/Node/Expression/Parent.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/Parent.php rename to inc/lib/Twig/Node/Expression/Parent.php diff --git a/inc/contrib/Twig/Node/Expression/Test.php b/inc/lib/Twig/Node/Expression/Test.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/Test.php rename to inc/lib/Twig/Node/Expression/Test.php diff --git a/inc/contrib/Twig/Node/Expression/Unary.php b/inc/lib/Twig/Node/Expression/Unary.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/Unary.php rename to inc/lib/Twig/Node/Expression/Unary.php diff --git a/inc/contrib/Twig/Node/Expression/Unary/Neg.php b/inc/lib/Twig/Node/Expression/Unary/Neg.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/Unary/Neg.php rename to inc/lib/Twig/Node/Expression/Unary/Neg.php diff --git a/inc/contrib/Twig/Node/Expression/Unary/Not.php b/inc/lib/Twig/Node/Expression/Unary/Not.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/Unary/Not.php rename to inc/lib/Twig/Node/Expression/Unary/Not.php diff --git a/inc/contrib/Twig/Node/Expression/Unary/Pos.php b/inc/lib/Twig/Node/Expression/Unary/Pos.php similarity index 100% rename from inc/contrib/Twig/Node/Expression/Unary/Pos.php rename to inc/lib/Twig/Node/Expression/Unary/Pos.php diff --git a/inc/contrib/Twig/Node/For.php b/inc/lib/Twig/Node/For.php similarity index 100% rename from inc/contrib/Twig/Node/For.php rename to inc/lib/Twig/Node/For.php diff --git a/inc/contrib/Twig/Node/If.php b/inc/lib/Twig/Node/If.php similarity index 100% rename from inc/contrib/Twig/Node/If.php rename to inc/lib/Twig/Node/If.php diff --git a/inc/contrib/Twig/Node/Import.php b/inc/lib/Twig/Node/Import.php similarity index 100% rename from inc/contrib/Twig/Node/Import.php rename to inc/lib/Twig/Node/Import.php diff --git a/inc/contrib/Twig/Node/Include.php b/inc/lib/Twig/Node/Include.php similarity index 100% rename from inc/contrib/Twig/Node/Include.php rename to inc/lib/Twig/Node/Include.php diff --git a/inc/contrib/Twig/Node/Macro.php b/inc/lib/Twig/Node/Macro.php similarity index 100% rename from inc/contrib/Twig/Node/Macro.php rename to inc/lib/Twig/Node/Macro.php diff --git a/inc/contrib/Twig/Node/Module.php b/inc/lib/Twig/Node/Module.php similarity index 100% rename from inc/contrib/Twig/Node/Module.php rename to inc/lib/Twig/Node/Module.php diff --git a/inc/contrib/Twig/Node/Print.php b/inc/lib/Twig/Node/Print.php similarity index 100% rename from inc/contrib/Twig/Node/Print.php rename to inc/lib/Twig/Node/Print.php diff --git a/inc/contrib/Twig/Node/Sandbox.php b/inc/lib/Twig/Node/Sandbox.php similarity index 100% rename from inc/contrib/Twig/Node/Sandbox.php rename to inc/lib/Twig/Node/Sandbox.php diff --git a/inc/contrib/Twig/Node/SandboxedModule.php b/inc/lib/Twig/Node/SandboxedModule.php similarity index 100% rename from inc/contrib/Twig/Node/SandboxedModule.php rename to inc/lib/Twig/Node/SandboxedModule.php diff --git a/inc/contrib/Twig/Node/SandboxedPrint.php b/inc/lib/Twig/Node/SandboxedPrint.php similarity index 100% rename from inc/contrib/Twig/Node/SandboxedPrint.php rename to inc/lib/Twig/Node/SandboxedPrint.php diff --git a/inc/contrib/Twig/Node/Set.php b/inc/lib/Twig/Node/Set.php similarity index 100% rename from inc/contrib/Twig/Node/Set.php rename to inc/lib/Twig/Node/Set.php diff --git a/inc/contrib/Twig/Node/Spaceless.php b/inc/lib/Twig/Node/Spaceless.php similarity index 100% rename from inc/contrib/Twig/Node/Spaceless.php rename to inc/lib/Twig/Node/Spaceless.php diff --git a/inc/contrib/Twig/Node/Text.php b/inc/lib/Twig/Node/Text.php similarity index 100% rename from inc/contrib/Twig/Node/Text.php rename to inc/lib/Twig/Node/Text.php diff --git a/inc/contrib/Twig/NodeInterface.php b/inc/lib/Twig/NodeInterface.php similarity index 100% rename from inc/contrib/Twig/NodeInterface.php rename to inc/lib/Twig/NodeInterface.php diff --git a/inc/contrib/Twig/NodeOutputInterface.php b/inc/lib/Twig/NodeOutputInterface.php similarity index 100% rename from inc/contrib/Twig/NodeOutputInterface.php rename to inc/lib/Twig/NodeOutputInterface.php diff --git a/inc/contrib/Twig/NodeTraverser.php b/inc/lib/Twig/NodeTraverser.php similarity index 100% rename from inc/contrib/Twig/NodeTraverser.php rename to inc/lib/Twig/NodeTraverser.php diff --git a/inc/contrib/Twig/NodeVisitor/Escaper.php b/inc/lib/Twig/NodeVisitor/Escaper.php similarity index 100% rename from inc/contrib/Twig/NodeVisitor/Escaper.php rename to inc/lib/Twig/NodeVisitor/Escaper.php diff --git a/inc/contrib/Twig/NodeVisitor/Optimizer.php b/inc/lib/Twig/NodeVisitor/Optimizer.php similarity index 100% rename from inc/contrib/Twig/NodeVisitor/Optimizer.php rename to inc/lib/Twig/NodeVisitor/Optimizer.php diff --git a/inc/contrib/Twig/NodeVisitor/SafeAnalysis.php b/inc/lib/Twig/NodeVisitor/SafeAnalysis.php similarity index 100% rename from inc/contrib/Twig/NodeVisitor/SafeAnalysis.php rename to inc/lib/Twig/NodeVisitor/SafeAnalysis.php diff --git a/inc/contrib/Twig/NodeVisitor/Sandbox.php b/inc/lib/Twig/NodeVisitor/Sandbox.php similarity index 100% rename from inc/contrib/Twig/NodeVisitor/Sandbox.php rename to inc/lib/Twig/NodeVisitor/Sandbox.php diff --git a/inc/contrib/Twig/NodeVisitorInterface.php b/inc/lib/Twig/NodeVisitorInterface.php similarity index 100% rename from inc/contrib/Twig/NodeVisitorInterface.php rename to inc/lib/Twig/NodeVisitorInterface.php diff --git a/inc/contrib/Twig/Parser.php b/inc/lib/Twig/Parser.php similarity index 100% rename from inc/contrib/Twig/Parser.php rename to inc/lib/Twig/Parser.php diff --git a/inc/contrib/Twig/ParserInterface.php b/inc/lib/Twig/ParserInterface.php similarity index 100% rename from inc/contrib/Twig/ParserInterface.php rename to inc/lib/Twig/ParserInterface.php diff --git a/inc/contrib/Twig/Sandbox/SecurityError.php b/inc/lib/Twig/Sandbox/SecurityError.php similarity index 100% rename from inc/contrib/Twig/Sandbox/SecurityError.php rename to inc/lib/Twig/Sandbox/SecurityError.php diff --git a/inc/contrib/Twig/Sandbox/SecurityPolicy.php b/inc/lib/Twig/Sandbox/SecurityPolicy.php similarity index 100% rename from inc/contrib/Twig/Sandbox/SecurityPolicy.php rename to inc/lib/Twig/Sandbox/SecurityPolicy.php diff --git a/inc/contrib/Twig/Sandbox/SecurityPolicyInterface.php b/inc/lib/Twig/Sandbox/SecurityPolicyInterface.php similarity index 100% rename from inc/contrib/Twig/Sandbox/SecurityPolicyInterface.php rename to inc/lib/Twig/Sandbox/SecurityPolicyInterface.php diff --git a/inc/contrib/Twig/Template.php b/inc/lib/Twig/Template.php similarity index 100% rename from inc/contrib/Twig/Template.php rename to inc/lib/Twig/Template.php diff --git a/inc/contrib/Twig/TemplateInterface.php b/inc/lib/Twig/TemplateInterface.php similarity index 100% rename from inc/contrib/Twig/TemplateInterface.php rename to inc/lib/Twig/TemplateInterface.php diff --git a/inc/contrib/Twig/Test/Function.php b/inc/lib/Twig/Test/Function.php similarity index 100% rename from inc/contrib/Twig/Test/Function.php rename to inc/lib/Twig/Test/Function.php diff --git a/inc/contrib/Twig/Test/Method.php b/inc/lib/Twig/Test/Method.php similarity index 100% rename from inc/contrib/Twig/Test/Method.php rename to inc/lib/Twig/Test/Method.php diff --git a/inc/contrib/Twig/TestInterface.php b/inc/lib/Twig/TestInterface.php similarity index 100% rename from inc/contrib/Twig/TestInterface.php rename to inc/lib/Twig/TestInterface.php diff --git a/inc/contrib/Twig/Token.php b/inc/lib/Twig/Token.php similarity index 100% rename from inc/contrib/Twig/Token.php rename to inc/lib/Twig/Token.php diff --git a/inc/contrib/Twig/TokenParser.php b/inc/lib/Twig/TokenParser.php similarity index 100% rename from inc/contrib/Twig/TokenParser.php rename to inc/lib/Twig/TokenParser.php diff --git a/inc/contrib/Twig/TokenParser/AutoEscape.php b/inc/lib/Twig/TokenParser/AutoEscape.php similarity index 100% rename from inc/contrib/Twig/TokenParser/AutoEscape.php rename to inc/lib/Twig/TokenParser/AutoEscape.php diff --git a/inc/contrib/Twig/TokenParser/Block.php b/inc/lib/Twig/TokenParser/Block.php similarity index 100% rename from inc/contrib/Twig/TokenParser/Block.php rename to inc/lib/Twig/TokenParser/Block.php diff --git a/inc/contrib/Twig/TokenParser/Extends.php b/inc/lib/Twig/TokenParser/Extends.php similarity index 100% rename from inc/contrib/Twig/TokenParser/Extends.php rename to inc/lib/Twig/TokenParser/Extends.php diff --git a/inc/contrib/Twig/TokenParser/Filter.php b/inc/lib/Twig/TokenParser/Filter.php similarity index 100% rename from inc/contrib/Twig/TokenParser/Filter.php rename to inc/lib/Twig/TokenParser/Filter.php diff --git a/inc/contrib/Twig/TokenParser/For.php b/inc/lib/Twig/TokenParser/For.php similarity index 100% rename from inc/contrib/Twig/TokenParser/For.php rename to inc/lib/Twig/TokenParser/For.php diff --git a/inc/contrib/Twig/TokenParser/From.php b/inc/lib/Twig/TokenParser/From.php similarity index 100% rename from inc/contrib/Twig/TokenParser/From.php rename to inc/lib/Twig/TokenParser/From.php diff --git a/inc/contrib/Twig/TokenParser/If.php b/inc/lib/Twig/TokenParser/If.php similarity index 100% rename from inc/contrib/Twig/TokenParser/If.php rename to inc/lib/Twig/TokenParser/If.php diff --git a/inc/contrib/Twig/TokenParser/Import.php b/inc/lib/Twig/TokenParser/Import.php similarity index 100% rename from inc/contrib/Twig/TokenParser/Import.php rename to inc/lib/Twig/TokenParser/Import.php diff --git a/inc/contrib/Twig/TokenParser/Include.php b/inc/lib/Twig/TokenParser/Include.php similarity index 100% rename from inc/contrib/Twig/TokenParser/Include.php rename to inc/lib/Twig/TokenParser/Include.php diff --git a/inc/contrib/Twig/TokenParser/Macro.php b/inc/lib/Twig/TokenParser/Macro.php similarity index 100% rename from inc/contrib/Twig/TokenParser/Macro.php rename to inc/lib/Twig/TokenParser/Macro.php diff --git a/inc/contrib/Twig/TokenParser/Sandbox.php b/inc/lib/Twig/TokenParser/Sandbox.php similarity index 100% rename from inc/contrib/Twig/TokenParser/Sandbox.php rename to inc/lib/Twig/TokenParser/Sandbox.php diff --git a/inc/contrib/Twig/TokenParser/Set.php b/inc/lib/Twig/TokenParser/Set.php similarity index 100% rename from inc/contrib/Twig/TokenParser/Set.php rename to inc/lib/Twig/TokenParser/Set.php diff --git a/inc/contrib/Twig/TokenParser/Spaceless.php b/inc/lib/Twig/TokenParser/Spaceless.php similarity index 100% rename from inc/contrib/Twig/TokenParser/Spaceless.php rename to inc/lib/Twig/TokenParser/Spaceless.php diff --git a/inc/contrib/Twig/TokenParser/Use.php b/inc/lib/Twig/TokenParser/Use.php similarity index 100% rename from inc/contrib/Twig/TokenParser/Use.php rename to inc/lib/Twig/TokenParser/Use.php diff --git a/inc/contrib/Twig/TokenParserBroker.php b/inc/lib/Twig/TokenParserBroker.php similarity index 100% rename from inc/contrib/Twig/TokenParserBroker.php rename to inc/lib/Twig/TokenParserBroker.php diff --git a/inc/contrib/Twig/TokenParserBrokerInterface.php b/inc/lib/Twig/TokenParserBrokerInterface.php similarity index 100% rename from inc/contrib/Twig/TokenParserBrokerInterface.php rename to inc/lib/Twig/TokenParserBrokerInterface.php diff --git a/inc/contrib/Twig/TokenParserInterface.php b/inc/lib/Twig/TokenParserInterface.php similarity index 100% rename from inc/contrib/Twig/TokenParserInterface.php rename to inc/lib/Twig/TokenParserInterface.php diff --git a/inc/contrib/Twig/TokenStream.php b/inc/lib/Twig/TokenStream.php similarity index 100% rename from inc/contrib/Twig/TokenStream.php rename to inc/lib/Twig/TokenStream.php diff --git a/inc/contrib/gettext/AUTHORS b/inc/lib/gettext/AUTHORS similarity index 100% rename from inc/contrib/gettext/AUTHORS rename to inc/lib/gettext/AUTHORS diff --git a/inc/contrib/gettext/COPYING b/inc/lib/gettext/COPYING similarity index 100% rename from inc/contrib/gettext/COPYING rename to inc/lib/gettext/COPYING diff --git a/inc/contrib/gettext/Makefile b/inc/lib/gettext/Makefile similarity index 100% rename from inc/contrib/gettext/Makefile rename to inc/lib/gettext/Makefile diff --git a/inc/contrib/gettext/README b/inc/lib/gettext/README similarity index 100% rename from inc/contrib/gettext/README rename to inc/lib/gettext/README diff --git a/inc/contrib/gettext/examples/index.php b/inc/lib/gettext/examples/index.php similarity index 100% rename from inc/contrib/gettext/examples/index.php rename to inc/lib/gettext/examples/index.php diff --git a/inc/contrib/gettext/examples/locale/de_CH/LC_MESSAGES/messages.mo b/inc/lib/gettext/examples/locale/de_CH/LC_MESSAGES/messages.mo similarity index 100% rename from inc/contrib/gettext/examples/locale/de_CH/LC_MESSAGES/messages.mo rename to inc/lib/gettext/examples/locale/de_CH/LC_MESSAGES/messages.mo diff --git a/inc/contrib/gettext/examples/locale/de_CH/LC_MESSAGES/messages.po b/inc/lib/gettext/examples/locale/de_CH/LC_MESSAGES/messages.po similarity index 100% rename from inc/contrib/gettext/examples/locale/de_CH/LC_MESSAGES/messages.po rename to inc/lib/gettext/examples/locale/de_CH/LC_MESSAGES/messages.po diff --git a/inc/contrib/gettext/examples/locale/sr_CS/LC_MESSAGES/messages.mo b/inc/lib/gettext/examples/locale/sr_CS/LC_MESSAGES/messages.mo similarity index 100% rename from inc/contrib/gettext/examples/locale/sr_CS/LC_MESSAGES/messages.mo rename to inc/lib/gettext/examples/locale/sr_CS/LC_MESSAGES/messages.mo diff --git a/inc/contrib/gettext/examples/locale/sr_CS/LC_MESSAGES/messages.po b/inc/lib/gettext/examples/locale/sr_CS/LC_MESSAGES/messages.po similarity index 100% rename from inc/contrib/gettext/examples/locale/sr_CS/LC_MESSAGES/messages.po rename to inc/lib/gettext/examples/locale/sr_CS/LC_MESSAGES/messages.po diff --git a/inc/contrib/gettext/examples/pigs_dropin.php b/inc/lib/gettext/examples/pigs_dropin.php similarity index 100% rename from inc/contrib/gettext/examples/pigs_dropin.php rename to inc/lib/gettext/examples/pigs_dropin.php diff --git a/inc/contrib/gettext/examples/pigs_fallback.php b/inc/lib/gettext/examples/pigs_fallback.php similarity index 100% rename from inc/contrib/gettext/examples/pigs_fallback.php rename to inc/lib/gettext/examples/pigs_fallback.php diff --git a/inc/contrib/gettext/examples/update b/inc/lib/gettext/examples/update similarity index 100% rename from inc/contrib/gettext/examples/update rename to inc/lib/gettext/examples/update diff --git a/inc/contrib/gettext/gettext.inc b/inc/lib/gettext/gettext.inc similarity index 99% rename from inc/contrib/gettext/gettext.inc rename to inc/lib/gettext/gettext.inc index 00b96669..cb21fea5 100644 --- a/inc/contrib/gettext/gettext.inc +++ b/inc/lib/gettext/gettext.inc @@ -38,8 +38,8 @@ if (!defined('LC_MESSAGES')) { define('LC_MESSAGES', 5); } -require('streams.php'); -require('gettext.php'); +require(dirname(__FILE__) . '/streams.php'); +require(dirname(__FILE__) . '/gettext.php'); // Variables diff --git a/inc/contrib/gettext/gettext.php b/inc/lib/gettext/gettext.php similarity index 100% rename from inc/contrib/gettext/gettext.php rename to inc/lib/gettext/gettext.php diff --git a/inc/contrib/gettext/streams.php b/inc/lib/gettext/streams.php similarity index 100% rename from inc/contrib/gettext/streams.php rename to inc/lib/gettext/streams.php diff --git a/inc/contrib/gettext/tests/LocalesTest.php b/inc/lib/gettext/tests/LocalesTest.php similarity index 100% rename from inc/contrib/gettext/tests/LocalesTest.php rename to inc/lib/gettext/tests/LocalesTest.php diff --git a/inc/contrib/gettext/tests/ParsingTest.php b/inc/lib/gettext/tests/ParsingTest.php similarity index 100% rename from inc/contrib/gettext/tests/ParsingTest.php rename to inc/lib/gettext/tests/ParsingTest.php diff --git a/inc/contrib/minify/FirePHP.php b/inc/lib/minify/FirePHP.php similarity index 100% rename from inc/contrib/minify/FirePHP.php rename to inc/lib/minify/FirePHP.php diff --git a/inc/contrib/minify/HTTP/ConditionalGet.php b/inc/lib/minify/HTTP/ConditionalGet.php similarity index 100% rename from inc/contrib/minify/HTTP/ConditionalGet.php rename to inc/lib/minify/HTTP/ConditionalGet.php diff --git a/inc/contrib/minify/HTTP/Encoder.php b/inc/lib/minify/HTTP/Encoder.php similarity index 100% rename from inc/contrib/minify/HTTP/Encoder.php rename to inc/lib/minify/HTTP/Encoder.php diff --git a/inc/contrib/minify/JSMin.php b/inc/lib/minify/JSMin.php similarity index 100% rename from inc/contrib/minify/JSMin.php rename to inc/lib/minify/JSMin.php diff --git a/inc/contrib/minify/JSMinPlus.php b/inc/lib/minify/JSMinPlus.php similarity index 100% rename from inc/contrib/minify/JSMinPlus.php rename to inc/lib/minify/JSMinPlus.php diff --git a/inc/contrib/minify/Minify.php b/inc/lib/minify/Minify.php similarity index 100% rename from inc/contrib/minify/Minify.php rename to inc/lib/minify/Minify.php diff --git a/inc/contrib/minify/Minify/Build.php b/inc/lib/minify/Minify/Build.php similarity index 100% rename from inc/contrib/minify/Minify/Build.php rename to inc/lib/minify/Minify/Build.php diff --git a/inc/contrib/minify/Minify/CSS.php b/inc/lib/minify/Minify/CSS.php similarity index 100% rename from inc/contrib/minify/Minify/CSS.php rename to inc/lib/minify/Minify/CSS.php diff --git a/inc/contrib/minify/Minify/CSS/Compressor.php b/inc/lib/minify/Minify/CSS/Compressor.php similarity index 100% rename from inc/contrib/minify/Minify/CSS/Compressor.php rename to inc/lib/minify/Minify/CSS/Compressor.php diff --git a/inc/contrib/minify/Minify/CSS/UriRewriter.php b/inc/lib/minify/Minify/CSS/UriRewriter.php similarity index 100% rename from inc/contrib/minify/Minify/CSS/UriRewriter.php rename to inc/lib/minify/Minify/CSS/UriRewriter.php diff --git a/inc/contrib/minify/Minify/Cache/APC.php b/inc/lib/minify/Minify/Cache/APC.php similarity index 100% rename from inc/contrib/minify/Minify/Cache/APC.php rename to inc/lib/minify/Minify/Cache/APC.php diff --git a/inc/contrib/minify/Minify/Cache/File.php b/inc/lib/minify/Minify/Cache/File.php similarity index 100% rename from inc/contrib/minify/Minify/Cache/File.php rename to inc/lib/minify/Minify/Cache/File.php diff --git a/inc/contrib/minify/Minify/Cache/Memcache.php b/inc/lib/minify/Minify/Cache/Memcache.php similarity index 100% rename from inc/contrib/minify/Minify/Cache/Memcache.php rename to inc/lib/minify/Minify/Cache/Memcache.php diff --git a/inc/contrib/minify/Minify/Cache/ZendPlatform.php b/inc/lib/minify/Minify/Cache/ZendPlatform.php similarity index 100% rename from inc/contrib/minify/Minify/Cache/ZendPlatform.php rename to inc/lib/minify/Minify/Cache/ZendPlatform.php diff --git a/inc/contrib/minify/Minify/CommentPreserver.php b/inc/lib/minify/Minify/CommentPreserver.php similarity index 100% rename from inc/contrib/minify/Minify/CommentPreserver.php rename to inc/lib/minify/Minify/CommentPreserver.php diff --git a/inc/contrib/minify/Minify/Controller/Base.php b/inc/lib/minify/Minify/Controller/Base.php similarity index 100% rename from inc/contrib/minify/Minify/Controller/Base.php rename to inc/lib/minify/Minify/Controller/Base.php diff --git a/inc/contrib/minify/Minify/Controller/Files.php b/inc/lib/minify/Minify/Controller/Files.php similarity index 100% rename from inc/contrib/minify/Minify/Controller/Files.php rename to inc/lib/minify/Minify/Controller/Files.php diff --git a/inc/contrib/minify/Minify/Controller/Groups.php b/inc/lib/minify/Minify/Controller/Groups.php similarity index 100% rename from inc/contrib/minify/Minify/Controller/Groups.php rename to inc/lib/minify/Minify/Controller/Groups.php diff --git a/inc/contrib/minify/Minify/Controller/MinApp.php b/inc/lib/minify/Minify/Controller/MinApp.php similarity index 100% rename from inc/contrib/minify/Minify/Controller/MinApp.php rename to inc/lib/minify/Minify/Controller/MinApp.php diff --git a/inc/contrib/minify/Minify/Controller/Page.php b/inc/lib/minify/Minify/Controller/Page.php similarity index 100% rename from inc/contrib/minify/Minify/Controller/Page.php rename to inc/lib/minify/Minify/Controller/Page.php diff --git a/inc/contrib/minify/Minify/Controller/Version1.php b/inc/lib/minify/Minify/Controller/Version1.php similarity index 100% rename from inc/contrib/minify/Minify/Controller/Version1.php rename to inc/lib/minify/Minify/Controller/Version1.php diff --git a/inc/contrib/minify/Minify/DebugDetector.php b/inc/lib/minify/Minify/DebugDetector.php similarity index 100% rename from inc/contrib/minify/Minify/DebugDetector.php rename to inc/lib/minify/Minify/DebugDetector.php diff --git a/inc/contrib/minify/Minify/HTML.php b/inc/lib/minify/Minify/HTML.php similarity index 100% rename from inc/contrib/minify/Minify/HTML.php rename to inc/lib/minify/Minify/HTML.php diff --git a/inc/contrib/minify/Minify/HTML/Helper.php b/inc/lib/minify/Minify/HTML/Helper.php similarity index 100% rename from inc/contrib/minify/Minify/HTML/Helper.php rename to inc/lib/minify/Minify/HTML/Helper.php diff --git a/inc/contrib/minify/Minify/ImportProcessor.php b/inc/lib/minify/Minify/ImportProcessor.php similarity index 100% rename from inc/contrib/minify/Minify/ImportProcessor.php rename to inc/lib/minify/Minify/ImportProcessor.php diff --git a/inc/contrib/minify/Minify/JS/ClosureCompiler.php b/inc/lib/minify/Minify/JS/ClosureCompiler.php similarity index 100% rename from inc/contrib/minify/Minify/JS/ClosureCompiler.php rename to inc/lib/minify/Minify/JS/ClosureCompiler.php diff --git a/inc/contrib/minify/Minify/Lines.php b/inc/lib/minify/Minify/Lines.php similarity index 100% rename from inc/contrib/minify/Minify/Lines.php rename to inc/lib/minify/Minify/Lines.php diff --git a/inc/contrib/minify/Minify/Logger.php b/inc/lib/minify/Minify/Logger.php similarity index 100% rename from inc/contrib/minify/Minify/Logger.php rename to inc/lib/minify/Minify/Logger.php diff --git a/inc/contrib/minify/Minify/Packer.php b/inc/lib/minify/Minify/Packer.php similarity index 100% rename from inc/contrib/minify/Minify/Packer.php rename to inc/lib/minify/Minify/Packer.php diff --git a/inc/contrib/minify/Minify/Source.php b/inc/lib/minify/Minify/Source.php similarity index 100% rename from inc/contrib/minify/Minify/Source.php rename to inc/lib/minify/Minify/Source.php diff --git a/inc/contrib/minify/Minify/YUI/CssCompressor.java b/inc/lib/minify/Minify/YUI/CssCompressor.java similarity index 100% rename from inc/contrib/minify/Minify/YUI/CssCompressor.java rename to inc/lib/minify/Minify/YUI/CssCompressor.java diff --git a/inc/contrib/minify/Minify/YUI/CssCompressor.php b/inc/lib/minify/Minify/YUI/CssCompressor.php similarity index 100% rename from inc/contrib/minify/Minify/YUI/CssCompressor.php rename to inc/lib/minify/Minify/YUI/CssCompressor.php diff --git a/inc/contrib/minify/Minify/YUICompressor.php b/inc/lib/minify/Minify/YUICompressor.php similarity index 100% rename from inc/contrib/minify/Minify/YUICompressor.php rename to inc/lib/minify/Minify/YUICompressor.php diff --git a/inc/contrib/minify/MrClay/Cli.php b/inc/lib/minify/MrClay/Cli.php similarity index 100% rename from inc/contrib/minify/MrClay/Cli.php rename to inc/lib/minify/MrClay/Cli.php diff --git a/inc/contrib/minify/MrClay/Cli/Arg.php b/inc/lib/minify/MrClay/Cli/Arg.php similarity index 100% rename from inc/contrib/minify/MrClay/Cli/Arg.php rename to inc/lib/minify/MrClay/Cli/Arg.php diff --git a/inc/contrib/recaptcha/LICENSE b/inc/lib/recaptcha/LICENSE similarity index 100% rename from inc/contrib/recaptcha/LICENSE rename to inc/lib/recaptcha/LICENSE diff --git a/inc/contrib/recaptcha/recaptchalib.php b/inc/lib/recaptcha/recaptchalib.php similarity index 100% rename from inc/contrib/recaptcha/recaptchalib.php rename to inc/lib/recaptcha/recaptchalib.php diff --git a/inc/template.php b/inc/template.php index 537016ac..2a79f918 100644 --- a/inc/template.php +++ b/inc/template.php @@ -5,7 +5,7 @@ exit; } - require 'contrib/Twig/Autoloader.php'; + require 'lib/Twig/Autoloader.php'; Twig_Autoloader::register(); Twig_Autoloader::autoload('Twig_Extensions_Node_Trans');