diff --git a/4dev/database/table/edit_access_data.sql b/4dev/database/table/edit_access_data.sql
index ecadbedd..09ff02a8 100644
--- a/4dev/database/table/edit_access_data.sql
+++ b/4dev/database/table/edit_access_data.sql
@@ -11,6 +11,6 @@ CREATE TABLE edit_access_data (
 	edit_access_id INT NOT NULL,
 	name	VARCHAR,
 	value	VARCHAR,
-	enabled	SMALLINT NOT NULL DEFAULT 0, 
-	FOREIGN KEY (edit_access_id) REFERENCES edit_access (edit_access_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE 
+	enabled	SMALLINT NOT NULL DEFAULT 0,
+	FOREIGN KEY (edit_access_id) REFERENCES edit_access (edit_access_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
 ) INHERITS (edit_generic) WITHOUT OIDS;
diff --git a/4dev/sync/sync_template.sh b/4dev/sync/sync_template.sh
index 0650adea..c48dbde3 100755
--- a/4dev/sync/sync_template.sh
+++ b/4dev/sync/sync_template.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
 # create path
-path=`pwd`"/"$0;
+path=$(pwd)"/"$0;
 
 LOCAL_BASE_DIR="<local folder>";
 LOCAL_DIR=$LOCAL_BASE_DIR"";
 REMOTE_WEB="<remote folder>";
-TARGET_HOST_WEB="<user>@<host>
+TARGET_HOST_WEB="<user>@<host>";
 TMP_DIR=$LOCAL_BASE_DIR"/4dev/";
 tmpf_web=$TMP_DIR"tmp.web";
 
diff --git a/www/libs/TRAIT_db_pgsql.inc b/4dev/update/20180322_db_interface/TRAIT_db_pgsql.inc
similarity index 100%
rename from www/libs/TRAIT_db_pgsql.inc
rename to 4dev/update/20180322_db_interface/TRAIT_db_pgsql.inc
diff --git a/www/libs/db_pgsql_pdo.inc b/4dev/update/20180322_db_interface/db_pgsql_pdo.inc
similarity index 100%
rename from www/libs/db_pgsql_pdo.inc
rename to 4dev/update/20180322_db_interface/db_pgsql_pdo.inc
diff --git a/4dev/update/20180323_namespace/comp_func.sh b/4dev/update/20180323_namespace/comp_func.sh
new file mode 100755
index 00000000..bd3f96f4
--- /dev/null
+++ b/4dev/update/20180323_namespace/comp_func.sh
@@ -0,0 +1,72 @@
+#!/bin/bash
+
+OIFS=${IFS};
+base_dir="/home/clemens/html/developers/clemens/core_data/php_libraries/trunk/";
+class_file="CoreLibs/Output/Form/Generate.inc";
+tmp_file=${base_dir}"4dev/tmp/tmp.comp."$(echo "${class_file}" | tr \/. _);
+rpl_file=${base_dir}"4dev/tmp/tmp.rpl."$(echo "${class_file}" | tr \/. _);
+rm -f "${tmp_file}";
+rm -f "${rpl_file}";
+if [ ! -f ${class_file} ];
+then
+    echo "Cannot find ${class_file} in current folder: $(pwd)";
+    exit;
+fi;
+cat "${class_file}" | grep "WAS   :" -B 1 | while read line;
+do
+    # if method grep for function call
+    found=$(echo "${line}" | sed -e 's/^[ \t]*//' | grep "METHOD:");
+    if [ -n "${found}" ];
+    then
+        method=$(echo "${line}" | cut -d " " -f 3);
+        echo "1 MET: ${method}";
+        # is method
+        if [ -n "${method}" ];
+        then
+            # the full new call
+            new_function_call_full=$(grep "function ${method}(" "${class_file}" | grep "function" | sed -e 's/^[ \t]*//');
+            # just the method name
+            new_function_call=$(echo "${new_function_call_full}" | sed -e 's/public //' | sed -e 's/private //' | sed -e 's/static //' | sed -e 's/function //' | cut -d "(" -f 1);
+            # check if func call is more than just alphanumeric (we don't need to redeclare those, functions are case insenstivie)
+            #
+            # only params (remove all = ... stuff)
+            new_function_call_params=$(echo "${new_function_call_full}" | cut -d "(" -f 2- | sed -e 's/)//');
+            old_function_call_params='';
+            IFS=',';
+            for el in ${new_function_call_params};
+            do
+                if [ -n "${old_function_call_params}" ];
+                then
+                    old_function_call_params=${old_function_call_params}", ";
+                fi;
+                old_function_call_params=${old_function_call_params}$(echo "${el}" | cut -d "=" -f 1 | tr -d ' ');
+            done;
+            # cut -d "," "${new_function_call_params}" | while
+        fi;
+    fi;
+    # if this is a WAS
+    was=$(echo "${line}" | sed -e 's/^[ \t]*//' | grep "WAS   :" | tr -s " ");
+    if [ -n "${was}" ];
+    then
+        old_function_call=$(echo "${was}" | cut -d " " -f 4)
+        echo "2 OLD: ${old_function_call} => ${new_function_call} [${new_function_call_full}]";
+        # for return write:
+        # rpl new -> old { new }
+        rpl=$(echo "${new_function_call_full}" | sed -e "s/${new_function_call}/${old_function_call}/");
+        new_call="${rpl}\n";
+        new_call=${new_call}"{\n";
+        new_call=${new_call}"\terror_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);\n";
+        new_call=${new_call}"\treturn \$this->${new_function_call}(${old_function_call_params});\n";
+        new_call=${new_call}"}\n";
+        echo -e "${new_call}" >> "${tmp_file}";
+        echo "3A RPL CALL: ${rpl}";
+        echo "3B RPL CALL: return \$this->${new_function_call}(${old_function_call_params});";
+        echo "4  SWT RPL : rpl '\$this->${old_function_call}' '\$this->${new_function_call}'";
+        # write the replace calls for old $this->old_call to $this->new_call
+        echo "rpl '\$this->${old_function_call}' '\$this->${new_function_call}' ##TARGET_FILE##" >> "${rpl_file}";
+        echo "----";
+    fi;
+done;
+IFS=${OIFS};
+
+# __END__
diff --git a/4dev/update/20180323_namespace/rpl_old_method_in_file.sh b/4dev/update/20180323_namespace/rpl_old_method_in_file.sh
new file mode 100755
index 00000000..dba24008
--- /dev/null
+++ b/4dev/update/20180323_namespace/rpl_old_method_in_file.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+cat tmp.comp | while read i;
+do
+	found=$(echo "${i}" | grep "function ");
+	if [ -n "${found}" ]; then
+		fk=$(echo "${i}" | cut -d " " -f 3 | cut -d "(" -f 1);
+	fi;
+	found=$(echo "${i}" | grep "\$this->");
+	if [ -n "${found}" ]; then
+		# no to debug
+		found=$(echo "${i}" | grep "debug(");
+		if [ -z "${found}" ]; then
+			fk_n=$(echo "${i}" | cut -d "(" -f 1);
+			echo "rpl '\$this->${fk}' '${fk_n}' CoreLibs/DB/IO.inc";
+		fi;
+	fi;
+done;
diff --git a/www/Smarty b/www/Smarty
deleted file mode 120000
index da807799..00000000
--- a/www/Smarty
+++ /dev/null
@@ -1 +0,0 @@
-smarty-3.1.30
\ No newline at end of file
diff --git a/www/admin/Smarty b/www/admin/Smarty
deleted file mode 120000
index 100a744c..00000000
--- a/www/admin/Smarty
+++ /dev/null
@@ -1 +0,0 @@
-../Smarty
\ No newline at end of file
diff --git a/www/admin/cache b/www/admin/cache
deleted file mode 120000
index a32eef45..00000000
--- a/www/admin/cache
+++ /dev/null
@@ -1 +0,0 @@
-../cache/
\ No newline at end of file
diff --git a/www/admin/class_test.php b/www/admin/class_test.php
index b42094d3..db0d64c2 100644
--- a/www/admin/class_test.php
+++ b/www/admin/class_test.php
@@ -1,4 +1,4 @@
-<?
+<?php
 $DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
 $DEBUG_ALL = 1;
 $PRINT_ALL = 1;
@@ -8,35 +8,36 @@ if ($DEBUG_ALL) {
 	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 }
 
+ob_start();
+
+// basic class test file
 define('USE_DATABASE', true);
 // sample config
 require("config.inc");
 // set session name
 DEFINE('SET_SESSION_NAME', EDIT_SESSION_NAME);
-//	session_name(EDIT_SESSION_NAME);
-//	session_start();
-// basic class test file
-foreach (array ('Login', 'Admin.Backend') as $class) {
-	_spl_autoload('Class.'.$class.'.inc');
-}
-
-$lang = 'en_utf8';
-
+// define log file id
 DEFINE('LOG_FILE_ID', 'classTest');
-$login = new login($DB_CONFIG[LOGIN_DB], $lang);
-// init with standard
-//	$basic = new db_io($DB_CONFIG[MAIN_DB]);
-$basic = new AdminBackend($DB_CONFIG[MAIN_DB], $lang);
-$basic->db_info(1);
+// set language for l10n
+$lang = 'en_utf8';
+// init login & backend class
+$login = new CoreLibs\ACL\Login($DB_CONFIG[LOGIN_DB], $lang);
+$basic = new CoreLibs\Admin\Backend($DB_CONFIG[MAIN_DB], $lang);
+$basic->dbInfo(1);
+ob_end_flush();
 
 // set + check edit access id
 $edit_access_id = 3;
-print "ACL UNIT: ".print_r(array_keys($login->acl['unit']), 1)."<br>";
-print "ACCESS CHECK: ".$login->login_check_edit_access($edit_access_id)."<br>";
-if ($login->login_check_edit_access($edit_access_id)) {
-	$basic->edit_access_id = $edit_access_id;
+if (array_key_exists('unit', $login->acl)) {
+	print "ACL UNIT: ".print_r(array_keys($login->acl['unit']), 1)."<br>";
+	print "ACCESS CHECK: ".$login->loginCheckEditAccess($edit_access_id)."<br>";
+	if ($login->loginCheckEditAccess($edit_access_id)) {
+		$basic->edit_access_id = $edit_access_id;
+	} else {
+		$basic->edit_access_id = $login->acl['unit_id'];
+	}
 } else {
-	$basic->edit_access_id = $login->acl['unit_id'];
+	print "Something went wrong with the login<br>";
 }
 
 //	$basic->debug('SESSION', $basic->print_ar($_SESSION));
@@ -59,12 +60,12 @@ print "DEBUG OUT ALL: ".$basic->debug_output_all."<br>";
 print "ECHO OUT ALL: ".$basic->echo_output_all."<br>";
 print "PRINT OUT ALL: ".$basic->print_output_all."<br>";
 
-print "CALLER BACKTRACE: ".$basic->get_caller_method()."<br>";
+print "CALLER BACKTRACE: ".$basic->getCallerMethod()."<br>";
 $basic->debug('SOME MARK', 'Some error output');
 
 print "EDIT ACCESS ID: ".$basic->edit_access_id."<br>";
 //	print "ACL: <br>".$basic->print_ar($login->acl)."<br>";
-$basic->debug('ACL', "ACL: ".$basic->print_ar($login->acl));
+$basic->debug('ACL', "ACL: ".$basic->printAr($login->acl));
 //	print "DEFAULT ACL: <br>".$basic->print_ar($login->default_acl_list)."<br>";
 //	print "DEFAULT ACL: <br>".$basic->print_ar($login->default_acl_list)."<br>";
 //	$result = array_flip(array_filter(array_flip($login->default_acl_list), function ($key) { if (is_numeric($key)) return $key; }));
@@ -72,51 +73,54 @@ $basic->debug('ACL', "ACL: ".$basic->print_ar($login->acl));
 // DEPRICATED CALL
 //	$basic->adbSetACL($login->acl);
 
-while ($res = $basic->db_return("SELECT * FROM max_test")) {
+// DB client encoding
+print "DB Client encoding: ".$basic->dbGetEncoding()."<br>";
+
+while ($res = $basic->dbReturn("SELECT * FROM max_test")) {
 	print "TIME: ".$res['time']."<br>";
 }
 
-$status = $basic->db_exec("INSERT INTO foo (test) VALUES ('FOO TEST ".time()."') RETURNING test");
+$status = $basic->dbExec("INSERT INTO foo (test) VALUES ('FOO TEST ".time()."') RETURNING test");
 print "DIRECT INSERT STATUS: $status | PRIMARY KEY: ".$basic->insert_id." | PRIMARY KEY EXT: ".print_r($basic->insert_id_ext, 1)."<br>";
-print "DIRECT INSERT PREVIOUS INSERTED: ".print_r($basic->db_return_row("SELECT foo_id, test FROM foo WHERE foo_id = ".$basic->insert_id), 1)."<br>";
-$basic->db_prepare("ins_foo", "INSERT INTO foo (test) VALUES ($1)");
-$status = $basic->db_execute("ins_foo", array('BAR TEST '.time()));
+print "DIRECT INSERT PREVIOUS INSERTED: ".print_r($basic->dbReturnRow("SELECT foo_id, test FROM foo WHERE foo_id = ".$basic->insert_id), 1)."<br>";
+$basic->dbPrepare("ins_foo", "INSERT INTO foo (test) VALUES ($1)");
+$status = $basic->dbExecute("ins_foo", array('BAR TEST '.time()));
 print "PREPARE INSERT STATUS: $status | PRIMARY KEY: ".$basic->insert_id." | PRIMARY KEY EXT: ".print_r($basic->insert_id_ext, 1)."<br>";
-print "PREPARE INSERT PREVIOUS INSERTED: ".print_r($basic->db_return_row("SELECT foo_id, test FROM foo WHERE foo_id = ".$basic->insert_id), 1)."<br>";
+print "PREPARE INSERT PREVIOUS INSERTED: ".print_r($basic->dbReturnRow("SELECT foo_id, test FROM foo WHERE foo_id = ".$basic->insert_id), 1)."<br>";
 // returning test with multiple entries
 //	$status = $basic->db_exec("INSERT INTO foo (test) values ('BAR 1 ".time()."'), ('BAR 2 ".time()."'), ('BAR 3 ".time()."') RETURNING foo_id");
-$status = $basic->db_exec("INSERT INTO foo (test) values ('BAR 1 ".time()."'), ('BAR 2 ".time()."'), ('BAR 3 ".time()."') RETURNING foo_id, test");
+$status = $basic->dbExec("INSERT INTO foo (test) values ('BAR 1 ".time()."'), ('BAR 2 ".time()."'), ('BAR 3 ".time()."') RETURNING foo_id, test");
 print "DIRECT MULTIPLE INSERT STATUS: $status | PRIMARY KEYS: ".print_r($basic->insert_id, 1)." | PRIMARY KEY EXT: ".print_r($basic->insert_id_ext, 1)."<br>";
 // no returning, but not needed ;
-$status = $basic->db_exec("INSERT INTO foo (test) VALUES ('FOO; TEST ".time()."');");
+$status = $basic->dbExec("INSERT INTO foo (test) VALUES ('FOO; TEST ".time()."');");
 print "DIRECT INSERT STATUS: $status | PRIMARY KEY: ".$basic->insert_id." | PRIMARY KEY EXT: ".print_r($basic->insert_id_ext, 1)."<br>";
 
 # db write class test
 $table = 'foo';
-print "TABLE META DATA: ".$basic->print_ar($basic->db_show_table_meta_data($table))."<br>";
+print "TABLE META DATA: ".$basic->printAr($basic->dbShowTableMetaData($table))."<br>";
 $primary_key = ''; # unset
 $db_write_table = array ('test', 'string_a', 'number_a', 'some_bool');
 //	$db_write_table = array ('test');
 $object_fields_not_touch = array ();
 $object_fields_not_update = array ();
 $data = array ('test' => 'BOOL TEST SOMETHING '.time(), 'string_a' => 'SOME TEXT', 'number_a' => 5);
-$primary_key = $basic->db_write_data_ext($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
+$primary_key = $basic->dbWriteDataExt($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
 print "Wrote to DB tabel $table and got primary key $primary_key<br>";
 $data = array ('test' => 'BOOL TEST ON '.time(), 'string_a' => '', 'number_a' => 0, 'some_bool' => 1);
-$primary_key = $basic->db_write_data_ext($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
+$primary_key = $basic->dbWriteDataExt($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
 print "Wrote to DB tabel $table and got primary key $primary_key<br>";
 $data = array ('test' => 'BOOL TEST OFF '.time(), 'string_a' => null, 'number_a' => null, 'some_bool' => 0);
-$primary_key = $basic->db_write_data_ext($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
+$primary_key = $basic->dbWriteDataExt($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
 print "Wrote to DB tabel $table and got primary key $primary_key<br>";
 $data = array ('test' => 'BOOL TEST UNSET '.time());
-$primary_key = $basic->db_write_data_ext($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
+$primary_key = $basic->dbWriteDataExt($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
 print "Wrote to DB tabel $table and got primary key $primary_key<br>";
 
 # async test queries
-/*	$basic->db_exec_async("SELECT test FROM foo, (SELECT pg_sleep(10)) as sub WHERE foo_id IN (27, 50, 67, 44, 10)");
+/*	$basic->dbExecAsync("SELECT test FROM foo, (SELECT pg_sleep(10)) as sub WHERE foo_id IN (27, 50, 67, 44, 10)");
 echo "WAITING FOR ASYNC: ";
 $chars = array('|', '/', '-', '\\');
-while (($ret = $basic->db_check_async()) === true)
+while (($ret = $basic->dbCheckAsync()) === true)
 {
 	if ((list($_, $char) = each($chars)) === FALSE)
 	{
@@ -128,37 +132,37 @@ while (($ret = $basic->db_check_async()) === true)
 	flush();
 }
 print "<br>END STATUS: ".$ret."<br>";
-//	while ($res = $basic->db_fetch_array($ret))
-while ($res = $basic->db_fetch_array())
+//	while ($res = $basic->dbFetchArray($ret))
+while ($res = $basic->dbFetchArray())
 {
 	echo "RES: ".$res['test']."<br>";
 }
 # test async insert
-$basic->db_exec_async("INSERT INTO foo (Test) VALUES ('ASYNC TEST ".time()."')");
+$basic->dbExecAsync("INSERT INTO foo (Test) VALUES ('ASYNC TEST ".time()."')");
 echo "WAITING FOR ASYNC INSERT: ";
-while (($ret = $basic->db_check_async()) === true)
+while (($ret = $basic->dbCheckAsync()) === true)
 {
 	print ".";
 	sleep(1);
 	flush();
 }
 print "<br>END STATUS: ".$ret." | PK: ".$basic->insert_id."<br>";
-print "ASYNC PREVIOUS INSERTED: ".print_r($basic->db_return_row("SELECT foo_id, test FROM foo WHERE foo_id = ".$basic->insert_id), 1)."<br>"; */
+print "ASYNC PREVIOUS INSERTED: ".print_r($basic->dbReturnRow("SELECT foo_id, test FROM foo WHERE foo_id = ".$basic->insert_id), 1)."<br>"; */
 
 $to_db_version = '9.1.9';
-print "VERSION DB: ".$basic->db_version()."<br>";
-print "DB Version smaller $to_db_version: ".$basic->db_compare_version('<'.$to_db_version)."<br>";
-print "DB Version smaller than $to_db_version: ".$basic->db_compare_version('<='.$to_db_version)."<br>";
-print "DB Version equal $to_db_version: ".$basic->db_compare_version('='.$to_db_version)."<br>";
-print "DB Version bigger than $to_db_version: ".$basic->db_compare_version('>='.$to_db_version)."<br>";
-print "DB Version bigger $to_db_version: ".$basic->db_compare_version('>'.$to_db_version)."<br>";
+print "VERSION DB: ".$basic->dbVersion()."<br>";
+print "DB Version smaller $to_db_version: ".$basic->dbCompareVersion('<'.$to_db_version)."<br>";
+print "DB Version smaller than $to_db_version: ".$basic->dbCompareVersion('<='.$to_db_version)."<br>";
+print "DB Version equal $to_db_version: ".$basic->dbCompareVersion('='.$to_db_version)."<br>";
+print "DB Version bigger than $to_db_version: ".$basic->dbCompareVersion('>='.$to_db_version)."<br>";
+print "DB Version bigger $to_db_version: ".$basic->dbCompareVersion('>'.$to_db_version)."<br>";
 
 /*	$q = "SELECT FOO FRO BAR";
 //	$q = "Select * from foo";
-$foo = $basic->db_exec_async($q);
+$foo = $basic->dbExecAsync($q);
 print "[ERR] Query: ".$q."<br>";
 print "[ERR] RESOURCE: $foo<br>";
-while (($ret = $basic->db_check_async()) === true)
+while (($ret = $basic->dbCheckAsync()) === true)
 {
 	print "[ERR]: $ret<br>";
 //		sleep(5);
@@ -166,30 +170,33 @@ while (($ret = $basic->db_check_async()) === true)
 
 // search path check
 $q = "SHOW search_path";
-$cursor = $basic->db_exec($q);
-$data = $basic->db_fetch_array($cursor)['search_path'];
+$cursor = $basic->dbExec($q);
+$data = $basic->dbFetchArray($cursor)['search_path'];
 print "RETURN DATA FOR search_path: ".$data."<br>";
-//	print "RETURN DATA FOR search_path: ".$basic->print_ar($data)."<br>";
+//	print "RETURN DATA FOR search_path: ".$basic->printAr($data)."<br>";
 // insert something into test.schema_test and see if we get the PK back
-$status = $basic->db_exec("INSERT INTO test.schema_test (contents, id) VALUES ('TIME: ".time()."', ".rand(1, 10).")");
+$status = $basic->dbExec("INSERT INTO test.schema_test (contents, id) VALUES ('TIME: ".time()."', ".rand(1, 10).")");
 print "OTHER SCHEMA INSERT STATUS: ".$status." | PK NAME: ".$basic->pk_name.", PRIMARY KEY: ".$basic->insert_id."<br>";
 
 // time string thest
 $timestamp = 5887998.33445;
-$time_string = $basic->TimeStringFormat($timestamp);
+$time_string = $basic->timeStringFormat($timestamp);
 print "TIME STRING TEST: ".$time_string."<br>";
-print "REVERSE TIME STRING: ".$basic->StringToTime($time_string);
+print "REVERSE TIME STRING: ".$basic->stringToTime($time_string);
 
 // magic links test
-print $basic->magic_links('user@bubu.at').'<br>';
-print $basic->magic_links('http://test.com/foo/bar.php?foo=1').'<br>';
+print $basic->magicLinks('user@bubu.at').'<br>';
+print $basic->magicLinks('http://test.com/foo/bar.php?foo=1').'<br>';
 
 // compare date
 $date_1 = '2017/1/5';
 $date_2 = '2017-01-05';
-print "COMPARE DATE: ".$basic->CompareDate($date_1, $date_2)."<br>";
+print "COMPARE DATE: ".$basic->compareDate($date_1, $date_2)."<br>";
 
 // print error messages
-print $basic->print_error_msg();
+print $login->printErrorMsg();
+print $basic->printErrorMsg();
 
 print "</body></html>";
+
+# __END__
diff --git a/www/admin/edit_base.inc b/www/admin/edit_base.inc
index 62ee3d32..14bf0850 100644
--- a/www/admin/edit_base.inc
+++ b/www/admin/edit_base.inc
@@ -1,4 +1,4 @@
-<?
+<?php
 /********************************************************************
 * AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
 * CREATED: 2003/06/10
@@ -28,22 +28,15 @@ define(REL_PATH, '');
 
 ob_start();
 include("config.inc");
+// set session name here
+define('SET_SESSION_NAME', EDIT_SESSION_NAME);
 // overrride debug flags
 if (!DEBUG)	{
 	$DEBUG_ALL = 0;
 	$PRINT_ALL = 0;
 	$DB_DEBUG = 0;
 	$ECHO_ALL = 0;
-//		$DEBUG_TMPL = 0;
 }
-// set session name here
-define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-// login class
-require(LIBS."Class.Login.inc");
-// form generate for edit interface
-require(LIBS."Class.Form.Generate.inc");
-// Smarty: and the small extend for l10n calls
-require(LIBS.'Class.Smarty.Extend.inc');
 
 // set default lang if not set otherwise
 if (!$lang) {
@@ -52,17 +45,17 @@ if (!$lang) {
 // should be utf8
 header("Content-type: text/html; charset=".DEFAULT_ENCODING);
 ob_end_flush();
-$login = new login($DB_CONFIG[LOGIN_DB], $lang);
+$login = new CoreLibs\ACL\Login($DB_CONFIG[LOGIN_DB], $lang);
 
 // create form class
-$form = new form($DB_CONFIG[MAIN_DB], $lang);
-$form->db_exec("SET search_path TO ".LOGIN_DB_SCHEMA);
+$form = new CoreLibs\Output\Form\Generate($DB_CONFIG[MAIN_DB], $lang);
+$form->dbExec("SET search_path TO ".LOGIN_DB_SCHEMA);
 if ($form->mobile_phone) {
 	echo "I am sorry, but this page cannot be viewed by a mobile phone";
 	exit;
 }
 // smarty template engine (extended Translation version)
-$smarty = new SmartyML($lang);
+$smarty = new CoreLibs\Template\SmartyExtend($lang);
 
 if (TARGET == 'live' || TARGET == 'remote') {
 	// login
@@ -98,7 +91,7 @@ function EditLog($event = '', $data = '')
 {
 	$q = "INSERT INTO edit_log ";
 	$q .= "(euid, event_date, ip, event, data, page) ";
-	$q .= "VALUES (".$_SESSION['EUID'].", NOW(), '".$_SERVER["REMOTE_ADDR"]."', '".$GLOBALS['form']->db_escape_string($event)."', '".$GLOBALS['form']->db_escape_string($data)."', '".$GLOBALS['form']->get_page_name()."')";
+	$q .= "VALUES (".$_SESSION['EUID'].", NOW(), '".$_SERVER["REMOTE_ADDR"]."', '".$GLOBALS['form']->dbEscapeString($event)."', '".$GLOBALS['form']->dbEscapeString($data)."', '".$GLOBALS['form']->getPageName()."')";
 }
 
 // log backend data
@@ -112,11 +105,11 @@ $data = array (
 // log action
 EditLog('Edit Submit', serialize($data));
 
-$form->form_procedure_load(${$form->archive_pk_name});
-$form->form_procedure_new();
-$form->form_procedure_save();
-$form->form_procedure_delete();
-$form->form_procedure_delete_from_element_list($element_list, $remove_name);
+$form->formProcedureLoad(${$form->archive_pk_name});
+$form->formProcedureNew();
+$form->formProcedureSave();
+$form->formProcedureDelete();
+$form->formProcedureDeleteFromElementList($element_list, $remove_name);
 
 // define all needed smarty stuff for the general HTML/page building
 $HEADER['CSS'] = CSS;
@@ -128,7 +121,7 @@ $HEADER['JAVASCRIPT'] = $EDIT_JAVASCRIPT;
 $DATA['table_width'] = $table_width;
 
 // write out error / status messages
-$messages[] = $form->form_error_msg();
+$messages[] = $form->formPrintMsg();
 $DATA['form_error_msg'] = $messages;
 
 // MENU START
@@ -172,7 +165,7 @@ for ($i = 1; $i <= count($menuarray); $i ++) {
 	if ($i == 1 || !(($i - 1) % $SPLIT_FACTOR)) {
 		$menu_data[$j]['splitfactor_in'] = 1;
 	}
-	if ($menuarray[($i - 1)]["filename"] == $form->get_page_name()) {
+	if ($menuarray[($i - 1)]["filename"] == $form->getPageName()) {
 		$position = $i - 1;
 		$menu_data[$j]['position'] = 1;
 	} else {
@@ -197,103 +190,103 @@ $L_TITLE = $DATA['page_name'];
 $HEADER['HTML_TITLE'] = ((!$L_TITLE) ? $form->l->__($G_TITLE) : $form->l->__($L_TITLE));
 // END MENU
 // LOAD AND NEW
-$DATA['load'] = $form->form_create_load();
-$DATA['new'] = $form->form_create_new();
+$DATA['load'] = $form->formCreateLoad();
+$DATA['new'] = $form->formCreateNew();
 // SHOW DATA PART
 if ($form->yes) {
 	$DATA['form_yes'] = $form->yes;
 	$DATA['form_my_page_name'] = $form->my_page_name;
 
-	// depending on the "get_page_name()" I show different stuff
+	// depending on the "getPageName()" I show different stuff
 	switch ($form->my_page_name) {
 		case "edit_users":
-			$elements[] = $form->form_create_element("login_error_count");
-			$elements[] = $form->form_create_element("login_error_date_last");
-			$elements[] = $form->form_create_element("login_error_date_first");
-			$elements[] = $form->form_create_element("enabled");
-			$elements[] = $form->form_create_element("username");
-			$elements[] = $form->form_create_element("password");
-			$elements[] = $form->form_create_element("password_change_interval");
-			$elements[] = $form->form_create_element("email");
-			$elements[] = $form->form_create_element("last_name");
-			$elements[] = $form->form_create_element("first_name");
-			$elements[] = $form->form_create_element("edit_group_id");
-			$elements[] = $form->form_create_element("edit_access_right_id");
-			$elements[] = $form->form_create_element("strict");
-			$elements[] = $form->form_create_element("locked");
-			$elements[] = $form->form_create_element("admin");
-			$elements[] = $form->form_create_element("debug");
-			$elements[] = $form->form_create_element("db_debug");
-			$elements[] = $form->form_create_element("edit_language_id");
-			$elements[] = $form->form_create_element("edit_scheme_id");
-			$elements[] = $form->form_show_list_table("edit_access_user");
+			$elements[] = $form->formCreateElement("login_error_count");
+			$elements[] = $form->formCreateElement("login_error_date_last");
+			$elements[] = $form->formCreateElement("login_error_date_first");
+			$elements[] = $form->formCreateElement("enabled");
+			$elements[] = $form->formCreateElement("username");
+			$elements[] = $form->formCreateElement("password");
+			$elements[] = $form->formCreateElement("password_change_interval");
+			$elements[] = $form->formCreateElement("email");
+			$elements[] = $form->formCreateElement("last_name");
+			$elements[] = $form->formCreateElement("first_name");
+			$elements[] = $form->formCreateElement("edit_group_id");
+			$elements[] = $form->formCreateElement("edit_access_right_id");
+			$elements[] = $form->formCreateElement("strict");
+			$elements[] = $form->formCreateElement("locked");
+			$elements[] = $form->formCreateElement("admin");
+			$elements[] = $form->formCreateElement("debug");
+			$elements[] = $form->formCreateElement("db_debug");
+			$elements[] = $form->formCreateElement("edit_language_id");
+			$elements[] = $form->formCreateElement("edit_scheme_id");
+			$elements[] = $form->formCreateElementListTable("edit_access_user");
 			break;
 		case "edit_schemes":
-			$elements[] = $form->form_create_element("enabled");
-			$elements[] = $form->form_create_element("name");
-			$elements[] = $form->form_create_element("header_color");
-			$elements[] = $form->form_create_element("template");
+			$elements[] = $form->formCreateElement("enabled");
+			$elements[] = $form->formCreateElement("name");
+			$elements[] = $form->formCreateElement("header_color");
+			$elements[] = $form->formCreateElement("template");
 			break;
 		case "edit_pages":
 			if (!$form->table_array["edit_page_id"]["value"]) {
 				$q = "DELETE FROM temp_files";
-				$form->db_exec($q);
+				$form->dbExec($q);
 				// gets all files in the current dir ending with .php
 				$crap = exec("ls *.php", $output, $status);
 				// now get all that are NOT in de DB
 				$q = "INSERT INTO temp_files VALUES ";
 				for ($i = 0; $i < count($output); $i ++) {
-					$t_q = "('".$form->db_escape_string($output[$i])."')";
-					$form->db_exec($q.$t_q, 'NULL');
+					$t_q = "('".$form->dbEscapeString($output[$i])."')";
+					$form->dbExec($q.$t_q, 'NULL');
 				}
-				$elements[] = $form->form_create_element("filename");
+				$elements[] = $form->formCreateElement("filename");
 			} else {
 				// show file menu
 				// just show name of file ...
 				$DATA['filename_exist'] = 1;
 				$DATA['filename'] = $form->table_array["filename"]["value"];
 			} // File Name View IF
-			$elements[] = $form->form_create_element("name");
-			// $elements[] = $form->form_create_element("tag");
-			// $elements[] = $form->form_create_element("min_acl");
-			$elements[] = $form->form_create_element("order_number");
-			$elements[] = $form->form_create_element("online");
-			$elements[] = $form->form_create_element("menu");
-			$elements[] = $form->form_show_list_table("edit_query_string");
-			$elements[] = $form->form_create_element("popup");
-			$elements[] = $form->form_create_element("popup_x");
-			$elements[] = $form->form_create_element("popup_y");
-			$elements[] = $form->form_show_reference_table("edit_visible_group");
-			$elements[] = $form->form_show_reference_table("edit_menu_group");
+			$elements[] = $form->formCreateElement("name");
+			// $elements[] = $form->formCreateElement("tag");
+			// $elements[] = $form->formCreateElement("min_acl");
+			$elements[] = $form->formCreateElement("order_number");
+			$elements[] = $form->formCreateElement("online");
+			$elements[] = $form->formCreateElement("menu");
+			$elements[] = $form->formCreateElementListTable("edit_query_string");
+			$elements[] = $form->formCreateElement("popup");
+			$elements[] = $form->formCreateElement("popup_x");
+			$elements[] = $form->formCreateElement("popup_y");
+			$elements[] = $form->formCreateElementReferenceTable("edit_visible_group");
+			$elements[] = $form->formCreateElementReferenceTable("edit_menu_group");
 			break;
 		case "edit_languages":
-			$elements[] = $form->form_create_element("enabled");
-			$elements[] = $form->form_create_element("short_name");
-			$elements[] = $form->form_create_element("long_name");
-			$elements[] = $form->form_create_element("iso_name");
+			$elements[] = $form->formCreateElement("enabled");
+			$elements[] = $form->formCreateElement("short_name");
+			$elements[] = $form->formCreateElement("long_name");
+			$elements[] = $form->formCreateElement("iso_name");
 			break;
 		case "edit_groups":
-			$elements[] = $form->form_create_element("enabled");
-			$elements[] = $form->form_create_element("name");
-			$elements[] = $form->form_create_element("edit_access_right_id");
-			$elements[] = $form->form_create_element("edit_scheme_id");
-			$elements[] = $form->form_show_list_table("edit_page_access");
+			$elements[] = $form->formCreateElement("enabled");
+			$elements[] = $form->formCreateElement("name");
+			$elements[] = $form->formCreateElement("edit_access_right_id");
+			$elements[] = $form->formCreateElement("edit_scheme_id");
+			$elements[] = $form->formCreateElementListTable("edit_page_access");
 			break;
 		case "edit_visible_group":
-			$elements[] = $form->form_create_element("name");
-			$elements[] = $form->form_create_element("flag");
+			$elements[] = $form->formCreateElement("name");
+			$elements[] = $form->formCreateElement("flag");
 			break;
 		case "edit_menu_group":
-			$elements[] = $form->form_create_element("name");
-			$elements[] = $form->form_create_element("flag");
-			$elements[] = $form->form_create_element("order_number");
+			$elements[] = $form->formCreateElement("name");
+			$elements[] = $form->formCreateElement("flag");
+			$elements[] = $form->formCreateElement("order_number");
 			break;
 		case "edit_access":
-			$elements[] = $form->form_create_element("name");
-			$elements[] = $form->form_create_element("color");
-			$elements[] = $form->form_create_element("description");
+			$elements[] = $form->formCreateElement("name");
+			$elements[] = $form->formCreateElement("color");
+			$elements[] = $form->formCreateElement("description");
 			// add name/value list here
-			$elements[] = $form->form_show_list_table("edit_access_data");
+			$elements[] = $form->formCreateElementListTable("edit_access_data");
 			break;
 		default:
 			print "[No valid page definition given]";
@@ -301,8 +294,8 @@ if ($form->yes) {
 	}
 //		$form->debug('edit', "Elements: <pre>".$form->print_ar($elements));
 	$DATA['elements'] = $elements;
-	$DATA['hidden'] = $form->form_create_hidden_fields();
-	$DATA['save_delete'] = $form->form_create_save_delete();
+	$DATA['hidden'] = $form->formCreateHiddenFields();
+	$DATA['save_delete'] = $form->formCreateSaveDelete();
 }
 
 // debug data, if DEBUG flag is on, this data is print out
@@ -314,11 +307,16 @@ $CONTENT_DATA = array_merge($HEADER, $DATA, $DEBUG_DATA);
 while (list($key, $value) = each($CONTENT_DATA)) {
 	$smarty->assign($key, $value);
 }
-
-//	$smarty->assign('popup_page', 'mt_popup_'.$body_part.'.tpl');
-
+if (is_dir(BASE.TEMPLATES_C)) {
+	$smarty->setCompileDir(BASE.TEMPLATES_C);
+}
+if (is_dir(BASE.CACHE)) {
+	$smarty->setCacheDir(BASE.CACHE);
+}
 $smarty->display('edit_body.tpl');
 
 // debug output
-echo $login->print_error_msg();
-echo $form->print_error_msg();
+echo $login->printErrorMsg();
+echo $form->printErrorMsg();
+
+# __END__
diff --git a/www/admin/edit_order.php b/www/admin/edit_order.php
index 822c5e3a..ec0b4543 100644
--- a/www/admin/edit_order.php
+++ b/www/admin/edit_order.php
@@ -1,209 +1,196 @@
-<?
-	/********************************************************************
-	* AUTHOR: Clemens Schwaighofer
-	* CREATED: 2001/07/11
-	* SHORT DESCRIPTION:
-	* sets the order from a table (edit_)
-	* HISTORY:
-	* 2005/07/11 (cs) adept to new edit interface
-	* 2002-10-18: little include changes
-	* 2001-07-11: erste Version
-	**********************************************************************/
+<?php
+/********************************************************************
+* AUTHOR: Clemens Schwaighofer
+* CREATED: 2001/07/11
+* SHORT DESCRIPTION:
+* sets the order from a table (edit_)
+* HISTORY:
+* 2005/07/11 (cs) adept to new edit interface
+* 2002-10-18: little include changes
+* 2001-07-11: erste Version
+**********************************************************************/
 
-	$DEBUG_ALL = 1;
-	$DB_DEBUG = 1;
+$DEBUG_ALL = 1;
+$DB_DEBUG = 1;
 
-	extract($_GET, EXTR_SKIP);
-	extract($_POST, EXTR_SKIP);
+extract($_GET, EXTR_SKIP);
+extract($_POST, EXTR_SKIP);
 
-	include("config.inc");
-	// overrride debug flags
-	if (!DEBUG)
-	{
-		$DEBUG_ALL = 0;
-		$PRINT_ALL = 0;
-		$DB_DEBUG = 0;
-		$ECHO_ALL = 0;
-//		$DEBUG_TMPL = 0;
-	}
-	// set session name
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-	require(LIBS."Class.Login.inc");
-	require(LIBS.'Class.Smarty.Extend.inc');
+include("config.inc");
+// set session name
+define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+// overrride debug flags
+if (!DEBUG) {
+	$DEBUG_ALL = 0;
+	$PRINT_ALL = 0;
+	$DB_DEBUG = 0;
+	$ECHO_ALL = 0;
+}
 
-	// default lang
-	if (!$lang)
-		$lang = DEFAULT_LANG;
+// default lang
+if (!$lang) {
+	$lang = DEFAULT_LANG;
+}
 
-	$table_width = 600;
-	if (!$table_width)
-		$table_width = PAGE_WIDTH;
+$table_width = 600;
+if (!$table_width) {
+	$table_width = PAGE_WIDTH;
+}
 
-	ob_end_flush();
-	$login = new login($DB_CONFIG[LOGIN_DB], $lang);
-	$db = new db_io($DB_CONFIG[MAIN_DB]);
-	$db->db_exec("SET search_path TO ".LOGIN_DB_SCHEMA);
-	$smarty = new SmartyML($lang);
-	if (TARGET == 'live' || TARGET == 'remote')
-	{
-		// login
-		$login->debug_output_all = DEBUG ? 1 : 0;
-		$login->echo_output_all = 0;
-		$login->print_output_all = DEBUG ? 1 : 0;
-		// form
-		$db->debug_output_all = DEBUG ? 1 : 0;
-		$db->echo_output_all = 0;
-		$db->print_output_all = DEBUG ? 1 : 0;
-	}
-	// set the template dir
-	if (defined('LAYOUT'))
-	{
-		$smarty->setTemplateDir(LAYOUT.DEFAULT_TEMPLATE.TEMPLATES);
-		$DATA['css'] = LAYOUT.DEFAULT_TEMPLATE.CSS;
-		$DATA['js'] = LAYOUT.DEFAULT_TEMPLATE.JS;
-	}
-	else
-	{
-		$smarty->setTemplateDir(TEMPLATES.DEFAULT_TEMPLATE);
-		$DATA['css'] = CSS.DEFAULT_TEMPLATE;
-		$DATA['js'] = JS.DEFAULT_TEMPLATE;
-	}
-
-	// order name is _always_ order_number for the edit interface
-
-	// follwing arrays do exist here:
-	// $position ... has the positions of the array (0..max), cause in a <select> I can't put an number into the array field, in this array, there are the POSITION stored, that should CHANGE there order (up/down)
-	// $row_data_id ... has ALL ids from the sorting part
-	// $row_data_order ... has ALL order positions from the soirting part
-	if (count($position))
-	{
-		$original_id = $row_data_id;
-
-		// FIRST u have to put right sort, then read again ...
-		if ($up && $position[0] > 0) // hast to be >0 or the first one is selected and then there is no move
-		{
-			for ($i = 0; $i < count($position); $i++)
-			{
-				// change position order
-				// this gets temp, id before that, gets actual (moves one "down")
-				// this gets the old before (moves one "up")
-				// is done for every element in row
-//echo "A: ".$row_data_id[$position[$i]]." (".$row_data_order[$position[$i]].") -- ".$row_data_id[$position[$i]-1]." (".$row_data_order[$position[$i]-1].")<br>";
-				$temp_id = $row_data_id[$position[$i]];
-				$row_data_id[$position[$i]] = $row_data_id[$position[$i]-1];
-				$row_data_id[$position[$i]-1] = $temp_id;
-//echo "A: ".$row_data_id[$position[$i]]." (".$row_data_order[$position[$i]].") -- ".$row_data_id[$position[$i]-1]." (".$row_data_order[$position[$i]-1].")<br>";
-			} // for
-		} // if up
-
-		if ($down && ($position[count($position) - 1] != (count($row_data_id) - 1))) // the last position id from position array is not to be the count-1 of row_data_id array, or it is the last element
-		{
-			for ($i = count($position) - 1; $i >= 0; $i --)
-			{
-				// same as up, just up in other way, starts from bottom (last element) and moves "up"
-				// element before actuel gets temp, this element, becomes element after this,
-				// element after this, gets this
-				$temp_id = $row_data_id[$position[$i] + 1];
-				$row_data_id[$position[$i] + 1] = $row_data_id[$position[$i]];
-				$row_data_id[$position[$i]] = $temp_id;
-			} // for
-		} // if down
-
-		// write data ... (which has to be abstrackt ...)
-		if (($up && $position[0] > 0) || ($down && ($position[count($position) - 1]!=(count($row_data_id) - 1))))
-		{
-			for ($i = 0;$i < count($row_data_id); $i ++)
-			{
-//				$q="UPDATE broschueren SET broschuere_order=".$row_data_order[$i]." WHERE unique_id='".$row_data_id[$i]."'";
-				$q = "UPDATE ".$table_name." SET order_number = ".$row_data_order[$i]." WHERE ".$table_name."_id = ".$row_data_id[$i];
-//echo "Q: $q<br>";
-				$q = $db->db_exec($q);
-			} // for all article ids ...
-		} // if write
-	} // if there is something to move
-
-	// get ...
-	$q = "SELECT ".$table_name."_id, name, order_number FROM ".$table_name." ";
-	if ($where_string)
-		$q .= "WHERE $where_string ";
-	$q .= "ORDER BY order_number";
-
-	while ($res = $db->db_return($q))
-	{
-		$row_data[] = array (
-			"id" => $res[$table_name."_id"],
-			"name" => $res["name"],
-			"order" => $res["order_number"]
-		);
-	} // while read data ...
-
-	// define all needed smarty stuff for the general HTML/page building
+ob_end_flush();
+$login = new CoreLibs\ACL\Login($DB_CONFIG[LOGIN_DB], $lang);
+$db = new CoreLibs\DB\IO($DB_CONFIG[MAIN_DB]);
+$db->dbExec("SET search_path TO ".LOGIN_DB_SCHEMA);
+$smarty = new CoreLibs\Template\SmartyExtend($lang);
+if (TARGET == 'live' || TARGET == 'remote') {
+	// login
+	$login->debug_output_all = DEBUG ? 1 : 0;
+	$login->echo_output_all = 0;
+	$login->print_output_all = DEBUG ? 1 : 0;
+	// form
+	$db->debug_output_all = DEBUG ? 1 : 0;
+	$db->echo_output_all = 0;
+	$db->print_output_all = DEBUG ? 1 : 0;
+}
+// set the template dir
+if (defined('LAYOUT')) {
+	$smarty->setTemplateDir(LAYOUT.DEFAULT_TEMPLATE.TEMPLATES);
 	$DATA['css'] = LAYOUT.DEFAULT_TEMPLATE.CSS;
 	$DATA['js'] = LAYOUT.DEFAULT_TEMPLATE.JS;
-	$HEADER['CSS'] = CSS;
-	$HEADER['DEFAULT_ENCODING'] = DEFAULT_ENCODING;
-	$HEADER['JS'] = JS;
-	$HEADER['STYLESHEET'] = $EDIT_STYLESHEET;
-	$HEADER['JAVASCRIPT'] = $EDIT_JAVASCRIPT;
-	// html title
-	$HEADER['HTML_TITLE'] = ((!$L_TITLE) ? $smarty->l10n->__($G_TITLE) : $smarty->l10n->__($L_TITLE));
+} else {
+	$smarty->setTemplateDir(TEMPLATES.DEFAULT_TEMPLATE);
+	$DATA['css'] = CSS.DEFAULT_TEMPLATE;
+	$DATA['js'] = JS.DEFAULT_TEMPLATE;
+}
 
-	$DATA['table_width'] = $table_width;
+// order name is _always_ order_number for the edit interface
 
-	// error msg
-	if ($error)
-	{
-		$messages[] = array('msg' => $msg, 'class' => 'error', 'width' => $table_width);
-	}
-	$DATA['form_error_msg'] = $messages;
+// follwing arrays do exist here:
+// $position ... has the positions of the array (0..max), cause in a <select>
+//               I can't put an number into the array field, in this array,
+//               there are the POSITION stored, that should CHANGE there order (up/down)
+// $row_data_id ... has ALL ids from the sorting part
+// $row_data_order ... has ALL order positions from the soirting part
+if (count($position)) {
+	$original_id = $row_data_id;
 
-	// all the row data
-	$options_id = array();
-	$options_name = array();
-	$options_selected = array();
-	for ($i = 0; $i < count($row_data); $i ++)
-	{
-		$options_id[] = $i;
-		$options_name[] = $row_data[$i]["name"];
-		// list of points to order
-		for ($j = 0; $j < count($position); $j++)
-		{
-			// if matches, put into select array
-			if ($original_id[$position[$j]] == $row_data[$i]["id"])
-				$options_selected[] = $i;
+	// FIRST u have to put right sort, then read again ...
+	// hast to be >0 or the first one is selected and then there is no move
+	if ($up && $position[0] > 0) {
+		for ($i = 0; $i < count($position); $i++) {
+			// change position order
+			// this gets temp, id before that, gets actual (moves one "down")
+			// this gets the old before (moves one "up")
+			// is done for every element in row
+			// echo "A: ".$row_data_id[$position[$i]]." (".$row_data_order[$position[$i]].") -- ".$row_data_id[$position[$i]-1]." (".$row_data_order[$position[$i]-1].")<br>";
+			$temp_id = $row_data_id[$position[$i]];
+			$row_data_id[$position[$i]] = $row_data_id[$position[$i]-1];
+			$row_data_id[$position[$i]-1] = $temp_id;
+			// echo "A: ".$row_data_id[$position[$i]]." (".$row_data_order[$position[$i]].") -- ".$row_data_id[$position[$i]-1]." (".$row_data_order[$position[$i]-1].")<br>";
+		} // for
+	} // if up
+
+	// the last position id from position array is not to be the count-1 of row_data_id array, or it is the last element
+	if ($down && ($position[count($position) - 1] != (count($row_data_id) - 1))) {
+		for ($i = count($position) - 1; $i >= 0; $i --)	{
+			// same as up, just up in other way, starts from bottom (last element) and moves "up"
+			// element before actuel gets temp, this element, becomes element after this,
+			// element after this, gets this
+			$temp_id = $row_data_id[$position[$i] + 1];
+			$row_data_id[$position[$i] + 1] = $row_data_id[$position[$i]];
+			$row_data_id[$position[$i]] = $temp_id;
+		} // for
+	} // if down
+
+	// write data ... (which has to be abstrackt ...)
+	if (($up && $position[0] > 0) || ($down && ($position[count($position) - 1]!=(count($row_data_id) - 1)))) {
+		for ($i = 0; $i < count($row_data_id); $i ++) {
+			$q = "UPDATE ".$table_name." SET order_number = ".$row_data_order[$i]." WHERE ".$table_name."_id = ".$row_data_id[$i];
+			$q = $db->dbExec($q);
+		} // for all article ids ...
+	} // if write
+} // if there is something to move
+
+// get ...
+$q = "SELECT ".$table_name."_id, name, order_number FROM ".$table_name." ";
+if ($where_string) {
+	$q .= "WHERE $where_string ";
+}
+$q .= "ORDER BY order_number";
+
+while ($res = $db->dbReturn($q)) {
+	$row_data[] = array (
+		"id" => $res[$table_name."_id"],
+		"name" => $res["name"],
+		"order" => $res["order_number"]
+	);
+} // while read data ...
+
+// define all needed smarty stuff for the general HTML/page building
+$DATA['css'] = LAYOUT.DEFAULT_TEMPLATE.CSS;
+$DATA['js'] = LAYOUT.DEFAULT_TEMPLATE.JS;
+$HEADER['CSS'] = CSS;
+$HEADER['DEFAULT_ENCODING'] = DEFAULT_ENCODING;
+$HEADER['JS'] = JS;
+$HEADER['STYLESHEET'] = $EDIT_STYLESHEET;
+$HEADER['JAVASCRIPT'] = $EDIT_JAVASCRIPT;
+// html title
+$HEADER['HTML_TITLE'] = (!$L_TITLE) ? $smarty->l10n->__($G_TITLE) : $smarty->l10n->__($L_TITLE);
+
+$DATA['table_width'] = $table_width;
+
+// error msg
+if ($error) {
+	$messages[] = array('msg' => $msg, 'class' => 'error', 'width' => $table_width);
+}
+$DATA['form_error_msg'] = $messages;
+
+// all the row data
+$options_id = array();
+$options_name = array();
+$options_selected = array();
+for ($i = 0; $i < count($row_data); $i ++) {
+	$options_id[] = $i;
+	$options_name[] = $row_data[$i]["name"];
+	// list of points to order
+	for ($j = 0; $j < count($position); $j++) {
+		// if matches, put into select array
+		if ($original_id[$position[$j]] == $row_data[$i]["id"]) {
+			$options_selected[] = $i;
 		}
 	}
-	$DATA['options_id'] = $options_id;
-	$DATA['options_name'] = $options_name;
-	$DATA['options_selected'] = $options_selected;
+}
+$DATA['options_id'] = $options_id;
+$DATA['options_name'] = $options_name;
+$DATA['options_selected'] = $options_selected;
 
-	// hidden list for the data (id, order number)
-	$row_data_id = array();
-	$row_data_order = array();
-	for ($i = 0; $i < count($row_data); $i++)
-	{
-		$row_data_id[] = $row_data[$i]["id"];
-		$row_data_order[] = $row_data[$i]["order"];
-	}
-	$DATA['row_data_id'] = $row_data_id;
-	$DATA['row_data_order'] = $row_data_order;
+// hidden list for the data (id, order number)
+$row_data_id = array();
+$row_data_order = array();
+for ($i = 0; $i < count($row_data); $i++) {
+	$row_data_id[] = $row_data[$i]["id"];
+	$row_data_order[] = $row_data[$i]["order"];
+}
+$DATA['row_data_id'] = $row_data_id;
+$DATA['row_data_order'] = $row_data_order;
 
-	// hidden names for the table & where string
-	$DATA['table_name'] = $table_name;
-	$DATA['where_string'] = $where_string;
+// hidden names for the table & where string
+$DATA['table_name'] = $table_name;
+$DATA['where_string'] = $where_string;
 
-	// debug data, if DEBUG flag is on, this data is print out
-	$DEBUG_DATA['DEBUG'] = $DEBUG_TMPL;
+// debug data, if DEBUG flag is on, this data is print out
+$DEBUG_DATA['DEBUG'] = $DEBUG_TMPL;
 
-	// create main data array
-	$CONTENT_DATA = array_merge($HEADER, $DATA, $DEBUG_DATA);
-	// data is 1:1 mapping (all vars, values, etc)
-	while (list($key, $value) = each($CONTENT_DATA))
-	{
-		$smarty->assign($key, $value);
-	}
-	$smarty->display('edit_order.tpl');
+// create main data array
+$CONTENT_DATA = array_merge($HEADER, $DATA, $DEBUG_DATA);
+// data is 1:1 mapping (all vars, values, etc)
+while (list($key, $value) = each($CONTENT_DATA)) {
+	$smarty->assign($key, $value);
+}
+$smarty->display('edit_order.tpl');
+
+echo $login->printErrorMsg();
+echo $db->printErrorMsg();
+
+# __END__
 
-	echo $login->print_error_msg();
-	echo $db->print_error_msg();
-?>
diff --git a/www/admin/files.php b/www/admin/files.php
index 0966d070..489fef2a 100644
--- a/www/admin/files.php
+++ b/www/admin/files.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2005/07/13
@@ -202,10 +202,10 @@ if ($cms->action == 'save') {
 		$file = DEV_SCHEMA."_".$file_uid;
 		// now upload the file
 		if ($_FILES['file_up']['name']) {
-			$upload_file = ROOT.MEDIA.$cms->data_path[$file_type].$file;
+			$upload_file = BASE.MEDIA.$cms->data_path[$file_type].$file;
 			// wipe out any old tmp data for this new upload
-			if (is_array(glob(ROOT.TMP."thumb_".$file."*"))) {
-				foreach (glob(ROOT.TMP."thumb_".$file."*") as $filename) {
+			if (is_array(glob(BASE.TMP."thumb_".$file."*"))) {
+				foreach (glob(BASE.TMP."thumb_".$file."*") as $filename) {
 					@unlink($filename);
 				}
 			}
@@ -213,7 +213,7 @@ if ($cms->action == 'save') {
 			$error = move_uploaded_file($_FILES['file_up']['tmp_name'], $upload_file);
 
 			$cms->debug('file_upload', "UP: $upload_file");
-			$cms->debug('file_upload', "Orig: ".$cms->print_ar($_FILES['file_up']));
+			$cms->debug('file_upload', "Orig: ".$cms->printAr($_FILES['file_up']));
 
 			// because I get bogus error info from move_uploaded_file ...
 			$error = 0;
@@ -242,7 +242,7 @@ if ($cms->action == 'save') {
 			}
 			$q .= ") VALUES ('".$cms->queue_name."', '".$file_uid."', 'file_uid', '".$sql_action."', 'file', '".$cms->db_escape_string($sql_data)."', '".$cms->queue_key."', '".$cms->action."'";
 			if ($_FILES['file_up']['name']) {
-				$q .= ", '".ROOT.MEDIA.$cms->data_path[$file_type].$file."#".ROOT.MEDIA.$cms->data_path[$file_type].PUBLIC_SCHEMA."_".$file_uid."'";
+				$q .= ", '".BASE.MEDIA.$cms->data_path[$file_type].$file."#".BASE.MEDIA.$cms->data_path[$file_type].PUBLIC_SCHEMA."_".$file_uid."'";
 			}
 			$q .= ")";
 			$cms->db_exec($q);
@@ -262,9 +262,9 @@ if ($cms->action == 'delete' && $cms->action_yes == 'true') {
 	}
 	if (QUEUE == 'live_queue') {
 		$q = "INSERT INTO ".GLOBAL_DB_SCHEMA.".live_queue (queue_key, key_value, key_name, type, target, data, group_key, action, file) VALUES (";
-		$q .= "'".$cms->queue_name."', '".$file_uid."', 'file_uid', 'DELETE', 'file', '', '".$cms->queue_key."', '".$cms->action."', '".ROOT.MEDIA.$cms->data_path[$file_type].PUBLIC_SCHEMA."_".$file_uid."')";
+		$q .= "'".$cms->queue_name."', '".$file_uid."', 'file_uid', 'DELETE', 'file', '', '".$cms->queue_key."', '".$cms->action."', '".BASE.MEDIA.$cms->data_path[$file_type].PUBLIC_SCHEMA."_".$file_uid."')";
 	}
-	@unlink(ROOT.MEDIA.$cms->data_path[$file_type].DEV_SCHEMA."_".$file_uid);
+	@unlink(BASE.MEDIA.$cms->data_path[$file_type].DEV_SCHEMA."_".$file_uid);
 	unset($file_uid);
 	unset($file_id);
 	$delete_done = 1;
@@ -296,7 +296,7 @@ if ($cms->action_flag == 'set_live' && $cms->action = 'set_delete') {
 	while ($res = $cms->db_return($q)) {
 		$q_del = "DELETE FROM ".PUBLIC_SCHEMA.".file WHERE file_uid = '".$res['pkid'].'"';
 		$cms->db_exec($q_del);
-		@unlink(ROOT.MEDIA.$cms->data_path[$res['type']].PUBLIC_SCHEMA."_".$res['file_uid']);
+		@unlink(BASE.MEDIA.$cms->data_path[$res['type']].PUBLIC_SCHEMA."_".$res['file_uid']);
 	}
 	$q = "DELETE FROM ".LOGIN_DB_SCHEMA.".set_live WHERE table_name = '".$cms->page_name."' AND delete_flag = 't'";
 	$cms->db_exec($q);
diff --git a/www/admin/footer.inc b/www/admin/footer.inc
index 058db58c..997bcfde 100644
--- a/www/admin/footer.inc
+++ b/www/admin/footer.inc
@@ -1,4 +1,4 @@
-<?
+<?php
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2008/08/14
@@ -8,5 +8,5 @@
 *********************************************************************/
 
 // print debug messages
-echo $login->print_error_msg();
-echo $cms->print_error_msg();
+echo $login->printErrorMsg();
+echo $cms->printErrorMsg();
diff --git a/www/admin/header.inc b/www/admin/header.inc
index 3c2e5fb6..170019ec 100644
--- a/www/admin/header.inc
+++ b/www/admin/header.inc
@@ -1,4 +1,4 @@
-<?
+<?php
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2008/08/01
@@ -23,11 +23,6 @@ extract($_POST, EXTR_SKIP);
 // set output to quiet for load of classes & session settings
 ob_start();
 require("config.inc");
-
-// login class, DB connections & Admin class, Smarty extension
-foreach (array ('Login', 'Admin.Backend', 'Smarty.Extend') as $class) {
-	_spl_autoload('Class.'.$class.'.inc');
-}
 //------------------------------ library include end
 
 //------------------------------ basic variable settings start
@@ -50,21 +45,19 @@ if (array_key_exists('action', $_POST) && $_POST['action'] != 'download_csv') {
 
 //------------------------------ class init start
 // login & page access check
-$login = new login($DB_CONFIG[LOGIN_DB], $lang);
+$login = new CoreLibs\ACL\Login($DB_CONFIG[LOGIN_DB], $lang);
 // post login lang check
 if ($_SESSION['DEFAULT_LANG']) {
 	$lang = $_SESSION['DEFAULT_LANG'];
 }
 // create smarty object
-$smarty = new SmartyML($lang);
+$smarty = new CoreLibs\Template\SmartyExtend($lang);
 // create new DB class
-$cms = new AdminBackend($DB_CONFIG[MAIN_DB], $lang);
-// set search path to the default DB schema
-$cms->db_exec("SET search_path TO ".DB_SCHEMA);
+$cms = new CoreLibs\Admin\Backend($DB_CONFIG[MAIN_DB], $lang);
 // the menu show flag (what menu to show)
 $cms->menu_show_flag = 'main';
 // db nfo
-$cms->db_info();
+$cms->dbInfo();
 // set acl
 $cms->acl = $login->acl;
 //------------------------------ class init end
diff --git a/www/admin/libs b/www/admin/libs
deleted file mode 120000
index a48a2d68..00000000
--- a/www/admin/libs
+++ /dev/null
@@ -1 +0,0 @@
-../libs/
\ No newline at end of file
diff --git a/www/admin/log b/www/admin/log
deleted file mode 120000
index 3355f402..00000000
--- a/www/admin/log
+++ /dev/null
@@ -1 +0,0 @@
-../log/
\ No newline at end of file
diff --git a/www/admin/namespace_test.php b/www/admin/namespace_test.php
new file mode 100755
index 00000000..6e11a07e
--- /dev/null
+++ b/www/admin/namespace_test.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = 1;
+$PRINT_ALL = 1;
+$DB_DEBUG = 1;
+
+// namespace test
+ob_start();
+
+// admin class tests
+require 'config.inc' ;
+DEFINE('SET_SESSION_NAME', EDIT_SESSION_NAME);
+
+echo "DIR: ".DIR."<br>ROOT: ".ROOT."<br>BASE: ".BASE."<br>";
+
+$lang = 'ja_utf8';
+$base = new CoreLibs\Admin\Backend($DB_CONFIG[MAIN_DB], $lang);
+ob_end_flush();
+
+print "Start time: ".$base->runningTime()."<br>";
+print "ByteStringFormat: ".$base->ByteStringFormat(1234567.12)."<br>";
+print "byteStringFormat: ".$base->byteStringFormat(1234567.12)."<br>";
+print "get_page_name [DEPRECATED]: ".$base->get_page_name()."<br>";
+print "getPageName: ".$base->getPageName()."<br>";
+
+print "DB Info: ".$base->dbInfo(1)."<br>";
+
+
+print "End Time: ".$base->runningTime()."<br>";
+print "Run Time: ".$base->runningTime()."<br>";
+$base->resetRunningtime();
+
+print "Lang: ".$base->l->__getLang().", MO File: ".$base->l->__getMoFile()."<br>";
+print "Translate test: Year -> ".$base->l->__('Year')."<br>";
+
+// end error print
+print $base->printErrorMsg();
+
+# __END__
diff --git a/www/admin/other_test.php b/www/admin/other_test.php
new file mode 100755
index 00000000..777c61ff
--- /dev/null
+++ b/www/admin/other_test.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Foo;
+
+class FooBar
+{
+	public $foo = '';
+
+	public function __construct()
+	{
+		$this->foo = 'BAR';
+	}
+
+	public function otherBarBar($wrong)
+	{
+		echo "B: $wrong<br>";
+	}
+
+	public function barBar($wrong)
+	{
+		echo "B: $wrong<br>";
+	}
+}
diff --git a/www/admin/set_paths.inc b/www/admin/set_paths.inc
index 263bc3e7..192ecbb5 100644
--- a/www/admin/set_paths.inc
+++ b/www/admin/set_paths.inc
@@ -1,4 +1,4 @@
-<?
+<?php
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2007/09/03
@@ -15,7 +15,7 @@ if ($_SESSION['TEMPLATE']) {
 } else {
 	$TEMPLATE = DEFAULT_TEMPLATE;
 }
-$TEMPLATE_DIR = $TEMPLATE.'/';
+$TEMPLATE_DIR = $TEMPLATE;
 // master template
 if (!$MASTER_TEMPLATE_NAME) {
 	$MASTER_TEMPLATE_NAME = MASTER_TEMPLATE_NAME;
@@ -41,7 +41,7 @@ $lang_short = substr($lang, 0, 2);
 $CONTENT_INCLUDE = str_replace(".php", ".tpl", $cms->page_name);
 $FORM_NAME = !isset($FORM_NAME) || !$FORM_NAME ? str_replace(".php", "", $cms->page_name) : $FORM_NAME;
 // set local page title
-$L_TITLE = ucfirst(str_replace('_', ' ', $cms->get_page_name(1))).' - '.$G_TITLE;
+$L_TITLE = ucfirst(str_replace('_', ' ', $cms->getPageName(1))).' - '.$G_TITLE;
 // strip tpl and replace it with inc
 // php include file per page
 $cms->INC_TEMPLATE_NAME = str_replace(".tpl", ".inc", $CONTENT_INCLUDE);
@@ -55,13 +55,13 @@ $cms->CSS_SPECIAL_TEMPLATE_NAME = @$CSS_NAME;
 $cms->JS_SPECIAL_TEMPLATE_NAME = @$JS_NAME;
 
 // set basic template path (tmp)
-$smarty->setTemplateDir(LAYOUT.$TEMPLATE_DIR.TEMPLATES.'/');
-$cms->lang_dir = LAYOUT.$TEMPLATE_DIR.LANG."/";
-$cms->includes = LAYOUT.$TEMPLATE_DIR.INCLUDES."/";
-$cms->javascript = LAYOUT.$TEMPLATE_DIR.JS."/";
-$cms->css = LAYOUT.$TEMPLATE_DIR.CSS."/";
-$cms->pictures = LAYOUT.$TEMPLATE_DIR.IMAGES."/";
-$cms->cache_pictures = LAYOUT.$TEMPLATE_DIR.CACHE.IMAGES.'/';
+$smarty->setTemplateDir(LAYOUT.$TEMPLATE_DIR.TEMPLATES);
+$cms->lang_dir = LAYOUT.$TEMPLATE_DIR.LANG;
+$cms->includes = LAYOUT.$TEMPLATE_DIR.INCLUDES;
+$cms->javascript = LAYOUT.$TEMPLATE_DIR.JS;
+$cms->css = LAYOUT.$TEMPLATE_DIR.CSS;
+$cms->pictures = LAYOUT.$TEMPLATE_DIR.IMAGES;
+$cms->cache_pictures = LAYOUT.$TEMPLATE_DIR.CACHE.IMAGES;
 $cms->cache_pictures_root = ROOT.$cms->cache_pictures;
 if (!is_dir($cms->cache_pictures_root)) {
 	mkdir($cms->cache_pictures_root);
@@ -69,13 +69,13 @@ if (!is_dir($cms->cache_pictures_root)) {
 $template_set = $TEMPLATE;
 
 // if we don't find the master template, set the template path back AND set the insert template as absolute path
-if (!file_exists(ROOT.$smarty->getTemplateDir()[0]."/".MASTER_TEMPLATE_NAME)) {
-	if (file_exists(ROOT.$smarty->getTemplateDir()[0]."/".$TEMPLATE_NAME)) {
-		$TEMPLATE_NAME = ROOT.$smarty->getTemplateDir()[0]."/".$TEMPLATE_NAME;
+if (!file_exists(ROOT.$smarty->getTemplateDir()[0].DS.MASTER_TEMPLATE_NAME)) {
+	if (file_exists(ROOT.$smarty->getTemplateDir()[0].DS.$TEMPLATE_NAME)) {
+		$TEMPLATE_NAME = ROOT.$smarty->getTemplateDir()[0].DS.$TEMPLATE_NAME;
 	}
 	$smarty->setTemplateDir(LAYOUT.DEFAULT_TEMPLATE.TEMPLATES);
 	$template_set = DEFAULT_TEMPLATE;
-} elseif (!file_exists(ROOT.$smarty->getTemplateDir()[0]."/".$TEMPLATE_NAME)) {
+} elseif (!file_exists(ROOT.$smarty->getTemplateDir()[0].DS.$TEMPLATE_NAME)) {
 	// check if the template exists in the template path, if not, set path to to default
 	$smarty->setTemplateDir(LAYOUT.DEFAULT_TEMPLATE.TEMPLATES);
 	$template_set = DEFAULT_TEMPLATE;
@@ -85,25 +85,25 @@ if (!file_exists(ROOT.$smarty->getTemplateDir()[0]."/".MASTER_TEMPLATE_NAME)) {
 
 // check if the javascript folder exists in the template path, if not fall back to default
 if (!is_dir($cms->javascript)) {
-	$cms->javascript = LAYOUT.DEFAULT_TEMPLATE.JS."/";
+	$cms->javascript = LAYOUT.DEFAULT_TEMPLATE.JS;
 }
 // check if lang_dir folder exists in the template path, if not fall back to default
 if (!is_dir($cms->lang_dir)) {
-	$cms->lang_dir = LAYOUT.DEFAULT_TEMPLATE.LANG."/";
+	$cms->lang_dir = LAYOUT.DEFAULT_TEMPLATE.LANG;
 }
 // check if include folder exists in the template path, if not fall back to default
 if (!is_dir($cms->includes)) {
-	$cms->includes = LAYOUT.DEFAULT_TEMPLATE.INCLUDES."/";
+	$cms->includes = LAYOUT.DEFAULT_TEMPLATE.INCLUDES;
 }
 // check if css folder exists in the template path, if not fall back to default
 if (!is_dir($cms->css)) {
-	$cms->css = LAYOUT.DEFAULT_TEMPLATE.CSS."/";
+	$cms->css = LAYOUT.DEFAULT_TEMPLATE.CSS;
 }
 if (!is_dir($cms->pictures)) {
-	$cms->pictures = LAYOUT.DEFAULT_TEMPLATE.PICTURES.'/';
+	$cms->pictures = LAYOUT.DEFAULT_TEMPLATE.PICTURES;
 }
 if (!is_dir($cms->cache_pictures)) {
-	$cms->cache_pictures = LAYOUT.DEFAULT_TEMPLATE.CACHE.IMAGES.'/';
+	$cms->cache_pictures = LAYOUT.DEFAULT_TEMPLATE.CACHE.IMAGES;
 }
 
 // if the template_dir is != DEFAULT_TEMPLATE, then try to make a lang switch
diff --git a/www/admin/smarty.inc b/www/admin/smarty.inc
index 2cb730f3..b6b7707e 100644
--- a/www/admin/smarty.inc
+++ b/www/admin/smarty.inc
@@ -1,4 +1,4 @@
-<?
+<?php
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2005/07/12
@@ -84,7 +84,7 @@ $cms->DATA['LANG'] = $lang;
 $cms->DATA['TINYMCE_LANG'] = $lang_short;
 
 // debug data, if DEBUG flag is on, this data is print out
-$cms->DEBUG_DATA['debug_error_msg'] = $cms->running_time();
+$cms->DEBUG_DATA['debug_error_msg'] = $cms->runningTime();
 $cms->DEBUG_DATA['DEBUG'] = @$DEBUG_TMPL;
 
 // create main data array
@@ -93,4 +93,10 @@ $cms->CONTENT_DATA = array_merge($cms->HEADER, $cms->DATA, $cms->DEBUG_DATA);
 while (list($key, $value) = each($cms->CONTENT_DATA)) {
 	$smarty->assign($key, $value);
 }
+if (is_dir(BASE.TEMPLATES_C)) {
+	$smarty->setCompileDir(BASE.TEMPLATES_C);
+}
+if (is_dir(BASE.CACHE)) {
+	$smarty->setCacheDir(BASE.CACHE);
+}
 $smarty->display($MASTER_TEMPLATE_NAME, $TEMPLATE.$lang, $TEMPLATE.$lang);
diff --git a/www/admin/smarty_test.php b/www/admin/smarty_test.php
index f79455b5..702843f0 100644
--- a/www/admin/smarty_test.php
+++ b/www/admin/smarty_test.php
@@ -1,4 +1,4 @@
-<?
+<?php
 $ENABLE_ERROR_HANDLING = 0;
 $DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
 $DEBUG_ALL = 1;
diff --git a/www/admin/templates_c b/www/admin/templates_c
deleted file mode 120000
index fb1dd32a..00000000
--- a/www/admin/templates_c
+++ /dev/null
@@ -1 +0,0 @@
-../templates_c/
\ No newline at end of file
diff --git a/www/admin/tmp b/www/admin/tmp
deleted file mode 120000
index b684689e..00000000
--- a/www/admin/tmp
+++ /dev/null
@@ -1 +0,0 @@
-../tmp/
\ No newline at end of file
diff --git a/www/configs/config.template.inc b/www/configs/config.template.inc
index 6f5e3422..2d517ecf 100644
--- a/www/configs/config.template.inc
+++ b/www/configs/config.template.inc
@@ -1,4 +1,4 @@
-<?
+<?php
 /********************************************************************
 * AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
 * CREATED: 2003/06/10
@@ -21,67 +21,66 @@ DEFINE('DEFAULT_LANG', "en_utf8");
 DEFINE('DEFAULT_ENCODING', "UTF-8");
 
 /************* PATHS *********************/
+// directory seperator
+DEFINE('DS', DIRECTORY_SEPARATOR);
 // ** NEW/BETTER DIR DECLARATIONS **
 // path to original file (if symlink)
-DEFINE('DIR', __DIR__."/");
-// libs base path based on DIR
-DEFINE('LIBDIR', DIR.'libs/');
-// SMARTY path based on DIR
-DEFINE('SMARTYDIR', DIR.'Smarty/');
-// table arrays for Class Form
-DEFINE('TABLEARRAYDIR', DIR.'table_arrays/');
+DEFINE('DIR', __DIR__.DS);
+// base dir root folder level
+DEFINE('BASE', str_replace('configs', '', __DIR__));
 
 // ** OLD DIR DECLARATIONS **
 // path to document root of file called
-DEFINE('ROOT', getcwd()."/");
+DEFINE('ROOT', getcwd().DS);
 // libs path
-DEFINE('LIBS', "libs/");
+DEFINE('LIB', 'lib'.DS);
+DEFINE('LIBS', 'lib'.DS);
 // includes (strings, arrays for static, etc)
-DEFINE('INCLUDES', "includes/");
+DEFINE('INCLUDES', 'includes'.DS);
 // layout base path
-DEFINE('LAYOUT', 'layout/');
+DEFINE('LAYOUT', 'layout'.DS);
 // pic-root (compatible to CMS)
-DEFINE('PICTURES', "images/");
+DEFINE('PICTURES', "images".DS);
 // images
-DEFINE('IMAGES', "images/");
+DEFINE('IMAGES', "images".DS);
 // icons (below the images/ folder)
-DEFINE('ICONS', 'icons/');
+DEFINE('ICONS', 'icons'.DS);
 // media
-DEFINE('MEDIA', "media/");
+DEFINE('MEDIA', "media".DS);
 // flash-root (below media)
-DEFINE('FLASH', "flash/");
+DEFINE('FLASH', "flash".DS);
 // uploads (anything to keep)
-DEFINE('UPLOADS', "uploads/");
+DEFINE('UPLOADS', "uploads".DS);
 // files (binaries) (below media)
-DEFINE('BINARIES', "binaries/");
+DEFINE('BINARIES', "binaries".DS);
 // files (videos) (below media)
-DEFINE('VIDEOS', "videos/");
+DEFINE('VIDEOS', "videos".DS);
 // files (documents) (below media)
-DEFINE('DOCUMENTS', "documents/");
+DEFINE('DOCUMENTS', "documents".DS);
 // files (pdfs) (below media)
-DEFINE('PDFS', "documents/");
+DEFINE('PDFS', "documents".DS);
 // css
-DEFINE('CSS', "css/");
+DEFINE('CSS', "css".DS);
 // js
-DEFINE('JS', "javascript/");
+DEFINE('JS', "javascript".DS);
 // table arrays
-DEFINE('TABLE_ARRAYS', "table_arrays/");
+DEFINE('TABLE_ARRAYS', "table_arrays".DS);
 // smarty libs path
-DEFINE('SMARTY', "Smarty/");
+DEFINE('SMARTY', "Smarty".DS);
 // po langs
-DEFINE('LANG', "lang/");
+DEFINE('LANG', "lang".DS);
 // cache path
-DEFINE('CACHE', "cache/");
+DEFINE('CACHE', "cache".DS);
 // temp path
-DEFINE('TMP', "tmp/");
+DEFINE('TMP', "tmp".DS);
 // log files
-DEFINE('LOG', 'log/');
+DEFINE('LOG', 'log'.DS);
 // template base
-DEFINE('TEMPLATES', "templates/");
+DEFINE('TEMPLATES', "templates".DS);
 // frontend template dir', only for admin
-DEFINE('TEMPLATES_FRONTEND', "templates_frontend/");
+DEFINE('TEMPLATES_FRONTEND', "templates_frontend".DS);
 // default template
-DEFINE('DEFAULT_TEMPLATE', "default/");
+DEFINE('DEFAULT_TEMPLATE', "default".DS);
 // default template file
 DEFINE('DEFAULT_TEMPLATE_FILE', 'default.tpl');
 
@@ -249,27 +248,7 @@ if (DEBUG == false) {
 // any other global definitons here
 //	DEFINE('SOME_ID', <SOME VALUE>);
 
-// function that will be called on top of each class include to load the class
-function _spl_autoload($include_file)
-{
-	// where to search for the files to include
-	$dirs = array (
-		LIBDIR,
-		SMARTYDIR,
-		TABLEARRAYDIR,
-		'',
-		LIBS,
-		SMARTY,
-		TABLE_ARRAYS,
-		__DIR__.'/'.LIBS,
-		__DIR__.'/'.SMARTY
-	);
-	// try to find and load the class ifle
-	foreach ($dirs as $folder) {
-		if (file_exists($folder.$include_file)) {
-			require_once($folder.$include_file);
-			return true;
-		}
-	}
-	return false;
-}
+// read auto loader
+require BASE.LIB.'autoloader.php';
+
+# __END__
diff --git a/www/layout/admin/default/lang/messages_en_utf8.po b/www/layout/admin/default/lang/messages_en_utf8.po
index c8e836e7..fbfe06ce 100644
--- a/www/layout/admin/default/lang/messages_en_utf8.po
+++ b/www/layout/admin/default/lang/messages_en_utf8.po
@@ -10,11 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Project Version\n"
-"Report-Msgid-Bugs-To: clemens.schwaighofer@e-graphics.com\n"
-"POT-Creation-Date: 2005-08-09 09:26+0900\n"
+"Report-Msgid-Bugs-To: clemens.schwaighofer@egplusww.com\n"
+"POT-Creation-Date: 2018-03-28 10:40+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: \n"
-"Language-Team: E-GRAPHICS COMMUNICATIONS Japan <info.jp@e-graphics.com>\n"
+"Language-Team: E-GRAPHICS COMMUNICATIONS Japan <info.jp@egplusww.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/www/layout/admin/default/lang/messages_ja_utf8.po b/www/layout/admin/default/lang/messages_ja_utf8.po
index 36f8507b..6d0ae776 100644
--- a/www/layout/admin/default/lang/messages_ja_utf8.po
+++ b/www/layout/admin/default/lang/messages_ja_utf8.po
@@ -1,6 +1,6 @@
 #********************************************************************
 # AUTHOR: Clemens Schwaighofer
-# CREATED: 2007/04/18
+# CREATED: 2018/03/28
 # SHORT DESCRIPTION:
 # Backend Japanese Messages file for gettext
 # to craete: msgfmt -o ja.mo messages_ja.po
@@ -10,14 +10,54 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Project Version\n"
-"Report-Msgid-Bugs-To: clemens.schwaighofer@e-graphics.com\n"
-"POT-Creation-Date: 2007-04-18 17:40+0900\n"
+"Report-Msgid-Bugs-To: clemens.schwaighofer@egplusww.com\n"
+"POT-Creation-Date: 2018-03-28 10:40+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: \n"
-"Language-Team: E-GRAPHICS COMMUNICATIONS Japan <info.jp@e-graphics.com>\n"
+"Language-Team: E-GRAPHICS COMMUNICATIONS Japan <info.jp@egplusww.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "Yes"
-msgstr ""
+msgstr "��"
+
+msgid "No"
+msgstr "���"
+
+# Basic date info
+msgid "Year"
+msgstr "å¹´"
+
+msgid "Month"
+msgstr "月"
+
+msgid "Day"
+msgstr "æ—¥"
+
+msgid "Hour"
+msgstr "時"
+
+msgid "Minute"
+msgstr "分"
+
+msgid "Mon"
+msgstr "月"
+
+msgid "Tue"
+msgstr "�"
+
+msgid "Wed"
+msgstr "æ°´"
+
+msgid "Thu"
+msgstr "木"
+
+msgid "Fri"
+msgstr "金"
+
+msgid "Sat"
+msgstr "土"
+
+msgid "Sun"
+msgstr "æ—¥"
diff --git a/www/libs/Class.Login.inc b/www/lib/CoreLibs/ACL/Login.inc
similarity index 86%
rename from www/libs/Class.Login.inc
rename to www/lib/CoreLibs/ACL/Login.inc
index d19c20dd..32447cad 100644
--- a/www/libs/Class.Login.inc
+++ b/www/lib/CoreLibs/ACL/Login.inc
@@ -1,8 +1,8 @@
-<?
+<?php
 /*********************************************************************
 * AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
 * CREATED: 2000/06/01
-* VERSION: 4.0.0
+* VERSION: 5.0.0
 * RELEASED LICENSE: GNU GPL 3
 * SHORT DESCRIPTON:
 *   ~ 2003/03/03: change the whole include file into one class
@@ -57,10 +57,9 @@
 *   2000-06-01: created basic idea and functions
 *********************************************************************/
 
-// try to include file from LIBS path, or from normal path
-_spl_autoload('Class.DB.IO.inc');
+namespace CoreLibs\ACL;
 
-class login extends db_io
+class Login extends \CoreLibs\DB\IO
 {
 	private $euid; // the user id var
 	private $permission_okay = 0; // is set to one if login okay, or EUID is set and user is okay to access this page
@@ -92,7 +91,11 @@ class login extends db_io
 		$this->log_per_class = 1;
 
 		// create db connection and init base class
-		parent::__construct($db_config, $debug, $db_debug, $echo, $print);
+		if (!parent::__construct($db_config, $debug, $db_debug, $echo, $print)) {
+			echo "Could not connect to DB<br>";
+			// if I can't connect to the DB to auth exit hard. No access allowed
+			exit;
+		}
 
 		// no session could be found at all
 		if (!session_id()) {
@@ -100,14 +103,15 @@ class login extends db_io
 			exit;
 		}
 
-		// get the language sub class & init it
-		_spl_autoload('Class.l10n.inc');
-		$this->l = new l10n($lang);
+		$this->l = new \CoreLibs\Language\L10n($lang);
 
 		// if we have a search path we need to set it, to use the correct DB to login
 		// check what schema to use. if there is a login schema use this, else check if there is a schema set in the config, or fall back to DB_SCHEMA if this exists, if this also does not exists use public schema
 		$SCHEMA = defined('LOGIN_DB_SCHEMA') ? LOGIN_DB_SCHEMA : ($db_config['db_schema'] ? $db_config['db_schema'] : (defined('DB_SCHEMA') ? DB_SCHEMA : 'public'));
-		$this->db_exec("SET search_path TO ".$SCHEMA);
+		// set schema if schema differs to schema set in db conneciton
+		if ($this->dbGetSchema() && $this->dbGetSchema() != $SCHEMA) {
+			$this->dbExec("SET search_path TO ".$SCHEMA);
+		}
 		$this->euid = array_key_exists('EUID', $_SESSION) ? $_SESSION['EUID'] : 0; // if there is none, there is none, saves me POST/GET check
 		// get login vars, are so, can't be changed
 		// prepare
@@ -165,16 +169,16 @@ class login extends db_io
 		// internal
 		$this->class_info["login"] = array(
 			"class_name" => "Login",
-			"class_version" => "4.0.0",
+			"class_version" => "5.0.0",
 			"class_created" => "2000-06-01",
-			"class_author" => "cs/gullevek/at"
+			"class_author" => "Clemens Schwaighofer"
 		);
 
 		// init default ACL list array
 		$_SESSION['DEFAULT_ACL_LIST'] = array ();
 		// read the current edit_access_right list into an array
 		$q = "SELECT level, type, name FROM edit_access_right WHERE level >= 0 ORDER BY level";
-		while ($res = $this->db_return($q)) {
+		while ($res = $this->dbReturn($q)) {
 			// level to description format (numeric)
 			$this->default_acl_list[$res['level']] = array (
 				'type' => $res['type'],
@@ -185,19 +189,19 @@ class login extends db_io
 		$_SESSION['DEFAULT_ACL_LIST'] = $this->default_acl_list;
 
 		// if username & password & !$euid start login
-		$this->login_login_user();
+		$this->loginLoginUser();
 		// checks if $euid given check if user is okay for that side
-		$this->login_check_permissions();
+		$this->loginCheckPermissions();
 		// logsout user
-		$this->login_logout_user();
+		$this->loginLogoutUser();
 		// if the password change flag is okay, run the password change method
 		if ($this->password_change) {
-			$this->login_password_change();
+			$this->loginPasswordChange();
 		}
 		// if !$euid || permission not okay, print login screan
-		echo $this->login_print_login();
+		echo $this->loginPrintLogin();
 		// closing all connections, depending on error status, exit
-		if (!$this->login_close_class()) {
+		if (!$this->loginCloseClass()) {
 			// do not go anywhere, quit processing here
 			// do something with possible debug data?
 			if (TARGET == 'live' || TARGET == 'remote')	{
@@ -206,14 +210,14 @@ class login extends db_io
 				$this->echo_output_all = 0;
 				$this->print_output_all = DEBUG ? 1 : 0;
 			}
-			$status_msg = $this->print_error_msg();
+			$status_msg = $this->printErrorMsg();
 			if ($this->echo_output_all) {
 				echo $status_msg;
 			}
 			exit;
 		}
 		// set acls for this user/group and this page
-		$this->login_set_acl();
+		$this->loginSetAcl();
 	}
 
 	// METHOD: _login
@@ -225,11 +229,12 @@ class login extends db_io
 		parent::__destruct();
 	}
 
-	// METHOD: login_login_user
+	// METHOD: loginLoginUser
+	// WAS   : login_login_user
 	// PARAMS: none
 	// RETURN: none
 	// DESC  : if user pressed login button this script is called, but only if there is no preview euid set
-	private function login_login_user()
+	private function loginLoginUser()
 	{
 		// have to get the global stuff here for setting it later
 		if (!$this->euid && $this->login) {
@@ -253,7 +258,7 @@ class login extends db_io
 				$q .= "eg.edit_access_right_id = eareg.edit_access_right_id AND ";
 				// password match is done in script, against old plain or new blowfish encypted
 				$q .= "(LOWER(username) = '".strtolower($this->username)."') ";
-				$res = $this->db_return($q);
+				$res = $this->dbReturn($q);
 				// username is wrong, but we throw for wrong username and wrong password the same error
 				if (!$this->cursor_ext[md5($q)]["num_rows"]) {
 					$this->login_error = 1010;
@@ -280,13 +285,24 @@ class login extends db_io
 					} elseif ($res['locked']) {
 						// user is locked, either set or auto set
 						$this->login_error = 105;
-					} elseif ((preg_match("/^\\$2(a|y)\\$/", $res['password']) && CRYPT_BLOWFISH != 1) || (preg_match("/^\\$1\\$/", $res['password']) && CRYPT_MD5 != 1) || (preg_match("/^\\$[0-9A-Za-z.]{12}$/", $res['password']) && CRYPT_STD_DES != 1)) {
+					} elseif ((preg_match("/^\\$2(a|y)\\$/", $res['password']) && CRYPT_BLOWFISH != 1) ||
+						(preg_match("/^\\$1\\$/", $res['password']) && CRYPT_MD5 != 1) ||
+						(preg_match("/^\\$[0-9A-Za-z.]{12}$/", $res['password']) && CRYPT_STD_DES != 1)
+					) {
 						// this means password cannot be decrypted because of missing crypt methods
 						$this->login_error = 9999;
-					} elseif ((preg_match("/^\\$2(a|y)\\$/", $res['password']) || preg_match("/^\\$1\\$/", $res['password']) || preg_match("/^\\$[0-9A-Za-z.]{12}$/", $res['password'])) && !$this->verifyCryptString($this->password, $res['password'])) {
+					} elseif ((preg_match("/^\\$2(a|y)\\$/", $res['password']) ||
+						preg_match("/^\\$1\\$/", $res['password']) ||
+						preg_match("/^\\$[0-9A-Za-z.]{12}$/", $res['password'])) &&
+						!$this->verifyCryptString($this->password, $res['password'])
+					) {
 						// check passwword as crypted, $2a$ or $2y$ is blowfish start, $1$ is MD5 start, $\w{12} is standard DES
 						$this->login_error = 1011;
-					} elseif (!preg_match("/^\\$2(a|y)\\$/", $res['password']) && !preg_match("/^\\$1\\$/", $res['password']) && !preg_match("/^\\$[0-9A-Za-z.]{12}$/", $res['password']) && $res['password'] != $this->password) {
+					} elseif (!preg_match("/^\\$2(a|y)\\$/", $res['password']) &&
+						!preg_match("/^\\$1\\$/", $res['password']) &&
+						!preg_match("/^\\$[0-9A-Za-z.]{12}$/", $res['password']) &&
+						$res['password'] != $this->password
+					) {
 						// check old plain password, non case sensitive
 						$this->login_error = 1012;
 					} else {
@@ -294,7 +310,7 @@ class login extends db_io
 						// set class var and session var
 						$_SESSION["EUID"] = $this->euid = $res["edit_user_id"];
 						// check if user is okay
-						$this->login_check_permissions();
+						$this->loginCheckPermissions();
 						if (!$this->login_error) {
 							// now set all session vars and read page permissions
 							$GLOBALS["DEBUG_ALL"] = $_SESSION["DEBUG_ALL"] = $res["debug"];
@@ -314,7 +330,7 @@ class login extends db_io
 							// reset any login error count for this user
 							if ($res['login_error_count'] > 0) {
 								$q = "UPDATE edit_user SET login_error_count = 0, login_error_date_last = NULL, login_error_date_first = NULL WHERE edit_user_id = ".$res['edit_user_id'];
-								$this->db_exec($q);
+								$this->dbExec($q);
 							}
 							$pages = array();
 							$edit_page_ids = array();
@@ -324,7 +340,7 @@ class login extends db_io
 							$q .= "WHERE ep.edit_page_id = epa.edit_page_id AND ear.edit_access_right_id = epa.edit_access_right_id ";
 							$q .= "AND epa.enabled = 1 AND epa.edit_group_id = ".$res["edit_group_id"]." ";
 							$q .= "ORDER BY ep.order_number";
-							while ($res = $this->db_return($q)) {
+							while ($res = $this->dbReturn($q)) {
 								// page id array for sub data readout
 								$edit_page_ids[] = $res['edit_page_id'];
 								// create the array for pages
@@ -348,22 +364,26 @@ class login extends db_io
 							} // for each page
 							// get the visible groups for all pages and write them to the pages
 							$_edit_page_id = 0;
-							$q = "SELECT epvg.edit_page_id, name, flag FROM edit_visible_group evp, edit_page_visible_group epvg WHERE evp.edit_visible_group_id = epvg.edit_visible_group_id AND epvg.edit_page_id IN (".join(', ', $edit_page_ids).") ORDER BY epvg.edit_page_id";
-							while ($res = $this->db_return($q)) {
+							$q = "SELECT epvg.edit_page_id, name, flag ";
+							$q .= "FROM edit_visible_group evp, edit_page_visible_group epvg ";
+							$q .= "WHERE evp.edit_visible_group_id = epvg.edit_visible_group_id AND epvg.edit_page_id IN (".join(', ', $edit_page_ids).") ";
+							$q .= "ORDER BY epvg.edit_page_id";
+							while ($res = $this->dbReturn($q)) {
 								if ($res['edit_page_id'] != $_edit_page_id) {
 									// search the pos in the array push
-									$pos = $this->array_search_recursive($res['edit_page_id'], $pages, 'edit_page_id');
+									$pos = $this->arraySearchRecursive($res['edit_page_id'], $pages, 'edit_page_id');
 									$_edit_page_id = $res['edit_page_id'];
 								}
 								$pages[$pos[0]]['visible'][$res['name']] = $res['flag'];
 							}
 							// get the same for the query strings
 							$_edit_page_id = 0;
-							$q = "SELECT eqs.edit_page_id, name, value, dynamic FROM edit_query_string eqs WHERE enabled = 1 AND edit_page_id IN (".join(', ', $edit_page_ids).") ORDER BY eqs.edit_page_id";
-							while ($res = $this->db_return($q))	{
+							$q = "SELECT eqs.edit_page_id, name, value, dynamic FROM edit_query_string eqs ";
+							$q .= "WHERE enabled = 1 AND edit_page_id IN (".join(', ', $edit_page_ids).") ORDER BY eqs.edit_page_id";
+							while ($res = $this->dbReturn($q)) {
 								if ($res['edit_page_id'] != $_edit_page_id)	{
 									// search the pos in the array push
-									$pos = $this->array_search_recursive($res['edit_page_id'], $pages, 'edit_page_id');
+									$pos = $this->arraySearchRecursive($res['edit_page_id'], $pages, 'edit_page_id');
 									$_edit_page_id = $res['edit_page_id'];
 								}
 								$pages[$pos[0]]['query'][] = array (
@@ -378,16 +398,17 @@ class login extends db_io
 							// load the edit_access user rights
 							$q = "SELECT ea.edit_access_id, level, type, ea.name, ea.color, ea.uid, edit_default ";
 							$q .= "FROM edit_access_user eau, edit_access_right ear, edit_access ea ";
-							$q .= "WHERE eau.edit_access_id = ea.edit_access_id AND eau.edit_access_right_id = ear.edit_access_right_id AND eau.enabled = 1 AND edit_user_id = ".$this->euid." ";
+							$q .= "WHERE eau.edit_access_id = ea.edit_access_id AND eau.edit_access_right_id = ear.edit_access_right_id ";
+							$q .= "AND eau.enabled = 1 AND edit_user_id = ".$this->euid." ";
 							$q .= "ORDER BY ea.name";
 							$unit_access = array();
 							$eauid = array();
 							$unit_acl = array();
-							while ($res = $this->db_return($q))	{
+							while ($res = $this->dbReturn($q)) {
 								// read edit access data fields and drop them into the unit access array
 								$q_sub ="SELECT name, value FROM edit_access_data WHERE enabled = 1 AND edit_access_id = ".$res['edit_access_id'];
 								$ea_data = array ();
-								while ($res_sub = $this->db_return($q_sub)) {
+								while ($res_sub = $this->dbReturn($q_sub)) {
 									$ea_data[$res_sub['name']] = $res_sub['value'];
 								}
 								// build master unit array
@@ -419,8 +440,10 @@ class login extends db_io
 							$login_error_date_first = ', login_error_date_first = NOW()';
 						}
 						// update login error count for this user
-						$q = "UPDATE edit_user SET login_error_count = login_error_count + 1, login_error_date_last = NOW() $login_error_date_first WHERE edit_user_id = ".$res['edit_user_id'];
-						$this->db_exec($q);
+						$q = "UPDATE edit_user ";
+						$q .= "SET login_error_count = login_error_count + 1, login_error_date_last = NOW() $login_error_date_first ";
+						$q .= "WHERE edit_user_id = ".$res['edit_user_id'];
+						$this->dbExec($q);
 						// totally lock the user if error max is reached
 						if ($res['login_error_count'] + 1 > $this->max_login_error_count) {
 							// do some alert reporting in case this error is too big
@@ -441,21 +464,22 @@ class login extends db_io
 		} // if he pressed login at least and is not yet loggined in
 	}
 
-	// METHOD: login_check_permission
+	// METHOD: loginCheckPermissions
+	// WAS   : login_check_permission
 	// PARAMS: none
 	// RETUNR none
 	// DESC  : for every page the user access this script checks if he is allowed to do so
-	public function login_check_permissions()
+	public function loginCheckPermissions()
 	{
 		if ($this->euid && $this->login_error != 103) {
 			$q = "SELECT filename ";
 			$q .= "FROM edit_page ep, edit_page_access epa, edit_group eg, edit_user eu ";
 			$q .= "WHERE ep.edit_page_id = epa.edit_page_id AND eg.edit_group_id = epa.edit_group_id AND eg.edit_group_id = eu.edit_group_id ";
 			$q .= "AND eu.edit_user_id = ".$this->euid." AND filename = '".$this->page_name."' AND eg.enabled = 1 AND epa.enabled = 1";
-			$res = $this->db_return_row($q);
+			$res = $this->dbReturnRow($q);
 			// unset mem limit if debug is set to 1
-//				if (($GLOBALS["DEBUG_ALL"] || $GLOBALS["DB_DEBUG"] || $_SESSION["DEBUG_ALL"] || $_SESSION["DB_DEBUG"]) && ini_get('memory_limit') != -1)
-//					ini_set('memory_limit', -1);
+			// if (($GLOBALS["DEBUG_ALL"] || $GLOBALS["DB_DEBUG"] || $_SESSION["DEBUG_ALL"] || $_SESSION["DB_DEBUG"]) && ini_get('memory_limit') != -1)
+			// 	ini_set('memory_limit', -1);
 			if ($res["filename"] == $this->page_name) {
 				$this->permission_okay = 1;
 			} else {
@@ -467,11 +491,12 @@ class login extends db_io
 		return $this->permission_okay;
 	}
 
-	// METHOD: login_logout_user
+	// METHOD: loginLogoutUser
+	// WAS   : login_logout_user
 	// PARAMS: none
 	// RETURN: none
 	// DESC  : if a user pressed on logout, destroyes session and unsets all global vars
-	public function login_logout_user()
+	public function loginLogoutUser()
 	{
 		if ($this->logout || $this->login_error) {
 			// unregister and destroy session vars
@@ -495,7 +520,8 @@ class login extends db_io
 		}
 	}
 
-	// METHOD: login_set_acl
+	// METHOD: loginSetAcl
+	// WAS   : login_set_acl
 	// PARAMS: none
 	// RETURN: none
 	// DESC  : sets all the basic ACLs
@@ -512,7 +538,7 @@ class login extends db_io
 	//         * if an account ACL is set, set this parallel, account ACL overrides user ACL if it applies
 	//         * if edit access ACL level is set, use this, else use page
 	//         set all base ACL levels as a list keyword -> ACL number
-	public function login_set_acl()
+	public function loginSetAcl()
 	{
 		// we start with the default acl
 		$this->acl['base'] = DEFAULT_ACL_LEVEL;
@@ -595,11 +621,12 @@ class login extends db_io
 //			$this->debug('ACL', $this->print_ar($this->acl));
 	}
 
-	// METHOD: login_check_edit_access
+	// METHOD: loginCheckEditAccess
+	// WAS   : login_check_edit_access
 	// PARAMS: edit_access_id to check
 	// RETURN: true/false: if the edit access is not in the valid list: false
 	// DESC  : checks if this edit access id is valid
-	public function login_check_edit_access($edit_access_id)
+	public function loginCheckEditAccess($edit_access_id)
 	{
 		if (array_key_exists($edit_access_id, $this->acl['unit'])) {
 			return true;
@@ -608,11 +635,12 @@ class login extends db_io
 		}
 	}
 
-	// METHOD: login_password_change
+	// METHOD: loginPasswordChange
+	// WAS   : login_password_change
 	// PARAMS: none
 	// RETURN: none
 	// DESC  : changes a user password
-	private function login_password_change()
+	private function loginPasswordChange()
 	{
 		if ($this->change_password) {
 			$event = 'Password Change';
@@ -624,8 +652,8 @@ class login extends db_io
 				}
 				// check user exist, if not -> error
 				if (!$this->login_error) {
-					$q = "SELECT edit_user_id FROM edit_user WHERE enabled = 1 AND username = '".$this->db_escape_string($this->pw_username)."'";
-					list ($edit_user_id) = $this->db_return_row($q);
+					$q = "SELECT edit_user_id FROM edit_user WHERE enabled = 1 AND username = '".$this->dbEscapeString($this->pw_username)."'";
+					list ($edit_user_id) = $this->dbReturnRow($q);
 					if (!$edit_user_id) {
 						// username wrong
 						$this->login_error = 201;
@@ -634,8 +662,8 @@ class login extends db_io
 				}
 				// check old passwords match -> error
 				if (!$this->login_error) {
-					$q = "SELECT edit_user_id FROM edit_user WHERE enabled = 1 AND username = '".$this->db_escape_string($this->pw_username)."' AND password = '".$this->db_escape_string($this->pw_old_password)."'";
-					list ($edit_user_id) = $this->db_return_row($q);
+					$q = "SELECT edit_user_id FROM edit_user WHERE enabled = 1 AND username = '".$this->dbEscapeString($this->pw_username)."' AND password = '".$this->dbEscapeString($this->pw_old_password)."'";
+					list ($edit_user_id) = $this->dbReturnRow($q);
 					if (!$edit_user_id) {
 						// old password wrong
 						$this->login_error = 202;
@@ -659,8 +687,8 @@ class login extends db_io
 				// no error change this users password
 				if (!$this->login_error) {
 					// update the user (edit_user_id) with the new password
-					$q = "UPDATE edit_user SET password = '".$this->db_escape_string($this->cryptString($this->pw_new_password))."' WHERE edit_user_id = ".$edit_user_id;
-					$this->db_exec($q);
+					$q = "UPDATE edit_user SET password = '".$this->dbEscapeString($this->cryptString($this->pw_new_password))."' WHERE edit_user_id = ".$edit_user_id;
+					$this->dbExec($q);
 					$data = 'Password change for user "'.$this->pw_username.'" from "'.$this->pw_old_password.'" to "'.$this->pw_new_password.'"';
 				}
 			} else {
@@ -673,15 +701,16 @@ class login extends db_io
 		} // button pressed
 	}
 
-	// METHOD: login_print_login
+	// METHOD: loginPrintLogin
+	// WAS   : login_print_login
 	// PARAMS: none
 	// RETURN: none
 	// DESC  : prints out login html part if no permission (error) is set
-	private function login_print_login()
+	private function loginPrintLogin()
 	{
 		if (!$this->permission_okay) {
 			// set the templates now
-			$this->login_set_templates();
+			$this->loginSetTemplates();
 			// if there is a global logout target ...
 			if (file_exists($this->logout_target) && $this->logout_target) {
 				$LOGOUT_TARGET = $this->logout_target;
@@ -728,11 +757,12 @@ class login extends db_io
 		} // if permission is 0 then print out login
 	}
 
-	// METHOD: login_close_class
+	// METHOD: loginCloseClass
+	// WAS   : login_close_class
 	// PARAMS: none
 	// RETURN: none
 	// DESC  : last function called, writes log and prints out error msg and exists script if permission 0
-	private function login_close_class()
+	private function loginCloseClass()
 	{
 		// write to LOG table ...
 		if ($this->login_error || $this->login || $this->logout) {
@@ -750,9 +780,9 @@ class login extends db_io
 			if ($this->euid) {
 				// get user from user table
 				$q = "SELECT username, password FROM edit_user WHERE edit_user_id = ".$this->euid;
-				list($username, $password) = $this->db_return_row($q);
+				list($username, $password) = $this->dbReturnRow($q);
 			} // if euid is set, get username (or try)
-			$this->write_log($event, '', $this->login_error, $username, $password);
+			$this->writeLog($event, '', $this->login_error, $username, $password);
 		} // write log under certain settings
 		// now close DB connection
 //			$this->error_msg = $this->_login();
@@ -763,11 +793,12 @@ class login extends db_io
 		}
 	}
 
-	// METHOD: login_set_templates
+	// METHOD: loginSetTemplates
+	// WAS   : login_set_templates
 	// PARAMS:
 	// RETURN: none
 	// DESC  : checks if there are external templates, if not uses internal fallback ones
-	private function login_set_templates()
+	private function loginSetTemplates()
 	{
 		$strings = array (
 			'HTML_TITLE' => $this->l->__("LOGIN"),
@@ -911,13 +942,14 @@ EOM;
 		}
 	}
 
-	// METHOD: write_log
+	// METHOD: writeLog
+	// WAS   : write_log
 	// PARAMS: event -> string of what has been done
 	//        data -> data information (id, etc)
 	//        error -> if error, write error string (not enougth data, etc)
 	// RETURN: none
 	// DESC  : writes detailed data into the edit user log table (keep log what user does)
-	private function write_log($event, $data, $error = "", $username = "", $password = "")
+	private function writeLog($event, $data, $error = "", $username = "", $password = "")
 	{
 		if ($this->login) {
 				$this->action = 'Login';
@@ -931,31 +963,32 @@ EOM;
 				'_FILES' => $_FILES,
 				'error' => $this->login_error
 		);
-		$data_binary = $this->db_escape_bytea(bzcompress(serialize($_data_binary)));
+		$data_binary = $this->dbEscapeBytea(bzcompress(serialize($_data_binary)));
 		// SQL querie for log entry
 		$q = "INSERT INTO edit_log ";
 		$q .= "(username, password, euid, event_date, event, error, data, data_binary, page, ";
 		$q .= "ip, user_agent, referer, script_name, query_string, server_name, http_host, http_accept, http_accept_charset, http_accept_encoding, session_id, ";
 		$q .= "action, action_id, action_yes, action_flag, action_menu, action_loaded, action_value, action_error) ";
-		$q .= "VALUES ('".$this->db_escape_string($username)."', '".$this->db_escape_string($password)."', ".(($this->euid) ? $this->euid : 'NULL').", ";
-		$q .= "NOW(), '".$this->db_escape_string($event)."', '".$this->db_escape_string($error)."', '".$this->db_escape_string($data)."', '".$data_binary."', '".$this->page_name."', ";
+		$q .= "VALUES ('".$this->dbEscapeString($username)."', '".$this->dbEscapeString($password)."', ".(($this->euid) ? $this->euid : 'NULL').", ";
+		$q .= "NOW(), '".$this->dbEscapeString($event)."', '".$this->dbEscapeString($error)."', '".$this->dbEscapeString($data)."', '".$data_binary."', '".$this->page_name."', ";
 		foreach (array('REMOTE_ADDR', 'HTTP_USER_AGENT', 'HTTP_REFERER', 'SCRIPT_FILENAME', 'QUERY_STRING', 'SERVER_NAME', 'HTTP_HOST', 'HTTP_ACCEPT', 'HTTP_ACCEPT_CHARSET', 'HTTP_ACCEPT_ENCODING') as $server_code) {
 			if (array_key_exists($server_code, $_SERVER)) {
-				$q .= "'".$this->db_escape_string($_SERVER[$server_code])."', ";
+				$q .= "'".$this->dbEscapeString($_SERVER[$server_code])."', ";
 			} else {
 				$q .= "NULL, ";
 			}
 		}
 		$q .= "'".session_id()."', ";
-		$q .= "'".$this->db_escape_string($this->action)."', '".$this->db_escape_string($this->username)."', NULL, '".$this->db_escape_string($this->login_error)."', NULL, NULL, '".$this->db_escape_string($this->permission_okay)."', NULL)";
-		$this->db_exec($q, 'NULL');
+		$q .= "'".$this->dbEscapeString($this->action)."', '".$this->dbEscapeString($this->username)."', NULL, '".$this->dbEscapeString($this->login_error)."', NULL, NULL, '".$this->dbEscapeString($this->permission_okay)."', NULL)";
+		$this->dbExec($q, 'NULL');
 	}
 
-	// METHOD: login_check_edit_access_id
+	// METHOD: loginCheckEditAccessId
+	// WAS   : login_check_edit_access_id
 	// PARAMS: edit access id to check
 	// RETURN: same edit access id if ok, or the default edit access id if given one is not valud
 	// DESC  : checks that the given edit access id is valid for this user
-	public function login_check_edit_access_id($edit_access_id)
+	public function loginCheckEditAccessId($edit_access_id)
 	{
 		if (!array_key_exists($edit_access_id, $_SESSION["UNIT"])) {
 			return $_SESSION["UNIT_DEFAULT"];
@@ -964,11 +997,12 @@ EOM;
 		}
 	}
 
-	// METHOD: login_set_edit_access_data
+	// METHOD: loginSetEditAccessData
+	// WAS   : login_set_edit_access_data
 	// PARAMS: edit access id, key value to search for
 	// RETURN: false for not found or string for found data
 	// DESC  : searchs in the data set for the unit for the data key and returns the value asociated with it
-	public function login_set_edit_access_data($edit_access_id, $data_key)
+	public function loginSetEditAccessData($edit_access_id, $data_key)
 	{
 		if (!$_SESSION['UNIT'][$edit_access_id]['data'][$data_key]) {
 			return false;
@@ -977,3 +1011,5 @@ EOM;
 		}
 	}
 } // close class
+
+# __END__
diff --git a/www/libs/Class.Admin.Backend.inc b/www/lib/CoreLibs/Admin/Backend.inc
similarity index 60%
rename from www/libs/Class.Admin.Backend.inc
rename to www/lib/CoreLibs/Admin/Backend.inc
index 1e7b5680..4566e377 100644
--- a/www/libs/Class.Admin.Backend.inc
+++ b/www/lib/CoreLibs/Admin/Backend.inc
@@ -1,8 +1,8 @@
-<?
+<?php
 /*********************************************************************
 * AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
 * CREATED: 2006/08/15
-* VERSION: 0.1.0
+* VERSION: 1.0.0
 * RELEASED LICENSE: GNU GPL 3
 * DESCRIPTION
 * Basic Admin interface backend
@@ -22,10 +22,9 @@
 *
 *********************************************************************/
 
-// try to include file from LIBS path, or from normal path
-_spl_autoload('Class.DB.IO.inc');
+namespace CoreLibs\Admin;
 
-class AdminBackend extends db_io
+class Backend extends \CoreLibs\DB\IO
 {
 	// page name
 	public $page_name; // the name of the current page
@@ -61,24 +60,21 @@ class AdminBackend extends db_io
 	public function __construct($db_config, $lang, $debug = 0, $db_debug = 0, $echo = 1, $print = 0)
 	{
 		// get the language sub class & init it
-		_spl_autoload('Class.l10n.inc');
-
-		$this->l = new l10n($lang);
+		$this->l = new \CoreLibs\Language\L10n($lang);
 
 		// init the database class
-//			$this->db_io($db_config, $debug, $db_debug, $echo, $print);
 		parent::__construct($db_config, $debug, $db_debug, $echo, $print);
 
 		// internal
 		$this->class_info["adbBackend"] = array(
 			"class_name" => "Admin Interface Backend",
-			"class_version" => "0.1.0",
+			"class_version" => "1.0.0",
 			"class_created" => "2006/08/15",
-			"class_author" => "cs/gullevek/jp"
+			"class_author" => "Clemens Schwaighofer"
 		);
 
 		// set page name
-		$this->page_name = $this->get_page_name();
+		$this->page_name = $this->getPageName();
 
 		// set the action ids
 		foreach ($this->action_list as $_action) {
@@ -122,15 +118,15 @@ class AdminBackend extends db_io
 	// METHOD: adbEditLog()
 	// PARAMS: event -> any kind of event description, data -> any kind of data related to that event
 	// RETURN: none
-	// DESC:   writes all action vars plus other info into edit_log table
+	// DESC  : writes all action vars plus other info into edit_log table
 	public function adbEditLog($event = '', $data = '', $write_type = 'STRING')
 	{
 		if ($write_type == 'BINARY') {
-			$data_binary = $this->db_escape_bytea(bzcompress(serialize($data)));
+			$data_binary = $this->dbEscapeBytea(bzcompress(serialize($data)));
 			$data = 'see bzip compressed data_binary field';
 		}
 		if ($write_type == 'STRING') {
-			$data = $this->db_escape_string(serialize($data));
+			$data = $this->dbEscapeString(serialize($data));
 		}
 
 		$q = "INSERT INTO ".LOGIN_DB_SCHEMA.".edit_log ";
@@ -138,31 +134,24 @@ class AdminBackend extends db_io
 		$q .= "ip, user_agent, referer, script_name, query_string, server_name, http_host, http_accept, http_accept_charset, http_accept_encoding, session_id, ";
 		$q .= "action, action_id, action_yes, action_flag, action_menu, action_loaded, action_value, action_error) ";
 		$q .= "VALUES ";
-		$q .= "(".@$_SESSION['EUID'].", NOW(), '".$this->db_escape_string($event)."', '".$data."', '".$data_binary."', '".$this->page_name."', ";
-		$q .= "'".@$_SERVER["REMOTE_ADDR"]."', '".$this->db_escape_string(@$_SERVER['HTTP_USER_AGENT'])."', ";
-		$q .= "'".$this->db_escape_string(@$_SERVER['HTTP_REFERER'])."', '".$this->db_escape_string(@$_SERVER['SCRIPT_FILENAME'])."', ";
-		$q .= "'".$this->db_escape_string(@$_SERVER['QUERY_STRING'])."', '".$this->db_escape_string(@$_SERVER['SERVER_NAME'])."', ";
-		$q .= "'".$this->db_escape_string(@$_SERVER['HTTP_HOST'])."', '".$this->db_escape_string(@$_SERVER['HTTP_ACCEPT'])."', ";
-		$q .= "'".$this->db_escape_string(@$_SERVER['HTTP_ACCEPT_CHARSET'])."', '".$this->db_escape_string(@$_SERVER['HTTP_ACCEPT_ENCODING'])."', ";
+		$q .= "(".@$_SESSION['EUID'].", NOW(), '".$this->dbEscapeString($event)."', '".$data."', '".$data_binary."', '".$this->page_name."', ";
+		$q .= "'".@$_SERVER["REMOTE_ADDR"]."', '".$this->dbEscapeString(@$_SERVER['HTTP_USER_AGENT'])."', ";
+		$q .= "'".$this->dbEscapeString(@$_SERVER['HTTP_REFERER'])."', '".$this->dbEscapeString(@$_SERVER['SCRIPT_FILENAME'])."', ";
+		$q .= "'".$this->dbEscapeString(@$_SERVER['QUERY_STRING'])."', '".$this->dbEscapeString(@$_SERVER['SERVER_NAME'])."', ";
+		$q .= "'".$this->dbEscapeString(@$_SERVER['HTTP_HOST'])."', '".$this->dbEscapeString(@$_SERVER['HTTP_ACCEPT'])."', ";
+		$q .= "'".$this->dbEscapeString(@$_SERVER['HTTP_ACCEPT_CHARSET'])."', '".$this->dbEscapeString(@$_SERVER['HTTP_ACCEPT_ENCODING'])."', ";
 		$q .= "'".session_id()."', ";
-		$q .= "'".$this->db_escape_string($this->action)."', '".$this->db_escape_string($this->action_id)."', ";
-		$q .= "'".$this->db_escape_string($this->action_yes)."', '".$this->db_escape_string($this->action_flag)."', ";
-		$q .= "'".$this->db_escape_string($this->action_menu)."', '".$this->db_escape_string($this->action_loaded)."', ";
-		$q .= "'".$this->db_escape_string($this->action_value)."', '".$this->db_escape_string($this->action_error)."')";
-		$this->db_exec($q, 'NULL');
+		$q .= "'".$this->dbEscapeString($this->action)."', '".$this->dbEscapeString($this->action_id)."', ";
+		$q .= "'".$this->dbEscapeString($this->action_yes)."', '".$this->dbEscapeString($this->action_flag)."', ";
+		$q .= "'".$this->dbEscapeString($this->action_menu)."', '".$this->dbEscapeString($this->action_loaded)."', ";
+		$q .= "'".$this->dbEscapeString($this->action_value)."', '".$this->dbEscapeString($this->action_error)."')";
+		$this->dbExec($q, 'NULL');
 	}
 
-
-	// ==================================
-	// ALL THE PAGE RIGHTS/USER RIGHTS/ETC need to fixed and put into one
-	// proper settings have to be done with the defined top down rights flow
-	// ==================================
-	// all ACLs are set in the login class
-
 	// METHOD: adbTopMenu
 	// PARAMS: level
 	// RETURN: returns an array for the top menu with all correct settings
-	// DESC:   menu creater
+	// DESC  : menu creater
 	public function adbTopMenu($flag = 0)
 	{
 		if ($this->menu_show_flag) {
@@ -174,13 +163,11 @@ class AdminBackend extends db_io
 		if (!is_array($pages)) {
 			$pages = array ();
 		}
-
-//$this->debug('pages', $this->print_ar($pages));
-
+		// $this->debug('pages', $this->print_ar($pages));
 		// if flag is 0, then we show all, else, we show only the matching flagges array points
 		// array is already sorted after correct order
 		reset($pages);
-		for ($i = 0; $i < count($pages); $i ++) {
+		for ($i = 0, $iMax = count($pages); $i < $iMax; $i ++) {
 			$show = 0;
 			// is it visible in the menu & is it online
 			if ($pages[$i]["menu"] && $pages[$i]["online"]) {
@@ -205,7 +192,7 @@ class AdminBackend extends db_io
 					}
 					$query_string = '';
 					if (count($pages[$i]["query"])) {
-						for ($j = 0; $j < count($pages[$i]["query"]); $j ++) {
+						for ($j = 0, $jMax = count($pages[$i]["query"]); $j < $jMax; $j ++) {
 							if (strlen($query_string)) {
 								$query_string .= "&";
 							}
@@ -224,7 +211,7 @@ class AdminBackend extends db_io
 					$name = $pages[$i]["page_name"];
 					// if page name matchs -> set selected flag
 					$selected = 0;
-					if ($this->get_page_name() == $pages[$i]["filename"]) {
+					if ($this->getPageName() == $pages[$i]["filename"]) {
 						$selected = 1;
 						$this->page_name = $name;
 					}
@@ -244,7 +231,7 @@ class AdminBackend extends db_io
 	// METHOD: adbShowMenuPoint
 	// PARAMS: filename
 	// RETURN: returns boolean true/false
-	// DESC:   checks if this filename is in the current situation (user id, etc) available
+	// DESC  : checks if this filename is in the current situation (user id, etc) available
 	public function adbShowMenuPoint($filename)
 	{
 		$enabled = 0;
@@ -260,20 +247,20 @@ class AdminBackend extends db_io
 	// METHOD: adbAssocArray
 	// PARAMS: db array, key, value part
 	// RETURN: returns and associative array
-	// DESC:   creates out of a normal db_return array an assoc array
+	// DESC  : creates out of a normal db_return array an assoc array
 	public function adbAssocArray($db_array, $key, $value)
 	{
-		return $this->GenAssocArray($db_array, $key, $value);
+		return $this->genAssocArray($db_array, $key, $value);
 	}
 
 	// REMARK: below function has moved to "Class.Basic"
 	// METHOD: adbByteStringFormat
 	// PARAMS: int
 	// RETURN: string
-	// DESC:   converts bytes into formated string with KB, MB, etc
+	// DESC  : converts bytes into formated string with KB, MB, etc
 	public function adbByteStringFormat($number)
 	{
-		return $this->ByteStringFormat($number);
+		return $this->byteStringFormat($number);
 	}
 
 	// REMARK: below function has moved to "Class.Basic"
@@ -285,10 +272,10 @@ class AdminBackend extends db_io
 	//         path -> if source start is not ROOT path, if empty ROOT is choosen
 	//         cache -> cache path, if not given TMP is used
 	// RETURN: thumbnail name
-	// DESC:   converts picture to a thumbnail with max x and max y size
+	// DESC  : converts picture to a thumbnail with max x and max y size
 	public function adbCreateThumbnail($pic, $size_x, $size_y, $dummy = false, $path = "", $cache = "")
 	{
-		return $this->CreateThumbnail($pic, $size_x, $size_y, $dummy, $path, $cache);
+		return $this->createThumbnail($pic, $size_x, $size_y, $dummy, $path, $cache);
 	}
 
 	// METHOD: adbMsg
@@ -296,7 +283,7 @@ class AdminBackend extends db_io
 	//         msg -> string, can be printf formated
 	//         var array -> optional data for a possible printf formated msg
 	// RETURN: none
-	// DESC:   wrapper function to fill up the mssages array
+	// DESC  : wrapper function to fill up the mssages array
 	public function adbMsg($level, $msg, $vars = array ())
 	{
 		if (!preg_match("/^info|warning|error$/", $level)) {
@@ -329,82 +316,47 @@ class AdminBackend extends db_io
 	//         associate -> NULL for free, LOCK for first insert, group key for reference to first entry
 	//         file      -> string for special file copy actions; mostyle "test#live;..."
 	// RETURN: none
-	// DESC:   writes live queue
+	// DESC  : writes live queue
 	public function adbLiveQueue($queue_key, $type, $target, $data, $key_name, $key_value, $associate = null, $file = null)
 	{
 		$q = "INSERT INTO ".GLOBAL_DB_SCHEMA.".live_queue (";
 		$q .= "queue_key, key_value, key_name, type, target, data, group_key, action, associate, file";
 		$q .= ") VALUES (";
-		$q .= "'".$this->db_escape_string($queue_key)."', '".$this->db_escape_string($key_value)."', ";
-		$q .= "'".$this->db_escape_string($key_name)."', '".$this->db_escape_string($type)."', ";
-		$q .= "'".$this->db_escape_string($target)."', '".$this->db_escape_string($data)."', ";
-		$q .= "'".$this->queue_key."', '".$this->action."', '".$this->db_escape_string($associate)."', ";
-		$q .= "'".$this->db_escape_string($file)."')";
+		$q .= "'".$this->dbEscapeString($queue_key)."', '".$this->dbEscapeString($key_value)."', ";
+		$q .= "'".$this->dbEscapeString($key_name)."', '".$this->dbEscapeString($type)."', ";
+		$q .= "'".$this->dbEscapeString($target)."', '".$this->dbEscapeString($data)."', ";
+		$q .= "'".$this->queue_key."', '".$this->action."', '".$this->dbEscapeString($associate)."', ";
+		$q .= "'".$this->dbEscapeString($file)."')";
 		$this->db_exec($q);
 	}
 
 	// METHOD: adbPrintDateTime
 	// PARAMS: year, month, day, hour, min: the date and time values
-	//         suffix: additional info printed after the date time variable in the drop down, also used for ID in the on change JS call
-	//         minute steps, can be 1 (default), 5, 10, etc, if invalid (outside 1h range, it falls back to 1min)
+	//         suffix: additional info printed after the date time variable in the drop down,
+	//         also used for ID in the on change JS call
+	//         minute steps: can be 1 (default), 5, 10, etc, if invalid (outside 1h range,
+	//         it falls back to 1min)
+	//         name pos back: default false, if set to true, the name will be printend
+	//                        after the drop down and not before the drop down
 	// RETURN: HTML formated strings for drop down lists of date and time
-	// DESC:   print the date/time drop downs, used in any queue/send/insert at date/time place
-	public function adbPrintDateTime($year, $month, $day, $hour, $min, $suffix = '', $min_steps = 1)
+	// DESC  : print the date/time drop downs, used in any queue/send/insert at date/time place
+	// NOTE  : Basic class holds exact the same, except the Year/Month/Day/etc strings
+	//         are translated in this call
+	public function adbPrintDateTime($year, $month, $day, $hour, $min, $suffix = '', $min_steps = 1, $name_pos_back = false)
 	{
-		// if suffix given, add _ before
-		if ($suffix) {
-			$suffix = '_'.$suffix;
+		// get the build layout
+		$html_time = $this->printDateTime($year, $month, $day, $hour, $min, $suffix, $min_steps, $name_pos_back);
+		// translate the strings inside
+		foreach (array('Year ', 'Month ', 'Day ', 'Hour ', 'Minute ') as $_time) {
+			$html_time = str_replace($_time, $this->l->__(str_replace(' ', '', $_time)).' ', $html_time);
 		}
-		if ($min_steps < 1 || $min_steps > 59) {
-			$min_steps = 1;
+		// replace week days in short
+		foreach (array('Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun') as $_date) {
+			$html_time = str_replace('('.$_date.')', '('.$this->l->__($_date).')', $html_time);
 		}
-
-		$on_change_call = 'dt_list(\''.$suffix.'\');';
-
-		// always be 1h ahead (for safety)
-		$timestamp = time() + 3600; // in seconds
-
-		// the max year is this year + 1;
-		$max_year = date("Y", $timestamp) + 1;
-
-		// preset year, month, ...
-		$year = (!$year) ? date("Y", $timestamp) : $year;
-		$month = (!$month) ? date("m", $timestamp) : $month;
-		$day = (!$day) ? date("d", $timestamp) : $day;
-		$hour = (!$hour) ? date("H", $timestamp) : $hour;
-		$min = (!$min) ? date("i", $timestamp) : $min; // add to five min?
-		// max days in selected month
-		$days_in_month = date("t", strtotime($year."-".$month."-".$day." ".$hour.":".$min.":0"));
-
-		// from now to ?
-		$string = $this->l->__('Year').' ';
-		$string .= '<select id="year'.$suffix.'" name="year'.$suffix.'" onChange="'.$on_change_call.'">';
-		for ($i = date("Y"); $i <= $max_year; $i ++) {
-			$string .= '<option value="'.$i.'" '.(($year == $i) ? 'selected' : '').'>'.$i.'</option>';
-		}
-		$string .= '</select> '.$this->l->__('Month').' ';
-		$string .= '<select id="month'.$suffix.'" name="month'.$suffix.'" onChange="'.$on_change_call.'">';
-		for ($i = 1; $i <= 12; $i ++) {
-			$string .= '<option value="'.(($i < 10) ? '0'.$i : $i).'" '.(($month == $i) ? 'selected' : '').'>'.$i.'</option>';
-		}
-		$string .= '</select> '.$this->l->__('Day').' ';
-		$string .= '<select id="day'.$suffix.'" name="day'.$suffix.'" onChange="'.$on_change_call.'">';
-		for ($i = 1; $i <= $days_in_month; $i ++) {
-			// set weekday text based on current month ($month) and year ($year)
-			$string .= '<option value="'.(($i < 10) ? '0'.$i : $i).'" '.(($day == $i) ? 'selected' : '').'>'.$i.' ('.$this->l->__(date('D', mktime(0, 0, 0, $month, $i, $year))).')</option>';
-		}
-		$string .= '</select> '.$this->l->__('Hour').' ';
-		$string .= '<select id="hour'.$suffix.'" name="hour'.$suffix.'" onChange="'.$on_change_call.'">';
-		for ($i = 0; $i <= 23; $i ++) {
-			$string .= '<option value="'.(($i < 10) ? '0'.$i : $i).'" '.(($hour == $i) ? 'selected' : '').'>'.$i.'</option>';
-		}
-		$string .= '</select> '.$this->l->__('Minute').' ';
-		$string .= '<select id="min'.$suffix.'" name="min'.$suffix.'" onChange="'.$on_change_call.'">';
-		for ($i = 0; $i <= 59; $i += $min_steps) {
-			$string .= '<option value="'.(( $i < 10) ? '0'.$i : $i).'" '.(($min == $i) ? 'selected' : '').'>'.$i.'</option>';
-		}
-		$string .= '</select>';
-		// return the datetime select string
-		return $string;
+		// return the datetime select string with strings translated
+		return $html_time;
 	}
 }
+
+# __END__
diff --git a/www/libs/Class.Basic.inc b/www/lib/CoreLibs/Basic.inc
similarity index 73%
rename from www/libs/Class.Basic.inc
rename to www/lib/CoreLibs/Basic.inc
index 1302e150..62480a98 100644
--- a/www/libs/Class.Basic.inc
+++ b/www/lib/CoreLibs/Basic.inc
@@ -1,10 +1,13 @@
-<?
+<?php
 /*********************************************************************
 * AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
 * CREATED: 2003/03/24
-* VERSION: 0.9.0
+* VERSION: 2.0.0
 * RELEASED LICENSE: GNU GPL 3
 * SHORT DESCRIPTION:
+*   2018/3/23, the whole class system is transformed to namespaces
+*   also all internal class calls are converted to camel case
+*
 *   basic class start class for ALL clases, holds basic vars, infos, methods, etc
 *
 * PUBLIC VARIABLES
@@ -33,27 +36,25 @@
 *
 * PUBLIC METHODS
 *	debug -> calls with "level", "string" and flag to turn off (0) the newline at the end
-*	debug_for -> sets debug on/off for a type (error, echo, print) for a certain level
-*	print_error_msg -> prints out the error message, optional parameter is a header prefix
+*	debugFor -> sets debug on/off for a type (error, echo, print) for a certain level
+*	printErrorMsg -> prints out the error message, optional parameter is a header prefix
 *	fdebug -> prints line directly to debug_file.log in tmp
 *
-* 	print_time -> prints time + microtime, optional flag to turn off (0) microtime printout
-*	basic  -> constructor
-*	_basic -> desconstructor
+* 	printTime -> prints time + microtime, optional flag to turn off (0) microtime printout
 *	info -> info about that class
-*	running_time -> prints out the time of start/end (automatically called on created and error printout
+*	runningTime -> prints out the time of start/end (automatically called on created and error printout
 *	checked -> returnes checked or selected for var & array
-*	magic_links -> parses text and makes <a href> out of links
-*	get_page_name -> get the filename of the current page
-*	array_search_recursive -> search for a value/key combination in an array of arrays
-*	ByteStringFormat -> format bytes into KB, MB, GB, ...
-*	TimeStringFormat -> format a timestamp (seconds) into days, months, ... also with ms
-*	StringToTime -> reverste a TimeStringFormat to a timestamp
-*	GenAssocArray -> generactes a new associativ array from an existing array
-*	CheckDate -> checks if a date is valid
-*   CompareDate -> compares two dates. -1 if the first is smaller, 0 if they are equal, 1 if the first is bigger
-*   CompareDateTime -> compares two dates with time. -1 if the first is smaller, 0 if they are equal, 1 if the first is bigger
-*   _crc32b -> behaves like the hash("crc32b") in php < 5.2.8. this function will flip the hash like it was (wrong)
+*	magicLinks -> parses text and makes <a href> out of links
+*	getPageName -> get the filename of the current page
+*	arraySearchRecursive -> search for a value/key combination in an array of arrays
+*	byteStringFormat -> format bytes into KB, MB, GB, ...
+*	timeStringFormat -> format a timestamp (seconds) into days, months, ... also with ms
+*	stringToTime -> reverste a TimeStringFormat to a timestamp
+*	genAssocArray -> generactes a new associativ array from an existing array
+*	checkDate -> checks if a date is valid
+*   compareDate -> compares two dates. -1 if the first is smaller, 0 if they are equal, 1 if the first is bigger
+*   compareDateTime -> compares two dates with time. -1 if the first is smaller, 0 if they are equal, 1 if the first is bigger
+*   __crc32b -> behaves like the hash("crc32b") in php < 5.2.8. this function will flip the hash like it was (wrong)
 *              before if a new php version is found
 *   crypt* -> encrypt and decrypt login string data, used by Login class
 *   setFormToken/validateFormToken -> form protection with token
@@ -92,7 +93,9 @@
 * 2003-03-24: start of stub/basic class
 *********************************************************************/
 
-class basic
+namespace CoreLibs;
+
+class Basic
 {
 	public $class_info; // class info var
 
@@ -126,8 +129,8 @@ class basic
 	public $log_per_page = 0; // set, will split log per called file
 	public $log_per_run = 0; // create a new log file per run (time stamp + unique ID)
 
-	public $starttime; // start time if time debug is used
-	public $endtime; // end time if time debug is used
+	private $starttime; // start time if time debug is used
+	private $endtime; // end time if time debug is used
 
 	public $email_regex; // regex var for email check
 	public $keitai_email_regex; // regex var for email check
@@ -158,9 +161,9 @@ class basic
 	// form token (used for form validation)
 	private $form_token = '';
 
-	// METHOD __construct
-	// PARAMS debug_all (0)/1, echo_all (1)/0, print_all (0)/1
-	// RETURN none
+	// METHOD: __construct
+	// PARAMS: debug_all (0)/1, echo_all (1)/0, print_all (0)/1
+	// RETURN: none
 	// DESC constructor
 	public function __construct($debug_all = 0, $echo_all = 1, $print_all = 0)
 	{
@@ -170,14 +173,14 @@ class basic
 		// internal info var
 		$this->class_info["basic"] = array (
 			"class_name" => "Basic",
-			"class_version" => "0.9.0",
+			"class_version" => "2.0.0",
 			"class_created" => "2003-03-24",
-			"class_author" => 'Clemens "Gullevek" Schwaighofer (.at)'
+			"class_author" => 'Clemens Schwaighofer'
 		);
 
 		// set the page name
-		$this->page_name = $this->get_page_name();
-		$this->host_name = $this->get_host_name();
+		$this->page_name = $this->getPageName();
+		$this->host_name = $this->getHostName();
 
 		// set the paths matching to the valid file types
 		$this->data_path = array (
@@ -341,30 +344,30 @@ class basic
 		$this->cryptInit();
 
 		// start logging running time
-		$this->running_time();
+		$this->runningTime();
 	}
 
-	// METHOD __destruct
-	// PARAMS none
-	// RETURN if debug is on, return error data
-	// DESC   basic deconstructor (should be called from all deconstructors in higher classes)
+	// METHOD: __destruct
+	// PARAMS: none
+	// RETURN: if debug is on, return error data
+	// DESC  : basic deconstructor (should be called from all deconstructors in higher classes)
 	//        writes out $error_msg to global var
 	public function __destruct()
 	{
 		// this has to be changed, not returned here, this is the last class to close
-//			return $this->error_msg;
+		// return $this->error_msg;
 		// close open file handles
-//			$this->fdebug_fp('c');
+		// $this->fdebugFP('c');
 	}
 
 	// *************************************************************
 	// GENERAL METHODS
 	// *************************************************************
 
-	// METHOD db_io_info
-	// PARAMS show, default 1, if set to 0 won't write to error_msg var
-	// RETURN string with info
-	// DESC   default class info (prints out class info)
+	// METHOD: db_io_info
+	// PARAMS: show, default 1, if set to 0 won't write to error_msg var
+	// RETURN: string with info
+	// DESC  : default class info (prints out class info)
 	public function info($class_name = "basic", $stdio = 0)
 	{
 		unset($string);
@@ -383,7 +386,13 @@ class basic
 		return $string;
 	}
 
-	public function running_time($simple = false)
+	// METHOD: runningTime
+	// WAS   : running_time
+	// PARAMS: simple flag true/false, if given print non HTML info
+	// RETURN: string with running time for debugging
+	// DESC  : prints start or end time in text format. On first call sets start time
+	//         on second call it sends the end time and then also prints the running time
+	public function runningTime($simple = false)
 	{
 		list($micro, $timestamp) = explode(" ", microtime());
 		$string = '';
@@ -401,16 +410,26 @@ class basic
 			$running_time = $this->endtime - $this->starttime;
 			$string .= ($simple ? 'Run: ' : "<br><b>Script running time</b>: ").$running_time." s";
 		}
-//			$this->debug('info', $string);
+		// $this->debug('info', $string);
 		return $running_time;
 	}
 
-	// METHOD print_time
-	// PARAMS $set_microtime, 0 shows none, default (-1) shows all, positive number is for rounding
-	// RETURN formated datetime string
-	// DESCRIPTION
-	// wrapper around microtime function to print out y-m-d h:i:s.ms
-	public static function print_time($set_microtime = -1)
+	// METHOD: resetRunningtime
+	// PARAMS: none
+	// RETURN: none
+	// DESC  : resets start & end time for runningTime call
+	public function resetRunningTime()
+	{
+		$this->starttime = '';
+		$this->endtime = '';
+	}
+
+	// METHOD: printTime
+	// WAS   : print_time
+	// PARAMS: $set_microtime, 0 shows none, default (-1) shows all, positive number is for rounding
+	// RETURN: formated datetime string
+	// DESC  : wrapper around microtime function to print out y-m-d h:i:s.ms
+	public static function printTime($set_microtime = -1)
 	{
 		list($microtime, $timestamp) = explode(" ", microtime());
 		$string = date("Y-m-d H:i:s", $timestamp);
@@ -424,49 +443,48 @@ class basic
 	}
 
 
-	// METHOD fdebug
-	// PARAMS $string: data to write to file
+	// METHOD: fdebug
+	// PARAMS: $string: data to write to file
 	//        $enter: default on true, if set to false, no linebreak (\n) will be put at the end
-	// RETURN  none
-	// DESCRIPTION
-	// writes a string to a file immediatly, for fast debug output
+	// RETURN:  none
+	// DESC  : writes a string to a file immediatly, for fast debug output
 	public function fdebug($string, $enter = 1)
 	{
 		if ($this->debug_filename) {
-			$this->fdebug_fp();
+			$this->fdebugFP();
 			if ($enter) {
 				$string .= "\n";
 			}
-			$string = "[".$this->print_time()."] [".$this->get_page_name(2)."] - ".$string;
+			$string = "[".$this->printTime()."] [".$this->getPageName(2)."] - ".$string;
 			fwrite($this->debug_fp, $string);
-			$this->fdebug_fp();
+			$this->fdebugFP();
 		}
 	}
 
-	// METHOD fdebug_fp
-	// PARAMS $flag: default '', 'o' -> open, 'c' -> close
-	// RETURN none
-	// DESCRIPTION
-	// if no debug_fp found, opens a new one; if fp exists close it
-	private function fdebug_fp($flag = '')
+	// METHOD: fdebugFP
+	// WAS   : fdebug_fp
+	// PARAMS: $flag: default '', 'o' -> open, 'c' -> close
+	// RETURN: none
+	// DESC  : if no debug_fp found, opens a new one; if fp exists close it
+	private function fdebugFP($flag = '')
 	{
 		if (!$this->debug_fp || $flag == 'o') {
-			$fn = ROOT.LOG.$this->debug_filename;
+			$fn = BASE.LOG.$this->debug_filename;
 			$this->debug_fp = @fopen($fn, 'a');
 		} elseif ($this->debug_fp || $flag == 'c') {
 			fclose($this->debug_fp);
 		}
 	}
 
-	// METHOD debug_for
-	// PARAMS $type: error, echo, print
-	//        $flag: on/off
-	//        $array of levels to turn on/off debug
-	// RETURN none
-	// DESCRIPTION
-	// passes list of level names, to turn on debug
-	// eg $foo->debug_for('print', 'on', array('LOG', 'DEBUG', 'INFO'));
-	public function debug_for($type, $flag)
+	// METHOD: debugFor
+	// WAS   : debug_for
+	// PARAMS: $type: error, echo, print
+	//         $flag: on/off
+	//         $array of levels to turn on/off debug
+	// RETURN: none
+	// DESC  : passes list of level names, to turn on debug
+	//         eg $foo->debug_for('print', 'on', array('LOG', 'DEBUG', 'INFO'));
+	public function debugFor($type, $flag)
 	{
 		$debug_on = func_get_args();
 		array_shift($debug_on); // kick out type
@@ -482,14 +500,13 @@ class basic
 		}
 	}
 
-	// METHOD debug
-	// PARAMS $level: id for error message, groups messages together
-	//        $string: the actual error message
-	//        $strip: default on false, if set to true, all html tags will be stripped and <br> changed to \n
-	//                this is only used for debug output
-	// RETURN none
-	// DESCRIPTION
-	// write debug data to error_msg array
+	// METHOD: debug
+	// PARAMS: $level: id for error message, groups messages together
+	//         $string: the actual error message
+	//         $strip: default on false, if set to true, all html tags will be stripped and <br> changed to \n
+	//                 this is only used for debug output
+	// RETURN: none
+	// DESC  : write debug data to error_msg array
 	public function debug($level, $string, $strip = false)
 	{
 		if (($this->debug_output[$level] || $this->debug_output_all) && !$this->debug_output_not[$level]) {
@@ -497,7 +514,7 @@ class basic
 				$this->error_msg[$level] = '';
 			}
 			$error_string = '<div>';
-			$error_string .= '[<span style="font-weight: bold; color: #5e8600;">'.$this->print_time().'</span>] ';
+			$error_string .= '[<span style="font-weight: bold; color: #5e8600;">'.$this->printTime().'</span>] ';
 			$error_string .= '[<span style="font-weight: bold; color: #c56c00;">'.$level.'</span>] ';
 			$error_string .= '[<span style="color: #b000ab;">'.$this->host_name.'</span>] ';
 			$error_string .= '[<span style="color: #08b369;">'.$this->page_name.'</span>] ';
@@ -511,10 +528,10 @@ class basic
 				$string = preg_replace("/(<\/?)(\w+)([^>]*>)/", "", $string);
 			}
 			// same string put for print (no html crap inside)
-			$error_string_print = '['.$this->print_time().'] ['.$this->host_name.'] ['.$this->get_page_name(2).'] ['.$this->running_uid.'] {'.get_class($this).'} <'.$level.'> - '.$string;
+			$error_string_print = '['.$this->printTime().'] ['.$this->host_name.'] ['.$this->getPageName(2).'] ['.$this->running_uid.'] {'.get_class($this).'} <'.$level.'> - '.$string;
 			$error_string_print .= "\n";
 			// write to file if set
-			$this->write_error_msg($level, $error_string_print);
+			$this->writeErrorMsg($level, $error_string_print);
 			// write to error level
 			if (($this->echo_output[$level] || $this->echo_output_all) && !$this->echo_output_not[$level]) {
 				$this->error_msg[$level] .= $error_string;
@@ -522,12 +539,13 @@ class basic
 		}
 	}
 
-	// METHOD: get_caller_method
+	// METHOD: getCallerMethod
+	// WAS   : get_caller_method
 	// PARAMS: none (optional later: which level to deb ug)
 	// RETURN: null or the function that called the function where this methid is called
 	// DESC  : if there is a need to find out which parent method called a child method, eg for debugging, this function does this
 	//         call this method in the child method and you get the parent function that called it
-	public function get_caller_method($level = 2)
+	public function getCallerMethod($level = 2)
 	{
 		$traces = debug_backtrace();
 		// extended info (later)
@@ -546,12 +564,13 @@ class basic
 		return null;
 	}
 
-	// METHOD merge_errors
-	// PARAMS error array
-	// RETURN none
-	// DESC   merges the given error array with the one from this class
-	//        only merges visible ones
-	public function merge_errors($error_msg = array ())
+	// METHOD: mergeErrors
+	// WAS   : merge_errors
+	// PARAMS: error array
+	// RETURN: none
+	// DESC  : merges the given error array with the one from this class
+	//         only merges visible ones
+	public function mergeErrors($error_msg = array ())
 	{
 		if (!is_array($error_msg)) {
 			$error_msg = array ();
@@ -561,20 +580,20 @@ class basic
 		}
 	}
 
-	// METHOD print_error_msg
-	// PARAMS $string: prefix string for header
-	// RETURN error msg for all levels
-	// DESCRIPTION
-	// prints out the error string
-	public function print_error_msg($string = '')
+	// METHOD: printErrorMsg
+	// WAS   : print_error_msg
+	// PARAMS: $string: prefix string for header
+	// RETURN: error msg for all levels
+	// DESC  : prints out the error string
+	public function printErrorMsg($string = '')
 	{
 		$string_output = '';
 		if ($this->debug_output_all) {
 			if ($this->error_msg_prefix) {
 				$string = $this->error_msg_prefix;
 			}
-			$script_end = $this->running_time();
-			while (list($level, $temp_debug_output) = each($this->error_msg)) {
+			$script_end = $this->runningTime();
+			foreach ($this->error_msg as $level => $temp_debug_output) {
 				if (($this->debug_output[$level] || $this->debug_output_all) && !$this->debug_output_not[$level]) {
 					if (($this->echo_output[$level] || $this->echo_output_all) && !$this->echo_output_not[$level]) {
 						$string_output .= '<div style="font-size: 12px;">[<span style="font-style: italic; color: #c56c00;">'.$level.'</span>] '.(($string) ? "<b>**** ".$this->htmlent($string)." ****</b>\n" : "").'</div>';
@@ -594,26 +613,26 @@ class basic
 		return $string_output;
 	}
 
-	// METHOD write_error_msg
-	// PARAMS $level: the level to write
-	// RETURN none
-	// DESCRIPTION
-	// writes error msg data to file for current level
-	private function write_error_msg($level, $error_string)
+	// METHOD: writeErrorMsg
+	// WAS   : write_error_msg
+	// PARAMS: $level: the level to write
+	// RETURN: none
+	// DESC  : writes error msg data to file for current level
+	private function writeErrorMsg($level, $error_string)
 	{
 		if (($this->debug_output[$level] || $this->debug_output_all) && !$this->debug_output_not[$level]) {
 			// only write if write is requested
 			if (($this->print_output[$level] || $this->print_output_all) && !$this->print_output_not[$level]) {
 				// replace all html tags
-					// $error_string = preg_replace("/(<\/?)(\w+)([^>]*>)/", "##\\2##", $error_string);
-					// $error_string = preg_replace("/(<\/?)(\w+)([^>]*>)/", "", $error_string);
+				// $error_string = preg_replace("/(<\/?)(\w+)([^>]*>)/", "##\\2##", $error_string);
+				// $error_string = preg_replace("/(<\/?)(\w+)([^>]*>)/", "", $error_string);
 				// replace special line break tag
-					// $error_string = str_replace('<!--#BR#-->', "\n", $error_string);
+				// $error_string = str_replace('<!--#BR#-->', "\n", $error_string);
 
 				// init output variable
 				$output = $error_string; // output formated error string to output file
 				// init base file path
-				$fn = ROOT.LOG.$this->log_print_file.'.'.$this->log_file_name_ext;
+				$fn = BASE.LOG.$this->log_print_file.'.'.$this->log_file_name_ext;
 				// log ID prefix settings, if not valid, replace with empty
 				if (preg_match("/^[A-Za-z0-9]+$/", $this->log_file_id)) {
 					$rpl_string = '_'.$this->log_file_id;
@@ -638,10 +657,10 @@ class basic
 				$rpl_string = !$this->log_per_level ? '' : '_'.$level; // if request to write to one file
 				$fn = str_replace('##LEVEL##', $rpl_string, $fn); // create output filename
 
-				$rpl_string = !$this->log_per_class ? '' : '_'.get_class($this); // set sub class settings
+				$rpl_string = !$this->log_per_class ? '' : '_'.str_replace('\\', '-', get_class($this)); // set sub class settings
 				$fn = str_replace('##CLASS##', $rpl_string, $fn); // create output filename
 
-				$rpl_string = !$this->log_per_page ? '' : '_'.$this->get_page_name(1); // if request to write to one file
+				$rpl_string = !$this->log_per_page ? '' : '_'.$this->getPageName(1); // if request to write to one file
 				$fn = str_replace('##PAGENAME##', $rpl_string, $fn); // create output filename
 
 				// write to file
@@ -661,13 +680,14 @@ class basic
 		}
 	}
 
-	// METHOD reset_error_msg
-	// PARAMS level -> optional level
-	// RETURN none
-	// DESC   unsests the error message array
-	//        can be used if writing is primary to file
-	//        if no level given resets all
-	public function reset_error_msg($level = '')
+	// METHOD: resetErrorMsg
+	// WAS   : reset_error_msg
+	// PARAMS: level -> optional level
+	// RETURN: none
+	// DESC  : unsests the error message array
+	//         can be used if writing is primary to file
+	//         if no level given resets all
+	public function resetErrorMsg($level = '')
 	{
 		if (!$level) {
 			unset($this->error_msg);
@@ -676,14 +696,17 @@ class basic
 		}
 	}
 
-	// METHOD ErrorHandler
-	// PARAMS none
-	// RETURN none
-	// DESC   catch function to handle all errors that are not handled by php itself
-	//        eg all errors that would be surpressed are written to a log file if this function is enabled
-	//        to use it call with set_error_handler(array("baisc", "ErrorHandler"));
-	//        NOTE: this will only catch any additional erros created AFTER the set_error_hanlder was set, so mostly no strict/notices from the classes are visible
-	public static function ErrorHandler($type, $message, $file, $line, $context)
+	// METHOD: errorHandler
+	// WAS   : ErrorHandler
+	// PARAMS: none
+	// RETURN: none
+	// DESC  : catch function to handle all errors that are not handled by php itself
+	//         eg all errors that would be surpressed are written to a log file if this function is enabled
+	//         to use it call with set_error_handler(array("Basic", "ErrorHandler"));
+	// NOTE  : this will only catch any additional erros created AFTER the set_error_handler was set,
+	//         so mostly no strict/notices from the classes are visible
+	//         also, this currently returns true, which will invoke the standard PHP error reporter too
+	public static function errorHandler($type, $message, $file, $line)
 	{
 		// error levels for PHP
 		// values based on 5.3
@@ -706,32 +729,32 @@ class basic
 			30719 => 'E_ALL' // 6143 in 5.2, 2047 in previous versions
 		);
 
-		$fn = ROOT.LOG.'php_errors-'.date('Y-m-d').'.log';
-		$output = '['.basic::print_time().'] {'.basic::get_page_name().'} ['.$file.'] <'.$line.'> ['.$error_level[$type].'|'.$type.']: '.$message."\n";
+		$fn = BASE.LOG.'php_errors-'.date('Y-m-d').'.log';
+		$output = '['.Basic::print_time().'] {'.Basic::get_page_name().'} ['.$file.'] <'.$line.'> ['.$error_level[$type].'|'.$type.']: '.$message."\n";
 		$fp = fopen($fn, 'a');
 		fwrite($fp, $output);
 		fclose($fp);
+		// if set to false the PHP error reporter will be called after this
 		return false;
 	}
 
-	// METHOD print_ar
-	// PARAMS $array
-	// RETURN string html formatted
-	// DESCRIPTION
-	// prints a html formatted (pre) array
-	public static function print_ar($array)
+	// METHOD: printAr
+	// WAS   : print_ar
+	// PARAMS: $array
+	// RETURN: string html formatted
+	// DESC  : prints a html formatted (pre) array
+	public static function printAr($array)
 	{
 		return "<pre>".print_r($array, 1)."</pre>";
 	}
 
-	// METHOD checked
-	// PARAMS haystack (search in), needle (search for), type: 0: returns selected, 1, returns checked
-	//        haystack can be an array or a string
-	// RETURN returns checked or selected, else returns nothing (empty return)
-	// DESCRIPTION
-	// returns 'checked' or 'selected' if okay
-	// $needle is a var, $haystack an array
-	// **** THE RETURN VALUE WILL CHANGE TO A DEFAULT "FALSE" ****
+	// METHOD: checked
+	// PARAMS: haystack (search in), needle (search for), type: 0: returns selected, 1, returns checked
+	//         haystack can be an array or a string
+	// RETURN: returns checked or selected, else returns nothing (empty return)
+	// DESC  : returns 'checked' or 'selected' if okay
+	//         $needle is a var, $haystack an array
+	// **** THE RETURN: VALUE WILL CHANGE TO A DEFAULT "FALSE" ****
 	public static function checked($haystack, $needle, $type = 0)
 	{
 		if (is_array($haystack)) {
@@ -745,14 +768,14 @@ class basic
 		}
 	}
 
-	// METHOD magic_links
-	// PARAMS string: data to transform to a valud HTML url, target: default _blank
-	// RETURN correctly formed html url link
-	// DESCRIPTION
-	// tries to find mailto:user@bubu.at and changes it into -> <a href="mailto:user@bubu.at">E-Mail senden</a>
-	// or tries to take any url (http, ftp, etc) and transform it into a valid URL
-	// the string is in the format: some url|name#css|, same for email
-	public function magic_links($string, $target = "_blank")
+	// METHOD: magicLinks
+	// WAS   : magic_links
+	// PARAMS: string: data to transform to a valud HTML url, target: default _blank
+	// RETURN: correctly formed html url link
+	// DESC  : tries to find mailto:user@bubu.at and changes it into -> <a href="mailto:user@bubu.at">E-Mail senden</a>
+	//         or tries to take any url (http, ftp, etc) and transform it into a valid URL
+	//         the string is in the format: some url|name#css|, same for email
+	public function magicLinks($string, $target = "_blank")
 	{
 		$output = $string;
 		$protList = array("http", "https", "ftp", "news", "nntp");
@@ -784,11 +807,11 @@ class basic
 		// _7: link name/email link name
 		// _9: style sheet class
 		$self = $this;
-//			$this->debug('URL', 'Before: '.$output);
+		// $this->debug('URL', 'Before: '.$output);
 		$output = preg_replace_callback(
 			"/(href=\")?(\>)?\b($protRegex)([\w\.\-?&=+%#~,;\/]+)\b([\.\-?&=+%#~,;\/]*)(\|([^\||^#]+)(#([^\|]+))?\|)?/",
 			function ($matches) use ($self) {
-				return @$self->create_url($matches[1], $matches[2], $matches[3], $matches[4], $matches[5], $matches[7], $matches[9]);
+				return @$self->createUrl($matches[1], $matches[2], $matches[3], $matches[4], $matches[5], $matches[7], $matches[9]);
 			},
 			$output
 		);
@@ -796,15 +819,15 @@ class basic
 		$output = preg_replace_callback(
 			"/(mailto:)?(\>)?\b([\w\.-]+)@([\w\.\-]+)\.([a-zA-Z]{2,4})\b(\|([^\||^#]+)(#([^\|]+))?\|)?/",
 			function ($matches) use ($self) {
-				return @$self->create_email($matches[1], $matches[2], $matches[3], $matches[4], $matches[5], $matches[7], $matches[9]);
+				return @$self->createEmail($matches[1], $matches[2], $matches[3], $matches[4], $matches[5], $matches[7], $matches[9]);
 			},
 			$output
 		);
 
 		$this->debug('URL', 'After: '.$output);
-//			// we have one slashes after the Protocol -> internal link no domain, strip out the proto
-//			$output = preg_replace("/($protRegex)\/(.*)/e", "\\2", $ouput);
-//			$this->debug('URL', "$output");
+		// we have one slashes after the Protocol -> internal link no domain, strip out the proto
+		// $output = preg_replace("/($protRegex)\/(.*)/e", "\\2", $ouput);
+		// $this->debug('URL', "$output");
 
 		// post processing
 		$output = str_replace("{TARGET}", $target, $output);
@@ -815,18 +838,18 @@ class basic
 		return $output;
 	}
 
-	// METHOD create_url [INTERNAL]
-	// PARAMS url link, anchor tag (define both type or url),
-	//        _1, _2, _3 = part of thel URL, if atag is set, _1 is not used
-	//        target: link target, name: name for the url, if not given _2 + _3 is used
-	//        class: style sheet
-	// RETURN correct string for url href process
-	// DESCRIPTION
-	// internal function, called by the magic url create functions.
-	// checks if title $_4 exists, if not, set url as title
-	private function create_url($href, $atag, $_1, $_2, $_3, $name, $class)
+	// METHOD: createUrl [INTERNAL]
+	// WAS   : create_url
+	// PARAMS: url link, anchor tag (define both type or url),
+	//         _1, _2, _3 = part of thel URL, if atag is set, _1 is not used
+	//         target: link target, name: name for the url, if not given _2 + _3 is used
+	//         class: style sheet
+	// RETURN: correct string for url href process
+	// DESC  : internal function, called by the magic url create functions.
+	//         checks if title $_4 exists, if not, set url as title
+	private function createUrl($href, $atag, $_1, $_2, $_3, $name, $class)
 	{
-//			$this->debug('URL', "1: $_1 - 2: $_2 - $_3 - atag: $atag - name: $name - class: $class");
+		// $this->debug('URL', "1: $_1 - 2: $_2 - $_3 - atag: $atag - name: $name - class: $class");
 		// if $_1 ends with //, then we strip $_1 complete & target is also blanked (its an internal link)
 		if (preg_match("/\/\/$/", $_1) && preg_match("/^\//", $_2)) {
 			$_1 = '';
@@ -844,14 +867,14 @@ class basic
 		}
 	}
 
-	// METHOD create_email [INTERNAL]
+	// METHOD: createEmail [INTERNAL]
+	// WAS   : create_email
 	// PARAMS: email address, atag (define type of url)
 	//         _1, _2, _3: parts of the email _1 before @, _2 after @, 3_ tld
 	//         title: name for the link, if not given use email
 	//         class: style sheet
-	// DESCRIPTION
-	// internal function for createing email, returns data to magic_url method
-	private function create_email($mailto, $atag, $_1, $_2, $_3, $title, $class)
+	// DESC  : internal function for createing email, returns data to magic_url method
+	private function createEmail($mailto, $atag, $_1, $_2, $_3, $title, $class)
 	{
 		$email = $_1."@".$_2.".".$_3;
 		if (!$mailto && !$atag) {
@@ -863,12 +886,12 @@ class basic
 		}
 	}
 
-	// METHOD get_host_name
-	// PARAMS none
-	// RETURN host name
-	// DESCRIPTION
-	// get the host name without the port as given by the SELF var
-	public function get_host_name()
+	// METHOD: getHostName
+	// WAS   : get_host_name
+	// PARAMS: none
+	// RETURN: host name
+	// DESC  : get the host name without the port as given by the SELF var
+	public function getHostName()
 	{
 		$port = '';
 		if ($_SERVER['HTTP_HOST'] && preg_match("/:/", $_SERVER['HTTP_HOST'])) {
@@ -882,14 +905,14 @@ class basic
 		return $host_name;
 	}
 
-	// METHOD get_page_name
-	// PARAMS 1: strip page file name extension
-	//        0: keep filename as is
-	//        2: keep filename as is, but add dirname too
-	// RETURN filename
-	// DESCRIPTION
-	// get the page name of the curronte page:
-	public static function get_page_name($strip_ext = 0)
+	// METHOD: getPageName
+	// WAS   : get_page_name
+	// PARAMS: 1: strip page file name extension
+	//         0: keep filename as is
+	//         2: keep filename as is, but add dirname too
+	// RETURN: filename
+	// DESC  : get the page name of the curronte page:
+	public static function getPageName($strip_ext = 0)
 	{
 		// get the file info
 		$page_temp = pathinfo($_SERVER["PHP_SELF"]);
@@ -902,26 +925,26 @@ class basic
 		}
 	}
 
-	// METHOD get_file_name_ending
-	// PARAMS filename
-	// RETURN extension of the file name
-	// DESCRIPTION
-	// quick return the extension of the given file name
-	public static function get_filename_ending($filename)
+	// METHOD: getFilenameEnding
+	// WAS   : get_filename_ending
+	// PARAMS: filename
+	// RETURN: extension of the file name
+	// DESC  : quick return the extension of the given file name
+	public static function getFilenameEnding($filename)
 	{
 		$page_temp = pathinfo($filename);
 		return $page_temp['extension'];
 	}
 
-	// METHOD array_search_recursive
-	// PARAMS needle (search for)
-	//        haystack (search in)
-	//        key_lookin: the key to look out for, default empty
-	// RETURN array with the elements where the needle can be found in the haystack array
-	// DESCRIPTION
-	// searches key = value in an array / array
-	// only returns the first one found
-	public static function array_search_recursive($needle, $haystack, $key_lookin = "")
+	// METHOD: arraySearchRecursive
+	// WAS   : array_search_recursive
+	// PARAMS: needle (search for)
+	//         haystack (search in)
+	//         key_lookin: the key to look out for, default empty
+	// RETURN: array with the elements where the needle can be found in the haystack array
+	// DESC  : searches key = value in an array / array
+	//         only returns the first one found
+	public static function arraySearchRecursive($needle, $haystack, $key_lookin = "")
 	{
 		$path = null;
 		if (!is_array($haystack)) {
@@ -932,15 +955,11 @@ class basic
 		} else {
 			foreach ($haystack as $key => $val) {
 				if (is_scalar($val) && $val === $needle && empty($key_lookin)) {
-//echo "BAR FOUND $needle<Br>";
-					$path[] = $key;
 					break;
 				} elseif (is_scalar($val) && !empty($key_lookin) && $key === $key_lookin && $val == $needle) {
-//echo "FOO FOUND $needle | $key | $val<Br>";
 					$path[] = $key;
 					break;
-				} elseif (is_array($val) && $path = basic::array_search_recursive($needle, $val, $key_lookin)) {
-//echo "BAS FOUND $needle | ".print_r($path)."<Br>";
+				} elseif (is_array($val) && $path = Basic::arraySearchRecursive($needle, $val, $key_lookin)) {
 					array_unshift($path, $key);
 					break;
 				}
@@ -949,15 +968,15 @@ class basic
 		return $path;
 	}
 
-	// METHOD array_search_recursive_all
-	// PARAMS needle (search for)
-	//        haystack (search in)
-	//        key: the key to look for in
-	//        path: recursive call for previous path
-	// RETURN all array elements paths where the element was found
-	// DESCRIPTION
-	// recursive array search function, which returns all found not only the first one
-	public static function array_search_recursive_all($needle, $haystack, $key, $path = null)
+	// METHOD: arraySearchRecursiveAll
+	// WAS   : array_search_recursive_all
+	// PARAMS: needle (search for)
+	//         haystack (search in)
+	//         key: the key to look for in
+	//         path: recursive call for previous path
+	// RETURN: all array elements paths where the element was found
+	// DESC  : recursive array search function, which returns all found not only the first one
+	public static function arraySearchRecursiveAll($needle, $haystack, $key, $path = null)
 	{
 		if (!isset($path['level'])) {
 			$path['level'] = 0;
@@ -985,7 +1004,7 @@ class basic
 				// we will up a level
 				$path['level'] += 1;
 				// call recursive
-				$path = basic::array_search_recursive_all($needle, $_value, $key, $path);
+				$path = Basic::arraySearchRecursiveAll($needle, $_value, $key, $path);
 			}
 		}
 		// cut all that is >= level
@@ -995,12 +1014,12 @@ class basic
 		return $path;
 	}
 
-	// METHOD array_search_simple
-	// PARAMS array (search in), key (key to search in), value (what to find
-	// RETURN true on found, false on not found
-	// DESCRIPTION
-	// array search simple. looks for key, value combination, if found, returns true
-	public static function array_search_simple($array, $key, $value)
+	// METHOD: arraySearchSimple
+	// WAS   : array_search_simple
+	// PARAMS: array (search in), key (key to search in), value (what to find
+	// RETURN: true on found, false on not found
+	// DESC  : array search simple. looks for key, value combination, if found, returns true
+	public static function arraySearchSimple($array, $key, $value)
 	{
 		if (!is_array($array)) {
 			$array = array ();
@@ -1009,7 +1028,7 @@ class basic
 			// if value is an array, we search
 			if (is_array($_value)) {
 				// call recursive, and return result if it is true, else continue
-				if (($result = basic::array_search_simple($_value, $key, $value)) !== false) {
+				if (($result = Basic::arraySearchSimple($_value, $key, $value)) !== false) {
 					return $result;
 				}
 			} elseif ($_key == $key && $_value == $value) {
@@ -1020,12 +1039,61 @@ class basic
 		return false;
 	}
 
-	// METHOD _mb_mime_encode
-	// PARAMS string to encode, encoding to encode in
-	// RETURN encoded string
-	// DESCRIPTION
-	// wrapper function for mb mime convert, for correct conversion with long strings
-	public static function _mb_mime_encode($string, $encoding)
+	// METHOD: inArrayAny
+	// WAS   : in_array_any
+	// PARAMS: needle: array
+	//         haystack: array
+	// RETURN: found elements: array
+	// DESC  : search for the needle array elements in haystack and return the ones found as an array,
+	//         is there nothing found, it returns FALSE (boolean)
+	public static function inArrayAny($needle, $haystack)
+	{
+		if (!is_array($needle)) {
+			return false;
+		}
+		if (!is_array($haystack)) {
+			return false;
+		}
+		$found = array ();
+		foreach ($needle as $element) {
+			if (in_array($element, $haystack)) {
+				$found[] = $element;
+			}
+		}
+		if (count($found) == 0) {
+			return false;
+		} else {
+			return $found;
+		}
+	}
+
+	// METHOD: genAssocArray
+	// WAS   : GenAssocArray
+	// PARAMS: db array, key, value part, flag if set all or only set
+	// RETURN: returns and associative array
+	// DESC  : creates out of a normal db_return array an assoc array
+	public static function genAssocArray($db_array, $key, $value, $set_only = 0)
+	{
+		// do this to only run count once
+		for ($i = 0, $iMax = count($db_array); $i < $iMax; $i ++) {
+			// if no key then we make an order reference
+			if ($key && $value && (($set_only && $db_array[$i][$value]) || (!$set_only))) {
+				$ret_array[$db_array[$i][$key]] = $db_array[$i][$value];
+			} elseif (!$key && $value) {
+				$ret_array[] = $db_array[$i][$value];
+			} elseif ($key && !$value) {
+				$ret_array[$db_array[$i][$key]] = $i;
+			}
+		}
+		return $ret_array;
+	}
+
+	// METHOD: __mbMimeEncode
+	// WAS   : _mb_mime_encode
+	// PARAMS: string to encode, encoding to encode in
+	// RETURN: encoded string
+	// DESC  : wrapper function for mb mime convert, for correct conversion with long strings
+	public static function __mbMimeEncode($string, $encoding)
 	{
 		// set internal encoding, so the mimeheader encode works correctly
 		mb_internal_encoding($encoding);
@@ -1053,11 +1121,12 @@ class basic
 		return $string;
 	}
 
-	// METHOD: ByteStringFormat
+	// METHOD: byteStringFormat
+	// WAS   : ByteStringFormat
 	// PARAMS: int bytes, boolean for space, default is set
 	// RETURN: string
-	// DESC:   converts bytes into formated string with KB, MB, etc
-	public static function ByteStringFormat($number, $space = true)
+	// DESC  : converts bytes into formated string with KB, MB, etc
+	public static function byteStringFormat($number, $space = true)
 	{
 		if (is_numeric($number) && $number > 0) {
 			// labels in order of size
@@ -1068,15 +1137,19 @@ class basic
 		return $number;
 	}
 
-	// METHOD: StringByteFormat
+	// METHOD: stringByteFormat
+	// WAS   : StringByteFormat
 	// PARAMS: string
 	// RETURN: int
-	// DESC:   calculates the bytes based on a string with nnG, nnM, etc
-	public static function StringByteFormat($number)
+	// DESC  : calculates the bytes based on a string with nnG, nnM, etc
+	public static function stringByteFormat($number)
 	{
 		$number = trim($number);
 		$last = strtolower($number[strlen($number) - 1]);
 		switch ($last) {
+			case 't':
+				$number *= 1024;
+				// no break, calc down next level
 			case 'g':
 				$number *= 1024;
 				// no break: if we have giga we do first multiplication before the others
@@ -1089,26 +1162,27 @@ class basic
 		return $number;
 	}
 
-	// METHOD: DateStringFormat
+	// METHOD: dateStringFormat
+	// WAS   : DateStringFormat
 	// PARAMS: unix timestamp, true/false to show microtime
 	// RETURN: string formated date+time in Y-M-D h:m:s
 	// DESC  : a simple wrapper for the date format
-	public static function DateStringFormat($timestamp, $show_micro = true)
+	public static function dateStringFormat($timestamp, $show_micro = true)
 	{
 		list ($timestamp, $ms) = explode('.', round($timestamp, 4));
+		$string = date("Y-m-d H:i:s", $timestamp);
 		if ($show_micro) {
-			$string = date("Y-m-d H:i:s", $timestamp).' '.$ms.'ms';
-		} else {
-			$string = date("Y-m-d H:i:s", $timestamp);
+			$string .= ' '.$ms.'ms';
 		}
 		return $string;
 	}
 
-	// METHOD: TimeStringFormat
+	// METHOD: timeStringFormat
+	// WAS   : TimeStringFormat
 	// PARAMS: seconds
 	// RETURN: formated time string
-	// DESC:   formats a timestamp into time from. not a date
-	public static function TimeStringFormat($timestamp, $show_micro = true)
+	// DESC  : formats a timestamp into time from. not a date
+	public static function timeStringFormat($timestamp, $show_micro = true)
 	{
 		// check if the timestamp has any h/m/s/ms inside, if yes skip
 		if (!preg_match("/(h|m|s|ms)/", $timestamp)) {
@@ -1117,7 +1191,7 @@ class basic
 			$timegroups = array (86400, 3600, 60, 1);
 			$labels = array ('d', 'h', 'm', 's');
 			$time_string = '';
-			for ($i = 0; $i < count($timegroups); $i ++) {
+			for ($i = 0, $iMax = count($timegroups); $i < $iMax; $i ++) {
 				$output = floor($timestamp / $timegroups[$i]);
 				$timestamp = $timestamp % $timegroups[$i];
 				// output has days|hours|min|sec
@@ -1139,12 +1213,13 @@ class basic
 		return $time_string;
 	}
 
-	// METHOD: StringToTime
+	// METHOD: stringToTime
+	// WAS   : StringToTime
 	// PARAMS: TimeStringFormat string
 	// RETURN: timestamp with microseconds
 	// DESC  : does a reverse of the TimeStringFormat and converts the string from
 	//         xd xh xm xs xms to a timestamp.microtime format
-	public static function StringToTime($timestring)
+	public static function stringToTime($timestring)
 	{
 		$timestamp = '';
 		if (preg_match("/(d|h|m|s|ms)/", $timestring)) {
@@ -1165,30 +1240,12 @@ class basic
 		}
 	}
 
-	// METHOD: GenAssocArray
-	// PARAMS: db array, key, value part, flag if set all or only set
-	// RETURN: returns and associative array
-	// DESC:   creates out of a normal db_return array an assoc array
-	public static function GenAssocArray($db_array, $key, $value, $set_only = 0)
-	{
-		for ($i = 0; $i < count($db_array); $i ++) {
-			// if no key then we make an order reference
-			if ($key && $value && (($set_only && $db_array[$i][$value]) || (!$set_only))) {
-				$ret_array[$db_array[$i][$key]] = $db_array[$i][$value];
-			} elseif (!$key && $value) {
-				$ret_array[] = $db_array[$i][$value];
-			} elseif ($key && !$value) {
-				$ret_array[$db_array[$i][$key]] = $i;
-			}
-		}
-		return $ret_array;
-	}
-
-	// METHOD: CheckDate
+	// METHOD: checkDate
+	// WAS   : CheckDate
 	// PARAMS: date (YYYY-MM-DD)
 	// RETURN: true if valid date, false if date not valid
-	// DESC:   splits & checks date, wrap around for check_date function
-	public static function CheckDate($date)
+	// DESC  : splits & checks date, wrap around for check_date function
+	public static function checkDate($date)
 	{
 		list ($year, $month, $day) = preg_split("/[\/-]/", $date);
 		if (!$year || !$month || !$day) {
@@ -1200,11 +1257,12 @@ class basic
 		return true;
 	}
 
-	// METHOD: CheckDateTime
+	// METHOD: checkDateTime
+	// WAS   : CheckDateTime
 	// PARAMS: date (YYYY-MM-DD) + time (HH:MM:SS), SS can be dropped
 	// RETURN: true if valid date, false if date not valid
-	// DESC:   splits & checks date, wrap around for check_date function
-	public static function CheckDateTime($datetime)
+	// DESC  : splits & checks date, wrap around for check_date function
+	public static function checkDateTime($datetime)
 	{
 		list ($year, $month, $day, $hour, $min, $sec) = preg_split("/[\/\- :]/", $datetime);
 		if (!$year || !$month || !$day) {
@@ -1222,11 +1280,12 @@ class basic
 		return true;
 	}
 
-	// METHOD: CompareDate
+	// METHOD: compareDate
+	// WAS   : CompareDate
 	// PARAMS: start_date, end_date (both: YYYY-MM-DD)
 	// RETURN: -1 if the first date is smaller the last, 0 if both are equal, 1 if the end date is bigger than the last
-	// DESC:   splits & checks date, wrap around for check_date function
-	public static function CompareDate($start_date, $end_date)
+	// DESC  : splits & checks date, wrap around for check_date function
+	public static function compareDate($start_date, $end_date)
 	{
 		// pre check for empty or wrong
 		if ($start_date == '--' || $end_date == '--' || !$start_date || !$end_date) {
@@ -1263,11 +1322,12 @@ class basic
 		}
 	}
 
-	// METHOD: CompareDateTime
+	// METHOD: compareDateTime
+	// WAS   : CompareDateTime
 	// PARAMS: start_datetime, end_datetime (both YYYY-MM-DD HH:mm:ss)
 	// RETURN: -1 if the first date is smaller the last, 0 if both are equal, 1 if the end date is bigger than the last
 	// DESC  : compares the two dates + times. if seconds missing in one set, add :00, converts / to -
-	public static function CompareDateTime($start_datetime, $end_datetime)
+	public static function compareDateTime($start_datetime, $end_datetime)
 	{
 		// pre check for empty or wrong
 		if ($start_date == '--' || $end_date == '--' || !$start_date || !$end_date) {
@@ -1286,11 +1346,12 @@ class basic
 		}
 	}
 
-	// METHOD: ArrayToString
+	// METHOD: arrayToString
+	// WAS   : ArrayToString
 	// PARAMS: array, connect char
 	// RETRUN: string
-	// DESC:   wrapper for join, but checks if input is an array and if not returns null
-	public static function ArrayToString($array, $connect_char)
+	// DESC  : wrapper for join, but checks if input is an array and if not returns null
+	public static function arrayToString($array, $connect_char)
 	{
 		if (is_array($array)) {
 			return join($connect_char, $array);
@@ -1299,7 +1360,8 @@ class basic
 		}
 	}
 
-	// METHOD: CreateThumbnail
+	// METHOD: createThumbnail
+	// WAS   : CreateThumbnail
 	// PARAMS: pic -> picture where from we create a thumbnail
 	//         x -> max x size of thumbnail
 	//         y -> max y size of thumbnail
@@ -1308,8 +1370,8 @@ class basic
 	//         cache -> cache path, if not given TMP is used
 	//         clear cache -> if set to true, will create thumb all the tame
 	// RETURN: thumbnail name
-	// DESC:   converts picture to a thumbnail with max x and max y size
-	public static function CreateThumbnail($pic, $size_x, $size_y, $dummy = "", $path = "", $cache_source = "", $clear_cache = false)
+	// DESC  : converts picture to a thumbnail with max x and max y size
+	public static function createThumbnail($pic, $size_x, $size_y, $dummy = "", $path = "", $cache_source = "", $clear_cache = false)
 	{
 		// get image type flags
 		$image_types = array (
@@ -1321,12 +1383,12 @@ class basic
 		if ($cache_source) {
 			$tmp_src = $cache_source;
 		} else {
-			$tmp_src = ROOT.TMP;
+			$tmp_src = BASE.TMP;
 		}
 		// check if pic has a path, and override next sets
 		if (strstr($pic, '/') === false) {
 			if (!$path) {
-				$path = ROOT;
+				$path = BASE;
 			}
 			$filename = $path.MEDIA.PICTURES.$pic;
 		} else {
@@ -1414,21 +1476,13 @@ class basic
 		return $return_data;
 	}
 
-	// *** DEPRICATED CALL ***
-	// should be removed later
-	public function checkConvert($string, $from_encoding, $to_encoding)
-	{
-		$this->debug('DEPRICATED CALL', 'Depricated call for method: checkConvert [NOW: checkConvertEncoding]');
-		return $this->checkConvertEncoding($string, $from_encoding, $to_encoding);
-	}
-
 	// METHOD: checkConvertEncoding
 	// PARAMS: string: string to test
 	//         from_encoding: source encoding of this string
 	//         to_encoding: target encoding of this string
 	// RETURN: false if no problem
 	//         on error, return array with characters that failed in the convert
-	// DESC:   test if a string can be safely convert between encodings. mostly utf8 to shift jis
+	// DESC  : test if a string can be safely convert between encodings. mostly utf8 to shift jis
 	//         the default compare has a possibility of failure, especially with windows
 	//         it is recommended to the following in the script which uses this method:
 	//         mb_substitute_character(0x2234);
@@ -1446,11 +1500,11 @@ class basic
 		// if string does not match anymore we have a convert problem
 		if ($string != $compare) {
 			// go through each character and find the ones that do not match
-			for ($i = 0; $i < mb_strlen($string, $from_encoding); $i ++) {
+			for ($i = 0, $iMax = mb_strlen($string, $from_encoding); $i < $iMax; $i ++) {
 				$char = mb_substr($string, $i, 1, $from_encoding);
 				$r_char = mb_substr($compare, $i, 1, $from_encoding);
 				// the ord 194 is a hack to fix the IE7/IE8 bug with line break and illegal character
-//					$this->debug('CHECK CONVERTT', '['.$this->mbErrorChar.'] O: '.$char.', C: '.$r_char);
+				// $this->debug('CHECK CONVERTT', '['.$this->mbErrorChar.'] O: '.$char.', C: '.$r_char);
 				if ((($char != $r_char && !$this->mbErrorChar) || ($char != $r_char && $r_char == $this->mbErrorChar && $this->mbErrorChar)) && ord($char) != 194) {
 					$this->debug('CHARS', "'".$char."'".' == '.$r_char.' ('.ord($char).')');
 					$failed[] = $char;
@@ -1484,42 +1538,45 @@ class basic
 		return $string;
 	}
 
-	// METHOD: _crc32b
+	// METHOD: __crc32b
+	// WAS   : _crc32b
 	// PARAMS: string
 	// RETURN: old (wrong) crc32b hash
-	// DESC:   checks php version and if >=5.2.7 it will flip the string
-	public function _crc32b($string)
+	// DESC  : checks php version and if >=5.2.7 it will flip the string
+	public function __crc32b($string)
 	{
 		// do normal hash crc32b
 		$string = hash('crc32b', $string);
 		// if bigger than 5.2.7, we need to "unfix" the fix
-		if ($this->checkPHPVersion('5.2.7')) {
+		if (self::checkPHPVersion('5.2.7')) {
 			// flip it back to old (two char groups)
 			$string = preg_replace("/^([a-z0-9]{2})([a-z0-9]{2})([a-z0-9]{2})([a-z0-9]{2})$/", "$4$3$2$1", $string);
 		}
 		return $string;
 	}
 
-	// METHOD: _sha1_short
+	// METHOD: __sha1Short
+	// WAS   : _sha1_short
 	// PARAMS: string, flag to use sha
-	// RETURN: sha1 short (9 chars), but current calls _crc32b
-	// DESC  : replacement for _crc32b call
-	public function _sha1_short($string, $use_sha = false)
+	// RETURN: sha1 short (9 chars), but current calls __crc32b
+	// DESC  : replacement for __crc32b call
+	public function __sha1Short($string, $use_sha = false)
 	{
 		if ($use_sha) {
 			return substr(hash('sha1', $string), 0, 9);
 		} else {
-			return $this->_crc32b($string);
+			return $this->__crc32b($string);
 		}
 	}
 
-	// METHOD: _hash
+	// METHOD: __hash
+	// WAS   : _hash
 	// PARAMS: string, type of hash to use
 	// RETURN: hashed string
-	// DESC  : replacemend for _crc32b call (alternate)
+	// DESC  : replacemend for __crc32b call (alternate)
 	//         defaults to adler 32, fnv132, fnv1a32, joaat
 	//         all that create 8 char long hashes
-	public function _hash($string, $hash_type = 'adler32')
+	public function __hash($string, $hash_type = 'adler32')
 	{
 		if (!in_array($hash_type, array('adler32', 'fnv132', 'fnv1a32', 'joaat'))) {
 			$hash_type = 'adler32';
@@ -1531,6 +1588,7 @@ class basic
 	// PARAMS: $min_version: minimum version. in format x, x.y or x.y.z
 	//         $max_version: default empty, else in same format as min version
 	// RETURN: true if ok, false if not matching version
+	// DESC  : checks if running PHP version matches given PHP version (min or max)
 	public static function checkPHPVersion($min_version, $max_version = '')
 	{
 		// exit with false if the min/max strings are wrong
@@ -1575,7 +1633,7 @@ class basic
 	// METHOD: cryptInit
 	// PARAMS: none
 	// RETURN: none
-	// DESC:   inits crypt settings for the crypt functions
+	// DESC  : inits crypt settings for the crypt functions
 	//         this function NEEDS (!) to be called BEFORE any of the crypt functions is called
 	//         there is no auto init for this at the moment
 	private function cryptInit()
@@ -1586,10 +1644,10 @@ class basic
 		// WARNING: des is very bad, only first 6 chars get used for the password
 		// MD5 is a bit better but is already broken
 		// problem with PHP < 5.3 is that you mostly don't have access to blowfish
-		if (CRYPT_BLOWFISH == 1 || $this->checkPHPVersion('5.3.0')) {
+		if (CRYPT_BLOWFISH == 1 || self::checkPHPVersion('5.3.0')) {
 			// blowfish salt prefix
 			// for < 5.3.7 use the old one for anything newer use the new version
-			if ($this->checkPHPVersion('5.3.7')) {
+			if (self::checkPHPVersion('5.3.7')) {
 				$this->cryptSaltPrefix = '$2y$';
 			} else {
 				$this->cryptSaltPrefix = '$2a$';
@@ -1621,7 +1679,7 @@ class basic
 	// METHOD: cryptSaltString
 	// PARAMS: random string length, default is 22 (for blowfish crypt)
 	// RETURN: random string
-	// DESC:   creates a random string from alphanumeric characters: A-Z a-z 0-9 ./
+	// DESC  : creates a random string from alphanumeric characters: A-Z a-z 0-9 ./
 	private function cryptSaltString($nSize = 22)
 	{
 		// A-Z is 65,90
@@ -1631,7 +1689,7 @@ class basic
 		$min = array (46, 65, 97);
 		$max = array (57, 90, 122);
 		$chars = array ();
-		for ($i = 0; $i < count($min); $i ++) {
+		for ($i = 0, $iMax = count($min); $i < $iMax; $i ++) {
 			for ($j = $min[$i]; $j <= $max[$i]; $j ++) {
 				$chars[] = chr($j);
 			}
@@ -1648,7 +1706,7 @@ class basic
 	// METHOD: cryptString
 	// PARAMS: string to be crypted (one way)
 	// RETURN: encrypted string
-	// DESC:   encrypts the string with blowfish and returns the full string + salt part that needs to be stored somewhere (eg DB)
+	// DESC  : encrypts the string with blowfish and returns the full string + salt part that needs to be stored somewhere (eg DB)
 	public function cryptString($string)
 	{
 		// the crypt prefix is set in the init of the class
@@ -1660,7 +1718,7 @@ class basic
 	// PARAMS: plain string (eg password)
 	//         full crypted string (from cryptString
 	// RETURN: true on matching or false for not matching
-	// DESC:   compares the string with the crypted one, is counter method to cryptString
+	// DESC  : compares the string with the crypted one, is counter method to cryptString
 	public function verifyCryptString($string, $crypt)
 	{
 		// the full crypted string needs to be passed on to the salt, so the init (for blowfish) and salt are passed on
@@ -1676,7 +1734,7 @@ class basic
 	// METHOD: hex2rgb
 	// PARAMS: hexstring, flag to return as string (true/false), string seperator: default: ,
 	// RETURN: array with RGB or a string with the seperator
-	// DESC:   converts a hex RGB color to the int numbers
+	// DESC  : converts a hex RGB color to the int numbers
 	public static function hex2rgb($hexStr, $returnAsString = false, $seperator = ',')
 	{
 		$hexStr = preg_replace("/[^0-9A-Fa-f]/", '', $hexStr); // Gets a proper hex string
@@ -1701,7 +1759,7 @@ class basic
 	// METHOD: rgb2hex
 	// PARAMS: red, green, blue (0-255)
 	// RETURN: string with hex rgb color plus # in front
-	// DESC:   converts the rgb values from int data to the valid rgb html hex string
+	// DESC  : converts the rgb values from int data to the valid rgb html hex string
 	public static function rgb2hex($red, $green, $blue)
 	{
 		$hex_color = '#';
@@ -1860,7 +1918,7 @@ class basic
 	// METHOD: hsl2rgb
 	// PARAMS: hue: 0-360 (degrees)
 	//		   saturation: 0-1
-	//		   luminance: 0-1
+	//         luminance: 0-1
 	// RETURN: array with RGB as full int
 	// DESC  : converts an HSL to RGB
 	public static function hsl2rgb($h, $s, $l)
@@ -1896,7 +1954,7 @@ class basic
 
 	// METHOD: rgb2html
 	// PARAMS: red, green, blue
-	// RETRUN: valid # prefix hex html color string
+	// RETRUN valid # prefix hex html color string
 	// DESC  : converts and int RGB to the HTML color string in hex format
 	public static function rgb2html($red, $green, $blue)
 	{
@@ -1914,36 +1972,10 @@ class basic
 		return '#'.$red.$green.$blue;
 	}
 
-	// METHOD: in_array_any
-	// PARAMS: needle: array
-	//         haystack: array
-	// RETURN: found elements: array
-	// DESC:   search for the needle array elements in haystack and return the ones found as an array, is there nothing found, it returns FALSE (boolean)
-	public static function in_array_any($needle, $haystack)
-	{
-		if (!is_array($needle)) {
-			return false;
-		}
-		if (!is_array($haystack)) {
-			return false;
-		}
-		$found = array ();
-		foreach ($needle as $element) {
-			if (in_array($element, $haystack)) {
-				$found[] = $element;
-			}
-		}
-		if (count($found) == 0) {
-			return false;
-		} else {
-			return $found;
-		}
-	}
-
 	// METHOD: getEmailType
 	// PARAMS: email, short == false
 	// RETURN: string for email type, eg "pc", "docomo", etc
-	// DESC:   guesses the email type (mostly for mobile) from the domain
+	// DESC  : guesses the email type (mostly for mobile) from the domain
 	//         if second is set to true, it will return short naming scheme (only provider)
 	public function getEmailType($email, $short = false)
 	{
@@ -1980,16 +2012,22 @@ class basic
 
 	// METHOD: printDateTime
 	// PARAMS: year, month, day, hour, min: the date and time values
-	//         suffix: additional info printed after the date time variable in the drop down, also used for ID in the on change JS call
+	//         suffix: additional info printed after the date time variable in the drop down,
+	//         also used for ID in the on change JS call
 	//         min_steps: default is 1 (minute), can set to anything, is used as sum up from 0
+	//         name_pos_back: default false, if set to true, the name will be printend
+	//                        after the drop down and not before the drop down
 	// RETURN: HTML formated strings for drop down lists of date and time
-	// DESC:   print the date/time drop downs, used in any queue/send/insert at date/time place
-	public static function printDateTime($year, $month, $day, $hour, $min, $suffix = '', $min_steps = 1)
+	// DESC  : print the date/time drop downs, used in any queue/send/insert at date/time place
+	public static function printDateTime($year, $month, $day, $hour, $min, $suffix = '', $min_steps = 1, $name_pos_back = false)
 	{
 		// if suffix given, add _ before
 		if ($suffix) {
 			$suffix = '_'.$suffix;
 		}
+		if ($min_steps < 1 || $min_steps > 59) {
+			$min_steps = 1;
+		}
 
 		$on_change_call = 'dt_list(\''.$suffix.'\');';
 
@@ -2009,33 +2047,62 @@ class basic
 		$days_in_month = date("t", strtotime($year."-".$month."-".$day." ".$hour.":".$min.":0"));
 
 		// from now to ?
-		$string = 'Year ';
+		if ($name_pos_back === false) {
+			$string = 'Year ';
+		}
 		$string .= '<select id="year'.$suffix.'" name="year'.$suffix.'" onChange="'.$on_change_call.'">';
 		for ($i = date("Y"); $i <= $max_year; $i ++) {
 			$string .= '<option value="'.$i.'" '.(($year == $i) ? 'selected' : '').'>'.$i.'</option>';
 		}
-		$string .= '</select> Month ';
+		$string .= '</select> ';
+		if ($name_pos_back === true) {
+			$string .= 'Year ';
+		}
+		if ($name_pos_back === false) {
+			$string .= 'Month ';
+		}
 		$string .= '<select id="month'.$suffix.'" name="month'.$suffix.'" onChange="'.$on_change_call.'">';
 		for ($i = 1; $i <= 12; $i ++) {
 			$string .= '<option value="'.(($i < 10) ? '0'.$i : $i).'" '.(($month == $i) ? 'selected' : '').'>'.$i.'</option>';
 		}
-		$string .= '</select> Day ';
+		$string .= '</select> ';
+		if ($name_pos_back === true) {
+			$string .= 'Month ';
+		}
+		if ($name_pos_back === false) {
+			$string .= 'Day ';
+		}
 		$string .= '<select id="day'.$suffix.'" name="day'.$suffix.'" onChange="'.$on_change_call.'">';
 		for ($i = 1; $i <= $days_in_month; $i ++) {
 			// set weekday text based on current month ($month) and year ($year)
 			$string .= '<option value="'.(($i < 10) ? '0'.$i : $i).'" '.(($day == $i) ? 'selected' : '').'>'.$i.' ('.date('D', mktime(0, 0, 0, $month, $i, $year)).')</option>';
 		}
-		$string .= '</select> Hour ';
+		$string .= '</select> ';
+		if ($name_pos_back === true) {
+			$string .= 'Day ';
+		}
+		if ($name_pos_back === false) {
+			$string .= 'Hour ';
+		}
 		$string .= '<select id="hour'.$suffix.'" name="hour'.$suffix.'" onChange="'.$on_change_call.'">';
 		for ($i = 0; $i <= 23; $i += $min_steps) {
 			$string .= '<option value="'.(($i < 10) ? '0'.$i : $i).'" '.(($hour == $i) ? 'selected' : '').'>'.$i.'</option>';
 		}
-		$string .= '</select> Minute ';
+		$string .= '</select> ';
+		if ($name_pos_back === true) {
+			$string .= 'Hour ';
+		}
+		if ($name_pos_back === false) {
+			$string .= 'Minute ';
+		}
 		$string .= '<select id="min'.$suffix.'" name="min'.$suffix.'" onChange="'.$on_change_call.'">';
 		for ($i = 0; $i <= 59; $i ++) {
 			$string .= '<option value="'.(( $i < 10) ? '0'.$i : $i).'" '.(($min == $i) ? 'selected' : '').'>'.$i.'</option>';
 		}
 		$string .= '</select>';
+		if ($name_pos_back === true) {
+			$string .= ' Minute ';
+		}
 		// return the datetime select string
 		return $string;
 	}
@@ -2069,4 +2136,166 @@ class basic
 	{
 		return $_SESSION[$name] === $token;
 	}
+
+	// *************************************************************
+	// *** DEPRICATED CALL ***
+	// *************************************************************
+	// should be removed later
+	public function checkConvert($string, $from_encoding, $to_encoding)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->checkConvertEncoding($string, $from_encoding, $to_encoding);
+	}
+
+	// *************************************************************
+	// *** COMPATIBILITY METHODS ***
+	// those methods are deprecated function call names
+	// they exist for backwards compatibility only
+	// *************************************************************
+
+	public function running_time($simple = false)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->runningTime($simple);
+	}
+
+	public static function print_time($set_microtime = -1)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return Basic::printTime($set_microtime);
+	}
+
+	private function fdebug_fp($flag = '')
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->fdebugFP($flag);
+	}
+
+	public function debug_for($type, $flag)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->debugFor($type, $flag);
+	}
+
+	public function get_caller_method($level = 2)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->getCallerMethod($level);
+	}
+
+	public function merge_errors($error_msg = array ())
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->mergeErrors($error_msg);
+	}
+
+	public function print_error_msg($string = '')
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->printErrorMsg($string);
+	}
+
+	private function write_error_msg($level, $error_string)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->writeErrorMsg($level, $error_string);
+	}
+
+	public function reset_error_msg($level = '')
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->resetErrorMsg($level);
+	}
+
+	public static function print_ar($array)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return Basic::printAr($array);
+	}
+
+	public function magic_links($string, $target = "_blank")
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->magicLinks($string, $target);
+	}
+
+	private function create_url($href, $atag, $_1, $_2, $_3, $name, $class)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->createUrl($href, $atag, $_1, $_2, $_3, $name, $class);
+	}
+
+	private function create_email($mailto, $atag, $_1, $_2, $_3, $title, $class)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->createEmail($mailto, $atag, $_1, $_2, $_3, $title, $class);
+	}
+
+	public function get_host_name()
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->getHostName();
+	}
+
+	public static function get_page_name($strip_ext = 0)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return Basic::getPageName($strip_ext);
+	}
+
+	public static function get_filename_ending($filename)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return Basic::getFilenameEnding($filename);
+	}
+
+	public static function array_search_recursive($needle, $haystack, $key_lookin = "")
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return Basic::arraySearchRecursive($needle, $haystack, $key_lookin);
+	}
+
+	public static function array_search_recursive_all($needle, $haystack, $key, $path = null)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return Basic::arraySearchRecursiveAll($needle, $haystack, $key, $path);
+	}
+
+	public static function array_search_simple($array, $key, $value)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return Basic::arraySearchSimple($array, $key, $value);
+	}
+
+	public static function _mb_mime_encode($string, $encoding)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return Basic::__mbMimeEncode($string, $encoding);
+	}
+
+	public function _crc32b($string)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->__crc32b($string);
+	}
+
+	public function _sha1_short($string, $use_sha = false)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->__sha1Short($string, $use_sha);
+	}
+
+	public function _hash($string, $hash_type = 'adler32')
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->__hash($string, $hash_type);
+	}
+
+	public static function in_array_any($needle, $haystack)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return Basic::inArrayAny($needle, $haystack);
+	}
 }
+
+# __END__
diff --git a/www/libs/Class.DB.Array.IO.inc b/www/lib/CoreLibs/DB/Extended/ArrayIO.inc
similarity index 70%
rename from www/libs/Class.DB.Array.IO.inc
rename to www/lib/CoreLibs/DB/Extended/ArrayIO.inc
index 70a9fcbe..3839d983 100644
--- a/www/libs/Class.DB.Array.IO.inc
+++ b/www/lib/CoreLibs/DB/Extended/ArrayIO.inc
@@ -1,10 +1,10 @@
-<?
+<?php
 /*********************************************************************
 * AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
 * CREATED: 2002/12/17
-* VERSION: 0.4.0
+* VERSION: 1.0.0
 * RELEASED LICENSE: GNU GPL 3
-* SHORT DESCRIPTION:
+* SHORT DESC  :RIPTION:
 *   DB Array IO Class:
 *   writes, reads or deletes a complete array (one data set) in/out a
 *   table from the connected DB.
@@ -14,9 +14,9 @@
 *
 *   PRIVATE VARIABLES
 *
-*   PUBLIC METHODS
+*   PUBLIC METHOD:S
 *
-*   PRIVATE METHODS
+*   PRIVATE METHOD:S
 *
 * HISTORY:
 * 2005/07/07 (cs) updated array class for postgres: set 0 & NULL if int field given, insert uses () values () syntax
@@ -36,11 +36,10 @@
 // as it actually has nothing to do with this one here ? (or at least
 // put into separete function in this class)
 
-// try to include file from LIBS path, or from normal path
-_spl_autoload('Class.DB.IO.inc');
+namespace CoreLibs\DB\Extended;
 
 // subclass for one array handling
-class db_array_io extends db_io
+class ArrayIO extends \CoreLibs\DB\IO
 {
 	// main calss variables
 	public $table_array; // the array from the table to work on
@@ -48,14 +47,14 @@ class db_array_io extends db_io
 	public $pk_name; // the primary key from this table
 	public $pk_id; // the PK id
 
-	// METHOD db_array_io
-	// PARAMS db_config -> db_io class init vars
-	//        table_array -> the array from the table
-	//        table_name -> name of the table (for the array)
-	//        db_debug -> turn on db_io debug output (DB_DEBUG as global var does the same)
-	// RETURN none
-	// DESC   constructor for the array io class, set the
-	//        primary key name automatically (from array)
+	// METHOD: db_array_io
+	// PARAMS: db_config -> db_io class init vars
+	//         table_array -> the array from the table
+	//         table_name -> name of the table (for the array)
+	//         db_debug -> turn on db_io debug output (DB_DEBUG as global var does the same)
+	// RETURN: none
+	// DESC  : constructor for the array io class, set the
+	//         primary key name automatically (from array)
 	public function __construct($db_config, $table_array, $table_name, $debug = 0, $db_debug = 0, $echo = 1, $print = 0)
 	{
 		// instance db_io class
@@ -69,7 +68,7 @@ class db_array_io extends db_io
 
 		// set primary key for given table_array
 		if ($this->table_array) {
-			while (list($key, $value) = each($table_array)) {
+			foreach ($table_array as $key => $value) {
 				if ($value["pk"]) {
 					$this->pk_name = $key;
 				}
@@ -78,9 +77,9 @@ class db_array_io extends db_io
 		// internal
 		$this->class_info["db_array_io"] = array(
 			"class_name" => "DB Array IO",
-			"class_version" => "0.4.0",
+			"class_version" => "1.0.0",
 			"class_created" => "2002/12/17",
-			"class_author" => "cs/gullevek/at"
+			"class_author" => "Clemens Schwaighofer"
 		);
 	}
 
@@ -90,14 +89,15 @@ class db_array_io extends db_io
 		parent::__destruct();
 	}
 
-	// METHOD convert_data
-	// PARAMS string -> the string that should be changed
-	// RETURN string -> the altered string
-	// DESC   changes all previously alterd HTML code into visible one,
-	//        works for <b>,<i>, and <a> (thought <a> can be / or should
-	//        be handled with the magic links functions
-	//        used with the read function
-	public function convert_data($text)
+	// METHOD: convertData
+	// WAS   : convert_data
+	// PARAMS: string -> the string that should be changed
+	// RETURN: string -> the altered string
+	// DESC  : changes all previously alterd HTML code into visible one,
+	//         works for <b>,<i>, and <a> (thought <a> can be / or should
+	//         be handled with the magic links functions
+	//         used with the read function
+	public function convertData($text)
 	{
 		$text = str_replace('&lt;b&gt;', '<b>', $text);
 		$text = str_replace('&lt;/b&gt;', '</b>', $text);
@@ -110,11 +110,12 @@ class db_array_io extends db_io
 		return $text;
 	}
 
-	// METHOD convert_entities
-	// PARAMS string -> string to be changed
-	// RETURN string -> altered string
-	// DESC   changeds all HTML entities into non HTML ones
-	public function convert_entities($text)
+	// METHOD: convertEntities
+	// WAS   : convert_entities
+	// PARAMS: string -> string to be changed
+	// RETURN: string -> altered string
+	// DESC  : changeds all HTML entities into non HTML ones
+	public function convertEntities($text)
 	{
 		$text = str_replace('&lt;', '<', $text);
 		$text = str_replace('&gt;', '>', $text);
@@ -124,14 +125,15 @@ class db_array_io extends db_io
 		return $text;
 	}
 
-	// METHOD db_dump_array
-	// PARAMS none
-	// RETURN returns the current array
-	// DESC   dumps the current data
-	public function db_dump_array($write = 0)
+	// METHOD: dbDumpArray
+	// WAS   : db_dump_array
+	// PARAMS: none
+	// RETURN: returns the current array
+	// DESC  : dumps the current data
+	public function dbDumpArray($write = 0)
 	{
 		reset($this->table_array);
-		while (list($column, $data_array) = each($this->table_array)) {
+		foreach ($this->table_array as $column => $data_array) {
 			$string .= "<b>".$column."</b> -> ".$data_array["value"]."<br>";
 		}
 		// add output to internal error_msg
@@ -141,24 +143,12 @@ class db_array_io extends db_io
 		return $string;
 	}
 
-	// METHOD _db_error
-	// PARAMS none
-	// RETURN none
-	// DESC   writes errors to internal error string
-/*     function _db_error()
-	{
-		// if error occured
-		if ($this->error_id)
-		{
-			$this->error_msg['db'] .= "<b>-DB_ARRAY-error-></b> ".$this->error_id.": ".$this->error_string[$this->error_id]." <br>";
-		}
-	} */
-
-	// METHOD db_check_pk_set
-	// PARAMS none
-	// RETURN none
-	// DESC   checks if pk is set and if not, set from pk_id and if this also not set return 0
-	public function db_check_pk_set()
+	// METHOD: dbCheckPkSet
+	// WAS   : db_check_pk_set
+	// PARAMS: none
+	// RETURN: none
+	// DESC  : checks if pk is set and if not, set from pk_id and if this also not set return 0
+	public function dbCheckPkSet()
 	{
 		// if pk_id is set, overrule ...
 		if ($this->pk_id) {
@@ -168,21 +158,22 @@ class db_array_io extends db_io
 		if (!$this->table_array[$this->pk_name]["value"]) {
 			// if no PK found, error ...
 			$this->error_id = 21;
-			$this->_db_error();
+			$this->__dbError();
 			return 0;
 		} else {
 			return 1;
 		}
 	}
 
-	// METHOD db_reset_array
-	// PARAMS reset_pk -> if set reset the pk too
-	// RETURN none
-	// DESC   resets the whole array
-	public function db_reset_array($reset_pk = 0)
+	// METHOD: dbResetArray
+	// WAS   : db_reset_array
+	// PARAMS: reset_pk -> if set reset the pk too
+	// RETURN: none
+	// DESC  : resets the whole array
+	public function dbResetArray($reset_pk = 0)
 	{
 		reset($this->table_array);
-		while (list($column, $data_array) = each($this->table_array)) {
+		foreach ($this->table_array as $column => $data_array) {
 			if (!$this->table_array[$column]["pk"]) {
 				unset($this->table_array[$column]["value"]);
 			} elseif ($reset_pk) {
@@ -191,16 +182,17 @@ class db_array_io extends db_io
 		}
 	}
 
-	// METHOD db_delete
-	// PARAMS optional the table_array, if not given uses class var
-	// RETURN 1 for successfull delete or 0 for error
-	// DESC   deletes one dataset
-	public function db_delete($table_array = 0)
+	// METHOD: dbDelete
+	// WAS   : db_delete
+	// PARAMS: optional the table_array, if not given uses class var
+	// RETURN: 1 for successfull delete or 0 for error
+	// DESC  : deletes one dataset
+	public function dbDelete($table_array = 0)
 	{
 		if (is_array($table_array)) {
 			$this->table_array = $table_array;
 		}
-		if (!$this->db_check_pk_set()) {
+		if (!$this->dbCheckPkSet()) {
 			return $this->table_array;
 		}
 		// delete query
@@ -208,8 +200,8 @@ class db_array_io extends db_io
 		$q .= $this->pk_name." = ".$this->table_array[$this->pk_name]["value"]." ";
 		// delete files and build FK query
 		reset($this->table_array);
-		while (list($column, $data_array) = each($this->table_array)) {
-			// suchen nach bildern und löschen ...
+		foreach ($this->table_array as $column => $data_array) {
+			// suchen nach bildern und lschen ...
 			if ($this->table_array[$column]["file"] && file_exists($this->table_array[$column]["url"].$this->table_array[$column]["value"])) {
 				if (file_exists($this->table_array[$column]["path"].$this->table_array[$column]["value"])) {
 					unlink($this->table_array[$column]["path"].$this->table_array[$column]["value"]);
@@ -227,7 +219,7 @@ class db_array_io extends db_io
 				}
 				$q_where .= $column." = ".$this->table_array[$column]["value"];
 			}
-			// allgemeines zurücksetzen des arrays
+			// allgemeines zurcksetzen des arrays
 			unset($this->table_array[$column]["value"]);
 		}
 
@@ -237,29 +229,30 @@ class db_array_io extends db_io
 		}
 		// if 0, error
 		unset($this->pk_id);
-		if (!$this->db_exec($q)) {
+		if (!$this->dbExec($q)) {
 			$this->error_id=22;
-			$this->_db_error();
+			$this->__dbError();
 		}
 		return $this->table_array;
 	}
 
-	// METHOD db_read
-	// PARAMS edit -> if 1 data will not be altered for output, optional the table_array, if not given uses class var
-	// RETURN true or false for reading
-	// DESC   reads one row into the array
-	public function db_read($edit = 0, $table_array = 0)
+	// METHOD: dbRead
+	// WAS   : db_read
+	// PARAMS: edit -> if 1 data will not be altered for output, optional the table_array, if not given uses class var
+	// RETURN: true or false for reading
+	// DESC  : reads one row into the array
+	public function dbRead($edit = 0, $table_array = 0)
 	{
 		// if array give, overrules internal array
 		if (is_array($table_array)) {
 			$this->table_array = $table_array;
 		}
-		if (!$this->db_check_pk_set()) {
+		if (!$this->dbCheckPkSet()) {
 			return $this->table_array;
 		}
 		reset($this->table_array);
 		// create select part & addition FK part
-		while (list($column, $data_array)=each($this->table_array)) {
+		foreach ($this->table_array as $column => $data_array) {
 			if ($q_select) {
 				$q_select .= ", ";
 			}
@@ -283,12 +276,12 @@ class db_array_io extends db_io
 		}
 
 		// if query was executed okay, else set error
-		if ($this->db_exec($q)) {
-			if ($res = $this->db_fetch_array()) {
+		if ($this->dbExec($q)) {
+			if ($res = $this->dbFetchArray()) {
 				reset($this->table_array);
-				while (list($column, $data_array) = each($this->table_array)) {
-					// wenn "edit" dann gib daten wie in DB zurück, ansonten aufbereiten für ausgabe
-					// ?? sollte das nicht draußen ??? man weis ja net was da drin steht --> is noch zu überlegen
+				foreach ($this->table_array as $column => $data_array) {
+					// wenn "edit" dann gib daten wie in DB zurck, ansonten aufbereiten fr ausgabe
+					// ?? sollte das nicht drauen ??? man weis ja net was da drin steht --> is noch zu berlegen
 					// echo "EDIT: $edit | Spalte: $column | type: ".$this->table_array[$column]["type"]." | Res: ".$res[$column]."<br>";
 					if ($edit) {
 						$this->table_array[$column]["value"] = $res[$column];
@@ -297,25 +290,26 @@ class db_array_io extends db_io
 							$this->table_array[$column]["HIDDEN_value"] = $res[$column];
 						}
 					} else {
-						$this->table_array[$column]["value"] = $this->convert_data(nl2br($res[$column]));
+						$this->table_array[$column]["value"] = $this->convertData(nl2br($res[$column]));
 						// had to put out the htmlentities from the line above as it breaks japanese characters
 					}
 				}
 			}
-			// possible db_fetch_array errors ...
+			// possible dbFetchArray errors ...
 			$this->pk_id = $this->table_array[$this->pk_name]["value"];
 		} else {
 			$this->error_id = 22;
-			$this->_db_error();
+			$this->__dbError();
 		}
 		return $this->table_array;
 	}
 
-	// METHOD db_write
-	// PARAMS addslashes -> if 1 will make an addslashes for each array field, optional the table_array, if not given uses class var
-	// RETURN true or false on write
-	// DESC   writes on set into DB or updates one set (if PK exists)
-	public function db_write($addslashes = 0, $table_array = 0)
+	// METHOD: dbWrite
+	// WAS   : db_write
+	// PARAMS: addslashes -> if 1 will make an addslashes for each array field, optional the table_array, if not given uses class var
+	// RETURN: true or false on write
+	// DESC  : writes on set into DB or updates one set (if PK exists)
+	public function dbWrite($addslashes = 0, $table_array = 0)
 	{
 		if (is_array($table_array)) {
 			$this->table_array = $table_array;
@@ -332,8 +326,7 @@ class db_array_io extends db_io
 		}
 
 		reset($this->table_array);
-		while (list($column, $data_array) = each($this->table_array)) {
-
+		foreach ($this->table_array as $column => $data_array) {
 /********************************* START FILE *************************************/
 			// file upload
 			if ($this->table_array[$column]["file"]) {
@@ -427,9 +420,9 @@ class db_array_io extends db_io
 					$q_data .= "'";
 					// if add slashes do convert & add slashes else write AS is
 					if ($addslashes) {
-						$q_data .= $this->db_escape_string($this->convert_entities($this->table_array[$column]["value"]));
+						$q_data .= $this->dbEscapeString($this->convertEntities($this->table_array[$column]["value"]));
 					} else {
-						$q_data .= $this->db_escape_string($this->table_array[$column]["value"]);
+						$q_data .= $this->dbEscapeString($this->table_array[$column]["value"]);
 					}
 					$q_data .= "'";
 				}
@@ -440,7 +433,7 @@ class db_array_io extends db_io
 		// get it at the end, cause now we can be more sure of no double IDs, etc
 		reset($this->table_array);
 		// create select part & addition FK part
-		while (list($column, $data_array) = each($this->table_array)) {
+		foreach ($this->table_array as $column => $data_array) {
 			// check FK ...
 			if ($this->table_array[$column]["fk"] && $this->table_array[$column]["value"]) {
 				if ($q_where) {
@@ -454,7 +447,7 @@ class db_array_io extends db_io
 		if (!$this->table_array[$this->pk_name]["value"]) {
 			// max id, falls INSERT
 			$q = "SELECT MAX(".$this->pk_name.") + 1 AS pk_id FROM ".$this->table_name;
-			$res = $this->db_return_row($q);
+			$res = $this->dbReturnRow($q);
 			if (!$res["pk_id"]) {
 				$res["pk_id"] = 1;
 			}
@@ -482,9 +475,9 @@ class db_array_io extends db_io
 			// $this->pk_id = $this->table_array[$this->pk_name]["value"];
 		}
 		// return success or not
-		if (!$this->db_exec($q)) {
+		if (!$this->dbExec($q)) {
 			$this->error_id = 22;
-			$this->_db_error();
+			$this->__dbError();
 		}
 		// set primary key
 		if ($insert) {
@@ -494,4 +487,60 @@ class db_array_io extends db_io
 		// return the table if needed
 		return $this->table_array;
 	}
+
+	// *************************************************************
+	// COMPATIBILITY METHODS
+	// those methods are deprecated function call names
+	// they exist for backwards compatibility only
+	// *************************************************************
+
+	public function convert_data($text)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->convertData($text);
+	}
+
+	public function convert_entities($text)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->convertEntities($text);
+	}
+
+	public function db_dump_array($write = 0)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbDumpArray($write);
+	}
+
+	public function db_check_pk_set()
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbCheckPkSet();
+	}
+
+	public function db_reset_array($reset_pk = 0)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbResetArray($reset_pk);
+	}
+
+	public function db_delete($table_array = 0)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbDelete($table_array);
+	}
+
+	public function db_read($edit = 0, $table_array = 0)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbRead($edit, $table_array);
+	}
+
+	public function db_write($addslashes = 0, $table_array = 0)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbWrite($addslashes, $table_array);
+	}
 } // end of class
+
+# __END__
diff --git a/www/libs/Class.DB.IO.inc b/www/lib/CoreLibs/DB/IO.inc
similarity index 62%
rename from www/libs/Class.DB.IO.inc
rename to www/lib/CoreLibs/DB/IO.inc
index 66bb73b5..0faf340b 100644
--- a/www/libs/Class.DB.IO.inc
+++ b/www/lib/CoreLibs/DB/IO.inc
@@ -1,10 +1,13 @@
-<?
+<?php
 /********************************************************************
 * AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
 * CREATED: 2000/11/23
-* VERSION: 4.1.0
+* VERSION: 5.0.0
 * RELEASED LICENSE: GNU GPL 3
 * SHORT DESCRIPTON:
+*   2018/3/23, the whole class system is transformed to namespaces
+*   also all internal class calls are converted to camel case
+*
 *   2013/10/10, prepare/excute were added, including auto RETURNING primary key if
 *   possible for any INSERT query in exec or prepare/execute, better debugging and
 *   data dumping. Proper string escape wrapper, special db exec writer for complex
@@ -238,10 +241,9 @@
 *   23.11.2000: erster Test
 *********************************************************************/
 
-// try to include file from LIBS path, or from normal path
-_spl_autoload('Class.Basic.inc');
+namespace CoreLibs\DB;
 
-class db_io extends basic
+class IO extends \CoreLibs\Basic
 {
 	// recommend to set private/protected and only allow setting via method
 	// can bet set from outside
@@ -306,15 +308,19 @@ class db_io extends basic
 	{
 		// start basic class
 		parent::__construct($debug, $echo, $print);
+		// dummy init array for db config if not array
+		if (!is_array($db_config)) {
+			$db_config = array ();
+		}
 		// sets the names (for connect/reconnect)
-		$this->db_name = $db_config['db_name'];
-		$this->db_user = $db_config['db_user'];
-		$this->db_pwd = $db_config['db_pass'];
-		$this->db_host = $db_config['db_host'];
+		$this->db_name = $db_config['db_name'] ?? '';
+		$this->db_user = $db_config['db_user'] ?? '';
+		$this->db_pwd = $db_config['db_pass'] ?? '';
+		$this->db_host = $db_config['db_host'] ?? '';
 		$this->db_port = array_key_exists('db_port', $db_config) ? $db_config['db_port'] : '5432';
 		$this->db_schema = array_key_exists('db_schema', $db_config) ? $db_config['db_schema'] : ''; // do not set to 'public' if not set, because the default is already public
 		$this->db_encoding = array_key_exists('db_encoding', $db_config) ? $db_config['db_encoding'] : '';
-		$this->db_type = 'db_'.$db_config['db_type'];
+		$this->db_type = $db_config['db_type'] ?? '';
 		$this->db_ssl = array_key_exists('db_ssl', $db_config) ? $db_config['db_ssl'] : 'allow';
 
 		// set the target encoding to the DEFAULT_ENCODING if it is one of them: EUC, Shift_JIS, UTF-8
@@ -324,13 +330,14 @@ class db_io extends basic
 		$this->MAX_QUERY_CALL = 20;
 
 		// error & debug stuff, error & warning ids are the same, its just in which var they get written
+		$this->error_string['10'] = 'Could not load DB interface functions';
 		$this->error_string['11'] = 'No Querystring given';
 		$this->error_string['12'] = 'No Cursor given, no correct query perhaps?';
 		$this->error_string['13'] = 'Query could not be executed without errors';
 		$this->error_string['14'] = 'Can\'t connect to DB server';
 		$this->error_string['15'] = 'Can\'t select DB';
 		$this->error_string['16'] = 'No DB Handler found / connect or reconnect failed';
-		$this->error_string['17'] = 'All db_return* methods work only with SELECT statements, please use db_exec for everything else';
+		$this->error_string['17'] = 'All dbReturn* methods work only with SELECT statements, please use dbExec for everything else';
 		$this->error_string['18'] = 'Query not found in cache. Nothing has been reset';
 		$this->error_string['19'] = 'Wrong PK name given or no PK name given at all, can\'t get Insert ID';
 		$this->error_string['20'] = 'Found given Prepare Statement Name in array, Query not prepared, will use existing one';
@@ -354,23 +361,36 @@ class db_io extends basic
 			$this->db_debug = $GLOBALS['DB_DEBUG'];
 		}
 
-		// includes sub class for db type
-		_spl_autoload($this->db_type.'.inc');
-		$this->db_functions = new $this->db_type();
+		// based on $this->db_type
+		// here we need to load the db pgsql include one
+		// How can we do this dynamic? eg for non PgSQL
+		// OTOH this whole class is so PgSQL specific
+		// that non PgSQL doesn't make much sense anymore
+		if ($this->db_type == 'pgsql') {
+			$this->db_functions = new \CoreLibs\DB\SQL\PgSQL();
+		} else {
+			// abort error
+			$this->error_id = 10;
+			$this->__dbError();
+			return false;
+		}
 
 		// connect to DB
-		if (!$this->_connect_to_db()) {
+		if (!$this->__connectToDB()) {
 			$this->error_id = 16;
-			$this->_db_error();
+			$this->__dbError();
 			return false;
 		}
 
 		$this->class_info['db_io']=array(
 			'class_name' => 'DB IO',
-			'class_version' => '4.1.0',
+			'class_version' => '5.0.0',
 			'class_created' => '2000-11-23',
 			'class_author' => 'Clemens Schwaighofer'
 		);
+
+		// all ok return true
+		return true;
 	}
 
 	// METHOD: __destruct
@@ -379,7 +399,7 @@ class db_io extends basic
 	// DESC:   final desctruct method, closes the DB connection
 	public function __destruct()
 	{
-		$this->_close_db();
+		$this->__closeDB();
 		parent::__destruct();
 	}
 
@@ -387,75 +407,79 @@ class db_io extends basic
 	// PRIVATE METHODS
 	// *************************************************************
 
-	// METHOD: _connect_to_db
+	// METHOD: __connectToDB
+	// WAS   : _connect_to_db
 	// PARAMS: none
 	// RETURN: true on successfull connect, false if failed
-	// DESC:
+	// DESC  :
 	// internal connection function. Used to connect to the DB if there is no connection done yet.
 	// Called before any execute
-	private function _connect_to_db()
+	private function __connectToDB()
 	{
 		// generate connect string
-		$this->dbh = $this->db_functions->_db_connect($this->db_host, $this->db_user, $this->db_pwd, $this->db_name, $this->db_port, $this->db_ssl);
+		$this->dbh = $this->db_functions->__dbConnect($this->db_host, $this->db_user, $this->db_pwd, $this->db_name, $this->db_port, $this->db_ssl);
 		// if no dbh here, we couldn't connect to the DB itself
 		if (!$this->dbh) {
 			$this->error_id = 14;
-			$this->_db_error();
+			$this->__dbError();
 			return false;
 		}
 		// 15 error (cant select to DB is not valid in postgres, as connect is different)
 		// if returns 0 we couldn't select the DB
 		if ($this->dbh == -1) {
 			$this->error_id = 15;
-			$this->_db_error();
+			$this->__dbError();
 			return false;
 		}
 		// set search path if needed
 		if ($this->db_schema) {
-			$this->db_set_schema();
+			$this->dbSetSchema();
 		}
 		// set client encoding
 		if ($this->db_encoding) {
-			$this->db_set_encoding();
+			$this->dbSetEncoding();
 		}
 		// all okay
 		return true;
 	}
 
-	// METHOD: _close_db
+	// METHOD: __closeDB
+	// WAS   : _close_db
 	// PARAMS: none
 	// RETURN: none
 	// DESC  : close db connection
 	//         only used by the deconstructor
-	private function _close_db()
+	private function __closeDB()
 	{
 		if (isset($this->dbh) && $this->dbh) {
-			$this->db_functions->_db_close();
+			$this->db_functions->__dbClose();
 			unset($this->dbh);
 		}
 	}
 
-	// METHOS: _check_query_for_select
+	// METHOD: __checkQueryForSelect
+	// WAS   : _check_query_for_select
 	// PARAMS: query
 	// RETURN: true if matching, false if not
-	// DESC  : checks if query is a SELECT, if not error, 0 return
-	//       : NOTE: Query needs to start with SELECT. if starts with "with" it is ignored
-	private function _check_query_for_select($query)
+	// DESC  : checks if query is a SELECT or SHOW, if not error, 0 return
+	// NOTE  : Query needs to start with SELECT or SHOW. if starts with "with" it is ignored
+	private function __checkQueryForSelect($query)
 	{
 		// perhaps allow spaces before select ?!?
-		if (!preg_match("/^select /i", $query)) {
+		if (!preg_match("/^(select|show) /i", $query)) {
 			return false;
 		}
 		return true;
 	}
 
-	// METHOD: _check_query_for_insert
+	// METHOD: __checkQueryForInsert
+	// WAS   : _check_query_for_insert
 	// PARAMS: query, pure flag (boolean)
 	// RETURN: true if matching, flase if not
 	// DESC  : check for DELETE, INSERT, UPDATE
 	//       : if pure is set to true, only when INSERT is set will return true
-	//       : NOTE: Queries need to start with INSERT, UPDATE, DELETE. Anything else is ignored
-	private function _check_query_for_insert($query, $pure = false)
+	// NOTE  : Queries need to start with INSERT, UPDATE, DELETE. Anything else is ignored
+	private function __checkQueryForInsert($query, $pure = false)
 	{
 		if (!preg_match("/^insert /i", $query) && !preg_match("/^update /i", $query) && !preg_match("/^delete /i", $query)) {
 			return false;
@@ -469,19 +493,20 @@ class db_io extends basic
 		}
 	}
 
-	// METHOD: _print_array
+	// METHOD: __printArray
+	// WAS   : _print_array
 	// PARAMS: array to print
 	// RETURN: string with printed and formated array
 	// DESC  : internal funktion that creates the array
-	//       : used in db_dump_data only
-	private function _print_array($array)
+	// NOTE  : used in db_dump_data only
+	private function __printArray($array)
 	{
 		while (list($key, $value) = each($array)) {
 			$string .= $this->nbsp.'<b>'.$key.'</b> => ';
 			if (is_array($value)) {
 				$this->nbsp .= '&nbsp;&nbsp;&nbsp;';
 				$string .= '<br>';
-				$string .= $this->_print_array($value);
+				$string .= $this->__printArray($value);
 			} else {
 				$string .= $value.'<br>';
 			}
@@ -490,14 +515,15 @@ class db_io extends basic
 		return $string;
 	}
 
-	// METHOD _db_debug
-	// PARAMS debug_id -> group id for debug
-	//        error_string -> error message or debug data
-	//        id -> db debug group
-	//        type -> query identifiery (Q, I, etc)
-	// RETURN none
-	// DESC   calls the basic class debug with strip command
-	private function _db_debug($debug_id, $error_string, $id = '', $type = '')
+	// METHOD: __dbDebug
+	// WAS   : _db_debug
+	// PARAMS: debug_id -> group id for debug
+	//         error_string -> error message or debug data
+	//         id -> db debug group
+	//         type -> query identifiery (Q, I, etc)
+	// RETURN: none
+	// DESC  : calls the basic class debug with strip command
+	private function __dbDebug($debug_id, $error_string, $id = '', $type = '')
 	{
 		$prefix = '';
 		if ($id) {
@@ -512,34 +538,36 @@ class db_io extends basic
 		$this->debug($debug_id, $prefix.$error_string, true);
 	}
 
-	// METHOD _db_error
-	// PARAMS cursor -> current cursor for pg_result_error, mysql uses dbh, pg_last_error too,
-	//                  but pg_result_error is more accurate
-	//        msg -> optional message
-	// RETURN none
-	// DESC   if error_id set, writes long error string into error_msg
-	// MARK: needed to make public so it can be called from DB.Array.IO too
-	public function _db_error($cursor = '', $msg = '')
+	// METHOD: __dbError
+	// WAS   : _db_error
+	// PARAMS: cursor -> current cursor for pg_result_error, mysql uses dbh, pg_last_error too,
+	//                   but pg_result_error is more accurate
+	//         msg -> optional message
+	// RETURN: none
+	// DESC  : if error_id set, writes long error string into error_msg
+	// NOTE  : needed to make public so it can be called from DB.Array.IO too
+	public function __dbError($cursor = '', $msg = '')
 	{
-		$where_called = $this->get_caller_method();
+		$pg_error_string = '';
+		$where_called = $this->getCallerMethod();
 		if ($cursor) {
-			$pg_error_string = $this->db_functions->_db_print_error($cursor);
+			$pg_error_string = $this->db_functions->__dbPrintError($cursor);
 		}
-		if (!$cursor) {
-			$pg_error_string = $this->db_functions->_db_print_error();
+		if (!$cursor && method_exists($this->db_functions, '__dbPrintError')) {
+			$pg_error_string = $this->db_functions->__dbPrintError();
 		}
 		if ($pg_error_string) {
-			$this->_db_debug('db', $pg_error_string, 'DB_ERROR', $where_called);
+			$this->__dbDebug('db', $pg_error_string, 'DB_ERROR', $where_called);
 		}
 		// okay, an error occured
 		if ($this->error_id) {
 			// write error msg ...
-			$this->_db_debug('db', '<span style="color: red;"><b>DB-Error</b> '.$this->error_id.': '.$this->error_string[$this->error_id].($msg ? ', '.$msg : '').'</span>', 'DB_ERROR', $where_called);
+			$this->__dbDebug('db', '<span style="color: red;"><b>DB-Error</b> '.$this->error_id.': '.$this->error_string[$this->error_id].($msg ? ', '.$msg : '').'</span>', 'DB_ERROR', $where_called);
 			$this->had_error = $this->error_id;
 			// write detailed error log
 		}
 		if ($this->warning_id) {
-			$this->_db_debug('db', '<span style="color: orange;"><b>DB-Warning</b> '.$this->warning_id.': '.$this->error_string[$this->warning_id].($msg ? ', '.$msg : '').'</span>', 'DB_ERROR', $where_called);
+			$this->__dbDebug('db', '<span style="color: orange;"><b>DB-Warning</b> '.$this->warning_id.': '.$this->error_string[$this->warning_id].($msg ? ', '.$msg : '').'</span>', 'DB_ERROR', $where_called);
 			$this->had_warning = $this->warning_id;
 		}
 		// unset the error/warning vars
@@ -547,11 +575,12 @@ class db_io extends basic
 		$this->warning_id = 0;
 	}
 
-	// METHOD _db_convert_encoding
-	// PARAMS array from fetch_row
-	// RETURN convert fetch_row array
-	// DESC   if there is the 'to_encoding' var set, and the field is in the wrong encoding converts it to the target
-	private function _db_convert_encoding($row)
+	// METHOD: __dbConvertEncoding
+	// WAS   : _db_convert_encoding
+	// PARAMS: array from fetch_row
+	// RETURN: convert fetch_row array
+	// DESC  : if there is the 'to_encoding' var set, and the field is in the wrong encoding converts it to the target
+	private function __dbConvertEncoding($row)
 	{
 		if ($this->to_encoding && $this->db_encoding) {
 			// go through each row and convert the encoding if needed
@@ -566,27 +595,29 @@ class db_io extends basic
 		return $row;
 	}
 
-	// METHOD _db_debug_prepare
-	// PARAMS $stm_name, data array
-	// RETURN query in prepared form
-	// DESC   for debug purpose replaces $1, $2, etc with actual data
-	private function _db_debug_prepare($stm_name, $data = array())
+	// METHOD: __dbDebugPrepare
+	// WAS   : _db_debug_prepare
+	// PARAMS: $stm_name, data array
+	// RETURN: query in prepared form
+	// DESC  : for debug purpose replaces $1, $2, etc with actual data
+	private function __dbDebugPrepare($stm_name, $data = array())
 	{
 		// get the keys from data array
 		$keys = array_keys($data);
 		// because the placeholders start with $ and at 1, we need to increase each key and prefix it with a $ char
-		for ($i = 0; $i < count($keys); $i ++) {
+		for ($i = 0, $iMax = count($keys); $i < $iMax; $i ++) {
 			$keys[$i] = '$'.($keys[$i] + 1);
 		}
 		// simply replace the $1, $2, ... with the actual data and return it
 		return str_replace(array_reverse($keys), array_reverse($data), $this->prepare_cursor[$stm_name]['query']);
 	}
 
-	// METHOD _db_return_table
-	// PARAMS insert/select/update/delete query
-	// RETURN array with schema and table
-	// DESC   extracts schema and table from the query, if no schema returns just empty string
-	private function _db_return_table($query)
+	// METHOD: __dbReturnTable
+	// WAS   : _db_return_table
+	// PARAMS: insert/select/update/delete query
+	// RETURN: array with schema and table
+	// DESC  : extracts schema and table from the query, if no schema returns just empty string
+	private function __dbReturnTable($query)
 	{
 		if (preg_match("/^SELECT /i", $query)) {
 			preg_match("/ (FROM) (([\w_]+)\.)?([\w_]+) /i", $query, $matches);
@@ -596,17 +627,18 @@ class db_io extends basic
 		return array($matches[3], $matches[4]);
 	}
 
-	// METHOD _db_prepare_exec
-	// PARAMS query, primary key [if set to NULL no returning will be added]
-	// RETURN md5 OR boolean false on error
-	// DESC   sub function for db_exec and db_exec_async
-	//        * checks query is set
-	//        * checks there is a database handler
-	//        * checks that here is no other query executing
-	//        * checks for insert if returning is set/pk name
-	//        * sets internal md5 for query
-	//        * checks multiple call count
-	private function _db_prepare_exec($query, $pk_name)
+	// METHOD: __dbPrepareExec
+	// WAS   : _db_prepare_exec
+	// PARAMS: query, primary key [if set to NULL no returning will be added]
+	// RETURN: md5 OR boolean false on error
+	// DESC  : sub function for dbExec and dbExecAsync
+	//         * checks query is set
+	//         * checks there is a database handler
+	//         * checks that here is no other query executing
+	//         * checks for insert if returning is set/pk name
+	//         * sets internal md5 for query
+	//         * checks multiple call count
+	private function __dbPrepareExec($query, $pk_name)
 	{
 		// to either use the returning method or the guess method for getting primary keys
 		$this->returning_id = false;
@@ -616,33 +648,33 @@ class db_io extends basic
 		}
 		if (!$this->query) {
 			$this->error_id = 11;
-			$this->_db_error();
+			$this->__dbError();
 			return false;
 		}
 		// if no DB Handler drop out
 		if (!$this->dbh) {
 			// if reconnect fails drop out
-			if (!$this->_connect_to_db()) {
+			if (!$this->__connectToDB()) {
 				$this->error_id = 16;
-				$this->_db_error();
+				$this->__dbError();
 				return false;
 			}
 		}
 		// check that no other query is running right now
-		if ($this->db_functions->_db_connection_busy()) {
+		if ($this->db_functions->__dbConnectionBusy()) {
 			$this->error_id = 41;
-			$this->_db_error();
+			$this->__dbError();
 			return false;
 		}
 		// if we do have an insert, check if there is no RETURNING pk_id, add it if I can get the PK id
-		if ($this->_check_query_for_insert($this->query, true)) {
+		if ($this->__checkQueryForInsert($this->query, true)) {
 			$this->pk_name = $pk_name;
 			if ($this->pk_name != 'NULL') {
 				if (!$this->pk_name) {
 					// TODO: get primary key from table name
-					list($schema, $table) = $this->_db_return_table($this->query);
+					list($schema, $table) = $this->__dbReturnTable($this->query);
 					if (!array_key_exists($table, $this->pk_name_table) || !$this->pk_name_table[$table]) {
-						$this->pk_name_table[$table] = $this->db_functions->_db_primary_key($table, $schema);
+						$this->pk_name_table[$table] = $this->db_functions->__dbPrimaryKey($table, $schema);
 					}
 					$this->pk_name = $this->pk_name_table[$table] ? $this->pk_name_table[$table] : 'NULL';
 				}
@@ -662,7 +694,7 @@ class db_io extends basic
 		}
 		// for DEBUG, only on first time ;)
 		if ($this->db_debug) {
-			$this->_db_debug('db', $this->query, '_db_prepare_exec', 'Q');
+			$this->__dbDebug('db', $this->query, '__dbPrepareExec', 'Q');
 		}
 		// import protection, md5 needed
 		$md5 = md5($this->query);
@@ -677,8 +709,8 @@ class db_io extends basic
 		// count up the run, if this is run more than the max_run then exit with error
 		if ($this->query_called[$md5] > $this->MAX_QUERY_CALL) {
 				$this->error_id = 30;
-				$this->_db_error();
-				$this->_db_debug('db', $this->query, 'db_exec', 'Q[nc]');
+				$this->__dbError();
+				$this->__dbDebug('db', $this->query, 'dbExec', 'Q[nc]');
 				return false;
 		}
 		$this->query_called[$md5] ++;
@@ -686,51 +718,52 @@ class db_io extends basic
 		return $md5;
 	}
 
-	// METHOD _db_post_exec
-	// PARAMS none
-	// RETURN true on success or false if an error occured
-	// DESC   runs post execute for rows affected, field names, inserted primary key, etc
-	private function _db_post_exec()
+	// METHOD: __dbPostExec
+	// WAS   : _db_post_exec
+	// PARAMS: none
+	// RETURN: true on success or false if an error occured
+	// DESC  : runs post execute for rows affected, field names, inserted primary key, etc
+	private function __dbPostExec()
 	{
 		// if FALSE returned, set error stuff
 		// if either the cursor is false
-		if (!$this->cursor || $this->db_functions->_db_last_error_query()) {
+		if (!$this->cursor || $this->db_functions->__dbLastErrorQuery()) {
 			// printout Query if debug is turned on
 			if ($this->db_debug) {
-				$this->_db_debug('db', $this->query, 'db_exec', 'Q[nc]');
+				$this->__dbDebug('db', $this->query, 'dbExec', 'Q[nc]');
 			}
 			// internal error handling
 			$this->error_id = 13;
-			$this->_db_error($this->cursor);
+			$this->__dbError($this->cursor);
 			return false;
 		} else {
 			// if SELECT do here ...
-			if ($this->_check_query_for_select($this->query)) {
+			if ($this->__checkQueryForSelect($this->query)) {
 				// count the rows returned (if select)
-				$this->num_rows = $this->db_functions->_db_num_rows($this->cursor);
+				$this->num_rows = $this->db_functions->__dbNumRows($this->cursor);
 				// count the fields
-				$this->num_fields = $this->db_functions->_db_num_fields($this->cursor);
+				$this->num_fields = $this->db_functions->__dbNumFields($this->cursor);
 				// set field names
 				unset($this->field_names);
 				for ($i = 0; $i < $this->num_fields; $i ++) {
-					$this->field_names[] = $this->db_functions->_db_field_name($this->cursor, $i);
+					$this->field_names[] = $this->db_functions->__dbFieldName($this->cursor, $i);
 				}
-			} elseif ($this->_check_query_for_insert($this->query)) {
+			} elseif ($this->__checkQueryForInsert($this->query)) {
 				// if not select do here
 				// count affected rows
-				$this->num_rows = $this->db_functions->_db_affected_rows($this->cursor);
-				if ($this->_check_query_for_insert($this->query, true) && $this->pk_name != 'NULL') {
+				$this->num_rows = $this->db_functions->__dbAffectedRows($this->cursor);
+				if ($this->__checkQueryForInsert($this->query, true) && $this->pk_name != 'NULL') {
 					// set insert_id
 					// if we do not have a returning, we try to get it via the primary key and another select
 					if (!$this->returning_id) {
-						$this->insert_id = $this->db_functions->_db_insert_id($this->query, $this->pk_name);
+						$this->insert_id = $this->db_functions->__dbInsertId($this->query, $this->pk_name);
 					} else {
 						$this->insert_id = array ();
 						$this->insert_id_ext = array ();
 						// echo "** PREPARE RETURNING FOR CURSOR: ".$this->cursor."<br>";
 						// we have returning, now we need to check if we get one or many returned
 						// we'll need to loop this, if we have multiple insert_id returns
-						while ($_insert_id = $this->db_functions->_db_fetch_array($this->cursor, PGSQL_ASSOC)) {
+						while ($_insert_id = $this->db_functions->__dbFetchArray($this->cursor, PGSQL_ASSOC)) {
 							// echo "*** RETURNING: ".print_r($_insert_id, 1)."<br>";
 							$this->insert_id[] = $_insert_id;
 						}
@@ -752,7 +785,7 @@ class db_io extends basic
 							// failed to get insert id
 							$this->insert_id = '';
 							$this->warning_id = 33;
-							$this->_db_error($this->cursor, '[db_exec]');
+							$this->__dbError($this->cursor, '[dbExec]');
 						}
 						// if we have multiple, do not set the insert_id different, keep as array
 					}
@@ -760,7 +793,7 @@ class db_io extends basic
 					// we returned an array of PKs instread of a single one
 					if (is_array($this->insert_id)) {
 						$this->warning_id = 32;
-						$this->_db_error($this->cursor, '[db_exec]');
+						$this->__dbError($this->cursor, '[dbExec]');
 					}
 				}
 			}
@@ -772,14 +805,15 @@ class db_io extends basic
 	// PUBLIC METHODS
 	// *************************************************************
 
-	// METHOD db_set_debug
-	// PARAMS true/false or none
-	// RETURN new set debug flag
-	// DESC   switches the debug flag on or off
-	//        if none given, then the debug flag auto switches from
-	//        the previous setting to either then on or off
-	//        else override with boolean true/false
-	public function db_set_debug($debug = '')
+	// METHOD: dbSetDebug
+	// WAS   : db_set_debug
+	// PARAMS: true/false or none
+	// RETURN: new set debug flag
+	// DESC  : switches the debug flag on or off
+	//         if none given, then the debug flag auto switches from
+	//         the previous setting to either then on or off
+	//         else override with boolean true/false
+	public function dbSetDebug($debug = '')
 	{
 		if ($debug === true) {
 			$this->db_debug = 1;
@@ -793,21 +827,23 @@ class db_io extends basic
 		return $this->db_debug;
 	}
 
-	// METHOD db_reset_query_called
-	// PARAMS query
-	// RETURN none
-	// DESC   resets the call times for the max query called to 0
-	//        USE CAREFULLY: rather make the query prepare -> execute
-	public function db_reset_query_called($query)
+	// METHOD: dbResetQueryCalled
+	// WAS   : db_reset_query_called
+	// PARAMS: query
+	// RETURN: none
+	// DESC  : resets the call times for the max query called to 0
+	//         USE CAREFULLY: rather make the query prepare -> execute
+	public function dbResetQueryCalled($query)
 	{
 		$this->query_called[md5($query)] = 0;
 	}
 
-	// METHOD db_get_query_called
-	// PARAMS query
-	// RETURN count of query called
-	// DESC   gets how often a query was called already
-	public function db_get_query_called($query)
+	// METHOD: dbGetQueryCalled
+	// WAS   : db_get_query_called
+	// PARAMS: query
+	// RETURN: count of query called
+	// DESC  : gets how often a query was called already
+	public function dbGetQueryCalled($query)
 	{
 		$md5 = md5($query);
 		if ($this->query_called[$md5]) {
@@ -817,24 +853,26 @@ class db_io extends basic
 		}
 	}
 
-	// METHOD db_close
-	// PARAMS none
-	// RETURN none
-	// DESC   closes the db_connection
-	//        normally this is not used, as the class deconstructor closes the connection down
-	public function db_close()
+	// METHOD: dbClose
+	// WAS   : db_close
+	// PARAMS: none
+	// RETURN: none
+	// DESC  : closes the db_connection
+	//         normally this is not used, as the class deconstructor closes the connection down
+	public function dbClose()
 	{
 		if ($this->dbh) {
-			$this->db_functions->_db_close();
+			$this->db_functions->__dbClose();
 			unset($this->dbh);
 		}
 	}
 
-	// METHOD db_set_schema
-	// PARAMS db_schema: if not given tries internal default db schema
-	// RETURN false on failure to find schema values, true of db exec schema set
-	// DESC   sets new db schema
-	public function db_set_schema($db_schema = '')
+	// METHOD: dbSetSchema
+	// WAS   : db_set_schema
+	// PARAMS: db_schema: if not given tries internal default db schema
+	// RETURN: false on failure to find schema values, true of db exec schema set
+	// DESC  : sets new db schema
+	public function dbSetSchema($db_schema = '')
 	{
 		if (!$db_schema && $this->db_schema) {
 			$db_schema = $this->db_schema;
@@ -842,24 +880,26 @@ class db_io extends basic
 		if (!$db_schema) {
 			return false;
 		}
-		$q = "SET search_path TO '".$this->db_escape_string($db_schema)."'";
-		return $this->db_exec($q);
+		$q = "SET search_path TO '".$this->dbEscapeString($db_schema)."'";
+		return $this->dbExec($q);
 	}
 
-	// METHOD db_get_schema
-	// PARAMS none
-	// RETURN db_schema current set
-	// DESC   returns the current set db schema
-	public function db_get_schema()
+	// METHOD: dbGetSchema
+	// WAS   : db_get_schema
+	// PARAMS: none
+	// RETURN: db_schema current set
+	// DESC  : returns the current set db schema
+	public function dbGetSchema()
 	{
 		return $this->db_schema;
 	}
 
-	// METHOD db_set_encoding
-	// PARAMS valid encoding name, so the the data gets converted to this encoding
-	// RETURN false, or true of db exec encoding set
-	// DESC   sets the client encoding in the postgres database
-	public function db_set_encoding($db_encoding = '')
+	// METHOD: dbSetEncoding
+	// WAS   : db_set_encoding
+	// PARAMS: valid encoding name, so the the data gets converted to this encoding
+	// RETURN: false, or true of db exec encoding set
+	// DESC  : sets the client encoding in the postgres database
+	public function dbSetEncoding($db_encoding = '')
 	{
 		if (!$db_encoding && $this->db_encoding) {
 			$db_encoding = $this->db_encoding;
@@ -867,15 +907,25 @@ class db_io extends basic
 		if (!$db_encoding) {
 			return false;
 		}
-		$q = "SET client_encoding TO '".$this->db_escape_string($db_encoding)."'";
-		return $this->db_exec($q);
+		$q = "SET client_encoding TO '".$this->dbEscapeString($db_encoding)."'";
+		return $this->dbExec($q);
 	}
 
-	// METHOD db_info
-	// PARAMS show, default 1, if set to 0 won't write to error_msg var
-	// RETURN string with db_connection info
-	// DESC   prints out status info from the connected DB (might be usefull for debug stuff)
-	public function db_info($show = 1)
+	// METHOD: dbGetEncoding
+	// PARAMS: none
+	// RETURN: current client encoding
+	// DESC  : returns the current set client encoding from the connected DB
+	public function dbGetEncoding()
+	{
+		return $this->db_return_row('SHOW client_encoding')['client_encoding'];
+	}
+
+	// METHOD: dbInfo
+	// WAS   : db_info
+	// PARAMS: show, default 1, if set to 0 won't write to error_msg var
+	// RETURN: string with db_connection info
+	// DESC  : prints out status info from the connected DB (might be usefull for debug stuff)
+	public function dbInfo($show = 1)
 	{
 		$string = '';
 		$string .= '<b>-DB-info-></b> Connected to db <b>\''.$this->db_name.'\'</b> ';
@@ -886,18 +936,19 @@ class db_io extends basic
 		$string .= 'with ssl mode <b>\''.$this->db_ssl.'\'</b><br>';
 		$string .= '<b>-DB-info-></b> DB IO Class debug output: <b>'.(($this->db_debug) ? 'Yes' : 'No').'</b>';
 		if ($show) {
-			$this->_db_debug('db', '<br>'.$string, 'db_info');
+			$this->__dbDebug('db', $string, 'dbInfo');
 		} else {
-			$string = '<br>'.$string;
+			$string = $string.'<br>';
 		}
 		return $string;
 	}
 
-	// METHOD db_dump_data
-	// PARAMS query -> if given, only from this quey (if found)
-	// RETURN formated string with all the data in the array
-	// DESC   dumps ALL data for this query, OR if no query given all in cursor_ext array
-	public function db_dump_data($query = 0)
+	// METHOD: dbDumpData
+	// WAS   : db_dump_data
+	// PARAMS: query -> if given, only from this quey (if found)
+	// RETURN: formated string with all the data in the array
+	// DESC  : dumps ALL data for this query, OR if no query given all in cursor_ext array
+	public function dbDumpData($query = 0)
 	{
 		// set start array
 		if ($query) {
@@ -907,28 +958,29 @@ class db_io extends basic
 		}
 		if (is_array($array)) {
 			$this->nbps = '';
-			$string .= $this->_print_array($array);
-			$this->_db_debug('db', $string, 'db_dump_data');
+			$string .= $this->__printArray($array);
+			$this->__dbDebug('db', $string, 'dbDumpData');
 		}
 		return $string;
 	}
 
-	// METHOD db_return
-	// PARAMS query -> the query ...
-	//        reset -> if set to 1, at the end of the query (last row returned), the stored array will be deleted ...
-	//                 if set to 2, the data will be read new and cached (wheres 1 reads new AND destroys at end of read)
-	//              -> if set to 3, after EACH row, the data will be reset, no caching is done except for basic (count, etc)
-	// RETURN res mixed (array/hash)
-	// DESC   single running function, if called creates md5 from
-	//        query string and so can itself call exec/return calls
-	//        caches data, so next time called with IDENTICAL (!!!!)
-	//        [this means 1:1 bit to bit identical query] returns cached
-	//        data, or with reset flag set calls data from DB again
-	public function db_return($query, $reset = 0)
+	// METHOD: dbReturn
+	// WAS   : db_return
+	// PARAMS: query -> the query ...
+	//         reset -> if set to 1, at the end of the query (last row returned), the stored array will be deleted ...
+	//                  if set to 2, the data will be read new and cached (wheres 1 reads new AND destroys at end of read)
+	//               -> if set to 3, after EACH row, the data will be reset, no caching is done except for basic (count, etc)
+	// RETURN: res mixed (array/hash)
+	// DESC  : single running function, if called creates md5 from
+	//         query string and so can itself call exec/return calls
+	//         caches data, so next time called with IDENTICAL (!!!!)
+	//         [this means 1:1 bit to bit identical query] returns cached
+	//         data, or with reset flag set calls data from DB again
+	public function dbReturn($query, $reset = 0)
 	{
 		if (!$query) {
 			$this->error_id = 11;
-			$this->_db_error();
+			$this->__dbError();
 			return false;
 		}
 		// create MD5 from query ...
@@ -948,9 +1000,9 @@ class db_io extends basic
 		// set the query
 		$this->cursor_ext[$md5]['query'] = $query;
 		// before doing ANYTHING check if query is "SELECT ..." everything else does not work
-		if (!$this->_check_query_for_select($this->cursor_ext[$md5]['query'])) {
+		if (!$this->__checkQueryForSelect($this->cursor_ext[$md5]['query'])) {
 			$this->error_id = 17;
-			$this->_db_error('', $this->cursor_ext[$md5]['query']);
+			$this->__dbError('', $this->cursor_ext[$md5]['query']);
 			return false;
 		}
 
@@ -959,38 +1011,38 @@ class db_io extends basic
 		if ($reset && !$this->cursor_ext[$md5]['pos']) {
 			unset($this->cursor_ext[$md5]['cursor']);
 		}
-//			$this->debug('MENU', 'Reset: '.$reset.', Cursor: '.$this->cursor_ext[$md5]['cursor'].', Pos: '.$this->cursor_ext[$md5]['pos'].', Query: '.$query);
+		// $this->debug('MENU', 'Reset: '.$reset.', Cursor: '.$this->cursor_ext[$md5]['cursor'].', Pos: '.$this->cursor_ext[$md5]['pos'].', Query: '.$query);
 
 		// if no cursor yet, execute
 		if (!$this->cursor_ext[$md5]['cursor']) {
 			// for DEBUG, print out each query executed
 			if ($this->db_debug) {
-				$this->_db_debug('db', $this->cursor_ext[$md5]['query'], 'db_return', 'Q');
+				$this->__dbDebug('db', $this->cursor_ext[$md5]['query'], 'dbReturn', 'Q');
 			}
 			// if no DB Handler try to reconnect
 			if (!$this->dbh) {
 				// if reconnect fails drop out
-				if (!$this->_connect_to_db()) {
+				if (!$this->__connectToDB()) {
 					$this->error_id = 16;
-					$this->_db_error();
+					$this->__dbError();
 					return false;
 				}
 			}
 			// check that no other query is running right now
-			if ($this->db_functions->_db_connection_busy()) {
+			if ($this->db_functions->__dbConnectionBusy()) {
 				$this->error_id = 41;
-				$this->_db_error();
+				$this->__dbError();
 				return false;
 			}
-			$this->cursor_ext[$md5]['cursor'] = $this->db_functions->_db_query($this->cursor_ext[$md5]['query']);
+			$this->cursor_ext[$md5]['cursor'] = $this->db_functions->__dbQuery($this->cursor_ext[$md5]['query']);
 			// if still no cursor ...
 			if (!$this->cursor_ext[$md5]['cursor']) {
 				if ($this->db_debug) {
-					$this->_db_debug('db', $this->cursor_ext[$md5]['query'], 'db_return', 'Q');
+					$this->__dbDebug('db', $this->cursor_ext[$md5]['query'], 'dbReturn', 'Q');
 				}
 				// internal error handling
 				$this->error_id = 13;
-				$this->_db_error($this->cursor_ext[$md5]['cursor']);
+				$this->__dbError($this->cursor_ext[$md5]['cursor']);
 				return false;
 			} else {
 				$this->cursor_ext[$md5]['firstcall'] = 1;
@@ -1001,12 +1053,12 @@ class db_io extends basic
 		if ($this->cursor_ext[$md5]['cursor']) {
 			if ($this->cursor_ext[$md5]['firstcall'] == 1) {
 				// count the rows returned (if select)
-				$this->cursor_ext[$md5]['num_rows'] = $this->db_functions->_db_num_rows($this->cursor_ext[$md5]['cursor']);
+				$this->cursor_ext[$md5]['num_rows'] = $this->db_functions->__dbNumRows($this->cursor_ext[$md5]['cursor']);
 				// count the fields
-				$this->cursor_ext[$md5]['num_fields'] = $this->db_functions->_db_num_fields($this->cursor_ext[$md5]['cursor']);
+				$this->cursor_ext[$md5]['num_fields'] = $this->db_functions->__dbNumFields($this->cursor_ext[$md5]['cursor']);
 				// set field names
 				for ($i = 0; $i < $this->cursor_ext[$md5]['num_fields']; $i ++) {
-					$this->cursor_ext[$md5]['field_names'][] = $this->db_functions->_db_field_name($this->cursor_ext[$md5]['cursor'], $i);
+					$this->cursor_ext[$md5]['field_names'][] = $this->db_functions->__dbFieldName($this->cursor_ext[$md5]['cursor'], $i);
 				}
 				// reset first call vars
 				$this->cursor_ext[$md5]['firstcall'] = 0;
@@ -1019,7 +1071,7 @@ class db_io extends basic
 			if ($this->cursor_ext[$md5]['read_rows'] == $this->cursor_ext[$md5]['num_rows']) {
 				$return = 0;
 			} else {
-				$return = $this->_db_convert_encoding($this->db_functions->_db_fetch_array($this->cursor_ext[$md5]['cursor']));
+				$return = $this->__dbConvertEncoding($this->db_functions->__dbFetchArray($this->cursor_ext[$md5]['cursor']));
 			}
 			// check if cached call or reset call ...
 			if (!$return && !$reset) {
@@ -1070,74 +1122,77 @@ class db_io extends basic
 		return $return;
 	}
 
-	// METHOD db_cache_reset
-	// PARAMS $query -> The Query whose cache should be cleaned
-	// RETURN 0 if failure (eg no query with this md5 found)
-	//        1 if successfull
-	// DESC   resets all data stored to this query
-	public function db_cache_reset($query)
+	// METHOD: dbCacheReset
+	// WAS   : db_cache_reset
+	// PARAMS: $query -> The Query whose cache should be cleaned
+	// RETURN: 0 if failure (eg no query with this md5 found)
+	//         1 if successfull
+	// DESC  : resets all data stored to this query
+	public function dbCacheReset($query)
 	{
 		$md5 = md5($query);
 		// clears cache for this query
 		if (!$this->cursor_ext[$md5]['query']) {
 			$this->error_id = 18;
-			$this->_db_error();
+			$this->__dbError();
 			return false;
 		}
 		unset($this->cursor_ext[$md5]);
 		return true;
 	}
 
-	// METHOD db_exec
-	// PARAMS query -> the query, if not given, the query class var will be used
-	//                 (if this was not set, method will quit with a 0 (failure)
-	//        pk_name -> optional primary key name, for insert id return if the pk name is very different
-	//                   if pk name is table name and _id, pk_name is not needed to be set
-	//                   if NULL is given here, no RETURNING will be auto added
-	// RETURN cursor for this query
-	// DESC   executes the query and returns & sets the internal cursor
-	//        fruthermore this functions also sets varios other vars
-	//        like num_rows, num_fields, etc depending on query
-	//        for INSERT INTO queries it is highly recommended to set the pk_name to avoid an additional
-	//        read from the database for the PK NAME
-	public function db_exec($query = 0, $pk_name = '')
+	// METHOD: dbExec
+	// METHOD: db_exec
+	// PARAMS: query -> the query, if not given, the query class var will be used
+	//                  (if this was not set, method will quit with a 0 (failure)
+	//         pk_name -> optional primary key name, for insert id return if the pk name is very different
+	//                    if pk name is table name and _id, pk_name is not needed to be set
+	//                    if NULL is given here, no RETURNING will be auto added
+	// RETURN: cursor for this query
+	// DESC  : executes the query and returns & sets the internal cursor
+	//         fruthermore this functions also sets varios other vars
+	//         like num_rows, num_fields, etc depending on query
+	//         for INSERT INTO queries it is highly recommended to set the pk_name to avoid an additional
+	//         read from the database for the PK NAME
+	public function dbExec($query = 0, $pk_name = '')
 	{
 		// prepare and check if we can actually run it
-		if (($md5 = $this->_db_prepare_exec($query, $pk_name)) === false) {
+		if (($md5 = $this->__dbPrepareExec($query, $pk_name)) === false) {
 			// bail if no md5 set
 			return false;
 		}
 		// ** actual db exec call
-		$this->cursor = $this->db_functions->_db_query($this->query);
+		$this->cursor = $this->db_functions->__dbQuery($this->query);
 		// if FALSE returned, set error stuff
 		// run the post exec processing
-		if (!$this->_db_post_exec()) {
+		if (!$this->__dbPostExec()) {
 			return false;
 		} else {
 			return $this->cursor;
 		}
 	}
 
-	// METHOD db_exec_async
-	// PARAMS query -> query to run
-	//        pk_name -> optional primary key name, only used with insert for returning call
-	// RETURN true if async query was sent ok, false if error happened
-	// DESC   executres the query async so other methods can be run during this
-	//        for INSERT INTO queries it is highly recommended to set the pk_name to avoid an additional
-	//        read from the database for the PK NAME
-	// NEEDS  db_check_async
-	public function db_exec_async($query, $pk_name = '')
+	// METHOD: dbExecAsync
+	// WAS   : db_exec_async
+	// PARAMS: query -> query to run
+	//         pk_name -> optional primary key name, only used with insert for returning call
+	// RETURN: true if async query was sent ok, false if error happened
+	// DESC  : executres the query async so other methods can be run during this
+	//         for INSERT INTO queries it is highly recommended to set the pk_name to avoid an additional
+	//         read from the database for the PK NAME
+	// NEEDS : dbCheckAsync
+	public function dbExecAsync($query, $pk_name = '')
 	{
 		// prepare and check if we can actually run the query
-		if (($md5 = $this->_db_prepare_exec($query, $pk_name)) === false) {
+		if (($md5 = $this->__dbPrepareExec($query, $pk_name)) === false) {
 			// bail if no md5 set
 			return false;
 		}
 		// run the async query
-		if (!$this->db_functions->_db_send_query($this->query)) {
+		if (!$this->db_functions->__dbSendQuery($this->query)) {
 			// if failed, process here
 			$this->error_id = 40;
-			$this->_db_error();
+			$this->__dbError();
 			return false;
 		} else {
 			$this->async_running = $md5;
@@ -1146,23 +1201,24 @@ class db_io extends basic
 		}
 	}
 
-	// METHOD db_check_async
-	// PARAMS none
-	// RETURN true if the query is still running, false if an error occured or cursor of that query
-	// DESC   checks a previous async query and returns data if finished
-	// NEEDS  db_exec_async
-	public function db_check_async()
+	// METHOD: dbCheckAsync
+	// WAS   : db_check_async
+	// PARAMS: none
+	// RETURN: true if the query is still running, false if an error occured or cursor of that query
+	// DESC  : checks a previous async query and returns data if finished
+	// NEEDS : dbExecAsync
+	public function dbCheckAsync()
 	{
 		// if there is actually a async query there
 		if ($this->async_running) {
-			if ($this->db_functions->_db_connection_busy()) {
+			if ($this->db_functions->__dbConnectionBusy()) {
 				return true;
 			} else {
 				// get the result/or error
-				$this->cursor = $this->db_functions->_db_get_result();
+				$this->cursor = $this->db_functions->__dbGetResult();
 				$this->async_running = '';
 				// run the post exec processing
-				if (!$this->_db_post_exec()) {
+				if (!$this->__dbPostExec()) {
 					return false;
 				} else {
 					return $this->cursor;
@@ -1171,17 +1227,18 @@ class db_io extends basic
 		} else {
 			// if no async running print error
 			$this->error_id = 42;
-			$this->_db_debug('db', '<span style="color: red;"><b>DB-Error</b> No async query has been started yet.</span>', 'DB_ERROR');
+			$this->__dbDebug('db', '<span style="color: red;"><b>DB-Error</b> No async query has been started yet.</span>', 'DB_ERROR');
 			return false;
 		}
 	}
 
-	// METHOD db_fetch_array
-	// PARAMS cusors -> the cursor from db_exec or pg_query/pg_exec/mysql_query
-	//                  if not set will use internal cursor, if not found, stops with 0 (error)
-	// RETURN a mixed row
-	// DESC   executes a cursor and returns the data, if no more data 0 will be returned
-	public function db_fetch_array($cursor = 0)
+	// METHOD: dbFetchArray
+	// WAS   : db_fetch_array
+	// PARAMS: cusors -> the cursor from db_exec or pg_query/pg_exec/mysql_query
+	//                   if not set will use internal cursor, if not found, stops with 0 (error)
+	// RETURN: a mixed row
+	// DESC  : executes a cursor and returns the data, if no more data 0 will be returned
+	public function dbFetchArray($cursor = 0)
 	{
 		// return false if no query or cursor set ...
 		if (!$cursor) {
@@ -1189,53 +1246,55 @@ class db_io extends basic
 		}
 		if (!$cursor) {
 			$this->error_id = 12;
-			$this->_db_error();
+			$this->__dbError();
 			return false;
 		}
-		return $this->_db_convert_encoding($this->db_functions->_db_fetch_array($cursor));
+		return $this->__dbConvertEncoding($this->db_functions->__dbFetchArray($cursor));
 	}
 
-	// METHOD db_return_row
-	// PARAMS query -> the query to be executed
-	// RETURN mixed db result
-	// DESC   returns the FIRST row of the given query
-	public function db_return_row($query)
+	// METHOD: dbReturnRow
+	// WAS   : db_return_row
+	// PARAMS: query -> the query to be executed
+	// RETURN: mixed db result
+	// DESC  : returns the FIRST row of the given query
+	public function dbReturnRow($query)
 	{
 		if (!$query) {
 			$this->error_id = 11;
-			$this->_db_error();
+			$this->__dbError();
 			return false;
 		}
 		// before doing ANYTHING check if query is "SELECT ..." everything else does not work
-		if (!$this->_check_query_for_select($query)) {
+		if (!$this->__checkQueryForSelect($query)) {
 			$this->error_id = 17;
-			$this->_db_error('', $query);
+			$this->__dbError('', $query);
 			return false;
 		}
-		$cursor = $this->db_exec($query);
-		$result = $this->db_fetch_array($cursor);
+		$cursor = $this->dbExec($query);
+		$result = $this->dbFetchArray($cursor);
 		return $result;
 	}
 
-	// METHOD db_return_array
-	// PARAMS query -> the query to be executed, named_only -> if true, only name ref are returned
-	// RETURN array of hashes (row -> fields)
-	// DESC   createds an array of hashes of the query (all data)
-	public function db_return_array($query, $named_only = 0)
+	// METHOD: dbReturnArray
+	// WAS   : db_return_array
+	// PARAMS: query -> the query to be executed, named_only -> if true, only name ref are returned
+	// RETURN: array of hashes (row -> fields)
+	// DESC  : createds an array of hashes of the query (all data)
+	public function dbReturnArray($query, $named_only = 0)
 	{
 		if (!$query) {
 			$this->error_id = 11;
-			$this->_db_error();
+			$this->__dbError();
 			return false;
 		}
 		// before doing ANYTHING check if query is "SELECT ..." everything else does not work
-		if (!$this->_check_query_for_select($query)) {
+		if (!$this->__checkQueryForSelect($query)) {
 			$this->error_id = 17;
-			$this->_db_error('', $query);
+			$this->__dbError('', $query);
 			return false;
 		}
-		$cursor = $this->db_exec($query);
-		while ($res = $this->db_fetch_array($cursor)) {
+		$cursor = $this->dbExec($query);
+		while ($res = $this->dbFetchArray($cursor)) {
 			for ($i = 0; $i < $this->num_fields; $i ++) {
 				// cereated mixed, first name
 				$data[$this->field_names[$i]] = $res[$this->field_names[$i]];
@@ -1249,92 +1308,96 @@ class db_io extends basic
 		return $rows;
 	}
 
-	// METHOD db_cursor_pos
-	// PARAMS $query -> query to find in cursor_ext
-	// RETURN position (int)
-	// DESC   returns the current position the read out
-	public function db_cursor_pos($query)
+	// METHOD: dbCursorPos
+	// WAS   : db_cursor_pos
+	// PARAMS: $query -> query to find in cursor_ext
+	// RETURN: position (int)
+	// DESC  : returns the current position the read out
+	public function dbCursorPos($query)
 	{
 		if (!$query) {
 			$this->error_id = 11;
-			$this->_db_error();
+			$this->__dbError();
 			return false;
 		}
 		$md5 = md5($query);
 		return $this->cursor_ext[$md5]['pos'];
 	}
 
-	// METHOD db_cursor_num_rows
-	// PARAMS $query -> query to find in cursor_ext
-	// RETURN row count (int)
-	// DESC   returns the number of rows for the current select query
-	public function db_cursor_num_rows($query)
+	// METHOD: dbCursorNumRows
+	// WAS   : db_cursor_num_rows
+	// PARAMS: $query -> query to find in cursor_ext
+	// RETURN: row count (int)
+	// DESC  : returns the number of rows for the current select query
+	public function dbCursorNumRows($query)
 	{
 		if (!$query) {
 			$this->error_id = 11;
-			$this->_db_error();
+			$this->__dbError();
 			return false;
 		}
 		$md5 = md5($query);
 		return $this->cursor_ext[$md5]['num_rows'];
 	}
 
-	// METHOD db_show_table_meta_data
-	// PARAMS $table -> table name
-	//        $schema -> optional schema name
-	// RETURN array of table data
-	// DESC   returns an array of the table with columns and values. FALSE on no table found
-	public function db_show_table_meta_data($table, $schema = '')
+	// METHOD: dbShowTableMetaData
+	// WAS   : db_show_table_meta_data
+	// PARAMS: $table -> table name
+	//         $schema -> optional schema name
+	// RETURN: array of table data
+	// DESC  : returns an array of the table with columns and values. FALSE on no table found
+	public function dbShowTableMetaData($table, $schema = '')
 	{
 		$table = ($schema ? $schema.'.' : '').$table;
 
-		$array = $this->db_functions->_db_meta_data($table);
+		$array = $this->db_functions->__dbMetaData($table);
 		if (!is_array($array)) {
 			$array = false;
 		}
 		return $array;
 	}
 
-	// METHOD db_prepare
-	// PARAMS $stm_name, $query, $pk_name: optional
-	// RETURN false on error
-	// DESC   prepares a query
-	//        for INSERT INTO queries it is highly recommended to set the pk_name to avoid an additional
-	//        read from the database for the PK NAME
-	public function db_prepare($stm_name, $query, $pk_name = '')
+	// METHOD: dbPrepare
+	// WAS   : db_prepare
+	// PARAMS: $stm_name, $query, $pk_name: optional
+	// RETURN: false on error
+	// DESC  : prepares a query
+	//         for INSERT INTO queries it is highly recommended to set the pk_name to avoid an additional
+	//         read from the database for the PK NAME
+	public function dbPrepare($stm_name, $query, $pk_name = '')
 	{
 		if (!$query) {
 			$this->error_id = 11;
-			$this->_db_error();
+			$this->__dbError();
 			return false;
 		}
 		// if no DB Handler drop out
 		if (!$this->dbh) {
 			// if reconnect fails drop out
-			if (!$this->_connect_to_db()) {
+			if (!$this->__connectToDB()) {
 				$this->error_id = 16;
-				$this->_db_error();
+				$this->__dbError();
 				return false;
 			}
 		}
 		// check that no other query is running right now
-		if ($this->db_functions->_db_connection_busy()) {
+		if ($this->db_functions->__dbConnectionBusy()) {
 			$this->error_id = 41;
-			$this->_db_error();
+			$this->__dbError();
 			return false;
 		}
 		// check if this was already prepared
 		if (!array_key_exists($stm_name, $this->prepare_cursor) || !is_array($this->prepare_cursor[$stm_name])) {
 			// if this is an insert query, check if we can add a return
-			if ($this->_check_query_for_insert($query, true)) {
+			if ($this->__checkQueryForInsert($query, true)) {
 				if ($pk_name != 'NULL') {
 					// set primary key name
 					// current: only via parameter
 					if (!$pk_name) {
 						// read the primary key from the table, if we do not have one, we get nothing in return
-						list($schema, $table) = $this->_db_return_table($query);
+						list($schema, $table) = $this->__dbReturnTable($query);
 						if (!$this->pk_name_table[$table]) {
-							$this->pk_name_table[$table] = $this->db_functions->_db_primary_key($table, $schema);
+							$this->pk_name_table[$table] = $this->db_functions->__dbPrimaryKey($table, $schema);
 						}
 						$pk_name = $this->pk_name_table[$table];
 					}
@@ -1360,14 +1423,14 @@ class db_io extends basic
 			preg_match_all('/(\$[0-9]{1,})/', $query, $match);
 			$this->prepare_cursor[$stm_name]['count'] = count($match[1]);
 			$this->prepare_cursor[$stm_name]['query'] = $query;
-			$result = $this->db_functions->_db_prepare($stm_name, $query);
+			$result = $this->db_functions->__dbPrepare($stm_name, $query);
 			if ($result) {
 				$this->prepare_cursor[$stm_name]['result'] = $result;
 				return $result;
 			} else {
 				$this->error_id = 21;
-				$this->_db_error();
-				$this->_db_debug('db', '<span style="color: red;"><b>DB-Error</b> '.$stm_name.': Prepare field with: '.$stm_name.' | '.$query.'</span>', 'DB_ERROR');
+				$this->__dbError();
+				$this->__dbDebug('db', '<span style="color: red;"><b>DB-Error</b> '.$stm_name.': Prepare field with: '.$stm_name.' | '.$query.'</span>', 'DB_ERROR');
 				return $result;
 			}
 		} else {
@@ -1377,47 +1440,48 @@ class db_io extends basic
 		}
 	}
 
-	// METHOD db_execute
-	// PARAMS $stm_name, data array
-	// RETURN false on error
-	// DESC   runs a prepare query
-	public function db_execute($stm_name, $data = array())
+	// METHOD: dbExecute
+	// WAS   : db_execute
+	// PARAMS: $stm_name, data array
+	// RETURN: false on error
+	// DESC  : runs a prepare query
+	public function dbExecute($stm_name, $data = array())
 	{
 		// if we do not have no prepare cursor array entry for this statement name, abort
 		if (!is_array($this->prepare_cursor[$stm_name])) {
 			$this->error_id = 24;
-			$this->_db_debug('db', '<span style="color: red;"><b>DB-Error</b> '.$stm_name.': We do not have a prepared query entry for this statement name.</span>', 'DB_ERROR');
+			$this->__dbDebug('db', '<span style="color: red;"><b>DB-Error</b> '.$stm_name.': We do not have a prepared query entry for this statement name.</span>', 'DB_ERROR');
 			return false;
 		}
 		if (!is_array($data)) {
 			$this->error_id = 25;
-			$this->_db_debug('db', '<span style="color: red;"><b>DB-Error</b> '.$stm_name.': Prepared query Data has to be given in array form.</span>', 'DB_ERROR');
+			$this->__dbDebug('db', '<span style="color: red;"><b>DB-Error</b> '.$stm_name.': Prepared query Data has to be given in array form.</span>', 'DB_ERROR');
 			return false;
 		}
 		if ($this->prepare_cursor[$stm_name]['count'] != count($data)) {
 			$this->error_id = 23;
-			$this->_db_debug('db', '<span style="color: red;"><b>DB-Error</b> '.$stm_name.': Array data count does not match prepared fields. Need: '.$this->prepare_cursor[$stm_name]['count'].', has: '.count($data).'</span>', 'DB_ERROR');
+			$this->__dbDebug('db', '<span style="color: red;"><b>DB-Error</b> '.$stm_name.': Array data count does not match prepared fields. Need: '.$this->prepare_cursor[$stm_name]['count'].', has: '.count($data).'</span>', 'DB_ERROR');
 			return false;
 		} else {
 			if ($this->db_debug) {
-				$this->_db_debug('db', $this->_db_debug_prepare($stm_name, $data), 'db_exec_prep', 'Q');
+				$this->__dbDebug('db', $this->__dbDebugPrepare($stm_name, $data), 'dbExecPrep', 'Q');
 			}
-			$code = $this->db_functions->_db_execute($stm_name, $data);
+			$code = $this->db_functions->__dbExecute($stm_name, $data);
 			if (!$code) {
 				$this->debug('ExecuteData', 'ERROR in STM['.$stm_name.'|'.$this->prepare_cursor[$stm_name]['result'].']: '.$this->print_ar($data));
 				$this->error_id = 22;
-				$this->_db_error($this->prepare_cursor[$stm_name]['result']);
-				$this->_db_debug('db', '<span style="color: red;"><b>DB-Error</b> '.$stm_name.': Execution failed</span>', 'DB_ERROR');
+				$this->__dbError($this->prepare_cursor[$stm_name]['result']);
+				$this->__dbDebug('db', '<span style="color: red;"><b>DB-Error</b> '.$stm_name.': Execution failed</span>', 'DB_ERROR');
 			}
-			if ($this->_check_query_for_insert($this->prepare_cursor[$stm_name]['query'], true) && $this->prepare_cursor[$stm_name]['pk_name'] != 'NULL') {
+			if ($this->__checkQueryForInsert($this->prepare_cursor[$stm_name]['query'], true) && $this->prepare_cursor[$stm_name]['pk_name'] != 'NULL') {
 				if (!$this->prepare_cursor[$stm_name]['returning_id']) {
-					$this->insert_id = $this->db_functions->_db_insert_id($this->prepare_cursor[$stm_name]['query'], $this->prepare_cursor[$stm_name]['pk_name']);
+					$this->insert_id = $this->db_functions->__dbInsertId($this->prepare_cursor[$stm_name]['query'], $this->prepare_cursor[$stm_name]['pk_name']);
 				} elseif ($code) {
 					$this->insert_id = array ();
 					$this->insert_id_ext = array ();
 					// we have returning, now we need to check if we get one or many returned
 					// we'll need to loop this, if we have multiple insert_id returns
-					while ($_insert_id = $this->db_functions->_db_fetch_array($code, PGSQL_ASSOC)) {
+					while ($_insert_id = $this->db_functions->__dbFetchArray($code, PGSQL_ASSOC)) {
 						$this->insert_id[] = $_insert_id;
 					}
 					// if we have only one, revert from arry to single
@@ -1433,63 +1497,67 @@ class db_io extends basic
 						} elseif ($this->insert_id[0][$this->prepare_cursor[$stm_name]['pk_name']]) {
 							$this->insert_id = $this->insert_id[0][$this->prepare_cursor[$stm_name]['pk_name']];
 						}
-					} else {
+					} elseif (count($this->insert_id) == 0) {
 						// failed to get insert id
 						$this->insert_id = '';
 						$this->warning_id = 33;
-						$this->_db_error();
-						$this->_db_debug('db', '<span style="color: orange;"><b>DB-Warning</b> '.$stm_name.': insert id returned no data</span>', 'DB_WARNING');
+						$this->__dbError();
+						$this->__dbDebug('db', '<span style="color: orange;"><b>DB-Warning</b> '.$stm_name.': insert id returned no data</span>', 'DB_WARNING');
 					}
 				}
 				// this error handling is only for pgsql
 				if (is_array($this->insert_id)) {
 					$this->warning_id = 32;
-					$this->_db_error();
-					$this->_db_debug('db', '<span style="color: orange;"><b>DB-Warning</b> '.$stm_name.': insert id data returned as array</span>', 'DB_WARNING');
+					$this->__dbError();
+					$this->__dbDebug('db', '<span style="color: orange;"><b>DB-Warning</b> '.$stm_name.': insert id data returned as array</span>', 'DB_WARNING');
 				} elseif (!$this->insert_id) {
 					// NOTE should we keep this inside
 					$this->warning_id = 31;
-					$this->_db_error();
-					$this->_db_debug('db', '<span style="color: orange;"><b>DB-Warning</b> '.$stm_name.': Could not get insert id</span>', 'DB_WARNING');
+					$this->__dbError();
+					$this->__dbDebug('db', '<span style="color: orange;"><b>DB-Warning</b> '.$stm_name.': Could not get insert id</span>', 'DB_WARNING');
 				}
 			}
 			return $code;
 		}
 	}
 
-	// METHOD db_escape_string
-	// PARAMS $string -> string to escape
-	// RETURN escaped string
-	// DESC   neutral function to escape a string for DB writing
-	public function db_escape_string($string)
+	// METHOD: dbEscapeString
+	// WAS   : db_escape_string
+	// PARAMS: $string -> string to escape
+	// RETURN: escaped string
+	// DESC  : neutral function to escape a string for DB writing
+	public function dbEscapeString($string)
 	{
-		return $this->db_functions->_db_escape_string($string);
+		return $this->db_functions->__dbEscapeString($string);
 	}
 
-	// METHOD db_escape_bytea
-	// PARAMS $bytea -> bytea to escape
-	// RETURN escaped bytea
-	// DESC   neutral function to escape a bytea for DB writing
-	public function db_escape_bytea($bytea)
+	// METHOD: dbEscapeBytea
+	// WAS   : db_escape_bytea
+	// PARAMS: $bytea -> bytea to escape
+	// RETURN: escaped bytea
+	// DESC  : neutral function to escape a bytea for DB writing
+	public function dbEscapeBytea($bytea)
 	{
-		return $this->db_functions->_db_escape_bytea($bytea);
+		return $this->db_functions->__dbEscapeBytea($bytea);
 	}
 
-	// METHOD db_version
-	// PARAMS none
-	// RETURN database version as string
-	// DESC   return current database version
-	public function db_version()
+	// METHOD: dbVersion
+	// WAS   : db_version
+	// PARAMS: none
+	// RETURN: database version as string
+	// DESC  : return current database version
+	public function dbVersion()
 	{
-		return $this->db_functions->_db_version();
+		return $this->db_functions->__dbVersion();
 	}
 
-	// METHOD db_compare_version
-	// PARAMS string to which the return will return true or false
+	// METHOD: dbCompareVersion
+	// WAS   : db_compare_version
+	// PARAMS: string to which the return will return true or false
 	//        =X.Y, >X.Y, <X.Y
-	// RETURN true/false
-	// DESC   returns boolean true or false if the string matches the database version
-	public function db_compare_version($compare)
+	// RETURN: true/false
+	// DESC  : returns boolean true or false if the string matches the database version
+	public function dbCompareVersion($compare)
 	{
 		// compare has =, >, < prefix, and gets stripped, if the rest is not X.Y format then error
 		preg_match("/^([<>=]{1,2})(\d{1,2})\.(\d{1,2})/", $compare, $matches);
@@ -1503,7 +1571,7 @@ class db_io extends basic
 		}
 		// db_version can return X.Y.Z
 		// we only compare the first two
-		list ($master, $minor, $_other) = explode('.', $this->db_version());
+		list ($master, $minor, $_other) = explode('.', $this->dbVersion());
 		$version = $master.($minor < 10 ? '0' : '').$minor;
 		$return = false;
 		// compare
@@ -1539,11 +1607,12 @@ class db_io extends basic
 		return $return;
 	}
 
-	// METHOD db_boolean
-	// PARAMS 't' / 'f' or any string
-	// RETURN correct php boolean true/false
-	// DESC   if the input is a single char 't' or 'f' it will return the boolean value instead
-	public function db_boolean($string, $rev = false)
+	// METHOD: dbBoolean
+	// WAS   : db_boolean
+	// PARAMS: 't' / 'f' or any string
+	// RETURN: correct php boolean true/false
+	// DESC  : if the input is a single char 't' or 'f' it will return the boolean value instead
+	public function dbBoolean($string, $rev = false)
 	{
 		if (!$rev) {
 			if ($string == 't' || $string == 'true') {
@@ -1567,14 +1636,15 @@ class db_io extends basic
 	// db_write_data is the old without separate update no write list
 	// db_write_data_ext is the extended with additional array for no write list for update
 
-	// METHOD: db_write_data
+	// METHOD: dbWriteData
+	// WAS   : db_write_data
 	// PARAMS: write_array -> list of elements to write
 	//         not_write_array -> list of elements not to write
 	//         primary_key -> id key to decide if we write insert or update
 	//         table -> name for the target table
 	// RETURN: primary key id
 	// DESC:   writes into one table based on array of table columns
-	public function db_write_data($write_array, $not_write_array, $primary_key, $table, $data = array ())
+	public function dbWriteData($write_array, $not_write_array, $primary_key, $table, $data = array ())
 	{
 		if (!is_array($write_array)) {
 			$write_array = array ();
@@ -1586,21 +1656,24 @@ class db_io extends basic
 			return false;
 		}
 		$not_write_update_array = array ();
-		return $this->db_write_data_ext($write_array, $primary_key, $table, $not_write_array, $not_write_update_array, $data);
+		return $this->dbWriteData_ext($write_array, $primary_key, $table, $not_write_array, $not_write_update_array, $data);
 	}
 
-	// METHOD: db_write_data_ext
+	// METHOD: dbWriteDataExt
+	// WAS   : db_write_data_ext
 	// PARAMS: write_array -> list of elements to write
 	//         primary_key -> id key to decide if we write insert or update
-	//                     -> alternate the primary key can be an array with 'row' => 'row name', 'value' => 'data' to use a different column as the primary key
+	//                     -> alternate the primary key can be an array with
+	//                        'row' => 'row name', 'value' => 'data' to use a
+	//                        different column as the primary key
 	//         table -> name for the target table
 	// (optional)
 	//         not_write_array -> list of elements not to write
 	//         not_write_update_array -> list of elements not to write during update
 	//         data -> optional array with data, if not _POST vars are used
 	// RETURN: primary key id
-	// DESC:   writes into one table based on array of table columns
-	public function db_write_data_ext($write_array, $primary_key, $table, $not_write_array = array (), $not_write_update_array = array (), $data = array ())
+	// DESC  : writes into one table based on array of table columns
+	public function dbWriteDataExt($write_array, $primary_key, $table, $not_write_array = array (), $not_write_update_array = array (), $data = array ())
 	{
 		if (!is_array($primary_key)) {
 			$primary_key = array (
@@ -1612,7 +1685,7 @@ class db_io extends basic
 		$q_sub_value = '';
 		$q_sub_data = '';
 		// get the table layout and row types
-		$table_data = $this->db_show_table_meta_data(($this->db_schema ? $this->db_schema.'.' : '').$table);
+		$table_data = $this->dbShowTableMetaData(($this->db_schema ? $this->db_schema.'.' : '').$table);
 		foreach ($write_array as $field) {
 			if ((!$primary_key['value'] || ($primary_key['value'] && !in_array($field, $not_write_update_array))) && !in_array($field, $not_write_array)) {
 				// data from external or data field
@@ -1656,7 +1729,7 @@ class db_io extends basic
 						$q_sub_data .= (is_numeric($_data) && isset($_data)) ? $_data : 'NULL';
 					} else {
 						// if bool -> set bool, else write data
-						$q_sub_data .= isset($_data) ? "'".($is_bool ? $this->db_boolean($_data, true) : $this->db_escape_string($_data))."'" : 'NULL';
+						$q_sub_data .= isset($_data) ? "'".($is_bool ? $this->dbBoolean($_data, true) : $this->dbEscapeString($_data))."'" : 'NULL';
 					}
 				}
 			}
@@ -1676,7 +1749,7 @@ class db_io extends basic
 			$q .= ')';
 			$this->temp_sql = $q;
 		}
-		if (!$this->db_exec($q)) {
+		if (!$this->dbExec($q)) {
 			return false;
 		}
 		if (!$primary_key['value']) {
@@ -1686,12 +1759,13 @@ class db_io extends basic
 		return $primary_key['value'];
 	}
 
-	// METHOD: db_time_format
+	// METHOD: dbTimeFormat
+	// WAS   : db_time_format
 	// PARAMS: age or datetime difference
 	//         micro on off (default false)
 	// RETURN: Y/M/D/h/m/s formatted string (like TimeStringFormat
-	// DESC:   only for postgres. pretty formats an age or datetime difference string
-	public function db_time_format($age, $show_micro = false)
+	// DESC  :   only for postgres. pretty formats an age or datetime difference string
+	public function dbTimeFormat($age, $show_micro = false)
 	{
 		// in string (datetime diff): 1786 days 22:11:52.87418
 		// or (age): 4 years 10 mons 21 days 12:31:11.87418
@@ -1708,21 +1782,23 @@ class db_io extends basic
 		return $prefix.($hour ? $hour.'h ' : '').($minutes ? $minutes.'m ' : '').($seconds ? $seconds.'s' : '').($show_micro && $milliseconds? ' '.$milliseconds.'ms' : '');
 	}
 
-	// METHOD: db_array_parse
+	// METHOD: dbArrayParse
+	// WAS   : db_array_parse
 	// PARAMS: text: input text to parse to an array
 	// RETURN: PHP array of the parsed data
-	// DESC:   this is only needed for Postgresql. Converts postgresql arrays to PHP
-	public function db_array_parse($text)
+	// DESC  : this is only needed for Postgresql. Converts postgresql arrays to PHP
+	public function dbArrayParse($text)
 	{
-		return $this->db_functions->_db_array_parse($text, $output);
+		return $this->db_functions->__dbArrayParse($text, $output);
 	}
 
-	// METHOD: db_sql_escape
+	// METHOD: dbSqlEscape
+	// WAS   : db_sql_escape
 	// PARAMS: value -> to escape data
-	//         kbn -> escape trigger type
+	//          kbn -> escape trigger type
 	// RETURN: escaped value
 	// DESC  : clear up any data for valid DB insert
-	public function db_sql_escape($value, $kbn = "")
+	public function dbSqlEscape($value, $kbn = "")
 	{
 		switch ($kbn) {
 			case "i":
@@ -1732,10 +1808,10 @@ class db_io extends basic
 				$value = (!isset($value) || $value === "") ? "NULL" : floatval($value);
 				break;
 			case "t":
-				$value = (!isset($value) || $value === "") ? "NULL" : "'".$this->db_escape_string($value)."'";
+				$value = (!isset($value) || $value === "") ? "NULL" : "'".$this->dbEscapeString($value)."'";
 				break;
 			case "d":
-				$value = (!isset($value) || $value === "") ? "NULL" : "'".$this->db_escape_string($value)."'";
+				$value = (!isset($value) || $value === "") ? "NULL" : "'".$this->dbEscapeString($value)."'";
 				break;
 			case "i2":
 				$value = (!isset($value) || $value === "") ? 0 : intval($value);
@@ -1743,4 +1819,274 @@ class db_io extends basic
 		}
 		return $value;
 	}
+
+	// *************************************************************
+	// COMPATIBILITY METHODS
+	// those methods are deprecated function call names
+	// they exist for backwards compatibility only
+	// *************************************************************
+
+	private function _connect_to_db()
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->__connectToDB();
+	}
+
+	private function _close_db()
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->__closeDB();
+	}
+
+	private function _check_query_for_select($query)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->__checkQueryForSelect($query);
+	}
+
+	private function _check_query_for_insert($query, $pure = false)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->__checkQueryForInsert($query, $pure);
+	}
+
+	private function _print_array($array)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->__printArray($array);
+	}
+
+	private function _db_debug($debug_id, $error_string, $id = '', $type = '')
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->__dbDebug($debug_id, $error_string, $id, $type);
+	}
+
+	public function _db_error($cursor = '', $msg = '')
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->__dbError($cursor, $msg);
+	}
+
+	private function _db_convert_encoding($row)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->__dbConvertEncoding($row);
+	}
+
+	private function _db_debug_prepare($stm_name, $data = array())
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->__dbDebugPrepare($stm_name, $data);
+	}
+
+	private function _db_return_table($query)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->__dbReturnTable($query);
+	}
+
+	private function _db_prepare_exec($query, $pk_name)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->__dbPrepareExec($query, $pk_name);
+	}
+
+	private function _db_post_exec()
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->__dbPostExec();
+	}
+
+	public function db_set_debug($debug = '')
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbSetDebug($debug);
+	}
+
+	public function db_reset_query_called($query)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbResetQueryCalled($query);
+	}
+
+	public function db_get_query_called($query)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbGetQueryCalled($query);
+	}
+
+	public function db_close()
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbClose();
+	}
+
+	public function db_set_schema($db_schema = '')
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbSetSchema($db_schema);
+	}
+
+	public function db_get_schema()
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbGetSchema();
+	}
+
+	public function db_set_encoding($db_encoding = '')
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbSetEncoding($db_encoding);
+	}
+
+	public function db_info($show = 1)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbInfo($show);
+	}
+
+	public function db_dump_data($query = 0)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbDumpData($query);
+	}
+
+	public function db_return($query, $reset = 0)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbReturn($query, $reset);
+	}
+
+	public function db_cache_reset($query)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbCacheReset($query);
+	}
+
+	public function db_exec($query = 0, $pk_name = '')
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbExec($query, $pk_name);
+	}
+
+	public function db_exec_async($query, $pk_name = '')
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbExecAsync($query, $pk_name);
+	}
+
+	public function db_check_async()
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbCheckAsync();
+	}
+
+	public function db_fetch_array($cursor = 0)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbFetchArray($cursor);
+	}
+
+	public function db_return_row($query)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbReturnRow($query);
+	}
+
+	public function db_return_array($query, $named_only = 0)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbReturnArray($query, $named_only);
+	}
+
+	public function db_cursor_pos($query)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbCursorPos($query);
+	}
+
+	public function db_cursor_num_rows($query)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbCursorNumRows($query);
+	}
+
+	public function db_show_table_meta_data($table, $schema = '')
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbShowTableMetaData($table, $schema);
+	}
+
+	public function db_prepare($stm_name, $query, $pk_name = '')
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbPrepare($stm_name, $query, $pk_name);
+	}
+
+	public function db_execute($stm_name, $data = array())
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbExecute($stm_name, $data);
+	}
+
+	public function db_escape_string($string)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbEscapeString($string);
+	}
+
+	public function db_escape_bytea($bytea)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbEscapeBytea($bytea);
+	}
+
+	public function db_version()
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbVersion();
+	}
+
+	public function db_compare_version($compare)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbCompareVersion($compare);
+	}
+
+	public function db_boolean($string, $rev = false)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbBoolean($string, $rev);
+	}
+
+	public function db_write_data($write_array, $not_write_array, $primary_key, $table, $data = array ())
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbWriteData($write_array, $not_write_array, $primary_key, $table, $data);
+	}
+
+	public function db_write_data_ext($write_array, $primary_key, $table, $not_write_array = array (), $not_write_update_array = array (), $data = array ())
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbWriteDataExt($write_array, $primary_key, $table, $not_write_array, $not_write_update_array, $data);
+	}
+
+	public function db_time_format($age, $show_micro = false)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbTimeFormat($age, $show_micro);
+	}
+
+	public function db_array_parse($text)
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbArrayParse($text);
+	}
+
+	public function db_sql_escape($value, $kbn = "")
+	{
+		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
+		return $this->dbSqlEscape($value, $kbn);
+	}
 } // end if db class
diff --git a/www/libs/db_pgsql.inc b/www/lib/CoreLibs/DB/SQL/PgSQL.inc
similarity index 76%
rename from www/libs/db_pgsql.inc
rename to www/lib/CoreLibs/DB/SQL/PgSQL.inc
index 13715d9c..bff0ce7e 100644
--- a/www/libs/db_pgsql.inc
+++ b/www/lib/CoreLibs/DB/SQL/PgSQL.inc
@@ -1,10 +1,14 @@
-<?
+<?php
 /*********************************************************************
 * AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
 * CREATED: 2003/04/09
 * SHORT DESCRIPTION:
+*   2018/3/23, the whole class system is transformed to namespaces
+*   also all internal class calls are converted to camel case
+*
 * pgsql wrapper calls
-* HISTORY:
+*
+*  HISTORY:
 * 2008/04/16 (cs) wrapper for pg escape string
 * 2007/01/11 (cs) add prepare/execute for postgres
 * 2006/09/12 (cs) in case db_query retuns false, save the query and run the query through the send/get procedure to get correct error data from the db
@@ -37,7 +41,9 @@
 *
 */
 
-class db_pgsql
+namespace CoreLibs\DB\SQL;
+
+class PgSQL
 {
 	private $last_error_query;
 	private $dbh;
@@ -50,7 +56,12 @@ class db_pgsql
 	{
 	}
 
-	public function _db_last_error_query()
+	// METHOD: __dbLastErrorQuery
+	// WAS   : _db_last_error_query
+	// PARAMS: none
+	// RETURN: true/false if last error is set
+	// DESC  : queries last error query and returns true or false if error was set
+	public function __dbLastErrorQuery()
 	{
 		if ($this->last_error_query) {
 			return true;
@@ -59,11 +70,12 @@ class db_pgsql
 		}
 	}
 
-	// METHOD: _db_query
+	// METHOD: __dbQuery
+	// WAS   : _db_query
 	// PARAMS: query
 	// RETURN: query result
 	// DESC  : wrapper for gp_query, catches error and stores it in class var
-	public function _db_query($query)
+	public function __dbQuery($query)
 	{
 		$this->last_error_query = '';
 		// read out the query status and save the query if needed
@@ -74,20 +86,22 @@ class db_pgsql
 		return $result;
 	}
 
-	// METHOD: _db_send_query
+	// METHOD: __dbSendQuery
+	// WAS   : _db_send_query
 	// PARAMS: query
 	// RETURN: true/false if query was sent successful
 	// DESC  : sends an async query to the server
-	public function _db_send_query($query)
+	public function __dbSendQuery($query)
 	{
 		return pg_send_query($this->dbh, $query);
 	}
 
-	// METHOD: _db_get_result
+	// METHOD: __dbGetResult
+	// WAS   : _db_get_result
 	// PARAMS: none
 	// RETURN: resource handler
 	// DESC  : wrapper for pg_get_result
-	public function _db_get_result()
+	public function __dbGetResult()
 	{
 		$this->last_error_query = '';
 		$result = pg_get_result($this->dbh);
@@ -97,11 +111,12 @@ class db_pgsql
 		return $result;
 	}
 
-	// METHOD: _db_close
+	// METHOD: __dbClose
+	// WAS   : _db_close
 	// PARAMS: none
 	// RETURN: none
 	// DESC  : wrapper for pg_close
-	public function _db_close()
+	public function __dbClose()
 	{
 		if (is_resource($this->dbh)) {
 			if (pg_connection_status($this->dbh) === PGSQL_CONNECTION_OK) {
@@ -110,11 +125,12 @@ class db_pgsql
 		}
 	}
 
-	// METHOD: _db_prepare
+	// METHOD: __dbPrepare
+	// WAS   : _db_prepare
 	// PARAMS: prepare name, query
 	// RETURN: prepared statement handler
 	// DESC  : wrapper for pg_prepare
-	public function _db_prepare($name, $query)
+	public function __dbPrepare($name, $query)
 	{
 		$result = pg_prepare($this->dbh, $name, $query);
 		if (!$result) {
@@ -123,11 +139,12 @@ class db_pgsql
 		return $result;
 	}
 
-	// METHOD: _db_execute
+	// METHOD: __dbExecute
+	// WAS   : _db_execute
 	// PARAMS: prepare name, data for query
 	// RETURN: returns status
 	// DESC  : wrapper for pg_execute for running a prepared statement
-	public function _db_execute($name, $data)
+	public function __dbExecute($name, $data)
 	{
 		$result = pg_execute($this->dbh, $name, $data);
 		if (!$result) {
@@ -136,38 +153,42 @@ class db_pgsql
 		return $result;
 	}
 
-	// METHOD: _db_num_rows
+	// METHOD: __dbNumRows
+	// WAS   : _db_num_rows
 	// PARAMS: cursor
 	// RETURN: rows
 	// DESC  : wrapper for pg_num_rows
-	public function _db_num_rows($cursor)
+	public function __dbNumRows($cursor)
 	{
 		return pg_num_rows($cursor);
 	}
 
-	// METHOD: _db_num_fields
+	// METHOD: __dbNumFields
+	// WAS   : _db_num_fields
 	// PARAMS: cursor
 	// RETURN: number for fields in query
 	// DESC  : wrapper for pg_num_fields
-	public function _db_num_fields($cursor)
+	public function __dbNumFields($cursor)
 	{
 		return pg_num_fields($cursor);
 	}
 
-	// METHOD: _db_field_name
+	// METHOD: __dbFieldName
+	// WAS   : _db_field_name
 	// PARAMS: cursor, field position
 	// RETURN: name of field
 	// DESC  : wrapper for pg_field_name
-	public function _db_field_name($cursor, $i)
+	public function __dbFieldName($cursor, $i)
 	{
 		return pg_field_name($cursor, $i);
 	}
 
-	// METHOD: _db_fetch_array
+	// METHOD: __dbFetchArray
+	// WAS   : _db_fetch_array
 	// PARAMS: cursor, opt result type
 	// RETURN: row
 	// DESC  : wrapper for pg_fetch_array
-	public function _db_fetch_array($cursor, $result_type = '')
+	public function __dbFetchArray($cursor, $result_type = '')
 	{
 		// result type is passed on as is [should be checked]
 		if ($result_type) {
@@ -177,32 +198,35 @@ class db_pgsql
 		}
 	}
 
-	// METHOD: _db_fetch_all
+	// METHOD: __dbFetchAll
+	// WAS   : _db_fetch_all
 	// PARAMS: cursor
 	// RETURN: all rows as array
 	// DESC  : wrapper for pg_fetch_array
-	public function _db_fetch_all($cursor)
+	public function __dbFetchAll($cursor)
 	{
 		return pg_fetch_all($cursor);
 	}
 
-	// METHOD: _db_affected_ros
+	// METHOD: __dbAffectedRows
+	// WAS   : _db_affected_rows
 	// PARAMS: cursor
 	// RETURN: number for rows
 	// DESC  : wrapper for pg_affected_rows
-	public function _db_affected_rows($cursor)
+	public function __dbAffectedRows($cursor)
 	{
 		return pg_affected_rows($cursor);
 	}
 
-	// METHOD: _db_insert_id
+	// METHOD: __dbInsertId
+	// WAS   : _db_insert_id
 	// PARAMS: query, primary key name
 	// RETURN: last insert primary key
 	// DESC  : reads the last inserted primary key for the query
 	//         if ther is no pk_name tries to auto built it from the table name
 	//         this only works if db schema is after "no plural names. and pk name is table name + _id
 	//         detects schema prefix in table name
-	public function _db_insert_id($query, $pk_name)
+	public function __dbInsertId($query, $pk_name)
 	{
 		// only if an insert has been done
 		if (preg_match("/^insert /i", $query)) {
@@ -227,8 +251,8 @@ class db_pgsql
 			$seq = (($schema) ? $schema.'.' : '').$table."_".$pk_name."_seq";
 			$q = "SELECT CURRVAL('$seq') AS insert_id";
 			// I have to do manually or I overwrite the original insert internal vars ...
-			if ($q = $this->_db_query($q)) {
-				list($id) = $this->_db_fetch_array($q);
+			if ($q = $this->__dbQuery($q)) {
+				list($id) = $this->__dbFetchArray($q);
 			} else {
 				$id = array(-1, $q);
 			}
@@ -236,19 +260,20 @@ class db_pgsql
 		}
 	}
 
-	// METHOD: _db_primary_key
+	// METHOD: __dbPrimaryKey
+	// WAS   : _db_primary_key
 	// PARAMS: table and optional schema
 	// RETURN: primary key name OR false if not possible
 	// DESC  : queries database for the primary key name to this table in the selected schema
-	public function _db_primary_key($table, $schema = '')
+	public function __dbPrimaryKey($table, $schema = '')
 	{
 		if ($table) {
 			// check if schema set is different from schema given, only needed if schema is not empty
 			$table_prefix = '';
 			if ($schema) {
 				$q = "SHOW search_path";
-				$cursor = $this->_db_query($q);
-				$search_path = $this->_db_fetch_array($cursor)['search_path'];
+				$cursor = $this->__dbQuery($q);
+				$search_path = $this->__dbFetchArray($cursor)['search_path'];
 				if ($search_path != $schema) {
 					$table_prefix = $schema.'.';
 				}
@@ -271,9 +296,9 @@ class db_pgsql
 			$q .= "pg_attribute.attrelid = pg_class.oid AND ";
 			$q .= "pg_attribute.attnum = any(pg_index.indkey) ";
 			$q .= "AND indisprimary";
-			$cursor = $this->_db_query($q);
+			$cursor = $this->__dbQuery($q);
 			if ($cursor) {
-				return $this->_db_fetch_array($cursor)['column_name'];
+				return $this->__dbFetchArray($cursor)['column_name'];
 			} else {
 				return false;
 			}
@@ -282,11 +307,12 @@ class db_pgsql
 		}
 	}
 
-	// METHOD: _db_connect
+	// METHOD: __dbConnect
+	// WAS   : _db_connect
 	// PARAMS: host name, user name, password, database name, optional port (defaults to default postgres port), optional ssl (default allow)
 	// RETURN: database handler
 	// DESC  : wrapper for pg_connect, writes out failure to screen if error occurs (hidden var)
-	public function _db_connect($db_host, $db_user, $db_pass, $db_name, $db_port = 5432, $db_ssl = 'allow')
+	public function __dbConnect($db_host, $db_user, $db_pass, $db_name, $db_port = 5432, $db_ssl = 'allow')
 	{
 		// to avoid empty db_port
 		if (!$db_port) {
@@ -299,11 +325,12 @@ class db_pgsql
 		return $this->dbh;
 	}
 
-	// METHOD: _db_print_error
+	// METHOD: __dbPrintError
+	// WAS   : _db_print_error
 	// PARAMS: database handler, cursor
 	// RETURN: error string (HTML)
 	// DESC  : reads the last error for this cursor
-	public function _db_print_error($cursor = '')
+	public function __dbPrintError($cursor = '')
 	{
 		// run the query again for the error result here
 		if (!$cursor && $this->last_error_query) {
@@ -316,47 +343,52 @@ class db_pgsql
 		}
 	}
 
-	// METHOD: _db_meta_data
+	// METHOD: __dbMetaData
+	// WAS   : _db_meta_data
 	// PARAMS: table name
 	// RETURN: array with table data
 	// DESC  : wrapper for pg_emta_data
-	public function _db_meta_data($table)
+	public function __dbMetaData($table)
 	{
 		return pg_meta_data($this->dbh, $table);
 	}
 
-	// METHOD: _db_escape_string
+	// METHOD: __dbEscapeString
+	// WAS   : _db_escape_string
 	// PARAMS: string
 	// RETURN: escaped string for postgres
 	// DESC  : wrapper for pg_escape_string
-	public function _db_escape_string($string)
+	public function __dbEscapeString($string)
 	{
 		return pg_escape_string($this->dbh, $string);
 	}
 
-	// METHOD: _db_escape_bytea
+	// METHOD: __dbEscapeBytea
+	// WAS   : _db_escape_bytea
 	// PARAMS: string
 	// RETURN: escape bytes for postgres
 	// DESC  : wrapper for pg_escape_bytea
-	public function _db_escape_bytea($bytea)
+	public function __dbEscapeBytea($bytea)
 	{
 		return pg_escape_bytea($this->dbh, $bytea);
 	}
 
-	// METHOD: _db_connection_busy
+	// METHOD: __dbConnectionBusy
+	// WAS   : _db_connection_busy
 	// PARAMS: none
 	// RETURN: true/false for busy connection
 	// DESC  : wrapper for pg_connection_busy
-	public function _db_connection_busy()
+	public function __dbConnectionBusy()
 	{
 		return pg_connection_busy($this->dbh);
 	}
 
-	// METHOD: _db_version
+	// METHOD: __dbVersion
+	// WAS   : _db_version
 	// PARAMS: none
 	// RETURN: databse version
 	// DESC  : wrapper for pg_version
-	public function _db_version()
+	public function __dbVersion()
 	{
 		// array has client, protocol, server
 		// we just need the server
@@ -364,13 +396,14 @@ class db_pgsql
 		return $v['server'];
 	}
 
-	// METHOD: _db_array_parse
+	// METHOD: __dbArrayParse
+	// WAS   : _db_array_parse
 	// PARAMS: input text, output array [needed]
 	//         [internal] limit: are we at the end of the parse
 	//         [internal] offset: shift for {}
 	// RETURN: array with the elements
 	// DESC  : postgresql array to php array
-	public function _db_array_parse($text, &$output, $limit = false, $offset = 1)
+	public function __dbArrayParse($text, &$output, $limit = false, $offset = 1)
 	{
 		if (false === $limit) {
 			$limit = strlen($text) - 1;
@@ -393,3 +426,5 @@ class db_pgsql
 		return $output;
 	}
 }
+
+# __END__
diff --git a/www/lib/CoreLibs/Language/Core/CachedFileReader.inc b/www/lib/CoreLibs/Language/Core/CachedFileReader.inc
new file mode 100755
index 00000000..a2245e5e
--- /dev/null
+++ b/www/lib/CoreLibs/Language/Core/CachedFileReader.inc
@@ -0,0 +1,48 @@
+<?php
+
+/*
+	Copyright (c) 2003, 2005, 2006, 2009 Danilo Segan <danilo@kvota.net>.
+
+	This file is part of PHP-gettext.
+
+	PHP-gettext is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	PHP-gettext is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with PHP-gettext; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+namespace CoreLibs\Language\Core;
+
+// Preloads entire file in memory first, then creates a StringReader
+// over it (it assumes knowledge of StringReader internals)
+class CachedFileReader extends CoreLibs\Language\Core\StringReader
+{
+	public function __construct($filename)
+	{
+		if (file_exists($filename)) {
+			$length = filesize($filename);
+			$fd = fopen($filename, 'rb');
+
+			if (!$fd) {
+				$this->error = 3; // Cannot read file, probably permissions
+				return false;
+			}
+			$this->_str = fread($fd, $length);
+			fclose($fd);
+		} else {
+			$this->error = 2; // File doesn't exist
+			return false;
+		}
+	}
+}
+
+# __END__
diff --git a/www/lib/CoreLibs/Language/Core/FileReader.inc b/www/lib/CoreLibs/Language/Core/FileReader.inc
new file mode 100755
index 00000000..bfbdba78
--- /dev/null
+++ b/www/lib/CoreLibs/Language/Core/FileReader.inc
@@ -0,0 +1,91 @@
+<?php
+
+/*
+	Copyright (c) 2003, 2005, 2006, 2009 Danilo Segan <danilo@kvota.net>.
+
+	This file is part of PHP-gettext.
+
+	PHP-gettext is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	PHP-gettext is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with PHP-gettext; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+namespace CoreLibs\Language\Core;
+
+class FileReader
+{
+	public $fr_pos;
+	public $fr_fd;
+	public $fr_length;
+
+	public function __construct($filename)
+	{
+		if (file_exists($filename)) {
+			$this->fr_length = filesize($filename);
+			$this->fr_pos = 0;
+			$this->fr_fd = fopen($filename, 'rb');
+			if (!$this->fr_fd) {
+				$this->error = 3; // Cannot read file, probably permissions
+				return false;
+			}
+		} else {
+			$this->error = 2; // File doesn't exist
+			return false;
+		}
+	}
+
+	public function read($bytes)
+	{
+		if ($bytes) {
+			fseek($this->fr_fd, $this->fr_pos);
+
+			// PHP 5.1.1 does not read more than 8192 bytes in one fread()
+			// the discussions at PHP Bugs suggest it's the intended behaviour
+			$data = '';
+			while ($bytes > 0) {
+				$chunk = fread($this->fr_fd, $bytes);
+				$data .= $chunk;
+				$bytes -= strlen($chunk);
+			}
+			$this->fr_pos = ftell($this->fr_fd);
+
+			return $data;
+		} else {
+			return '';
+		}
+	}
+
+	public function seekto($pos)
+	{
+		fseek($this->fr_fd, $pos);
+		$this->fr_pos = ftell($this->fr_fd);
+		return $this->fr_pos;
+	}
+
+	public function currentpos()
+	{
+		return $this->fr_pos;
+	}
+
+	public function length()
+	{
+		return $this->fr_length;
+	}
+
+	public function close()
+	{
+		fclose($this->fr_fd);
+	}
+}
+
+# __END__
diff --git a/www/libs/gettext.php b/www/lib/CoreLibs/Language/Core/GetTextReader.inc
old mode 100644
new mode 100755
similarity index 99%
rename from www/libs/gettext.php
rename to www/lib/CoreLibs/Language/Core/GetTextReader.inc
index 71a2fddb..f0f77eaa
--- a/www/libs/gettext.php
+++ b/www/lib/CoreLibs/Language/Core/GetTextReader.inc
@@ -20,6 +20,8 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+namespace CoreLibs\Language\Core;
+
 /**
 * Provides a simple gettext replacement that works independently from
 * the system's gettext abilities.
@@ -32,7 +34,7 @@
 * second parameter in the constructor (e.g. whenusing very large MO files
 * that you don't want to keep in memory)
 */
-class gettext_reader
+class GetTextReader
 {
 	// public:
 	public $error = 0; // public variable that holds error code (0 if no error)
@@ -454,3 +456,5 @@ class gettext_reader
 		}
 	}
 }
+
+# __END__
\ No newline at end of file
diff --git a/www/lib/CoreLibs/Language/Core/StreamReader.inc b/www/lib/CoreLibs/Language/Core/StreamReader.inc
new file mode 100755
index 00000000..805db260
--- /dev/null
+++ b/www/lib/CoreLibs/Language/Core/StreamReader.inc
@@ -0,0 +1,54 @@
+<?php
+
+/*
+	Copyright (c) 2003, 2005, 2006, 2009 Danilo Segan <danilo@kvota.net>.
+
+	This file is part of PHP-gettext.
+
+	PHP-gettext is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	PHP-gettext is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with PHP-gettext; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+namespace CoreLibs\Language\Core;
+
+// Simple class to wrap file streams, string streams, etc.
+// seek is essential, and it should be byte stream
+class StreamReader
+{
+	// should return a string [FIXME: perhaps return array of bytes?]
+	public function read($bytes)
+	{
+		return false;
+	}
+
+	// should return new position
+	public function seekto($position)
+	{
+		return false;
+	}
+
+	// returns current position
+	public function currentpos()
+	{
+		return false;
+	}
+
+	// returns length of entire stream (limit for seekto()s)
+	public function length()
+	{
+		return false;
+	}
+}
+
+# __END__
diff --git a/www/lib/CoreLibs/Language/Core/StringReader.inc b/www/lib/CoreLibs/Language/Core/StringReader.inc
new file mode 100755
index 00000000..e1c63818
--- /dev/null
+++ b/www/lib/CoreLibs/Language/Core/StringReader.inc
@@ -0,0 +1,67 @@
+<?php
+
+/*
+	Copyright (c) 2003, 2005, 2006, 2009 Danilo Segan <danilo@kvota.net>.
+
+	This file is part of PHP-gettext.
+
+	PHP-gettext is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	PHP-gettext is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with PHP-gettext; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+namespace CoreLibs\Language\Core;
+
+class StringReader
+{
+	public $sr_pos;
+	public $sr_str;
+
+	public function __construct($str = '')
+	{
+		$this->sr_str = $str;
+		$this->sr_pos = 0;
+	}
+
+	public function read($bytes)
+	{
+		$data = substr($this->sr_str, $this->sr_pos, $bytes);
+		$this->sr_pos += $bytes;
+		if (strlen($this->sr_str) < $this->sr_pos) {
+			$this->sr_pos = strlen($this->sr_str);
+		}
+
+		return $data;
+	}
+
+	public function seekto($pos)
+	{
+		$this->sr_pos = $pos;
+		if (strlen($this->sr_str) < $this->sr_pos) {
+			$this->sr_pos = strlen($this->sr_str);
+		}
+		return $this->sr_pos;
+	}
+
+	public function currentpos()
+	{
+		return $this->sr_pos;
+	}
+
+	public function length()
+	{
+		return strlen($this->sr_str);
+	}
+}
+
+# __END__
diff --git a/www/libs/Class.l10n.inc b/www/lib/CoreLibs/Language/L10n.inc
similarity index 81%
rename from www/libs/Class.l10n.inc
rename to www/lib/CoreLibs/Language/L10n.inc
index 7b22cefd..e511a2b0 100644
--- a/www/libs/Class.l10n.inc
+++ b/www/lib/CoreLibs/Language/L10n.inc
@@ -1,8 +1,8 @@
-<?
+<?php
 /*********************************************************************
 * AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
 * CREATED: 2004/11/18
-* VERSION: 0.1.1
+* VERSION: 1.0.0
 * RELEASED LICENSE: GNU GPL 3
 * SHORT DESCRIPTION:
 * 	init class for gettext. Original was just a function & var setting include for wordpress.
@@ -14,7 +14,7 @@
 *
 * PUBLIC METHODS
 *	__:	returns string (translated or original if not found)
-*	_e:	echos out string (translated or original if not found)
+*	__e: echos out string (translated or original if not found)
 *	__ngettext:	should return plural. never tested this.
 *
 *   PRIVATE METHODS
@@ -23,10 +23,12 @@
 * 2005/10/17 (cs) made an on the fly switch method (reload of lang)
 *********************************************************************/
 
-// try to include file from LIBS path, or from normal path
-_spl_autoload('Class.Basic.inc');
+namespace CoreLibs\Language;
 
-class l10n extends basic
+use \CoreLibs\Language\Core\FileReader;
+use \CoreLibs\Language\Core\GetTextReader;
+
+class L10n extends \CoreLibs\Basic
 {
 	private $lang = '';
 	private $mofile = '';
@@ -35,10 +37,6 @@ class l10n extends basic
 
 	public function __construct($lang = '', $path = DEFAULT_TEMPLATE)
 	{
-		foreach (array('streams.php', 'gettext.php') as $include_file) {
-			_spl_autoload($include_file);
-		}
-
 		if (!$lang) {
 			$this->lang = 'en';
 		} else {
@@ -60,7 +58,7 @@ class l10n extends basic
 			$this->input = false;
 		}
 
-		$this->l10n = new gettext_reader($this->input);
+		$this->l10n = new GetTextReader($this->input);
 	}
 
 	// reloads the mofile, if the location of the lang file changes
@@ -82,7 +80,7 @@ class l10n extends basic
 		// check if get a readable mofile
 		if (is_readable($this->mofile)) {
 			$this->input = new FileReader($this->mofile);
-			$this->l10n = new gettext_reader($this->input);
+			$this->l10n = new GetTextReader($this->input);
 		} else {
 			// else fall back to the old ones
 			$this->mofile = $old_mofile;
@@ -95,7 +93,7 @@ class l10n extends basic
 		return $this->l10n->translate($text);
 	}
 
-	public function _e($text)
+	public function __e($text)
 	{
 		echo $this->l10n->translate($text);
 	}
@@ -106,12 +104,12 @@ class l10n extends basic
 		return $this->l10n->ngettext($single, $plural, $number);
 	}
 
-	public function __get_lang()
+	public function __getLang()
 	{
 		return $this->lang;
 	}
 
-	public function __get_mofile()
+	public function __getMoFile()
 	{
 		return $this->mofile;
 	}
diff --git a/www/libs/Class.Form.Generate.inc b/www/lib/CoreLibs/Output/Form/Generate.inc
similarity index 87%
rename from www/libs/Class.Form.Generate.inc
rename to www/lib/CoreLibs/Output/Form/Generate.inc
index 00eed11c..e78e5994 100644
--- a/www/libs/Class.Form.Generate.inc
+++ b/www/lib/CoreLibs/Output/Form/Generate.inc
@@ -1,8 +1,8 @@
-<?
+<?php
 /********************************************************************
 * AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
 * CREATED: 2002/10/22
-* VERSION: 2.4.9
+* VERSION: 3.0.0
 * RELEASED LICENSE: GNU GPL 3
 * SHORT DESCRIPTION:
 *   ~ 2003/02/26: decided to move away from single class and change this
@@ -210,10 +210,9 @@
 *               save data, loads data, etc
 *********************************************************************/
 
-// try to include file from LIBS path, or from normal path
-_spl_autoload('Class.DB.Array.IO.inc');
+namespace CoreLibs\Output\Form;
 
-class form extends db_array_io
+class Generate extends \CoreLibs\DB\Extended\ArrayIO
 {
 	// rest
 	public $field_array = array (); // for the load statetment describes which elements from the load query should be shown and i which format
@@ -244,23 +243,20 @@ class form extends db_array_io
 	// now some default error msgs (english)
 	public $language_array = array ();
 
-	// METHOD constructor
-	// PARAMS $db_config -> connect to DB
-	//        $lang -> language code ("en", "ja", etc)
-	//        $table_width -> width of table
-	//        $db_debug -> turns db_io debug on/off (DB_DEBUG as global var does the same)
+	// METHOD: constructor
+	// PARAMS: $db_config -> connect to DB
+	//         $lang -> language code ("en", "ja", etc)
+	//         $table_width -> width of table
+	//         $db_debug -> turns db_io debug on/off (DB_DEBUG as global var does the same)
 	public function __construct($db_config, $lang, $table_width = 750, $debug = 0, $db_debug = 0, $echo = 1, $print = 0)
 	{
-		$this->my_page_name = $this->get_page_name(1);
+		$this->my_page_name = $this->getPageName(1);
 		// init the language class
-		_spl_autoload('Class.l10n.inc');
-		$this->l = new l10n($lang);
+		$this->l = new \CoreLibs\Language\L10n($lang);
 		// load config array
 		// get table array definitions for current page name
 		// WARNING: auto spl load does not work with this as it is an array and not a function/object
-//			$flag = _spl_autoload('array_'.$this->my_page_name.'.inc');
 		include(TABLE_ARRAYS."array_".$this->my_page_name.".inc");
-
 		$config_array = ${$this->my_page_name};
 
 		// start the array_io class which will start db_io ...
@@ -309,14 +305,14 @@ class form extends db_array_io
 		// internal
 		$this->class_info["form"] = array(
 			"class_name" => "Form create",
-			"class_version" => "2.4.9",
+			"class_version" => "3.0.0",
 			"class_created" => "2002-10-22",
-			"class_author" => "cs/gullevek/at"
+			"class_author" => "Clemens Schwaighofer"
 		);
 	}
 
 	// dumps all values into output (for error msg)
-	public function form_dump_table_array()
+	public function formDumpTableArray()
 	{
 		if (!is_array($this->table_array)) {
 			$this->table_array = array ();
@@ -338,49 +334,14 @@ class form extends db_array_io
 		parent::__destruct();
 	}
 
-	/*****************************************************
-		Along here are wrapper functions for the former, old names
-	*/
-
-	public function form_load()
-	{
-		return $this->form_create_load();
-	}
-
-	public function form_new($hide_new_checkbox = 0)
-	{
-		return $this->form_create_new($hide_new_checkbox);
-	}
-
-	public function form_delete_save($hide_delete = 0, $hide_delete_checkbox = 0)
-	{
-		return $this->form_create_save_delete($hide_delete, $hide_delete_checkbox);
-	}
-
-	public function form_error_msg()
-	{
-		return $this->form_print_msg();
-	}
-
-	public function form_show_reference_table($table_name)
-	{
-		return $this->form_create_element_reference_table($table_name);
-	}
-
-	public function form_show_list_table($table_name)
-	{
-		return $this->form_create_element_list_table($table_name);
-	}
-
-	// END wrapper
-
-	// METHOD form_get_col_name_from_key
-	// PARAMS $want_key: the key where u want the data from
-	//        $key_value: if set searches for special right value
-	// RETURN the value of the $want_key array field
-	//        works only with fields that appear only ONCE
-	//        if multiple gets only FIRST
-	public function form_get_col_name_from_key($want_key, $key_value = "")
+	// METHOD: formGetColNameFromKey
+	// WAS   : form_get_col_name_from_key
+	// PARAMS: $want_key: the key where u want the data from
+	//         $key_value: if set searches for special right value
+	// RETURN: the value of the $want_key array field
+	//         works only with fields that appear only ONCE
+	//         if multiple gets only FIRST
+	public function formGetColNameFromKey($want_key, $key_value = "")
 	{
 		if (!is_array($this->table_array)) {
 			$this->table_array = array ();
@@ -395,11 +356,12 @@ class form extends db_array_io
 		}
 	}
 
-	// METHOD form_get_col_name_array_from_key
-	// PARAMS $want_key: the key where u want the data from
-	//        $key_value: if set searches for special right value
-	// RETURN array of fields
-	public function form_get_col_name_array_from_key($want_key, $key_value = "")
+	// METHOD: formGetColNameArrayFromKey
+	// WAS   : form_get_col_name_array_from_key
+	// PARAMS: $want_key: the key where u want the data from
+	//         $key_value: if set searches for special right value
+	// RETURN: array of fields
+	public function formGetColNameArrayFromKey($want_key, $key_value = "")
 	{
 		$key_array = array();
 		if (!is_array($this->table_array)) {
@@ -417,10 +379,11 @@ class form extends db_array_io
 		return $key_array;
 	}
 
-	// METHOD form_print_msg
-	// PARAMS none
-	// RETURN formated output for the error && warning msg
-	public function form_print_msg()
+	// METHOD: formPrintMsg
+	// WAS   : form_print_msg
+	// PARAMS: none
+	// RETURN: formated output for the error && warning msg
+	public function formPrintMsg()
 	{
 		if ($this->error) {
 			$class = "error";
@@ -432,27 +395,29 @@ class form extends db_array_io
 	}
 
 	// next for functions are pre_test fkts for easier default new,load, etc handling
-	// METHOD form_procedure_load
-	// PARAMS archive_id - which ID should be loaded
-	// RETURN none
-	// DESC   default load procedure
-	public function form_procedure_load($archive_id)
+	// METHOD: formProcedureLoad
+	// WAS   : form_procedure_load
+	// PARAMS: archive_id - which ID should be loaded
+	// RETURN: none
+	// DESC  : default load procedure
+	public function formProcedureLoad($archive_id)
 	{
 		if ($this->archive && $archive_id && $this->group_level_user <= $this->security_level["load"]) {
-			$this->form_load_table_array($archive_id);
+			$this->formLoadTableArray($archive_id);
 			$this->yes = 1;
 		}
 	}
 
-	// METHOD form_procedure_new
-	// PARAMS none
-	// RETURN none
-	// DESC   default new procedure
-	public function form_procedure_new()
+	// METHOD: formProcedureNew
+	// WAS   : form_procedure_new
+	// PARAMS: none
+	// RETURN: none
+	// DESC  : default new procedure
+	public function formProcedureNew()
 	{
 		if ($this->new && $this->group_level_user <= $this->security_level["new"]) {
 			if ($this->really_new == "yes") {
-				$this->form_unset_table_array();
+				$this->formUnsetTablearray();
 			} else {
 				$this->msg .= $this->l->__("You have to select the <b>Checkbox for New</b>!<br>");
 				$this->error = 2;
@@ -461,26 +426,28 @@ class form extends db_array_io
 		}
 	}
 
-	// METHOD form_procedure_save
-	// PARAMS none
-	// RETURN none
-	// DESC   default save procedure
-	public function form_procedure_save()
+	// METHOD: formProcedureSave
+	// WAS   : form_procedure_save
+	// PARAMS: none
+	// RETURN: none
+	// DESC  : default save procedure
+	public function formProcedureSave()
 	{
 		if ($this->save && $this->group_level_user <= $this->security_level["save"]) {
-			$this->form_error_check();
+			$this->formErrorCheck();
 			if (!$this->error) {
-				$this->form_save_table_array();
+				$this->formSaveTableArray();
 			}
 			$this->yes = 1;
 		}
 	}
 
-	// METHOD form_procedure_delete
-	// PARAMS none
-	// RETURN none
-	// DESC   default delete procedure
-	public function form_procedure_delete()
+	// METHOD: formProcedureDelete
+	// WAS   : form_procedure_delete
+	// PARAMS: none
+	// RETURN: none
+	// DESC  : default delete procedure
+	public function formProcedureDelete()
 	{
 		// delete is also by "protected"
 		if ($this->delete && $this->group_level_user <= $this->security_level["delete"] && !$this->table_array["protected"]["value"]) {
@@ -489,7 +456,7 @@ class form extends db_array_io
 				$this->error = 2;
 			}
 			if ($this->really_delete == "yes") {
-				$this->form_delete_table_array();
+				$this->formDeleteTableArray();
 			} else {
 				$this->msg .= $this->l->__("You have to select the <b>Checkbox for Delete</b>!<br>");
 				$this->error = 2;
@@ -498,16 +465,17 @@ class form extends db_array_io
 		}
 	}
 
-	// METHOD form_procedure_delete_from_element_list
-	// PARAMS none
-	// RETURN none
-	// DESC   default delete procedure
-	public function form_procedure_delete_from_element_list($element_list, $remove_name)
+	// METHOD: formProcedureDeleteFromElementList
+	// WAS   : form_procedure_delete_from_element_list
+	// PARAMS: none
+	// RETURN: none
+	// DESC  : default delete procedure
+	public function formProcedureDeleteFromElementList($element_list, $remove_name)
 	{
 		// only do if the user is allowed to delete
 		if ($this->group_level_user <= $this->security_level["delete"] && !$this->table_array["protected"]["value"] && !$this->error) {
 			for ($i = 0; $i < count($element_list); $i ++) {
-//$this->debug('form_error', "Array: ".is_array($this->element_list[$element_list[$i]]["read_data"])." | ".$this->element_list[$element_list[$i]]["delete"]);
+				// $this->debug('form_error', "Array: ".is_array($this->element_list[$element_list[$i]]["read_data"])." | ".$this->element_list[$element_list[$i]]["delete"]);
 				// if prefix, set it
 				$prfx = ($this->element_list[$element_list[$i]]["prefix"]) ? $this->element_list[$element_list[$i]]["prefix"]."_" : '';
 				// get the primary key
@@ -524,7 +492,7 @@ class form extends db_array_io
 
 					if ($_POST[$flag] == "true") {
 						$q = "DELETE FROM ".$element_list[$i]." WHERE ".$pk_name." = ".$_POST[$id];
-						$this->db_exec($q);
+						$this->dbExec($q);
 						$this->msg .= $this->l->__("Removed entry from list<br>");
 						$this->warning = 1;
 					} // post okay true -> delete
@@ -534,20 +502,20 @@ class form extends db_array_io
 						if (!$_POST[$remove_name[$i]][$j]) {
 							$q = "UPDATE ".$element_list[$i]." WHERE ".$pk_name." = ".$_POST[$prfx.$pk_name][$j];
 							// $this->debug('edit_db', "UP: $q");
-							// $this->db_exec($q);
+							// $this->dbExec($q);
 							$this->msg .= $this->l->__("Disabled deselected entries from list<br>");
 							$this->warning = 1;
 						}
 					}
 				} elseif (is_array($this->element_list[$element_list[$i]]["read_data"]) && $this->element_list[$element_list[$i]]["delete"]) {
-//$this->debug('form_clean', "ID [$id] [$prfx.$pk_name]");
-//$this->debug('form_clean', "ID arr: ".$this->print_ar($_POST[$id]));
-//$this->debug('form_clean', "PK arr: ".$this->print_ar($_POST[$prfx.$pk_name]));
+					// $this->debug('form_clean', "ID [$id] [$prfx.$pk_name]");
+					// $this->debug('form_clean', "ID arr: ".$this->print_ar($_POST[$id]));
+					// $this->debug('form_clean', "PK arr: ".$this->print_ar($_POST[$prfx.$pk_name]));
 					for ($j = 0; $j < count($_POST[$prfx.$pk_name]); $j ++) {
 						if (!$_POST[$remove_name[$i]][$j] && $_POST[$prfx.$pk_name][$j]) {
 							$q = "DELETE FROM ".$element_list[$i]." WHERE ".$pk_name." = ".$_POST[$prfx.$pk_name][$j];
-//								$this->debug('edit_db', "DEL: $q");
-							$this->db_exec($q);
+							// $this->debug('edit_db', "DEL: $q");
+							$this->dbExec($q);
 							$this->msg .= $this->l->__("Deleted deselected entries from list<br>");
 							$this->warning = 1;
 						}
@@ -560,17 +528,18 @@ class form extends db_array_io
 		}
 	}
 
-	// METHOD form_create_load
-	// PARAMS none
-	// RETURN string from "load" part of form ...
-	public function form_create_load()
+	// METHOD: formCreateLoad
+	// WAS   : form_create_load
+	// PARAMS: none
+	// RETURN: string from "load" part of form ...
+	public function formCreateLoad()
 	{
 		// when security leve is okay ...
 		if ($this->group_level_user <= $this->security_level["load"]) {
 			$t_pk_name = $this->archive_pk_name;
 
 			// lade liste
-			$this->db_exec($this->load_query);
+			$this->dbExec($this->load_query);
 			while ($res = $this->db_fetch_array()) {
 				$pk_ids[] = $res[$this->int_pk_name];
 				if ($res[$this->int_pk_name] == $this->table_array[$this->int_pk_name]["value"]) {
@@ -590,19 +559,17 @@ class form extends db_array_io
 						$t_string .= $res[$this->field_array[$i]["name"]];
 					}
 				}
-/*
-//<? echo $res["question"]." (Lang: ".$res["lang_name"].", Freigeschalten: ".ucfirst($res["enabled"]?"ja":"nein").")"; ?>
-*/
 				$pk_names[] = $t_string;
 			}
 		} // show it at all
 		return array('t_pk_name' => $t_pk_name, 'pk_ids' => $pk_ids, 'pk_names' => $pk_names, 'pk_selected' => $pk_selected);
 	}
 
-	// METHOD form_create_new
-	// PARAMS none
-	// RETURN part for new
-	public function form_create_new($hide_new_checkbox = 0)
+	// METHOD: formCreateNew
+	// WAS   : form_create_new
+	// PARAMS: none
+	// RETURN: part for new
+	public function formCreateNew($hide_new_checkbox = 0)
 	{
 		// when security level is okay
 		if ($this->group_level_user <= $this->security_level["new"]) {
@@ -619,10 +586,11 @@ class form extends db_array_io
 		return array('new_name' => $new_name, 'show_checkbox' => $show_checkbox);
 	}
 
-	// METHOD form_create_save_delete
-	// PARAMS none
-	// RETURN string for delete / save part
-	public function form_create_save_delete($hide_delete = 0, $hide_delete_checkbox = 0)
+	// METHOD: formCreateSaveDelete
+	// WAS   : form_create_save_delete
+	// PARAMS: none
+	// RETURN: string for delete / save part
+	public function formCreateSaveDelete($hide_delete = 0, $hide_delete_checkbox = 0)
 	{
 		if ($this->group_level_user <= $this->security_level["save"] || $this->group_level_user <= $this->security_level["delete"]) {
 			$old_school_hidden = 0;
@@ -647,13 +615,14 @@ class form extends db_array_io
 		return array('seclevel_okay' => $seclevel_okay, 'save' => $save, 'pk_name' => $pk_name, 'pk_value' => $pk_value, 'show_delete' => $show_delete, 'hide_delete_checkbox' => $hide_delete_checkbox);
 	} // end of function
 
-	// METHOD form_create_element
-	// PARAMS $element_name: the name from the array, you want to have build
-	//        $query: can overrule internal query data,
-	//                for drop down, as data comes from a reference table
-	//                for drop_down_text it has to be an array with $key->$value
-	// RETURN element in HTML
-	public function form_create_element($element_name, $query = "")
+	// METHOD: formCreateElement
+	// WAS   : form_create_element
+	// PARAMS: $element_name: the name from the array, you want to have build
+	//         $query: can overrule internal query data,
+	//                 for drop down, as data comes from a reference table
+	//                 for drop_down_text it has to be an array with $key->$value
+	// RETURN: element in HTML
+	public function formCreateElement($element_name, $query = "")
 	{
 		// special 2nd color for "binary" attribut
 		if ($this->table_array[$element_name]["type"] == "binary" && !$this->table_array[$element_name]["value"]) {
@@ -824,13 +793,14 @@ class form extends db_array_io
 		return array('output_name' => $output_name, 'color' => $EDIT_FGCOLOR_T, 'type' => $type, 'data' => $data);
 	}
 
-	// METHOD form_error_check
-	// PARAMS none
-	// RETURNS full error message string for output
+	// METHOD: formErrorCheck
+	// WAS   : form_error_check
+	// PARAMS: none
+	// RETURN: full error message string for output
 	//         should be cought like this ...
 	//         if ($msg=$form->form_error_check())
 	//           $error=1;
-	public function form_error_check()
+	public function formErrorCheck()
 	{
 		if (!is_array($this->table_array)) {
 			$this->table_array = array ();
@@ -841,7 +811,7 @@ class form extends db_array_io
 			// if error value set && somethign input, check if input okay
 			if ($value["error_check"] && $this->table_array[$key]["value"]) {
 				// each error check can be a piped seperated value, lets split it
-//$this->debug('edit', $value["error_check"]);
+				// $this->debug('edit', $value["error_check"]);
 				foreach (explode('|', $value["error_check"]) as $error_check) {
 					switch ($error_check) {
 						case "number":
@@ -878,7 +848,7 @@ class form extends db_array_io
 							if ($this->table_array[$this->int_pk_name]["value"]) {
 								$q .= " AND ".$this->int_pk_name." <> ".$this->table_array[$this->int_pk_name]["value"];
 							}
-							list($$key) = $this->db_return_row($q);
+							list($$key) = $this->dbReturnRow($q);
 							if ($$key) {
 								$this->msg .= sprintf($this->l->__("The field <b>%s</b> can be used only once!<br>"), $this->table_array[$key]["output_name"]);
 							}
@@ -889,20 +859,20 @@ class form extends db_array_io
 							}
 							break;
 						case "alphanumericspace":
-//$this->debug('edit', 'IN Alphanumericspace');
+							// $this->debug('edit', 'IN Alphanumericspace');
 							if (!preg_match("/^[0-9A-Za-z\ ]+$/", $this->table_array[$key]["value"])) {
 								$this->msg .= sprintf($this->l->__("Please enter a valid alphanumeric (Numbers and Letters, spaces allowed) value for the <b>%s</b> Field!<br>"), $this->table_array[$key]["output_name"]);
 							}
 							break;
 						case "alphanumeric":
-//$this->debug('edit', 'IN Alphanumeric');
+							// $this->debug('edit', 'IN Alphanumeric');
 							if (!preg_match("/^[0-9A-Za-z_\-]+$/", $this->table_array[$key]["value"])) {
 								$this->msg .= sprintf($this->l->__("Please enter a valid alphanumeric (Numbers and Letters only also - and _, no spaces) value for the <b>%s</b> Field!<br>"), $this->table_array[$key]["output_name"]);
 							}
 							break;
 						// this one also allows @ and .
 						case "alphanumericextended":
-//$this->debug('edit', 'IN Alphanumericextended');
+							// $this->debug('edit', 'IN Alphanumericextended');
 							if (!preg_match("/^[0-9A-Za-z_\-@\.]+$/", $this->table_array[$key]["value"])) {
 								$this->msg .= sprintf($this->l->__("Please enter a valid alphanumeric extended (Numbers, Letters, -,  _, @ and . only, no spaces) value for the <b>%s</b> Field!<br>"), $this->table_array[$key]["output_name"]);
 							}
@@ -928,7 +898,7 @@ class form extends db_array_io
 					// main if end
 					) {
 				// if mandatory && no input
-//$this->debug('form', "A: ".$this->table_array[$key]["type"]." -- ".$this->table_array[$key]["input_value"]." -- ".$this->table_array[$key]["value"]);
+				// $this->debug('form', "A: ".$this->table_array[$key]["type"]." -- ".$this->table_array[$key]["input_value"]." -- ".$this->table_array[$key]["value"]);
 				if (!$this->table_array[$key]["value"] && $this->table_array[$key]["type"] != "binary") {
 					$this->msg .= sprintf($this->l->__("Please enter something into the <b>%s</b> field!<br>"), $this->table_array[$key]["output_name"]);
 				}
@@ -964,7 +934,7 @@ class form extends db_array_io
 				}
 			}
 		}
-//$this->debug('edit_error', "QS: <pre>".print_r($_POST, 1)."</pre>");
+		// $this->debug('edit_error', "QS: <pre>".print_r($_POST, 1)."</pre>");
 		if (is_array($this->element_list)) {
 			// check the mandatory stuff
 			// if mandatory, check that at least on pk exists or if at least the mandatory field is filled
@@ -988,10 +958,10 @@ class form extends db_array_io
 					if (count($_POST[$prfx.$key]) > $max) {
 						$max = count($_POST[$prfx.$key]);
 					}
-//$this->debug('edit_error_chk', "KEY: $prfx$key | count: ".count($_POST[$prfx.$key])." | M: $max");
-//$this->debug('edit_error_chk', "K: ".$_POST[$prfx.$key]." | ".$_POST[$prfx.$key][0]);
+					// $this->debug('edit_error_chk', "KEY: $prfx$key | count: ".count($_POST[$prfx.$key])." | M: $max");
+					// $this->debug('edit_error_chk', "K: ".$_POST[$prfx.$key]." | ".$_POST[$prfx.$key][0]);
 				}
-//$this->debug('post_array', $this->print_ar($_POST));
+				$this->debug('post_array', $this->print_ar($_POST));
 				# check each row
 				for ($i = 0; $i < $max; $i ++) {
 					// either one of the post pks is set, or the mandatory
@@ -1005,18 +975,18 @@ class form extends db_array_io
 						}
 						// we found a mandatory field. check now if one is set to satisfy the main mandatory
 						// also check, if this field is mandatory and its not set, but any other, throw an error
-//$this->debug('edit_error_chk', "RG error - Data[".$prfx.$el_name.": ".$_POST[$prfx.$el_name][$i]." | ".$_POST[$prfx.$el_name]." - ".$reference_array['enable_name']." - ".$_POST[$reference_array['enable_name']][$_POST[$prfx.$el_name][$i]]);
+						// $this->debug('edit_error_chk', "RG error - Data[".$prfx.$el_name.": ".$_POST[$prfx.$el_name][$i]." | ".$_POST[$prfx.$el_name]." - ".$reference_array['enable_name']." - ".$_POST[$reference_array['enable_name']][$_POST[$prfx.$el_name][$i]]);
 						if ($data_array["mandatory"] && $_POST[$prfx.$el_name][$i]) {
 							$mand_okay = 1;
 							$row_okay[$i] = 1;
 						} elseif ($data_array['type'] == 'radio_group' && !isset($_POST[$prfx.$el_name])) {
 							// radio group and set where one not active
-//$this->debug('edit_error_chk', "RADIO GROUP");
+							// $this->debug('edit_error_chk', "RADIO GROUP");
 							$row_okay[$_POST[$prfx.$el_name][$i]] = 0;
 							$default_wrong[$_POST[$prfx.$el_name][$i]] = 1;
 							$error[$_POST[$prfx.$el_name][$i]] = 1;
 						} elseif ($_POST[$prfx.$el_name][$i] && !$error[$i]) {
-//$this->debug('edit_error_chk', "[$i]");
+							// $this->debug('edit_error_chk', "[$i]");
 							$element_set[$i] = 1;
 							$row_okay[$i] = 1;
 						} elseif ($data_array["mandatory"] && !$_POST[$prfx.$el_name][$i]) {
@@ -1033,7 +1003,7 @@ class form extends db_array_io
 										if ($this->table_array[$this->int_pk_name]["value"]) {
 											$q .= " AND ".$this->int_pk_name." <> ".$this->table_array[$this->int_pk_name]["value"];
 										}
-										list($$key) = $this->db_return_row($q);
+										list($$key) = $this->dbReturnRow($q);
 										if ($$key) {
 											$this->msg .= sprintf($this->l->__("The field <b>%s</b> in row <b>%s</b> can be used only once!<br>"), $reference_array["output_name"], $i);
 										}
@@ -1068,38 +1038,40 @@ class form extends db_array_io
 		}
 	}
 
-	// METHOD form_set_order
-	// PARAMS none
-	// RETURN the table array
-	// DOES   sets the order to the maximum, if order flag is set in array
-	public function form_set_order()
+	// METHOD: formSetOrder
+	// WAS: form_set_order
+	// PARAMS: none
+	// RETURN: the table array
+	// DESC  : sets the order to the maximum, if order flag is set in array
+	public function formSetOrder()
 	{
 		// get order name
-		$order_name = $this->form_get_col_name_from_key("order");
+		$order_name = $this->formGetColNameFromKey("order");
 		if ($order_name) {
 			// first check out of order ...
 
 			if (!$this->table_array[$order_name]["value"]) {
 				// set order (read max)
 				$q = "SELECT MAX(".$order_name.") + 1 AS max_page_order FROM ".$this->table_name;
-				list($this->table_array[$order_name]["value"]) = $this->db_return_row($q);
+				list($this->table_array[$order_name]["value"]) = $this->dbReturnRow($q);
 				// frist element is 0 because NULL gets returned, set to 1
 				if (!$this->table_array[$order_name]["value"]) {
 					$this->table_array[$order_name]["value"] = 1;
 				}
 			} elseif ($this->table_array[$this->int_pk_name]["value"]) {
 				$q = "SELECT $order_name FROM ".$this->table_name." WHERE ".$this->int_pk_name." = ".$this->table_array[$this->int_pk_name]["value"];
-				list($this->table_array[$order_name]["value"]) = $this->db_return_row($q);
+				list($this->table_array[$order_name]["value"]) = $this->dbReturnRow($q);
 			}
 		}
 		return $this->table_array;
 	}
 
-	// METHOD form_unsert_table_array
-	// PARAMS none
-	// RETURN none
-	// DOES resets all values in table_array and in the reference tables
-	public function form_unset_table_array()
+	// METHOD: formUnsetTableArray
+	// WAS   : form_unsert_table_array
+	// PARAMS: none
+	// RETURN: none
+	// DESC  : resets all values in table_array and in the reference tables
+	public function formUnsetTableArray()
 	{
 		unset($this->pk_id);
 		if (!is_array($this->table_array)) {
@@ -1127,11 +1099,12 @@ class form extends db_array_io
 		$this->msg = $this->l->__("Cleared for new Dataset!");
 	}
 
-	// METHOD form_load_table_array
-	// PARAMS pk_id - overrule pk_id
-	// RETURN none
-	// DESC   load a table & reference
-	public function form_load_table_array($pk_id = 0)
+	// METHOD: formLoadTableArray
+	// WAS   : form_load_table_array
+	// PARAMS: pk_id - overrule pk_id
+	// RETURN: none
+	// DESC  : load a table & reference
+	public function formLoadTableArray($pk_id = 0)
 	{
 		if ($pk_id) {
 			$this->pk_id = $pk_id;
@@ -1165,11 +1138,12 @@ class form extends db_array_io
 		$this->msg = $this->l->__("Dataset has been loaded!<br>");
 	}
 
-	// METHOD form_save_table_array
-	// PARAMS addslashes - if one, passes 1 to the db_write function
-	// RETURN none
-	// DESC   save a table, reference and all input fields
-	public function form_save_table_array($addslashes = 0)
+	// METHOD: formSaveTableArray
+	// WAS   : form_save_table_array
+	// PARAMS: addslashes - if one, passes 1 to the db_write function
+	// RETURN: none
+	// DESC  : save a table, reference and all input fields
+	public function formSaveTableArray($addslashes = 0)
 	{
 //       global $_FILES;
 		// for drop_down_db_input check if text field is filled and if, if not yet in db ...
@@ -1189,20 +1163,20 @@ class form extends db_array_io
 				if ($this->table_array[$key]["where"]) {
 					$q .= " AND ".$this->table_array[$key]["where"];
 				}
-				list($pk_name_temp) = $this->db_return_row($q);
+				list($pk_name_temp) = $this->dbReturnRow($q);
 				if ($this->num_rows >= 1) {
 					$this->table_array[$key]["value"] = $pk_name_temp;
 				} else {
 					// if a where was given, set this key also [dangerous!]
 					// postgreSQL compatible insert
 					$q = "INSERT INTO ".$this->table_array[$key]["table_name"]." (".$this->table_array[$key]["input_name"].") VALUES ('".$this->db_escape_string($this->table_array[$key]["input_value"])."')";
-					$this->db_exec($q);
+					$this->dbExec($q);
 					if ($this->table_array[$key]["where"]) {
 						// make an update on the just inseted data with the where data als update values
 						$q = "UPDATE ".$this->table_array[$key]["table_name"]." SET ";
 						$q .= $this->table_array[$key]["where"]." ";
 						$q .= "WHERE ".$this->table_array[$key]["pk_name"]." = ".$this->insert_id;
-						$this->db_exec($q);
+						$this->dbExec($q);
 					}
 					$this->table_array[$key]["value"] = $this->insert_id;
 				} // set value from DB through select or insert
@@ -1218,7 +1192,7 @@ class form extends db_array_io
 					if ($this->table_array[$key]["where"]) {
 						$q .= " AND ".$this->table_array[$key]["where"];
 					}
-					list($temp) = $this->db_return_row($q);
+					list($temp) = $this->dbReturnRow($q);
 					// nothing found in table, use new inserted key
 					if (!$temp) {
 						$this->table_array[$key]["value"] = $this->table_array[$key]["input_value"];
@@ -1276,9 +1250,9 @@ class form extends db_array_io
 		} // go through each field
 
 		// set object order (if necessary)
-		$this->form_set_order();
+		$this->formSetOrder();
 		// write the object
-		$this->db_write($addslashes);
+		$this->dbWrite($addslashes);
 		// write reference array(s) if necessary
 		if (is_array($this->reference_array)) {
 			if (!is_array($this->reference_array)) {
@@ -1287,11 +1261,11 @@ class form extends db_array_io
 			reset($this->reference_array);
 			foreach ($this->reference_array as $reference_array) {
 				$q = "DELETE FROM ".$reference_array["table_name"]." WHERE ".$this->int_pk_name."=".$this->table_array[$this->int_pk_name]["value"];
-				$this->db_exec($q);
+				$this->dbExec($q);
 				$q = "INSERT INTO ".$reference_array["table_name"]." (".$reference_array["other_table_pk"].", ".$this->int_pk_name.") VALUES ";
 				for ($i = 0; $i < count($reference_array["selected"]); $i ++) {
 					$t_q = "(".$reference_array["selected"][$i].", ".$this->table_array[$this->int_pk_name]["value"].")";
-					$this->db_exec($q.$t_q);
+					$this->dbExec($q.$t_q);
 				}
 			} // foreach reference arrays
 		} // if reference arrays
@@ -1409,7 +1383,7 @@ class form extends db_array_io
 						$this->debug('edit', "Pos[$i] => ".$type[$i]." Q: ".$q."<br>");
 						// write the dataset
 						if ($q) {
-							$this->db_exec($q);
+							$this->dbExec($q);
 						}
 					}
 				} // for each created query
@@ -1419,11 +1393,12 @@ class form extends db_array_io
 		$this->msg = $this->l->__("Dataset has been saved!<Br>");
 	}
 
-	// METHOD form_delete_table_array
-	// PARAMS none
-	// RETURN none
-	// DESC   delete a table and reference fields
-	public function form_delete_table_array()
+	// METHOD: formDeleteTableArray
+	// WAS   : form_delete_table_array
+	// PARAMS: none
+	// RETURN: none
+	// DESC  : delete a table and reference fields
+	public function formDeleteTableArray()
 	{
 		// remove any reference arrays
 		if (is_array($this->reference_array)) {
@@ -1433,7 +1408,7 @@ class form extends db_array_io
 			reset($this->reference_array);
 			foreach ($this->reference_array as $reference_array) {
 				$q = "DELETE FROM ".$reference_array["table_name"]." WHERE ".$this->int_pk_name." = ".$this->table_array[$this->int_pk_name]["value"];
-				$this->db_exec($q);
+				$this->dbExec($q);
 			}
 		}
 		// remove any element list references
@@ -1444,7 +1419,7 @@ class form extends db_array_io
 			reset($this->element_list);
 			while (list($table_name, $data_array) = each($this->element_list)) {
 				$q = "DELETE FROM ".$table_name." WHERE ".$this->int_pk_name." = ".$this->table_array[$this->int_pk_name]["value"];
-				$this->db_exec($q);
+				$this->dbExec($q);
 			}
 		}
 		// unlink ALL files
@@ -1462,11 +1437,12 @@ class form extends db_array_io
 		$this->msg = $this->l->__("Dataset has been deleted!");
 	}
 
-	// METHOD form_create_hidden_fields
-	// PARAMS $hidden_array
-	// RETURNS the input fields (html)
-	// creates HTML hidden input fields out of an hash array
-	public function form_create_hidden_fields($hidden_array = "")
+	// METHOD: formCreateHiddenFields
+	// WAS   : form_create_hidden_fields
+	// PARAMS: $hidden_array
+	// RETURN: the input fields (html)
+	// DESC  : creates HTML hidden input fields out of an hash array
+	public function formCreateHiddenFields($hidden_array = "")
 	{
 		$hidden = array ();
 		if (!is_array($this->table_array)) {
@@ -1487,11 +1463,12 @@ class form extends db_array_io
 		return $hidden;
 	}
 
-	// METHOD form_create_element_reference_table
-	// PARAMS show which reference table
-	// RETURN array for output
-	// DESC   creates the multiple select part for a reference_table
-	public function form_create_element_reference_table($table_name)
+	// METHOD: formCreateElementReferenceTable
+	// WAS   : form_create_element_reference_table
+	// PARAMS: show which reference table
+	// RETURN: array for output
+	// DESC  : creates the multiple select part for a reference_table
+	public function formCreateElementReferenceTable($table_name)
 	{
 		$output_name = $this->reference_array[$table_name]["output_name"];
 		if ($this->reference_array[$table_name]["mandatory"]) {
@@ -1508,13 +1485,14 @@ class form extends db_array_io
 		return array('output_name' => $output_name, 'type' => $type, 'color' => 'edit_fgcolor', 'data' => $data);
 	}
 
-	// METHOD form_create_element_list
-	// PARAMS show which element list
-	// RETURN array for output
-	// DESC   create list of elements next to each other for a group of data in an input field
-	//        this currently only works for a list that is filled from a sub table and creates only a connection to this one
-	//        new version will allow a sub list with free input fields to directly fill a sub table to a master table
-	public function form_create_element_list_table($table_name)
+	// METHOD: formCreateElementListTable
+	// WAS   : form_create_element_list_table
+	// PARAMS: show which element list
+	// RETURN: array for output
+	// DESC  : create list of elements next to each other for a group of data in an input field
+	//         this currently only works for a list that is filled from a sub table and creates only a connection to this one
+	//         new version will allow a sub list with free input fields to directly fill a sub table to a master table
+	public function formCreateElementListTable($table_name)
 	{
 		// output name for the viewable left table td box, prefixed with * if mandatory
 		$output_name = $this->element_list[$table_name]["output_name"];
@@ -1547,7 +1525,7 @@ class form extends db_array_io
 		// generic data read in (counts for all rows)
 		// visible list data output
 		while (list($el_name, $data_array) = each($this->element_list[$table_name]["elements"])) {
-//				$this->debug('CFG', 'El: '.$el_name.' -> '.$this->print_ar($data_array));
+			$this->debug('CFG', 'El: '.$el_name.' -> '.$this->print_ar($data_array));
 			// if the element name matches the read array, then set the table as a name prefix
 			$q_select[] = $el_name; // this is for reading the data
 			// prefix the name for any further data parts
@@ -1566,7 +1544,7 @@ class form extends db_array_io
 			if ($data_array['type'] == 'drop_down_db') {
 				$md_q = md5($data_array['query']);
 				while ($res = $this->db_return($data_array['query'])) {
-//$this->debug('edit', "Q[$md_q] pos: ".$this->cursor_ext[$md_q]["pos"]." | want: ".$data_array["preset"]." | set: ".$data['preset'][$el_name]);
+					$this->debug('edit', "Q[$md_q] pos: ".$this->cursor_ext[$md_q]["pos"]." | want: ".$data_array["preset"]." | set: ".$data['preset'][$el_name]);
 					// first is default for this element
 					if (!$data['preset'][$el_name] && ($this->cursor_ext[$md_q]["pos"] == $data_array['preset'])) {
 						$data['preset'][$el_name] = $res[0];
@@ -1580,11 +1558,11 @@ class form extends db_array_io
 			}
 			$proto[$el_name] = ($this->error) ? $_POST[$el_name][(count($_POST[$el_name]) - 1)] : ''; // this is for the new line
 		}
-//			$this->debug('CFG DATA', 'Data: '.$this->print_ar($data));
-//			$this->debug('CFG PROTO', 'Proto: '.$this->print_ar($proto));
-//			$this->debug('CFG SELECT', 'Proto: '.$this->print_ar($q_select));
+		// $this->debug('CFG DATA', 'Data: '.$this->print_ar($data));
+		// $this->debug('CFG PROTO', 'Proto: '.$this->print_ar($proto));
+		// $this->debug('CFG SELECT', 'Proto: '.$this->print_ar($q_select));
 		// query for reading in the data
-//$this->debug('edit_error', "ERR: ".$this->error);
+		$this->debug('edit_error', "ERR: ".$this->error);
 		// if we got a read data, build the read select for the read, and read out the "selected" data
 		if ($this->element_list[$table_name]["read_data"]) {
 			// we need a second one for the query build only
@@ -1604,18 +1582,18 @@ class form extends db_array_io
 			$data['type'][$data["prefix"].$this->element_list[$table_name]["read_data"]["name"]] = 'string';
 			// build the read query
 			$q = "SELECT ";
-//				if (!$this->table_array[$this->int_pk_name]["value"])
-//					$q .= "DISTINCT ";
+			// if (!$this->table_array[$this->int_pk_name]["value"])
+			// 	$q .= "DISTINCT ";
 			// prefix join key with table name, and implode the query select part
 			$q .= str_replace($table_name.'.'.$this->element_list[$table_name]["read_data"]["pk_id"], $this->element_list[$table_name]["read_data"]["table_name"].'.'.$this->element_list[$table_name]["read_data"]["pk_id"], implode(', ', $_q_select)).' ';
-//				if (!$this->table_array[$this->int_pk_name]["value"] && $this->element_list[$table_name]["read_data"]["order"])
-//					$q .= ", ".$this->element_list[$table_name]["read_data"]["order"]." ";
+			// if (!$this->table_array[$this->int_pk_name]["value"] && $this->element_list[$table_name]["read_data"]["order"])
+			// 	$q .= ", ".$this->element_list[$table_name]["read_data"]["order"]." ";
 			// read from the read table as main, and left join to the sub table to read the actual data
 			$q .= "FROM ".$this->element_list[$table_name]["read_data"]["table_name"]." ";
 			$q .= "LEFT JOIN ".$table_name." ";
 			$q .= "ON (";
 			$q .= $this->element_list[$table_name]["read_data"]["table_name"].".".$this->element_list[$table_name]["read_data"]["pk_id"]." = ".$table_name.".".$this->element_list[$table_name]["read_data"]["pk_id"]." ";
-//				if ($this->table_array[$this->int_pk_name]["value"])
+			// if ($this->table_array[$this->int_pk_name]["value"])
 			$q .= "AND ".$table_name.".".$this->int_pk_name." = ".(($this->table_array[$this->int_pk_name]["value"]) ? $this->table_array[$this->int_pk_name]["value"] : 'NULL')." ";
 			$q .= ") ";
 			if ($this->element_list[$table_name]["read_data"]["order"]) {
@@ -1628,7 +1606,7 @@ class form extends db_array_io
 				$q = "SELECT ".implode(", ", $q_select)." FROM ".$table_name." WHERE ".$this->int_pk_name." = ".$this->table_array[$this->int_pk_name]["value"];
 			}
 		}
-//			$this->debug('CFG QUERY', 'Q: '.$q);
+		// $this->debug('CFG QUERY', 'Q: '.$q);
 		// only run if we have query strnig
 		if ($q) {
 			$pos = 0; // position in while for overwrite if needed
@@ -1640,7 +1618,7 @@ class form extends db_array_io
 				for ($i = 0; $i < count($q_select); $i ++) {
 					// query select part, set to the element name
 					$el_name = $q_select[$i];
-//$this->debug('edit_error', "[$i] ELNAME: $el_name | POS[$prfx$el_name]: ".$_POST[$prfx.$el_name][$pos]." | RES: ".$res[$el_name]);
+					// $this->debug('edit_error', "[$i] ELNAME: $el_name | POS[$prfx$el_name]: ".$_POST[$prfx.$el_name][$pos]." | RES: ".$res[$el_name]);
 					// if we have an error, we take what we have in the vars, if not we take the data from the db
 					if ($this->error) {
 						// if we have a radio group, set a bit different
@@ -1700,8 +1678,10 @@ class form extends db_array_io
 		if ($data['delete_name']) {
 			$data['content'][] = $proto;
 		}
-//$this->debug('edit', "A:<pre>".print_r($data, 1)."</pre>");
+		// $this->debug('edit', "A:<pre>".print_r($data, 1)."</pre>");
 		$type = 'element_list';
 		return array('output_name' => $output_name, 'type' => $type, 'color' => 'edit_fgcolor', 'data' => $data);
 	}
 } // end of class
+
+# __END__
diff --git a/www/libs/Class.Progressbar.inc b/www/lib/CoreLibs/Output/Progressbar.inc
similarity index 92%
rename from www/libs/Class.Progressbar.inc
rename to www/lib/CoreLibs/Output/Progressbar.inc
index 73e5067d..6fa9e139 100644
--- a/www/libs/Class.Progressbar.inc
+++ b/www/lib/CoreLibs/Output/Progressbar.inc
@@ -8,9 +8,13 @@
 *	Update:		Clemens Schwaighofer
 *	Date:		2012.9.5 [stacked output]
 *	Date:		2013.2.21 [proper class formatting]
+*	Date:       2017.4.13 [no output fix with cache overload]
+*	Date:       2018.3.28 [PHPCS + namespace]
 *
 */
 
+namespace CoreLibs\Output;
+
 class ProgressBar
 {
 	// private vars
@@ -80,13 +84,13 @@ class ProgressBar
 			$this->height = $height;
 		}
 		// needs to be called twice or I do not get any output
-		$this->_flushCache($this->clear_buffer_size_init);
-		$this->_flushCache($this->clear_buffer_size_init);
+		$this->__flushCache($this->clear_buffer_size_init);
+		$this->__flushCache($this->clear_buffer_size_init);
 	}
 
 	// private functions
 
-	private function _flushCache($clear_buffer_size = 0)
+	private function __flushCache($clear_buffer_size = 0)
 	{
 		if (!$clear_buffer_size) {
 			$clear_buffer_size = $this->clear_buffer_size;
@@ -96,7 +100,7 @@ class ProgressBar
 		flush();
 	}
 
-	private function _calculatePercent($step)
+	private function __calculatePercent($step)
 	{
 		// avoid divison through 0
 		if ($this->max - $this->min == 0) {
@@ -109,7 +113,7 @@ class ProgressBar
 		return $percent;
 	}
 
-	private function _calculatePosition($step)
+	private function __calculatePosition($step)
 	{
 		switch ($this->direction) {
 			case 'right':
@@ -162,7 +166,7 @@ class ProgressBar
 		return $position;
 	}
 
-	private function _setStep($step)
+	private function __setStep($step)
 	{
 		if ($step > $this->max) {
 			$step = $this->max;
@@ -300,7 +304,7 @@ class ProgressBar
 
 	public function setLabelPosition($name, $left, $top, $width, $height, $align = '')
 	{
-//		print "SET POSITION[$name]: $left<br>";
+		// print "SET POSITION[$name]: $left<br>";
 		// if this is percent, we ignore anything, it is auto positioned
 		if ($this->label[$name]['type'] != 'percent') {
 			foreach (array('top', 'left', 'width', 'height') as $pos_name) {
@@ -323,7 +327,7 @@ class ProgressBar
 			$output .= 'document.getElementById("plbl'.$name.$this->code.'").style.align="'.$this->label[$name]['align'].'";';
 			$output .= '</script>'."\n";
 			echo $output;
-			$this->_flushCache();
+			$this->__flushCache();
 		}
 	}
 
@@ -332,7 +336,7 @@ class ProgressBar
 		$this->label[$name]['color'] = $color;
 		if ($this->status != 'new') {
 			echo '<script type="text/JavaScript">document.getElementById("plbl'.$name.$this->code.'").style.color="'.$color.'";</script>'."\n";
-			$this->_flushCache();
+			$this->__flushCache();
 		}
 	}
 
@@ -341,7 +345,7 @@ class ProgressBar
 		$this->label[$name]['bgr_color'] = $color;
 		if ($this->status != 'new') {
 			echo '<script type="text/JavaScript">document.getElementById("plbl'.$name.$this->code.'").style.background="'.$color.'";</script>'."\n";
-			$this->_flushCache();
+			$this->__flushCache();
 		}
 	}
 
@@ -359,7 +363,7 @@ class ProgressBar
 		if ($this->label[$name]['type'] == 'percent') {
 			$this->label[$name]['top'] = round(($this->height - intval($size)) / log($this->height - intval($size), 7), 0) - $this->pedding;
 		}
-//		print "HEIGHT: ".$this->height.", Size: ".intval($size).", Pedding: ".$this->pedding.", Calc: ".round($this->height - intval($size)).", Log: ".log($this->height - intval($size), 7)."<br>";
+		// print "HEIGHT: ".$this->height.", Size: ".intval($size).", Pedding: ".$this->pedding.", Calc: ".round($this->height - intval($size)).", Log: ".log($this->height - intval($size), 7)."<br>";
 		// then set like usual
 		$this->label[$name]['font-size'] = intval($size);
 		if ($family != '') {
@@ -376,17 +380,17 @@ class ProgressBar
 			$output .= 'document.getElementById("plbl'.$name.$this->code.'").style.font-weight="'.$this->label[$name]['font-weight'].'";';
 			$output .= '</script>'."\n";
 			echo $output;
-			$this->_flushCache();
+			$this->__flushCache();
 		}
 	}
 
 	public function setLabelValue($name, $value)
 	{
 		$this->label[$name]['value'] = $value;
-//		print "NAME[$name], Status: ".$this->status.": ".$value."<Br>";
+		// print "NAME[$name], Status: ".$this->status.": ".$value."<Br>";
 		if ($this->status != 'new') {
 			echo '<script type="text/JavaScript">PBlabelText'.$this->code.'("'.$name.'","'.$this->label[$name]['value'].'");</script>'."\n";
-			$this->_flushCache();
+			$this->__flushCache();
 		}
 	}
 
@@ -395,7 +399,7 @@ class ProgressBar
 		$this->color = $color;
 		if ($this->status != 'new') {
 			echo '<script type="text/JavaScript">document.getElementById("pbar'.$this->code.'").style.background="'.$color.'";</script>'."\n";
-			$this->_flushCache();
+			$this->__flushCache();
 		}
 	}
 
@@ -404,7 +408,7 @@ class ProgressBar
 		$this->bgr_color = $color;
 		if ($this->status != 'new') {
 			echo '<script type="text/JavaScript">document.getElementById("pbrd'.$this->code.'").style.background="'.$color.'";</script>'."\n";
-			$this->_flushCache();
+			$this->__flushCache();
 		}
 	}
 
@@ -413,7 +417,7 @@ class ProgressBar
 		$this->direction = $direction;
 
 		if ($this->status != 'new') {
-			$this->position = $this->_calculatePosition($this->step);
+			$this->position = $this->__calculatePosition($this->step);
 
 			echo '<script type="text/JavaScript">';
 			echo 'PBposition'.$this->code.'("left",'.$this->position['left'].');';
@@ -421,7 +425,7 @@ class ProgressBar
 			echo 'PBposition'.$this->code.'("width",'.$this->position['width'].');';
 			echo 'PBposition'.$this->code.'("height",'.$this->position['height'].');';
 			echo '</script>'."\n";
-			$this->_flushCache();
+			$this->__flushCache();
 		}
 	}
 
@@ -431,8 +435,8 @@ class ProgressBar
 		$js = '';
 		$html_button = '';
 
-		$this->_setStep($this->step);
-		$this->position = $this->_calculatePosition($this->step);
+		$this->__setStep($this->step);
+		$this->position = $this->__calculatePosition($this->step);
 
 		if ($this->top || $this->left) {
 			$style_master = 'position:relative;top:'.$this->top.'px;left:'.$this->left.'px;width:'.($this->width + 10).'px;';
@@ -477,7 +481,7 @@ class ProgressBar
 		$js .= ' }'."\n";
 		$js .= '}'."\n";
 
-//print "DUMP LABEL: <br><pre>".print_r($this->label, 1)."</pre><br>";
+		// print "DUMP LABEL: <br><pre>".print_r($this->label, 1)."</pre><br>";
 		foreach ($this->label as $name => $data) {
 			// set what type of move we do
 			$move_prefix = $data['type'] == 'button' ? 'margin' : 'padding';
@@ -522,13 +526,13 @@ class ProgressBar
 						break;
 					case 'percent':
 						// only one inner percent
-//						print "STYLE[$name]: ".$style_lbl."<br>";
+						// print "STYLE[$name]: ".$style_lbl."<br>";
 						if (!$html_percent) {
-							$html_percent = '<div id="plbl'.$name.$this->code.'" style="'.$style_lbl.'width:'.$data['width'].'px;line-height:1;text-shadow: 0 0 .2em white, 0 0 .5em white;">'.$this->_calculatePercent($this->step).'%</div>'."\n";
+							$html_percent = '<div id="plbl'.$name.$this->code.'" style="'.$style_lbl.'width:'.$data['width'].'px;line-height:1;text-shadow: 0 0 .2em white, 0 0 .5em white;">'.$this->__calculatePercent($this->step).'%</div>'."\n";
 						}
 						break;
 					case 'percentlbl':
-						$html .= '<div id="plbl'.$name.$this->code.'" style="'.$style_lbl.'width:'.$data['width'].'px;">'.$this->_calculatePercent($this->step).'%</div>'."\n";
+						$html .= '<div id="plbl'.$name.$this->code.'" style="'.$style_lbl.'width:'.$data['width'].'px;">'.$this->__calculatePercent($this->step).'%</div>'."\n";
 						break;
 					case 'crossbar':
 						$html .= '<div id="plbl'.$name.$this->code.'" style="'.$style_lbl.'">'.$data['value'].'</div>'."\n";
@@ -578,16 +582,16 @@ class ProgressBar
 	{
 		$this->status = 'show';
 		echo $this->getHtml();
-		$this->_flushCache();
+		$this->__flushCache();
 	}
 
 	public function moveStep($step)
 	{
 		$last_step = $this->step;
-		$this->_setStep($step);
+		$this->__setStep($step);
 
 		$js = '';
-		$new_position = $this->_calculatePosition($this->step);
+		$new_position = $this->__calculatePosition($this->step);
 		if ($new_position['width'] != $this->position['width'] && ($this->direction == 'right' || $this->direction == 'left')) {
 			if ($this->direction=='left') {
 				$js .= 'PBposition'.$this->code.'("left",'.$new_position['left'].');';
@@ -603,7 +607,7 @@ class ProgressBar
 		$this->position = $new_position;
 		foreach ($this->label as $name => $data) {
 			if (array_key_exists('type', $data)) {
-				switch($data['type']) {
+				switch ($data['type']) {
 					case 'step':
 						if ($this->step != $last_step) {
 							$js .= 'PBlabelText'.$this->code.'("'.$name.'","'.$this->step.'/'.$this->max.'");';
@@ -611,8 +615,8 @@ class ProgressBar
 						break;
 					case 'percentlbl':
 					case 'percent':
-						$percent = $this->_calculatePercent($this->step);
-						if ($percent != $this->_calculatePercent($last_step)) {
+						$percent = $this->__calculatePercent($this->step);
+						if ($percent != $this->__calculatePercent($last_step)) {
 							$js .= 'PBlabelText'.$this->code.'("'.$name.'","'.$percent.'%");';
 						}
 						break;
@@ -624,7 +628,7 @@ class ProgressBar
 		}
 		if ($js != '') {
 			echo '<script type="text/JavaScript">'.$js.'</script>'."\n";
-			$this->_flushCache();
+			$this->__flushCache();
 		}
 	}
 
@@ -647,7 +651,7 @@ class ProgressBar
 			$output .= 'document.getElementById("pbm'.$this->code.'").style.visibility="hidden";document.getElementById("pbm'.$this->code.'").style.display="none";';
 			$output .= '</script>'."\n";
 			echo $output;
-			$this->_flushCache();
+			$this->__flushCache();
 		}
 	}
 
@@ -660,7 +664,10 @@ class ProgressBar
 			$output .= 'document.getElementById("pbm'.$this->code.'").style.visibility="visible";document.getElementById("pbm'.$this->code.'").style.visibility="block";';
 			$output .= '</script>'."\n";
 			echo $output;
-			$this->_flushCache();
+			$this->__flushCache();
 		}
 	}
 }
+
+# __END__
+
diff --git a/www/libs/Class.Smarty.Extend.inc b/www/lib/CoreLibs/Template/SmartyExtend.inc
similarity index 65%
rename from www/libs/Class.Smarty.Extend.inc
rename to www/lib/CoreLibs/Template/SmartyExtend.inc
index 67b72b3c..e7382e3f 100644
--- a/www/libs/Class.Smarty.Extend.inc
+++ b/www/lib/CoreLibs/Template/SmartyExtend.inc
@@ -1,4 +1,4 @@
-<?
+<?php
 /********************************************************************
 * AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
 * CREATED: 2004/12/21
@@ -8,12 +8,14 @@
 * 2005/06/22 (cs) include smarty class here, so there is no need to include it in the main file
 *********************************************************************/
 
-// read in the Smarty class for definition
-// use smarty BC for backwards compability
-// try to include file from LIBS path, or from normal path
-_spl_autoload('SmartyBC.class.php');
+namespace CoreLibs\Template;
 
-class SmartyML extends SmartyBC
+// I need to manually load Smarty BC here (it is not namespaced)
+require_once(BASE.LIB.SMARTY.'SmartyBC.class.php');
+// So it doesn't start looking around in the wrong naemspace as smarty doesn't have one
+use SmartyBC;
+
+class SmartyExtend extends SmartyBC
 {
 	public $l10n;
 
@@ -21,9 +23,10 @@ class SmartyML extends SmartyBC
 	public function __construct($lang)
 	{
 		SmartyBC::__construct();
-		_spl_autoload('Class.l10n.inc');
-		$this->l10n = new l10n($lang);
+		$this->l10n = new \CoreLibs\Language\L10n($lang);
 		// variable variable register
 		$this->register_modifier('getvar', array(&$this, 'get_template_vars'));
 	}
 }
+
+# __END__
diff --git a/www/lib/CoreLibs/Upload/Core/qqUploadedFileForm.inc b/www/lib/CoreLibs/Upload/Core/qqUploadedFileForm.inc
new file mode 100755
index 00000000..2c58a26e
--- /dev/null
+++ b/www/lib/CoreLibs/Upload/Core/qqUploadedFileForm.inc
@@ -0,0 +1,31 @@
+<?php
+
+namespace CoreLibs\Upload\Core;
+
+/**
+ * Handle file uploads via regular form post (uses the $_FILES array)
+ */
+class qqUploadedFileForm
+{
+	/**
+	 * Save the file to the specified path
+	 * @return boolean TRUE on success
+	 */
+	public function save($path)
+	{
+		if (!move_uploaded_file($_FILES['qqfile']['tmp_name'], $path)) {
+			return false;
+		}
+		return true;
+	}
+	public function getName()
+	{
+		return $_FILES['qqfile']['name'];
+	}
+	public function getSize()
+	{
+		return $_FILES['qqfile']['size'];
+	}
+}
+
+# __END__
diff --git a/www/lib/CoreLibs/Upload/Core/qqUploadedFileXhr.inc b/www/lib/CoreLibs/Upload/Core/qqUploadedFileXhr.inc
new file mode 100755
index 00000000..4e5a223c
--- /dev/null
+++ b/www/lib/CoreLibs/Upload/Core/qqUploadedFileXhr.inc
@@ -0,0 +1,46 @@
+<?php
+
+namespace CoreLibs\Upload\Core;
+
+/**
+ * Handle file uploads via XMLHttpRequest
+ */
+class qqUploadedFileXhr
+{
+	/**
+	 * Save the file to the specified path
+	 * @return boolean TRUE on success
+	 */
+	public function save($path)
+	{
+		$input = fopen("php://input", "r");
+		$temp = tmpfile();
+		$realSize = stream_copy_to_stream($input, $temp);
+		fclose($input);
+
+		if ($realSize != $this->getSize()) {
+			return false;
+		}
+
+		$target = fopen($path, "w");
+		fseek($temp, 0, SEEK_SET);
+		stream_copy_to_stream($temp, $target);
+		fclose($target);
+
+		return true;
+	}
+	public function getName()
+	{
+		return $_GET['qqfile'];
+	}
+	public function getSize()
+	{
+		if (isset($_SERVER["CONTENT_LENGTH"])) {
+			return (int)$_SERVER["CONTENT_LENGTH"];
+		} else {
+			throw new Exception('Getting content length is not supported.');
+		}
+	}
+}
+
+# __END__
diff --git a/www/libs/FileUploader.inc b/www/lib/CoreLibs/Upload/qqFileUploader.inc
old mode 100644
new mode 100755
similarity index 68%
rename from www/libs/FileUploader.inc
rename to www/lib/CoreLibs/Upload/qqFileUploader.inc
index b45e464d..d926119e
--- a/www/libs/FileUploader.inc
+++ b/www/lib/CoreLibs/Upload/qqFileUploader.inc
@@ -1,71 +1,9 @@
 <?php
 
-/**
- * Handle file uploads via XMLHttpRequest
- */
-class qqUploadedFileXhr
-{
-	/**
-	 * Save the file to the specified path
-	 * @return boolean TRUE on success
-	 */
-	public function save($path)
-	{
-		$input = fopen("php://input", "r");
-		$temp = tmpfile();
-		$realSize = stream_copy_to_stream($input, $temp);
-		fclose($input);
+namespace CoreLibs\Upload;
 
-		if ($realSize != $this->getSize()) {
-			return false;
-		}
-
-		$target = fopen($path, "w");
-		fseek($temp, 0, SEEK_SET);
-		stream_copy_to_stream($temp, $target);
-		fclose($target);
-
-		return true;
-	}
-	public function getName()
-	{
-		return $_GET['qqfile'];
-	}
-	public function getSize()
-	{
-		if (isset($_SERVER["CONTENT_LENGTH"])) {
-			return (int)$_SERVER["CONTENT_LENGTH"];
-		} else {
-			throw new Exception('Getting content length is not supported.');
-		}
-	}
-}
-
-/**
- * Handle file uploads via regular form post (uses the $_FILES array)
- */
-class qqUploadedFileForm
-{
-	/**
-	 * Save the file to the specified path
-	 * @return boolean TRUE on success
-	 */
-	public function save($path)
-	{
-		if (!move_uploaded_file($_FILES['qqfile']['tmp_name'], $path)) {
-			return false;
-		}
-		return true;
-	}
-	public function getName()
-	{
-		return $_FILES['qqfile']['name'];
-	}
-	public function getSize()
-	{
-		return $_FILES['qqfile']['size'];
-	}
-}
+use \CoreLibs\Upload\Core\qqUploadedFileForm;
+use \CoreLibs\Upload\Core\qqUploadedFileXhr;
 
 class qqFileUploader
 {
@@ -170,3 +108,5 @@ class qqFileUploader
 		}
 	}
 }
+
+# __END__
diff --git a/www/libs/Error.Handling.inc b/www/lib/Error.Handling.inc
similarity index 99%
rename from www/libs/Error.Handling.inc
rename to www/lib/Error.Handling.inc
index 2567f673..166e14ee 100644
--- a/www/libs/Error.Handling.inc
+++ b/www/lib/Error.Handling.inc
@@ -1,4 +1,4 @@
-<?
+<?php
 /*********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2011/2/8
diff --git a/www/libs/Fonts/GeosansLight.ttf b/www/lib/Fonts/GeosansLight.ttf
similarity index 100%
rename from www/libs/Fonts/GeosansLight.ttf
rename to www/lib/Fonts/GeosansLight.ttf
diff --git a/www/libs/Fonts/MankSans.ttf b/www/lib/Fonts/MankSans.ttf
similarity index 100%
rename from www/libs/Fonts/MankSans.ttf
rename to www/lib/Fonts/MankSans.ttf
diff --git a/www/libs/Fonts/Silkscreen.ttf b/www/lib/Fonts/Silkscreen.ttf
similarity index 100%
rename from www/libs/Fonts/Silkscreen.ttf
rename to www/lib/Fonts/Silkscreen.ttf
diff --git a/www/libs/Fonts/pf_arma_five.ttf b/www/lib/Fonts/pf_arma_five.ttf
similarity index 100%
rename from www/libs/Fonts/pf_arma_five.ttf
rename to www/lib/Fonts/pf_arma_five.ttf
diff --git a/www/libs/Fonts/tahoma.ttf b/www/lib/Fonts/tahoma.ttf
similarity index 100%
rename from www/libs/Fonts/tahoma.ttf
rename to www/lib/Fonts/tahoma.ttf
diff --git a/www/lib/SMARTY_UPDATE b/www/lib/SMARTY_UPDATE
new file mode 100644
index 00000000..ed3e9ca1
--- /dev/null
+++ b/www/lib/SMARTY_UPDATE
@@ -0,0 +1,6 @@
+* copy
+plugins/block.t.php
+plugins/function.popup*.php
+* check & copy
+plugins/function.html_checkboxes.php
+plugins/function.html_options.php
diff --git a/www/lib/Smarty b/www/lib/Smarty
new file mode 120000
index 00000000..7156d2dc
--- /dev/null
+++ b/www/lib/Smarty
@@ -0,0 +1 @@
+smarty-3.1.30/
\ No newline at end of file
diff --git a/www/lib/autoloader.php b/www/lib/autoloader.php
new file mode 100644
index 00000000..9fc3f458
--- /dev/null
+++ b/www/lib/autoloader.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Autoloader;
+
+// shall implement an auto loader
+
+if (class_exists('Autoload', false) === false) {
+	// define the auto loader class
+	class Autoload
+	{
+		// we do it simple here
+		// passes on the class to load and we search here in namespace
+		// to load that class
+		public static function load($class)
+		{
+			// print "(1) Class: $class / DIR: ".__DIR__."<br>";
+			// set directory seperator (we need to replace from namespace)
+			$ds = DS ?? DIRECTORY_SEPARATOR;
+			// base lib
+			$LIB = LIB ?? 'lib';
+			// if lib is in path, do not add lib again
+			if (strpos(__DIR__, $LIB) !== false) {
+				$LIB .= DS;
+			} else {
+				$LIB = '';
+			}
+			// default path is unset
+			$path = false;
+			// set path on full dir
+			// if we have the namespace in the class, strip it out
+			$len = 0;
+			if (strpos($class, __NAMESPACE__) !== false) {
+				$len = strlen(__NAMESPACE__);
+			}
+			// set default extension
+			$extension = '.inc';
+			// set full include path
+			$path = __DIR__.$ds.$LIB.substr($class, $len);
+			// replace namespace \ with dir sepeator
+			$path = str_replace('\\', $ds, $path).$extension;
+			// print "(2) Class clean: $path<br>";
+			// if path is set and a valid file
+			if ($path !== false && is_file($path)) {
+				// echo "<b>(3)</b> Load Path: $path<br>";
+				// we should sub that
+				// self::loadFile($path);
+				include $path;
+				return true;
+			}
+			return false;
+		}
+	} // end class define
+
+	spl_autoload_register('Autoloader\Autoload::load', true, true);
+} // end check for already defined
+
+# __END__
diff --git a/www/libs/pChart b/www/lib/pChart
similarity index 100%
rename from www/libs/pChart
rename to www/lib/pChart
diff --git a/www/libs/pChart2.1.4/class/pBarcode128.class.php b/www/lib/pChart2.1.4/class/pBarcode128.class.php
similarity index 100%
rename from www/libs/pChart2.1.4/class/pBarcode128.class.php
rename to www/lib/pChart2.1.4/class/pBarcode128.class.php
diff --git a/www/libs/pChart2.1.4/class/pBarcode39.class.php b/www/lib/pChart2.1.4/class/pBarcode39.class.php
similarity index 100%
rename from www/libs/pChart2.1.4/class/pBarcode39.class.php
rename to www/lib/pChart2.1.4/class/pBarcode39.class.php
diff --git a/www/libs/pChart2.1.4/class/pBubble.class.php b/www/lib/pChart2.1.4/class/pBubble.class.php
similarity index 100%
rename from www/libs/pChart2.1.4/class/pBubble.class.php
rename to www/lib/pChart2.1.4/class/pBubble.class.php
diff --git a/www/libs/pChart2.1.4/class/pCache.class.php b/www/lib/pChart2.1.4/class/pCache.class.php
similarity index 100%
rename from www/libs/pChart2.1.4/class/pCache.class.php
rename to www/lib/pChart2.1.4/class/pCache.class.php
diff --git a/www/libs/pChart2.1.4/class/pData.class.php b/www/lib/pChart2.1.4/class/pData.class.php
similarity index 100%
rename from www/libs/pChart2.1.4/class/pData.class.php
rename to www/lib/pChart2.1.4/class/pData.class.php
diff --git a/www/libs/pChart2.1.4/class/pDraw.class.php b/www/lib/pChart2.1.4/class/pDraw.class.php
similarity index 100%
rename from www/libs/pChart2.1.4/class/pDraw.class.php
rename to www/lib/pChart2.1.4/class/pDraw.class.php
diff --git a/www/libs/pChart2.1.4/class/pImage.class.php b/www/lib/pChart2.1.4/class/pImage.class.php
similarity index 100%
rename from www/libs/pChart2.1.4/class/pImage.class.php
rename to www/lib/pChart2.1.4/class/pImage.class.php
diff --git a/www/libs/pChart2.1.4/class/pIndicator.class.php b/www/lib/pChart2.1.4/class/pIndicator.class.php
similarity index 100%
rename from www/libs/pChart2.1.4/class/pIndicator.class.php
rename to www/lib/pChart2.1.4/class/pIndicator.class.php
diff --git a/www/libs/pChart2.1.4/class/pPie.class.php b/www/lib/pChart2.1.4/class/pPie.class.php
similarity index 100%
rename from www/libs/pChart2.1.4/class/pPie.class.php
rename to www/lib/pChart2.1.4/class/pPie.class.php
diff --git a/www/libs/pChart2.1.4/class/pRadar.class.php b/www/lib/pChart2.1.4/class/pRadar.class.php
similarity index 100%
rename from www/libs/pChart2.1.4/class/pRadar.class.php
rename to www/lib/pChart2.1.4/class/pRadar.class.php
diff --git a/www/libs/pChart2.1.4/class/pScatter.class.php b/www/lib/pChart2.1.4/class/pScatter.class.php
similarity index 100%
rename from www/libs/pChart2.1.4/class/pScatter.class.php
rename to www/lib/pChart2.1.4/class/pScatter.class.php
diff --git a/www/libs/pChart2.1.4/class/pSplit.class.php b/www/lib/pChart2.1.4/class/pSplit.class.php
similarity index 100%
rename from www/libs/pChart2.1.4/class/pSplit.class.php
rename to www/lib/pChart2.1.4/class/pSplit.class.php
diff --git a/www/libs/pChart2.1.4/class/pSpring.class.php b/www/lib/pChart2.1.4/class/pSpring.class.php
similarity index 100%
rename from www/libs/pChart2.1.4/class/pSpring.class.php
rename to www/lib/pChart2.1.4/class/pSpring.class.php
diff --git a/www/libs/pChart2.1.4/class/pStock.class.php b/www/lib/pChart2.1.4/class/pStock.class.php
similarity index 100%
rename from www/libs/pChart2.1.4/class/pStock.class.php
rename to www/lib/pChart2.1.4/class/pStock.class.php
diff --git a/www/libs/pChart2.1.4/class/pSurface.class.php b/www/lib/pChart2.1.4/class/pSurface.class.php
similarity index 100%
rename from www/libs/pChart2.1.4/class/pSurface.class.php
rename to www/lib/pChart2.1.4/class/pSurface.class.php
diff --git a/www/libs/pChart2.1.4/data/128B.db b/www/lib/pChart2.1.4/data/128B.db
similarity index 100%
rename from www/libs/pChart2.1.4/data/128B.db
rename to www/lib/pChart2.1.4/data/128B.db
diff --git a/www/libs/pChart2.1.4/data/39.db b/www/lib/pChart2.1.4/data/39.db
similarity index 100%
rename from www/libs/pChart2.1.4/data/39.db
rename to www/lib/pChart2.1.4/data/39.db
diff --git a/www/libs/pChart2.1.4/fonts/Bedizen.ttf b/www/lib/pChart2.1.4/fonts/Bedizen.ttf
similarity index 100%
rename from www/libs/pChart2.1.4/fonts/Bedizen.ttf
rename to www/lib/pChart2.1.4/fonts/Bedizen.ttf
diff --git a/www/libs/pChart2.1.4/fonts/Forgotte.ttf b/www/lib/pChart2.1.4/fonts/Forgotte.ttf
similarity index 100%
rename from www/libs/pChart2.1.4/fonts/Forgotte.ttf
rename to www/lib/pChart2.1.4/fonts/Forgotte.ttf
diff --git a/www/libs/pChart2.1.4/fonts/GeosansLight.ttf b/www/lib/pChart2.1.4/fonts/GeosansLight.ttf
similarity index 100%
rename from www/libs/pChart2.1.4/fonts/GeosansLight.ttf
rename to www/lib/pChart2.1.4/fonts/GeosansLight.ttf
diff --git a/www/libs/pChart2.1.4/fonts/MankSans.ttf b/www/lib/pChart2.1.4/fonts/MankSans.ttf
similarity index 100%
rename from www/libs/pChart2.1.4/fonts/MankSans.ttf
rename to www/lib/pChart2.1.4/fonts/MankSans.ttf
diff --git a/www/libs/pChart2.1.4/fonts/Silkscreen.ttf b/www/lib/pChart2.1.4/fonts/Silkscreen.ttf
similarity index 100%
rename from www/libs/pChart2.1.4/fonts/Silkscreen.ttf
rename to www/lib/pChart2.1.4/fonts/Silkscreen.ttf
diff --git a/www/libs/pChart2.1.4/fonts/advent_light.ttf b/www/lib/pChart2.1.4/fonts/advent_light.ttf
similarity index 100%
rename from www/libs/pChart2.1.4/fonts/advent_light.ttf
rename to www/lib/pChart2.1.4/fonts/advent_light.ttf
diff --git a/www/libs/pChart2.1.4/fonts/calibri.ttf b/www/lib/pChart2.1.4/fonts/calibri.ttf
similarity index 100%
rename from www/libs/pChart2.1.4/fonts/calibri.ttf
rename to www/lib/pChart2.1.4/fonts/calibri.ttf
diff --git a/www/libs/pChart2.1.4/fonts/pf_arma_five.ttf b/www/lib/pChart2.1.4/fonts/pf_arma_five.ttf
similarity index 100%
rename from www/libs/pChart2.1.4/fonts/pf_arma_five.ttf
rename to www/lib/pChart2.1.4/fonts/pf_arma_five.ttf
diff --git a/www/libs/pChart2.1.4/fonts/verdana.ttf b/www/lib/pChart2.1.4/fonts/verdana.ttf
similarity index 100%
rename from www/libs/pChart2.1.4/fonts/verdana.ttf
rename to www/lib/pChart2.1.4/fonts/verdana.ttf
diff --git a/www/libs/pChart2.1.4/palettes/autumn.color b/www/lib/pChart2.1.4/palettes/autumn.color
similarity index 100%
rename from www/libs/pChart2.1.4/palettes/autumn.color
rename to www/lib/pChart2.1.4/palettes/autumn.color
diff --git a/www/libs/pChart2.1.4/palettes/blind.color b/www/lib/pChart2.1.4/palettes/blind.color
similarity index 100%
rename from www/libs/pChart2.1.4/palettes/blind.color
rename to www/lib/pChart2.1.4/palettes/blind.color
diff --git a/www/libs/pChart2.1.4/palettes/evening.color b/www/lib/pChart2.1.4/palettes/evening.color
similarity index 100%
rename from www/libs/pChart2.1.4/palettes/evening.color
rename to www/lib/pChart2.1.4/palettes/evening.color
diff --git a/www/libs/pChart2.1.4/palettes/kitchen.color b/www/lib/pChart2.1.4/palettes/kitchen.color
similarity index 100%
rename from www/libs/pChart2.1.4/palettes/kitchen.color
rename to www/lib/pChart2.1.4/palettes/kitchen.color
diff --git a/www/libs/pChart2.1.4/palettes/light.color b/www/lib/pChart2.1.4/palettes/light.color
similarity index 100%
rename from www/libs/pChart2.1.4/palettes/light.color
rename to www/lib/pChart2.1.4/palettes/light.color
diff --git a/www/libs/pChart2.1.4/palettes/navy.color b/www/lib/pChart2.1.4/palettes/navy.color
similarity index 100%
rename from www/libs/pChart2.1.4/palettes/navy.color
rename to www/lib/pChart2.1.4/palettes/navy.color
diff --git a/www/libs/pChart2.1.4/palettes/shade.color b/www/lib/pChart2.1.4/palettes/shade.color
similarity index 100%
rename from www/libs/pChart2.1.4/palettes/shade.color
rename to www/lib/pChart2.1.4/palettes/shade.color
diff --git a/www/libs/pChart2.1.4/palettes/spring.color b/www/lib/pChart2.1.4/palettes/spring.color
similarity index 100%
rename from www/libs/pChart2.1.4/palettes/spring.color
rename to www/lib/pChart2.1.4/palettes/spring.color
diff --git a/www/libs/pChart2.1.4/palettes/summer.color b/www/lib/pChart2.1.4/palettes/summer.color
similarity index 100%
rename from www/libs/pChart2.1.4/palettes/summer.color
rename to www/lib/pChart2.1.4/palettes/summer.color
diff --git a/www/smarty-3.1.27/.gitattributes b/www/lib/smarty-3.1.30/.gitattributes
similarity index 100%
rename from www/smarty-3.1.27/.gitattributes
rename to www/lib/smarty-3.1.30/.gitattributes
diff --git a/www/smarty-3.1.27/.gitignore b/www/lib/smarty-3.1.30/.gitignore
similarity index 100%
rename from www/smarty-3.1.27/.gitignore
rename to www/lib/smarty-3.1.30/.gitignore
diff --git a/www/smarty-3.1.27/.travis.yml b/www/lib/smarty-3.1.30/.travis.yml
similarity index 100%
rename from www/smarty-3.1.27/.travis.yml
rename to www/lib/smarty-3.1.30/.travis.yml
diff --git a/www/smarty-3.1.30/Autoloader.php b/www/lib/smarty-3.1.30/Autoloader.php
similarity index 100%
rename from www/smarty-3.1.30/Autoloader.php
rename to www/lib/smarty-3.1.30/Autoloader.php
diff --git a/www/smarty-3.1.30/Smarty.class.php b/www/lib/smarty-3.1.30/Smarty.class.php
similarity index 100%
rename from www/smarty-3.1.30/Smarty.class.php
rename to www/lib/smarty-3.1.30/Smarty.class.php
diff --git a/www/smarty-3.1.30/SmartyBC.class.php b/www/lib/smarty-3.1.30/SmartyBC.class.php
similarity index 100%
rename from www/smarty-3.1.30/SmartyBC.class.php
rename to www/lib/smarty-3.1.30/SmartyBC.class.php
diff --git a/www/smarty-3.1.30/debug.tpl b/www/lib/smarty-3.1.30/debug.tpl
similarity index 100%
rename from www/smarty-3.1.30/debug.tpl
rename to www/lib/smarty-3.1.30/debug.tpl
diff --git a/www/smarty-3.1.27/plugins/block.t.php b/www/lib/smarty-3.1.30/plugins/block.t.php
similarity index 100%
rename from www/smarty-3.1.27/plugins/block.t.php
rename to www/lib/smarty-3.1.30/plugins/block.t.php
diff --git a/www/smarty-3.1.30/plugins/block.textformat.php b/www/lib/smarty-3.1.30/plugins/block.textformat.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/block.textformat.php
rename to www/lib/smarty-3.1.30/plugins/block.textformat.php
diff --git a/www/smarty-3.1.30/plugins/function.counter.php b/www/lib/smarty-3.1.30/plugins/function.counter.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/function.counter.php
rename to www/lib/smarty-3.1.30/plugins/function.counter.php
diff --git a/www/smarty-3.1.30/plugins/function.cycle.php b/www/lib/smarty-3.1.30/plugins/function.cycle.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/function.cycle.php
rename to www/lib/smarty-3.1.30/plugins/function.cycle.php
diff --git a/www/smarty-3.1.30/plugins/function.fetch.php b/www/lib/smarty-3.1.30/plugins/function.fetch.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/function.fetch.php
rename to www/lib/smarty-3.1.30/plugins/function.fetch.php
diff --git a/www/smarty-3.1.27/plugins/function.html_checkboxes.php b/www/lib/smarty-3.1.30/plugins/function.html_checkboxes.php
similarity index 100%
rename from www/smarty-3.1.27/plugins/function.html_checkboxes.php
rename to www/lib/smarty-3.1.30/plugins/function.html_checkboxes.php
diff --git a/www/smarty-3.1.30/plugins/function.html_image.php b/www/lib/smarty-3.1.30/plugins/function.html_image.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/function.html_image.php
rename to www/lib/smarty-3.1.30/plugins/function.html_image.php
diff --git a/www/smarty-3.1.27/plugins/function.html_options.php b/www/lib/smarty-3.1.30/plugins/function.html_options.php
similarity index 100%
rename from www/smarty-3.1.27/plugins/function.html_options.php
rename to www/lib/smarty-3.1.30/plugins/function.html_options.php
diff --git a/www/smarty-3.1.30/plugins/function.html_radios.php b/www/lib/smarty-3.1.30/plugins/function.html_radios.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/function.html_radios.php
rename to www/lib/smarty-3.1.30/plugins/function.html_radios.php
diff --git a/www/smarty-3.1.30/plugins/function.html_select_date.php b/www/lib/smarty-3.1.30/plugins/function.html_select_date.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/function.html_select_date.php
rename to www/lib/smarty-3.1.30/plugins/function.html_select_date.php
diff --git a/www/smarty-3.1.30/plugins/function.html_select_time.php b/www/lib/smarty-3.1.30/plugins/function.html_select_time.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/function.html_select_time.php
rename to www/lib/smarty-3.1.30/plugins/function.html_select_time.php
diff --git a/www/smarty-3.1.30/plugins/function.html_table.php b/www/lib/smarty-3.1.30/plugins/function.html_table.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/function.html_table.php
rename to www/lib/smarty-3.1.30/plugins/function.html_table.php
diff --git a/www/smarty-3.1.30/plugins/function.mailto.php b/www/lib/smarty-3.1.30/plugins/function.mailto.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/function.mailto.php
rename to www/lib/smarty-3.1.30/plugins/function.mailto.php
diff --git a/www/smarty-3.1.30/plugins/function.math.php b/www/lib/smarty-3.1.30/plugins/function.math.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/function.math.php
rename to www/lib/smarty-3.1.30/plugins/function.math.php
diff --git a/www/smarty-3.1.27/plugins/function.popup.php b/www/lib/smarty-3.1.30/plugins/function.popup.php
similarity index 100%
rename from www/smarty-3.1.27/plugins/function.popup.php
rename to www/lib/smarty-3.1.30/plugins/function.popup.php
diff --git a/www/smarty-3.1.27/plugins/function.popup_init.php b/www/lib/smarty-3.1.30/plugins/function.popup_init.php
similarity index 100%
rename from www/smarty-3.1.27/plugins/function.popup_init.php
rename to www/lib/smarty-3.1.30/plugins/function.popup_init.php
diff --git a/www/smarty-3.1.30/plugins/modifier.capitalize.php b/www/lib/smarty-3.1.30/plugins/modifier.capitalize.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/modifier.capitalize.php
rename to www/lib/smarty-3.1.30/plugins/modifier.capitalize.php
diff --git a/www/smarty-3.1.27/plugins/modifier.date_format.php b/www/lib/smarty-3.1.30/plugins/modifier.date_format.php
similarity index 100%
rename from www/smarty-3.1.27/plugins/modifier.date_format.php
rename to www/lib/smarty-3.1.30/plugins/modifier.date_format.php
diff --git a/www/smarty-3.1.30/plugins/modifier.debug_print_var.php b/www/lib/smarty-3.1.30/plugins/modifier.debug_print_var.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/modifier.debug_print_var.php
rename to www/lib/smarty-3.1.30/plugins/modifier.debug_print_var.php
diff --git a/www/smarty-3.1.30/plugins/modifier.escape.php b/www/lib/smarty-3.1.30/plugins/modifier.escape.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/modifier.escape.php
rename to www/lib/smarty-3.1.30/plugins/modifier.escape.php
diff --git a/www/smarty-3.1.30/plugins/modifier.regex_replace.php b/www/lib/smarty-3.1.30/plugins/modifier.regex_replace.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/modifier.regex_replace.php
rename to www/lib/smarty-3.1.30/plugins/modifier.regex_replace.php
diff --git a/www/smarty-3.1.27/plugins/modifier.replace.php b/www/lib/smarty-3.1.30/plugins/modifier.replace.php
similarity index 100%
rename from www/smarty-3.1.27/plugins/modifier.replace.php
rename to www/lib/smarty-3.1.30/plugins/modifier.replace.php
diff --git a/www/smarty-3.1.27/plugins/modifier.spacify.php b/www/lib/smarty-3.1.30/plugins/modifier.spacify.php
similarity index 100%
rename from www/smarty-3.1.27/plugins/modifier.spacify.php
rename to www/lib/smarty-3.1.30/plugins/modifier.spacify.php
diff --git a/www/smarty-3.1.30/plugins/modifier.truncate.php b/www/lib/smarty-3.1.30/plugins/modifier.truncate.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/modifier.truncate.php
rename to www/lib/smarty-3.1.30/plugins/modifier.truncate.php
diff --git a/www/smarty-3.1.27/plugins/modifiercompiler.cat.php b/www/lib/smarty-3.1.30/plugins/modifiercompiler.cat.php
similarity index 100%
rename from www/smarty-3.1.27/plugins/modifiercompiler.cat.php
rename to www/lib/smarty-3.1.30/plugins/modifiercompiler.cat.php
diff --git a/www/smarty-3.1.30/plugins/modifiercompiler.count_characters.php b/www/lib/smarty-3.1.30/plugins/modifiercompiler.count_characters.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/modifiercompiler.count_characters.php
rename to www/lib/smarty-3.1.30/plugins/modifiercompiler.count_characters.php
diff --git a/www/smarty-3.1.30/plugins/modifiercompiler.count_paragraphs.php b/www/lib/smarty-3.1.30/plugins/modifiercompiler.count_paragraphs.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/modifiercompiler.count_paragraphs.php
rename to www/lib/smarty-3.1.30/plugins/modifiercompiler.count_paragraphs.php
diff --git a/www/smarty-3.1.30/plugins/modifiercompiler.count_sentences.php b/www/lib/smarty-3.1.30/plugins/modifiercompiler.count_sentences.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/modifiercompiler.count_sentences.php
rename to www/lib/smarty-3.1.30/plugins/modifiercompiler.count_sentences.php
diff --git a/www/smarty-3.1.30/plugins/modifiercompiler.count_words.php b/www/lib/smarty-3.1.30/plugins/modifiercompiler.count_words.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/modifiercompiler.count_words.php
rename to www/lib/smarty-3.1.30/plugins/modifiercompiler.count_words.php
diff --git a/www/smarty-3.1.30/plugins/modifiercompiler.default.php b/www/lib/smarty-3.1.30/plugins/modifiercompiler.default.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/modifiercompiler.default.php
rename to www/lib/smarty-3.1.30/plugins/modifiercompiler.default.php
diff --git a/www/smarty-3.1.30/plugins/modifiercompiler.escape.php b/www/lib/smarty-3.1.30/plugins/modifiercompiler.escape.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/modifiercompiler.escape.php
rename to www/lib/smarty-3.1.30/plugins/modifiercompiler.escape.php
diff --git a/www/smarty-3.1.30/plugins/modifiercompiler.from_charset.php b/www/lib/smarty-3.1.30/plugins/modifiercompiler.from_charset.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/modifiercompiler.from_charset.php
rename to www/lib/smarty-3.1.30/plugins/modifiercompiler.from_charset.php
diff --git a/www/smarty-3.1.30/plugins/modifiercompiler.indent.php b/www/lib/smarty-3.1.30/plugins/modifiercompiler.indent.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/modifiercompiler.indent.php
rename to www/lib/smarty-3.1.30/plugins/modifiercompiler.indent.php
diff --git a/www/smarty-3.1.30/plugins/modifiercompiler.lower.php b/www/lib/smarty-3.1.30/plugins/modifiercompiler.lower.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/modifiercompiler.lower.php
rename to www/lib/smarty-3.1.30/plugins/modifiercompiler.lower.php
diff --git a/www/smarty-3.1.27/plugins/modifiercompiler.noprint.php b/www/lib/smarty-3.1.30/plugins/modifiercompiler.noprint.php
similarity index 100%
rename from www/smarty-3.1.27/plugins/modifiercompiler.noprint.php
rename to www/lib/smarty-3.1.30/plugins/modifiercompiler.noprint.php
diff --git a/www/smarty-3.1.30/plugins/modifiercompiler.string_format.php b/www/lib/smarty-3.1.30/plugins/modifiercompiler.string_format.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/modifiercompiler.string_format.php
rename to www/lib/smarty-3.1.30/plugins/modifiercompiler.string_format.php
diff --git a/www/smarty-3.1.30/plugins/modifiercompiler.strip.php b/www/lib/smarty-3.1.30/plugins/modifiercompiler.strip.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/modifiercompiler.strip.php
rename to www/lib/smarty-3.1.30/plugins/modifiercompiler.strip.php
diff --git a/www/smarty-3.1.30/plugins/modifiercompiler.strip_tags.php b/www/lib/smarty-3.1.30/plugins/modifiercompiler.strip_tags.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/modifiercompiler.strip_tags.php
rename to www/lib/smarty-3.1.30/plugins/modifiercompiler.strip_tags.php
diff --git a/www/smarty-3.1.30/plugins/modifiercompiler.to_charset.php b/www/lib/smarty-3.1.30/plugins/modifiercompiler.to_charset.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/modifiercompiler.to_charset.php
rename to www/lib/smarty-3.1.30/plugins/modifiercompiler.to_charset.php
diff --git a/www/smarty-3.1.30/plugins/modifiercompiler.unescape.php b/www/lib/smarty-3.1.30/plugins/modifiercompiler.unescape.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/modifiercompiler.unescape.php
rename to www/lib/smarty-3.1.30/plugins/modifiercompiler.unescape.php
diff --git a/www/smarty-3.1.30/plugins/modifiercompiler.upper.php b/www/lib/smarty-3.1.30/plugins/modifiercompiler.upper.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/modifiercompiler.upper.php
rename to www/lib/smarty-3.1.30/plugins/modifiercompiler.upper.php
diff --git a/www/smarty-3.1.30/plugins/modifiercompiler.wordwrap.php b/www/lib/smarty-3.1.30/plugins/modifiercompiler.wordwrap.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/modifiercompiler.wordwrap.php
rename to www/lib/smarty-3.1.30/plugins/modifiercompiler.wordwrap.php
diff --git a/www/smarty-3.1.30/plugins/outputfilter.trimwhitespace.php b/www/lib/smarty-3.1.30/plugins/outputfilter.trimwhitespace.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/outputfilter.trimwhitespace.php
rename to www/lib/smarty-3.1.30/plugins/outputfilter.trimwhitespace.php
diff --git a/www/smarty-3.1.30/plugins/shared.escape_special_chars.php b/www/lib/smarty-3.1.30/plugins/shared.escape_special_chars.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/shared.escape_special_chars.php
rename to www/lib/smarty-3.1.30/plugins/shared.escape_special_chars.php
diff --git a/www/smarty-3.1.30/plugins/shared.literal_compiler_param.php b/www/lib/smarty-3.1.30/plugins/shared.literal_compiler_param.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/shared.literal_compiler_param.php
rename to www/lib/smarty-3.1.30/plugins/shared.literal_compiler_param.php
diff --git a/www/smarty-3.1.30/plugins/shared.make_timestamp.php b/www/lib/smarty-3.1.30/plugins/shared.make_timestamp.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/shared.make_timestamp.php
rename to www/lib/smarty-3.1.30/plugins/shared.make_timestamp.php
diff --git a/www/smarty-3.1.30/plugins/shared.mb_str_replace.php b/www/lib/smarty-3.1.30/plugins/shared.mb_str_replace.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/shared.mb_str_replace.php
rename to www/lib/smarty-3.1.30/plugins/shared.mb_str_replace.php
diff --git a/www/smarty-3.1.27/plugins/shared.mb_unicode.php b/www/lib/smarty-3.1.30/plugins/shared.mb_unicode.php
similarity index 100%
rename from www/smarty-3.1.27/plugins/shared.mb_unicode.php
rename to www/lib/smarty-3.1.30/plugins/shared.mb_unicode.php
diff --git a/www/smarty-3.1.30/plugins/shared.mb_wordwrap.php b/www/lib/smarty-3.1.30/plugins/shared.mb_wordwrap.php
similarity index 100%
rename from www/smarty-3.1.30/plugins/shared.mb_wordwrap.php
rename to www/lib/smarty-3.1.30/plugins/shared.mb_wordwrap.php
diff --git a/www/smarty-3.1.27/plugins/variablefilter.htmlspecialchars.php b/www/lib/smarty-3.1.30/plugins/variablefilter.htmlspecialchars.php
similarity index 100%
rename from www/smarty-3.1.27/plugins/variablefilter.htmlspecialchars.php
rename to www/lib/smarty-3.1.30/plugins/variablefilter.htmlspecialchars.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_cacheresource.php b/www/lib/smarty-3.1.30/sysplugins/smarty_cacheresource.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_cacheresource.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_cacheresource.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_cacheresource_custom.php b/www/lib/smarty-3.1.30/sysplugins/smarty_cacheresource_custom.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_cacheresource_custom.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_cacheresource_custom.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_cacheresource_keyvaluestore.php b/www/lib/smarty-3.1.30/sysplugins/smarty_cacheresource_keyvaluestore.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_cacheresource_keyvaluestore.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_cacheresource_keyvaluestore.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_data.php b/www/lib/smarty-3.1.30/sysplugins/smarty_data.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_data.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_data.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_block.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_block.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_block.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_block.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_cacheresource_file.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_cacheresource_file.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_cacheresource_file.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_cacheresource_file.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_append.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_append.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_append.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_append.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_assign.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_assign.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_assign.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_assign.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_block.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_block.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_block.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_block.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_break.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_break.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_break.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_break.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_call.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_call.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_call.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_call.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_capture.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_capture.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_capture.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_capture.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_config_load.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_config_load.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_config_load.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_config_load.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_continue.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_continue.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_continue.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_continue.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_debug.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_debug.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_debug.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_debug.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_eval.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_eval.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_eval.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_eval.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_extends.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_extends.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_extends.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_extends.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_for.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_for.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_for.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_for.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_foreach.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_foreach.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_foreach.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_foreach.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_function.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_function.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_function.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_function.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_if.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_if.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_if.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_if.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_include.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_include.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_include.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_include.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_include_php.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_include_php.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_include_php.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_include_php.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_insert.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_insert.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_insert.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_insert.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_ldelim.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_ldelim.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_ldelim.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_ldelim.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_make_nocache.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_make_nocache.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_make_nocache.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_make_nocache.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_nocache.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_nocache.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_nocache.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_nocache.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_private_block_plugin.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_private_block_plugin.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_private_block_plugin.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_private_block_plugin.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_private_foreachsection.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_private_foreachsection.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_private_foreachsection.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_private_foreachsection.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_private_function_plugin.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_private_function_plugin.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_private_function_plugin.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_private_function_plugin.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_private_modifier.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_private_modifier.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_private_modifier.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_private_modifier.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_private_object_block_function.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_private_object_block_function.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_private_object_block_function.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_private_object_block_function.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_private_object_function.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_private_object_function.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_private_object_function.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_private_object_function.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_private_php.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_private_php.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_private_php.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_private_php.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_private_print_expression.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_private_print_expression.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_private_print_expression.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_private_print_expression.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_private_registered_block.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_private_registered_block.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_private_registered_block.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_private_registered_block.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_private_registered_function.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_private_registered_function.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_private_registered_function.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_private_registered_function.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_private_special_variable.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_private_special_variable.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_private_special_variable.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_private_special_variable.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_rdelim.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_rdelim.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_rdelim.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_rdelim.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_section.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_section.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_section.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_section.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_setfilter.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_setfilter.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_setfilter.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_setfilter.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_shared_inheritance.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_shared_inheritance.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_shared_inheritance.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_shared_inheritance.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compile_while.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_while.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compile_while.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compile_while.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_compilebase.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_compilebase.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_compilebase.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_compilebase.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_config_file_compiler.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_config_file_compiler.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_config_file_compiler.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_config_file_compiler.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_configfilelexer.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_configfilelexer.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_configfilelexer.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_configfilelexer.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_configfileparser.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_configfileparser.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_configfileparser.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_configfileparser.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_data.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_data.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_data.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_data.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_debug.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_debug.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_debug.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_debug.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_extension_clear.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_extension_clear.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_extension_clear.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_extension_clear.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_extension_handler.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_extension_handler.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_extension_handler.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_extension_handler.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_addautoloadfilters.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_addautoloadfilters.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_addautoloadfilters.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_addautoloadfilters.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_adddefaultmodifiers.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_adddefaultmodifiers.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_adddefaultmodifiers.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_adddefaultmodifiers.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_append.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_append.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_append.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_append.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_appendbyref.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_appendbyref.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_appendbyref.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_appendbyref.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_assignbyref.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_assignbyref.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_assignbyref.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_assignbyref.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_assignglobal.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_assignglobal.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_assignglobal.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_assignglobal.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_clearallassign.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_clearallassign.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_clearallassign.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_clearallassign.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_clearallcache.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_clearallcache.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_clearallcache.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_clearallcache.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_clearassign.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_clearassign.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_clearassign.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_clearassign.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_clearcache.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_clearcache.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_clearcache.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_clearcache.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_clearcompiledtemplate.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_clearcompiledtemplate.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_clearcompiledtemplate.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_clearcompiledtemplate.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_clearconfig.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_clearconfig.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_clearconfig.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_clearconfig.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_compileallconfig.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_compileallconfig.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_compileallconfig.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_compileallconfig.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_compilealltemplates.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_compilealltemplates.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_compilealltemplates.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_compilealltemplates.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_configload.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_configload.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_configload.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_configload.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_createdata.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_createdata.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_createdata.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_createdata.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_getautoloadfilters.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_getautoloadfilters.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_getautoloadfilters.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_getautoloadfilters.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_getconfigvars.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_getconfigvars.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_getconfigvars.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_getconfigvars.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_getdebugtemplate.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_getdebugtemplate.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_getdebugtemplate.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_getdebugtemplate.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_getdefaultmodifiers.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_getdefaultmodifiers.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_getdefaultmodifiers.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_getdefaultmodifiers.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_getglobal.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_getglobal.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_getglobal.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_getglobal.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_getregisteredobject.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_getregisteredobject.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_getregisteredobject.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_getregisteredobject.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_getstreamvariable.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_getstreamvariable.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_getstreamvariable.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_getstreamvariable.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_gettags.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_gettags.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_gettags.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_gettags.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_gettemplatevars.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_gettemplatevars.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_gettemplatevars.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_gettemplatevars.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_loadfilter.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_loadfilter.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_loadfilter.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_loadfilter.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_loadplugin.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_loadplugin.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_loadplugin.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_loadplugin.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_mustcompile.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_mustcompile.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_mustcompile.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_mustcompile.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_registercacheresource.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_registercacheresource.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_registercacheresource.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_registercacheresource.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_registerclass.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_registerclass.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_registerclass.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_registerclass.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_registerdefaultconfighandler.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_registerdefaultconfighandler.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_registerdefaultconfighandler.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_registerdefaultconfighandler.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_registerfilter.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_registerfilter.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_registerfilter.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_registerfilter.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_registerobject.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_registerobject.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_registerobject.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_registerobject.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_registerplugin.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_registerplugin.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_registerplugin.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_registerplugin.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_registerresource.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_registerresource.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_registerresource.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_registerresource.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_setautoloadfilters.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_setautoloadfilters.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_setautoloadfilters.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_setautoloadfilters.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_setdebugtemplate.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_setdebugtemplate.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_setdebugtemplate.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_setdebugtemplate.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_setdefaultmodifiers.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_setdefaultmodifiers.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_setdefaultmodifiers.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_setdefaultmodifiers.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_unloadfilter.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_unloadfilter.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_unloadfilter.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_unloadfilter.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_unregistercacheresource.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_unregistercacheresource.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_unregistercacheresource.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_unregistercacheresource.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_unregisterfilter.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_unregisterfilter.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_unregisterfilter.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_unregisterfilter.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_unregisterobject.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_unregisterobject.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_unregisterobject.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_unregisterobject.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_unregisterplugin.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_unregisterplugin.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_unregisterplugin.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_unregisterplugin.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_method_unregisterresource.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_unregisterresource.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_method_unregisterresource.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_method_unregisterresource.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_nocache_insert.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_nocache_insert.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_nocache_insert.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_nocache_insert.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_parsetree.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_parsetree.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_parsetree.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_parsetree.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_parsetree_code.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_parsetree_code.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_parsetree_code.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_parsetree_code.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_parsetree_dq.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_parsetree_dq.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_parsetree_dq.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_parsetree_dq.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_parsetree_dqcontent.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_parsetree_dqcontent.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_parsetree_dqcontent.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_parsetree_dqcontent.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_parsetree_tag.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_parsetree_tag.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_parsetree_tag.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_parsetree_tag.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_parsetree_template.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_parsetree_template.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_parsetree_template.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_parsetree_template.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_parsetree_text.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_parsetree_text.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_parsetree_text.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_parsetree_text.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_resource_eval.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_resource_eval.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_resource_eval.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_resource_eval.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_resource_extends.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_resource_extends.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_resource_extends.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_resource_extends.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_resource_file.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_resource_file.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_resource_file.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_resource_file.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_resource_php.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_resource_php.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_resource_php.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_resource_php.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_resource_registered.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_resource_registered.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_resource_registered.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_resource_registered.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_resource_stream.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_resource_stream.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_resource_stream.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_resource_stream.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_resource_string.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_resource_string.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_resource_string.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_resource_string.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_runtime_cachemodify.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_runtime_cachemodify.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_runtime_cachemodify.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_runtime_cachemodify.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_runtime_capture.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_runtime_capture.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_runtime_capture.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_runtime_capture.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_runtime_codeframe.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_runtime_codeframe.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_runtime_codeframe.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_runtime_codeframe.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_runtime_filterhandler.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_runtime_filterhandler.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_runtime_filterhandler.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_runtime_filterhandler.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_runtime_foreach.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_runtime_foreach.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_runtime_foreach.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_runtime_foreach.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_runtime_getincludepath.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_runtime_getincludepath.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_runtime_getincludepath.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_runtime_getincludepath.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_runtime_inheritance.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_runtime_inheritance.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_runtime_inheritance.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_runtime_inheritance.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_runtime_make_nocache.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_runtime_make_nocache.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_runtime_make_nocache.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_runtime_make_nocache.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_runtime_tplfunction.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_runtime_tplfunction.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_runtime_tplfunction.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_runtime_tplfunction.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_runtime_updatecache.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_runtime_updatecache.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_runtime_updatecache.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_runtime_updatecache.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_runtime_updatescope.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_runtime_updatescope.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_runtime_updatescope.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_runtime_updatescope.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_runtime_writefile.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_runtime_writefile.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_runtime_writefile.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_runtime_writefile.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_smartytemplatecompiler.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_smartytemplatecompiler.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_smartytemplatecompiler.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_smartytemplatecompiler.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_template.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_template.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_template.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_template.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_templatebase.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_templatebase.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_templatebase.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_templatebase.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_templatecompilerbase.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_templatecompilerbase.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_templatecompilerbase.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_templatecompilerbase.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_templatelexer.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_templatelexer.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_templatelexer.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_templatelexer.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_templateparser.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_templateparser.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_templateparser.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_templateparser.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_testinstall.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_testinstall.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_testinstall.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_testinstall.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_internal_undefined.php b/www/lib/smarty-3.1.30/sysplugins/smarty_internal_undefined.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_internal_undefined.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_internal_undefined.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_resource.php b/www/lib/smarty-3.1.30/sysplugins/smarty_resource.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_resource.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_resource.php
diff --git a/www/smarty-3.1.27/sysplugins/smarty_resource_custom.php b/www/lib/smarty-3.1.30/sysplugins/smarty_resource_custom.php
similarity index 100%
rename from www/smarty-3.1.27/sysplugins/smarty_resource_custom.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_resource_custom.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_resource_recompiled.php b/www/lib/smarty-3.1.30/sysplugins/smarty_resource_recompiled.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_resource_recompiled.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_resource_recompiled.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_resource_uncompiled.php b/www/lib/smarty-3.1.30/sysplugins/smarty_resource_uncompiled.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_resource_uncompiled.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_resource_uncompiled.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_security.php b/www/lib/smarty-3.1.30/sysplugins/smarty_security.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_security.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_security.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_template_cached.php b/www/lib/smarty-3.1.30/sysplugins/smarty_template_cached.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_template_cached.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_template_cached.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_template_compiled.php b/www/lib/smarty-3.1.30/sysplugins/smarty_template_compiled.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_template_compiled.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_template_compiled.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_template_config.php b/www/lib/smarty-3.1.30/sysplugins/smarty_template_config.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_template_config.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_template_config.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_template_resource_base.php b/www/lib/smarty-3.1.30/sysplugins/smarty_template_resource_base.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_template_resource_base.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_template_resource_base.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_template_source.php b/www/lib/smarty-3.1.30/sysplugins/smarty_template_source.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_template_source.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_template_source.php
diff --git a/www/smarty-3.1.27/sysplugins/smarty_undefined_variable.php b/www/lib/smarty-3.1.30/sysplugins/smarty_undefined_variable.php
similarity index 100%
rename from www/smarty-3.1.27/sysplugins/smarty_undefined_variable.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_undefined_variable.php
diff --git a/www/smarty-3.1.30/sysplugins/smarty_variable.php b/www/lib/smarty-3.1.30/sysplugins/smarty_variable.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smarty_variable.php
rename to www/lib/smarty-3.1.30/sysplugins/smarty_variable.php
diff --git a/www/smarty-3.1.30/sysplugins/smartycompilerexception.php b/www/lib/smarty-3.1.30/sysplugins/smartycompilerexception.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smartycompilerexception.php
rename to www/lib/smarty-3.1.30/sysplugins/smartycompilerexception.php
diff --git a/www/smarty-3.1.30/sysplugins/smartyexception.php b/www/lib/smarty-3.1.30/sysplugins/smartyexception.php
similarity index 100%
rename from www/smarty-3.1.30/sysplugins/smartyexception.php
rename to www/lib/smarty-3.1.30/sysplugins/smartyexception.php
diff --git a/www/libs/class.progressbar.php b/www/libs/class.progressbar.php
deleted file mode 120000
index 4770db78..00000000
--- a/www/libs/class.progressbar.php
+++ /dev/null
@@ -1 +0,0 @@
-Class.Progressbar.inc
\ No newline at end of file
diff --git a/www/libs/streams.php b/www/libs/streams.php
deleted file mode 100644
index 2037fab3..00000000
--- a/www/libs/streams.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-/*
-	Copyright (c) 2003, 2005, 2006, 2009 Danilo Segan <danilo@kvota.net>.
-
-	This file is part of PHP-gettext.
-
-	PHP-gettext is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; either version 2 of the License, or
-	(at your option) any later version.
-
-	PHP-gettext is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with PHP-gettext; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-
-  // Simple class to wrap file streams, string streams, etc.
-  // seek is essential, and it should be byte stream
-class StreamReader
-{
-	// should return a string [FIXME: perhaps return array of bytes?]
-	public function read($bytes)
-	{
-		return false;
-	}
-
-	// should return new position
-	public function seekto($position)
-	{
-		return false;
-	}
-
-	// returns current position
-	public function currentpos()
-	{
-		return false;
-	}
-
-	// returns length of entire stream (limit for seekto()s)
-	public function length()
-	{
-		return false;
-	}
-}
-
-class StringReader
-{
-	public $_pos;
-	public $_str;
-
-	public function __construct($str = '')
-	{
-		$this->_str = $str;
-		$this->_pos = 0;
-	}
-
-	public function read($bytes)
-	{
-		$data = substr($this->_str, $this->_pos, $bytes);
-		$this->_pos += $bytes;
-		if (strlen($this->_str) < $this->_pos) {
-			$this->_pos = strlen($this->_str);
-		}
-
-		return $data;
-	}
-
-	public function seekto($pos)
-	{
-		$this->_pos = $pos;
-		if (strlen($this->_str) < $this->_pos) {
-			$this->_pos = strlen($this->_str);
-		}
-		return $this->_pos;
-	}
-
-	public function currentpos()
-	{
-		return $this->_pos;
-	}
-
-	public function length()
-	{
-		return strlen($this->_str);
-	}
-}
-
-
-class FileReader
-{
-	public $_pos;
-	public $_fd;
-	public $_length;
-
-	public function __construct($filename)
-	{
-		if (file_exists($filename)) {
-			$this->_length = filesize($filename);
-			$this->_pos = 0;
-			$this->_fd = fopen($filename, 'rb');
-			if (!$this->_fd) {
-				$this->error = 3; // Cannot read file, probably permissions
-				return false;
-			}
-		} else {
-			$this->error = 2; // File doesn't exist
-			return false;
-		}
-	}
-
-	public function read($bytes)
-	{
-		if ($bytes) {
-			fseek($this->_fd, $this->_pos);
-
-			// PHP 5.1.1 does not read more than 8192 bytes in one fread()
-			// the discussions at PHP Bugs suggest it's the intended behaviour
-			$data = '';
-			while ($bytes > 0) {
-				$chunk = fread($this->_fd, $bytes);
-				$data .= $chunk;
-				$bytes -= strlen($chunk);
-			}
-			$this->_pos = ftell($this->_fd);
-
-			return $data;
-		} else {
-			return '';
-		}
-	}
-
-	public function seekto($pos)
-	{
-		fseek($this->_fd, $pos);
-		$this->_pos = ftell($this->_fd);
-		return $this->_pos;
-	}
-
-	public function currentpos()
-	{
-		return $this->_pos;
-	}
-
-	public function length()
-	{
-		return $this->_length;
-	}
-
-	public function close()
-	{
-		fclose($this->_fd);
-	}
-}
-
-// Preloads entire file in memory first, then creates a StringReader
-// over it (it assumes knowledge of StringReader internals)
-class CachedFileReader extends StringReader
-{
-	public function __construct($filename)
-	{
-		if (file_exists($filename)) {
-			$length = filesize($filename);
-			$fd = fopen($filename, 'rb');
-
-			if (!$fd) {
-				$this->error = 3; // Cannot read file, probably permissions
-				return false;
-			}
-			$this->_str = fread($fd, $length);
-			fclose($fd);
-		} else {
-			$this->error = 2; // File doesn't exist
-			return false;
-		}
-	}
-}
diff --git a/www/smarty-3.1.27/Autoloader.php b/www/smarty-3.1.27/Autoloader.php
deleted file mode 100644
index a24cad6f..00000000
--- a/www/smarty-3.1.27/Autoloader.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-/**
- * Smarty Autoloader
- *
- * @package    Smarty
- */
-
-/**
- * Smarty Autoloader
- *
- * @package    Smarty
- * @author     Uwe Tews
- *             Usage:
- *             require_once '...path/Autoloader.php';
- *             Smarty_Autoloader::register();
- *             $smarty = new Smarty();
- *             Note:       This autoloader is not needed if you use Composer.
- *             Composer will automatically add the classes of the Smarty package to it common autoloader.
- */
-class Smarty_Autoloader
-{
-    /**
-     * Filepath to Smarty root
-     *
-     * @var string
-     */
-    public static $SMARTY_DIR = '';
-    /**
-     * Filepath to Smarty internal plugins
-     *
-     * @var string
-     */
-    public static $SMARTY_SYSPLUGINS_DIR = '';
-    /**
-     * Array of not existing classes to avoid is_file calls for  already tested classes
-     *
-     * @var array
-     */
-    public static $unknown = array();
-    /**
-     * Array with Smarty core classes and their filename
-     *
-     * @var array
-     */
-    public static $rootClasses = array('Smarty'   => 'Smarty.class.php',
-                                       'SmartyBC' => 'SmartyBC.class.php',
-    );
-
-    private static $syspluginsClasses = array(
-        'smarty_config_source'                  => true,
-        'smarty_security'                       => true,
-        'smarty_cacheresource'                  => true,
-        'smarty_compiledresource'               => true,
-        'smarty_cacheresource_custom'           => true,
-        'smarty_cacheresource_keyvaluestore'    => true,
-        'smarty_resource'                       => true,
-        'smarty_resource_custom'                => true,
-        'smarty_resource_uncompiled'            => true,
-        'smarty_resource_recompiled'            => true,
-        'smarty_template_source'                => true,
-        'smarty_template_compiled'              => true,
-        'smarty_template_cached'                => true,
-        'smarty_template_config'                => true,
-        'smarty_data'                           => true,
-        'smarty_variable'                       => true,
-        'smarty_undefined_variable'             => true,
-        'smartyexception'                       => true,
-        'smartycompilerexception'               => true,
-        'smarty_internal_data'                  => true,
-        'smarty_internal_template'              => true,
-        'smarty_internal_templatebase'          => true,
-        'smarty_internal_resource_file'         => true,
-        'smarty_internal_resource_extends'      => true,
-        'smarty_internal_resource_eval'         => true,
-        'smarty_internal_resource_string'       => true,
-        'smarty_internal_resource_registered'   => true,
-        'smarty_internal_extension_codeframe'   => true,
-        'smarty_internal_extension_config'      => true,
-        'smarty_internal_filter_handler'        => true,
-        'smarty_internal_function_call_handler' => true,
-        'smarty_internal_cacheresource_file'    => true,
-        'smarty_internal_write_file'    => true,
-    );
-
-    /**
-     * Registers Smarty_Autoloader backward compatible to older installations.
-     *
-     * @param bool $prepend Whether to prepend the autoloader or not.
-     */
-    public static function registerBC($prepend = false)
-    {
-        /**
-         * register the class autoloader
-         */
-        if (!defined('SMARTY_SPL_AUTOLOAD')) {
-            define('SMARTY_SPL_AUTOLOAD', 0);
-        }
-        if (SMARTY_SPL_AUTOLOAD && set_include_path(get_include_path() . PATH_SEPARATOR . SMARTY_SYSPLUGINS_DIR) !== false) {
-            $registeredAutoLoadFunctions = spl_autoload_functions();
-            if (!isset($registeredAutoLoadFunctions['spl_autoload'])) {
-                spl_autoload_register();
-            }
-        } else {
-            self::register($prepend);
-        }
-    }
-
-    /**
-     * Registers Smarty_Autoloader as an SPL autoloader.
-     *
-     * @param bool $prepend Whether to prepend the autoloader or not.
-     */
-    public static function register($prepend = false)
-    {
-        self::$SMARTY_DIR = defined('SMARTY_DIR') ? SMARTY_DIR : dirname(__FILE__) . '/';
-        self::$SMARTY_SYSPLUGINS_DIR = defined('SMARTY_SYSPLUGINS_DIR') ? SMARTY_SYSPLUGINS_DIR : self::$SMARTY_DIR . 'sysplugins/';
-        if (version_compare(phpversion(), '5.3.0', '>=')) {
-            spl_autoload_register(array(__CLASS__, 'autoload'), true, $prepend);
-        } else {
-            spl_autoload_register(array(__CLASS__, 'autoload'));
-        }
-    }
-
-    /**
-     * Handles autoloading of classes.
-     *
-     * @param string $class A class name.
-     */
-    public static function autoload($class)
-    {
-        // Request for Smarty or already unknown class
-        if (isset(self::$unknown[$class])) {
-            return;
-        }
-        $_class = strtolower($class);
-        if (isset(self::$syspluginsClasses[$_class])) {
-            $_class = (self::$syspluginsClasses[$_class] === true) ? $_class : self::$syspluginsClasses[$_class];
-            $file = self::$SMARTY_SYSPLUGINS_DIR . $_class . '.php';
-            require_once $file;
-            return;
-        } elseif (0 !== strpos($_class, 'smarty_internal_')) {
-            if (isset(self::$rootClasses[$class])) {
-                $file = self::$SMARTY_DIR . self::$rootClasses[$class];
-                require_once $file;
-                return;
-            }
-            self::$unknown[$class] = true;
-            return;
-        }
-        $file = self::$SMARTY_SYSPLUGINS_DIR . $_class . '.php';
-        if (is_file($file)) {
-            require_once $file;
-            return;
-        }
-        self::$unknown[$class] = true;
-        return;
-    }
-}
diff --git a/www/smarty-3.1.27/Smarty.class.php b/www/smarty-3.1.27/Smarty.class.php
deleted file mode 100644
index 1f0f2634..00000000
--- a/www/smarty-3.1.27/Smarty.class.php
+++ /dev/null
@@ -1,1802 +0,0 @@
-<?php
-/**
- * Project:     Smarty: the PHP compiling template engine
- * File:        Smarty.class.php
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * For questions, help, comments, discussion, etc., please join the
- * Smarty mailing list. Send a blank e-mail to
- * smarty-discussion-subscribe@googlegroups.com
- *
- * @link      http://www.smarty.net/
- * @copyright 2015 New Digital Group, Inc.
- * @copyright 2015 Uwe Tews
- * @author    Monte Ohrt <monte at ohrt dot com>
- * @author    Uwe Tews
- * @author    Rodney Rehm
- * @package   Smarty
- * @version   3.1.27
- */
-
-/**
- * define shorthand directory separator constant
- */
-if (!defined('DS')) {
-    define('DS', DIRECTORY_SEPARATOR);
-}
-
-/**
- * set SMARTY_DIR to absolute path to Smarty library files.
- * Sets SMARTY_DIR only if user application has not already defined it.
- */
-if (!defined('SMARTY_DIR')) {
-    define('SMARTY_DIR', dirname(__FILE__) . DS);
-}
-
-/**
- * set SMARTY_SYSPLUGINS_DIR to absolute path to Smarty internal plugins.
- * Sets SMARTY_SYSPLUGINS_DIR only if user application has not already defined it.
- */
-if (!defined('SMARTY_SYSPLUGINS_DIR')) {
-    define('SMARTY_SYSPLUGINS_DIR', SMARTY_DIR . 'sysplugins' . DS);
-}
-if (!defined('SMARTY_PLUGINS_DIR')) {
-    define('SMARTY_PLUGINS_DIR', SMARTY_DIR . 'plugins' . DS);
-}
-if (!defined('SMARTY_MBSTRING')) {
-    define('SMARTY_MBSTRING', function_exists('mb_get_info'));
-}
-if (!defined('SMARTY_RESOURCE_CHAR_SET')) {
-    // UTF-8 can only be done properly when mbstring is available!
-    /**
-     * @deprecated in favor of Smarty::$_CHARSET
-     */
-    define('SMARTY_RESOURCE_CHAR_SET', SMARTY_MBSTRING ? 'UTF-8' : 'ISO-8859-1');
-}
-if (!defined('SMARTY_RESOURCE_DATE_FORMAT')) {
-    /**
-     * @deprecated in favor of Smarty::$_DATE_FORMAT
-     */
-    define('SMARTY_RESOURCE_DATE_FORMAT', '%b %e, %Y');
-}
-
-/**
- * Try loading the Smarty_Internal_Data class
- * If we fail we must load Smarty's autoloader.
- * Otherwise we may have a global autoloader like Composer
- */
-if (!class_exists('Smarty_Autoloader', false)) {
-    if (!class_exists('Smarty_Internal_Data', true)) {
-        require_once 'Autoloader.php';
-        Smarty_Autoloader::registerBC();
-    }
-}
-
-/**
- * Load always needed external class files
- */
-
-if (!class_exists('Smarty_Internal_Data', false)) {
-    require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_data.php';
-}
-require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_templatebase.php';
-require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_template.php';
-require_once SMARTY_SYSPLUGINS_DIR . 'smarty_resource.php';
-require_once SMARTY_SYSPLUGINS_DIR . 'smarty_variable.php';
-require_once SMARTY_SYSPLUGINS_DIR . 'smarty_template_source.php';
-
-/**
- * This is the main Smarty class
- *
- * @package Smarty
- */
-class Smarty extends Smarty_Internal_TemplateBase
-{
-    /**#@+
-     * constant definitions
-     */
-
-    /**
-     * smarty version
-     */
-    const SMARTY_VERSION = '3.1.27';
-
-    /**
-     * define variable scopes
-     */
-    const SCOPE_LOCAL = 0;
-
-    const SCOPE_PARENT = 1;
-
-    const SCOPE_ROOT = 2;
-
-    const SCOPE_GLOBAL = 3;
-
-    /**
-     * define caching modes
-     */
-    const CACHING_OFF = 0;
-
-    const CACHING_LIFETIME_CURRENT = 1;
-
-    const CACHING_LIFETIME_SAVED = 2;
-
-    /**
-     * define constant for clearing cache files be saved expiration datees
-     */
-    const CLEAR_EXPIRED = - 1;
-
-    /**
-     * define compile check modes
-     */
-    const COMPILECHECK_OFF = 0;
-
-    const COMPILECHECK_ON = 1;
-
-    const COMPILECHECK_CACHEMISS = 2;
-
-    /**
-     * define debug modes
-     */
-    const DEBUG_OFF = 0;
-
-    const DEBUG_ON = 1;
-
-    const DEBUG_INDIVIDUAL = 2;
-
-    /**
-     * modes for handling of "<?php ... ?>" tags in templates.
-     */
-    const PHP_PASSTHRU = 0; //-> print tags as plain text
-
-    const PHP_QUOTE = 1; //-> escape tags as entities
-
-    const PHP_REMOVE = 2; //-> escape tags as entities
-
-    const PHP_ALLOW = 3; //-> escape tags as entities
-
-    /**
-     * filter types
-     */
-    const FILTER_POST = 'post';
-
-    const FILTER_PRE = 'pre';
-
-    const FILTER_OUTPUT = 'output';
-
-    const FILTER_VARIABLE = 'variable';
-
-    /**
-     * plugin types
-     */
-    const PLUGIN_FUNCTION = 'function';
-
-    const PLUGIN_BLOCK = 'block';
-
-    const PLUGIN_COMPILER = 'compiler';
-
-    const PLUGIN_MODIFIER = 'modifier';
-
-    const PLUGIN_MODIFIERCOMPILER = 'modifiercompiler';
-
-    /**#@-*/
-
-    /**
-     * assigned global tpl vars
-     */
-    public static $global_tpl_vars = array();
-
-    /**
-     * error handler returned by set_error_hanlder() in Smarty::muteExpectedErrors()
-     */
-    public static $_previous_error_handler = null;
-
-    /**
-     * contains directories outside of SMARTY_DIR that are to be muted by muteExpectedErrors()
-     */
-    public static $_muted_directories = array('./templates_c/' => null, './cache/' => null);
-
-    /**
-     * Flag denoting if Multibyte String functions are available
-     */
-    public static $_MBSTRING = SMARTY_MBSTRING;
-
-    /**
-     * The character set to adhere to (e.g. "UTF-8")
-     */
-    public static $_CHARSET = SMARTY_RESOURCE_CHAR_SET;
-
-    /**
-     * The date format to be used internally
-     * (accepts date() and strftime())
-     */
-    public static $_DATE_FORMAT = SMARTY_RESOURCE_DATE_FORMAT;
-
-    /**
-     * Flag denoting if PCRE should run in UTF-8 mode
-     */
-    public static $_UTF8_MODIFIER = 'u';
-
-    /**
-     * Flag denoting if operating system is windows
-     */
-    public static $_IS_WINDOWS = false;
-
-    /**#@+
-     * variables
-     */
-
-    /**
-     * auto literal on delimiters with whitspace
-     *
-     * @var boolean
-     */
-    public $auto_literal = true;
-
-    /**
-     * display error on not assigned variables
-     *
-     * @var boolean
-     */
-    public $error_unassigned = false;
-
-    /**
-     * look up relative filepaths in include_path
-     *
-     * @var boolean
-     */
-    public $use_include_path = false;
-
-    /**
-     * template directory
-     *
-     * @var array
-     */
-    private $template_dir = array('./templates/');
-
-    /**
-     * joined template directory string used in cache keys
-     *
-     * @var string
-     */
-    public $joined_template_dir = './templates/';
-
-    /**
-     * joined config directory string used in cache keys
-     *
-     * @var string
-     */
-    public $joined_config_dir = './configs/';
-
-    /**
-     * default template handler
-     *
-     * @var callable
-     */
-    public $default_template_handler_func = null;
-
-    /**
-     * default config handler
-     *
-     * @var callable
-     */
-    public $default_config_handler_func = null;
-
-    /**
-     * default plugin handler
-     *
-     * @var callable
-     */
-    public $default_plugin_handler_func = null;
-
-    /**
-     * compile directory
-     *
-     * @var string
-     */
-    private $compile_dir = './templates_c/';
-
-    /**
-     * plugins directory
-     *
-     * @var array
-     */
-    private $plugins_dir = null;
-
-    /**
-     * cache directory
-     *
-     * @var string
-     */
-    private $cache_dir = './cache/';
-
-    /**
-     * config directory
-     *
-     * @var array
-     */
-    private $config_dir = array('./configs/');
-
-    /**
-     * force template compiling?
-     *
-     * @var boolean
-     */
-    public $force_compile = false;
-
-    /**
-     * check template for modifications?
-     *
-     * @var boolean
-     */
-    public $compile_check = true;
-
-    /**
-     * use sub dirs for compiled/cached files?
-     *
-     * @var boolean
-     */
-    public $use_sub_dirs = false;
-
-    /**
-     * allow ambiguous resources (that are made unique by the resource handler)
-     *
-     * @var boolean
-     */
-    public $allow_ambiguous_resources = false;
-
-    /**
-     * merge compiled includes
-     *
-     * @var boolean
-     */
-    public $merge_compiled_includes = false;
-
-    /**
-     * template inheritance merge compiled includes
-     *
-     * @var boolean
-     */
-    public $inheritance_merge_compiled_includes = true;
-
-    /**
-     * force cache file creation
-     *
-     * @var boolean
-     */
-    public $force_cache = false;
-
-    /**
-     * template left-delimiter
-     *
-     * @var string
-     */
-    public $left_delimiter = "{";
-
-    /**
-     * template right-delimiter
-     *
-     * @var string
-     */
-    public $right_delimiter = "}";
-
-    /**#@+
-     * security
-     */
-    /**
-     * class name
-     * This should be instance of Smarty_Security.
-     *
-     * @var string
-     * @see Smarty_Security
-     */
-    public $security_class = 'Smarty_Security';
-
-    /**
-     * implementation of security class
-     *
-     * @var Smarty_Security
-     */
-    public $security_policy = null;
-
-    /**
-     * controls handling of PHP-blocks
-     *
-     * @var integer
-     */
-    public $php_handling = self::PHP_PASSTHRU;
-
-    /**
-     * controls if the php template file resource is allowed
-     *
-     * @var bool
-     */
-    public $allow_php_templates = false;
-
-    /**
-     * Should compiled-templates be prevented from being called directly?
-     * {@internal
-     * Currently used by Smarty_Internal_Template only.
-     * }}
-     *
-     * @var boolean
-     */
-    public $direct_access_security = true;
-
-    /**#@-*/
-    /**
-     * debug mode
-     * Setting this to true enables the debug-console.
-     *
-     * @var boolean
-     */
-    public $debugging = false;
-
-    /**
-     * This determines if debugging is enable-able from the browser.
-     * <ul>
-     *  <li>NONE => no debugging control allowed</li>
-     *  <li>URL => enable debugging when SMARTY_DEBUG is found in the URL.</li>
-     * </ul>
-     *
-     * @var string
-     */
-    public $debugging_ctrl = 'NONE';
-
-    /**
-     * Name of debugging URL-param.
-     * Only used when $debugging_ctrl is set to 'URL'.
-     * The name of the URL-parameter that activates debugging.
-     *
-     * @var string
-     */
-    public $smarty_debug_id = 'SMARTY_DEBUG';
-
-    /**
-     * Path of debug template.
-     *
-     * @var string
-     */
-    public $debug_tpl = null;
-
-    /**
-     * When set, smarty uses this value as error_reporting-level.
-     *
-     * @var int
-     */
-    public $error_reporting = null;
-
-    /**
-     * Internal flag for getTags()
-     *
-     * @var boolean
-     */
-    public $get_used_tags = false;
-
-    /**#@+
-     * config var settings
-     */
-
-    /**
-     * Controls whether variables with the same name overwrite each other.
-     *
-     * @var boolean
-     */
-    public $config_overwrite = true;
-
-    /**
-     * Controls whether config values of on/true/yes and off/false/no get converted to boolean.
-     *
-     * @var boolean
-     */
-    public $config_booleanize = true;
-
-    /**
-     * Controls whether hidden config sections/vars are read from the file.
-     *
-     * @var boolean
-     */
-    public $config_read_hidden = false;
-
-    /**#@-*/
-
-    /**#@+
-     * resource locking
-     */
-
-    /**
-     * locking concurrent compiles
-     *
-     * @var boolean
-     */
-    public $compile_locking = true;
-
-    /**
-     * Controls whether cache resources should emply locking mechanism
-     *
-     * @var boolean
-     */
-    public $cache_locking = false;
-
-    /**
-     * seconds to wait for acquiring a lock before ignoring the write lock
-     *
-     * @var float
-     */
-    public $locking_timeout = 10;
-
-    /**#@-*/
-
-    /**
-     * resource type used if none given
-     * Must be an valid key of $registered_resources.
-     *
-     * @var string
-     */
-    public $default_resource_type = 'file';
-
-    /**
-     * caching type
-     * Must be an element of $cache_resource_types.
-     *
-     * @var string
-     */
-    public $caching_type = 'file';
-
-    /**
-     * internal config properties
-     *
-     * @var array
-     */
-    public $properties = array();
-
-    /**
-     * config type
-     *
-     * @var string
-     */
-    public $default_config_type = 'file';
-
-    /**
-     * cached template objects
-     *
-     * @var array
-     */
-    public $source_objects = array();
-
-    /**
-     * cached template objects
-     *
-     * @var array
-     */
-    public $template_objects = array();
-
-    /**
-     * enable resource caching
-     *
-     * @var bool
-     */
-    public $resource_caching = false;
-
-    /**
-     * enable template resource caching
-     *
-     * @var bool
-     */
-    public $template_resource_caching = true;
-
-    /**
-     * check If-Modified-Since headers
-     *
-     * @var boolean
-     */
-    public $cache_modified_check = false;
-
-    /**
-     * registered plugins
-     *
-     * @var array
-     */
-    public $registered_plugins = array();
-
-    /**
-     * plugin search order
-     *
-     * @var array
-     */
-    public $plugin_search_order = array('function', 'block', 'compiler', 'class');
-
-    /**
-     * registered objects
-     *
-     * @var array
-     */
-    public $registered_objects = array();
-
-    /**
-     * registered classes
-     *
-     * @var array
-     */
-    public $registered_classes = array();
-
-    /**
-     * registered filters
-     *
-     * @var array
-     */
-    public $registered_filters = array();
-
-    /**
-     * registered resources
-     *
-     * @var array
-     */
-    public $registered_resources = array();
-
-    /**
-     * resource handler cache
-     *
-     * @var array
-     */
-    public $_resource_handlers = array();
-
-    /**
-     * registered cache resources
-     *
-     * @var array
-     */
-    public $registered_cache_resources = array();
-
-    /**
-     * cache resource handler cache
-     *
-     * @var array
-     */
-    public $_cacheresource_handlers = array();
-
-    /**
-     * autoload filter
-     *
-     * @var array
-     */
-    public $autoload_filters = array();
-
-    /**
-     * default modifier
-     *
-     * @var array
-     */
-    public $default_modifiers = array();
-
-    /**
-     * autoescape variable output
-     *
-     * @var boolean
-     */
-    public $escape_html = false;
-
-    /**
-     * global internal smarty vars
-     *
-     * @var array
-     */
-    public static $_smarty_vars = array();
-
-    /**
-     * start time for execution time calculation
-     *
-     * @var int
-     */
-    public $start_time = 0;
-
-    /**
-     * default file permissions
-     *
-     * @var int
-     */
-    public $_file_perms = 0644;
-
-    /**
-     * default dir permissions
-     *
-     * @var int
-     */
-    public $_dir_perms = 0771;
-
-    /**
-     * block tag hierarchy
-     *
-     * @var array
-     */
-    public $_tag_stack = array();
-
-    /**
-     * required by the compiler for BC
-     *
-     * @var string
-     */
-    public $_current_file = null;
-
-    /**
-     * internal flag to enable parser debugging
-     *
-     * @var bool
-     */
-    public $_parserdebug = false;
-
-    /**
-     * Cache of is_file results of loadPlugin()
-     *
-     * @var array
-     */
-    public $_is_file_cache = array();
-
-    /**#@-*/
-
-    /**
-     * Initialize new Smarty object
-     */
-    public function __construct()
-    {
-        if (is_callable('mb_internal_encoding')) {
-            mb_internal_encoding(Smarty::$_CHARSET);
-        }
-        $this->start_time = microtime(true);
-        // check default dirs for overloading
-        if ($this->template_dir[0] !== './templates/' || isset($this->template_dir[1])) {
-            $this->setTemplateDir($this->template_dir);
-        }
-        if ($this->config_dir[0] !== './configs/' || isset($this->config_dir[1])) {
-            $this->setConfigDir($this->config_dir);
-        }
-        if ($this->compile_dir !== './templates_c/') {
-            unset(self::$_muted_directories['./templates_c/']);
-            $this->setCompileDir($this->compile_dir);
-        }
-        if ($this->cache_dir !== './cache/') {
-            unset(self::$_muted_directories['./cache/']);
-            $this->setCacheDir($this->cache_dir);
-        }
-        if (isset($this->plugins_dir)) {
-            $this->setPluginsDir($this->plugins_dir);
-        } else {
-            $this->setPluginsDir(SMARTY_PLUGINS_DIR);
-        }
-        if (isset($_SERVER['SCRIPT_NAME'])) {
-            Smarty::$global_tpl_vars['SCRIPT_NAME'] = new Smarty_Variable($_SERVER['SCRIPT_NAME']);
-        }
-
-        // Check if we're running on windows
-        Smarty::$_IS_WINDOWS = strtoupper(substr(PHP_OS, 0, 3)) === 'WIN';
-
-        // let PCRE (preg_*) treat strings as ISO-8859-1 if we're not dealing with UTF-8
-        if (Smarty::$_CHARSET !== 'UTF-8') {
-            Smarty::$_UTF8_MODIFIER = '';
-        }
-    }
-
-    /**
-     * fetches a rendered Smarty template
-     *
-     * @param  string $template         the resource handle of the template file or template object
-     * @param  mixed  $cache_id         cache id to be used with this template
-     * @param  mixed  $compile_id       compile id to be used with this template
-     * @param  object $parent           next higher level of Smarty variables
-     * @param  bool   $display          true: display, false: fetch
-     * @param  bool   $merge_tpl_vars   not used - left for BC
-     * @param  bool   $no_output_filter not used - left for BC
-     *
-     * @throws Exception
-     * @throws SmartyException
-     * @return string rendered template output
-     */
-    public function fetch($template = null, $cache_id = null, $compile_id = null, $parent = null, $display = false, $merge_tpl_vars = true, $no_output_filter = false)
-    {
-        if ($cache_id !== null && is_object($cache_id)) {
-            $parent = $cache_id;
-            $cache_id = null;
-        }
-        if ($parent === null) {
-            $parent = $this;
-        }
-        // get template object
-        $_template = is_object($template) ? $template : $this->createTemplate($template, $cache_id, $compile_id, $parent, false);
-        // set caching in template object
-        $_template->caching = $this->caching;
-        // fetch template content
-        return $_template->render(true, false, $display);
-    }
-
-    /**
-     * displays a Smarty template
-     *
-     * @param string $template   the resource handle of the template file or template object
-     * @param mixed  $cache_id   cache id to be used with this template
-     * @param mixed  $compile_id compile id to be used with this template
-     * @param object $parent     next higher level of Smarty variables
-     */
-    public function display($template = null, $cache_id = null, $compile_id = null, $parent = null)
-    {
-        // display template
-        $this->fetch($template, $cache_id, $compile_id, $parent, true);
-    }
-
-    /**
-     * Check if a template resource exists
-     *
-     * @param  string $resource_name template name
-     *
-     * @return boolean status
-     */
-    public function templateExists($resource_name)
-    {
-        // create template object
-        $save = $this->template_objects;
-        $tpl = new $this->template_class($resource_name, $this);
-        // check if it does exists
-        $result = $tpl->source->exists;
-        $this->template_objects = $save;
-
-        return $result;
-    }
-
-    /**
-     * Returns a single or all global  variables
-     *
-     * @param  string $varname variable name or null
-     *
-     * @return string variable value or or array of variables
-     */
-    public function getGlobal($varname = null)
-    {
-        if (isset($varname)) {
-            if (isset(self::$global_tpl_vars[$varname])) {
-                return self::$global_tpl_vars[$varname]->value;
-            } else {
-                return '';
-            }
-        } else {
-            $_result = array();
-            foreach (self::$global_tpl_vars AS $key => $var) {
-                $_result[$key] = $var->value;
-            }
-
-            return $_result;
-        }
-    }
-
-    /**
-     * Empty cache folder
-     *
-     * @param  integer $exp_time expiration time
-     * @param  string  $type     resource type
-     *
-     * @return integer number of cache files deleted
-     */
-    public function clearAllCache($exp_time = null, $type = null)
-    {
-        // load cache resource and call clearAll
-        $_cache_resource = Smarty_CacheResource::load($this, $type);
-        Smarty_CacheResource::invalidLoadedCache($this);
-
-        return $_cache_resource->clearAll($this, $exp_time);
-    }
-
-    /**
-     * Empty cache for a specific template
-     *
-     * @param  string  $template_name template name
-     * @param  string  $cache_id      cache id
-     * @param  string  $compile_id    compile id
-     * @param  integer $exp_time      expiration time
-     * @param  string  $type          resource type
-     *
-     * @return integer number of cache files deleted
-     */
-    public function clearCache($template_name, $cache_id = null, $compile_id = null, $exp_time = null, $type = null)
-    {
-        // load cache resource and call clear
-        $_cache_resource = Smarty_CacheResource::load($this, $type);
-        Smarty_CacheResource::invalidLoadedCache($this);
-
-        return $_cache_resource->clear($this, $template_name, $cache_id, $compile_id, $exp_time);
-    }
-
-    /**
-     * Loads security class and enables security
-     *
-     * @param  string|Smarty_Security $security_class if a string is used, it must be class-name
-     *
-     * @return Smarty                 current Smarty instance for chaining
-     * @throws SmartyException        when an invalid class name is provided
-     */
-    public function enableSecurity($security_class = null)
-    {
-        if ($security_class instanceof Smarty_Security) {
-            $this->security_policy = $security_class;
-
-            return $this;
-        } elseif (is_object($security_class)) {
-            throw new SmartyException("Class '" . get_class($security_class) . "' must extend Smarty_Security.");
-        }
-        if ($security_class == null) {
-            $security_class = $this->security_class;
-        }
-        if (!class_exists($security_class)) {
-            throw new SmartyException("Security class '$security_class' is not defined");
-        } elseif ($security_class !== 'Smarty_Security' && !is_subclass_of($security_class, 'Smarty_Security')) {
-            throw new SmartyException("Class '$security_class' must extend Smarty_Security.");
-        } else {
-            $this->security_policy = new $security_class($this);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Disable security
-     *
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function disableSecurity()
-    {
-        $this->security_policy = null;
-
-        return $this;
-    }
-
-    /**
-     * Set template directory
-     *
-     * @param  string|array $template_dir directory(s) of template sources
-     *
-     * @return Smarty       current Smarty instance for chaining
-     */
-    public function setTemplateDir($template_dir)
-    {
-        $this->template_dir = array();
-        foreach ((array) $template_dir as $k => $v) {
-            $this->template_dir[$k] = rtrim($v, '/\\') . DS;
-        }
-        $this->joined_template_dir = join(' # ', $this->template_dir);
-        return $this;
-    }
-
-    /**
-     * Add template directory(s)
-     *
-     * @param  string|array $template_dir directory(s) of template sources
-     * @param  string       $key          of the array element to assign the template dir to
-     *
-     * @return Smarty          current Smarty instance for chaining
-     * @throws SmartyException when the given template directory is not valid
-     */
-    public function addTemplateDir($template_dir, $key = null)
-    {
-        $this->_addDir('template_dir', $template_dir, $key);
-        $this->joined_template_dir = join(' # ', $this->template_dir);
-        return $this;
-    }
-
-    /**
-     * Get template directories
-     *
-     * @param mixed $index index of directory to get, null to get all
-     *
-     * @return array|string list of template directories, or directory of $index
-     */
-    public function getTemplateDir($index = null)
-    {
-        if ($index !== null) {
-            return isset($this->template_dir[$index]) ? $this->template_dir[$index] : null;
-        }
-        return (array) $this->template_dir;
-    }
-
-    /**
-     * Set config directory
-     *
-     * @param $config_dir
-     *
-     * @return Smarty       current Smarty instance for chaining
-     */
-    public function setConfigDir($config_dir)
-    {
-        $this->config_dir = array();
-        foreach ((array) $config_dir as $k => $v) {
-            $this->config_dir[$k] = rtrim($v, '/\\') . DS;
-        }
-        $this->joined_config_dir = join(' # ', $this->config_dir);
-        return $this;
-    }
-
-    /**
-     * Add config directory(s)
-     *
-     * @param string|array $config_dir directory(s) of config sources
-     * @param mixed        $key        key of the array element to assign the config dir to
-     *
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function addConfigDir($config_dir, $key = null)
-    {
-        $this->_addDir('config_dir', $config_dir, $key);
-        $this->joined_config_dir = join(' # ', $this->config_dir);
-        return $this;
-    }
-
-    /**
-     * Get config directory
-     *
-     * @param mixed $index index of directory to get, null to get all
-     *
-     * @return array|string configuration directory
-     */
-    public function getConfigDir($index = null)
-    {
-        if ($index !== null) {
-            return isset($this->config_dir[$index]) ? $this->config_dir[$index] : null;
-        }
-        return (array) $this->config_dir;
-    }
-
-    /**
-     * Set plugins directory
-     *
-     * @param  string|array $plugins_dir directory(s) of plugins
-     *
-     * @return Smarty       current Smarty instance for chaining
-     */
-    public function setPluginsDir($plugins_dir)
-    {
-        $this->plugins_dir = array();
-        $this->addPluginsDir($plugins_dir);
-        return $this;
-    }
-
-    /**
-     * Adds directory of plugin files
-     *
-     * @param $plugins_dir
-     *
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function addPluginsDir($plugins_dir)
-    {
-        // make sure we're dealing with an array
-        $this->plugins_dir = (array) $this->plugins_dir;
-        foreach ((array) $plugins_dir as $v) {
-            $this->plugins_dir[] = rtrim($v, '/\\') . DS;
-        }
-        $this->plugins_dir = array_unique($this->plugins_dir);
-        $this->_is_file_cache = array();
-        return $this;
-    }
-
-    /**
-     * Get plugin directories
-     *
-     * @return array list of plugin directories
-     */
-    public function getPluginsDir()
-    {
-        return (array) $this->plugins_dir;
-    }
-
-    /**
-     * Set compile directory
-     *
-     * @param  string $compile_dir directory to store compiled templates in
-     *
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function setCompileDir($compile_dir)
-    {
-        $this->compile_dir = rtrim($compile_dir, '/\\') . DS;
-        if (!isset(Smarty::$_muted_directories[$this->compile_dir])) {
-            Smarty::$_muted_directories[$this->compile_dir] = null;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get compiled directory
-     *
-     * @return string path to compiled templates
-     */
-    public function getCompileDir()
-    {
-        return $this->compile_dir;
-    }
-
-    /**
-     * Set cache directory
-     *
-     * @param  string $cache_dir directory to store cached templates in
-     *
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function setCacheDir($cache_dir)
-    {
-        $this->cache_dir = rtrim($cache_dir, '/\\') . DS;
-        if (!isset(Smarty::$_muted_directories[$this->cache_dir])) {
-            Smarty::$_muted_directories[$this->cache_dir] = null;
-        }
-        return $this;
-    }
-
-    /**
-     * Get cache directory
-     *
-     * @return string path of cache directory
-     */
-    public function getCacheDir()
-    {
-        return $this->cache_dir;
-    }
-
-    /**
-     * add directories to given property name
-     *
-     * @param string       $dirName directory property name
-     * @param string|array $dir     directory string or array of strings
-     * @param mixed        $key     optional key
-     */
-    private function _addDir($dirName, $dir, $key = null)
-    {
-        // make sure we're dealing with an array
-        $this->$dirName = (array) $this->$dirName;
-
-        if (is_array($dir)) {
-            foreach ($dir as $k => $v) {
-                if (is_int($k)) {
-                    // indexes are not merged but appended
-                    $this->{$dirName}[] = rtrim($v, '/\\') . DS;
-                } else {
-                    // string indexes are overridden
-                    $this->{$dirName}[$k] = rtrim($v, '/\\') . DS;
-                }
-            }
-        } else {
-            if ($key !== null) {
-                // override directory at specified index
-                $this->{$dirName}[$key] = rtrim($dir, '/\\') . DS;
-            } else {
-                // append new directory
-                $this->{$dirName}[] = rtrim($dir, '/\\') . DS;
-            }
-        }
-    }
-
-    /**
-     * Set default modifiers
-     *
-     * @param  array|string $modifiers modifier or list of modifiers to set
-     *
-     * @return Smarty       current Smarty instance for chaining
-     */
-    public function setDefaultModifiers($modifiers)
-    {
-        $this->default_modifiers = (array) $modifiers;
-
-        return $this;
-    }
-
-    /**
-     * Add default modifiers
-     *
-     * @param  array|string $modifiers modifier or list of modifiers to add
-     *
-     * @return Smarty       current Smarty instance for chaining
-     */
-    public function addDefaultModifiers($modifiers)
-    {
-        if (is_array($modifiers)) {
-            $this->default_modifiers = array_merge($this->default_modifiers, $modifiers);
-        } else {
-            $this->default_modifiers[] = $modifiers;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get default modifiers
-     *
-     * @return array list of default modifiers
-     */
-    public function getDefaultModifiers()
-    {
-        return $this->default_modifiers;
-    }
-
-    /**
-     * Set autoload filters
-     *
-     * @param  array  $filters filters to load automatically
-     * @param  string $type    "pre", "output", … specify the filter type to set. Defaults to none treating $filters'
-     *                         keys as the appropriate types
-     *
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function setAutoloadFilters($filters, $type = null)
-    {
-        if ($type !== null) {
-            $this->autoload_filters[$type] = (array) $filters;
-        } else {
-            $this->autoload_filters = (array) $filters;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Add autoload filters
-     *
-     * @param  array  $filters filters to load automatically
-     * @param  string $type    "pre", "output", … specify the filter type to set. Defaults to none treating $filters'
-     *                         keys as the appropriate types
-     *
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function addAutoloadFilters($filters, $type = null)
-    {
-        if ($type !== null) {
-            if (!empty($this->autoload_filters[$type])) {
-                $this->autoload_filters[$type] = array_merge($this->autoload_filters[$type], (array) $filters);
-            } else {
-                $this->autoload_filters[$type] = (array) $filters;
-            }
-        } else {
-            foreach ((array) $filters as $key => $value) {
-                if (!empty($this->autoload_filters[$key])) {
-                    $this->autoload_filters[$key] = array_merge($this->autoload_filters[$key], (array) $value);
-                } else {
-                    $this->autoload_filters[$key] = (array) $value;
-                }
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get autoload filters
-     *
-     * @param  string $type type of filter to get autoloads for. Defaults to all autoload filters
-     *
-     * @return array  array( 'type1' => array( 'filter1', 'filter2', … ) ) or array( 'filter1', 'filter2', …) if $type
-     *                was specified
-     */
-    public function getAutoloadFilters($type = null)
-    {
-        if ($type !== null) {
-            return isset($this->autoload_filters[$type]) ? $this->autoload_filters[$type] : array();
-        }
-
-        return $this->autoload_filters;
-    }
-
-    /**
-     * return name of debugging template
-     *
-     * @return string
-     */
-    public function getDebugTemplate()
-    {
-        return $this->debug_tpl;
-    }
-
-    /**
-     * set the debug template
-     *
-     * @param  string $tpl_name
-     *
-     * @return Smarty          current Smarty instance for chaining
-     * @throws SmartyException if file is not readable
-     */
-    public function setDebugTemplate($tpl_name)
-    {
-        if (!is_readable($tpl_name)) {
-            throw new SmartyException("Unknown file '{$tpl_name}'");
-        }
-        $this->debug_tpl = $tpl_name;
-
-        return $this;
-    }
-
-    /**
-     * creates a template object
-     *
-     * @param  string  $template   the resource handle of the template file
-     * @param  mixed   $cache_id   cache id to be used with this template
-     * @param  mixed   $compile_id compile id to be used with this template
-     * @param  object  $parent     next higher level of Smarty variables
-     * @param  boolean $do_clone   flag is Smarty object shall be cloned
-     *
-     * @return object  template object
-     */
-    public function createTemplate($template, $cache_id = null, $compile_id = null, $parent = null, $do_clone = true)
-    {
-        if ($cache_id !== null && (is_object($cache_id) || is_array($cache_id))) {
-            $parent = $cache_id;
-            $cache_id = null;
-        }
-        if ($parent !== null && is_array($parent)) {
-            $data = $parent;
-            $parent = null;
-        } else {
-            $data = null;
-        }
-        $_templateId = $this->getTemplateId($template, $cache_id, $compile_id);
-        if (isset($this->template_objects[$_templateId])) {
-            if ($do_clone) {
-                $tpl = clone $this->template_objects[$_templateId];
-                $tpl->smarty = clone $tpl->smarty;
-            } else {
-                $tpl = $this->template_objects[$_templateId];
-            }
-            $tpl->parent = $parent;
-            $tpl->tpl_vars = array();
-            $tpl->config_vars = array();
-        } else {
-            $tpl = new $this->template_class($template, $this, $parent, $cache_id, $compile_id);
-            if ($do_clone) {
-                $tpl->smarty = clone $tpl->smarty;
-            }
-            $tpl->templateId = $_templateId;
-        }
-        // fill data if present
-        if (!empty($data) && is_array($data)) {
-            // set up variable values
-            foreach ($data as $_key => $_val) {
-                $tpl->tpl_vars[$_key] = new Smarty_Variable($_val);
-            }
-        }
-        if ($this->debugging) {
-            Smarty_Internal_Debug::register_template($tpl);
-        }
-        return $tpl;
-    }
-
-    /**
-     * Takes unknown classes and loads plugin files for them
-     * class name format: Smarty_PluginType_PluginName
-     * plugin filename format: plugintype.pluginname.php
-     *
-     * @param  string $plugin_name class plugin name to load
-     * @param  bool   $check       check if already loaded
-     *
-     * @throws SmartyException
-     * @return string |boolean filepath of loaded file or false
-     */
-    public function loadPlugin($plugin_name, $check = true)
-    {
-        // if function or class exists, exit silently (already loaded)
-        if ($check && (is_callable($plugin_name) || class_exists($plugin_name, false))) {
-            return true;
-        }
-        // Plugin name is expected to be: Smarty_[Type]_[Name]
-        $_name_parts = explode('_', $plugin_name, 3);
-        // class name must have three parts to be valid plugin
-        // count($_name_parts) < 3 === !isset($_name_parts[2])
-        if (!isset($_name_parts[2]) || strtolower($_name_parts[0]) !== 'smarty') {
-            throw new SmartyException("plugin {$plugin_name} is not a valid name format");
-        }
-        // if type is "internal", get plugin from sysplugins
-        if (strtolower($_name_parts[1]) == 'internal') {
-            $file = SMARTY_SYSPLUGINS_DIR . strtolower($plugin_name) . '.php';
-            if (isset($this->_is_file_cache[$file]) ? $this->_is_file_cache[$file] : $this->_is_file_cache[$file] = is_file($file)) {
-                require_once($file);
-                return $file;
-            } else {
-                return false;
-            }
-        }
-        // plugin filename is expected to be: [type].[name].php
-        $_plugin_filename = "{$_name_parts[1]}.{$_name_parts[2]}.php";
-
-        $_stream_resolve_include_path = function_exists('stream_resolve_include_path');
-
-        // loop through plugin dirs and find the plugin
-        foreach ($this->getPluginsDir() as $_plugin_dir) {
-            $names = array($_plugin_dir . $_plugin_filename, $_plugin_dir . strtolower($_plugin_filename),);
-            foreach ($names as $file) {
-                if (isset($this->_is_file_cache[$file]) ? $this->_is_file_cache[$file] : $this->_is_file_cache[$file] = is_file($file)) {
-                    require_once($file);
-                    return $file;
-                }
-                if ($this->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_plugin_dir)) {
-                    // try PHP include_path
-                    if ($_stream_resolve_include_path) {
-                        $file = stream_resolve_include_path($file);
-                    } else {
-                        $file = Smarty_Internal_Get_Include_Path::getIncludePath($file);
-                    }
-
-                    if ($file !== false) {
-                        require_once($file);
-
-                        return $file;
-                    }
-                }
-            }
-        }
-        // no plugin loaded
-        return false;
-    }
-
-    /**
-     * Compile all template files
-     *
-     * @param  string $extension     file extension
-     * @param  bool   $force_compile force all to recompile
-     * @param  int    $time_limit
-     * @param  int    $max_errors
-     *
-     * @return integer number of template files recompiled
-     */
-    public function compileAllTemplates($extension = '.tpl', $force_compile = false, $time_limit = 0, $max_errors = null)
-    {
-        return Smarty_Internal_Utility::compileAllTemplates($extension, $force_compile, $time_limit, $max_errors, $this);
-    }
-
-    /**
-     * Compile all config files
-     *
-     * @param  string $extension     file extension
-     * @param  bool   $force_compile force all to recompile
-     * @param  int    $time_limit
-     * @param  int    $max_errors
-     *
-     * @return integer number of template files recompiled
-     */
-    public function compileAllConfig($extension = '.conf', $force_compile = false, $time_limit = 0, $max_errors = null)
-    {
-        return Smarty_Internal_Utility::compileAllConfig($extension, $force_compile, $time_limit, $max_errors, $this);
-    }
-
-    /**
-     * Delete compiled template file
-     *
-     * @param  string  $resource_name template name
-     * @param  string  $compile_id    compile id
-     * @param  integer $exp_time      expiration time
-     *
-     * @return integer number of template files deleted
-     */
-    public function clearCompiledTemplate($resource_name = null, $compile_id = null, $exp_time = null)
-    {
-        return Smarty_Internal_Utility::clearCompiledTemplate($resource_name, $compile_id, $exp_time, $this);
-    }
-
-    /**
-     * Return array of tag/attributes of all tags used by an template
-     *
-     * @param Smarty_Internal_Template $template
-     *
-     * @return array  of tag/attributes
-     */
-    public function getTags(Smarty_Internal_Template $template)
-    {
-        return Smarty_Internal_Utility::getTags($template);
-    }
-
-    /**
-     * Run installation test
-     *
-     * @param  array $errors Array to write errors into, rather than outputting them
-     *
-     * @return boolean true if setup is fine, false if something is wrong
-     */
-    public function testInstall(&$errors = null)
-    {
-        return Smarty_Internal_TestInstall::testInstall($this, $errors);
-    }
-
-    /**
-     * @param boolean $compile_check
-     */
-    public function setCompileCheck($compile_check)
-    {
-        $this->compile_check = $compile_check;
-    }
-
-    /**
-     * @param boolean $use_sub_dirs
-     */
-    public function setUseSubDirs($use_sub_dirs)
-    {
-        $this->use_sub_dirs = $use_sub_dirs;
-    }
-
-    /**
-     * @param boolean $caching
-     */
-    public function setCaching($caching)
-    {
-        $this->caching = $caching;
-    }
-
-    /**
-     * @param int $cache_lifetime
-     */
-    public function setCacheLifetime($cache_lifetime)
-    {
-        $this->cache_lifetime = $cache_lifetime;
-    }
-
-    /**
-     * @param string $compile_id
-     */
-    public function setCompileId($compile_id)
-    {
-        $this->compile_id = $compile_id;
-    }
-
-    /**
-     * @param string $cache_id
-     */
-    public function setCacheId($cache_id)
-    {
-        $this->cache_id = $cache_id;
-    }
-
-    /**
-     * @param int $error_reporting
-     */
-    public function setErrorReporting($error_reporting)
-    {
-        $this->error_reporting = $error_reporting;
-    }
-
-    /**
-     * @param boolean $escape_html
-     */
-    public function setEscapeHtml($escape_html)
-    {
-        $this->escape_html = $escape_html;
-    }
-
-    /**
-     * @param boolean $auto_literal
-     */
-    public function setAutoLiteral($auto_literal)
-    {
-        $this->auto_literal = $auto_literal;
-    }
-
-    /**
-     * @param boolean $force_compile
-     */
-    public function setForceCompile($force_compile)
-    {
-        $this->force_compile = $force_compile;
-    }
-
-    /**
-     * @param boolean $merge_compiled_includes
-     */
-    public function setMergeCompiledIncludes($merge_compiled_includes)
-    {
-        $this->merge_compiled_includes = $merge_compiled_includes;
-    }
-
-    /**
-     * @param string $left_delimiter
-     */
-    public function setLeftDelimiter($left_delimiter)
-    {
-        $this->left_delimiter = $left_delimiter;
-    }
-
-    /**
-     * @param string $right_delimiter
-     */
-    public function setRightDelimiter($right_delimiter)
-    {
-        $this->right_delimiter = $right_delimiter;
-    }
-
-    /**
-     * @param boolean $debugging
-     */
-    public function setDebugging($debugging)
-    {
-        $this->debugging = $debugging;
-    }
-
-    /**
-     * @param boolean $config_overwrite
-     */
-    public function setConfigOverwrite($config_overwrite)
-    {
-        $this->config_overwrite = $config_overwrite;
-    }
-
-    /**
-     * @param boolean $config_booleanize
-     */
-    public function setConfigBooleanize($config_booleanize)
-    {
-        $this->config_booleanize = $config_booleanize;
-    }
-
-    /**
-     * @param boolean $config_read_hidden
-     */
-    public function setConfigReadHidden($config_read_hidden)
-    {
-        $this->config_read_hidden = $config_read_hidden;
-    }
-
-    /**
-     * @param boolean $compile_locking
-     */
-    public function setCompileLocking($compile_locking)
-    {
-        $this->compile_locking = $compile_locking;
-    }
-
-    /**
-     * Class destructor
-     */
-    public function __destruct()
-    {
-        // intentionally left blank
-    }
-
-    /**
-     * <<magic>> Generic getter.
-     * Calls the appropriate getter function.
-     * Issues an E_USER_NOTICE if no valid getter is found.
-     *
-     * @param  string $name property name
-     *
-     * @return mixed
-     */
-    public function __get($name)
-    {
-        $allowed = array('template_dir' => 'getTemplateDir', 'config_dir' => 'getConfigDir',
-                         'plugins_dir'  => 'getPluginsDir', 'compile_dir' => 'getCompileDir',
-                         'cache_dir'    => 'getCacheDir',);
-
-        if (isset($allowed[$name])) {
-            return $this->{$allowed[$name]}();
-        } else {
-            trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
-        }
-    }
-
-    /**
-     * <<magic>> Generic setter.
-     * Calls the appropriate setter function.
-     * Issues an E_USER_NOTICE if no valid setter is found.
-     *
-     * @param string $name  property name
-     * @param mixed  $value parameter passed to setter
-     */
-    public function __set($name, $value)
-    {
-        $allowed = array('template_dir' => 'setTemplateDir', 'config_dir' => 'setConfigDir',
-                         'plugins_dir'  => 'setPluginsDir', 'compile_dir' => 'setCompileDir',
-                         'cache_dir'    => 'setCacheDir',);
-
-        if (isset($allowed[$name])) {
-            $this->{$allowed[$name]}($value);
-        } else {
-            trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
-        }
-    }
-
-    /**
-     * Error Handler to mute expected messages
-     *
-     * @link http://php.net/set_error_handler
-     *
-     * @param  integer $errno Error level
-     * @param          $errstr
-     * @param          $errfile
-     * @param          $errline
-     * @param          $errcontext
-     *
-     * @return boolean
-     */
-    public static function mutingErrorHandler($errno, $errstr, $errfile, $errline, $errcontext)
-    {
-        $_is_muted_directory = false;
-
-        // add the SMARTY_DIR to the list of muted directories
-        if (!isset(Smarty::$_muted_directories[SMARTY_DIR])) {
-            $smarty_dir = realpath(SMARTY_DIR);
-            if ($smarty_dir !== false) {
-                Smarty::$_muted_directories[SMARTY_DIR] = array('file'   => $smarty_dir,
-                                                                'length' => strlen($smarty_dir),);
-            }
-        }
-
-        // walk the muted directories and test against $errfile
-        foreach (Smarty::$_muted_directories as $key => &$dir) {
-            if (!$dir) {
-                // resolve directory and length for speedy comparisons
-                $file = realpath($key);
-                if ($file === false) {
-                    // this directory does not exist, remove and skip it
-                    unset(Smarty::$_muted_directories[$key]);
-                    continue;
-                }
-                $dir = array('file' => $file, 'length' => strlen($file),);
-            }
-            if (!strncmp($errfile, $dir['file'], $dir['length'])) {
-                $_is_muted_directory = true;
-                break;
-            }
-        }
-
-        // pass to next error handler if this error did not occur inside SMARTY_DIR
-        // or the error was within smarty but masked to be ignored
-        if (!$_is_muted_directory || ($errno && $errno & error_reporting())) {
-            if (Smarty::$_previous_error_handler) {
-                return call_user_func(Smarty::$_previous_error_handler, $errno, $errstr, $errfile, $errline, $errcontext);
-            } else {
-                return false;
-            }
-        }
-    }
-
-    /**
-     * Enable error handler to mute expected messages
-     *
-     * @return void
-     */
-    public static function muteExpectedErrors()
-    {
-        /*
-            error muting is done because some people implemented custom error_handlers using
-            http://php.net/set_error_handler and for some reason did not understand the following paragraph:
-
-                It is important to remember that the standard PHP error handler is completely bypassed for the
-                error types specified by error_types unless the callback function returns FALSE.
-                error_reporting() settings will have no effect and your error handler will be called regardless -
-                however you are still able to read the current value of error_reporting and act appropriately.
-                Of particular note is that this value will be 0 if the statement that caused the error was
-                prepended by the @ error-control operator.
-
-            Smarty deliberately uses @filemtime() over file_exists() and filemtime() in some places. Reasons include
-                - @filemtime() is almost twice as fast as using an additional file_exists()
-                - between file_exists() and filemtime() a possible race condition is opened,
-                  which does not exist using the simple @filemtime() approach.
-        */
-        $error_handler = array('Smarty', 'mutingErrorHandler');
-        $previous = set_error_handler($error_handler);
-
-        // avoid dead loops
-        if ($previous !== $error_handler) {
-            Smarty::$_previous_error_handler = $previous;
-        }
-    }
-
-    /**
-     * Disable error handler muting expected messages
-     *
-     * @return void
-     */
-    public static function unmuteExpectedErrors()
-    {
-        restore_error_handler();
-    }
-}
diff --git a/www/smarty-3.1.27/SmartyBC.class.php b/www/smarty-3.1.27/SmartyBC.class.php
deleted file mode 100644
index 76dd8bd0..00000000
--- a/www/smarty-3.1.27/SmartyBC.class.php
+++ /dev/null
@@ -1,448 +0,0 @@
-<?php
-/**
- * Project:     Smarty: the PHP compiling template engine
- * File:        SmartyBC.class.php
- * SVN:         $Id: $
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * For questions, help, comments, discussion, etc., please join the
- * Smarty mailing list. Send a blank e-mail to
- * smarty-discussion-subscribe@googlegroups.com
- *
- * @link      http://www.smarty.net/
- * @copyright 2008 New Digital Group, Inc.
- * @author    Monte Ohrt <monte at ohrt dot com>
- * @author    Uwe Tews
- * @author    Rodney Rehm
- * @package   Smarty
- */
-/**
- * @ignore
- */
-require_once(dirname(__FILE__) . '/Smarty.class.php');
-
-/**
- * Smarty Backward Compatability Wrapper Class
- *
- * @package Smarty
- */
-class SmartyBC extends Smarty
-{
-    /**
-     * Smarty 2 BC
-     *
-     * @var string
-     */
-    public $_version = self::SMARTY_VERSION;
-
-    /**
-     * Initialize new SmartyBC object
-     *
-     * @param array $options options to set during initialization, e.g. array( 'forceCompile' => false )
-     */
-    public function __construct(array $options = array())
-    {
-        parent::__construct($options);
-    }
-
-    /**
-     * wrapper for assign_by_ref
-     *
-     * @param string $tpl_var the template variable name
-     * @param mixed  &$value  the referenced value to assign
-     */
-    public function assign_by_ref($tpl_var, &$value)
-    {
-        $this->assignByRef($tpl_var, $value);
-    }
-
-    /**
-     * wrapper for append_by_ref
-     *
-     * @param string  $tpl_var the template variable name
-     * @param mixed   &$value  the referenced value to append
-     * @param boolean $merge   flag if array elements shall be merged
-     */
-    public function append_by_ref($tpl_var, &$value, $merge = false)
-    {
-        $this->appendByRef($tpl_var, $value, $merge);
-    }
-
-    /**
-     * clear the given assigned template variable.
-     *
-     * @param string $tpl_var the template variable to clear
-     */
-    public function clear_assign($tpl_var)
-    {
-        $this->clearAssign($tpl_var);
-    }
-
-    /**
-     * Registers custom function to be used in templates
-     *
-     * @param string $function      the name of the template function
-     * @param string $function_impl the name of the PHP function to register
-     * @param bool   $cacheable
-     * @param mixed  $cache_attrs
-     */
-    public function register_function($function, $function_impl, $cacheable = true, $cache_attrs = null)
-    {
-        $this->registerPlugin('function', $function, $function_impl, $cacheable, $cache_attrs);
-    }
-
-    /**
-     * Unregisters custom function
-     *
-     * @param string $function name of template function
-     */
-    public function unregister_function($function)
-    {
-        $this->unregisterPlugin('function', $function);
-    }
-
-    /**
-     * Registers object to be used in templates
-     *
-     * @param string  $object        name of template object
-     * @param object  $object_impl   the referenced PHP object to register
-     * @param array   $allowed       list of allowed methods (empty = all)
-     * @param boolean $smarty_args   smarty argument format, else traditional
-     * @param array   $block_methods list of methods that are block format
-     *
-     * @throws SmartyException
-     * @internal param array $block_functs list of methods that are block format
-     */
-    public function register_object($object, $object_impl, $allowed = array(), $smarty_args = true, $block_methods = array())
-    {
-        settype($allowed, 'array');
-        settype($smarty_args, 'boolean');
-        $this->registerObject($object, $object_impl, $allowed, $smarty_args, $block_methods);
-    }
-
-    /**
-     * Unregisters object
-     *
-     * @param string $object name of template object
-     */
-    public function unregister_object($object)
-    {
-        $this->unregisterObject($object);
-    }
-
-    /**
-     * Registers block function to be used in templates
-     *
-     * @param string $block      name of template block
-     * @param string $block_impl PHP function to register
-     * @param bool   $cacheable
-     * @param mixed  $cache_attrs
-     */
-    public function register_block($block, $block_impl, $cacheable = true, $cache_attrs = null)
-    {
-        $this->registerPlugin('block', $block, $block_impl, $cacheable, $cache_attrs);
-    }
-
-    /**
-     * Unregisters block function
-     *
-     * @param string $block name of template function
-     */
-    public function unregister_block($block)
-    {
-        $this->unregisterPlugin('block', $block);
-    }
-
-    /**
-     * Registers compiler function
-     *
-     * @param string $function      name of template function
-     * @param string $function_impl name of PHP function to register
-     * @param bool   $cacheable
-     */
-    public function register_compiler_function($function, $function_impl, $cacheable = true)
-    {
-        $this->registerPlugin('compiler', $function, $function_impl, $cacheable);
-    }
-
-    /**
-     * Unregisters compiler function
-     *
-     * @param string $function name of template function
-     */
-    public function unregister_compiler_function($function)
-    {
-        $this->unregisterPlugin('compiler', $function);
-    }
-
-    /**
-     * Registers modifier to be used in templates
-     *
-     * @param string $modifier      name of template modifier
-     * @param string $modifier_impl name of PHP function to register
-     */
-    public function register_modifier($modifier, $modifier_impl)
-    {
-        $this->registerPlugin('modifier', $modifier, $modifier_impl);
-    }
-
-    /**
-     * Unregisters modifier
-     *
-     * @param string $modifier name of template modifier
-     */
-    public function unregister_modifier($modifier)
-    {
-        $this->unregisterPlugin('modifier', $modifier);
-    }
-
-    /**
-     * Registers a resource to fetch a template
-     *
-     * @param string $type      name of resource
-     * @param array  $functions array of functions to handle resource
-     */
-    public function register_resource($type, $functions)
-    {
-        $this->registerResource($type, $functions);
-    }
-
-    /**
-     * Unregisters a resource
-     *
-     * @param string $type name of resource
-     */
-    public function unregister_resource($type)
-    {
-        $this->unregisterResource($type);
-    }
-
-    /**
-     * Registers a prefilter function to apply
-     * to a template before compiling
-     *
-     * @param callable $function
-     */
-    public function register_prefilter($function)
-    {
-        $this->registerFilter('pre', $function);
-    }
-
-    /**
-     * Unregisters a prefilter function
-     *
-     * @param callable $function
-     */
-    public function unregister_prefilter($function)
-    {
-        $this->unregisterFilter('pre', $function);
-    }
-
-    /**
-     * Registers a postfilter function to apply
-     * to a compiled template after compilation
-     *
-     * @param callable $function
-     */
-    public function register_postfilter($function)
-    {
-        $this->registerFilter('post', $function);
-    }
-
-    /**
-     * Unregisters a postfilter function
-     *
-     * @param callable $function
-     */
-    public function unregister_postfilter($function)
-    {
-        $this->unregisterFilter('post', $function);
-    }
-
-    /**
-     * Registers an output filter function to apply
-     * to a template output
-     *
-     * @param callable $function
-     */
-    public function register_outputfilter($function)
-    {
-        $this->registerFilter('output', $function);
-    }
-
-    /**
-     * Unregisters an outputfilter function
-     *
-     * @param callable $function
-     */
-    public function unregister_outputfilter($function)
-    {
-        $this->unregisterFilter('output', $function);
-    }
-
-    /**
-     * load a filter of specified type and name
-     *
-     * @param string $type filter type
-     * @param string $name filter name
-     */
-    public function load_filter($type, $name)
-    {
-        $this->loadFilter($type, $name);
-    }
-
-    /**
-     * clear cached content for the given template and cache id
-     *
-     * @param  string $tpl_file   name of template file
-     * @param  string $cache_id   name of cache_id
-     * @param  string $compile_id name of compile_id
-     * @param  string $exp_time   expiration time
-     *
-     * @return boolean
-     */
-    public function clear_cache($tpl_file = null, $cache_id = null, $compile_id = null, $exp_time = null)
-    {
-        return $this->clearCache($tpl_file, $cache_id, $compile_id, $exp_time);
-    }
-
-    /**
-     * clear the entire contents of cache (all templates)
-     *
-     * @param  string $exp_time expire time
-     *
-     * @return boolean
-     */
-    public function clear_all_cache($exp_time = null)
-    {
-        return $this->clearCache(null, null, null, $exp_time);
-    }
-
-    /**
-     * test to see if valid cache exists for this template
-     *
-     * @param  string $tpl_file name of template file
-     * @param  string $cache_id
-     * @param  string $compile_id
-     *
-     * @return boolean
-     */
-    public function is_cached($tpl_file, $cache_id = null, $compile_id = null)
-    {
-        return $this->isCached($tpl_file, $cache_id, $compile_id);
-    }
-
-    /**
-     * clear all the assigned template variables.
-     */
-    public function clear_all_assign()
-    {
-        $this->clearAllAssign();
-    }
-
-    /**
-     * clears compiled version of specified template resource,
-     * or all compiled template files if one is not specified.
-     * This function is for advanced use only, not normally needed.
-     *
-     * @param  string $tpl_file
-     * @param  string $compile_id
-     * @param  string $exp_time
-     *
-     * @return boolean results of {@link smarty_core_rm_auto()}
-     */
-    public function clear_compiled_tpl($tpl_file = null, $compile_id = null, $exp_time = null)
-    {
-        return $this->clearCompiledTemplate($tpl_file, $compile_id, $exp_time);
-    }
-
-    /**
-     * Checks whether requested template exists.
-     *
-     * @param  string $tpl_file
-     *
-     * @return boolean
-     */
-    public function template_exists($tpl_file)
-    {
-        return $this->templateExists($tpl_file);
-    }
-
-    /**
-     * Returns an array containing template variables
-     *
-     * @param  string $name
-     *
-     * @return array
-     */
-    public function get_template_vars($name = null)
-    {
-        return $this->getTemplateVars($name);
-    }
-
-    /**
-     * Returns an array containing config variables
-     *
-     * @param  string $name
-     *
-     * @return array
-     */
-    public function get_config_vars($name = null)
-    {
-        return $this->getConfigVars($name);
-    }
-
-    /**
-     * load configuration values
-     *
-     * @param string $file
-     * @param string $section
-     * @param string $scope
-     */
-    public function config_load($file, $section = null, $scope = 'global')
-    {
-        $this->ConfigLoad($file, $section, $scope);
-    }
-
-    /**
-     * return a reference to a registered object
-     *
-     * @param  string $name
-     *
-     * @return object
-     */
-    public function get_registered_object($name)
-    {
-        return $this->getRegisteredObject($name);
-    }
-
-    /**
-     * clear configuration values
-     *
-     * @param string $var
-     */
-    public function clear_config($var = null)
-    {
-        $this->clearConfig($var);
-    }
-
-    /**
-     * trigger Smarty error
-     *
-     * @param string  $error_msg
-     * @param integer $error_type
-     */
-    public function trigger_error($error_msg, $error_type = E_USER_WARNING)
-    {
-        trigger_error("Smarty error: $error_msg", $error_type);
-    }
-}
diff --git a/www/smarty-3.1.27/debug.tpl b/www/smarty-3.1.27/debug.tpl
deleted file mode 100644
index 5b09c5bd..00000000
--- a/www/smarty-3.1.27/debug.tpl
+++ /dev/null
@@ -1,160 +0,0 @@
-{capture name='_smarty_debug' assign=debug_output}
-    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-    <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-    <head>
-        <title>Smarty Debug Console</title>
-        <style type="text/css">
-            {literal}
-            body, h1, h2, h3, td, th, p {
-                font-family: sans-serif;
-                font-weight: normal;
-                font-size: 0.9em;
-                margin: 1px;
-                padding: 0;
-            }
-
-            h1 {
-                margin: 0;
-                text-align: left;
-                padding: 2px;
-                background-color: #f0c040;
-                color: black;
-                font-weight: bold;
-                font-size: 1.2em;
-            }
-
-            h2 {
-                background-color: #9B410E;
-                color: white;
-                text-align: left;
-                font-weight: bold;
-                padding: 2px;
-                border-top: 1px solid black;
-            }
-            h3 {
-                text-align: left;
-                font-weight: bold;
-                color: black;
-                font-size: 0.7em;
-                padding: 2px;
-            }
-
-            body {
-                background: black;
-            }
-
-            p, table, div {
-                background: #f0ead8;
-            }
-
-            p {
-                margin: 0;
-                font-style: italic;
-                text-align: center;
-            }
-
-            table {
-                width: 100%;
-            }
-
-            th, td {
-                font-family: monospace;
-                vertical-align: top;
-                text-align: left;
-            }
-
-            td {
-                color: green;
-            }
-
-            .odd {
-                background-color: #eeeeee;
-            }
-
-            .even {
-                background-color: #fafafa;
-            }
-
-            .exectime {
-                font-size: 0.8em;
-                font-style: italic;
-            }
-
-            #bold div {
-                color: black;
-                font-weight: bold;
-            }
-            #blue h3 {
-                color: blue;
-            }
-            #normal div {
-                color: black;
-                font-weight: normal;
-            }
-            #table_assigned_vars th {
-                color: blue;
-                font-weight: bold;
-            }
-
-            #table_config_vars th {
-                color: maroon;
-            }
-
-            {/literal}
-        </style>
-    </head>
-    <body>
-
-    <h1>Smarty {Smarty::SMARTY_VERSION} Debug Console
-        -  {if isset($template_name)}{$template_name|debug_print_var nofilter} {/if}{if !empty($template_data)}Total Time {$execution_time|string_format:"%.5f"}{/if}</h1>
-
-    {if !empty($template_data)}
-        <h2>included templates &amp; config files (load time in seconds)</h2>
-        <div>
-            {foreach $template_data as $template}
-                <font color=brown>{$template.name}</font>
-                <br>&nbsp;&nbsp;<span class="exectime">
-                (compile {$template['compile_time']|string_format:"%.5f"}) (render {$template['render_time']|string_format:"%.5f"}) (cache {$template['cache_time']|string_format:"%.5f"})
-                 </span>
-                <br>
-            {/foreach}
-        </div>
-    {/if}
-
-    <h2>assigned template variables</h2>
-
-    <table id="table_assigned_vars">
-        {foreach $assigned_vars as $vars}
-            <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">
-                <td><h3><font color=blue>${$vars@key}</font></h3>
-                    {if isset($vars['nocache'])}<b>Nocache</b></br>{/if}
-                    {if isset($vars['scope'])}<b>Origin:</b> {$vars['scope']|debug_print_var:10:80 nofilter}{/if}
-                </td>
-                <td><h3>Value</h3>{$vars['value']|debug_print_var:10:80 nofilter}</td>
-                <td>{if isset($vars['attributes'])}<h3>Attributes</h3>{$vars['attributes']|debug_print_var nofilter} {/if}</td>
-         {/foreach}
-    </table>
-
-    <h2>assigned config file variables</h2>
-
-    <table id="table_config_vars">
-        {foreach $config_vars as $vars}
-            <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">
-                <td><h3><font color=blue>#{$vars@key}#</font></h3>
-                    {if isset($vars['scope'])}<b>Origin:</b> {$vars['scope']|debug_print_var:10:80 nofilter}{/if}
-                </td>
-                <td>{$vars['value']|debug_print_var:10:80 nofilter}</td>
-            </tr>
-        {/foreach}
-
-    </table>
-    </body>
-    </html>
-{/capture}
-<script type="text/javascript">
-    {$id = ''}
-    {if $display_mode}{$id = "$offset$template_name"|md5}{/if}
-    _smarty_console = window.open("", "console{$id}", "width=680,height=600,left={$offset},top={$offset},resizable,scrollbars=yes");
-    _smarty_console.document.write("{$debug_output|escape:'javascript' nofilter}");
-    _smarty_console.document.close();
-</script>
diff --git a/www/smarty-3.1.27/plugins/block.textformat.php b/www/smarty-3.1.27/plugins/block.textformat.php
deleted file mode 100644
index abf54493..00000000
--- a/www/smarty-3.1.27/plugins/block.textformat.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/**
- * Smarty plugin to format text blocks
- *
- * @package    Smarty
- * @subpackage PluginsBlock
- */
-
-/**
- * Smarty {textformat}{/textformat} block plugin
- * Type:     block function<br>
- * Name:     textformat<br>
- * Purpose:  format text a certain way with preset styles
- *           or custom wrap/indent settings<br>
- * Params:
- * <pre>
- * - style         - string (email)
- * - indent        - integer (0)
- * - wrap          - integer (80)
- * - wrap_char     - string ("\n")
- * - indent_char   - string (" ")
- * - wrap_boundary - boolean (true)
- * </pre>
- *
- * @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 <monte at ohrt dot com>
- */
-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/www/smarty-3.1.27/plugins/function.counter.php b/www/smarty-3.1.27/plugins/function.counter.php
deleted file mode 100644
index 4da85a14..00000000
--- a/www/smarty-3.1.27/plugins/function.counter.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * Smarty {counter} function plugin
- * Type:     function<br>
- * Name:     counter<br>
- * Purpose:  print out a counter value
- *
- * @author Monte Ohrt <monte at ohrt dot com>
- * @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/www/smarty-3.1.27/plugins/function.cycle.php b/www/smarty-3.1.27/plugins/function.cycle.php
deleted file mode 100644
index 8dc5cd9d..00000000
--- a/www/smarty-3.1.27/plugins/function.cycle.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * Smarty {cycle} function plugin
- * Type:     function<br>
- * Name:     cycle<br>
- * Date:     May 3, 2002<br>
- * Purpose:  cycle through given values<br>
- * Params:
- * <pre>
- * - 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.
- * </pre>
- * Examples:<br>
- * <pre>
- * {cycle values="#eeeeee,#d0d0d0d"}
- * {cycle name=row values="one,two,three" reset=true}
- * {cycle name=row}
- * </pre>
- *
- * @link     http://www.smarty.net/manual/en/language.function.cycle.php {cycle}
- *           (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @author   credit to Mark Priatel <mpriatel@rogers.com>
- * @author   credit to Gerard <gerard@interfold.com>
- * @author   credit to Jason Sweat <jsweat_php@yahoo.com>
- * @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/www/smarty-3.1.27/plugins/function.fetch.php b/www/smarty-3.1.27/plugins/function.fetch.php
deleted file mode 100644
index 3506d4a8..00000000
--- a/www/smarty-3.1.27/plugins/function.fetch.php
+++ /dev/null
@@ -1,221 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * Smarty {fetch} plugin
- * Type:     function<br>
- * Name:     fetch<br>
- * 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 <monte at ohrt dot com>
- *
- * @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/www/smarty-3.1.27/plugins/function.html_image.php b/www/smarty-3.1.27/plugins/function.html_image.php
deleted file mode 100644
index 5037e8bd..00000000
--- a/www/smarty-3.1.27/plugins/function.html_image.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * Smarty {html_image} function plugin
- * Type:     function<br>
- * Name:     html_image<br>
- * Date:     Feb 24, 2003<br>
- * Purpose:  format HTML tags for the image<br>
- * Examples: {html_image file="/images/masthead.gif"}<br>
- * Output:   <img src="/images/masthead.gif" width=400 height=23><br>
- * Params:
- * <pre>
- * - file        - (required) - file (and path) of image
- * - height      - (optional) - image height (default actual height)
- * - width       - (optional) - image width (default actual width)
- * - basedir     - (optional) - base directory for absolute paths, default is environment variable DOCUMENT_ROOT
- * - path_prefix - prefix for path output (optional, default empty)
- * </pre>
- *
- * @link    http://www.smarty.net/manual/en/language.function.html.image.php {html_image}
- *          (Smarty online manual)
- * @author  Monte Ohrt <monte at ohrt dot com>
- * @author  credits to Duda <duda@big.hu>
- * @version 1.0
- *
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- *
- * @throws SmartyException
- * @return string
- * @uses    smarty_function_escape_special_chars()
- */
-function smarty_function_html_image($params, $template)
-{
-    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-
-    $alt = '';
-    $file = '';
-    $height = '';
-    $width = '';
-    $extra = '';
-    $prefix = '';
-    $suffix = '';
-    $path_prefix = '';
-    $basedir = isset($_SERVER['DOCUMENT_ROOT']) ? $_SERVER['DOCUMENT_ROOT'] : '';
-    foreach ($params as $_key => $_val) {
-        switch ($_key) {
-            case 'file':
-            case 'height':
-            case 'width':
-            case 'dpi':
-            case 'path_prefix':
-            case 'basedir':
-                $$_key = $_val;
-                break;
-
-            case 'alt':
-                if (!is_array($_val)) {
-                    $$_key = smarty_function_escape_special_chars($_val);
-                } else {
-                    throw new SmartyException ("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-
-            case 'link':
-            case 'href':
-                $prefix = '<a href="' . $_val . '">';
-                $suffix = '</a>';
-                break;
-
-            default:
-                if (!is_array($_val)) {
-                    $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
-                } else {
-                    throw new SmartyException ("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-        }
-    }
-
-    if (empty($file)) {
-        trigger_error("html_image: missing 'file' parameter", E_USER_NOTICE);
-
-        return;
-    }
-
-    if ($file[0] == '/') {
-        $_image_path = $basedir . $file;
-    } else {
-        $_image_path = $file;
-    }
-
-    // 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($_image_path)) {
-                return;
-            }
-        }
-    }
-
-    if (!isset($params['width']) || !isset($params['height'])) {
-        // FIXME: (rodneyrehm) getimagesize() loads the complete file off a remote resource, use custom [jpg,png,gif]header reader!
-        if (!$_image_data = @getimagesize($_image_path)) {
-            if (!file_exists($_image_path)) {
-                trigger_error("html_image: unable to find '$_image_path'", E_USER_NOTICE);
-
-                return;
-            } elseif (!is_readable($_image_path)) {
-                trigger_error("html_image: unable to read '$_image_path'", E_USER_NOTICE);
-
-                return;
-            } else {
-                trigger_error("html_image: '$_image_path' is not a valid image file", E_USER_NOTICE);
-
-                return;
-            }
-        }
-
-        if (!isset($params['width'])) {
-            $width = $_image_data[0];
-        }
-        if (!isset($params['height'])) {
-            $height = $_image_data[1];
-        }
-    }
-
-    if (isset($params['dpi'])) {
-        if (strstr($_SERVER['HTTP_USER_AGENT'], 'Mac')) {
-            // FIXME: (rodneyrehm) wrong dpi assumption
-            // don't know who thought this up… even if it was true in 1998, it's definitely wrong in 2011.
-            $dpi_default = 72;
-        } else {
-            $dpi_default = 96;
-        }
-        $_resize = $dpi_default / $params['dpi'];
-        $width = round($width * $_resize);
-        $height = round($height * $_resize);
-    }
-
-    return $prefix . '<img src="' . $path_prefix . $file . '" alt="' . $alt . '" width="' . $width . '" height="' . $height . '"' . $extra . ' />' . $suffix;
-}
diff --git a/www/smarty-3.1.27/plugins/function.html_radios.php b/www/smarty-3.1.27/plugins/function.html_radios.php
deleted file mode 100644
index f121d5ea..00000000
--- a/www/smarty-3.1.27/plugins/function.html_radios.php
+++ /dev/null
@@ -1,221 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * Smarty {html_radios} function plugin
- * File:       function.html_radios.php<br>
- * Type:       function<br>
- * Name:       html_radios<br>
- * Date:       24.Feb.2003<br>
- * Purpose:    Prints out a list of radio input types<br>
- * Params:
- * <pre>
- * - name       (optional) - string default "radio"
- * - values     (required) - array
- * - options    (required) - associative array
- * - checked    (optional) - array default not set
- * - separator  (optional) - ie <br> or &nbsp;
- * - output     (optional) - the output next to each radio button
- * - assign     (optional) - assign the output as an array to this variable
- * - escape     (optional) - escape the content (not value), defaults to true
- * </pre>
- * Examples:
- * <pre>
- * {html_radios values=$ids output=$names}
- * {html_radios values=$ids name='box' separator='<br>' output=$names}
- * {html_radios values=$ids checked=$checked separator='<br>' output=$names}
- * </pre>
- *
- * @link    http://smarty.php.net/manual/en/language.function.html.radios.php {html_radios}
- *          (Smarty online manual)
- * @author  Christopher Kvarme <christopher.kvarme@flashjab.com>
- * @author  credits to Monte Ohrt <monte at ohrt dot com>
- * @version 1.0
- *
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- *
- * @return string
- * @uses    smarty_function_escape_special_chars()
- */
-function smarty_function_html_radios($params, $template)
-{
-    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-
-    $name = 'radio';
-    $values = null;
-    $options = null;
-    $selected = null;
-    $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 'checked':
-            case 'selected':
-                if (is_array($_val)) {
-                    trigger_error('html_radios: the "' . $_key . '" attribute cannot be an array', E_USER_WARNING);
-                } elseif (is_object($_val)) {
-                    if (method_exists($_val, "__toString")) {
-                        $selected = smarty_function_escape_special_chars((string) $_val->__toString());
-                    } else {
-                        trigger_error("html_radios: selected attribute is an object of class '" . get_class($_val) . "' without __toString() method", E_USER_NOTICE);
-                    }
-                } else {
-                    $selected = (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 'radios':
-                trigger_error('html_radios: the use of the "radios" 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_radios: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-        }
-    }
-
-    if (!isset($options) && !isset($values)) {
-        /* raise error here? */
-
-        return '';
-    }
-
-    $_html_result = array();
-
-    if (isset($options)) {
-        foreach ($options as $_key => $_val) {
-            $_html_result[] = smarty_function_html_radios_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_radios_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_radios_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids, $escape)
-{
-    $_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 .= '<label for="' . $_id . '">';
-        } else {
-            $_output .= '<label>';
-        }
-    }
-
-    $name = smarty_function_escape_special_chars($name);
-    $value = smarty_function_escape_special_chars($value);
-    if ($escape) {
-        $output = smarty_function_escape_special_chars($output);
-    }
-
-    $_output .= '<input type="radio" name="' . $name . '" value="' . $value . '"';
-
-    if ($labels && $label_ids) {
-        $_output .= ' id="' . $_id . '"';
-    }
-
-    if ($value === $selected) {
-        $_output .= ' checked="checked"';
-    }
-
-    $_output .= $extra . ' />' . $output;
-    if ($labels) {
-        $_output .= '</label>';
-    }
-
-    $_output .= $separator;
-
-    return $_output;
-}
diff --git a/www/smarty-3.1.27/plugins/function.html_select_date.php b/www/smarty-3.1.27/plugins/function.html_select_date.php
deleted file mode 100644
index d6625665..00000000
--- a/www/smarty-3.1.27/plugins/function.html_select_date.php
+++ /dev/null
@@ -1,387 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * @ignore
- */
-require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-/**
- * @ignore
- */
-require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
-
-/**
- * Smarty {html_select_date} plugin
- * Type:     function<br>
- * Name:     html_select_date<br>
- * Purpose:  Prints the dropdowns for date selection.
- * ChangeLog:
- * <pre>
- *            - 1.0 initial release
- *            - 1.1 added support for +/- N syntax for begin
- *              and end year values. (Monte)
- *            - 1.2 added support for yyyy-mm-dd syntax for
- *              time value. (Jan Rosier)
- *            - 1.3 added support for choosing format for
- *              month values (Gary Loescher)
- *            - 1.3.1 added support for choosing format for
- *              day values (Marcus Bointon)
- *            - 1.3.2 support negative timestamps, force year
- *              dropdown to include given date unless explicitly set (Monte)
- *            - 1.3.4 fix behaviour of 0000-00-00 00:00:00 dates to match that
- *              of 0000-00-00 dates (cybot, boots)
- *            - 2.0 complete rewrite for performance,
- *              added attributes month_names, *_id
- * </pre>
- *
- * @link     http://www.smarty.net/manual/en/language.function.html.select.date.php {html_select_date}
- *           (Smarty online manual)
- * @version  2.0
- * @author   Andrei Zmievski
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @author   Rodney Rehm
- *
- * @param array $params parameters
- *
- * @return string
- */
-function smarty_function_html_select_date($params)
-{
-    // generate timestamps used for month names only
-    static $_month_timestamps = null;
-    static $_current_year = null;
-    if ($_month_timestamps === null) {
-        $_current_year = date('Y');
-        $_month_timestamps = array();
-        for ($i = 1; $i <= 12; $i ++) {
-            $_month_timestamps[$i] = mktime(0, 0, 0, $i, 1, 2000);
-        }
-    }
-
-    /* Default values. */
-    $prefix = "Date_";
-    $start_year = null;
-    $end_year = null;
-    $display_days = true;
-    $display_months = true;
-    $display_years = true;
-    $month_format = "%B";
-    /* Write months as numbers by default  GL */
-    $month_value_format = "%m";
-    $day_format = "%02d";
-    /* Write day values using this format MB */
-    $day_value_format = "%d";
-    $year_as_text = false;
-    /* Display years in reverse order? Ie. 2000,1999,.... */
-    $reverse_years = false;
-    /* Should the select boxes be part of an array when returned from PHP?
-       e.g. setting it to "birthday", would create "birthday[Day]",
-       "birthday[Month]" & "birthday[Year]". Can be combined with prefix */
-    $field_array = null;
-    /* <select size>'s of the different <select> tags.
-       If not set, uses default dropdown. */
-    $day_size = null;
-    $month_size = null;
-    $year_size = null;
-    /* Unparsed attributes common to *ALL* the <select>/<input> tags.
-       An example might be in the template: all_extra ='class ="foo"'. */
-    $all_extra = null;
-    /* Separate attributes for the tags. */
-    $day_extra = null;
-    $month_extra = null;
-    $year_extra = null;
-    /* Order in which to display the fields.
-       "D" -> day, "M" -> month, "Y" -> year. */
-    $field_order = 'MDY';
-    /* String printed between the different fields. */
-    $field_separator = "\n";
-    $option_separator = "\n";
-    $time = null;
-    // $all_empty = null;
-    // $day_empty = null;
-    // $month_empty = null;
-    // $year_empty = null;
-    $extra_attrs = '';
-    $all_id = null;
-    $day_id = null;
-    $month_id = null;
-    $year_id = null;
-
-    foreach ($params as $_key => $_value) {
-        switch ($_key) {
-            case 'time':
-                if (!is_array($_value) && $_value !== null) {
-                    $time = smarty_make_timestamp($_value);
-                }
-                break;
-
-            case 'month_names':
-                if (is_array($_value) && count($_value) == 12) {
-                    $$_key = $_value;
-                } else {
-                    trigger_error("html_select_date: month_names must be an array of 12 strings", E_USER_NOTICE);
-                }
-                break;
-
-            case 'prefix':
-            case 'field_array':
-            case 'start_year':
-            case 'end_year':
-            case 'day_format':
-            case 'day_value_format':
-            case 'month_format':
-            case 'month_value_format':
-            case 'day_size':
-            case 'month_size':
-            case 'year_size':
-            case 'all_extra':
-            case 'day_extra':
-            case 'month_extra':
-            case 'year_extra':
-            case 'field_order':
-            case 'field_separator':
-            case 'option_separator':
-            case 'all_empty':
-            case 'month_empty':
-            case 'day_empty':
-            case 'year_empty':
-            case 'all_id':
-            case 'month_id':
-            case 'day_id':
-            case 'year_id':
-                $$_key = (string) $_value;
-                break;
-
-            case 'display_days':
-            case 'display_months':
-            case 'display_years':
-            case 'year_as_text':
-            case 'reverse_years':
-                $$_key = (bool) $_value;
-                break;
-
-            default:
-                if (!is_array($_value)) {
-                    $extra_attrs .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_value) . '"';
-                } else {
-                    trigger_error("html_select_date: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-        }
-    }
-
-    // Note: date() is faster than strftime()
-    // Note: explode(date()) is faster than date() date() date()
-    if (isset($params['time']) && is_array($params['time'])) {
-        if (isset($params['time'][$prefix . 'Year'])) {
-            // $_REQUEST[$field_array] given
-            foreach (array('Y' => 'Year', 'm' => 'Month', 'd' => 'Day') as $_elementKey => $_elementName) {
-                $_variableName = '_' . strtolower($_elementName);
-                $$_variableName = isset($params['time'][$prefix . $_elementName])
-                    ? $params['time'][$prefix . $_elementName]
-                    : date($_elementKey);
-            }
-        } elseif (isset($params['time'][$field_array][$prefix . 'Year'])) {
-            // $_REQUEST given
-            foreach (array('Y' => 'Year', 'm' => 'Month', 'd' => 'Day') as $_elementKey => $_elementName) {
-                $_variableName = '_' . strtolower($_elementName);
-                $$_variableName = isset($params['time'][$field_array][$prefix . $_elementName])
-                    ? $params['time'][$field_array][$prefix . $_elementName]
-                    : date($_elementKey);
-            }
-        } else {
-            // no date found, use NOW
-            list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
-        }
-    } elseif ($time === null) {
-        if (array_key_exists('time', $params)) {
-            $_year = $_month = $_day = $time = null;
-        } else {
-            list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
-        }
-    } else {
-        list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d', $time));
-    }
-
-    // make syntax "+N" or "-N" work with $start_year and $end_year
-    // Note preg_match('!^(\+|\-)\s*(\d+)$!', $end_year, $match) is slower than trim+substr
-    foreach (array('start', 'end') as $key) {
-        $key .= '_year';
-        $t = $$key;
-        if ($t === null) {
-            $$key = (int) $_current_year;
-        } elseif ($t[0] == '+') {
-            $$key = (int) ($_current_year + (int)trim(substr($t, 1)));
-        } elseif ($t[0] == '-') {
-            $$key = (int) ($_current_year - (int)trim(substr($t, 1)));
-        } else {
-            $$key = (int) $$key;
-        }
-    }
-
-    // flip for ascending or descending
-    if (($start_year > $end_year && !$reverse_years) || ($start_year < $end_year && $reverse_years)) {
-        $t = $end_year;
-        $end_year = $start_year;
-        $start_year = $t;
-    }
-
-    // generate year <select> or <input>
-    if ($display_years) {
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Year]') : ($prefix . 'Year');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        }
-        if ($year_extra) {
-            $_extra .= ' ' . $year_extra;
-        }
-
-        if ($year_as_text) {
-            $_html_years = '<input type="text" name="' . $_name . '" value="' . $_year . '" size="4" maxlength="4"' . $_extra . $extra_attrs . ' />';
-        } else {
-            $_html_years = '<select name="' . $_name . '"';
-            if ($year_id !== null || $all_id !== null) {
-                $_html_years .= ' id="' . smarty_function_escape_special_chars(
-                        $year_id !== null ? ($year_id ? $year_id : $_name) : ($all_id ? ($all_id . $_name) : $_name)
-                    ) . '"';
-            }
-            if ($year_size) {
-                $_html_years .= ' size="' . $year_size . '"';
-            }
-            $_html_years .= $_extra . $extra_attrs . '>' . $option_separator;
-
-            if (isset($year_empty) || isset($all_empty)) {
-                $_html_years .= '<option value="">' . (isset($year_empty) ? $year_empty : $all_empty) . '</option>' . $option_separator;
-            }
-
-            $op = $start_year > $end_year ? - 1 : 1;
-            for ($i = $start_year; $op > 0 ? $i <= $end_year : $i >= $end_year; $i += $op) {
-                $_html_years .= '<option value="' . $i . '"'
-                    . ($_year == $i ? ' selected="selected"' : '')
-                    . '>' . $i . '</option>' . $option_separator;
-            }
-
-            $_html_years .= '</select>';
-        }
-    }
-
-    // generate month <select> or <input>
-    if ($display_months) {
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Month]') : ($prefix . 'Month');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        }
-        if ($month_extra) {
-            $_extra .= ' ' . $month_extra;
-        }
-
-        $_html_months = '<select name="' . $_name . '"';
-        if ($month_id !== null || $all_id !== null) {
-            $_html_months .= ' id="' . smarty_function_escape_special_chars(
-                    $month_id !== null ? ($month_id ? $month_id : $_name) : ($all_id ? ($all_id . $_name) : $_name)
-                ) . '"';
-        }
-        if ($month_size) {
-            $_html_months .= ' size="' . $month_size . '"';
-        }
-        $_html_months .= $_extra . $extra_attrs . '>' . $option_separator;
-
-        if (isset($month_empty) || isset($all_empty)) {
-            $_html_months .= '<option value="">' . (isset($month_empty) ? $month_empty : $all_empty) . '</option>' . $option_separator;
-        }
-
-        for ($i = 1; $i <= 12; $i ++) {
-            $_val = sprintf('%02d', $i);
-            $_text = isset($month_names) ? smarty_function_escape_special_chars($month_names[$i]) : ($month_format == "%m" ? $_val : strftime($month_format, $_month_timestamps[$i]));
-            $_value = $month_value_format == "%m" ? $_val : strftime($month_value_format, $_month_timestamps[$i]);
-            $_html_months .= '<option value="' . $_value . '"'
-                . ($_val == $_month ? ' selected="selected"' : '')
-                . '>' . $_text . '</option>' . $option_separator;
-        }
-
-        $_html_months .= '</select>';
-    }
-
-    // generate day <select> or <input>
-    if ($display_days) {
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Day]') : ($prefix . 'Day');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        }
-        if ($day_extra) {
-            $_extra .= ' ' . $day_extra;
-        }
-
-        $_html_days = '<select name="' . $_name . '"';
-        if ($day_id !== null || $all_id !== null) {
-            $_html_days .= ' id="' . smarty_function_escape_special_chars(
-                    $day_id !== null ? ($day_id ? $day_id : $_name) : ($all_id ? ($all_id . $_name) : $_name)
-                ) . '"';
-        }
-        if ($day_size) {
-            $_html_days .= ' size="' . $day_size . '"';
-        }
-        $_html_days .= $_extra . $extra_attrs . '>' . $option_separator;
-
-        if (isset($day_empty) || isset($all_empty)) {
-            $_html_days .= '<option value="">' . (isset($day_empty) ? $day_empty : $all_empty) . '</option>' . $option_separator;
-        }
-
-        for ($i = 1; $i <= 31; $i ++) {
-            $_val = sprintf('%02d', $i);
-            $_text = $day_format == '%02d' ? $_val : sprintf($day_format, $i);
-            $_value = $day_value_format == '%02d' ? $_val : sprintf($day_value_format, $i);
-            $_html_days .= '<option value="' . $_value . '"'
-                . ($_val == $_day ? ' selected="selected"' : '')
-                . '>' . $_text . '</option>' . $option_separator;
-        }
-
-        $_html_days .= '</select>';
-    }
-
-    // order the fields for output
-    $_html = '';
-    for ($i = 0; $i <= 2; $i ++) {
-        switch ($field_order[$i]) {
-            case 'Y':
-            case 'y':
-                if (isset($_html_years)) {
-                    if ($_html) {
-                        $_html .= $field_separator;
-                    }
-                    $_html .= $_html_years;
-                }
-                break;
-
-            case 'm':
-            case 'M':
-                if (isset($_html_months)) {
-                    if ($_html) {
-                        $_html .= $field_separator;
-                    }
-                    $_html .= $_html_months;
-                }
-                break;
-
-            case 'd':
-            case 'D':
-                if (isset($_html_days)) {
-                    if ($_html) {
-                        $_html .= $field_separator;
-                    }
-                    $_html .= $_html_days;
-                }
-                break;
-        }
-    }
-
-    return $_html;
-}
diff --git a/www/smarty-3.1.27/plugins/function.html_select_time.php b/www/smarty-3.1.27/plugins/function.html_select_time.php
deleted file mode 100644
index 9af6aad5..00000000
--- a/www/smarty-3.1.27/plugins/function.html_select_time.php
+++ /dev/null
@@ -1,364 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * @ignore
- */
-require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-/**
- * @ignore
- */
-require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
-
-/**
- * Smarty {html_select_time} function plugin
- * Type:     function<br>
- * Name:     html_select_time<br>
- * Purpose:  Prints the dropdowns for time selection
- *
- * @link     http://www.smarty.net/manual/en/language.function.html.select.time.php {html_select_time}
- *           (Smarty online manual)
- * @author   Roberto Berto <roberto@berto.net>
- * @author   Monte Ohrt <monte AT ohrt DOT com>
- *
- * @param array $params parameters
- *
- * @return string
- * @uses     smarty_make_timestamp()
- */
-function smarty_function_html_select_time($params)
-{
-    $prefix = "Time_";
-    $field_array = null;
-    $field_separator = "\n";
-    $option_separator = "\n";
-    $time = null;
-
-    $display_hours = true;
-    $display_minutes = true;
-    $display_seconds = true;
-    $display_meridian = true;
-
-    $hour_format = '%02d';
-    $hour_value_format = '%02d';
-    $minute_format = '%02d';
-    $minute_value_format = '%02d';
-    $second_format = '%02d';
-    $second_value_format = '%02d';
-
-    $hour_size = null;
-    $minute_size = null;
-    $second_size = null;
-    $meridian_size = null;
-
-    $all_empty = null;
-    $hour_empty = null;
-    $minute_empty = null;
-    $second_empty = null;
-    $meridian_empty = null;
-
-    $all_id = null;
-    $hour_id = null;
-    $minute_id = null;
-    $second_id = null;
-    $meridian_id = null;
-
-    $use_24_hours = true;
-    $minute_interval = 1;
-    $second_interval = 1;
-
-    $extra_attrs = '';
-    $all_extra = null;
-    $hour_extra = null;
-    $minute_extra = null;
-    $second_extra = null;
-    $meridian_extra = null;
-
-    foreach ($params as $_key => $_value) {
-        switch ($_key) {
-            case 'time':
-                if (!is_array($_value) && $_value !== null) {
-                    $time = smarty_make_timestamp($_value);
-                }
-                break;
-
-            case 'prefix':
-            case 'field_array':
-
-            case 'field_separator':
-            case 'option_separator':
-
-            case 'all_extra':
-            case 'hour_extra':
-            case 'minute_extra':
-            case 'second_extra':
-            case 'meridian_extra':
-
-            case 'all_empty':
-            case 'hour_empty':
-            case 'minute_empty':
-            case 'second_empty':
-            case 'meridian_empty':
-
-            case 'all_id':
-            case 'hour_id':
-            case 'minute_id':
-            case 'second_id':
-            case 'meridian_id':
-
-            case 'hour_format':
-            case 'hour_value_format':
-            case 'minute_format':
-            case 'minute_value_format':
-            case 'second_format':
-            case 'second_value_format':
-                $$_key = (string) $_value;
-                break;
-
-            case 'display_hours':
-            case 'display_minutes':
-            case 'display_seconds':
-            case 'display_meridian':
-            case 'use_24_hours':
-                $$_key = (bool) $_value;
-                break;
-
-            case 'minute_interval':
-            case 'second_interval':
-
-            case 'hour_size':
-            case 'minute_size':
-            case 'second_size':
-            case 'meridian_size':
-                $$_key = (int) $_value;
-                break;
-
-            default:
-                if (!is_array($_value)) {
-                    $extra_attrs .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_value) . '"';
-                } else {
-                    trigger_error("html_select_date: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-        }
-    }
-
-    if (isset($params['time']) && is_array($params['time'])) {
-        if (isset($params['time'][$prefix . 'Hour'])) {
-            // $_REQUEST[$field_array] given
-            foreach (array('H' => 'Hour', 'i' => 'Minute', 's' => 'Second') as $_elementKey => $_elementName) {
-                $_variableName = '_' . strtolower($_elementName);
-                $$_variableName = isset($params['time'][$prefix . $_elementName])
-                    ? $params['time'][$prefix . $_elementName]
-                    : date($_elementKey);
-            }
-            $_meridian = isset($params['time'][$prefix . 'Meridian'])
-                ? (' ' . $params['time'][$prefix . 'Meridian'])
-                : '';
-            $time = strtotime($_hour . ':' . $_minute . ':' . $_second . $_meridian);
-            list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
-        } elseif (isset($params['time'][$field_array][$prefix . 'Hour'])) {
-            // $_REQUEST given
-            foreach (array('H' => 'Hour', 'i' => 'Minute', 's' => 'Second') as $_elementKey => $_elementName) {
-                $_variableName = '_' . strtolower($_elementName);
-                $$_variableName = isset($params['time'][$field_array][$prefix . $_elementName])
-                    ? $params['time'][$field_array][$prefix . $_elementName]
-                    : date($_elementKey);
-            }
-            $_meridian = isset($params['time'][$field_array][$prefix . 'Meridian'])
-                ? (' ' . $params['time'][$field_array][$prefix . 'Meridian'])
-                : '';
-            $time = strtotime($_hour . ':' . $_minute . ':' . $_second . $_meridian);
-            list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
-        } else {
-            // no date found, use NOW
-            list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
-        }
-    } elseif ($time === null) {
-        if (array_key_exists('time', $params)) {
-            $_hour = $_minute = $_second = $time = null;
-        } else {
-            list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s'));
-        }
-    } else {
-        list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
-    }
-
-    // generate hour <select>
-    if ($display_hours) {
-        $_html_hours = '';
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Hour]') : ($prefix . 'Hour');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        }
-        if ($hour_extra) {
-            $_extra .= ' ' . $hour_extra;
-        }
-
-        $_html_hours = '<select name="' . $_name . '"';
-        if ($hour_id !== null || $all_id !== null) {
-            $_html_hours .= ' id="' . smarty_function_escape_special_chars(
-                    $hour_id !== null ? ($hour_id ? $hour_id : $_name) : ($all_id ? ($all_id . $_name) : $_name)
-                ) . '"';
-        }
-        if ($hour_size) {
-            $_html_hours .= ' size="' . $hour_size . '"';
-        }
-        $_html_hours .= $_extra . $extra_attrs . '>' . $option_separator;
-
-        if (isset($hour_empty) || isset($all_empty)) {
-            $_html_hours .= '<option value="">' . (isset($hour_empty) ? $hour_empty : $all_empty) . '</option>' . $option_separator;
-        }
-
-        $start = $use_24_hours ? 0 : 1;
-        $end = $use_24_hours ? 23 : 12;
-        for ($i = $start; $i <= $end; $i ++) {
-            $_val = sprintf('%02d', $i);
-            $_text = $hour_format == '%02d' ? $_val : sprintf($hour_format, $i);
-            $_value = $hour_value_format == '%02d' ? $_val : sprintf($hour_value_format, $i);
-
-            if (!$use_24_hours) {
-                $_hour12 = $_hour == 0
-                    ? 12
-                    : ($_hour <= 12 ? $_hour : $_hour - 12);
-            }
-
-            $selected = $_hour !== null ? ($use_24_hours ? $_hour == $_val : $_hour12 == $_val) : null;
-            $_html_hours .= '<option value="' . $_value . '"'
-                . ($selected ? ' selected="selected"' : '')
-                . '>' . $_text . '</option>' . $option_separator;
-        }
-
-        $_html_hours .= '</select>';
-    }
-
-    // generate minute <select>
-    if ($display_minutes) {
-        $_html_minutes = '';
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Minute]') : ($prefix . 'Minute');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        }
-        if ($minute_extra) {
-            $_extra .= ' ' . $minute_extra;
-        }
-
-        $_html_minutes = '<select name="' . $_name . '"';
-        if ($minute_id !== null || $all_id !== null) {
-            $_html_minutes .= ' id="' . smarty_function_escape_special_chars(
-                    $minute_id !== null ? ($minute_id ? $minute_id : $_name) : ($all_id ? ($all_id . $_name) : $_name)
-                ) . '"';
-        }
-        if ($minute_size) {
-            $_html_minutes .= ' size="' . $minute_size . '"';
-        }
-        $_html_minutes .= $_extra . $extra_attrs . '>' . $option_separator;
-
-        if (isset($minute_empty) || isset($all_empty)) {
-            $_html_minutes .= '<option value="">' . (isset($minute_empty) ? $minute_empty : $all_empty) . '</option>' . $option_separator;
-        }
-
-        $selected = $_minute !== null ? ($_minute - $_minute % $minute_interval) : null;
-        for ($i = 0; $i <= 59; $i += $minute_interval) {
-            $_val = sprintf('%02d', $i);
-            $_text = $minute_format == '%02d' ? $_val : sprintf($minute_format, $i);
-            $_value = $minute_value_format == '%02d' ? $_val : sprintf($minute_value_format, $i);
-            $_html_minutes .= '<option value="' . $_value . '"'
-                . ($selected === $i ? ' selected="selected"' : '')
-                . '>' . $_text . '</option>' . $option_separator;
-        }
-
-        $_html_minutes .= '</select>';
-    }
-
-    // generate second <select>
-    if ($display_seconds) {
-        $_html_seconds = '';
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Second]') : ($prefix . 'Second');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        }
-        if ($second_extra) {
-            $_extra .= ' ' . $second_extra;
-        }
-
-        $_html_seconds = '<select name="' . $_name . '"';
-        if ($second_id !== null || $all_id !== null) {
-            $_html_seconds .= ' id="' . smarty_function_escape_special_chars(
-                    $second_id !== null ? ($second_id ? $second_id : $_name) : ($all_id ? ($all_id . $_name) : $_name)
-                ) . '"';
-        }
-        if ($second_size) {
-            $_html_seconds .= ' size="' . $second_size . '"';
-        }
-        $_html_seconds .= $_extra . $extra_attrs . '>' . $option_separator;
-
-        if (isset($second_empty) || isset($all_empty)) {
-            $_html_seconds .= '<option value="">' . (isset($second_empty) ? $second_empty : $all_empty) . '</option>' . $option_separator;
-        }
-
-        $selected = $_second !== null ? ($_second - $_second % $second_interval) : null;
-        for ($i = 0; $i <= 59; $i += $second_interval) {
-            $_val = sprintf('%02d', $i);
-            $_text = $second_format == '%02d' ? $_val : sprintf($second_format, $i);
-            $_value = $second_value_format == '%02d' ? $_val : sprintf($second_value_format, $i);
-            $_html_seconds .= '<option value="' . $_value . '"'
-                . ($selected === $i ? ' selected="selected"' : '')
-                . '>' . $_text . '</option>' . $option_separator;
-        }
-
-        $_html_seconds .= '</select>';
-    }
-
-    // generate meridian <select>
-    if ($display_meridian && !$use_24_hours) {
-        $_html_meridian = '';
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Meridian]') : ($prefix . 'Meridian');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        }
-        if ($meridian_extra) {
-            $_extra .= ' ' . $meridian_extra;
-        }
-
-        $_html_meridian = '<select name="' . $_name . '"';
-        if ($meridian_id !== null || $all_id !== null) {
-            $_html_meridian .= ' id="' . smarty_function_escape_special_chars(
-                    $meridian_id !== null ? ($meridian_id ? $meridian_id : $_name) : ($all_id ? ($all_id . $_name) : $_name)
-                ) . '"';
-        }
-        if ($meridian_size) {
-            $_html_meridian .= ' size="' . $meridian_size . '"';
-        }
-        $_html_meridian .= $_extra . $extra_attrs . '>' . $option_separator;
-
-        if (isset($meridian_empty) || isset($all_empty)) {
-            $_html_meridian .= '<option value="">' . (isset($meridian_empty) ? $meridian_empty : $all_empty) . '</option>' . $option_separator;
-        }
-
-        $_html_meridian .= '<option value="am"' . ($_hour > 0 && $_hour < 12 ? ' selected="selected"' : '') . '>AM</option>' . $option_separator
-            . '<option value="pm"' . ($_hour < 12 ? '' : ' selected="selected"') . '>PM</option>' . $option_separator
-            . '</select>';
-    }
-
-    $_html = '';
-    foreach (array('_html_hours', '_html_minutes', '_html_seconds', '_html_meridian') as $k) {
-        if (isset($$k)) {
-            if ($_html) {
-                $_html .= $field_separator;
-            }
-            $_html .= $$k;
-        }
-    }
-
-    return $_html;
-}
diff --git a/www/smarty-3.1.27/plugins/function.html_table.php b/www/smarty-3.1.27/plugins/function.html_table.php
deleted file mode 100644
index ec7ba48a..00000000
--- a/www/smarty-3.1.27/plugins/function.html_table.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * Smarty {html_table} function plugin
- * Type:     function<br>
- * Name:     html_table<br>
- * Date:     Feb 17, 2003<br>
- * Purpose:  make an html table from an array of data<br>
- * Params:
- * <pre>
- * - loop       - array to loop through
- * - cols       - number of columns, comma separated list of column names
- *                or array of column names
- * - rows       - number of rows
- * - table_attr - table attributes
- * - th_attr    - table heading attributes (arrays are cycled)
- * - tr_attr    - table row attributes (arrays are cycled)
- * - td_attr    - table cell attributes (arrays are cycled)
- * - trailpad   - value to pad trailing cells with
- * - caption    - text for caption element
- * - vdir       - vertical direction (default: "down", means top-to-bottom)
- * - hdir       - horizontal direction (default: "right", means left-to-right)
- * - inner      - inner loop (default "cols": print $loop line by line,
- *                $loop will be printed column by column otherwise)
- * </pre>
- * Examples:
- * <pre>
- * {table loop=$data}
- * {table loop=$data cols=4 tr_attr='"bgcolor=red"'}
- * {table loop=$data cols="first,second,third" tr_attr=$colors}
- * </pre>
- *
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @author   credit to Messju Mohr <messju at lammfellpuschen dot de>
- * @author   credit to boots <boots dot smarty at yahoo dot com>
- * @version  1.1
- * @link     http://www.smarty.net/manual/en/language.function.html.table.php {html_table}
- *           (Smarty online manual)
- *
- * @param array $params parameters
- *
- * @return string
- */
-function smarty_function_html_table($params)
-{
-    $table_attr = 'border="1"';
-    $tr_attr = '';
-    $th_attr = '';
-    $td_attr = '';
-    $cols = $cols_count = 3;
-    $rows = 3;
-    $trailpad = '&nbsp;';
-    $vdir = 'down';
-    $hdir = 'right';
-    $inner = 'cols';
-    $caption = '';
-    $loop = null;
-
-    if (!isset($params['loop'])) {
-        trigger_error("html_table: missing 'loop' parameter", E_USER_WARNING);
-
-        return;
-    }
-
-    foreach ($params as $_key => $_value) {
-        switch ($_key) {
-            case 'loop':
-                $$_key = (array) $_value;
-                break;
-
-            case 'cols':
-                if (is_array($_value) && !empty($_value)) {
-                    $cols = $_value;
-                    $cols_count = count($_value);
-                } elseif (!is_numeric($_value) && is_string($_value) && !empty($_value)) {
-                    $cols = explode(',', $_value);
-                    $cols_count = count($cols);
-                } elseif (!empty($_value)) {
-                    $cols_count = (int) $_value;
-                } else {
-                    $cols_count = $cols;
-                }
-                break;
-
-            case 'rows':
-                $$_key = (int) $_value;
-                break;
-
-            case 'table_attr':
-            case 'trailpad':
-            case 'hdir':
-            case 'vdir':
-            case 'inner':
-            case 'caption':
-                $$_key = (string) $_value;
-                break;
-
-            case 'tr_attr':
-            case 'td_attr':
-            case 'th_attr':
-                $$_key = $_value;
-                break;
-        }
-    }
-
-    $loop_count = count($loop);
-    if (empty($params['rows'])) {
-        /* no rows specified */
-        $rows = ceil($loop_count / $cols_count);
-    } elseif (empty($params['cols'])) {
-        if (!empty($params['rows'])) {
-            /* no cols specified, but rows */
-            $cols_count = ceil($loop_count / $rows);
-        }
-    }
-
-    $output = "<table $table_attr>\n";
-
-    if (!empty($caption)) {
-        $output .= '<caption>' . $caption . "</caption>\n";
-    }
-
-    if (is_array($cols)) {
-        $cols = ($hdir == 'right') ? $cols : array_reverse($cols);
-        $output .= "<thead><tr>\n";
-
-        for ($r = 0; $r < $cols_count; $r ++) {
-            $output .= '<th' . smarty_function_html_table_cycle('th', $th_attr, $r) . '>';
-            $output .= $cols[$r];
-            $output .= "</th>\n";
-        }
-        $output .= "</tr></thead>\n";
-    }
-
-    $output .= "<tbody>\n";
-    for ($r = 0; $r < $rows; $r ++) {
-        $output .= "<tr" . smarty_function_html_table_cycle('tr', $tr_attr, $r) . ">\n";
-        $rx = ($vdir == 'down') ? $r * $cols_count : ($rows - 1 - $r) * $cols_count;
-
-        for ($c = 0; $c < $cols_count; $c ++) {
-            $x = ($hdir == 'right') ? $rx + $c : $rx + $cols_count - 1 - $c;
-            if ($inner != 'cols') {
-                /* shuffle x to loop over rows*/
-                $x = floor($x / $cols_count) + ($x % $cols_count) * $rows;
-            }
-
-            if ($x < $loop_count) {
-                $output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">" . $loop[$x] . "</td>\n";
-            } else {
-                $output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">$trailpad</td>\n";
-            }
-        }
-        $output .= "</tr>\n";
-    }
-    $output .= "</tbody>\n";
-    $output .= "</table>\n";
-
-    return $output;
-}
-
-function smarty_function_html_table_cycle($name, $var, $no)
-{
-    if (!is_array($var)) {
-        $ret = $var;
-    } else {
-        $ret = $var[$no % count($var)];
-    }
-
-    return ($ret) ? ' ' . $ret : '';
-}
diff --git a/www/smarty-3.1.27/plugins/function.mailto.php b/www/smarty-3.1.27/plugins/function.mailto.php
deleted file mode 100644
index 520fb7aa..00000000
--- a/www/smarty-3.1.27/plugins/function.mailto.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * Smarty {mailto} function plugin
- * Type:     function<br>
- * Name:     mailto<br>
- * Date:     May 21, 2002
- * Purpose:  automate mailto address link creation, and optionally encode them.<br>
- * Params:
- * <pre>
- * - address    - (required) - e-mail address
- * - text       - (optional) - text to display, default is address
- * - encode     - (optional) - can be one of:
- *                             * none : no encoding (default)
- *                             * javascript : encode with javascript
- *                             * javascript_charcode : encode with javascript charcode
- *                             * hex : encode with hexidecimal (no javascript)
- * - cc         - (optional) - address(es) to carbon copy
- * - bcc        - (optional) - address(es) to blind carbon copy
- * - subject    - (optional) - e-mail subject
- * - newsgroups - (optional) - newsgroup(s) to post to
- * - followupto - (optional) - address(es) to follow up to
- * - extra      - (optional) - extra tags for the href link
- * </pre>
- * Examples:
- * <pre>
- * {mailto address="me@domain.com"}
- * {mailto address="me@domain.com" encode="javascript"}
- * {mailto address="me@domain.com" encode="hex"}
- * {mailto address="me@domain.com" subject="Hello to you!"}
- * {mailto address="me@domain.com" cc="you@domain.com,they@domain.com"}
- * {mailto address="me@domain.com" extra='class="mailto"'}
- * </pre>
- *
- * @link     http://www.smarty.net/manual/en/language.function.mailto.php {mailto}
- *           (Smarty online manual)
- * @version  1.2
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @author   credits to Jason Sweat (added cc, bcc and subject functionality)
- *
- * @param array $params parameters
- *
- * @return string
- */
-function smarty_function_mailto($params)
-{
-    static $_allowed_encoding = array('javascript' => true, 'javascript_charcode' => true, 'hex' => true, 'none' => true);
-    $extra = '';
-
-    if (empty($params['address'])) {
-        trigger_error("mailto: missing 'address' parameter", E_USER_WARNING);
-
-        return;
-    } else {
-        $address = $params['address'];
-    }
-
-    $text = $address;
-    // netscape and mozilla do not decode %40 (@) in BCC field (bug?)
-    // so, don't encode it.
-    $search = array('%40', '%2C');
-    $replace = array('@', ',');
-    $mail_parms = array();
-    foreach ($params as $var => $value) {
-        switch ($var) {
-            case 'cc':
-            case 'bcc':
-            case 'followupto':
-            if (!empty($value)) {
-                $mail_parms[] = $var . '=' . str_replace($search, $replace, rawurlencode($value));
-            }
-                break;
-
-            case 'subject':
-            case 'newsgroups':
-                $mail_parms[] = $var . '=' . rawurlencode($value);
-                break;
-
-            case 'extra':
-            case 'text':
-                $$var = $value;
-
-            default:
-        }
-    }
-
-    if ($mail_parms) {
-        $address .= '?' . join('&', $mail_parms);
-    }
-
-    $encode = (empty($params['encode'])) ? 'none' : $params['encode'];
-    if (!isset($_allowed_encoding[$encode])) {
-        trigger_error("mailto: 'encode' parameter must be none, javascript, javascript_charcode or hex", E_USER_WARNING);
-
-        return;
-    }
-    // FIXME: (rodneyrehm) document.write() excues me what? 1998 has passed!
-    if ($encode == 'javascript') {
-        $string = 'document.write(\'<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>\');';
-
-        $js_encode = '';
-        for ($x = 0, $_length = strlen($string); $x < $_length; $x ++) {
-            $js_encode .= '%' . bin2hex($string[$x]);
-        }
-
-        return '<script type="text/javascript">eval(unescape(\'' . $js_encode . '\'))</script>';
-    } elseif ($encode == 'javascript_charcode') {
-        $string = '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
-
-        for ($x = 0, $y = strlen($string); $x < $y; $x ++) {
-            $ord[] = ord($string[$x]);
-        }
-
-        $_ret = "<script type=\"text/javascript\" language=\"javascript\">\n"
-            . "{document.write(String.fromCharCode("
-            . implode(',', $ord)
-            . "))"
-            . "}\n"
-            . "</script>\n";
-
-        return $_ret;
-    } elseif ($encode == 'hex') {
-        preg_match('!^(.*)(\?.*)$!', $address, $match);
-        if (!empty($match[2])) {
-            trigger_error("mailto: hex encoding does not work with extra attributes. Try javascript.", E_USER_WARNING);
-
-            return;
-        }
-        $address_encode = '';
-        for ($x = 0, $_length = strlen($address); $x < $_length; $x ++) {
-            if (preg_match('!\w!' . Smarty::$_UTF8_MODIFIER, $address[$x])) {
-                $address_encode .= '%' . bin2hex($address[$x]);
-            } else {
-                $address_encode .= $address[$x];
-            }
-        }
-        $text_encode = '';
-        for ($x = 0, $_length = strlen($text); $x < $_length; $x ++) {
-            $text_encode .= '&#x' . bin2hex($text[$x]) . ';';
-        }
-
-        $mailto = "&#109;&#97;&#105;&#108;&#116;&#111;&#58;";
-
-        return '<a href="' . $mailto . $address_encode . '" ' . $extra . '>' . $text_encode . '</a>';
-    } else {
-        // no encoding
-        return '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
-    }
-}
diff --git a/www/smarty-3.1.27/plugins/function.math.php b/www/smarty-3.1.27/plugins/function.math.php
deleted file mode 100644
index aba76e82..00000000
--- a/www/smarty-3.1.27/plugins/function.math.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * This plugin is only for Smarty2 BC
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * Smarty {math} function plugin
- * Type:     function<br>
- * Name:     math<br>
- * Purpose:  handle math computations in template
- *
- * @link     http://www.smarty.net/manual/en/language.function.math.php {math}
- *           (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- *
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- *
- * @return string|null
- */
-function smarty_function_math($params, $template)
-{
-    static $_allowed_funcs = array(
-        'int'  => true, 'abs' => true, 'ceil' => true, 'cos' => true, 'exp' => true, 'floor' => true,
-        'log'  => true, 'log10' => true, 'max' => true, 'min' => true, 'pi' => true, 'pow' => true,
-        'rand' => true, 'round' => true, 'sin' => true, 'sqrt' => true, 'srand' => true, 'tan' => true
-    );
-    // be sure equation parameter is present
-    if (empty($params['equation'])) {
-        trigger_error("math: missing equation parameter", E_USER_WARNING);
-
-        return;
-    }
-
-    $equation = $params['equation'];
-
-    // make sure parenthesis are balanced
-    if (substr_count($equation, "(") != substr_count($equation, ")")) {
-        trigger_error("math: unbalanced parenthesis", E_USER_WARNING);
-
-        return;
-    }
-
-    // match all vars in equation, make sure all are passed
-    preg_match_all("!(?:0x[a-fA-F0-9]+)|([a-zA-Z][a-zA-Z0-9_]*)!", $equation, $match);
-
-    foreach ($match[1] as $curr_var) {
-        if ($curr_var && !isset($params[$curr_var]) && !isset($_allowed_funcs[$curr_var])) {
-            trigger_error("math: function call $curr_var not allowed", E_USER_WARNING);
-
-            return;
-        }
-    }
-
-    foreach ($params as $key => $val) {
-        if ($key != "equation" && $key != "format" && $key != "assign") {
-            // make sure value is not empty
-            if (strlen($val) == 0) {
-                trigger_error("math: parameter $key is empty", E_USER_WARNING);
-
-                return;
-            }
-            if (!is_numeric($val)) {
-                trigger_error("math: parameter $key: is not numeric", E_USER_WARNING);
-
-                return;
-            }
-            $equation = preg_replace("/\b$key\b/", " \$params['$key'] ", $equation);
-        }
-    }
-    $smarty_math_result = null;
-    eval("\$smarty_math_result = " . $equation . ";");
-
-    if (empty($params['format'])) {
-        if (empty($params['assign'])) {
-            return $smarty_math_result;
-        } else {
-            $template->assign($params['assign'], $smarty_math_result);
-        }
-    } else {
-        if (empty($params['assign'])) {
-            printf($params['format'], $smarty_math_result);
-        } else {
-            $template->assign($params['assign'], sprintf($params['format'], $smarty_math_result));
-        }
-    }
-}
diff --git a/www/smarty-3.1.27/plugins/modifier.capitalize.php b/www/smarty-3.1.27/plugins/modifier.capitalize.php
deleted file mode 100644
index a8ad7637..00000000
--- a/www/smarty-3.1.27/plugins/modifier.capitalize.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifier
- */
-
-/**
- * Smarty capitalize modifier plugin
- * Type:     modifier<br>
- * Name:     capitalize<br>
- * Purpose:  capitalize words in the string
- * {@internal {$string|capitalize:true:true} is the fastest option for MBString enabled systems }}
- *
- * @param string  $string    string to capitalize
- * @param boolean $uc_digits also capitalize "x123" to "X123"
- * @param boolean $lc_rest   capitalize first letters, lowercase all following letters "aAa" to "Aaa"
- *
- * @return string capitalized string
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author Rodney Rehm
- */
-function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = false)
-{
-    if (Smarty::$_MBSTRING) {
-        if ($lc_rest) {
-            // uppercase (including hyphenated words)
-            $upper_string = mb_convert_case($string, MB_CASE_TITLE, Smarty::$_CHARSET);
-        } else {
-            // uppercase word breaks
-            $upper_string = preg_replace_callback("!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_mbconvert_cb', $string);
-        }
-        // check uc_digits case
-        if (!$uc_digits) {
-            if (preg_match_all("!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER, $string, $matches, PREG_OFFSET_CAPTURE)) {
-                foreach ($matches[1] as $match) {
-                    $upper_string = substr_replace($upper_string, mb_strtolower($match[0], Smarty::$_CHARSET), $match[1], strlen($match[0]));
-                }
-            }
-        }
-        $upper_string = preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_mbconvert2_cb', $upper_string);
-        return $upper_string;
-    }
-
-    // lowercase first
-    if ($lc_rest) {
-        $string = strtolower($string);
-    }
-    // uppercase (including hyphenated words)
-    $upper_string = preg_replace_callback("!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_ucfirst_cb', $string);
-    // check uc_digits case
-    if (!$uc_digits) {
-        if (preg_match_all("!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER, $string, $matches, PREG_OFFSET_CAPTURE)) {
-            foreach ($matches[1] as $match) {
-                $upper_string = substr_replace($upper_string, strtolower($match[0]), $match[1], strlen($match[0]));
-            }
-        }
-    }
-    $upper_string = preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_ucfirst2_cb', $upper_string);
-    return $upper_string;
-}
-
-/* 
- *
- * Bug: create_function() use exhausts memory when used in long loops
- * Fix: use declared functions for callbacks instead of using create_function()
- * Note: This can be fixed using anonymous functions instead, but that requires PHP >= 5.3
- *
- * @author Kyle Renfrow
- */
-function smarty_mod_cap_mbconvert_cb($matches)
-{
-    return stripslashes($matches[1]) . mb_convert_case(stripslashes($matches[2]), MB_CASE_UPPER, Smarty::$_CHARSET);
-}
-
-function smarty_mod_cap_mbconvert2_cb($matches)
-{
-    return stripslashes($matches[1]) . mb_convert_case(stripslashes($matches[3]), MB_CASE_UPPER, Smarty::$_CHARSET);
-}
-
-function smarty_mod_cap_ucfirst_cb($matches)
-{
-    return stripslashes($matches[1]) . ucfirst(stripslashes($matches[2]));
-}
-
-function smarty_mod_cap_ucfirst2_cb($matches)
-{
-    return stripslashes($matches[1]) . ucfirst(stripslashes($matches[3]));
-}
diff --git a/www/smarty-3.1.27/plugins/modifier.debug_print_var.php b/www/smarty-3.1.27/plugins/modifier.debug_print_var.php
deleted file mode 100644
index e3971a04..00000000
--- a/www/smarty-3.1.27/plugins/modifier.debug_print_var.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage Debug
- */
-
-/**
- * Smarty debug_print_var modifier plugin
- * Type:     modifier<br>
- * Name:     debug_print_var<br>
- * Purpose:  formats variable contents for display in the console
- *
- * @author Monte Ohrt <monte at ohrt dot com>
- *
- * @param array|object $var     variable to be formatted
- * @param int          $max     maximum recursion depth if $var is an array or object
- * @param int          $length  maximum string length if $var is a string
- * @param int          $depth   actual recursion depth
- * @param array        $objects processed objects in actual depth to prevent recursive object processing
- *
- * @return string
- */
-function smarty_modifier_debug_print_var($var, $max = 10, $length = 40, $depth = 0, $objects = array())
-{
-    $_replace = array("\n" => '<i>\n</i>',
-                      "\r" => '<i>\r</i>',
-                      "\t" => '<i>\t</i>'
-    );
-    switch (gettype($var)) {
-        case 'array' :
-            $results = '<b>Array (' . count($var) . ')</b>';
-            if ($depth == $max) {
-                break;
-            }
-            foreach ($var as $curr_key => $curr_val) {
-                $results .= '<br>' . str_repeat('&nbsp;', $depth * 2)
-                    . '<b>' . strtr($curr_key, $_replace) . '</b> =&gt; '
-                    . smarty_modifier_debug_print_var($curr_val, $max, $length, ++ $depth, $objects);
-                $depth --;
-            }
-            break;
-
-        case 'object' :
-            $object_vars = get_object_vars($var);
-            $results = '<b>' . get_class($var) . ' Object (' . count($object_vars) . ')</b>';
-            if (in_array($var, $objects)) {
-                $results .= ' called recursive';
-                break;
-            }
-            if ($depth == $max) {
-                break;
-            }
-            $objects[] = $var;
-            foreach ($object_vars as $curr_key => $curr_val) {
-                $results .= '<br>' . str_repeat('&nbsp;', $depth * 2)
-                    . '<b> -&gt;' . strtr($curr_key, $_replace) . '</b> = '
-                    . smarty_modifier_debug_print_var($curr_val, $max, $length, ++ $depth, $objects);
-                $depth --;
-            }
-            break;
-
-        case 'boolean' :
-        case 'NULL' :
-        case 'resource' :
-            if (true === $var) {
-                $results = 'true';
-            } elseif (false === $var) {
-                $results = 'false';
-            } elseif (null === $var) {
-                $results = 'null';
-            } else {
-                $results = htmlspecialchars((string) $var);
-            }
-            $results = '<i>' . $results . '</i>';
-            break;
-
-        case 'integer' :
-        case 'float' :
-            $results = htmlspecialchars((string) $var);
-            break;
-
-        case 'string' :
-            $results = strtr($var, $_replace);
-            if (Smarty::$_MBSTRING) {
-                if (mb_strlen($var, Smarty::$_CHARSET) > $length) {
-                    $results = mb_substr($var, 0, $length - 3, Smarty::$_CHARSET) . '...';
-                }
-            } else {
-                if (isset($var[$length])) {
-                    $results = substr($var, 0, $length - 3) . '...';
-                }
-            }
-
-            $results = htmlspecialchars('"' . $results . '"');
-            break;
-
-        case 'unknown type' :
-        default :
-            $results = strtr((string) $var, $_replace);
-            if (Smarty::$_MBSTRING) {
-                if (mb_strlen($results, Smarty::$_CHARSET) > $length) {
-                    $results = mb_substr($results, 0, $length - 3, Smarty::$_CHARSET) . '...';
-                }
-            } else {
-                if (strlen($results) > $length) {
-                    $results = substr($results, 0, $length - 3) . '...';
-                }
-            }
-
-            $results = htmlspecialchars($results);
-    }
-
-    return $results;
-}
diff --git a/www/smarty-3.1.27/plugins/modifier.escape.php b/www/smarty-3.1.27/plugins/modifier.escape.php
deleted file mode 100644
index 9fdb0702..00000000
--- a/www/smarty-3.1.27/plugins/modifier.escape.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifier
- */
-
-/**
- * Smarty escape modifier plugin
- * Type:     modifier<br>
- * Name:     escape<br>
- * Purpose:  escape string for output
- *
- * @link   http://www.smarty.net/docs/en/language.modifier.escape
- * @author Monte Ohrt <monte at ohrt dot com>
- *
- * @param string  $string        input string
- * @param string  $esc_type      escape type
- * @param string  $char_set      character set, used for htmlspecialchars() or htmlentities()
- * @param boolean $double_encode encode already encoded entitites again, used for htmlspecialchars() or htmlentities()
- *
- * @return string escaped input string
- */
-function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $double_encode = true)
-{
-    static $_double_encode = null;
-    if ($_double_encode === null) {
-        $_double_encode = version_compare(PHP_VERSION, '5.2.3', '>=');
-    }
-
-    if (!$char_set) {
-        $char_set = Smarty::$_CHARSET;
-    }
-
-    switch ($esc_type) {
-        case 'html':
-            if ($_double_encode) {
-                // php >=5.3.2 - go native
-                return htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode);
-            } else {
-                if ($double_encode) {
-                    // php <5.2.3 - only handle double encoding
-                    return htmlspecialchars($string, ENT_QUOTES, $char_set);
-                } else {
-                    // php <5.2.3 - prevent double encoding
-                    $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
-                    $string = htmlspecialchars($string, ENT_QUOTES, $char_set);
-                    $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string);
-
-                    return $string;
-                }
-            }
-
-        case 'htmlall':
-            if (Smarty::$_MBSTRING) {
-                // mb_convert_encoding ignores htmlspecialchars()
-                if ($_double_encode) {
-                    // php >=5.3.2 - go native
-                    $string = htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode);
-                } else {
-                    if ($double_encode) {
-                        // php <5.2.3 - only handle double encoding
-                        $string = htmlspecialchars($string, ENT_QUOTES, $char_set);
-                    } else {
-                        // php <5.2.3 - prevent double encoding
-                        $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
-                        $string = htmlspecialchars($string, ENT_QUOTES, $char_set);
-                        $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string);
-
-                        return $string;
-                    }
-                }
-
-                // htmlentities() won't convert everything, so use mb_convert_encoding
-                return mb_convert_encoding($string, 'HTML-ENTITIES', $char_set);
-            }
-
-            // no MBString fallback
-            if ($_double_encode) {
-                return htmlentities($string, ENT_QUOTES, $char_set, $double_encode);
-            } else {
-                if ($double_encode) {
-                    return htmlentities($string, ENT_QUOTES, $char_set);
-                } else {
-                    $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
-                    $string = htmlentities($string, ENT_QUOTES, $char_set);
-                    $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string);
-
-                    return $string;
-                }
-            }
-
-        case 'url':
-            return rawurlencode($string);
-
-        case 'urlpathinfo':
-            return str_replace('%2F', '/', rawurlencode($string));
-
-        case 'quotes':
-            // escape unescaped single quotes
-            return preg_replace("%(?<!\\\\)'%", "\\'", $string);
-
-        case 'hex':
-            // escape every byte into hex
-            // Note that the UTF-8 encoded character ä will be represented as %c3%a4
-            $return = '';
-            $_length = strlen($string);
-            for ($x = 0; $x < $_length; $x ++) {
-                $return .= '%' . bin2hex($string[$x]);
-            }
-
-            return $return;
-
-        case 'hexentity':
-            $return = '';
-            if (Smarty::$_MBSTRING) {
-                require_once(SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php');
-                $return = '';
-                foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) {
-                    $return .= '&#x' . strtoupper(dechex($unicode)) . ';';
-                }
-
-                return $return;
-            }
-            // no MBString fallback
-            $_length = strlen($string);
-            for ($x = 0; $x < $_length; $x ++) {
-                $return .= '&#x' . bin2hex($string[$x]) . ';';
-            }
-
-            return $return;
-
-        case 'decentity':
-            $return = '';
-            if (Smarty::$_MBSTRING) {
-                require_once(SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php');
-                $return = '';
-                foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) {
-                    $return .= '&#' . $unicode . ';';
-                }
-
-                return $return;
-            }
-            // no MBString fallback
-            $_length = strlen($string);
-            for ($x = 0; $x < $_length; $x ++) {
-                $return .= '&#' . ord($string[$x]) . ';';
-            }
-
-            return $return;
-
-        case 'javascript':
-            // escape quotes and backslashes, newlines, etc.
-            return strtr($string, array('\\' => '\\\\', "'" => "\\'", '"' => '\\"', "\r" => '\\r', "\n" => '\\n', '</' => '<\/'));
-
-        case 'mail':
-            if (Smarty::$_MBSTRING) {
-                require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php');
-
-                return smarty_mb_str_replace(array('@', '.'), array(' [AT] ', ' [DOT] '), $string);
-            }
-            // no MBString fallback
-            return str_replace(array('@', '.'), array(' [AT] ', ' [DOT] '), $string);
-
-        case 'nonstd':
-            // escape non-standard chars, such as ms document quotes
-            $return = '';
-            if (Smarty::$_MBSTRING) {
-                require_once(SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php');
-                foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) {
-                    if ($unicode >= 126) {
-                        $return .= '&#' . $unicode . ';';
-                    } else {
-                        $return .= chr($unicode);
-                    }
-                }
-
-                return $return;
-            }
-
-            $_length = strlen($string);
-            for ($_i = 0; $_i < $_length; $_i ++) {
-                $_ord = ord(substr($string, $_i, 1));
-                // non-standard char, escape it
-                if ($_ord >= 126) {
-                    $return .= '&#' . $_ord . ';';
-                } else {
-                    $return .= substr($string, $_i, 1);
-                }
-            }
-
-            return $return;
-
-        default:
-            return $string;
-    }
-}
diff --git a/www/smarty-3.1.27/plugins/modifier.regex_replace.php b/www/smarty-3.1.27/plugins/modifier.regex_replace.php
deleted file mode 100644
index abb1ff54..00000000
--- a/www/smarty-3.1.27/plugins/modifier.regex_replace.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifier
- */
-
-/**
- * Smarty regex_replace modifier plugin
- * Type:     modifier<br>
- * Name:     regex_replace<br>
- * Purpose:  regular expression search/replace
- *
- * @link    http://smarty.php.net/manual/en/language.modifier.regex.replace.php
- *          regex_replace (Smarty online manual)
- * @author  Monte Ohrt <monte at ohrt dot com>
- *
- * @param string       $string  input string
- * @param string|array $search  regular expression(s) to search for
- * @param string|array $replace string(s) that should be replaced
- *
- * @return string
- */
-function smarty_modifier_regex_replace($string, $search, $replace)
-{
-    if (is_array($search)) {
-        foreach ($search as $idx => $s) {
-            $search[$idx] = _smarty_regex_replace_check($s);
-        }
-    } else {
-        $search = _smarty_regex_replace_check($search);
-    }
-
-    return preg_replace($search, $replace, $string);
-}
-
-/**
- * @param  string $search string(s) that should be replaced
- *
- * @return string
- * @ignore
- */
-function _smarty_regex_replace_check($search)
-{
-    // null-byte injection detection
-    // anything behind the first null-byte is ignored
-    if (($pos = strpos($search, "\0")) !== false) {
-        $search = substr($search, 0, $pos);
-    }
-    // remove eval-modifier from $search
-    if (preg_match('!([a-zA-Z\s]+)$!s', $search, $match) && (strpos($match[1], 'e') !== false)) {
-        $search = substr($search, 0, - strlen($match[1])) . preg_replace('![e\s]+!', '', $match[1]);
-    }
-
-    return $search;
-}
diff --git a/www/smarty-3.1.27/plugins/modifier.truncate.php b/www/smarty-3.1.27/plugins/modifier.truncate.php
deleted file mode 100644
index fbe62e82..00000000
--- a/www/smarty-3.1.27/plugins/modifier.truncate.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifier
- */
-
-/**
- * Smarty truncate modifier plugin
- * Type:     modifier<br>
- * Name:     truncate<br>
- * Purpose:  Truncate a string to a certain length if necessary,
- *               optionally splitting in the middle of a word, and
- *               appending the $etc string or inserting $etc into the middle.
- *
- * @link   http://smarty.php.net/manual/en/language.modifier.truncate.php truncate (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- *
- * @param string  $string      input string
- * @param integer $length      length of truncated text
- * @param string  $etc         end string
- * @param boolean $break_words truncate at word boundary
- * @param boolean $middle      truncate in the middle of text
- *
- * @return string truncated string
- */
-function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_words = false, $middle = false)
-{
-    if ($length == 0) {
-        return '';
-    }
-
-    if (Smarty::$_MBSTRING) {
-        if (mb_strlen($string, Smarty::$_CHARSET) > $length) {
-            $length -= min($length, mb_strlen($etc, Smarty::$_CHARSET));
-            if (!$break_words && !$middle) {
-                $string = preg_replace('/\s+?(\S+)?$/' . Smarty::$_UTF8_MODIFIER, '', mb_substr($string, 0, $length + 1, Smarty::$_CHARSET));
-            }
-            if (!$middle) {
-                return mb_substr($string, 0, $length, Smarty::$_CHARSET) . $etc;
-            }
-
-            return mb_substr($string, 0, $length / 2, Smarty::$_CHARSET) . $etc . mb_substr($string, - $length / 2, $length, Smarty::$_CHARSET);
-        }
-
-        return $string;
-    }
-
-    // no MBString fallback
-    if (isset($string[$length])) {
-        $length -= min($length, strlen($etc));
-        if (!$break_words && !$middle) {
-            $string = preg_replace('/\s+?(\S+)?$/', '', substr($string, 0, $length + 1));
-        }
-        if (!$middle) {
-            return substr($string, 0, $length) . $etc;
-        }
-
-        return substr($string, 0, $length / 2) . $etc . substr($string, - $length / 2);
-    }
-
-    return $string;
-}
diff --git a/www/smarty-3.1.27/plugins/modifiercompiler.count_characters.php b/www/smarty-3.1.27/plugins/modifiercompiler.count_characters.php
deleted file mode 100644
index f8463d80..00000000
--- a/www/smarty-3.1.27/plugins/modifiercompiler.count_characters.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty count_characters modifier plugin
- * Type:     modifier<br>
- * Name:     count_characteres<br>
- * Purpose:  count the number of characters in a text
- *
- * @link   http://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_count_characters($params)
-{
-    if (!isset($params[1]) || $params[1] != 'true') {
-        return 'preg_match_all(\'/[^\s]/' . Smarty::$_UTF8_MODIFIER . '\',' . $params[0] . ', $tmp)';
-    }
-    if (Smarty::$_MBSTRING) {
-        return 'mb_strlen(' . $params[0] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
-    }
-    // no MBString fallback
-    return 'strlen(' . $params[0] . ')';
-}
diff --git a/www/smarty-3.1.27/plugins/modifiercompiler.count_paragraphs.php b/www/smarty-3.1.27/plugins/modifiercompiler.count_paragraphs.php
deleted file mode 100644
index 34f0bbb8..00000000
--- a/www/smarty-3.1.27/plugins/modifiercompiler.count_paragraphs.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty count_paragraphs modifier plugin
- * Type:     modifier<br>
- * Name:     count_paragraphs<br>
- * Purpose:  count the number of paragraphs in a text
- *
- * @link    http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
- *          count_paragraphs (Smarty online manual)
- * @author  Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_count_paragraphs($params)
-{
-    // count \r or \n characters
-    return '(preg_match_all(\'#[\r\n]+#\', ' . $params[0] . ', $tmp)+1)';
-}
diff --git a/www/smarty-3.1.27/plugins/modifiercompiler.count_sentences.php b/www/smarty-3.1.27/plugins/modifiercompiler.count_sentences.php
deleted file mode 100644
index f1ec5600..00000000
--- a/www/smarty-3.1.27/plugins/modifiercompiler.count_sentences.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty count_sentences modifier plugin
- * Type:     modifier<br>
- * Name:     count_sentences
- * Purpose:  count the number of sentences in a text
- *
- * @link    http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
- *          count_sentences (Smarty online manual)
- * @author  Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_count_sentences($params)
-{
-    // find periods, question marks, exclamation marks with a word before but not after.
-    return 'preg_match_all("#\w[\.\?\!](\W|$)#S' . Smarty::$_UTF8_MODIFIER . '", ' . $params[0] . ', $tmp)';
-}
diff --git a/www/smarty-3.1.27/plugins/modifiercompiler.count_words.php b/www/smarty-3.1.27/plugins/modifiercompiler.count_words.php
deleted file mode 100644
index 8b4330f1..00000000
--- a/www/smarty-3.1.27/plugins/modifiercompiler.count_words.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty count_words modifier plugin
- * Type:     modifier<br>
- * Name:     count_words<br>
- * Purpose:  count the number of words in a text
- *
- * @link   http://www.smarty.net/manual/en/language.modifier.count.words.php count_words (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_count_words($params)
-{
-    if (Smarty::$_MBSTRING) {
-        // return 'preg_match_all(\'#[\w\pL]+#' . Smarty::$_UTF8_MODIFIER . '\', ' . $params[0] . ', $tmp)';
-        // expression taken from http://de.php.net/manual/en/function.str-word-count.php#85592
-        return 'preg_match_all(\'/\p{L}[\p{L}\p{Mn}\p{Pd}\\\'\x{2019}]*/' . Smarty::$_UTF8_MODIFIER . '\', ' . $params[0] . ', $tmp)';
-    }
-    // no MBString fallback
-    return 'str_word_count(' . $params[0] . ')';
-}
diff --git a/www/smarty-3.1.27/plugins/modifiercompiler.default.php b/www/smarty-3.1.27/plugins/modifiercompiler.default.php
deleted file mode 100644
index fe777623..00000000
--- a/www/smarty-3.1.27/plugins/modifiercompiler.default.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty default modifier plugin
- * Type:     modifier<br>
- * Name:     default<br>
- * Purpose:  designate default value for empty variables
- *
- * @link   http://www.smarty.net/manual/en/language.modifier.default.php default (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_default($params)
-{
-    $output = $params[0];
-    if (!isset($params[1])) {
-        $params[1] = "''";
-    }
-
-    array_shift($params);
-    foreach ($params as $param) {
-        $output = '(($tmp = @' . $output . ')===null||$tmp===\'\' ? ' . $param . ' : $tmp)';
-    }
-
-    return $output;
-}
diff --git a/www/smarty-3.1.27/plugins/modifiercompiler.escape.php b/www/smarty-3.1.27/plugins/modifiercompiler.escape.php
deleted file mode 100644
index 7e848aae..00000000
--- a/www/smarty-3.1.27/plugins/modifiercompiler.escape.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * @ignore
- */
-require_once(SMARTY_PLUGINS_DIR . 'shared.literal_compiler_param.php');
-
-/**
- * Smarty escape modifier plugin
- * Type:     modifier<br>
- * Name:     escape<br>
- * Purpose:  escape string for output
- *
- * @link   http://www.smarty.net/docsv2/en/language.modifier.escape count_characters (Smarty online manual)
- * @author Rodney Rehm
- *
- * @param array $params parameters
- * @param       $compiler
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_escape($params, $compiler)
-{
-    static $_double_encode = null;
-    if ($_double_encode === null) {
-        $_double_encode = version_compare(PHP_VERSION, '5.2.3', '>=');
-    }
-
-    try {
-        $esc_type = smarty_literal_compiler_param($params, 1, 'html');
-        $char_set = smarty_literal_compiler_param($params, 2, Smarty::$_CHARSET);
-        $double_encode = smarty_literal_compiler_param($params, 3, true);
-
-        if (!$char_set) {
-            $char_set = Smarty::$_CHARSET;
-        }
-
-        switch ($esc_type) {
-            case 'html':
-                if ($_double_encode) {
-                    return 'htmlspecialchars('
-                    . $params[0] . ', ENT_QUOTES, '
-                    . var_export($char_set, true) . ', '
-                    . var_export($double_encode, true) . ')';
-                } elseif ($double_encode) {
-                    return 'htmlspecialchars('
-                    . $params[0] . ', ENT_QUOTES, '
-                    . var_export($char_set, true) . ')';
-                } else {
-                    // fall back to modifier.escape.php
-                }
-
-            case 'htmlall':
-                if (Smarty::$_MBSTRING) {
-                    if ($_double_encode) {
-                        // php >=5.2.3 - go native
-                        return 'mb_convert_encoding(htmlspecialchars('
-                        . $params[0] . ', ENT_QUOTES, '
-                        . var_export($char_set, true) . ', '
-                        . var_export($double_encode, true)
-                        . '), "HTML-ENTITIES", '
-                        . var_export($char_set, true) . ')';
-                    } elseif ($double_encode) {
-                        // php <5.2.3 - only handle double encoding
-                        return 'mb_convert_encoding(htmlspecialchars('
-                        . $params[0] . ', ENT_QUOTES, '
-                        . var_export($char_set, true)
-                        . '), "HTML-ENTITIES", '
-                        . var_export($char_set, true) . ')';
-                    } else {
-                        // fall back to modifier.escape.php
-                    }
-                }
-
-                // no MBString fallback
-                if ($_double_encode) {
-                    // php >=5.2.3 - go native
-                    return 'htmlentities('
-                    . $params[0] . ', ENT_QUOTES, '
-                    . var_export($char_set, true) . ', '
-                    . var_export($double_encode, true) . ')';
-                } elseif ($double_encode) {
-                    // php <5.2.3 - only handle double encoding
-                    return 'htmlentities('
-                    . $params[0] . ', ENT_QUOTES, '
-                    . var_export($char_set, true) . ')';
-                } else {
-                    // fall back to modifier.escape.php
-                }
-
-            case 'url':
-                return 'rawurlencode(' . $params[0] . ')';
-
-            case 'urlpathinfo':
-                return 'str_replace("%2F", "/", rawurlencode(' . $params[0] . '))';
-
-            case 'quotes':
-                // escape unescaped single quotes
-                return 'preg_replace("%(?<!\\\\\\\\)\'%", "\\\'",' . $params[0] . ')';
-
-            case 'javascript':
-                // escape quotes and backslashes, newlines, etc.
-                return 'strtr(' . $params[0] . ', array("\\\\" => "\\\\\\\\", "\'" => "\\\\\'", "\"" => "\\\\\"", "\\r" => "\\\\r", "\\n" => "\\\n", "</" => "<\/" ))';
-        }
-    }
-    catch (SmartyException $e) {
-        // pass through to regular plugin fallback
-    }
-
-    // could not optimize |escape call, so fallback to regular plugin
-    if ($compiler->template->caching && ($compiler->tag_nocache | $compiler->nocache)) {
-        $compiler->template->required_plugins['nocache']['escape']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'modifier.escape.php';
-        $compiler->template->required_plugins['nocache']['escape']['modifier']['function'] = 'smarty_modifier_escape';
-    } else {
-        $compiler->template->required_plugins['compiled']['escape']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'modifier.escape.php';
-        $compiler->template->required_plugins['compiled']['escape']['modifier']['function'] = 'smarty_modifier_escape';
-    }
-
-    return 'smarty_modifier_escape(' . join(', ', $params) . ')';
-}
diff --git a/www/smarty-3.1.27/plugins/modifiercompiler.from_charset.php b/www/smarty-3.1.27/plugins/modifiercompiler.from_charset.php
deleted file mode 100644
index dab43e9c..00000000
--- a/www/smarty-3.1.27/plugins/modifiercompiler.from_charset.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty from_charset modifier plugin
- * Type:     modifier<br>
- * Name:     from_charset<br>
- * Purpose:  convert character encoding from $charset to internal encoding
- *
- * @author Rodney Rehm
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_from_charset($params)
-{
-    if (!Smarty::$_MBSTRING) {
-        // FIXME: (rodneyrehm) shouldn't this throw an error?
-        return $params[0];
-    }
-
-    if (!isset($params[1])) {
-        $params[1] = '"ISO-8859-1"';
-    }
-
-    return 'mb_convert_encoding(' . $params[0] . ', "' . addslashes(Smarty::$_CHARSET) . '", ' . $params[1] . ')';
-}
diff --git a/www/smarty-3.1.27/plugins/modifiercompiler.indent.php b/www/smarty-3.1.27/plugins/modifiercompiler.indent.php
deleted file mode 100644
index e3ca2082..00000000
--- a/www/smarty-3.1.27/plugins/modifiercompiler.indent.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty indent modifier plugin
- * Type:     modifier<br>
- * Name:     indent<br>
- * Purpose:  indent lines of text
- *
- * @link   http://www.smarty.net/manual/en/language.modifier.indent.php indent (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-
-function smarty_modifiercompiler_indent($params)
-{
-    if (!isset($params[1])) {
-        $params[1] = 4;
-    }
-    if (!isset($params[2])) {
-        $params[2] = "' '";
-    }
-
-    return 'preg_replace(\'!^!m\',str_repeat(' . $params[2] . ',' . $params[1] . '),' . $params[0] . ')';
-}
diff --git a/www/smarty-3.1.27/plugins/modifiercompiler.lower.php b/www/smarty-3.1.27/plugins/modifiercompiler.lower.php
deleted file mode 100644
index 1d255f37..00000000
--- a/www/smarty-3.1.27/plugins/modifiercompiler.lower.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty lower modifier plugin
- * Type:     modifier<br>
- * Name:     lower<br>
- * Purpose:  convert string to lowercase
- *
- * @link   http://www.smarty.net/manual/en/language.modifier.lower.php lower (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-
-function smarty_modifiercompiler_lower($params)
-{
-    if (Smarty::$_MBSTRING) {
-        return 'mb_strtolower(' . $params[0] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
-    }
-    // no MBString fallback
-    return 'strtolower(' . $params[0] . ')';
-}
diff --git a/www/smarty-3.1.27/plugins/modifiercompiler.string_format.php b/www/smarty-3.1.27/plugins/modifiercompiler.string_format.php
deleted file mode 100644
index 71cdf281..00000000
--- a/www/smarty-3.1.27/plugins/modifiercompiler.string_format.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty string_format modifier plugin
- * Type:     modifier<br>
- * Name:     string_format<br>
- * Purpose:  format strings via sprintf
- *
- * @link   http://www.smarty.net/manual/en/language.modifier.string.format.php string_format (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_string_format($params)
-{
-    return 'sprintf(' . $params[1] . ',' . $params[0] . ')';
-}
diff --git a/www/smarty-3.1.27/plugins/modifiercompiler.strip.php b/www/smarty-3.1.27/plugins/modifiercompiler.strip.php
deleted file mode 100644
index fcd6cbae..00000000
--- a/www/smarty-3.1.27/plugins/modifiercompiler.strip.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty strip modifier plugin
- * Type:     modifier<br>
- * Name:     strip<br>
- * Purpose:  Replace all repeated spaces, newlines, tabs
- *              with a single space or supplied replacement string.<br>
- * Example:  {$var|strip} {$var|strip:"&nbsp;"}<br>
- * Date:     September 25th, 2002
- *
- * @link   http://www.smarty.net/manual/en/language.modifier.strip.php strip (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-
-function smarty_modifiercompiler_strip($params)
-{
-    if (!isset($params[1])) {
-        $params[1] = "' '";
-    }
-
-    return "preg_replace('!\s+!" . Smarty::$_UTF8_MODIFIER . "', {$params[1]},{$params[0]})";
-}
diff --git a/www/smarty-3.1.27/plugins/modifiercompiler.strip_tags.php b/www/smarty-3.1.27/plugins/modifiercompiler.strip_tags.php
deleted file mode 100644
index 3e6e1304..00000000
--- a/www/smarty-3.1.27/plugins/modifiercompiler.strip_tags.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty strip_tags modifier plugin
- * Type:     modifier<br>
- * Name:     strip_tags<br>
- * Purpose:  strip html tags from text
- *
- * @link   http://www.smarty.net/manual/en/language.modifier.strip.tags.php strip_tags (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_strip_tags($params)
-{
-    if (!isset($params[1]) || $params[1] === true || trim($params[1], '"') == 'true') {
-        return "preg_replace('!<[^>]*?>!', ' ', {$params[0]})";
-    } else {
-        return 'strip_tags(' . $params[0] . ')';
-    }
-}
diff --git a/www/smarty-3.1.27/plugins/modifiercompiler.to_charset.php b/www/smarty-3.1.27/plugins/modifiercompiler.to_charset.php
deleted file mode 100644
index 9122d8bb..00000000
--- a/www/smarty-3.1.27/plugins/modifiercompiler.to_charset.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty to_charset modifier plugin
- * Type:     modifier<br>
- * Name:     to_charset<br>
- * Purpose:  convert character encoding from internal encoding to $charset
- *
- * @author Rodney Rehm
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_to_charset($params)
-{
-    if (!Smarty::$_MBSTRING) {
-        // FIXME: (rodneyrehm) shouldn't this throw an error?
-        return $params[0];
-    }
-
-    if (!isset($params[1])) {
-        $params[1] = '"ISO-8859-1"';
-    }
-
-    return 'mb_convert_encoding(' . $params[0] . ', ' . $params[1] . ', "' . addslashes(Smarty::$_CHARSET) . '")';
-}
diff --git a/www/smarty-3.1.27/plugins/modifiercompiler.unescape.php b/www/smarty-3.1.27/plugins/modifiercompiler.unescape.php
deleted file mode 100644
index 3b17ea2e..00000000
--- a/www/smarty-3.1.27/plugins/modifiercompiler.unescape.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty unescape modifier plugin
- * Type:     modifier<br>
- * Name:     unescape<br>
- * Purpose:  unescape html entities
- *
- * @author Rodney Rehm
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_unescape($params)
-{
-    if (!isset($params[1])) {
-        $params[1] = 'html';
-    }
-    if (!isset($params[2])) {
-        $params[2] = '\'' . addslashes(Smarty::$_CHARSET) . '\'';
-    } else {
-        $params[2] = "'" . $params[2] . "'";
-    }
-
-    switch (trim($params[1], '"\'')) {
-        case 'entity':
-        case 'htmlall':
-            if (Smarty::$_MBSTRING) {
-                return 'mb_convert_encoding(' . $params[0] . ', ' . $params[2] . ', \'HTML-ENTITIES\')';
-            }
-
-            return 'html_entity_decode(' . $params[0] . ', ENT_NOQUOTES, ' . $params[2] . ')';
-
-        case 'html':
-            return 'htmlspecialchars_decode(' . $params[0] . ', ENT_QUOTES)';
-
-        case 'url':
-            return 'rawurldecode(' . $params[0] . ')';
-
-        default:
-            return $params[0];
-    }
-}
diff --git a/www/smarty-3.1.27/plugins/modifiercompiler.upper.php b/www/smarty-3.1.27/plugins/modifiercompiler.upper.php
deleted file mode 100644
index 52ca4e8f..00000000
--- a/www/smarty-3.1.27/plugins/modifiercompiler.upper.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty upper modifier plugin
- * Type:     modifier<br>
- * Name:     lower<br>
- * Purpose:  convert string to uppercase
- *
- * @link   http://smarty.php.net/manual/en/language.modifier.upper.php lower (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_upper($params)
-{
-    if (Smarty::$_MBSTRING) {
-        return 'mb_strtoupper(' . $params[0] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
-    }
-    // no MBString fallback
-    return 'strtoupper(' . $params[0] . ')';
-}
diff --git a/www/smarty-3.1.27/plugins/modifiercompiler.wordwrap.php b/www/smarty-3.1.27/plugins/modifiercompiler.wordwrap.php
deleted file mode 100644
index 2ad928ea..00000000
--- a/www/smarty-3.1.27/plugins/modifiercompiler.wordwrap.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty wordwrap modifier plugin
- * Type:     modifier<br>
- * Name:     wordwrap<br>
- * Purpose:  wrap a string of text at a given length
- *
- * @link   http://smarty.php.net/manual/en/language.modifier.wordwrap.php wordwrap (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- * @param       $compiler
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_wordwrap($params, $compiler)
-{
-    if (!isset($params[1])) {
-        $params[1] = 80;
-    }
-    if (!isset($params[2])) {
-        $params[2] = '"\n"';
-    }
-    if (!isset($params[3])) {
-        $params[3] = 'false';
-    }
-    $function = 'wordwrap';
-    if (Smarty::$_MBSTRING) {
-        if ($compiler->template->caching && ($compiler->tag_nocache | $compiler->nocache)) {
-            $compiler->template->required_plugins['nocache']['wordwrap']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'shared.mb_wordwrap.php';
-            $compiler->template->required_plugins['nocache']['wordwrap']['modifier']['function'] = 'smarty_mb_wordwrap';
-        } else {
-            $compiler->template->required_plugins['compiled']['wordwrap']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'shared.mb_wordwrap.php';
-            $compiler->template->required_plugins['compiled']['wordwrap']['modifier']['function'] = 'smarty_mb_wordwrap';
-        }
-        $function = 'smarty_mb_wordwrap';
-    }
-
-    return $function . '(' . $params[0] . ',' . $params[1] . ',' . $params[2] . ',' . $params[3] . ')';
-}
diff --git a/www/smarty-3.1.27/plugins/outputfilter.trimwhitespace.php b/www/smarty-3.1.27/plugins/outputfilter.trimwhitespace.php
deleted file mode 100644
index ad35d11a..00000000
--- a/www/smarty-3.1.27/plugins/outputfilter.trimwhitespace.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFilter
- */
-
-/**
- * Smarty trimwhitespace outputfilter plugin
- * Trim unnecessary whitespace from HTML markup.
- *
- * @author   Rodney Rehm
- *
- * @param string $source input string
- *
- * @return string filtered output
- * @todo     substr_replace() is not overloaded by mbstring.func_overload - so this function might fail!
- */
-function smarty_outputfilter_trimwhitespace($source)
-{
-    $store = array();
-    $_store = 0;
-    $_offset = 0;
-
-    // Unify Line-Breaks to \n
-    $source = preg_replace("/\015\012|\015|\012/", "\n", $source);
-
-    // capture Internet Explorer Conditional Comments
-    if (preg_match_all('#<!--\[[^\]]+\]>.*?<!\[[^\]]+\]-->#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
-        foreach ($matches as $match) {
-            $store[] = $match[0][0];
-            $_length = strlen($match[0][0]);
-            $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
-            $source = substr_replace($source, $replace, $match[0][1] - $_offset, $_length);
-
-            $_offset += $_length - strlen($replace);
-            $_store ++;
-        }
-    }
-
-    // Strip all HTML-Comments
-    // yes, even the ones in <script> - see http://stackoverflow.com/a/808850/515124
-    $source = preg_replace('#<!--.*?-->#ms', '', $source);
-
-    // capture html elements not to be messed with
-    $_offset = 0;
-    if (preg_match_all('#(<script[^>]*>.*?</script[^>]*>)|(<textarea[^>]*>.*?</textarea[^>]*>)|(<pre[^>]*>.*?</pre[^>]*>)#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
-        foreach ($matches as $match) {
-            $store[] = $match[0][0];
-            $_length = strlen($match[0][0]);
-            $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
-            $source = substr_replace($source, $replace, $match[0][1] - $_offset, $_length);
-
-            $_offset += $_length - strlen($replace);
-            $_store ++;
-        }
-    }
-
-    $expressions = array(
-        // replace multiple spaces between tags by a single space
-        // can't remove them entirely, becaue that might break poorly implemented CSS display:inline-block elements
-        '#(:SMARTY@!@|>)\s+(?=@!@SMARTY:|<)#s'                            => '\1 \2',
-        // remove spaces between attributes (but not in attribute values!)
-        '#(([a-z0-9]\s*=\s*("[^"]*?")|(\'[^\']*?\'))|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \5',
-        // note: for some very weird reason trim() seems to remove spaces inside attributes.
-        // maybe a \0 byte or something is interfering?
-        '#^\s+<#Ss'                                                       => '<',
-        '#>\s+$#Ss'                                                       => '>',
-    );
-
-    $source = preg_replace(array_keys($expressions), array_values($expressions), $source);
-    // note: for some very weird reason trim() seems to remove spaces inside attributes.
-    // maybe a \0 byte or something is interfering?
-    // $source = trim( $source );
-
-    $_offset = 0;
-    if (preg_match_all('#@!@SMARTY:([0-9]+):SMARTY@!@#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
-        foreach ($matches as $match) {
-            $_length = strlen($match[0][0]);
-            $replace = $store[$match[1][0]];
-            $source = substr_replace($source, $replace, $match[0][1] + $_offset, $_length);
-
-            $_offset += strlen($replace) - $_length;
-            $_store ++;
-        }
-    }
-
-    return $source;
-}
diff --git a/www/smarty-3.1.27/plugins/shared.escape_special_chars.php b/www/smarty-3.1.27/plugins/shared.escape_special_chars.php
deleted file mode 100644
index d3bd756b..00000000
--- a/www/smarty-3.1.27/plugins/shared.escape_special_chars.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Smarty shared plugin
- *
- * @package    Smarty
- * @subpackage PluginsShared
- */
-
-if (version_compare(PHP_VERSION, '5.2.3', '>=')) {
-    /**
-     * escape_special_chars common function
-     * Function: smarty_function_escape_special_chars<br>
-     * Purpose:  used by other smarty functions to escape
-     *           special chars except for already escaped ones
-     *
-     * @author   Monte Ohrt <monte at ohrt dot com>
-     *
-     * @param  string $string text that should by escaped
-     *
-     * @return string
-     */
-    function smarty_function_escape_special_chars($string)
-    {
-        if (!is_array($string)) {
-            $string = htmlspecialchars($string, ENT_COMPAT, Smarty::$_CHARSET, false);
-        }
-
-        return $string;
-    }
-} else {
-    /**
-     * escape_special_chars common function
-     * Function: smarty_function_escape_special_chars<br>
-     * Purpose:  used by other smarty functions to escape
-     *           special chars except for already escaped ones
-     *
-     * @author   Monte Ohrt <monte at ohrt dot com>
-     *
-     * @param  string $string text that should by escaped
-     *
-     * @return string
-     */
-    function smarty_function_escape_special_chars($string)
-    {
-        if (!is_array($string)) {
-            $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
-            $string = htmlspecialchars($string);
-            $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string);
-        }
-
-        return $string;
-    }
-}
diff --git a/www/smarty-3.1.27/plugins/shared.literal_compiler_param.php b/www/smarty-3.1.27/plugins/shared.literal_compiler_param.php
deleted file mode 100644
index 47d728a7..00000000
--- a/www/smarty-3.1.27/plugins/shared.literal_compiler_param.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsShared
- */
-
-/**
- * evaluate compiler parameter
- *
- * @param array   $params  parameter array as given to the compiler function
- * @param integer $index   array index of the parameter to convert
- * @param mixed   $default value to be returned if the parameter is not present
- *
- * @return mixed evaluated value of parameter or $default
- * @throws SmartyException if parameter is not a literal (but an expression, variable, …)
- * @author Rodney Rehm
- */
-function smarty_literal_compiler_param($params, $index, $default = null)
-{
-    // not set, go default
-    if (!isset($params[$index])) {
-        return $default;
-    }
-    // test if param is a literal
-    if (!preg_match('/^([\'"]?)[a-zA-Z0-9-]+(\\1)$/', $params[$index])) {
-        throw new SmartyException('$param[' . $index . '] is not a literal and is thus not evaluatable at compile time');
-    }
-
-    $t = null;
-    eval("\$t = " . $params[$index] . ";");
-
-    return $t;
-}
diff --git a/www/smarty-3.1.27/plugins/shared.make_timestamp.php b/www/smarty-3.1.27/plugins/shared.make_timestamp.php
deleted file mode 100644
index 7c94e5f5..00000000
--- a/www/smarty-3.1.27/plugins/shared.make_timestamp.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Smarty shared plugin
- *
- * @package    Smarty
- * @subpackage PluginsShared
- */
-
-/**
- * Function: smarty_make_timestamp<br>
- * Purpose:  used by other smarty functions to make a timestamp from a string.
- *
- * @author   Monte Ohrt <monte at ohrt dot com>
- *
- * @param DateTime|int|string $string date object, timestamp or string that can be converted using strtotime()
- *
- * @return int
- */
-function smarty_make_timestamp($string)
-{
-    if (empty($string)) {
-        // use "now":
-        return time();
-    } elseif ($string instanceof DateTime) {
-        return $string->getTimestamp();
-    } elseif (strlen($string) == 14 && ctype_digit($string)) {
-        // it is mysql timestamp format of YYYYMMDDHHMMSS?
-        return mktime(substr($string, 8, 2), substr($string, 10, 2), substr($string, 12, 2),
-                      substr($string, 4, 2), substr($string, 6, 2), substr($string, 0, 4));
-    } elseif (is_numeric($string)) {
-        // it is a numeric string, we handle it as timestamp
-        return (int) $string;
-    } else {
-        // strtotime should handle it
-        $time = strtotime($string);
-        if ($time == - 1 || $time === false) {
-            // strtotime() was not able to parse $string, use "now":
-            return time();
-        }
-
-        return $time;
-    }
-}
diff --git a/www/smarty-3.1.27/plugins/shared.mb_str_replace.php b/www/smarty-3.1.27/plugins/shared.mb_str_replace.php
deleted file mode 100644
index a5682ed3..00000000
--- a/www/smarty-3.1.27/plugins/shared.mb_str_replace.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Smarty shared plugin
- *
- * @package    Smarty
- * @subpackage PluginsShared
- */
-if (!function_exists('smarty_mb_str_replace')) {
-
-    /**
-     * Multibyte string replace
-     *
-     * @param  string $search  the string to be searched
-     * @param  string $replace the replacement string
-     * @param  string $subject the source string
-     * @param  int    &$count  number of matches found
-     *
-     * @return string replaced string
-     * @author Rodney Rehm
-     */
-    function smarty_mb_str_replace($search, $replace, $subject, &$count = 0)
-    {
-        if (!is_array($search) && is_array($replace)) {
-            return false;
-        }
-        if (is_array($subject)) {
-            // call mb_replace for each single string in $subject
-            foreach ($subject as &$string) {
-                $string = & smarty_mb_str_replace($search, $replace, $string, $c);
-                $count += $c;
-            }
-        } elseif (is_array($search)) {
-            if (!is_array($replace)) {
-                foreach ($search as &$string) {
-                    $subject = smarty_mb_str_replace($string, $replace, $subject, $c);
-                    $count += $c;
-                }
-            } else {
-                $n = max(count($search), count($replace));
-                while ($n --) {
-                    $subject = smarty_mb_str_replace(current($search), current($replace), $subject, $c);
-                    $count += $c;
-                    next($search);
-                    next($replace);
-                }
-            }
-        } else {
-            $parts = mb_split(preg_quote($search), $subject);
-            $count = count($parts) - 1;
-            $subject = implode($replace, $parts);
-        }
-
-        return $subject;
-    }
-}
diff --git a/www/smarty-3.1.27/plugins/shared.mb_wordwrap.php b/www/smarty-3.1.27/plugins/shared.mb_wordwrap.php
deleted file mode 100644
index 31f4acf0..00000000
--- a/www/smarty-3.1.27/plugins/shared.mb_wordwrap.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
- * Smarty shared plugin
- *
- * @package    Smarty
- * @subpackage PluginsShared
- */
-
-if (!function_exists('smarty_mb_wordwrap')) {
-
-    /**
-     * Wrap a string to a given number of characters
-     *
-     * @link   http://php.net/manual/en/function.wordwrap.php for similarity
-     *
-     * @param  string  $str   the string to wrap
-     * @param  int     $width the width of the output
-     * @param  string  $break the character used to break the line
-     * @param  boolean $cut   ignored parameter, just for the sake of
-     *
-     * @return string  wrapped string
-     * @author Rodney Rehm
-     */
-    function smarty_mb_wordwrap($str, $width = 75, $break = "\n", $cut = false)
-    {
-        // break words into tokens using white space as a delimiter
-        $tokens = preg_split('!(\s)!S' . Smarty::$_UTF8_MODIFIER, $str, - 1, PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE);
-        $length = 0;
-        $t = '';
-        $_previous = false;
-        $_space = false;
-
-        foreach ($tokens as $_token) {
-            $token_length = mb_strlen($_token, Smarty::$_CHARSET);
-            $_tokens = array($_token);
-            if ($token_length > $width) {
-                 if ($cut) {
-                    $_tokens = preg_split('!(.{' . $width . '})!S' . Smarty::$_UTF8_MODIFIER, $_token, - 1, PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE);
-                }
-            }
-
-            foreach ($_tokens as $token) {
-                $_space = !!preg_match('!^\s$!S' . Smarty::$_UTF8_MODIFIER, $token);
-                $token_length = mb_strlen($token, Smarty::$_CHARSET);
-                $length += $token_length;
-
-                if ($length > $width) {
-                    // remove space before inserted break
-                    if ($_previous) {
-                        $t = mb_substr($t, 0, - 1, Smarty::$_CHARSET);
-                    }
-
-                    if (!$_space) {
-                        // add the break before the token
-                        if (!empty($t)) {
-                            $t .= $break;
-                        }
-                        $length = $token_length;
-                    }
-                } elseif ($token == "\n") {
-                    // hard break must reset counters
-                    $_previous = 0;
-                    $length = 0;
-                }
-                $_previous = $_space;
-                // add the token
-                $t .= $token;
-            }
-        }
-
-        return $t;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_cacheresource.php b/www/smarty-3.1.27/sysplugins/smarty_cacheresource.php
deleted file mode 100644
index 622ab6fb..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_cacheresource.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin
- *
- * @package    Smarty
- * @subpackage Cacher
- */
-
-/**
- * Cache Handler API
- *
- * @package    Smarty
- * @subpackage Cacher
- * @author     Rodney Rehm
- */
-abstract class Smarty_CacheResource
-{
-    /**
-     * resource types provided by the core
-     *
-     * @var array
-     */
-    protected static $sysplugins = array(
-        'file' => 'smarty_internal_cacheresource_file.php',
-    );
-
-    /**
-     * populate Cached Object with meta data from Resource
-     *
-     * @param Smarty_Template_Cached   $cached    cached object
-     * @param Smarty_Internal_Template $_template template object
-     *
-     * @return void
-     */
-    abstract public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template);
-
-    /**
-     * populate Cached Object with timestamp and exists from Resource
-     *
-     * @param Smarty_Template_Cached $cached
-     *
-     * @return void
-     */
-    abstract public function populateTimestamp(Smarty_Template_Cached $cached);
-
-    /**
-     * Read the cached template and process header
-     *
-     * @param Smarty_Internal_Template $_template template object
-     * @param Smarty_Template_Cached   $cached    cached object
-     *
-     * @return boolean true or false if the cached content does not exist
-     */
-    abstract public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null);
-
-    /**
-     * Write the rendered template output to cache
-     *
-     * @param Smarty_Internal_Template $_template template object
-     * @param string                   $content   content to cache
-     *
-     * @return boolean success
-     */
-    abstract public function writeCachedContent(Smarty_Internal_Template $_template, $content);
-
-    /**
-     * Return cached content
-     *
-     * @param Smarty_Internal_Template $_template template object
-     *
-     * @return null|string
-     */
-    public function getCachedContent(Smarty_Internal_Template $_template)
-    {
-        if ($_template->cached->handler->process($_template)) {
-            ob_start();
-            $_template->properties['unifunc']($_template);
-
-            return ob_get_clean();
-        }
-
-        return null;
-    }
-
-    /**
-     * Empty cache
-     *
-     * @param Smarty  $smarty   Smarty object
-     * @param integer $exp_time expiration time (number of seconds, not timestamp)
-     *
-     * @return integer number of cache files deleted
-     */
-    abstract public function clearAll(Smarty $smarty, $exp_time = null);
-
-    /**
-     * Empty cache for a specific template
-     *
-     * @param Smarty  $smarty        Smarty object
-     * @param string  $resource_name template name
-     * @param string  $cache_id      cache id
-     * @param string  $compile_id    compile id
-     * @param integer $exp_time      expiration time (number of seconds, not timestamp)
-     *
-     * @return integer number of cache files deleted
-     */
-    abstract public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time);
-
-    /**
-     * @param Smarty                 $smarty
-     * @param Smarty_Template_Cached $cached
-     *
-     * @return bool|null
-     */
-    public function locked(Smarty $smarty, Smarty_Template_Cached $cached)
-    {
-        // theoretically locking_timeout should be checked against time_limit (max_execution_time)
-        $start = microtime(true);
-        $hadLock = null;
-        while ($this->hasLock($smarty, $cached)) {
-            $hadLock = true;
-            if (microtime(true) - $start > $smarty->locking_timeout) {
-                // abort waiting for lock release
-                return false;
-            }
-            sleep(1);
-        }
-
-        return $hadLock;
-    }
-
-    /**
-     * Check is cache is locked for this template
-     *
-     * @param Smarty                 $smarty
-     * @param Smarty_Template_Cached $cached
-     *
-     * @return bool
-     */
-    public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
-    {
-        // check if lock exists
-        return false;
-    }
-
-    /**
-     * Lock cache for this template
-     *
-     * @param Smarty                 $smarty
-     * @param Smarty_Template_Cached $cached
-     *
-     * @return bool
-     */
-    public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
-    {
-        // create lock
-        return true;
-    }
-
-    /**
-     * Unlock cache for this template
-     *
-     * @param Smarty                 $smarty
-     * @param Smarty_Template_Cached $cached
-     *
-     * @return bool
-     */
-    public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
-    {
-        // release lock
-        return true;
-    }
-
-    /**
-     * Load Cache Resource Handler
-     *
-     * @param Smarty $smarty Smarty object
-     * @param string $type   name of the cache resource
-     *
-     * @throws SmartyException
-     * @return Smarty_CacheResource Cache Resource Handler
-     */
-    public static function load(Smarty $smarty, $type = null)
-    {
-        if (!isset($type)) {
-            $type = $smarty->caching_type;
-        }
-
-        // try smarty's cache
-        if (isset($smarty->_cacheresource_handlers[$type])) {
-            return $smarty->_cacheresource_handlers[$type];
-        }
-
-        // try registered resource
-        if (isset($smarty->registered_cache_resources[$type])) {
-            // do not cache these instances as they may vary from instance to instance
-            return $smarty->_cacheresource_handlers[$type] = $smarty->registered_cache_resources[$type];
-        }
-        // try sysplugins dir
-        if (isset(self::$sysplugins[$type])) {
-            $cache_resource_class = 'Smarty_Internal_CacheResource_' . ucfirst($type);
-            if (!class_exists($cache_resource_class, false)) {
-                require SMARTY_SYSPLUGINS_DIR . self::$sysplugins[$type];
-            }
-            return $smarty->_cacheresource_handlers[$type] = new $cache_resource_class();
-        }
-        // try plugins dir
-        $cache_resource_class = 'Smarty_CacheResource_' . ucfirst($type);
-        if ($smarty->loadPlugin($cache_resource_class)) {
-            return $smarty->_cacheresource_handlers[$type] = new $cache_resource_class();
-        }
-        // give up
-        throw new SmartyException("Unable to load cache resource '{$type}'");
-    }
-
-    /**
-     * Invalid Loaded Cache Files
-     *
-     * @param Smarty $smarty Smarty object
-     */
-    public static function invalidLoadedCache(Smarty $smarty)
-    {
-        foreach ($smarty->template_objects as $tpl) {
-            if (isset($tpl->cached)) {
-                $tpl->cached->valid = false;
-                $tpl->cached->processed = false;
-            }
-        }
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_cacheresource_custom.php b/www/smarty-3.1.27/sysplugins/smarty_cacheresource_custom.php
deleted file mode 100644
index f496c152..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_cacheresource_custom.php
+++ /dev/null
@@ -1,312 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin
- *
- * @package    Smarty
- * @subpackage Cacher
- */
-
-/**
- * Cache Handler API
- *
- * @package    Smarty
- * @subpackage Cacher
- * @author     Rodney Rehm
- */
-abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
-{
-    /**
-     * fetch cached content and its modification time from data source
-     *
-     * @param  string  $id         unique cache content identifier
-     * @param  string  $name       template name
-     * @param  string  $cache_id   cache id
-     * @param  string  $compile_id compile id
-     * @param  string  $content    cached content
-     * @param  integer $mtime      cache modification timestamp (epoch)
-     *
-     * @return void
-     */
-    abstract protected function fetch($id, $name, $cache_id, $compile_id, &$content, &$mtime);
-
-    /**
-     * Fetch cached content's modification timestamp from data source
-     * {@internal implementing this method is optional.
-     *  Only implement it if modification times can be accessed faster than loading the complete cached content.}}
-     *
-     * @param  string $id         unique cache content identifier
-     * @param  string $name       template name
-     * @param  string $cache_id   cache id
-     * @param  string $compile_id compile id
-     *
-     * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
-     */
-    protected function fetchTimestamp($id, $name, $cache_id, $compile_id)
-    {
-        return null;
-    }
-
-    /**
-     * Save content to cache
-     *
-     * @param  string       $id         unique cache content identifier
-     * @param  string       $name       template name
-     * @param  string       $cache_id   cache id
-     * @param  string       $compile_id compile id
-     * @param  integer|null $exp_time   seconds till expiration or null
-     * @param  string       $content    content to cache
-     *
-     * @return boolean      success
-     */
-    abstract protected function save($id, $name, $cache_id, $compile_id, $exp_time, $content);
-
-    /**
-     * Delete content from cache
-     *
-     * @param  string       $name       template name
-     * @param  string       $cache_id   cache id
-     * @param  string       $compile_id compile id
-     * @param  integer|null $exp_time   seconds till expiration time in seconds or null
-     *
-     * @return integer      number of deleted caches
-     */
-    abstract protected function delete($name, $cache_id, $compile_id, $exp_time);
-
-    /**
-     * populate Cached Object with meta data from Resource
-     *
-     * @param  Smarty_Template_Cached   $cached    cached object
-     * @param  Smarty_Internal_Template $_template template object
-     *
-     * @return void
-     */
-    public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template)
-    {
-        $_cache_id = isset($cached->cache_id) ? preg_replace('![^\w\|]+!', '_', $cached->cache_id) : null;
-        $_compile_id = isset($cached->compile_id) ? preg_replace('![^\w\|]+!', '_', $cached->compile_id) : null;
-        $path = $cached->source->filepath . $_cache_id . $_compile_id;
-        $cached->filepath = sha1($path);
-        if ($_template->smarty->cache_locking) {
-            $cached->lock_id = sha1('lock.' . $path);
-        }
-        $this->populateTimestamp($cached);
-    }
-
-    /**
-     * populate Cached Object with timestamp and exists from Resource
-     *
-     * @param Smarty_Template_Cached $cached
-     *
-     * @return void
-     */
-    public function populateTimestamp(Smarty_Template_Cached $cached)
-    {
-        $mtime = $this->fetchTimestamp($cached->filepath, $cached->source->name, $cached->cache_id, $cached->compile_id);
-        if ($mtime !== null) {
-            $cached->timestamp = $mtime;
-            $cached->exists = !!$cached->timestamp;
-
-            return;
-        }
-        $timestamp = null;
-        $this->fetch($cached->filepath, $cached->source->name, $cached->cache_id, $cached->compile_id, $cached->content, $timestamp);
-        $cached->timestamp = isset($timestamp) ? $timestamp : false;
-        $cached->exists = !!$cached->timestamp;
-    }
-
-    /**
-     * Read the cached template and process the header
-     *
-     * @param  Smarty_Internal_Template $_template template object
-     * @param  Smarty_Template_Cached   $cached    cached object
-     *
-     * @return boolean                 true or false if the cached content does not exist
-     */
-    public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null)
-    {
-        if (!$cached) {
-            $cached = $_template->cached;
-        }
-        $content = $cached->content ? $cached->content : null;
-        $timestamp = $cached->timestamp ? $cached->timestamp : null;
-        if ($content === null || !$timestamp) {
-            $this->fetch(
-                $_template->cached->filepath,
-                $_template->source->name,
-                $_template->cache_id,
-                $_template->compile_id,
-                $content,
-                $timestamp
-            );
-        }
-        if (isset($content)) {
-            /** @var Smarty_Internal_Template $_smarty_tpl
-             * used in evaluated code
-             */
-            $_smarty_tpl = $_template;
-            eval("?>" . $content);
-
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Write the rendered template output to cache
-     *
-     * @param  Smarty_Internal_Template $_template template object
-     * @param  string                   $content   content to cache
-     *
-     * @return boolean                  success
-     */
-    public function writeCachedContent(Smarty_Internal_Template $_template, $content)
-    {
-        return $this->save(
-            $_template->cached->filepath,
-            $_template->source->name,
-            $_template->cache_id,
-            $_template->compile_id,
-            $_template->properties['cache_lifetime'],
-            $content
-        );
-    }
-
-    /**
-     * Read cached template from cache
-     *
-     * @param  Smarty_Internal_Template $_template template object
-     *
-     * @return string  content
-     */
-    public function readCachedContent(Smarty_Internal_Template $_template)
-    {
-        $content = $_template->cached->content ? $_template->cached->content : null;
-        $timestamp = null;
-        if ($content === null) {
-            $timestamp = null;
-            $this->fetch(
-                $_template->cached->filepath,
-                $_template->source->name,
-                $_template->cache_id,
-                $_template->compile_id,
-                $content,
-                $timestamp
-            );
-        }
-        if (isset($content)) {
-            return $content;
-        }
-        return false;
-    }
-
-    /**
-     * Empty cache
-     *
-     * @param  Smarty  $smarty   Smarty object
-     * @param  integer $exp_time expiration time (number of seconds, not timestamp)
-     *
-     * @return integer number of cache files deleted
-     */
-    public function clearAll(Smarty $smarty, $exp_time = null)
-    {
-        $this->cache = array();
-
-        return $this->delete(null, null, null, $exp_time);
-    }
-
-    /**
-     * Empty cache for a specific template
-     *
-     * @param  Smarty  $smarty        Smarty object
-     * @param  string  $resource_name template name
-     * @param  string  $cache_id      cache id
-     * @param  string  $compile_id    compile id
-     * @param  integer $exp_time      expiration time (number of seconds, not timestamp)
-     *
-     * @return integer number of cache files deleted
-     */
-    public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
-    {
-        $this->cache = array();
-        $cache_name = null;
-
-        if (isset($resource_name)) {
-            $_save_stat = $smarty->caching;
-            $smarty->caching = true;
-            $tpl = new $smarty->template_class($resource_name, $smarty);
-            $smarty->caching = $_save_stat;
-
-            if ($tpl->source->exists) {
-                $cache_name = $tpl->source->name;
-            } else {
-                return 0;
-            }
-            // remove from template cache
-            if ($smarty->allow_ambiguous_resources) {
-                $_templateId = $tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id;
-            } else {
-                $_templateId = $smarty->joined_template_dir . '#' . $resource_name . $tpl->cache_id . $tpl->compile_id;
-            }
-            if (isset($_templateId[150])) {
-                $_templateId = sha1($_templateId);
-            }
-            unset($smarty->template_objects[$_templateId]);
-            // template object no longer needed
-            unset($tpl);
-        }
-
-        return $this->delete($cache_name, $cache_id, $compile_id, $exp_time);
-    }
-
-    /**
-     * Check is cache is locked for this template
-     *
-     * @param  Smarty                 $smarty Smarty object
-     * @param  Smarty_Template_Cached $cached cached object
-     *
-     * @return boolean               true or false if cache is locked
-     */
-    public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
-    {
-        $id = $cached->lock_id;
-        $name = $cached->source->name . '.lock';
-
-        $mtime = $this->fetchTimestamp($id, $name, $cached->cache_id, $cached->compile_id);
-        if ($mtime === null) {
-            $this->fetch($id, $name, $cached->cache_id, $cached->compile_id, $content, $mtime);
-        }
-        return $mtime && ($t = time()) - $mtime < $smarty->locking_timeout;
-    }
-
-    /**
-     * Lock cache for this template
-     *
-     * @param Smarty                 $smarty Smarty object
-     * @param Smarty_Template_Cached $cached cached object
-     *
-     * @return bool|void
-     */
-    public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
-    {
-        $cached->is_locked = true;
-        $id = $cached->lock_id;
-        $name = $cached->source->name . '.lock';
-        $this->save($id, $name, $cached->cache_id, $cached->compile_id, $smarty->locking_timeout, '');
-    }
-
-    /**
-     * Unlock cache for this template
-     *
-     * @param Smarty                 $smarty Smarty object
-     * @param Smarty_Template_Cached $cached cached object
-     *
-     * @return bool|void
-     */
-    public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
-    {
-        $cached->is_locked = false;
-        $name = $cached->source->name . '.lock';
-        $this->delete($name, $cached->cache_id, $cached->compile_id, null);
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_cacheresource_keyvaluestore.php b/www/smarty-3.1.27/sysplugins/smarty_cacheresource_keyvaluestore.php
deleted file mode 100644
index 2fdc7e42..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_cacheresource_keyvaluestore.php
+++ /dev/null
@@ -1,510 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin
- *
- * @package    Smarty
- * @subpackage Cacher
- */
-
-/**
- * Smarty Cache Handler Base for Key/Value Storage Implementations
- * This class implements the functionality required to use simple key/value stores
- * for hierarchical cache groups. key/value stores like memcache or APC do not support
- * wildcards in keys, therefore a cache group cannot be cleared like "a|*" - which
- * is no problem to filesystem and RDBMS implementations.
- * This implementation is based on the concept of invalidation. While one specific cache
- * can be identified and cleared, any range of caches cannot be identified. For this reason
- * each level of the cache group hierarchy can have its own value in the store. These values
- * are nothing but microtimes, telling us when a particular cache group was cleared for the
- * last time. These keys are evaluated for every cache read to determine if the cache has
- * been invalidated since it was created and should hence be treated as inexistent.
- * Although deep hierarchies are possible, they are not recommended. Try to keep your
- * cache groups as shallow as possible. Anything up 3-5 parents should be ok. So
- * »a|b|c« is a good depth where »a|b|c|d|e|f|g|h|i|j|k« isn't. Try to join correlating
- * cache groups: if your cache groups look somewhat like »a|b|$page|$items|$whatever«
- * consider using »a|b|c|$page-$items-$whatever« instead.
- *
- * @package    Smarty
- * @subpackage Cacher
- * @author     Rodney Rehm
- */
-abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
-{
-    /**
-     * cache for contents
-     *
-     * @var array
-     */
-    protected $contents = array();
-
-    /**
-     * cache for timestamps
-     *
-     * @var array
-     */
-    protected $timestamps = array();
-
-    /**
-     * populate Cached Object with meta data from Resource
-     *
-     * @param  Smarty_Template_Cached   $cached    cached object
-     * @param  Smarty_Internal_Template $_template template object
-     *
-     * @return void
-     */
-    public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template)
-    {
-        $cached->filepath = $_template->source->uid . '#' . $this->sanitize($cached->source->resource) . '#' . $this->sanitize($cached->cache_id) . '#' . $this->sanitize($cached->compile_id);
-
-        $this->populateTimestamp($cached);
-    }
-
-    /**
-     * populate Cached Object with timestamp and exists from Resource
-     *
-     * @param  Smarty_Template_Cached $cached cached object
-     *
-     * @return void
-     */
-    public function populateTimestamp(Smarty_Template_Cached $cached)
-    {
-        if (!$this->fetch($cached->filepath, $cached->source->name, $cached->cache_id, $cached->compile_id, $content, $timestamp, $cached->source->uid)) {
-            return;
-        }
-        $cached->content = $content;
-        $cached->timestamp = (int) $timestamp;
-        $cached->exists = $cached->timestamp;
-    }
-
-    /**
-     * Read the cached template and process the header
-     *
-     * @param  Smarty_Internal_Template $_template template object
-     * @param  Smarty_Template_Cached   $cached    cached object
-     *
-     * @return boolean                 true or false if the cached content does not exist
-     */
-    public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null)
-    {
-        if (!$cached) {
-            $cached = $_template->cached;
-        }
-        $content = $cached->content ? $cached->content : null;
-        $timestamp = $cached->timestamp ? $cached->timestamp : null;
-        if ($content === null || !$timestamp) {
-            if (!$this->fetch($_template->cached->filepath, $_template->source->name, $_template->cache_id, $_template->compile_id, $content, $timestamp, $_template->source->uid)) {
-                return false;
-            }
-        }
-        if (isset($content)) {
-            /** @var Smarty_Internal_Template $_smarty_tpl
-             * used in evaluated code
-             */
-            $_smarty_tpl = $_template;
-            eval("?>" . $content);
-
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Write the rendered template output to cache
-     *
-     * @param  Smarty_Internal_Template $_template template object
-     * @param  string                   $content   content to cache
-     *
-     * @return boolean                  success
-     */
-    public function writeCachedContent(Smarty_Internal_Template $_template, $content)
-    {
-        $this->addMetaTimestamp($content);
-
-        return $this->write(array($_template->cached->filepath => $content), $_template->properties['cache_lifetime']);
-    }
-
-    /**
-     * Read cached template from cache
-     *
-     * @param  Smarty_Internal_Template $_template template object
-     *
-     * @return string  content
-     */
-    public function readCachedContent(Smarty_Internal_Template $_template)
-    {
-        $content = $_template->cached->content ? $_template->cached->content : null;
-        $timestamp = null;
-        if ($content === null) {
-            if (!$this->fetch($_template->cached->filepath, $_template->source->name, $_template->cache_id, $_template->compile_id, $content, $timestamp, $_template->source->uid)) {
-                return false;
-            }
-        }
-        if (isset($content)) {
-            return $content;
-        }
-        return false;
-    }
-
-    /**
-     * Empty cache
-     * {@internal the $exp_time argument is ignored altogether }}
-     *
-     * @param  Smarty  $smarty   Smarty object
-     * @param  integer $exp_time expiration time [being ignored]
-     *
-     * @return integer number of cache files deleted [always -1]
-     * @uses purge() to clear the whole store
-     * @uses invalidate() to mark everything outdated if purge() is inapplicable
-     */
-    public function clearAll(Smarty $smarty, $exp_time = null)
-    {
-        if (!$this->purge()) {
-            $this->invalidate(null);
-        }
-
-        return - 1;
-    }
-
-    /**
-     * Empty cache for a specific template
-     * {@internal the $exp_time argument is ignored altogether}}
-     *
-     * @param  Smarty  $smarty        Smarty object
-     * @param  string  $resource_name template name
-     * @param  string  $cache_id      cache id
-     * @param  string  $compile_id    compile id
-     * @param  integer $exp_time      expiration time [being ignored]
-     *
-     * @return integer number of cache files deleted [always -1]
-     * @uses buildCachedFilepath() to generate the CacheID
-     * @uses invalidate() to mark CacheIDs parent chain as outdated
-     * @uses delete() to remove CacheID from cache
-     */
-    public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
-    {
-        $uid = $this->getTemplateUid($smarty, $resource_name, $cache_id, $compile_id);
-        $cid = $uid . '#' . $this->sanitize($resource_name) . '#' . $this->sanitize($cache_id) . '#' . $this->sanitize($compile_id);
-        $this->delete(array($cid));
-        $this->invalidate($cid, $resource_name, $cache_id, $compile_id, $uid);
-
-        return - 1;
-    }
-
-    /**
-     * Get template's unique ID
-     *
-     * @param  Smarty $smarty        Smarty object
-     * @param  string $resource_name template name
-     * @param  string $cache_id      cache id
-     * @param  string $compile_id    compile id
-     *
-     * @return string filepath of cache file
-     */
-    protected function getTemplateUid(Smarty $smarty, $resource_name, $cache_id, $compile_id)
-    {
-        $uid = '';
-        if (isset($resource_name)) {
-            $tpl = new $smarty->template_class($resource_name, $smarty);
-            if ($tpl->source->exists) {
-                $uid = $tpl->source->uid;
-            }
-
-            // remove from template cache
-            if ($smarty->allow_ambiguous_resources) {
-                $_templateId = $tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id;
-            } else {
-                $_templateId = $smarty->joined_template_dir . '#' . $resource_name . $tpl->cache_id . $tpl->compile_id;
-            }
-            if (isset($_templateId[150])) {
-                $_templateId = sha1($_templateId);
-            }
-            unset($smarty->template_objects[$_templateId]);
-        }
-
-        return $uid;
-    }
-
-    /**
-     * Sanitize CacheID components
-     *
-     * @param  string $string CacheID component to sanitize
-     *
-     * @return string sanitized CacheID component
-     */
-    protected function sanitize($string)
-    {
-        // some poeple smoke bad weed
-        $string = trim($string, '|');
-        if (!$string) {
-            return null;
-        }
-
-        return preg_replace('#[^\w\|]+#S', '_', $string);
-    }
-
-    /**
-     * Fetch and prepare a cache object.
-     *
-     * @param  string  $cid           CacheID to fetch
-     * @param  string  $resource_name template name
-     * @param  string  $cache_id      cache id
-     * @param  string  $compile_id    compile id
-     * @param  string  $content       cached content
-     * @param  integer &$timestamp    cached timestamp (epoch)
-     * @param  string  $resource_uid  resource's uid
-     *
-     * @return boolean success
-     */
-    protected function fetch($cid, $resource_name = null, $cache_id = null, $compile_id = null, &$content = null, &$timestamp = null, $resource_uid = null)
-    {
-        $t = $this->read(array($cid));
-        $content = !empty($t[$cid]) ? $t[$cid] : null;
-        $timestamp = null;
-
-        if ($content && ($timestamp = $this->getMetaTimestamp($content))) {
-            $invalidated = $this->getLatestInvalidationTimestamp($cid, $resource_name, $cache_id, $compile_id, $resource_uid);
-            if ($invalidated > $timestamp) {
-                $timestamp = null;
-                $content = null;
-            }
-        }
-
-        return !!$content;
-    }
-
-    /**
-     * Add current microtime to the beginning of $cache_content
-     * {@internal the header uses 8 Bytes, the first 4 Bytes are the seconds, the second 4 Bytes are the microseconds}}
-     *
-     * @param string &$content the content to be cached
-     */
-    protected function addMetaTimestamp(&$content)
-    {
-        $mt = explode(" ", microtime());
-        $ts = pack("NN", $mt[1], (int) ($mt[0] * 100000000));
-        $content = $ts . $content;
-    }
-
-    /**
-     * Extract the timestamp the $content was cached
-     *
-     * @param  string &$content the cached content
-     *
-     * @return float  the microtime the content was cached
-     */
-    protected function getMetaTimestamp(&$content)
-    {
-        extract(unpack('N1s/N1m/a*content', $content));
-        return $s + ($m / 100000000);
-    }
-
-    /**
-     * Invalidate CacheID
-     *
-     * @param  string $cid           CacheID
-     * @param  string $resource_name template name
-     * @param  string $cache_id      cache id
-     * @param  string $compile_id    compile id
-     * @param  string $resource_uid  source's uid
-     *
-     * @return void
-     */
-    protected function invalidate($cid = null, $resource_name = null, $cache_id = null, $compile_id = null, $resource_uid = null)
-    {
-        $now = microtime(true);
-        $key = null;
-        // invalidate everything
-        if (!$resource_name && !$cache_id && !$compile_id) {
-            $key = 'IVK#ALL';
-        } // invalidate all caches by template
-        else {
-            if ($resource_name && !$cache_id && !$compile_id) {
-                $key = 'IVK#TEMPLATE#' . $resource_uid . '#' . $this->sanitize($resource_name);
-            } // invalidate all caches by cache group
-            else {
-                if (!$resource_name && $cache_id && !$compile_id) {
-                    $key = 'IVK#CACHE#' . $this->sanitize($cache_id);
-                } // invalidate all caches by compile id
-                else {
-                    if (!$resource_name && !$cache_id && $compile_id) {
-                        $key = 'IVK#COMPILE#' . $this->sanitize($compile_id);
-                    } // invalidate by combination
-                    else {
-                        $key = 'IVK#CID#' . $cid;
-                    }
-                }
-            }
-        }
-        $this->write(array($key => $now));
-    }
-
-    /**
-     * Determine the latest timestamp known to the invalidation chain
-     *
-     * @param  string $cid           CacheID to determine latest invalidation timestamp of
-     * @param  string $resource_name template name
-     * @param  string $cache_id      cache id
-     * @param  string $compile_id    compile id
-     * @param  string $resource_uid  source's filepath
-     *
-     * @return float  the microtime the CacheID was invalidated
-     */
-    protected function getLatestInvalidationTimestamp($cid, $resource_name = null, $cache_id = null, $compile_id = null, $resource_uid = null)
-    {
-        // abort if there is no CacheID
-        if (false && !$cid) {
-            return 0;
-        }
-        // abort if there are no InvalidationKeys to check
-        if (!($_cid = $this->listInvalidationKeys($cid, $resource_name, $cache_id, $compile_id, $resource_uid))) {
-            return 0;
-        }
-
-        // there are no InValidationKeys
-        if (!($values = $this->read($_cid))) {
-            return 0;
-        }
-        // make sure we're dealing with floats
-        $values = array_map('floatval', $values);
-
-        return max($values);
-    }
-
-    /**
-     * Translate a CacheID into the list of applicable InvalidationKeys.
-     * Splits "some|chain|into|an|array" into array( '#clearAll#', 'some', 'some|chain', 'some|chain|into', ... )
-     *
-     * @param  string $cid           CacheID to translate
-     * @param  string $resource_name template name
-     * @param  string $cache_id      cache id
-     * @param  string $compile_id    compile id
-     * @param  string $resource_uid  source's filepath
-     *
-     * @return array  list of InvalidationKeys
-     * @uses $invalidationKeyPrefix to prepend to each InvalidationKey
-     */
-    protected function listInvalidationKeys($cid, $resource_name = null, $cache_id = null, $compile_id = null, $resource_uid = null)
-    {
-        $t = array('IVK#ALL');
-        $_name = $_compile = '#';
-        if ($resource_name) {
-            $_name .= $resource_uid . '#' . $this->sanitize($resource_name);
-            $t[] = 'IVK#TEMPLATE' . $_name;
-        }
-        if ($compile_id) {
-            $_compile .= $this->sanitize($compile_id);
-            $t[] = 'IVK#COMPILE' . $_compile;
-        }
-        $_name .= '#';
-        // some poeple smoke bad weed
-        $cid = trim($cache_id, '|');
-        if (!$cid) {
-            return $t;
-        }
-        $i = 0;
-        while (true) {
-            // determine next delimiter position
-            $i = strpos($cid, '|', $i);
-            // add complete CacheID if there are no more delimiters
-            if ($i === false) {
-                $t[] = 'IVK#CACHE#' . $cid;
-                $t[] = 'IVK#CID' . $_name . $cid . $_compile;
-                $t[] = 'IVK#CID' . $_name . $_compile;
-                break;
-            }
-            $part = substr($cid, 0, $i);
-            // add slice to list
-            $t[] = 'IVK#CACHE#' . $part;
-            $t[] = 'IVK#CID' . $_name . $part . $_compile;
-            // skip past delimiter position
-            $i ++;
-        }
-
-        return $t;
-    }
-
-    /**
-     * Check is cache is locked for this template
-     *
-     * @param  Smarty                 $smarty Smarty object
-     * @param  Smarty_Template_Cached $cached cached object
-     *
-     * @return boolean               true or false if cache is locked
-     */
-    public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
-    {
-        $key = 'LOCK#' . $cached->filepath;
-        $data = $this->read(array($key));
-
-        return $data && time() - $data[$key] < $smarty->locking_timeout;
-    }
-
-    /**
-     * Lock cache for this template
-     *
-     * @param Smarty                 $smarty Smarty object
-     * @param Smarty_Template_Cached $cached cached object
-     *
-     * @return bool|void
-     */
-    public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
-    {
-        $cached->is_locked = true;
-        $key = 'LOCK#' . $cached->filepath;
-        $this->write(array($key => time()), $smarty->locking_timeout);
-    }
-
-    /**
-     * Unlock cache for this template
-     *
-     * @param Smarty                 $smarty Smarty object
-     * @param Smarty_Template_Cached $cached cached object
-     *
-     * @return bool|void
-     */
-    public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
-    {
-        $cached->is_locked = false;
-        $key = 'LOCK#' . $cached->filepath;
-        $this->delete(array($key));
-    }
-
-    /**
-     * Read values for a set of keys from cache
-     *
-     * @param  array $keys list of keys to fetch
-     *
-     * @return array list of values with the given keys used as indexes
-     */
-    abstract protected function read(array $keys);
-
-    /**
-     * Save values for a set of keys to cache
-     *
-     * @param  array $keys   list of values to save
-     * @param  int   $expire expiration time
-     *
-     * @return boolean true on success, false on failure
-     */
-    abstract protected function write(array $keys, $expire = null);
-
-    /**
-     * Remove values from cache
-     *
-     * @param  array $keys list of keys to delete
-     *
-     * @return boolean true on success, false on failure
-     */
-    abstract protected function delete(array $keys);
-
-    /**
-     * Remove *all* values from cache
-     *
-     * @return boolean true on success, false on failure
-     */
-    protected function purge()
-    {
-        return false;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_data.php b/www/smarty-3.1.27/sysplugins/smarty_data.php
deleted file mode 100644
index 8074513d..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_data.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Smarty Plugin Data
- * This file contains the data object
- *
- * @package    Smarty
- * @subpackage Template
- * @author     Uwe Tews
- */
-
-/**
- * class for the Smarty data object
- * The Smarty data object will hold Smarty variables in the current scope
- *
- * @package    Smarty
- * @subpackage Template
- */
-class Smarty_Data extends Smarty_Internal_Data
-{
-    /**
-     * Counter
-     *
-     * @var int
-     */
-    static $count = 0;
-
-    /**
-     * Data block name
-     *
-     * @var string
-     */
-    public $dataObjectName = '';
-    /**
-     * Smarty object
-     *
-     * @var Smarty
-     */
-    public $smarty = null;
-
-    /**
-     * create Smarty data object
-     *
-     * @param Smarty|array                    $_parent parent template
-     * @param Smarty|Smarty_Internal_Template $smarty  global smarty instance
-     * @param string                          $name    optional data block name
-     *
-     * @throws SmartyException
-     */
-    public function __construct($_parent = null, $smarty = null, $name = null)
-    {
-        self::$count ++;
-        $this->dataObjectName = 'Data_object ' . (isset($name) ? "'{$name}'" : self::$count);
-        $this->smarty = $smarty;
-        if (is_object($_parent)) {
-            // when object set up back pointer
-            $this->parent = $_parent;
-        } elseif (is_array($_parent)) {
-            // set up variable values
-            foreach ($_parent as $_key => $_val) {
-                $this->tpl_vars[$_key] = new Smarty_Variable($_val);
-            }
-        } elseif ($_parent != null) {
-            throw new SmartyException("Wrong type for template variables");
-        }
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_cacheresource_file.php b/www/smarty-3.1.27/sysplugins/smarty_internal_cacheresource_file.php
deleted file mode 100644
index de794517..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_cacheresource_file.php
+++ /dev/null
@@ -1,320 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin CacheResource File
- *
- * @package    Smarty
- * @subpackage Cacher
- * @author     Uwe Tews
- * @author     Rodney Rehm
- */
-
-/**
- * This class does contain all necessary methods for the HTML cache on file system
- * Implements the file system as resource for the HTML cache Version ussing nocache inserts.
- *
- * @package    Smarty
- * @subpackage Cacher
- */
-class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
-{
-    /**
-     * populate Cached Object with meta data from Resource
-     *
-     * @param Smarty_Template_Cached   $cached    cached object
-     * @param Smarty_Internal_Template $_template template object
-     *
-     * @return void
-     */
-    public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template)
-    {
-        $_source_file_path = str_replace(':', '.', $_template->source->filepath);
-        $_cache_id = isset($_template->cache_id) ? preg_replace('![^\w\|]+!', '_', $_template->cache_id) : null;
-        $_compile_id = isset($_template->compile_id) ? preg_replace('![^\w\|]+!', '_', $_template->compile_id) : null;
-        $_filepath = $_template->source->uid;
-        // if use_sub_dirs, break file into directories
-        if ($_template->smarty->use_sub_dirs) {
-            $_filepath = substr($_filepath, 0, 2) . DS
-                . substr($_filepath, 2, 2) . DS
-                . substr($_filepath, 4, 2) . DS
-                . $_filepath;
-        }
-        $_compile_dir_sep = $_template->smarty->use_sub_dirs ? DS : '^';
-        if (isset($_cache_id)) {
-            $_cache_id = str_replace('|', $_compile_dir_sep, $_cache_id) . $_compile_dir_sep;
-        } else {
-            $_cache_id = '';
-        }
-        if (isset($_compile_id)) {
-            $_compile_id = $_compile_id . $_compile_dir_sep;
-        } else {
-            $_compile_id = '';
-        }
-        $_cache_dir = $_template->smarty->getCacheDir();
-        if ($_template->smarty->cache_locking) {
-            // create locking file name
-            // relative file name?
-            if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_cache_dir)) {
-                $_lock_dir = rtrim(getcwd(), '/\\') . DS . $_cache_dir;
-            } else {
-                $_lock_dir = $_cache_dir;
-            }
-            $cached->lock_id = $_lock_dir . sha1($_cache_id . $_compile_id . $_template->source->uid) . '.lock';
-        }
-        $cached->filepath = $_cache_dir . $_cache_id . $_compile_id . $_filepath . '.' . basename($_source_file_path) . '.php';
-        $cached->timestamp = $cached->exists = is_file($cached->filepath);
-        if ($cached->exists) {
-            $cached->timestamp = filemtime($cached->filepath);
-        }
-    }
-
-    /**
-     * populate Cached Object with timestamp and exists from Resource
-     *
-     * @param Smarty_Template_Cached $cached cached object
-     *
-     * @return void
-     */
-    public function populateTimestamp(Smarty_Template_Cached $cached)
-    {
-        $cached->timestamp = $cached->exists = is_file($cached->filepath);
-        if ($cached->exists) {
-            $cached->timestamp = filemtime($cached->filepath);
-        }
-    }
-
-    /**
-     * Read the cached template and process its header
-     *
-     * @param Smarty_Internal_Template $_template template object
-     * @param Smarty_Template_Cached   $cached    cached object
-     *
-     * @return booleantrue or false if the cached content does not exist
-     */
-    public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null)
-    {
-        /** @var Smarty_Internal_Template $_smarty_tpl
-         * used in included file
-         */
-        $_smarty_tpl = $_template;
-
-        return @include $_template->cached->filepath;
-    }
-
-    /**
-     * Write the rendered template output to cache
-     *
-     * @param Smarty_Internal_Template $_template template object
-     * @param string                   $content   content to cache
-     *
-     * @return boolean success
-     */
-    public function writeCachedContent(Smarty_Internal_Template $_template, $content)
-    {
-        $obj = new Smarty_Internal_Write_File();
-        if ($obj->writeFile($_template->cached->filepath, $content, $_template->smarty) === true) {
-            $cached = $_template->cached;
-            $cached->timestamp = $cached->exists = is_file($cached->filepath);
-            if ($cached->exists) {
-                $cached->timestamp = filemtime($cached->filepath);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Read cached template from cache
-     *
-     * @param  Smarty_Internal_Template $_template template object
-     *
-     * @return string  content
-     */
-    public function readCachedContent(Smarty_Internal_Template $_template)
-    {
-        if (is_file($_template->cached->filepath)) {
-            return file_get_contents($_template->cached->filepath);
-        }
-        return false;
-    }
-
-    /**
-     * Empty cache
-     *
-     * @param Smarty  $smarty
-     * @param integer $exp_time expiration time (number of seconds, not timestamp)
-     *
-     * @return integer number of cache files deleted
-     */
-    public function clearAll(Smarty $smarty, $exp_time = null)
-    {
-        return $this->clear($smarty, null, null, null, $exp_time);
-    }
-
-    /**
-     * Empty cache for a specific template
-     *
-     * @param Smarty  $smarty
-     * @param string  $resource_name template name
-     * @param string  $cache_id      cache id
-     * @param string  $compile_id    compile id
-     * @param integer $exp_time      expiration time (number of seconds, not timestamp)
-     *
-     * @return integer number of cache files deleted
-     */
-    public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
-    {
-        $_cache_id = isset($cache_id) ? preg_replace('![^\w\|]+!', '_', $cache_id) : null;
-        $_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null;
-        $_dir_sep = $smarty->use_sub_dirs ? '/' : '^';
-        $_compile_id_offset = $smarty->use_sub_dirs ? 3 : 0;
-        $_dir = realpath($smarty->getCacheDir()) . '/';
-        if ($_dir == '/') { //We should never want to delete this!
-            return 0;
-        }
-        $_dir_length = strlen($_dir);
-        if (isset($_cache_id)) {
-            $_cache_id_parts = explode('|', $_cache_id);
-            $_cache_id_parts_count = count($_cache_id_parts);
-            if ($smarty->use_sub_dirs) {
-                foreach ($_cache_id_parts as $id_part) {
-                    $_dir .= $id_part . DS;
-                }
-            }
-        }
-        if (isset($resource_name)) {
-            $_save_stat = $smarty->caching;
-            $smarty->caching = true;
-            $tpl = new $smarty->template_class($resource_name, $smarty);
-            $smarty->caching = $_save_stat;
-
-            // remove from template cache
-            $tpl->source; // have the template registered before unset()
-            if ($smarty->allow_ambiguous_resources) {
-                $_templateId = $tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id;
-            } else {
-                $_templateId = $smarty->joined_template_dir . '#' . $resource_name . $tpl->cache_id . $tpl->compile_id;
-            }
-            if (isset($_templateId[150])) {
-                $_templateId = sha1($_templateId);
-            }
-            unset($smarty->template_objects[$_templateId]);
-
-            if ($tpl->source->exists) {
-                $_resourcename_parts = basename(str_replace('^', '/', $tpl->cached->filepath));
-            } else {
-                return 0;
-            }
-        }
-        $_count = 0;
-        $_time = time();
-        if (file_exists($_dir)) {
-            $_cacheDirs = new RecursiveDirectoryIterator($_dir);
-            $_cache = new RecursiveIteratorIterator($_cacheDirs, RecursiveIteratorIterator::CHILD_FIRST);
-            foreach ($_cache as $_file) {
-                if (substr(basename($_file->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false) {
-                    continue;
-                }
-                // directory ?
-                if ($_file->isDir()) {
-                    if (!$_cache->isDot()) {
-                        // delete folder if empty
-                        @rmdir($_file->getPathname());
-                    }
-                } else {
-                    $_parts = explode($_dir_sep, str_replace('\\', '/', substr((string) $_file, $_dir_length)));
-                    $_parts_count = count($_parts);
-                    // check name
-                    if (isset($resource_name)) {
-                        if ($_parts[$_parts_count - 1] != $_resourcename_parts) {
-                            continue;
-                        }
-                    }
-                    // check compile id
-                    if (isset($_compile_id) && (!isset($_parts[$_parts_count - 2 - $_compile_id_offset]) || $_parts[$_parts_count - 2 - $_compile_id_offset] != $_compile_id)) {
-                        continue;
-                    }
-                    // check cache id
-                    if (isset($_cache_id)) {
-                        // count of cache id parts
-                        $_parts_count = (isset($_compile_id)) ? $_parts_count - 2 - $_compile_id_offset : $_parts_count - 1 - $_compile_id_offset;
-                        if ($_parts_count < $_cache_id_parts_count) {
-                            continue;
-                        }
-                        for ($i = 0; $i < $_cache_id_parts_count; $i ++) {
-                            if ($_parts[$i] != $_cache_id_parts[$i]) {
-                                continue 2;
-                            }
-                        }
-                    }
-                    // expired ?
-                    if (isset($exp_time)) {
-                        if ($exp_time < 0) {
-                            preg_match('#\'cache_lifetime\' =>\s*(\d*)#', file_get_contents($_file), $match);
-                            if ($_time < (@filemtime($_file) + $match[1])) {
-                                continue;
-                            }
-                        } else {
-                            if ($_time - @filemtime($_file) < $exp_time) {
-                                continue;
-                            }
-                        }
-                    }
-                    $_count += @unlink((string) $_file) ? 1 : 0;
-                }
-            }
-        }
-
-        return $_count;
-    }
-
-    /**
-     * Check is cache is locked for this template
-     *
-     * @param Smarty                 $smarty Smarty object
-     * @param Smarty_Template_Cached $cached cached object
-     *
-     * @return boolean true or false if cache is locked
-     */
-    public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
-    {
-        if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
-            clearstatcache(true, $cached->lock_id);
-        } else {
-            clearstatcache();
-        }
-        if (is_file($cached->lock_id)) {
-            $t = @filemtime($cached->lock_id);
-            return $t && (time() - $t < $smarty->locking_timeout);
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Lock cache for this template
-     *
-     * @param Smarty                 $smarty Smarty object
-     * @param Smarty_Template_Cached $cached cached object
-     *
-     * @return bool|void
-     */
-    public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
-    {
-        $cached->is_locked = true;
-        touch($cached->lock_id);
-    }
-
-    /**
-     * Unlock cache for this template
-     *
-     * @param Smarty                 $smarty Smarty object
-     * @param Smarty_Template_Cached $cached cached object
-     *
-     * @return bool|void
-     */
-    public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
-    {
-        $cached->is_locked = false;
-        @unlink($cached->lock_id);
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_append.php b/www/smarty-3.1.27/sysplugins/smarty_internal_compile_append.php
deleted file mode 100644
index cbf65685..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_append.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Append
- * Compiles the {append} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Append Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Append extends Smarty_Internal_Compile_Assign
-{
-    /**
-     * Compiles code for the {append} tag
-     *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        // the following must be assigned at runtime because it will be overwritten in parent class
-        $this->required_attributes = array('var', 'value');
-        $this->shorttag_order = array('var', 'value');
-        $this->optional_attributes = array('scope', 'index');
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        // map to compile assign attributes
-        if (isset($_attr['index'])) {
-            $_params['smarty_internal_index'] = '[' . $_attr['index'] . ']';
-            unset($_attr['index']);
-        } else {
-            $_params['smarty_internal_index'] = '[]';
-        }
-        $_new_attr = array();
-        foreach ($_attr as $key => $value) {
-            $_new_attr[] = array($key => $value);
-        }
-        // call compile assign
-        return parent::compile($_new_attr, $compiler, $_params);
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_assign.php b/www/smarty-3.1.27/sysplugins/smarty_internal_compile_assign.php
deleted file mode 100644
index bdce0c3f..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_assign.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Assign
- * Compiles the {assign} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Assign Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Assign extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {assign} tag
-     *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        // the following must be assigned at runtime because it will be overwritten in Smarty_Internal_Compile_Append
-        $this->required_attributes = array('var', 'value');
-        $this->shorttag_order = array('var', 'value');
-        $this->optional_attributes = array('scope');
-        $_nocache = 'null';
-        $_scope = Smarty::SCOPE_LOCAL;
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        // nocache ?
-        if ($compiler->tag_nocache || $compiler->nocache) {
-            $_nocache = 'true';
-            // create nocache var to make it know for further compiling
-            if (isset($compiler->template->tpl_vars[trim($_attr['var'], "'")])) {
-                $compiler->template->tpl_vars[trim($_attr['var'], "'")]->nocache = true;
-            } else {
-                $compiler->template->tpl_vars[trim($_attr['var'], "'")] = new Smarty_Variable(null, true);
-            }
-        }
-        // scope setup
-        if (isset($_attr['scope'])) {
-            $_attr['scope'] = trim($_attr['scope'], "'\"");
-            if ($_attr['scope'] == 'parent') {
-                $_scope = Smarty::SCOPE_PARENT;
-            } elseif ($_attr['scope'] == 'root') {
-                $_scope = Smarty::SCOPE_ROOT;
-            } elseif ($_attr['scope'] == 'global') {
-                $_scope = Smarty::SCOPE_GLOBAL;
-            } else {
-                $compiler->trigger_template_error('illegal value for "scope" attribute', $compiler->lex->taglineno);
-            }
-        }
-        // compiled output
-        if (isset($parameter['smarty_internal_index'])) {
-            $output = "<?php \$_smarty_tpl->createLocalArrayVariable($_attr[var], $_nocache, $_scope);\n\$_smarty_tpl->tpl_vars[$_attr[var]]->value$parameter[smarty_internal_index] = $_attr[value];";
-        } else {
-            // implement Smarty2's behaviour of variables assigned by reference
-            if ($compiler->template->smarty instanceof SmartyBC) {
-                $output = "<?php if (isset(\$_smarty_tpl->tpl_vars[$_attr[var]])) {\$_smarty_tpl->tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]];";
-                $output .= "\n\$_smarty_tpl->tpl_vars[$_attr[var]]->value = $_attr[value]; \$_smarty_tpl->tpl_vars[$_attr[var]]->nocache = $_nocache; \$_smarty_tpl->tpl_vars[$_attr[var]]->scope = $_scope;";
-                $output .= "\n} else \$_smarty_tpl->tpl_vars[$_attr[var]] = new Smarty_Variable($_attr[value], $_nocache, $_scope);";
-            } else {
-                $output = "<?php \$_smarty_tpl->tpl_vars[$_attr[var]] = new Smarty_Variable($_attr[value], $_nocache, $_scope);";
-            }
-        }
-        if ($_scope == Smarty::SCOPE_PARENT) {
-            $output .= "\nif (\$_smarty_tpl->parent != null) \$_smarty_tpl->parent->tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]];";
-        } elseif ($_scope == Smarty::SCOPE_ROOT || $_scope == Smarty::SCOPE_GLOBAL) {
-            $output .= "\n\$_ptr = \$_smarty_tpl->parent; while (\$_ptr != null) {\$_ptr->tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]]; \$_ptr = \$_ptr->parent; }";
-        }
-        if ($_scope == Smarty::SCOPE_GLOBAL) {
-            $output .= "\nSmarty::\$global_tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]];";
-        }
-        $output .= '?>';
-
-        return $output;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_block.php b/www/smarty-3.1.27/sysplugins/smarty_internal_compile_block.php
deleted file mode 100644
index 93c90a91..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_block.php
+++ /dev/null
@@ -1,443 +0,0 @@
-<?php
-
-/**
- * Smarty Internal Plugin Compile Block
- * Compiles the {block}{/block} tags
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Block Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Block extends Smarty_Internal_CompileBase
-{
-
-    const parent = '____SMARTY_BLOCK_PARENT____';
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('name');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('name');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $option_flags = array('hide', 'append', 'prepend', 'nocache');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('internal_file', 'internal_uid', 'internal_line');
-    /**
-     * nested child block names
-     *
-     * @var array
-     */
-    public static $nested_block_names = array();
-
-    /**
-     * child block source buffer
-     *
-     * @var array
-     */
-    public static $block_data = array();
-
-    /**
-     * Compiles code for the {block} tag
-     *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     *
-     * @return boolean true
-     */
-    public function compile($args, $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $_name = trim($_attr['name'], "\"'");
-
-        // existing child must override parent settings
-        if (isset($compiler->template->block_data[$_name]) && $compiler->template->block_data[$_name]['mode'] == 'replace') {
-            $_attr['append'] = false;
-            $_attr['prepend'] = false;
-        }
-
-        // check if we process an inheritance child template
-        if ($compiler->inheritance_child) {
-            array_unshift(self::$nested_block_names, $_name);
-            // build {block} for child block
-            self::$block_data[$_name]['source'] =
-                "{$compiler->smarty->left_delimiter}private_child_block name={$_attr['name']} file='{$compiler->template->source->filepath}' type='{$compiler->template->source->type}' resource='{$compiler->template->template_resource}'" .
-                " uid='{$compiler->template->source->uid}' line={$compiler->lex->line}";
-            if ($_attr['nocache']) {
-                self::$block_data[$_name]['source'] .= ' nocache';
-            }
-            self::$block_data[$_name]['source'] .= $compiler->smarty->right_delimiter;
-
-            $save = array($_attr, $compiler->inheritance);
-            $this->openTag($compiler, 'block', $save);
-            // set flag for {block} tag
-            $compiler->inheritance = true;
-            $compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBLOCK);
-            $compiler->has_code = false;
-            return;
-        }
-        // must merge includes
-        if ($_attr['nocache'] == true) {
-            $compiler->tag_nocache = true;
-        }
-        $save = array($_attr, $compiler->inheritance, $compiler->parser->current_buffer, $compiler->nocache);
-        $this->openTag($compiler, 'block', $save);
-        $compiler->inheritance = true;
-        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-
-        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template($compiler->parser);
-        $compiler->has_code = false;
-
-        return true;
-    }
-
-    /**
-     * Compile saved child block source
-     *
-     * @param object $compiler compiler object
-     * @param string $_name    optional name of child block
-     *
-     * @return string   compiled code of child block
-     */
-    static function compileChildBlock($compiler, $_name = null)
-    {
-        if ($compiler->inheritance_child) {
-            $name1 = Smarty_Internal_Compile_Block::$nested_block_names[0];
-            if (isset($compiler->template->block_data[$name1])) {
-                //  replace inner block name with generic
-                Smarty_Internal_Compile_Block::$block_data[$name1]['source'] .= $compiler->template->block_data[$name1]['source'];
-                Smarty_Internal_Compile_Block::$block_data[$name1]['child'] = true;
-            }
-            $compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBLOCK);
-            $compiler->has_code = false;
-            return;
-        }
-        // if called by {$smarty.block.child} we must search the name of enclosing {block}
-        if ($_name == null) {
-            $stack_count = count($compiler->_tag_stack);
-            while (-- $stack_count >= 0) {
-                if ($compiler->_tag_stack[$stack_count][0] == 'block') {
-                    $_name = trim($compiler->_tag_stack[$stack_count][1][0]['name'], "\"'");
-                    break;
-                }
-            }
-        }
-        if ($_name == null) {
-            $compiler->trigger_template_error(' tag {$smarty.block.child} used outside {block} tags ', $compiler->lex->taglineno);
-        }
-        // undefined child?
-        if (!isset($compiler->template->block_data[$_name]['source'])) {
-            $compiler->popTrace();
-            return '';
-        }
-        // flag that child is already compile by {$smarty.block.child} inclusion
-        $compiler->template->block_data[$_name]['compiled'] = true;
-        $_tpl = new Smarty_Internal_template('string:' . $compiler->template->block_data[$_name]['source'], $compiler->smarty, $compiler->template, $compiler->template->cache_id,
-                                             $compiler->template->compile_id, $compiler->template->caching, $compiler->template->cache_lifetime);
-        if ($compiler->smarty->debugging) {
-            Smarty_Internal_Debug::ignore($_tpl);
-        }
-        $_tpl->tpl_vars = $compiler->template->tpl_vars;
-        $_tpl->variable_filters = $compiler->template->variable_filters;
-        $_tpl->properties['nocache_hash'] = $compiler->template->properties['nocache_hash'];
-        $_tpl->allow_relative_path = true;
-        $_tpl->compiler->inheritance = true;
-        $_tpl->compiler->suppressHeader = true;
-        $_tpl->compiler->suppressFilter = true;
-        $_tpl->compiler->suppressTemplatePropertyHeader = true;
-        $nocache = $compiler->nocache || $compiler->tag_nocache;
-        if (strpos($compiler->template->block_data[$_name]['source'], self::parent) !== false) {
-            $_output = str_replace(self::parent, $compiler->parser->current_buffer->to_smarty_php(), $_tpl->compiler->compileTemplate($_tpl, $nocache, $compiler->parent_compiler));
-        } elseif ($compiler->template->block_data[$_name]['mode'] == 'prepend') {
-            $_output = $_tpl->compiler->compileTemplate($_tpl, $nocache, $compiler->parent_compiler) . $compiler->parser->current_buffer->to_smarty_php();
-        } elseif ($compiler->template->block_data[$_name]['mode'] == 'append') {
-            $_output = $compiler->parser->current_buffer->to_smarty_php() . $_tpl->compiler->compileTemplate($_tpl, $nocache, $compiler->parent_compiler);
-        } elseif (!empty($compiler->template->block_data[$_name])) {
-            $_output = $_tpl->compiler->compileTemplate($_tpl, $nocache, $compiler->parent_compiler);
-        }
-        $compiler->template->properties['file_dependency'] = array_merge($compiler->template->properties['file_dependency'], $_tpl->properties['file_dependency']);
-        $compiler->template->properties['tpl_function'] = array_merge($compiler->template->properties['tpl_function'], $_tpl->properties['tpl_function']);
-        $compiler->template->variable_filters = $_tpl->variable_filters;
-        if ($_tpl->has_nocache_code) {
-            $compiler->template->has_nocache_code = true;
-        }
-        foreach ($_tpl->required_plugins as $key => $tmp1) {
-            if ($compiler->nocache && $compiler->template->caching) {
-                $code = 'nocache';
-            } else {
-                $code = $key;
-            }
-            foreach ($tmp1 as $name => $tmp) {
-                foreach ($tmp as $type => $data) {
-                    $compiler->template->required_plugins[$code][$name][$type] = $data;
-                }
-            }
-        }
-        unset($_tpl);
-        $compiler->has_code = true;
-        return $_output;
-    }
-
-    /**
-     * Compile $smarty.block.parent
-     *
-     * @param object $compiler compiler object
-     * @param string $_name    optional name of child block
-     *
-     * @return string   compiled code of child block
-     */
-    static function compileParentBlock($compiler, $_name = null)
-    {
-        // if called by {$smarty.block.parent} we must search the name of enclosing {block}
-        if ($_name == null) {
-            $stack_count = count($compiler->_tag_stack);
-            while (-- $stack_count >= 0) {
-                if ($compiler->_tag_stack[$stack_count][0] == 'block') {
-                    $_name = trim($compiler->_tag_stack[$stack_count][1][0]['name'], "\"'");
-                    break;
-                }
-            }
-        }
-        if ($_name == null) {
-            $compiler->trigger_template_error(' tag {$smarty.block.parent} used outside {block} tags ', $compiler->lex->taglineno);
-        }
-        if (empty(Smarty_Internal_Compile_Block::$nested_block_names)) {
-            $compiler->trigger_template_error(' illegal {$smarty.block.parent} in parent template ', $compiler->lex->taglineno);
-        }
-        Smarty_Internal_Compile_Block::$block_data[Smarty_Internal_Compile_Block::$nested_block_names[0]]['source'] .= Smarty_Internal_Compile_Block::parent;
-        $compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBLOCK);
-        $compiler->has_code = false;
-        return;
-    }
-
-    /**
-     * Process block source
-     *
-     * @param        $compiler
-     * @param string $source source text
-     */
-    static function blockSource($compiler, $source)
-    {
-        Smarty_Internal_Compile_Block::$block_data[Smarty_Internal_Compile_Block::$nested_block_names[0]]['source'] .= $source;
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile BlockClose Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {/block} tag
-     *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        $compiler->has_code = true;
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $saved_data = $this->closeTag($compiler, array('block'));
-        $_name = trim($saved_data[0]['name'], "\"'");
-        // reset flag for {block} tag
-        $compiler->inheritance = $saved_data[1];
-        // check if we process an inheritance child template
-        if ($compiler->inheritance_child) {
-            $name1 = Smarty_Internal_Compile_Block::$nested_block_names[0];
-            Smarty_Internal_Compile_Block::$block_data[$name1]['source'] .= "{$compiler->smarty->left_delimiter}/private_child_block{$compiler->smarty->right_delimiter}";
-            array_shift(Smarty_Internal_Compile_Block::$nested_block_names);
-            if (!empty(Smarty_Internal_Compile_Block::$nested_block_names)) {
-                $name2 = Smarty_Internal_Compile_Block::$nested_block_names[0];
-                if (isset($compiler->template->block_data[$name1]) || !$saved_data[0]['hide']) {
-                    if (isset(Smarty_Internal_Compile_Block::$block_data[$name1]['child']) || !isset($compiler->template->block_data[$name1])) {
-                        Smarty_Internal_Compile_Block::$block_data[$name2]['source'] .= Smarty_Internal_Compile_Block::$block_data[$name1]['source'];
-                    } else {
-                        if ($compiler->template->block_data[$name1]['mode'] == 'append') {
-                            Smarty_Internal_Compile_Block::$block_data[$name2]['source'] .= Smarty_Internal_Compile_Block::$block_data[$name1]['source'] . $compiler->template->block_data[$name1]['source'];
-                        } elseif ($compiler->template->block_data[$name1]['mode'] == 'prepend') {
-                            Smarty_Internal_Compile_Block::$block_data[$name2]['source'] .= $compiler->template->block_data[$name1]['source'] . Smarty_Internal_Compile_Block::$block_data[$name1]['source'];
-                        } else {
-                            Smarty_Internal_Compile_Block::$block_data[$name2]['source'] .= $compiler->template->block_data[$name1]['source'];
-                        }
-                    }
-                }
-                unset(Smarty_Internal_Compile_Block::$block_data[$name1]);
-                $compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBLOCK);
-            } else {
-                if (isset($compiler->template->block_data[$name1]) || !$saved_data[0]['hide']) {
-                    if (isset($compiler->template->block_data[$name1]) && !isset(Smarty_Internal_Compile_Block::$block_data[$name1]['child'])) {
-                        if (strpos($compiler->template->block_data[$name1]['source'], Smarty_Internal_Compile_Block::parent) !== false) {
-                            $compiler->template->block_data[$name1]['source'] =
-                                str_replace(Smarty_Internal_Compile_Block::parent, Smarty_Internal_Compile_Block::$block_data[$name1]['source'], $compiler->template->block_data[$name1]['source']);
-                        } elseif ($compiler->template->block_data[$name1]['mode'] == 'prepend') {
-                            $compiler->template->block_data[$name1]['source'] .= Smarty_Internal_Compile_Block::$block_data[$name1]['source'];
-                        } elseif ($compiler->template->block_data[$name1]['mode'] == 'append') {
-                            $compiler->template->block_data[$name1]['source'] = Smarty_Internal_Compile_Block::$block_data[$name1]['source'] . $compiler->template->block_data[$name1]['source'];
-                        }
-                    } else {
-                        $compiler->template->block_data[$name1]['source'] = Smarty_Internal_Compile_Block::$block_data[$name1]['source'];
-                    }
-                    $compiler->template->block_data[$name1]['mode'] = 'replace';
-                    if ($saved_data[0]['append']) {
-                        $compiler->template->block_data[$name1]['mode'] = 'append';
-                    }
-                    if ($saved_data[0]['prepend']) {
-                        $compiler->template->block_data[$name1]['mode'] = 'prepend';
-                    }
-                }
-                unset(Smarty_Internal_Compile_Block::$block_data[$name1]);
-                $compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBODY);
-            }
-            $compiler->has_code = false;
-            return;
-        }
-        if (isset($compiler->template->block_data[$_name]) && !isset($compiler->template->block_data[$_name]['compiled'])) {
-            $_output = Smarty_Internal_Compile_Block::compileChildBlock($compiler, $_name);
-        } else {
-            if ($saved_data[0]['hide'] && !isset($compiler->template->block_data[$_name]['source'])) {
-                $_output = '';
-            } else {
-                $_output = $compiler->parser->current_buffer->to_smarty_php();
-            }
-        }
-        if (isset($compiler->template->block_data[$_name]['compiled'])) {
-            unset($compiler->template->block_data[$_name]['compiled']);
-        }
-        // reset flags
-        $compiler->parser->current_buffer = $saved_data[2];
-        if ($compiler->nocache) {
-            $compiler->tag_nocache = true;
-        }
-        $compiler->nocache = $saved_data[3];
-        // $_output content has already nocache code processed
-        $compiler->suppressNocacheProcessing = true;
-
-        return $_output;
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Child Block Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Child_Block extends Smarty_Internal_CompileBase
-{
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('name', 'file', 'uid', 'line', 'type', 'resource');
-
-    /**
-     * Compiles code for the {private_child_block} tag
-     *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     *
-     * @return boolean true
-     */
-    public function compile($args, $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        // update template with original template resource of {block}
-        if (trim($_attr['type'], "'") == 'file') {
-            $compiler->template->template_resource = 'file:' . realpath(trim($_attr['file'], "'"));
-        } else {
-            $compiler->template->template_resource = trim($_attr['resource'], "'");
-        }
-        // source object
-        unset ($compiler->template->source);
-        $exists = $compiler->template->source->exists;
-
-        // must merge includes
-        if ($_attr['nocache'] == true) {
-            $compiler->tag_nocache = true;
-        }
-        $save = array($_attr, $compiler->nocache);
-
-        // set trace back to child block
-        $compiler->pushTrace(trim($_attr['file'], "\"'"), trim($_attr['uid'], "\"'"), $_attr['line'] - $compiler->lex->line);
-
-        $this->openTag($compiler, 'private_child_block', $save);
-
-        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-        $compiler->has_code = false;
-
-        return true;
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Child Block Close Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Child_Blockclose extends Smarty_Internal_CompileBase
-{
-
-    /**
-     * Compiles code for the {/private_child_block} tag
-     *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     *
-     * @return boolean true
-     */
-    public function compile($args, $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        $saved_data = $this->closeTag($compiler, array('private_child_block'));
-
-        // end of child block
-        $compiler->popTrace();
-
-        $compiler->nocache = $saved_data[1];
-        $compiler->has_code = false;
-
-        return true;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_break.php b/www/smarty-3.1.27/sysplugins/smarty_internal_compile_break.php
deleted file mode 100644
index b51e9e8f..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_break.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Break
- * Compiles the {break} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Break Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('levels');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('levels');
-
-    /**
-     * Compiles code for the {break} tag
-     *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        static $_is_loopy = array('for' => true, 'foreach' => true, 'while' => true, 'section' => true);
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
-        }
-
-        if (isset($_attr['levels'])) {
-            if (!is_numeric($_attr['levels'])) {
-                $compiler->trigger_template_error('level attribute must be a numeric constant', $compiler->lex->taglineno);
-            }
-            $_levels = $_attr['levels'];
-        } else {
-            $_levels = 1;
-        }
-        $level_count = $_levels;
-        $stack_count = count($compiler->_tag_stack) - 1;
-        while ($level_count > 0 && $stack_count >= 0) {
-            if (isset($_is_loopy[$compiler->_tag_stack[$stack_count][0]])) {
-                $level_count --;
-            }
-            $stack_count --;
-        }
-        if ($level_count != 0) {
-            $compiler->trigger_template_error("cannot break {$_levels} level(s)", $compiler->lex->taglineno);
-        }
-
-        return "<?php break {$_levels};?>";
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_call.php b/www/smarty-3.1.27/sysplugins/smarty_internal_compile_call.php
deleted file mode 100644
index 05420fa5..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_call.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Function_Call
- * Compiles the calls of user defined tags defined by {function}
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Function_Call Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('name');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('name');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('_any');
-
-    /**
-     * Compiles the calls of user defined tags defined by {function}
-     *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        // save possible attributes
-        if (isset($_attr['assign'])) {
-            // output will be stored in a smarty variable instead of being displayed
-            $_assign = $_attr['assign'];
-        }
-        //$_name = trim($_attr['name'], "'\"");
-        $_name = $_attr['name'];
-        unset($_attr['name'], $_attr['assign'], $_attr['nocache']);
-        // set flag (compiled code of {function} must be included in cache file
-        if (!$compiler->template->caching || $compiler->nocache || $compiler->tag_nocache) {
-            $_nocache = 'true';
-        } else {
-            $_nocache = 'false';
-        }
-        $_paramsArray = array();
-        foreach ($_attr as $_key => $_value) {
-            if (is_int($_key)) {
-                $_paramsArray[] = "$_key=>$_value";
-            } else {
-                $_paramsArray[] = "'$_key'=>$_value";
-            }
-        }
-        $_params = 'array(' . implode(",", $_paramsArray) . ')';
-        //$compiler->suppressNocacheProcessing = true;
-        // was there an assign attribute
-        if (isset($_assign)) {
-            $_output = "<?php ob_start();\$_smarty_tpl->callTemplateFunction ({$_name}, \$_smarty_tpl, {$_params}, {$_nocache}); \$_smarty_tpl->assign({$_assign}, ob_get_clean());?>\n";
-        } else {
-            $_output = "<?php \$_smarty_tpl->callTemplateFunction ({$_name}, \$_smarty_tpl, {$_params}, {$_nocache});?>\n";
-        }
-        return $_output;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_capture.php b/www/smarty-3.1.27/sysplugins/smarty_internal_compile_capture.php
deleted file mode 100644
index 34728e47..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_capture.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Capture
- * Compiles the {capture} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Capture Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('name');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('name', 'assign', 'append');
-
-    /**
-     * Compiles code for the {capture} tag
-     *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        $buffer = isset($_attr['name']) ? $_attr['name'] : "'default'";
-        $assign = isset($_attr['assign']) ? $_attr['assign'] : 'null';
-        $append = isset($_attr['append']) ? $_attr['append'] : 'null';
-
-        $compiler->_capture_stack[0][] = array($buffer, $assign, $append, $compiler->nocache);
-        // maybe nocache because of nocache variables
-        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-        $_output = "<?php \$_smarty_tpl->_capture_stack[0][] = array($buffer, $assign, $append); ob_start(); ?>";
-
-        return $_output;
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Captureclose Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_CaptureClose extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {/capture} tag
-     *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        // must endblock be nocache?
-        if ($compiler->nocache) {
-            $compiler->tag_nocache = true;
-        }
-
-        list($buffer, $assign, $append, $compiler->nocache) = array_pop($compiler->_capture_stack[0]);
-
-        $_output = "<?php list(\$_capture_buffer, \$_capture_assign, \$_capture_append) = array_pop(\$_smarty_tpl->_capture_stack[0]);\n";
-        $_output .= "if (!empty(\$_capture_buffer)) {\n";
-        $_output .= " if (isset(\$_capture_assign)) \$_smarty_tpl->assign(\$_capture_assign, ob_get_contents());\n";
-        $_output .= " if (isset( \$_capture_append)) \$_smarty_tpl->append( \$_capture_append, ob_get_contents());\n";
-        $_output .= " Smarty::\$_smarty_vars['capture'][\$_capture_buffer]=ob_get_clean();\n";
-        $_output .= "} else \$_smarty_tpl->capture_error();?>";
-
-        return $_output;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_config_load.php b/www/smarty-3.1.27/sysplugins/smarty_internal_compile_config_load.php
deleted file mode 100644
index 5b291bed..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_config_load.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Config Load
- * Compiles the {config load} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Config Load Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('file');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('file', 'section');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('section', 'scope');
-
-    /**
-     * Compiles code for the {config_load} tag
-     *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        static $_is_legal_scope = array('local' => true, 'parent' => true, 'root' => true, 'global' => true);
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
-        }
-
-        // save possible attributes
-        $conf_file = $_attr['file'];
-        if (isset($_attr['section'])) {
-            $section = $_attr['section'];
-        } else {
-            $section = 'null';
-        }
-        $scope = 'local';
-        // scope setup
-        if (isset($_attr['scope'])) {
-            $_attr['scope'] = trim($_attr['scope'], "'\"");
-            if (isset($_is_legal_scope[$_attr['scope']])) {
-                $scope = $_attr['scope'];
-            } else {
-                $compiler->trigger_template_error('illegal value for "scope" attribute', $compiler->lex->taglineno);
-            }
-        }
-        // create config object
-        $_output = "<?php  Smarty_Internal_Extension_Config::configLoad(\$_smarty_tpl, $conf_file, $section, '$scope');?>";
-
-        return $_output;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_continue.php b/www/smarty-3.1.27/sysplugins/smarty_internal_compile_continue.php
deleted file mode 100644
index af376512..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_continue.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Continue
- * Compiles the {continue} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Continue Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Continue extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('levels');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('levels');
-
-    /**
-     * Compiles code for the {continue} tag
-     *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        static $_is_loopy = array('for' => true, 'foreach' => true, 'while' => true, 'section' => true);
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
-        }
-
-        if (isset($_attr['levels'])) {
-            if (!is_numeric($_attr['levels'])) {
-                $compiler->trigger_template_error('level attribute must be a numeric constant', $compiler->lex->taglineno);
-            }
-            $_levels = $_attr['levels'];
-        } else {
-            $_levels = 1;
-        }
-        $level_count = $_levels;
-        $stack_count = count($compiler->_tag_stack) - 1;
-        while ($level_count > 0 && $stack_count >= 0) {
-            if (isset($_is_loopy[$compiler->_tag_stack[$stack_count][0]])) {
-                $level_count --;
-            }
-            $stack_count --;
-        }
-        if ($level_count != 0) {
-            $compiler->trigger_template_error("cannot continue {$_levels} level(s)", $compiler->lex->taglineno);
-        }
-
-        return "<?php continue {$_levels};?>";
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_debug.php b/www/smarty-3.1.27/sysplugins/smarty_internal_compile_debug.php
deleted file mode 100644
index b184a746..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_debug.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Debug
- * Compiles the {debug} tag.
- * It opens a window the the Smarty Debugging Console.
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Debug Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Debug extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {debug} tag
-     *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        // compile always as nocache
-        $compiler->tag_nocache = true;
-
-        // display debug template
-        $_output = "<?php \$_smarty_tpl->smarty->loadPlugin('Smarty_Internal_Debug'); Smarty_Internal_Debug::display_debug(\$_smarty_tpl); ?>";
-
-        return $_output;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_eval.php b/www/smarty-3.1.27/sysplugins/smarty_internal_compile_eval.php
deleted file mode 100644
index 407482f0..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_eval.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Eval
- * Compiles the {eval} tag.
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Eval Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Eval extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('var');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('assign');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('var', 'assign');
-
-    /**
-     * Compiles code for the {eval} tag
-     *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        $this->required_attributes = array('var');
-        $this->optional_attributes = array('assign');
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        if (isset($_attr['assign'])) {
-            // output will be stored in a smarty variable instead of being displayed
-            $_assign = $_attr['assign'];
-        }
-
-        // create template object
-        $_output = "\$_template = new {$compiler->smarty->template_class}('eval:'." . $_attr['var'] . ", \$_smarty_tpl->smarty, \$_smarty_tpl);";
-        //was there an assign attribute?
-        if (isset($_assign)) {
-            $_output .= "\$_smarty_tpl->assign($_assign,\$_template->fetch());";
-        } else {
-            $_output .= "echo \$_template->fetch();";
-        }
-
-        return "<?php $_output ?>";
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_extends.php b/www/smarty-3.1.27/sysplugins/smarty_internal_compile_extends.php
deleted file mode 100644
index 2b541f2e..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_extends.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * Smarty Internal Plugin Compile extend
- * Compiles the {extends} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile extend Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Extends extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('file');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('file');
-
-    /**
-     * Compiles code for the {extends} tag
-     *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
-        }
-        if (strpos($_attr['file'], '$_tmp') !== false) {
-            $compiler->trigger_template_error('illegal value for file attribute', $compiler->lex->taglineno);
-        }
-
-        $name = $_attr['file'];
-        /** @var Smarty_Internal_Template $_smarty_tpl
-         * used in evaluated code
-         */
-        $_smarty_tpl = $compiler->template;
-        eval("\$tpl_name = $name;");
-        // create template object
-        $_template = new $compiler->smarty->template_class($tpl_name, $compiler->smarty, $compiler->template);
-        // check for recursion
-        $uid = $_template->source->uid;
-        if (isset($compiler->extends_uid[$uid])) {
-            $compiler->trigger_template_error("illegal recursive call of \"$include_file\"", $compiler->lex->line - 1);
-        }
-        $compiler->extends_uid[$uid] = true;
-        if (empty($_template->source->components)) {
-            array_unshift($compiler->sources, $_template->source);
-        } else {
-            foreach ($_template->source->components as $source) {
-                array_unshift($compiler->sources, $source);
-                $uid = $source->uid;
-                if (isset($compiler->extends_uid[$uid])) {
-                    $compiler->trigger_template_error("illegal recursive call of \"{$source->filepath}\"", $compiler->lex->line - 1);
-                }
-                $compiler->extends_uid[$uid] = true;
-            }
-        }
-        unset ($_template);
-        $compiler->inheritance_child = true;
-        $compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBODY);
-        return '';
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_for.php b/www/smarty-3.1.27/sysplugins/smarty_internal_compile_for.php
deleted file mode 100644
index 5bac5501..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_for.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile For
- * Compiles the {for} {forelse} {/for} tags
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile For Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {for} tag
-     * Smarty 3 does implement two different syntax's:
-     * - {for $var in $array}
-     * For looping over arrays or iterators
-     * - {for $x=0; $x<$y; $x++}
-     * For general loops
-     * The parser is generating different sets of attribute by which this compiler can
-     * determine which syntax is used.
-     *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        if ($parameter == 0) {
-            $this->required_attributes = array('start', 'to');
-            $this->optional_attributes = array('max', 'step');
-        } else {
-            $this->required_attributes = array('start', 'ifexp', 'var', 'step');
-            $this->optional_attributes = array();
-        }
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        $output = "<?php ";
-        if ($parameter == 1) {
-            foreach ($_attr['start'] as $_statement) {
-                if (is_array($_statement['var'])) {
-                    $var = $_statement['var']['var'];
-                    $index = $_statement['var']['smarty_internal_index'];
-                } else {
-                    $var = $_statement['var'];
-                    $index = '';
-                }
-                $output .= " \$_smarty_tpl->tpl_vars[$var] = new Smarty_Variable;";
-                $output .= " \$_smarty_tpl->tpl_vars[$var]->value{$index} = $_statement[value];\n";
-            }
-            if (is_array($_attr['var'])) {
-                $var = $_attr['var']['var'];
-                $index = $_attr['var']['smarty_internal_index'];
-            } else {
-                $var = $_attr['var'];
-                $index = '';
-            }
-            $output .= "  if ($_attr[ifexp]) { for (\$_foo=true;$_attr[ifexp]; \$_smarty_tpl->tpl_vars[$var]->value{$index}$_attr[step]) {\n";
-        } else {
-            $_statement = $_attr['start'];
-            if (is_array($_statement['var'])) {
-                $var = $_statement['var']['var'];
-                $index = $_statement['var']['smarty_internal_index'];
-            } else {
-                $var = $_statement['var'];
-                $index = '';
-            }
-            $output .= "\$_smarty_tpl->tpl_vars[$var] = new Smarty_Variable;";
-            if (isset($_attr['step'])) {
-                $output .= "\$_smarty_tpl->tpl_vars[$var]->step = $_attr[step];";
-            } else {
-                $output .= "\$_smarty_tpl->tpl_vars[$var]->step = 1;";
-            }
-            if (isset($_attr['max'])) {
-                $output .= "\$_smarty_tpl->tpl_vars[$var]->total = (int) min(ceil((\$_smarty_tpl->tpl_vars[$var]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$var]->step)),$_attr[max]);\n";
-            } else {
-                $output .= "\$_smarty_tpl->tpl_vars[$var]->total = (int) ceil((\$_smarty_tpl->tpl_vars[$var]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$var]->step));\n";
-            }
-            $output .= "if (\$_smarty_tpl->tpl_vars[$var]->total > 0) {\n";
-            $output .= "for (\$_smarty_tpl->tpl_vars[$var]->value{$index} = $_statement[value], \$_smarty_tpl->tpl_vars[$var]->iteration = 1;\$_smarty_tpl->tpl_vars[$var]->iteration <= \$_smarty_tpl->tpl_vars[$var]->total;\$_smarty_tpl->tpl_vars[$var]->value{$index} += \$_smarty_tpl->tpl_vars[$var]->step, \$_smarty_tpl->tpl_vars[$var]->iteration++) {\n";
-            $output .= "\$_smarty_tpl->tpl_vars[$var]->first = \$_smarty_tpl->tpl_vars[$var]->iteration == 1;";
-            $output .= "\$_smarty_tpl->tpl_vars[$var]->last = \$_smarty_tpl->tpl_vars[$var]->iteration == \$_smarty_tpl->tpl_vars[$var]->total;";
-        }
-        $output .= "?>";
-
-        $this->openTag($compiler, 'for', array('for', $compiler->nocache));
-        // maybe nocache because of nocache variables
-        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-        // return compiled code
-        return $output;
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Forelse Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Forelse extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {forelse} tag
-     *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        list($openTag, $nocache) = $this->closeTag($compiler, array('for'));
-        $this->openTag($compiler, 'forelse', array('forelse', $nocache));
-
-        return "<?php }} else { ?>";
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Forclose Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Forclose extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {/for} tag
-     *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        // must endblock be nocache?
-        if ($compiler->nocache) {
-            $compiler->tag_nocache = true;
-        }
-
-        list($openTag, $compiler->nocache) = $this->closeTag($compiler, array('for', 'forelse'));
-
-        if ($openTag == 'forelse') {
-            return "<?php }  ?>";
-        } else {
-            return "<?php }} ?>";
-        }
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_foreach.php b/www/smarty-3.1.27/sysplugins/smarty_internal_compile_foreach.php
deleted file mode 100644
index 82ea4963..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_foreach.php
+++ /dev/null
@@ -1,288 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Foreach
- * Compiles the {foreach} {foreachelse} {/foreach} tags
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Foreach Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('from', 'item');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('name', 'key');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('from', 'item', 'key', 'name');
-
-    /**
-     * Compiles code for the {foreach} tag
-     *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        $from = $_attr['from'];
-        $item = $_attr['item'];
-        if (!strncmp("\$_smarty_tpl->tpl_vars[$item]", $from, strlen($item) + 24)) {
-            $compiler->trigger_template_error("item variable {$item} may not be the same variable as at 'from'", $compiler->lex->taglineno);
-        }
-
-        if (isset($_attr['key'])) {
-            $key = $_attr['key'];
-        } else {
-            $key = null;
-        }
-
-        $this->openTag($compiler, 'foreach', array('foreach', $compiler->nocache, $item, $key, true));
-        // maybe nocache because of nocache variables
-        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-
-        if (isset($_attr['name'])) {
-            $name = trim($_attr['name'], '\'"');
-            $has_name = true;
-            $SmartyVarName = "\$smarty.foreach.{$name}.";
-        } else {
-            $has_name = false;
-        }
-        $ItemVarName = '$' . trim($item, '\'"') . '@';
-        // evaluates which Smarty variables and properties have to be computed
-        
-        if ($has_name) {
-            $useSmartyForeach = $usesSmartyFirst = strpos($compiler->lex->data, $SmartyVarName . 'first') !== false;
-            $useSmartyForeach = ($usesSmartyLast = strpos($compiler->lex->data, $SmartyVarName . 'last') !== false) || $useSmartyForeach;
-            $useSmartyForeach = ($usesSmartyIndex = strpos($compiler->lex->data, $SmartyVarName . 'index') !== false) || $useSmartyForeach;
-            $useSmartyForeach = ($usesSmartyIteration = (!$usesSmartyIndex && ($usesSmartyFirst || $usesSmartyLast)) || strpos($compiler->lex->data, $SmartyVarName . 'iteration') !== false) || $useSmartyForeach;
-            $useSmartyForeach = ($usesSmartyShow = strpos($compiler->lex->data, $SmartyVarName . 'show') !== false) || $useSmartyForeach;
-            $useSmartyForeach = ($usesSmartyTotal = $usesSmartyLast ||strpos($compiler->lex->data, $SmartyVarName . 'total') !== false) || $useSmartyForeach;
-        } else {
-            $usesSmartyFirst = false;
-            $usesSmartyLast = false;
-            $usesSmartyTotal = false;
-            $usesSmartyShow = false;
-            $useSmartyForeach = false;
-        }
-
-        $usesPropKey = strpos($compiler->lex->data, $ItemVarName . 'key') !== false;
-        $usesPropFirst = strpos($compiler->lex->data, $ItemVarName . 'first') !== false;
-        $usesPropLast =  strpos($compiler->lex->data, $ItemVarName . 'last') !== false;
-        $usesPropIndex =  strpos($compiler->lex->data, $ItemVarName . 'index') !== false;
-        $usesPropIteration = (!$usesPropIndex && ($usesPropFirst || $usesPropLast)) || strpos($compiler->lex->data, $ItemVarName . 'iteration') !== false;
-        $usesPropShow = strpos($compiler->lex->data, $ItemVarName . 'show') !== false;
-        $usesPropTotal = $usesPropLast || strpos($compiler->lex->data, $ItemVarName . 'total') !== false;
-
-        $keyTerm = '';
-        if ($usesPropKey) {
-            $keyTerm = "\$_smarty_tpl->tpl_vars[$item]->key => ";
-        } elseif ($key != null) {
-            $keyTerm = "\$_smarty_tpl->tpl_vars[$key]->value => ";
-        }
-        // generate output code
-        $output = "<?php\n";
-        $output .= "\$_from = $from;\n";
-        $output .= "if (!is_array(\$_from) && !is_object(\$_from)) {\n";
-        $output .= "settype(\$_from, 'array');\n";
-        $output .= "}\n";
-        $output .= "\$_smarty_tpl->tpl_vars[$item] = new Smarty_Variable;\n";
-        $output .= "\$_smarty_tpl->tpl_vars[$item]->_loop = false;\n";
-        if ($key != null) {
-            $output .= "\$_smarty_tpl->tpl_vars[$key] = new Smarty_Variable;\n";
-        }
-        if ($usesPropTotal) {
-            $output .= "\$_smarty_tpl->tpl_vars[$item]->total= \$_smarty_tpl->_count(\$_from);\n";
-        }
-        if ($usesPropIteration) {
-            $output .= "\$_smarty_tpl->tpl_vars[$item]->iteration=0;\n";
-        }
-        if ($usesPropIndex) {
-            $output .= "\$_smarty_tpl->tpl_vars[$item]->index=-1;\n";
-        }
-        if ($usesPropShow) {
-            if ($usesPropTotal) {
-                $output .= "\$_smarty_tpl->tpl_vars[$item]->show = (\$_smarty_tpl->tpl_vars[$item]->total > 0);\n";
-            } else {
-                $output .= "\$_smarty_tpl->tpl_vars[$item]->show = (\$_smarty_tpl->_count(\$_from) > 0);\n";
-            }
-        }
-        if ($has_name) {
-            $prop = array();
-            if ($usesSmartyTotal) {
-                $prop['total'] = "'total' => ";
-                $prop['total'] .= $usesSmartyShow ? '$total = ' : '';
-                $prop['total'] .= '$_smarty_tpl->_count($_from)';
-            }
-            if ($usesSmartyIteration) {
-                $prop['iteration'] = "'iteration' => 0";
-            }
-            if ($usesSmartyIndex) {
-                $prop['index'] = "'index' => -1";
-            }
-            if ($usesSmartyShow) {
-                $prop['show'] = "'show' => ";
-                if ($usesSmartyTotal) {
-                    $prop['show'] .= "(\$total > 0)";
-                } else {
-                    $prop['show'] .= "(\$_smarty_tpl->_count(\$_from) > 0)";
-                }
-            }
-            if ($useSmartyForeach) {
-                $_vars = 'array(' . join(', ', $prop) . ')';
-                $foreachVar = "'__foreach_{$name}'";
-                $output .= "\$_smarty_tpl->tpl_vars[$foreachVar] = new Smarty_Variable({$_vars});\n";
-            }
-        }
-        $output .= "foreach (\$_from as {$keyTerm}\$_smarty_tpl->tpl_vars[$item]->value) {\n";
-        $output .= "\$_smarty_tpl->tpl_vars[$item]->_loop = true;\n";
-        if ($key != null && $usesPropKey) {
-            $output .= "\$_smarty_tpl->tpl_vars[$key]->value = \$_smarty_tpl->tpl_vars[$item]->key;\n";
-        }
-        if ($usesPropIteration) {
-            $output .= "\$_smarty_tpl->tpl_vars[$item]->iteration++;\n";
-        }
-        if ($usesPropIndex) {
-            $output .= "\$_smarty_tpl->tpl_vars[$item]->index++;\n";
-        }
-        if ($usesPropFirst) {
-            if ($usesPropIndex) {
-                $output .= "\$_smarty_tpl->tpl_vars[$item]->first = \$_smarty_tpl->tpl_vars[$item]->index == 0;\n";
-            } else {
-                $output .= "\$_smarty_tpl->tpl_vars[$item]->first = \$_smarty_tpl->tpl_vars[$item]->iteration == 1;\n";
-            }
-        }
-        if ($usesPropLast) {
-            if ($usesPropIndex) {
-                $output .= "\$_smarty_tpl->tpl_vars[$item]->last = \$_smarty_tpl->tpl_vars[$item]->index + 1 == \$_smarty_tpl->tpl_vars[$item]->total;\n";
-            } else {
-                $output .= "\$_smarty_tpl->tpl_vars[$item]->last = \$_smarty_tpl->tpl_vars[$item]->iteration == \$_smarty_tpl->tpl_vars[$item]->total;\n";
-            }
-        }
-        if ($has_name) {
-            if ($usesSmartyIteration) {
-                $output .= "\$_smarty_tpl->tpl_vars[$foreachVar]->value['iteration']++;\n";
-            }
-            if ($usesSmartyIndex) {
-                $output .= "\$_smarty_tpl->tpl_vars[$foreachVar]->value['index']++;\n";
-            }
-            if ($usesSmartyFirst) {
-                if ($usesSmartyIndex) {
-                    $output .= "\$_smarty_tpl->tpl_vars[$foreachVar]->value['first'] = \$_smarty_tpl->tpl_vars[$foreachVar]->value['index'] == 0;\n";
-                } else {
-                    $output .= "\$_smarty_tpl->tpl_vars[$foreachVar]->value['first'] = \$_smarty_tpl->tpl_vars[$foreachVar]->value['iteration'] == 1;\n";
-                }
-            }
-            if ($usesSmartyLast) {
-                if ($usesSmartyIndex) {
-                    $output .= "\$_smarty_tpl->tpl_vars[$foreachVar]->value['last'] = \$_smarty_tpl->tpl_vars[$foreachVar]->value['index'] + 1 == \$_smarty_tpl->tpl_vars[$foreachVar]->value['total'];\n";
-                } else {
-                    $output .= "\$_smarty_tpl->tpl_vars[$foreachVar]->value['last'] = \$_smarty_tpl->tpl_vars[$foreachVar]->value['iteration'] == \$_smarty_tpl->tpl_vars[$foreachVar]->value['total'];\n";
-                }
-            }
-        }
-        $itemName = trim($item,"'\"");
-        $output .= "\$foreach_{$itemName}_Sav = \$_smarty_tpl->tpl_vars[$item];\n";
-        $output .= "?>";
-
-        return $output;
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Foreachelse Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Foreachelse extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {foreachelse} tag
-     *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        list($openTag, $nocache, $item, $key, $foo) = $this->closeTag($compiler, array('foreach'));
-        $this->openTag($compiler, 'foreachelse', array('foreachelse', $nocache, $item, $key, false));
-        $itemName = trim($item,"'\"");
-        $output = "<?php\n";
-        $output .= "\$_smarty_tpl->tpl_vars[$item] = \$foreach_{$itemName}_Sav;\n";
-        $output .= "}\n";
-        $output .= "if (!\$_smarty_tpl->tpl_vars[$item]->_loop) {\n?>";
-        return $output;
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Foreachclose Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Foreachclose extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {/foreach} tag
-     *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        // must endblock be nocache?
-        if ($compiler->nocache) {
-            $compiler->tag_nocache = true;
-        }
-
-        list($openTag, $compiler->nocache, $item, $key, $restore) = $this->closeTag($compiler, array('foreach', 'foreachelse'));
-        $itemName = trim($item,"'\"");
-        $output = "<?php\n";
-        if ($restore) {
-            $output .= "\$_smarty_tpl->tpl_vars[$item] = \$foreach_{$itemName}_Sav;\n";
-        }
-        $output .= "}\n?>";
-
-        return $output;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_function.php b/www/smarty-3.1.27/sysplugins/smarty_internal_compile_function.php
deleted file mode 100644
index 35408bcb..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_function.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Function
- * Compiles the {function} {/function} tags
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Function Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase
-{
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('name');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('name');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('_any');
-
-    /**
-     * Compiles code for the {function} tag
-     *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
-     *
-     * @return boolean true
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
-        }
-        unset($_attr['nocache']);
-        $_name = trim($_attr['name'], "'\"");
-        $compiler->parent_compiler->templateProperties['tpl_function'][$_name] = array();
-        $save = array($_attr, $compiler->parser->current_buffer, $compiler->template->has_nocache_code, $compiler->template->required_plugins, $compiler->template->caching);
-        $this->openTag($compiler, 'function', $save);
-        // set flag that we are compiling a template function
-        $compiler->compiles_template_function = true;
-        // Init temporary context
-        $compiler->template->required_plugins = array('compiled' => array(), 'nocache' => array());
-        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template($compiler->parser);
-        $compiler->template->has_nocache_code = false;
-        $compiler->template->caching = true;
-        return true;
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Functionclose Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
-{
-
-    /**
-     * Compiler object
-     *
-     * @var object
-     */
-    private $compiler = null;
-
-    /**
-     * Compiles code for the {/function} tag
-     *
-     * @param  array                                       $args      array with attributes from parser
-     * @param object|\Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param  array                                       $parameter array with compilation parameter
-     *
-     * @return bool true
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
-    {
-        $this->compiler = $compiler;
-        $saved_data = $this->closeTag($compiler, array('function'));
-        $_attr = $saved_data[0];
-        $_name = trim($_attr['name'], "'\"");
-        // reset flag that we are compiling a template function
-        $compiler->compiles_template_function = false;
-        $compiler->parent_compiler->templateProperties['tpl_function'][$_name]['called_functions'] = $compiler->called_functions;
-        $compiler->parent_compiler->templateProperties['tpl_function'][$_name]['compiled_filepath'] = $compiler->parent_compiler->template->compiled->filepath;
-        $compiler->parent_compiler->templateProperties['tpl_function'][$_name]['uid'] = $compiler->template->source->uid;
-        $compiler->called_functions = array();
-        $_parameter = $_attr;
-        unset($_parameter['name']);
-        // default parameter
-        $_paramsArray = array();
-        foreach ($_parameter as $_key => $_value) {
-            if (is_int($_key)) {
-                $_paramsArray[] = "$_key=>$_value";
-            } else {
-                $_paramsArray[] = "'$_key'=>$_value";
-            }
-        }
-        if (!empty($_paramsArray)) {
-            $_params = 'array(' . implode(",", $_paramsArray) . ')';
-            $_paramsCode = "\$params = array_merge($_params, \$params);\n";
-        } else {
-            $_paramsCode = '';
-        }
-        $_functionCode = $compiler->parser->current_buffer;
-        // setup buffer for template function code
-        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template($compiler->parser);
-
-        $_funcName = "smarty_template_function_{$_name}_{$compiler->template->properties['nocache_hash']}";
-        $_funcNameCaching = $_funcName . '_nocache';
-        if ($compiler->template->has_nocache_code) {
-            $compiler->parent_compiler->templateProperties['tpl_function'][$_name]['call_name_caching'] = $_funcNameCaching;
-            $output = "<?php\n";
-            $output .= "/* {$_funcNameCaching} */\n";
-            $output .= "if (!function_exists('{$_funcNameCaching}')) {\n";
-            $output .= "function {$_funcNameCaching} (\$_smarty_tpl,\$params) {\n";
-            // build plugin include code
-            if (!empty($compiler->template->required_plugins['compiled'])) {
-                foreach ($compiler->template->required_plugins['compiled'] as $tmp) {
-                    foreach ($tmp as $data) {
-                        $output .= "if (!is_callable('{$data['function']}')) require_once '{$data['file']}';\n";
-                    }
-                }
-            }
-            if (!empty($compiler->template->required_plugins['nocache'])) {
-                $output .= "echo '/*%%SmartyNocache:{$compiler->template->properties['nocache_hash']}%%*/<?php ";
-                foreach ($compiler->template->required_plugins['nocache'] as $tmp) {
-                    foreach ($tmp as $data) {
-                        $output .= "if (!is_callable(\'{$data['function']}\')) require_once \'{$data['file']}\';\n";
-                    }
-                }
-                $output .= "?>/*/%%SmartyNocache:{$compiler->template->properties['nocache_hash']}%%*/';\n";
-            }
-            $output .= "ob_start();\n";
-            $output .= $_paramsCode;
-            $output .= "\$_smarty_tpl->properties['saved_tpl_vars'][] = \$_smarty_tpl->tpl_vars;\n";
-            $output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->tpl_vars[\$key] = new Smarty_Variable(\$value);\n}";
-            $output .= "\$params = var_export(\$params, true);\n";
-            $output .= "echo \"/*%%SmartyNocache:{$compiler->template->properties['nocache_hash']}%%*/<?php ";
-            $output .= "\\\$saved_tpl_vars = \\\$_smarty_tpl->tpl_vars;\nforeach (\$params as \\\$key => \\\$value) {\n\\\$_smarty_tpl->tpl_vars[\\\$key] = new Smarty_Variable(\\\$value);\n}\n?>";
-            $output .= "/*/%%SmartyNocache:{$compiler->template->properties['nocache_hash']}%%*/\n\";?>";
-            $compiler->parser->current_buffer->append_subtree(new Smarty_Internal_ParseTree_Tag($compiler->parser, $output));
-            $compiler->parser->current_buffer->append_subtree($_functionCode);
-            $output = "<?php echo \"/*%%SmartyNocache:{$compiler->template->properties['nocache_hash']}%%*/<?php ";
-            $output .= "foreach (Smarty::\\\$global_tpl_vars as \\\$key => \\\$value){\n";
-            $output .= "if (\\\$_smarty_tpl->tpl_vars[\\\$key] === \\\$value) \\\$saved_tpl_vars[\\\$key] = \\\$value;\n}\n";
-            $output .= "\\\$_smarty_tpl->tpl_vars = \\\$saved_tpl_vars;?>\n";
-            $output .= "/*/%%SmartyNocache:{$compiler->template->properties['nocache_hash']}%%*/\";\n?>";
-            $output .= "<?php echo str_replace('{$compiler->template->properties['nocache_hash']}', \$_smarty_tpl->properties['nocache_hash'], ob_get_clean());\n";
-            $output .= "\$_smarty_tpl->tpl_vars = array_pop(\$_smarty_tpl->properties['saved_tpl_vars']);\n}\n}\n";
-            $output .= "/*/ {$_funcName}_nocache */\n\n";
-            $output .= "?>\n";
-            $compiler->parser->current_buffer->append_subtree(new Smarty_Internal_ParseTree_Tag($compiler->parser, $output));
-            $_functionCode = new Smarty_Internal_ParseTree_Tag($compiler->parser, preg_replace_callback("/((<\?php )?echo '\/\*%%SmartyNocache:{$compiler->template->properties['nocache_hash']}%%\*\/([\S\s]*?)\/\*\/%%SmartyNocache:{$compiler->template->properties['nocache_hash']}%%\*\/';(\?>\n)?)/", array($this, 'removeNocache'), $_functionCode->to_smarty_php()));
-        }
-        $compiler->parent_compiler->templateProperties['tpl_function'][$_name]['call_name'] = $_funcName;
-        $output = "<?php\n";
-        $output .= "/* {$_funcName} */\n";
-        $output .= "if (!function_exists('{$_funcName}')) {\n";
-        $output .= "function {$_funcName}(\$_smarty_tpl,\$params) {\n";
-        // build plugin include code
-        if (!empty($compiler->template->required_plugins['nocache'])) {
-            $compiler->template->required_plugins['compiled'] = array_merge($compiler->template->required_plugins['compiled'], $compiler->template->required_plugins['nocache']);
-        }
-        if (!empty($compiler->template->required_plugins['compiled'])) {
-            foreach ($compiler->template->required_plugins['compiled'] as $tmp) {
-                foreach ($tmp as $data) {
-                    $output .= "if (!is_callable('{$data['function']}')) require_once '{$data['file']}';\n";
-                }
-            }
-        }
-        $output .= "\$saved_tpl_vars = \$_smarty_tpl->tpl_vars;\n";
-        $output .= $_paramsCode;
-        $output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->tpl_vars[\$key] = new Smarty_Variable(\$value);\n}?>";
-        $compiler->parser->current_buffer->append_subtree(new Smarty_Internal_ParseTree_Tag($compiler->parser, $output));
-        $compiler->parser->current_buffer->append_subtree($_functionCode);
-        $output = "<?php foreach (Smarty::\$global_tpl_vars as \$key => \$value){\n";
-        $output .= "if (\$_smarty_tpl->tpl_vars[\$key] === \$value) \$saved_tpl_vars[\$key] = \$value;\n}\n";
-        $output .= "\$_smarty_tpl->tpl_vars = \$saved_tpl_vars;\n}\n}\n";
-        $output .= "/*/ {$_funcName} */\n\n";
-        $output .= "?>\n";
-        $compiler->parser->current_buffer->append_subtree(new Smarty_Internal_ParseTree_Tag($compiler->parser, $output));
-        $compiler->parent_compiler->templateFunctionCode .= $compiler->parser->current_buffer->to_smarty_php();
-        // restore old buffer
-        $compiler->parser->current_buffer = $saved_data[1];
-        // restore old status
-        $compiler->template->has_nocache_code = $saved_data[2];
-        $compiler->template->required_plugins = $saved_data[3];
-        $compiler->template->caching = $saved_data[4];
-        return true;
-    }
-
-    /**
-     * @param $match
-     *
-     * @return mixed
-     */
-    function removeNocache($match)
-    {
-        $code = preg_replace("/((<\?php )?echo '\/\*%%SmartyNocache:{$this->compiler->template->properties['nocache_hash']}%%\*\/)|(\/\*\/%%SmartyNocache:{$this->compiler->template->properties['nocache_hash']}%%\*\/';(\?>\n)?)/", '', $match[0]);
-        $code = str_replace(array('\\\'', '\\\\\''), array('\'', '\\\''), $code);
-        return $code;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_if.php b/www/smarty-3.1.27/sysplugins/smarty_internal_compile_if.php
deleted file mode 100644
index d4fd30e9..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_if.php
+++ /dev/null
@@ -1,221 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile If
- * Compiles the {if} {else} {elseif} {/if} tags
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile If Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_If extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {if} tag
-     *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $this->openTag($compiler, 'if', array(1, $compiler->nocache));
-        // must whole block be nocache ?
-        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-
-        if (!array_key_exists("if condition", $parameter)) {
-            $compiler->trigger_template_error("missing if condition", $compiler->lex->taglineno);
-        }
-
-        if (is_array($parameter['if condition'])) {
-            if ($compiler->nocache) {
-                $_nocache = ',true';
-                // create nocache var to make it know for further compiling
-                if (is_array($parameter['if condition']['var'])) {
-                    $var = trim($parameter['if condition']['var']['var'], "'");
-                } else {
-                    $var = trim($parameter['if condition']['var'], "'");
-                 }
-                if (isset($compiler->template->tpl_vars[$var])) {
-                    $compiler->template->tpl_vars[$var]->nocache = true;
-                } else {
-                    $compiler->template->tpl_vars[$var] = new Smarty_Variable(null, true);
-                }
-            } else {
-                $_nocache = '';
-            }
-            if (is_array($parameter['if condition']['var'])) {
-                $_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n";
-                $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . ") {?>";
-            } else {
-                $_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});";
-                $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . ") {?>";
-            }
-
-            return $_output;
-        } else {
-            return "<?php if ({$parameter['if condition']}) {?>";
-        }
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Else Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Else extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {else} tag
-     *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        list($nesting, $compiler->tag_nocache) = $this->closeTag($compiler, array('if', 'elseif'));
-        $this->openTag($compiler, 'else', array($nesting, $compiler->tag_nocache));
-
-        return "<?php } else { ?>";
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile ElseIf Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {elseif} tag
-     *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        list($nesting, $compiler->tag_nocache) = $this->closeTag($compiler, array('if', 'elseif'));
-
-        if (!array_key_exists("if condition", $parameter)) {
-            $compiler->trigger_template_error("missing elseif condition", $compiler->lex->taglineno);
-        }
-
-        if (is_array($parameter['if condition'])) {
-            $condition_by_assign = true;
-            if ($compiler->nocache) {
-                $_nocache = ',true';
-                // create nocache var to make it know for further compiling
-                if (is_array($parameter['if condition']['var'])) {
-                    $var = trim($parameter['if condition']['var']['var'], "'");
-                } else {
-                    $var = trim($parameter['if condition']['var'], "'");
-                }
-                if (isset($compiler->template->tpl_vars[$var])) {
-                    $compiler->template->tpl_vars[$var]->nocache = true;
-                } else {
-                    $compiler->template->tpl_vars[$var] = new Smarty_Variable(null, true);
-                }
-            } else {
-                $_nocache = '';
-            }
-        } else {
-            $condition_by_assign = false;
-        }
-
-        if (empty($compiler->prefix_code)) {
-            if ($condition_by_assign) {
-                $this->openTag($compiler, 'elseif', array($nesting + 1, $compiler->tag_nocache));
-                if (is_array($parameter['if condition']['var'])) {
-                    $_output = "<?php } else { if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n";
-                    $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . ") {?>";
-                } else {
-                    $_output = "<?php  } else { if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});";
-                    $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . ") {?>";
-                }
-
-                return $_output;
-            } else {
-                $this->openTag($compiler, 'elseif', array($nesting, $compiler->tag_nocache));
-
-                return "<?php } elseif ({$parameter['if condition']}) {?>";
-            }
-        } else {
-            $tmp = '';
-            foreach ($compiler->prefix_code as $code) {
-                $tmp = $compiler->appendCode($tmp, $code);
-           }
-            $compiler->prefix_code = array();
-            $tmp = $compiler->appendCode("<?php } else {?>", $tmp);
-            $this->openTag($compiler, 'elseif', array($nesting + 1, $compiler->tag_nocache));
-            if ($condition_by_assign) {
-                if (is_array($parameter['if condition']['var'])) {
-                    $_output = $compiler->appendCode($tmp, "<?php  if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n");
-                    $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . ") {?>";
-                } else {
-                    $_output = $compiler->appendCode($tmp, "<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});");
-                    $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . ") {?>";
-                }
-
-                return $_output;
-            } else {
-                return $compiler->appendCode($tmp, "<?php if ({$parameter['if condition']}) {?>");
-            }
-        }
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Ifclose Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Ifclose extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {/if} tag
-     *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        // must endblock be nocache?
-        if ($compiler->nocache) {
-            $compiler->tag_nocache = true;
-        }
-        list($nesting, $compiler->nocache) = $this->closeTag($compiler, array('if', 'else', 'elseif'));
-        $tmp = '';
-        for ($i = 0; $i < $nesting; $i ++) {
-            $tmp .= '}';
-        }
-
-        return "<?php {$tmp}?>";
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_include.php b/www/smarty-3.1.27/sysplugins/smarty_internal_compile_include.php
deleted file mode 100644
index b0720a29..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_include.php
+++ /dev/null
@@ -1,298 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Include
- * Compiles the {include} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Include Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
-{
-    /**
-     * caching mode to create nocache code but no cache file
-     */
-    const CACHING_NOCACHE_CODE = 9999;
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('file');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('file');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $option_flags = array('nocache', 'inline', 'caching');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('_any');
-
-    /**
-     * Compiles code for the {include} tag
-     *
-     * @param  array                                  $args      array with attributes from parser
-     * @param  Smarty_Internal_SmartyTemplateCompiler $compiler  compiler object
-     * @param  array                                  $parameter array with compilation parameter
-     *
-     * @throws SmartyCompilerException
-     * @return string compiled code
-     */
-    public function compile($args, Smarty_Internal_SmartyTemplateCompiler $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        // save possible attributes
-        $include_file = $_attr['file'];
-
-        if (isset($_attr['assign'])) {
-            // output will be stored in a smarty variable instead of being displayed
-            $_assign = $_attr['assign'];
-        }
-
-        $_parent_scope = Smarty::SCOPE_LOCAL;
-        if (isset($_attr['scope'])) {
-            $_attr['scope'] = trim($_attr['scope'], "'\"");
-            if ($_attr['scope'] == 'parent') {
-                $_parent_scope = Smarty::SCOPE_PARENT;
-            } elseif ($_attr['scope'] == 'root') {
-                $_parent_scope = Smarty::SCOPE_ROOT;
-            } elseif ($_attr['scope'] == 'global') {
-                $_parent_scope = Smarty::SCOPE_GLOBAL;
-            }
-        }
-
-        // assume caching is off
-        $_caching = Smarty::CACHING_OFF;
-
-        if ($_attr['nocache'] === true) {
-            $compiler->tag_nocache = true;
-        }
-
-        $call_nocache = $compiler->tag_nocache || $compiler->nocache;
-
-        // caching was on and {include} is not in nocache mode
-        if ($compiler->template->caching && !$compiler->nocache && !$compiler->tag_nocache) {
-            $_caching = self::CACHING_NOCACHE_CODE;
-        }
-
-        // flag if included template code should be merged into caller
-        $merge_compiled_includes = ($compiler->smarty->merge_compiled_includes || ($compiler->inheritance && $compiler->smarty->inheritance_merge_compiled_includes) || $_attr['inline'] === true) && !$compiler->template->source->recompiled;
-
-        if ($merge_compiled_includes && $_attr['inline'] !== true) {
-            // variable template name ?
-            if ($compiler->has_variable_string || !((substr_count($include_file, '"') == 2 || substr_count($include_file, "'") == 2)) || substr_count($include_file, '(') != 0 || substr_count($include_file, '$_smarty_tpl->') != 0) {
-                $merge_compiled_includes = false;
-                if ($compiler->template->caching) {
-                    // must use individual cache file
-                    //$_attr['caching'] = 1;
-                }
-                if ($compiler->inheritance && $compiler->smarty->inheritance_merge_compiled_includes && $_attr['inline'] !== true) {
-                    $compiler->trigger_template_error(' variable template file names not allow within {block} tags');
-                }
-            }
-            // variable compile_id?
-            if (isset($_attr['compile_id'])) {
-                if (!((substr_count($_attr['compile_id'], '"') == 2 || substr_count($_attr['compile_id'], "'") == 2 || is_numeric($_attr['compile_id']))) || substr_count($_attr['compile_id'], '(') != 0 || substr_count($_attr['compile_id'], '$_smarty_tpl->') != 0) {
-                    $merge_compiled_includes = false;
-                    if ($compiler->template->caching) {
-                        // must use individual cache file
-                        //$_attr['caching'] = 1;
-                    }
-                    if ($compiler->inheritance && $compiler->smarty->inheritance_merge_compiled_includes && $_attr['inline'] !== true) {
-                        $compiler->trigger_template_error(' variable compile_id not allow within {block} tags');
-                    }
-                }
-            }
-        }
-
-        /*
-        * if the {include} tag provides individual parameter for caching or compile_id
-        * the subtemplate must not be included into the common cache file and is treated like
-        * a call in nocache mode.
-        *
-        */
-        if ($_attr['nocache'] !== true && $_attr['caching']) {
-            $_caching = $_new_caching = (int) $_attr['caching'];
-            $call_nocache = true;
-        } else {
-            $_new_caching = Smarty::CACHING_LIFETIME_CURRENT;
-        }
-        if (isset($_attr['cache_lifetime'])) {
-            $_cache_lifetime = $_attr['cache_lifetime'];
-            $call_nocache = true;
-            $_caching = $_new_caching;
-        } else {
-            $_cache_lifetime = '$_smarty_tpl->cache_lifetime';
-        }
-        if (isset($_attr['cache_id'])) {
-            $_cache_id = $_attr['cache_id'];
-            $call_nocache = true;
-            $_caching = $_new_caching;
-        } else {
-            $_cache_id = '$_smarty_tpl->cache_id';
-        }
-        if (isset($_attr['compile_id'])) {
-            $_compile_id = $_attr['compile_id'];
-        } else {
-            $_compile_id = '$_smarty_tpl->compile_id';
-        }
-
-        // if subtemplate will be called in nocache mode do not merge
-        if ($compiler->template->caching && $call_nocache) {
-            $merge_compiled_includes = false;
-        }
-
-        $has_compiled_template = false;
-        if ($merge_compiled_includes) {
-            if ($compiler->template->caching && ($compiler->tag_nocache || $compiler->nocache) && $_caching != self::CACHING_NOCACHE_CODE) {
-                //                $merge_compiled_includes = false;
-                if ($compiler->inheritance && $compiler->smarty->inheritance_merge_compiled_includes) {
-                    $compiler->trigger_template_error(' invalid caching mode of subtemplate within {block} tags');
-                }
-            }
-            $c_id = isset($_attr['compile_id']) ? $_attr['compile_id'] : $compiler->template->compile_id;
-            // we must observe different compile_id and caching
-            $uid = sha1($c_id . ($_caching ? '--caching' : '--nocaching'));
-            $tpl_name = null;
-
-            /** @var Smarty_Internal_Template $_smarty_tpl
-             * used in evaluated code
-             */
-            $_smarty_tpl = $compiler->template;
-            eval("\$tpl_name = $include_file;");
-            if (!isset($compiler->parent_compiler->mergedSubTemplatesData[$tpl_name][$uid])) {
-                $compiler->smarty->allow_ambiguous_resources = true;
-                $tpl = new $compiler->smarty->template_class ($tpl_name, $compiler->smarty, $compiler->template, $compiler->template->cache_id, $c_id, $_caching);
-                // save unique function name
-                $compiler->parent_compiler->mergedSubTemplatesData[$tpl_name][$uid]['func'] = $tpl->properties['unifunc'] = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
-                if ($compiler->inheritance) {
-                    $tpl->compiler->inheritance = true;
-                }
-                // make sure whole chain gets compiled
-                $tpl->mustCompile = true;
-                if (!($tpl->source->uncompiled) && $tpl->source->exists) {
-                    $tpl->compiler->suppressTemplatePropertyHeader = true;
-                    $compiler->parent_compiler->mergedSubTemplatesData[$tpl_name][$uid]['nocache_hash'] = $tpl->properties['nocache_hash'] = str_replace(array('.', ','), '_', uniqid(rand(), true));
-                    // get compiled code
-                    $compiled_code = Smarty_Internal_Extension_CodeFrame::createFunctionFrame($tpl, $tpl->compiler->compileTemplate($tpl, null, $compiler->parent_compiler));
-                    unset($tpl->compiler);
-
-                    // remove header code
-                    $compiled_code = preg_replace("/(<\?php \/\*%%SmartyHeaderCode:{$tpl->properties['nocache_hash']}%%\*\/(.+?)\/\*\/%%SmartyHeaderCode%%\*\/\?>\n)/s", '', $compiled_code);
-                    if ($tpl->has_nocache_code) {
-                        // replace nocache_hash
-                        $compiled_code = str_replace("{$tpl->properties['nocache_hash']}", $compiler->template->properties['nocache_hash'], $compiled_code);
-                        $compiler->template->has_nocache_code = true;
-                    }
-                    $compiler->parent_compiler->mergedSubTemplatesCode[$tpl->properties['unifunc']] = $compiled_code;
-                    $has_compiled_template = true;
-                    if (!empty($tpl->required_plugins['compiled'])) {
-                        foreach ($tpl->required_plugins['compiled'] as $name => $callBack) {
-                            if (!isset($compiler->template->required_plugins['compiled'][$name])) {
-                                $compiler->template->required_plugins['compiled'][$name] = $callBack;
-                            }
-                        }
-                    }
-                    if (!empty($tpl->required_plugins['nocache'])) {
-                        foreach ($tpl->required_plugins['nocache'] as $name => $callBack) {
-                            if (!isset($compiler->template->required_plugins['nocache'][$name])) {
-                                $compiler->template->required_plugins['nocache'][$name] = $callBack;
-                            }
-                        }
-                    }
-                    unset ($tpl);
-                }
-            } else {
-                $has_compiled_template = true;
-            }
-        }
-        // delete {include} standard attributes
-        unset($_attr['file'], $_attr['assign'], $_attr['cache_id'], $_attr['compile_id'], $_attr['cache_lifetime'], $_attr['nocache'], $_attr['caching'], $_attr['scope'], $_attr['inline']);
-        // remaining attributes must be assigned as smarty variable
-        $_vars_nc = '';
-        if (!empty($_attr)) {
-            if ($_parent_scope == Smarty::SCOPE_LOCAL) {
-                $_pairs = array();
-                // create variables
-                foreach ($_attr as $key => $value) {
-                    $_pairs[] = "'$key'=>$value";
-                    $_vars_nc .= "\$_smarty_tpl->tpl_vars['$key'] =  new Smarty_Variable($value);\n";
-                }
-                $_vars = 'array(' . join(',', $_pairs) . ')';
-            } else {
-                $compiler->trigger_template_error('variable passing not allowed in parent/global scope', $compiler->lex->taglineno);
-            }
-        } else {
-            $_vars = 'array()';
-        }
-        $update_compile_id = $compiler->template->caching && !$compiler->tag_nocache && !$compiler->nocache && $_compile_id != '$_smarty_tpl->compile_id';
-        if ($has_compiled_template && !$call_nocache) {
-            //           if ($has_compiled_template && !$compiler->tag_nocache && !$compiler->nocache) {
-            // never call inline templates in nocache mode
-            //$compiler->suppressNocacheProcessing = true;
-            $_hash = $compiler->parent_compiler->mergedSubTemplatesData[$tpl_name][$uid]['nocache_hash'];
-            $_output = "<?php /*  Call merged included template \"" . $tpl_name . "\" */\n";
-            if ($update_compile_id) {
-                $_output .= $compiler->makeNocacheCode("\$_compile_id_save[] = \$_smarty_tpl->compile_id;\n\$_smarty_tpl->compile_id = {$_compile_id};\n");
-            }
-            if (!empty($_vars_nc) && $_caching == 9999 && $_smarty_tpl->caching) {
-                //$compiler->suppressNocacheProcessing = false;
-                $_output .= substr($compiler->processNocacheCode('<?php ' . $_vars_nc . "?>\n", true), 6, - 3);
-                //$compiler->suppressNocacheProcessing = true;
-            }
-            if (isset($_assign)) {
-                $_output .= " \$_smarty_tpl->tpl_vars[$_assign] = new Smarty_Variable(\$_smarty_tpl->getInlineSubTemplate({$include_file}, {$_cache_id}, {$_compile_id}, {$_caching}, {$_cache_lifetime}, {$_vars}, {$_parent_scope}, '{$_hash}', '{$compiler->parent_compiler->mergedSubTemplatesData[$tpl_name][$uid]['func']}'));\n";
-            } else {
-                $_output .= "echo \$_smarty_tpl->getInlineSubTemplate({$include_file}, {$_cache_id}, {$_compile_id}, {$_caching}, {$_cache_lifetime}, {$_vars}, {$_parent_scope}, '{$_hash}', '{$compiler->parent_compiler->mergedSubTemplatesData[$tpl_name][$uid]['func']}');\n";
-            }
-            if ($update_compile_id) {
-                $_output .= $compiler->makeNocacheCode("\$_smarty_tpl->compile_id = array_pop(\$_compile_id_save);\n");
-            }
-            $_output .= "/*  End of included template \"" . $tpl_name . "\" */?>\n";
-
-            return $_output;
-        }
-
-        if ($call_nocache) {
-            $compiler->tag_nocache = true;
-        }
-        $_output = "<?php ";
-        if ($update_compile_id) {
-            $_output .= "\$_compile_id_save[] = \$_smarty_tpl->compile_id;\n\$_smarty_tpl->compile_id = {$_compile_id};\n";
-        }
-        // was there an assign attribute
-        if (isset($_assign)) {
-            $_output .= "\$_smarty_tpl->tpl_vars[$_assign] = new Smarty_Variable(\$_smarty_tpl->getSubTemplate ($include_file, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_parent_scope));\n";
-        } else {
-            $_output .= "echo \$_smarty_tpl->getSubTemplate ($include_file, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_parent_scope);\n";
-        }
-        if ($update_compile_id) {
-            $_output .= "\$_smarty_tpl->compile_id = array_pop(\$_compile_id_save);\n";
-        }
-        $_output .= "?>\n";
-        return $_output;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_include_php.php b/www/smarty-3.1.27/sysplugins/smarty_internal_compile_include_php.php
deleted file mode 100644
index 76f506c5..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_include_php.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Include PHP
- * Compiles the {include_php} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Insert Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('file');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('file');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('once', 'assign');
-
-    /**
-     * Compiles code for the {include_php} tag
-     *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
-     *
-     * @throws SmartyException
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        if (!($compiler->smarty instanceof SmartyBC)) {
-            throw new SmartyException("{include_php} is deprecated, use SmartyBC class to enable");
-        }
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        /** @var Smarty_Internal_Template $_smarty_tpl
-         * used in evaluated code
-         */
-        $_smarty_tpl = $compiler->template;
-        $_filepath = false;
-        eval('$_file = ' . $_attr['file'] . ';');
-        if (!isset($compiler->smarty->security_policy) && file_exists($_file)) {
-            $_filepath = $_file;
-        } else {
-            if (isset($compiler->smarty->security_policy)) {
-                $_dir = $compiler->smarty->security_policy->trusted_dir;
-            } else {
-                $_dir = $compiler->smarty->trusted_dir;
-            }
-            if (!empty($_dir)) {
-                foreach ((array) $_dir as $_script_dir) {
-                    $_script_dir = rtrim($_script_dir, '/\\') . DS;
-                    if (file_exists($_script_dir . $_file)) {
-                        $_filepath = $_script_dir . $_file;
-                        break;
-                    }
-                }
-            }
-        }
-        if ($_filepath == false) {
-            $compiler->trigger_template_error("{include_php} file '{$_file}' is not readable", $compiler->lex->taglineno);
-        }
-
-        if (isset($compiler->smarty->security_policy)) {
-            $compiler->smarty->security_policy->isTrustedPHPDir($_filepath);
-        }
-
-        if (isset($_attr['assign'])) {
-            // output will be stored in a smarty variable instead of being displayed
-            $_assign = $_attr['assign'];
-        }
-        $_once = '_once';
-        if (isset($_attr['once'])) {
-            if ($_attr['once'] == 'false') {
-                $_once = '';
-            }
-        }
-
-        if (isset($_assign)) {
-            return "<?php ob_start(); include{$_once} ('{$_filepath}'); \$_smarty_tpl->assign({$_assign},ob_get_contents()); ob_end_clean();?>";
-        } else {
-            return "<?php include{$_once} ('{$_filepath}');?>\n";
-        }
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_insert.php b/www/smarty-3.1.27/sysplugins/smarty_internal_compile_insert.php
deleted file mode 100644
index 57f27350..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_insert.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-
-/**
- * Smarty Internal Plugin Compile Insert
- * Compiles the {insert} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Insert Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('name');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('name');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('_any');
-
-    /**
-     * Compiles code for the {insert} tag
-     *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $nocacheParam = $compiler->template->caching && ($compiler->tag_nocache || $compiler->nocache);
-        if (!$nocacheParam) {
-            // do not compile as nocache code
-            $compiler->suppressNocacheProcessing = true;
-        }
-        $compiler->tag_nocache = true;
-        $_smarty_tpl = $compiler->template;
-        $_name = null;
-        $_script = null;
-
-        $_output = '<?php ';
-        // save possible attributes
-        eval('$_name = ' . $_attr['name'] . ';');
-        if (isset($_attr['assign'])) {
-            // output will be stored in a smarty variable instead of being displayed
-            $_assign = $_attr['assign'];
-            // create variable to make sure that the compiler knows about its nocache status
-            $var = trim($_attr['assign'], "'");
-            if (isset($compiler->template->tpl_vars[$var])) {
-                $compiler->template->tpl_vars[$var]->nocache = true;
-            } else {
-                $compiler->template->tpl_vars[$var] = new Smarty_Variable(null, true);
-            }
-        }
-        if (isset($_attr['script'])) {
-            // script which must be included
-            $_function = "smarty_insert_{$_name}";
-            $_smarty_tpl = $compiler->template;
-            $_filepath = false;
-            eval('$_script = ' . $_attr['script'] . ';');
-            if (!isset($compiler->smarty->security_policy) && file_exists($_script)) {
-                $_filepath = $_script;
-            } else {
-                if (isset($compiler->smarty->security_policy)) {
-                    $_dir = $compiler->smarty->security_policy->trusted_dir;
-                } else {
-                    $_dir = $compiler->smarty->trusted_dir;
-                }
-                if (!empty($_dir)) {
-                    foreach ((array) $_dir as $_script_dir) {
-                        $_script_dir = rtrim($_script_dir, '/\\') . DS;
-                        if (file_exists($_script_dir . $_script)) {
-                            $_filepath = $_script_dir . $_script;
-                            break;
-                        }
-                    }
-                }
-            }
-            if ($_filepath == false) {
-                $compiler->trigger_template_error("{insert} missing script file '{$_script}'", $compiler->lex->taglineno);
-            }
-            // code for script file loading
-            $_output .= "require_once '{$_filepath}' ;";
-            require_once $_filepath;
-            if (!is_callable($_function)) {
-                $compiler->trigger_template_error(" {insert} function '{$_function}' is not callable in script file '{$_script}'", $compiler->lex->taglineno);
-            }
-        } else {
-            $_filepath = 'null';
-            $_function = "insert_{$_name}";
-            // function in PHP script ?
-            if (!is_callable($_function)) {
-                // try plugin
-                if (!$_function = $compiler->getPlugin($_name, 'insert')) {
-                    $compiler->trigger_template_error("{insert} no function or plugin found for '{$_name}'", $compiler->lex->taglineno);
-                }
-            }
-        }
-        // delete {insert} standard attributes
-        unset($_attr['name'], $_attr['assign'], $_attr['script'], $_attr['nocache']);
-        // convert attributes into parameter array string
-        $_paramsArray = array();
-        foreach ($_attr as $_key => $_value) {
-                $_paramsArray[] = "'$_key' => $_value";
-        }
-        $_params = 'array(' . implode(", ", $_paramsArray) . ')';
-        // call insert
-        if (isset($_assign)) {
-            if ($_smarty_tpl->caching && !$nocacheParam) {
-                $_output .= "echo Smarty_Internal_Nocache_Insert::compile ('{$_function}',{$_params}, \$_smarty_tpl, '{$_filepath}',{$_assign});?>";
-            } else {
-                $_output .= "\$_smarty_tpl->assign({$_assign} , {$_function} ({$_params},\$_smarty_tpl), true);?>";
-            }
-        } else {
-            $compiler->has_output = true;
-            if ($_smarty_tpl->caching && !$nocacheParam) {
-                $_output .= "echo Smarty_Internal_Nocache_Insert::compile ('{$_function}',{$_params}, \$_smarty_tpl, '{$_filepath}');?>";
-            } else {
-                $_output .= "echo {$_function}({$_params},\$_smarty_tpl);?>";
-            }
-        }
-
-        return $_output;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_ldelim.php b/www/smarty-3.1.27/sysplugins/smarty_internal_compile_ldelim.php
deleted file mode 100644
index 91b44881..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_ldelim.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Ldelim
- * Compiles the {ldelim} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Ldelim Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Ldelim extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {ldelim} tag
-     * This tag does output the left delimiter
-     *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        $_attr = $this->getAttributes($compiler, $args);
-        if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
-        }
-        // this tag does not return compiled code
-        $compiler->has_code = true;
-
-        return $compiler->smarty->left_delimiter;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_nocache.php b/www/smarty-3.1.27/sysplugins/smarty_internal_compile_nocache.php
deleted file mode 100644
index 6f63dcb1..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_nocache.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Nocache
- * Compiles the {nocache} {/nocache} tags.
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Nocache Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Nocache extends Smarty_Internal_CompileBase
-{
-    /**
-     * Array of names of valid option flags
-     *
-     * @var array
-     */
-    public $option_flags = array();
-
-    /**
-     * Compiles code for the {nocache} tag
-     * This tag does not generate compiled output. It only sets a compiler flag.
-     *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
-     *
-     * @return bool
-     */
-    public function compile($args, $compiler)
-    {
-        $_attr = $this->getAttributes($compiler, $args);
-        $this->openTag($compiler, 'nocache', array($compiler->nocache));
-        // enter nocache mode
-        $compiler->nocache = true;
-        // this tag does not return compiled code
-        $compiler->has_code = false;
-
-        return true;
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Nocacheclose Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Nocacheclose extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {/nocache} tag
-     * This tag does not generate compiled output. It only sets a compiler flag.
-     *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
-     *
-     * @return bool
-     */
-    public function compile($args, $compiler)
-    {
-        $_attr = $this->getAttributes($compiler, $args);
-        // leave nocache mode
-        list($compiler->nocache) = $this->closeTag($compiler, array('nocache'));
-        // this tag does not return compiled code
-        $compiler->has_code = false;
-
-        return true;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_private_block_plugin.php b/www/smarty-3.1.27/sysplugins/smarty_internal_compile_private_block_plugin.php
deleted file mode 100644
index 3dff8538..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_private_block_plugin.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Block Plugin
- * Compiles code for the execution of block plugin
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Block Plugin Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('_any');
-
-    /**
-     * Compiles code for the execution of block plugin
-     *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
-     * @param  string $tag       name of block plugin
-     * @param  string $function  PHP function name
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter, $tag, $function)
-    {
-        if (!isset($tag[5]) || substr($tag, - 5) != 'close') {
-            // opening tag of block plugin
-            // check and get attributes
-            $_attr = $this->getAttributes($compiler, $args);
-            if ($_attr['nocache'] === true) {
-                $compiler->tag_nocache = true;
-            }
-            unset($_attr['nocache']);
-            // convert attributes into parameter array string
-            $_paramsArray = array();
-            foreach ($_attr as $_key => $_value) {
-                if (is_int($_key)) {
-                    $_paramsArray[] = "$_key=>$_value";
-                } else {
-                    $_paramsArray[] = "'$_key'=>$_value";
-                }
-            }
-            $_params = 'array(' . implode(",", $_paramsArray) . ')';
-
-            $this->openTag($compiler, $tag, array($_params, $compiler->nocache));
-            // maybe nocache because of nocache variables or nocache plugin
-            $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-            // compile code
-            $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
-        } else {
-            // must endblock be nocache?
-            if ($compiler->nocache) {
-                $compiler->tag_nocache = true;
-            }
-            // closing tag of block plugin, restore nocache
-            list($_params, $compiler->nocache) = $this->closeTag($compiler, substr($tag, 0, - 5));
-            // This tag does create output
-            $compiler->has_output = true;
-            // compile code
-            if (!isset($parameter['modifier_list'])) {
-                $mod_pre = $mod_post = '';
-            } else {
-                $mod_pre = ' ob_start(); ';
-                $mod_post = 'echo ' . $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifier_list'], 'value' => 'ob_get_clean()')) . ';';
-            }
-            $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;" . $mod_pre . " echo {$function}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); " . $mod_post . " } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
-        }
-
-        return $output . "\n";
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_private_function_plugin.php b/www/smarty-3.1.27/sysplugins/smarty_internal_compile_private_function_plugin.php
deleted file mode 100644
index 4fbd4dc1..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_private_function_plugin.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Function Plugin
- * Compiles code for the execution of function plugin
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Function Plugin Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array();
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('_any');
-
-    /**
-     * Compiles code for the execution of function plugin
-     *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
-     * @param  string $tag       name of function plugin
-     * @param  string $function  PHP function name
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter, $tag, $function)
-    {
-        // This tag does create output
-        $compiler->has_output = true;
-
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        if ($_attr['nocache'] === true) {
-            $compiler->tag_nocache = true;
-        }
-        unset($_attr['nocache']);
-        // convert attributes into parameter array string
-        $_paramsArray = array();
-        foreach ($_attr as $_key => $_value) {
-            if (is_int($_key)) {
-                $_paramsArray[] = "$_key=>$_value";
-            } else {
-                $_paramsArray[] = "'$_key'=>$_value";
-            }
-        }
-        $_params = 'array(' . implode(",", $_paramsArray) . ')';
-        // compile code
-        $output = "<?php echo {$function}({$_params},\$_smarty_tpl);?>\n";
-
-        return $output;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_private_modifier.php b/www/smarty-3.1.27/sysplugins/smarty_internal_compile_private_modifier.php
deleted file mode 100644
index ba03bfcf..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_private_modifier.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-
-/**
- * Smarty Internal Plugin Compile Modifier
- * Compiles code for modifier execution
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Modifier Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for modifier execution
-     *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $output = $parameter['value'];
-        // loop over list of modifiers
-        foreach ($parameter['modifierlist'] as $single_modifier) {
-            $modifier = $single_modifier[0];
-            $single_modifier[0] = $output;
-            $params = implode(',', $single_modifier);
-            // check if we know already the type of modifier
-            if (isset($compiler->known_modifier_type[$modifier])) {
-                $modifier_types = array($compiler->known_modifier_type[$modifier]);
-            } else {
-                $modifier_types = array(1, 2, 3, 4, 5, 6);
-            }
-            foreach ($modifier_types as $type) {
-                switch ($type) {
-                    case 1:
-                        // registered modifier
-                        if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][$modifier])) {
-                            $function = $compiler->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][$modifier][0];
-                            if (!is_array($function)) {
-                                $output = "{$function}({$params})";
-                            } else {
-                                if (is_object($function[0])) {
-                                    $output = '$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][\'' . $modifier . '\'][0][0]->' . $function[1] . '(' . $params . ')';
-                                } else {
-                                    $output = $function[0] . '::' . $function[1] . '(' . $params . ')';
-                                }
-                            }
-                            $compiler->known_modifier_type[$modifier] = $type;
-                            break 2;
-                        }
-                        break;
-                    case 2:
-                        // registered modifier compiler
-                        if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_MODIFIERCOMPILER][$modifier][0])) {
-                            $output = call_user_func($compiler->smarty->registered_plugins[Smarty::PLUGIN_MODIFIERCOMPILER][$modifier][0], $single_modifier, $compiler->smarty);
-                            $compiler->known_modifier_type[$modifier] = $type;
-                            break 2;
-                        }
-                        break;
-                    case 3:
-                        // modifiercompiler plugin
-                        if ($compiler->smarty->loadPlugin('smarty_modifiercompiler_' . $modifier)) {
-                            // check if modifier allowed
-                            if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)) {
-                                $plugin = 'smarty_modifiercompiler_' . $modifier;
-                                $output = $plugin($single_modifier, $compiler);
-                            }
-                            $compiler->known_modifier_type[$modifier] = $type;
-                            break 2;
-                        }
-                        break;
-                    case 4:
-                        // modifier plugin
-                        if ($function = $compiler->getPlugin($modifier, Smarty::PLUGIN_MODIFIER)) {
-                            // check if modifier allowed
-                            if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)) {
-                                $output = "{$function}({$params})";
-                            }
-                            $compiler->known_modifier_type[$modifier] = $type;
-                            break 2;
-                        }
-                        break;
-                    case 5:
-                        // PHP function
-                        if (is_callable($modifier)) {
-                            // check if modifier allowed
-                            if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedPhpModifier($modifier, $compiler)) {
-                                $output = "{$modifier}({$params})";
-                            }
-                            $compiler->known_modifier_type[$modifier] = $type;
-                            break 2;
-                        }
-                        break;
-                    case 6:
-                        // default plugin handler
-                        if (isset($compiler->default_handler_plugins[Smarty::PLUGIN_MODIFIER][$modifier]) || (is_callable($compiler->smarty->default_plugin_handler_func) && $compiler->getPluginFromDefaultHandler($modifier, Smarty::PLUGIN_MODIFIER))) {
-                            $function = $compiler->default_handler_plugins[Smarty::PLUGIN_MODIFIER][$modifier][0];
-                            // check if modifier allowed
-                            if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)) {
-                                if (!is_array($function)) {
-                                    $output = "{$function}({$params})";
-                                } else {
-                                    if (is_object($function[0])) {
-                                        $output = '$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][\'' . $modifier . '\'][0][0]->' . $function[1] . '(' . $params . ')';
-                                    } else {
-                                        $output = $function[0] . '::' . $function[1] . '(' . $params . ')';
-                                    }
-                                }
-                            }
-                            if (isset($compiler->template->required_plugins['nocache'][$modifier][Smarty::PLUGIN_MODIFIER]['file']) || isset($compiler->template->required_plugins['compiled'][$modifier][Smarty::PLUGIN_MODIFIER]['file'])) {
-                                // was a plugin
-                                $compiler->known_modifier_type[$modifier] = 4;
-                            } else {
-                                $compiler->known_modifier_type[$modifier] = $type;
-                            }
-                            break 2;
-                        }
-                }
-            }
-            if (!isset($compiler->known_modifier_type[$modifier])) {
-                $compiler->trigger_template_error("unknown modifier \"" . $modifier . "\"", $compiler->lex->taglineno);
-            }
-        }
-
-        return $output;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_private_object_block_function.php b/www/smarty-3.1.27/sysplugins/smarty_internal_compile_private_object_block_function.php
deleted file mode 100644
index 5418feff..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_private_object_block_function.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Object Block Function
- * Compiles code for registered objects as block function
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Object Block Function Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Object_Block_Function extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('_any');
-
-    /**
-     * Compiles code for the execution of block plugin
-     *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
-     * @param  string $tag       name of block object
-     * @param  string $method    name of method to call
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter, $tag, $method)
-    {
-        if (!isset($tag[5]) || substr($tag, - 5) != 'close') {
-            // opening tag of block plugin
-            // check and get attributes
-            $_attr = $this->getAttributes($compiler, $args);
-            if ($_attr['nocache'] === true) {
-                $compiler->tag_nocache = true;
-            }
-            unset($_attr['nocache']);
-            // convert attributes into parameter array string
-            $_paramsArray = array();
-            foreach ($_attr as $_key => $_value) {
-                if (is_int($_key)) {
-                    $_paramsArray[] = "$_key=>$_value";
-                } else {
-                    $_paramsArray[] = "'$_key'=>$_value";
-                }
-            }
-            $_params = 'array(' . implode(",", $_paramsArray) . ')';
-
-            $this->openTag($compiler, $tag . '->' . $method, array($_params, $compiler->nocache));
-            // maybe nocache because of nocache variables or nocache plugin
-            $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-            // compile code
-            $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}->{$method}', {$_params}); \$_block_repeat=true; echo \$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
-        } else {
-            $base_tag = substr($tag, 0, - 5);
-            // must endblock be nocache?
-            if ($compiler->nocache) {
-                $compiler->tag_nocache = true;
-            }
-            // closing tag of block plugin, restore nocache
-            list($_params, $compiler->nocache) = $this->closeTag($compiler, $base_tag . '->' . $method);
-            // This tag does create output
-            $compiler->has_output = true;
-            // compile code
-            if (!isset($parameter['modifier_list'])) {
-                $mod_pre = $mod_post = '';
-            } else {
-                $mod_pre = ' ob_start(); ';
-                $mod_post = 'echo ' . $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifier_list'], 'value' => 'ob_get_clean()')) . ';';
-            }
-            $output = "<?php \$_block_content = ob_get_contents(); ob_end_clean(); \$_block_repeat=false;" . $mod_pre . " echo \$_smarty_tpl->smarty->registered_objects['{$base_tag}'][0]->{$method}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); " . $mod_post . "  } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
-        }
-
-        return $output . "\n";
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_private_object_function.php b/www/smarty-3.1.27/sysplugins/smarty_internal_compile_private_object_function.php
deleted file mode 100644
index d6eb47ab..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_private_object_function.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Object Function
- * Compiles code for registered objects as function
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Object Function Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('_any');
-
-    /**
-     * Compiles code for the execution of function plugin
-     *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
-     * @param  string $tag       name of function
-     * @param  string $method    name of method to call
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter, $tag, $method)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        if ($_attr['nocache'] === true) {
-            $compiler->tag_nocache = true;
-        }
-        unset($_attr['nocache']);
-        $_assign = null;
-        if (isset($_attr['assign'])) {
-            $_assign = $_attr['assign'];
-            unset($_attr['assign']);
-        }
-        // method or property ?
-        if (method_exists($compiler->smarty->registered_objects[$tag][0], $method)) {
-            // convert attributes into parameter array string
-            if ($compiler->smarty->registered_objects[$tag][2]) {
-                $_paramsArray = array();
-                foreach ($_attr as $_key => $_value) {
-                    if (is_int($_key)) {
-                        $_paramsArray[] = "$_key=>$_value";
-                    } else {
-                        $_paramsArray[] = "'$_key'=>$_value";
-                    }
-                }
-                $_params = 'array(' . implode(",", $_paramsArray) . ')';
-                $return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params},\$_smarty_tpl)";
-            } else {
-                $_params = implode(",", $_attr);
-                $return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params})";
-            }
-        } else {
-            // object property
-            $return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}";
-        }
-
-        if (empty($_assign)) {
-            // This tag does create output
-            $compiler->has_output = true;
-            $output = "<?php echo {$return};?>\n";
-        } else {
-            $output = "<?php \$_smarty_tpl->assign({$_assign},{$return});?>\n";
-        }
-
-        return $output;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_private_php.php b/www/smarty-3.1.27/sysplugins/smarty_internal_compile_private_php.php
deleted file mode 100644
index 0b795819..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_private_php.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile PHP Expression
- * Compiles any tag which will output an expression or variable
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile PHP Expression Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Php extends Smarty_Internal_CompileBase
-{
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('code', 'type');
-
-    /**
-     * Compiles code for generating output from any expression
-     *
-     * @param array                                 $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param array                                 $parameter array with compilation parameter
-     *
-     * @return string
-     * @throws \SmartyException
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $compiler->has_code = false;
-        if ($_attr['type'] == 'xml') {
-            $compiler->tag_nocache = true;
-            $save = $compiler->template->has_nocache_code;
-            $output = addcslashes($_attr['code'], "'\\");
-            $compiler->parser->current_buffer->append_subtree(new Smarty_Internal_ParseTree_Tag($compiler->parser, $compiler->processNocacheCode("<?php echo '" . $output . "';?>", $compiler, true)));
-            $compiler->template->has_nocache_code = $save;
-            return '';
-        }
-        if ($_attr['type'] != 'tag') {
-            if ($compiler->php_handling == Smarty::PHP_REMOVE) {
-                return '';
-            } elseif ($compiler->php_handling == Smarty::PHP_QUOTE) {
-                $output = preg_replace_callback('#(<\?(?:php|=)?)|(<%)|(<script\s+language\s*=\s*["\']?\s*php\s*["\']?\s*>)|(\?>)|(%>)|(<\/script>)#i', array($this,
-                    'quote'), $_attr['code']);
-                $compiler->parser->current_buffer->append_subtree(new Smarty_Internal_ParseTree_Text($compiler->parser, $output));
-                return '';
-            } elseif ($compiler->php_handling == Smarty::PHP_PASSTHRU || $_attr['type'] == 'unmatched') {
-                $compiler->tag_nocache = true;
-                $save = $compiler->template->has_nocache_code;
-                $output = addcslashes($_attr['code'], "'\\");
-                $compiler->parser->current_buffer->append_subtree(new Smarty_Internal_ParseTree_Tag($compiler->parser, $compiler->processNocacheCode("<?php echo '" . $output . "';?>", $compiler, true)));
-                $compiler->template->has_nocache_code = $save;
-                return '';
-            } elseif ($compiler->php_handling == Smarty::PHP_ALLOW) {
-                if (!($compiler->smarty instanceof SmartyBC)) {
-                    $compiler->trigger_template_error('$smarty->php_handling PHP_ALLOW not allowed. Use SmartyBC to enable it', $compiler->lex->taglineno);
-                }
-                $compiler->has_code = true;
-                return $_attr['code'];
-            } else {
-                $compiler->trigger_template_error('Illegal $smarty->php_handling value', $compiler->lex->taglineno);
-            }
-        } else {
-            $compiler->has_code = true;
-            if (!($compiler->smarty instanceof SmartyBC)) {
-                $compiler->trigger_template_error('{php}[/php} tags not allowed. Use SmartyBC to enable them', $compiler->lex->taglineno);
-            }
-            $ldel = preg_quote($compiler->smarty->left_delimiter, '#');
-            $rdel = preg_quote($compiler->smarty->right_delimiter, '#');
-            preg_match("#^({$ldel}php\\s*)((.)*?)({$rdel})#", $_attr['code'], $match);
-            if (!empty($match[2])) {
-                if ('nocache' == trim($match[2])) {
-                    $compiler->tag_nocache = true;
-                } else {
-                    $compiler->trigger_template_error("illegal value of option flag \"{$match[2]}\"", $compiler->lex->taglineno);
-                }
-            }
-            return preg_replace(array("#^{$ldel}\\s*php\\s*(.)*?{$rdel}#",
-                                    "#{$ldel}\\s*/\\s*php\\s*{$rdel}$#"), array('<?php ', '?>'), $_attr['code']);
-        }
-    }
-
-    /**
-     * Lexer code for PHP tags
-     *
-     * This code has been moved from lexer here fo easier debugging and maintenance
-     *
-     * @param $lex
-     */
-    public function parsePhp($lex)
-    {
-        $lex->token = Smarty_Internal_Templateparser::TP_PHP;
-        $close = 0;
-        $lex->taglineno = $lex->line;
-        $closeTag = '?>';
-        if (strpos($lex->value, '<?xml') === 0) {
-            $lex->is_xml = true;
-            $lex->token = Smarty_Internal_Templateparser::TP_NOCACHE;
-            return;
-        } elseif (strpos($lex->value, '<?') === 0) {
-            $lex->phpType = 'php';
-        } elseif (strpos($lex->value, '<%') === 0) {
-            $lex->phpType = 'asp';
-            $closeTag = '%>';
-        } elseif (strpos($lex->value, '%>') === 0) {
-            $lex->phpType = 'unmatched';
-        } elseif (strpos($lex->value, '?>') === 0) {
-            if ($lex->is_xml) {
-                $lex->is_xml = false;
-                $lex->token = Smarty_Internal_Templateparser::TP_NOCACHE;
-                return;
-            }
-            $lex->phpType = 'unmatched';
-        } elseif (strpos($lex->value, '<s') === 0) {
-            $lex->phpType = 'script';
-            $closeTag = '</script>';
-        } elseif (strpos($lex->value, $lex->smarty->left_delimiter) === 0) {
-            if ($lex->isAutoLiteral()) {
-                $lex->token = Smarty_Internal_Templateparser::TP_TEXT;
-                return;
-            }
-            $closeTag = "{$lex->smarty->left_delimiter}/php{$lex->smarty->right_delimiter}";
-            if ($lex->value == $closeTag) {
-                $lex->compiler->trigger_template_error("unexpected closing tag '{$closeTag}'");
-            }
-            $lex->phpType = 'tag';
-        }
-        if ($lex->phpType == 'unmatched') {
-            return;
-        }
-        if (($lex->phpType == 'php' || $lex->phpType == 'asp') && ($lex->compiler->php_handling == Smarty::PHP_PASSTHRU || $lex->compiler->php_handling == Smarty::PHP_QUOTE)) {
-            return;
-        }
-        $start = $lex->counter + strlen($lex->value);
-        $body = true;
-        if (preg_match('~' . preg_quote($closeTag, '~') . '~i', $lex->data, $match, PREG_OFFSET_CAPTURE, $start)) {
-            $close = $match[0][1];
-        } else {
-            $lex->compiler->trigger_template_error("missing closing tag '{$closeTag}'");
-        }
-        while ($body) {
-            if (preg_match('~([/][*])|([/][/][^\n]*)|(\'[^\'\\\\]*(?:\\.[^\'\\\\]*)*\')|("[^"\\\\]*(?:\\.[^"\\\\]*)*")~', $lex->data, $match, PREG_OFFSET_CAPTURE, $start)) {
-                $value = $match[0][0];
-                $from = $pos = $match[0][1];
-                if ($pos > $close) {
-                    $body = false;
-                } else {
-                    $start = $pos + strlen($value);
-                    $phpCommentStart = $value == '/*';
-                    if ($phpCommentStart) {
-                        $phpCommentEnd = preg_match('~([*][/])~', $lex->data, $match, PREG_OFFSET_CAPTURE, $start);
-                        if ($phpCommentEnd) {
-                            $pos2 = $match[0][1];
-                            $start = $pos2 + strlen($match[0][0]);
-                        }
-                    }
-                    while ($close > $pos && $close < $start) {
-                        if (preg_match('~' . preg_quote($closeTag, '~') . '~i', $lex->data, $match, PREG_OFFSET_CAPTURE, $from)) {
-                            $close = $match[0][1];
-                            $from = $close + strlen($match[0][0]);
-                        } else {
-                            $lex->compiler->trigger_template_error("missing closing tag '{$closeTag}'");
-                        }
-                    }
-                    if ($phpCommentStart && (!$phpCommentEnd || $pos2 > $close)) {
-                        $lex->taglineno = $lex->line + substr_count(substr($lex->data, $lex->counter, $start), "\n");
-                        $lex->compiler->trigger_template_error("missing PHP comment closing tag '*/'");
-                    }
-                }
-            } else {
-                $body = false;
-            }
-        }
-        $lex->value = substr($lex->data, $lex->counter, $close + strlen($closeTag) - $lex->counter);
-    }
-
-    /*
-     * Call back function for $php_handling = PHP_QUOTE
-     *
-     */
-    private function quote($match)
-    {
-        return htmlspecialchars($match[0], ENT_QUOTES);
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_private_print_expression.php b/www/smarty-3.1.27/sysplugins/smarty_internal_compile_private_print_expression.php
deleted file mode 100644
index 188bbe77..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_private_print_expression.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Print Expression
- * Compiles any tag which will output an expression or variable
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Print Expression Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('assign');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $option_flags = array('nocache', 'nofilter');
-
-    /**
-     * Compiles code for generating output from any expression
-     *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
-     *
-     * @throws SmartyException
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        // nocache option
-        if ($_attr['nocache'] === true) {
-            $compiler->tag_nocache = true;
-        }
-        if (isset($_attr['assign'])) {
-            // assign output to variable
-            $output = "<?php \$_smarty_tpl->assign({$_attr['assign']},{$parameter['value']});?>";
-        } else {
-            // display value
-            $output = $parameter['value'];
-            // tag modifier
-            if (!empty($parameter['modifierlist'])) {
-                $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifierlist'], 'value' => $output));
-            }
-            if (!$_attr['nofilter']) {
-                // default modifier
-                if (!empty($compiler->smarty->default_modifiers)) {
-                    if (empty($compiler->default_modifier_list)) {
-                        $modifierlist = array();
-                        foreach ($compiler->smarty->default_modifiers as $key => $single_default_modifier) {
-                            preg_match_all('/(\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'|"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"|:|[^:]+)/', $single_default_modifier, $mod_array);
-                            for ($i = 0, $count = count($mod_array[0]); $i < $count; $i ++) {
-                                if ($mod_array[0][$i] != ':') {
-                                    $modifierlist[$key][] = $mod_array[0][$i];
-                                }
-                            }
-                        }
-                        $compiler->default_modifier_list = $modifierlist;
-                    }
-                    $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => $compiler->default_modifier_list, 'value' => $output));
-                }
-                // autoescape html
-                if ($compiler->template->smarty->escape_html) {
-                    $output = "htmlspecialchars({$output}, ENT_QUOTES, '" . addslashes(Smarty::$_CHARSET) . "')";
-                }
-                // loop over registered filters
-                if (!empty($compiler->template->smarty->registered_filters[Smarty::FILTER_VARIABLE])) {
-                    foreach ($compiler->template->smarty->registered_filters[Smarty::FILTER_VARIABLE] as $key => $function) {
-                        if (!is_array($function)) {
-                            $output = "{$function}({$output},\$_smarty_tpl)";
-                        } elseif (is_object($function[0])) {
-                            $output = "\$_smarty_tpl->smarty->registered_filters[Smarty::FILTER_VARIABLE]['{$key}'][0]->{$function[1]}({$output},\$_smarty_tpl)";
-                        } else {
-                            $output = "{$function[0]}::{$function[1]}({$output},\$_smarty_tpl)";
-                        }
-                    }
-                }
-                // auto loaded filters
-                if (isset($compiler->smarty->autoload_filters[Smarty::FILTER_VARIABLE])) {
-                    foreach ((array) $compiler->template->smarty->autoload_filters[Smarty::FILTER_VARIABLE] as $name) {
-                        $result = $this->compile_output_filter($compiler, $name, $output);
-                        if ($result !== false) {
-                            $output = $result;
-                        } else {
-                            // not found, throw exception
-                            throw new SmartyException("Unable to load filter '{$name}'");
-                        }
-                    }
-                }
-                if (isset($compiler->template->variable_filters)) {
-                    foreach ($compiler->template->variable_filters as $filter) {
-                        if (count($filter) == 1 && ($result = $this->compile_output_filter($compiler, $filter[0], $output)) !== false) {
-                            $output = $result;
-                        } else {
-                            $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => array($filter), 'value' => $output));
-                        }
-                    }
-                }
-            }
-
-            $compiler->has_output = true;
-            $output = "<?php echo {$output};?>";
-        }
-
-        return $output;
-    }
-
-    /**
-     * @param object $compiler compiler object
-     * @param string $name     name of variable filter
-     * @param string   $output   embedded output
-     *
-     * @return string
-     */
-    private function compile_output_filter($compiler, $name, $output)
-    {
-        $plugin_name = "smarty_variablefilter_{$name}";
-        $path = $compiler->smarty->loadPlugin($plugin_name, false);
-        if ($path) {
-            if ($compiler->template->caching) {
-                $compiler->template->required_plugins['nocache'][$name][Smarty::FILTER_VARIABLE]['file'] = $path;
-                $compiler->template->required_plugins['nocache'][$name][Smarty::FILTER_VARIABLE]['function'] = $plugin_name;
-            } else {
-                $compiler->template->required_plugins['compiled'][$name][Smarty::FILTER_VARIABLE]['file'] = $path;
-                $compiler->template->required_plugins['compiled'][$name][Smarty::FILTER_VARIABLE]['function'] = $plugin_name;
-            }
-        } else {
-            // not found
-            return false;
-        }
-
-        return "{$plugin_name}({$output},\$_smarty_tpl)";
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_private_registered_block.php b/www/smarty-3.1.27/sysplugins/smarty_internal_compile_private_registered_block.php
deleted file mode 100644
index 68ab644f..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_private_registered_block.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Registered Block
- * Compiles code for the execution of a registered block function
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Registered Block Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('_any');
-
-    /**
-     * Compiles code for the execution of a block function
-     *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
-     * @param  string $tag       name of block function
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter, $tag)
-    {
-        if (!isset($tag[5]) || substr($tag, - 5) != 'close') {
-            // opening tag of block plugin
-            // check and get attributes
-            $_attr = $this->getAttributes($compiler, $args);
-            if ($_attr['nocache']) {
-                $compiler->tag_nocache = true;
-            }
-            unset($_attr['nocache']);
-            if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$tag])) {
-                $tag_info = $compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$tag];
-            } else {
-                $tag_info = $compiler->default_handler_plugins[Smarty::PLUGIN_BLOCK][$tag];
-            }
-            // convert attributes into parameter array string
-            $_paramsArray = array();
-            foreach ($_attr as $_key => $_value) {
-                if (is_int($_key)) {
-                    $_paramsArray[] = "$_key=>$_value";
-                } elseif ($compiler->template->caching && in_array($_key, $tag_info[2])) {
-                    $_value = str_replace("'", "^#^", $_value);
-                    $_paramsArray[] = "'$_key'=>^#^.var_export($_value,true).^#^";
-                } else {
-                    $_paramsArray[] = "'$_key'=>$_value";
-                }
-            }
-            $_params = 'array(' . implode(",", $_paramsArray) . ')';
-
-            $this->openTag($compiler, $tag, array($_params, $compiler->nocache));
-            // maybe nocache because of nocache variables or nocache plugin
-            $compiler->nocache = !$tag_info[1] | $compiler->nocache | $compiler->tag_nocache;
-            $function = $tag_info[0];
-            // compile code
-            if (!is_array($function)) {
-                $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
-            } elseif (is_object($function[0])) {
-                $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo \$_smarty_tpl->smarty->registered_plugins['block']['{$tag}'][0][0]->{$function[1]}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
-            } else {
-                $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function[0]}::{$function[1]}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
-            }
-        } else {
-            // must endblock be nocache?
-            if ($compiler->nocache) {
-                $compiler->tag_nocache = true;
-            }
-            $base_tag = substr($tag, 0, - 5);
-            // closing tag of block plugin, restore nocache
-            list($_params, $compiler->nocache) = $this->closeTag($compiler, $base_tag);
-            // This tag does create output
-            $compiler->has_output = true;
-            if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag])) {
-                $function = $compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag][0];
-            } else {
-                $function = $compiler->default_handler_plugins[Smarty::PLUGIN_BLOCK][$base_tag][0];
-            }
-            // compile code
-            if (!isset($parameter['modifier_list'])) {
-                $mod_pre = $mod_post = '';
-            } else {
-                $mod_pre = ' ob_start(); ';
-                $mod_post = 'echo ' . $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifier_list'], 'value' => 'ob_get_clean()')) . ';';
-            }
-            if (!is_array($function)) {
-                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;" . $mod_pre . " echo {$function}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat);" . $mod_post . " } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
-            } elseif (is_object($function[0])) {
-                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;" . $mod_pre . " echo \$_smarty_tpl->smarty->registered_plugins['block']['{$base_tag}'][0][0]->{$function[1]}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); " . $mod_post . "} array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
-            } else {
-                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;" . $mod_pre . " echo {$function[0]}::{$function[1]}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); " . $mod_post . "} array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
-            }
-        }
-
-        return $output . "\n";
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_private_registered_function.php b/www/smarty-3.1.27/sysplugins/smarty_internal_compile_private_registered_function.php
deleted file mode 100644
index dfb4572f..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_private_registered_function.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Registered Function
- * Compiles code for the execution of a registered function
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Registered Function Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('_any');
-
-    /**
-     * Compiles code for the execution of a registered function
-     *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
-     * @param  string $tag       name of function
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter, $tag)
-    {
-        // This tag does create output
-        $compiler->has_output = true;
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        if ($_attr['nocache']) {
-            $compiler->tag_nocache = true;
-        }
-        unset($_attr['nocache']);
-        if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION][$tag])) {
-            $tag_info = $compiler->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION][$tag];
-        } else {
-            $tag_info = $compiler->default_handler_plugins[Smarty::PLUGIN_FUNCTION][$tag];
-        }
-        // not cachable?
-        $compiler->tag_nocache = $compiler->tag_nocache || !$tag_info[1];
-        // convert attributes into parameter array string
-        $_paramsArray = array();
-        foreach ($_attr as $_key => $_value) {
-            if (is_int($_key)) {
-                $_paramsArray[] = "$_key=>$_value";
-            } elseif ($compiler->template->caching && in_array($_key, $tag_info[2])) {
-                $_value = str_replace("'", "^#^", $_value);
-                $_paramsArray[] = "'$_key'=>^#^.var_export($_value,true).^#^";
-            } else {
-                $_paramsArray[] = "'$_key'=>$_value";
-            }
-        }
-        $_params = 'array(' . implode(",", $_paramsArray) . ')';
-        $function = $tag_info[0];
-        // compile code
-        if (!is_array($function)) {
-            $output = "<?php echo {$function}({$_params},\$_smarty_tpl);?>\n";
-        } elseif (is_object($function[0])) {
-            $output = "<?php echo \$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION]['{$tag}'][0][0]->{$function[1]}({$_params},\$_smarty_tpl);?>\n";
-        } else {
-            $output = "<?php echo {$function[0]}::{$function[1]}({$_params},\$_smarty_tpl);?>\n";
-        }
-
-        return $output;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_private_special_variable.php b/www/smarty-3.1.27/sysplugins/smarty_internal_compile_private_special_variable.php
deleted file mode 100644
index 525bc0db..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_private_special_variable.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Special Smarty Variable
- * Compiles the special $smarty variables
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile special Smarty Variable Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the special $smarty variables
-     *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
-     * @param         $parameter
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        $_index = preg_split("/\]\[/", substr($parameter, 1, strlen($parameter) - 2));
-        $compiled_ref = ' ';
-        $variable = trim($_index[0], "'");
-        if (!isset($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedSpecialSmartyVar($variable, $compiler)) {
-            switch ($variable) {
-                case 'foreach':
-                    $name = trim($_index[1], "'");
-                    $foreachVar = "'__foreach_{$name}'";
-                    return "(isset(\$_smarty_tpl->tpl_vars[$foreachVar]->value[{$_index[2]}]) ? \$_smarty_tpl->tpl_vars[$foreachVar]->value[{$_index[2]}] : null)";
-                case 'section':
-                    return "\$_smarty_tpl->getVariable('smarty')->value$parameter";
-                case 'capture':
-                    return "Smarty::\$_smarty_vars$parameter";
-                case 'now':
-                    return 'time()';
-                case 'cookies':
-                    if (isset($compiler->smarty->security_policy) && !$compiler->smarty->security_policy->allow_super_globals) {
-                        $compiler->trigger_template_error("(secure mode) super globals not permitted");
-                        break;
-                    }
-                    $compiled_ref = '$_COOKIE';
-                    break;
-
-                case 'get':
-                case 'post':
-                case 'env':
-                case 'server':
-                case 'session':
-                case 'request':
-                    if (isset($compiler->smarty->security_policy) && !$compiler->smarty->security_policy->allow_super_globals) {
-                        $compiler->trigger_template_error("(secure mode) super globals not permitted");
-                        break;
-                    }
-                    $compiled_ref = '$_' . strtoupper($variable);
-                    break;
-
-                case 'template':
-                    return 'basename($_smarty_tpl->source->filepath)';
-
-                case 'template_object':
-                    return '$_smarty_tpl';
-
-                case 'current_dir':
-                    return 'dirname($_smarty_tpl->source->filepath)';
-
-                case 'version':
-                    $_version = Smarty::SMARTY_VERSION;
-
-                    return "'$_version'";
-
-                case 'const':
-                    if (isset($compiler->smarty->security_policy) && !$compiler->smarty->security_policy->allow_constants) {
-                        $compiler->trigger_template_error("(secure mode) constants not permitted");
-                        break;
-                    }
-                    if (strpos($_index[1], '$') === false && strpos($_index[1], '\'') === false ) {
-                        return "@constant('{$_index[1]}')";
-                    } else {
-                        return "@constant({$_index[1]})";
-                    }
-
-                case 'config':
-                    if (isset($_index[2])) {
-                        return "(is_array(\$tmp = \$_smarty_tpl->getConfigVariable($_index[1])) ? \$tmp[$_index[2]] : null)";
-                    } else {
-                        return "\$_smarty_tpl->getConfigVariable($_index[1])";
-                    }
-                case 'ldelim':
-                    $_ldelim = $compiler->smarty->left_delimiter;
-
-                    return "'$_ldelim'";
-
-                case 'rdelim':
-                    $_rdelim = $compiler->smarty->right_delimiter;
-
-                    return "'$_rdelim'";
-
-                default:
-                    $compiler->trigger_template_error('$smarty.' . trim($_index[0], "'") . ' is invalid');
-                    break;
-            }
-            if (isset($_index[1])) {
-                array_shift($_index);
-                foreach ($_index as $_ind) {
-                    $compiled_ref = $compiled_ref . "[$_ind]";
-                }
-            }
-        }
-        return $compiled_ref;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_rdelim.php b/www/smarty-3.1.27/sysplugins/smarty_internal_compile_rdelim.php
deleted file mode 100644
index dcff2ae4..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_rdelim.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Rdelim
- * Compiles the {rdelim} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Rdelim Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Rdelim extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {rdelim} tag
-     * This tag does output the right delimiter.
-     *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        $_attr = $this->getAttributes($compiler, $args);
-        if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
-        }
-        // this tag does not return compiled code
-        $compiler->has_code = true;
-
-        return $compiler->smarty->right_delimiter;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_section.php b/www/smarty-3.1.27/sysplugins/smarty_internal_compile_section.php
deleted file mode 100644
index 5ac3fb06..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_section.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Section
- * Compiles the {section} {sectionelse} {/section} tags
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Section Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Section extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('name', 'loop');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('name', 'loop');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('start', 'step', 'max', 'show');
-
-    /**
-     * Compiles code for the {section} tag
-     *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        $this->openTag($compiler, 'section', array('section', $compiler->nocache));
-        // maybe nocache because of nocache variables
-        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-
-        $output = "<?php ";
-
-        $section_name = $_attr['name'];
-
-        $output .= "if (isset(\$_smarty_tpl->tpl_vars['smarty']->value['section'][$section_name])) unset(\$_smarty_tpl->tpl_vars['smarty']->value['section'][$section_name]);\n";
-        $section_props = "\$_smarty_tpl->tpl_vars['smarty']->value['section'][$section_name]";
-
-        foreach ($_attr as $attr_name => $attr_value) {
-            switch ($attr_name) {
-                case 'loop':
-                    $output .= "{$section_props}['loop'] = is_array(\$_loop=$attr_value) ? count(\$_loop) : max(0, (int) \$_loop); unset(\$_loop);\n";
-                    break;
-
-                case 'show':
-                    if (is_bool($attr_value)) {
-                        $show_attr_value = $attr_value ? 'true' : 'false';
-                    } else {
-                        $show_attr_value = "(bool) $attr_value";
-                    }
-                    $output .= "{$section_props}['show'] = $show_attr_value;\n";
-                    break;
-
-                case 'name':
-                    $output .= "{$section_props}['$attr_name'] = $attr_value;\n";
-                    break;
-
-                case 'max':
-                case 'start':
-                    $output .= "{$section_props}['$attr_name'] = (int) $attr_value;\n";
-                    break;
-
-                case 'step':
-                    $output .= "{$section_props}['$attr_name'] = ((int) $attr_value) == 0 ? 1 : (int) $attr_value;\n";
-                    break;
-            }
-        }
-
-        if (!isset($_attr['show'])) {
-            $output .= "{$section_props}['show'] = true;\n";
-        }
-
-        if (!isset($_attr['loop'])) {
-            $output .= "{$section_props}['loop'] = 1;\n";
-        }
-
-        if (!isset($_attr['max'])) {
-            $output .= "{$section_props}['max'] = {$section_props}['loop'];\n";
-        } else {
-            $output .= "if ({$section_props}['max'] < 0)\n" . "    {$section_props}['max'] = {$section_props}['loop'];\n";
-        }
-
-        if (!isset($_attr['step'])) {
-            $output .= "{$section_props}['step'] = 1;\n";
-        }
-
-        if (!isset($_attr['start'])) {
-            $output .= "{$section_props}['start'] = {$section_props}['step'] > 0 ? 0 : {$section_props}['loop']-1;\n";
-        } else {
-            $output .= "if ({$section_props}['start'] < 0)\n" . "    {$section_props}['start'] = max({$section_props}['step'] > 0 ? 0 : -1, {$section_props}['loop'] + {$section_props}['start']);\n" . "else\n" . "    {$section_props}['start'] = min({$section_props}['start'], {$section_props}['step'] > 0 ? {$section_props}['loop'] : {$section_props}['loop']-1);\n";
-        }
-
-        $output .= "if ({$section_props}['show']) {\n";
-        if (!isset($_attr['start']) && !isset($_attr['step']) && !isset($_attr['max'])) {
-            $output .= "    {$section_props}['total'] = {$section_props}['loop'];\n";
-        } else {
-            $output .= "    {$section_props}['total'] = min(ceil(({$section_props}['step'] > 0 ? {$section_props}['loop'] - {$section_props}['start'] : {$section_props}['start']+1)/abs({$section_props}['step'])), {$section_props}['max']);\n";
-        }
-        $output .= "    if ({$section_props}['total'] == 0)\n" . "        {$section_props}['show'] = false;\n" . "} else\n" . "    {$section_props}['total'] = 0;\n";
-
-        $output .= "if ({$section_props}['show']):\n";
-        $output .= "
-            for ({$section_props}['index'] = {$section_props}['start'], {$section_props}['iteration'] = 1;
-                 {$section_props}['iteration'] <= {$section_props}['total'];
-                 {$section_props}['index'] += {$section_props}['step'], {$section_props}['iteration']++):\n";
-        $output .= "{$section_props}['rownum'] = {$section_props}['iteration'];\n";
-        $output .= "{$section_props}['index_prev'] = {$section_props}['index'] - {$section_props}['step'];\n";
-        $output .= "{$section_props}['index_next'] = {$section_props}['index'] + {$section_props}['step'];\n";
-        $output .= "{$section_props}['first']      = ({$section_props}['iteration'] == 1);\n";
-        $output .= "{$section_props}['last']       = ({$section_props}['iteration'] == {$section_props}['total']);\n";
-
-        $output .= "?>";
-
-        return $output;
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Sectionelse Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Sectionelse extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {sectionelse} tag
-     *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        list($openTag, $nocache) = $this->closeTag($compiler, array('section'));
-        $this->openTag($compiler, 'sectionelse', array('sectionelse', $nocache));
-
-        return "<?php endfor; else: ?>";
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Sectionclose Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Sectionclose extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {/section} tag
-     *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        // must endblock be nocache?
-        if ($compiler->nocache) {
-            $compiler->tag_nocache = true;
-        }
-
-        list($openTag, $compiler->nocache) = $this->closeTag($compiler, array('section', 'sectionelse'));
-
-        if ($openTag == 'sectionelse') {
-            return "<?php endif; ?>";
-        } else {
-            return "<?php endfor; endif; ?>";
-        }
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_setfilter.php b/www/smarty-3.1.27/sysplugins/smarty_internal_compile_setfilter.php
deleted file mode 100644
index 8e91ba6d..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_setfilter.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Setfilter
- * Compiles code for setfilter tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Setfilter Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Setfilter extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for setfilter tag
-     *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        $compiler->variable_filter_stack[] = $compiler->template->variable_filters;
-        $compiler->template->variable_filters = $parameter['modifier_list'];
-        // this tag does not return compiled code
-        $compiler->has_code = false;
-
-        return true;
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Setfilterclose Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Setfilterclose extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {/setfilter} tag
-     * This tag does not generate compiled output. It resets variable filter.
-     *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        $_attr = $this->getAttributes($compiler, $args);
-        // reset variable filter to previous state
-        if (count($compiler->variable_filter_stack)) {
-            $compiler->template->variable_filters = array_pop($compiler->variable_filter_stack);
-        } else {
-            $compiler->template->variable_filters = array();
-        }
-        // this tag does not return compiled code
-        $compiler->has_code = false;
-
-        return true;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_while.php b/www/smarty-3.1.27/sysplugins/smarty_internal_compile_while.php
deleted file mode 100644
index 6a6fb3ef..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_compile_while.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile While
- * Compiles the {while} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile While Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_While extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {while} tag
-     *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $this->openTag($compiler, 'while', $compiler->nocache);
-
-        if (!array_key_exists("if condition", $parameter)) {
-            $compiler->trigger_template_error("missing while condition", $compiler->lex->taglineno);
-        }
-
-        // maybe nocache because of nocache variables
-        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-        if (is_array($parameter['if condition'])) {
-            if ($compiler->nocache) {
-                $_nocache = ',true';
-                // create nocache var to make it know for further compiling
-                if (is_array($parameter['if condition']['var'])) {
-                    $var = trim($parameter['if condition']['var']['var'], "'");
-                } else {
-                    $var = trim($parameter['if condition']['var'], "'");
-                }
-                if (isset($compiler->template->tpl_vars[$var])) {
-                    $compiler->template->tpl_vars[$var]->nocache = true;
-                } else {
-                    $compiler->template->tpl_vars[$var] = new Smarty_Variable(null, true);
-                }
-            } else {
-                $_nocache = '';
-            }
-            if (is_array($parameter['if condition']['var'])) {
-                $_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n";
-                $_output .= "while (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . ") {?>";
-            } else {
-                $_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});";
-                $_output .= "while (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . ") {?>";
-            }
-
-            return $_output;
-        } else {
-            return "<?php while ({$parameter['if condition']}) {?>";
-        }
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Whileclose Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Whileclose extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {/while} tag
-     *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        // must endblock be nocache?
-        if ($compiler->nocache) {
-            $compiler->tag_nocache = true;
-        }
-        $compiler->nocache = $this->closeTag($compiler, array('while'));
-
-        return "<?php }?>";
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_compilebase.php b/www/smarty-3.1.27/sysplugins/smarty_internal_compilebase.php
deleted file mode 100644
index f78f15f4..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_compilebase.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin CompileBase
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * This class does extend all internal compile plugins
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-abstract class Smarty_Internal_CompileBase
-{
-    /**
-     * Array of names of required attribute required by tag
-     *
-     * @var array
-     */
-    public $required_attributes = array();
-    /**
-     * Array of names of optional attribute required by tag
-     * use array('_any') if there is no restriction of attributes names
-     *
-     * @var array
-     */
-    public $optional_attributes = array();
-    /**
-     * Shorttag attribute order defined by its names
-     *
-     * @var array
-     */
-    public $shorttag_order = array();
-    /**
-     * Array of names of valid option flags
-     *
-     * @var array
-     */
-    public $option_flags = array('nocache');
-
-    /**
-     * This function checks if the attributes passed are valid
-     * The attributes passed for the tag to compile are checked against the list of required and
-     * optional attributes. Required attributes must be present. Optional attributes are check against
-     * the corresponding list. The keyword '_any' specifies that any attribute will be accepted
-     * as valid
-     *
-     * @param  object $compiler   compiler object
-     * @param  array  $attributes attributes applied to the tag
-     *
-     * @return array  of mapped attributes for further processing
-     */
-    public function getAttributes($compiler, $attributes)
-    {
-        $_indexed_attr = array();
-        // loop over attributes
-        foreach ($attributes as $key => $mixed) {
-            // shorthand ?
-            if (!is_array($mixed)) {
-                // option flag ?
-                if (in_array(trim($mixed, '\'"'), $this->option_flags)) {
-                    $_indexed_attr[trim($mixed, '\'"')] = true;
-                    // shorthand attribute ?
-                } elseif (isset($this->shorttag_order[$key])) {
-                    $_indexed_attr[$this->shorttag_order[$key]] = $mixed;
-                } else {
-                    // too many shorthands
-                    $compiler->trigger_template_error('too many shorthand attributes', $compiler->lex->taglineno);
-                }
-                // named attribute
-            } else {
-                $kv = each($mixed);
-                // option flag?
-                if (in_array($kv['key'], $this->option_flags)) {
-                    if (is_bool($kv['value'])) {
-                        $_indexed_attr[$kv['key']] = $kv['value'];
-                    } elseif (is_string($kv['value']) && in_array(trim($kv['value'], '\'"'), array('true', 'false'))) {
-                        if (trim($kv['value']) == 'true') {
-                            $_indexed_attr[$kv['key']] = true;
-                        } else {
-                            $_indexed_attr[$kv['key']] = false;
-                        }
-                    } elseif (is_numeric($kv['value']) && in_array($kv['value'], array(0, 1))) {
-                        if ($kv['value'] == 1) {
-                            $_indexed_attr[$kv['key']] = true;
-                        } else {
-                            $_indexed_attr[$kv['key']] = false;
-                        }
-                    } else {
-                        $compiler->trigger_template_error("illegal value of option flag \"{$kv['key']}\"", $compiler->lex->taglineno);
-                    }
-                    // must be named attribute
-                } else {
-                    reset($mixed);
-                    $_indexed_attr[key($mixed)] = $mixed[key($mixed)];
-                }
-            }
-        }
-        // check if all required attributes present
-        foreach ($this->required_attributes as $attr) {
-            if (!array_key_exists($attr, $_indexed_attr)) {
-                $compiler->trigger_template_error("missing \"" . $attr . "\" attribute", $compiler->lex->taglineno);
-            }
-        }
-        // check for not allowed attributes
-        if ($this->optional_attributes != array('_any')) {
-            $tmp_array = array_merge($this->required_attributes, $this->optional_attributes, $this->option_flags);
-            foreach ($_indexed_attr as $key => $dummy) {
-                if (!in_array($key, $tmp_array) && $key !== 0) {
-                    $compiler->trigger_template_error("unexpected \"" . $key . "\" attribute", $compiler->lex->taglineno);
-                }
-            }
-        }
-        // default 'false' for all option flags not set
-        foreach ($this->option_flags as $flag) {
-            if (!isset($_indexed_attr[$flag])) {
-                $_indexed_attr[$flag] = false;
-            }
-        }
-
-        return $_indexed_attr;
-    }
-
-    /**
-     * Push opening tag name on stack
-     * Optionally additional data can be saved on stack
-     *
-     * @param object $compiler compiler object
-     * @param string $openTag  the opening tag's name
-     * @param mixed  $data     optional data saved
-     */
-    public function openTag($compiler, $openTag, $data = null)
-    {
-        array_push($compiler->_tag_stack, array($openTag, $data));
-    }
-
-    /**
-     * Pop closing tag
-     * Raise an error if this stack-top doesn't match with expected opening tags
-     *
-     * @param  object       $compiler    compiler object
-     * @param  array|string $expectedTag the expected opening tag names
-     *
-     * @return mixed        any type the opening tag's name or saved data
-     */
-    public function closeTag($compiler, $expectedTag)
-    {
-        if (count($compiler->_tag_stack) > 0) {
-            // get stacked info
-            list($_openTag, $_data) = array_pop($compiler->_tag_stack);
-            // open tag must match with the expected ones
-            if (in_array($_openTag, (array) $expectedTag)) {
-                if (is_null($_data)) {
-                    // return opening tag
-                    return $_openTag;
-                } else {
-                    // return restored data
-                    return $_data;
-                }
-            }
-            // wrong nesting of tags
-            $compiler->trigger_template_error("unclosed {$compiler->smarty->left_delimiter}" . $_openTag . "{$compiler->smarty->right_delimiter} tag");
-
-            return;
-        }
-        // wrong nesting of tags
-        $compiler->trigger_template_error("unexpected closing tag", $compiler->lex->taglineno);
-
-        return;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_config_file_compiler.php b/www/smarty-3.1.27/sysplugins/smarty_internal_config_file_compiler.php
deleted file mode 100644
index 50779c7b..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_config_file_compiler.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Config File Compiler
- * This is the config file compiler class. It calls the lexer and parser to
- * perform the compiling.
- *
- * @package    Smarty
- * @subpackage Config
- * @author     Uwe Tews
- */
-
-/**
- * Main config file compiler class
- *
- * @package    Smarty
- * @subpackage Config
- */
-class Smarty_Internal_Config_File_Compiler
-{
-    /**
-     * Lexer class name
-     *
-     * @var string
-     */
-    public $lexer_class;
-
-    /**
-     * Parser class name
-     *
-     * @var string
-     */
-    public $parser_class;
-    /**
-     * Lexer object
-     *
-     * @var object
-     */
-    public $lex;
-
-    /**
-     * Parser object
-     *
-     * @var object
-     */
-    public $parser;
-
-    /**
-     * Smarty object
-     *
-     * @var Smarty object
-     */
-    public $smarty;
-
-    /**
-     * Smarty object
-     *
-     * @var Smarty_Internal_Template object
-     */
-    public $template;
-
-    /**
-     * Compiled config data sections and variables
-     *
-     * @var array
-     */
-    public $config_data = array();
-
-    /**
-     * compiled config data must always be written
-     *
-     * @var bool
-     */
-    public $write_compiled_code = true;
-
-    /**
-     * Initialize compiler
-     *
-     * @param string $lexer_class  class name
-     * @param string $parser_class class name
-     * @param Smarty $smarty       global instance
-     */
-    public function __construct($lexer_class, $parser_class, Smarty $smarty)
-    {
-        $this->smarty = $smarty;
-        // get required plugins
-        $this->lexer_class = $lexer_class;
-        $this->parser_class = $parser_class;
-        $this->smarty = $smarty;
-        $this->config_data['sections'] = array();
-        $this->config_data['vars'] = array();
-    }
-
-    /**
-     * Method to compile Smarty config source.
-     *
-     * @param Smarty_Internal_Template $template
-     *
-     * @return bool true if compiling succeeded, false if it failed
-     */
-    public function compileTemplate(Smarty_Internal_Template $template)
-    {
-        $this->template = $template;
-        $this->template->properties['file_dependency'][$this->template->source->uid] = array($this->template->source->name, $this->template->source->timestamp, $this->template->source->type);
-       // on empty config just return
-        if ($template->source->content == '') {
-            return true;
-        }
-        if ($this->smarty->debugging) {
-            Smarty_Internal_Debug::start_compile($this->template);
-        }
-        // init the lexer/parser to compile the config file
-        $lex = new $this->lexer_class(str_replace(array("\r\n", "\r"), "\n", $template->source->content) . "\n", $this);
-        $parser = new $this->parser_class($lex, $this);
-
-        if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
-            $mbEncoding = mb_internal_encoding();
-            mb_internal_encoding('ASCII');
-        } else {
-            $mbEncoding = null;
-        }
-
-        if ($this->smarty->_parserdebug) {
-            $parser->PrintTrace();
-        }
-        // get tokens from lexer and parse them
-        while ($lex->yylex()) {
-            if ($this->smarty->_parserdebug) {
-                echo "<br>Parsing  {$parser->yyTokenName[$lex->token]} Token {$lex->value} Line {$lex->line} \n";
-            }
-            $parser->doParse($lex->token, $lex->value);
-        }
-        // finish parsing process
-        $parser->doParse(0, 0);
-
-        if ($mbEncoding) {
-            mb_internal_encoding($mbEncoding);
-        }
-        if ($this->smarty->debugging) {
-            Smarty_Internal_Debug::end_compile($this->template);
-        }
-        // template header code
-        $template_header = "<?php /* Smarty version " . Smarty::SMARTY_VERSION . ", created on " . strftime("%Y-%m-%d %H:%M:%S") . "\n";
-        $template_header .= "         compiled from \"" . $this->template->source->filepath . "\" */ ?>\n";
-
-        $code = '<?php Smarty_Internal_Extension_Config::loadConfigVars($_smarty_tpl, ' . var_export($this->config_data, true) . '); ?>';
-        return $template_header . Smarty_Internal_Extension_CodeFrame::create($this->template, $code);
-    }
-
-    /**
-     * display compiler error messages without dying
-     * If parameter $args is empty it is a parser detected syntax error.
-     * In this case the parser is called to obtain information about expected tokens.
-     * If parameter $args contains a string this is used as error message
-     *
-     * @param string $args individual error message or null
-     *
-     * @throws SmartyCompilerException
-     */
-    public function trigger_config_file_error($args = null)
-    {
-        $this->lex = Smarty_Internal_Configfilelexer::instance();
-        $this->parser = Smarty_Internal_Configfileparser::instance();
-        // get config source line which has error
-        $line = $this->lex->line;
-        if (isset($args)) {
-            // $line--;
-        }
-        $match = preg_split("/\n/", $this->lex->data);
-        $error_text = "Syntax error in config file '{$this->template->source->filepath}' on line {$line} '{$match[$line - 1]}' ";
-        if (isset($args)) {
-            // individual error message
-            $error_text .= $args;
-        } else {
-            // expected token from parser
-            foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) {
-                $exp_token = $this->parser->yyTokenName[$token];
-                if (isset($this->lex->smarty_token_names[$exp_token])) {
-                    // token type from lexer
-                    $expect[] = '"' . $this->lex->smarty_token_names[$exp_token] . '"';
-                } else {
-                    // otherwise internal token name
-                    $expect[] = $this->parser->yyTokenName[$token];
-                }
-            }
-            // output parser error message
-            $error_text .= ' - Unexpected "' . $this->lex->value . '", expected one of: ' . implode(' , ', $expect);
-        }
-        throw new SmartyCompilerException($error_text);
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_configfilelexer.php b/www/smarty-3.1.27/sysplugins/smarty_internal_configfilelexer.php
deleted file mode 100644
index e62728c2..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_configfilelexer.php
+++ /dev/null
@@ -1,699 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Configfilelexer
- *
- * This is the lexer to break the config file source into tokens
- *
- * @package    Smarty
- * @subpackage Config
- * @author     Uwe Tews
- */
-
-/**
- * Smarty_Internal_Configfilelexer
- *
- * This is the config file lexer.
- * It is generated from the smarty_internal_configfilelexer.plex file
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-class Smarty_Internal_Configfilelexer
-{
-    /**
-     * Source
-     *
-     * @var string
-     */
-    public $data;
-
-    /**
-     * byte counter
-     *
-     * @var int
-     */
-    public $counter;
-
-    /**
-     * token number
-     *
-     * @var int
-     */
-    public $token;
-
-    /**
-     * token value
-     *
-     * @var string
-     */
-    public $value;
-
-    /**
-     * current line
-     *
-     * @var int
-     */
-    public $line;
-
-    /**
-     * state number
-     *
-     * @var int
-     */
-    public $state = 1;
-
-    /**
-     * Smarty object
-     *
-     * @var Smarty
-     */
-    public $smarty = null;
-
-    /**
-     * compiler object
-     *
-     * @var Smarty_Internal_Config_File_Compiler
-     */
-    private $compiler = null;
-
-    /**
-     * copy of config_booleanize
-     *
-     * @var bool
-     */
-    private $configBooleanize = false;
-
-    /**
-     * trace file
-     *
-     * @var resource
-     */
-    public $yyTraceFILE;
-
-    /**
-     * trace prompt
-     *
-     * @var string
-     */
-    public $yyTracePrompt;
-
-    /**
-     * state names
-     *
-     * @var array
-     */
-    public $state_name = array(1 => 'START', 2 => 'VALUE', 3 => 'NAKED_STRING_VALUE', 4 => 'COMMENT', 5 => 'SECTION',
-                               6 => 'TRIPPLE');
-
-    /**
-     * storage for assembled token patterns
-     *
-     * @var sring
-     */
-    private $yy_global_pattern1 = null;
-
-    private $yy_global_pattern2 = null;
-
-    private $yy_global_pattern3 = null;
-
-    private $yy_global_pattern4 = null;
-
-    private $yy_global_pattern5 = null;
-
-    private $yy_global_pattern6 = null;
-
-    /**
-     * token names
-     *
-     * @var array
-     */
-    public $smarty_token_names = array(        // Text for parser error messages
-    );
-
-    /**
-     * constructor
-     *
-     * @param   string                             $data template source
-     * @param Smarty_Internal_Config_File_Compiler $compiler
-     */
-    function __construct($data, Smarty_Internal_Config_File_Compiler $compiler)
-    {
-        // set instance object
-        self::instance($this);
-        $this->data = $data . "\n"; //now all lines are \n-terminated
-        $this->counter = 0;
-        if (preg_match('/^\xEF\xBB\xBF/', $this->data, $match)) {
-            $this->counter += strlen($match[0]);
-        }
-        $this->line = 1;
-        $this->compiler = $compiler;
-        $this->smarty = $compiler->smarty;
-        $this->configBooleanize = $this->smarty->config_booleanize;
-    }
-
-    public static function &instance($new_instance = null)
-    {
-        static $instance = null;
-        if (isset($new_instance) && is_object($new_instance)) {
-            $instance = $new_instance;
-        }
-        return $instance;
-    }
-
-    public function PrintTrace()
-    {
-        $this->yyTraceFILE = fopen('php://output', 'w');
-        $this->yyTracePrompt = '<br>';
-    }
-
-    private $_yy_state = 1;
-
-    private $_yy_stack = array();
-
-    public function yylex()
-    {
-        return $this->{'yylex' . $this->_yy_state}();
-    }
-
-    public function yypushstate($state)
-    {
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
-        }
-        array_push($this->_yy_stack, $this->_yy_state);
-        $this->_yy_state = $state;
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
-        }
-    }
-
-    public function yypopstate()
-    {
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
-        }
-        $this->_yy_state = array_pop($this->_yy_stack);
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
-        }
-    }
-
-    public function yybegin($state)
-    {
-        $this->_yy_state = $state;
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
-        }
-    }
-
-    public function yylex1()
-    {
-        if (!isset($this->yy_global_pattern1)) {
-            $this->yy_global_pattern1 = "/\G(#|;)|\G(\\[)|\G(\\])|\G(=)|\G([ \t\r]+)|\G(\n)|\G([0-9]*[a-zA-Z_]\\w*)|\G([\S\s])/isS";
-        }
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-
-        do {
-            if (preg_match($this->yy_global_pattern1, $this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[0]) < 200) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                } else {
-                    $yymatches = array_filter($yymatches, 'strlen');
-                }
-                if (empty($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state START');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r1_' . $this->token}();
-                if ($r === null) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
-            }
-            break;
-        } while (true);
-    } // end function
-
-    const START = 1;
-
-    function yy_r1_1()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART;
-        $this->yypushstate(self::COMMENT);
-    }
-
-    function yy_r1_2()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_OPENB;
-        $this->yypushstate(self::SECTION);
-    }
-
-    function yy_r1_3()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB;
-    }
-
-    function yy_r1_4()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_EQUAL;
-        $this->yypushstate(self::VALUE);
-    }
-
-    function yy_r1_5()
-    {
-
-        return false;
-    }
-
-    function yy_r1_6()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
-    }
-
-    function yy_r1_7()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_ID;
-    }
-
-    function yy_r1_8()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_OTHER;
-    }
-
-    public function yylex2()
-    {
-        if (!isset($this->yy_global_pattern2)) {
-            $this->yy_global_pattern2 = "/\G([ \t\r]+)|\G(\\d+\\.\\d+(?=[ \t\r]*[\n#;]))|\G(\\d+(?=[ \t\r]*[\n#;]))|\G(\"\"\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*'(?=[ \t\r]*[\n#;]))|\G(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"(?=[ \t\r]*[\n#;]))|\G([a-zA-Z]+(?=[ \t\r]*[\n#;]))|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/isS";
-        }
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-
-        do {
-            if (preg_match($this->yy_global_pattern2, $this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[0]) < 200) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                } else {
-                    $yymatches = array_filter($yymatches, 'strlen');
-                }
-                if (empty($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state VALUE');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r2_' . $this->token}();
-                if ($r === null) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
-            }
-            break;
-        } while (true);
-    } // end function
-
-    const VALUE = 2;
-
-    function yy_r2_1()
-    {
-
-        return false;
-    }
-
-    function yy_r2_2()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_FLOAT;
-        $this->yypopstate();
-    }
-
-    function yy_r2_3()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_INT;
-        $this->yypopstate();
-    }
-
-    function yy_r2_4()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES;
-        $this->yypushstate(self::TRIPPLE);
-    }
-
-    function yy_r2_5()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING;
-        $this->yypopstate();
-    }
-
-    function yy_r2_6()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING;
-        $this->yypopstate();
-    }
-
-    function yy_r2_7()
-    {
-
-        if (!$this->configBooleanize || !in_array(strtolower($this->value), Array("true", "false", "on", "off", "yes",
-                "no"))
-        ) {
-            $this->yypopstate();
-            $this->yypushstate(self::NAKED_STRING_VALUE);
-            return true; //reprocess in new state
-        } else {
-            $this->token = Smarty_Internal_Configfileparser::TPC_BOOL;
-            $this->yypopstate();
-        }
-    }
-
-    function yy_r2_8()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
-        $this->yypopstate();
-    }
-
-    function yy_r2_9()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
-        $this->value = "";
-        $this->yypopstate();
-    }
-
-    public function yylex3()
-    {
-        if (!isset($this->yy_global_pattern3)) {
-            $this->yy_global_pattern3 = "/\G([^\n]+?(?=[ \t\r]*\n))/isS";
-        }
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-
-        do {
-            if (preg_match($this->yy_global_pattern3, $this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[0]) < 200) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                } else {
-                    $yymatches = array_filter($yymatches, 'strlen');
-                }
-                if (empty($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state NAKED_STRING_VALUE');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r3_' . $this->token}();
-                if ($r === null) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
-            }
-            break;
-        } while (true);
-    } // end function
-
-    const NAKED_STRING_VALUE = 3;
-
-    function yy_r3_1()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
-        $this->yypopstate();
-    }
-
-    public function yylex4()
-    {
-        if (!isset($this->yy_global_pattern4)) {
-            $this->yy_global_pattern4 = "/\G([ \t\r]+)|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/isS";
-        }
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-
-        do {
-            if (preg_match($this->yy_global_pattern4, $this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[0]) < 200) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                } else {
-                    $yymatches = array_filter($yymatches, 'strlen');
-                }
-                if (empty($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state COMMENT');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r4_' . $this->token}();
-                if ($r === null) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
-            }
-            break;
-        } while (true);
-    } // end function
-
-    const COMMENT = 4;
-
-    function yy_r4_1()
-    {
-
-        return false;
-    }
-
-    function yy_r4_2()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
-    }
-
-    function yy_r4_3()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
-        $this->yypopstate();
-    }
-
-    public function yylex5()
-    {
-        if (!isset($this->yy_global_pattern5)) {
-            $this->yy_global_pattern5 = "/\G(\\.)|\G(.*?(?=[\.=[\]\r\n]))/isS";
-        }
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-
-        do {
-            if (preg_match($this->yy_global_pattern5, $this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[0]) < 200) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                } else {
-                    $yymatches = array_filter($yymatches, 'strlen');
-                }
-                if (empty($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state SECTION');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r5_' . $this->token}();
-                if ($r === null) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
-            }
-            break;
-        } while (true);
-    } // end function
-
-    const SECTION = 5;
-
-    function yy_r5_1()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_DOT;
-    }
-
-    function yy_r5_2()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_SECTION;
-        $this->yypopstate();
-    }
-
-    public function yylex6()
-    {
-        if (!isset($this->yy_global_pattern6)) {
-            $this->yy_global_pattern6 = "/\G(\"\"\"(?=[ \t\r]*[\n#;]))|\G([\S\s])/isS";
-        }
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-
-        do {
-            if (preg_match($this->yy_global_pattern6, $this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[0]) < 200) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                } else {
-                    $yymatches = array_filter($yymatches, 'strlen');
-                }
-                if (empty($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state TRIPPLE');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r6_' . $this->token}();
-                if ($r === null) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
-            }
-            break;
-        } while (true);
-    } // end function
-
-    const TRIPPLE = 6;
-
-    function yy_r6_1()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES_END;
-        $this->yypopstate();
-        $this->yypushstate(self::START);
-    }
-
-    function yy_r6_2()
-    {
-
-        $to = strlen($this->data);
-        preg_match("/\"\"\"[ \t\r]*[\n#;]/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
-        if (isset($match[0][1])) {
-            $to = $match[0][1];
-        } else {
-            $this->compiler->trigger_template_error("missing or misspelled literal closing tag");
-        }
-        $this->value = substr($this->data, $this->counter, $to - $this->counter);
-        $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_TEXT;
-    }
-
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_configfileparser.php b/www/smarty-3.1.27/sysplugins/smarty_internal_configfileparser.php
deleted file mode 100644
index 69aaf990..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_configfileparser.php
+++ /dev/null
@@ -1,1010 +0,0 @@
-<?php
-
-class TPC_yyToken implements ArrayAccess
-{
-    public $string = '';
-
-    public $metadata = array();
-
-    public function __construct($s, $m = array())
-    {
-        if ($s instanceof TPC_yyToken) {
-            $this->string = $s->string;
-            $this->metadata = $s->metadata;
-        } else {
-            $this->string = (string) $s;
-            if ($m instanceof TPC_yyToken) {
-                $this->metadata = $m->metadata;
-            } elseif (is_array($m)) {
-                $this->metadata = $m;
-            }
-        }
-    }
-
-    public function __toString()
-    {
-        return $this->string;
-    }
-
-    public function offsetExists($offset)
-    {
-        return isset($this->metadata[$offset]);
-    }
-
-    public function offsetGet($offset)
-    {
-        return $this->metadata[$offset];
-    }
-
-    public function offsetSet($offset, $value)
-    {
-        if ($offset === null) {
-            if (isset($value[0])) {
-                $x = ($value instanceof TPC_yyToken) ? $value->metadata : $value;
-                $this->metadata = array_merge($this->metadata, $x);
-
-                return;
-            }
-            $offset = count($this->metadata);
-        }
-        if ($value === null) {
-            return;
-        }
-        if ($value instanceof TPC_yyToken) {
-            if ($value->metadata) {
-                $this->metadata[$offset] = $value->metadata;
-            }
-        } elseif ($value) {
-            $this->metadata[$offset] = $value;
-        }
-    }
-
-    public function offsetUnset($offset)
-    {
-        unset($this->metadata[$offset]);
-    }
-}
-
-class TPC_yyStackEntry
-{
-    public $stateno;       /* The state-number */
-    public $major;         /* The major token value.  This is the code
-                     ** number for the token at this stack level */
-    public $minor; /* The user-supplied minor token value.  This
-                     ** is the value of the token  */
-}
-
-;
-
-#line 12 "../smarty/lexer/smarty_internal_configfileparser.y"
-
-/**
- * Smarty Internal Plugin Configfileparse
- *
- * This is the config file parser.
- * It is generated from the smarty_internal_configfileparser.y file
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-class Smarty_Internal_Configfileparser
-{
-    #line 25 "../smarty/lexer/smarty_internal_configfileparser.y"
-
-    /**
-     * result status
-     *
-     * @var bool
-     */
-    public $successful = true;
-
-    /**
-     * return value
-     *
-     * @var mixed
-     */
-    public $retvalue = 0;
-
-    /**
-     * @var
-     */
-    public $yymajor;
-
-    /**
-     * lexer object
-     *
-     * @var Smarty_Internal_Configfilelexer
-     */
-    private $lex;
-
-    /**
-     * internal error flag
-     *
-     * @var bool
-     */
-    private $internalError = false;
-
-    /**
-     * compiler object
-     *
-     * @var Smarty_Internal_Config_File_Compiler
-     */
-    public $compiler = null;
-
-    /**
-     * smarty object
-     *
-     * @var Smarty
-     */
-    public $smarty = null;
-
-    /**
-     * copy of config_overwrite property
-     *
-     * @var bool
-     */
-    private $configOverwrite = false;
-
-    /**
-     * copy of config_read_hidden property
-     *
-     * @var bool
-     */
-    private $configReadHidden = false;
-
-    /**
-     * helper map
-     *
-     * @var array
-     */
-    private static $escapes_single = Array('\\' => '\\', '\'' => '\'');
-
-    /**
-     * constructor
-     *
-     * @param Smarty_Internal_Configfilelexer      $lex
-     * @param Smarty_Internal_Config_File_Compiler $compiler
-     */
-    function __construct(Smarty_Internal_Configfilelexer $lex, Smarty_Internal_Config_File_Compiler $compiler)
-    {
-        // set instance object
-        self::instance($this);
-        $this->lex = $lex;
-        $this->smarty = $compiler->smarty;
-        $this->compiler = $compiler;
-        $this->configOverwrite = $this->smarty->config_overwrite;
-        $this->configReadHidden = $this->smarty->config_read_hidden;
-    }
-
-    /**
-     * @param null $new_instance
-     *
-     * @return null
-     */
-    public static function &instance($new_instance = null)
-    {
-        static $instance = null;
-        if (isset($new_instance) && is_object($new_instance)) {
-            $instance = $new_instance;
-        }
-        return $instance;
-    }
-
-    /**
-     * parse optional boolean keywords
-     *
-     * @param string $str
-     *
-     * @return bool
-     */
-    private function parse_bool($str)
-    {
-        $str = strtolower($str);
-        if (in_array($str, array('on', 'yes', 'true'))) {
-            $res = true;
-        } else {
-            $res = false;
-        }
-        return $res;
-    }
-
-    /**
-     * parse single quoted string
-     *  remove outer quotes
-     *  unescape inner quotes
-     *
-     * @param string $qstr
-     *
-     * @return string
-     */
-    private static function parse_single_quoted_string($qstr)
-    {
-        $escaped_string = substr($qstr, 1, strlen($qstr) - 2); //remove outer quotes
-
-        $ss = preg_split('/(\\\\.)/', $escaped_string, - 1, PREG_SPLIT_DELIM_CAPTURE);
-
-        $str = "";
-        foreach ($ss as $s) {
-            if (strlen($s) === 2 && $s[0] === '\\') {
-                if (isset(self::$escapes_single[$s[1]])) {
-                    $s = self::$escapes_single[$s[1]];
-                }
-            }
-            $str .= $s;
-        }
-        return $str;
-    }
-
-    /**
-     * parse double quoted string
-     *
-     * @param string $qstr
-     *
-     * @return string
-     */
-    private static function parse_double_quoted_string($qstr)
-    {
-        $inner_str = substr($qstr, 1, strlen($qstr) - 2);
-        return stripcslashes($inner_str);
-    }
-
-    /**
-     * parse triple quoted string
-     *
-     * @param string $qstr
-     *
-     * @return string
-     */
-    private static function parse_tripple_double_quoted_string($qstr)
-    {
-        return stripcslashes($qstr);
-    }
-
-    /**
-     * set a config variable in target array
-     *
-     * @param array $var
-     * @param array $target_array
-     */
-    private function set_var(Array $var, Array &$target_array)
-    {
-        $key = $var["key"];
-        $value = $var["value"];
-
-        if ($this->configOverwrite || !isset($target_array['vars'][$key])) {
-            $target_array['vars'][$key] = $value;
-        } else {
-            settype($target_array['vars'][$key], 'array');
-            $target_array['vars'][$key][] = $value;
-        }
-    }
-
-    /**
-     * add config variable to global vars
-     *
-     * @param array $vars
-     */
-    private function add_global_vars(Array $vars)
-    {
-        if (!isset($this->compiler->config_data['vars'])) {
-            $this->compiler->config_data['vars'] = Array();
-        }
-        foreach ($vars as $var) {
-            $this->set_var($var, $this->compiler->config_data);
-        }
-    }
-
-    /**
-     * add config variable to section
-     *
-     * @param string $section_name
-     * @param array  $vars
-     */
-    private function add_section_vars($section_name, Array $vars)
-    {
-        if (!isset($this->compiler->config_data['sections'][$section_name]['vars'])) {
-            $this->compiler->config_data['sections'][$section_name]['vars'] = Array();
-        }
-        foreach ($vars as $var) {
-            $this->set_var($var, $this->compiler->config_data['sections'][$section_name]);
-        }
-    }
-
-    const TPC_OPENB = 1;
-
-    const TPC_SECTION = 2;
-
-    const TPC_CLOSEB = 3;
-
-    const TPC_DOT = 4;
-
-    const TPC_ID = 5;
-
-    const TPC_EQUAL = 6;
-
-    const TPC_FLOAT = 7;
-
-    const TPC_INT = 8;
-
-    const TPC_BOOL = 9;
-
-    const TPC_SINGLE_QUOTED_STRING = 10;
-
-    const TPC_DOUBLE_QUOTED_STRING = 11;
-
-    const TPC_TRIPPLE_QUOTES = 12;
-
-    const TPC_TRIPPLE_TEXT = 13;
-
-    const TPC_TRIPPLE_QUOTES_END = 14;
-
-    const TPC_NAKED_STRING = 15;
-
-    const TPC_OTHER = 16;
-
-    const TPC_NEWLINE = 17;
-
-    const TPC_COMMENTSTART = 18;
-
-    const YY_NO_ACTION = 60;
-
-    const YY_ACCEPT_ACTION = 59;
-
-    const YY_ERROR_ACTION = 58;
-
-    const YY_SZ_ACTTAB = 38;
-
-    static public $yy_action = array(29, 30, 34, 33, 24, 13, 19, 25, 35, 21, 59, 8, 3, 1, 20, 12, 14, 31, 20, 12, 15,
-        17, 23, 18, 27, 26, 4, 5, 6, 32, 2, 11, 28, 22, 16, 9, 7, 10,);
-
-    static public $yy_lookahead = array(7, 8, 9, 10, 11, 12, 5, 27, 15, 16, 20, 21, 23, 23, 17, 18, 13, 14, 17, 18, 15,
-        2, 17, 4, 25, 26, 6, 3, 3, 14, 23, 1, 24, 17, 2, 25, 22, 25,);
-
-    const YY_SHIFT_USE_DFLT = - 8;
-
-    const YY_SHIFT_MAX = 19;
-
-    static public $yy_shift_ofst = array(- 8, 1, 1, 1, - 7, - 3, - 3, 30, - 8, - 8, - 8, 19, 5, 3, 15, 16, 24, 25, 32,
-        20,);
-
-    const YY_REDUCE_USE_DFLT = - 21;
-
-    const YY_REDUCE_MAX = 10;
-
-    static public $yy_reduce_ofst = array(- 10, - 1, - 1, - 1, - 20, 10, 12, 8, 14, 7, - 11,);
-
-    static public $yyExpectedTokens = array(array(), array(5, 17, 18,), array(5, 17, 18,), array(5, 17, 18,),
-        array(7, 8, 9, 10, 11, 12, 15, 16,), array(17, 18,), array(17, 18,), array(1,), array(), array(), array(),
-        array(2, 4,), array(15, 17,), array(13, 14,), array(14,), array(17,), array(3,), array(3,), array(2,),
-        array(6,), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(),
-        array(), array(), array(), array(), array(),);
-
-    static public $yy_default = array(44, 37, 41, 40, 58, 58, 58, 36, 39, 44, 44, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-        55, 54, 57, 56, 50, 45, 43, 42, 38, 46, 47, 52, 51, 49, 48, 53,);
-
-    const YYNOCODE = 29;
-
-    const YYSTACKDEPTH = 100;
-
-    const YYNSTATE = 36;
-
-    const YYNRULE = 22;
-
-    const YYERRORSYMBOL = 19;
-
-    const YYERRSYMDT = 'yy0';
-
-    const YYFALLBACK = 0;
-
-    public static $yyFallback = array();
-
-    public function Trace($TraceFILE, $zTracePrompt)
-    {
-        if (!$TraceFILE) {
-            $zTracePrompt = 0;
-        } elseif (!$zTracePrompt) {
-            $TraceFILE = 0;
-        }
-        $this->yyTraceFILE = $TraceFILE;
-        $this->yyTracePrompt = $zTracePrompt;
-    }
-
-    public function PrintTrace()
-    {
-        $this->yyTraceFILE = fopen('php://output', 'w');
-        $this->yyTracePrompt = '<br>';
-    }
-
-    public $yyTraceFILE;
-
-    public $yyTracePrompt;
-
-    public $yyidx;                    /* Index of top element in stack */
-    public $yyerrcnt;                 /* Shifts left before out of the error */
-    public $yystack = array();  /* The parser's stack */
-
-    public $yyTokenName = array('$', 'OPENB', 'SECTION', 'CLOSEB', 'DOT', 'ID', 'EQUAL', 'FLOAT', 'INT', 'BOOL',
-        'SINGLE_QUOTED_STRING', 'DOUBLE_QUOTED_STRING', 'TRIPPLE_QUOTES', 'TRIPPLE_TEXT', 'TRIPPLE_QUOTES_END',
-        'NAKED_STRING', 'OTHER', 'NEWLINE', 'COMMENTSTART', 'error', 'start', 'global_vars', 'sections', 'var_list',
-        'section', 'newline', 'var', 'value',);
-
-    public static $yyRuleName = array('start ::= global_vars sections', 'global_vars ::= var_list',
-        'sections ::= sections section', 'sections ::=', 'section ::= OPENB SECTION CLOSEB newline var_list',
-        'section ::= OPENB DOT SECTION CLOSEB newline var_list', 'var_list ::= var_list newline',
-        'var_list ::= var_list var', 'var_list ::=', 'var ::= ID EQUAL value', 'value ::= FLOAT', 'value ::= INT',
-        'value ::= BOOL', 'value ::= SINGLE_QUOTED_STRING', 'value ::= DOUBLE_QUOTED_STRING',
-        'value ::= TRIPPLE_QUOTES TRIPPLE_TEXT TRIPPLE_QUOTES_END', 'value ::= TRIPPLE_QUOTES TRIPPLE_QUOTES_END',
-        'value ::= NAKED_STRING', 'value ::= OTHER', 'newline ::= NEWLINE', 'newline ::= COMMENTSTART NEWLINE',
-        'newline ::= COMMENTSTART NAKED_STRING NEWLINE',);
-
-    public function tokenName($tokenType)
-    {
-        if ($tokenType === 0) {
-            return 'End of Input';
-        }
-        if ($tokenType > 0 && $tokenType < count($this->yyTokenName)) {
-            return $this->yyTokenName[$tokenType];
-        } else {
-            return "Unknown";
-        }
-    }
-
-    public static function yy_destructor($yymajor, $yypminor)
-    {
-        switch ($yymajor) {
-            default:
-                break;   /* If no destructor action specified: do nothing */
-        }
-    }
-
-    public function yy_pop_parser_stack()
-    {
-        if (empty($this->yystack)) {
-            return;
-        }
-        $yytos = array_pop($this->yystack);
-        if ($this->yyTraceFILE && $this->yyidx >= 0) {
-            fwrite($this->yyTraceFILE, $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] . "\n");
-        }
-        $yymajor = $yytos->major;
-        self::yy_destructor($yymajor, $yytos->minor);
-        $this->yyidx --;
-
-        return $yymajor;
-    }
-
-    public function __destruct()
-    {
-        while ($this->yystack !== Array()) {
-            $this->yy_pop_parser_stack();
-        }
-        if (is_resource($this->yyTraceFILE)) {
-            fclose($this->yyTraceFILE);
-        }
-    }
-
-    public function yy_get_expected_tokens($token)
-    {
-        static $res3 = array();
-        static $res4 = array();
-        $state = $this->yystack[$this->yyidx]->stateno;
-        $expected = self::$yyExpectedTokens[$state];
-        if (isset($res3[$state][$token])) {
-            if ($res3[$state][$token]) {
-                return $expected;
-            }
-        } else {
-            if ($res3[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
-                return $expected;
-            }
-        }
-        $stack = $this->yystack;
-        $yyidx = $this->yyidx;
-        do {
-            $yyact = $this->yy_find_shift_action($token);
-            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
-                // reduce action
-                $done = 0;
-                do {
-                    if ($done ++ == 100) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        // too much recursion prevents proper detection
-                        // so give up
-                        return array_unique($expected);
-                    }
-                    $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
-                    $nextstate = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, self::$yyRuleInfo[$yyruleno][0]);
-                    if (isset(self::$yyExpectedTokens[$nextstate])) {
-                        $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
-                        if (isset($res4[$nextstate][$token])) {
-                            if ($res4[$nextstate][$token]) {
-                                $this->yyidx = $yyidx;
-                                $this->yystack = $stack;
-                                return array_unique($expected);
-                            }
-                        } else {
-                            if ($res4[$nextstate][$token] = in_array($token, self::$yyExpectedTokens[$nextstate], true)) {
-                                $this->yyidx = $yyidx;
-                                $this->yystack = $stack;
-                                return array_unique($expected);
-                            }
-                        }
-                    }
-                    if ($nextstate < self::YYNSTATE) {
-                        // we need to shift a non-terminal
-                        $this->yyidx ++;
-                        $x = new TPC_yyStackEntry;
-                        $x->stateno = $nextstate;
-                        $x->major = self::$yyRuleInfo[$yyruleno][0];
-                        $this->yystack[$this->yyidx] = $x;
-                        continue 2;
-                    } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        // the last token was just ignored, we can't accept
-                        // by ignoring input, this is in essence ignoring a
-                        // syntax error!
-                        return array_unique($expected);
-                    } elseif ($nextstate === self::YY_NO_ACTION) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        // input accepted, but not shifted (I guess)
-                        return $expected;
-                    } else {
-                        $yyact = $nextstate;
-                    }
-                } while (true);
-            }
-            break;
-        } while (true);
-        $this->yyidx = $yyidx;
-        $this->yystack = $stack;
-
-        return array_unique($expected);
-    }
-
-    public function yy_is_expected_token($token)
-    {
-        static $res = array();
-        static $res2 = array();
-        if ($token === 0) {
-            return true; // 0 is not part of this
-        }
-        $state = $this->yystack[$this->yyidx]->stateno;
-        if (isset($res[$state][$token])) {
-            if ($res[$state][$token]) {
-                return true;
-            }
-        } else {
-            if ($res[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
-                return true;
-            }
-        }
-        $stack = $this->yystack;
-        $yyidx = $this->yyidx;
-        do {
-            $yyact = $this->yy_find_shift_action($token);
-            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
-                // reduce action
-                $done = 0;
-                do {
-                    if ($done ++ == 100) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        // too much recursion prevents proper detection
-                        // so give up
-                        return true;
-                    }
-                    $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
-                    $nextstate = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, self::$yyRuleInfo[$yyruleno][0]);
-                    if (isset($res2[$nextstate][$token])) {
-                        if ($res2[$nextstate][$token]) {
-                            $this->yyidx = $yyidx;
-                            $this->yystack = $stack;
-                            return true;
-                        }
-                    } else {
-                        if ($res2[$nextstate][$token] = (isset(self::$yyExpectedTokens[$nextstate]) && in_array($token, self::$yyExpectedTokens[$nextstate], true))) {
-                            $this->yyidx = $yyidx;
-                            $this->yystack = $stack;
-                            return true;
-                        }
-                    }
-                    if ($nextstate < self::YYNSTATE) {
-                        // we need to shift a non-terminal
-                        $this->yyidx ++;
-                        $x = new TPC_yyStackEntry;
-                        $x->stateno = $nextstate;
-                        $x->major = self::$yyRuleInfo[$yyruleno][0];
-                        $this->yystack[$this->yyidx] = $x;
-                        continue 2;
-                    } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        if (!$token) {
-                            // end of input: this is valid
-                            return true;
-                        }
-                        // the last token was just ignored, we can't accept
-                        // by ignoring input, this is in essence ignoring a
-                        // syntax error!
-                        return false;
-                    } elseif ($nextstate === self::YY_NO_ACTION) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        // input accepted, but not shifted (I guess)
-                        return true;
-                    } else {
-                        $yyact = $nextstate;
-                    }
-                } while (true);
-            }
-            break;
-        } while (true);
-        $this->yyidx = $yyidx;
-        $this->yystack = $stack;
-
-        return true;
-    }
-
-    public function yy_find_shift_action($iLookAhead)
-    {
-        $stateno = $this->yystack[$this->yyidx]->stateno;
-
-        /* if ($this->yyidx < 0) return self::YY_NO_ACTION;  */
-        if (!isset(self::$yy_shift_ofst[$stateno])) {
-            // no shift actions
-            return self::$yy_default[$stateno];
-        }
-        $i = self::$yy_shift_ofst[$stateno];
-        if ($i === self::YY_SHIFT_USE_DFLT) {
-            return self::$yy_default[$stateno];
-        }
-        if ($iLookAhead == self::YYNOCODE) {
-            return self::YY_NO_ACTION;
-        }
-        $i += $iLookAhead;
-        if ($i < 0 || $i >= self::YY_SZ_ACTTAB || self::$yy_lookahead[$i] != $iLookAhead) {
-            if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback) && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) {
-                if ($this->yyTraceFILE) {
-                    fwrite($this->yyTraceFILE, $this->yyTracePrompt . "FALLBACK " . $this->yyTokenName[$iLookAhead] . " => " . $this->yyTokenName[$iFallback] . "\n");
-                }
-
-                return $this->yy_find_shift_action($iFallback);
-            }
-
-            return self::$yy_default[$stateno];
-        } else {
-            return self::$yy_action[$i];
-        }
-    }
-
-    public function yy_find_reduce_action($stateno, $iLookAhead)
-    {
-        /* $stateno = $this->yystack[$this->yyidx]->stateno; */
-
-        if (!isset(self::$yy_reduce_ofst[$stateno])) {
-            return self::$yy_default[$stateno];
-        }
-        $i = self::$yy_reduce_ofst[$stateno];
-        if ($i == self::YY_REDUCE_USE_DFLT) {
-            return self::$yy_default[$stateno];
-        }
-        if ($iLookAhead == self::YYNOCODE) {
-            return self::YY_NO_ACTION;
-        }
-        $i += $iLookAhead;
-        if ($i < 0 || $i >= self::YY_SZ_ACTTAB || self::$yy_lookahead[$i] != $iLookAhead) {
-            return self::$yy_default[$stateno];
-        } else {
-            return self::$yy_action[$i];
-        }
-    }
-
-    public function yy_shift($yyNewState, $yyMajor, $yypMinor)
-    {
-        $this->yyidx ++;
-        if ($this->yyidx >= self::YYSTACKDEPTH) {
-            $this->yyidx --;
-            if ($this->yyTraceFILE) {
-                fprintf($this->yyTraceFILE, "%sStack Overflow!\n", $this->yyTracePrompt);
-            }
-            while ($this->yyidx >= 0) {
-                $this->yy_pop_parser_stack();
-            }
-            #line 255 "../smarty/lexer/smarty_internal_configfileparser.y"
-
-            $this->internalError = true;
-            $this->compiler->trigger_config_file_error("Stack overflow in configfile parser");
-
-            return;
-        }
-        $yytos = new TPC_yyStackEntry;
-        $yytos->stateno = $yyNewState;
-        $yytos->major = $yyMajor;
-        $yytos->minor = $yypMinor;
-        $this->yystack[] = $yytos;
-        if ($this->yyTraceFILE && $this->yyidx > 0) {
-            fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt, $yyNewState);
-            fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt);
-            for ($i = 1; $i <= $this->yyidx; $i ++) {
-                fprintf($this->yyTraceFILE, " %s", $this->yyTokenName[$this->yystack[$i]->major]);
-            }
-            fwrite($this->yyTraceFILE, "\n");
-        }
-    }
-
-    public static $yyRuleInfo = array(array(0 => 20, 1 => 2), array(0 => 21, 1 => 1), array(0 => 22, 1 => 2),
-        array(0 => 22, 1 => 0), array(0 => 24, 1 => 5), array(0 => 24, 1 => 6), array(0 => 23, 1 => 2),
-        array(0 => 23, 1 => 2), array(0 => 23, 1 => 0), array(0 => 26, 1 => 3), array(0 => 27, 1 => 1),
-        array(0 => 27, 1 => 1), array(0 => 27, 1 => 1), array(0 => 27, 1 => 1), array(0 => 27, 1 => 1),
-        array(0 => 27, 1 => 3), array(0 => 27, 1 => 2), array(0 => 27, 1 => 1), array(0 => 27, 1 => 1),
-        array(0 => 25, 1 => 1), array(0 => 25, 1 => 2), array(0 => 25, 1 => 3),);
-
-    public static $yyReduceMap = array(0  => 0, 2 => 0, 3 => 0, 19 => 0, 20 => 0, 21 => 0, 1 => 1, 4 => 4, 5 => 5,
-                                       6  => 6, 7 => 7, 8 => 8, 9 => 9, 10 => 10, 11 => 11, 12 => 12, 13 => 13,
-                                       14 => 14, 15 => 15, 16 => 16, 17 => 17, 18 => 17,);
-
-    #line 261 "../smarty/lexer/smarty_internal_configfileparser.y"
-    function yy_r0()
-    {
-        $this->_retvalue = null;
-    }
-
-    #line 266 "../smarty/lexer/smarty_internal_configfileparser.y"
-    function yy_r1()
-    {
-        $this->add_global_vars($this->yystack[$this->yyidx + 0]->minor);
-        $this->_retvalue = null;
-    }
-
-    #line 280 "../smarty/lexer/smarty_internal_configfileparser.y"
-    function yy_r4()
-    {
-        $this->add_section_vars($this->yystack[$this->yyidx + - 3]->minor, $this->yystack[$this->yyidx + 0]->minor);
-        $this->_retvalue = null;
-    }
-
-    #line 285 "../smarty/lexer/smarty_internal_configfileparser.y"
-    function yy_r5()
-    {
-        if ($this->configReadHidden) {
-            $this->add_section_vars($this->yystack[$this->yyidx + - 3]->minor, $this->yystack[$this->yyidx + 0]->minor);
-        }
-        $this->_retvalue = null;
-    }
-
-    #line 293 "../smarty/lexer/smarty_internal_configfileparser.y"
-    function yy_r6()
-    {
-        $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor;
-    }
-
-    #line 297 "../smarty/lexer/smarty_internal_configfileparser.y"
-    function yy_r7()
-    {
-        $this->_retvalue = array_merge($this->yystack[$this->yyidx + - 1]->minor, Array($this->yystack[$this->yyidx + 0]->minor));
-    }
-
-    #line 301 "../smarty/lexer/smarty_internal_configfileparser.y"
-    function yy_r8()
-    {
-        $this->_retvalue = Array();
-    }
-
-    #line 307 "../smarty/lexer/smarty_internal_configfileparser.y"
-    function yy_r9()
-    {
-        $this->_retvalue = Array("key"   => $this->yystack[$this->yyidx + - 2]->minor,
-                                 "value" => $this->yystack[$this->yyidx + 0]->minor);
-    }
-
-    #line 312 "../smarty/lexer/smarty_internal_configfileparser.y"
-    function yy_r10()
-    {
-        $this->_retvalue = (float) $this->yystack[$this->yyidx + 0]->minor;
-    }
-
-    #line 316 "../smarty/lexer/smarty_internal_configfileparser.y"
-    function yy_r11()
-    {
-        $this->_retvalue = (int) $this->yystack[$this->yyidx + 0]->minor;
-    }
-
-    #line 320 "../smarty/lexer/smarty_internal_configfileparser.y"
-    function yy_r12()
-    {
-        $this->_retvalue = $this->parse_bool($this->yystack[$this->yyidx + 0]->minor);
-    }
-
-    #line 324 "../smarty/lexer/smarty_internal_configfileparser.y"
-    function yy_r13()
-    {
-        $this->_retvalue = self::parse_single_quoted_string($this->yystack[$this->yyidx + 0]->minor);
-    }
-
-    #line 328 "../smarty/lexer/smarty_internal_configfileparser.y"
-    function yy_r14()
-    {
-        $this->_retvalue = self::parse_double_quoted_string($this->yystack[$this->yyidx + 0]->minor);
-    }
-
-    #line 332 "../smarty/lexer/smarty_internal_configfileparser.y"
-    function yy_r15()
-    {
-        $this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[$this->yyidx + - 1]->minor);
-    }
-
-    #line 336 "../smarty/lexer/smarty_internal_configfileparser.y"
-    function yy_r16()
-    {
-        $this->_retvalue = '';
-    }
-
-    #line 340 "../smarty/lexer/smarty_internal_configfileparser.y"
-    function yy_r17()
-    {
-        $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
-    }
-
-    private $_retvalue;
-
-    public function yy_reduce($yyruleno)
-    {
-        if ($this->yyTraceFILE && $yyruleno >= 0 && $yyruleno < count(self::$yyRuleName)) {
-            fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n", $this->yyTracePrompt, $yyruleno, self::$yyRuleName[$yyruleno]);
-        }
-
-        $this->_retvalue = $yy_lefthand_side = null;
-        if (isset(self::$yyReduceMap[$yyruleno])) {
-            // call the action
-            $this->_retvalue = null;
-            $this->{'yy_r' . self::$yyReduceMap[$yyruleno]}();
-            $yy_lefthand_side = $this->_retvalue;
-        }
-        $yygoto = self::$yyRuleInfo[$yyruleno][0];
-        $yysize = self::$yyRuleInfo[$yyruleno][1];
-        $this->yyidx -= $yysize;
-        for ($i = $yysize; $i; $i --) {
-            // pop all of the right-hand side parameters
-            array_pop($this->yystack);
-        }
-        $yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto);
-        if ($yyact < self::YYNSTATE) {
-            if (!$this->yyTraceFILE && $yysize) {
-                $this->yyidx ++;
-                $x = new TPC_yyStackEntry;
-                $x->stateno = $yyact;
-                $x->major = $yygoto;
-                $x->minor = $yy_lefthand_side;
-                $this->yystack[$this->yyidx] = $x;
-            } else {
-                $this->yy_shift($yyact, $yygoto, $yy_lefthand_side);
-            }
-        } elseif ($yyact == self::YYNSTATE + self::YYNRULE + 1) {
-            $this->yy_accept();
-        }
-    }
-
-    public function yy_parse_failed()
-    {
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt);
-        }
-        while ($this->yyidx >= 0) {
-            $this->yy_pop_parser_stack();
-        }
-    }
-
-    public function yy_syntax_error($yymajor, $TOKEN)
-    {
-        #line 248 "../smarty/lexer/smarty_internal_configfileparser.y"
-
-        $this->internalError = true;
-        $this->yymajor = $yymajor;
-        $this->compiler->trigger_config_file_error();
-    }
-
-    public function yy_accept()
-    {
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt);
-        }
-        while ($this->yyidx >= 0) {
-            $this->yy_pop_parser_stack();
-        }
-        #line 241 "../smarty/lexer/smarty_internal_configfileparser.y"
-
-        $this->successful = !$this->internalError;
-        $this->internalError = false;
-        $this->retvalue = $this->_retvalue;
-    }
-
-    public function doParse($yymajor, $yytokenvalue)
-    {
-        $yyerrorhit = 0;   /* True if yymajor has invoked an error */
-
-        if ($this->yyidx === null || $this->yyidx < 0) {
-            $this->yyidx = 0;
-            $this->yyerrcnt = - 1;
-            $x = new TPC_yyStackEntry;
-            $x->stateno = 0;
-            $x->major = 0;
-            $this->yystack = array();
-            $this->yystack[] = $x;
-        }
-        $yyendofinput = ($yymajor == 0);
-
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sInput %s\n", $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
-        }
-
-        do {
-            $yyact = $this->yy_find_shift_action($yymajor);
-            if ($yymajor < self::YYERRORSYMBOL && !$this->yy_is_expected_token($yymajor)) {
-                // force a syntax error
-                $yyact = self::YY_ERROR_ACTION;
-            }
-            if ($yyact < self::YYNSTATE) {
-                $this->yy_shift($yyact, $yymajor, $yytokenvalue);
-                $this->yyerrcnt --;
-                if ($yyendofinput && $this->yyidx >= 0) {
-                    $yymajor = 0;
-                } else {
-                    $yymajor = self::YYNOCODE;
-                }
-            } elseif ($yyact < self::YYNSTATE + self::YYNRULE) {
-                $this->yy_reduce($yyact - self::YYNSTATE);
-            } elseif ($yyact == self::YY_ERROR_ACTION) {
-                if ($this->yyTraceFILE) {
-                    fprintf($this->yyTraceFILE, "%sSyntax Error!\n", $this->yyTracePrompt);
-                }
-                if (self::YYERRORSYMBOL) {
-                    if ($this->yyerrcnt < 0) {
-                        $this->yy_syntax_error($yymajor, $yytokenvalue);
-                    }
-                    $yymx = $this->yystack[$this->yyidx]->major;
-                    if ($yymx == self::YYERRORSYMBOL || $yyerrorhit) {
-                        if ($this->yyTraceFILE) {
-                            fprintf($this->yyTraceFILE, "%sDiscard input token %s\n", $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
-                        }
-                        $this->yy_destructor($yymajor, $yytokenvalue);
-                        $yymajor = self::YYNOCODE;
-                    } else {
-                        while ($this->yyidx >= 0 && $yymx != self::YYERRORSYMBOL && ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE) {
-                            $this->yy_pop_parser_stack();
-                        }
-                        if ($this->yyidx < 0 || $yymajor == 0) {
-                            $this->yy_destructor($yymajor, $yytokenvalue);
-                            $this->yy_parse_failed();
-                            $yymajor = self::YYNOCODE;
-                        } elseif ($yymx != self::YYERRORSYMBOL) {
-                            $u2 = 0;
-                            $this->yy_shift($yyact, self::YYERRORSYMBOL, $u2);
-                        }
-                    }
-                    $this->yyerrcnt = 3;
-                    $yyerrorhit = 1;
-                } else {
-                    if ($this->yyerrcnt <= 0) {
-                        $this->yy_syntax_error($yymajor, $yytokenvalue);
-                    }
-                    $this->yyerrcnt = 3;
-                    $this->yy_destructor($yymajor, $yytokenvalue);
-                    if ($yyendofinput) {
-                        $this->yy_parse_failed();
-                    }
-                    $yymajor = self::YYNOCODE;
-                }
-            } else {
-                $this->yy_accept();
-                $yymajor = self::YYNOCODE;
-            }
-        } while ($yymajor != self::YYNOCODE && $this->yyidx >= 0);
-    }
-}
-
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_data.php b/www/smarty-3.1.27/sysplugins/smarty_internal_data.php
deleted file mode 100644
index 2ca0f31d..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_data.php
+++ /dev/null
@@ -1,404 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Data
- * This file contains the basic classes and methods for template and variable creation
- *
- * @package    Smarty
- * @subpackage Template
- * @author     Uwe Tews
- */
-
-/**
- * Base class with template and variable methods
- *
- * @package    Smarty
- * @subpackage Template
- */
-class Smarty_Internal_Data
-{
-    /**
-     * name of class used for templates
-     *
-     * @var string
-     */
-    public $template_class = 'Smarty_Internal_Template';
-    /**
-     * template variables
-     *
-     * @var array
-     */
-    public $tpl_vars = array();
-    /**
-     * parent template (if any)
-     *
-     * @var Smarty_Internal_Template
-     */
-    public $parent = null;
-    /**
-     * configuration settings
-     *
-     * @var array
-     */
-    public $config_vars = array();
-
-    /**
-     * assigns a Smarty variable
-     *
-     * @param  array|string $tpl_var the template variable name(s)
-     * @param  mixed        $value   the value to assign
-     * @param  boolean      $nocache if true any output of this variable will be not cached
-     *
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function assign($tpl_var, $value = null, $nocache = false)
-    {
-        if (is_array($tpl_var)) {
-            foreach ($tpl_var as $_key => $_val) {
-                if ($_key != '') {
-                    $this->tpl_vars[$_key] = new Smarty_Variable($_val, $nocache);
-                }
-            }
-        } else {
-            if ($tpl_var != '') {
-                $this->tpl_vars[$tpl_var] = new Smarty_Variable($value, $nocache);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * assigns a global Smarty variable
-     *
-     * @param  string  $varname the global variable name
-     * @param  mixed   $value   the value to assign
-     * @param  boolean $nocache if true any output of this variable will be not cached
-     *
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function assignGlobal($varname, $value = null, $nocache = false)
-    {
-        if ($varname != '') {
-            Smarty::$global_tpl_vars[$varname] = new Smarty_Variable($value, $nocache);
-            $ptr = $this;
-            while ($ptr instanceof Smarty_Internal_Template) {
-                $ptr->tpl_vars[$varname] = clone Smarty::$global_tpl_vars[$varname];
-                $ptr = $ptr->parent;
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * assigns values to template variables by reference
-     *
-     * @param string   $tpl_var the template variable name
-     * @param          $value
-     * @param  boolean $nocache if true any output of this variable will be not cached
-     *
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function assignByRef($tpl_var, &$value, $nocache = false)
-    {
-        if ($tpl_var != '') {
-            $this->tpl_vars[$tpl_var] = new Smarty_Variable(null, $nocache);
-            $this->tpl_vars[$tpl_var]->value = &$value;
-        }
-
-        return $this;
-    }
-
-    /**
-     * appends values to template variables
-     *
-     * @param  array|string $tpl_var the template variable name(s)
-     * @param  mixed        $value   the value to append
-     * @param  boolean      $merge   flag if array elements shall be merged
-     * @param  boolean      $nocache if true any output of this variable will be not cached
-     *
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function append($tpl_var, $value = null, $merge = false, $nocache = false)
-    {
-        if (is_array($tpl_var)) {
-            // $tpl_var is an array, ignore $value
-            foreach ($tpl_var as $_key => $_val) {
-                if ($_key != '') {
-                    if (!isset($this->tpl_vars[$_key])) {
-                        $tpl_var_inst = $this->getVariable($_key, null, true, false);
-                        if ($tpl_var_inst instanceof Smarty_Undefined_Variable) {
-                            $this->tpl_vars[$_key] = new Smarty_Variable(null, $nocache);
-                        } else {
-                            $this->tpl_vars[$_key] = clone $tpl_var_inst;
-                        }
-                    }
-                    if (!(is_array($this->tpl_vars[$_key]->value) || $this->tpl_vars[$_key]->value instanceof ArrayAccess)) {
-                        settype($this->tpl_vars[$_key]->value, 'array');
-                    }
-                    if ($merge && is_array($_val)) {
-                        foreach ($_val as $_mkey => $_mval) {
-                            $this->tpl_vars[$_key]->value[$_mkey] = $_mval;
-                        }
-                    } else {
-                        $this->tpl_vars[$_key]->value[] = $_val;
-                    }
-                }
-            }
-        } else {
-            if ($tpl_var != '' && isset($value)) {
-                if (!isset($this->tpl_vars[$tpl_var])) {
-                    $tpl_var_inst = $this->getVariable($tpl_var, null, true, false);
-                    if ($tpl_var_inst instanceof Smarty_Undefined_Variable) {
-                        $this->tpl_vars[$tpl_var] = new Smarty_Variable(null, $nocache);
-                    } else {
-                        $this->tpl_vars[$tpl_var] = clone $tpl_var_inst;
-                    }
-                }
-                if (!(is_array($this->tpl_vars[$tpl_var]->value) || $this->tpl_vars[$tpl_var]->value instanceof ArrayAccess)) {
-                    settype($this->tpl_vars[$tpl_var]->value, 'array');
-                }
-                if ($merge && is_array($value)) {
-                    foreach ($value as $_mkey => $_mval) {
-                        $this->tpl_vars[$tpl_var]->value[$_mkey] = $_mval;
-                    }
-                } else {
-                    $this->tpl_vars[$tpl_var]->value[] = $value;
-                }
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * appends values to template variables by reference
-     *
-     * @param  string  $tpl_var the template variable name
-     * @param  mixed   &$value  the referenced value to append
-     * @param  boolean $merge   flag if array elements shall be merged
-     *
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function appendByRef($tpl_var, &$value, $merge = false)
-    {
-        if ($tpl_var != '' && isset($value)) {
-            if (!isset($this->tpl_vars[$tpl_var])) {
-                $this->tpl_vars[$tpl_var] = new Smarty_Variable();
-            }
-            if (!is_array($this->tpl_vars[$tpl_var]->value)) {
-                settype($this->tpl_vars[$tpl_var]->value, 'array');
-            }
-            if ($merge && is_array($value)) {
-                foreach ($value as $_key => $_val) {
-                    $this->tpl_vars[$tpl_var]->value[$_key] = &$value[$_key];
-                }
-            } else {
-                $this->tpl_vars[$tpl_var]->value[] = &$value;
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns a single or all template variables
-     *
-     * @param  string  $varname        variable name or null
-     * @param  object  $_ptr           optional pointer to data object
-     * @param  boolean $search_parents include parent templates?
-     *
-     * @return string  variable value or or array of variables
-     */
-    public function getTemplateVars($varname = null, $_ptr = null, $search_parents = true)
-    {
-        if (isset($varname)) {
-            $_var = $this->getVariable($varname, $_ptr, $search_parents, false);
-            if (is_object($_var)) {
-                return $_var->value;
-            } else {
-                return null;
-            }
-        } else {
-            $_result = array();
-            if ($_ptr === null) {
-                $_ptr = $this;
-            }
-            while ($_ptr !== null) {
-                foreach ($_ptr->tpl_vars AS $key => $var) {
-                    if (!array_key_exists($key, $_result)) {
-                        $_result[$key] = $var->value;
-                    }
-                }
-                // not found, try at parent
-                if ($search_parents) {
-                    $_ptr = $_ptr->parent;
-                } else {
-                    $_ptr = null;
-                }
-            }
-            if ($search_parents && isset(Smarty::$global_tpl_vars)) {
-                foreach (Smarty::$global_tpl_vars AS $key => $var) {
-                    if (!array_key_exists($key, $_result)) {
-                        $_result[$key] = $var->value;
-                    }
-                }
-            }
-
-            return $_result;
-        }
-    }
-
-    /**
-     * clear the given assigned template variable.
-     *
-     * @param  string|array $tpl_var the template variable(s) to clear
-     *
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function clearAssign($tpl_var)
-    {
-        if (is_array($tpl_var)) {
-            foreach ($tpl_var as $curr_var) {
-                unset($this->tpl_vars[$curr_var]);
-            }
-        } else {
-            unset($this->tpl_vars[$tpl_var]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * clear all the assigned template variables.
-     *
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function clearAllAssign()
-    {
-        $this->tpl_vars = array();
-
-        return $this;
-    }
-
-    /**
-     * load a config file, optionally load just selected sections
-     *
-     * @param  string $config_file filename
-     * @param  mixed  $sections    array of section names, single section or null
-     *
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function configLoad($config_file, $sections = null)
-    {
-        // load Config class
-        Smarty_Internal_Extension_Config::configLoad($this, $config_file, $sections);
-        return $this;
-    }
-
-    /**
-     * gets the object of a Smarty variable
-     *
-     * @param  string  $variable       the name of the Smarty variable
-     * @param  object  $_ptr           optional pointer to data object
-     * @param  boolean $search_parents search also in parent data
-     * @param bool     $error_enable
-     *
-     * @return object  the object of the variable
-     */
-    public function getVariable($variable, $_ptr = null, $search_parents = true, $error_enable = true)
-    {
-        if ($_ptr === null) {
-            $_ptr = $this;
-        }
-        while ($_ptr !== null) {
-            if (isset($_ptr->tpl_vars[$variable])) {
-                // found it, return it
-                return $_ptr->tpl_vars[$variable];
-            }
-            // not found, try at parent
-            if ($search_parents) {
-                $_ptr = $_ptr->parent;
-            } else {
-                $_ptr = null;
-            }
-        }
-        if (isset(Smarty::$global_tpl_vars[$variable])) {
-            // found it, return it
-            return Smarty::$global_tpl_vars[$variable];
-        }
-        $smarty = isset($this->smarty) ? $this->smarty : $this;
-        if ($smarty->error_unassigned && $error_enable) {
-            // force a notice
-            $x = $$variable;
-        }
-
-        return new Smarty_Undefined_Variable;
-    }
-
-    /**
-     * gets  a config variable
-     *
-     * @param  string $variable the name of the config variable
-     * @param bool    $error_enable
-     *
-     * @return mixed  the value of the config variable
-     */
-    public function getConfigVariable($variable, $error_enable = true)
-    {
-        return Smarty_Internal_Extension_Config::getConfigVariable($this, $variable, $error_enable = true);
-    }
-
-    /**
-     * Returns a single or all config variables
-     *
-     * @param  string $varname variable name or null
-     * @param bool    $search_parents
-     *
-     * @return string variable value or or array of variables
-     */
-    public function getConfigVars($varname = null, $search_parents = true)
-    {
-        return Smarty_Internal_Extension_Config::getConfigVars($this, $varname, $search_parents);
-    }
-
-    /**
-     * Deassigns a single or all config variables
-     *
-     * @param  string $varname variable name or null
-     *
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function clearConfig($varname = null)
-    {
-        return Smarty_Internal_Extension_Config::clearConfig($this, $varname);
-    }
-
-    /**
-     * gets  a stream variable
-     *
-     * @param  string $variable the stream of the variable
-     *
-     * @throws SmartyException
-     * @return mixed  the value of the stream variable
-     */
-    public function getStreamVariable($variable)
-    {
-        $_result = '';
-        $fp = fopen($variable, 'r+');
-        if ($fp) {
-            while (!feof($fp) && ($current_line = fgets($fp)) !== false) {
-                $_result .= $current_line;
-            }
-            fclose($fp);
-
-            return $_result;
-        }
-        $smarty = isset($this->smarty) ? $this->smarty : $this;
-        if ($smarty->error_unassigned) {
-            throw new SmartyException('Undefined stream variable "' . $variable . '"');
-        } else {
-            return null;
-        }
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_debug.php b/www/smarty-3.1.27/sysplugins/smarty_internal_debug.php
deleted file mode 100644
index 89eb9f3a..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_debug.php
+++ /dev/null
@@ -1,424 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Debug
- * Class to collect data for the Smarty Debugging Console
- *
- * @package    Smarty
- * @subpackage Debug
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Debug Class
- *
- * @package    Smarty
- * @subpackage Debug
- */
-class Smarty_Internal_Debug extends Smarty_Internal_Data
-{
-    /**
-     * template data
-     *
-     * @var array
-     */
-    public static $template_data = array();
-
-    /**
-     * List of uid's which shall be ignored
-     *
-     * @var array
-     */
-    public static $ignore_uid = array();
-
-    /**
-     * Index of display() and fetch() calls
-     *
-     * @var int
-     */
-    public static $index = 0;
-
-    /**
-     * Counter for window offset
-     *
-     * @var int
-     */
-    public static $offset = 0;
-
-    /**
-     * Start logging template
-     *
-     * @param \Smarty_Internal_Template $template template
-     * @param null                                $mode true: display   false: fetch  null: subtemolate
-     */
-    public static function start_template(Smarty_Internal_Template $template, $mode = null)
-    {
-        if (isset($mode)) {
-            self::$index ++;
-            self::$offset ++;
-            self::$template_data[self::$index] = null;
-        }
-        $key = self::get_key($template);
-        self::$template_data[self::$index][$key]['start_template_time'] = microtime(true);
-    }
-
-    /**
-     * End logging of cache time
-     *
-     * @param \Smarty_Internal_Template $template cached template
-     */
-    public static function end_template(Smarty_Internal_Template $template)
-    {
-        $key = self::get_key($template);
-        self::$template_data[self::$index][$key]['total_time'] += microtime(true) - self::$template_data[self::$index][$key]['start_template_time'];
-        self::$template_data[self::$index][$key]['properties'] = $template->properties;
-    }
-
-    /**
-     * Start logging of compile time
-     *
-     * @param \Smarty_Internal_Template $template
-     */
-    public static function start_compile(Smarty_Internal_Template $template)
-    {
-        static $_is_stringy = array('string' => true, 'eval' => true);
-        if (!empty($template->compiler->trace_uid)) {
-            $key = $template->compiler->trace_uid;
-            if (!isset(self::$template_data[self::$index][$key])) {
-                if (isset($_is_stringy[$template->source->type])) {
-                    self::$template_data[self::$index][$key]['name'] = '\'' . substr($template->source->name, 0, 25) . '...\'';
-                } else {
-                    self::$template_data[self::$index][$key]['name'] = $template->source->filepath;
-                }
-                self::$template_data[self::$index][$key]['compile_time'] = 0;
-                self::$template_data[self::$index][$key]['render_time'] = 0;
-                self::$template_data[self::$index][$key]['cache_time'] = 0;
-            }
-        } else {
-            if (isset(self::$ignore_uid[$template->source->uid])) {
-                return;
-            }
-            $key = self::get_key($template);
-        }
-        self::$template_data[self::$index][$key]['start_time'] = microtime(true);
-    }
-
-    /**
-     * End logging of compile time
-     *
-     * @param \Smarty_Internal_Template $template
-     */
-    public static function end_compile(Smarty_Internal_Template $template)
-    {
-        if (!empty($template->compiler->trace_uid)) {
-            $key = $template->compiler->trace_uid;
-        } else {
-            if (isset(self::$ignore_uid[$template->source->uid])) {
-                return;
-            }
-
-            $key = self::get_key($template);
-        }
-        self::$template_data[self::$index][$key]['compile_time'] += microtime(true) - self::$template_data[self::$index][$key]['start_time'];
-    }
-
-    /**
-     * Start logging of render time
-     *
-     * @param \Smarty_Internal_Template $template
-     */
-    public static function start_render(Smarty_Internal_Template $template)
-    {
-        $key = self::get_key($template);
-        self::$template_data[self::$index][$key]['start_time'] = microtime(true);
-    }
-
-    /**
-     * End logging of compile time
-     *
-     * @param \Smarty_Internal_Template $template
-     */
-    public static function end_render(Smarty_Internal_Template $template)
-    {
-        $key = self::get_key($template);
-        self::$template_data[self::$index][$key]['render_time'] += microtime(true) - self::$template_data[self::$index][$key]['start_time'];
-    }
-
-    /**
-     * Start logging of cache time
-     *
-     * @param \Smarty_Internal_Template $template cached template
-     */
-    public static function start_cache(Smarty_Internal_Template $template)
-    {
-        $key = self::get_key($template);
-        self::$template_data[self::$index][$key]['start_time'] = microtime(true);
-    }
-
-    /**
-     * End logging of cache time
-     *
-     * @param \Smarty_Internal_Template $template cached template
-     */
-    public static function end_cache(Smarty_Internal_Template $template)
-    {
-        $key = self::get_key($template);
-        self::$template_data[self::$index][$key]['cache_time'] += microtime(true) - self::$template_data[self::$index][$key]['start_time'];
-    }
-
-    /**
-     * Register template object
-     *
-     * @param \Smarty_Internal_Template $template cached template
-     */
-    public static function register_template(Smarty_Internal_Template $template)
-    {
-    }
-
-    /**
-     * Register data object
-     *
-     * @param \Smarty_Data $data data object
-     */
-    public static function register_data(Smarty_Data $data)
-    {
-    }
-
-    /**
-     * Opens a window for the Smarty Debugging Console and display the data
-     *
-     * @param Smarty_Internal_Template|Smarty $obj object to debug
-     * @param bool                            $full
-     */
-    public static function display_debug($obj, $full = false)
-    {
-        if (!$full) {
-            self::$offset ++;
-            $savedIndex = self::$index;
-            self::$index = 9999;
-        }
-        if ($obj instanceof Smarty) {
-            $smarty = $obj;
-        } else {
-            $smarty = $obj->smarty;
-        }
-        // create fresh instance of smarty for displaying the debug console
-        // to avoid problems if the application did overload the Smarty class
-        $debObj = new Smarty();
-        // copy the working dirs from application
-        $debObj->setCompileDir($smarty->getCompileDir());
-        // init properties by hand as user may have edited the original Smarty class
-        $debObj->setPluginsDir(is_dir(__DIR__ . '/../plugins') ? __DIR__ . '/../plugins' : $smarty->getPluginsDir());
-        $debObj->force_compile = false;
-        $debObj->compile_check = true;
-        $debObj->left_delimiter = '{';
-        $debObj->right_delimiter = '}';
-        $debObj->security_policy = null;
-        $debObj->debugging = false;
-        $debObj->debugging_ctrl = 'NONE';
-        $debObj->error_reporting = E_ALL & ~E_NOTICE;
-        $debObj->debug_tpl = isset($smarty->debug_tpl) ? $smarty->debug_tpl : 'file:' . __DIR__ . '/../debug.tpl';
-        $debObj->registered_plugins = array();
-        $debObj->registered_resources = array();
-        $debObj->registered_filters = array();
-        $debObj->autoload_filters = array();
-        $debObj->default_modifiers = array();
-        $debObj->escape_html = true;
-        $debObj->caching = false;
-        $debObj->compile_id = null;
-        $debObj->cache_id = null;
-        // prepare information of assigned variables
-        $ptr = self::get_debug_vars($obj);
-        $_assigned_vars = $ptr->tpl_vars;
-        ksort($_assigned_vars);
-        $_config_vars = $ptr->config_vars;
-        ksort($_config_vars);
-        $debugging = $smarty->debugging;
-
-        $_template = new Smarty_Internal_Template($debObj->debug_tpl, $debObj);
-        if ($obj instanceof Smarty_Internal_Template) {
-            $_template->assign('template_name', $obj->source->type . ':' . $obj->source->name);
-        }
-        if ($obj instanceof Smarty || $full) {
-            $_template->assign('template_data', self::$template_data[self::$index]);
-        } else {
-            $_template->assign('template_data', null);
-        }
-        $_template->assign('assigned_vars', $_assigned_vars);
-        $_template->assign('config_vars', $_config_vars);
-        $_template->assign('execution_time', microtime(true) - $smarty->start_time);
-        $_template->assign('display_mode', $debugging == 2 || !$full);
-        $_template->assign('offset', self::$offset * 50);
-        echo $_template->fetch();
-        if (isset($full)) {
-            self::$index --;
-        }
-        if (!$full) {
-            self::$index = $savedIndex;
-        }
-    }
-
-    /**
-     * Recursively gets variables from all template/data scopes
-     *
-     * @param  Smarty_Internal_Template|Smarty_Data $obj object to debug
-     *
-     * @return StdClass
-     */
-    public static function get_debug_vars($obj)
-    {
-        $config_vars = array();
-        foreach ($obj->config_vars as $key => $var) {
-            $config_vars[$key]['value'] = $var;
-            if ($obj instanceof Smarty_Internal_Template) {
-                $config_vars[$key]['scope'] = $obj->source->type . ':' . $obj->source->name;
-            } elseif ($obj instanceof Smarty_Data) {
-                $tpl_vars[$key]['scope'] = $obj->dataObjectName;
-            } else {
-                $config_vars[$key]['scope'] = 'Smarty object';
-            }
-        }
-        $tpl_vars = array();
-        foreach ($obj->tpl_vars as $key => $var) {
-            foreach ($var as $varkey => $varvalue) {
-                if ($varkey == 'value') {
-                    $tpl_vars[$key][$varkey] = $varvalue;
-                } else {
-                    if ($varkey == 'nocache') {
-                        if ($varvalue == true) {
-                            $tpl_vars[$key][$varkey] = $varvalue;
-                        }
-                    } else {
-                        if ($varkey != 'scope' || $varvalue !== 0) {
-                            $tpl_vars[$key]['attributes'][$varkey] = $varvalue;
-                        }
-                    }
-                }
-            }
-            if ($obj instanceof Smarty_Internal_Template) {
-                $tpl_vars[$key]['scope'] = $obj->source->type . ':' . $obj->source->name;
-            } elseif ($obj instanceof Smarty_Data) {
-                $tpl_vars[$key]['scope'] = $obj->dataObjectName;
-            } else {
-                $tpl_vars[$key]['scope'] = 'Smarty object';
-            }
-        }
-
-        if (isset($obj->parent)) {
-            $parent = self::get_debug_vars($obj->parent);
-            foreach ($parent->tpl_vars as $name => $pvar) {
-                if (isset($tpl_vars[$name]) && $tpl_vars[$name]['value'] === $pvar['value']) {
-                    $tpl_vars[$name]['scope'] = $pvar['scope'];
-                }
-            }
-            $tpl_vars = array_merge($parent->tpl_vars, $tpl_vars);
-
-            foreach ($parent->config_vars as $name => $pvar) {
-                if (isset($config_vars[$name]) && $config_vars[$name]['value'] === $pvar['value']) {
-                    $config_vars[$name]['scope'] = $pvar['scope'];
-                }
-            }
-            $config_vars = array_merge($parent->config_vars, $config_vars);
-        } else {
-            foreach (Smarty::$global_tpl_vars as $key => $var) {
-                if (!array_key_exists($key, $tpl_vars)) {
-                    foreach ($var as $varkey => $varvalue) {
-                        if ($varkey == 'value') {
-                            $tpl_vars[$key][$varkey] = $varvalue;
-                        } else {
-                            if ($varkey == 'nocache') {
-                                if ($varvalue == true) {
-                                    $tpl_vars[$key][$varkey] = $varvalue;
-                                }
-                            } else {
-                                if ($varkey != 'scope' || $varvalue !== 0) {
-                                    $tpl_vars[$key]['attributes'][$varkey] = $varvalue;
-                                }
-                            }
-                        }
-                    }
-                    $tpl_vars[$key]['scope'] = 'Global';
-                }
-            }
-        }
-
-        return (object) array('tpl_vars' => $tpl_vars, 'config_vars' => $config_vars);
-    }
-
-    /**
-     * Return key into $template_data for template
-     *
-     * @param \Smarty_Internal_Template $template template object
-     *
-     * @return string key into $template_data
-     */
-    private static function get_key(Smarty_Internal_Template $template)
-    {
-        static $_is_stringy = array('string' => true, 'eval' => true);
-        // calculate Uid if not already done
-        if ($template->source->uid == '') {
-            $template->source->filepath;
-        }
-        $key = $template->source->uid;
-        if (isset(self::$template_data[self::$index][$key])) {
-            return $key;
-        } else {
-            if (isset($_is_stringy[$template->source->type])) {
-                self::$template_data[self::$index][$key]['name'] = '\'' . substr($template->source->name, 0, 25) . '...\'';
-            } else {
-                self::$template_data[self::$index][$key]['name'] = $template->source->filepath;
-            }
-            self::$template_data[self::$index][$key]['compile_time'] = 0;
-            self::$template_data[self::$index][$key]['render_time'] = 0;
-            self::$template_data[self::$index][$key]['cache_time'] = 0;
-            self::$template_data[self::$index][$key]['total_time'] = 0;
-
-            return $key;
-        }
-    }
-
-    /**
-     * Ignore template
-     *
-     * @param \Smarty_Internal_Template $template
-     */
-    public static function ignore(Smarty_Internal_Template $template)
-    {
-        // calculate Uid if not already done
-        if ($template->source->uid == '') {
-            $template->source->filepath;
-        }
-        self::$ignore_uid[$template->source->uid] = true;
-    }
-
-    /**
-     * handle 'URL' debugging mode
-     *
-     * @param Smarty_Internal_Template $_template
-     */
-    public static function debugUrl(Smarty_Internal_Template $_template)
-    {
-        if (isset($_SERVER['QUERY_STRING'])) {
-            $_query_string = $_SERVER['QUERY_STRING'];
-        } else {
-            $_query_string = '';
-        }
-        if (false !== strpos($_query_string, $_template->smarty->smarty_debug_id)) {
-            if (false !== strpos($_query_string, $_template->smarty->smarty_debug_id . '=on')) {
-                // enable debugging for this browser session
-                setcookie('SMARTY_DEBUG', true);
-                $_template->smarty->debugging = true;
-            } elseif (false !== strpos($_query_string, $_template->smarty->smarty_debug_id . '=off')) {
-                // disable debugging for this browser session
-                setcookie('SMARTY_DEBUG', false);
-                $_template->smarty->debugging = false;
-            } else {
-                // enable debugging for this page
-                $_template->smarty->debugging = true;
-            }
-        } else {
-            if (isset($_COOKIE['SMARTY_DEBUG'])) {
-                $_template->smarty->debugging = true;
-            }
-        }
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_extension_codeframe.php b/www/smarty-3.1.27/sysplugins/smarty_internal_extension_codeframe.php
deleted file mode 100644
index 0474378c..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_extension_codeframe.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-/**
- * Smarty Internal Extension
- * This file contains the Smarty template extension to create a code frame
- *
- * @package    Smarty
- * @subpackage Template
- * @author     Uwe Tews
- */
-
-/**
- * Class Smarty_Internal_Extension_CodeFrame
- * Create code frame for compiled and cached templates
- */
-class Smarty_Internal_Extension_CodeFrame
-{
-    /**
-     * Create code frame for compiled and cached templates
-     *
-     * @param Smarty_Internal_Template $_template
-     * @param  string                  $content optional template content
-     * @param  bool                    $cache   flag for cache file
-     *
-     * @return string
-     */
-    public static function create(Smarty_Internal_Template $_template, $content = '', $cache = false)
-    {
-        // build property code
-        $_template->properties['has_nocache_code'] = $_template->has_nocache_code || !empty($_template->required_plugins['nocache']);
-        $_template->properties['version'] = Smarty::SMARTY_VERSION;
-        if (!isset($_template->properties['unifunc'])) {
-            $_template->properties['unifunc'] = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
-        }
-        $properties = $_template->properties;
-        if (!$cache) {
-            unset($properties['tpl_function']);
-            if (!empty($_template->compiler->templateProperties)) {
-                $properties['tpl_function'] = $_template->compiler->templateProperties['tpl_function'];
-            }
-        }
-        $output = "<?php\n";
-        $output .= "/*%%SmartyHeaderCode:{$_template->properties['nocache_hash']}%%*/\n";
-        if ($_template->smarty->direct_access_security) {
-            $output .= "if(!defined('SMARTY_DIR')) exit('no direct access allowed');\n";
-        }
-        $output .= "\$_valid = \$_smarty_tpl->decodeProperties(" . var_export($properties, true) . ',' . ($cache ? 'true' : 'false') . ");\n";
-        $output .= "/*/%%SmartyHeaderCode%%*/\n";
-        $output .= "if (\$_valid && !is_callable('{$_template->properties['unifunc']}')) {\n";
-        $output .= "function {$_template->properties['unifunc']} (\$_smarty_tpl) {\n";
-        // include code for plugins
-        if (!$cache) {
-            if (!empty($_template->required_plugins['compiled'])) {
-                foreach ($_template->required_plugins['compiled'] as $tmp) {
-                    foreach ($tmp as $data) {
-                        $file = addslashes($data['file']);
-                        if (is_Array($data['function'])) {
-                            $output .= "if (!is_callable(array('{$data['function'][0]}','{$data['function'][1]}'))) require_once '{$file}';\n";
-                        } else {
-                            $output .= "if (!is_callable('{$data['function']}')) require_once '{$file}';\n";
-                        }
-                    }
-                }
-            }
-            if (!empty($_template->required_plugins['nocache'])) {
-                $_template->has_nocache_code = true;
-                $output .= "echo '/*%%SmartyNocache:{$_template->properties['nocache_hash']}%%*/<?php \$_smarty = \$_smarty_tpl->smarty; ";
-                foreach ($_template->required_plugins['nocache'] as $tmp) {
-                    foreach ($tmp as $data) {
-                        $file = addslashes($data['file']);
-                        if (is_Array($data['function'])) {
-                            $output .= addslashes("if (!is_callable(array('{$data['function'][0]}','{$data['function'][1]}'))) require_once '{$file}';\n");
-                        } else {
-                            $output .= addslashes("if (!is_callable('{$data['function']}')) require_once '{$file}';\n");
-                        }
-                    }
-                }
-                $output .= "?>/*/%%SmartyNocache:{$_template->properties['nocache_hash']}%%*/';\n";
-            }
-        }
-        $output .= "?>\n";
-        $output = self::appendCode($output, $content);
-        return self::appendCode($output, "<?php }\n}\n?>");
-    }
-
-    /**
-     * Create code frame of compiled template function
-     *
-     * @param \Smarty_Internal_Template $_template
-     * @param string                    $content
-     *
-     * @return string
-     */
-    public static function createFunctionFrame(Smarty_Internal_Template $_template, $content = '')
-    {
-        if (!isset($_template->properties['unifunc'])) {
-            $_template->properties['unifunc'] = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
-        }
-        $output = "<?php\n";
-        $output .= "/*%%SmartyHeaderCode:{$_template->properties['nocache_hash']}%%*/\n";
-        $output .= "if (\$_valid && !is_callable('{$_template->properties['unifunc']}')) {\n";
-        $output .= "function {$_template->properties['unifunc']} (\$_smarty_tpl) {\n";
-        $output .= "?>\n" . $content;
-        $output .= "<?php\n";
-        $output .= "/*/%%SmartyNocache:{$_template->properties['nocache_hash']}%%*/\n";
-        $output .= "}\n}\n?>";
-        return $output;
-    }
-
-    /**
-     * Append code segments and remove unneeded ?> <?php transitions
-     *
-     * @param string $left
-     * @param string $right
-     *
-     * @return string
-     */
-    public static function appendCode($left, $right)
-    {
-        if (preg_match('/\s*\?>$/', $left) && preg_match('/^<\?php\s+/', $right)) {
-            $left = preg_replace('/\s*\?>$/', "\n", $left);
-            $left .= preg_replace('/^<\?php\s+/', '', $right);
-        } else {
-            $left .= $right;
-        }
-        return $left;
-    }
-}
\ No newline at end of file
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_extension_config.php b/www/smarty-3.1.27/sysplugins/smarty_internal_extension_config.php
deleted file mode 100644
index a30bb22d..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_extension_config.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-
-/**
- * @package    Smarty
- * @subpackage PluginsInternal
- */
-class Smarty_Internal_Extension_Config
-{
-    /**
-     * @param        $obj
-     * @param        $config_file
-     * @param null   $sections
-     * @param string $scope
-     */
-    static function configLoad($obj, $config_file, $sections = null, $scope = 'local')
-    {
-        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
-        $confObj = new $smarty->template_class($config_file, $smarty, $obj);
-        $confObj->caching = Smarty::CACHING_OFF;
-        $confObj->source = Smarty_Template_Config::load($confObj);
-        $confObj->source->config_sections = $sections;
-        $confObj->source->scope = $scope;
-        $confObj->compiled = Smarty_Template_Compiled::load($confObj);
-        if ($confObj->smarty->debugging) {
-            Smarty_Internal_Debug::start_render($confObj);
-        }
-        $confObj->compiled->render($confObj);
-        if ($confObj->smarty->debugging) {
-            Smarty_Internal_Debug::end_render($confObj);
-        }
-        if ($obj instanceof Smarty_Internal_Template) {
-            $obj->properties['file_dependency'][$confObj->source->uid] = array($confObj->source->filepath, $confObj->source->timestamp, $confObj->source->type);
-        }
-    }
-
-    /**
-     * load config variables
-     *
-     * @param mixed  $sections array of section names, single section or null
-     * @param string $scope    global,parent or local
-     *
-     * @throws Exception
-     */
-    static function loadConfigVars($_template, $_config_vars)
-    {
-        $scope = $_template->source->scope;
-        // pointer to scope (local scope is parent of template object
-        $scope_ptr = $_template->parent;
-        if ($scope == 'parent') {
-            if (isset($_template->parent->parent)) {
-                $scope_ptr = $_template->parent->parent;
-            }
-        } elseif ($scope == 'root' || $scope == 'global') {
-            while (isset($scope_ptr->parent)) {
-                $scope_ptr = $scope_ptr->parent;
-            }
-        }
-        // copy global config vars
-        foreach ($_config_vars['vars'] as $variable => $value) {
-            if ($_template->smarty->config_overwrite || !isset($scope_ptr->config_vars[$variable])) {
-                $scope_ptr->config_vars[$variable] = $value;
-            } else {
-                $scope_ptr->config_vars[$variable] = array_merge((array) $scope_ptr->config_vars[$variable], (array) $value);
-            }
-        }
-        // scan sections
-        $sections = $_template->source->config_sections;
-        if (!empty($sections)) {
-            foreach ((array) $sections as $_template_section) {
-                if (isset($_config_vars['sections'][$_template_section])) {
-                    foreach ($_config_vars['sections'][$_template_section]['vars'] as $variable => $value) {
-                        if ($_template->smarty->config_overwrite || !isset($scope_ptr->config_vars[$variable])) {
-                            $scope_ptr->config_vars[$variable] = $value;
-                        } else {
-                            $scope_ptr->config_vars[$variable] = array_merge((array) $scope_ptr->config_vars[$variable], (array) $value);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns a single or all config variables
-     *
-     * @param  string $varname variable name or null
-     * @param bool    $search_parents
-     *
-     * @return string variable value or or array of variables
-     */
-    static function getConfigVars($obj, $varname = null, $search_parents = true)
-    {
-        $_ptr = $obj;
-        $var_array = array();
-        while ($_ptr !== null) {
-            if (isset($varname)) {
-                if (isset($_ptr->config_vars[$varname])) {
-                    return $_ptr->config_vars[$varname];
-                }
-            } else {
-                $var_array = array_merge($_ptr->config_vars, $var_array);
-            }
-            // not found, try at parent
-            if ($search_parents) {
-                $_ptr = $_ptr->parent;
-            } else {
-                $_ptr = null;
-            }
-        }
-        if (isset($varname)) {
-            return '';
-        } else {
-            return $var_array;
-        }
-    }
-
-    /**
-     * gets  a config variable
-     *
-     * @param  string $variable the name of the config variable
-     * @param bool    $error_enable
-     *
-     * @return mixed  the value of the config variable
-     */
-    static function getConfigVariable($obj, $variable, $error_enable = true)
-    {
-        $_ptr = $obj;
-        while ($_ptr !== null) {
-            if (isset($_ptr->config_vars[$variable])) {
-                // found it, return it
-                return $_ptr->config_vars[$variable];
-            }
-            // not found, try at parent
-            $_ptr = $_ptr->parent;
-        }
-        if ($obj->error_unassigned && $error_enable) {
-            // force a notice
-            $x = $$variable;
-        }
-
-        return null;
-    }
-
-    /**
-     * remove a single or all config variables
-     *
-     * @param  string $name variable name or null
-     *
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    static function clearConfig($obj, $name = null)
-    {
-        if (isset($name)) {
-            unset($obj->config_vars[$name]);
-        } else {
-            $obj->config_vars = array();
-        }
-        return $obj;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_extension_defaulttemplatehandler.php b/www/smarty-3.1.27/sysplugins/smarty_internal_extension_defaulttemplatehandler.php
deleted file mode 100644
index ed602920..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_extension_defaulttemplatehandler.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * Smarty Resource Extension
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Resource Extension
- * Default template and config file handling
- *
- * @package    Smarty
- * @subpackage TemplateResources
- */
-class Smarty_Internal_Extension_DefaultTemplateHandler
-{
-
-    /**
-     * get default content from template of config resource handler
-     *
-     * @param Smarty_Internal_Template        $_template
-     * @param Smarty_Internal_Template_Source $source
-     * @param  Smarty_Resource                $resObj
-     */
-    static function _getDefault(Smarty_Internal_Template $_template, &$source, &$resObj)
-    {
-        if ($source->isConfig) {
-            $default_handler = $_template->smarty->default_config_handler_func;
-        } else {
-            $default_handler = $_template->smarty->default_template_handler_func;
-        }
-        $_content = $_timestamp = null;
-        $_return = call_user_func_array($default_handler,
-                                        array($source->type, $source->name, &$_content, &$_timestamp, $source->smarty));
-        if (is_string($_return)) {
-            $source->exists = is_file($_return);
-            if ($source->exists) {
-                $source->timestamp = filemtime($_return);
-            }
-            $source->filepath = $_return;
-        } elseif ($_return === true) {
-            $source->content = $_content;
-            $source->timestamp = $_timestamp;
-            $source->exists = true;
-            $source->recompiled = true;
-            $source->filepath = false;
-        }
-    }
-
-    /**
-     * register template default handler
-     *
-     * @param Smarty $smarty
-     * @param mixed  $callback
-     *
-     * @throws SmartyException
-     */
-    static function registerDefaultTemplateHandler(Smarty $smarty, $callback)
-    {
-        if (is_callable($callback)) {
-            $smarty->default_template_handler_func = $callback;
-        } else {
-            throw new SmartyException("Default template handler not callable");
-        }
-    }
-
-    /**
-     * register config default handler
-     *
-     * @param Smarty $smarty
-     * @param mixed  $callback
-     *
-     * @throws SmartyException
-     */
-    static function registerDefaultConfigHandler(Smarty $smarty, $callback)
-    {
-        if (is_callable($callback)) {
-            $smarty->default_config_handler_func = $callback;
-        } else {
-            throw new SmartyException("Default config handler not callable");
-        }
-    }
-}
\ No newline at end of file
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_filter_handler.php b/www/smarty-3.1.27/sysplugins/smarty_internal_filter_handler.php
deleted file mode 100644
index 4f0f3981..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_filter_handler.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Filter Handler
- * Smarty filter handler class
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-
-/**
- * Class for filter processing
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- */
-class Smarty_Internal_Filter_Handler
-{
-    /**
-     * Run filters over content
-     * The filters will be lazy loaded if required
-     * class name format: Smarty_FilterType_FilterName
-     * plugin filename format: filtertype.filtername.php
-     * Smarty2 filter plugins could be used
-     *
-     * @param  string                   $type     the type of filter ('pre','post','output') which shall run
-     * @param  string                   $content  the content which shall be processed by the filters
-     * @param  Smarty_Internal_Template $template template object
-     *
-     * @throws SmartyException
-     * @return string                   the filtered content
-     */
-    public static function runFilter($type, $content, Smarty_Internal_Template $template)
-    {
-        $output = $content;
-        // loop over autoload filters of specified type
-        if (!empty($template->smarty->autoload_filters[$type])) {
-            foreach ((array) $template->smarty->autoload_filters[$type] as $name) {
-                $plugin_name = "Smarty_{$type}filter_{$name}";
-                if ($template->smarty->loadPlugin($plugin_name)) {
-                    if (function_exists($plugin_name)) {
-                        // use loaded Smarty2 style plugin
-                        $output = $plugin_name($output, $template);
-                    } elseif (class_exists($plugin_name, false)) {
-                        // loaded class of filter plugin
-                        $output = call_user_func(array($plugin_name, 'execute'), $output, $template);
-                    }
-                } else {
-                    // nothing found, throw exception
-                    throw new SmartyException("Unable to load filter {$plugin_name}");
-                }
-            }
-        }
-        // loop over registerd filters of specified type
-        if (!empty($template->smarty->registered_filters[$type])) {
-            foreach ($template->smarty->registered_filters[$type] as $key => $name) {
-                if (is_array($template->smarty->registered_filters[$type][$key])) {
-                    $output = call_user_func($template->smarty->registered_filters[$type][$key], $output, $template);
-                } else {
-                    $output = $template->smarty->registered_filters[$type][$key]($output, $template);
-                }
-            }
-        }
-        // return filtered output
-        return $output;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_function_call_handler.php b/www/smarty-3.1.27/sysplugins/smarty_internal_function_call_handler.php
deleted file mode 100644
index 6cf4188a..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_function_call_handler.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Function Call Handler
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-
-/**
- * This class does handles template functions defined with the {function} tag missing in cache file.
- * It can happen when the template function was called with the nocache option or within a nocache section.
- * The template function will be loaded from it's compiled template file, executed and added to the cache file
- * for later use.
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- */
-class Smarty_Internal_Function_Call_Handler
-{
-    /**
-     * This function handles calls to template functions defined by {function}
-     * It does create a PHP function at the first call
-     *
-     * @param string                   $_name     template function name
-     * @param Smarty_Internal_Template $_smarty_tpl
-     * @param string                   $_function PHP function name
-     * @param array                    $_params   Smarty variables passed as call parameter
-     * @param bool                     $_nocache  nocache flag
-     *
-     * @return bool
-     */
-    public static function call($_name, Smarty_Internal_Template $_smarty_tpl, $_function, $_params, $_nocache)
-    {
-        $funcParam = $_smarty_tpl->properties['tpl_function'][$_name];
-        if (is_file($funcParam['compiled_filepath'])) {
-            // read compiled file
-            $code = file_get_contents($funcParam['compiled_filepath']);
-            // grab template function
-            if (preg_match("/\/\* {$_function} \*\/([\S\s]*?)\/\*\/ {$_function} \*\//", $code, $match)) {
-                // grab source info from file dependency
-                preg_match("/\s*'{$funcParam['uid']}'([\S\s]*?)\),/", $code, $match1);
-                unset($code);
-                $output = '';
-                // make PHP function known
-                eval($match[0]);
-                if (function_exists($_function)) {
-                    // search cache file template
-                    $tplPtr = $_smarty_tpl;
-                    while (!isset($tplPtr->cached) && isset($tplPtr->parent)) {
-                        $tplPtr = $tplPtr->parent;
-                    }
-                    // add template function code to cache file
-                    if (isset($tplPtr->cached)) {
-                        $cache = $tplPtr->cached;
-                        $content = $cache->read($tplPtr);
-                        if ($content) {
-                            // check if we must update file dependency
-                            if (!preg_match("/'{$funcParam['uid']}'([\S\s]*?)'nocache_hash'/", $content, $match2)) {
-                                $content = preg_replace("/('file_dependency'([\S\s]*?)\()/", "\\1{$match1[0]}", $content);
-                            }
-                            $cache->write($tplPtr, $content . "<?php " . $match[0] . "?>\n");
-                        }
-                    }
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_get_include_path.php b/www/smarty-3.1.27/sysplugins/smarty_internal_get_include_path.php
deleted file mode 100644
index d46ca702..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_get_include_path.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Smarty read include path plugin
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Monte Ohrt
- */
-
-/**
- * Smarty Internal Read Include Path Class
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- */
-class Smarty_Internal_Get_Include_Path
-{
-    /**
-     * Return full file path from PHP include_path
-     *
-     * @param  string $filepath filepath
-     *
-     * @return string|boolean full filepath or false
-     */
-    public static function getIncludePath($filepath)
-    {
-        static $_include_path = null;
-
-        if (function_exists('stream_resolve_include_path')) {
-            // available since PHP 5.3.2
-            return stream_resolve_include_path($filepath);
-        }
-
-        if ($_include_path === null) {
-            $_include_path = explode(PATH_SEPARATOR, get_include_path());
-        }
-
-        foreach ($_include_path as $_path) {
-            if (file_exists($_path . DS . $filepath)) {
-                return $_path . DS . $filepath;
-            }
-        }
-
-        return false;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_nocache_insert.php b/www/smarty-3.1.27/sysplugins/smarty_internal_nocache_insert.php
deleted file mode 100644
index 0d2facfe..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_nocache_insert.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Nocache Insert
- * Compiles the {insert} tag into the cache file
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Insert Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Nocache_Insert
-{
-    /**
-     * Compiles code for the {insert} tag into cache file
-     *
-     * @param  string                   $_function insert function name
-     * @param  array                    $_attr     array with parameter
-     * @param  Smarty_Internal_Template $_template template object
-     * @param  string                   $_script   script name to load or 'null'
-     * @param  string                   $_assign   optional variable name
-     *
-     * @return string                   compiled code
-     */
-    public static function compile($_function, $_attr, $_template, $_script, $_assign = null)
-    {
-        $_output = '<?php ';
-        if ($_script != 'null') {
-            // script which must be included
-            // code for script file loading
-            $_output .= "require_once '{$_script}';";
-        }
-        // call insert
-        if (isset($_assign)) {
-            $_output .= "\$_smarty_tpl->assign('{$_assign}' , {$_function} (" . var_export($_attr, true) . ",\$_smarty_tpl), true);?>";
-        } else {
-            $_output .= "echo {$_function}(" . var_export($_attr, true) . ",\$_smarty_tpl);?>";
-        }
-        $_tpl = $_template;
-        while ($_tpl->parent instanceof Smarty_Internal_Template) {
-            $_tpl = $_tpl->parent;
-        }
-
-        return "/*%%SmartyNocache:{$_tpl->properties['nocache_hash']}%%*/" . $_output . "/*/%%SmartyNocache:{$_tpl->properties['nocache_hash']}%%*/";
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_parsetree.php b/www/smarty-3.1.27/sysplugins/smarty_internal_parsetree.php
deleted file mode 100644
index c96731ed..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_parsetree.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Templateparser Parsetrees
- * These are classes to build parsetrees in the template parser
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Thue Kristensen
- * @author     Uwe Tews
- */
-
-/**
- * @package    Smarty
- * @subpackage Compiler
- * @ignore
- */
-abstract class Smarty_Internal_ParseTree
-{
-
-    /**
-     * Parser object
-     *
-     * @var object
-     */
-    public $parser;
-
-    /**
-     * Buffer content
-     *
-     * @var mixed
-     */
-    public $data;
-
-    /**
-     * Subtree array
-     *
-     * @var array
-     */
-    public $subtrees = array();
-
-    /**
-     * Return buffer
-     *
-     * @return string buffer content
-     */
-    abstract public function to_smarty_php();
-}
-
-
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_parsetree_code.php b/www/smarty-3.1.27/sysplugins/smarty_internal_parsetree_code.php
deleted file mode 100644
index a44ae499..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_parsetree_code.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Templateparser Parse Tree
- * These are classes to build parse trees in the template parser
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Thue Kristensen
- * @author     Uwe Tews
- */
-
-/**
- * Code fragment inside a tag .
- *
- * @package    Smarty
- * @subpackage Compiler
- * @ignore
- */
-class Smarty_Internal_ParseTree_Code extends Smarty_Internal_ParseTree
-{
-    /**
-     * Create parse tree buffer for code fragment
-     *
-     * @param object $parser parser object
-     * @param string $data   content
-     */
-    public function __construct($parser, $data)
-    {
-        $this->parser = $parser;
-        $this->data = $data;
-    }
-
-    /**
-     * Return buffer content in parentheses
-     *
-     * @return string content
-     */
-    public function to_smarty_php()
-    {
-        return sprintf("(%s)", $this->data);
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_parsetree_dq.php b/www/smarty-3.1.27/sysplugins/smarty_internal_parsetree_dq.php
deleted file mode 100644
index bdfa4c48..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_parsetree_dq.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-/**
- * Double quoted string inside a tag.
- *
- * @package    Smarty
- * @subpackage Compiler
- * @ignore
- */
-
-/**
- * Double quoted string inside a tag.
- *
- * @package    Smarty
- * @subpackage Compiler
- * @ignore
- */
-class Smarty_Internal_ParseTree_Dq extends Smarty_Internal_ParseTree
-{
-    /**
-     * Create parse tree buffer for double quoted string subtrees
-     *
-     * @param object                    $parser  parser object
-     * @param Smarty_Internal_ParseTree $subtree parse tree buffer
-     */
-    public function __construct($parser, Smarty_Internal_ParseTree $subtree)
-    {
-        $this->parser = $parser;
-        $this->subtrees[] = $subtree;
-        if ($subtree instanceof Smarty_Internal_ParseTree_Tag) {
-            $this->parser->block_nesting_level = count($this->parser->compiler->_tag_stack);
-        }
-    }
-
-    /**
-     * Append buffer to subtree
-     *
-     * @param Smarty_Internal_ParseTree $subtree parse tree buffer
-     */
-    public function append_subtree(Smarty_Internal_ParseTree $subtree)
-    {
-        $last_subtree = count($this->subtrees) - 1;
-        if ($last_subtree >= 0 && $this->subtrees[$last_subtree] instanceof Smarty_Internal_ParseTree_Tag && $this->subtrees[$last_subtree]->saved_block_nesting < $this->parser->block_nesting_level) {
-            if ($subtree instanceof Smarty_Internal_ParseTree_Code) {
-                $this->subtrees[$last_subtree]->data = $this->parser->compiler->appendCode($this->subtrees[$last_subtree]->data, '<?php echo ' . $subtree->data . ';?>');
-            } elseif ($subtree instanceof Smarty_Internal_ParseTree_DqContent) {
-                $this->subtrees[$last_subtree]->data = $this->parser->compiler->appendCode($this->subtrees[$last_subtree]->data, '<?php echo "' . $subtree->data . '";?>');
-            } else {
-                $this->subtrees[$last_subtree]->data = $this->parser->compiler->appendCode($this->subtrees[$last_subtree]->data, $subtree->data);
-            }
-        } else {
-            $this->subtrees[] = $subtree;
-        }
-        if ($subtree instanceof Smarty_Internal_ParseTree_Tag) {
-            $this->parser->block_nesting_level = count($this->parser->compiler->_tag_stack);
-        }
-    }
-
-    /**
-     * Merge subtree buffer content together
-     *
-     * @return string compiled template code
-     */
-    public function to_smarty_php()
-    {
-        $code = '';
-        foreach ($this->subtrees as $subtree) {
-            if ($code !== "") {
-                $code .= ".";
-            }
-            if ($subtree instanceof Smarty_Internal_ParseTree_Tag) {
-                $more_php = $subtree->assign_to_var();
-            } else {
-                $more_php = $subtree->to_smarty_php();
-            }
-
-            $code .= $more_php;
-
-            if (!$subtree instanceof Smarty_Internal_ParseTree_DqContent) {
-                $this->parser->compiler->has_variable_string = true;
-            }
-        }
-
-        return $code;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_parsetree_dqcontent.php b/www/smarty-3.1.27/sysplugins/smarty_internal_parsetree_dqcontent.php
deleted file mode 100644
index 3197772d..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_parsetree_dqcontent.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Templateparser Parse Tree
- * These are classes to build parse tree  in the template parser
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Thue Kristensen
- * @author     Uwe Tews
- */
-
-/**
- * Raw chars as part of a double quoted string.
- *
- * @package    Smarty
- * @subpackage Compiler
- * @ignore
- */
-class Smarty_Internal_ParseTree_DqContent extends Smarty_Internal_ParseTree
-{
-    /**
-     * Create parse tree buffer with string content
-     *
-     * @param object $parser parser object
-     * @param string $data   string section
-     */
-    public function __construct($parser, $data)
-    {
-        $this->parser = $parser;
-        $this->data = $data;
-    }
-
-    /**
-     * Return content as double quoted string
-     *
-     * @return string doubled quoted string
-     */
-    public function to_smarty_php()
-    {
-        return '"' . $this->data . '"';
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_parsetree_tag.php b/www/smarty-3.1.27/sysplugins/smarty_internal_parsetree_tag.php
deleted file mode 100644
index 81475b5f..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_parsetree_tag.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Templateparser Parse Tree
- * These are classes to build parse tree in the template parser
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Thue Kristensen
- * @author     Uwe Tews
- */
-
-/**
- * A complete smarty tag.
- *
- * @package    Smarty
- * @subpackage Compiler
- * @ignore
- */
-class Smarty_Internal_ParseTree_Tag extends Smarty_Internal_ParseTree
-{
-
-    /**
-     * Saved block nesting level
-     *
-     * @var int
-     */
-    public $saved_block_nesting;
-
-    /**
-     * Create parse tree buffer for Smarty tag
-     *
-     * @param object $parser parser object
-     * @param string $data   content
-     */
-    public function __construct($parser, $data)
-    {
-        $this->parser = $parser;
-        $this->data = $data;
-        $this->saved_block_nesting = $parser->block_nesting_level;
-    }
-
-    /**
-     * Return buffer content
-     *
-     * @return string content
-     */
-    public function to_smarty_php()
-    {
-        return $this->data;
-    }
-
-    /**
-     * Return complied code that loads the evaluated output of buffer content into a temporary variable
-     *
-     * @return string template code
-     */
-    public function assign_to_var()
-    {
-        $var = sprintf('$_tmp%d', ++ Smarty_Internal_Templateparser::$prefix_number);
-        $tmp = $this->parser->compiler->appendCode('<?php ob_start();?>', $this->data);
-        $tmp = $this->parser->compiler->appendCode($tmp, "<?php {$var}=ob_get_clean();?>");
-        $this->parser->compiler->prefix_code[] = sprintf("%s", $tmp);
-
-        return $var;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_parsetree_template.php b/www/smarty-3.1.27/sysplugins/smarty_internal_parsetree_template.php
deleted file mode 100644
index 7d814eda..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_parsetree_template.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Templateparser Parse Tree
- * These are classes to build parse tree in the template parser
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Thue Kristensen
- * @author     Uwe Tews
- */
-
-/**
- * Template element
- *
- * @package    Smarty
- * @subpackage Compiler
- * @ignore
- */
-class Smarty_Internal_ParseTree_Template extends Smarty_Internal_ParseTree
-{
-
-    /**
-     * Array of template elements
-     *
-     * @var array
-     */
-    public $subtrees = Array();
-
-    /**
-     * Create root of parse tree for template elements
-     *
-     * @param object $parser parse object
-     */
-    public function __construct($parser)
-    {
-        $this->parser = $parser;
-    }
-
-    /**
-     * Append buffer to subtree
-     *
-     * @param Smarty_Internal_ParseTree $subtree
-     */
-    public function append_subtree(Smarty_Internal_ParseTree $subtree)
-    {
-        if (!empty($subtree->subtrees)) {
-            $this->subtrees = array_merge($this->subtrees, $subtree->subtrees);
-        } else {
-            if ($subtree->data !== '') {
-                $this->subtrees[] = $subtree;
-            }
-        }
-    }
-
-    /**
-     * Sanitize and merge subtree buffers together
-     *
-     * @return string template code content
-     */
-    public function to_smarty_php()
-    {
-        $code = '';
-        for ($key = 0, $cnt = count($this->subtrees); $key < $cnt; $key ++) {
-            if ($this->subtrees[$key] instanceof Smarty_Internal_ParseTree_Text) {
-                $subtree = $this->subtrees[$key]->to_smarty_php();
-                while ($key + 1 < $cnt && ($this->subtrees[$key + 1] instanceof Smarty_Internal_ParseTree_Text || $this->subtrees[$key + 1]->data == '')) {
-                    $key ++;
-                    if ($this->subtrees[$key]->data == '') {
-                        continue;
-                    }
-                    $subtree .= $this->subtrees[$key]->to_smarty_php();
-                }
-                if ($subtree == '') {
-                    continue;
-                }
-                $code .= preg_replace('/((<%)|(%>)|(<\?php)|(<\?)|(\?>)|(<\/?script))/', "<?php echo '\$1'; ?>\n", $subtree);
-                continue;
-            }
-            if ($this->subtrees[$key] instanceof Smarty_Internal_ParseTree_Tag) {
-                $subtree = $this->subtrees[$key]->to_smarty_php();
-                while ($key + 1 < $cnt && ($this->subtrees[$key + 1] instanceof Smarty_Internal_ParseTree_Tag || $this->subtrees[$key + 1]->data == '')) {
-                    $key ++;
-                    if ($this->subtrees[$key]->data == '') {
-                        continue;
-                    }
-                    $subtree = $this->parser->compiler->appendCode($subtree, $this->subtrees[$key]->to_smarty_php());
-                }
-                if ($subtree == '') {
-                    continue;
-                }
-                $code .= $subtree;
-                continue;
-            }
-            $code .= $this->subtrees[$key]->to_smarty_php();
-        }
-        return $code;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_parsetree_text.php b/www/smarty-3.1.27/sysplugins/smarty_internal_parsetree_text.php
deleted file mode 100644
index 42d5bd29..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_parsetree_text.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * Smarty Internal Plugin Templateparser Parse Tree
- * These are classes to build parse tree in the template parser
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Thue Kristensen
- * @author     Uwe Tews
- *             *
- *             template text
- * @package    Smarty
- * @subpackage Compiler
- * @ignore
- */
-class Smarty_Internal_ParseTree_Text extends Smarty_Internal_ParseTree
-{
-    /**
-     * Create template text buffer
-     *
-     * @param object $parser parser object
-     * @param string $data   text
-     */
-    public function __construct($parser, $data)
-    {
-        $this->parser = $parser;
-        $this->data = $data;
-    }
-
-    /**
-     * Return buffer content
-     *
-     * @return string text
-     */
-    public function to_smarty_php()
-    {
-        return $this->data;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_resource_eval.php b/www/smarty-3.1.27/sysplugins/smarty_internal_resource_eval.php
deleted file mode 100644
index aca71035..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_resource_eval.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Resource Eval
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Uwe Tews
- * @author     Rodney Rehm
- */
-
-/**
- * Smarty Internal Plugin Resource Eval
- * Implements the strings as resource for Smarty template
- * {@internal unlike string-resources the compiled state of eval-resources is NOT saved for subsequent access}}
- *
- * @package    Smarty
- * @subpackage TemplateResources
- */
-class Smarty_Internal_Resource_Eval extends Smarty_Resource_Recompiled
-{
-    /**
-     * populate Source Object with meta data from Resource
-     *
-     * @param  Smarty_Template_Source   $source    source object
-     * @param  Smarty_Internal_Template $_template template object
-     *
-     * @return void
-     */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
-    {
-        $source->uid = $source->filepath = sha1($source->name);
-        $source->timestamp = false;
-        $source->exists = true;
-    }
-
-    /**
-     * Load template's source from $resource_name into current template object
-     *
-     * @uses decode() to decode base64 and urlencoded template_resources
-     *
-     * @param  Smarty_Template_Source $source source object
-     *
-     * @return string                 template source
-     */
-    public function getContent(Smarty_Template_Source $source)
-    {
-        return $this->decode($source->name);
-    }
-
-    /**
-     * decode base64 and urlencode
-     *
-     * @param  string $string template_resource to decode
-     *
-     * @return string decoded template_resource
-     */
-    protected function decode($string)
-    {
-        // decode if specified
-        if (($pos = strpos($string, ':')) !== false) {
-            if (!strncmp($string, 'base64', 6)) {
-                return base64_decode(substr($string, 7));
-            } elseif (!strncmp($string, 'urlencode', 9)) {
-                return urldecode(substr($string, 10));
-            }
-        }
-
-        return $string;
-    }
-
-    /**
-     * modify resource_name according to resource handlers specifications
-     *
-     * @param  Smarty  $smarty        Smarty instance
-     * @param  string  $resource_name resource_name to make unique
-     * @param  boolean $isConfig      flag for config resource
-     *
-     * @return string unique resource name
-     */
-    public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
-    {
-        return get_class($this) . '#' . $this->decode($resource_name);
-    }
-
-    /**
-     * Determine basename for compiled filename
-     *
-     * @param  Smarty_Template_Source $source source object
-     *
-     * @return string                 resource's basename
-     */
-    public function getBasename(Smarty_Template_Source $source)
-    {
-        return '';
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_resource_extends.php b/www/smarty-3.1.27/sysplugins/smarty_internal_resource_extends.php
deleted file mode 100644
index 16974ef2..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_resource_extends.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Resource Extends
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Uwe Tews
- * @author     Rodney Rehm
- */
-
-/**
- * Smarty Internal Plugin Resource Extends
- * Implements the file system as resource for Smarty which {extend}s a chain of template files templates
- *
- * @package    Smarty
- * @subpackage TemplateResources
- */
-class Smarty_Internal_Resource_Extends extends Smarty_Resource
-{
-    /**
-     * mbstring.overload flag
-     *
-     * @var int
-     */
-    public $mbstring_overload = 0;
-
-    /**
-     * populate Source Object with meta data from Resource
-     *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
-     *
-     * @throws SmartyException
-     */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
-    {
-        $uid = sha1(getcwd());
-        $sources = array();
-        $components = explode('|', $source->name);
-        $exists = true;
-        foreach ($components as $component) {
-            $s = Smarty_Resource::source(null, $source->smarty, $component);
-            if ($s->type == 'php') {
-                throw new SmartyException("Resource type {$s->type} cannot be used with the extends resource type");
-            }
-            $sources[$s->uid] = $s;
-            $uid .= realpath($s->filepath);
-            if ($_template && $_template->smarty->compile_check) {
-                $exists = $exists && $s->exists;
-            }
-        }
-        $source->components = $sources;
-        $source->filepath = $s->filepath;
-        $source->uid = sha1($uid);
-        if ($_template && $_template->smarty->compile_check) {
-            $source->timestamp = $s->timestamp;
-            $source->exists = $exists;
-        }
-        // need the template at getContent()
-        $source->template = $_template;
-    }
-
-    /**
-     * populate Source Object with timestamp and exists from Resource
-     *
-     * @param Smarty_Template_Source $source source object
-     */
-    public function populateTimestamp(Smarty_Template_Source $source)
-    {
-        $source->exists = true;
-        foreach ($source->components as $s) {
-            $source->exists = $source->exists && $s->exists;
-        }
-        $source->timestamp = $s->timestamp;
-    }
-
-    /**
-     * Load template's source from files into current template object
-     *
-     * @param Smarty_Template_Source $source source object
-     *
-     * @return string template source
-     * @throws SmartyException if source cannot be loaded
-     */
-    public function getContent(Smarty_Template_Source $source)
-    {
-        if (!$source->exists) {
-            throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
-        }
-
-        $_components = array_reverse($source->components);
-
-        $_content = '';
-        foreach ($_components as $_component) {
-            // read content
-            $_content .= $_component->content;
-        }
-        return $_content;
-    }
-
-    /**
-     * Determine basename for compiled filename
-     *
-     * @param Smarty_Template_Source $source source object
-     *
-     * @return string resource's basename
-     */
-    public function getBasename(Smarty_Template_Source $source)
-    {
-        return str_replace(':', '.', basename($source->filepath));
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_resource_file.php b/www/smarty-3.1.27/sysplugins/smarty_internal_resource_file.php
deleted file mode 100644
index b34033dd..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_resource_file.php
+++ /dev/null
@@ -1,216 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Resource File
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Uwe Tews
- * @author     Rodney Rehm
- */
-
-/**
- * Smarty Internal Plugin Resource File
- * Implements the file system as resource for Smarty templates
- *
- * @package    Smarty
- * @subpackage TemplateResources
- */
-class Smarty_Internal_Resource_File extends Smarty_Resource
-{
-    /**
-     * build template filepath by traversing the template_dir array
-     *
-     * @param Smarty_Template_Source    $source    source object
-     * @param  Smarty_Internal_Template $_template template object
-     *
-     * @return string fully qualified filepath
-     * @throws SmartyException
-     */
-    protected function buildFilepath(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
-    {
-        $file = $source->name;
-        preg_match('#^(?P<absolute>[\\\/]|[a-zA-Z]:[\\\/])|(\[(?P<index>[^\]]+)\])|(?P<rel>\.[\\\/])#', $file, $fileMatch);
-        // save basename
-        if (!empty($fileMatch['absolute'])) {
-            $file = $this->normalizePath($file);
-            return is_file($file) ? $file : false;
-        }
-        // go relative to a given template?
-        if (!empty($fileMatch['rel']) && $_template && $_template->parent instanceof Smarty_Internal_Template) {
-            if ($_template->parent->source->type != 'file' && $_template->parent->source->type != 'extends' && !$_template->parent->allow_relative_path) {
-                throw new SmartyException("Template '{$file}' cannot be relative to template of resource type '{$_template->parent->source->type}'");
-            }
-            $path = dirname($_template->parent->source->filepath) . DS . $file;
-            // normalize path
-            $path = $this->normalizePath($path);
-            // files relative to a template only get one shot
-            return is_file($path) ? $path : false;
-        }
-
-        if ($source->isConfig) {
-            $_directories = $source->smarty->getConfigDir();
-        } else {
-            $_directories = $source->smarty->getTemplateDir();
-        }
-        // template_dir index?
-        if (!empty($fileMatch['index'])) {
-            $index = $fileMatch['index'];
-            $_directory = null;
-            // try string indexes
-            if (isset($_directories[$index])) {
-                $_directory = $_directories[$index];
-            } elseif (is_numeric($index)) {
-                // try numeric index
-                $index = (int) $index;
-                if (isset($_directories[$index])) {
-                    $_directory = $_directories[$index];
-                } else {
-                    // try at location index
-                    $keys = array_keys($_directories);
-                    $_directory = $_directories[$keys[$index]];
-                }
-            }
-            if ($_directory) {
-                preg_match('#\](.+)$#', $file, $fileMatch);
-                $path = $_directory . $fileMatch[1];
-                $path = $this->normalizePath($path);
-                if (is_file($path)) {
-                    return $path;
-                }
-            } else {
-                // index not found
-                return false;
-            }
-        }
-
-        // relative file name?
-        foreach ($_directories as $_directory) {
-            $_filepath = $_directory . $file;
-            $path = $this->normalizePath($_filepath);
-            if (is_file($path)) {
-                return $path;
-            }
-            if ($source->smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_directory)) {
-                // try PHP include_path
-                if (function_exists('stream_resolve_include_path')) {
-                    $_filepath = stream_resolve_include_path($_filepath);
-                } else {
-                    $_filepath = Smarty_Internal_Get_Include_Path::getIncludePath($_filepath);
-                }
-                if ($_filepath !== false) {
-                    $path = $this->normalizePath($_filepath);
-                    if (is_file($path)) {
-                        return $path;
-                    }
-                }
-            }
-        }
-        // Could be relative to cwd
-        $path = $this->normalizePath(getcwd() . DS . $file);
-        return is_file($path) ? $path : false;
-    }
-
-    /**
-     * Normalize path
-     *  - remove /./ and /../
-     *  - make it absolute
-     *
-     * @param string $path file path
-     *
-     * @return string
-     */
-    public function normalizePath($path)
-    {
-        if ($path[0] == '.') {
-            $path = getcwd() . DS . $path;
-        }
-        $path = preg_replace('#[\\\/]+([.][\\\/]+)*#', DS, $path);
-        while (strrpos($path, '.' . DS) !== false) {
-            $path = preg_replace('#([\\\/]([^\\\/]+[\\\/]){2}([.][.][\\\/]){2})|([\\\/][^\\\/]+[\\\/][.][.][\\\/])#', DS, $path);
-        }
-        return $path;
-    }
-
-    /**
-     * test is file exists and save timestamp
-     *
-     * @param  Smarty_Template_Source $source source object
-     * @param  string                 $file   file name
-     *
-     * @return bool                   true if file exists
-     */
-    protected function fileExists(Smarty_Template_Source $source, $file)
-    {
-        $source->timestamp = is_file($file) ? @filemtime($file) : false;
-        return $source->exists = !!$source->timestamp;
-    }
-
-    /**
-     * populate Source Object with meta data from Resource
-     *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
-     */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
-    {
-        $source->filepath = $this->buildFilepath($source, $_template);
-
-        if ($source->filepath !== false) {
-            if (is_object($source->smarty->security_policy)) {
-                $source->smarty->security_policy->isTrustedResourceDir($source->filepath);
-            }
-            $source->exists = true;
-            $source->uid = sha1($source->filepath);
-            if ($source->smarty->compile_check && !isset($source->timestamp)) {
-                $source->timestamp = @filemtime($source->filepath);
-            }
-        } else {
-            $source->timestamp = false;
-            $source->exists = false;
-        }
-    }
-
-    /**
-     * populate Source Object with timestamp and exists from Resource
-     *
-     * @param Smarty_Template_Source $source source object
-     */
-    public function populateTimestamp(Smarty_Template_Source $source)
-    {
-        $source->timestamp = $source->exists = is_file($source->filepath);
-        if ($source->exists) {
-            $source->timestamp = @filemtime($source->filepath);
-        }
-    }
-
-    /**
-     * Load template's source from file into current template object
-     *
-     * @param  Smarty_Template_Source $source source object
-     *
-     * @return string                 template source
-     * @throws SmartyException        if source cannot be loaded
-     */
-    public function getContent(Smarty_Template_Source $source)
-    {
-        if ($source->timestamp) {
-            return file_get_contents($source->filepath);
-        }
-        if ($source instanceof Smarty_Config_Source) {
-            throw new SmartyException("Unable to read config {$source->type} '{$source->name}'");
-        }
-        throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
-    }
-
-    /**
-     * Determine basename for compiled filename
-     *
-     * @param  Smarty_Template_Source $source source object
-     *
-     * @return string                 resource's basename
-     */
-    public function getBasename(Smarty_Template_Source $source)
-    {
-        return basename($source->filepath);
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_resource_php.php b/www/smarty-3.1.27/sysplugins/smarty_internal_resource_php.php
deleted file mode 100644
index c836d1b2..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_resource_php.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-/**
- * Smarty Internal Plugin Resource PHP
- * Implements the file system as resource for PHP templates
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Uwe Tews
- * @author     Rodney Rehm
- */
-class Smarty_Internal_Resource_Php extends Smarty_Internal_Resource_File
-{
-    /**
-     * Flag that it's an uncompiled resource
-     *
-     * @var bool
-     */
-    public $uncompiled = true;
-    /**
-     * container for short_open_tag directive's value before executing PHP templates
-     *
-     * @var string
-     */
-    protected $short_open_tag;
-
-    /**
-     * Create a new PHP Resource
-
-     */
-    public function __construct()
-    {
-        $this->short_open_tag = ini_get('short_open_tag');
-    }
-
-    /**
-     * Load template's source from file into current template object
-     *
-     * @param  Smarty_Template_Source $source source object
-     *
-     * @return string                 template source
-     * @throws SmartyException        if source cannot be loaded
-     */
-    public function getContent(Smarty_Template_Source $source)
-    {
-        if ($source->timestamp) {
-            return '';
-        }
-        throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
-    }
-
-    /**
-     * Render and output the template (without using the compiler)
-     *
-     * @param  Smarty_Template_Source   $source    source object
-     * @param  Smarty_Internal_Template $_template template object
-     *
-     * @return void
-     * @throws SmartyException          if template cannot be loaded or allow_php_templates is disabled
-     */
-    public function renderUncompiled(Smarty_Template_Source $source, Smarty_Internal_Template $_template)
-    {
-        if (!$source->smarty->allow_php_templates) {
-            throw new SmartyException("PHP templates are disabled");
-        }
-        if (!$source->exists) {
-            if ($_template->parent instanceof Smarty_Internal_Template) {
-                $parent_resource = " in '{$_template->parent->template_resource}'";
-            } else {
-                $parent_resource = '';
-            }
-            throw new SmartyException("Unable to load template {$source->type} '{$source->name}'{$parent_resource}");
-        }
-
-        // prepare variables
-        extract($_template->getTemplateVars());
-
-        // include PHP template with short open tags enabled
-        ini_set('short_open_tag', '1');
-        /** @var Smarty_Internal_Template $_smarty_template
-         * used in included file
-         */
-        $_smarty_template = $_template;
-        include($source->filepath);
-        ini_set('short_open_tag', $this->short_open_tag);
-    }
-
-    /**
-     * populate compiled object with compiled filepath
-     *
-     * @param Smarty_Template_Compiled $compiled  compiled object
-     * @param Smarty_Internal_Template $_template template object (is ignored)
-     */
-    public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
-    {
-        $compiled->filepath = false;
-        $compiled->timestamp = false;
-        $compiled->exists = false;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_resource_registered.php b/www/smarty-3.1.27/sysplugins/smarty_internal_resource_registered.php
deleted file mode 100644
index f7175dd9..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_resource_registered.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Resource Registered
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Uwe Tews
- * @author     Rodney Rehm
- */
-
-/**
- * Smarty Internal Plugin Resource Registered
- * Implements the registered resource for Smarty template
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @deprecated
- */
-class Smarty_Internal_Resource_Registered extends Smarty_Resource
-{
-    /**
-     * populate Source Object with meta data from Resource
-     *
-     * @param  Smarty_Template_Source   $source    source object
-     * @param  Smarty_Internal_Template $_template template object
-     *
-     * @return void
-     */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
-    {
-        $source->filepath = $source->type . ':' . $source->name;
-        $source->uid = sha1($source->filepath);
-        if ($source->smarty->compile_check) {
-            $source->timestamp = $this->getTemplateTimestamp($source);
-            $source->exists = !!$source->timestamp;
-        }
-    }
-
-    /**
-     * populate Source Object with timestamp and exists from Resource
-     *
-     * @param  Smarty_Template_Source $source source object
-     *
-     * @return void
-     */
-    public function populateTimestamp(Smarty_Template_Source $source)
-    {
-        $source->timestamp = $this->getTemplateTimestamp($source);
-        $source->exists = !!$source->timestamp;
-    }
-
-    /**
-     * Get timestamp (epoch) the template source was modified
-     *
-     * @param  Smarty_Template_Source $source source object
-     *
-     * @return integer|boolean        timestamp (epoch) the template was modified, false if resources has no timestamp
-     */
-    public function getTemplateTimestamp(Smarty_Template_Source $source)
-    {
-        // return timestamp
-        $time_stamp = false;
-        call_user_func_array($source->smarty->registered_resources[$source->type][0][1], array($source->name, &$time_stamp, $source->smarty));
-
-        return is_numeric($time_stamp) ? (int) $time_stamp : $time_stamp;
-    }
-
-    /**
-     * Load template's source by invoking the registered callback into current template object
-     *
-     * @param  Smarty_Template_Source $source source object
-     *
-     * @return string                 template source
-     * @throws SmartyException        if source cannot be loaded
-     */
-    public function getContent(Smarty_Template_Source $source)
-    {
-        // return template string
-        $t = call_user_func_array($source->smarty->registered_resources[$source->type][0][0], array($source->name, &$source->content, $source->smarty));
-        if (is_bool($t) && !$t) {
-            throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
-        }
-
-        return $source->content;
-    }
-
-    /**
-     * Determine basename for compiled filename
-     *
-     * @param  Smarty_Template_Source $source source object
-     *
-     * @return string                 resource's basename
-     */
-    public function getBasename(Smarty_Template_Source $source)
-    {
-        return basename($source->name);
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_resource_stream.php b/www/smarty-3.1.27/sysplugins/smarty_internal_resource_stream.php
deleted file mode 100644
index 8a902268..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_resource_stream.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Resource Stream
- * Implements the streams as resource for Smarty template
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Uwe Tews
- * @author     Rodney Rehm
- */
-
-/**
- * Smarty Internal Plugin Resource Stream
- * Implements the streams as resource for Smarty template
- *
- * @link       http://php.net/streams
- * @package    Smarty
- * @subpackage TemplateResources
- */
-class Smarty_Internal_Resource_Stream extends Smarty_Resource_Recompiled
-{
-    /**
-     * populate Source Object with meta data from Resource
-     *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
-     *
-     * @return void
-     */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
-    {
-        if (strpos($source->resource, '://') !== false) {
-            $source->filepath = $source->resource;
-        } else {
-            $source->filepath = str_replace(':', '://', $source->resource);
-        }
-        $source->uid = false;
-        $source->content = $this->getContent($source);
-        $source->timestamp = false;
-        $source->exists = !!$source->content;
-    }
-
-    /**
-     * Load template's source from stream into current template object
-     *
-     * @param Smarty_Template_Source $source source object
-     *
-     * @return string template source
-     * @throws SmartyException if source cannot be loaded
-     */
-    public function getContent(Smarty_Template_Source $source)
-    {
-        $t = '';
-        // the availability of the stream has already been checked in Smarty_Resource::fetch()
-        $fp = fopen($source->filepath, 'r+');
-        if ($fp) {
-            while (!feof($fp) && ($current_line = fgets($fp)) !== false) {
-                $t .= $current_line;
-            }
-            fclose($fp);
-
-            return $t;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * modify resource_name according to resource handlers specifications
-     *
-     * @param Smarty   $smarty        Smarty instance
-     * @param string   $resource_name resource_name to make unique
-     * @param  boolean $isConfig      flag for config resource
-     *
-     * @return string unique resource name
-     */
-    public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
-    {
-        return get_class($this) . '#' . $resource_name;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_resource_string.php b/www/smarty-3.1.27/sysplugins/smarty_internal_resource_string.php
deleted file mode 100644
index 75e99e6f..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_resource_string.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Resource String
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Uwe Tews
- * @author     Rodney Rehm
- */
-
-/**
- * Smarty Internal Plugin Resource String
- * Implements the strings as resource for Smarty template
- * {@internal unlike eval-resources the compiled state of string-resources is saved for subsequent access}}
- *
- * @package    Smarty
- * @subpackage TemplateResources
- */
-class Smarty_Internal_Resource_String extends Smarty_Resource
-{
-    /**
-     * populate Source Object with meta data from Resource
-     *
-     * @param  Smarty_Template_Source   $source    source object
-     * @param  Smarty_Internal_Template $_template template object
-     *
-     * @return void
-     */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
-    {
-        $source->uid = $source->filepath = sha1($source->name);
-        $source->timestamp = 0;
-        $source->exists = true;
-    }
-
-    /**
-     * Load template's source from $resource_name into current template object
-     *
-     * @uses decode() to decode base64 and urlencoded template_resources
-     *
-     * @param  Smarty_Template_Source $source source object
-     *
-     * @return string                 template source
-     */
-    public function getContent(Smarty_Template_Source $source)
-    {
-        return $this->decode($source->name);
-    }
-
-    /**
-     * decode base64 and urlencode
-     *
-     * @param  string $string template_resource to decode
-     *
-     * @return string decoded template_resource
-     */
-    protected function decode($string)
-    {
-        // decode if specified
-        if (($pos = strpos($string, ':')) !== false) {
-            if (!strncmp($string, 'base64', 6)) {
-                return base64_decode(substr($string, 7));
-            } elseif (!strncmp($string, 'urlencode', 9)) {
-                return urldecode(substr($string, 10));
-            }
-        }
-
-        return $string;
-    }
-
-    /**
-     * modify resource_name according to resource handlers specifications
-     *
-     * @param  Smarty  $smarty        Smarty instance
-     * @param  string  $resource_name resource_name to make unique
-     * @param  boolean $isConfig      flag for config resource
-     *
-     * @return string unique resource name
-     */
-    public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
-    {
-        return get_class($this) . '#' . $this->decode($resource_name);
-    }
-
-    /**
-     * Determine basename for compiled filename
-     * Always returns an empty string.
-     *
-     * @param  Smarty_Template_Source $source source object
-     *
-     * @return string                 resource's basename
-     */
-    public function getBasename(Smarty_Template_Source $source)
-    {
-        return '';
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_smartytemplatecompiler.php b/www/smarty-3.1.27/sysplugins/smarty_internal_smartytemplatecompiler.php
deleted file mode 100644
index ca9bc669..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_smartytemplatecompiler.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Smarty Template Compiler Base
- * This file contains the basic classes and methods for compiling Smarty templates with lexer/parser
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * @ignore
- */
-//include 'smarty_internal_parsetree.php';
-
-/**
- * Class SmartyTemplateCompiler
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCompilerBase
-{
-    /**
-     * Lexer class name
-     *
-     * @var string
-     */
-    public $lexer_class;
-
-    /**
-     * Parser class name
-     *
-     * @var string
-     */
-    public $parser_class;
-
-    /**
-     * Lexer object
-     *
-     * @var object
-     */
-    public $lex;
-
-    /**
-     * Parser object
-     *
-     * @var object
-     */
-    public $parser;
-
-    /**
-     * array of vars which can be compiled in local scope
-     *
-     * @var array
-     */
-    public $local_var = array();
-
-    /**
-     * Initialize compiler
-     *
-     * @param string $lexer_class  class name
-     * @param string $parser_class class name
-     * @param Smarty $smarty       global instance
-     */
-    public function __construct($lexer_class, $parser_class, $smarty)
-    {
-        $this->smarty = $smarty;
-        parent::__construct();
-        // get required plugins
-        $this->lexer_class = $lexer_class;
-        $this->parser_class = $parser_class;
-    }
-
-    /**
-     * method to compile a Smarty template
-     *
-     * @param  mixed $_content template source
-     *
-     * @return bool  true if compiling succeeded, false if it failed
-     */
-    protected function doCompile($_content, $isTemplateSource = false)
-    {
-        /* here is where the compiling takes place. Smarty
-          tags in the templates are replaces with PHP code,
-          then written to compiled files. */
-        // init the lexer/parser to compile the template
-        $this->lex = new $this->lexer_class(str_replace(array("\r\n", "\r"), "\n", $_content), $this);
-        $this->parser = new $this->parser_class($this->lex, $this);
-        if ($isTemplateSource) {
-            $this->parser->insertPhpCode("<?php\n\$_smarty_tpl->properties['nocache_hash'] = '{$this->nocache_hash}';\n?>\n");
-        }
-        if ($this->inheritance_child) {
-            // start state on child templates
-            $this->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBODY);
-        }
-        if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
-            $mbEncoding = mb_internal_encoding();
-            mb_internal_encoding('ASCII');
-        } else {
-            $mbEncoding = null;
-        }
-
-        if ($this->smarty->_parserdebug) {
-            $this->parser->PrintTrace();
-            $this->lex->PrintTrace();
-        }
-        // get tokens from lexer and parse them
-        while ($this->lex->yylex() && !$this->abort_and_recompile) {
-            if ($this->smarty->_parserdebug) {
-                echo "<pre>Line {$this->lex->line} Parsing  {$this->parser->yyTokenName[$this->lex->token]} Token " .
-                    htmlentities($this->lex->value) . "</pre>";
-            }
-            $this->parser->doParse($this->lex->token, $this->lex->value);
-        }
-
-        if ($this->abort_and_recompile) {
-            // exit here on abort
-            return false;
-        }
-        // finish parsing process
-        $this->parser->doParse(0, 0);
-        if ($mbEncoding) {
-            mb_internal_encoding($mbEncoding);
-        }
-        // check for unclosed tags
-        if (count($this->_tag_stack) > 0) {
-            // get stacked info
-            list($openTag, $_data) = array_pop($this->_tag_stack);
-            $this->trigger_template_error("unclosed {$this->smarty->left_delimiter}" . $openTag . "{$this->smarty->right_delimiter} tag");
-        }
-        // return compiled code
-        // return str_replace(array("? >\n<?php","? ><?php"), array('',''), $this->parser->retvalue);
-        return $this->parser->retvalue;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_template.php b/www/smarty-3.1.27/sysplugins/smarty_internal_template.php
deleted file mode 100644
index 4721f308..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_template.php
+++ /dev/null
@@ -1,922 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Template
- * This file contains the Smarty template engine
- *
- * @package    Smarty
- * @subpackage Template
- * @author     Uwe Tews
- */
-
-/**
- * Main class with template data structures and methods
- *
- * @package    Smarty
- * @subpackage Template
- *
- * @property Smarty_Template_Source   $source
- * @property Smarty_Template_Compiled $compiled
- * @property Smarty_Template_Cached   $cached
- */
-class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
-{
-    /**
-     * Global smarty instance
-     *
-     * @var Smarty
-     */
-    public $smarty = null;
-
-    /**
-     * Template resource
-     *
-     * @var string
-     */
-    public $template_resource = null;
-    /**
-     * Saved template Id
-     *
-     * @var null|string
-     */
-    public $templateId = null;
-    /**
-     * flag if compiled template is invalid and must be (re)compiled
-     *
-     * @var bool
-     */
-    public $mustCompile = null;
-    /**
-     * flag if template does contain nocache code sections
-     *
-     * @var bool
-     */
-    public $has_nocache_code = false;
-    /**
-     * special compiled and cached template properties
-     *
-     * @var array
-     */
-    public $properties = array('file_dependency' => array(),
-                               'nocache_hash'    => '',
-                               'tpl_function'    => array(),
-    );
-    /**
-     * required plugins
-     *
-     * @var array
-     */
-    public $required_plugins = array('compiled' => array(), 'nocache' => array());
-    /**
-     * blocks for template inheritance
-     *
-     * @var array
-     */
-    public $block_data = array();
-    /**
-     * variable filters
-     *
-     * @var array
-     */
-    public $variable_filters = array();
-    /**
-     * optional log of tag/attributes
-     *
-     * @var array
-     */
-    public $used_tags = array();
-    /**
-     * internal flag to allow relative path in child template blocks
-     *
-     * @var bool
-     */
-    public $allow_relative_path = false;
-    /**
-     * internal capture runtime stack
-     *
-     * @var array
-     */
-    public $_capture_stack = array(0 => array());
-
-    /**
-     * Create template data object
-     * Some of the global Smarty settings copied to template scope
-     * It load the required template resources and caching plugins
-     *
-     * @param string                   $template_resource template resource string
-     * @param Smarty                   $smarty            Smarty instance
-     * @param Smarty_Internal_Template $_parent           back pointer to parent object with variables or null
-     * @param mixed                    $_cache_id         cache   id or null
-     * @param mixed                    $_compile_id       compile id or null
-     * @param bool                     $_caching          use caching?
-     * @param int                      $_cache_lifetime   cache life-time in seconds
-     */
-    public function __construct($template_resource, $smarty, $_parent = null, $_cache_id = null, $_compile_id = null, $_caching = null, $_cache_lifetime = null)
-    {
-        $this->smarty = &$smarty;
-        // Smarty parameter
-        $this->cache_id = $_cache_id === null ? $this->smarty->cache_id : $_cache_id;
-        $this->compile_id = $_compile_id === null ? $this->smarty->compile_id : $_compile_id;
-        $this->caching = $_caching === null ? $this->smarty->caching : $_caching;
-        if ($this->caching === true) {
-            $this->caching = Smarty::CACHING_LIFETIME_CURRENT;
-        }
-        $this->cache_lifetime = $_cache_lifetime === null ? $this->smarty->cache_lifetime : $_cache_lifetime;
-        $this->parent = $_parent;
-        // Template resource
-        $this->template_resource = $template_resource;
-        // copy block data of template inheritance
-        if ($this->parent instanceof Smarty_Internal_Template) {
-            $this->block_data = $this->parent->block_data;
-        }
-    }
-
-    /**
-     * fetches rendered template
-     *
-     * @throws Exception
-     * @throws SmartyException
-     * @return string rendered template output
-     */
-    public function fetch()
-    {
-        return $this->render(true, false, false);
-    }
-
-    /**
-     * displays a Smarty template
-     */
-    public function display()
-    {
-        $this->render(true, false, true);
-    }
-
-    /**
-     * render template
-     *
-     * @param  bool $merge_tpl_vars   if true parent template variables merged in to local scope
-     * @param  bool $no_output_filter if true do not run output filter
-     * @param  bool $display          true: display, false: fetch null: subtemplate
-     *
-     * @throws Exception
-     * @throws SmartyException
-     * @return string rendered template output
-     */
-    public function render($merge_tpl_vars = false, $no_output_filter = true, $display = null)
-    {
-        $parentIsTpl = $this->parent instanceof Smarty_Internal_Template;
-        if ($this->smarty->debugging) {
-            Smarty_Internal_Debug::start_template($this, $display);
-        }
-        $save_tpl_vars = null;
-        $save_config_vars = null;
-        // merge all variable scopes into template
-        if ($merge_tpl_vars) {
-            // save local variables
-            $save_tpl_vars = $this->tpl_vars;
-            $save_config_vars = $this->config_vars;
-            $ptr_array = array($this);
-            $ptr = $this;
-            while (isset($ptr->parent)) {
-                $ptr_array[] = $ptr = $ptr->parent;
-            }
-            $ptr_array = array_reverse($ptr_array);
-            $parent_ptr = reset($ptr_array);
-            $tpl_vars = $parent_ptr->tpl_vars;
-            $config_vars = $parent_ptr->config_vars;
-            while ($parent_ptr = next($ptr_array)) {
-                if (!empty($parent_ptr->tpl_vars)) {
-                    $tpl_vars = array_merge($tpl_vars, $parent_ptr->tpl_vars);
-                }
-                if (!empty($parent_ptr->config_vars)) {
-                    $config_vars = array_merge($config_vars, $parent_ptr->config_vars);
-                }
-            }
-            if (!empty(Smarty::$global_tpl_vars)) {
-                $tpl_vars = array_merge(Smarty::$global_tpl_vars, $tpl_vars);
-            }
-            $this->tpl_vars = $tpl_vars;
-            $this->config_vars = $config_vars;
-        }
-        // dummy local smarty variable
-        if (!isset($this->tpl_vars['smarty'])) {
-            $this->tpl_vars['smarty'] = new Smarty_Variable;
-        }
-        $_smarty_old_error_level = isset($this->smarty->error_reporting) ? error_reporting($this->smarty->error_reporting) : null;
-        // check URL debugging control
-        if (!$this->smarty->debugging && $this->smarty->debugging_ctrl == 'URL') {
-            Smarty_Internal_Debug::debugUrl($this);
-        }
-        if (!isset($this->source)) {
-            $this->loadSource();
-        }
-        // checks if template exists
-        if (!$this->source->exists) {
-            if ($parentIsTpl) {
-                $parent_resource = " in '{$this->parent->template_resource}'";
-            } else {
-                $parent_resource = '';
-            }
-            throw new SmartyException("Unable to load template {$this->source->type} '{$this->source->name}'{$parent_resource}");
-        }
-        // disable caching for evaluated code
-        if ($this->source->recompiled) {
-            $this->caching = false;
-        }
-        // read from cache or render
-        $isCacheTpl = $this->caching == Smarty::CACHING_LIFETIME_CURRENT || $this->caching == Smarty::CACHING_LIFETIME_SAVED;
-        if ($isCacheTpl) {
-            if (!isset($this->cached)) {
-                $this->loadCached();
-            }
-            $this->cached->isCached($this);
-        }
-        if (!($isCacheTpl) || !$this->cached->valid) {
-            if ($isCacheTpl) {
-                $this->properties['tpl_function'] = array();
-            }
-            // render template (not loaded and not in cache)
-            if ($this->smarty->debugging) {
-                Smarty_Internal_Debug::start_render($this);
-            }
-            if (!$this->source->uncompiled) {
-                // render compiled code
-                if (!isset($this->compiled)) {
-                    $this->loadCompiled();
-                }
-                $content = $this->compiled->render($this);
-            } else {
-                $content = $this->source->renderUncompiled($this);
-            }
-            if (!$this->source->recompiled && empty($this->properties['file_dependency'][$this->source->uid])) {
-                $this->properties['file_dependency'][$this->source->uid] = array($this->source->filepath, $this->source->timestamp, $this->source->type);
-            }
-            if ($parentIsTpl) {
-                $this->parent->properties['file_dependency'] = array_merge($this->parent->properties['file_dependency'], $this->properties['file_dependency']);
-                //$this->parent->properties['tpl_function'] = array_merge($this->parent->properties['tpl_function'], $this->properties['tpl_function']);
-            }
-            if ($this->smarty->debugging) {
-                Smarty_Internal_Debug::end_render($this);
-            }
-            // write to cache when necessary
-            if (!$this->source->recompiled && $isCacheTpl) {
-                if ($this->smarty->debugging) {
-                    Smarty_Internal_Debug::start_cache($this);
-                }
-                $this->cached->updateCache($this, $content, $no_output_filter);
-                $compile_check = $this->smarty->compile_check;
-                $this->smarty->compile_check = false;
-                if ($parentIsTpl) {
-                    $this->properties['tpl_function'] = $this->parent->properties['tpl_function'];
-                }
-                if (!$this->cached->processed) {
-                    $this->cached->process($this);
-                }
-                $this->smarty->compile_check = $compile_check;
-                $content = $this->getRenderedTemplateCode();
-                if ($this->smarty->debugging) {
-                    Smarty_Internal_Debug::end_cache($this);
-                }
-            } else {
-                if (!empty($this->properties['nocache_hash']) && !empty($this->parent->properties['nocache_hash'])) {
-                    // replace nocache_hash
-                    $content = str_replace("{$this->properties['nocache_hash']}", $this->parent->properties['nocache_hash'], $content);
-                    $this->parent->has_nocache_code = $this->parent->has_nocache_code || $this->has_nocache_code;
-                }
-            }
-        } else {
-            if ($this->smarty->debugging) {
-                Smarty_Internal_Debug::start_cache($this);
-            }
-            $content = $this->cached->render($this);
-            if ($this->smarty->debugging) {
-                Smarty_Internal_Debug::end_cache($this);
-            }
-        }
-        if ((!$this->caching || $this->has_nocache_code || $this->source->recompiled) && !$no_output_filter && (isset($this->smarty->autoload_filters['output']) || isset($this->smarty->registered_filters['output']))) {
-            $content = Smarty_Internal_Filter_Handler::runFilter('output', $content, $this);
-        }
-        if (isset($_smarty_old_error_level)) {
-            error_reporting($_smarty_old_error_level);
-        }
-        // display or fetch
-        if ($display) {
-            if ($this->caching && $this->smarty->cache_modified_check) {
-                $this->cached->cacheModifiedCheck($this, $content);
-            } else {
-                echo $content;
-            }
-            if ($this->smarty->debugging) {
-                Smarty_Internal_Debug::end_template($this);
-            }
-            // debug output
-            if ($this->smarty->debugging) {
-                Smarty_Internal_Debug::display_debug($this, true);
-            }
-            if ($merge_tpl_vars) {
-                // restore local variables
-                $this->tpl_vars = $save_tpl_vars;
-                $this->config_vars = $save_config_vars;
-            }
-            return '';
-        } else {
-            if ($merge_tpl_vars) {
-                // restore local variables
-                $this->tpl_vars = $save_tpl_vars;
-                $this->config_vars = $save_config_vars;
-            }
-            if ($this->smarty->debugging) {
-                Smarty_Internal_Debug::end_template($this);
-            }
-            if ($this->smarty->debugging == 2 and $display === false) {
-                if ($this->smarty->debugging) {
-                    Smarty_Internal_Debug::display_debug($this, true);
-                }
-            }
-            if ($parentIsTpl) {
-                $this->parent->properties['tpl_function'] = array_merge($this->parent->properties['tpl_function'], $this->properties['tpl_function']);
-                foreach ($this->required_plugins as $code => $tmp1) {
-                    foreach ($tmp1 as $name => $tmp) {
-                        foreach ($tmp as $type => $data) {
-                            $this->parent->required_plugins[$code][$name][$type] = $data;
-                        }
-                    }
-                }
-            }
-            // return cache content
-            return $content;
-        }
-    }
-
-    /**
-     * get rendered template content by calling compiled or cached template code
-     *
-     * @return string
-     * @throws Exception
-     */
-    public function getRenderedTemplateCode()
-    {
-        $level = ob_get_level();
-        try {
-            ob_start();
-            if (empty($this->properties['unifunc']) || !is_callable($this->properties['unifunc'])) {
-                throw new SmartyException("Invalid compiled template for '{$this->template_resource}'");
-            }
-            if (isset($this->smarty->security_policy)) {
-                $this->smarty->security_policy->startTemplate($this);
-            }
-            array_unshift($this->_capture_stack, array());
-            //
-            // render compiled or saved template code
-            //
-            $this->properties['unifunc']($this);
-            // any unclosed {capture} tags ?
-            if (isset($this->_capture_stack[0][0])) {
-                $this->capture_error();
-            }
-            array_shift($this->_capture_stack);
-            if (isset($this->smarty->security_policy)) {
-                $this->smarty->security_policy->exitTemplate($this);
-            }
-            return ob_get_clean();
-        }
-        catch (Exception $e) {
-            while (ob_get_level() > $level) {
-                ob_end_clean();
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Returns if the current template must be compiled by the Smarty compiler
-     * It does compare the timestamps of template source and the compiled templates and checks the force compile
-     * configuration
-     *
-     * @throws SmartyException
-     * @return boolean true if the template must be compiled
-     */
-    public function mustCompile()
-    {
-        if (!$this->source->exists) {
-            if ($this->parent instanceof Smarty_Internal_Template) {
-                $parent_resource = " in '$this->parent->template_resource}'";
-            } else {
-                $parent_resource = '';
-            }
-            throw new SmartyException("Unable to load template {$this->source->type} '{$this->source->name}'{$parent_resource}");
-        }
-        if ($this->mustCompile === null) {
-            $this->mustCompile = (!$this->source->uncompiled && ($this->smarty->force_compile || $this->source->recompiled || $this->compiled->timestamp === false ||
-                    ($this->smarty->compile_check && $this->compiled->timestamp < $this->source->timestamp)));
-        }
-
-        return $this->mustCompile;
-    }
-
-    /**
-     * Compiles the template
-     * If the template is not evaluated the compiled template is saved on disk
-     */
-    public function compileTemplateSource()
-    {
-        return $this->compiled->compileTemplateSource($this);
-    }
-
-    /**
-     * Writes the content to cache resource
-     *
-     * @param string $content
-     *
-     * @return bool
-     */
-    public function writeCachedContent($content)
-    {
-        return $this->cached->writeCachedContent($this, $content);
-    }
-
-    /**
-     * Template code runtime function to get subtemplate content
-     *
-     * @param string  $template       the resource handle of the template file
-     * @param mixed   $cache_id       cache id to be used with this template
-     * @param mixed   $compile_id     compile id to be used with this template
-     * @param integer $caching        cache mode
-     * @param integer $cache_lifetime life time of cache data
-     * @param         $data
-     * @param int     $parent_scope   scope in which {include} should execute
-     *
-     * @returns string template content
-     */
-    public function getSubTemplate($template, $cache_id, $compile_id, $caching, $cache_lifetime, $data, $parent_scope)
-    {
-        $tpl = $this->setupSubTemplate($template, $cache_id, $compile_id, $caching, $cache_lifetime, $data, $parent_scope);
-        return $tpl->render();
-    }
-
-    /**
-     * Template code runtime function to set up an inline subtemplate
-     *
-     * @param string  $template       the resource handle of the template file
-     * @param mixed   $cache_id       cache id to be used with this template
-     * @param mixed   $compile_id     compile id to be used with this template
-     * @param integer $caching        cache mode
-     * @param integer $cache_lifetime life time of cache data
-     * @param array   $data           passed parameter template variables
-     * @param int     $parent_scope   scope in which {include} should execute
-     *
-     * @returns object template object
-     */
-    public function setupSubTemplate($template, $cache_id, $compile_id, $caching, $cache_lifetime, $data, $parent_scope)
-    {
-        $_templateId = $this->getTemplateId($template, $cache_id, $compile_id);
-        // already in template cache?
-        if (isset($this->smarty->template_objects[$_templateId])) {
-            // clone cached template object because of possible recursive call
-            $tpl = clone $this->smarty->template_objects[$_templateId];
-            $tpl->parent = $this;
-            if ((bool) $tpl->caching !== (bool) $caching) {
-                unset($tpl->compiled);
-            }
-            $tpl->caching = $caching;
-            $tpl->cache_lifetime = $cache_lifetime;
-        } else {
-            $tpl = new $this->smarty->template_class($template, $this->smarty, $this, $cache_id, $compile_id, $caching, $cache_lifetime);
-            $tpl->templateId = $_templateId;
-        }
-        // get variables from calling scope
-        if ($parent_scope == Smarty::SCOPE_LOCAL) {
-            $tpl->tpl_vars = $this->tpl_vars;
-            $tpl->tpl_vars['smarty'] = clone $this->tpl_vars['smarty'];
-        } elseif ($parent_scope == Smarty::SCOPE_PARENT) {
-            $tpl->tpl_vars = &$this->tpl_vars;
-        } elseif ($parent_scope == Smarty::SCOPE_GLOBAL) {
-            $tpl->tpl_vars = &Smarty::$global_tpl_vars;
-        } elseif (($scope_ptr = $this->getScopePointer($parent_scope)) == null) {
-            $tpl->tpl_vars = &$this->tpl_vars;
-        } else {
-            $tpl->tpl_vars = &$scope_ptr->tpl_vars;
-        }
-        $tpl->config_vars = $this->config_vars;
-        if (!empty($data)) {
-            // set up variable values
-            foreach ($data as $_key => $_val) {
-                $tpl->tpl_vars[$_key] = new Smarty_Variable($_val);
-            }
-        }
-        $tpl->properties['tpl_function'] = $this->properties['tpl_function'];
-        return $tpl;
-    }
-
-    /**
-     * Template code runtime function to set up an inline subtemplate
-     *
-     * @param string  $template       the resource handle of the template file
-     * @param mixed   $cache_id       cache id to be used with this template
-     * @param mixed   $compile_id     compile id to be used with this template
-     * @param integer $caching        cache mode
-     * @param integer $cache_lifetime life time of cache data
-     * @param array   $data           passed parameter template variables
-     * @param int     $parent_scope   scope in which {include} should execute
-     * @param string  $hash           nocache hash code
-     * @param string  $content_func   name of content function
-     *
-     * @returns object template content
-     */
-    public function getInlineSubTemplate($template, $cache_id, $compile_id, $caching, $cache_lifetime, $data, $parent_scope, $hash, $content_func)
-    {
-        $tpl = $this->setupSubTemplate($template, $cache_id, $compile_id, $caching, $cache_lifetime, $data, $parent_scope);
-        $tpl->properties['nocache_hash'] = $hash;
-        if (!isset($this->smarty->template_objects[$tpl->templateId])) {
-            $this->smarty->template_objects[$tpl->templateId] = $tpl;
-        }
-        if ($this->smarty->debugging) {
-            Smarty_Internal_Debug::start_template($tpl);
-            Smarty_Internal_Debug::start_render($tpl);
-        }
-        $tpl->properties['unifunc'] = $content_func;
-        $output = $tpl->getRenderedTemplateCode();
-        if ($this->smarty->debugging) {
-            Smarty_Internal_Debug::end_template($tpl);
-            Smarty_Internal_Debug::end_render($tpl);
-        }
-        if (!empty($tpl->properties['file_dependency'])) {
-            $this->properties['file_dependency'] = array_merge($this->properties['file_dependency'], $tpl->properties['file_dependency']);
-        }
-        $this->properties['tpl_function'] = $tpl->properties['tpl_function'];
-        return str_replace($tpl->properties['nocache_hash'], $this->properties['nocache_hash'], $output);
-    }
-
-    /**
-     * Call template function
-     *
-     * @param string                           $name        template function name
-     * @param object|\Smarty_Internal_Template $_smarty_tpl template object
-     * @param array                            $params      parameter array
-     * @param bool                             $nocache     true if called nocache
-     *
-     * @throws \SmartyException
-     */
-    public function callTemplateFunction($name, Smarty_Internal_Template $_smarty_tpl, $params, $nocache)
-    {
-        if (isset($_smarty_tpl->properties['tpl_function'][$name])) {
-            if (!$_smarty_tpl->caching || ($_smarty_tpl->caching && $nocache)) {
-                $function = $_smarty_tpl->properties['tpl_function'][$name]['call_name'];
-            } else {
-                if (isset($_smarty_tpl->properties['tpl_function'][$name]['call_name_caching'])) {
-                    $function = $_smarty_tpl->properties['tpl_function'][$name]['call_name_caching'];
-                } else {
-                    $function = $_smarty_tpl->properties['tpl_function'][$name]['call_name'];
-                }
-            }
-            if (function_exists($function)) {
-                $function ($_smarty_tpl, $params);
-                return;
-            }
-            // try to load template function dynamically
-            if (Smarty_Internal_Function_Call_Handler::call($name, $_smarty_tpl, $function, $params, $nocache)) {
-                $function ($_smarty_tpl, $params);
-                return;
-            }
-        }
-        throw new SmartyException("Unable to find template function '{$name}'");
-    }
-
-    /**
-     * This function is executed automatically when a compiled or cached template file is included
-     * - Decode saved properties from compiled template and cache files
-     * - Check if compiled or cache file is valid
-     *
-     * @param  array $properties special template properties
-     * @param  bool  $cache      flag if called from cache file
-     *
-     * @return bool  flag if compiled or cache file is valid
-     */
-    public function decodeProperties($properties, $cache = false)
-    {
-        $properties['version'] = (isset($properties['version'])) ? $properties['version'] : '';
-        $is_valid = true;
-        if (Smarty::SMARTY_VERSION != $properties['version']) {
-            // new version must rebuild
-            $is_valid = false;
-        } elseif ((!$cache && $this->smarty->compile_check || $cache && ($this->smarty->compile_check === true || $this->smarty->compile_check === Smarty::COMPILECHECK_ON)) && !empty($properties['file_dependency'])) {
-            // check file dependencies at compiled code
-            foreach ($properties['file_dependency'] as $_file_to_check) {
-                if ($_file_to_check[2] == 'file' || $_file_to_check[2] == 'php') {
-                    if ($this->source->filepath == $_file_to_check[0] && isset($this->source->timestamp)) {
-                        // do not recheck current template
-                        $mtime = $this->source->timestamp;
-                    } else {
-                        // file and php types can be checked without loading the respective resource handlers
-                        $mtime = is_file($_file_to_check[0]) ? @filemtime($_file_to_check[0]) : false;
-                    }
-                } elseif ($_file_to_check[2] == 'string') {
-                    continue;
-                } else {
-                    $source = Smarty_Resource::source(null, $this->smarty, $_file_to_check[0]);
-                    $mtime = $source->timestamp;
-                }
-                if (!$mtime || $mtime > $_file_to_check[1]) {
-                    $is_valid = false;
-                    break;
-                }
-            }
-        }
-        if ($cache) {
-            // CACHING_LIFETIME_SAVED cache expiry has to be validated here since otherwise we'd define the unifunc
-            if ($this->caching === Smarty::CACHING_LIFETIME_SAVED &&
-                $properties['cache_lifetime'] >= 0 &&
-                (time() > ($this->cached->timestamp + $properties['cache_lifetime']))
-            ) {
-                $is_valid = false;
-            }
-            $this->cached->valid = $is_valid;
-        } else {
-            $this->mustCompile = !$is_valid;
-        }
-        if ($is_valid) {
-            $this->has_nocache_code = $properties['has_nocache_code'];
-            //            $this->properties['nocache_hash'] = $properties['nocache_hash'];
-            if (isset($properties['cache_lifetime'])) {
-                $this->properties['cache_lifetime'] = $properties['cache_lifetime'];
-            }
-            if (isset($properties['file_dependency'])) {
-                $this->properties['file_dependency'] = array_merge($this->properties['file_dependency'], $properties['file_dependency']);
-            }
-            if (isset($properties['tpl_function'])) {
-                $this->properties['tpl_function'] = array_merge($this->properties['tpl_function'], $properties['tpl_function']);
-            }
-            $this->properties['version'] = $properties['version'];
-            $this->properties['unifunc'] = $properties['unifunc'];
-        }
-        return $is_valid;
-    }
-
-    /**
-     * Template code runtime function to create a local Smarty variable for array assignments
-     *
-     * @param string $tpl_var template variable name
-     * @param bool   $nocache cache mode of variable
-     * @param int    $scope   scope of variable
-     */
-    public function createLocalArrayVariable($tpl_var, $nocache = false, $scope = Smarty::SCOPE_LOCAL)
-    {
-        if (!isset($this->tpl_vars[$tpl_var])) {
-            $this->tpl_vars[$tpl_var] = new Smarty_Variable(array(), $nocache, $scope);
-        } else {
-            $this->tpl_vars[$tpl_var] = clone $this->tpl_vars[$tpl_var];
-            if ($scope != Smarty::SCOPE_LOCAL) {
-                $this->tpl_vars[$tpl_var]->scope = $scope;
-            }
-            if (!(is_array($this->tpl_vars[$tpl_var]->value) || $this->tpl_vars[$tpl_var]->value instanceof ArrayAccess)) {
-                settype($this->tpl_vars[$tpl_var]->value, 'array');
-            }
-        }
-    }
-
-    /**
-     * Template code runtime function to get pointer to template variable array of requested scope
-     *
-     * @param  int $scope requested variable scope
-     *
-     * @return array array of template variables
-     */
-    public function &getScope($scope)
-    {
-        if ($scope == Smarty::SCOPE_PARENT && !empty($this->parent)) {
-            return $this->parent->tpl_vars;
-        } elseif ($scope == Smarty::SCOPE_ROOT && !empty($this->parent)) {
-            $ptr = $this->parent;
-            while (!empty($ptr->parent)) {
-                $ptr = $ptr->parent;
-            }
-
-            return $ptr->tpl_vars;
-        } elseif ($scope == Smarty::SCOPE_GLOBAL) {
-            return Smarty::$global_tpl_vars;
-        }
-        $null = null;
-
-        return $null;
-    }
-
-    /**
-     * Get parent or root of template parent chain
-     *
-     * @param  int $scope parent or root scope
-     *
-     * @return mixed object
-     */
-    public function getScopePointer($scope)
-    {
-        if ($scope == Smarty::SCOPE_PARENT && !empty($this->parent)) {
-            return $this->parent;
-        } elseif ($scope == Smarty::SCOPE_ROOT && !empty($this->parent)) {
-            $ptr = $this->parent;
-            while (!empty($ptr->parent)) {
-                $ptr = $ptr->parent;
-            }
-
-            return $ptr;
-        }
-
-        return null;
-    }
-
-    /**
-     * [util function] counts an array, arrayAccess/traversable or PDOStatement object
-     *
-     * @param  mixed $value
-     *
-     * @return int   the count for arrays and objects that implement countable, 1 for other objects that don't, and 0
-     *               for empty elements
-     */
-    public function _count($value)
-    {
-        if (is_array($value) === true || $value instanceof Countable) {
-            return count($value);
-        } elseif ($value instanceof IteratorAggregate) {
-            // Note: getIterator() returns a Traversable, not an Iterator
-            // thus rewind() and valid() methods may not be present
-            return iterator_count($value->getIterator());
-        } elseif ($value instanceof Iterator) {
-            return iterator_count($value);
-        } elseif ($value instanceof PDOStatement) {
-            return $value->rowCount();
-        } elseif ($value instanceof Traversable) {
-            return iterator_count($value);
-        } elseif ($value instanceof ArrayAccess) {
-            if ($value->offsetExists(0)) {
-                return 1;
-            }
-        } elseif (is_object($value)) {
-            return count($value);
-        }
-
-        return 0;
-    }
-
-    /**
-     * runtime error not matching capture tags
-     */
-    public function capture_error()
-    {
-        throw new SmartyException("Not matching {capture} open/close in \"{$this->template_resource}\"");
-    }
-
-    /**
-     * Empty cache for this template
-     *
-     * @param integer $exp_time expiration time
-     *
-     * @return integer number of cache files deleted
-     */
-    public function clearCache($exp_time = null)
-    {
-        Smarty_CacheResource::invalidLoadedCache($this->smarty);
-
-        return $this->cached->handler->clear($this->smarty, $this->template_resource, $this->cache_id, $this->compile_id, $exp_time);
-    }
-
-    /**
-     * Load source resource
-     *
-     * @throws SmartyException
-     */
-    public function loadSource()
-    {
-        $this->source = Smarty_Template_Source::load($this);
-        if ($this->smarty->template_resource_caching && !$this->source->recompiled && isset($this->templateId)) {
-            $this->smarty->template_objects[$this->templateId] = $this;
-        }
-    }
-
-    /**
-     * Load compiled object
-     *
-     */
-    public function loadCompiled()
-    {
-        if (!isset($this->compiled)) {
-            if (!class_exists('Smarty_Template_Compiled', false)) {
-                require SMARTY_SYSPLUGINS_DIR . 'smarty_template_compiled.php';
-            }
-            $this->compiled = Smarty_Template_Compiled::load($this);
-        }
-    }
-
-    /**
-     * Load cached object
-     *
-     */
-    public function loadCached()
-    {
-        if (!isset($this->cached)) {
-            if (!class_exists('Smarty_Template_Cached', false)) {
-                require SMARTY_SYSPLUGINS_DIR . 'smarty_template_cached.php';
-            }
-            $this->cached = Smarty_Template_Cached::load($this);
-        }
-    }
-
-    /**
-     * Load compiler object
-     *
-     * @throws \SmartyException
-     */
-    public function loadCompiler()
-    {
-        $this->smarty->loadPlugin($this->source->compiler_class);
-        $this->compiler = new $this->source->compiler_class($this->source->template_lexer_class, $this->source->template_parser_class, $this->smarty);
-    }
-
-    /**
-     * Handle unknown class methods
-     *
-     * @param string $name unknown method-name
-     * @param array  $args argument array
-     *
-     * @return mixed
-     * @throws SmartyException
-     */
-    public function __call($name, $args)
-    {
-        // method of Smarty object?
-        if (method_exists($this->smarty, $name)) {
-            return call_user_func_array(array($this->smarty, $name), $args);
-        }
-        // parent
-        return parent::__call($name, $args);
-    }
-
-    /**
-     * set Smarty property in template context
-     *
-     * @param string $property_name property name
-     * @param mixed  $value         value
-     *
-     * @throws SmartyException
-     */
-    public function __set($property_name, $value)
-    {
-        switch ($property_name) {
-            case 'source':
-            case 'compiled':
-            case 'cached':
-            case 'compiler':
-                $this->$property_name = $value;
-                return;
-            default:
-                // Smarty property ?
-                if (property_exists($this->smarty, $property_name)) {
-                    $this->smarty->$property_name = $value;
-                    return;
-                }
-        }
-        throw new SmartyException("invalid template property '$property_name'.");
-    }
-
-    /**
-     * get Smarty property in template context
-     *
-     * @param string $property_name property name
-     *
-     * @return mixed|Smarty_Template_Cached
-     * @throws SmartyException
-     */
-    public function __get($property_name)
-    {
-        switch ($property_name) {
-            case 'source':
-                $this->loadSource();
-                return $this->source;
-
-            case 'compiled':
-                $this->loadCompiled();
-                return $this->compiled;
-
-            case 'cached':
-                $this->loadCached();
-                return $this->cached;
-
-            case 'compiler':
-                $this->loadCompiler();
-                return $this->compiler;
-            default:
-                // Smarty property ?
-                if (property_exists($this->smarty, $property_name)) {
-                    return $this->smarty->$property_name;
-                }
-        }
-        throw new SmartyException("template property '$property_name' does not exist.");
-    }
-
-    /**
-     * Template data object destructor
-     */
-    public function __destruct()
-    {
-        if ($this->smarty->cache_locking && isset($this->cached) && $this->cached->is_locked) {
-            $this->cached->handler->releaseLock($this->smarty, $this->cached);
-        }
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_templatebase.php b/www/smarty-3.1.27/sysplugins/smarty_internal_templatebase.php
deleted file mode 100644
index 68fd4be2..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_templatebase.php
+++ /dev/null
@@ -1,557 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Smarty Template  Base
- * This file contains the basic shared methods for template handling
- *
- * @package    Smarty
- * @subpackage Template
- * @author     Uwe Tews
- */
-
-/**
- * Class with shared template methods
- *
- * @package    Smarty
- * @subpackage Template
- */
-abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
-{
-    /**
-     * Set this if you want different sets of cache files for the same
-     * templates.
-     *
-     * @var string
-     */
-    public $cache_id = null;
-    /**
-     * Set this if you want different sets of compiled files for the same
-     * templates.
-     *
-     * @var string
-     */
-    public $compile_id = null;
-    /**
-     * caching enabled
-     *
-     * @var boolean
-     */
-    public $caching = false;
-    /**
-     * cache lifetime in seconds
-     *
-     * @var integer
-     */
-    public $cache_lifetime = 3600;
-
-    /**
-     * test if cache is valid
-     *
-     * @param  string|object $template   the resource handle of the template file or template object
-     * @param  mixed         $cache_id   cache id to be used with this template
-     * @param  mixed         $compile_id compile id to be used with this template
-     * @param  object        $parent     next higher level of Smarty variables
-     *
-     * @return boolean       cache status
-     */
-    public function isCached($template = null, $cache_id = null, $compile_id = null, $parent = null)
-    {
-        if ($template === null && $this instanceof $this->template_class) {
-            $template = $this;
-        } else {
-            if (!($template instanceof $this->template_class)) {
-                if ($parent === null) {
-                    $parent = $this;
-                }
-                $smarty = isset($this->smarty) ? $this->smarty : $this;
-                $template = $smarty->createTemplate($template, $cache_id, $compile_id, $parent, false);
-            }
-        }
-        // return cache status of template
-        if (!isset($template->cached)) {
-            $template->loadCached();
-        }
-        return $template->cached->isCached($template);
-    }
-
-    /**
-     * creates a data object
-     *
-     * @param object $parent next higher level of Smarty variables
-     * @param string $name   optional data block name
-     *
-     * @returns Smarty_Data data object
-     */
-    public function createData($parent = null, $name = null)
-    {
-        $dataObj = new Smarty_Data($parent, $this, $name);
-        if ($this->debugging) {
-            Smarty_Internal_Debug::register_data($dataObj);
-        }
-        return $dataObj;
-    }
-
-    /**
-     * Get unique template id
-     *
-     * @param string     $template_name
-     * @param null|mixed $cache_id
-     * @param null|mixed $compile_id
-     *
-     * @return string
-     */
-    public function getTemplateId($template_name, $cache_id = null, $compile_id = null)
-    {
-        $cache_id = isset($cache_id) ? $cache_id : $this->cache_id;
-        $compile_id = isset($compile_id) ? $compile_id : $this->compile_id;
-        $smarty = isset($this->smarty) ? $this->smarty : $this;
-        if ($smarty->allow_ambiguous_resources) {
-            $_templateId = Smarty_Resource::getUniqueTemplateName($this, $template_name) . "#{$cache_id}#{$compile_id}";
-        } else {
-            $_templateId = $smarty->joined_template_dir . "#{$template_name}#{$cache_id}#{$compile_id}";
-        }
-        if (isset($_templateId[150])) {
-            $_templateId = sha1($_templateId);
-        }
-        return $_templateId;
-    }
-
-    /**
-     * Registers plugin to be used in templates
-     *
-     * @param  string   $type       plugin type
-     * @param  string   $tag        name of template tag
-     * @param  callback $callback   PHP callback to register
-     * @param  boolean  $cacheable  if true (default) this fuction is cachable
-     * @param  array    $cache_attr caching attributes if any
-     *
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or
-     *                                      Smarty_Internal_Template) instance for chaining
-     * @throws SmartyException              when the plugin tag is invalid
-     */
-    public function registerPlugin($type, $tag, $callback, $cacheable = true, $cache_attr = null)
-    {
-        $smarty = isset($this->smarty) ? $this->smarty : $this;
-        if (isset($smarty->registered_plugins[$type][$tag])) {
-            throw new SmartyException("Plugin tag \"{$tag}\" already registered");
-        } elseif (!is_callable($callback)) {
-            throw new SmartyException("Plugin \"{$tag}\" not callable");
-        } else {
-            $smarty->registered_plugins[$type][$tag] = array($callback, (bool) $cacheable, (array) $cache_attr);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Unregister Plugin
-     *
-     * @param  string $type of plugin
-     * @param  string $tag  name of plugin
-     *
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or
-     *                                      Smarty_Internal_Template) instance for chaining
-     */
-    public function unregisterPlugin($type, $tag)
-    {
-        $smarty = isset($this->smarty) ? $this->smarty : $this;
-        if (isset($smarty->registered_plugins[$type][$tag])) {
-            unset($smarty->registered_plugins[$type][$tag]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Registers a resource to fetch a template
-     *
-     * @param  string                $type     name of resource type
-     * @param  Smarty_Resource|array $callback or instance of Smarty_Resource, or array of callbacks to handle resource
-     *                                         (deprecated)
-     *
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or
-     *                                      Smarty_Internal_Template) instance for chaining
-     */
-    public function registerResource($type, $callback)
-    {
-        $smarty = isset($this->smarty) ? $this->smarty : $this;
-        $smarty->registered_resources[$type] = $callback instanceof Smarty_Resource ? $callback : array($callback, false);
-
-        return $this;
-    }
-
-    /**
-     * Unregisters a resource
-     *
-     * @param  string $type name of resource type
-     *
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or
-     *                                      Smarty_Internal_Template) instance for chaining
-     */
-    public function unregisterResource($type)
-    {
-        $smarty = isset($this->smarty) ? $this->smarty : $this;
-        if (isset($smarty->registered_resources[$type])) {
-            unset($smarty->registered_resources[$type]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Registers a cache resource to cache a template's output
-     *
-     * @param  string               $type     name of cache resource type
-     * @param  Smarty_CacheResource $callback instance of Smarty_CacheResource to handle output caching
-     *
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or
-     *                                      Smarty_Internal_Template) instance for chaining
-     */
-    public function registerCacheResource($type, Smarty_CacheResource $callback)
-    {
-        $smarty = isset($this->smarty) ? $this->smarty : $this;
-        $smarty->registered_cache_resources[$type] = $callback;
-
-        return $this;
-    }
-
-    /**
-     * Unregisters a cache resource
-     *
-     * @param  string $type name of cache resource type
-     *
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or
-     *                                      Smarty_Internal_Template) instance for chaining
-     */
-    public function unregisterCacheResource($type)
-    {
-        $smarty = isset($this->smarty) ? $this->smarty : $this;
-        if (isset($smarty->registered_cache_resources[$type])) {
-            unset($smarty->registered_cache_resources[$type]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Registers object to be used in templates
-     *
-     * @param          $object_name
-     * @param  object  $object_impl   the referenced PHP object to register
-     * @param  array   $allowed       list of allowed methods (empty = all)
-     * @param  boolean $smarty_args   smarty argument format, else traditional
-     * @param  array   $block_methods list of block-methods
-     *
-     * @throws SmartyException
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or
-     *                                      Smarty_Internal_Template) instance for chaining
-     */
-    public function registerObject($object_name, $object_impl, $allowed = array(), $smarty_args = true, $block_methods = array())
-    {
-        // test if allowed methods callable
-        if (!empty($allowed)) {
-            foreach ((array) $allowed as $method) {
-                if (!is_callable(array($object_impl, $method)) && !property_exists($object_impl, $method)) {
-                    throw new SmartyException("Undefined method or property '$method' in registered object");
-                }
-            }
-        }
-        // test if block methods callable
-        if (!empty($block_methods)) {
-            foreach ((array) $block_methods as $method) {
-                if (!is_callable(array($object_impl, $method))) {
-                    throw new SmartyException("Undefined method '$method' in registered object");
-                }
-            }
-        }
-        // register the object
-        $smarty = isset($this->smarty) ? $this->smarty : $this;
-        $smarty->registered_objects[$object_name] =
-            array($object_impl, (array) $allowed, (boolean) $smarty_args, (array) $block_methods);
-
-        return $this;
-    }
-
-    /**
-     * return a reference to a registered object
-     *
-     * @param  string $name object name
-     *
-     * @return object
-     * @throws SmartyException if no such object is found
-     */
-    public function getRegisteredObject($name)
-    {
-        $smarty = isset($this->smarty) ? $this->smarty : $this;
-        if (!isset($smarty->registered_objects[$name])) {
-            throw new SmartyException("'$name' is not a registered object");
-        }
-        if (!is_object($smarty->registered_objects[$name][0])) {
-            throw new SmartyException("registered '$name' is not an object");
-        }
-
-        return $smarty->registered_objects[$name][0];
-    }
-
-    /**
-     * unregister an object
-     *
-     * @param  string $name object name
-     *
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or
-     *                                      Smarty_Internal_Template) instance for chaining
-     */
-    public function unregisterObject($name)
-    {
-        $smarty = isset($this->smarty) ? $this->smarty : $this;
-        if (isset($smarty->registered_objects[$name])) {
-            unset($smarty->registered_objects[$name]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Registers static classes to be used in templates
-     *
-     * @param         $class_name
-     * @param  string $class_impl the referenced PHP class to register
-     *
-     * @throws SmartyException
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or
-     *                                      Smarty_Internal_Template) instance for chaining
-     */
-    public function registerClass($class_name, $class_impl)
-    {
-        // test if exists
-        if (!class_exists($class_impl)) {
-            throw new SmartyException("Undefined class '$class_impl' in register template class");
-        }
-        // register the class
-        $smarty = isset($this->smarty) ? $this->smarty : $this;
-        $smarty->registered_classes[$class_name] = $class_impl;
-
-        return $this;
-    }
-
-    /**
-     * Registers a default plugin handler
-     *
-     * @param  callable $callback class/method name
-     *
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or
-     *                                      Smarty_Internal_Template) instance for chaining
-     * @throws SmartyException              if $callback is not callable
-     */
-    public function registerDefaultPluginHandler($callback)
-    {
-        $smarty = isset($this->smarty) ? $this->smarty : $this;
-        if (is_callable($callback)) {
-            $smarty->default_plugin_handler_func = $callback;
-        } else {
-            throw new SmartyException("Default plugin handler '$callback' not callable");
-        }
-
-        return $this;
-    }
-
-    /**
-     * Registers a default template handler
-     *
-     * @param  callable $callback class/method name
-     *
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or
-     *                                      Smarty_Internal_Template) instance for chaining
-     * @throws SmartyException              if $callback is not callable
-     */
-    public function registerDefaultTemplateHandler($callback)
-    {
-        Smarty_Internal_Extension_DefaultTemplateHandler::registerDefaultTemplateHandler($this, $callback);
-        return $this;
-    }
-
-    /**
-     * Registers a default template handler
-     *
-     * @param  callable $callback class/method name
-     *
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or
-     *                                      Smarty_Internal_Template) instance for chaining
-     * @throws SmartyException              if $callback is not callable
-     */
-    public function registerDefaultConfigHandler($callback)
-    {
-        Smarty_Internal_Extension_DefaultTemplateHandler::registerDefaultConfigHandler($this, $callback);
-        return $this;
-    }
-
-    /**
-     * Registers a filter function
-     *
-     * @param  string   $type filter type
-     * @param  callback $callback
-     *
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or
-     *                                      Smarty_Internal_Template) instance for chaining
-     */
-    public function registerFilter($type, $callback)
-    {
-        $smarty = isset($this->smarty) ? $this->smarty : $this;
-        $smarty->registered_filters[$type][$this->_get_filter_name($callback)] = $callback;
-
-        return $this;
-    }
-
-    /**
-     * Unregisters a filter function
-     *
-     * @param  string   $type filter type
-     * @param  callback $callback
-     *
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or
-     *                                      Smarty_Internal_Template) instance for chaining
-     */
-    public function unregisterFilter($type, $callback)
-    {
-        $name = $this->_get_filter_name($callback);
-        $smarty = isset($this->smarty) ? $this->smarty : $this;
-        if (isset($smarty->registered_filters[$type][$name])) {
-            unset($smarty->registered_filters[$type][$name]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Return internal filter name
-     *
-     * @param  callback $function_name
-     *
-     * @return string   internal filter name
-     */
-    public function _get_filter_name($function_name)
-    {
-        if (is_array($function_name)) {
-            $_class_name = (is_object($function_name[0]) ?
-                get_class($function_name[0]) : $function_name[0]);
-
-            return $_class_name . '_' . $function_name[1];
-        } else {
-            return $function_name;
-        }
-    }
-
-    /**
-     * load a filter of specified type and name
-     *
-     * @param  string $type filter type
-     * @param  string $name filter name
-     *
-     * @throws SmartyException if filter could not be loaded
-     */
-    public function loadFilter($type, $name)
-    {
-        $smarty = isset($this->smarty) ? $this->smarty : $this;
-        $_plugin = "smarty_{$type}filter_{$name}";
-        $_filter_name = $_plugin;
-        if ($smarty->loadPlugin($_plugin)) {
-            if (class_exists($_plugin, false)) {
-                $_plugin = array($_plugin, 'execute');
-            }
-            if (is_callable($_plugin)) {
-                $smarty->registered_filters[$type][$_filter_name] = $_plugin;
-
-                return true;
-            }
-        }
-        throw new SmartyException("{$type}filter \"{$name}\" not callable");
-    }
-
-    /**
-     * unload a filter of specified type and name
-     *
-     * @param  string $type filter type
-     * @param  string $name filter name
-     *
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or
-     *                                      Smarty_Internal_Template) instance for chaining
-     */
-    public function unloadFilter($type, $name)
-    {
-        $smarty = isset($this->smarty) ? $this->smarty : $this;
-        $_filter_name = "smarty_{$type}filter_{$name}";
-        if (isset($smarty->registered_filters[$type][$_filter_name])) {
-            unset ($smarty->registered_filters[$type][$_filter_name]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * preg_replace callback to convert camelcase getter/setter to underscore property names
-     *
-     * @param  string $match match string
-     *
-     * @return string replacemant
-     */
-    private function replaceCamelcase($match)
-    {
-        return "_" . strtolower($match[1]);
-    }
-
-    /**
-     * Handle unknown class methods
-     *
-     * @param string $name unknown method-name
-     * @param array  $args argument array
-     *
-     * @throws SmartyException
-     */
-    public function __call($name, $args)
-    {
-        static $_prefixes = array('set' => true, 'get' => true);
-        static $_resolved_property_name = array();
-        static $_resolved_property_source = array();
-
-        // see if this is a set/get for a property
-        $first3 = strtolower(substr($name, 0, 3));
-        if (isset($_prefixes[$first3]) && isset($name[3]) && $name[3] !== '_') {
-            if (isset($_resolved_property_name[$name])) {
-                $property_name = $_resolved_property_name[$name];
-            } else {
-                // try to keep case correct for future PHP 6.0 case-sensitive class methods
-                // lcfirst() not available < PHP 5.3.0, so improvise
-                $property_name = strtolower(substr($name, 3, 1)) . substr($name, 4);
-                // convert camel case to underscored name
-                $property_name = preg_replace_callback('/([A-Z])/', array($this, 'replaceCamelcase'), $property_name);
-                $_resolved_property_name[$name] = $property_name;
-            }
-            if (isset($_resolved_property_source[$property_name])) {
-                $status = $_resolved_property_source[$property_name];
-            } else {
-                $status = null;
-                if (property_exists($this, $property_name)) {
-                    $status = true;
-                } elseif (property_exists($this->smarty, $property_name)) {
-                    $status = false;
-                }
-                $_resolved_property_source[$property_name] = $status;
-            }
-            $smarty = null;
-            if ($status === true) {
-                $smarty = $this;
-            } elseif ($status === false) {
-                $smarty = $this->smarty;
-            }
-            if ($smarty) {
-                if ($first3 == 'get') {
-                    return $smarty->$property_name;
-                } else {
-                    return $smarty->$property_name = $args[0];
-                }
-            }
-            throw new SmartyException("property '$property_name' does not exist.");
-        }
-        throw new SmartyException("Call of unknown method '$name'.");
-    }
-}
-
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_templatecompilerbase.php b/www/smarty-3.1.27/sysplugins/smarty_internal_templatecompilerbase.php
deleted file mode 100644
index 7fc6c325..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_templatecompilerbase.php
+++ /dev/null
@@ -1,1026 +0,0 @@
-<?php
-
-/**
- * Smarty Internal Plugin Smarty Template Compiler Base
- * This file contains the basic classes and methods for compiling Smarty templates with lexer/parser
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Main abstract compiler class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-abstract class Smarty_Internal_TemplateCompilerBase
-{
-
-    /**
-     * Smarty object
-     *
-     * @var Smarty
-     */
-    public $smarty = null;
-
-    /**
-     * hash for nocache sections
-     *
-     * @var mixed
-     */
-    public $nocache_hash = null;
-
-    /**
-     * suppress generation of nocache code
-     *
-     * @var bool
-     */
-    public $suppressNocacheProcessing = false;
-
-    /**
-     * compile tag objects
-     *
-     * @var array
-     */
-    public static $_tag_objects = array();
-
-    /**
-     * tag stack
-     *
-     * @var array
-     */
-    public $_tag_stack = array();
-
-    /**
-     * current template
-     *
-     * @var Smarty_Internal_Template
-     */
-    public $template = null;
-
-    /**
-     * merged included sub template data
-     *
-     * @var array
-     */
-    public $mergedSubTemplatesData = array();
-
-    /**
-     * merged sub template code
-     *
-     * @var array
-     */
-    public $mergedSubTemplatesCode = array();
-
-    /**
-     * collected template properties during compilation
-     *
-     * @var array
-     */
-    public $templateProperties = array();
-
-    /**
-     * sources which must be compiled
-     *
-     * @var array
-     */
-    public $sources = array();
-
-    /**
-     * flag that we are inside {block}
-     *
-     * @var bool
-     */
-    public $inheritance = false;
-
-    /**
-     * flag when compiling inheritance child template
-     *
-     * @var bool
-     */
-    public $inheritance_child = false;
-
-    /**
-     * uid of templates called by {extends} for recursion check
-     *
-     * @var array
-     */
-    public $extends_uid = array();
-
-    /**
-     * source line offset for error messages
-     *
-     * @var int
-     */
-    public $trace_line_offset = 0;
-
-    /**
-     * trace uid
-     *
-     * @var string
-     */
-    public $trace_uid = '';
-
-    /**
-     * trace file path
-     *
-     * @var string
-     */
-    public $trace_filepath = '';
-
-    /**
-     * stack for tracing file and line of nested {block} tags
-     *
-     * @var array
-     */
-    public $trace_stack = array();
-
-    /**
-     * plugins loaded by default plugin handler
-     *
-     * @var array
-     */
-    public $default_handler_plugins = array();
-
-    /**
-     * saved preprocessed modifier list
-     *
-     * @var mixed
-     */
-    public $default_modifier_list = null;
-
-    /**
-     * force compilation of complete template as nocache
-     *
-     * @var boolean
-     */
-    public $forceNocache = false;
-
-    /**
-     * suppress Smarty header code in compiled template
-     *
-     * @var bool
-     */
-    public $suppressHeader = false;
-
-    /**
-     * suppress template property header code in compiled template
-     *
-     * @var bool
-     */
-    public $suppressTemplatePropertyHeader = false;
-
-    /**
-     * suppress pre and post filter
-     *
-     * @var bool
-     */
-    public $suppressFilter = false;
-
-    /**
-     * flag if compiled template file shall we written
-     *
-     * @var bool
-     */
-    public $write_compiled_code = true;
-
-    /**
-     * flag if currently a template function is compiled
-     *
-     * @var bool
-     */
-    public $compiles_template_function = false;
-
-    /**
-     * called sub functions from template function
-     *
-     * @var array
-     */
-    public $called_functions = array();
-
-    /**
-     * compiled template function code
-     *
-     * @var string
-     */
-    public $templateFunctionCode = '';
-
-    /**
-     * php_handling setting either from Smarty or security
-     *
-     * @var int
-     */
-    public $php_handling = 0;
-
-    /**
-     * flags for used modifier plugins
-     *
-     * @var array
-     */
-    public $modifier_plugins = array();
-
-    /**
-     * type of already compiled modifier
-     *
-     * @var array
-     */
-    public $known_modifier_type = array();
-
-    /**
-     * parent compiler object for merged subtemplates and template functions
-     *
-     * @var Smarty_Internal_TemplateCompilerBase
-     */
-    public $parent_compiler = null;
-
-    /**
-     * Flag true when compiling nocache section
-     *
-     * @var bool
-     */
-    public $nocache = false;
-
-    /**
-     * Flag true when tag is compiled as nocache
-     *
-     * @var bool
-     */
-    public $tag_nocache = false;
-
-    /**
-     * Flag to restart parsing
-     *
-     * @var bool
-     */
-    public $abort_and_recompile = false;
-
-    /**
-     * Compiled tag prefix code
-     *
-     * @var array
-     */
-    public $prefix_code = array();
-
-    /**
-     * Prefix code  stack
-     *
-     * @var array
-     */
-    public $prefixCodeStack = array();
-
-    /**
-     * Tag has compiled code
-     *
-     * @var bool
-     */
-    public $has_code = false;
-
-    /**
-     * A variable string was compiled
-     *
-     * @var bool
-     */
-    public $has_variable_string = false;
-
-    /**
-     * Tag creates output
-     *
-     * @var bool
-     */
-    public $has_output = false;
-
-    /**
-     * Strip preg pattern
-     *
-     * @var string
-     */
-    public $stripRegEx = '![\t ]*[\r\n]+[\t ]*!';
-
-    /**
-     * method to compile a Smarty template
-     *
-     * @param  mixed $_content template source
-     *
-     * @return bool  true if compiling succeeded, false if it failed
-     */
-    abstract protected function doCompile($_content);
-
-    /**
-     * Initialize compiler
-     */
-    public function __construct()
-    {
-        $this->nocache_hash = str_replace(array('.', ','), '_', uniqid(rand(), true));
-    }
-
-    /**
-     * Method to compile a Smarty template
-     *
-     * @param  Smarty_Internal_Template                 $template template object to compile
-     * @param  bool                                     $nocache  true is shall be compiled in nocache mode
-     * @param null|Smarty_Internal_TemplateCompilerBase $parent_compiler
-     *
-     * @return bool true if compiling succeeded, false if it failed
-     */
-    public function compileTemplate(Smarty_Internal_Template $template, $nocache = null, $parent_compiler = null)
-    {
-        // save template object in compiler class
-        $this->template = $template;
-        if (isset($this->template->smarty->security_policy)) {
-            $this->php_handling = $this->template->smarty->security_policy->php_handling;
-        } else {
-            $this->php_handling = $this->template->smarty->php_handling;
-        }
-        $this->parent_compiler = $parent_compiler ? $parent_compiler : $this;
-        $nocache = isset($nocache) ? $nocache : false;
-        if (empty($template->properties['nocache_hash'])) {
-            $template->properties['nocache_hash'] = $this->nocache_hash;
-        } else {
-            $this->nocache_hash = $template->properties['nocache_hash'];
-        }
-        $save_source = $this->template->source;
-        // template header code
-        $template_header = '';
-        if (!$this->suppressHeader) {
-            $template_header .= "<?php /* Smarty version " . Smarty::SMARTY_VERSION . ", created on " . strftime("%Y-%m-%d %H:%M:%S") . "\n";
-            $template_header .= "         compiled from \"" . $this->template->source->filepath . "\" */ ?>\n";
-        }
-
-        if (empty($this->template->source->components)) {
-            $this->sources = array($template->source);
-        } else {
-            // we have array of inheritance templates by extends: resource
-            $this->sources = array_reverse($template->source->components);
-        }
-        $loop = 0;
-        // the $this->sources array can get additional elements while compiling by the {extends} tag
-        while ($this->template->source = array_shift($this->sources)) {
-            $this->smarty->_current_file = $this->template->source->filepath;
-            if ($this->smarty->debugging) {
-                Smarty_Internal_Debug::start_compile($this->template);
-            }
-            $no_sources = count($this->sources);
-            $this->parent_compiler->template->properties['file_dependency'][$this->template->source->uid] = array($this->template->source->filepath, $this->template->source->timestamp, $this->template->source->type);
-            $loop ++;
-            if ($no_sources) {
-                $this->inheritance_child = true;
-            } else {
-                $this->inheritance_child = false;
-            }
-            do {
-                // flag for nochache sections
-                $this->nocache = $nocache;
-                $this->tag_nocache = false;
-                // reset has nocache code flag
-                $this->template->has_nocache_code = false;
-                $this->has_variable_string = false;
-                $this->prefix_code = array();
-                $_compiled_code = '';
-                // flag for aborting current and start recompile
-                $this->abort_and_recompile = false;
-                // get template source
-                $_content = $this->template->source->content;
-                if ($_content != '') {
-                    // run prefilter if required
-                    if ((isset($this->smarty->autoload_filters['pre']) || isset($this->smarty->registered_filters['pre'])) && !$this->suppressFilter) {
-                        $_content = Smarty_Internal_Filter_Handler::runFilter('pre', $_content, $template);
-                    }
-                    // call compiler
-                    $_compiled_code = $this->doCompile($_content, true);
-                }
-            } while ($this->abort_and_recompile);
-            if ($this->smarty->debugging) {
-                Smarty_Internal_Debug::end_compile($this->template);
-            }
-        }
-        // restore source
-        $this->template->source = $save_source;
-        unset($save_source);
-        $this->smarty->_current_file = $this->template->source->filepath;
-        // free memory
-        unset($this->parser->root_buffer, $this->parser->current_buffer, $this->parser, $this->lex);
-        self::$_tag_objects = array();
-        // return compiled code to template object
-        $merged_code = '';
-        if (!empty($this->mergedSubTemplatesCode)) {
-            foreach ($this->mergedSubTemplatesCode as $code) {
-                $merged_code .= $code;
-            }
-        }
-        // run postfilter if required on compiled template code
-        if ((isset($this->smarty->autoload_filters['post']) || isset($this->smarty->registered_filters['post'])) && !$this->suppressFilter && $_compiled_code != '') {
-            $_compiled_code = Smarty_Internal_Filter_Handler::runFilter('post', $_compiled_code, $template);
-        }
-        if ($this->suppressTemplatePropertyHeader) {
-            $_compiled_code .= $merged_code;
-        } else {
-            $_compiled_code = $template_header . Smarty_Internal_Extension_CodeFrame::create($template, $_compiled_code) . $merged_code;
-        }
-        if (!empty($this->templateFunctionCode)) {
-            // run postfilter if required on compiled template code
-            if ((isset($this->smarty->autoload_filters['post']) || isset($this->smarty->registered_filters['post'])) && !$this->suppressFilter) {
-                $_compiled_code .= Smarty_Internal_Filter_Handler::runFilter('post', $this->templateFunctionCode, $template);
-            } else {
-                $_compiled_code .= $this->templateFunctionCode;
-            }
-        }
-        // unset content because template inheritance could have replace source with parent code
-        unset ($template->source->content);
-        $this->parent_compiler = null;
-        $this->template = null;
-        return $_compiled_code;
-    }
-
-    /**
-     * Compile Tag
-     * This is a call back from the lexer/parser
-     *
-     * Save current prefix code
-     * Compile tag
-     * Merge tag prefix code with saved one
-     * (required nested tags in attributes)
-     *
-     * @param  string $tag       tag name
-     * @param  array  $args      array with tag attributes
-     * @param  array  $parameter array with compilation parameter
-     *
-     * @throws SmartyCompilerException
-     * @throws SmartyException
-     * @return string compiled code
-     */
-    public function compileTag($tag, $args, $parameter = array())
-    {
-        $this->prefixCodeStack[] = $this->prefix_code;
-        $this->prefix_code = array();
-        $result = $this->compileTag2($tag, $args, $parameter);
-        $this->prefix_code = array_merge($this->prefix_code, array_pop($this->prefixCodeStack));
-        return $result;
-    }
-
-    /**
-     * Compile Tag
-     *
-     * @param  string $tag       tag name
-     * @param  array  $args      array with tag attributes
-     * @param  array  $parameter array with compilation parameter
-     *
-     * @throws SmartyCompilerException
-     * @throws SmartyException
-     * @return string compiled code
-     */
-    private function compileTag2($tag, $args, $parameter)
-    {
-        $plugin_type = '';
-        // $args contains the attributes parsed and compiled by the lexer/parser
-        // assume that tag does compile into code, but creates no HTML output
-        $this->has_code = true;
-        $this->has_output = false;
-        // log tag/attributes
-        if (isset($this->smarty->get_used_tags) && $this->smarty->get_used_tags) {
-            $this->template->used_tags[] = array($tag, $args);
-        }
-        // check nocache option flag
-        if (in_array("'nocache'", $args) || in_array(array('nocache' => 'true'), $args) || in_array(array('nocache' => '"true"'), $args) || in_array(array('nocache' => "'true'"), $args)
-        ) {
-            $this->tag_nocache = true;
-        }
-        // compile the smarty tag (required compile classes to compile the tag are autoloaded)
-        if (($_output = $this->callTagCompiler($tag, $args, $parameter)) === false) {
-            if (isset($this->parent_compiler->templateProperties['tpl_function'][$tag])) {
-                // template defined by {template} tag
-                $args['_attr']['name'] = "'" . $tag . "'";
-                $_output = $this->callTagCompiler('call', $args, $parameter);
-            }
-        }
-        if ($_output !== false) {
-            if ($_output !== true) {
-                // did we get compiled code
-                if ($this->has_code) {
-                    // Does it create output?
-                    if ($this->has_output) {
-                        $_output .= "\n";
-                    }
-                    // return compiled code
-                    return $_output;
-                }
-            }
-            // tag did not produce compiled code
-            return null;
-        } else {
-            // map_named attributes
-            if (isset($args['_attr'])) {
-                foreach ($args['_attr'] as $key => $attribute) {
-                    if (is_array($attribute)) {
-                        $args = array_merge($args, $attribute);
-                    }
-                }
-            }
-            // not an internal compiler tag
-            if (strlen($tag) < 6 || substr($tag, - 5) != 'close') {
-                // check if tag is a registered object
-                if (isset($this->smarty->registered_objects[$tag]) && isset($parameter['object_method'])) {
-                    $method = $parameter['object_method'];
-                    if (!in_array($method, $this->smarty->registered_objects[$tag][3]) && (empty($this->smarty->registered_objects[$tag][1]) || in_array($method, $this->smarty->registered_objects[$tag][1]))
-                    ) {
-                        return $this->callTagCompiler('private_object_function', $args, $parameter, $tag, $method);
-                    } elseif (in_array($method, $this->smarty->registered_objects[$tag][3])) {
-                        return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag, $method);
-                    } else {
-                        // throw exception
-                        $this->trigger_template_error('not allowed method "' . $method . '" in registered object "' . $tag . '"', $this->lex->taglineno);
-                    }
-                }
-                // check if tag is registered
-                foreach (array(Smarty::PLUGIN_COMPILER, Smarty::PLUGIN_FUNCTION, Smarty::PLUGIN_BLOCK) as $plugin_type) {
-                    if (isset($this->smarty->registered_plugins[$plugin_type][$tag])) {
-                        // if compiler function plugin call it now
-                        if ($plugin_type == Smarty::PLUGIN_COMPILER) {
-                            $new_args = array();
-                            foreach ($args as $key => $mixed) {
-                                if (is_array($mixed)) {
-                                    $new_args = array_merge($new_args, $mixed);
-                                } else {
-                                    $new_args[$key] = $mixed;
-                                }
-                            }
-                            if (!$this->smarty->registered_plugins[$plugin_type][$tag][1]) {
-                                $this->tag_nocache = true;
-                            }
-                            $function = $this->smarty->registered_plugins[$plugin_type][$tag][0];
-                            if (!is_array($function)) {
-                                return $function($new_args, $this);
-                            } elseif (is_object($function[0])) {
-                                return $this->smarty->registered_plugins[$plugin_type][$tag][0][0]->$function[1]($new_args, $this);
-                            } else {
-                                return call_user_func_array($function, array($new_args, $this));
-                            }
-                        }
-                        // compile registered function or block function
-                        if ($plugin_type == Smarty::PLUGIN_FUNCTION || $plugin_type == Smarty::PLUGIN_BLOCK) {
-                            return $this->callTagCompiler('private_registered_' . $plugin_type, $args, $parameter, $tag);
-                        }
-                    }
-                }
-                // check plugins from plugins folder
-                foreach ($this->smarty->plugin_search_order as $plugin_type) {
-                    if ($plugin_type == Smarty::PLUGIN_COMPILER && $this->smarty->loadPlugin('smarty_compiler_' . $tag) && (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this))) {
-                        $plugin = 'smarty_compiler_' . $tag;
-                        if (is_callable($plugin)) {
-                            // convert arguments format for old compiler plugins
-                            $new_args = array();
-                            foreach ($args as $key => $mixed) {
-                                if (is_array($mixed)) {
-                                    $new_args = array_merge($new_args, $mixed);
-                                } else {
-                                    $new_args[$key] = $mixed;
-                                }
-                            }
-
-                            return $plugin($new_args, $this->smarty);
-                        }
-                        if (class_exists($plugin, false)) {
-                            $plugin_object = new $plugin;
-                            if (method_exists($plugin_object, 'compile')) {
-                                return $plugin_object->compile($args, $this);
-                            }
-                        }
-                        throw new SmartyException("Plugin \"{$tag}\" not callable");
-                    } else {
-                        if ($function = $this->getPlugin($tag, $plugin_type)) {
-                            if (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this)) {
-                                return $this->callTagCompiler('private_' . $plugin_type . '_plugin', $args, $parameter, $tag, $function);
-                            }
-                        }
-                    }
-                }
-                if (is_callable($this->smarty->default_plugin_handler_func)) {
-                    $found = false;
-                    // look for already resolved tags
-                    foreach ($this->smarty->plugin_search_order as $plugin_type) {
-                        if (isset($this->default_handler_plugins[$plugin_type][$tag])) {
-                            $found = true;
-                            break;
-                        }
-                    }
-                    if (!$found) {
-                        // call default handler
-                        foreach ($this->smarty->plugin_search_order as $plugin_type) {
-                            if ($this->getPluginFromDefaultHandler($tag, $plugin_type)) {
-                                $found = true;
-                                break;
-                            }
-                        }
-                    }
-                    if ($found) {
-                        // if compiler function plugin call it now
-                        if ($plugin_type == Smarty::PLUGIN_COMPILER) {
-                            $new_args = array();
-                            foreach ($args as $mixed) {
-                                $new_args = array_merge($new_args, $mixed);
-                            }
-                            $function = $this->default_handler_plugins[$plugin_type][$tag][0];
-                            if (!is_array($function)) {
-                                return $function($new_args, $this);
-                            } elseif (is_object($function[0])) {
-                                return $this->default_handler_plugins[$plugin_type][$tag][0][0]->$function[1]($new_args, $this);
-                            } else {
-                                return call_user_func_array($function, array($new_args, $this));
-                            }
-                        } else {
-                            return $this->callTagCompiler('private_registered_' . $plugin_type, $args, $parameter, $tag);
-                        }
-                    }
-                }
-            } else {
-                // compile closing tag of block function
-                $base_tag = substr($tag, 0, - 5);
-                // check if closing tag is a registered object
-                if (isset($this->smarty->registered_objects[$base_tag]) && isset($parameter['object_method'])) {
-                    $method = $parameter['object_method'];
-                    if (in_array($method, $this->smarty->registered_objects[$base_tag][3])) {
-                        return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag, $method);
-                    } else {
-                        // throw exception
-                        $this->trigger_template_error('not allowed closing tag method "' . $method . '" in registered object "' . $base_tag . '"', $this->lex->taglineno);
-                    }
-                }
-                // registered block tag ?
-                if (isset($this->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag]) || isset($this->default_handler_plugins[Smarty::PLUGIN_BLOCK][$base_tag])) {
-                    return $this->callTagCompiler('private_registered_block', $args, $parameter, $tag);
-                }
-                // block plugin?
-                if ($function = $this->getPlugin($base_tag, Smarty::PLUGIN_BLOCK)) {
-                    return $this->callTagCompiler('private_block_plugin', $args, $parameter, $tag, $function);
-                }
-                // registered compiler plugin ?
-                if (isset($this->smarty->registered_plugins[Smarty::PLUGIN_COMPILER][$tag])) {
-                    // if compiler function plugin call it now
-                    $args = array();
-                    if (!$this->smarty->registered_plugins[Smarty::PLUGIN_COMPILER][$tag][1]) {
-                        $this->tag_nocache = true;
-                    }
-                    $function = $this->smarty->registered_plugins[Smarty::PLUGIN_COMPILER][$tag][0];
-                    if (!is_array($function)) {
-                        return $function($args, $this);
-                    } elseif (is_object($function[0])) {
-                        return $this->smarty->registered_plugins[Smarty::PLUGIN_COMPILER][$tag][0][0]->$function[1]($args, $this);
-                    } else {
-                        return call_user_func_array($function, array($args, $this));
-                    }
-                }
-                if ($this->smarty->loadPlugin('smarty_compiler_' . $tag)) {
-                    $plugin = 'smarty_compiler_' . $tag;
-                    if (is_callable($plugin)) {
-                        return $plugin($args, $this->smarty);
-                    }
-                    if (class_exists($plugin, false)) {
-                        $plugin_object = new $plugin;
-                        if (method_exists($plugin_object, 'compile')) {
-                            return $plugin_object->compile($args, $this);
-                        }
-                    }
-                    throw new SmartyException("Plugin \"{$tag}\" not callable");
-                }
-            }
-            $this->trigger_template_error("unknown tag \"" . $tag . "\"", $this->lex->taglineno);
-        }
-    }
-
-    /**
-     * compile variable
-     *
-     * @param string $variable
-     *
-     * @return string
-     */
-    public function compileVariable($variable)
-    {
-        if (strpos($variable, '(') == 0) {
-            // not a variable variable
-            $var = trim($variable, '\'');
-            $this->tag_nocache = $this->tag_nocache | $this->template->getVariable($var, null, true, false)->nocache;
-            $this->template->properties['variables'][$var] = $this->tag_nocache | $this->nocache;
-        }
-        return '$_smarty_tpl->tpl_vars[' . $variable . ']->value';
-    }
-
-    /**
-     * This method is called from parser to process a text content section
-     * - remove text from inheritance child templates as they may generate output
-     * - strip text if strip is enabled
-     *
-     * @param string $text
-     *
-     * @return null|\Smarty_Internal_ParseTree_Text
-     */
-    public function processText($text)
-    {
-        if ($this->parser->strip) {
-            return new Smarty_Internal_ParseTree_Text($this->parser, preg_replace($this->stripRegEx, '', $text));
-        } else {
-            return new Smarty_Internal_ParseTree_Text($this->parser, $text);
-        }
-    }
-
-    /**
-     * lazy loads internal compile plugin for tag and calls the compile method
-     * compile objects cached for reuse.
-     * class name format:  Smarty_Internal_Compile_TagName
-     * plugin filename format: Smarty_Internal_Tagname.php
-     *
-     * @param  string $tag    tag name
-     * @param  array  $args   list of tag attributes
-     * @param  mixed  $param1 optional parameter
-     * @param  mixed  $param2 optional parameter
-     * @param  mixed  $param3 optional parameter
-     *
-     * @return string compiled code
-     */
-    public function callTagCompiler($tag, $args, $param1 = null, $param2 = null, $param3 = null)
-    {
-        // check if tag allowed by security
-        if (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this)) {
-            // re-use object if already exists
-            if (!isset(self::$_tag_objects[$tag])) {
-                // lazy load internal compiler plugin
-                $class_name = 'Smarty_Internal_Compile_' . $tag;
-                if ($this->smarty->loadPlugin($class_name)) {
-                    self::$_tag_objects[$tag] = new $class_name;
-                } else {
-                    return false;
-                }
-            }
-            // compile this tag
-            return self::$_tag_objects[$tag]->compile($args, $this, $param1, $param2, $param3);
-        }
-        // no internal compile plugin for this tag
-        return false;
-    }
-
-    /**
-     * Check for plugins and return function name
-     *
-     * @param         $plugin_name
-     * @param  string $plugin_type type of plugin
-     *
-     * @return string call name of function
-     */
-    public function getPlugin($plugin_name, $plugin_type)
-    {
-        $function = null;
-        if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
-            if (isset($this->template->required_plugins['nocache'][$plugin_name][$plugin_type])) {
-                $function = $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]['function'];
-            } elseif (isset($this->template->required_plugins['compiled'][$plugin_name][$plugin_type])) {
-                $this->template->required_plugins['nocache'][$plugin_name][$plugin_type] = $this->template->required_plugins['compiled'][$plugin_name][$plugin_type];
-                $function = $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]['function'];
-            }
-        } else {
-            if (isset($this->template->required_plugins['compiled'][$plugin_name][$plugin_type])) {
-                $function = $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]['function'];
-            } elseif (isset($this->template->required_plugins['nocache'][$plugin_name][$plugin_type])) {
-                $this->template->required_plugins['compiled'][$plugin_name][$plugin_type] = $this->template->required_plugins['nocache'][$plugin_name][$plugin_type];
-                $function = $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]['function'];
-            }
-        }
-        if (isset($function)) {
-            if ($plugin_type == 'modifier') {
-                $this->modifier_plugins[$plugin_name] = true;
-            }
-
-            return $function;
-        }
-        // loop through plugin dirs and find the plugin
-        $function = 'smarty_' . $plugin_type . '_' . $plugin_name;
-        $file = $this->smarty->loadPlugin($function, false);
-
-        if (is_string($file)) {
-            if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
-                $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]['file'] = $file;
-                $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]['function'] = $function;
-            } else {
-                $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]['file'] = $file;
-                $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]['function'] = $function;
-            }
-            if ($plugin_type == 'modifier') {
-                $this->modifier_plugins[$plugin_name] = true;
-            }
-
-            return $function;
-        }
-        if (is_callable($function)) {
-            // plugin function is defined in the script
-            return $function;
-        }
-
-        return false;
-    }
-
-    /**
-     * Check for plugins by default plugin handler
-     *
-     * @param  string $tag         name of tag
-     * @param  string $plugin_type type of plugin
-     *
-     * @return boolean true if found
-     */
-    public function getPluginFromDefaultHandler($tag, $plugin_type)
-    {
-        $callback = null;
-        $script = null;
-        $cacheable = true;
-        $result = call_user_func_array($this->smarty->default_plugin_handler_func, array($tag, $plugin_type, $this->template, &$callback, &$script, &$cacheable));
-        if ($result) {
-            $this->tag_nocache = $this->tag_nocache || !$cacheable;
-            if ($script !== null) {
-                if (is_file($script)) {
-                    if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
-                        $this->template->required_plugins['nocache'][$tag][$plugin_type]['file'] = $script;
-                        $this->template->required_plugins['nocache'][$tag][$plugin_type]['function'] = $callback;
-                    } else {
-                        $this->template->required_plugins['compiled'][$tag][$plugin_type]['file'] = $script;
-                        $this->template->required_plugins['compiled'][$tag][$plugin_type]['function'] = $callback;
-                    }
-                    require_once $script;
-                } else {
-                    $this->trigger_template_error("Default plugin handler: Returned script file \"{$script}\" for \"{$tag}\" not found");
-                }
-            }
-            if (!is_string($callback) && !(is_array($callback) && is_string($callback[0]) && is_string($callback[1]))) {
-                $this->trigger_template_error("Default plugin handler: Returned callback for \"{$tag}\" must be a static function name or array of class and function name");
-            }
-            if (is_callable($callback)) {
-                $this->default_handler_plugins[$plugin_type][$tag] = array($callback, true, array());
-
-                return true;
-            } else {
-                $this->trigger_template_error("Default plugin handler: Returned callback for \"{$tag}\" not callable");
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Append code segments and remove unneeded ?> <?php transitions
-     *
-     * @param string $left
-     * @param string $right
-     *
-     * @return string
-     */
-    public function appendCode($left, $right)
-    {
-        if (preg_match('/\s*\?>\s*$/', $left) && preg_match('/^\s*<\?php\s+/', $right)) {
-            $left = preg_replace('/\s*\?>\s*$/', "\n", $left);
-            $left .= preg_replace('/^\s*<\?php\s+/', '', $right);
-        } else {
-            $left .= $right;
-        }
-        return $left;
-    }
-
-    /**
-     * Inject inline code for nocache template sections
-     * This method gets the content of each template element from the parser.
-     * If the content is compiled code and it should be not cached the code is injected
-     * into the rendered output.
-     *
-     * @param  string  $content content of template element
-     * @param  boolean $is_code true if content is compiled code
-     *
-     * @return string  content
-     */
-    public function processNocacheCode($content, $is_code)
-    {
-        // If the template is not evaluated and we have a nocache section and or a nocache tag
-        if ($is_code && !empty($content)) {
-            // generate replacement code
-            if ((!($this->template->source->recompiled) || $this->forceNocache) && $this->template->caching && !$this->suppressNocacheProcessing && ($this->nocache || $this->tag_nocache)
-            ) {
-                $this->template->has_nocache_code = true;
-                $_output = addcslashes($content, '\'\\');
-                $_output = str_replace("^#^", "'", $_output);
-                $_output = "<?php echo '/*%%SmartyNocache:{$this->nocache_hash}%%*/" . $_output . "/*/%%SmartyNocache:{$this->nocache_hash}%%*/';?>\n";
-                // make sure we include modifier plugins for nocache code
-                foreach ($this->modifier_plugins as $plugin_name => $dummy) {
-                    if (isset($this->template->required_plugins['compiled'][$plugin_name]['modifier'])) {
-                        $this->template->required_plugins['nocache'][$plugin_name]['modifier'] = $this->template->required_plugins['compiled'][$plugin_name]['modifier'];
-                    }
-                }
-            } else {
-                $_output = $content;
-            }
-        } else {
-            $_output = $content;
-        }
-        $this->modifier_plugins = array();
-        $this->suppressNocacheProcessing = false;
-        $this->tag_nocache = false;
-
-        return $_output;
-    }
-
-    /**
-     * Generate nocache code string
-     *
-     * @param string $code PHP code
-     *
-     * @return string
-     */
-    public function makeNocacheCode($code)
-    {
-        return "echo '/*%%SmartyNocache:{$this->nocache_hash}%%*/<?php " . str_replace("^#^", "'", addcslashes($code, '\'\\')) . "?>/*/%%SmartyNocache:{$this->nocache_hash}%%*/';\n";
-    }
-
-    /**
-     *  push current file and line offset on stack for tracing {block} source lines
-     *
-     * @param string $file  new filename
-     * @param string $uid   uid of file
-     * @param int    $line  line offset to source
-     * @param bool   $debug false debug end_compile shall not be called
-     */
-    public function pushTrace($file, $uid, $line, $debug = true)
-    {
-        if ($this->smarty->debugging && $debug) {
-            Smarty_Internal_Debug::end_compile($this->template);
-        }
-        array_push($this->trace_stack, array($this->smarty->_current_file, $this->trace_filepath, $this->trace_uid, $this->trace_line_offset));
-        $this->trace_filepath = $this->smarty->_current_file = $file;
-        $this->trace_uid = $uid;
-        $this->trace_line_offset = $line;
-        if ($this->smarty->debugging) {
-            Smarty_Internal_Debug::start_compile($this->template);
-        }
-    }
-
-    /**
-     *  restore file and line offset
-     */
-    public function popTrace()
-    {
-        if ($this->smarty->debugging) {
-            Smarty_Internal_Debug::end_compile($this->template);
-        }
-        $r = array_pop($this->trace_stack);
-        $this->smarty->_current_file = $r[0];
-        $this->trace_filepath = $r[1];
-        $this->trace_uid = $r[2];
-        $this->trace_line_offset = $r[3];
-        if ($this->smarty->debugging) {
-            Smarty_Internal_Debug::start_compile($this->template);
-        }
-    }
-
-    /**
-     * display compiler error messages without dying
-     * If parameter $args is empty it is a parser detected syntax error.
-     * In this case the parser is called to obtain information about expected tokens.
-     * If parameter $args contains a string this is used as error message
-     *
-     * @param  string $args individual error message or null
-     * @param  string $line line-number
-     *
-     * @throws SmartyCompilerException when an unexpected token is found
-     */
-    public function trigger_template_error($args = null, $line = null)
-    {
-        // get template source line which has error
-        if (!isset($line)) {
-            $line = $this->lex->line;
-        }
-        //        $line += $this->trace_line_offset;
-        $match = preg_split("/\n/", $this->lex->data);
-        $error_text = 'Syntax error in template "' . (empty($this->trace_filepath) ? $this->template->source->filepath : $this->trace_filepath) . '"  on line ' . ($line + $this->trace_line_offset) . ' "' . trim(preg_replace('![\t\r\n]+!', ' ', $match[$line - 1])) . '" ';
-        if (isset($args)) {
-            // individual error message
-            $error_text .= $args;
-        } else {
-            $expect = array();
-            // expected token from parser
-            $error_text .= ' - Unexpected "' . $this->lex->value . '"';
-            if (count($this->parser->yy_get_expected_tokens($this->parser->yymajor)) <= 4) {
-                foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) {
-                    $exp_token = $this->parser->yyTokenName[$token];
-                    if (isset($this->lex->smarty_token_names[$exp_token])) {
-                        // token type from lexer
-                        $expect[] = '"' . $this->lex->smarty_token_names[$exp_token] . '"';
-                    } else {
-                        // otherwise internal token name
-                        $expect[] = $this->parser->yyTokenName[$token];
-                    }
-                }
-                $error_text .= ', expected one of: ' . implode(' , ', $expect);
-            }
-        }
-        $e = new SmartyCompilerException($error_text);
-        $e->line = $line;
-        $e->source = trim(preg_replace('![\t\r\n]+!', ' ', $match[$line - 1]));
-        $e->desc = $args;
-        $e->template = $this->template->source->filepath;
-        throw $e;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_templatelexer.php b/www/smarty-3.1.27/sysplugins/smarty_internal_templatelexer.php
deleted file mode 100644
index abf81d08..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_templatelexer.php
+++ /dev/null
@@ -1,1368 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Templatelexer
- * This is the lexer to break the template source into tokens
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty_Internal_Templatelexer
- * This is the template file lexer.
- * It is generated from the smarty_internal_templatelexer.plex file
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-class Smarty_Internal_Templatelexer
-{
-    /**
-     * Source
-     *
-     * @var string
-     */
-    public $data;
-
-    /**
-     * byte counter
-     *
-     * @var int
-     */
-    public $counter;
-
-    /**
-     * token number
-     *
-     * @var int
-     */
-    public $token;
-
-    /**
-     * token value
-     *
-     * @var string
-     */
-    public $value;
-
-    /**
-     * current line
-     *
-     * @var int
-     */
-    public $line;
-
-    /**
-     * tag start line
-     *
-     * @var
-     */
-    public $taglineno;
-
-    /**
-     * php code type
-     *
-     * @var string
-     */
-    public $phpType = '';
-
-    /**
-     * escaped left delimiter
-     *
-     * @var string
-     */
-    public $ldel = '';
-
-    /**
-     * escaped left delimiter length
-     *
-     * @var int
-     */
-    public $ldel_length = 0;
-
-    /**
-     * escaped right delimiter
-     *
-     * @var string
-     */
-    public $rdel = '';
-
-    /**
-     * escaped right delimiter length
-     *
-     * @var int
-     */
-    public $rdel_length = 0;
-
-    /**
-     * state number
-     *
-     * @var int
-     */
-    public $state = 1;
-
-    /**
-     * Smarty object
-     *
-     * @var Smarty
-     */
-    public $smarty = null;
-
-    /**
-     * compiler object
-     *
-     * @var Smarty_Internal_TemplateCompilerBase
-     */
-    public $compiler = null;
-
-    /**
-     * literal tag nesting level
-     *
-     * @var int
-     */
-    private $literal_cnt = 0;
-
-    /**
-     * PHP start tag string
-     *
-     * @var string
-     */
-
-    /**
-     * trace file
-     *
-     * @var resource
-     */
-    public $yyTraceFILE;
-
-    /**
-     * trace prompt
-     *
-     * @var string
-     */
-    public $yyTracePrompt;
-
-    /**
-     * XML flag true while processing xml
-     *
-     * @var bool
-     */
-    public $is_xml = false;
-
-    /**
-     * state names
-     *
-     * @var array
-     */
-    public $state_name = array(1 => 'TEXT', 2 => 'TAG', 3 => 'TAGBODY', 4 => 'LITERAL', 5 => 'DOUBLEQUOTEDSTRING',
-                               6 => 'CHILDBODY', 7 => 'CHILDBLOCK', 8 => 'CHILDLITERAL');
-
-    /**
-     * storage for assembled token patterns
-     *
-     * @var string
-     */
-    private $yy_global_pattern1 = null;
-
-    private $yy_global_pattern2 = null;
-
-    private $yy_global_pattern3 = null;
-
-    private $yy_global_pattern4 = null;
-
-    private $yy_global_pattern5 = null;
-
-    private $yy_global_pattern6 = null;
-
-    private $yy_global_pattern7 = null;
-
-    private $yy_global_pattern8 = null;
-
-    /**
-     * token names
-     *
-     * @var array
-     */
-    public $smarty_token_names = array(        // Text for parser error messages
-        'NOT'         => '(!,not)', 'OPENP' => '(', 'CLOSEP' => ')', 'OPENB' => '[', 'CLOSEB' => ']', 'PTR' => '->',
-        'APTR'        => '=>', 'EQUAL' => '=', 'NUMBER' => 'number', 'UNIMATH' => '+" , "-', 'MATH' => '*" , "/" , "%',
-        'INCDEC'      => '++" , "--', 'SPACE' => ' ', 'DOLLAR' => '$', 'SEMICOLON' => ';', 'COLON' => ':',
-        'DOUBLECOLON' => '::', 'AT' => '@', 'HATCH' => '#', 'QUOTE' => '"', 'BACKTICK' => '`', 'VERT' => '"|" modifier',
-        'DOT'         => '.', 'COMMA' => '","', 'QMARK' => '"?"', 'ID' => 'id, name', 'TEXT' => 'text',
-        'LDELSLASH'   => '{/..} closing tag', 'LDEL' => '{...} Smarty tag', 'COMMENT' => 'comment', 'AS' => 'as',
-        'TO'          => 'to', 'PHP' => '"<?php", "<%", "{php}" tag', 'LOGOP' => '"<", "==" ... logical operator',
-        'TLOGOP'      => '"lt", "eq" ... logical operator; "is div by" ... if condition',
-        'SCOND'       => '"is even" ... if condition',);
-
-    /**
-     * constructor
-     *
-     * @param   string                             $data template source
-     * @param Smarty_Internal_TemplateCompilerBase $compiler
-     */
-    function __construct($data, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        $this->data = $data;
-        $this->counter = 0;
-        if (preg_match('~^\xEF\xBB\xBF~i', $this->data, $match)) {
-            $this->counter += strlen($match[0]);
-        }
-        $this->line = 1;
-        $this->smarty = $compiler->smarty;
-        $this->compiler = $compiler;
-        $this->ldel = preg_quote($this->smarty->left_delimiter, '~');
-        $this->ldel_length = strlen($this->smarty->left_delimiter);
-        $this->rdel = preg_quote($this->smarty->right_delimiter, '~');
-        $this->rdel_length = strlen($this->smarty->right_delimiter);
-        $this->smarty_token_names['LDEL'] = $this->smarty->left_delimiter;
-        $this->smarty_token_names['RDEL'] = $this->smarty->right_delimiter;
-    }
-
-    public function PrintTrace()
-    {
-        $this->yyTraceFILE = fopen('php://output', 'w');
-        $this->yyTracePrompt = '<br>';
-    }
-
-    /*
-     * Check if this tag is autoliteral
-     */
-    public function isAutoLiteral()
-    {
-        return $this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false;
-    }
-
-    private $_yy_state = 1;
-
-    private $_yy_stack = array();
-
-    public function yylex()
-    {
-        return $this->{'yylex' . $this->_yy_state}();
-    }
-
-    public function yypushstate($state)
-    {
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
-        }
-        array_push($this->_yy_stack, $this->_yy_state);
-        $this->_yy_state = $state;
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
-        }
-    }
-
-    public function yypopstate()
-    {
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
-        }
-        $this->_yy_state = array_pop($this->_yy_stack);
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
-        }
-    }
-
-    public function yybegin($state)
-    {
-        $this->_yy_state = $state;
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
-        }
-    }
-
-    public function yylex1()
-    {
-        if (!isset($this->yy_global_pattern1)) {
-            $this->yy_global_pattern1 = "/\G([{][}])|\G(" . $this->ldel . "[*])|\G((<[?]((php\\s+|=)|\\s+))|(<[%])|(<[?]xml\\s+)|(<script\\s+language\\s*=\\s*[\"']?\\s*php\\s*[\"']?\\s*>)|([?][>])|([%][>])|(" . $this->ldel . "\\s*php(.*?)" . $this->rdel . ")|(" . $this->ldel . "\\s*[\/]php" . $this->rdel . "))|\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*)|\G(\\s*" . $this->rdel . ")|\G([\S\s])/isS";
-        }
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-
-        do {
-            if (preg_match($this->yy_global_pattern1, $this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[0]) < 200) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                } else {
-                    $yymatches = array_filter($yymatches, 'strlen');
-                }
-                if (empty($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state TEXT');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r1_' . $this->token}();
-                if ($r === null) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
-            }
-            break;
-        } while (true);
-    } // end function
-
-    const TEXT = 1;
-
-    function yy_r1_1()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-
-    function yy_r1_2()
-    {
-
-        preg_match("~[*]{$this->rdel}~", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
-        if (isset($match[0][1])) {
-            $to = $match[0][1] + strlen($match[0][0]);
-        } else {
-            $this->compiler->trigger_template_error("missing or misspelled comment closing tag '*{$this->smarty->right_delimiter}'");
-        }
-        $this->value = substr($this->data, $this->counter, $to - $this->counter);
-        return false;
-    }
-
-    function yy_r1_3()
-    {
-
-        $obj = new Smarty_Internal_Compile_Private_Php();
-        $obj->parsePhp($this);
-    }
-
-    function yy_r1_15()
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
-            $this->yypushstate(self::LITERAL);
-        }
-    }
-
-    function yy_r1_16()
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->yypushstate(self::TAG);
-            return true;
-        }
-    }
-
-    function yy_r1_17()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-
-    function yy_r1_18()
-    {
-
-        $to = strlen($this->data);
-        preg_match("~($this->ldel)|([<]script\s+language\s*=\s*[\"\']?\s*php\s*[\"\']?\s*[>])|([<][?])|([<][%])|([?][>])|([%][>])~i", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
-        if (isset($match[0][1])) {
-            $to = $match[0][1];
-        }
-        $this->value = substr($this->data, $this->counter, $to - $this->counter);
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-
-    public function yylex2()
-    {
-        if (!isset($this->yy_global_pattern2)) {
-            $this->yy_global_pattern2 = "/\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" . $this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*setfilter\\s+)|\G(" . $this->ldel . "\\s*[0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*[\/](?:(?!block)[0-9]*[a-zA-Z_]\\w*)\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*[$][0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*[\/])|\G(" . $this->ldel . "\\s*)/isS";
-        }
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-
-        do {
-            if (preg_match($this->yy_global_pattern2, $this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[0]) < 200) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                } else {
-                    $yymatches = array_filter($yymatches, 'strlen');
-                }
-                if (empty($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state TAG');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r2_' . $this->token}();
-                if ($r === null) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
-            }
-            break;
-        } while (true);
-    } // end function
-
-    const TAG = 2;
-
-    function yy_r2_1()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
-        $this->yybegin(self::TAGBODY);
-        $this->taglineno = $this->line;
-    }
-
-    function yy_r2_3()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
-        $this->yybegin(self::TAGBODY);
-        $this->taglineno = $this->line;
-    }
-
-    function yy_r2_4()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
-        $this->yybegin(self::TAGBODY);
-        $this->taglineno = $this->line;
-    }
-
-    function yy_r2_5()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER;
-        $this->yybegin(self::TAGBODY);
-        $this->taglineno = $this->line;
-    }
-
-    function yy_r2_6()
-    {
-
-        $this->yypopstate();
-        $this->token = Smarty_Internal_Templateparser::TP_SIMPLETAG;
-        $this->taglineno = $this->line;
-    }
-
-    function yy_r2_8()
-    {
-
-        $this->yypopstate();
-        $this->token = Smarty_Internal_Templateparser::TP_CLOSETAG;
-        $this->taglineno = $this->line;
-    }
-
-    function yy_r2_9()
-    {
-
-        if ($this->_yy_stack[count($this->_yy_stack) - 1] == self::TEXT) {
-            $this->yypopstate();
-            $this->token = Smarty_Internal_Templateparser::TP_SIMPLEOUTPUT;
-            $this->taglineno = $this->line;
-        } else {
-            $this->value = $this->smarty->left_delimiter;
-            $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-            $this->yybegin(self::TAGBODY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r2_11()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-        $this->yybegin(self::TAGBODY);
-        $this->taglineno = $this->line;
-    }
-
-    function yy_r2_12()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-        $this->yybegin(self::TAGBODY);
-        $this->taglineno = $this->line;
-    }
-
-    public function yylex3()
-    {
-        if (!isset($this->yy_global_pattern3)) {
-            $this->yy_global_pattern3 = "/\G(\\s*" . $this->rdel . ")|\G([\"])|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G([$]smarty\\.block\\.(child|parent))|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*(([!=][=]{1,2})|([<][=>]?)|([>][=]?)|[&|]{2})\\s*)|\G(\\s+(eq|ne|neq|gt|ge|gte|lt|le|lte|mod|and|or|xor|(is\\s+(not\\s+)?(odd|even|div)\\s+by))\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even))|\G(([!]\\s*)|(not\\s+))|\G([(](int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)[)]\\s*)|\G(\\s*[(]\\s*)|\G(\\s*[)])|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*[-][>]\\s*)|\G(\\s*[=][>]\\s*)|\G(\\s*[=]\\s*)|\G(([+]|[-]){2})|\G(\\s*([+]|[-])\\s*)|\G(\\s*([*]{1,2}|[%\/^&]|[<>]{2})\\s*)|\G([@])|\G([#])|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*[=]\\s*)|\G(([0-9]*[a-zA-Z_]\\w*)?(\\\\[0-9]*[a-zA-Z_]\\w*)+)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G([`])|\G([|])|\G([.])|\G(\\s*[,]\\s*)|\G(\\s*[;]\\s*)|\G([:]{2})|\G(\\s*[:]\\s*)|\G(\\s*[?]\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+)|\G(" . $this->ldel . "\\s*)|\G([\S\s])/isS";
-        }
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-
-        do {
-            if (preg_match($this->yy_global_pattern3, $this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[0]) < 200) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                } else {
-                    $yymatches = array_filter($yymatches, 'strlen');
-                }
-                if (empty($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state TAGBODY     ');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r3_' . $this->token}();
-                if ($r === null) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
-            }
-            break;
-        } while (true);
-    } // end function
-
-    const TAGBODY = 3;
-
-    function yy_r3_1()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_RDEL;
-        $this->yypopstate();
-    }
-
-    function yy_r3_2()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
-        $this->yypushstate(self::DOUBLEQUOTEDSTRING);
-    }
-
-    function yy_r3_3()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
-    }
-
-    function yy_r3_4()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT;
-        $this->taglineno = $this->line;
-    }
-
-    function yy_r3_6()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
-    }
-
-    function yy_r3_7()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
-    }
-
-    function yy_r3_8()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_ISIN;
-    }
-
-    function yy_r3_9()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_AS;
-    }
-
-    function yy_r3_10()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_TO;
-    }
-
-    function yy_r3_11()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_STEP;
-    }
-
-    function yy_r3_12()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
-    }
-
-    function yy_r3_13()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_LOGOP;
-    }
-
-    function yy_r3_18()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_TLOGOP;
-    }
-
-    function yy_r3_23()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_SINGLECOND;
-    }
-
-    function yy_r3_26()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_NOT;
-    }
-
-    function yy_r3_29()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
-    }
-
-    function yy_r3_33()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_OPENP;
-    }
-
-    function yy_r3_34()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
-    }
-
-    function yy_r3_35()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_OPENB;
-    }
-
-    function yy_r3_36()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
-    }
-
-    function yy_r3_37()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_PTR;
-    }
-
-    function yy_r3_38()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_APTR;
-    }
-
-    function yy_r3_39()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_EQUAL;
-    }
-
-    function yy_r3_40()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_INCDEC;
-    }
-
-    function yy_r3_42()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
-    }
-
-    function yy_r3_44()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_MATH;
-    }
-
-    function yy_r3_46()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_AT;
-    }
-
-    function yy_r3_47()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_HATCH;
-    }
-
-    function yy_r3_48()
-    {
-
-        // resolve conflicts with shorttag and right_delimiter starting with '='
-        if (substr($this->data, $this->counter + strlen($this->value) - 1, $this->rdel_length) == $this->smarty->right_delimiter) {
-            preg_match("~\s+~", $this->value, $match);
-            $this->value = $match[0];
-            $this->token = Smarty_Internal_Templateparser::TP_SPACE;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_ATTR;
-        }
-    }
-
-    function yy_r3_49()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_NAMESPACE;
-    }
-
-    function yy_r3_52()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_ID;
-    }
-
-    function yy_r3_53()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_INTEGER;
-    }
-
-    function yy_r3_54()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
-        $this->yypopstate();
-    }
-
-    function yy_r3_55()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_VERT;
-    }
-
-    function yy_r3_56()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_DOT;
-    }
-
-    function yy_r3_57()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_COMMA;
-    }
-
-    function yy_r3_58()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
-    }
-
-    function yy_r3_59()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
-    }
-
-    function yy_r3_60()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_COLON;
-    }
-
-    function yy_r3_61()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_QMARK;
-    }
-
-    function yy_r3_62()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_HEX;
-    }
-
-    function yy_r3_63()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_SPACE;
-    }
-
-    function yy_r3_64()
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->yypushstate(self::TAG);
-            return true;
-        }
-    }
-
-    function yy_r3_65()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-
-    public function yylex4()
-    {
-        if (!isset($this->yy_global_pattern4)) {
-            $this->yy_global_pattern4 = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*[\/]literal\\s*" . $this->rdel . ")|\G([\S\s])/isS";
-        }
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-
-        do {
-            if (preg_match($this->yy_global_pattern4, $this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[0]) < 200) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                } else {
-                    $yymatches = array_filter($yymatches, 'strlen');
-                }
-                if (empty($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state LITERAL');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r4_' . $this->token}();
-                if ($r === null) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
-            }
-            break;
-        } while (true);
-    } // end function
-
-    const LITERAL = 4;
-
-    function yy_r4_1()
-    {
-
-        $this->literal_cnt ++;
-        $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
-    }
-
-    function yy_r4_2()
-    {
-
-        if ($this->literal_cnt) {
-            $this->literal_cnt --;
-            $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
-            $this->yypopstate();
-        }
-    }
-
-    function yy_r4_3()
-    {
-
-        $to = strlen($this->data);
-        preg_match("~{$this->ldel}[/]?literal{$this->rdel}~i", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
-        if (isset($match[0][1])) {
-            $to = $match[0][1];
-        } else {
-            $this->compiler->trigger_template_error("missing or misspelled literal closing tag");
-        }
-        $this->value = substr($this->data, $this->counter, $to - $this->counter);
-        $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
-    }
-
-    public function yylex5()
-    {
-        if (!isset($this->yy_global_pattern5)) {
-            $this->yy_global_pattern5 = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*[\/]literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*[\/])|\G(" . $this->ldel . "\\s*[0-9]*[a-zA-Z_]\\w*)|\G(" . $this->ldel . "\\s*)|\G([\"])|\G([`][$])|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(" . $this->ldel . "|\\$|`\\$|\")))|\G([\S\s])/isS";
-        }
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-
-        do {
-            if (preg_match($this->yy_global_pattern5, $this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[0]) < 200) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                } else {
-                    $yymatches = array_filter($yymatches, 'strlen');
-                }
-                if (empty($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state DOUBLEQUOTEDSTRING');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r5_' . $this->token}();
-                if ($r === null) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
-            }
-            break;
-        } while (true);
-    } // end function
-
-    const DOUBLEQUOTEDSTRING = 5;
-
-    function yy_r5_1()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-
-    function yy_r5_2()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-
-    function yy_r5_3()
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->yypushstate(self::TAG);
-            return true;
-        }
-    }
-
-    function yy_r5_4()
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->yypushstate(self::TAG);
-            return true;
-        }
-    }
-
-    function yy_r5_5()
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-            $this->taglineno = $this->line;
-            $this->yypushstate(self::TAGBODY);
-        }
-    }
-
-    function yy_r5_6()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
-        $this->yypopstate();
-    }
-
-    function yy_r5_7()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
-        $this->value = substr($this->value, 0, - 1);
-        $this->yypushstate(self::TAGBODY);
-        $this->taglineno = $this->line;
-    }
-
-    function yy_r5_8()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
-    }
-
-    function yy_r5_9()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-
-    function yy_r5_10()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-
-    function yy_r5_14()
-    {
-
-        $to = strlen($this->data);
-        $this->value = substr($this->data, $this->counter, $to - $this->counter);
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-
-    public function yylex6()
-    {
-        if (!isset($this->yy_global_pattern6)) {
-            $this->yy_global_pattern6 = "/\G(" . $this->ldel . "\\s*strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*[\/]strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*block)|\G([\S\s])/isS";
-        }
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-
-        do {
-            if (preg_match($this->yy_global_pattern6, $this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[0]) < 200) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                } else {
-                    $yymatches = array_filter($yymatches, 'strlen');
-                }
-                if (empty($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state CHILDBODY');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r6_' . $this->token}();
-                if ($r === null) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
-            }
-            break;
-        } while (true);
-    } // end function
-
-    const CHILDBODY = 6;
-
-    function yy_r6_1()
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            return false;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_STRIPON;
-        }
-    }
-
-    function yy_r6_2()
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            return false;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_STRIPOFF;
-        }
-    }
-
-    function yy_r6_3()
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            return false;
-        } else {
-            $this->yypopstate();
-            return true;
-        }
-    }
-
-    function yy_r6_4()
-    {
-
-        $to = strlen($this->data);
-        preg_match("~" . $this->ldel . "\s*(([/])?strip\s*" . $this->rdel . "|block\s+)~i", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
-        if (isset($match[0][1])) {
-            $to = $match[0][1];
-        }
-        $this->value = substr($this->data, $this->counter, $to - $this->counter);
-        return false;
-    }
-
-    public function yylex7()
-    {
-        if (!isset($this->yy_global_pattern7)) {
-            $this->yy_global_pattern7 = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*block)|\G(" . $this->ldel . "\\s*[\/]block)|\G(" . $this->ldel . "\\s*[$]smarty\\.block\\.(child|parent))|\G([\S\s])/isS";
-        }
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-
-        do {
-            if (preg_match($this->yy_global_pattern7, $this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[0]) < 200) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                } else {
-                    $yymatches = array_filter($yymatches, 'strlen');
-                }
-                if (empty($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state CHILDBLOCK');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r7_' . $this->token}();
-                if ($r === null) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
-            }
-            break;
-        } while (true);
-    } // end function
-
-    const CHILDBLOCK = 7;
-
-    function yy_r7_1()
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
-            $this->yypushstate(self::CHILDLITERAL);
-        }
-    }
-
-    function yy_r7_2()
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
-        } else {
-            $this->yypopstate();
-            return true;
-        }
-    }
-
-    function yy_r7_3()
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
-        } else {
-            $this->yypopstate();
-            return true;
-        }
-    }
-
-    function yy_r7_4()
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
-        } else {
-            $this->yypopstate();
-            return true;
-        }
-    }
-
-    function yy_r7_6()
-    {
-
-        $to = strlen($this->data);
-        preg_match("~" . $this->ldel . "\s*(literal\s*" . $this->rdel . "|([/])?block(\s|" . $this->rdel . ")|[\$]smarty\.block\.(child|parent))~i", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
-        if (isset($match[0][1])) {
-            $to = $match[0][1];
-        }
-        $this->value = substr($this->data, $this->counter, $to - $this->counter);
-        $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
-    }
-
-    public function yylex8()
-    {
-        if (!isset($this->yy_global_pattern8)) {
-            $this->yy_global_pattern8 = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*[\/]literal\\s*" . $this->rdel . ")|\G([\S\s])/isS";
-        }
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-
-        do {
-            if (preg_match($this->yy_global_pattern8, $this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[0]) < 200) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                } else {
-                    $yymatches = array_filter($yymatches, 'strlen');
-                }
-                if (empty($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state CHILDLITERAL');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r8_' . $this->token}();
-                if ($r === null) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
-            }
-            break;
-        } while (true);
-    } // end function
-
-    const CHILDLITERAL = 8;
-
-    function yy_r8_1()
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
-            $this->yypushstate(self::CHILDLITERAL);
-        }
-    }
-
-    function yy_r8_2()
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
-            $this->yypopstate();
-        }
-    }
-
-    function yy_r8_3()
-    {
-
-        $to = strlen($this->data);
-        preg_match("~{$this->ldel}[/]?literal\s*{$this->rdel}~i", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
-        if (isset($match[0][1])) {
-            $to = $match[0][1];
-        } else {
-            $this->compiler->trigger_template_error("missing or misspelled literal closing tag");
-        }
-        $this->value = substr($this->data, $this->counter, $to - $this->counter);
-        $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
-    }
-
-}
-
-     
\ No newline at end of file
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_templateparser.php b/www/smarty-3.1.27/sysplugins/smarty_internal_templateparser.php
deleted file mode 100644
index 871f7c0a..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_templateparser.php
+++ /dev/null
@@ -1,2409 +0,0 @@
-<?php
-
-class TP_yyToken implements ArrayAccess
-{
-    public $string = '';
-
-    public $metadata = array();
-
-    public function __construct($s, $m = array())
-    {
-        if ($s instanceof TP_yyToken) {
-            $this->string = $s->string;
-            $this->metadata = $s->metadata;
-        } else {
-            $this->string = (string) $s;
-            if ($m instanceof TP_yyToken) {
-                $this->metadata = $m->metadata;
-            } elseif (is_array($m)) {
-                $this->metadata = $m;
-            }
-        }
-    }
-
-    public function __toString()
-    {
-        return $this->string;
-    }
-
-    public function offsetExists($offset)
-    {
-        return isset($this->metadata[$offset]);
-    }
-
-    public function offsetGet($offset)
-    {
-        return $this->metadata[$offset];
-    }
-
-    public function offsetSet($offset, $value)
-    {
-        if ($offset === null) {
-            if (isset($value[0])) {
-                $x = ($value instanceof TP_yyToken) ? $value->metadata : $value;
-                $this->metadata = array_merge($this->metadata, $x);
-
-                return;
-            }
-            $offset = count($this->metadata);
-        }
-        if ($value === null) {
-            return;
-        }
-        if ($value instanceof TP_yyToken) {
-            if ($value->metadata) {
-                $this->metadata[$offset] = $value->metadata;
-            }
-        } elseif ($value) {
-            $this->metadata[$offset] = $value;
-        }
-    }
-
-    public function offsetUnset($offset)
-    {
-        unset($this->metadata[$offset]);
-    }
-}
-
-class TP_yyStackEntry
-{
-    public $stateno;       /* The state-number */
-    public $major;         /* The major token value.  This is the code
-                     ** number for the token at this stack level */
-    public $minor; /* The user-supplied minor token value.  This
-                     ** is the value of the token  */
-}
-
-;
-
-#line 13 "../smarty/lexer/smarty_internal_templateparser.y"
-
-/**
- * Smarty Internal Plugin Templateparser
- *
- * This is the template parser.
- * It is generated from the smarty_internal_templateparser.y file
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-class Smarty_Internal_Templateparser
-{
-    #line 26 "../smarty/lexer/smarty_internal_templateparser.y"
-
-    const Err1 = "Security error: Call to private object member not allowed";
-
-    const Err2 = "Security error: Call to dynamic object member not allowed";
-
-    const Err3 = "PHP in template not allowed. Use SmartyBC to enable it";
-
-    /**
-     * result status
-     *
-     * @var bool
-     */
-    public $successful = true;
-
-    /**
-     * return value
-     *
-     * @var mixed
-     */
-    public $retvalue = 0;
-
-    /**
-     * counter for prefix code
-     *
-     * @var int
-     */
-    public static $prefix_number = 0;
-
-    /**
-     * @var
-     */
-    public $yymajor;
-
-    /**
-     * last index of array variable
-     *
-     * @var mixed
-     */
-    public $last_index;
-
-    /**
-     * last variable name
-     *
-     * @var string
-     */
-    public $last_variable;
-
-    /**
-     * root parse tree buffer
-     *
-     * @var Smarty_Internal_ParseTree
-     */
-    public $root_buffer;
-
-    /**
-     * current parse tree object
-     *
-     * @var Smarty_Internal_ParseTree
-     */
-    public $current_buffer;
-
-    /**
-     * lexer object
-     *
-     * @var Smarty_Internal_Templatelexer
-     */
-    private $lex;
-
-    /**
-     * internal error flag
-     *
-     * @var bool
-     */
-    private $internalError = false;
-
-    /**
-     * {strip} status
-     *
-     * @var bool
-     */
-    public $strip = false;
-
-    /**
-     * compiler object
-     *
-     * @var Smarty_Internal_TemplateCompilerBase
-     */
-    public $compiler = null;
-
-    /**
-     * smarty object
-     *
-     * @var Smarty
-     */
-    public $smarty = null;
-
-    /**
-     * template object
-     *
-     * @var Smarty_Internal_Template
-     */
-    public $template = null;
-
-    /**
-     * block nesting level
-     *
-     * @var int
-     */
-    public $block_nesting_level = 0;
-
-    /**
-     * security object
-     *
-     * @var Smarty_Security
-     */
-    private $security = null;
-
-    /**
-     * constructor
-     *
-     * @param Smarty_Internal_Templatelexer        $lex
-     * @param Smarty_Internal_TemplateCompilerBase $compiler
-     */
-    function __construct(Smarty_Internal_Templatelexer $lex, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        $this->lex = $lex;
-        $this->compiler = $compiler;
-        $this->template = $this->compiler->template;
-        $this->smarty = $this->template->smarty;
-        $this->security = isset($this->smarty->security_policy) ? $this->smarty->security_policy : false;
-        $this->current_buffer = $this->root_buffer = new Smarty_Internal_ParseTree_Template($this);
-    }
-
-    /**
-     * insert PHP code in current buffer
-     *
-     * @param string $code
-     */
-    public function insertPhpCode($code)
-    {
-        $this->current_buffer->append_subtree(new Smarty_Internal_ParseTree_Tag($this, $code));
-    }
-
-    /**
-     *  merge PHP code with prefix code and return parse tree tag object
-     *
-     * @param string $code
-     *
-     * @return Smarty_Internal_ParseTree_Tag
-     */
-    public function mergePrefixCode($code)
-    {
-        $tmp = '';
-        foreach ($this->compiler->prefix_code as $preCode) {
-            $tmp = empty($tmp) ? $preCode : $this->compiler->appendCode($tmp, $preCode);
-        }
-        $this->compiler->prefix_code = array();
-        $tmp = empty($tmp) ? $code : $this->compiler->appendCode($tmp, $code);
-        return new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp, true));
-    }
-
-    const TP_VERT = 1;
-
-    const TP_COLON = 2;
-
-    const TP_PHP = 3;
-
-    const TP_NOCACHE = 4;
-
-    const TP_TEXT = 5;
-
-    const TP_STRIPON = 6;
-
-    const TP_STRIPOFF = 7;
-
-    const TP_BLOCKSOURCE = 8;
-
-    const TP_LITERALSTART = 9;
-
-    const TP_LITERALEND = 10;
-
-    const TP_LITERAL = 11;
-
-    const TP_RDEL = 12;
-
-    const TP_SIMPLEOUTPUT = 13;
-
-    const TP_LDEL = 14;
-
-    const TP_DOLLARID = 15;
-
-    const TP_EQUAL = 16;
-
-    const TP_SIMPLETAG = 17;
-
-    const TP_ID = 18;
-
-    const TP_PTR = 19;
-
-    const TP_LDELIF = 20;
-
-    const TP_LDELFOR = 21;
-
-    const TP_SEMICOLON = 22;
-
-    const TP_INCDEC = 23;
-
-    const TP_TO = 24;
-
-    const TP_STEP = 25;
-
-    const TP_LDELFOREACH = 26;
-
-    const TP_SPACE = 27;
-
-    const TP_AS = 28;
-
-    const TP_APTR = 29;
-
-    const TP_LDELSETFILTER = 30;
-
-    const TP_SMARTYBLOCKCHILDPARENT = 31;
-
-    const TP_CLOSETAG = 32;
-
-    const TP_LDELSLASH = 33;
-
-    const TP_ATTR = 34;
-
-    const TP_INTEGER = 35;
-
-    const TP_COMMA = 36;
-
-    const TP_OPENP = 37;
-
-    const TP_CLOSEP = 38;
-
-    const TP_MATH = 39;
-
-    const TP_UNIMATH = 40;
-
-    const TP_ISIN = 41;
-
-    const TP_INSTANCEOF = 42;
-
-    const TP_QMARK = 43;
-
-    const TP_NOT = 44;
-
-    const TP_TYPECAST = 45;
-
-    const TP_HEX = 46;
-
-    const TP_DOT = 47;
-
-    const TP_SINGLEQUOTESTRING = 48;
-
-    const TP_DOUBLECOLON = 49;
-
-    const TP_NAMESPACE = 50;
-
-    const TP_AT = 51;
-
-    const TP_HATCH = 52;
-
-    const TP_OPENB = 53;
-
-    const TP_CLOSEB = 54;
-
-    const TP_DOLLAR = 55;
-
-    const TP_LOGOP = 56;
-
-    const TP_TLOGOP = 57;
-
-    const TP_SINGLECOND = 58;
-
-    const TP_QUOTE = 59;
-
-    const TP_BACKTICK = 60;
-
-    const YY_NO_ACTION = 525;
-
-    const YY_ACCEPT_ACTION = 524;
-
-    const YY_ERROR_ACTION = 523;
-
-    const YY_SZ_ACTTAB = 1908;
-
-    static public $yy_action = array(287, 9, 129, 251, 273, 194, 441, 2, 82, 280, 281, 282, 216, 110, 353, 223, 212,
-        229, 441, 258, 217, 12, 199, 240, 32, 257, 257, 39, 17, 12, 25, 43, 42, 263, 224, 233, 17, 206, 441, 80, 1, 244,
-        311, 311, 172, 172, 52, 287, 9, 128, 441, 273, 65, 178, 2, 82, 268, 14, 184, 298, 110, 262, 13, 319, 229, 297,
-        258, 217, 31, 225, 12, 32, 170, 257, 39, 239, 189, 17, 43, 42, 263, 224, 292, 214, 206, 249, 80, 1, 113, 311,
-        164, 442, 172, 52, 287, 9, 132, 201, 273, 209, 260, 2, 82, 442, 14, 141, 256, 110, 262, 88, 303, 229, 261, 258,
-        217, 260, 225, 12, 32, 168, 36, 39, 241, 12, 17, 43, 42, 263, 224, 292, 17, 206, 189, 80, 1, 7, 311, 180, 257,
-        219, 52, 287, 9, 132, 134, 273, 193, 470, 2, 82, 10, 470, 156, 304, 110, 300, 89, 172, 229, 310, 258, 217, 260,
-        205, 223, 32, 257, 14, 39, 324, 12, 262, 43, 42, 263, 224, 292, 17, 206, 189, 80, 1, 470, 311, 470, 172, 470,
-        52, 287, 9, 131, 201, 273, 209, 257, 2, 82, 83, 307, 232, 201, 110, 399, 454, 230, 229, 237, 258, 217, 454, 225,
-        355, 32, 133, 201, 39, 215, 399, 144, 43, 42, 263, 224, 292, 399, 206, 12, 80, 1, 326, 311, 157, 236, 17, 52,
-        287, 9, 133, 201, 273, 209, 260, 2, 82, 214, 201, 235, 202, 110, 113, 80, 99, 229, 311, 258, 217, 396, 225, 187,
-        19, 14, 323, 39, 18, 262, 28, 43, 42, 263, 224, 292, 396, 206, 12, 80, 1, 143, 311, 396, 134, 17, 52, 287, 9,
-        132, 10, 273, 209, 4, 2, 82, 313, 14, 146, 454, 110, 262, 181, 158, 229, 454, 258, 217, 260, 192, 12, 32, 20,
-        260, 39, 99, 441, 17, 43, 42, 263, 224, 292, 243, 206, 189, 80, 1, 441, 311, 187, 182, 298, 52, 287, 9, 130,
-        201, 273, 209, 14, 2, 82, 93, 262, 104, 24, 110, 399, 99, 169, 229, 154, 258, 217, 220, 225, 113, 5, 124, 260,
-        39, 135, 399, 100, 43, 42, 263, 224, 292, 399, 206, 261, 80, 1, 325, 311, 228, 112, 104, 52, 287, 9, 132, 92,
-        273, 191, 173, 2, 82, 174, 291, 285, 16, 110, 330, 312, 260, 229, 310, 258, 217, 311, 225, 223, 32, 259, 90, 39,
-        261, 6, 264, 43, 42, 263, 224, 292, 181, 206, 175, 80, 1, 116, 311, 171, 201, 21, 52, 287, 9, 132, 37, 273, 195,
-        260, 2, 82, 36, 296, 238, 189, 110, 189, 259, 201, 229, 261, 258, 217, 214, 225, 218, 32, 35, 113, 39, 36, 232,
-        299, 43, 42, 263, 224, 292, 15, 206, 183, 80, 1, 211, 311, 17, 91, 226, 52, 287, 9, 133, 177, 273, 209, 179, 2,
-        82, 318, 470, 99, 18, 110, 470, 454, 121, 229, 288, 258, 217, 289, 225, 316, 19, 145, 189, 39, 187, 189, 121,
-        43, 42, 263, 224, 292, 161, 206, 261, 80, 99, 104, 311, 454, 14, 454, 52, 470, 262, 454, 279, 278, 276, 277,
-        283, 284, 174, 159, 470, 261, 287, 9, 470, 454, 273, 311, 317, 2, 82, 176, 298, 223, 204, 110, 115, 68, 107,
-        229, 117, 258, 217, 100, 3, 201, 272, 329, 138, 29, 210, 271, 293, 454, 325, 454, 359, 470, 260, 454, 254, 317,
-        139, 275, 200, 306, 223, 204, 111, 119, 72, 107, 260, 201, 37, 242, 100, 255, 151, 272, 329, 213, 4, 210, 271,
-        293, 150, 325, 245, 167, 20, 152, 317, 81, 208, 149, 260, 223, 204, 260, 119, 60, 102, 186, 218, 185, 265, 100,
-        269, 22, 272, 329, 286, 270, 210, 271, 293, 317, 325, 248, 147, 148, 223, 204, 178, 119, 72, 107, 153, 232, 260,
-        274, 100, 13, 319, 272, 329, 261, 397, 210, 271, 293, 231, 325, 268, 136, 317, 189, 165, 106, 207, 223, 204,
-        397, 115, 68, 107, 84, 327, 85, 397, 100, 103, 441, 272, 329, 290, 86, 210, 271, 293, 87, 325, 299, 299, 441,
-        317, 299, 155, 299, 299, 223, 204, 305, 119, 50, 102, 299, 108, 299, 299, 100, 299, 299, 272, 329, 299, 299,
-        210, 271, 293, 317, 325, 299, 299, 299, 223, 204, 299, 119, 72, 107, 299, 299, 299, 299, 100, 27, 227, 272, 329,
-        160, 299, 210, 271, 293, 299, 325, 299, 299, 317, 299, 299, 299, 203, 223, 204, 299, 109, 46, 107, 299, 299,
-        299, 299, 100, 299, 299, 272, 329, 299, 308, 210, 271, 293, 299, 325, 299, 311, 287, 8, 309, 299, 273, 299, 317,
-        2, 82, 299, 299, 223, 204, 110, 119, 49, 107, 229, 299, 258, 217, 100, 299, 142, 272, 329, 299, 178, 210, 271,
-        293, 299, 325, 260, 317, 299, 13, 319, 299, 223, 204, 299, 119, 70, 107, 299, 294, 23, 299, 100, 189, 299, 272,
-        329, 299, 299, 210, 271, 293, 317, 325, 299, 299, 299, 223, 204, 299, 119, 77, 107, 299, 299, 299, 299, 100,
-        299, 299, 272, 329, 299, 308, 210, 271, 293, 299, 325, 299, 299, 287, 8, 309, 299, 273, 299, 317, 2, 82, 299,
-        299, 223, 204, 110, 119, 71, 107, 229, 299, 258, 217, 100, 299, 299, 272, 329, 299, 299, 210, 271, 293, 299,
-        325, 299, 317, 299, 299, 299, 299, 223, 204, 299, 119, 60, 107, 299, 295, 23, 299, 100, 299, 299, 272, 329, 299,
-        299, 210, 271, 293, 317, 325, 299, 140, 299, 223, 204, 178, 119, 73, 107, 299, 299, 260, 299, 100, 13, 319, 272,
-        329, 299, 299, 210, 271, 293, 299, 325, 317, 201, 299, 189, 299, 223, 204, 299, 119, 62, 107, 299, 41, 40, 38,
-        100, 299, 299, 272, 329, 299, 299, 210, 271, 293, 299, 325, 317, 163, 321, 322, 328, 223, 204, 299, 119, 63,
-        107, 299, 41, 40, 38, 100, 299, 299, 272, 329, 299, 299, 210, 271, 293, 299, 325, 317, 201, 321, 322, 328, 223,
-        204, 299, 97, 69, 107, 299, 299, 299, 299, 100, 299, 299, 272, 329, 299, 299, 210, 271, 293, 299, 325, 317, 299,
-        299, 299, 299, 223, 204, 299, 119, 75, 107, 222, 41, 40, 38, 100, 299, 299, 272, 329, 299, 299, 210, 271, 293,
-        299, 325, 317, 201, 321, 322, 328, 223, 204, 299, 119, 64, 107, 299, 247, 299, 299, 100, 299, 299, 272, 329,
-        299, 299, 210, 271, 293, 299, 325, 317, 201, 26, 299, 299, 223, 204, 299, 98, 74, 107, 299, 41, 40, 38, 100,
-        299, 299, 272, 329, 299, 299, 210, 271, 293, 299, 325, 317, 201, 321, 322, 328, 223, 198, 299, 105, 59, 107,
-        299, 41, 40, 38, 100, 299, 299, 272, 329, 299, 299, 210, 271, 293, 299, 325, 317, 299, 321, 322, 328, 223, 204,
-        299, 119, 45, 107, 246, 41, 40, 38, 100, 299, 299, 272, 329, 299, 299, 210, 271, 293, 299, 325, 317, 201, 321,
-        322, 328, 223, 94, 299, 79, 48, 101, 299, 252, 299, 299, 100, 299, 299, 272, 329, 299, 299, 210, 271, 293, 299,
-        325, 317, 299, 299, 299, 299, 223, 204, 299, 119, 56, 107, 299, 41, 40, 38, 100, 299, 299, 272, 329, 299, 299,
-        210, 271, 293, 299, 325, 317, 201, 321, 322, 328, 223, 204, 299, 119, 61, 107, 299, 190, 299, 299, 100, 299,
-        299, 272, 329, 299, 299, 210, 271, 293, 299, 325, 317, 299, 299, 299, 299, 223, 204, 299, 96, 58, 107, 299, 41,
-        40, 38, 100, 299, 299, 272, 329, 299, 299, 210, 271, 293, 299, 325, 317, 201, 321, 322, 328, 223, 204, 299, 119,
-        66, 107, 299, 188, 299, 299, 100, 299, 299, 272, 329, 299, 299, 210, 271, 293, 299, 325, 317, 201, 299, 299,
-        299, 223, 204, 299, 119, 47, 107, 299, 41, 40, 38, 100, 299, 299, 272, 329, 299, 299, 210, 271, 293, 299, 325,
-        317, 299, 321, 322, 328, 223, 204, 299, 119, 78, 107, 299, 41, 40, 38, 100, 299, 299, 272, 329, 299, 299, 210,
-        271, 293, 299, 325, 317, 299, 321, 322, 328, 223, 204, 299, 119, 54, 107, 299, 299, 299, 299, 100, 299, 299,
-        272, 329, 299, 299, 210, 271, 293, 299, 325, 317, 299, 299, 299, 299, 223, 204, 299, 119, 53, 107, 299, 299,
-        299, 299, 100, 299, 299, 272, 329, 299, 299, 210, 271, 293, 299, 325, 317, 299, 299, 299, 299, 223, 95, 299, 79,
-        44, 101, 299, 299, 299, 299, 100, 299, 299, 272, 329, 299, 299, 210, 271, 293, 299, 325, 317, 299, 299, 299,
-        299, 223, 197, 299, 119, 57, 107, 299, 299, 299, 299, 100, 299, 299, 272, 329, 299, 299, 210, 271, 293, 299,
-        325, 317, 299, 299, 299, 299, 223, 204, 299, 119, 76, 107, 299, 299, 299, 299, 100, 299, 299, 272, 329, 299,
-        299, 210, 271, 293, 299, 325, 317, 299, 299, 299, 299, 223, 204, 299, 119, 55, 107, 299, 299, 299, 299, 100,
-        299, 299, 272, 329, 299, 299, 210, 271, 293, 299, 325, 317, 299, 299, 299, 299, 223, 204, 299, 119, 67, 107,
-        299, 299, 299, 299, 100, 299, 299, 272, 329, 299, 299, 210, 271, 293, 299, 325, 317, 299, 299, 299, 299, 223,
-        234, 299, 122, 299, 107, 299, 299, 299, 299, 100, 299, 299, 299, 320, 299, 299, 210, 271, 293, 299, 325, 317,
-        409, 409, 299, 299, 223, 234, 299, 127, 299, 107, 299, 299, 299, 299, 100, 299, 299, 299, 250, 299, 299, 210,
-        271, 293, 299, 325, 524, 51, 253, 281, 282, 216, 299, 299, 223, 299, 441, 317, 409, 409, 409, 201, 223, 234,
-        299, 126, 299, 107, 441, 299, 299, 299, 100, 299, 299, 409, 409, 409, 299, 210, 271, 293, 201, 325, 299, 33,
-        299, 12, 299, 299, 299, 299, 299, 301, 17, 299, 299, 299, 299, 41, 40, 38, 299, 299, 317, 299, 299, 299, 12,
-        223, 234, 299, 123, 299, 107, 17, 321, 322, 328, 100, 41, 40, 38, 299, 299, 299, 210, 271, 293, 299, 325, 299,
-        299, 403, 299, 299, 299, 321, 322, 328, 299, 317, 299, 403, 299, 403, 223, 234, 403, 118, 299, 107, 299, 299,
-        299, 403, 100, 403, 299, 403, 299, 299, 299, 210, 271, 293, 317, 325, 232, 299, 299, 223, 234, 299, 125, 299,
-        107, 299, 299, 226, 299, 100, 299, 201, 299, 299, 299, 299, 210, 271, 293, 470, 325, 317, 201, 470, 454, 226,
-        223, 234, 299, 120, 299, 107, 299, 299, 299, 299, 100, 470, 299, 30, 299, 470, 454, 210, 271, 293, 201, 325, 12,
-        41, 40, 38, 454, 299, 454, 17, 470, 299, 454, 314, 41, 40, 38, 299, 315, 299, 321, 322, 328, 201, 454, 34, 454,
-        299, 470, 299, 454, 321, 322, 328, 299, 299, 226, 470, 41, 40, 38, 470, 454, 299, 114, 299, 299, 299, 470, 299,
-        299, 299, 470, 454, 299, 321, 322, 328, 299, 302, 299, 41, 40, 38, 201, 299, 299, 299, 299, 299, 454, 299, 454,
-        299, 470, 365, 454, 299, 321, 322, 328, 454, 221, 454, 299, 470, 299, 454, 166, 299, 12, 299, 178, 299, 299,
-        299, 299, 17, 260, 299, 441, 13, 319, 162, 299, 11, 196, 178, 299, 266, 137, 299, 441, 260, 178, 189, 13, 319,
-        299, 299, 260, 299, 299, 13, 319, 299, 267, 299, 299, 299, 189, 299, 299, 299, 299, 299, 299, 189, 299, 299,
-        299, 299, 299, 299, 299, 299, 311,);
-
-    static public $yy_lookahead = array(13, 14, 15, 15, 17, 18, 37, 20, 21, 64, 65, 66, 67, 26, 12, 70, 47, 30, 49, 32,
-        33, 27, 35, 54, 37, 23, 23, 40, 34, 27, 29, 44, 45, 46, 47, 48, 34, 50, 37, 52, 53, 54, 55, 55, 42, 42, 59, 13,
-        14, 15, 49, 17, 18, 76, 20, 21, 93, 14, 95, 96, 26, 18, 85, 86, 30, 31, 32, 33, 16, 35, 27, 37, 29, 23, 40, 23,
-        99, 34, 44, 45, 46, 47, 48, 75, 50, 77, 52, 53, 80, 55, 72, 37, 42, 59, 13, 14, 15, 1, 17, 18, 82, 20, 21, 49,
-        14, 72, 18, 26, 18, 76, 60, 30, 94, 32, 33, 82, 35, 27, 37, 29, 36, 40, 38, 27, 34, 44, 45, 46, 47, 48, 34, 50,
-        99, 52, 53, 36, 55, 81, 23, 51, 59, 13, 14, 15, 47, 17, 18, 14, 20, 21, 53, 18, 72, 54, 26, 12, 76, 42, 30, 65,
-        32, 33, 82, 35, 70, 37, 23, 14, 40, 54, 27, 18, 44, 45, 46, 47, 48, 34, 50, 99, 52, 53, 14, 55, 51, 42, 18, 59,
-        13, 14, 15, 1, 17, 18, 23, 20, 21, 103, 104, 47, 1, 26, 12, 47, 51, 30, 54, 32, 33, 53, 35, 12, 37, 15, 1, 40,
-        18, 27, 28, 44, 45, 46, 47, 48, 34, 50, 27, 52, 53, 18, 55, 72, 19, 34, 59, 13, 14, 15, 1, 17, 18, 82, 20, 21,
-        75, 1, 77, 78, 26, 80, 52, 19, 30, 55, 32, 33, 12, 35, 99, 37, 14, 50, 40, 16, 18, 14, 44, 45, 46, 47, 48, 27,
-        50, 27, 52, 53, 92, 55, 34, 47, 34, 59, 13, 14, 15, 53, 17, 18, 37, 20, 21, 54, 14, 72, 47, 26, 18, 76, 72, 30,
-        53, 32, 33, 82, 35, 27, 37, 16, 82, 40, 19, 37, 34, 44, 45, 46, 47, 48, 54, 50, 99, 52, 53, 49, 55, 99, 95, 96,
-        59, 13, 14, 15, 1, 17, 18, 14, 20, 21, 81, 18, 49, 16, 26, 12, 19, 72, 30, 75, 32, 33, 71, 35, 80, 37, 75, 82,
-        40, 15, 27, 80, 44, 45, 46, 47, 48, 34, 50, 94, 52, 53, 91, 55, 51, 80, 49, 59, 13, 14, 15, 37, 17, 18, 72, 20,
-        21, 9, 10, 11, 22, 26, 97, 96, 82, 30, 65, 32, 33, 55, 35, 70, 37, 100, 36, 40, 94, 37, 35, 44, 45, 46, 47, 48,
-        76, 50, 76, 52, 53, 49, 55, 72, 1, 16, 59, 13, 14, 15, 2, 17, 18, 82, 20, 21, 36, 104, 38, 99, 26, 99, 100, 1,
-        30, 94, 32, 33, 75, 35, 77, 37, 29, 80, 40, 36, 47, 38, 44, 45, 46, 47, 48, 27, 50, 15, 52, 53, 18, 55, 34, 92,
-        2, 59, 13, 14, 15, 76, 17, 18, 76, 20, 21, 90, 14, 19, 16, 26, 18, 19, 97, 30, 66, 32, 33, 69, 35, 90, 37, 15,
-        99, 40, 99, 99, 97, 44, 45, 46, 47, 48, 92, 50, 94, 52, 19, 49, 55, 47, 14, 49, 59, 51, 18, 53, 3, 4, 5, 6, 7,
-        8, 9, 92, 14, 94, 13, 14, 18, 19, 17, 55, 65, 20, 21, 95, 96, 70, 71, 26, 73, 74, 75, 30, 18, 32, 33, 80, 37, 1,
-        83, 84, 72, 24, 87, 88, 89, 47, 91, 49, 12, 51, 82, 53, 18, 65, 72, 5, 101, 102, 70, 71, 18, 73, 74, 75, 82, 1,
-        2, 38, 80, 18, 52, 83, 84, 18, 37, 87, 88, 89, 72, 91, 54, 72, 16, 52, 65, 18, 98, 92, 82, 70, 71, 82, 73, 74,
-        75, 18, 77, 81, 18, 80, 18, 43, 83, 84, 12, 35, 87, 88, 89, 65, 91, 18, 72, 92, 70, 71, 76, 73, 74, 75, 92, 47,
-        82, 82, 80, 85, 86, 83, 84, 94, 12, 87, 88, 89, 16, 91, 93, 80, 65, 99, 92, 79, 98, 70, 71, 27, 73, 74, 75, 80,
-        87, 80, 34, 80, 68, 37, 83, 84, 10, 80, 87, 88, 89, 80, 91, 105, 105, 49, 65, 105, 92, 105, 105, 70, 71, 102,
-        73, 74, 75, 105, 77, 105, 105, 80, 105, 105, 83, 84, 105, 105, 87, 88, 89, 65, 91, 105, 105, 105, 70, 71, 105,
-        73, 74, 75, 105, 105, 105, 105, 80, 14, 15, 83, 84, 18, 105, 87, 88, 89, 105, 91, 105, 105, 65, 105, 105, 105,
-        98, 70, 71, 105, 73, 74, 75, 105, 105, 105, 105, 80, 105, 105, 83, 84, 105, 5, 87, 88, 89, 105, 91, 105, 55, 13,
-        14, 15, 105, 17, 105, 65, 20, 21, 105, 105, 70, 71, 26, 73, 74, 75, 30, 105, 32, 33, 80, 105, 72, 83, 84, 105,
-        76, 87, 88, 89, 105, 91, 82, 65, 105, 85, 86, 105, 70, 71, 105, 73, 74, 75, 105, 59, 60, 105, 80, 99, 105, 83,
-        84, 105, 105, 87, 88, 89, 65, 91, 105, 105, 105, 70, 71, 105, 73, 74, 75, 105, 105, 105, 105, 80, 105, 105, 83,
-        84, 105, 5, 87, 88, 89, 105, 91, 105, 105, 13, 14, 15, 105, 17, 105, 65, 20, 21, 105, 105, 70, 71, 26, 73, 74,
-        75, 30, 105, 32, 33, 80, 105, 105, 83, 84, 105, 105, 87, 88, 89, 105, 91, 105, 65, 105, 105, 105, 105, 70, 71,
-        105, 73, 74, 75, 105, 59, 60, 105, 80, 105, 105, 83, 84, 105, 105, 87, 88, 89, 65, 91, 105, 72, 105, 70, 71, 76,
-        73, 74, 75, 105, 105, 82, 105, 80, 85, 86, 83, 84, 105, 105, 87, 88, 89, 105, 91, 65, 1, 105, 99, 105, 70, 71,
-        105, 73, 74, 75, 105, 39, 40, 41, 80, 105, 105, 83, 84, 105, 105, 87, 88, 89, 105, 91, 65, 28, 56, 57, 58, 70,
-        71, 105, 73, 74, 75, 105, 39, 40, 41, 80, 105, 105, 83, 84, 105, 105, 87, 88, 89, 105, 91, 65, 1, 56, 57, 58,
-        70, 71, 105, 73, 74, 75, 105, 105, 105, 105, 80, 105, 105, 83, 84, 105, 105, 87, 88, 89, 105, 91, 65, 105, 105,
-        105, 105, 70, 71, 105, 73, 74, 75, 38, 39, 40, 41, 80, 105, 105, 83, 84, 105, 105, 87, 88, 89, 105, 91, 65, 1,
-        56, 57, 58, 70, 71, 105, 73, 74, 75, 105, 12, 105, 105, 80, 105, 105, 83, 84, 105, 105, 87, 88, 89, 105, 91, 65,
-        1, 2, 105, 105, 70, 71, 105, 73, 74, 75, 105, 39, 40, 41, 80, 105, 105, 83, 84, 105, 105, 87, 88, 89, 105, 91,
-        65, 1, 56, 57, 58, 70, 71, 105, 73, 74, 75, 105, 39, 40, 41, 80, 105, 105, 83, 84, 105, 105, 87, 88, 89, 105,
-        91, 65, 105, 56, 57, 58, 70, 71, 105, 73, 74, 75, 38, 39, 40, 41, 80, 105, 105, 83, 84, 105, 105, 87, 88, 89,
-        105, 91, 65, 1, 56, 57, 58, 70, 71, 105, 73, 74, 75, 105, 12, 105, 105, 80, 105, 105, 83, 84, 105, 105, 87, 88,
-        89, 105, 91, 65, 105, 105, 105, 105, 70, 71, 105, 73, 74, 75, 105, 39, 40, 41, 80, 105, 105, 83, 84, 105, 105,
-        87, 88, 89, 105, 91, 65, 1, 56, 57, 58, 70, 71, 105, 73, 74, 75, 105, 12, 105, 105, 80, 105, 105, 83, 84, 105,
-        105, 87, 88, 89, 105, 91, 65, 105, 105, 105, 105, 70, 71, 105, 73, 74, 75, 105, 39, 40, 41, 80, 105, 105, 83,
-        84, 105, 105, 87, 88, 89, 105, 91, 65, 1, 56, 57, 58, 70, 71, 105, 73, 74, 75, 105, 12, 105, 105, 80, 105, 105,
-        83, 84, 105, 105, 87, 88, 89, 105, 91, 65, 1, 105, 105, 105, 70, 71, 105, 73, 74, 75, 105, 39, 40, 41, 80, 105,
-        105, 83, 84, 105, 105, 87, 88, 89, 105, 91, 65, 105, 56, 57, 58, 70, 71, 105, 73, 74, 75, 105, 39, 40, 41, 80,
-        105, 105, 83, 84, 105, 105, 87, 88, 89, 105, 91, 65, 105, 56, 57, 58, 70, 71, 105, 73, 74, 75, 105, 105, 105,
-        105, 80, 105, 105, 83, 84, 105, 105, 87, 88, 89, 105, 91, 65, 105, 105, 105, 105, 70, 71, 105, 73, 74, 75, 105,
-        105, 105, 105, 80, 105, 105, 83, 84, 105, 105, 87, 88, 89, 105, 91, 65, 105, 105, 105, 105, 70, 71, 105, 73, 74,
-        75, 105, 105, 105, 105, 80, 105, 105, 83, 84, 105, 105, 87, 88, 89, 105, 91, 65, 105, 105, 105, 105, 70, 71,
-        105, 73, 74, 75, 105, 105, 105, 105, 80, 105, 105, 83, 84, 105, 105, 87, 88, 89, 105, 91, 65, 105, 105, 105,
-        105, 70, 71, 105, 73, 74, 75, 105, 105, 105, 105, 80, 105, 105, 83, 84, 105, 105, 87, 88, 89, 105, 91, 65, 105,
-        105, 105, 105, 70, 71, 105, 73, 74, 75, 105, 105, 105, 105, 80, 105, 105, 83, 84, 105, 105, 87, 88, 89, 105, 91,
-        65, 105, 105, 105, 105, 70, 71, 105, 73, 74, 75, 105, 105, 105, 105, 80, 105, 105, 83, 84, 105, 105, 87, 88, 89,
-        105, 91, 65, 105, 105, 105, 105, 70, 71, 105, 73, 105, 75, 105, 105, 105, 105, 80, 105, 105, 105, 84, 105, 105,
-        87, 88, 89, 105, 91, 65, 1, 2, 105, 105, 70, 71, 105, 73, 105, 75, 105, 105, 105, 105, 80, 105, 105, 105, 84,
-        105, 105, 87, 88, 89, 105, 91, 62, 63, 64, 65, 66, 67, 105, 105, 70, 105, 37, 65, 39, 40, 41, 1, 70, 71, 105,
-        73, 105, 75, 49, 105, 105, 105, 80, 105, 105, 56, 57, 58, 105, 87, 88, 89, 1, 91, 105, 25, 105, 27, 105, 105,
-        105, 105, 105, 12, 34, 105, 105, 105, 105, 39, 40, 41, 105, 105, 65, 105, 105, 105, 27, 70, 71, 105, 73, 105,
-        75, 34, 56, 57, 58, 80, 39, 40, 41, 105, 105, 105, 87, 88, 89, 105, 91, 105, 105, 12, 105, 105, 105, 56, 57, 58,
-        105, 65, 105, 22, 105, 24, 70, 71, 27, 73, 105, 75, 105, 105, 105, 34, 80, 36, 105, 38, 105, 105, 105, 87, 88,
-        89, 65, 91, 47, 105, 105, 70, 71, 105, 73, 105, 75, 105, 105, 2, 105, 80, 105, 1, 105, 105, 105, 105, 87, 88,
-        89, 14, 91, 65, 1, 18, 19, 2, 70, 71, 105, 73, 105, 75, 105, 105, 105, 105, 80, 14, 105, 16, 105, 18, 19, 87,
-        88, 89, 1, 91, 27, 39, 40, 41, 47, 105, 49, 34, 51, 105, 53, 54, 39, 40, 41, 105, 54, 105, 56, 57, 58, 1, 47, 2,
-        49, 105, 51, 105, 53, 56, 57, 58, 105, 105, 2, 14, 39, 40, 41, 18, 19, 105, 22, 105, 105, 105, 14, 105, 105,
-        105, 18, 19, 105, 56, 57, 58, 105, 60, 105, 39, 40, 41, 1, 105, 105, 105, 105, 105, 47, 105, 49, 105, 51, 12,
-        53, 105, 56, 57, 58, 47, 19, 49, 105, 51, 105, 53, 72, 105, 27, 105, 76, 105, 105, 105, 105, 34, 82, 105, 37,
-        85, 86, 72, 105, 14, 15, 76, 105, 18, 72, 105, 49, 82, 76, 99, 85, 86, 105, 105, 82, 105, 105, 85, 86, 105, 35,
-        105, 105, 105, 99, 105, 105, 105, 105, 105, 105, 99, 105, 105, 105, 105, 105, 105, 105, 105, 55,);
-
-    const YY_SHIFT_USE_DFLT = - 32;
-
-    const YY_SHIFT_MAX = 236;
-
-    static public $yy_shift_ofst = array(517, 410, 316, 81, 81, 316, 81, 410, 34, 34, - 13, 81, 128, 81, 81, 128, 81,
-        81, 269, 81, 81, 81, 175, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 363, 81, 81, 222, 222, 457, 457, 457, 457,
-        457, 1624, 1603, 1736, 1736, 1736, 1736, 1736, 517, 754, 1211, 1265, 1076, 1157, 1760, 941, 1725, 995, 1103,
-        1049, 1783, 1292, 1824, 1292, 1292, 1292, 1292, 1292, 1292, 1292, 1292, 1292, 1292, 1292, 914, 914, 199, 198,
-        96, 342, 842, 90, 43, 278, 246, 96, 96, 342, 232, 342, 580, 2, 143, 190, 244, 331, 711, 321, 325, 291, 376, 446,
-        237, - 6, 462, - 6, 552, 432, 213, 500, 500, 480, 419, 446, 438, 438, 438, 438, 491, 438, 438, 491, 438, 438,
-        - 32, 1738, 1720, 466, 1784, 1795, 514, 1852, 247, 153, - 6, - 6, - 6, - 6, - 6, - 6, 97, - 12, 168, - 6, - 6,
-        97, 97, - 6, 156, 156, 97, 52, 97, - 6, - 6, - 6, 97, 251, 97, - 6, - 12, - 6, 97, - 6, - 6, - 12, - 6, - 12,
-        - 6, 211, - 6, 664, 438, 491, 438, 438, 438, 424, 438, 491, 515, 491, 424, - 32, - 32, - 32, - 32, - 32, 1562,
-        1664, 634, - 31, 1, 133, 50, 115, 152, 99, 88, 366, 84, 3, 405, 54, 415, 396, 274, 368, 553, 571, 542, 582, 534,
-        566, 558, 545, 567, 547, 583, 574, 608, 586, 590, 598, 515, 550, 593, 596, 609, 371, 264, 171, 533, 530,);
-
-    const YY_REDUCE_USE_DFLT = - 56;
-
-    const YY_REDUCE_MAX = 190;
-
-    static public $yy_reduce_ofst = array(1527, 471, 619, 560, 644, 535, 504, 589, 1335, 1092, 1038, 1119, 1011, 984,
-        876, 1173, 903, 930, 957, 1146, 1200, 1443, 1416, 1362, 1227, 1389, 1254, 1281, 1308, 1065, 673, 849, 824, 708,
-        761, 736, 796, 1497, 1470, 1619, 1535, 1671, 1644, 1582, 1792, 1777, 1799, 845, 1792, 718, 556, - 55, 94, - 23,
-        - 23, - 23, - 23, - 23, - 23, - 23, - 23, - 23, - 23, - 23, - 23, 33, - 23, - 23, - 23, - 23, - 23, - 23, - 23,
-        - 23, - 23, - 23, - 23, - 23, - 23, 221, 279, 80, 169, 329, 347, 310, 18, 273, 159, 226, 8, - 37, 369, 338, 525,
-        525, 336, 336, 336, 293, 414, 231, 231, 422, 389, 336, 522, 231, 498, 336, 484, 400, 435, 414, 272, 336, 403,
-        397, 336, 336, 336, 444, 336, 336, 231, 336, 336, 336, 184, 184, 184, 184, 184, 184, 573, 184, 551, 557, 557,
-        557, 557, 557, 557, 559, 585, 184, 557, 557, 559, 559, 557, 544, 564, 559, 578, 559, 557, 557, 557, 559, 594,
-        559, 557, 587, 557, 559, 557, 557, 595, 557, 599, 557, 579, 557, 602, 399, 295, 399, 399, 399, 301, 399, 295,
-        375, 295, 301, 257, 56, 537, 532, 511,);
-
-    static public $yyExpectedTokens = array(array(3, 4, 5, 6, 7, 8, 9, 13, 14, 17, 20, 21, 26, 30, 32, 33,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 31, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 31, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 54, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 53, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 55, 59,),
-        array(13, 14, 15, 17, 18, 20, 21, 26, 30, 32, 33, 35, 37, 40, 44, 45, 46, 47, 48, 50, 52, 55, 59,),
-        array(1, 12, 27, 34, 39, 40, 41, 56, 57, 58,), array(1, 25, 27, 34, 39, 40, 41, 56, 57, 58,),
-        array(1, 27, 34, 39, 40, 41, 56, 57, 58,), array(1, 27, 34, 39, 40, 41, 56, 57, 58,),
-        array(1, 27, 34, 39, 40, 41, 56, 57, 58,), array(1, 27, 34, 39, 40, 41, 56, 57, 58,),
-        array(1, 27, 34, 39, 40, 41, 56, 57, 58,), array(3, 4, 5, 6, 7, 8, 9, 13, 14, 17, 20, 21, 26, 30, 32, 33,),
-        array(5, 13, 14, 15, 17, 20, 21, 26, 30, 32, 33, 59, 60,), array(1, 12, 39, 40, 41, 56, 57, 58,),
-        array(1, 12, 39, 40, 41, 56, 57, 58,), array(1, 2, 39, 40, 41, 56, 57, 58,),
-        array(1, 12, 39, 40, 41, 56, 57, 58,), array(1, 39, 40, 41, 56, 57, 58, 60,),
-        array(1, 28, 39, 40, 41, 56, 57, 58,), array(1, 39, 40, 41, 54, 56, 57, 58,),
-        array(1, 38, 39, 40, 41, 56, 57, 58,), array(1, 38, 39, 40, 41, 56, 57, 58,),
-        array(1, 12, 39, 40, 41, 56, 57, 58,), array(1, 22, 39, 40, 41, 56, 57, 58,), array(1, 39, 40, 41, 56, 57, 58,),
-        array(1, 12, 19, 27, 34, 37, 49,), array(1, 39, 40, 41, 56, 57, 58,), array(1, 39, 40, 41, 56, 57, 58,),
-        array(1, 39, 40, 41, 56, 57, 58,), array(1, 39, 40, 41, 56, 57, 58,), array(1, 39, 40, 41, 56, 57, 58,),
-        array(1, 39, 40, 41, 56, 57, 58,), array(1, 39, 40, 41, 56, 57, 58,), array(1, 39, 40, 41, 56, 57, 58,),
-        array(1, 39, 40, 41, 56, 57, 58,), array(1, 39, 40, 41, 56, 57, 58,), array(1, 39, 40, 41, 56, 57, 58,),
-        array(39, 40, 41, 56, 57, 58,), array(39, 40, 41, 56, 57, 58,), array(1, 12, 27, 34,), array(15, 18, 52, 55,),
-        array(1, 27, 34,), array(15, 37, 55,), array(5, 13, 14, 15, 17, 20, 21, 26, 30, 32, 33, 59, 60,),
-        array(14, 18, 27, 29, 34,), array(14, 18, 27, 29, 34,), array(14, 18, 27, 34,), array(14, 18, 27, 34,),
-        array(1, 27, 34,), array(1, 27, 34,), array(15, 37, 55,), array(19, 47, 53,), array(15, 37, 55,), array(1, 2,),
-        array(12, 23, 27, 34, 42,), array(12, 23, 27, 34, 42,), array(1, 12, 27, 28, 34,), array(1, 12, 27, 34,),
-        array(1, 12, 27, 34,), array(14, 15, 18, 55,), array(14, 18, 51,), array(16, 19, 49,), array(16, 19, 49,),
-        array(9, 10, 11,), array(15, 18,), array(1, 54,), array(27, 34,), array(19, 49,), array(27, 34,), array(1, 12,),
-        array(27, 34,), array(1, 19,), array(14, 18,), array(14, 18,), array(15, 55,), array(1, 29,), array(15, 18,),
-        array(1,), array(1,), array(1,), array(1,), array(19,), array(1,), array(1,), array(19,), array(1,), array(1,),
-        array(), array(2, 14, 16, 18, 19, 47, 49, 51, 53,), array(2, 14, 18, 19, 47, 49, 51, 53, 54,),
-        array(2, 14, 16, 18, 19, 47, 49, 51, 53,), array(2, 14, 18, 19, 47, 49, 51, 53,),
-        array(2, 14, 18, 19, 47, 49, 51, 53,), array(14, 18, 19, 47, 49, 51, 53,), array(14, 15, 18, 35, 55,),
-        array(16, 47, 53,), array(14, 18, 51,), array(27, 34,), array(27, 34,), array(27, 34,), array(27, 34,),
-        array(27, 34,), array(27, 34,), array(47, 53,), array(15, 55,), array(14, 18,), array(27, 34,), array(27, 34,),
-        array(47, 53,), array(47, 53,), array(27, 34,), array(47, 53,), array(47, 53,), array(47, 53,), array(16, 23,),
-        array(47, 53,), array(27, 34,), array(27, 34,), array(27, 34,), array(47, 53,), array(14, 37,), array(47, 53,),
-        array(27, 34,), array(15, 55,), array(27, 34,), array(47, 53,), array(27, 34,), array(27, 34,), array(15, 55,),
-        array(27, 34,), array(15, 55,), array(27, 34,), array(18, 50,), array(27, 34,), array(10,), array(1,),
-        array(19,), array(1,), array(1,), array(1,), array(2,), array(1,), array(19,), array(37,), array(19,),
-        array(2,), array(), array(), array(), array(), array(), array(1, 2, 37, 39, 40, 41, 49, 56, 57, 58,),
-        array(12, 22, 24, 27, 34, 36, 38, 47,), array(12, 16, 27, 34, 37, 49,), array(37, 47, 49, 54,),
-        array(29, 37, 49,), array(14, 18, 51,), array(23, 42, 60,), array(23, 42, 54,), array(47, 54,), array(36, 54,),
-        array(18, 51,), array(22, 36,), array(36, 38,), array(23, 42,), array(16, 47,), array(37, 49,), array(36, 38,),
-        array(36, 38,), array(37, 49,), array(37, 49,), array(37,), array(18,), array(54,), array(16,), array(52,),
-        array(5,), array(18,), array(38,), array(18,), array(52,), array(18,), array(43,), array(12,), array(35,),
-        array(47,), array(18,), array(37,), array(18,), array(18,), array(18,), array(18,), array(35,), array(54,),
-        array(23,), array(24,), array(18,), array(), array(), array(), array(), array(), array(), array(), array(),
-        array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(),
-        array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(),
-        array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(),
-        array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(),
-        array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(),
-        array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(),
-        array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(),
-        array(), array(),);
-
-    static public $yy_default = array(334, 508, 523, 488, 488, 523, 488, 523, 523, 523, 523, 523, 523, 523, 523, 523,
-        523, 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, 523,
-        523, 523, 523, 523, 523, 523, 523, 393, 360, 393, 357, 393, 369, 331, 523, 523, 523, 523, 523, 523, 398, 523,
-        523, 523, 523, 523, 414, 431, 405, 400, 511, 395, 509, 486, 487, 374, 398, 404, 510, 419, 420, 407, 523, 393,
-        523, 523, 393, 393, 393, 393, 393, 393, 523, 500, 523, 383, 421, 421, 407, 407, 407, 523, 454, 444, 444, 523,
-        523, 407, 393, 444, 371, 407, 393, 387, 454, 454, 523, 407, 523, 389, 422, 407, 410, 497, 417, 423, 444, 424,
-        411, 495, 443, 443, 443, 443, 443, 443, 523, 470, 456, 361, 378, 372, 362, 364, 377, 451, 523, 454, 356, 370,
-        480, 481, 373, 447, 449, 448, 523, 478, 367, 366, 368, 479, 454, 452, 358, 523, 380, 450, 376, 354, 523, 382,
-        523, 379, 523, 381, 348, 384, 498, 390, 413, 388, 489, 438, 475, 454, 501, 490, 494, 494, 454, 494, 454, 431,
-        427, 431, 431, 431, 455, 421, 421, 427, 523, 523, 523, 523, 421, 427, 439, 523, 523, 431, 523, 499, 523, 523,
-        523, 523, 339, 523, 523, 523, 523, 523, 433, 523, 523, 427, 523, 470, 523, 523, 523, 523, 429, 434, 421, 401,
-        523, 464, 483, 375, 461, 484, 406, 463, 469, 462, 433, 474, 394, 402, 496, 470, 460, 332, 445, 491, 492, 425,
-        386, 493, 392, 472, 473, 426, 428, 457, 458, 459, 453, 409, 430, 432, 408, 363, 391, 341, 340, 342, 338, 337,
-        333, 335, 336, 343, 344, 350, 351, 352, 349, 347, 345, 346, 434, 435, 512, 513, 514, 385, 476, 485, 519, 520,
-        517, 516, 505, 507, 506, 515, 522, 518, 521, 471, 477, 467, 465, 468, 440, 437, 436, 415, 416, 502, 503, 442,
-        466, 446, 441, 418, 504, 412, 482,);
-
-    const YYNOCODE = 106;
-
-    const YYSTACKDEPTH = 500;
-
-    const YYNSTATE = 331;
-
-    const YYNRULE = 192;
-
-    const YYERRORSYMBOL = 61;
-
-    const YYERRSYMDT = 'yy0';
-
-    const YYFALLBACK = 0;
-
-    public static $yyFallback = array();
-
-    public function Trace($TraceFILE, $zTracePrompt)
-    {
-        if (!$TraceFILE) {
-            $zTracePrompt = 0;
-        } elseif (!$zTracePrompt) {
-            $TraceFILE = 0;
-        }
-        $this->yyTraceFILE = $TraceFILE;
-        $this->yyTracePrompt = $zTracePrompt;
-    }
-
-    public function PrintTrace()
-    {
-        $this->yyTraceFILE = fopen('php://output', 'w');
-        $this->yyTracePrompt = '<br>';
-    }
-
-    public $yyTraceFILE;
-
-    public $yyTracePrompt;
-
-    public $yyidx;                    /* Index of top element in stack */
-    public $yyerrcnt;                 /* Shifts left before out of the error */
-    public $yystack = array();  /* The parser's stack */
-
-    public $yyTokenName = array('$', 'VERT', 'COLON', 'PHP', 'NOCACHE', 'TEXT', 'STRIPON', 'STRIPOFF', 'BLOCKSOURCE',
-        'LITERALSTART', 'LITERALEND', 'LITERAL', 'RDEL', 'SIMPLEOUTPUT', 'LDEL', 'DOLLARID', 'EQUAL', 'SIMPLETAG', 'ID',
-        'PTR', 'LDELIF', 'LDELFOR', 'SEMICOLON', 'INCDEC', 'TO', 'STEP', 'LDELFOREACH', 'SPACE', 'AS', 'APTR',
-        'LDELSETFILTER', 'SMARTYBLOCKCHILDPARENT', 'CLOSETAG', 'LDELSLASH', 'ATTR', 'INTEGER', 'COMMA', 'OPENP',
-        'CLOSEP', 'MATH', 'UNIMATH', 'ISIN', 'INSTANCEOF', 'QMARK', 'NOT', 'TYPECAST', 'HEX', 'DOT',
-        'SINGLEQUOTESTRING', 'DOUBLECOLON', 'NAMESPACE', 'AT', 'HATCH', 'OPENB', 'CLOSEB', 'DOLLAR', 'LOGOP', 'TLOGOP',
-        'SINGLECOND', 'QUOTE', 'BACKTICK', 'error', 'start', 'template', 'template_element', 'smartytag', 'literal',
-        'text_content', 'literal_elements', 'literal_element', 'tag', 'variable', 'attributes', 'value', 'expr',
-        'varindexed', 'modifierlist', 'statement', 'statements', 'foraction', 'varvar', 'modparameters', 'attribute',
-        'ternary', 'array', 'lop', 'scond', 'ns1', 'function', 'doublequoted_with_quotes', 'static_class_access',
-        'object', 'arrayindex', 'indexdef', 'varvarele', 'objectchain', 'objectelement', 'method', 'params', 'modifier',
-        'modparameter', 'arrayelements', 'arrayelement', 'doublequoted', 'doublequotedcontent',);
-
-    public static $yyRuleName = array('start ::= template', 'template ::= template_element',
-        'template ::= template template_element', 'template ::=', 'template_element ::= smartytag',
-        'template_element ::= literal', 'template_element ::= PHP', 'template_element ::= NOCACHE',
-        'template_element ::= text_content', 'text_content ::= TEXT', 'text_content ::= text_content TEXT',
-        'template_element ::= STRIPON', 'template_element ::= STRIPOFF', 'template_element ::= BLOCKSOURCE',
-        'literal ::= LITERALSTART LITERALEND', 'literal ::= LITERALSTART literal_elements LITERALEND',
-        'literal_elements ::= literal_elements literal_element', 'literal_elements ::=', 'literal_element ::= literal',
-        'literal_element ::= LITERAL', 'smartytag ::= tag RDEL', 'smartytag ::= SIMPLEOUTPUT', 'tag ::= LDEL variable',
-        'tag ::= LDEL variable attributes', 'tag ::= LDEL value', 'tag ::= LDEL value attributes', 'tag ::= LDEL expr',
-        'tag ::= LDEL expr attributes', 'tag ::= LDEL DOLLARID EQUAL value', 'tag ::= LDEL DOLLARID EQUAL expr',
-        'tag ::= LDEL DOLLARID EQUAL expr attributes', 'tag ::= LDEL varindexed EQUAL expr attributes',
-        'smartytag ::= SIMPLETAG', 'tag ::= LDEL ID attributes', 'tag ::= LDEL ID',
-        'tag ::= LDEL ID modifierlist attributes', 'tag ::= LDEL ID PTR ID attributes',
-        'tag ::= LDEL ID PTR ID modifierlist attributes', 'tag ::= LDELIF expr', 'tag ::= LDELIF expr attributes',
-        'tag ::= LDELIF statement', 'tag ::= LDELIF statement attributes',
-        'tag ::= LDELFOR statements SEMICOLON expr SEMICOLON varindexed foraction attributes',
-        'foraction ::= EQUAL expr', 'foraction ::= INCDEC', 'tag ::= LDELFOR statement TO expr attributes',
-        'tag ::= LDELFOR statement TO expr STEP expr attributes', 'tag ::= LDELFOREACH attributes',
-        'tag ::= LDELFOREACH SPACE value AS varvar attributes',
-        'tag ::= LDELFOREACH SPACE value AS varvar APTR varvar attributes',
-        'tag ::= LDELFOREACH SPACE expr AS varvar attributes',
-        'tag ::= LDELFOREACH SPACE expr AS varvar APTR varvar attributes', 'tag ::= LDELSETFILTER ID modparameters',
-        'tag ::= LDELSETFILTER ID modparameters modifierlist', 'tag ::= LDEL SMARTYBLOCKCHILDPARENT',
-        'smartytag ::= CLOSETAG', 'tag ::= LDELSLASH ID', 'tag ::= LDELSLASH ID modifierlist',
-        'tag ::= LDELSLASH ID PTR ID', 'tag ::= LDELSLASH ID PTR ID modifierlist',
-        'attributes ::= attributes attribute', 'attributes ::= attribute', 'attributes ::=',
-        'attribute ::= SPACE ID EQUAL ID', 'attribute ::= ATTR expr', 'attribute ::= ATTR value',
-        'attribute ::= SPACE ID', 'attribute ::= SPACE expr', 'attribute ::= SPACE value',
-        'attribute ::= SPACE INTEGER EQUAL expr', 'statements ::= statement',
-        'statements ::= statements COMMA statement', 'statement ::= DOLLARID EQUAL INTEGER',
-        'statement ::= DOLLARID EQUAL expr', 'statement ::= varindexed EQUAL expr',
-        'statement ::= OPENP statement CLOSEP', 'expr ::= value', 'expr ::= ternary', 'expr ::= DOLLARID COLON ID',
-        'expr ::= expr MATH value', 'expr ::= expr UNIMATH value', 'expr ::= array', 'expr ::= expr modifierlist',
-        'expr ::= expr lop expr', 'expr ::= expr scond', 'expr ::= expr ISIN array', 'expr ::= expr ISIN value',
-        'expr ::= variable INSTANCEOF ns1', 'ternary ::= OPENP expr CLOSEP QMARK DOLLARID COLON expr',
-        'ternary ::= OPENP expr CLOSEP QMARK expr COLON expr', 'value ::= variable', 'value ::= UNIMATH value',
-        'value ::= NOT value', 'value ::= TYPECAST value', 'value ::= variable INCDEC', 'value ::= HEX',
-        'value ::= INTEGER', 'value ::= INTEGER DOT INTEGER', 'value ::= INTEGER DOT', 'value ::= DOT INTEGER',
-        'value ::= ID', 'value ::= function', 'value ::= OPENP expr CLOSEP', 'value ::= SINGLEQUOTESTRING',
-        'value ::= doublequoted_with_quotes', 'value ::= varindexed DOUBLECOLON static_class_access',
-        'value ::= smartytag', 'value ::= value modifierlist', 'value ::= NAMESPACE',
-        'value ::= ns1 DOUBLECOLON static_class_access', 'ns1 ::= ID', 'ns1 ::= NAMESPACE', 'variable ::= DOLLARID',
-        'variable ::= varindexed', 'variable ::= varvar AT ID', 'variable ::= object', 'variable ::= HATCH ID HATCH',
-        'variable ::= HATCH ID HATCH arrayindex', 'variable ::= HATCH variable HATCH',
-        'variable ::= HATCH variable HATCH arrayindex', 'varindexed ::= DOLLARID arrayindex',
-        'varindexed ::= varvar arrayindex', 'arrayindex ::= arrayindex indexdef', 'arrayindex ::=',
-        'indexdef ::= DOT DOLLARID', 'indexdef ::= DOT varvar', 'indexdef ::= DOT varvar AT ID', 'indexdef ::= DOT ID',
-        'indexdef ::= DOT INTEGER', 'indexdef ::= DOT LDEL expr RDEL', 'indexdef ::= OPENB ID CLOSEB',
-        'indexdef ::= OPENB ID DOT ID CLOSEB', 'indexdef ::= OPENB SINGLEQUOTESTRING CLOSEB',
-        'indexdef ::= OPENB INTEGER CLOSEB', 'indexdef ::= OPENB DOLLARID CLOSEB', 'indexdef ::= OPENB variable CLOSEB',
-        'indexdef ::= OPENB value CLOSEB', 'indexdef ::= OPENB expr CLOSEB', 'indexdef ::= OPENB CLOSEB',
-        'varvar ::= DOLLARID', 'varvar ::= DOLLAR', 'varvar ::= varvar varvarele', 'varvarele ::= ID',
-        'varvarele ::= LDEL expr RDEL', 'object ::= varindexed objectchain', 'objectchain ::= objectelement',
-        'objectchain ::= objectchain objectelement', 'objectelement ::= PTR ID arrayindex',
-        'objectelement ::= PTR varvar arrayindex', 'objectelement ::= PTR LDEL expr RDEL arrayindex',
-        'objectelement ::= PTR ID LDEL expr RDEL arrayindex', 'objectelement ::= PTR method',
-        'function ::= ns1 OPENP params CLOSEP', 'method ::= ID OPENP params CLOSEP',
-        'method ::= DOLLARID OPENP params CLOSEP', 'params ::= params COMMA expr', 'params ::= expr', 'params ::=',
-        'modifierlist ::= modifierlist modifier modparameters', 'modifierlist ::= modifier modparameters',
-        'modifier ::= VERT AT ID', 'modifier ::= VERT ID', 'modparameters ::= modparameters modparameter',
-        'modparameters ::=', 'modparameter ::= COLON value', 'modparameter ::= COLON array',
-        'static_class_access ::= method', 'static_class_access ::= method objectchain', 'static_class_access ::= ID',
-        'static_class_access ::= DOLLARID arrayindex', 'static_class_access ::= DOLLARID arrayindex objectchain',
-        'lop ::= LOGOP', 'lop ::= TLOGOP', 'scond ::= SINGLECOND', 'array ::= OPENB arrayelements CLOSEB',
-        'arrayelements ::= arrayelement', 'arrayelements ::= arrayelements COMMA arrayelement', 'arrayelements ::=',
-        'arrayelement ::= value APTR expr', 'arrayelement ::= ID APTR expr', 'arrayelement ::= expr',
-        'doublequoted_with_quotes ::= QUOTE QUOTE', 'doublequoted_with_quotes ::= QUOTE doublequoted QUOTE',
-        'doublequoted ::= doublequoted doublequotedcontent', 'doublequoted ::= doublequotedcontent',
-        'doublequotedcontent ::= BACKTICK variable BACKTICK', 'doublequotedcontent ::= BACKTICK expr BACKTICK',
-        'doublequotedcontent ::= DOLLARID', 'doublequotedcontent ::= LDEL variable RDEL',
-        'doublequotedcontent ::= LDEL expr RDEL', 'doublequotedcontent ::= smartytag', 'doublequotedcontent ::= TEXT',);
-
-    public function tokenName($tokenType)
-    {
-        if ($tokenType === 0) {
-            return 'End of Input';
-        }
-        if ($tokenType > 0 && $tokenType < count($this->yyTokenName)) {
-            return $this->yyTokenName[$tokenType];
-        } else {
-            return "Unknown";
-        }
-    }
-
-    public static function yy_destructor($yymajor, $yypminor)
-    {
-        switch ($yymajor) {
-            default:
-                break;   /* If no destructor action specified: do nothing */
-        }
-    }
-
-    public function yy_pop_parser_stack()
-    {
-        if (empty($this->yystack)) {
-            return;
-        }
-        $yytos = array_pop($this->yystack);
-        if ($this->yyTraceFILE && $this->yyidx >= 0) {
-            fwrite($this->yyTraceFILE, $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] . "\n");
-        }
-        $yymajor = $yytos->major;
-        self::yy_destructor($yymajor, $yytos->minor);
-        $this->yyidx --;
-
-        return $yymajor;
-    }
-
-    public function __destruct()
-    {
-        while ($this->yystack !== Array()) {
-            $this->yy_pop_parser_stack();
-        }
-        if (is_resource($this->yyTraceFILE)) {
-            fclose($this->yyTraceFILE);
-        }
-    }
-
-    public function yy_get_expected_tokens($token)
-    {
-        static $res3 = array();
-        static $res4 = array();
-        $state = $this->yystack[$this->yyidx]->stateno;
-        $expected = self::$yyExpectedTokens[$state];
-        if (isset($res3[$state][$token])) {
-            if ($res3[$state][$token]) {
-                return $expected;
-            }
-        } else {
-            if ($res3[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
-                return $expected;
-            }
-        }
-        $stack = $this->yystack;
-        $yyidx = $this->yyidx;
-        do {
-            $yyact = $this->yy_find_shift_action($token);
-            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
-                // reduce action
-                $done = 0;
-                do {
-                    if ($done ++ == 100) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        // too much recursion prevents proper detection
-                        // so give up
-                        return array_unique($expected);
-                    }
-                    $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
-                    $nextstate = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, self::$yyRuleInfo[$yyruleno][0]);
-                    if (isset(self::$yyExpectedTokens[$nextstate])) {
-                        $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
-                        if (isset($res4[$nextstate][$token])) {
-                            if ($res4[$nextstate][$token]) {
-                                $this->yyidx = $yyidx;
-                                $this->yystack = $stack;
-                                return array_unique($expected);
-                            }
-                        } else {
-                            if ($res4[$nextstate][$token] = in_array($token, self::$yyExpectedTokens[$nextstate], true)) {
-                                $this->yyidx = $yyidx;
-                                $this->yystack = $stack;
-                                return array_unique($expected);
-                            }
-                        }
-                    }
-                    if ($nextstate < self::YYNSTATE) {
-                        // we need to shift a non-terminal
-                        $this->yyidx ++;
-                        $x = new TP_yyStackEntry;
-                        $x->stateno = $nextstate;
-                        $x->major = self::$yyRuleInfo[$yyruleno][0];
-                        $this->yystack[$this->yyidx] = $x;
-                        continue 2;
-                    } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        // the last token was just ignored, we can't accept
-                        // by ignoring input, this is in essence ignoring a
-                        // syntax error!
-                        return array_unique($expected);
-                    } elseif ($nextstate === self::YY_NO_ACTION) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        // input accepted, but not shifted (I guess)
-                        return $expected;
-                    } else {
-                        $yyact = $nextstate;
-                    }
-                } while (true);
-            }
-            break;
-        } while (true);
-        $this->yyidx = $yyidx;
-        $this->yystack = $stack;
-
-        return array_unique($expected);
-    }
-
-    public function yy_is_expected_token($token)
-    {
-        static $res = array();
-        static $res2 = array();
-        if ($token === 0) {
-            return true; // 0 is not part of this
-        }
-        $state = $this->yystack[$this->yyidx]->stateno;
-        if (isset($res[$state][$token])) {
-            if ($res[$state][$token]) {
-                return true;
-            }
-        } else {
-            if ($res[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
-                return true;
-            }
-        }
-        $stack = $this->yystack;
-        $yyidx = $this->yyidx;
-        do {
-            $yyact = $this->yy_find_shift_action($token);
-            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
-                // reduce action
-                $done = 0;
-                do {
-                    if ($done ++ == 100) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        // too much recursion prevents proper detection
-                        // so give up
-                        return true;
-                    }
-                    $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
-                    $nextstate = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, self::$yyRuleInfo[$yyruleno][0]);
-                    if (isset($res2[$nextstate][$token])) {
-                        if ($res2[$nextstate][$token]) {
-                            $this->yyidx = $yyidx;
-                            $this->yystack = $stack;
-                            return true;
-                        }
-                    } else {
-                        if ($res2[$nextstate][$token] = (isset(self::$yyExpectedTokens[$nextstate]) && in_array($token, self::$yyExpectedTokens[$nextstate], true))) {
-                            $this->yyidx = $yyidx;
-                            $this->yystack = $stack;
-                            return true;
-                        }
-                    }
-                    if ($nextstate < self::YYNSTATE) {
-                        // we need to shift a non-terminal
-                        $this->yyidx ++;
-                        $x = new TP_yyStackEntry;
-                        $x->stateno = $nextstate;
-                        $x->major = self::$yyRuleInfo[$yyruleno][0];
-                        $this->yystack[$this->yyidx] = $x;
-                        continue 2;
-                    } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        if (!$token) {
-                            // end of input: this is valid
-                            return true;
-                        }
-                        // the last token was just ignored, we can't accept
-                        // by ignoring input, this is in essence ignoring a
-                        // syntax error!
-                        return false;
-                    } elseif ($nextstate === self::YY_NO_ACTION) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        // input accepted, but not shifted (I guess)
-                        return true;
-                    } else {
-                        $yyact = $nextstate;
-                    }
-                } while (true);
-            }
-            break;
-        } while (true);
-        $this->yyidx = $yyidx;
-        $this->yystack = $stack;
-
-        return true;
-    }
-
-    public function yy_find_shift_action($iLookAhead)
-    {
-        $stateno = $this->yystack[$this->yyidx]->stateno;
-
-        /* if ($this->yyidx < 0) return self::YY_NO_ACTION;  */
-        if (!isset(self::$yy_shift_ofst[$stateno])) {
-            // no shift actions
-            return self::$yy_default[$stateno];
-        }
-        $i = self::$yy_shift_ofst[$stateno];
-        if ($i === self::YY_SHIFT_USE_DFLT) {
-            return self::$yy_default[$stateno];
-        }
-        if ($iLookAhead == self::YYNOCODE) {
-            return self::YY_NO_ACTION;
-        }
-        $i += $iLookAhead;
-        if ($i < 0 || $i >= self::YY_SZ_ACTTAB || self::$yy_lookahead[$i] != $iLookAhead) {
-            if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback) && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) {
-                if ($this->yyTraceFILE) {
-                    fwrite($this->yyTraceFILE, $this->yyTracePrompt . "FALLBACK " . $this->yyTokenName[$iLookAhead] . " => " . $this->yyTokenName[$iFallback] . "\n");
-                }
-
-                return $this->yy_find_shift_action($iFallback);
-            }
-
-            return self::$yy_default[$stateno];
-        } else {
-            return self::$yy_action[$i];
-        }
-    }
-
-    public function yy_find_reduce_action($stateno, $iLookAhead)
-    {
-        /* $stateno = $this->yystack[$this->yyidx]->stateno; */
-
-        if (!isset(self::$yy_reduce_ofst[$stateno])) {
-            return self::$yy_default[$stateno];
-        }
-        $i = self::$yy_reduce_ofst[$stateno];
-        if ($i == self::YY_REDUCE_USE_DFLT) {
-            return self::$yy_default[$stateno];
-        }
-        if ($iLookAhead == self::YYNOCODE) {
-            return self::YY_NO_ACTION;
-        }
-        $i += $iLookAhead;
-        if ($i < 0 || $i >= self::YY_SZ_ACTTAB || self::$yy_lookahead[$i] != $iLookAhead) {
-            return self::$yy_default[$stateno];
-        } else {
-            return self::$yy_action[$i];
-        }
-    }
-
-    public function yy_shift($yyNewState, $yyMajor, $yypMinor)
-    {
-        $this->yyidx ++;
-        if ($this->yyidx >= self::YYSTACKDEPTH) {
-            $this->yyidx --;
-            if ($this->yyTraceFILE) {
-                fprintf($this->yyTraceFILE, "%sStack Overflow!\n", $this->yyTracePrompt);
-            }
-            while ($this->yyidx >= 0) {
-                $this->yy_pop_parser_stack();
-            }
-            #line 190 "../smarty/lexer/smarty_internal_templateparser.y"
-
-            $this->internalError = true;
-            $this->compiler->trigger_template_error("Stack overflow in template parser");
-
-            return;
-        }
-        $yytos = new TP_yyStackEntry;
-        $yytos->stateno = $yyNewState;
-        $yytos->major = $yyMajor;
-        $yytos->minor = $yypMinor;
-        $this->yystack[] = $yytos;
-        if ($this->yyTraceFILE && $this->yyidx > 0) {
-            fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt, $yyNewState);
-            fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt);
-            for ($i = 1; $i <= $this->yyidx; $i ++) {
-                fprintf($this->yyTraceFILE, " %s", $this->yyTokenName[$this->yystack[$i]->major]);
-            }
-            fwrite($this->yyTraceFILE, "\n");
-        }
-    }
-
-    public static $yyRuleInfo = array(array(0 => 62, 1 => 1), array(0 => 63, 1 => 1), array(0 => 63, 1 => 2),
-        array(0 => 63, 1 => 0), array(0 => 64, 1 => 1), array(0 => 64, 1 => 1), array(0 => 64, 1 => 1),
-        array(0 => 64, 1 => 1), array(0 => 64, 1 => 1), array(0 => 67, 1 => 1), array(0 => 67, 1 => 2),
-        array(0 => 64, 1 => 1), array(0 => 64, 1 => 1), array(0 => 64, 1 => 1), array(0 => 66, 1 => 2),
-        array(0 => 66, 1 => 3), array(0 => 68, 1 => 2), array(0 => 68, 1 => 0), array(0 => 69, 1 => 1),
-        array(0 => 69, 1 => 1), array(0 => 65, 1 => 2), array(0 => 65, 1 => 1), array(0 => 70, 1 => 2),
-        array(0 => 70, 1 => 3), array(0 => 70, 1 => 2), array(0 => 70, 1 => 3), array(0 => 70, 1 => 2),
-        array(0 => 70, 1 => 3), array(0 => 70, 1 => 4), array(0 => 70, 1 => 4), array(0 => 70, 1 => 5),
-        array(0 => 70, 1 => 5), array(0 => 65, 1 => 1), array(0 => 70, 1 => 3), array(0 => 70, 1 => 2),
-        array(0 => 70, 1 => 4), array(0 => 70, 1 => 5), array(0 => 70, 1 => 6), array(0 => 70, 1 => 2),
-        array(0 => 70, 1 => 3), array(0 => 70, 1 => 2), array(0 => 70, 1 => 3), array(0 => 70, 1 => 8),
-        array(0 => 79, 1 => 2), array(0 => 79, 1 => 1), array(0 => 70, 1 => 5), array(0 => 70, 1 => 7),
-        array(0 => 70, 1 => 2), array(0 => 70, 1 => 6), array(0 => 70, 1 => 8), array(0 => 70, 1 => 6),
-        array(0 => 70, 1 => 8), array(0 => 70, 1 => 3), array(0 => 70, 1 => 4), array(0 => 70, 1 => 2),
-        array(0 => 65, 1 => 1), array(0 => 70, 1 => 2), array(0 => 70, 1 => 3), array(0 => 70, 1 => 4),
-        array(0 => 70, 1 => 5), array(0 => 72, 1 => 2), array(0 => 72, 1 => 1), array(0 => 72, 1 => 0),
-        array(0 => 82, 1 => 4), array(0 => 82, 1 => 2), array(0 => 82, 1 => 2), array(0 => 82, 1 => 2),
-        array(0 => 82, 1 => 2), array(0 => 82, 1 => 2), array(0 => 82, 1 => 4), array(0 => 78, 1 => 1),
-        array(0 => 78, 1 => 3), array(0 => 77, 1 => 3), array(0 => 77, 1 => 3), array(0 => 77, 1 => 3),
-        array(0 => 77, 1 => 3), array(0 => 74, 1 => 1), array(0 => 74, 1 => 1), array(0 => 74, 1 => 3),
-        array(0 => 74, 1 => 3), array(0 => 74, 1 => 3), array(0 => 74, 1 => 1), array(0 => 74, 1 => 2),
-        array(0 => 74, 1 => 3), array(0 => 74, 1 => 2), array(0 => 74, 1 => 3), array(0 => 74, 1 => 3),
-        array(0 => 74, 1 => 3), array(0 => 83, 1 => 7), array(0 => 83, 1 => 7), array(0 => 73, 1 => 1),
-        array(0 => 73, 1 => 2), array(0 => 73, 1 => 2), array(0 => 73, 1 => 2), array(0 => 73, 1 => 2),
-        array(0 => 73, 1 => 1), array(0 => 73, 1 => 1), array(0 => 73, 1 => 3), array(0 => 73, 1 => 2),
-        array(0 => 73, 1 => 2), array(0 => 73, 1 => 1), array(0 => 73, 1 => 1), array(0 => 73, 1 => 3),
-        array(0 => 73, 1 => 1), array(0 => 73, 1 => 1), array(0 => 73, 1 => 3), array(0 => 73, 1 => 1),
-        array(0 => 73, 1 => 2), array(0 => 73, 1 => 1), array(0 => 73, 1 => 3), array(0 => 87, 1 => 1),
-        array(0 => 87, 1 => 1), array(0 => 71, 1 => 1), array(0 => 71, 1 => 1), array(0 => 71, 1 => 3),
-        array(0 => 71, 1 => 1), array(0 => 71, 1 => 3), array(0 => 71, 1 => 4), array(0 => 71, 1 => 3),
-        array(0 => 71, 1 => 4), array(0 => 75, 1 => 2), array(0 => 75, 1 => 2), array(0 => 92, 1 => 2),
-        array(0 => 92, 1 => 0), array(0 => 93, 1 => 2), array(0 => 93, 1 => 2), array(0 => 93, 1 => 4),
-        array(0 => 93, 1 => 2), array(0 => 93, 1 => 2), array(0 => 93, 1 => 4), array(0 => 93, 1 => 3),
-        array(0 => 93, 1 => 5), array(0 => 93, 1 => 3), array(0 => 93, 1 => 3), array(0 => 93, 1 => 3),
-        array(0 => 93, 1 => 3), array(0 => 93, 1 => 3), array(0 => 93, 1 => 3), array(0 => 93, 1 => 2),
-        array(0 => 80, 1 => 1), array(0 => 80, 1 => 1), array(0 => 80, 1 => 2), array(0 => 94, 1 => 1),
-        array(0 => 94, 1 => 3), array(0 => 91, 1 => 2), array(0 => 95, 1 => 1), array(0 => 95, 1 => 2),
-        array(0 => 96, 1 => 3), array(0 => 96, 1 => 3), array(0 => 96, 1 => 5), array(0 => 96, 1 => 6),
-        array(0 => 96, 1 => 2), array(0 => 88, 1 => 4), array(0 => 97, 1 => 4), array(0 => 97, 1 => 4),
-        array(0 => 98, 1 => 3), array(0 => 98, 1 => 1), array(0 => 98, 1 => 0), array(0 => 76, 1 => 3),
-        array(0 => 76, 1 => 2), array(0 => 99, 1 => 3), array(0 => 99, 1 => 2), array(0 => 81, 1 => 2),
-        array(0 => 81, 1 => 0), array(0 => 100, 1 => 2), array(0 => 100, 1 => 2), array(0 => 90, 1 => 1),
-        array(0 => 90, 1 => 2), array(0 => 90, 1 => 1), array(0 => 90, 1 => 2), array(0 => 90, 1 => 3),
-        array(0 => 85, 1 => 1), array(0 => 85, 1 => 1), array(0 => 86, 1 => 1), array(0 => 84, 1 => 3),
-        array(0 => 101, 1 => 1), array(0 => 101, 1 => 3), array(0 => 101, 1 => 0), array(0 => 102, 1 => 3),
-        array(0 => 102, 1 => 3), array(0 => 102, 1 => 1), array(0 => 89, 1 => 2), array(0 => 89, 1 => 3),
-        array(0 => 103, 1 => 2), array(0 => 103, 1 => 1), array(0 => 104, 1 => 3), array(0 => 104, 1 => 3),
-        array(0 => 104, 1 => 1), array(0 => 104, 1 => 3), array(0 => 104, 1 => 3), array(0 => 104, 1 => 1),
-        array(0 => 104, 1 => 1),);
-
-    public static $yyReduceMap = array(0   => 0, 1 => 1, 2 => 2, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 9 => 9,
-                                       18  => 9, 19 => 9, 44 => 9, 67 => 9, 68 => 9, 76 => 9, 77 => 9, 81 => 9, 90 => 9,
-                                       95  => 9, 96 => 9, 101 => 9, 103 => 9, 104 => 9, 108 => 9, 110 => 9, 111 => 9,
-                                       115 => 9, 175 => 9, 180 => 9, 10 => 10, 11 => 11, 12 => 12, 13 => 13, 14 => 14,
-                                       17  => 14, 15 => 15, 75 => 15, 16 => 16, 91 => 16, 93 => 16, 94 => 16, 122 => 16,
-                                       20  => 20, 21 => 21, 22 => 22, 24 => 22, 26 => 22, 23 => 23, 25 => 23, 27 => 23,
-                                       28  => 28, 29 => 28, 30 => 30, 31 => 31, 32 => 32, 33 => 33, 34 => 34, 35 => 35,
-                                       36  => 36, 37 => 37, 38 => 38, 39 => 39, 41 => 39, 40 => 40, 42 => 42, 43 => 43,
-                                       45  => 45, 46 => 46, 47 => 47, 48 => 48, 50 => 48, 49 => 49, 51 => 49, 52 => 52,
-                                       53  => 53, 54 => 54, 55 => 55, 56 => 56, 57 => 57, 58 => 58, 59 => 59, 60 => 60,
-                                       61  => 61, 70 => 61, 156 => 61, 160 => 61, 164 => 61, 165 => 61, 62 => 62,
-                                       157 => 62, 163 => 62, 63 => 63, 64 => 64, 65 => 64, 66 => 66, 142 => 66,
-                                       69  => 69, 71 => 71, 72 => 72, 73 => 72, 74 => 74, 78 => 78, 79 => 79, 80 => 79,
-                                       82  => 82, 107 => 82, 83 => 83, 84 => 84, 85 => 85, 86 => 86, 87 => 87, 88 => 88,
-                                       89  => 89, 92 => 92, 97 => 97, 98 => 98, 99 => 99, 100 => 100, 102 => 102,
-                                       105 => 105, 106 => 106, 109 => 109, 112 => 112, 113 => 113, 114 => 114,
-                                       116 => 116, 117 => 117, 118 => 118, 119 => 119, 120 => 120, 121 => 121,
-                                       123 => 123, 177 => 123, 124 => 124, 125 => 125, 126 => 126, 127 => 127,
-                                       128 => 128, 129 => 129, 137 => 129, 130 => 130, 131 => 131, 132 => 132,
-                                       133 => 132, 135 => 132, 136 => 132, 134 => 134, 138 => 138, 139 => 139,
-                                       140 => 140, 181 => 140, 141 => 141, 143 => 143, 144 => 144, 145 => 145,
-                                       146 => 146, 147 => 147, 148 => 148, 149 => 149, 150 => 150, 151 => 151,
-                                       152 => 152, 153 => 153, 154 => 154, 155 => 155, 158 => 158, 159 => 159,
-                                       161 => 161, 162 => 162, 166 => 166, 167 => 167, 168 => 168, 169 => 169,
-                                       170 => 170, 171 => 171, 172 => 172, 173 => 173, 174 => 174, 176 => 176,
-                                       178 => 178, 179 => 179, 182 => 182, 183 => 183, 184 => 184, 185 => 185,
-                                       186 => 185, 188 => 185, 187 => 187, 189 => 189, 190 => 190, 191 => 191,);
-
-    #line 201 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r0()
-    {
-        $this->_retvalue = $this->root_buffer->to_smarty_php();
-    }
-
-    #line 209 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r1()
-    {
-        if ($this->yystack[$this->yyidx + 0]->minor != null) {
-            $this->current_buffer->append_subtree($this->yystack[$this->yyidx + 0]->minor);
-        }
-    }
-
-    #line 216 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r2()
-    {
-        if ($this->yystack[$this->yyidx + 0]->minor != null) {
-            // because of possible code injection
-            $this->current_buffer->append_subtree($this->yystack[$this->yyidx + 0]->minor);
-        }
-    }
-
-    #line 230 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r4()
-    {
-        if ($this->compiler->has_code) {
-            $this->_retvalue = $this->mergePrefixCode($this->yystack[$this->yyidx + 0]->minor);
-        } else {
-            $this->_retvalue = null;
-        }
-        $this->compiler->has_variable_string = false;
-        $this->block_nesting_level = count($this->compiler->_tag_stack);
-    }
-
-    #line 241 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r5()
-    {
-        $this->_retvalue = new Smarty_Internal_ParseTree_Text($this, $this->yystack[$this->yyidx + 0]->minor);
-    }
-
-    #line 245 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r6()
-    {
-        $code = $this->compiler->compileTag('private_php', array(array('code' => $this->yystack[$this->yyidx + 0]->minor),
-            array('type' => $this->lex->phpType)), array());
-        if ($this->compiler->has_code && !empty($code)) {
-            $tmp = '';
-            foreach ($this->compiler->prefix_code as $code) {
-                $tmp .= $code;
-            }
-            $this->compiler->prefix_code = array();
-            $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp . $code, true));
-        } else {
-            $this->_retvalue = null;
-        }
-    }
-
-    #line 256 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r7()
-    {
-        $this->compiler->tag_nocache = true;
-        $save = $this->template->has_nocache_code;
-        $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode("<?php echo '{$this->yystack[$this->yyidx + 0]->minor}';?>\n", $this->compiler, true));
-        $this->template->has_nocache_code = $save;
-    }
-
-    #line 263 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r8()
-    {
-        $this->_retvalue = $this->compiler->processText($this->yystack[$this->yyidx + 0]->minor);
-    }
-
-    #line 267 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r9()
-    {
-        $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
-    }
-
-    #line 271 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r10()
-    {
-        $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor;
-    }
-
-    #line 276 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r11()
-    {
-        $this->strip = true;
-    }
-
-    #line 280 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r12()
-    {
-        $this->strip = false;
-    }
-
-    #line 284 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r13()
-    {
-        if ($this->strip) {
-            SMARTY_INTERNAL_COMPILE_BLOCK::blockSource($this->compiler, preg_replace('![\t ]*[\r\n]+[\t ]*!', '', $this->yystack[$this->yyidx + 0]->minor));
-        } else {
-            SMARTY_INTERNAL_COMPILE_BLOCK::blockSource($this->compiler, $this->yystack[$this->yyidx + 0]->minor);
-        }
-    }
-
-    #line 293 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r14()
-    {
-        $this->_retvalue = '';
-    }
-
-    #line 297 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r15()
-    {
-        $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor;
-    }
-
-    #line 301 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r16()
-    {
-        $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor;
-    }
-
-    #line 317 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r20()
-    {
-        $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor;
-    }
-
-    #line 323 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r21()
-    {
-        $var = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->lex->ldel_length, - $this->lex->rdel_length), ' $');
-        if (preg_match('/^(.*)(\s+nocache)$/', $var, $match)) {
-            $this->_retvalue = $this->compiler->compileTag('private_print_expression', array('nocache'), array('value' => $this->compiler->compileVariable('\'' . $match[1] . '\'')));
-        } else {
-            $this->_retvalue = $this->compiler->compileTag('private_print_expression', array(), array('value' => $this->compiler->compileVariable('\'' . $var . '\'')));
-        }
-    }
-
-    #line 333 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r22()
-    {
-        $this->_retvalue = $this->compiler->compileTag('private_print_expression', array(), array('value' => $this->yystack[$this->yyidx + 0]->minor));
-    }
-
-    #line 337 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r23()
-    {
-        $this->_retvalue = $this->compiler->compileTag('private_print_expression', $this->yystack[$this->yyidx + 0]->minor, array('value' => $this->yystack[$this->yyidx + - 1]->minor));
-    }
-
-    #line 360 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r28()
-    {
-        $this->_retvalue = $this->compiler->compileTag('assign', array(array('value' => $this->yystack[$this->yyidx + 0]->minor),
-            array('var' => '\'' . substr($this->yystack[$this->yyidx + - 2]->minor, 1) . '\'')));
-    }
-
-    #line 368 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r30()
-    {
-        $this->_retvalue = $this->compiler->compileTag('assign', array_merge(array(array('value' => $this->yystack[$this->yyidx + - 1]->minor),
-                                                                                 array('var' => '\'' . substr($this->yystack[$this->yyidx + - 3]->minor, 1) . '\'')), $this->yystack[$this->yyidx + 0]->minor));
-    }
-
-    #line 372 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r31()
-    {
-        $this->_retvalue = $this->compiler->compileTag('assign', array_merge(array(array('value' => $this->yystack[$this->yyidx + - 1]->minor),
-                                                                                 array('var' => $this->yystack[$this->yyidx + - 3]->minor['var'])), $this->yystack[$this->yyidx + 0]->minor), array('smarty_internal_index' => $this->yystack[$this->yyidx + - 3]->minor['smarty_internal_index']));
-    }
-
-    #line 377 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r32()
-    {
-        $tag = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->lex->ldel_length, - $this->lex->rdel_length));
-        if ($tag == 'strip') {
-            $this->strip = true;
-            $this->_retvalue = null;;
-        } else {
-            if (defined($tag)) {
-                if ($this->security) {
-                    $this->security->isTrustedConstant($tag, $this->compiler);
-                }
-                $this->_retvalue = $this->compiler->compileTag('private_print_expression', array(), array('value' => $tag));
-            } else {
-                if (preg_match('/^(.*)(\s+nocache)$/', $tag, $match)) {
-                    $this->_retvalue = $this->compiler->compileTag($match[1], array("'nocache'"));
-                } else {
-                    $this->_retvalue = $this->compiler->compileTag($tag, array());
-                }
-            }
-        }
-    }
-
-    #line 399 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r33()
-    {
-        if (defined($this->yystack[$this->yyidx + - 1]->minor)) {
-            if ($this->security) {
-                $this->security->isTrustedConstant($this->yystack[$this->yyidx + - 1]->minor, $this->compiler);
-            }
-            $this->_retvalue = $this->compiler->compileTag('private_print_expression', $this->yystack[$this->yyidx + 0]->minor, array('value' => $this->yystack[$this->yyidx + - 1]->minor));
-        } else {
-            $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor);
-        }
-    }
-
-    #line 409 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r34()
-    {
-        if (defined($this->yystack[$this->yyidx + 0]->minor)) {
-            if ($this->security) {
-                $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
-            }
-            $this->_retvalue = $this->compiler->compileTag('private_print_expression', array(), array('value' => $this->yystack[$this->yyidx + 0]->minor));
-        } else {
-            $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + 0]->minor, array());
-        }
-    }
-
-    #line 422 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r35()
-    {
-        if (defined($this->yystack[$this->yyidx + - 2]->minor)) {
-            if ($this->security) {
-                $this->security->isTrustedConstant($this->yystack[$this->yyidx + - 2]->minor, $this->compiler);
-            }
-            $this->_retvalue = $this->compiler->compileTag('private_print_expression', $this->yystack[$this->yyidx + 0]->minor, array('value'        => $this->yystack[$this->yyidx + - 2]->minor,
-                                                                                                                                      'modifierlist' => $this->yystack[$this->yyidx + - 1]->minor));
-        } else {
-            $this->_retvalue = '<?php ob_start();?>' . $this->compiler->compileTag($this->yystack[$this->yyidx + - 2]->minor, $this->yystack[$this->yyidx + 0]->minor) . '<?php echo ';
-            $this->_retvalue .= $this->compiler->compileTag('private_modifier', array(), array('modifierlist' => $this->yystack[$this->yyidx + - 1]->minor,
-                                                                                               'value'        => 'ob_get_clean()')) . ';?>';
-        }
-    }
-
-    #line 435 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r36()
-    {
-        $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + - 3]->minor, $this->yystack[$this->yyidx + 0]->minor, array('object_method' => $this->yystack[$this->yyidx + - 1]->minor));
-    }
-
-    #line 440 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r37()
-    {
-        $this->_retvalue = '<?php ob_start();?>' . $this->compiler->compileTag($this->yystack[$this->yyidx + - 4]->minor, $this->yystack[$this->yyidx + 0]->minor, array('object_method' => $this->yystack[$this->yyidx + - 2]->minor)) . '<?php echo ';
-        $this->_retvalue .= $this->compiler->compileTag('private_modifier', array(), array('modifierlist' => $this->yystack[$this->yyidx + - 1]->minor,
-                                                                                           'value'        => 'ob_get_clean()')) . ';?>';
-    }
-
-    #line 446 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r38()
-    {
-        $tag = trim(substr($this->yystack[$this->yyidx + - 1]->minor, $this->lex->ldel_length));
-        $this->_retvalue = $this->compiler->compileTag(($tag == 'else if') ? 'elseif' : $tag, array(), array('if condition' => $this->yystack[$this->yyidx + 0]->minor));
-    }
-
-    #line 451 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r39()
-    {
-        $tag = trim(substr($this->yystack[$this->yyidx + - 2]->minor, $this->lex->ldel_length));
-        $this->_retvalue = $this->compiler->compileTag(($tag == 'else if') ? 'elseif' : $tag, $this->yystack[$this->yyidx + 0]->minor, array('if condition' => $this->yystack[$this->yyidx + - 1]->minor));
-    }
-
-    #line 456 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r40()
-    {
-        $tag = trim(substr($this->yystack[$this->yyidx + - 1]->minor, $this->lex->ldel_length));
-        $this->_retvalue = $this->compiler->compileTag(($tag == 'else if') ? 'elseif' : $tag, array(), array('if condition' => $this->yystack[$this->yyidx + 0]->minor));
-    }
-
-    #line 467 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r42()
-    {
-        $this->_retvalue = $this->compiler->compileTag('for', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('start' => $this->yystack[$this->yyidx + - 6]->minor),
-            array('ifexp' => $this->yystack[$this->yyidx + - 4]->minor),
-            array('var' => $this->yystack[$this->yyidx + - 2]->minor),
-            array('step' => $this->yystack[$this->yyidx + - 1]->minor))), 1);
-    }
-
-    #line 471 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r43()
-    {
-        $this->_retvalue = '=' . $this->yystack[$this->yyidx + 0]->minor;
-    }
-
-    #line 479 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r45()
-    {
-        $this->_retvalue = $this->compiler->compileTag('for', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('start' => $this->yystack[$this->yyidx + - 3]->minor),
-            array('to' => $this->yystack[$this->yyidx + - 1]->minor))), 0);
-    }
-
-    #line 483 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r46()
-    {
-        $this->_retvalue = $this->compiler->compileTag('for', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('start' => $this->yystack[$this->yyidx + - 5]->minor),
-            array('to' => $this->yystack[$this->yyidx + - 3]->minor),
-            array('step' => $this->yystack[$this->yyidx + - 1]->minor))), 0);
-    }
-
-    #line 488 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r47()
-    {
-        $this->_retvalue = $this->compiler->compileTag('foreach', $this->yystack[$this->yyidx + 0]->minor);
-    }
-
-    #line 493 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r48()
-    {
-        $this->_retvalue = $this->compiler->compileTag('foreach', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('from' => $this->yystack[$this->yyidx + - 3]->minor),
-            array('item' => $this->yystack[$this->yyidx + - 1]->minor))));
-    }
-
-    #line 497 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r49()
-    {
-        $this->_retvalue = $this->compiler->compileTag('foreach', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('from' => $this->yystack[$this->yyidx + - 5]->minor),
-            array('item' => $this->yystack[$this->yyidx + - 1]->minor),
-            array('key' => $this->yystack[$this->yyidx + - 3]->minor))));
-    }
-
-    #line 510 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r52()
-    {
-        $this->_retvalue = $this->compiler->compileTag('setfilter', array(), array('modifier_list' => array(array_merge(array($this->yystack[$this->yyidx + - 1]->minor), $this->yystack[$this->yyidx + 0]->minor))));
-    }
-
-    #line 514 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r53()
-    {
-        $this->_retvalue = $this->compiler->compileTag('setfilter', array(), array('modifier_list' => array_merge(array(array_merge(array($this->yystack[$this->yyidx + - 2]->minor), $this->yystack[$this->yyidx + - 1]->minor)), $this->yystack[$this->yyidx + 0]->minor)));
-    }
-
-    #line 519 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r54()
-    {
-        $j = strrpos($this->yystack[$this->yyidx + 0]->minor, '.');
-        if ($this->yystack[$this->yyidx + 0]->minor[$j + 1] == 'c') {
-            // {$smarty.block.child}
-            $this->_retvalue = SMARTY_INTERNAL_COMPILE_BLOCK::compileChildBlock($this->compiler);
-        } else {
-            // {$smarty.block.parent}
-            $this->_retvalue = SMARTY_INTERNAL_COMPILE_BLOCK::compileParentBlock($this->compiler);
-        }
-    }
-
-    #line 532 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r55()
-    {
-        $tag = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->lex->ldel_length, - $this->lex->rdel_length), ' /');
-        if ($tag == 'strip') {
-            $this->strip = false;
-            $this->_retvalue = null;
-        } else {
-            $this->_retvalue = $this->compiler->compileTag($tag . 'close', array());
-        }
-    }
-
-    #line 541 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r56()
-    {
-        $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + 0]->minor . 'close', array());
-    }
-
-    #line 545 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r57()
-    {
-        $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + - 1]->minor . 'close', array(), array('modifier_list' => $this->yystack[$this->yyidx + 0]->minor));
-    }
-
-    #line 550 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r58()
-    {
-        $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + - 2]->minor . 'close', array(), array('object_method' => $this->yystack[$this->yyidx + 0]->minor));
-    }
-
-    #line 554 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r59()
-    {
-        $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + - 3]->minor . 'close', array(), array('object_method' => $this->yystack[$this->yyidx + - 1]->minor,
-                                                                                                                           'modifier_list' => $this->yystack[$this->yyidx + 0]->minor));
-    }
-
-    #line 562 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r60()
-    {
-        $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor;
-        $this->_retvalue[] = $this->yystack[$this->yyidx + 0]->minor;
-    }
-
-    #line 568 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r61()
-    {
-        $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);
-    }
-
-    #line 573 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r62()
-    {
-        $this->_retvalue = array();
-    }
-
-    #line 578 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r63()
-    {
-        if (defined($this->yystack[$this->yyidx + 0]->minor)) {
-            if ($this->security) {
-                $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
-            }
-            $this->_retvalue = array($this->yystack[$this->yyidx + - 2]->minor => $this->yystack[$this->yyidx + 0]->minor);
-        } else {
-            $this->_retvalue = array($this->yystack[$this->yyidx + - 2]->minor => '\'' . $this->yystack[$this->yyidx + 0]->minor . '\'');
-        }
-    }
-
-    #line 589 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r64()
-    {
-        $this->_retvalue = array(trim($this->yystack[$this->yyidx + - 1]->minor, " =\n\r\t") => $this->yystack[$this->yyidx + 0]->minor);
-    }
-
-    #line 597 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r66()
-    {
-        $this->_retvalue = '\'' . $this->yystack[$this->yyidx + 0]->minor . '\'';
-    }
-
-    #line 609 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r69()
-    {
-        $this->_retvalue = array($this->yystack[$this->yyidx + - 2]->minor => $this->yystack[$this->yyidx + 0]->minor);
-    }
-
-    #line 622 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r71()
-    {
-        $this->yystack[$this->yyidx + - 2]->minor[] = $this->yystack[$this->yyidx + 0]->minor;
-        $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor;
-    }
-
-    #line 627 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r72()
-    {
-        $this->_retvalue = array('var'   => '\'' . substr($this->yystack[$this->yyidx + - 2]->minor, 1) . '\'',
-                                 'value' => $this->yystack[$this->yyidx + 0]->minor);
-    }
-
-    #line 634 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r74()
-    {
-        $this->_retvalue = array('var'   => $this->yystack[$this->yyidx + - 2]->minor,
-                                 'value' => $this->yystack[$this->yyidx + 0]->minor);
-    }
-
-    #line 658 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r78()
-    {
-        $this->_retvalue = '$_smarty_tpl->getStreamVariable(\'' . substr($this->yystack[$this->yyidx + - 2]->minor, 1) . '://' . $this->yystack[$this->yyidx + 0]->minor . '\')';
-    }
-
-    #line 663 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r79()
-    {
-        $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . trim($this->yystack[$this->yyidx + - 1]->minor) . $this->yystack[$this->yyidx + 0]->minor;
-    }
-
-    #line 677 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r82()
-    {
-        $this->_retvalue = $this->compiler->compileTag('private_modifier', array(), array('value'        => $this->yystack[$this->yyidx + - 1]->minor,
-                                                                                          'modifierlist' => $this->yystack[$this->yyidx + 0]->minor));
-    }
-
-    #line 683 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r83()
-    {
-        $this->_retvalue = (isset($this->yystack[$this->yyidx + - 1]->minor['pre']) ? $this->yystack[$this->yyidx + - 1]->minor['pre'] : '') . $this->yystack[$this->yyidx + - 2]->minor . $this->yystack[$this->yyidx + - 1]->minor['op'] . $this->yystack[$this->yyidx + 0]->minor . (isset($this->yystack[$this->yyidx + - 1]->minor['pre']) ? ')' : '');
-    }
-
-    #line 686 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r84()
-    {
-        $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor . $this->yystack[$this->yyidx + - 1]->minor . ')';
-    }
-
-    #line 690 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r85()
-    {
-        $this->_retvalue = 'in_array(' . $this->yystack[$this->yyidx + - 2]->minor . ',' . $this->yystack[$this->yyidx + 0]->minor . ')';
-    }
-
-    #line 694 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r86()
-    {
-        $this->_retvalue = 'in_array(' . $this->yystack[$this->yyidx + - 2]->minor . ',(array)' . $this->yystack[$this->yyidx + 0]->minor . ')';
-    }
-
-    #line 698 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r87()
-    {
-        $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor;
-    }
-
-    #line 706 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r88()
-    {
-        $this->_retvalue = $this->yystack[$this->yyidx + - 5]->minor . ' ? ' . $this->compiler->compileVariable('\'' . substr($this->yystack[$this->yyidx + - 2]->minor, 1) . '\'') . ' : ' . $this->yystack[$this->yyidx + 0]->minor;
-    }
-
-    #line 710 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r89()
-    {
-        $this->_retvalue = $this->yystack[$this->yyidx + - 5]->minor . ' ? ' . $this->yystack[$this->yyidx + - 2]->minor . ' : ' . $this->yystack[$this->yyidx + 0]->minor;
-    }
-
-    #line 725 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r92()
-    {
-        $this->_retvalue = '!' . $this->yystack[$this->yyidx + 0]->minor;
-    }
-
-    #line 746 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r97()
-    {
-        $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . '.' . $this->yystack[$this->yyidx + 0]->minor;
-    }
-
-    #line 750 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r98()
-    {
-        $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor . '.';
-    }
-
-    #line 754 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r99()
-    {
-        $this->_retvalue = '.' . $this->yystack[$this->yyidx + 0]->minor;
-    }
-
-    #line 759 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r100()
-    {
-        if (defined($this->yystack[$this->yyidx + 0]->minor)) {
-            if ($this->security) {
-                $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
-            }
-            $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
-        } else {
-            $this->_retvalue = '\'' . $this->yystack[$this->yyidx + 0]->minor . '\'';
-        }
-    }
-
-    #line 776 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r102()
-    {
-        $this->_retvalue = "(" . $this->yystack[$this->yyidx + - 1]->minor . ")";
-    }
-
-    #line 791 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r105()
-    {
-        self::$prefix_number ++;
-        if ($this->yystack[$this->yyidx + - 2]->minor['var'] == '\'smarty\'') {
-            $this->compiler->prefix_code[] = '<?php $_tmp' . self::$prefix_number . ' = ' . $this->compiler->compileTag('private_special_variable', array(), $this->yystack[$this->yyidx + - 2]->minor['smarty_internal_index']) . ';?>';
-        } else {
-            $this->compiler->prefix_code[] = '<?php $_tmp' . self::$prefix_number . ' = ' . $this->compiler->compileVariable($this->yystack[$this->yyidx + - 2]->minor['var']) . $this->yystack[$this->yyidx + - 2]->minor['smarty_internal_index'] . ';?>';
-        }
-        $this->_retvalue = '$_tmp' . self::$prefix_number . '::' . $this->yystack[$this->yyidx + 0]->minor[0] . $this->yystack[$this->yyidx + 0]->minor[1];
-    }
-
-    #line 802 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r106()
-    {
-        self::$prefix_number ++;
-        $tmp = $this->compiler->appendCode('<?php ob_start();?>', $this->yystack[$this->yyidx + 0]->minor);
-        $this->compiler->prefix_code[] = $this->compiler->appendCode($tmp, '<?php $_tmp' . self::$prefix_number . '=ob_get_clean();?>');
-        $this->_retvalue = '$_tmp' . self::$prefix_number;
-    }
-
-    #line 819 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r109()
-    {
-        if (!in_array(strtolower($this->yystack[$this->yyidx + - 2]->minor), array('self',
-                'parent')) && (!$this->security || $this->security->isTrustedStaticClassAccess($this->yystack[$this->yyidx + - 2]->minor, $this->yystack[$this->yyidx + 0]->minor, $this->compiler))
-        ) {
-            if (isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + - 2]->minor])) {
-                $this->_retvalue = $this->smarty->registered_classes[$this->yystack[$this->yyidx + - 2]->minor] . '::' . $this->yystack[$this->yyidx + 0]->minor[0] . $this->yystack[$this->yyidx + 0]->minor[1];
-            } else {
-                $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . '::' . $this->yystack[$this->yyidx + 0]->minor[0] . $this->yystack[$this->yyidx + 0]->minor[1];
-            }
-        } else {
-            $this->compiler->trigger_template_error("static class '" . $this->yystack[$this->yyidx + - 2]->minor . "' is undefined or not allowed by security setting");
-        }
-    }
-
-    #line 853 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r112()
-    {
-        $this->_retvalue = $this->compiler->compileVariable('\'' . substr($this->yystack[$this->yyidx + 0]->minor, 1) . '\'');
-    }
-
-    #line 856 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r113()
-    {
-        if ($this->yystack[$this->yyidx + 0]->minor['var'] == '\'smarty\'') {
-            $smarty_var = $this->compiler->compileTag('private_special_variable', array(), $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']);
-            $this->_retvalue = $smarty_var;
-        } else {
-            // used for array reset,next,prev,end,current 
-            $this->last_variable = $this->yystack[$this->yyidx + 0]->minor['var'];
-            $this->last_index = $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
-            $this->_retvalue = $this->compiler->compileVariable($this->yystack[$this->yyidx + 0]->minor['var']) . $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
-        }
-    }
-
-    #line 869 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r114()
-    {
-        $this->_retvalue = '$_smarty_tpl->tpl_vars[' . $this->yystack[$this->yyidx + - 2]->minor . ']->' . $this->yystack[$this->yyidx + 0]->minor;
-    }
-
-    #line 879 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r116()
-    {
-        $this->_retvalue = '$_smarty_tpl->getConfigVariable( \'' . $this->yystack[$this->yyidx + - 1]->minor . '\')';
-    }
-
-    #line 883 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r117()
-    {
-        $this->_retvalue = '(is_array($tmp = $_smarty_tpl->getConfigVariable( \'' . $this->yystack[$this->yyidx + - 2]->minor . '\')) ? $tmp' . $this->yystack[$this->yyidx + 0]->minor . ' :null)';
-    }
-
-    #line 887 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r118()
-    {
-        $this->_retvalue = '$_smarty_tpl->getConfigVariable( ' . $this->yystack[$this->yyidx + - 1]->minor . ')';
-    }
-
-    #line 891 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r119()
-    {
-        $this->_retvalue = '(is_array($tmp = $_smarty_tpl->getConfigVariable( ' . $this->yystack[$this->yyidx + - 2]->minor . ')) ? $tmp' . $this->yystack[$this->yyidx + 0]->minor . ' : null)';
-    }
-
-    #line 895 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r120()
-    {
-        $this->_retvalue = array('var'                   => '\'' . substr($this->yystack[$this->yyidx + - 1]->minor, 1) . '\'',
-                                 'smarty_internal_index' => $this->yystack[$this->yyidx + 0]->minor);
-    }
-
-    #line 898 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r121()
-    {
-        $this->_retvalue = array('var'                   => $this->yystack[$this->yyidx + - 1]->minor,
-                                 'smarty_internal_index' => $this->yystack[$this->yyidx + 0]->minor);
-    }
-
-    #line 911 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r123()
-    {
-        return;
-    }
-
-    #line 917 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r124()
-    {
-        $this->_retvalue = '[' . $this->compiler->compileVariable('\'' . substr($this->yystack[$this->yyidx + 0]->minor, 1) . '\'') . ']';
-    }
-
-    #line 920 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r125()
-    {
-        $this->_retvalue = '[' . $this->compiler->compileVariable($this->yystack[$this->yyidx + 0]->minor) . ']';
-    }
-
-    #line 924 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r126()
-    {
-        $this->_retvalue = '[' . $this->compiler->compileVariable($this->yystack[$this->yyidx + - 2]->minor) . '->' . $this->yystack[$this->yyidx + 0]->minor . ']';
-    }
-
-    #line 928 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r127()
-    {
-        if (defined($this->yystack[$this->yyidx + 0]->minor)) {
-            if ($this->security) {
-                $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
-            }
-            $this->_retvalue = '[' . $this->yystack[$this->yyidx + 0]->minor . ']';
-        } else {
-            $this->_retvalue = "['" . $this->yystack[$this->yyidx + 0]->minor . "']";
-        }
-    }
-
-    #line 939 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r128()
-    {
-        $this->_retvalue = '[' . $this->yystack[$this->yyidx + 0]->minor . ']';
-    }
-
-    #line 943 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r129()
-    {
-        $this->_retvalue = '[' . $this->yystack[$this->yyidx + - 1]->minor . ']';
-    }
-
-    #line 948 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r130()
-    {
-        $this->_retvalue = '[' . $this->compiler->compileTag('private_special_variable', array(), '[\'section\'][\'' . $this->yystack[$this->yyidx + - 1]->minor . '\'][\'index\']') . ']';
-    }
-
-    #line 952 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r131()
-    {
-        $this->_retvalue = '[' . $this->compiler->compileTag('private_special_variable', array(), '[\'section\'][\'' . $this->yystack[$this->yyidx + - 3]->minor . '\'][\'' . $this->yystack[$this->yyidx + - 1]->minor . '\']') . ']';
-    }
-
-    #line 955 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r132()
-    {
-        $this->_retvalue = '[' . $this->yystack[$this->yyidx + - 1]->minor . ']';
-    }
-
-    #line 961 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r134()
-    {
-        $this->_retvalue = '[' . $this->compiler->compileVariable('\'' . substr($this->yystack[$this->yyidx + - 1]->minor, 1) . '\'') . ']';;
-    }
-
-    #line 977 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r138()
-    {
-        $this->_retvalue = '[]';
-    }
-
-    #line 987 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r139()
-    {
-        $this->_retvalue = '\'' . substr($this->yystack[$this->yyidx + 0]->minor, 1) . '\'';
-    }
-
-    #line 991 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r140()
-    {
-        $this->_retvalue = "''";
-    }
-
-    #line 996 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r141()
-    {
-        $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor . '.' . $this->yystack[$this->yyidx + 0]->minor;
-    }
-
-    #line 1006 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r143()
-    {
-        $this->_retvalue = '(' . $this->yystack[$this->yyidx + - 1]->minor . ')';
-    }
-
-    #line 1013 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r144()
-    {
-        if ($this->yystack[$this->yyidx + - 1]->minor['var'] == '\'smarty\'') {
-            $this->_retvalue = $this->compiler->compileTag('private_special_variable', array(), $this->yystack[$this->yyidx + - 1]->minor['smarty_internal_index']) . $this->yystack[$this->yyidx + 0]->minor;
-        } else {
-            $this->_retvalue = $this->compiler->compileVariable($this->yystack[$this->yyidx + - 1]->minor['var']) . $this->yystack[$this->yyidx + - 1]->minor['smarty_internal_index'] . $this->yystack[$this->yyidx + 0]->minor;
-        }
-    }
-
-    #line 1022 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r145()
-    {
-        $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
-    }
-
-    #line 1027 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r146()
-    {
-        $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor;
-    }
-
-    #line 1032 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r147()
-    {
-        if ($this->security && substr($this->yystack[$this->yyidx + - 1]->minor, 0, 1) == '_') {
-            $this->compiler->trigger_template_error(self::Err1);
-        }
-        $this->_retvalue = '->' . $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor;
-    }
-
-    #line 1039 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r148()
-    {
-        if ($this->security) {
-            $this->compiler->trigger_template_error(self::Err2);
-        }
-        $this->_retvalue = '->{' . $this->compiler->compileVariable($this->yystack[$this->yyidx + - 1]->minor) . $this->yystack[$this->yyidx + 0]->minor . '}';
-    }
-
-    #line 1046 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r149()
-    {
-        if ($this->security) {
-            $this->compiler->trigger_template_error(self::Err2);
-        }
-        $this->_retvalue = '->{' . $this->yystack[$this->yyidx + - 2]->minor . $this->yystack[$this->yyidx + 0]->minor . '}';
-    }
-
-    #line 1053 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r150()
-    {
-        if ($this->security) {
-            $this->compiler->trigger_template_error(self::Err2);
-        }
-        $this->_retvalue = '->{\'' . $this->yystack[$this->yyidx + - 4]->minor . '\'.' . $this->yystack[$this->yyidx + - 2]->minor . $this->yystack[$this->yyidx + 0]->minor . '}';
-    }
-
-    #line 1061 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r151()
-    {
-        $this->_retvalue = '->' . $this->yystack[$this->yyidx + 0]->minor;
-    }
-
-    #line 1069 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r152()
-    {
-        if (!$this->security || $this->security->isTrustedPhpFunction($this->yystack[$this->yyidx + - 3]->minor, $this->compiler)) {
-            if (strcasecmp($this->yystack[$this->yyidx + - 3]->minor, 'isset') === 0 || strcasecmp($this->yystack[$this->yyidx + - 3]->minor, 'empty') === 0 || strcasecmp($this->yystack[$this->yyidx + - 3]->minor, 'array') === 0 || is_callable($this->yystack[$this->yyidx + - 3]->minor)) {
-                $func_name = strtolower($this->yystack[$this->yyidx + - 3]->minor);
-                if ($func_name == 'isset') {
-                    if (count($this->yystack[$this->yyidx + - 1]->minor) == 0) {
-                        $this->compiler->trigger_template_error('Illegal number of paramer in "isset()"');
-                    }
-                    $par = implode(',', $this->yystack[$this->yyidx + - 1]->minor);
-                    if (strncasecmp($par, '$_smarty_tpl->getConfigVariable', strlen('$_smarty_tpl->getConfigVariable')) === 0) {
-                        self::$prefix_number ++;
-                        $this->compiler->prefix_code[] = '<?php $_tmp' . self::$prefix_number . '=' . str_replace(')', ', false)', $par) . ';?>';
-                        $isset_par = '$_tmp' . self::$prefix_number;
-                    } else {
-                        $isset_par = str_replace("')->value", "',null,true,false)->value", $par);
-                    }
-                    $this->_retvalue = $this->yystack[$this->yyidx + - 3]->minor . "(" . $isset_par . ")";
-                } elseif (in_array($func_name, array('empty', 'reset', 'current', 'end', 'prev', 'next'))) {
-                    if (count($this->yystack[$this->yyidx + - 1]->minor) != 1) {
-                        $this->compiler->trigger_template_error('Illegal number of paramer in "empty()"');
-                    }
-                    if ($func_name == 'empty') {
-                        $this->_retvalue = $func_name . '(' . str_replace("')->value", "',null,true,false)->value", $this->yystack[$this->yyidx + - 1]->minor[0]) . ')';
-                    } else {
-                        $this->_retvalue = $func_name . '(' . $this->yystack[$this->yyidx + - 1]->minor[0] . ')';
-                    }
-                } else {
-                    $this->_retvalue = $this->yystack[$this->yyidx + - 3]->minor . "(" . implode(',', $this->yystack[$this->yyidx + - 1]->minor) . ")";
-                }
-            } else {
-                $this->compiler->trigger_template_error("unknown function \"" . $this->yystack[$this->yyidx + - 3]->minor . "\"");
-            }
-        }
-    }
-
-    #line 1108 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r153()
-    {
-        if ($this->security && substr($this->yystack[$this->yyidx + - 3]->minor, 0, 1) == '_') {
-            $this->compiler->trigger_template_error(self::Err1);
-        }
-        $this->_retvalue = $this->yystack[$this->yyidx + - 3]->minor . "(" . implode(',', $this->yystack[$this->yyidx + - 1]->minor) . ")";
-    }
-
-    #line 1115 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r154()
-    {
-        if ($this->security) {
-            $this->compiler->trigger_template_error(self::Err2);
-        }
-        self::$prefix_number ++;
-        $this->compiler->prefix_code[] = '<?php $_tmp' . self::$prefix_number . '=' . $this->compiler->compileVariable('\'' . substr($this->yystack[$this->yyidx + - 3]->minor, 1) . '\'') . ';?>';
-        $this->_retvalue = '$_tmp' . self::$prefix_number . '(' . implode(',', $this->yystack[$this->yyidx + - 1]->minor) . ')';
-    }
-
-    #line 1126 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r155()
-    {
-        $this->_retvalue = array_merge($this->yystack[$this->yyidx + - 2]->minor, array($this->yystack[$this->yyidx + 0]->minor));
-    }
-
-    #line 1143 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r158()
-    {
-        $this->_retvalue = array_merge($this->yystack[$this->yyidx + - 2]->minor, array(array_merge($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor)));
-    }
-
-    #line 1147 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r159()
-    {
-        $this->_retvalue = array(array_merge($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor));
-    }
-
-    #line 1155 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r161()
-    {
-        $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);
-    }
-
-    #line 1163 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r162()
-    {
-        $this->_retvalue = array_merge($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor);
-    }
-
-    #line 1182 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r166()
-    {
-        $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor, '', 'method');
-    }
-
-    #line 1187 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r167()
-    {
-        $this->_retvalue = array($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor,
-            'method');
-    }
-
-    #line 1192 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r168()
-    {
-        $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor, '');
-    }
-
-    #line 1197 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r169()
-    {
-        $this->_retvalue = array($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor,
-            'property');
-    }
-
-    #line 1202 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r170()
-    {
-        $this->_retvalue = array($this->yystack[$this->yyidx + - 2]->minor,
-            $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor, 'property');
-    }
-
-    #line 1208 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r171()
-    {
-        $this->_retvalue['op'] = ' ' . trim($this->yystack[$this->yyidx + 0]->minor) . ' ';
-    }
-
-    #line 1212 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r172()
-    {
-        static $lops = array('eq'          => array('op' => ' == ', 'pre' => null),
-                             'ne'          => array('op' => ' != ', 'pre' => null),
-                             'neq'         => array('op' => ' != ', 'pre' => null),
-                             'gt'          => array('op' => ' > ', 'pre' => null),
-                             'ge'          => array('op' => ' >= ', 'pre' => null),
-                             'gte'         => array('op' => ' >= ', 'pre' => null),
-                             'lt'          => array('op' => ' < ', 'pre' => null),
-                             'le'          => array('op' => ' <= ', 'pre' => null),
-                             'lte'         => array('op' => ' <= ', 'pre' => null),
-                             'mod'         => array('op' => ' % ', 'pre' => null),
-                             'and'         => array('op' => ' && ', 'pre' => null),
-                             'or'          => array('op' => ' || ', 'pre' => null),
-                             'xor'         => array('op' => ' xor ', 'pre' => null),
-                             'isdivby'     => array('op' => ' % ', 'pre' => '!('),
-                             'isnotdivby'  => array('op' => ' % ', 'pre' => '('),
-                             'isevenby'    => array('op' => ' / ', 'pre' => '!(1 & '),
-                             'isnotevenby' => array('op' => ' / ', 'pre' => '(1 & '),
-                             'isoddby'     => array('op' => ' / ', 'pre' => '(1 & '),
-                             'isnotoddby'  => array('op' => ' / ', 'pre' => '!(1 & '),);
-        $op = strtolower(preg_replace('/\s*/', '', $this->yystack[$this->yyidx + 0]->minor));
-        $this->_retvalue = $lops[$op];
-    }
-
-    #line 1238 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r173()
-    {
-        static $scond = array('iseven'   => '!(1 & ', 'isnoteven' => '(1 & ', 'isodd' => '(1 & ',
-                              'isnotodd' => '!(1 & ',);
-        $op = strtolower(str_replace(' ', '', $this->yystack[$this->yyidx + 0]->minor));
-        $this->_retvalue = $scond[$op];
-    }
-
-    #line 1252 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r174()
-    {
-        $this->_retvalue = 'array(' . $this->yystack[$this->yyidx + - 1]->minor . ')';
-    }
-
-    #line 1260 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r176()
-    {
-        $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . ',' . $this->yystack[$this->yyidx + 0]->minor;
-    }
-
-    #line 1268 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r178()
-    {
-        $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . '=>' . $this->yystack[$this->yyidx + 0]->minor;
-    }
-
-    #line 1272 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r179()
-    {
-        $this->_retvalue = '\'' . $this->yystack[$this->yyidx + - 2]->minor . '\'=>' . $this->yystack[$this->yyidx + 0]->minor;
-    }
-
-    #line 1288 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r182()
-    {
-        $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor->to_smarty_php();
-    }
-
-    #line 1293 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r183()
-    {
-        $this->yystack[$this->yyidx + - 1]->minor->append_subtree($this->yystack[$this->yyidx + 0]->minor);
-        $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor;
-    }
-
-    #line 1298 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r184()
-    {
-        $this->_retvalue = new Smarty_Internal_ParseTree_Dq($this, $this->yystack[$this->yyidx + 0]->minor);
-    }
-
-    #line 1302 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r185()
-    {
-        $this->_retvalue = new Smarty_Internal_ParseTree_Code($this, '(string)' . $this->yystack[$this->yyidx + - 1]->minor);
-    }
-
-    #line 1310 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r187()
-    {
-        $this->_retvalue = new Smarty_Internal_ParseTree_Code($this, '(string)$_smarty_tpl->tpl_vars[\'' . substr($this->yystack[$this->yyidx + 0]->minor, 1) . '\']->value');
-    }
-
-    #line 1318 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r189()
-    {
-        $this->_retvalue = new Smarty_Internal_ParseTree_Code($this, '(string)(' . $this->yystack[$this->yyidx + - 1]->minor . ')');
-    }
-
-    #line 1322 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r190()
-    {
-        $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this, $this->yystack[$this->yyidx + 0]->minor);
-    }
-
-    #line 1326 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r191()
-    {
-        $this->_retvalue = new Smarty_Internal_ParseTree_DqContent($this, $this->yystack[$this->yyidx + 0]->minor);
-    }
-
-    private $_retvalue;
-
-    public function yy_reduce($yyruleno)
-    {
-        if ($this->yyTraceFILE && $yyruleno >= 0 && $yyruleno < count(self::$yyRuleName)) {
-            fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n", $this->yyTracePrompt, $yyruleno, self::$yyRuleName[$yyruleno]);
-        }
-
-        $this->_retvalue = $yy_lefthand_side = null;
-        if (isset(self::$yyReduceMap[$yyruleno])) {
-            // call the action
-            $this->_retvalue = null;
-            $this->{'yy_r' . self::$yyReduceMap[$yyruleno]}();
-            $yy_lefthand_side = $this->_retvalue;
-        }
-        $yygoto = self::$yyRuleInfo[$yyruleno][0];
-        $yysize = self::$yyRuleInfo[$yyruleno][1];
-        $this->yyidx -= $yysize;
-        for ($i = $yysize; $i; $i --) {
-            // pop all of the right-hand side parameters
-            array_pop($this->yystack);
-        }
-        $yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto);
-        if ($yyact < self::YYNSTATE) {
-            if (!$this->yyTraceFILE && $yysize) {
-                $this->yyidx ++;
-                $x = new TP_yyStackEntry;
-                $x->stateno = $yyact;
-                $x->major = $yygoto;
-                $x->minor = $yy_lefthand_side;
-                $this->yystack[$this->yyidx] = $x;
-            } else {
-                $this->yy_shift($yyact, $yygoto, $yy_lefthand_side);
-            }
-        } elseif ($yyact == self::YYNSTATE + self::YYNRULE + 1) {
-            $this->yy_accept();
-        }
-    }
-
-    public function yy_parse_failed()
-    {
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt);
-        }
-        while ($this->yyidx >= 0) {
-            $this->yy_pop_parser_stack();
-        }
-    }
-
-    public function yy_syntax_error($yymajor, $TOKEN)
-    {
-        #line 183 "../smarty/lexer/smarty_internal_templateparser.y"
-
-        $this->internalError = true;
-        $this->yymajor = $yymajor;
-        $this->compiler->trigger_template_error();
-    }
-
-    public function yy_accept()
-    {
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt);
-        }
-        while ($this->yyidx >= 0) {
-            $this->yy_pop_parser_stack();
-        }
-        #line 176 "../smarty/lexer/smarty_internal_templateparser.y"
-
-        $this->successful = !$this->internalError;
-        $this->internalError = false;
-        $this->retvalue = $this->_retvalue;
-    }
-
-    public function doParse($yymajor, $yytokenvalue)
-    {
-        $yyerrorhit = 0;   /* True if yymajor has invoked an error */
-
-        if ($this->yyidx === null || $this->yyidx < 0) {
-            $this->yyidx = 0;
-            $this->yyerrcnt = - 1;
-            $x = new TP_yyStackEntry;
-            $x->stateno = 0;
-            $x->major = 0;
-            $this->yystack = array();
-            $this->yystack[] = $x;
-        }
-        $yyendofinput = ($yymajor == 0);
-
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sInput %s\n", $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
-        }
-
-        do {
-            $yyact = $this->yy_find_shift_action($yymajor);
-            if ($yymajor < self::YYERRORSYMBOL && !$this->yy_is_expected_token($yymajor)) {
-                // force a syntax error
-                $yyact = self::YY_ERROR_ACTION;
-            }
-            if ($yyact < self::YYNSTATE) {
-                $this->yy_shift($yyact, $yymajor, $yytokenvalue);
-                $this->yyerrcnt --;
-                if ($yyendofinput && $this->yyidx >= 0) {
-                    $yymajor = 0;
-                } else {
-                    $yymajor = self::YYNOCODE;
-                }
-            } elseif ($yyact < self::YYNSTATE + self::YYNRULE) {
-                $this->yy_reduce($yyact - self::YYNSTATE);
-            } elseif ($yyact == self::YY_ERROR_ACTION) {
-                if ($this->yyTraceFILE) {
-                    fprintf($this->yyTraceFILE, "%sSyntax Error!\n", $this->yyTracePrompt);
-                }
-                if (self::YYERRORSYMBOL) {
-                    if ($this->yyerrcnt < 0) {
-                        $this->yy_syntax_error($yymajor, $yytokenvalue);
-                    }
-                    $yymx = $this->yystack[$this->yyidx]->major;
-                    if ($yymx == self::YYERRORSYMBOL || $yyerrorhit) {
-                        if ($this->yyTraceFILE) {
-                            fprintf($this->yyTraceFILE, "%sDiscard input token %s\n", $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
-                        }
-                        $this->yy_destructor($yymajor, $yytokenvalue);
-                        $yymajor = self::YYNOCODE;
-                    } else {
-                        while ($this->yyidx >= 0 && $yymx != self::YYERRORSYMBOL && ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE) {
-                            $this->yy_pop_parser_stack();
-                        }
-                        if ($this->yyidx < 0 || $yymajor == 0) {
-                            $this->yy_destructor($yymajor, $yytokenvalue);
-                            $this->yy_parse_failed();
-                            $yymajor = self::YYNOCODE;
-                        } elseif ($yymx != self::YYERRORSYMBOL) {
-                            $u2 = 0;
-                            $this->yy_shift($yyact, self::YYERRORSYMBOL, $u2);
-                        }
-                    }
-                    $this->yyerrcnt = 3;
-                    $yyerrorhit = 1;
-                } else {
-                    if ($this->yyerrcnt <= 0) {
-                        $this->yy_syntax_error($yymajor, $yytokenvalue);
-                    }
-                    $this->yyerrcnt = 3;
-                    $this->yy_destructor($yymajor, $yytokenvalue);
-                    if ($yyendofinput) {
-                        $this->yy_parse_failed();
-                    }
-                    $yymajor = self::YYNOCODE;
-                }
-            } else {
-                $this->yy_accept();
-                $yymajor = self::YYNOCODE;
-            }
-        } while ($yymajor != self::YYNOCODE && $this->yyidx >= 0);
-    }
-}
-
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_testinstall.php b/www/smarty-3.1.27/sysplugins/smarty_internal_testinstall.php
deleted file mode 100644
index 1ba31638..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_testinstall.php
+++ /dev/null
@@ -1,571 +0,0 @@
-<?php
-/**
- * Smarty Internal TestInstall
- * Test Smarty installation
- *
- * @package    Smarty
- * @subpackage Utilities
- * @author     Uwe Tews
- */
-/**
- * TestInstall class
- *
- * @package    Smarty
- * @subpackage Utilities
- */
-class Smarty_Internal_TestInstall
-{
-    /**
-     * diagnose Smarty setup
-     * If $errors is secified, the diagnostic report will be appended to the array, rather than being output.
-     *
-     * @param  Smarty $smarty Smarty instance to test
-     * @param  array  $errors array to push results into rather than outputting them
-     *
-     * @return bool   status, true if everything is fine, false else
-     */
-    public static function testInstall(Smarty $smarty, &$errors = null)
-    {
-        $status = true;
-
-        if ($errors === null) {
-            echo "<PRE>\n";
-            echo "Smarty Installation test...\n";
-            echo "Testing template directory...\n";
-        }
-
-        $_stream_resolve_include_path = function_exists('stream_resolve_include_path');
-
-        // test if all registered template_dir are accessible
-        foreach ($smarty->getTemplateDir() as $template_dir) {
-            $_template_dir = $template_dir;
-            $template_dir = realpath($template_dir);
-            // resolve include_path or fail existence
-            if (!$template_dir) {
-                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_template_dir)) {
-                    // try PHP include_path
-                    if ($_stream_resolve_include_path) {
-                        $template_dir = stream_resolve_include_path($_template_dir);
-                    } else {
-                        $template_dir = Smarty_Internal_Get_Include_Path::getIncludePath($_template_dir);
-                    }
-
-                    if ($template_dir !== false) {
-                        if ($errors === null) {
-                            echo "$template_dir is OK.\n";
-                        }
-
-                        continue;
-                    } else {
-                        $status = false;
-                        $message = "FAILED: $_template_dir does not exist (and couldn't be found in include_path either)";
-                        if ($errors === null) {
-                            echo $message . ".\n";
-                        } else {
-                            $errors['template_dir'] = $message;
-                        }
-
-                        continue;
-                    }
-                } else {
-                    $status = false;
-                    $message = "FAILED: $_template_dir does not exist";
-                    if ($errors === null) {
-                        echo $message . ".\n";
-                    } else {
-                        $errors['template_dir'] = $message;
-                    }
-
-                    continue;
-                }
-            }
-
-            if (!is_dir($template_dir)) {
-                $status = false;
-                $message = "FAILED: $template_dir is not a directory";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['template_dir'] = $message;
-                }
-            } elseif (!is_readable($template_dir)) {
-                $status = false;
-                $message = "FAILED: $template_dir is not readable";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['template_dir'] = $message;
-                }
-            } else {
-                if ($errors === null) {
-                    echo "$template_dir is OK.\n";
-                }
-            }
-        }
-
-        if ($errors === null) {
-            echo "Testing compile directory...\n";
-        }
-
-        // test if registered compile_dir is accessible
-        $__compile_dir = $smarty->getCompileDir();
-        $_compile_dir = realpath($__compile_dir);
-        if (!$_compile_dir) {
-            $status = false;
-            $message = "FAILED: {$__compile_dir} does not exist";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['compile_dir'] = $message;
-            }
-        } elseif (!is_dir($_compile_dir)) {
-            $status = false;
-            $message = "FAILED: {$_compile_dir} is not a directory";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['compile_dir'] = $message;
-            }
-        } elseif (!is_readable($_compile_dir)) {
-            $status = false;
-            $message = "FAILED: {$_compile_dir} is not readable";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['compile_dir'] = $message;
-            }
-        } elseif (!is_writable($_compile_dir)) {
-            $status = false;
-            $message = "FAILED: {$_compile_dir} is not writable";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['compile_dir'] = $message;
-            }
-        } else {
-            if ($errors === null) {
-                echo "{$_compile_dir} is OK.\n";
-            }
-        }
-
-        if ($errors === null) {
-            echo "Testing plugins directory...\n";
-        }
-
-        // test if all registered plugins_dir are accessible
-        // and if core plugins directory is still registered
-        $_core_plugins_dir = realpath(dirname(__FILE__) . '/../plugins');
-        $_core_plugins_available = false;
-        foreach ($smarty->getPluginsDir() as $plugin_dir) {
-            $_plugin_dir = $plugin_dir;
-            $plugin_dir = realpath($plugin_dir);
-            // resolve include_path or fail existence
-            if (!$plugin_dir) {
-                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_plugin_dir)) {
-                    // try PHP include_path
-                    if ($_stream_resolve_include_path) {
-                        $plugin_dir = stream_resolve_include_path($_plugin_dir);
-                    } else {
-                        $plugin_dir = Smarty_Internal_Get_Include_Path::getIncludePath($_plugin_dir);
-                    }
-
-                    if ($plugin_dir !== false) {
-                        if ($errors === null) {
-                            echo "$plugin_dir is OK.\n";
-                        }
-
-                        continue;
-                    } else {
-                        $status = false;
-                        $message = "FAILED: $_plugin_dir does not exist (and couldn't be found in include_path either)";
-                        if ($errors === null) {
-                            echo $message . ".\n";
-                        } else {
-                            $errors['plugins_dir'] = $message;
-                        }
-
-                        continue;
-                    }
-                } else {
-                    $status = false;
-                    $message = "FAILED: $_plugin_dir does not exist";
-                    if ($errors === null) {
-                        echo $message . ".\n";
-                    } else {
-                        $errors['plugins_dir'] = $message;
-                    }
-
-                    continue;
-                }
-            }
-
-            if (!is_dir($plugin_dir)) {
-                $status = false;
-                $message = "FAILED: $plugin_dir is not a directory";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['plugins_dir'] = $message;
-                }
-            } elseif (!is_readable($plugin_dir)) {
-                $status = false;
-                $message = "FAILED: $plugin_dir is not readable";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['plugins_dir'] = $message;
-                }
-            } elseif ($_core_plugins_dir && $_core_plugins_dir == realpath($plugin_dir)) {
-                $_core_plugins_available = true;
-                if ($errors === null) {
-                    echo "$plugin_dir is OK.\n";
-                }
-            } else {
-                if ($errors === null) {
-                    echo "$plugin_dir is OK.\n";
-                }
-            }
-        }
-        if (!$_core_plugins_available) {
-            $status = false;
-            $message = "WARNING: Smarty's own libs/plugins is not available";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } elseif (!isset($errors['plugins_dir'])) {
-                $errors['plugins_dir'] = $message;
-            }
-        }
-
-        if ($errors === null) {
-            echo "Testing cache directory...\n";
-        }
-
-        // test if all registered cache_dir is accessible
-        $__cache_dir = $smarty->getCacheDir();
-        $_cache_dir = realpath($__cache_dir);
-        if (!$_cache_dir) {
-            $status = false;
-            $message = "FAILED: {$__cache_dir} does not exist";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['cache_dir'] = $message;
-            }
-        } elseif (!is_dir($_cache_dir)) {
-            $status = false;
-            $message = "FAILED: {$_cache_dir} is not a directory";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['cache_dir'] = $message;
-            }
-        } elseif (!is_readable($_cache_dir)) {
-            $status = false;
-            $message = "FAILED: {$_cache_dir} is not readable";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['cache_dir'] = $message;
-            }
-        } elseif (!is_writable($_cache_dir)) {
-            $status = false;
-            $message = "FAILED: {$_cache_dir} is not writable";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['cache_dir'] = $message;
-            }
-        } else {
-            if ($errors === null) {
-                echo "{$_cache_dir} is OK.\n";
-            }
-        }
-
-        if ($errors === null) {
-            echo "Testing configs directory...\n";
-        }
-
-        // test if all registered config_dir are accessible
-        foreach ($smarty->getConfigDir() as $config_dir) {
-            $_config_dir = $config_dir;
-            $config_dir = realpath($config_dir);
-            // resolve include_path or fail existence
-            if (!$config_dir) {
-                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_config_dir)) {
-                    // try PHP include_path
-                    if ($_stream_resolve_include_path) {
-                        $config_dir = stream_resolve_include_path($_config_dir);
-                    } else {
-                        $config_dir = Smarty_Internal_Get_Include_Path::getIncludePath($_config_dir);
-                    }
-
-                    if ($config_dir !== false) {
-                        if ($errors === null) {
-                            echo "$config_dir is OK.\n";
-                        }
-
-                        continue;
-                    } else {
-                        $status = false;
-                        $message = "FAILED: $_config_dir does not exist (and couldn't be found in include_path either)";
-                        if ($errors === null) {
-                            echo $message . ".\n";
-                        } else {
-                            $errors['config_dir'] = $message;
-                        }
-
-                        continue;
-                    }
-                } else {
-                    $status = false;
-                    $message = "FAILED: $_config_dir does not exist";
-                    if ($errors === null) {
-                        echo $message . ".\n";
-                    } else {
-                        $errors['config_dir'] = $message;
-                    }
-
-                    continue;
-                }
-            }
-
-            if (!is_dir($config_dir)) {
-                $status = false;
-                $message = "FAILED: $config_dir is not a directory";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['config_dir'] = $message;
-                }
-            } elseif (!is_readable($config_dir)) {
-                $status = false;
-                $message = "FAILED: $config_dir is not readable";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['config_dir'] = $message;
-                }
-            } else {
-                if ($errors === null) {
-                    echo "$config_dir is OK.\n";
-                }
-            }
-        }
-
-        if ($errors === null) {
-            echo "Testing sysplugin files...\n";
-        }
-        // test if sysplugins are available
-        $source = SMARTY_SYSPLUGINS_DIR;
-        if (is_dir($source)) {
-            $expected = array(
-                "smarty_cacheresource.php"                                  => true,
-                "smarty_cacheresource_custom.php"                           => true,
-                "smarty_cacheresource_keyvaluestore.php"                    => true,
-                "smarty_data.php"                                           => true,
-                "smarty_internal_cacheresource_file.php"                    => true,
-                "smarty_internal_compile_append.php"                        => true,
-                "smarty_internal_compile_assign.php"                        => true,
-                "smarty_internal_compile_block.php"                         => true,
-                "smarty_internal_compile_break.php"                         => true,
-                "smarty_internal_compile_call.php"                          => true,
-                "smarty_internal_compile_capture.php"                       => true,
-                "smarty_internal_compile_config_load.php"                   => true,
-                "smarty_internal_compile_continue.php"                      => true,
-                "smarty_internal_compile_debug.php"                         => true,
-                "smarty_internal_compile_eval.php"                          => true,
-                "smarty_internal_compile_extends.php"                       => true,
-                "smarty_internal_compile_for.php"                           => true,
-                "smarty_internal_compile_foreach.php"                       => true,
-                "smarty_internal_compile_function.php"                      => true,
-                "smarty_internal_compile_if.php"                            => true,
-                "smarty_internal_compile_include.php"                       => true,
-                "smarty_internal_compile_include_php.php"                   => true,
-                "smarty_internal_compile_insert.php"                        => true,
-                "smarty_internal_compile_ldelim.php"                        => true,
-                "smarty_internal_compile_nocache.php"                       => true,
-                "smarty_internal_compile_private_block_plugin.php"          => true,
-                "smarty_internal_compile_private_function_plugin.php"       => true,
-                "smarty_internal_compile_private_modifier.php"              => true,
-                "smarty_internal_compile_private_object_block_function.php" => true,
-                "smarty_internal_compile_private_object_function.php"       => true,
-                "smarty_internal_compile_private_print_expression.php"      => true,
-                "smarty_internal_compile_private_registered_block.php"      => true,
-                "smarty_internal_compile_private_registered_function.php"   => true,
-                "smarty_internal_compile_private_special_variable.php"      => true,
-                "smarty_internal_compile_rdelim.php"                        => true,
-                "smarty_internal_compile_section.php"                       => true,
-                "smarty_internal_compile_setfilter.php"                     => true,
-                "smarty_internal_compile_while.php"                         => true,
-                "smarty_internal_compilebase.php"                           => true,
-                "smarty_internal_config_file_compiler.php"                  => true,
-                "smarty_internal_configfilelexer.php"                       => true,
-                "smarty_internal_configfileparser.php"                      => true,
-                "smarty_internal_data.php"                                  => true,
-                "smarty_internal_debug.php"                                 => true,
-                "smarty_internal_extension_codeframe.php"                   => true,
-                "smarty_internal_extension_config.php"                      => true,
-                "smarty_internal_extension_defaulttemplatehandler.php"      => true,
-                "smarty_internal_filter_handler.php"                        => true,
-                "smarty_internal_function_call_handler.php"                 => true,
-                "smarty_internal_get_include_path.php"                      => true,
-                "smarty_internal_nocache_insert.php"                        => true,
-                "smarty_internal_parsetree.php"                             => true,
-                "smarty_internal_parsetree_code.php"                        => true,
-                "smarty_internal_parsetree_dq.php"                          => true,
-                "smarty_internal_parsetree_dqcontent.php"                   => true,
-                "smarty_internal_parsetree_tag.php"                         => true,
-                "smarty_internal_parsetree_template.php"                    => true,
-                "smarty_internal_parsetree_text.php"                        => true,
-                "smarty_internal_resource_eval.php"                         => true,
-                "smarty_internal_resource_extends.php"                      => true,
-                "smarty_internal_resource_file.php"                         => true,
-                "smarty_internal_resource_php.php"                          => true,
-                "smarty_internal_resource_registered.php"                   => true,
-                "smarty_internal_resource_stream.php"                       => true,
-                "smarty_internal_resource_string.php"                       => true,
-                "smarty_internal_smartytemplatecompiler.php"                => true,
-                "smarty_internal_template.php"                              => true,
-                "smarty_internal_templatebase.php"                          => true,
-                "smarty_internal_templatecompilerbase.php"                  => true,
-                "smarty_internal_templatelexer.php"                         => true,
-                "smarty_internal_templateparser.php"                        => true,
-                "smarty_internal_utility.php"                               => true,
-                "smarty_internal_write_file.php"                            => true,
-                "smarty_resource.php"                                       => true,
-                "smarty_resource_custom.php"                                => true,
-                "smarty_resource_recompiled.php"                            => true,
-                "smarty_resource_uncompiled.php"                            => true,
-                "smarty_security.php"                                       => true,
-                "smarty_template_cached.php"                                => true,
-                "smarty_template_compiled.php"                              => true,
-                "smarty_template_config.php"                                => true,
-                "smarty_template_source.php"                                => true,
-                "smarty_undefined_variable.php"                             => true,
-                "smarty_variable.php"                                       => true,
-                "smartycompilerexception.php"                               => true,
-                "smartyexception.php"                                       => true,
-            );
-            $iterator = new DirectoryIterator($source);
-            foreach ($iterator as $file) {
-                if (!$file->isDot()) {
-                    $filename = $file->getFilename();
-                    if (isset($expected[$filename])) {
-                        unset($expected[$filename]);
-                    }
-                }
-            }
-            if ($expected) {
-                $status = false;
-                $message = "FAILED: files missing from libs/sysplugins: " . join(', ', array_keys($expected));
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['sysplugins'] = $message;
-                }
-            } elseif ($errors === null) {
-                echo "... OK\n";
-            }
-        } else {
-            $status = false;
-            $message = "FAILED: " . SMARTY_SYSPLUGINS_DIR . ' is not a directory';
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['sysplugins_dir_constant'] = $message;
-            }
-        }
-
-        if ($errors === null) {
-            echo "Testing plugin files...\n";
-        }
-        // test if core plugins are available
-        $source = SMARTY_PLUGINS_DIR;
-        if (is_dir($source)) {
-            $expected = array(
-                "block.textformat.php"                  => true,
-                "function.counter.php"                  => true,
-                "function.cycle.php"                    => true,
-                "function.fetch.php"                    => true,
-                "function.html_checkboxes.php"          => true,
-                "function.html_image.php"               => true,
-                "function.html_options.php"             => true,
-                "function.html_radios.php"              => true,
-                "function.html_select_date.php"         => true,
-                "function.html_select_time.php"         => true,
-                "function.html_table.php"               => true,
-                "function.mailto.php"                   => true,
-                "function.math.php"                     => true,
-                "modifier.capitalize.php"               => true,
-                "modifier.date_format.php"              => true,
-                "modifier.debug_print_var.php"          => true,
-                "modifier.escape.php"                   => true,
-                "modifier.regex_replace.php"            => true,
-                "modifier.replace.php"                  => true,
-                "modifier.spacify.php"                  => true,
-                "modifier.truncate.php"                 => true,
-                "modifiercompiler.cat.php"              => true,
-                "modifiercompiler.count_characters.php" => true,
-                "modifiercompiler.count_paragraphs.php" => true,
-                "modifiercompiler.count_sentences.php"  => true,
-                "modifiercompiler.count_words.php"      => true,
-                "modifiercompiler.default.php"          => true,
-                "modifiercompiler.escape.php"           => true,
-                "modifiercompiler.from_charset.php"     => true,
-                "modifiercompiler.indent.php"           => true,
-                "modifiercompiler.lower.php"            => true,
-                "modifiercompiler.noprint.php"          => true,
-                "modifiercompiler.string_format.php"    => true,
-                "modifiercompiler.strip.php"            => true,
-                "modifiercompiler.strip_tags.php"       => true,
-                "modifiercompiler.to_charset.php"       => true,
-                "modifiercompiler.unescape.php"         => true,
-                "modifiercompiler.upper.php"            => true,
-                "modifiercompiler.wordwrap.php"         => true,
-                "outputfilter.trimwhitespace.php"       => true,
-                "shared.escape_special_chars.php"       => true,
-                "shared.literal_compiler_param.php"     => true,
-                "shared.make_timestamp.php"             => true,
-                "shared.mb_str_replace.php"             => true,
-                "shared.mb_unicode.php"                 => true,
-                "shared.mb_wordwrap.php"                => true,
-                "variablefilter.htmlspecialchars.php"   => true,
-            );
-            $iterator = new DirectoryIterator($source);
-            foreach ($iterator as $file) {
-                if (!$file->isDot()) {
-                    $filename = $file->getFilename();
-                    if (isset($expected[$filename])) {
-                        unset($expected[$filename]);
-                    }
-                }
-            }
-            if ($expected) {
-                $status = false;
-                $message = "FAILED: files missing from libs/plugins: " . join(', ', array_keys($expected));
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['plugins'] = $message;
-                }
-            } elseif ($errors === null) {
-                echo "... OK\n";
-            }
-        } else {
-            $status = false;
-            $message = "FAILED: " . SMARTY_PLUGINS_DIR . ' is not a directory';
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['plugins_dir_constant'] = $message;
-            }
-        }
-
-        if ($errors === null) {
-            echo "Tests complete.\n";
-            echo "</PRE>\n";
-        }
-
-        return $status;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_utility.php b/www/smarty-3.1.27/sysplugins/smarty_internal_utility.php
deleted file mode 100644
index cd027dec..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_utility.php
+++ /dev/null
@@ -1,303 +0,0 @@
-<?php
-/**
- * Project:     Smarty: the PHP compiling template engine
- * File:        smarty_internal_utility.php
- * SVN:         $Id: $
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * For questions, help, comments, discussion, etc., please join the
- * Smarty mailing list. Send a blank e-mail to
- * smarty-discussion-subscribe@googlegroups.com
- *
- * @link       http://www.smarty.net/
- * @copyright  2008 New Digital Group, Inc.
- * @author     Monte Ohrt <monte at ohrt dot com>
- * @author     Uwe Tews
- * @package    Smarty
- * @subpackage PluginsInternal
- * @version    3-SVN$Rev: 3286 $
- */
-
-/**
- * Utility class
- *
- * @package    Smarty
- * @subpackage Security
- */
-class Smarty_Internal_Utility
-{
-    /**
-     * private constructor to prevent calls creation of new instances
-     */
-    final private function __construct()
-    {
-        // intentionally left blank
-    }
-
-    /**
-     * Compile all template files
-     *
-     * @param  string $extension     template file name extension
-     * @param  bool   $force_compile force all to recompile
-     * @param  int    $time_limit    set maximum execution time
-     * @param  int    $max_errors    set maximum allowed errors
-     * @param  Smarty $smarty        Smarty instance
-     *
-     * @return integer number of template files compiled
-     */
-    public static function compileAllTemplates($extension, $force_compile, $time_limit, $max_errors, Smarty $smarty)
-    {
-        // switch off time limit
-        if (function_exists('set_time_limit')) {
-            @set_time_limit($time_limit);
-        }
-        $smarty->force_compile = $force_compile;
-        $_count = 0;
-        $_error_count = 0;
-        // loop over array of template directories
-        foreach ($smarty->getTemplateDir() as $_dir) {
-            $_compileDirs = new RecursiveDirectoryIterator($_dir);
-            $_compile = new RecursiveIteratorIterator($_compileDirs);
-            foreach ($_compile as $_fileinfo) {
-                $_file = $_fileinfo->getFilename();
-                if (substr(basename($_fileinfo->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false) {
-                    continue;
-                }
-                if (!substr_compare($_file, $extension, - strlen($extension)) == 0) {
-                    continue;
-                }
-                if ($_fileinfo->getPath() == substr($_dir, 0, - 1)) {
-                    $_template_file = $_file;
-                } else {
-                    $_template_file = substr($_fileinfo->getPath(), strlen($_dir)) . DS . $_file;
-                }
-                echo '<br>', $_dir, '---', $_template_file;
-                flush();
-                $_start_time = microtime(true);
-                try {
-                    $_tpl = $smarty->createTemplate($_template_file, null, null, null, false);
-                    if ($_tpl->mustCompile()) {
-                        $_tpl->compileTemplateSource();
-                        $_count ++;
-                        echo ' compiled in  ', microtime(true) - $_start_time, ' seconds';
-                        flush();
-                    } else {
-                        echo ' is up to date';
-                        flush();
-                    }
-                }
-                catch (Exception $e) {
-                    echo 'Error: ', $e->getMessage(), "<br><br>";
-                    $_error_count ++;
-                }
-                // free memory
-                $smarty->template_objects = array();
-                $_tpl->smarty->template_objects = array();
-                $_tpl = null;
-                if ($max_errors !== null && $_error_count == $max_errors) {
-                    echo '<br><br>too many errors';
-                    exit();
-                }
-            }
-        }
-
-        return $_count;
-    }
-
-    /**
-     * Compile all config files
-     *
-     * @param  string $extension     config file name extension
-     * @param  bool   $force_compile force all to recompile
-     * @param  int    $time_limit    set maximum execution time
-     * @param  int    $max_errors    set maximum allowed errors
-     * @param  Smarty $smarty        Smarty instance
-     *
-     * @return integer number of config files compiled
-     */
-    public static function compileAllConfig($extension, $force_compile, $time_limit, $max_errors, Smarty $smarty)
-    {
-        // switch off time limit
-        if (function_exists('set_time_limit')) {
-            @set_time_limit($time_limit);
-        }
-        $smarty->force_compile = $force_compile;
-        $_count = 0;
-        $_error_count = 0;
-        // loop over array of template directories
-        foreach ($smarty->getConfigDir() as $_dir) {
-            $_compileDirs = new RecursiveDirectoryIterator($_dir);
-            $_compile = new RecursiveIteratorIterator($_compileDirs);
-            foreach ($_compile as $_fileinfo) {
-                $_file = $_fileinfo->getFilename();
-                if (substr(basename($_fileinfo->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false) {
-                    continue;
-                }
-                if (!substr_compare($_file, $extension, - strlen($extension)) == 0) {
-                    continue;
-                }
-                if ($_fileinfo->getPath() == substr($_dir, 0, - 1)) {
-                    $_config_file = $_file;
-                } else {
-                    $_config_file = substr($_fileinfo->getPath(), strlen($_dir)) . DS . $_file;
-                }
-                echo '<br>', $_dir, '---', $_config_file;
-                flush();
-                $_start_time = microtime(true);
-                try {
-                    $_config = new Smarty_Internal_Config($_config_file, $smarty);
-                    if ($_config->mustCompile()) {
-                        $_config->compileConfigSource();
-                        $_count ++;
-                        echo ' compiled in  ', microtime(true) - $_start_time, ' seconds';
-                        flush();
-                    } else {
-                        echo ' is up to date';
-                        flush();
-                    }
-                }
-                catch (Exception $e) {
-                    echo 'Error: ', $e->getMessage(), "<br><br>";
-                    $_error_count ++;
-                }
-                if ($max_errors !== null && $_error_count == $max_errors) {
-                    echo '<br><br>too many errors';
-                    exit();
-                }
-            }
-        }
-
-        return $_count;
-    }
-
-    /**
-     * Delete compiled template file
-     *
-     * @param  string  $resource_name template name
-     * @param  string  $compile_id    compile id
-     * @param  integer $exp_time      expiration time
-     * @param  Smarty  $smarty        Smarty instance
-     *
-     * @return integer number of template files deleted
-     */
-    public static function clearCompiledTemplate($resource_name, $compile_id, $exp_time, Smarty $smarty)
-    {
-        $_compile_dir = realpath($smarty->getCompileDir()) . '/';
-        if ($_compile_dir == '/') { //We should never want to delete this!
-            return 0;
-        }
-        $_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null;
-        $_dir_sep = $smarty->use_sub_dirs ? '/' : '^';
-        if (isset($resource_name)) {
-            $_save_stat = $smarty->caching;
-            $smarty->caching = false;
-            $tpl = new $smarty->template_class($resource_name, $smarty);
-            $smarty->caching = $_save_stat;
-
-            // remove from template cache
-            $tpl->source; // have the template registered before unset()
-            if ($smarty->allow_ambiguous_resources) {
-                $_templateId = $tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id;
-            } else {
-                $_templateId = $smarty->joined_template_dir . '#' . $resource_name . $tpl->cache_id . $tpl->compile_id;
-            }
-            if (isset($_templateId[150])) {
-                $_templateId = sha1($_templateId);
-            }
-            unset($smarty->template_objects[$_templateId]);
-
-            if ($tpl->source->exists) {
-                $_resource_part_1 = basename(str_replace('^', '/', $tpl->compiled->filepath));
-                $_resource_part_1_length = strlen($_resource_part_1);
-            } else {
-                return 0;
-            }
-
-            $_resource_part_2 = str_replace('.php', '.cache.php', $_resource_part_1);
-            $_resource_part_2_length = strlen($_resource_part_2);
-        }
-        $_dir = $_compile_dir;
-        if ($smarty->use_sub_dirs && isset($_compile_id)) {
-            $_dir .= $_compile_id . $_dir_sep;
-        }
-        if (isset($_compile_id)) {
-            $_compile_id_part = str_replace('\\', '/', $_compile_dir . $_compile_id . $_dir_sep);
-            $_compile_id_part_length = strlen($_compile_id_part);
-        }
-        $_count = 0;
-        try {
-            $_compileDirs = new RecursiveDirectoryIterator($_dir);
-            // NOTE: UnexpectedValueException thrown for PHP >= 5.3
-        }
-        catch (Exception $e) {
-            return 0;
-        }
-        $_compile = new RecursiveIteratorIterator($_compileDirs, RecursiveIteratorIterator::CHILD_FIRST);
-        foreach ($_compile as $_file) {
-            if (substr(basename($_file->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false) {
-                continue;
-            }
-
-            $_filepath = str_replace('\\', '/', (string) $_file);
-
-            if ($_file->isDir()) {
-                if (!$_compile->isDot()) {
-                    // delete folder if empty
-                    @rmdir($_file->getPathname());
-                }
-            } else {
-                $unlink = false;
-                if ((!isset($_compile_id) || (isset($_filepath[$_compile_id_part_length]) && $a = !strncmp($_filepath, $_compile_id_part, $_compile_id_part_length)))
-                    && (!isset($resource_name)
-                        || (isset($_filepath[$_resource_part_1_length])
-                            && substr_compare($_filepath, $_resource_part_1, - $_resource_part_1_length, $_resource_part_1_length) == 0)
-                        || (isset($_filepath[$_resource_part_2_length])
-                            && substr_compare($_filepath, $_resource_part_2, - $_resource_part_2_length, $_resource_part_2_length) == 0))
-                ) {
-                    if (isset($exp_time)) {
-                        if (time() - @filemtime($_filepath) >= $exp_time) {
-                            $unlink = true;
-                        }
-                    } else {
-                        $unlink = true;
-                    }
-                }
-
-                if ($unlink && @unlink($_filepath)) {
-                    $_count ++;
-                }
-            }
-        }
-        // clear compiled cache
-        Smarty_Resource::$sources = array();
-        Smarty_Resource::$compileds = array();
-
-        return $_count;
-    }
-
-    /**
-     * Return array of tag/attributes of all tags used by an template
-     *
-     * @param Smarty_Internal_Template $template
-     *
-     * @throws Exception
-     * @throws SmartyException
-     * @return array                    of tag/attributes
-     */
-    public static function getTags(Smarty_Internal_Template $template)
-    {
-        $template->smarty->get_used_tags = true;
-        $template->compileTemplateSource();
-
-        return $template->used_tags;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_internal_write_file.php b/www/smarty-3.1.27/sysplugins/smarty_internal_write_file.php
deleted file mode 100644
index 9ecc7c0c..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_internal_write_file.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * Smarty write file plugin
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Monte Ohrt
- */
-
-/**
- * Smarty Internal Write File Class
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- */
-class Smarty_Internal_Write_File
-{
-    /**
-     * Writes file in a safe way to disk
-     *
-     * @param  string $_filepath complete filepath
-     * @param  string $_contents file content
-     * @param  Smarty $smarty    smarty instance
-     *
-     * @throws SmartyException
-     * @return boolean true
-     */
-    public function writeFile($_filepath, $_contents, Smarty $smarty)
-    {
-        $_error_reporting = error_reporting();
-        error_reporting($_error_reporting & ~E_NOTICE & ~E_WARNING);
-        if ($smarty->_file_perms !== null) {
-            $old_umask = umask(0);
-        }
-
-        $_dirpath = dirname($_filepath);
-        // if subdirs, create dir structure
-        if ($_dirpath !== '.' && !file_exists($_dirpath)) {
-            mkdir($_dirpath, $smarty->_dir_perms === null ? 0777 : $smarty->_dir_perms, true);
-        }
-
-        // write to tmp file, then move to overt file lock race condition
-        $_tmp_file = $_dirpath . DS . str_replace(array('.', ','), '_', uniqid('wrt', true));
-        if (!file_put_contents($_tmp_file, $_contents)) {
-            error_reporting($_error_reporting);
-            throw new SmartyException("unable to write file {$_tmp_file}");
-       }
-
-        /*
-         * Windows' rename() fails if the destination exists,
-         * Linux' rename() properly handles the overwrite.
-         * Simply unlink()ing a file might cause other processes
-         * currently reading that file to fail, but linux' rename()
-         * seems to be smart enough to handle that for us.
-         */
-        if (Smarty::$_IS_WINDOWS) {
-            // remove original file
-            if (is_file($_filepath)) {
-                @unlink($_filepath);
-            }
-            // rename tmp file
-            $success = @rename($_tmp_file, $_filepath);
-        } else {
-            // rename tmp file
-            $success = @rename($_tmp_file, $_filepath);
-            if (!$success) {
-                // remove original file
-                if (is_file($_filepath)) {
-                    @unlink($_filepath);
-                }
-                // rename tmp file
-                $success = @rename($_tmp_file, $_filepath);
-            }
-        }
-        if (!$success) {
-            error_reporting($_error_reporting);
-            throw new SmartyException("unable to write file {$_filepath}");
-        }
-        if ($smarty->_file_perms !== null) {
-            // set file permissions
-            chmod($_filepath, $smarty->_file_perms);
-            umask($old_umask);
-        }
-        error_reporting($_error_reporting);
-
-        return true;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_resource.php b/www/smarty-3.1.27/sysplugins/smarty_resource.php
deleted file mode 100644
index 5d5e368d..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_resource.php
+++ /dev/null
@@ -1,284 +0,0 @@
-<?php
-/**
- * Smarty Resource Plugin
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Rodney Rehm
- */
-
-/**
- * Smarty Resource Plugin
- * Base implementation for resource plugins
- *
- * @package    Smarty
- * @subpackage TemplateResources
- */
-abstract class Smarty_Resource
-{
-    /**
-     * Source is bypassing compiler
-     *
-     * @var boolean
-     */
-    public $uncompiled = false;
-
-    /**
-     * Source must be recompiled on every occasion
-     *
-     * @var boolean
-     */
-    public $recompiled = false;
-    /**
-     * resource handler object
-     *
-     * @var Smarty_Resource
-     */
-    public $handler = null;
-    /**
-     * cache for Smarty_Template_Source instances
-     *
-     * @var array
-     */
-    public static $sources = array();
-    /**
-     * cache for Smarty_Template_Compiled instances
-     *
-     * @var array
-     */
-    public static $compileds = array();
-    /**
-     * resource types provided by the core
-     *
-     * @var array
-     */
-    protected static $sysplugins = array(
-        'file'    => 'smarty_internal_resource_file.php',
-        'string'  => 'smarty_internal_resource_string.php',
-        'extends' => 'smarty_internal_resource_extends.php',
-        'stream'  => 'smarty_internal_resource_stream.php',
-        'eval'    => 'smarty_internal_resource_eval.php',
-        'php'     => 'smarty_internal_resource_php.php'
-    );
-
-    /**
-     * Name of the Class to compile this resource's contents with
-     *
-     * @var string
-     */
-    public $compiler_class = 'Smarty_Internal_SmartyTemplateCompiler';
-
-    /**
-     * Name of the Class to tokenize this resource's contents with
-     *
-     * @var string
-     */
-    public $template_lexer_class = 'Smarty_Internal_Templatelexer';
-
-    /**
-     * Name of the Class to parse this resource's contents with
-     *
-     * @var string
-     */
-    public $template_parser_class = 'Smarty_Internal_Templateparser';
-
-    /**
-     * Load template's source into current template object
-     * {@internal The loaded source is assigned to $_template->source->content directly.}}
-     *
-     * @param  Smarty_Template_Source $source source object
-     *
-     * @return string                 template source
-     * @throws SmartyException        if source cannot be loaded
-     */
-    abstract public function getContent(Smarty_Template_Source $source);
-
-    /**
-     * populate Source Object with meta data from Resource
-     *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
-     */
-    abstract public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null);
-
-    /**
-     * populate Source Object with timestamp and exists from Resource
-     *
-     * @param Smarty_Template_Source $source source object
-     */
-    public function populateTimestamp(Smarty_Template_Source $source)
-    {
-        // intentionally left blank
-    }
-
-    /**
-     * modify resource_name according to resource handlers specifications
-     *
-     * @param  Smarty  $smarty        Smarty instance
-     * @param  string  $resource_name resource_name to make unique
-     * @param  boolean $isConfig      flag for config resource
-     *
-     * @return string unique resource name
-     */
-    public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
-    {
-        if ($isConfig) {
-            return get_class($this) . '#' . $smarty->joined_config_dir . '#' . $resource_name;
-        } else {
-            return get_class($this) . '#' . $smarty->joined_template_dir . '#' . $resource_name;
-        }
-    }
-
-    /**
-     * Determine basename for compiled filename
-     *
-     * @param  Smarty_Template_Source $source source object
-     *
-     * @return string                 resource's basename
-     */
-    public function getBasename(Smarty_Template_Source $source)
-    {
-        return null;
-    }
-
-    /**
-     * Load Resource Handler
-     *
-     * @param  Smarty $smarty smarty object
-     * @param  string $type   name of the resource
-     *
-     * @throws SmartyException
-     * @return Smarty_Resource Resource Handler
-     */
-    public static function load(Smarty $smarty, $type)
-    {
-        // try smarty's cache
-        if (isset($smarty->_resource_handlers[$type])) {
-            return $smarty->_resource_handlers[$type];
-        }
-
-        // try registered resource
-        if (isset($smarty->registered_resources[$type])) {
-            if ($smarty->registered_resources[$type] instanceof Smarty_Resource) {
-                $smarty->_resource_handlers[$type] = $smarty->registered_resources[$type];
-            } else {
-                $smarty->_resource_handlers[$type] = new Smarty_Internal_Resource_Registered();
-            }
-
-            return $smarty->_resource_handlers[$type];
-        }
-
-        // try sysplugins dir
-        if (isset(self::$sysplugins[$type])) {
-            $_resource_class = 'Smarty_Internal_Resource_' . ucfirst($type);
-            if (!class_exists($_resource_class, false)) {
-                require SMARTY_SYSPLUGINS_DIR . self::$sysplugins[$type];
-            }
-            return $smarty->_resource_handlers[$type] = new $_resource_class();
-        }
-
-        // try plugins dir
-        $_resource_class = 'Smarty_Resource_' . ucfirst($type);
-        if ($smarty->loadPlugin($_resource_class)) {
-            if (class_exists($_resource_class, false)) {
-                return $smarty->_resource_handlers[$type] = new $_resource_class();
-            } else {
-                $smarty->registerResource($type, array(
-                    "smarty_resource_{$type}_source",
-                    "smarty_resource_{$type}_timestamp",
-                    "smarty_resource_{$type}_secure",
-                    "smarty_resource_{$type}_trusted"
-                ));
-                // give it another try, now that the resource is registered properly
-                return self::load($smarty, $type);
-            }
-        }
-
-        // try streams
-        $_known_stream = stream_get_wrappers();
-        if (in_array($type, $_known_stream)) {
-            // is known stream
-            if (is_object($smarty->security_policy)) {
-                $smarty->security_policy->isTrustedStream($type);
-            }
-            return $smarty->_resource_handlers[$type] = new Smarty_Internal_Resource_Stream();;
-        }
-
-        // TODO: try default_(template|config)_handler
-
-        // give up
-        throw new SmartyException("Unknown resource type '{$type}'");
-    }
-
-    /**
-     * extract resource_type and resource_name from template_resource and config_resource
-     * @note "C:/foo.tpl" was forced to file resource up till Smarty 3.1.3 (including).
-     *
-     * @param  string $resource_name    template_resource or config_resource to parse
-     * @param  string $default_resource the default resource_type defined in $smarty
-     *
-     * @return array with parsed resource name and type
-     */
-    public static function parseResourceName($resource_name, $default_resource)
-    {
-         if (preg_match('/^([A-Za-z0-9_\-]{2,})[:]/', $resource_name, $match)) {
-            $type = $match[1];
-            $name = substr($resource_name, strlen($match[0]));
-        } else {
-            // no resource given, use default
-            // or single character before the colon is not a resource type, but part of the filepath
-            $type = $default_resource;
-            $name = $resource_name;
-
-        }
-        return array($name, $type);
-    }
-
-    /**
-     * modify resource_name according to resource handlers specifications
-     *
-     * @param  Smarty $smarty        Smarty instance
-     * @param  string $resource_name resource_name to make unique
-     *
-     * @return string unique resource name
-     */
-
-    /**
-     * modify template_resource according to resource handlers specifications
-     *
-     * @param  Smarty_Internal_template $template          Smarty instance
-     * @param  string                   $template_resource template_resource to extract resource handler and name of
-     *
-     * @return string unique resource name
-     */
-    public static function getUniqueTemplateName($template, $template_resource)
-    {
-        $smarty = isset($template->smarty) ? $template->smarty : $template;
-        list($name, $type) = self::parseResourceName($template_resource, $smarty->default_resource_type);
-        // TODO: optimize for Smarty's internal resource types
-        $resource = Smarty_Resource::load($smarty, $type);
-        // go relative to a given template?
-        $_file_is_dotted = $name[0] == '.' && ($name[1] == '.' || $name[1] == '/');
-        if ($template instanceof Smarty_Internal_Template && $_file_is_dotted && ($template->source->type == 'file' || $template->parent->source->type == 'extends')) {
-            $name = dirname($template->source->filepath) . DS . $name;
-        }
-        return $resource->buildUniqueResourceName($smarty, $name);
-    }
-
-    /**
-     * initialize Source Object for given resource
-     * wrapper for backward compatibility to versions < 3.1.22
-     * Either [$_template] or [$smarty, $template_resource] must be specified
-     *
-     * @param  Smarty_Internal_Template $_template         template object
-     * @param  Smarty                   $smarty            smarty object
-     * @param  string                   $template_resource resource identifier
-     *
-     * @return Smarty_Template_Source   Source Object
-     */
-    public static function source(Smarty_Internal_Template $_template = null, Smarty $smarty = null, $template_resource = null)
-    {
-        return Smarty_Template_Source::load($_template, $smarty, $template_resource);
-    }
-}
-
diff --git a/www/smarty-3.1.27/sysplugins/smarty_resource_recompiled.php b/www/smarty-3.1.27/sysplugins/smarty_resource_recompiled.php
deleted file mode 100644
index c823387b..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_resource_recompiled.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Smarty Resource Plugin
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Rodney Rehm
- */
-
-/**
- * Smarty Resource Plugin
- * Base implementation for resource plugins that don't compile cache
- *
- * @package    Smarty
- * @subpackage TemplateResources
- */
-abstract class Smarty_Resource_Recompiled extends Smarty_Resource
-{
-    /**
-     * Flag that it's an recompiled resource
-     *
-     * @var bool
-     */
-    public $recompiled = true;
-
-    /**
-     * populate Compiled Object with compiled filepath
-     *
-     * @param  Smarty_Template_Compiled $compiled  compiled object
-     * @param  Smarty_Internal_Template $_template template object
-     *
-     * @return void
-     */
-    public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
-    {
-        $compiled->filepath = false;
-        $compiled->timestamp = false;
-        $compiled->exists = false;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_resource_uncompiled.php b/www/smarty-3.1.27/sysplugins/smarty_resource_uncompiled.php
deleted file mode 100644
index a52d86e8..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_resource_uncompiled.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * Smarty Resource Plugin
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Rodney Rehm
- */
-
-/**
- * Smarty Resource Plugin
- * Base implementation for resource plugins that don't use the compiler
- *
- * @package    Smarty
- * @subpackage TemplateResources
- */
-abstract class Smarty_Resource_Uncompiled extends Smarty_Resource
-{
-    /**
-     * Flag that it's an uncompiled resource
-     *
-     * @var bool
-     */
-    public $uncompiled = true;
-
-    /**
-     * Render and output the template (without using the compiler)
-     *
-     * @param  Smarty_Template_Source   $source    source object
-     * @param  Smarty_Internal_Template $_template template object
-     *
-     * @throws SmartyException          on failure
-     */
-    abstract public function renderUncompiled(Smarty_Template_Source $source, Smarty_Internal_Template $_template);
-
-    /**
-     * populate compiled object with compiled filepath
-     *
-     * @param Smarty_Template_Compiled $compiled  compiled object
-     * @param Smarty_Internal_Template $_template template object (is ignored)
-     */
-    public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
-    {
-        $compiled->filepath = false;
-        $compiled->timestamp = false;
-        $compiled->exists = false;
-    }
-
-    /**
-     * render compiled template code
-     *
-     * @param Smarty_Internal_Template $_template
-     *
-     * @return string
-     * @throws Exception
-     */
-    public function render($_template)
-    {
-        $level = ob_get_level();
-        ob_start();
-        try {
-            $this->renderUncompiled($_template->source, $_template);
-            return ob_get_clean();
-        }
-        catch (Exception $e) {
-            while (ob_get_level() > $level) {
-                ob_end_clean();
-            }
-            throw $e;
-        }
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_security.php b/www/smarty-3.1.27/sysplugins/smarty_security.php
deleted file mode 100644
index af1ca553..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_security.php
+++ /dev/null
@@ -1,644 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage Security
- * @author     Uwe Tews
- */
-
-/*
- * FIXME: Smarty_Security API
- *      - getter and setter instead of public properties would allow cultivating an internal cache properly
- *      - current implementation of isTrustedResourceDir() assumes that Smarty::$template_dir and Smarty::$config_dir are immutable
- *        the cache is killed every time either of the variables change. That means that two distinct Smarty objects with differing
- *        $template_dir or $config_dir should NOT share the same Smarty_Security instance,
- *        as this would lead to (severe) performance penalty! how should this be handled?
- */
-
-/**
- * This class does contain the security settings
- */
-class Smarty_Security
-{
-    /**
-     * This determines how Smarty handles "<?php ... ?>" tags in templates.
-     * possible values:
-     * <ul>
-     *   <li>Smarty::PHP_PASSTHRU -> echo PHP tags as they are</li>
-     *   <li>Smarty::PHP_QUOTE    -> escape tags as entities</li>
-     *   <li>Smarty::PHP_REMOVE   -> remove php tags</li>
-     *   <li>Smarty::PHP_ALLOW    -> execute php tags</li>
-     * </ul>
-     *
-     * @var integer
-     */
-    public $php_handling = Smarty::PHP_PASSTHRU;
-    /**
-     * This is the list of template directories that are considered secure.
-     * $template_dir is in this list implicitly.
-     *
-     * @var array
-     */
-    public $secure_dir = array();
-    /**
-     * This is an array of directories where trusted php scripts reside.
-     * {@link $security} is disabled during their inclusion/execution.
-     *
-     * @var array
-     */
-    public $trusted_dir = array();
-    /**
-     * List of regular expressions (PCRE) that include trusted URIs
-     *
-     * @var array
-     */
-    public $trusted_uri = array();
-    /**
-     * List of trusted constants names
-     *
-     * @var array
-     */
-    public $trusted_constants = array();
-    /**
-     * This is an array of trusted static classes.
-     * If empty access to all static classes is allowed.
-     * If set to 'none' none is allowed.
-     *
-     * @var array
-     */
-    public $static_classes = array();
-
-    /**
-     * This is an nested array of trusted classes and static methods.
-     * If empty access to all static classes and methods is allowed.
-     * Format:
-     * array (
-     *         'class_1' => array('method_1', 'method_2'), // allowed methods listed
-     *         'class_2' => array(),                       // all methods of class allowed
-     *       )
-     * If set to null none is allowed.
-     *
-     * @var array
-     */
-    public $trusted_static_methods = array();
-
-    /**
-     * This is an array of trusted static properties.
-     * If empty access to all static classes and properties is allowed.
-     * Format:
-     * array (
-     *         'class_1' => array('prop_1', 'prop_2'), // allowed properties listed
-     *         'class_2' => array(),                   // all properties of class allowed
-     *       )
-     * If set to null none is allowed.
-     *
-     * @var array
-     */
-    public $trusted_static_properties = array();
-    /**
-     * This is an array of trusted PHP functions.
-     * If empty all functions are allowed.
-     * To disable all PHP functions set $php_functions = null.
-     *
-     * @var array
-     */
-    public $php_functions = array(
-        'isset', 'empty',
-        'count', 'sizeof',
-        'in_array', 'is_array',
-        'time',
-    );
-    /**
-     * This is an array of trusted PHP modifiers.
-     * If empty all modifiers are allowed.
-     * To disable all modifier set $php_modifiers = null.
-     *
-     * @var array
-     */
-    public $php_modifiers = array(
-        'escape',
-        'count',
-        'nl2br',
-    );
-    /**
-     * This is an array of allowed tags.
-     * If empty no restriction by allowed_tags.
-     *
-     * @var array
-     */
-    public $allowed_tags = array();
-    /**
-     * This is an array of disabled tags.
-     * If empty no restriction by disabled_tags.
-     *
-     * @var array
-     */
-    public $disabled_tags = array();
-    /**
-     * This is an array of allowed modifier plugins.
-     * If empty no restriction by allowed_modifiers.
-     *
-     * @var array
-     */
-    public $allowed_modifiers = array();
-    /**
-     * This is an array of disabled modifier plugins.
-     * If empty no restriction by disabled_modifiers.
-     *
-     * @var array
-     */
-    public $disabled_modifiers = array();
-    /**
-     * This is an array of disabled special $smarty variables.
-     *
-     * @var array
-     */
-    public $disabled_special_smarty_vars = array();
-    /**
-     * This is an array of trusted streams.
-     * If empty all streams are allowed.
-     * To disable all streams set $streams = null.
-     *
-     * @var array
-     */
-    public $streams = array('file');
-    /**
-     * + flag if constants can be accessed from template
-     *
-     * @var boolean
-     */
-    public $allow_constants = true;
-    /**
-     * + flag if super globals can be accessed from template
-     *
-     * @var boolean
-     */
-    public $allow_super_globals = true;
-    /**
-     * max template nesting level
-     *
-     * @var int
-     */
-    public $max_template_nesting = 0;
-    /**
-     * current template nesting level
-     *
-     * @var int
-     */
-    private $_current_template_nesting = 0;
-    /**
-     * Cache for $resource_dir lookup
-     *
-     * @var array
-     */
-    protected $_resource_dir = null;
-    /**
-     * Cache for $template_dir lookup
-     *
-     * @var array
-     */
-    protected $_template_dir = null;
-    /**
-     * Cache for $config_dir lookup
-     *
-     * @var array
-     */
-    protected $_config_dir = null;
-    /**
-     * Cache for $secure_dir lookup
-     *
-     * @var array
-     */
-    protected $_secure_dir = null;
-    /**
-     * Cache for $php_resource_dir lookup
-     *
-     * @var array
-     */
-    protected $_php_resource_dir = null;
-    /**
-     * Cache for $trusted_dir lookup
-     *
-     * @var array
-     */
-    protected $_trusted_dir = null;
-
-    /**
-     * @param Smarty $smarty
-     */
-    public function __construct($smarty)
-    {
-        $this->smarty = $smarty;
-    }
-
-    /**
-     * Check if PHP function is trusted.
-     *
-     * @param  string $function_name
-     * @param  object $compiler compiler object
-     *
-     * @return boolean                 true if function is trusted
-     * @throws SmartyCompilerException if php function is not trusted
-     */
-    public function isTrustedPhpFunction($function_name, $compiler)
-    {
-        if (isset($this->php_functions) && (empty($this->php_functions) || in_array($function_name, $this->php_functions))) {
-            return true;
-        }
-
-        $compiler->trigger_template_error("PHP function '{$function_name}' not allowed by security setting");
-
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if static class is trusted.
-     *
-     * @param  string $class_name
-     * @param  object $compiler compiler object
-     *
-     * @return boolean                 true if class is trusted
-     * @throws SmartyCompilerException if static class is not trusted
-     */
-    public function isTrustedStaticClass($class_name, $compiler)
-    {
-        if (isset($this->static_classes) && (empty($this->static_classes) || in_array($class_name, $this->static_classes))) {
-            return true;
-        }
-
-        $compiler->trigger_template_error("access to static class '{$class_name}' not allowed by security setting");
-
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if static class method/property is trusted.
-     *
-     * @param  string $class_name
-     * @param  string $params
-     * @param  object $compiler compiler object
-     *
-     * @return boolean                 true if class method is trusted
-     * @throws SmartyCompilerException if static class method is not trusted
-     */
-    public function isTrustedStaticClassAccess($class_name, $params, $compiler)
-    {
-        if (!isset($params[2])) {
-            // fall back
-            return $this->isTrustedStaticClass($class_name, $compiler);
-        }
-        if ($params[2] == 'method') {
-            $allowed = $this->trusted_static_methods;
-            $name = substr($params[0], 0, strpos($params[0], '('));
-        } else {
-            $allowed = $this->trusted_static_properties;
-            // strip '$'
-            $name = substr($params[0], 1);
-        }
-        if (isset($allowed)) {
-            if (empty($allowed)) {
-                // fall back
-                return $this->isTrustedStaticClass($class_name, $compiler);
-            }
-            if (isset($allowed[$class_name])
-                && (empty($allowed[$class_name])
-                    || in_array($name, $allowed[$class_name]))
-            ) {
-                return true;
-            }
-        }
-        $compiler->trigger_template_error("access to static class '{$class_name}' {$params[2]} '{$name}' not allowed by security setting");
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if PHP modifier is trusted.
-     *
-     * @param  string $modifier_name
-     * @param  object $compiler compiler object
-     *
-     * @return boolean                 true if modifier is trusted
-     * @throws SmartyCompilerException if modifier is not trusted
-     */
-    public function isTrustedPhpModifier($modifier_name, $compiler)
-    {
-        if (isset($this->php_modifiers) && (empty($this->php_modifiers) || in_array($modifier_name, $this->php_modifiers))) {
-            return true;
-        }
-
-        $compiler->trigger_template_error("modifier '{$modifier_name}' not allowed by security setting");
-
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if tag is trusted.
-     *
-     * @param  string $tag_name
-     * @param  object $compiler compiler object
-     *
-     * @return boolean                 true if tag is trusted
-     * @throws SmartyCompilerException if modifier is not trusted
-     */
-    public function isTrustedTag($tag_name, $compiler)
-    {
-        // check for internal always required tags
-        if (in_array($tag_name, array('assign', 'call', 'private_filter', 'private_block_plugin', 'private_function_plugin', 'private_object_block_function',
-                                      'private_object_function', 'private_registered_function', 'private_registered_block', 'private_special_variable', 'private_print_expression', 'private_modifier'))
-        ) {
-            return true;
-        }
-        // check security settings
-        if (empty($this->allowed_tags)) {
-            if (empty($this->disabled_tags) || !in_array($tag_name, $this->disabled_tags)) {
-                return true;
-            } else {
-                $compiler->trigger_template_error("tag '{$tag_name}' disabled by security setting", $compiler->lex->taglineno);
-            }
-        } elseif (in_array($tag_name, $this->allowed_tags) && !in_array($tag_name, $this->disabled_tags)) {
-            return true;
-        } else {
-            $compiler->trigger_template_error("tag '{$tag_name}' not allowed by security setting", $compiler->lex->taglineno);
-        }
-
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if special $smarty variable is trusted.
-     *
-     * @param  string $var_name
-     * @param  object $compiler compiler object
-     *
-     * @return boolean                 true if tag is trusted
-     * @throws SmartyCompilerException if modifier is not trusted
-     */
-    public function isTrustedSpecialSmartyVar($var_name, $compiler)
-    {
-        if (!in_array($var_name, $this->disabled_special_smarty_vars)) {
-            return true;
-        } else {
-            $compiler->trigger_template_error("special variable '\$smarty.{$var_name}' not allowed by security setting", $compiler->lex->taglineno);
-        }
-
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if modifier plugin is trusted.
-     *
-     * @param  string $modifier_name
-     * @param  object $compiler compiler object
-     *
-     * @return boolean                 true if tag is trusted
-     * @throws SmartyCompilerException if modifier is not trusted
-     */
-    public function isTrustedModifier($modifier_name, $compiler)
-    {
-        // check for internal always allowed modifier
-        if (in_array($modifier_name, array('default'))) {
-            return true;
-        }
-        // check security settings
-        if (empty($this->allowed_modifiers)) {
-            if (empty($this->disabled_modifiers) || !in_array($modifier_name, $this->disabled_modifiers)) {
-                return true;
-            } else {
-                $compiler->trigger_template_error("modifier '{$modifier_name}' disabled by security setting", $compiler->lex->taglineno);
-            }
-        } elseif (in_array($modifier_name, $this->allowed_modifiers) && !in_array($modifier_name, $this->disabled_modifiers)) {
-            return true;
-        } else {
-            $compiler->trigger_template_error("modifier '{$modifier_name}' not allowed by security setting", $compiler->lex->taglineno);
-        }
-
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if constants are enabled or trusted
-     *
-     * @param  string $const    contant name
-     * @param  object $compiler compiler object
-     *
-     * @return bool
-     */
-    public function isTrustedConstant($const, $compiler)
-    {
-        if (in_array($const, array('true', 'false', 'null'))) {
-            return true;
-        }
-        if (!empty($this->trusted_constants)) {
-            if (!in_array($const, $this->trusted_constants)) {
-                $compiler->trigger_template_error("Security: access to constant '{$const}' not permitted");
-                return false;
-            }
-            return true;
-        }
-        if ($this->allow_constants) {
-            return true;
-        }
-        $compiler->trigger_template_error("Security: access to constants not permitted");
-        return false;
-    }
-
-    /**
-     * Check if stream is trusted.
-     *
-     * @param  string $stream_name
-     *
-     * @return boolean         true if stream is trusted
-     * @throws SmartyException if stream is not trusted
-     */
-    public function isTrustedStream($stream_name)
-    {
-        if (isset($this->streams) && (empty($this->streams) || in_array($stream_name, $this->streams))) {
-            return true;
-        }
-
-        throw new SmartyException("stream '{$stream_name}' not allowed by security setting");
-    }
-
-    /**
-     * Check if directory of file resource is trusted.
-     *
-     * @param  string $filepath
-     *
-     * @return boolean         true if directory is trusted
-     * @throws SmartyException if directory is not trusted
-     */
-    public function isTrustedResourceDir($filepath)
-    {
-        $_template = false;
-        $_config = false;
-        $_secure = false;
-
-        $_template_dir = $this->smarty->getTemplateDir();
-        $_config_dir = $this->smarty->getConfigDir();
-
-        // check if index is outdated
-        if ((!$this->_template_dir || $this->_template_dir !== $_template_dir)
-            || (!$this->_config_dir || $this->_config_dir !== $_config_dir)
-            || (!empty($this->secure_dir) && (!$this->_secure_dir || $this->_secure_dir !== $this->secure_dir))
-        ) {
-            $this->_resource_dir = array();
-            $_template = true;
-            $_config = true;
-            $_secure = !empty($this->secure_dir);
-        }
-
-        // rebuild template dir index
-        if ($_template) {
-            $this->_template_dir = $_template_dir;
-            foreach ($_template_dir as $directory) {
-                $directory = realpath($directory);
-                $this->_resource_dir[$directory] = true;
-            }
-        }
-
-        // rebuild config dir index
-        if ($_config) {
-            $this->_config_dir = $_config_dir;
-            foreach ($_config_dir as $directory) {
-                $directory = realpath($directory);
-                $this->_resource_dir[$directory] = true;
-            }
-        }
-
-        // rebuild secure dir index
-        if ($_secure) {
-            $this->_secure_dir = $this->secure_dir;
-            foreach ((array) $this->secure_dir as $directory) {
-                $directory = realpath($directory);
-                $this->_resource_dir[$directory] = true;
-            }
-        }
-
-        $_filepath = realpath($filepath);
-        $directory = dirname($_filepath);
-        $_directory = array();
-        while (true) {
-            // remember the directory to add it to _resource_dir in case we're successful
-            $_directory[$directory] = true;
-            // test if the directory is trusted
-            if (isset($this->_resource_dir[$directory])) {
-                // merge sub directories of current $directory into _resource_dir to speed up subsequent lookup
-                $this->_resource_dir = array_merge($this->_resource_dir, $_directory);
-
-                return true;
-            }
-            // abort if we've reached root
-            if (($pos = strrpos($directory, DS)) === false || !isset($directory[1])) {
-                break;
-            }
-            // bubble up one level
-            $directory = substr($directory, 0, $pos);
-        }
-
-        // give up
-        throw new SmartyException("directory '{$_filepath}' not allowed by security setting");
-    }
-
-    /**
-     * Check if URI (e.g. {fetch} or {html_image}) is trusted
-     * To simplify things, isTrustedUri() resolves all input to "{$PROTOCOL}://{$HOSTNAME}".
-     * So "http://username:password@hello.world.example.org:8080/some-path?some=query-string"
-     * is reduced to "http://hello.world.example.org" prior to applying the patters from {@link $trusted_uri}.
-     *
-     * @param  string $uri
-     *
-     * @return boolean         true if URI is trusted
-     * @throws SmartyException if URI is not trusted
-     * @uses $trusted_uri for list of patterns to match against $uri
-     */
-    public function isTrustedUri($uri)
-    {
-        $_uri = parse_url($uri);
-        if (!empty($_uri['scheme']) && !empty($_uri['host'])) {
-            $_uri = $_uri['scheme'] . '://' . $_uri['host'];
-            foreach ($this->trusted_uri as $pattern) {
-                if (preg_match($pattern, $_uri)) {
-                    return true;
-                }
-            }
-        }
-
-        throw new SmartyException("URI '{$uri}' not allowed by security setting");
-    }
-
-    /**
-     * Check if directory of file resource is trusted.
-     *
-     * @param  string $filepath
-     *
-     * @return boolean         true if directory is trusted
-     * @throws SmartyException if PHP directory is not trusted
-     */
-    public function isTrustedPHPDir($filepath)
-    {
-        if (empty($this->trusted_dir)) {
-            throw new SmartyException("directory '{$filepath}' not allowed by security setting (no trusted_dir specified)");
-        }
-
-        // check if index is outdated
-        if (!$this->_trusted_dir || $this->_trusted_dir !== $this->trusted_dir) {
-            $this->_php_resource_dir = array();
-
-            $this->_trusted_dir = $this->trusted_dir;
-            foreach ((array) $this->trusted_dir as $directory) {
-                $directory = realpath($directory);
-                $this->_php_resource_dir[$directory] = true;
-            }
-        }
-
-        $_filepath = realpath($filepath);
-        $directory = dirname($_filepath);
-        $_directory = array();
-        while (true) {
-            // remember the directory to add it to _resource_dir in case we're successful
-            $_directory[] = $directory;
-            // test if the directory is trusted
-            if (isset($this->_php_resource_dir[$directory])) {
-                // merge sub directories of current $directory into _resource_dir to speed up subsequent lookup
-                $this->_php_resource_dir = array_merge($this->_php_resource_dir, $_directory);
-
-                return true;
-            }
-            // abort if we've reached root
-            if (($pos = strrpos($directory, DS)) === false || !isset($directory[2])) {
-                break;
-            }
-            // bubble up one level
-            $directory = substr($directory, 0, $pos);
-        }
-
-        throw new SmartyException("directory '{$_filepath}' not allowed by security setting");
-    }
-
-    /**
-     * Start template processing
-     *
-     * @param $template
-     *
-     * @throws SmartyException
-     */
-    public function startTemplate($template)
-    {
-        if ($this->max_template_nesting > 0 && $this->_current_template_nesting ++ >= $this->max_template_nesting) {
-            throw new SmartyException("maximum template nesting level of '{$this->max_template_nesting}' exceeded when calling '{$template->template_resource}'");
-        }
-    }
-
-    /**
-     * Exit template processing
-     *
-     * @param $template
-     */
-    public function exitTemplate($template)
-    {
-        if ($this->max_template_nesting > 0) {
-            $this->_current_template_nesting --;
-        }
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_template_cached.php b/www/smarty-3.1.27/sysplugins/smarty_template_cached.php
deleted file mode 100644
index 5b904395..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_template_cached.php
+++ /dev/null
@@ -1,403 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: Uwe Tews
- * Date: 04.12.2014
- * Time: 06:08
- */
-
-/**
- * Smarty Resource Data Object
- * Cache Data Container for Template Files
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Rodney Rehm
- */
-class Smarty_Template_Cached
-{
-    /**
-     * Source Filepath
-     *
-     * @var string
-     */
-    public $filepath = false;
-
-    /**
-     * Source Content
-     *
-     * @var string
-     */
-    public $content = null;
-
-    /**
-     * Source Timestamp
-     *
-     * @var integer
-     */
-    public $timestamp = false;
-
-    /**
-     * Source Existence
-     *
-     * @var boolean
-     */
-    public $exists = false;
-
-    /**
-     * Cache Is Valid
-     *
-     * @var boolean
-     */
-    public $valid = null;
-
-    /**
-     * Cache was processed
-     *
-     * @var boolean
-     */
-    public $processed = false;
-
-    /**
-     * CacheResource Handler
-     *
-     * @var Smarty_CacheResource
-     */
-    public $handler = null;
-
-    /**
-     * Template Compile Id (Smarty_Internal_Template::$compile_id)
-     *
-     * @var string
-     */
-    public $compile_id = null;
-
-    /**
-     * Template Cache Id (Smarty_Internal_Template::$cache_id)
-     *
-     * @var string
-     */
-    public $cache_id = null;
-
-    /**
-     * Id for cache locking
-     *
-     * @var string
-     */
-    public $lock_id = null;
-
-    /**
-     * flag that cache is locked by this instance
-     *
-     * @var bool
-     */
-    public $is_locked = false;
-
-    /**
-     * Source Object
-     *
-     * @var Smarty_Template_Source
-     */
-    public $source = null;
-
-    /**
-     * create Cached Object container
-     *
-     * @param Smarty_Internal_Template $_template template object
-     */
-    public function __construct(Smarty_Internal_Template $_template)
-    {
-        $this->compile_id = $_template->compile_id;
-        $this->cache_id = $_template->cache_id;
-        if (!isset($_template->source)) {
-            $_template->loadSource();
-        }
-        $this->source = $_template->source;
-        if (!class_exists('Smarty_CacheResource', false)) {
-            require SMARTY_SYSPLUGINS_DIR . 'smarty_cacheresource.php';
-        }
-        $this->handler = Smarty_CacheResource::load($_template->smarty);
-    }
-
-    /**
-     * @param Smarty_Internal_Template $_template
-     *
-     * @return Smarty_Template_Cached
-     */
-    static function load(Smarty_Internal_Template $_template)
-    {
-        $_template->cached = $cached = new Smarty_Template_Cached($_template);
-        $cached->handler->populate($cached, $_template);
-        // caching enabled ?
-        if (!($_template->caching == Smarty::CACHING_LIFETIME_CURRENT || $_template->caching == Smarty::CACHING_LIFETIME_SAVED) || $_template->source->recompiled) {
-            $cached->valid = false;
-        }
-        return $cached;
-    }
-
-    /**
-     * Check if cache is valid, lock cache if required
-     *
-     * @param \Smarty_Internal_Template $_template
-     *
-     * @return bool flag true if cache is valid
-     */
-    public function isCached(Smarty_Internal_Template $_template)
-    {
-        if ($this->valid !== null) {
-            return $this->valid;
-        }
-        while (true) {
-            while (true) {
-                 if ($this->exists === false || $_template->smarty->force_compile || $_template->smarty->force_cache) {
-                    $this->valid = false;
-                } else {
-                    $this->valid = true;
-                }
-                if ($this->valid && $_template->caching == Smarty::CACHING_LIFETIME_CURRENT && $_template->cache_lifetime >= 0 && time() > ($this->timestamp + $_template->cache_lifetime)) {
-                    // lifetime expired
-                    $this->valid = false;
-                }
-                if ($this->valid && $_template->source->timestamp > $this->timestamp) {
-                    $this->valid = false;
-                }
-                if ($this->valid || !$_template->smarty->cache_locking) {
-                    break;
-                }
-                if (!$this->handler->locked($_template->smarty, $this)) {
-                    $this->handler->acquireLock($_template->smarty, $this);
-                    break 2;
-                }
-                $this->handler->populate($this, $_template);
-            }
-            if ($this->valid) {
-                if (!$_template->smarty->cache_locking || $this->handler->locked($_template->smarty, $this) === null) {
-                    // load cache file for the following checks
-                    if ($_template->smarty->debugging) {
-                        Smarty_Internal_Debug::start_cache($_template);
-                    }
-                    if ($this->handler->process($_template, $this) === false) {
-                        $this->valid = false;
-                    } else {
-                        $this->processed = true;
-                    }
-                    if ($_template->smarty->debugging) {
-                        Smarty_Internal_Debug::end_cache($_template);
-                    }
-                } else {
-                    $this->is_locked = true;
-                    continue;
-                }
-            } else {
-                return $this->valid;
-            }
-            if ($this->valid && $_template->caching === Smarty::CACHING_LIFETIME_SAVED && $_template->properties['cache_lifetime'] >= 0 && (time() > ($_template->cached->timestamp + $_template->properties['cache_lifetime']))) {
-                $this->valid = false;
-            }
-            if ($_template->smarty->cache_locking) {
-                if (!$this->valid) {
-                    $this->handler->acquireLock($_template->smarty, $this);
-                } elseif ($this->is_locked) {
-                    $this->handler->releaseLock($_template->smarty, $this);
-                }
-            }
-            return $this->valid;
-        }
-        return $this->valid;
-    }
-
-    /**
-     * Process cached template
-     *
-     * @param Smarty_Internal_Template $_template template object
-     */
-    public function process(Smarty_Internal_Template $_template)
-    {
-        if ($this->handler->process($_template, $this) === false) {
-            $this->valid = false;
-        }
-        if ($this->valid) {
-            $this->processed = true;
-        } else {
-            $this->processed = false;
-        }
-    }
-
-    /**
-     * Render cached template
-     *
-     * @param Smarty_Internal_Template $_template
-     *
-     * @return string
-     * @throws Exception
-     */
-    public function render(Smarty_Internal_Template $_template)
-    {
-        if (!$this->processed) {
-            $this->process($_template);
-        }
-        return $_template->getRenderedTemplateCode();
-    }
-
-    /**
-     * Write this cache object to handler
-     *
-     * @param Smarty_Internal_Template $_template template object
-     * @param string                   $content   content to cache
-     *
-     * @return boolean success
-     */
-    public function write(Smarty_Internal_Template $_template, $content)
-    {
-        if (!$_template->source->recompiled) {
-            if ($this->handler->writeCachedContent($_template, $content)) {
-                $this->content = null;
-                $this->timestamp = time();
-                $this->exists = true;
-                $this->valid = true;
-                $this->processed = false;
-                if ($_template->smarty->cache_locking) {
-                    $this->handler->releaseLock($_template->smarty, $this);
-                }
-
-                return true;
-            }
-            $this->content = null;
-            $this->timestamp = false;
-            $this->exists = false;
-            $this->valid = false;
-            $this->processed = false;
-        }
-
-        return false;
-    }
-
-    /**
-     * Read cache content from handler
-     *
-     * @param Smarty_Internal_Template $_template template object
-     *
-     * @return string content
-     */
-    public function read(Smarty_Internal_Template $_template)
-    {
-        if (!$_template->source->recompiled) {
-            return $this->handler->readCachedContent($_template);
-        }
-        return false;
-    }
-
-    /**
-     * Sanitize content and write it to cache resource
-     *
-     * @param Smarty_Internal_Template $_template
-     * @param string                   $content
-     * @param bool                     $no_output_filter
-     *
-     * @throws SmartyException
-     */
-    public function updateCache(Smarty_Internal_Template $_template, $content, $no_output_filter)
-    {
-        $_template->properties['has_nocache_code'] = false;
-        // get text between non-cached items
-        $cache_split = preg_split("!/\*%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*\/(.+?)/\*/%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*/!s", $content);
-        // get non-cached items
-        preg_match_all("!/\*%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*\/(.+?)/\*/%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*/!s", $content, $cache_parts);
-        $output = '';
-        // loop over items, stitch back together
-        foreach ($cache_split as $curr_idx => $curr_split) {
-            // escape PHP tags in template content
-            $output .= preg_replace('/(<%|%>|<\?php|<\?|\?>|<script\s+language\s*=\s*[\"\']?\s*php\s*[\"\']?\s*>)/', "<?php echo '\$1'; ?>\n", $curr_split);
-            if (isset($cache_parts[0][$curr_idx])) {
-                $_template->properties['has_nocache_code'] = true;
-                $output .= $cache_parts[1][$curr_idx];
-            }
-        }
-        if (!$no_output_filter && !$_template->has_nocache_code && (isset($_template->smarty->autoload_filters['output']) || isset($_template->smarty->registered_filters['output']))) {
-            $output = Smarty_Internal_Filter_Handler::runFilter('output', $output, $_template);
-        }
-        // write cache file content
-        $this->writeCachedContent($_template, $output);
-    }
-
-    /**
-     * Writes the content to cache resource
-     *
-     * @param Smarty_Internal_Template $_template
-     * @param string                   $content
-     *
-     * @return bool
-     */
-    public function writeCachedContent(Smarty_Internal_Template $_template, $content)
-    {
-        if ($_template->source->recompiled || !($_template->caching == Smarty::CACHING_LIFETIME_CURRENT || $_template->caching == Smarty::CACHING_LIFETIME_SAVED)) {
-            // don't write cache file
-            return false;
-        }
-        $_template->properties['cache_lifetime'] = $_template->cache_lifetime;
-        $_template->properties['unifunc'] = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
-        $content = Smarty_Internal_Extension_CodeFrame::create($_template, $content, true);
-        if (!empty($_template->properties['tpl_function'])) {
-            foreach ($_template->properties['tpl_function'] as $funcParam) {
-                if (is_file($funcParam['compiled_filepath'])) {
-                    // read compiled file
-                    $code = file_get_contents($funcParam['compiled_filepath']);
-                    // grab template function
-                    if (preg_match("/\/\* {$funcParam['call_name']} \*\/([\S\s]*?)\/\*\/ {$funcParam['call_name']} \*\//", $code, $match)) {
-                        unset($code);
-                        $content .= "<?php " . $match[0] . "?>\n";
-                    }
-                }
-            }
-        }
-        return $this->write($_template, $content);
-    }
-
-    /**
-     * check client side cache
-     *
-     * @param Smarty_Internal_Template $_template
-     * @param  string                  $content
-     */
-    public function cacheModifiedCheck(Smarty_Internal_Template $_template, $content)
-    {
-        $_isCached = $_template->isCached() && !$_template->has_nocache_code;
-        $_last_modified_date = @substr($_SERVER['HTTP_IF_MODIFIED_SINCE'], 0, strpos($_SERVER['HTTP_IF_MODIFIED_SINCE'], 'GMT') + 3);
-        if ($_isCached && $this->timestamp <= strtotime($_last_modified_date)) {
-            switch (PHP_SAPI) {
-                case 'cgi': // php-cgi < 5.3
-                case 'cgi-fcgi': // php-cgi >= 5.3
-                case 'fpm-fcgi': // php-fpm >= 5.3.3
-                    header('Status: 304 Not Modified');
-                    break;
-
-                case 'cli':
-                    if ( /* ^phpunit */
-                    !empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS']) /* phpunit$ */
-                    ) {
-                        $_SERVER['SMARTY_PHPUNIT_HEADERS'][] = '304 Not Modified';
-                    }
-                    break;
-
-                default:
-                    header($_SERVER['SERVER_PROTOCOL'] . ' 304 Not Modified');
-                    break;
-            }
-        } else {
-            switch (PHP_SAPI) {
-                case 'cli':
-                    if ( /* ^phpunit */
-                    !empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS']) /* phpunit$ */
-                    ) {
-                        $_SERVER['SMARTY_PHPUNIT_HEADERS'][] = 'Last-Modified: ' . gmdate('D, d M Y H:i:s', $this->timestamp) . ' GMT';
-                    }
-                    break;
-
-                default:
-                    header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $this->timestamp) . ' GMT');
-                    break;
-            }
-            echo $content;
-        }
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_template_compiled.php b/www/smarty-3.1.27/sysplugins/smarty_template_compiled.php
deleted file mode 100644
index 3ff8fa89..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_template_compiled.php
+++ /dev/null
@@ -1,288 +0,0 @@
-<?php
-
-/**
- * Smarty Resource Data Object
- * Meta Data Container for Template Files
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Rodney Rehm
- * @property string $content compiled content
- */
-class Smarty_Template_Compiled
-{
-    /**
-     * Compiled Filepath
-     *
-     * @var string
-     */
-    public $filepath = null;
-
-    /**
-     * Compiled Timestamp
-     *
-     * @var integer
-     */
-    public $timestamp = null;
-
-    /**
-     * Compiled Existence
-     *
-     * @var boolean
-     */
-    public $exists = false;
-
-    /**
-     * Compiled Content Loaded
-     *
-     * @var boolean
-     */
-    public $processed = false;
-    /**
-     * Code of recompiled template resource
-     *
-     * @var string|null
-     */
-    public $code = null;
-
-    /**
-     * create Compiled Object container
-     */
-    public function __construct()
-    {
-    }
-
-    /**
-     * get a Compiled Object of this source
-     *
-     * @param  Smarty_Internal_Template $_template template object
-     *
-     * @return Smarty_Template_Compiled compiled object
-     */
-    static function load($_template)
-    {
-        if (!isset($_template->source)) {
-            $_template->loadSource();
-        }
-        // check runtime cache
-        if (!$_template->source->recompiled && $_template->smarty->resource_caching) {
-            $_cache_key = $_template->source->unique_resource . '#';
-            if ($_template->caching) {
-                $_cache_key .= 'caching#';
-            }
-            $_cache_key .= $_template->compile_id;
-            if (isset($_template->source->compileds[$_cache_key])) {
-                return $_template->source->compileds[$_cache_key];
-            }
-        }
-        $compiled = new Smarty_Template_Compiled();
-        if (method_exists($_template->source->handler, 'populateCompiledFilepath')) {
-            $_template->source->handler->populateCompiledFilepath($compiled, $_template);
-        } else {
-            $compiled->populateCompiledFilepath($_template);
-        }
-        // runtime cache
-        if (!$_template->source->recompiled && $_template->smarty->resource_caching) {
-            $_template->source->compileds[$_cache_key] = $compiled;
-        }
-        return $compiled;
-    }
-
-    /**
-     * populate Compiled Object with compiled filepath
-     *
-     * @param Smarty_Internal_Template $_template template object
-     **/
-    public function populateCompiledFilepath(Smarty_Internal_Template $_template)
-    {
-        $_compile_id = isset($_template->compile_id) ? preg_replace('![^\w\|]+!', '_', $_template->compile_id) : null;
-        if ($_template->source->isConfig) {
-            $_flag = '_' . ((int) $_template->smarty->config_read_hidden + (int) $_template->smarty->config_booleanize * 2
-                    + (int) $_template->smarty->config_overwrite * 4);
-        } else {
-            $_flag = '_' . ((int) $_template->smarty->merge_compiled_includes + (int) $_template->smarty->escape_html * 2);
-        }
-        $_filepath = $_template->source->uid . $_flag;
-        // if use_sub_dirs, break file into directories
-        if ($_template->smarty->use_sub_dirs) {
-            $_filepath = substr($_filepath, 0, 2) . DS
-                . substr($_filepath, 2, 2) . DS
-                . substr($_filepath, 4, 2) . DS
-                . $_filepath;
-        }
-        $_compile_dir_sep = $_template->smarty->use_sub_dirs ? DS : '^';
-        if (isset($_compile_id)) {
-            $_filepath = $_compile_id . $_compile_dir_sep . $_filepath;
-        }
-        // caching token
-        if ($_template->caching) {
-            $_cache = '.cache';
-        } else {
-            $_cache = '';
-        }
-        $_compile_dir = $_template->smarty->getCompileDir();
-        // set basename if not specified
-        $_basename = $_template->source->handler->getBasename($_template->source);
-        if ($_basename === null) {
-            $_basename = basename(preg_replace('![^\w\/]+!', '_', $_template->source->name));
-        }
-        // separate (optional) basename by dot
-        if ($_basename) {
-            $_basename = '.' . $_basename;
-        }
-
-        $this->filepath = $_compile_dir . $_filepath . '.' . $_template->source->type . $_basename . $_cache . '.php';
-        $this->timestamp = $this->exists = is_file($this->filepath);
-        if ($this->exists) {
-            $this->timestamp = @filemtime($this->filepath);
-        }
-    }
-
-    /**
-     * load compiled template or compile from source
-     *
-     * @param Smarty_Internal_Template $_template
-     *
-     * @throws Exception
-     */
-    public function process(Smarty_Internal_Template $_template)
-    {
-        $_smarty_tpl = $_template;
-        if ($_template->source->recompiled || !$_template->compiled->exists || $_template->smarty->force_compile) {
-            $this->compileTemplateSource($_template);
-            $compileCheck = $_template->smarty->compile_check;
-            $_template->smarty->compile_check = false;
-            if ($_template->source->recompiled) {
-                $level = ob_get_level();
-                ob_start();
-                try {
-                    eval("?>" . $this->code);
-                }
-                catch (Exception $e) {
-                    while (ob_get_level() > $level) {
-                        ob_end_clean();
-                    }
-                    throw $e;
-                }
-                ob_get_clean();
-                $this->code = null;
-            } else {
-                include($_template->compiled->filepath);
-            }
-            $_template->smarty->compile_check = $compileCheck;
-        } else {
-            include($_template->compiled->filepath);
-            if ($_template->mustCompile) {
-                $this->compileTemplateSource($_template);
-                $compileCheck = $_template->smarty->compile_check;
-                $_template->smarty->compile_check = false;
-                include($_template->compiled->filepath);
-                $_template->smarty->compile_check = $compileCheck;
-            }
-        }
-        $this->unifunc = $_template->properties['unifunc'];
-        $this->processed = true;
-    }
-
-    /**
-     * render compiled template code
-     *
-     * @param Smarty_Internal_Template $_template
-     *
-     * @return string
-     * @throws Exception
-     */
-    public function render(Smarty_Internal_Template $_template)
-    {
-
-        if (!$this->processed) {
-            $this->process($_template);
-        }
-        $_template->properties['unifunc'] = $this->unifunc;
-        return $_template->getRenderedTemplateCode();
-    }
-
-    /**
-     * compile template from source
-     *
-     * @param Smarty_Internal_Template $_template
-     *
-     * @return string
-     * @throws Exception
-     */
-    public function compileTemplateSource(Smarty_Internal_Template $_template)
-    {
-        if (!$_template->source->recompiled) {
-            $_template->properties['file_dependency'] = array();
-        }
-        // compile locking
-        if (!$_template->source->recompiled) {
-            if ($saved_timestamp = $_template->compiled->timestamp) {
-                touch($_template->compiled->filepath);
-            }
-        }
-        // call compiler
-        try {
-            $code = $_template->compiler->compileTemplate($_template);
-        }
-        catch (Exception $e) {
-            // restore old timestamp in case of error
-            if (!$_template->source->recompiled && $saved_timestamp) {
-                touch($_template->compiled->filepath, $saved_timestamp);
-            }
-            throw $e;
-        }
-        // compiling succeeded
-        if ($_template->compiler->write_compiled_code) {
-            // write compiled template
-            $this->write($_template, $code);
-            $code = '';
-        }
-        // release compiler object to free memory
-        unset($_template->compiler);
-        return $code;
-    }
-
-    /**
-     * Write compiled code by handler
-     *
-     * @param Smarty_Internal_Template $_template template object
-     * @param string                   $code      compiled code
-     *
-     * @return boolean success
-     */
-    public function write(Smarty_Internal_Template $_template, $code)
-    {
-        if (!$_template->source->recompiled) {
-            $obj = new Smarty_Internal_Write_File();
-            if ($obj->writeFile($this->filepath, $code, $_template->smarty) === true) {
-                $this->timestamp = $this->exists = is_file($this->filepath);
-                if ($this->exists) {
-                    $this->timestamp = @filemtime($this->filepath);
-                    return true;
-                }
-            }
-            return false;
-        } else {
-            $this->code = $code;
-        }
-        $this->timestamp = time();
-        $this->exists = true;
-        return true;
-    }
-
-    /**
-     * Read compiled content from handler
-     *
-     * @param Smarty_Internal_Template $_template template object
-     *
-     * @return string content
-     */
-    public function read(Smarty_Internal_Template $_template)
-    {
-        if (!$_template->source->recompiled) {
-            return file_get_contents($this->filepath);
-        }
-        return isset($this->content) ? $this->content : false;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_template_config.php b/www/smarty-3.1.27/sysplugins/smarty_template_config.php
deleted file mode 100644
index f48d4711..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_template_config.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/**
- * Smarty Config Source Plugin
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Connfig Resource Data Object
- * Meta Data Container for Template Files
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Uwe Tews
- * @property integer $timestamp Source Timestamp
- * @property boolean $exists    Source Existence
- * @property boolean $template  Extended Template reference
- * @property string  $content   Source Content
- */
-class Smarty_Template_Config extends Smarty_Template_Source
-{
-    /**
-     * Name of the Class to compile this resource's contents with
-     *
-     * @var string
-     */
-    public $compiler_class = 'Smarty_Internal_Config_File_Compiler';
-
-    /**
-     * Name of the Class to tokenize this resource's contents with
-     *
-     * @var string
-     */
-    public $template_lexer_class = 'Smarty_Internal_Configfilelexer';
-
-    /**
-     * Name of the Class to parse this resource's contents with
-     *
-     * @var string
-     */
-    public $template_parser_class = 'Smarty_Internal_Configfileparser';
-
-    /**
-     * array of section names, single section or null
-     *
-     * @var null|string|array
-     */
-    public $config_sections = null;
-
-    /**
-     * scope into which the config variables shall be loaded
-     *
-     * @var string
-     */
-    public $scope = 'local';
-
-    /**
-     * Flag that source is a config file
-     *
-     * @var bool
-     */
-    public $isConfig = true;
-
-    /**
-     * create Source Object container
-     *
-     * @param Smarty_Resource $handler  Resource Handler this source object communicates with
-     * @param Smarty          $smarty   Smarty instance this source object belongs to
-     * @param string          $resource full template_resource
-     * @param string          $type     type of resource
-     * @param string          $name     resource name
-     */
-    public function __construct(Smarty_Resource $handler, Smarty $smarty, $resource, $type, $name)
-    {
-        $this->handler = clone $handler; // Note: prone to circular references
-        $this->resource = $resource;
-        $this->type = $type;
-        $this->name = $name;
-        $this->smarty = $smarty;
-    }
-
-    /**
-     * initialize Source Object for given resource
-     * Either [$_template] or [$smarty, $template_resource] must be specified
-     *
-     * @param  Smarty_Internal_Template $_template         template object
-     * @param  Smarty                   $smarty            smarty object
-     * @param  string                   $template_resource resource identifier
-     *
-     * @return Smarty_Template_Source Source Object
-     * @throws SmartyException
-     */
-    public static function load(Smarty_Internal_Template $_template = null, Smarty $smarty = null, $template_resource = null)
-    {
-        static $_incompatible_resources = array('extends' => true, 'php' => true);
-        $smarty = $_template->smarty;
-        $template_resource = $_template->template_resource;
-        if (empty($template_resource)) {
-            throw new SmartyException('Missing config name');
-        }
-        // parse resource_name, load resource handler
-        list($name, $type) = Smarty_Resource::parseResourceName($template_resource, $smarty->default_config_type);
-        // make sure configs are not loaded via anything smarty can't handle
-        if (isset($_incompatible_resources[$type])) {
-            throw new SmartyException ("Unable to use resource '{$type}' for config");
-        }
-        $resource = Smarty_Resource::load($smarty, $type);
-        $source = new Smarty_Template_Config($resource, $smarty, $template_resource, $type, $name);
-        $resource->populate($source, $_template);
-        if ((!isset($source->exists) || !$source->exists) && isset($_template->smarty->default_config_handler_func)) {
-            Smarty_Internal_Extension_DefaultTemplateHandler::_getDefault($_template, $source, $resource);
-        }
-        $source->unique_resource = $resource->buildUniqueResourceName($smarty, $name, true);
-        return $source;
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_template_source.php b/www/smarty-3.1.27/sysplugins/smarty_template_source.php
deleted file mode 100644
index dd537f0e..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_template_source.php
+++ /dev/null
@@ -1,285 +0,0 @@
-<?php
-
-/**
- * Smarty Resource Data Object
- * Meta Data Container for Template Files
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Rodney Rehm
- * @property integer $timestamp Source Timestamp
- * @property boolean $exists    Source Existence
- * @property boolean $template  Extended Template reference
- * @property string  $content   Source Content
- */
-class Smarty_Template_Source
-{
-    /**
-     * Name of the Class to compile this resource's contents with
-     *
-     * @var string
-     */
-    public $compiler_class = null;
-
-    /**
-     * Name of the Class to tokenize this resource's contents with
-     *
-     * @var string
-     */
-    public $template_lexer_class = null;
-
-    /**
-     * Name of the Class to parse this resource's contents with
-     *
-     * @var string
-     */
-    public $template_parser_class = null;
-
-    /**
-     * Unique Template ID
-     *
-     * @var string
-     */
-    public $uid = null;
-
-    /**
-     * Template Resource (Smarty_Internal_Template::$template_resource)
-     *
-     * @var string
-     */
-    public $resource = null;
-
-    /**
-     * Resource Type
-     *
-     * @var string
-     */
-    public $type = null;
-
-    /**
-     * Resource Name
-     *
-     * @var string
-     */
-    public $name = null;
-
-    /**
-     * Unique Resource Name
-     *
-     * @var string
-     */
-    public $unique_resource = null;
-
-    /**
-     * Source Filepath
-     *
-     * @var string
-     */
-    public $filepath = null;
-    /**
-     * Source File Base name
-     *
-     * @var string
-     */
-    public $basename = null;
-
-    /**
-     * The Components an extended template is made of
-     *
-     * @var array
-     */
-    public $components = null;
-
-    /**
-     * Resource Handler
-     *
-     * @var Smarty_Resource
-     */
-    public $handler = null;
-
-    /**
-     * Smarty instance
-     *
-     * @var Smarty
-     */
-    public $smarty = null;
-    /**
-     * Resource is source
-     *
-     * @var bool
-     */
-    public $isConfig = false;
-    /**
-     * Source is bypassing compiler
-     *
-     * @var boolean
-     */
-    public $uncompiled = false;
-
-    /**
-     * Source must be recompiled on every occasion
-     *
-     * @var boolean
-     */
-    public $recompiled = false;
-    /**
-     * cache for Smarty_Template_Compiled instances
-     *
-     * @var array
-     */
-    public $compileds = array();
-
-    /**
-     * create Source Object container
-     *
-     * @param Smarty_Resource $handler  Resource Handler this source object communicates with
-     * @param Smarty          $smarty   Smarty instance this source object belongs to
-     * @param string          $resource full template_resource
-     * @param string          $type     type of resource
-     * @param string          $name     resource name
-     *
-     * @internal param string $unique_resource unique resource name
-     */
-    public function __construct(Smarty_Resource $handler, Smarty $smarty, $resource, $type, $name)
-    {
-        $this->handler = $handler; // Note: prone to circular references
-
-        $this->recompiled = $handler->recompiled;
-        $this->uncompiled = $handler->uncompiled;
-        $this->compiler_class = $handler->compiler_class;
-        $this->template_lexer_class = $handler->template_lexer_class;
-        $this->template_parser_class = $handler->template_parser_class;
-
-        $this->smarty = $smarty;
-        $this->resource = $resource;
-        $this->type = $type;
-        $this->name = $name;
-    }
-
-    /**
-     * initialize Source Object for given resource
-     * Either [$_template] or [$smarty, $template_resource] must be specified
-     *
-     * @param  Smarty_Internal_Template $_template         template object
-     * @param  Smarty                   $smarty            smarty object
-     * @param  string                   $template_resource resource identifier
-     *
-     * @return Smarty_Template_Source Source Object
-     * @throws SmartyException
-     */
-    public static function load(Smarty_Internal_Template $_template = null, Smarty $smarty = null, $template_resource = null)
-    {
-        if ($_template) {
-            $smarty = $_template->smarty;
-            $template_resource = $_template->template_resource;
-        }
-        if (empty($template_resource)) {
-            throw new SmartyException('Missing template name');
-        }
-        // parse resource_name, load resource handler, identify unique resource name
-        list($name, $type) = Smarty_Resource::parseResourceName($template_resource, $smarty->default_resource_type);
-        $resource = Smarty_Resource::load($smarty, $type);
-        // if resource is not recompiling and resource name is not dotted we can check the source cache
-        if ($smarty->resource_caching && !$resource->recompiled && !(isset($name[1]) && $name[0] == '.' && ($name[1] == '.' || $name[1] == '/'))) {
-            $unique_resource = $resource->buildUniqueResourceName($smarty, $name);
-            if (isset($smarty->source_objects[$unique_resource])) {
-                return $smarty->source_objects[$unique_resource];
-            }
-        } else {
-            $unique_resource = null;
-        }
-        // create new source  object
-        $source = new Smarty_Template_Source($resource, $smarty, $template_resource, $type, $name);
-        $resource->populate($source, $_template);
-        if ((!isset($source->exists) || !$source->exists) && isset($_template->smarty->default_template_handler_func)) {
-            Smarty_Internal_Extension_DefaultTemplateHandler::_getDefault($_template, $source, $resObj);
-        }
-        // on recompiling resources we are done
-        if ($smarty->resource_caching && !$resource->recompiled) {
-            // may by we have already $unique_resource
-            $is_relative = false;
-            if (!isset($unique_resource)) {
-                $is_relative = isset($name[1]) && $name[0] == '.' && ($name[1] == '.' || $name[1] == '/') &&
-                    ($type == 'file' || (isset($_template->parent->source) && $_template->parent->source->type == 'extends'));
-                $unique_resource = $resource->buildUniqueResourceName($smarty, $is_relative ? $source->filepath . $name : $name);
-            }
-            $source->unique_resource = $unique_resource;
-            // save in runtime cache if not relative
-            if (!$is_relative) {
-                $smarty->source_objects[$unique_resource] = $source;
-            }
-        }
-        return $source;
-    }
-
-    /**
-     * render the uncompiled source
-     *
-     * @param Smarty_Internal_Template $_template template object
-     */
-    public function renderUncompiled(Smarty_Internal_Template $_template)
-    {
-        $level = ob_get_level();
-        ob_start();
-        try {
-            $this->handler->renderUncompiled($_template->source, $_template);
-            return ob_get_clean();
-        }
-        catch (Exception $e) {
-            while (ob_get_level() > $level) {
-                ob_end_clean();
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * <<magic>> Generic Setter.
-     *
-     * @param  string $property_name valid: timestamp, exists, content, template
-     * @param  mixed  $value         new value (is not checked)
-     *
-     * @throws SmartyException if $property_name is not valid
-     */
-    public function __set($property_name, $value)
-    {
-        switch ($property_name) {
-            // regular attributes
-            case 'timestamp':
-            case 'exists':
-            case 'content':
-                // required for extends: only
-            case 'template':
-                $this->$property_name = $value;
-                break;
-
-            default:
-                throw new SmartyException("source property '$property_name' does not exist.");
-        }
-    }
-
-    /**
-     * <<magic>> Generic getter.
-     *
-     * @param  string $property_name valid: timestamp, exists, content
-     *
-     * @return mixed
-     * @throws SmartyException if $property_name is not valid
-     */
-    public function __get($property_name)
-    {
-        switch ($property_name) {
-            case 'timestamp':
-            case 'exists':
-                $this->handler->populateTimestamp($this);
-
-                return $this->$property_name;
-
-            case 'content':
-                return $this->content = $this->handler->getContent($this);
-
-            default:
-                throw new SmartyException("source property '$property_name' does not exist.");
-        }
-    }
-}
diff --git a/www/smarty-3.1.27/sysplugins/smarty_variable.php b/www/smarty-3.1.27/sysplugins/smarty_variable.php
deleted file mode 100644
index c1de93cb..00000000
--- a/www/smarty-3.1.27/sysplugins/smarty_variable.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * class for the Smarty variable object
- * This class defines the Smarty variable object
- *
- * @package    Smarty
- * @subpackage Template
- */
-class Smarty_Variable
-{
-    /**
-     * template variable
-     *
-     * @var mixed
-     */
-    public $value = null;
-    /**
-     * if true any output of this variable will be not cached
-     *
-     * @var boolean
-     */
-    public $nocache = false;
-    /**
-     * the scope the variable will have  (local,parent or root)
-     *
-     * @var int
-     */
-    public $scope = Smarty::SCOPE_LOCAL;
-
-    /**
-     * create Smarty variable object
-     *
-     * @param mixed   $value   the value to assign
-     * @param boolean $nocache if true any output of this variable will be not cached
-     * @param int     $scope   the scope the variable will have  (local,parent or root)
-     */
-    public function __construct($value = null, $nocache = false, $scope = Smarty::SCOPE_LOCAL)
-    {
-        $this->value = $value;
-        $this->nocache = $nocache;
-        $this->scope = $scope;
-    }
-
-    /**
-     * <<magic>> String conversion
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return (string) $this->value;
-    }
-}
-
diff --git a/www/smarty-3.1.27/sysplugins/smartycompilerexception.php b/www/smarty-3.1.27/sysplugins/smartycompilerexception.php
deleted file mode 100644
index 4d5d7787..00000000
--- a/www/smarty-3.1.27/sysplugins/smartycompilerexception.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Smarty compiler exception class
- *
- * @package Smarty
- */
-class SmartyCompilerException extends SmartyException
-{
-    public function __toString()
-    {
-        return ' --> Smarty Compiler: ' . $this->message . ' <-- ';
-    }
-
-    /**
-     * The line number of the template error
-     *
-     * @type int|null
-     */
-    public $line = null;
-    /**
-     * The template source snippet relating to the error
-     *
-     * @type string|null
-     */
-    public $source = null;
-    /**
-     * The raw text of the error message
-     *
-     * @type string|null
-     */
-    public $desc = null;
-    /**
-     * The resource identifier or template name
-     *
-     * @type string|null
-     */
-    public $template = null;
-}
diff --git a/www/smarty-3.1.27/sysplugins/smartyexception.php b/www/smarty-3.1.27/sysplugins/smartyexception.php
deleted file mode 100644
index 3da16c27..00000000
--- a/www/smarty-3.1.27/sysplugins/smartyexception.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Smarty exception class
- *
- * @package Smarty
- */
-class SmartyException extends Exception
-{
-    public static $escape = false;
-
-    public function __toString()
-    {
-        return ' --> Smarty: ' . (self::$escape ? htmlentities($this->message) : $this->message) . ' <-- ';
-    }
-}
diff --git a/www/smarty-3.1.30/.gitattributes b/www/smarty-3.1.30/.gitattributes
deleted file mode 100644
index 412eeda7..00000000
--- a/www/smarty-3.1.30/.gitattributes
+++ /dev/null
@@ -1,22 +0,0 @@
-# Auto detect text files and perform LF normalization
-* text=auto
-
-# Custom for Visual Studio
-*.cs     diff=csharp
-*.sln    merge=union
-*.csproj merge=union
-*.vbproj merge=union
-*.fsproj merge=union
-*.dbproj merge=union
-
-# Standard to msysgit
-*.doc	 diff=astextplain
-*.DOC	 diff=astextplain
-*.docx diff=astextplain
-*.DOCX diff=astextplain
-*.dot  diff=astextplain
-*.DOT  diff=astextplain
-*.pdf  diff=astextplain
-*.PDF	 diff=astextplain
-*.rtf	 diff=astextplain
-*.RTF	 diff=astextplain
diff --git a/www/smarty-3.1.30/.gitignore b/www/smarty-3.1.30/.gitignore
deleted file mode 100644
index 51c201bf..00000000
--- a/www/smarty-3.1.30/.gitignore
+++ /dev/null
@@ -1,222 +0,0 @@
-#################
-## Eclipse
-#################
-
-*.pydevproject
-.project
-.metadata
-bin/
-tmp/
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-.classpath
-.settings/
-.loadpath
-
-# External tool builders
-.externalToolBuilders/
-
-# Locally stored "Eclipse launch configurations"
-*.launch
-
-# CDT-specific
-.cproject
-
-# PDT-specific
-.buildpath
-
-
-#################
-## Visual Studio
-#################
-
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
-# User-specific files
-*.suo
-*.user
-*.sln.docstates
-
-# Build results
-
-[Dd]ebug/
-[Rr]elease/
-x64/
-build/
-[Bb]in/
-[Oo]bj/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-*_i.c
-*_p.c
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.log
-*.scc
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opensdf
-*.sdf
-*.cachefile
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# NCrunch
-*.ncrunch*
-.*crunch*.local.xml
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.Publish.xml
-*.pubxml
-
-# NuGet Packages Directory
-## TODO: If you have NuGet Package Restore enabled, uncomment the next line
-#packages/
-
-# Windows Azure Build Output
-csx
-*.build.csdef
-
-# Windows Store app package directory
-AppPackages/
-
-# Others
-sql/
-*.Cache
-ClientBin/
-[Ss]tyle[Cc]op.*
-~$*
-*~
-*.dbmdl
-*.[Pp]ublish.xml
-*.pfx
-*.publishsettings
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file to a newer
-# Visual Studio version. Backup files are not needed, because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-
-# SQL Server files
-App_Data/*.mdf
-App_Data/*.ldf
-
-#############
-## Windows detritus
-#############
-
-# Windows image file caches
-Thumbs.db
-ehthumbs.db
-
-# Folder config file
-Desktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Mac crap
-.DS_Store
-
-
-#############
-## Python
-#############
-
-*.py[co]
-
-# Packages
-*.egg
-*.egg-info
-dist/
-build/
-eggs/
-parts/
-var/
-sdist/
-develop-eggs/
-.installed.cfg
-
-# Installer logs
-pip-log.txt
-
-# Unit test / coverage reports
-.coverage
-.tox
-
-#Translations
-*.mo
-
-#Mr Developer
-.mr.developer.cfg
-
-.idea/
-.idea\
-
-# Smarty
-lexer/*.php
-lexer/*.out
\ No newline at end of file
diff --git a/www/smarty-3.1.30/.travis.yml b/www/smarty-3.1.30/.travis.yml
deleted file mode 100644
index baca1979..00000000
--- a/www/smarty-3.1.30/.travis.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-language: php
-
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-
-allow_failures:
-    - php: hhvm
-
-install:
-   - git clone --depth=50 --branch=master git://github.com/smarty-php/smarty-phpunit.git
-
-script:
-   - cd smarty-phpunit
-   - phpunit ./
-
diff --git a/www/smarty-3.1.30/plugins/block.t.php b/www/smarty-3.1.30/plugins/block.t.php
deleted file mode 100644
index fb34307f..00000000
--- a/www/smarty-3.1.30/plugins/block.t.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/**
- * smarty-gettext.php - Gettext support for smarty
- *
- * ------------------------------------------------------------------------- *
- * This library is free software; you can redistribute it and/or             *
- * modify it under the terms of the GNU Lesser General Public                *
- * License as published by the Free Software Foundation; either              *
- * version 2.1 of the License, or (at your option) any later version.        *
- *                                                                           *
- * This library is distributed in the hope that it will be useful,           *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of            *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU         *
- * Lesser General Public License for more details.                           *
- *                                                                           *
- * You should have received a copy of the GNU Lesser General Public          *
- * License along with this library; if not, write to the Free Software       *
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA *
- * ------------------------------------------------------------------------- *
- *
- * To register as a smarty block function named 't', use:
- *   $smarty->register_block('t', 'smarty_translate');
- *
- * @package	smarty-gettext
- * @version	$Id: block.t.php 4737 2013-12-11 06:29:51Z gullevek $
- * @link	http://smarty-gettext.sf.net/
- * @author	Sagi Bashari <sagi@boom.org.il>
- * @copyright 2004 Sagi Bashari
- */
- 
-/**
- * Replace arguments in a string with their values. Arguments are represented by % followed by their number.
- *
- * @param	string	Source string
- * @param	mixed	Arguments, can be passed in an array or through single variables.
- * @returns	string	Modified string
- */
-function strarg($str)
-{
-	$tr = array();
-	$p = 0;
-
-	for ($i=1; $i < func_num_args(); $i++) {
-		$arg = func_get_arg($i);
-		
-		if (is_array($arg)) {
-			foreach ($arg as $aarg) {
-				$tr['%'.++$p] = $aarg;
-			}
-		} else {
-			$tr['%'.++$p] = $arg;
-		}
-	}
-	
-	return strtr($str, $tr);
-}
-
-/**
- * Smarty block function, provides gettext support for smarty.
- *
- * The block content is the text that should be translated.
- *
- * Any parameter that is sent to the function will be represented as %n in the translation text, 
- * where n is 1 for the first parameter. The following parameters are reserved:
- *   - escape - sets escape mode:
- *       - 'html' for HTML escaping, this is the default.
- *       - 'js' for javascript escaping.
- *       - 'no'/'off'/0 - turns off escaping
- *   - plural - The plural version of the text (2nd parameter of ngettext())
- *   - count - The item count for plural mode (3rd parameter of ngettext())
- */
-
-// cs modified: __ calls instead of direct gettext calls
-
-function smarty_block_t($params, $text, $template, &$repeat)
-{
-	if ($text) {
-		$text = stripslashes($text);
-		
-		// set escape mode
-		if (isset($params['escape'])) {
-			$escape = $params['escape'];
-			unset($params['escape']);
-		}
-		
-		// set plural version
-		if (isset($params['plural'])) {
-			$plural = $params['plural'];
-			unset($params['plural']);
-			
-			// set count
-			if (isset($params['count'])) {
-				$count = $params['count'];
-				unset($params['count']);
-			}
-		}
-
-		// use plural if required parameters are set
-		if (isset($count) && isset($plural)) {
-			$text = $template->l10n->__ngettext($text, $plural, $count);
-		} else { // use normal
-			$text = $template->l10n->__($text);
-		}
-
-		// run strarg if there are parameters
-		if (count($params)) {
-			$text = strarg($text, $params);
-		}
-
-		if (!isset($escape) || $escape == 'html') { // html escape, default
-		   $text = nl2br(htmlspecialchars($text));
-	   } elseif (isset($escape) && ($escape == 'javascript' || $escape == 'js')) { // javascript escape
-		   $text = str_replace('\'','\\\'',stripslashes($text));
-	   }
-
-		return $text;
-	}
-}
-
-?>
diff --git a/www/smarty-3.1.30/plugins/function.html_checkboxes.php b/www/smarty-3.1.30/plugins/function.html_checkboxes.php
deleted file mode 100644
index 82e93300..00000000
--- a/www/smarty-3.1.30/plugins/function.html_checkboxes.php
+++ /dev/null
@@ -1,256 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * Smarty {html_checkboxes} function plugin
- * File:       function.html_checkboxes.php<br>
- * Type:       function<br>
- * Name:       html_checkboxes<br>
- * Date:       24.Feb.2003<br>
- * Purpose:    Prints out a list of checkbox input types<br>
- * Examples:
- * <pre>
- * {html_checkboxes values=$ids output=$names}
- * {html_checkboxes values=$ids name='box' separator='<br>' output=$names}
- * {html_checkboxes values=$ids checked=$checked separator='<br>' output=$names}
- * </pre>
- * Params:
- * <pre>
- * - name       (optional) - string default "checkbox"
- * - values     (required) - array
- * - options    (optional) - associative array
- * - checked    (optional) - array default not set
- * - separator  (optional) - ie <br> or &nbsp;
- * - 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
- * </pre>
- *
- * @link       http://www.smarty.net/manual/en/language.function.html.checkboxes.php {html_checkboxes}
- *             (Smarty online manual)
- * @author     Christopher Kvarme <christopher.kvarme@flashjab.com>
- * @author     credits to Monte Ohrt <monte at ohrt dot com>
- * @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;
-    $pos = 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 'pos':
-                $$_key = array_values((array)$_val);
-                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) {
-            $_pos = isset($pos[ $_key ]) ? $pos[ $_key ] : '';
-            $_html_result[] =
-                smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels,
-                                                       $label_ids, $_pos, $escape);
-        }
-    } else {
-        foreach ($values as $_i => $_key) {
-            $_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
-            $_pos = isset($pos[ $_i ]) ? $pos[ $_i ] : '';
-            $_html_result[] =
-                smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels,
-                                                       $label_ids, $_pos, $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, $pos, $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 .= '<label for="' . $_id . '">';
-        } else {
-            $_output .= '<label>';
-        }
-    }
-
-    $name = smarty_function_escape_special_chars($name);
-    $value = smarty_function_escape_special_chars($value);
-    if ($escape) {
-        $output = smarty_function_escape_special_chars($output);
-    }
-
-    $_output .= '<input type="checkbox" name="' . $name . '[' . $pos . ']" value="' . $value . '"';
-
-    if ($labels && $label_ids) {
-        $_output .= ' id="' . $_id . '"';
-    }
-
-    if (is_array($selected)) {
-        if (isset($selected[ $value ])) {
-            $_output .= ' checked="checked"';
-        }
-    } elseif ($value === $selected) {
-        $_output .= ' checked="checked"';
-    }
-
-    $_output .= $extra . ' />' . $output;
-    if ($labels) {
-        $_output .= '</label>';
-    }
-
-    $_output .= $separator;
-
-    return $_output;
-}
diff --git a/www/smarty-3.1.30/plugins/function.html_options.php b/www/smarty-3.1.30/plugins/function.html_options.php
deleted file mode 100644
index ed3126df..00000000
--- a/www/smarty-3.1.30/plugins/function.html_options.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * Smarty {html_options} function plugin
- * Type:     function<br>
- * Name:     html_options<br>
- * Purpose:  Prints the list of <option> tags generated from
- *           the passed parameters<br>
- * Params:
- * <pre>
- * - name       (optional) - string default "select"
- * - values     (required) - if no options supplied) - array
- * - options    (required) - if no values supplied) - associative array
- * - selected   (optional) - string default not set
- * - output     (required) - if not options supplied) - array
- * - id         (optional) - string default not set
- * - class      (optional) - string default not set
- * </pre>
- *
- * @link     http://www.smarty.net/manual/en/language.function.html.options.php {html_image}
- *           (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @author   Ralf Strehle (minor optimization) <ralf dot strehle at yahoo dot de>
- *
- * @param array $params parameters
- *
- * @return string
- * @uses     smarty_function_escape_special_chars()
- */
-function smarty_function_html_options($params)
-{
-    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-
-    $name = null;
-    $values = null;
-    $options = null;
-    $selected = null;
-    $output = null;
-    $id = null;
-    $class = null;
-    $label = true;
-
-    $extra = '';
-
-    foreach ($params as $_key => $_val) {
-        switch ($_key) {
-            case 'name':
-            case 'class':
-            case 'id':
-                $$_key = (string) $_val;
-                break;
-
-            case 'options':
-                $options = (array) $_val;
-                break;
-
-            case 'values':
-            case 'output':
-                $$_key = array_values((array) $_val);
-                break;
-
-            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_options: 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_options: 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 'label':
-                if ($_val == 'true' || $_val == 'false')
-                    $$_key = (string)$_val;
-                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_options: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-        }
-    }
-
-    if (!isset($options) && !isset($values)) {
-        /* raise error here? */
-
-        return '';
-    }
-
-    $_html_result = '';
-    $_idx = 0;
-
-    if (isset($options)) {
-        foreach ($options as $_key => $_val) {
-            $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $label, $_idx);
-        }
-    } else {
-        foreach ($values as $_i => $_key) {
-            $_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
-            $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $label, $_idx);
-        }
-    }
-
-    if (!empty($name)) {
-        $_html_class = !empty($class) ? ' class="' . $class . '"' : '';
-        $_html_id = !empty($id) ? ' id="' . $id . '"' : '';
-        $_html_result =
-            '<select name="' . $name . '"' . $_html_class . $_html_id . $extra . '>' . "\n" . $_html_result .
-            '</select>' . "\n";
-    }
-
-    return $_html_result;
-}
-
-function smarty_function_html_options_optoutput($key, $value, $selected, $id, $class, $label, &$idx)
-{
-    if (!is_array($value)) {
-        $_key = smarty_function_escape_special_chars($key);
-        $_html_result = '<option' . (($label == 'true') ? ' label="' . smarty_function_escape_special_chars($value) . '"' : '') . ' value="' . $_key . '"';
-        if (is_array($selected)) {
-            if (isset($selected[ $_key ])) {
-                $_html_result .= ' selected="selected"';
-            }
-        } elseif ($_key === $selected) {
-            $_html_result .= ' selected="selected"';
-        }
-        $_html_class = !empty($class) ? ' class="' . $class . ' option"' : '';
-        $_html_id = !empty($id) ? ' id="' . $id . '-' . $idx . '"' : '';
-        if (is_object($value)) {
-            if (method_exists($value, "__toString")) {
-                $value = smarty_function_escape_special_chars((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 = smarty_function_escape_special_chars((string) $value);
-        }
-        $_html_result .= $_html_class . $_html_id . '>' . $value . '</option>' . "\n";
-        $idx ++;
-    } else {
-        $_idx = 0;
-        $_html_result =
-            smarty_function_html_options_optgroup($key, $value, $selected, !empty($id) ? ($id . '-' . $idx) : null,
-                                                  $class, $label, $_idx);
-        $idx ++;
-    }
-
-    return $_html_result;
-}
-
-function smarty_function_html_options_optgroup($key, $values, $selected, $id, $class, $label, &$idx)
-{
-    $optgroup_html = '<optgroup label="' . smarty_function_escape_special_chars($key) . '">' . "\n";
-    foreach ($values as $key => $value) {
-        $optgroup_html .= smarty_function_html_options_optoutput($key, $value, $selected, $id, $class, $label, $idx);
-    }
-    $optgroup_html .= "</optgroup>\n";
-
-    return $optgroup_html;
-}
diff --git a/www/smarty-3.1.30/plugins/function.popup.php b/www/smarty-3.1.30/plugins/function.popup.php
deleted file mode 100644
index 3a76b785..00000000
--- a/www/smarty-3.1.30/plugins/function.popup.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty {popup} function plugin
- *
- * Type:     function<br>
- * Name:     popup<br>
- * Purpose:  make text pop up in windows via overlib
- * @link http://smarty.php.net/manual/en/language.function.popup.php {popup}
- *          (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @param array
- * @param Smarty
- * @return string
- */
-function smarty_function_popup($params, &$smarty)
-{
-    $append = '';
-    foreach ($params as $_key=>$_value) {
-        switch ($_key) {
-            case 'text':
-            case 'trigger':
-            case 'function':
-            case 'inarray':
-                $$_key = (string)$_value;
-                if ($_key == 'function' || $_key == 'inarray')
-                    $append .= ',' . strtoupper($_key) . ",'$_value'";
-                break;
-
-            case 'caption':
-            case 'closetext':
-            case 'status':
-                $append .= ',' . strtoupper($_key) . ",'" . str_replace("'","\'",$_value) . "'";
-                break;
-
-            case 'fgcolor':
-            case 'bgcolor':
-            case 'textcolor':
-            case 'capcolor':
-            case 'closecolor':
-            case 'textfont':
-            case 'captionfont':
-            case 'closefont':
-            case 'fgbackground':
-            case 'bgbackground':
-            case 'caparray':
-            case 'capicon':
-            case 'background':
-            case 'frame':
-                $append .= ',' . strtoupper($_key) . ",'$_value'";
-                break;
-
-            case 'textsize':
-            case 'captionsize':
-            case 'closesize':
-            case 'width':
-            case 'height':
-            case 'border':
-            case 'offsetx':
-            case 'offsety':
-            case 'snapx':
-            case 'snapy':
-            case 'fixx':
-            case 'fixy':
-            case 'padx':
-            case 'pady':
-            case 'timeout':
-            case 'delay':
-                $append .= ',' . strtoupper($_key) . ",$_value";
-                break;
-
-            case 'sticky':
-            case 'left':
-            case 'right':
-            case 'center':
-            case 'above':
-            case 'below':
-            case 'noclose':
-            case 'autostatus':
-            case 'autostatuscap':
-            case 'fullhtml':
-            case 'hauto':
-            case 'vauto':
-            case 'mouseoff':
-            case 'followmouse':
-            case 'closeclick':
-                if ($_value) $append .= ',' . strtoupper($_key);
-                break;
-
-            default:
-                $smarty->trigger_error("[popup] unknown parameter $_key", E_USER_WARNING);
-        }
-    }
-
-    if (empty($text) && !isset($inarray) && empty($function)) {
-        $smarty->trigger_error("overlib: attribute 'text' or 'inarray' or 'function' required");
-        return false;
-    }
-
-    if (empty($trigger)) { $trigger = "onmouseover"; }
-
-    $retval = $trigger . '="return overlib(\''.preg_replace(array("!'!","![\r\n]!"),array("\'",'\r'),$text).'\'';
-    $retval .= $append . ');"';
-    if ($trigger == 'onmouseover')
-       $retval .= ' onmouseout="nd();"';
-
-
-    return $retval;
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/www/smarty-3.1.30/plugins/function.popup_init.php b/www/smarty-3.1.30/plugins/function.popup_init.php
deleted file mode 100644
index 93cb4545..00000000
--- a/www/smarty-3.1.30/plugins/function.popup_init.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty {popup_init} function plugin
- *
- * Type:     function<br>
- * Name:     popup_init<br>
- * Purpose:  initialize overlib
- * @link http://smarty.php.net/manual/en/language.function.popup.init.php {popup_init}
- *          (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @param array
- * @param Smarty
- * @return string
- */
-function smarty_function_popup_init($params, &$smarty)
-{
-    $zindex = 1000;
-    
-    if (!empty($params['zindex'])) {
-        $zindex = $params['zindex'];
-    }
-    
-    if (!empty($params['src'])) {
-        return '<div id="overDiv" style="position:absolute; visibility:hidden; z-index:'.$zindex.';"></div>' . "\n"
-         . '<script type="text/javascript" language="JavaScript" src="'.$params['src'].'"></script>' . "\n";
-    } else {
-        $smarty->trigger_error("popup_init: missing src parameter");
-    }
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/www/smarty-3.1.30/plugins/modifier.date_format.php b/www/smarty-3.1.30/plugins/modifier.date_format.php
deleted file mode 100644
index 28d6ff02..00000000
--- a/www/smarty-3.1.30/plugins/modifier.date_format.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifier
- */
-
-/**
- * Smarty date_format modifier plugin
- * Type:     modifier<br>
- * Name:     date_format<br>
- * Purpose:  format datestamps via strftime<br>
- * Input:<br>
- *          - string: input date string
- *          - format: strftime format for output
- *          - default_date: default date if $string is empty
- *
- * @link   http://www.smarty.net/manual/en/language.modifier.date.format.php date_format (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- *
- * @param string $string       input date string
- * @param string $format       strftime format for output
- * @param string $default_date default date if $string is empty
- * @param string $formatter    either 'strftime' or 'auto'
- *
- * @return string |void
- * @uses   smarty_make_timestamp()
- */
-function smarty_modifier_date_format($string, $format = null, $default_date = '', $formatter = 'auto')
-{
-    if ($format === null) {
-        $format = Smarty::$_DATE_FORMAT;
-    }
-    /**
-     * require_once the {@link shared.make_timestamp.php} plugin
-     */
-    require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
-    if ($string != '' && $string != '0000-00-00' && $string != '0000-00-00 00:00:00') {
-        $timestamp = smarty_make_timestamp($string);
-    } elseif ($default_date != '') {
-        $timestamp = smarty_make_timestamp($default_date);
-    } else {
-        return;
-    }
-    if ($formatter == 'strftime' || ($formatter == 'auto' && strpos($format, '%') !== false)) {
-        if (DS == '\\') {
-            $_win_from = array('%D', '%h', '%n', '%r', '%R', '%t', '%T');
-            $_win_to = array('%m/%d/%y', '%b', "\n", '%I:%M:%S %p', '%H:%M', "\t", '%H:%M:%S');
-            if (strpos($format, '%e') !== false) {
-                $_win_from[] = '%e';
-                $_win_to[] = sprintf('%\' 2d', date('j', $timestamp));
-            }
-            if (strpos($format, '%l') !== false) {
-                $_win_from[] = '%l';
-                $_win_to[] = sprintf('%\' 2d', date('h', $timestamp));
-            }
-            $format = str_replace($_win_from, $_win_to, $format);
-        }
-
-        return strftime($format, $timestamp);
-    } else {
-        return date($format, $timestamp);
-    }
-}
diff --git a/www/smarty-3.1.30/plugins/modifier.replace.php b/www/smarty-3.1.30/plugins/modifier.replace.php
deleted file mode 100644
index aa5e8570..00000000
--- a/www/smarty-3.1.30/plugins/modifier.replace.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifier
- */
-
-/**
- * Smarty replace modifier plugin
- * Type:     modifier<br>
- * Name:     replace<br>
- * Purpose:  simple search/replace
- *
- * @link   http://smarty.php.net/manual/en/language.modifier.replace.php replace (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author Uwe Tews
- *
- * @param string $string  input string
- * @param string $search  text to search for
- * @param string $replace replacement text
- *
- * @return string
- */
-function smarty_modifier_replace($string, $search, $replace)
-{
-    if (Smarty::$_MBSTRING) {
-        require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php');
-
-        return smarty_mb_str_replace($search, $replace, $string);
-    }
-
-    return str_replace($search, $replace, $string);
-}
diff --git a/www/smarty-3.1.30/plugins/modifier.spacify.php b/www/smarty-3.1.30/plugins/modifier.spacify.php
deleted file mode 100644
index e5c41ad8..00000000
--- a/www/smarty-3.1.30/plugins/modifier.spacify.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifier
- */
-
-/**
- * Smarty spacify modifier plugin
- * Type:     modifier<br>
- * Name:     spacify<br>
- * Purpose:  add spaces between characters in a string
- *
- * @link   http://smarty.php.net/manual/en/language.modifier.spacify.php spacify (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- *
- * @param string $string       input string
- * @param string $spacify_char string to insert between characters.
- *
- * @return string
- */
-function smarty_modifier_spacify($string, $spacify_char = ' ')
-{
-    // well… what about charsets besides latin and UTF-8?
-    return implode($spacify_char, preg_split('//' . Smarty::$_UTF8_MODIFIER, $string, - 1, PREG_SPLIT_NO_EMPTY));
-}
diff --git a/www/smarty-3.1.30/plugins/modifiercompiler.cat.php b/www/smarty-3.1.30/plugins/modifiercompiler.cat.php
deleted file mode 100644
index db9d81fb..00000000
--- a/www/smarty-3.1.30/plugins/modifiercompiler.cat.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty cat modifier plugin
- * Type:     modifier<br>
- * Name:     cat<br>
- * Date:     Feb 24, 2003<br>
- * Purpose:  catenate a value to a variable<br>
- * Input:    string to catenate<br>
- * Example:  {$var|cat:"foo"}
- *
- * @link     http://smarty.php.net/manual/en/language.modifier.cat.php cat
- *           (Smarty online manual)
- * @author   Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_cat($params)
-{
-    return '(' . implode(').(', $params) . ')';
-}
diff --git a/www/smarty-3.1.30/plugins/modifiercompiler.noprint.php b/www/smarty-3.1.30/plugins/modifiercompiler.noprint.php
deleted file mode 100644
index 4906908b..00000000
--- a/www/smarty-3.1.30/plugins/modifiercompiler.noprint.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty noprint modifier plugin
- * Type:     modifier<br>
- * Name:     noprint<br>
- * Purpose:  return an empty string
- *
- * @author   Uwe Tews
- * @return string with compiled code
- */
-function smarty_modifiercompiler_noprint()
-{
-    return "''";
-}
diff --git a/www/smarty-3.1.30/plugins/shared.mb_unicode.php b/www/smarty-3.1.30/plugins/shared.mb_unicode.php
deleted file mode 100644
index 0f790b56..00000000
--- a/www/smarty-3.1.30/plugins/shared.mb_unicode.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Smarty shared plugin
- *
- * @package    Smarty
- * @subpackage PluginsShared
- */
-
-/**
- * convert characters to their decimal unicode equivalents
- *
- * @link   http://www.ibm.com/developerworks/library/os-php-unicode/index.html#listing3 for inspiration
- *
- * @param string $string   characters to calculate unicode of
- * @param string $encoding encoding of $string, if null mb_internal_encoding() is used
- *
- * @return array sequence of unicodes
- * @author Rodney Rehm
- */
-function smarty_mb_to_unicode($string, $encoding = null)
-{
-    if ($encoding) {
-        $expanded = mb_convert_encoding($string, "UTF-32BE", $encoding);
-    } else {
-        $expanded = mb_convert_encoding($string, "UTF-32BE");
-    }
-
-    return unpack("N*", $expanded);
-}
-
-/**
- * convert unicodes to the character of given encoding
- *
- * @link   http://www.ibm.com/developerworks/library/os-php-unicode/index.html#listing3 for inspiration
- *
- * @param integer|array $unicode  single unicode or list of unicodes to convert
- * @param string        $encoding encoding of returned string, if null mb_internal_encoding() is used
- *
- * @return string unicode as character sequence in given $encoding
- * @author Rodney Rehm
- */
-function smarty_mb_from_unicode($unicode, $encoding = null)
-{
-    $t = '';
-    if (!$encoding) {
-        $encoding = mb_internal_encoding();
-    }
-    foreach ((array) $unicode as $utf32be) {
-        $character = pack("N*", $utf32be);
-        $t .= mb_convert_encoding($character, $encoding, "UTF-32BE");
-    }
-
-    return $t;
-}
diff --git a/www/smarty-3.1.30/plugins/variablefilter.htmlspecialchars.php b/www/smarty-3.1.30/plugins/variablefilter.htmlspecialchars.php
deleted file mode 100644
index aecd1e7e..00000000
--- a/www/smarty-3.1.30/plugins/variablefilter.htmlspecialchars.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFilter
- */
-
-/**
- * Smarty htmlspecialchars variablefilter plugin
- *
- * @param string $source input string
- *
- * @return string filtered output
- */
-function smarty_variablefilter_htmlspecialchars($source)
-{
-    return htmlspecialchars($source, ENT_QUOTES, Smarty::$_CHARSET);
-}
diff --git a/www/smarty-3.1.30/sysplugins/smarty_resource_custom.php b/www/smarty-3.1.30/sysplugins/smarty_resource_custom.php
deleted file mode 100644
index 619f2d6f..00000000
--- a/www/smarty-3.1.30/sysplugins/smarty_resource_custom.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Smarty Resource Plugin
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Rodney Rehm
- */
-
-/**
- * Smarty Resource Plugin
- * Wrapper Implementation for custom resource plugins
- *
- * @package    Smarty
- * @subpackage TemplateResources
- */
-abstract class Smarty_Resource_Custom extends Smarty_Resource
-{
-    /**
-     * fetch template and its modification time from data source
-     *
-     * @param string  $name    template name
-     * @param string  &$source template source
-     * @param integer &$mtime  template modification timestamp (epoch)
-     */
-    abstract protected function fetch($name, &$source, &$mtime);
-
-    /**
-     * Fetch template's modification timestamp from data source
-     * {@internal implementing this method is optional.
-     *  Only implement it if modification times can be accessed faster than loading the complete template source.}}
-     *
-     * @param  string $name template name
-     *
-     * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
-     */
-    protected function fetchTimestamp($name)
-    {
-        return null;
-    }
-
-    /**
-     * populate Source Object with meta data from Resource
-     *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
-     */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
-    {
-        $source->filepath = $source->type . ':' . $source->name;
-        $source->uid = sha1($source->type . ':' . $source->name);
-
-        $mtime = $this->fetchTimestamp($source->name);
-        if ($mtime !== null) {
-            $source->timestamp = $mtime;
-        } else {
-            $this->fetch($source->name, $content, $timestamp);
-            $source->timestamp = isset($timestamp) ? $timestamp : false;
-            if (isset($content)) {
-                $source->content = $content;
-            }
-        }
-        $source->exists = !!$source->timestamp;
-    }
-
-    /**
-     * Load template's source into current template object
-     *
-     * @param  Smarty_Template_Source $source source object
-     *
-     * @return string                 template source
-     * @throws SmartyException        if source cannot be loaded
-     */
-    public function getContent(Smarty_Template_Source $source)
-    {
-        $this->fetch($source->name, $content, $timestamp);
-        if (isset($content)) {
-            return $content;
-        }
-
-        throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
-    }
-
-    /**
-     * Determine basename for compiled filename
-     *
-     * @param  Smarty_Template_Source $source source object
-     *
-     * @return string                 resource's basename
-     */
-    public function getBasename(Smarty_Template_Source $source)
-    {
-        return basename($source->name);
-    }
-}
diff --git a/www/smarty-3.1.30/sysplugins/smarty_undefined_variable.php b/www/smarty-3.1.30/sysplugins/smarty_undefined_variable.php
deleted file mode 100644
index 88bc6f68..00000000
--- a/www/smarty-3.1.30/sysplugins/smarty_undefined_variable.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * class for undefined variable object
- * This class defines an object for undefined variable handling
- *
- * @package    Smarty
- * @subpackage Template
- */
-class Smarty_Undefined_Variable
-{
-    /**
-     * Returns FALSE for 'nocache' and NULL otherwise.
-     *
-     * @param  string $name
-     *
-     * @return bool
-     */
-    public function __get($name)
-    {
-        if ($name == 'nocache') {
-            return false;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Always returns an empty string.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return "";
-    }
-}