From 439d41b194073285ab97be94253b3f4cb4395e43 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 18 Dec 2017 15:48:49 +0100 Subject: install smarty via composer and update other php libs --- Zotlabs/Render/SmartyInterface.php | 2 - composer.json | 3 +- composer.lock | 390 +-- library/Smarty/COPYING.lib | 165 -- library/Smarty/NEW_FEATURES.txt | 133 - library/Smarty/README | 575 ---- library/Smarty/change_log.txt | 2864 -------------------- library/Smarty/libs/Autoloader.php | 124 - library/Smarty/libs/Smarty.class.php | 1482 ---------- library/Smarty/libs/SmartyBC.class.php | 455 ---- library/Smarty/libs/debug.tpl | 160 -- library/Smarty/libs/plugins/block.textformat.php | 110 - library/Smarty/libs/plugins/function.counter.php | 78 - library/Smarty/libs/plugins/function.cycle.php | 107 - library/Smarty/libs/plugins/function.fetch.php | 221 -- .../libs/plugins/function.html_checkboxes.php | 237 -- .../Smarty/libs/plugins/function.html_image.php | 163 -- .../Smarty/libs/plugins/function.html_options.php | 196 -- .../Smarty/libs/plugins/function.html_radios.php | 221 -- .../libs/plugins/function.html_select_date.php | 387 --- .../libs/plugins/function.html_select_time.php | 364 --- .../Smarty/libs/plugins/function.html_table.php | 176 -- library/Smarty/libs/plugins/function.mailto.php | 155 -- library/Smarty/libs/plugins/function.math.php | 91 - .../Smarty/libs/plugins/modifier.capitalize.php | 90 - .../Smarty/libs/plugins/modifier.date_format.php | 65 - .../libs/plugins/modifier.debug_print_var.php | 116 - library/Smarty/libs/plugins/modifier.escape.php | 198 -- .../Smarty/libs/plugins/modifier.regex_replace.php | 58 - library/Smarty/libs/plugins/modifier.replace.php | 34 - library/Smarty/libs/plugins/modifier.spacify.php | 27 - library/Smarty/libs/plugins/modifier.truncate.php | 64 - .../Smarty/libs/plugins/modifiercompiler.cat.php | 29 - .../plugins/modifiercompiler.count_characters.php | 32 - .../plugins/modifiercompiler.count_paragraphs.php | 27 - .../plugins/modifiercompiler.count_sentences.php | 27 - .../libs/plugins/modifiercompiler.count_words.php | 31 - .../libs/plugins/modifiercompiler.default.php | 35 - .../libs/plugins/modifiercompiler.escape.php | 126 - .../libs/plugins/modifiercompiler.from_charset.php | 33 - .../libs/plugins/modifiercompiler.indent.php | 33 - .../Smarty/libs/plugins/modifiercompiler.lower.php | 31 - .../libs/plugins/modifiercompiler.noprint.php | 21 - .../plugins/modifiercompiler.string_format.php | 25 - .../Smarty/libs/plugins/modifiercompiler.strip.php | 33 - .../libs/plugins/modifiercompiler.strip_tags.php | 29 - .../libs/plugins/modifiercompiler.to_charset.php | 33 - .../libs/plugins/modifiercompiler.unescape.php | 50 - .../Smarty/libs/plugins/modifiercompiler.upper.php | 29 - .../libs/plugins/modifiercompiler.wordwrap.php | 47 - .../libs/plugins/outputfilter.trimwhitespace.php | 90 - .../libs/plugins/shared.escape_special_chars.php | 53 - .../libs/plugins/shared.literal_compiler_param.php | 35 - .../Smarty/libs/plugins/shared.make_timestamp.php | 43 - .../Smarty/libs/plugins/shared.mb_str_replace.php | 55 - library/Smarty/libs/plugins/shared.mb_unicode.php | 54 - library/Smarty/libs/plugins/shared.mb_wordwrap.php | 73 - .../plugins/variablefilter.htmlspecialchars.php | 19 - .../libs/sysplugins/smarty_cacheresource.php | 223 -- .../sysplugins/smarty_cacheresource_custom.php | 281 -- .../smarty_cacheresource_keyvaluestore.php | 513 ---- library/Smarty/libs/sysplugins/smarty_data.php | 68 - .../smarty_internal_cacheresource_file.php | 225 -- .../sysplugins/smarty_internal_compile_append.php | 50 - .../sysplugins/smarty_internal_compile_assign.php | 98 - .../sysplugins/smarty_internal_compile_block.php | 292 -- .../sysplugins/smarty_internal_compile_break.php | 77 - .../sysplugins/smarty_internal_compile_call.php | 89 - .../sysplugins/smarty_internal_compile_capture.php | 117 - .../smarty_internal_compile_config_load.php | 104 - .../smarty_internal_compile_continue.php | 77 - .../sysplugins/smarty_internal_compile_debug.php | 41 - .../sysplugins/smarty_internal_compile_eval.php | 71 - .../sysplugins/smarty_internal_compile_extends.php | 134 - .../sysplugins/smarty_internal_compile_for.php | 169 -- .../sysplugins/smarty_internal_compile_foreach.php | 347 --- .../smarty_internal_compile_function.php | 210 -- .../libs/sysplugins/smarty_internal_compile_if.php | 252 -- .../sysplugins/smarty_internal_compile_include.php | 366 --- .../smarty_internal_compile_include_php.php | 111 - .../sysplugins/smarty_internal_compile_insert.php | 151 -- .../sysplugins/smarty_internal_compile_ldelim.php | 40 - .../sysplugins/smarty_internal_compile_nocache.php | 75 - ...marty_internal_compile_private_block_plugin.php | 89 - ...rty_internal_compile_private_foreachsection.php | 220 -- ...ty_internal_compile_private_function_plugin.php | 72 - .../smarty_internal_compile_private_modifier.php | 155 -- ...ernal_compile_private_object_block_function.php | 91 - ...ty_internal_compile_private_object_function.php | 84 - .../smarty_internal_compile_private_php.php | 209 -- ...y_internal_compile_private_print_expression.php | 156 -- ...y_internal_compile_private_registered_block.php | 119 - ...nternal_compile_private_registered_function.php | 79 - ...y_internal_compile_private_special_variable.php | 126 - .../sysplugins/smarty_internal_compile_rdelim.php | 39 - .../sysplugins/smarty_internal_compile_section.php | 454 ---- .../smarty_internal_compile_setfilter.php | 70 - .../smarty_internal_compile_shared_inheritance.php | 46 - .../sysplugins/smarty_internal_compile_while.php | 108 - .../sysplugins/smarty_internal_compilebase.php | 178 -- .../smarty_internal_config_file_compiler.php | 194 -- .../sysplugins/smarty_internal_configfilelexer.php | 699 ----- .../smarty_internal_configfileparser.php | 1010 ------- .../libs/sysplugins/smarty_internal_data.php | 240 -- .../libs/sysplugins/smarty_internal_debug.php | 430 --- .../sysplugins/smarty_internal_extension_clear.php | 126 - .../smarty_internal_extension_handler.php | 157 -- .../smarty_internal_method_addautoloadfilters.php | 51 - .../smarty_internal_method_adddefaultmodifiers.php | 42 - .../sysplugins/smarty_internal_method_append.php | 74 - .../smarty_internal_method_appendbyref.php | 50 - .../smarty_internal_method_assignbyref.php | 36 - .../smarty_internal_method_assignglobal.php | 43 - .../smarty_internal_method_clearallassign.php | 37 - .../smarty_internal_method_clearallcache.php | 40 - .../smarty_internal_method_clearassign.php | 44 - .../smarty_internal_method_clearcache.php | 43 - ...marty_internal_method_clearcompiledtemplate.php | 124 - .../smarty_internal_method_clearconfig.php | 41 - .../smarty_internal_method_compileallconfig.php | 32 - .../smarty_internal_method_compilealltemplates.php | 111 - .../smarty_internal_method_configload.php | 182 -- .../smarty_internal_method_createdata.php | 44 - .../smarty_internal_method_getautoloadfilters.php | 37 - .../smarty_internal_method_getconfigvars.php | 58 - .../smarty_internal_method_getdebugtemplate.php | 35 - .../smarty_internal_method_getdefaultmodifiers.php | 35 - .../smarty_internal_method_getregisteredobject.php | 44 - .../smarty_internal_method_getstreamvariable.php | 51 - .../sysplugins/smarty_internal_method_gettags.php | 62 - .../smarty_internal_method_gettemplatevars.php | 114 - .../smarty_internal_method_loadfilter.php | 77 - .../smarty_internal_method_loadplugin.php | 111 - .../smarty_internal_method_mustcompile.php | 49 - ...marty_internal_method_registercacheresource.php | 39 - .../smarty_internal_method_registerclass.php | 46 - ...nternal_method_registerdefaultconfighandler.php | 42 - ...nternal_method_registerdefaultpluginhandler.php | 43 - ...ernal_method_registerdefaulttemplatehandler.php | 72 - .../smarty_internal_method_registerfilter.php | 88 - .../smarty_internal_method_registerobject.php | 71 - .../smarty_internal_method_registerplugin.php | 50 - .../smarty_internal_method_registerresource.php | 44 - .../smarty_internal_method_setautoloadfilters.php | 70 - .../smarty_internal_method_setdebugtemplate.php | 41 - .../smarty_internal_method_setdefaultmodifiers.php | 38 - .../smarty_internal_method_unloadfilter.php | 42 - ...rty_internal_method_unregistercacheresource.php | 40 - .../smarty_internal_method_unregisterfilter.php | 42 - .../smarty_internal_method_unregisterobject.php | 40 - .../smarty_internal_method_unregisterplugin.php | 41 - .../smarty_internal_method_unregisterresource.php | 40 - .../sysplugins/smarty_internal_nocache_insert.php | 51 - .../libs/sysplugins/smarty_internal_parsetree.php | 54 - .../sysplugins/smarty_internal_parsetree_code.php | 42 - .../sysplugins/smarty_internal_parsetree_dq.php | 88 - .../smarty_internal_parsetree_dqcontent.php | 42 - .../sysplugins/smarty_internal_parsetree_tag.php | 69 - .../smarty_internal_parsetree_template.php | 128 - .../sysplugins/smarty_internal_parsetree_text.php | 40 - .../sysplugins/smarty_internal_resource_eval.php | 96 - .../smarty_internal_resource_extends.php | 124 - .../sysplugins/smarty_internal_resource_file.php | 179 -- .../sysplugins/smarty_internal_resource_php.php | 108 - .../smarty_internal_resource_registered.php | 99 - .../sysplugins/smarty_internal_resource_stream.php | 81 - .../sysplugins/smarty_internal_resource_string.php | 97 - .../smarty_internal_runtime_cachemodify.php | 67 - .../smarty_internal_runtime_codeframe.php | 94 - .../smarty_internal_runtime_filterhandler.php | 69 - .../sysplugins/smarty_internal_runtime_foreach.php | 47 - .../smarty_internal_runtime_getincludepath.php | 180 -- .../sysplugins/smarty_internal_runtime_hhvm.php | 30 - .../smarty_internal_runtime_inheritance.php | 233 -- .../smarty_internal_runtime_subtemplate.php | 203 -- .../smarty_internal_runtime_tplfunction.php | 97 - .../smarty_internal_runtime_updatecache.php | 170 -- .../smarty_internal_runtime_updatescope.php | 55 - .../smarty_internal_runtime_validatecompiled.php | 86 - .../sysplugins/smarty_internal_runtime_var.php | 33 - .../smarty_internal_runtime_writefile.php | 90 - .../smarty_internal_smartytemplatecompiler.php | 169 -- .../libs/sysplugins/smarty_internal_template.php | 376 --- .../sysplugins/smarty_internal_templatebase.php | 316 --- .../smarty_internal_templatecompilerbase.php | 1170 -------- .../sysplugins/smarty_internal_templatelexer.php | 1135 -------- .../sysplugins/smarty_internal_templateparser.php | 2833 ------------------- .../sysplugins/smarty_internal_testinstall.php | 604 ----- .../libs/sysplugins/smarty_internal_undefined.php | 48 - library/Smarty/libs/sysplugins/smarty_resource.php | 270 -- .../libs/sysplugins/smarty_resource_custom.php | 95 - .../libs/sysplugins/smarty_resource_recompiled.php | 47 - .../libs/sysplugins/smarty_resource_uncompiled.php | 79 - library/Smarty/libs/sysplugins/smarty_security.php | 715 ----- .../libs/sysplugins/smarty_template_cached.php | 246 -- .../libs/sysplugins/smarty_template_compiled.php | 297 -- .../libs/sysplugins/smarty_template_config.php | 97 - .../sysplugins/smarty_template_resource_base.php | 155 -- .../libs/sysplugins/smarty_template_source.php | 267 -- .../libs/sysplugins/smarty_undefined_variable.php | 37 - library/Smarty/libs/sysplugins/smarty_variable.php | 47 - .../libs/sysplugins/smartycompilerexception.php | 39 - library/Smarty/libs/sysplugins/smartyexception.php | 15 - vendor/bshaffer/oauth2-server-php/CHANGELOG.md | 20 +- vendor/bshaffer/oauth2-server-php/README.md | 2 +- vendor/bshaffer/oauth2-server-php/composer.json | 4 +- .../oauth2-server-php/src/OAuth2/Autoloader.php | 12 +- .../ClientAssertionTypeInterface.php | 13 + .../src/OAuth2/ClientAssertionType/HttpBasic.php | 48 +- .../src/OAuth2/Controller/AuthorizeController.php | 139 +- .../Controller/AuthorizeControllerInterface.php | 37 +- .../src/OAuth2/Controller/ResourceController.php | 49 +- .../Controller/ResourceControllerInterface.php | 29 +- .../src/OAuth2/Controller/TokenController.php | 74 +- .../OAuth2/Controller/TokenControllerInterface.php | 27 +- .../src/OAuth2/Encryption/EncryptionInterface.php | 23 + .../src/OAuth2/Encryption/Jwt.php | 58 +- .../src/OAuth2/GrantType/AuthorizationCode.php | 48 +- .../src/OAuth2/GrantType/ClientCredentials.php | 35 +- .../src/OAuth2/GrantType/GrantTypeInterface.php | 41 +- .../src/OAuth2/GrantType/JwtBearer.php | 47 +- .../src/OAuth2/GrantType/RefreshToken.php | 63 +- .../src/OAuth2/GrantType/UserCredentials.php | 46 +- .../OpenID/Controller/AuthorizeController.php | 39 +- .../Controller/AuthorizeControllerInterface.php | 2 + .../OpenID/Controller/UserInfoController.php | 40 +- .../Controller/UserInfoControllerInterface.php | 21 +- .../OAuth2/OpenID/GrantType/AuthorizationCode.php | 10 +- .../OpenID/ResponseType/AuthorizationCode.php | 30 +- .../ResponseType/AuthorizationCodeInterface.php | 14 +- .../src/OAuth2/OpenID/ResponseType/CodeIdToken.php | 16 + .../src/OAuth2/OpenID/ResponseType/IdToken.php | 58 +- .../OpenID/ResponseType/IdTokenInterface.php | 13 +- .../OAuth2/OpenID/ResponseType/IdTokenToken.php | 18 + .../OpenID/Storage/AuthorizationCodeInterface.php | 14 +- .../OAuth2/OpenID/Storage/UserClaimsInterface.php | 9 +- .../oauth2-server-php/src/OAuth2/Request.php | 70 +- .../src/OAuth2/RequestInterface.php | 23 + .../oauth2-server-php/src/OAuth2/Response.php | 134 +- .../src/OAuth2/ResponseInterface.php | 31 +- .../src/OAuth2/ResponseType/AccessToken.php | 64 +- .../OAuth2/ResponseType/AccessTokenInterface.php | 11 +- .../src/OAuth2/ResponseType/AuthorizationCode.php | 5 +- .../ResponseType/AuthorizationCodeInterface.php | 12 +- .../src/OAuth2/ResponseType/JwtAccessToken.php | 79 +- .../OAuth2/ResponseType/ResponseTypeInterface.php | 5 + .../oauth2-server-php/src/OAuth2/Scope.php | 40 +- .../src/OAuth2/ScopeInterface.php | 19 +- .../oauth2-server-php/src/OAuth2/Server.php | 283 +- .../src/OAuth2/Storage/AccessTokenInterface.php | 33 +- .../OAuth2/Storage/AuthorizationCodeInterface.php | 12 +- .../src/OAuth2/Storage/Cassandra.php | 230 +- .../src/OAuth2/Storage/CouchbaseDB.php | 2 +- .../src/OAuth2/Storage/DynamoDB.php | 2 +- .../src/OAuth2/Storage/JwtAccessToken.php | 3 +- .../src/OAuth2/Storage/Memory.php | 2 +- .../oauth2-server-php/src/OAuth2/Storage/Pdo.php | 318 ++- .../src/OAuth2/Storage/PublicKeyInterface.php | 16 +- .../OAuth2/Storage/UserCredentialsInterface.php | 16 +- .../oauth2-server-php/test/OAuth2/AutoloadTest.php | 4 +- .../OAuth2/Controller/AuthorizeControllerTest.php | 3 +- .../OAuth2/Controller/ResourceControllerTest.php | 3 +- .../test/OAuth2/Controller/TokenControllerTest.php | 45 +- .../test/OAuth2/Encryption/FirebaseJwtTest.php | 3 +- .../test/OAuth2/Encryption/JwtTest.php | 3 +- .../OAuth2/GrantType/AuthorizationCodeTest.php | 3 +- .../OAuth2/GrantType/ClientCredentialsTest.php | 3 +- .../test/OAuth2/GrantType/ImplicitTest.php | 3 +- .../test/OAuth2/GrantType/JwtBearerTest.php | 3 +- .../test/OAuth2/GrantType/RefreshTokenTest.php | 3 +- .../test/OAuth2/GrantType/UserCredentialsTest.php | 3 +- .../OpenID/Controller/AuthorizeControllerTest.php | 3 +- .../OpenID/Controller/UserInfoControllerTest.php | 3 +- .../OpenID/GrantType/AuthorizationCodeTest.php | 3 +- .../OAuth2/OpenID/ResponseType/CodeIdTokenTest.php | 3 +- .../OAuth2/OpenID/ResponseType/IdTokenTest.php | 3 +- .../OpenID/ResponseType/IdTokenTokenTest.php | 3 +- .../oauth2-server-php/test/OAuth2/RequestTest.php | 3 +- .../oauth2-server-php/test/OAuth2/ResponseTest.php | 4 +- .../test/OAuth2/ResponseType/AccessTokenTest.php | 3 +- .../OAuth2/ResponseType/JwtAccessTokenTest.php | 3 +- .../oauth2-server-php/test/OAuth2/ScopeTest.php | 3 +- .../oauth2-server-php/test/OAuth2/ServerTest.php | 3 +- .../test/OAuth2/TokenType/BearerTest.php | 3 +- .../test/lib/OAuth2/Request/TestRequest.php | 7 +- .../test/lib/OAuth2/Storage/BaseTest.php | 4 +- .../test/lib/OAuth2/Storage/Bootstrap.php | 0 vendor/composer/autoload_classmap.php | 2 - vendor/composer/autoload_files.php | 5 +- vendor/composer/autoload_static.php | 7 +- vendor/composer/installed.json | 517 ++-- vendor/league/html-to-markdown/CHANGELOG.md | 15 +- vendor/league/html-to-markdown/README.md | 8 +- vendor/league/html-to-markdown/composer.json | 2 +- .../src/Converter/ListItemConverter.php | 26 +- .../src/Converter/ParagraphConverter.php | 3 +- .../league/html-to-markdown/src/HtmlConverter.php | 3 +- vendor/sabre/vobject/.travis.yml | 4 +- vendor/sabre/vobject/CHANGELOG.md | 9 + vendor/sabre/vobject/README.md | 12 +- vendor/sabre/vobject/bin/bench.php | 0 vendor/sabre/vobject/bin/fetch_windows_zones.php | 0 vendor/sabre/vobject/bin/generateicalendardata.php | 0 vendor/sabre/vobject/bin/mergeduplicates.php | 0 vendor/sabre/vobject/composer.json | 2 +- vendor/sabre/vobject/lib/Component.php | 17 +- vendor/sabre/vobject/lib/Component/VCard.php | 5 + vendor/sabre/vobject/lib/Version.php | 2 +- .../vobject/lib/timezonedata/exchangezones.php | 1 + vendor/simplepie/simplepie/library/SimplePie.php | 58 +- .../library/SimplePie/Cache/Memcached.php | 0 .../simplepie/simplepie/library/SimplePie/File.php | 3 +- .../simplepie/library/SimplePie/HTTP/Parser.php | 21 + .../simplepie/simplepie/library/SimplePie/Item.php | 30 +- .../simplepie/library/SimplePie/Parser.php | 63 +- .../simplepie/library/SimplePie/Registry.php | 0 316 files changed, 2763 insertions(+), 34992 deletions(-) delete mode 100644 library/Smarty/COPYING.lib delete mode 100644 library/Smarty/NEW_FEATURES.txt delete mode 100644 library/Smarty/README delete mode 100644 library/Smarty/change_log.txt delete mode 100644 library/Smarty/libs/Autoloader.php delete mode 100644 library/Smarty/libs/Smarty.class.php delete mode 100644 library/Smarty/libs/SmartyBC.class.php delete mode 100644 library/Smarty/libs/debug.tpl delete mode 100644 library/Smarty/libs/plugins/block.textformat.php delete mode 100644 library/Smarty/libs/plugins/function.counter.php delete mode 100644 library/Smarty/libs/plugins/function.cycle.php delete mode 100644 library/Smarty/libs/plugins/function.fetch.php delete mode 100644 library/Smarty/libs/plugins/function.html_checkboxes.php delete mode 100644 library/Smarty/libs/plugins/function.html_image.php delete mode 100644 library/Smarty/libs/plugins/function.html_options.php delete mode 100644 library/Smarty/libs/plugins/function.html_radios.php delete mode 100644 library/Smarty/libs/plugins/function.html_select_date.php delete mode 100644 library/Smarty/libs/plugins/function.html_select_time.php delete mode 100644 library/Smarty/libs/plugins/function.html_table.php delete mode 100644 library/Smarty/libs/plugins/function.mailto.php delete mode 100644 library/Smarty/libs/plugins/function.math.php delete mode 100644 library/Smarty/libs/plugins/modifier.capitalize.php delete mode 100644 library/Smarty/libs/plugins/modifier.date_format.php delete mode 100644 library/Smarty/libs/plugins/modifier.debug_print_var.php delete mode 100644 library/Smarty/libs/plugins/modifier.escape.php delete mode 100644 library/Smarty/libs/plugins/modifier.regex_replace.php delete mode 100644 library/Smarty/libs/plugins/modifier.replace.php delete mode 100644 library/Smarty/libs/plugins/modifier.spacify.php delete mode 100644 library/Smarty/libs/plugins/modifier.truncate.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.cat.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.count_characters.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.count_paragraphs.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.count_sentences.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.count_words.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.default.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.escape.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.from_charset.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.indent.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.lower.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.noprint.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.string_format.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.strip.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.strip_tags.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.to_charset.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.unescape.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.upper.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.wordwrap.php delete mode 100644 library/Smarty/libs/plugins/outputfilter.trimwhitespace.php delete mode 100644 library/Smarty/libs/plugins/shared.escape_special_chars.php delete mode 100644 library/Smarty/libs/plugins/shared.literal_compiler_param.php delete mode 100644 library/Smarty/libs/plugins/shared.make_timestamp.php delete mode 100644 library/Smarty/libs/plugins/shared.mb_str_replace.php delete mode 100644 library/Smarty/libs/plugins/shared.mb_unicode.php delete mode 100644 library/Smarty/libs/plugins/shared.mb_wordwrap.php delete mode 100644 library/Smarty/libs/plugins/variablefilter.htmlspecialchars.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_cacheresource.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_cacheresource_custom.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_data.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_cacheresource_file.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_append.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_assign.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_block.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_break.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_call.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_capture.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_config_load.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_continue.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_debug.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_eval.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_extends.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_for.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_foreach.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_function.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_if.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_include.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_include_php.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_insert.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_ldelim.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_nocache.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_private_foreachsection.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_private_php.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_rdelim.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_section.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_setfilter.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_shared_inheritance.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_while.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compilebase.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_config_file_compiler.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_configfilelexer.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_configfileparser.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_data.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_debug.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_extension_clear.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_extension_handler.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_addautoloadfilters.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_adddefaultmodifiers.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_append.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_appendbyref.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_assignbyref.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_assignglobal.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_clearallassign.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_clearallcache.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_clearassign.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_clearcache.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_clearcompiledtemplate.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_clearconfig.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_compileallconfig.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_compilealltemplates.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_configload.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_createdata.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_getautoloadfilters.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_getconfigvars.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_getdebugtemplate.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_getdefaultmodifiers.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_getregisteredobject.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_getstreamvariable.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_gettags.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_gettemplatevars.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_loadfilter.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_loadplugin.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_mustcompile.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_registercacheresource.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_registerclass.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_registerdefaultconfighandler.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_registerfilter.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_registerobject.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_registerplugin.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_registerresource.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_setautoloadfilters.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_setdebugtemplate.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_setdefaultmodifiers.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_unloadfilter.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_unregistercacheresource.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_unregisterfilter.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_unregisterobject.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_unregisterplugin.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_unregisterresource.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_nocache_insert.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_parsetree.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_parsetree_code.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_parsetree_dq.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_parsetree_dqcontent.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_parsetree_tag.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_parsetree_template.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_parsetree_text.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_resource_eval.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_resource_extends.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_resource_file.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_resource_php.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_resource_registered.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_resource_stream.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_resource_string.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_runtime_cachemodify.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_runtime_codeframe.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_runtime_filterhandler.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_runtime_foreach.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_runtime_getincludepath.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_runtime_hhvm.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_runtime_inheritance.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_runtime_subtemplate.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_runtime_tplfunction.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_runtime_updatecache.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_runtime_updatescope.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_runtime_validatecompiled.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_runtime_var.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_runtime_writefile.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_template.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_templatebase.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_templatelexer.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_templateparser.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_testinstall.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_undefined.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_resource.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_resource_custom.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_resource_recompiled.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_resource_uncompiled.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_security.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_template_cached.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_template_compiled.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_template_config.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_template_resource_base.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_template_source.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_undefined_variable.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_variable.php delete mode 100644 library/Smarty/libs/sysplugins/smartycompilerexception.php delete mode 100644 library/Smarty/libs/sysplugins/smartyexception.php mode change 100755 => 100644 vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/CouchbaseDB.php mode change 100755 => 100644 vendor/bshaffer/oauth2-server-php/test/lib/OAuth2/Storage/BaseTest.php mode change 100755 => 100644 vendor/bshaffer/oauth2-server-php/test/lib/OAuth2/Storage/Bootstrap.php mode change 100755 => 100644 vendor/sabre/vobject/bin/bench.php mode change 100755 => 100644 vendor/sabre/vobject/bin/fetch_windows_zones.php mode change 100755 => 100644 vendor/sabre/vobject/bin/generateicalendardata.php mode change 100755 => 100644 vendor/sabre/vobject/bin/mergeduplicates.php mode change 100755 => 100644 vendor/simplepie/simplepie/library/SimplePie.php mode change 100755 => 100644 vendor/simplepie/simplepie/library/SimplePie/Cache/Memcached.php mode change 100755 => 100644 vendor/simplepie/simplepie/library/SimplePie/Registry.php diff --git a/Zotlabs/Render/SmartyInterface.php b/Zotlabs/Render/SmartyInterface.php index 0e3a47c2f..9c9a501c0 100755 --- a/Zotlabs/Render/SmartyInterface.php +++ b/Zotlabs/Render/SmartyInterface.php @@ -2,8 +2,6 @@ namespace Zotlabs\Render; -require_once('library/Smarty/libs/Smarty.class.php'); - class SmartyInterface extends \Smarty { public $filename; diff --git a/composer.json b/composer.json index d7d979129..f89fb15b2 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,8 @@ "league/html-to-markdown": "^4.4", "pear/text_languagedetect": "^1.0", "commerceguys/intl": "~0.7", - "lukasreschke/id3parser": "^0.0.1" + "lukasreschke/id3parser": "^0.0.1", + "smarty/smarty": "~3.1" }, "require-dev" : { "php" : ">=7.0", diff --git a/composer.lock b/composer.lock index 0a7db1306..e2703afdd 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "3898249f4ed6128a2e7dbcd1744106be", + "content-hash": "73ca170baa6ded94a989b8a1066e6a98", "packages": [ { "name": "bshaffer/oauth2-server-php", - "version": "v1.9.0", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/bshaffer/oauth2-server-php.git", - "reference": "8856aed1a98d6da596ae3f9b8095b5c7a1581697" + "reference": "d158878425392fe5a0cc34f15dbaf46315ae0ed9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bshaffer/oauth2-server-php/zipball/8856aed1a98d6da596ae3f9b8095b5c7a1581697", - "reference": "8856aed1a98d6da596ae3f9b8095b5c7a1581697", + "url": "https://api.github.com/repos/bshaffer/oauth2-server-php/zipball/d158878425392fe5a0cc34f15dbaf46315ae0ed9", + "reference": "d158878425392fe5a0cc34f15dbaf46315ae0ed9", "shasum": "" }, "require": { @@ -27,12 +27,14 @@ "aws/aws-sdk-php": "~2.8", "firebase/php-jwt": "~2.2", "mongodb/mongodb": "^1.1", + "phpunit/phpunit": "^4.0", "predis/predis": "dev-master", "thobbs/phpcassa": "dev-master" }, "suggest": { "aws/aws-sdk-php": "~2.8 is required to use DynamoDB storage", - "firebase/php-jwt": "~1.1 is required to use MondoDB storage", + "firebase/php-jwt": "~2.2 is required to use JWT features", + "mongodb/mongodb": "^1.1 is required to use MongoDB storage", "predis/predis": "Required to use Redis storage", "thobbs/phpcassa": "Required to use Cassandra storage" }, @@ -60,7 +62,7 @@ "oauth", "oauth2" ], - "time": "2017-01-06T23:20:00+00:00" + "time": "2017-11-15T01:41:02+00:00" }, { "name": "commerceguys/intl", @@ -155,16 +157,16 @@ }, { "name": "league/html-to-markdown", - "version": "4.4.1", + "version": "4.6.0", "source": { "type": "git", "url": "https://github.com/thephpleague/html-to-markdown.git", - "reference": "82ea375b5b2b1da1da222644c0565c695bf88186" + "reference": "9022e648bc40e44cb3b18438d97ed8715ecbc49b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/82ea375b5b2b1da1da222644c0565c695bf88186", - "reference": "82ea375b5b2b1da1da222644c0565c695bf88186", + "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/9022e648bc40e44cb3b18438d97ed8715ecbc49b", + "reference": "9022e648bc40e44cb3b18438d97ed8715ecbc49b", "shasum": "" }, "require": { @@ -183,7 +185,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.5-dev" + "dev-master": "4.7-dev" } }, "autoload": { @@ -215,7 +217,7 @@ "html", "markdown" ], - "time": "2017-03-16T00:45:59+00:00" + "time": "2017-10-24T02:45:05+00:00" }, { "name": "lukasreschke/id3parser", @@ -643,16 +645,16 @@ }, { "name": "sabre/vobject", - "version": "4.1.2", + "version": "4.1.3", "source": { "type": "git", "url": "https://github.com/sabre-io/vobject.git", - "reference": "d0fde2fafa2a3dad1f559c2d1c2591d4fd75ae3c" + "reference": "df9916813d1d83e4f761c4cba13361ee74196fac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sabre-io/vobject/zipball/d0fde2fafa2a3dad1f559c2d1c2591d4fd75ae3c", - "reference": "d0fde2fafa2a3dad1f559c2d1c2591d4fd75ae3c", + "url": "https://api.github.com/repos/sabre-io/vobject/zipball/df9916813d1d83e4f761c4cba13361ee74196fac", + "reference": "df9916813d1d83e4f761c4cba13361ee74196fac", "shasum": "" }, "require": { @@ -661,7 +663,7 @@ "sabre/xml": ">=1.5 <3.0" }, "require-dev": { - "phpunit/phpunit": "*", + "phpunit/phpunit": "> 4.8, <6.0.0", "sabre/cs": "^1.0.0" }, "suggest": { @@ -736,7 +738,7 @@ "xCal", "xCard" ], - "time": "2016-12-06T04:14:09+00:00" + "time": "2017-10-18T08:29:40+00:00" }, { "name": "sabre/xml", @@ -803,16 +805,16 @@ }, { "name": "simplepie/simplepie", - "version": "1.5", + "version": "1.5.1", "source": { "type": "git", "url": "https://github.com/simplepie/simplepie.git", - "reference": "5de5551953f95feef12cf355a7a26a70f94aa3ab" + "reference": "db9fff27b6d49eed3d4047cd3211ec8dba2f5d6e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/simplepie/simplepie/zipball/5de5551953f95feef12cf355a7a26a70f94aa3ab", - "reference": "5de5551953f95feef12cf355a7a26a70f94aa3ab", + "url": "https://api.github.com/repos/simplepie/simplepie/zipball/db9fff27b6d49eed3d4047cd3211ec8dba2f5d6e", + "reference": "db9fff27b6d49eed3d4047cd3211ec8dba2f5d6e", "shasum": "" }, "require": { @@ -859,10 +861,63 @@ "rss" ], "support": { - "source": "https://github.com/simplepie/simplepie/tree/1.5", + "source": "https://github.com/simplepie/simplepie/tree/1.5.1", "issues": "https://github.com/simplepie/simplepie/issues" }, - "time": "2017-04-17T07:29:31+00:00" + "time": "2017-11-12T02:03:34+00:00" + }, + { + "name": "smarty/smarty", + "version": "v3.1.31", + "source": { + "type": "git", + "url": "https://github.com/smarty-php/smarty.git", + "reference": "c7d42e4a327c402897dd587871434888fde1e7a9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/smarty-php/smarty/zipball/c7d42e4a327c402897dd587871434888fde1e7a9", + "reference": "c7d42e4a327c402897dd587871434888fde1e7a9", + "shasum": "" + }, + "require": { + "php": ">=5.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1.x-dev" + } + }, + "autoload": { + "files": [ + "libs/bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-3.0" + ], + "authors": [ + { + "name": "Monte Ohrt", + "email": "monte@ohrt.com" + }, + { + "name": "Uwe Tews", + "email": "uwe.tews@googlemail.com" + }, + { + "name": "Rodney Rehm", + "email": "rodney.rehm@medialize.de" + } + ], + "description": "Smarty - the compiling PHP template engine", + "homepage": "http://www.smarty.net", + "keywords": [ + "templating" + ], + "time": "2016-12-14T21:57:25+00:00" } ], "packages-dev": [ @@ -1313,32 +1368,32 @@ }, { "name": "doctrine/instantiator", - "version": "1.0.5", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" + "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", + "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", "shasum": "" }, "require": { - "php": ">=5.3,<8.0-DEV" + "php": "^7.1" }, "require-dev": { "athletic/athletic": "~0.1.8", "ext-pdo": "*", "ext-phar": "*", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~2.0" + "phpunit/phpunit": "^6.2.3", + "squizlabs/php_codesniffer": "^3.0.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { @@ -1363,28 +1418,31 @@ "constructor", "instantiate" ], - "time": "2015-06-14T21:17:01+00:00" + "time": "2017-07-22T11:58:36+00:00" }, { "name": "fabpot/goutte", - "version": "v3.2.1", + "version": "v3.2.2", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/Goutte.git", - "reference": "db5c28f4a010b4161d507d5304e28a7ebf211638" + "reference": "395f61d7c2e15a813839769553a4de16fa3b3c96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/db5c28f4a010b4161d507d5304e28a7ebf211638", - "reference": "db5c28f4a010b4161d507d5304e28a7ebf211638", + "url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/395f61d7c2e15a813839769553a4de16fa3b3c96", + "reference": "395f61d7c2e15a813839769553a4de16fa3b3c96", "shasum": "" }, "require": { "guzzlehttp/guzzle": "^6.0", "php": ">=5.5.0", - "symfony/browser-kit": "~2.1|~3.0", - "symfony/css-selector": "~2.1|~3.0", - "symfony/dom-crawler": "~2.1|~3.0" + "symfony/browser-kit": "~2.1|~3.0|~4.0", + "symfony/css-selector": "~2.1|~3.0|~4.0", + "symfony/dom-crawler": "~2.1|~3.0|~4.0" + }, + "require-dev": { + "symfony/phpunit-bridge": "^3.3 || ^4" }, "type": "application", "extra": { @@ -1395,7 +1453,10 @@ "autoload": { "psr-4": { "Goutte\\": "Goutte" - } + }, + "exclude-from-classmap": [ + "Goutte/Tests" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1412,7 +1473,7 @@ "keywords": [ "scraper" ], - "time": "2017-01-03T13:21:43+00:00" + "time": "2017-11-19T08:45:40+00:00" }, { "name": "guzzlehttp/guzzle", @@ -1909,16 +1970,16 @@ }, { "name": "phpdocumentor/reflection-common", - "version": "1.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c" + "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c", - "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", + "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", "shasum": "" }, "require": { @@ -1959,33 +2020,39 @@ "reflection", "static analysis" ], - "time": "2015-12-27T11:43:31+00:00" + "time": "2017-09-11T18:02:19+00:00" }, { "name": "phpdocumentor/reflection-docblock", - "version": "3.1.1", + "version": "4.2.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e" + "reference": "66465776cfc249844bde6d117abff1d22e06c2da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e", - "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/66465776cfc249844bde6d117abff1d22e06c2da", + "reference": "66465776cfc249844bde6d117abff1d22e06c2da", "shasum": "" }, "require": { - "php": ">=5.5", - "phpdocumentor/reflection-common": "^1.0@dev", - "phpdocumentor/type-resolver": "^0.2.0", + "php": "^7.0", + "phpdocumentor/reflection-common": "^1.0.0", + "phpdocumentor/type-resolver": "^0.4.0", "webmozart/assert": "^1.0" }, "require-dev": { - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^4.4" + "doctrine/instantiator": "~1.0.5", + "mockery/mockery": "^1.0", + "phpunit/phpunit": "^6.4" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.x-dev" + } + }, "autoload": { "psr-4": { "phpDocumentor\\Reflection\\": [ @@ -2004,24 +2071,24 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2016-09-30T07:12:33+00:00" + "time": "2017-11-27T17:38:31+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "0.2.1", + "version": "0.4.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb" + "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb", - "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7", + "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7", "shasum": "" }, "require": { - "php": ">=5.5", + "php": "^5.5 || ^7.0", "phpdocumentor/reflection-common": "^1.0" }, "require-dev": { @@ -2051,7 +2118,7 @@ "email": "me@mikevanriel.com" } ], - "time": "2016-11-25T06:54:22+00:00" + "time": "2017-07-14T14:27:02+00:00" }, { "name": "phpspec/prophecy", @@ -3333,30 +3400,28 @@ }, { "name": "symfony/config", - "version": "v3.4.2", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "e57211b88aa889fefac1cb36866db04100b0f21c" + "reference": "0356e6d5298e9e72212c0bad65c2f1b49e42d622" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/e57211b88aa889fefac1cb36866db04100b0f21c", - "reference": "e57211b88aa889fefac1cb36866db04100b0f21c", + "url": "https://api.github.com/repos/symfony/config/zipball/0356e6d5298e9e72212c0bad65c2f1b49e42d622", + "reference": "0356e6d5298e9e72212c0bad65c2f1b49e42d622", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", - "symfony/filesystem": "~2.8|~3.0|~4.0" + "php": "^7.1.3", + "symfony/filesystem": "~3.4|~4.0" }, "conflict": { - "symfony/dependency-injection": "<3.3", - "symfony/finder": "<3.3" + "symfony/finder": "<3.4" }, "require-dev": { - "symfony/dependency-injection": "~3.3|~4.0", - "symfony/finder": "~3.3|~4.0", - "symfony/yaml": "~3.0|~4.0" + "symfony/finder": "~3.4|~4.0", + "symfony/yaml": "~3.4|~4.0" }, "suggest": { "symfony/yaml": "To use the yaml reference dumper" @@ -3364,7 +3429,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -3391,25 +3456,24 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2017-12-14T19:40:10+00:00" + "time": "2017-12-14T19:48:22+00:00" }, { "name": "symfony/console", - "version": "v3.4.2", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "9f21adfb92a9315b73ae2ed43138988ee4913d4e" + "reference": "de8cf039eacdec59d83f7def67e3b8ff5ed46714" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/9f21adfb92a9315b73ae2ed43138988ee4913d4e", - "reference": "9f21adfb92a9315b73ae2ed43138988ee4913d4e", + "url": "https://api.github.com/repos/symfony/console/zipball/de8cf039eacdec59d83f7def67e3b8ff5ed46714", + "reference": "de8cf039eacdec59d83f7def67e3b8ff5ed46714", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", - "symfony/debug": "~2.8|~3.0|~4.0", + "php": "^7.1.3", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { @@ -3418,11 +3482,11 @@ }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~3.3|~4.0", + "symfony/config": "~3.4|~4.0", "symfony/dependency-injection": "~3.4|~4.0", - "symfony/event-dispatcher": "~2.8|~3.0|~4.0", + "symfony/event-dispatcher": "~3.4|~4.0", "symfony/lock": "~3.4|~4.0", - "symfony/process": "~3.3|~4.0" + "symfony/process": "~3.4|~4.0" }, "suggest": { "psr/log": "For using the console logger", @@ -3433,7 +3497,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -3460,7 +3524,7 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2017-12-14T19:40:10+00:00" + "time": "2017-12-14T19:48:22+00:00" }, { "name": "symfony/css-selector", @@ -3515,83 +3579,27 @@ "homepage": "https://symfony.com", "time": "2017-12-14T19:40:10+00:00" }, - { - "name": "symfony/debug", - "version": "v3.4.2", - "source": { - "type": "git", - "url": "https://github.com/symfony/debug.git", - "reference": "543deab3ffff94402440b326fc94153bae2dfa7a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/543deab3ffff94402440b326fc94153bae2dfa7a", - "reference": "543deab3ffff94402440b326fc94153bae2dfa7a", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8", - "psr/log": "~1.0" - }, - "conflict": { - "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" - }, - "require-dev": { - "symfony/http-kernel": "~2.8|~3.0|~4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Debug\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Debug Component", - "homepage": "https://symfony.com", - "time": "2017-12-12T08:27:14+00:00" - }, { "name": "symfony/dependency-injection", - "version": "v3.4.2", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "5f81907ea43bfa971ac2c7fbac593ebe7cd7d333" + "reference": "d2fa088b5fd7d429974a36bf1a9846b912d9d124" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/5f81907ea43bfa971ac2c7fbac593ebe7cd7d333", - "reference": "5f81907ea43bfa971ac2c7fbac593ebe7cd7d333", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/d2fa088b5fd7d429974a36bf1a9846b912d9d124", + "reference": "d2fa088b5fd7d429974a36bf1a9846b912d9d124", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", + "php": "^7.1.3", "psr/container": "^1.0" }, "conflict": { - "symfony/config": "<3.3.7", - "symfony/finder": "<3.3", + "symfony/config": "<3.4", + "symfony/finder": "<3.4", "symfony/proxy-manager-bridge": "<3.4", "symfony/yaml": "<3.4" }, @@ -3599,8 +3607,8 @@ "psr/container-implementation": "1.0" }, "require-dev": { - "symfony/config": "~3.3|~4.0", - "symfony/expression-language": "~2.8|~3.0|~4.0", + "symfony/config": "~3.4|~4.0", + "symfony/expression-language": "~3.4|~4.0", "symfony/yaml": "~3.4|~4.0" }, "suggest": { @@ -3613,7 +3621,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -3640,7 +3648,7 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2017-12-14T19:40:10+00:00" + "time": "2017-12-14T19:48:22+00:00" }, { "name": "symfony/dom-crawler", @@ -3700,30 +3708,30 @@ }, { "name": "symfony/event-dispatcher", - "version": "v3.4.2", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "b869cbf8a15ca6261689de2c28a7d7f2d0706835" + "reference": "d4face19ed8002eec8280bc1c5ec18130472bf43" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b869cbf8a15ca6261689de2c28a7d7f2d0706835", - "reference": "b869cbf8a15ca6261689de2c28a7d7f2d0706835", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d4face19ed8002eec8280bc1c5ec18130472bf43", + "reference": "d4face19ed8002eec8280bc1c5ec18130472bf43", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" + "php": "^7.1.3" }, "conflict": { - "symfony/dependency-injection": "<3.3" + "symfony/dependency-injection": "<3.4" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0|~4.0", - "symfony/dependency-injection": "~3.3|~4.0", - "symfony/expression-language": "~2.8|~3.0|~4.0", - "symfony/stopwatch": "~2.8|~3.0|~4.0" + "symfony/config": "~3.4|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/expression-language": "~3.4|~4.0", + "symfony/stopwatch": "~3.4|~4.0" }, "suggest": { "symfony/dependency-injection": "", @@ -3732,7 +3740,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -3759,29 +3767,29 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2017-12-14T19:40:10+00:00" + "time": "2017-12-14T19:48:22+00:00" }, { "name": "symfony/filesystem", - "version": "v3.4.2", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "25b135bea251829e3db6a77d773643408b575ed4" + "reference": "8c2868641d0c4885eee9c12a89c2b695eb1985cd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/25b135bea251829e3db6a77d773643408b575ed4", - "reference": "25b135bea251829e3db6a77d773643408b575ed4", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/8c2868641d0c4885eee9c12a89c2b695eb1985cd", + "reference": "8c2868641d0c4885eee9c12a89c2b695eb1985cd", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" + "php": "^7.1.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -3808,7 +3816,7 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2017-12-14T19:40:10+00:00" + "time": "2017-12-14T19:48:22+00:00" }, { "name": "symfony/polyfill-mbstring", @@ -3871,33 +3879,33 @@ }, { "name": "symfony/translation", - "version": "v3.4.2", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "4c5d5582baf2829751a5207659329c1f52eedeb6" + "reference": "e2678768d2fcb7fe3d8108392626de1ece575634" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/4c5d5582baf2829751a5207659329c1f52eedeb6", - "reference": "4c5d5582baf2829751a5207659329c1f52eedeb6", + "url": "https://api.github.com/repos/symfony/translation/zipball/e2678768d2fcb7fe3d8108392626de1ece575634", + "reference": "e2678768d2fcb7fe3d8108392626de1ece575634", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", + "php": "^7.1.3", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/config": "<2.8", + "symfony/config": "<3.4", "symfony/dependency-injection": "<3.4", "symfony/yaml": "<3.4" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0|~4.0", + "symfony/config": "~3.4|~4.0", "symfony/dependency-injection": "~3.4|~4.0", "symfony/finder": "~2.8|~3.0|~4.0", - "symfony/intl": "^2.8.18|^3.2.5|~4.0", + "symfony/intl": "~3.4|~4.0", "symfony/yaml": "~3.4|~4.0" }, "suggest": { @@ -3908,7 +3916,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -3935,24 +3943,24 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2017-12-12T08:27:14+00:00" + "time": "2017-12-12T08:41:51+00:00" }, { "name": "symfony/yaml", - "version": "v3.4.2", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "afe0cd38486505c9703707707d91450cfc1bd536" + "reference": "a5ee52d155f06ad23b19eb63c31228ff56ad1116" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/afe0cd38486505c9703707707d91450cfc1bd536", - "reference": "afe0cd38486505c9703707707d91450cfc1bd536", + "url": "https://api.github.com/repos/symfony/yaml/zipball/a5ee52d155f06ad23b19eb63c31228ff56ad1116", + "reference": "a5ee52d155f06ad23b19eb63c31228ff56ad1116", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" + "php": "^7.1.3" }, "conflict": { "symfony/console": "<3.4" @@ -3966,7 +3974,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -3993,7 +4001,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2017-12-11T20:38:23+00:00" + "time": "2017-12-12T08:41:51+00:00" }, { "name": "theseer/tokenizer", diff --git a/library/Smarty/COPYING.lib b/library/Smarty/COPYING.lib deleted file mode 100644 index 02bbb60bc..000000000 --- a/library/Smarty/COPYING.lib +++ /dev/null @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. \ No newline at end of file diff --git a/library/Smarty/NEW_FEATURES.txt b/library/Smarty/NEW_FEATURES.txt deleted file mode 100644 index 1a51c71d9..000000000 --- a/library/Smarty/NEW_FEATURES.txt +++ /dev/null @@ -1,133 +0,0 @@ - - -This file contains a brief description of new features which have been added to Smarty 3.1 - -Smarty 3.1.28 - - OPCACHE - ======= - Smarty does now invalidate automatically updated and cleared compiled or cached template files in OPCACHE. - Correct operation is no longer dependent on OPCACHE configuration settings. - - Template inheritance - ==================== - Template inheritance is now processed in run time. - See the INHERITANCE_RELEASE_NOTES - - Modifier regex_replace - ====================== - An optional limit parameter was added - - fetch() and display() - ===================== - The fetch() and display() methods of the template object accept now optionally the same parameter - as the corresponding Smarty methods to get the content of another template. - Example: - $template->display(); Does display template of template object - $template->display('foo.tpl'); Does display template 'foo.bar' - - File: resource - ============== - Multiple template_dir entries can now be selected by a comma separated list of indices. - The template_dir array is searched in the order of the indices. (Could be used to change the default search order) - Example: - $smarty->display('[1],[0]foo.bar'); - - Filter support - ============== - Optional filter names - An optional filter name was added to $smarty->registerFilter(). It can be used to unregister a filter by name. - - $smarty->registerFilter('output', $callback, 'name'); - $smarty->unregister('output', 'name'); - - Closures - $smarty->registerFilter() does now accept closures. - - $smarty->registerFilter('pre', function($source) {return $source;}); - If no optional filter name was specified it gets the default name 'closure'. - If you register multiple closures register each with a unique filter name. - - $smarty->registerFilter('pre', function($source) {return $source;}, 'closure_1'); - - $smarty->registerFilter('pre', function($source) {return $source;}, 'closure_2'); - - -Smarty 3.1.22 - - Namespace support within templates - ================================== - Within templates you can now use namespace specifications on: - - Constants like foo\bar\FOO - - Class names like foo\bar\Baz::FOO, foo\bar\Baz::$foo, foo\bar\Baz::foo() - - PHP function names like foo\bar\baz() - - Security - ======== - - disable special $smarty variable - - The Smarty_Security class has the new property $disabled_special_smarty_vars. - It's an array which can be loaded with the $smarty special variable names like - 'template_object', 'template', 'current_dir' and others which will be disabled. - Note: That this security check is performed at compile time. - - - limit template nesting - - Property $max_template_nesting of Smarty_Security does set the maximum template nesting level. - The main template is level 1. The nesting level is checked at run time. When the maximum will be exceeded - an Exception will be thrown. The default setting is 0 which does disable this check. - - - trusted static methods - - The Smarty_Security class has the new property $trusted_static_methods to restrict access to static methods. - It's an nested array of trusted class and method names. - Format: - array ( - 'class_1' => array('method_1', 'method_2'), // allowed methods - 'class_2' => array(), // all methods of class allowed - ) - To disable access for all methods of all classes set $trusted_static_methods = null; - The default value is an empty array() which does enables all methods of all classes, but for backward compatibility - the setting of $static_classes will be checked. - Note: That this security check is performed at compile time. - - - trusted static properties - - The Smarty_Security class has the new property $trusted_static_properties to restrict access to static properties. - It's an nested array of trusted class and property names. - Format: - array ( - 'class_1' => array('prop_1', 'prop_2'), // allowed properties listed - 'class_2' => array(), // all properties of class allowed - } - To disable access for all properties of all classes set $trusted_static_properties = null; - The default value is an empty array() which does enables all properties of all classes, but for backward compatibility - the setting of $static_classes will be checked. - Note: That this security check is performed at compile time. - - - trusted constants . - The Smarty_Security class has the new property $trusted_constants to restrict access to constants. - It's an array of trusted constant names. - Format: - array ( - 'SMARTY_DIR' , // allowed constant - } - If the array is empty (default) the usage of constants can be controlled with the - Smarty_Security::$allow_constants property (default true) - - - - Compiled Templates - ================== - Smarty does now automatically detects a change of the $merge_compiled_includes and $escape_html - property and creates different compiled templates files depending on the setting. - - Same applies to config files and the $config_overwrite, $config_booleanize and - $config_read_hidden properties. - - Debugging - ========= - The layout of the debug window has been changed for better readability - - New class constants - Smarty::DEBUG_OFF - Smarty::DEBUG_ON - Smarty::DEBUG_INDIVIDUAL - have been introduced for setting the $debugging property. - - Smarty::DEBUG_INDIVIDUAL will create for each display() and fetch() call an individual debug window. - - . - diff --git a/library/Smarty/README b/library/Smarty/README deleted file mode 100644 index 08b397c3f..000000000 --- a/library/Smarty/README +++ /dev/null @@ -1,575 +0,0 @@ -Smarty 3.x - -Author: Monte Ohrt -Author: Uwe Tews - -AN INTRODUCTION TO SMARTY 3 - -NOTICE FOR 3.1 release: - -Please see the SMARTY_3.1_NOTES.txt file that comes with the distribution. - -NOTICE for 3.0.5 release: - -Smarty now follows the PHP error_reporting level by default. If PHP does not mask E_NOTICE and you try to access an unset template variable, you will now get an E_NOTICE warning. To revert to the old behavior: - -$smarty->error_reporting = E_ALL & ~E_NOTICE; - -NOTICE for 3.0 release: - -IMPORTANT: Some API adjustments have been made between the RC4 and 3.0 release. -We felt it is better to make these now instead of after a 3.0 release, then have to -immediately deprecate APIs in 3.1. Online documentation has been updated -to reflect these changes. Specifically: - ----- API CHANGES RC4 -> 3.0 ---- - -$smarty->register->* -$smarty->unregister->* -$smarty->utility->* -$samrty->cache->* - -Have all been changed to local method calls such as: - -$smarty->clearAllCache() -$smarty->registerFoo() -$smarty->unregisterFoo() -$smarty->testInstall() -etc. - -Registration of function, block, compiler, and modifier plugins have been -consolidated under two API calls: - -$smarty->registerPlugin(...) -$smarty->unregisterPlugin(...) - -Registration of pre, post, output and variable filters have been -consolidated under two API calls: - -$smarty->registerFilter(...) -$smarty->unregisterFilter(...) - -Please refer to the online documentation for all specific changes: - -http://www.smarty.net/documentation - ----- - -The Smarty 3 API has been refactored to a syntax geared -for consistency and modularity. The Smarty 2 API syntax is still supported, but -will throw a deprecation notice. You can disable the notices, but it is highly -recommended to adjust your syntax to Smarty 3, as the Smarty 2 syntax must run -through an extra rerouting wrapper. - -Basically, all Smarty methods now follow the "fooBarBaz" camel case syntax. Also, -all Smarty properties now have getters and setters. So for example, the property -$smarty->cache_dir can be set with $smarty->setCacheDir('foo/') and can be -retrieved with $smarty->getCacheDir(). - -Some of the Smarty 3 APIs have been revoked such as the "is*" methods that were -just duplicate functions of the now available "get*" methods. - -Here is a rundown of the Smarty 3 API: - -$smarty->fetch($template, $cache_id = null, $compile_id = null, $parent = null) -$smarty->display($template, $cache_id = null, $compile_id = null, $parent = null) -$smarty->isCached($template, $cache_id = null, $compile_id = null) -$smarty->createData($parent = null) -$smarty->createTemplate($template, $cache_id = null, $compile_id = null, $parent = null) -$smarty->enableSecurity() -$smarty->disableSecurity() -$smarty->setTemplateDir($template_dir) -$smarty->addTemplateDir($template_dir) -$smarty->templateExists($resource_name) -$smarty->loadPlugin($plugin_name, $check = true) -$smarty->loadFilter($type, $name) -$smarty->setExceptionHandler($handler) -$smarty->addPluginsDir($plugins_dir) -$smarty->getGlobal($varname = null) -$smarty->getRegisteredObject($name) -$smarty->getDebugTemplate() -$smarty->setDebugTemplate($tpl_name) -$smarty->assign($tpl_var, $value = null, $nocache = false) -$smarty->assignGlobal($varname, $value = null, $nocache = false) -$smarty->assignByRef($tpl_var, &$value, $nocache = false) -$smarty->append($tpl_var, $value = null, $merge = false, $nocache = false) -$smarty->appendByRef($tpl_var, &$value, $merge = false) -$smarty->clearAssign($tpl_var) -$smarty->clearAllAssign() -$smarty->configLoad($config_file, $sections = null) -$smarty->getVariable($variable, $_ptr = null, $search_parents = true, $error_enable = true) -$smarty->getConfigVariable($variable) -$smarty->getStreamVariable($variable) -$smarty->getConfigVars($varname = null) -$smarty->clearConfig($varname = null) -$smarty->getTemplateVars($varname = null, $_ptr = null, $search_parents = true) -$smarty->clearAllCache($exp_time = null, $type = null) -$smarty->clearCache($template_name, $cache_id = null, $compile_id = null, $exp_time = null, $type = null) - -$smarty->registerPlugin($type, $tag, $callback, $cacheable = true, $cache_attr = array()) - -$smarty->registerObject($object_name, $object_impl, $allowed = array(), $smarty_args = true, $block_methods = array()) - -$smarty->registerFilter($type, $function_name) -$smarty->registerResource($resource_type, $function_names) -$smarty->registerDefaultPluginHandler($function_name) -$smarty->registerDefaultTemplateHandler($function_name) - -$smarty->unregisterPlugin($type, $tag) -$smarty->unregisterObject($object_name) -$smarty->unregisterFilter($type, $function_name) -$smarty->unregisterResource($resource_type) - -$smarty->compileAllTemplates($extension = '.tpl', $force_compile = false, $time_limit = 0, $max_errors = null) -$smarty->clearCompiledTemplate($resource_name = null, $compile_id = null, $exp_time = null) -$smarty->testInstall() - -// then all the getters/setters, available for all properties. Here are a few: - -$caching = $smarty->getCaching(); // get $smarty->caching -$smarty->setCaching(true); // set $smarty->caching -$smarty->setDeprecationNotices(false); // set $smarty->deprecation_notices -$smarty->setCacheId($id); // set $smarty->cache_id -$debugging = $smarty->getDebugging(); // get $smarty->debugging - - -FILE STRUCTURE - -The Smarty 3 file structure is similar to Smarty 2: - -/libs/ - Smarty.class.php -/libs/sysplugins/ - internal.* -/libs/plugins/ - function.mailto.php - modifier.escape.php - ... - -A lot of Smarty 3 core functionality lies in the sysplugins directory; you do -not need to change any files here. The /libs/plugins/ folder is where Smarty -plugins are located. You can add your own here, or create a separate plugin -directory, just the same as Smarty 2. You will still need to create your own -/cache/, /templates/, /templates_c/, /configs/ folders. Be sure /cache/ and -/templates_c/ are writable. - -The typical way to use Smarty 3 should also look familiar: - -require('Smarty.class.php'); -$smarty = new Smarty; -$smarty->assign('foo','bar'); -$smarty->display('index.tpl'); - - -However, Smarty 3 works completely different on the inside. Smarty 3 is mostly -backward compatible with Smarty 2, except for the following items: - -*) Smarty 3 is PHP 5 only. It will not work with PHP 4. -*) The {php} tag is disabled by default. Enable with $smarty->allow_php_tag=true. -*) Delimiters surrounded by whitespace are no longer treated as Smarty tags. - Therefore, { foo } will not compile as a tag, you must use {foo}. This change - Makes Javascript/CSS easier to work with, eliminating the need for {literal}. - This can be disabled by setting $smarty->auto_literal = false; -*) The Smarty 3 API is a bit different. Many Smarty 2 API calls are deprecated - but still work. You will want to update your calls to Smarty 3 for maximum - efficiency. - - -There are many things that are new to Smarty 3. Here are the notable items: - -LEXER/PARSER -============ - -Smarty 3 now uses a lexing tokenizer for its parser/compiler. Basically, this -means Smarty has some syntax additions that make life easier such as in-template -math, shorter/intuitive function parameter options, infinite function recursion, -more accurate error handling, etc. - - -WHAT IS NEW IN SMARTY TEMPLATE SYNTAX -===================================== - -Smarty 3 allows expressions almost anywhere. Expressions can include PHP -functions as long as they are not disabled by the security policy, object -methods and properties, etc. The {math} plugin is no longer necessary but -is still supported for BC. - -Examples: -{$x+$y} will output the sum of x and y. -{$foo = strlen($bar)} function in assignment -{assign var=foo value= $x+$y} in attributes -{$foo = myfunct( ($x+$y)*3 )} as function parameter -{$foo[$x+3]} as array index - -Smarty tags can be used as values within other tags. -Example: {$foo={counter}+3} - -Smarty tags can also be used inside double quoted strings. -Example: {$foo="this is message {counter}"} - -You can define arrays within templates. -Examples: -{assign var=foo value=[1,2,3]} -{assign var=foo value=['y'=>'yellow','b'=>'blue']} -Arrays can be nested. -{assign var=foo value=[1,[9,8],3]} - -There is a new short syntax supported for assigning variables. -Example: {$foo=$bar+2} - -You can assign a value to a specific array element. If the variable exists but -is not an array, it is converted to an array before the new values are assigned. -Examples: -{$foo['bar']=1} -{$foo['bar']['blar']=1} - -You can append values to an array. If the variable exists but is not an array, -it is converted to an array before the new values are assigned. -Example: {$foo[]=1} - -You can use a PHP-like syntax for accessing array elements, as well as the -original "dot" notation. -Examples: -{$foo[1]} normal access -{$foo['bar']} -{$foo['bar'][1]} -{$foo[$x+$x]} index may contain any expression -{$foo[$bar[1]]} nested index -{$foo[section_name]} smarty section access, not array access! - -The original "dot" notation stays, and with improvements. -Examples: -{$foo.a.b.c} => $foo['a']['b']['c'] -{$foo.a.$b.c} => $foo['a'][$b]['c'] with variable index -{$foo.a.{$b+4}.c} => $foo['a'][$b+4]['c'] with expression as index -{$foo.a.{$b.c}} => $foo['a'][$b['c']] with nested index - -note that { and } are used to address ambiguties when nesting the dot syntax. - -Variable names themselves can be variable and contain expressions. -Examples: -$foo normal variable -$foo_{$bar} variable name containing other variable -$foo_{$x+$y} variable name containing expressions -$foo_{$bar}_buh_{$blar} variable name with multiple segments -{$foo_{$x}} will output the variable $foo_1 if $x has a value of 1. - -Object method chaining is implemented. -Example: {$object->method1($x)->method2($y)} - -{for} tag added for looping (replacement for {section} tag): -{for $x=0, $y=count($foo); $x<$y; $x++} .... {/for} -Any number of statements can be used separated by comma as the first -inital expression at {for}. - -{for $x = $start to $end step $step} ... {/for}is in the SVN now . -You can use also -{for $x = $start to $end} ... {/for} -In this case the step value will be automaticall 1 or -1 depending on the start and end values. -Instead of $start and $end you can use any valid expression. -Inside the loop the following special vars can be accessed: -$x@iteration = number of iteration -$x@total = total number of iterations -$x@first = true on first iteration -$x@last = true on last iteration - - -The Smarty 2 {section} syntax is still supported. - -New shorter {foreach} syntax to loop over an array. -Example: {foreach $myarray as $var}...{/foreach} - -Within the foreach loop, properties are access via: - -$var@key foreach $var array key -$var@iteration foreach current iteration count (1,2,3...) -$var@index foreach current index count (0,1,2...) -$var@total foreach $var array total -$var@first true on first iteration -$var@last true on last iteration - -The Smarty 2 {foreach} tag syntax is still supported. - -NOTE: {$bar[foo]} still indicates a variable inside of a {section} named foo. -If you want to access an array element with index foo, you must use quotes -such as {$bar['foo']}, or use the dot syntax {$bar.foo}. - -while block tag is now implemented: -{while $foo}...{/while} -{while $x lt 10}...{/while} - -Direct access to PHP functions: -Just as you can use PHP functions as modifiers directly, you can now access -PHP functions directly, provided they are permitted by security settings: -{time()} - -There is a new {function}...{/function} block tag to implement a template function. -This enables reuse of code sequences like a plugin function. It can call itself recursively. -Template function must be called with the new {call name=foo...} tag. - -Example: - -Template file: -{function name=menu level=0} -
    - {foreach $data as $entry} - {if is_array($entry)} -
  • {$entry@key}
    • - {call name=menu data=$entry level=$level+1} - {else} -
  • {$entry}
    • - {/if} - {/foreach} -
-{/function} - -{$menu = ['item1','item2','item3' => ['item3-1','item3-2','item3-3' => - ['item3-3-1','item3-3-2']],'item4']} - -{call name=menu data=$menu} - - -Generated output: - * item1 - * item2 - * item3 - o item3-1 - o item3-2 - o item3-3 - + item3-3-1 - + item3-3-2 - * item4 - -The function tag itself must have the "name" attribute. This name is the tag -name when calling the function. The function tag may have any number of -additional attributes. These will be default settings for local variables. - -New {nocache} block function: -{nocache}...{/nocache} will declare a section of the template to be non-cached -when template caching is enabled. - -New nocache attribute: -You can declare variable/function output as non-cached with the nocache attribute. -Examples: - -{$foo nocache=true} -{$foo nocache} /* same */ - -{foo bar="baz" nocache=true} -{foo bar="baz" nocache} /* same */ - -{time() nocache=true} -{time() nocache} /* same */ - -Or you can also assign the variable in your script as nocache: -$smarty->assign('foo',$something,true); // third param is nocache setting -{$foo} /* non-cached */ - -$smarty.current_dir returns the directory name of the current template. - -You can use strings directly as templates with the "string" resource type. -Examples: -$smarty->display('string:This is my template, {$foo}!'); // php -{include file="string:This is my template, {$foo}!"} // template - - - -VARIABLE SCOPE / VARIABLE STORAGE -================================= - -In Smarty 2, all assigned variables were stored within the Smarty object. -Therefore, all variables assigned in PHP were accessible by all subsequent -fetch and display template calls. - -In Smarty 3, we have the choice to assign variables to the main Smarty object, -to user-created data objects, and to user-created template objects. -These objects can be chained. The object at the end of a chain can access all -variables belonging to that template and all variables within the parent objects. -The Smarty object can only be the root of a chain, but a chain can be isolated -from the Smarty object. - -All known Smarty assignment interfaces will work on the data and template objects. - -Besides the above mentioned objects, there is also a special storage area for -global variables. - -A Smarty data object can be created as follows: -$data = $smarty->createData(); // create root data object -$data->assign('foo','bar'); // assign variables as usual -$data->config_load('my.conf'); // load config file - -$data= $smarty->createData($smarty); // create data object having a parent link to -the Smarty object - -$data2= $smarty->createData($data); // create data object having a parent link to -the $data data object - -A template object can be created by using the createTemplate method. It has the -same parameter assignments as the fetch() or display() method. -Function definition: -function createTemplate($template, $cache_id = null, $compile_id = null, $parent = null) - -The first parameter can be a template name, a smarty object or a data object. - -Examples: -$tpl = $smarty->createTemplate('mytpl.tpl'); // create template object not linked to any parent -$tpl->assign('foo','bar'); // directly assign variables -$tpl->config_load('my.conf'); // load config file - -$tpl = $smarty->createTemplate('mytpl.tpl',$smarty); // create template having a parent link to the Smarty object -$tpl = $smarty->createTemplate('mytpl.tpl',$data); // create template having a parent link to the $data object - -The standard fetch() and display() methods will implicitly create a template object. -If the $parent parameter is not specified in these method calls, the template object -is will link back to the Smarty object as it's parent. - -If a template is called by an {include...} tag from another template, the -subtemplate links back to the calling template as it's parent. - -All variables assigned locally or from a parent template are accessible. If the -template creates or modifies a variable by using the {assign var=foo...} or -{$foo=...} tags, these new values are only known locally (local scope). When the -template exits, none of the new variables or modifications can be seen in the -parent template(s). This is same behavior as in Smarty 2. - -With Smarty 3, we can assign variables with a scope attribute which allows the -availablility of these new variables or modifications globally (ie in the parent -templates.) - -Possible scopes are local, parent, root and global. -Examples: -{assign var=foo value='bar'} // no scope is specified, the default 'local' -{$foo='bar'} // same, local scope -{assign var=foo value='bar' scope='local'} // same, local scope - -{assign var=foo value='bar' scope='parent'} // Values will be available to the parent object -{$foo='bar' scope='parent'} // (normally the calling template) - -{assign var=foo value='bar' scope='root'} // Values will be exported up to the root object, so they can -{$foo='bar' scope='root'} // be seen from all templates using the same root. - -{assign var=foo value='bar' scope='global'} // Values will be exported to global variable storage, -{$foo='bar' scope='global'} // they are available to any and all templates. - - -The scope attribute can also be attached to the {include...} tag. In this case, -the specified scope will be the default scope for all assignments within the -included template. - - -PLUGINS -======= - -Smarty 3 plugins follow the same coding rules as in Smarty 2. -The main difference is that the template object is now passed in place of the smarty object. -The smarty object can be still be accessed through $template->smarty. - -smarty_plugintype_name (array $params, Smarty_Internal_Template $template) - -The Smarty 2 plugins are still compatible as long as they do not make use of specific Smarty 2 internals. - - -TEMPLATE INHERITANCE: -===================== - -With template inheritance you can define blocks, which are areas that can be -overriden by child templates, so your templates could look like this: - -parent.tpl: - - - {block name='title'}My site name{/block} - - -

{block name='page-title'}Default page title{/block}

-
- {block name='content'} - Default content - {/block} -
- - - -child.tpl: -{extends file='parent.tpl'} -{block name='title'} -Child title -{/block} - -grandchild.tpl: -{extends file='child.tpl'} -{block name='title'}Home - {$smarty.block.parent}{/block} -{block name='page-title'}My home{/block} -{block name='content'} - {foreach $images as $img} - {$img.description} - {/foreach} -{/block} - -We redefined all the blocks here, however in the title block we used {$smarty.block.parent}, -which tells Smarty to insert the default content from the parent template in its place. -The content block was overriden to display the image files, and page-title has also be -overriden to display a completely different title. - -If we render grandchild.tpl we will get this: - - - Home - Child title - - -

My home

-
- image - image - image -
- - - -NOTE: In the child templates everything outside the {extends} or {block} tag sections -is ignored. - -The inheritance tree can be as big as you want (meaning you can extend a file that -extends another one that extends another one and so on..), but be aware that all files -have to be checked for modifications at runtime so the more inheritance the more overhead you add. - -Instead of defining the parent/child relationships with the {extends} tag in the child template you -can use the resource as follow: - -$smarty->display('extends:parent.tpl|child.tpl|grandchild.tpl'); - -Child {block} tags may optionally have a append or prepend attribute. In this case the parent block content -is appended or prepended to the child block content. - -{block name='title' append} My title {/block} - - -PHP STREAMS: -============ - -(see online documentation) - -VARIBLE FILTERS: -================ - -(see online documentation) - - -STATIC CLASS ACCESS AND NAMESPACE SUPPORT -========================================= - -You can register a class with optional namespace for the use in the template like: - -$smarty->register->templateClass('foo','name\name2\myclass'); - -In the template you can use it like this: -{foo::method()} etc. - - -======================= - -Please look through it and send any questions/suggestions/etc to the forums. - -http://www.phpinsider.com/smarty-forum/viewtopic.php?t=14168 - -Monte and Uwe diff --git a/library/Smarty/change_log.txt b/library/Smarty/change_log.txt deleted file mode 100644 index dadc5d17d..000000000 --- a/library/Smarty/change_log.txt +++ /dev/null @@ -1,2864 +0,0 @@ - ===== 3.1.29 ===== (21.12.2015) - 21.12.2015 - - optimization improve speed of filetime checks on extends and extendsall resource - - 20.12.2015 - - bugfix failure when the default resource type was set to 'extendsall' https://github.com/smarty-php/smarty/issues/123 - - update compilation of Smarty special variables - - bugfix add addition check for OS type on normalizaition of file path https://github.com/smarty-php/smarty/issues/134 - - bugfix the source uid of the extendsall resource must contain $template_dir settings https://github.com/smarty-php/smarty/issues/123 - - 19.12.2015 - - bugfix using $smarty.capture.foo in expressions could fail https://github.com/smarty-php/smarty/pull/138 - - bugfix broken PHP 5.2 compatibility https://github.com/smarty-php/smarty/issues/139 - - remove no longer used code - - improvement make sure that compiled and cache templates never can contain a trailing '?>? - - 18.12.2015 - - bugfix regression when modifier parameter was follow by math https://github.com/smarty-php/smarty/issues/132 - - 17.12.2015 - - bugfix {$smarty.capture.nameFail} did lowercase capture name https://github.com/smarty-php/smarty/issues/135 - - bugfix using {block append/prepend} on same block in multiple levels of inheritance templates could fail (forum topic 25827) - - bugfix text content consisting of just a single '0' like in {if true}0{/if} was suppressed (forum topic 25834) - - 16.12.2015 - - bugfix {foreach} did fail if from atrribute is a Generator class https://github.com/smarty-php/smarty/issues/128 - - bugfix direct access $smarty->template_dir = 'foo'; should call Smarty::setTemplateDir() https://github.com/smarty-php/smarty/issues/121 - - 15.12.2015 - - bugfix {$smarty.cookies.foo} did return the $_COOKIE array not the 'foo' value https://github.com/smarty-php/smarty/issues/122 - - bugfix a call to clearAllCache() and other should clear all internal template object caches (forum topic 25828) - - 14.12.2015 - - bugfix {$smarty.config.foo} broken in 3.1.28 https://github.com/smarty-php/smarty/issues/120 - - bugfix multiple calls of {section} with same name droped E_NOTICE error https://github.com/smarty-php/smarty/issues/118 - - ===== 3.1.28 ===== (13.12.2015) - 13.12.2015 - - bugfix {foreach} and {section} with uppercase characters in name attribute did not work (forum topic 25819) - - bugfix $smarty->debugging_ctrl = 'URL' did not work (forum topic 25811) - - bugfix Debug Console could display incorrect data when using subtemplates - - 09.12.2015 - - bugfix Smarty did fail under PHP 7.0.0 with use_include_path = true; - - 09.12.2015 - - bugfix {strip} should exclude some html tags from stripping, related to fix for https://github.com/smarty-php/smarty/issues/111 - - 08.12.2015 - - bugfix internal template function data got stored in wrong compiled file https://github.com/smarty-php/smarty/issues/114 - - 05.12.2015 - -bugfix {strip} should insert a single space https://github.com/smarty-php/smarty/issues/111 - - 25.11.2015 - -bugfix a left delimter like '[%' did fail on [%$var_[%$variable%]%] (forum topic 25798) - - 02.11.2015 - - bugfix {include} with variable file name like {include file="foo_`$bar`.tpl"} did fail in 3.1.28-dev https://github.com/smarty-php/smarty/issues/102 - - 01.11.2015 - - update config file processing - - 31.10.2015 - - bugfix add missing $trusted_dir property to SmartyBC class (forum topic 25751) - - 29.10.2015 - - improve template scope handling - - 24.10.2015 - - more optimizations of template processing - - bugfix Error when using {include} within {capture} https://github.com/smarty-php/smarty/issues/100 - - 21.10.2015 - - move some code into runtime extensions - - 18.10.2015 - - optimize filepath normalization - - rework of template inheritance - - speed and size optimizations - - bugfix under HHVM temporary cache file must only be created when caches template was updated - - fix compiled code for new {block} assign attribute - - update code generated by template function call handler - - 18.09.2015 - - bugfix {if $foo instanceof $bar} failed to compile if 2nd value is a variable https://github.com/smarty-php/smarty/issues/92 - - 17.09.2015 - - bugfix {foreach} first attribute was not correctly reset since commit 05a8fa2 of 02.08.2015 https://github.com/smarty-php/smarty/issues/90 - - 16.09.2015 - - update compiler by moving no longer needed properties, code optimizations and other - - 14.09.2015 - - optimize autoloader - - optimize subtemplate handling - - update template inheritance processing - - move code of {call} processing back into Smarty_Internal_Template class - - improvement invalidate OPCACHE for cleared compiled and cached template files (forum topic 25557) - - bugfix unintended multiple debug windows (forum topic 25699) - - 30.08.2015 - - size optimization move some runtime functions into extension - - optimize inline template processing - - optimization merge inheritance child and parent templates into one compiled template file - - 29.08.2015 - - improvement convert template inheritance into runtime processing - - bugfix {$smarty.block.parent} did always reference the root parent block https://github.com/smarty-php/smarty/issues/68 - - 23.08.2015 - - introduce Smarty::$resource_cache_mode and cache template object of {include} inside loop - - load seldom used Smarty API methods dynamically to reduce memory footprint - - cache template object of {include} if same template is included several times - - convert debug console processing to object - - use output buffers for better performance and less memory usage - - optimize nocache hash processing - - remove not really needed properties - - optimize rendering - - move caching to Smarty::_cache - - remove properties with redundant content - - optimize Smarty::templateExists() - - optimize use_include_path processing - - relocate properties for size optimization - - remove redundant code - - bugfix compiling super globals like {$smarty.get.foo} did fail in the master branch https://github.com/smarty-php/smarty/issues/77 - - 06.08.2015 - - avoid possible circular object references caused by parser/lexer objects - - rewrite compileAll... utility methods - - commit several internal improvements - - bugfix Smarty failed when compile_id did contain "|" - - 03.08.2015 - - rework clear cache methods - - bugfix compileAllConfig() was broken since 3.1.22 because of the changes in config file processing - - improve getIncludePath() to return directory if no file was given - - 02.08.2015 - - optimization and code cleanup of {foreach} and {section} compiler - - rework {capture} compiler - - 01.08.2015 - - update DateTime object can be instance of DateTimeImmutable since PHP5.5 https://github.com/smarty-php/smarty/pull/75 - - improvement show resource type and start of template source instead of uid on eval: and string: resource (forum topic 25630) - - 31.07.2015 - - optimize {foreach} and {section} compiler - - 29.07.2015 - - optimize {section} compiler for speed and size of compiled code - - 28.07.2015 - - update for PHP 7 compatibility - - 26.07.2015 - - improvement impement workaround for HHVM PHP incompatibillity https://github.com/facebook/hhvm/issues/4797 - - 25.07.2015 - - bugfix parser did hang on text starting fetch('foo.tpl') https://github.com/smarty-php/smarty/issues/70 - - improvement Added $limit parameter to regex_replace modifier #71 - - new feature multiple indices on file: resource - - 06.07.2015 - - optimize {block} compilation - - optimization get rid of __get and __set in source object - - 01.07.2015 - - optimize compile check handling - - update {foreach} compiler - - bugfix debugging console did not display string values containing \n, \r or \t correctly https://github.com/smarty-php/smarty/issues/66 - - optimize source resources - - 28.06.2015 - - move $smarty->enableSecurity() into Smarty_Security class - - optimize security isTrustedResourceDir() - - move auto load filter methods into extension - - move $smarty->getTemplateVars() into extension - - move getStreamVariable() into extension - - move $smarty->append() and $smarty->appendByRef() into extension - - optimize autoloader - - optimize file path normalization - - bugfix PATH_SEPARATOR was replaced by mistake in autoloader - - remove redundant code - - 27.06.2015 - - bugfix resolve naming conflict between custom Smarty delimiter '<%' and PHP ASP tags https://github.com/smarty-php/smarty/issues/64 - - update $smarty->_realpath for relative path not starting with './' - - update Smarty security with new realpath handling - - update {include_php} with new realpath handling - - move $smarty->loadPlugin() into extension - - minor compiler optimizations - - bugfix allow function plugins with name ending with 'close' https://github.com/smarty-php/smarty/issues/52 - - rework of $smarty->clearCompiledTemplate() and move it to its own extension - - 19.06.2015 - - improvement allow closures as callback at $smarty->registerFilter() https://github.com/smarty-php/smarty/issues/59 - - ===== 3.1.27===== (18.06.2015) - 18.06.2015 - - bugfix another update on file path normalization failed on path containing something like "/.foo/" https://github.com/smarty-php/smarty/issues/56 - - ===== 3.1.26===== (18.06.2015) - 18.06.2015 - - bugfix file path normalization failed on path containing something like "/.foo/" https://github.com/smarty-php/smarty/issues/56 - - 17.06.2015 - - bugfix calling a plugin with nocache option but no other attributes like {foo nocache} caused call to undefined function https://github.com/smarty-php/smarty/issues/55 - - ===== 3.1.25===== (15.06.2015) - 15.06.2015 - - optimization of smarty_cachereource_keyvaluestore.php code - - 14.06.2015 - - bugfix a relative sub template path could fail if template_dir path did contain /../ https://github.com/smarty-php/smarty/issues/50 - - optimization rework of path normalization - - bugfix an output tag with variable, modifier followed by an operator like {$foo|modifier+1} did fail https://github.com/smarty-php/smarty/issues/53 - - 13.06.2015 - - bugfix a custom cache resource using smarty_cachereource_keyvaluestore.php did fail if php.ini mbstring.func_overload = 2 (forum topic 25568) - - 11.06.2015 - - bugfix the lexer could hang on very large quoted strings (forum topic 25570) - - 08.06.2015 - - bugfix using {$foo} as array index like $bar.{$foo} or in double quoted string like "some {$foo} thing" failed https://github.com/smarty-php/smarty/issues/49 - - 04.06.2015 - - bugfix possible error message on unset() while compiling {block} tags https://github.com/smarty-php/smarty/issues/46 - - 01.06.2015 - - bugfix including template variables broken since 3.1.22 https://github.com/smarty-php/smarty/issues/47 - - 27.05.2015 - - bugfix {include} with variable file name must not create by default individual cache file (since 3.1.22) https://github.com/smarty-php/smarty/issues/43 - - 24.05.2015 - - bugfix if condition string 'neq' broken due to a typo https://github.com/smarty-php/smarty/issues/42 - - ===== 3.1.24===== (23.05.2015) - 23.05.2015 - - improvement on php_handling to allow very large PHP sections, better error handling - - improvement allow extreme large comment sections (forum 25538) - - 21.05.2015 - - bugfix broken PHP 5.2 compatibility when compiling 1 did compile into wrong code https://github.com/smarty-php/smarty/issues/41 - - 19.05.2015 - - bugfix compiler did overwrite existing variable value when setting the nocache attribute https://github.com/smarty-php/smarty/issues/39 - - bugfix output filter trimwhitespace could run into the pcre.backtrack_limit on large output (code.google issue 220) - - bugfix compiler could run into the pcre.backtrack_limit on larger comment or {php} tag sections (forum 25538) - - 18.05.2015 - - improvement introduce shortcuts in lexer/parser rules for most frequent terms for higher - compilation speed - - 16.05.2015 - - bugfix {php}{/php} did work just for single lines https://github.com/smarty-php/smarty/issues/33 - - improvement remove not needed ?> handling from parser to new compiler module - - 05.05.2015 - - bugfix code could be messed up when {tags} are used in multiple attributes https://github.com/smarty-php/smarty/issues/23 - - 04.05.2015 - - bugfix Smarty_Resource::parseResourceName incompatible with Google AppEngine (https://github.com/smarty-php/smarty/issues/22) - - improvement use is_file() checks to avoid errors suppressed by @ which could still cause problems (https://github.com/smarty-php/smarty/issues/24) - - 28.04.2015 - - bugfix plugins of merged subtemplates not loaded in 3.1.22-dev (forum topic 25508) 2nd fix - - 28.04.2015 - - bugfix plugins of merged subtemplates not loaded in 3.1.22-dev (forum topic 25508) - - 23.04.2015 - - bugfix a nocache template variable used as parameter at {insert} was by mistake cached - - 20.04.2015 - - bugfix at a template function containing nocache code a parmeter could overwrite a template variable of same name - - 27.03.2015 - - bugfix Smarty_Security->allow_constants=false; did also disable true, false and null (change of 16.03.2015) - - improvement added a whitelist for trusted constants to security Smarty_Security::$trusted_constants (forum topic 25471) - - 20.03.2015 - - bugfix make sure that function properties get saved only in compiled files containing the fuction definition {forum topic 25452} - - bugfix correct update of global variable values on exit of template functions. (reported under Smarty Developers) - - 16.03.2015 - - bugfix problems with {function}{/function} and {call} tags in different subtemplate cache files {forum topic 25452} - - bugfix Smarty_Security->allow_constants=false; did not disallow direct usage of defined constants like {SMARTY_DIR} {forum topic 25457} - - bugfix {block}{/block} tags did not work inside double quoted strings https://github.com/smarty-php/smarty/issues/18 - - - 15.03.2015 - - bugfix $smarty->compile_check must be restored before rendering of a just updated cache file {forum 25452} - - 14.03.2015 - - bugfix {nocache} {/nocache} tags corrupted code when used within a nocache section caused by a nocache template variable. - - - bugfix template functions defined with {function} in an included subtemplate could not be called in nocache - mode with {call... nocache} if the subtemplate had it's own cache file {forum 25452} - - 10.03.2015 - - bugfix {include ... nocache} whith variable file or compile_id attribute was not executed in nocache mode. - - 12.02.2015 - - bugfix multiple Smarty::fetch() of same template when $smarty->merge_compiled_includes = true; could cause function already defined error - - 11.02.2015 - - bugfix recursive {includes} did create E_NOTICE message when $smarty->merge_compiled_includes = true; (github issue #16) - - 22.01.2015 - - new feature security can now control access to static methods and properties - see also NEW_FEATURES.txt - - 21.01.2015 - - bugfix clearCompiledTemplates(), clearAll() and clear() could try to delete whole drive at wrong path permissions because realpath() fail (forum 25397) - - bugfix 'self::' and 'parent::' was interpreted in template syntax as static class - - 04.01.2015 - - push last weeks changes to github - - - different optimizations - - improvement automatically create different versions of compiled templates and config files depending - on property settings. - - optimization restructure template processing by moving code into classes it better belongs to - - optimization restructure config file processing - - 31.12.2014 - - bugfix use function_exists('mb_get_info') for setting Smarty::$_MBSTRING. - Function mb_split could be overloaded depending on php.ini mbstring.func_overload - - - 29.12.2014 - - new feature security can now limit the template nesting level by property $max_template_nesting - see also NEW_FEATURES.txt (forum 25370) - - 29.12.2014 - - new feature security can now disable special $smarty variables listed in property $disabled_special_smarty_vars - see also NEW_FEATURES.txt (forum 25370) - - 27.12.2014 - - bugfix clear internal _is_file_cache when plugins_dir was modified - - 13.12.2014 - - improvement optimization of lexer and parser resulting in a up to 30% higher compiling speed - - 11.12.2014 - - bugfix resolve parser ambiguity between constant print tag {CONST} and other smarty tags after change of 09.12.2014 - - 09.12.2014 - - bugfix variables $null, $true and $false did not work after the change of 12.11.2014 (forum 25342) - - bugfix call of template function by a variable name did not work after latest changes (forum 25342) - - 23.11.2014 - - bugfix a plugin with attached modifier could fail if the tag was immediately followed by another Smarty tag (since 3.1.21) (forum 25326) - - 13.11.2014 - - improvement move autoload code into Autoloader.php. Use Composer autoloader when possible - - 12.11.2014 - - new feature added support of namespaces to template code - - 08.11.2014 - 10.11.2014 - - bugfix subtemplate called in nocache mode could be called with wrong compile_id when it did change on one of the calling templates - - improvement add code of template functions called in nocache mode dynamically to cache file (related to bugfix of 01.11.2014) - - bugfix Debug Console did not include all data from merged compiled subtemplates - - 04.11.2014 - - new feature $smarty->debugging = true; => overwrite existing Debug Console window (old behaviour) - $smarty->debugging = 2; => individual Debug Console window by template name - - 03.11.2014 - - bugfix Debug Console did not show included subtemplates since 3.1.17 (forum 25301) - - bugfix Modifier debug_print_var did not limit recursion or prevent recursive object display at Debug Console - (ATTENTION: parameter order has changed to be able to specify maximum recursion) - - bugfix Debug consol did not include subtemplate information with $smarty->merge_compiled_includes = true - - improvement The template variables are no longer displayed as objects on the Debug Console - - improvement $smarty->createData($parent = null, $name = null) new optional name parameter for display at Debug Console - - addition of some hooks for future extension of Debug Console - - 01.11.2014 - - bugfix and enhancement on subtemplate {include} and template {function} tags. - * Calling a template which has a nocache section could fail if it was called from a cached and a not cached subtemplate. - * Calling the same subtemplate cached and not cached with the $smarty->merge_compiled_includes enabled could cause problems - * Many smaller related changes - - 30.10.2014 - - bugfix access to class constant by object like {$object::CONST} or variable class name {$class::CONST} did not work (forum 25301) - - 26.10.2014 - - bugfix E_NOTICE message was created during compilation when ASP tags '<%' or '%>' are in template source text - - bugfix merge_compiled_includes option failed when caching enables and same subtemplate was included cached and not cached - - ===== 3.1.21 ===== (18.10.2014) - 18.10.2014 - - composer moved to github - - 17.10.2014 - - bugfix on $php_handling security and optimization of smarty_internal_parsetree (Thue Kristensen) - - 16.10.2014 - - bugfix composer.json update - - 15.10.2014 - - bugfix calling a new created cache file with fetch() and Smarty::CACHING_LIFETIME_SAVED multiple times did fail (forum 22350) - - 14.10.2014 - - bugfix any tag placed within " diff --git a/library/Smarty/libs/plugins/block.textformat.php b/library/Smarty/libs/plugins/block.textformat.php deleted file mode 100644 index abf544939..000000000 --- a/library/Smarty/libs/plugins/block.textformat.php +++ /dev/null @@ -1,110 +0,0 @@ - - * Name: textformat
- * Purpose: format text a certain way with preset styles - * or custom wrap/indent settings
- * Params: - * 
- * - style         - string (email)
- * - indent        - integer (0)
- * - wrap          - integer (80)
- * - wrap_char     - string ("\n")
- * - indent_char   - string (" ")
- * - wrap_boundary - boolean (true)
- *
- * - * @link http://www.smarty.net/manual/en/language.function.textformat.php {textformat} - * (Smarty online manual) - * - * @param array $params parameters - * @param string $content contents of the block - * @param Smarty_Internal_Template $template template object - * @param boolean &$repeat repeat flag - * - * @return string content re-formatted - * @author Monte Ohrt - */ -function smarty_block_textformat($params, $content, $template, &$repeat) -{ - if (is_null($content)) { - return; - } - - $style = null; - $indent = 0; - $indent_first = 0; - $indent_char = ' '; - $wrap = 80; - $wrap_char = "\n"; - $wrap_cut = false; - $assign = null; - - foreach ($params as $_key => $_val) { - switch ($_key) { - case 'style': - case 'indent_char': - case 'wrap_char': - case 'assign': - $$_key = (string) $_val; - break; - - case 'indent': - case 'indent_first': - case 'wrap': - $$_key = (int) $_val; - break; - - case 'wrap_cut': - $$_key = (bool) $_val; - break; - - default: - trigger_error("textformat: unknown attribute '$_key'"); - } - } - - if ($style == 'email') { - $wrap = 72; - } - // split into paragraphs - $_paragraphs = preg_split('![\r\n]{2}!', $content); - - foreach ($_paragraphs as &$_paragraph) { - if (!$_paragraph) { - continue; - } - // convert mult. spaces & special chars to single space - $_paragraph = preg_replace(array('!\s+!' . Smarty::$_UTF8_MODIFIER, '!(^\s+)|(\s+$)!' . Smarty::$_UTF8_MODIFIER), array(' ', ''), $_paragraph); - // indent first line - if ($indent_first > 0) { - $_paragraph = str_repeat($indent_char, $indent_first) . $_paragraph; - } - // wordwrap sentences - if (Smarty::$_MBSTRING) { - require_once(SMARTY_PLUGINS_DIR . 'shared.mb_wordwrap.php'); - $_paragraph = smarty_mb_wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut); - } else { - $_paragraph = wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut); - } - // indent lines - if ($indent > 0) { - $_paragraph = preg_replace('!^!m', str_repeat($indent_char, $indent), $_paragraph); - } - } - $_output = implode($wrap_char . $wrap_char, $_paragraphs); - - if ($assign) { - $template->assign($assign, $_output); - } else { - return $_output; - } -} diff --git a/library/Smarty/libs/plugins/function.counter.php b/library/Smarty/libs/plugins/function.counter.php deleted file mode 100644 index 4da85a14e..000000000 --- a/library/Smarty/libs/plugins/function.counter.php +++ /dev/null @@ -1,78 +0,0 @@ - - * Name: counter
- * Purpose: print out a counter value - * - * @author Monte Ohrt - * @link http://www.smarty.net/manual/en/language.function.counter.php {counter} - * (Smarty online manual) - * - * @param array $params parameters - * @param Smarty_Internal_Template $template template object - * - * @return string|null - */ -function smarty_function_counter($params, $template) -{ - static $counters = array(); - - $name = (isset($params['name'])) ? $params['name'] : 'default'; - if (!isset($counters[$name])) { - $counters[$name] = array( - 'start' => 1, - 'skip' => 1, - 'direction' => 'up', - 'count' => 1 - ); - } - $counter =& $counters[$name]; - - if (isset($params['start'])) { - $counter['start'] = $counter['count'] = (int) $params['start']; - } - - if (!empty($params['assign'])) { - $counter['assign'] = $params['assign']; - } - - if (isset($counter['assign'])) { - $template->assign($counter['assign'], $counter['count']); - } - - if (isset($params['print'])) { - $print = (bool) $params['print']; - } else { - $print = empty($counter['assign']); - } - - if ($print) { - $retval = $counter['count']; - } else { - $retval = null; - } - - if (isset($params['skip'])) { - $counter['skip'] = $params['skip']; - } - - if (isset($params['direction'])) { - $counter['direction'] = $params['direction']; - } - - if ($counter['direction'] == "down") { - $counter['count'] -= $counter['skip']; - } else { - $counter['count'] += $counter['skip']; - } - - return $retval; -} diff --git a/library/Smarty/libs/plugins/function.cycle.php b/library/Smarty/libs/plugins/function.cycle.php deleted file mode 100644 index 8dc5cd9d5..000000000 --- a/library/Smarty/libs/plugins/function.cycle.php +++ /dev/null @@ -1,107 +0,0 @@ - - * Name: cycle
- * Date: May 3, 2002
- * Purpose: cycle through given values
- * Params: - * 
- * - name      - name of cycle (optional)
- * - values    - comma separated list of values to cycle, or an array of values to cycle
- *               (this can be left out for subsequent calls)
- * - reset     - boolean - resets given var to true
- * - print     - boolean - print var or not. default is true
- * - advance   - boolean - whether or not to advance the cycle
- * - delimiter - the value delimiter, default is ","
- * - assign    - boolean, assigns to template var instead of printed.
- *
- * Examples:
- * 
- * {cycle values="#eeeeee,#d0d0d0d"}
- * {cycle name=row values="one,two,three" reset=true}
- * {cycle name=row}
- *
- * - * @link http://www.smarty.net/manual/en/language.function.cycle.php {cycle} - * (Smarty online manual) - * @author Monte Ohrt - * @author credit to Mark Priatel - * @author credit to Gerard - * @author credit to Jason Sweat - * @version 1.3 - * - * @param array $params parameters - * @param Smarty_Internal_Template $template template object - * - * @return string|null - */ - -function smarty_function_cycle($params, $template) -{ - static $cycle_vars; - - $name = (empty($params['name'])) ? 'default' : $params['name']; - $print = (isset($params['print'])) ? (bool) $params['print'] : true; - $advance = (isset($params['advance'])) ? (bool) $params['advance'] : true; - $reset = (isset($params['reset'])) ? (bool) $params['reset'] : false; - - if (!isset($params['values'])) { - if (!isset($cycle_vars[$name]['values'])) { - trigger_error("cycle: missing 'values' parameter"); - - return; - } - } else { - if (isset($cycle_vars[$name]['values']) - && $cycle_vars[$name]['values'] != $params['values'] - ) { - $cycle_vars[$name]['index'] = 0; - } - $cycle_vars[$name]['values'] = $params['values']; - } - - if (isset($params['delimiter'])) { - $cycle_vars[$name]['delimiter'] = $params['delimiter']; - } elseif (!isset($cycle_vars[$name]['delimiter'])) { - $cycle_vars[$name]['delimiter'] = ','; - } - - if (is_array($cycle_vars[$name]['values'])) { - $cycle_array = $cycle_vars[$name]['values']; - } else { - $cycle_array = explode($cycle_vars[$name]['delimiter'], $cycle_vars[$name]['values']); - } - - if (!isset($cycle_vars[$name]['index']) || $reset) { - $cycle_vars[$name]['index'] = 0; - } - - if (isset($params['assign'])) { - $print = false; - $template->assign($params['assign'], $cycle_array[$cycle_vars[$name]['index']]); - } - - if ($print) { - $retval = $cycle_array[$cycle_vars[$name]['index']]; - } else { - $retval = null; - } - - if ($advance) { - if ($cycle_vars[$name]['index'] >= count($cycle_array) - 1) { - $cycle_vars[$name]['index'] = 0; - } else { - $cycle_vars[$name]['index'] ++; - } - } - - return $retval; -} diff --git a/library/Smarty/libs/plugins/function.fetch.php b/library/Smarty/libs/plugins/function.fetch.php deleted file mode 100644 index 3506d4a8d..000000000 --- a/library/Smarty/libs/plugins/function.fetch.php +++ /dev/null @@ -1,221 +0,0 @@ - - * Name: fetch
- * Purpose: fetch file, web or ftp data and display results - * - * @link http://www.smarty.net/manual/en/language.function.fetch.php {fetch} - * (Smarty online manual) - * @author Monte Ohrt - * - * @param array $params parameters - * @param Smarty_Internal_Template $template template object - * - * @throws SmartyException - * @return string|null if the assign parameter is passed, Smarty assigns the result to a template variable - */ -function smarty_function_fetch($params, $template) -{ - if (empty($params['file'])) { - trigger_error("[plugin] fetch parameter 'file' cannot be empty", E_USER_NOTICE); - - return; - } - - // strip file protocol - if (stripos($params['file'], 'file://') === 0) { - $params['file'] = substr($params['file'], 7); - } - - $protocol = strpos($params['file'], '://'); - if ($protocol !== false) { - $protocol = strtolower(substr($params['file'], 0, $protocol)); - } - - if (isset($template->smarty->security_policy)) { - if ($protocol) { - // remote resource (or php stream, …) - if (!$template->smarty->security_policy->isTrustedUri($params['file'])) { - return; - } - } else { - // local file - if (!$template->smarty->security_policy->isTrustedResourceDir($params['file'])) { - return; - } - } - } - - $content = ''; - if ($protocol == 'http') { - // http fetch - if ($uri_parts = parse_url($params['file'])) { - // set defaults - $host = $server_name = $uri_parts['host']; - $timeout = 30; - $accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*"; - $agent = "Smarty Template Engine " . Smarty::SMARTY_VERSION; - $referer = ""; - $uri = !empty($uri_parts['path']) ? $uri_parts['path'] : '/'; - $uri .= !empty($uri_parts['query']) ? '?' . $uri_parts['query'] : ''; - $_is_proxy = false; - if (empty($uri_parts['port'])) { - $port = 80; - } else { - $port = $uri_parts['port']; - } - if (!empty($uri_parts['user'])) { - $user = $uri_parts['user']; - } - if (!empty($uri_parts['pass'])) { - $pass = $uri_parts['pass']; - } - // loop through parameters, setup headers - foreach ($params as $param_key => $param_value) { - switch ($param_key) { - case "file": - case "assign": - case "assign_headers": - break; - case "user": - if (!empty($param_value)) { - $user = $param_value; - } - break; - case "pass": - if (!empty($param_value)) { - $pass = $param_value; - } - break; - case "accept": - if (!empty($param_value)) { - $accept = $param_value; - } - break; - case "header": - if (!empty($param_value)) { - if (!preg_match('![\w\d-]+: .+!', $param_value)) { - trigger_error("[plugin] invalid header format '" . $param_value . "'", E_USER_NOTICE); - - return; - } else { - $extra_headers[] = $param_value; - } - } - break; - case "proxy_host": - if (!empty($param_value)) { - $proxy_host = $param_value; - } - break; - case "proxy_port": - if (!preg_match('!\D!', $param_value)) { - $proxy_port = (int) $param_value; - } else { - trigger_error("[plugin] invalid value for attribute '" . $param_key . "'", E_USER_NOTICE); - - return; - } - break; - case "agent": - if (!empty($param_value)) { - $agent = $param_value; - } - break; - case "referer": - if (!empty($param_value)) { - $referer = $param_value; - } - break; - case "timeout": - if (!preg_match('!\D!', $param_value)) { - $timeout = (int) $param_value; - } else { - trigger_error("[plugin] invalid value for attribute '" . $param_key . "'", E_USER_NOTICE); - - return; - } - break; - default: - trigger_error("[plugin] unrecognized attribute '" . $param_key . "'", E_USER_NOTICE); - - return; - } - } - if (!empty($proxy_host) && !empty($proxy_port)) { - $_is_proxy = true; - $fp = fsockopen($proxy_host, $proxy_port, $errno, $errstr, $timeout); - } else { - $fp = fsockopen($server_name, $port, $errno, $errstr, $timeout); - } - - if (!$fp) { - trigger_error("[plugin] unable to fetch: $errstr ($errno)", E_USER_NOTICE); - - return; - } else { - if ($_is_proxy) { - fputs($fp, 'GET ' . $params['file'] . " HTTP/1.0\r\n"); - } else { - fputs($fp, "GET $uri HTTP/1.0\r\n"); - } - if (!empty($host)) { - fputs($fp, "Host: $host\r\n"); - } - if (!empty($accept)) { - fputs($fp, "Accept: $accept\r\n"); - } - if (!empty($agent)) { - fputs($fp, "User-Agent: $agent\r\n"); - } - if (!empty($referer)) { - fputs($fp, "Referer: $referer\r\n"); - } - if (isset($extra_headers) && is_array($extra_headers)) { - foreach ($extra_headers as $curr_header) { - fputs($fp, $curr_header . "\r\n"); - } - } - if (!empty($user) && !empty($pass)) { - fputs($fp, "Authorization: BASIC " . base64_encode("$user:$pass") . "\r\n"); - } - - fputs($fp, "\r\n"); - while (!feof($fp)) { - $content .= fgets($fp, 4096); - } - fclose($fp); - $csplit = preg_split("!\r\n\r\n!", $content, 2); - - $content = $csplit[1]; - - if (!empty($params['assign_headers'])) { - $template->assign($params['assign_headers'], preg_split("!\r\n!", $csplit[0])); - } - } - } else { - trigger_error("[plugin fetch] unable to parse URL, check syntax", E_USER_NOTICE); - - return; - } - } else { - $content = @file_get_contents($params['file']); - if ($content === false) { - throw new SmartyException("{fetch} cannot read resource '" . $params['file'] . "'"); - } - } - - if (!empty($params['assign'])) { - $template->assign($params['assign'], $content); - } else { - return $content; - } -} diff --git a/library/Smarty/libs/plugins/function.html_checkboxes.php b/library/Smarty/libs/plugins/function.html_checkboxes.php deleted file mode 100644 index d78680368..000000000 --- a/library/Smarty/libs/plugins/function.html_checkboxes.php +++ /dev/null @@ -1,237 +0,0 @@ - - * Type: function
- * Name: html_checkboxes
- * Date: 24.Feb.2003
- * Purpose: Prints out a list of checkbox input types
- * Examples: - * 
- * {html_checkboxes values=$ids output=$names}
- * {html_checkboxes values=$ids name='box' separator='
' output=$names}
- * {html_checkboxes values=$ids checked=$checked separator='
' output=$names}
- *
- * Params: - * 
- * - name       (optional) - string default "checkbox"
- * - values     (required) - array
- * - options    (optional) - associative array
- * - checked    (optional) - array default not set
- * - separator  (optional) - ie 
 or  
- * - output     (optional) - the output next to each checkbox
- * - assign     (optional) - assign the output as an array to this variable
- * - escape     (optional) - escape the content (not value), defaults to true
- *
- * - * @link http://www.smarty.net/manual/en/language.function.html.checkboxes.php {html_checkboxes} - * (Smarty online manual) - * @author Christopher Kvarme - * @author credits to Monte Ohrt - * @version 1.0 - * - * @param array $params parameters - * @param object $template template object - * - * @return string - * @uses smarty_function_escape_special_chars() - */ -function smarty_function_html_checkboxes($params, $template) -{ - require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'); - - $name = 'checkbox'; - $values = null; - $options = null; - $selected = array(); - $separator = ''; - $escape = true; - $labels = true; - $label_ids = false; - $output = null; - - $extra = ''; - - foreach ($params as $_key => $_val) { - switch ($_key) { - case 'name': - case 'separator': - $$_key = (string) $_val; - break; - - case 'escape': - case 'labels': - case 'label_ids': - $$_key = (bool) $_val; - break; - - case 'options': - $$_key = (array) $_val; - break; - - case 'values': - case 'output': - $$_key = array_values((array) $_val); - break; - - case 'checked': - case 'selected': - if (is_array($_val)) { - $selected = array(); - foreach ($_val as $_sel) { - if (is_object($_sel)) { - if (method_exists($_sel, "__toString")) { - $_sel = smarty_function_escape_special_chars((string) $_sel->__toString()); - } else { - trigger_error("html_checkboxes: selected attribute contains an object of class '" . get_class($_sel) . "' without __toString() method", E_USER_NOTICE); - continue; - } - } else { - $_sel = smarty_function_escape_special_chars((string) $_sel); - } - $selected[$_sel] = true; - } - } elseif (is_object($_val)) { - if (method_exists($_val, "__toString")) { - $selected = smarty_function_escape_special_chars((string) $_val->__toString()); - } else { - trigger_error("html_checkboxes: selected attribute is an object of class '" . get_class($_val) . "' without __toString() method", E_USER_NOTICE); - } - } else { - $selected = smarty_function_escape_special_chars((string) $_val); - } - break; - - case 'checkboxes': - trigger_error('html_checkboxes: the use of the "checkboxes" attribute is deprecated, use "options" instead', E_USER_WARNING); - $options = (array) $_val; - break; - - case 'assign': - break; - - case 'strict': - break; - - case 'disabled': - case 'readonly': - if (!empty($params['strict'])) { - if (!is_scalar($_val)) { - trigger_error("html_options: $_key attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute", E_USER_NOTICE); - } - - if ($_val === true || $_val === $_key) { - $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"'; - } - - break; - } - // omit break; to fall through! - - default: - if (!is_array($_val)) { - $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"'; - } else { - trigger_error("html_checkboxes: extra attribute '$_key' cannot be an array", E_USER_NOTICE); - } - break; - } - } - - if (!isset($options) && !isset($values)) { - return ''; - } /* raise error here? */ - - $_html_result = array(); - - if (isset($options)) { - foreach ($options as $_key => $_val) { - $_html_result[] = smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids, $escape); - } - } else { - foreach ($values as $_i => $_key) { - $_val = isset($output[$_i]) ? $output[$_i] : ''; - $_html_result[] = smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids, $escape); - } - } - - if (!empty($params['assign'])) { - $template->assign($params['assign'], $_html_result); - } else { - return implode("\n", $_html_result); - } -} - -function smarty_function_html_checkboxes_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids, $escape = true) -{ - $_output = ''; - - if (is_object($value)) { - if (method_exists($value, "__toString")) { - $value = (string) $value->__toString(); - } else { - trigger_error("html_options: value is an object of class '" . get_class($value) . "' without __toString() method", E_USER_NOTICE); - - return ''; - } - } else { - $value = (string) $value; - } - - if (is_object($output)) { - if (method_exists($output, "__toString")) { - $output = (string) $output->__toString(); - } else { - trigger_error("html_options: output is an object of class '" . get_class($output) . "' without __toString() method", E_USER_NOTICE); - - return ''; - } - } else { - $output = (string) $output; - } - - if ($labels) { - if ($label_ids) { - $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER, '_', $name . '_' . $value)); - $_output .= '