do not allow to enable fcgid/fpm at the same time when both are set to 'yes' simultaneously in settings

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>

.gitignore

@@ -1,4 +1,3 @@
-lib/classes/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer/*/
 templates/*
 logs/*
 install/update.log

actions/admin/settings/125.cronjob.php

@@ -29,6 +29,14 @@ return array(
 					'default' => '/etc/cron.d/froxlor',
 					'save_method' => 'storeSettingField',
 					),
+				'system_send_cron_errors' => array(
+					'label' => $lng['serversettings']['system_send_cron_errors'],
+					'settinggroup' => 'system',
+					'varname' => 'send_cron_errors',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+				),
 				'system_croncmdline' => array(
 					'label' => $lng['serversettings']['system_croncmdline'],
 					'settinggroup' => 'system',

admin_admins.php

@@ -93,6 +93,9 @@ if ($page == 'admins'
 
 				$row = str_replace_array('-1', 'UL', $row, 'customers domains diskspace traffic mysqls emails email_accounts email_forwarders email_quota ftps subdomains tickets');
 				$row = htmlentities_array($row);
+
+				$row['custom_notes'] = ($row['custom_notes'] != '') ? nl2br($row['custom_notes']) : '';
+
 				eval("\$admins.=\"" . getTemplate("admins/admins_admin") . "\";");
 				$count++;
 			}
@@ -198,6 +201,9 @@ if ($page == 'admins'
 			$name = validate($_POST['name'], 'name');
 			$email = $idna_convert->encode(validate($_POST['email'], 'email'));
 
+			$custom_notes = validate(str_replace("\r\n", "\n", $_POST['custom_notes']), 'custom_notes', '/^[^\0]*$/');
+			$custom_notes_show = intval_ressource($_POST['custom_notes_show']);
+
 			$loginname = validate($_POST['loginname'], 'loginname');
 			$password = validate($_POST['admin_password'], 'password');
 			$password = validatePassword($password);
@@ -366,7 +372,7 @@ if ($page == 'admins'
 
 				$ins_data = array(
 					'loginname' => $loginname,
-					'password' => md5($password),
+					'password' => makeCryptPassword($password),
 					'name' => $name,
 					'email' => $email,
 					'lang' => $def_language,
@@ -388,7 +394,9 @@ if ($page == 'admins'
 					'tickets_see_all' => $tickets_see_all,
 					'mysqls' => $mysqls,
 					'ip' => $ipaddress,
-					'theme' => $_theme
+					'theme' => $_theme,
+					'custom_notes' => $custom_notes,
+					'custom_notes_show' => $custom_notes_show
 				);
 
 				$ins_stmt = Database::prepare("
@@ -416,7 +424,9 @@ if ($page == 'admins'
 					`tickets_see_all` = :tickets_see_all,
 					`mysqls` = :mysqls,
 					`ip` = :ip,
-					`theme` = :theme
+					`theme` = :theme,
+					`custom_notes` = :custom_notes,
+					`custom_notes_show` = :custom_notes_show
 				");
 				Database::pexecute($ins_stmt, $ins_data);
 
@@ -487,6 +497,9 @@ if ($page == 'admins'
 				$name = validate($_POST['name'], 'name');
 				$email = $idna_convert->encode(validate($_POST['email'], 'email'));
 
+				$custom_notes = validate(str_replace("\r\n", "\n", $_POST['custom_notes']), 'custom_notes', '/^[^\0]*$/');
+				$custom_notes_show = intval_ressource($_POST['custom_notes_show']);
+
 				if ($result['adminid'] == $userinfo['userid']) {
 
 					$password = '';
@@ -624,7 +637,7 @@ if ($page == 'admins'
 				} else {
 					if ($password != '') {
 						$password = validatePassword($password);
-						$password = md5($password);
+						$password = makeCryptPassword($password);
 					} else {
 						$password = $result['password'];
 					}
@@ -721,6 +734,8 @@ if ($page == 'admins'
 						'mysqls' => $mysqls,
 						'ip' => $ipaddress,
 						'deactivated' => $deactivated,
+						'custom_notes' => $custom_notes,
+						'custom_notes_show' => $custom_notes_show,
 						'adminid' => $id
 					);
 
@@ -748,7 +763,9 @@ if ($page == 'admins'
 						`tickets_see_all` = :tickets_see_all,
 						`mysqls` = :mysqls,
 						`ip` = :ip,
-						`deactivated` = :deactivated
+						`deactivated` = :deactivated,
+						`custom_notes` = :custom_notes,
+						`custom_notes_show` = :custom_notes_show
 						WHERE `adminid` = :adminid
 					");
 					Database::pexecute($upd_stmt, $upd_data);

admin_customers.php

@@ -128,6 +128,8 @@ if ($page == 'customers'
 					$traffic_percent = 100;
 				}
 
+				$row['custom_notes'] = ($row['custom_notes'] != '') ? nl2br($row['custom_notes']) : '';
+
 				eval("\$customers.=\"" . getTemplate("customers/customers_customer") . "\";");
 				$count++;
 			}
@@ -417,6 +419,9 @@ if ($page == 'customers'
 				$def_language = validate($_POST['def_language'], 'default language');
 				$gender = intval_ressource($_POST['gender']);
 
+				$custom_notes = validate(str_replace("\r\n", "\n", $_POST['custom_notes']), 'custom_notes', '/^[^\0]*$/');
+				$custom_notes_show = intval_ressource($_POST['custom_notes_show']);
+
 				$diskspace = intval_ressource($_POST['diskspace']);
 				if (isset($_POST['diskspace_ul'])) {
 					$diskspace = - 1;
@@ -632,7 +637,7 @@ if ($page == 'customers'
 					}
 
 					if ($password == '') {
-						$password = substr(md5(uniqid(microtime(), 1)), 12, 6);
+						$password = generatePassword();
 					}
 
 					$_theme = Settings::Get('panel.default_theme');
@@ -640,7 +645,7 @@ if ($page == 'customers'
 					$ins_data = array(
 						'adminid' => $userinfo['adminid'],
 						'loginname' => $loginname,
-						'passwd' => md5($password),
+						'passwd' => makeCryptPassword($password),
 						'name' => $name,
 						'firstname' => $firstname,
 						'gender' => $gender,
@@ -669,7 +674,9 @@ if ($page == 'customers'
 						'imap' => $email_imap,
 						'pop3' => $email_pop3,
 						'perlenabled' => $perlenabled,
-						'theme' => $_theme
+						'theme' => $_theme,
+						'custom_notes' => $custom_notes,
+						'custom_notes_show' => $custom_notes_show
 					);
 
 					$ins_stmt = Database::prepare("
@@ -706,7 +713,9 @@ if ($page == 'customers'
 						`imap` = :imap,
 						`pop3` = :pop3,
 						`perlenabled` = :perlenabled,
-						`theme` = :theme"
+						`theme` = :theme,
+						`custom_notes` = :custom_notes,
+						`custom_notes_show` = :custom_notes_show"
 					);
 					Database::pexecute($ins_stmt, $ins_data);
 
@@ -1063,6 +1072,9 @@ if ($page == 'customers'
 
 				$move_to_admin = isset($_POST['move_to_admin']) ? intval_ressource($_POST['move_to_admin']) : 0;
 
+				$custom_notes = validate(str_replace("\r\n", "\n", $_POST['custom_notes']), 'custom_notes', '/^[^\0]*$/');
+				$custom_notes_show = intval_ressource($_POST['custom_notes_show']);
+
 				$diskspace = intval_ressource($_POST['diskspace']);
 				if (isset($_POST['diskspace_ul'])) {
 					$diskspace = - 1;
@@ -1203,7 +1215,7 @@ if ($page == 'customers'
 
 					if ($password != '') {
 						$password = validatePassword($password);
-						$password = md5($password);
+						$password = makeCryptPassword($password);
 					} else {
 						$password = $result['password'];
 					}
@@ -1398,7 +1410,9 @@ if ($page == 'customers'
 						'phpenabled' => $phpenabled,
 						'imap' => $email_imap,
 						'pop3' => $email_pop3,
-						'perlenabled' => $perlenabled
+						'perlenabled' => $perlenabled,
+						'custom_notes' => $custom_notes,
+						'custom_notes_show' => $custom_notes_show
 					);
 					$upd_stmt = Database::prepare("
 						UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET
@@ -1429,7 +1443,9 @@ if ($page == 'customers'
 						`email_quota` = :email_quota,
 						`imap` = :imap,
 						`pop3` = :pop3,
-						`perlenabled` = :perlenabled
+						`perlenabled` = :perlenabled,
+						`custom_notes` = :custom_notes,
+						`custom_notes_show` = :custom_notes_show
 						WHERE `customerid` = :customerid"
 					);
 					Database::pexecute($upd_stmt, $upd_data);

admin_domains.php

@@ -1911,7 +1911,7 @@ if ($page == 'domains'
 
 			$customerid = intval($_POST['customerid']);
 			$separator = validate($_POST['separator'], 'separator');
-			$offset = validate($_POST['offset'], 'offset', "/[0-9]/i");
+			$offset = (int)validate($_POST['offset'], 'offset', "/[0-9]/i");
 
 			$file_name = $_FILES['file']['tmp_name'];
 

admin_index.php

@@ -140,6 +140,8 @@ if ($page == 'overview') {
 	$userinfo['traffic_used'] = round($userinfo['traffic_used'] / (1024 * 1024), $dec_places);
 	$userinfo = str_replace_array('-1', $lng['customer']['unlimited'], $userinfo, 'customers domains diskspace traffic mysqls emails email_accounts email_forwarders email_quota ftps tickets subdomains');
 
+	$userinfo['custom_notes'] = ($userinfo['custom_notes'] != '') ? nl2br($userinfo['custom_notes']) : '';
+
 	$cron_last_runs = getCronjobsLastRun();
 	$outstanding_tasks = getOutstandingTasks();
 
@@ -197,7 +199,7 @@ if ($page == 'overview') {
 	) {
 		$old_password = validate($_POST['old_password'], 'old password');
 
-		if (md5($old_password) != $userinfo['password']) {
+		if (!validatePasswordLogin($userinfo,$old_password,TABLE_PANEL_ADMINS,'adminid')) {
 			standard_error('oldpasswordnotcorrect');
 			exit;
 		}
@@ -217,13 +219,11 @@ if ($page == 'overview') {
 			$chgpwd_stmt = Database::prepare("
 				UPDATE `" . TABLE_PANEL_ADMINS . "`
 				SET `password`= :newpasswd
-				WHERE `adminid`= :adminid
+				WHERE `adminid`= :adminid"
-				AND `password`= :oldpasswd"
 			);
 			Database::pexecute($chgpwd_stmt, array(
-				'newpasswd' => md5($new_password),
+				'newpasswd' => makeCryptPassword($new_password),
-				'adminid' => (int)$userinfo['adminid'],
+				'adminid' => (int)$userinfo['adminid']
-				'oldpasswd' => md5($old_password)
 			));
 			$log->logAction(ADM_ACTION, LOG_NOTICE, 'changed password');
 			redirectTo($filename, Array('s' => $s));

admin_tickets.php

@@ -158,8 +158,10 @@ if ($page == 'tickets'
 					}
 
 					$row['subject'] = html_entity_decode($row['subject']);
-					if (strlen($row['subject']) > 20) {
+					if (strlen($row['subject']) > 30) {
-						$row['subject'] = substr($row['subject'], 0, 17) . '...';
+						$ts = wordwrap($row['subject'], 30, "|");
+						$ts = explode("|", $ts);
+						$row['subject'] = $ts[0]. '...';
 					}
 
 					eval("\$tickets.=\"" . getTemplate("tickets/tickets_tickets") . "\";");

customer_domains.php

@@ -230,6 +230,12 @@ if ($page == 'overview') {
 				$domain_check = Database::pexecute_first($domain_stmt, array("domain" => $domain, "customerid" => $userinfo['customerid']));
 
 				$completedomain = $subdomain . '.' . $domain;
+
+				if ($completedomain == Settings::Get('system.hostname')) {
+					standard_error('admin_domain_emailsystemhostname');
+					exit;
+				}
+
 				$completedomain_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_DOMAINS . "`
 					WHERE `domain` = :domain
 					AND `customerid` = :customerid

customer_email.php

@@ -451,7 +451,7 @@ if ($page == 'overview') {
 						standard_error('passwordshouldnotbeusername');
 					} else {
 						if ($password == '') {
-							$password = substr(md5(uniqid(microtime(), 1)), 12, 6);
+							$password = generatePassword();
 						}
 
 						$cryptPassword = makeCryptPassword($password);

customer_index.php

@@ -85,6 +85,8 @@ if ($page == 'overview') {
 	$userinfo['traffic_used'] = round($userinfo['traffic_used'] / (1024 * 1024), Settings::Get('panel.decimal_places'));
 	$userinfo = str_replace_array('-1', $lng['customer']['unlimited'], $userinfo, 'diskspace traffic mysqls emails email_accounts email_forwarders email_quota ftps tickets subdomains');
 
+	$userinfo['custom_notes'] = ($userinfo['custom_notes'] != '') ? nl2br($userinfo['custom_notes']) : '';
+
 	$services_enabled = "";
 	$se = array();
 	if ($userinfo['imap'] == '1') $se[] = "IMAP";
@@ -97,7 +99,7 @@ if ($page == 'overview') {
 } elseif ($page == 'change_password') {
 	if (isset($_POST['send']) && $_POST['send'] == 'send') {
 		$old_password = validate($_POST['old_password'], 'old password');
-		if (md5($old_password) != $userinfo['password']) {
+		if (!validatePasswordLogin($userinfo,$old_password,TABLE_PANEL_CUSTOMERS,'customerid')) {
 			standard_error('oldpasswordnotcorrect');
 			exit;
 		}
@@ -117,13 +119,11 @@ if ($page == 'overview') {
 			// Update user password
 			$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "`
 				SET `password` = :newpassword
-				WHERE `customerid` = :customerid
+				WHERE `customerid` = :customerid"
-				AND `password` = :oldpassword"
 			);
 			$params = array(
-				"newpassword" => md5($new_password),
+				"newpassword" => makeCryptPassword($new_password),
-				"customerid" => $userinfo['customerid'],
+				"customerid" => $userinfo['customerid']
-				"oldpassword" => md5($old_password)
 			);
 			Database::pexecute($stmt, $params);
 			$log->logAction(USR_ACTION, LOG_NOTICE, 'changed password');

customer_mysql.php

@@ -219,7 +219,7 @@ if ($page == 'overview') {
 							'DB_NAME' => $username,
 							'DB_PASS' => $password,
 							'DB_DESC' => $databasedescription,
-							'DB_SRV' => $sql_root['caption'],
+							'DB_SRV' => $sql_root['host'],
 							'PMA_URI' => $pma
 						);
 

customer_tickets.php

@@ -92,8 +92,10 @@ if ($page == 'overview') {
 				}
 
 				$row['subject'] = html_entity_decode($row['subject']);
-				if (strlen($row['subject']) > 20) {
+				if (strlen($row['subject']) > 30) {
-					$row['subject'] = substr($row['subject'], 0, 17) . '...';
+					$ts = wordwrap($row['subject'], 30, "|");
+					$ts = explode("|", $ts);
+					$row['subject'] = $ts[0]. '...';
 				}
 
 				eval("\$tickets.=\"" . getTemplate("tickets/tickets_tickets") . "\";");

index.php

@@ -118,7 +118,7 @@ if ($action == 'login') {
 		if ($userinfo['loginfail_count'] >= Settings::Get('login.maxloginattempts') && $userinfo['lastlogin_fail'] > (time() - Settings::Get('login.deactivatetime'))) {
 			redirectTo('index.php', array('showmessage' => '3'));
 			exit;
-		} elseif ($userinfo['password'] == md5($password)) {
+		} elseif (validatePasswordLogin($userinfo, $password, $table, $uid)) {
 			// login correct
 			// reset loginfail_counter, set lastlogin_succ
 			$stmt = Database::prepare("UPDATE $table
@@ -511,7 +511,7 @@ if ($action == 'resetpwd') {
 								WHERE `customerid` = :userid"
 							);
 						}
-						Database::pexecute($stmt, array("newpassword" => md5($new_password), "userid" => $result['userid']));
+						Database::pexecute($stmt, array("newpassword" => makeCryptPassword($new_password), "userid" => $result['userid']));
 
 						$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'password_reset'));
 						$rstlog->logAction(USR_ACTION, LOG_NOTICE, "changed password using password reset.");

install/froxlor.sql

@@ -91,7 +91,7 @@ DROP TABLE IF EXISTS `panel_admins`;
 CREATE TABLE `panel_admins` (
   `adminid` int(11) unsigned NOT NULL auto_increment,
   `loginname` varchar(50) NOT NULL default '',
-  `password` varchar(50) NOT NULL default '',
+  `password` varchar(255) NOT NULL default '',
   `name` varchar(255) NOT NULL default '',
   `email` varchar(255) NOT NULL default '',
   `def_language` varchar(255) NOT NULL default '',
@@ -131,6 +131,8 @@ CREATE TABLE `panel_admins` (
   `loginfail_count` int(11) unsigned NOT NULL default '0',
   `reportsent` tinyint(4) unsigned NOT NULL default '0',
   `theme` varchar(255) NOT NULL default 'Sparkle',
+  `custom_notes` text,
+  `custom_notes_show` tinyint(1) NOT NULL default '0',
    PRIMARY KEY  (`adminid`),
    UNIQUE KEY `loginname` (`loginname`)
 ) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
@@ -141,7 +143,7 @@ DROP TABLE IF EXISTS `panel_customers`;
 CREATE TABLE `panel_customers` (
   `customerid` int(11) unsigned NOT NULL auto_increment,
   `loginname` varchar(50) NOT NULL default '',
-  `password` varchar(50) NOT NULL default '',
+  `password` varchar(255) NOT NULL default '',
   `adminid` int(11) unsigned NOT NULL default '0',
   `name` varchar(255) NOT NULL default '',
   `firstname` varchar(255) NOT NULL default '',
@@ -190,6 +192,8 @@ CREATE TABLE `panel_customers` (
   `imap` tinyint(1) NOT NULL default '1',
   `perlenabled` tinyint(1) NOT NULL default '0',
   `theme` varchar(255) NOT NULL default 'Sparkle',
+  `custom_notes` text,
+  `custom_notes_show` tinyint(1) NOT NULL default '0',
    PRIMARY KEY  (`customerid`),
    UNIQUE KEY `loginname` (`loginname`)
 ) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
@@ -488,7 +492,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
 	('system', 'phpreload_command', ''),
 	('system', 'apache24', '0'),
 	('system', 'documentroot_use_default_value', '0'),
-	('system', 'passwordcryptfunc', '1'),
+	('system', 'passwordcryptfunc', '3'),
 	('system', 'axfrservers', ''),
 	('system', 'customer_ssl_path', '/etc/ssl/froxlor-custom/'),
 	('system', 'allow_error_report_admin', '1'),
@@ -503,6 +507,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
 	('system', 'croncmdline', '/usr/bin/nice -n 5 /usr/bin/php5 -q'),
 	('system', 'cron_allowautoupdate', '0'),
 	('system', 'dns_createhostnameentry', '0'),
+	('system', 'send_cron_errors', '0'),
 	('panel', 'decimal_places', '4'),
 	('panel', 'adminmail', 'admin@SERVERNAME'),
 	('panel', 'phpmyadmin_url', ''),
@@ -532,8 +537,8 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
 	('panel', 'password_alpha_upper', '1'),
 	('panel', 'password_numeric', '0'),
 	('panel', 'password_special_char_required', '0'),
-	('panel', 'password_special_char', '!?<>§$%&+#=@'),
+	('panel', 'password_special_char', '!?<>§$%+#=@'),
-	('panel', 'version', '0.9.33-rc1');
+	('panel', 'version', '0.9.33-rc3');
 
 
 DROP TABLE IF EXISTS `panel_tasks`;

install/lib/class.FroxlorInstall.php

@@ -372,7 +372,8 @@ class FroxlorInstall {
 		$content .= $this->_status_message('begin', $this->_lng['install']['adding_admin_user']);
 		$ins_data = array(
 				'loginname' => $this->_data['admin_user'],
-				'password' => md5($this->_data['admin_pass1']),
+				/* use SHA256 default crypt */
+				'password' => crypt($this->_data['admin_pass1'], '$5$'. md5(uniqid(microtime(), 1)) . md5(uniqid(microtime(), 1))),
 				'email' => 'admin@' . $this->_data['servername'],
 				'deflang' => $this->_languages[$this->_activelng]
 		);

install/scripts/language-check.php

@@ -27,13 +27,16 @@ if(@php_sapi_name() != 'cli'
 }
 
 // Check argument count
+/*
 if (sizeof($argv) != 2) {
 	print_help($argv);
 	exit;
 }
+*/
 
 // Load the contents of the given path
 $path = $argv[1];
+$_f = isset($argv[2]) ? $argv[2] : null;
 $files = array();
 
 if ($dh = opendir($path)) {
@@ -43,9 +46,11 @@ if ($dh = opendir($path)) {
 		   && !is_dir($file)
 		   && preg_match('/(.+)\.lng\.php/i', $file)
 		) {
+			if (is_null($_f) || (!is_null($_f) && ($file == $_f || $file == $baseLanguage))) {
 				$files[$file] = str_replace('//', '/', $path . '/' . $file);
 			}
 		}
+	}
 
 	closedir($dh);
 } else {

install/updates/froxlor/0.9/update_0.9.inc.php

@@ -2852,3 +2852,35 @@ if (isFroxlorVersion('0.9.33-dev3')) {
 
 	updateToVersion('0.9.33-rc1');
 }
+
+if (isFroxlorVersion('0.9.33-rc1')) {
+	showUpdateStep("Updating from 0.9.33-rc1 to 0.9.33-rc2", false);
+
+	showUpdateStep("Add new setting for sending cron-errors via mail");
+	$sendcronerrors = isset($_POST['system_send_cron_errors']) ? (int)$_POST['system_send_cron_errors'] : "0";
+	Settings::addNew('system.send_cron_errors', $sendcronerrors);
+	lastStepStatus(0);
+
+	showUpdateStep("Add new custom-notes field for admins and customer");
+	Database::query("ALTER TABLE `".TABLE_PANEL_ADMINS."` ADD `custom_notes` text AFTER `theme`");
+	Database::query("ALTER TABLE `".TABLE_PANEL_ADMINS."` ADD `custom_notes_show` tinyint(1) NOT NULL default '0' AFTER `custom_notes`");
+	Database::query("ALTER TABLE `".TABLE_PANEL_CUSTOMERS."` ADD `custom_notes` text AFTER `theme`");
+	Database::query("ALTER TABLE `".TABLE_PANEL_CUSTOMERS."` ADD `custom_notes_show` tinyint(1) NOT NULL default '0' AFTER `custom_notes`");
+	lastStepStatus(0);
+
+	// go from varchar(50) to varchar(255) because of some hashes that are longer than that
+	showUpdateStep("Updating table structure of admins and customers");
+	Database::query("ALTER TABLE `".TABLE_PANEL_ADMINS."` MODIFY `password` varchar(255) NOT NULL default ''");
+	Database::query("ALTER TABLE `".TABLE_PANEL_CUSTOMERS."` MODIFY `password` varchar(255) NOT NULL default ''");
+	lastStepStatus(0);
+
+	updateToVersion('0.9.33-rc2');
+}
+
+if (isFroxlorVersion('0.9.33-rc2')) {
+
+	showUpdateStep("Updating from 0.9.33-rc2 to 0.9.33-rc3");
+	lastStepStatus(0);
+	updateToVersion('0.9.33-rc3');
+
+}

install/updates/preconfig/0.9/preconfig_0.9.inc.php

@@ -679,4 +679,11 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version) {
 		}
 	}
 
+	if (versionInUpdate($current_version, '0.9.33-rc2')) {
+		$has_preconfig = true;
+		$description  = 'You can chose whether you want to receive an e-mail on cronjob errors. Keep in mind that this can lead to an e-mail being sent every 5 minutes.<br /><br />';
+		$question = '<strong>Do you want to receive cron-errors via mail? (default: no):</strong>&nbsp;';
+		$question.= makeyesno('system_send_cron_errors', '1', '0', '0').'<br />';
+		eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
+	}
 }

lib/ajax.php

@@ -25,6 +25,8 @@ require './userdata.inc.php';
 require './tables.inc.php';
 require './classes/database/class.Database.php';
 require './classes/settings/class.Settings.php';
+require './functions/validate/function.validate_ip.php';
+require './functions/validate/function.validateDomain.php';
 
 if(isset($_POST['action'])) {
 	$action = $_POST['action'];
@@ -72,7 +74,19 @@ if ($action == "newsfeed") {
 			$content = preg_replace("/[\r\n]+/", " ", strip_tags($item->description));
 			$content = substr($content, 0, 150) . "...";
 
-			echo "<tr class=\"newsitem\"><td><small>" . $date . "</small><br /><a href=\"" . $link . "\" target=\"_blank\"><b>" . $title . "</b><br />" . $content . "</a></td></tr>";
+			echo "<li class=\"clearfix\">
+                <div class=\"newsfeed-body clearfix\">
+                    <div class=\"header\">
+                        <strong class=\"primary-font\"><a href=\"{$link}\" target=\"_blank\">{$title}</a></strong>
+                        <small class=\"pull-right text-muted\">
+                            <i class=\"fa fa-clock-o fa-fw\"></i> {$date}
+                        </small>
+                    </div>
+                    <p>
+                        {$content}
+                    </p>
+                </div>
+            </li>";
 		}
 	} else {
 		echo "";

lib/classes/Smarty

@@ -1 +1 @@
-Smarty-3.1.15/libs/
+Smarty-3.1.21/libs/

lib/classes/Smarty-3.1.15/demo/index.php

@@ -1,30 +0,0 @@
-<?php
- /**
- * Example Application
-
- * @package Example-application
- */
-
-require '../libs/Smarty.class.php';
-
-$smarty = new Smarty;
-
-//$smarty->force_compile = true;
-$smarty->debugging = true;
-$smarty->caching = true;
-$smarty->cache_lifetime = 120;
-
-$smarty->assign("Name","Fred Irving Johnathan Bradley Peppergill",true);
-$smarty->assign("FirstName",array("John","Mary","James","Henry"));
-$smarty->assign("LastName",array("Doe","Smith","Johnson","Case"));
-$smarty->assign("Class",array(array("A","B","C","D"), array("E", "F", "G", "H"),
-      array("I", "J", "K", "L"), array("M", "N", "O", "P")));
-
-$smarty->assign("contacts", array(array("phone" => "1", "fax" => "2", "cell" => "3"),
-      array("phone" => "555-4444", "fax" => "555-3333", "cell" => "760-1234")));
-
-$smarty->assign("option_values", array("NY","NE","KS","IA","OK","TX"));
-$smarty->assign("option_output", array("New York","Nebraska","Kansas","Iowa","Oklahoma","Texas"));
-$smarty->assign("option_selected", "NE");
-
-$smarty->display('index.tpl');

lib/classes/Smarty-3.1.15/demo/templates/index.tpl

@@ -1,82 +0,0 @@
-{config_load file="test.conf" section="setup"}
-{include file="header.tpl" title=foo}
-
-<PRE>
-
-{* bold and title are read from the config file *}
-{if #bold#}<b>{/if}
-{* capitalize the first letters of each word of the title *}
-Title: {#title#|capitalize}
-{if #bold#}</b>{/if}
-
-The current date and time is {$smarty.now|date_format:"%Y-%m-%d %H:%M:%S"}
-
-The value of global assigned variable $SCRIPT_NAME is {$SCRIPT_NAME}
-
-Example of accessing server environment variable SERVER_NAME: {$smarty.server.SERVER_NAME}
-
-The value of {ldelim}$Name{rdelim} is <b>{$Name}</b>
-
-variable modifier example of {ldelim}$Name|upper{rdelim}
-
-<b>{$Name|upper}</b>
-
-
-An example of a section loop:
-
-{section name=outer 
-loop=$FirstName}
-{if $smarty.section.outer.index is odd by 2}
-	{$smarty.section.outer.rownum} . {$FirstName[outer]} {$LastName[outer]}
-{else}
-	{$smarty.section.outer.rownum} * {$FirstName[outer]} {$LastName[outer]}
-{/if}
-{sectionelse}
-	none
-{/section}
-
-An example of section looped key values:
-
-{section name=sec1 loop=$contacts}
-	phone: {$contacts[sec1].phone}<br>
-	fax: {$contacts[sec1].fax}<br>
-	cell: {$contacts[sec1].cell}<br>
-{/section}
-<p>
-
-testing strip tags
-{strip}
-<table border=0>
-	<tr>
-		<td>
-			<A HREF="{$SCRIPT_NAME}">
-			<font color="red">This is a  test     </font>
-			</A>
-		</td>
-	</tr>
-</table>
-{/strip}
-
-</PRE>
-
-This is an example of the html_select_date function:
-
-<form>
-{html_select_date start_year=1998 end_year=2010}
-</form>
-
-This is an example of the html_select_time function:
-
-<form>
-{html_select_time use_24_hours=false}
-</form>
-
-This is an example of the html_options function:
-
-<form>
-<select name=states>
-{html_options values=$option_values selected=$option_selected output=$option_output}
-</select>
-</form>
-
-{include file="footer.tpl"}

lib/classes/Smarty-3.1.15/libs/debug.tpl

@@ -1,133 +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, 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;
-}
-
-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;
-    width: 50%;
-}
-
-td {
-    color: green;
-}
-
-.odd {
-    background-color: #eeeeee;
-}
-
-.even {
-    background-color: #fafafa;
-}
-
-.exectime {
-    font-size: 0.8em;
-    font-style: italic;
-}
-
-#table_assigned_vars th {
-    color: blue;
-}
-
-#table_config_vars th {
-    color: maroon;
-}
-{/literal}
-</style>
-</head>
-<body>
-
-<h1>Smarty Debug Console  -  {if isset($template_name)}{$template_name|debug_print_var nofilter}{else}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>
-  <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}">   
-       <th>${$vars@key|escape:'html'}</th>
-       <td>{$vars|debug_print_var nofilter}</td></tr>
-    {/foreach}
-</table>
-
-<h2>assigned config file variables (outer template scope)</h2>
-
-<table id="table_config_vars">
-    {foreach $config_vars as $vars}
-       <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">   
-       <th>{$vars@key|escape:'html'}</th>
-       <td>{$vars|debug_print_var nofilter}</td></tr>
-    {/foreach}
-
-</table>
-</body>
-</html>
-{/capture}
-<script type="text/javascript">
-{$id = $template_name|default:''|md5}
-    _smarty_console = window.open("","console{$id}","width=680,height=600,resizable,scrollbars=yes");
-    _smarty_console.document.write("{$debug_output|escape:'javascript' nofilter}");
-    _smarty_console.document.close();
-</script>

lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_cacheresource_file.php

@@ -1,277 +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 = @filemtime($cached->filepath);
-            $cached->exists = !!$cached->timestamp;
-        }
-
-        /**
-        * 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 = @filemtime($cached->filepath);
-            $cached->exists = !!$cached->timestamp;
-        }
-
-        /**
-        * Read the cached template and process its header
-        *
-        * @param Smarty_Internal_Template $_template template object
-        * @param Smarty_Template_Cached $cached cached object
-        * @return booelan true or false if the cached content does not exist
-        */
-        public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null)
-        {
-            $_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)
-        {
-            if (Smarty_Internal_Write_File::writeFile($_template->cached->filepath, $content, $_template->smarty) === true) {
-                $_template->cached->timestamp = @filemtime($_template->cached->filepath);
-                $_template->cached->exists = !!$_template->cached->timestamp;
-                if ($_template->cached->exists) {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        /**
-        * Empty cache
-        *
-        * @param Smarty_Internal_Template $_template template 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)
-        {
-            return $this->clear($smarty, null, null, null, $exp_time);
-        }
-
-        /**
-        * Empty cache for a specific template
-        *
-        * @param Smarty  $_template     template 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)
-        {
-            $_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 = $smarty->getCacheDir();
-            $_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 booelan 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();
-            }
-            $t = @filemtime($cached->lock_id);
-
-            return $t && (time() - $t < $smarty->locking_timeout);
-        }
-
-        /**
-        * Lock cache for this template
-        *
-        * @param Smarty $smarty Smarty object
-        * @param Smarty_Template_Cached $cached cached object
-        */
-        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
-        */
-        public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
-        {
-            $cached->is_locked = false;
-            @unlink($cached->lock_id);
-        }
-    }

lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_resource_stream.php

@@ -1,80 +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 $is_config    flag for config resource
-    * @return string unique resource name
-    */
-    protected function buildUniqueResourceName(Smarty $smarty, $resource_name, $is_config = false)
-    {
-        return get_class($this) . '#' . $resource_name;
-    }
-}

lib/classes/Smarty-3.1.21/README

@@ -1,4 +1,4 @@
-Smarty 3.1.15
+Smarty 3.1.21
 
 Author: Monte Ohrt <monte at ohrt dot com >
 Author: Uwe Tews

lib/classes/Smarty-3.1.21/change_log.txt

@@ -1,5 +1,169 @@
- ===== trunk =====
+ ===== 3.1.22-dev ===== (xx.xx.2014)
- ===== Smarty-3.1.15 =====
+ ===== 3.1.21 ===== (18.10.2014)
+ 18.10.2014
+ - composer moved to github
+ - add COMPOSER_RELEASE_NOTES
+
+ 17.10.2014
+ - bugfix on $php_handling security and optimization of smarty_internal_parsetree (Thue Kristensen)
+
+ 16.10.2014
+ - bugfix composer.json update
+
+ 15.10.2014
+ - bugfix calling a new created cache file with fetch() and Smarty::CACHING_LIFETIME_SAVED multiple times did fail (forum 22350)
+
+ 14.10.2014
+ - bugfix any tag placed within "<script language=php>" will throw a security exception to close all thinkable holes
+ - bugfix classmap in root composer.json should start at "libs/..."
+ - improvement cache is_file(file_exists) results of loadPlugin() to avoid unnecessary calls during compilation (Issue 201}
+
+ 12.10.2014
+ - bugfix a comment like "<script{*foo*} language=php>" bypassed $php_handling checking (Thue Kristensen)
+ - bugfix change of 08.10.2014 could create E_NOTICE meassage when using "<?php" tags
+ - bugfix "<script language=php>" with $php_handling PHP_PASSTHRU was executed in {nocache} sections
+
+ ===== 3.1.20 ===== (09.10.2014)
+ 08.10.2014
+ - bugfix security mode of "<script language=php>" must be controlled by $php_handling property (Thue Kristensen)
+ 
+ 01.10.2014
+ - bugfix template resource of inheritance blocks could get invalid if the default resource type is not 'file'(Issue 202)
+ - bugfix existing child {block} tag must override parent {block} tag append / prepend setting (topic 25259)
+ 
+ 02.08.2014
+ - bugfix modifier wordwrap did output break string wrong if first word was exceeding length with cut = true (topic 25193)
+ 
+ 24.07.2014
+ - bugfix cache clear when cache folder does not exist
+
+ 16.07.2014
+ - enhancement remove BOM automatically from template source (topic 25161)
+ 
+ 04.07.2014
+ - bugfix the bufix of 02.06.2014 broke correct handling of child templates with same name but different template folders in extends resource (issue 194 and topic 25099)
+ 
+ ===== 3.1.19 ===== (06.30.2014)
+ 20.06.2014
+ - bugfix template variables could not be passed as parameter in {include} when the include was in a {nocache} section (topic 25131)
+ 
+ 17.06.2014
+ - bugfix large template text of some charsets could cause parsing errors (topic 24630)
+ 
+ 08.06.2014
+ - bugfix registered objects did not work after spelling fixes of 06.06.2014
+ - bugfix {block} tags within {literal} .. {/literal} got not displayed correctly (topic 25024)
+ - bugfix UNC WINDOWS PATH like "\\psf\path\to\dir" did not work as template directory (Issue 192)
+ - bugfix {html_image} security check did fail on files relative to basedir (Issue 191)
+ 
+ 06.06.2014
+ - fixed PHPUnit outputFilterTrimWhitespaceTests.php assertion of test result
+ - fixed spelling, PHPDoc , minor errors, code cleanup
+ 
+ 02.06.2014
+ - using multiple cwd with relative template dirs could result in identical compiled file names. (issue 194 and topic 25099)
+ 
+ 19.04.2014
+ - bugfix calling createTemplate(template, data) with empty data array caused notice of array to string conversion (Issue 189)
+ - bugfix clearCompiledTemplate() did not delete files on WINDOWS when a compile_id was specified
+ 
+ 18.04.2014
+ - revert bugfix of 5.4.2014 because %-e date format is not supported on all operating systems
+
+ ===== 3.1.18 ===== (07.04.2014)
+ 06.04.2014 
+ - bugfix template inheritance fail when using custom resource after patch of 8.3.2014 (Issue 187)
+ - bugfix update of composer file (Issue 168 and 184)
+
+ 05.04.2014
+ - bugfix default date format leads to extra spaces when displaying dates with single digit days (Issue 165)
+ 
+ 26.03.2014
+ - bugfix Smart_Resource_Custom should not lowercase the resource name (Issue 183)
+ 
+ 24.03.2014
+ - bugfix using a {foreach} property like @iteration could fail when used in inheritance parent templates (Issue 182)
+ 
+ 20.03.2014
+ - bugfix $smarty->auto_literal and mbsting.func_overload 2, 6 or 7 did fail (forum topic 24899)
+ 
+ 18.03.2014
+ - revert change of 17.03.2014
+ 
+17.03.2014
+ - bugfix $smarty->auto_literal and mbsting.func_overload 2, 6 or 7 did fail (forum topic 24899)
+ 
+ 15.03.2014
+ - bugfix Smarty_CacheResource_Keyvaluestore did use different keys on read/writes and clearCache() calls (Issue 169)
+
+ 13.03.2014
+ - bugfix clearXxx() change of 27.1.2014 did not work when specifing cache_id or compile_id  (forum topic 24868 and 24867)
+ 
+ ===== 3.1.17 =====
+ 08.03.2014
+ - bugfix relative file path {include} within {block} of child templates did throw exception on first call (Issue 177)
+ 
+ 17.02.2014
+ - bugfix Smarty failed when executing PHP on HHVM (Hip Hop 2.4) because uniqid('',true) does return string with ',' (forum topic 20343)
+ 
+ 16.02.2014
+ - bugfix a '//' or '\\' in template_dir path could produce wrong path on relative filepath in {include} (Issue 175)
+ 
+ 05.02.2014
+ - bugfix shared.literal_compiler_param.php did throw an exception when literal did contain a '-' (smarty-developers group)
+ 
+ 27.01.2014
+ - bugfix $smarty->debugging = true; did show the variable of the $smarty object not the variables used in display() call (forum topic 24764)
+ - bugfix clearCompiledTemplate(), clearAll() and clear() should use realpath to avoid possible exception from RecursiveDirectoryIterator (Issue 171)
+ 
+ 26.01.2014
+ - bugfix  undo block nesting checks for {nocache} for reasons like forum topic 23280 (forum topic 24762)
+ 
+ 18.01.2014
+ - bugfix the compiler did fail when using template inheritance and recursive {include} (smarty-developers group)
+ 
+ 11.01.2014
+ - bugfix "* }" (spaces before right delimiter) was interpreted by mistake as comment end tag (Issue 170)
+ - internals  content cache should be clear when updating cache file
+ 
+ 08.01.2014
+ - bugfix Smarty_CacheResource_Custom did not handle template resource type specifications on clearCache() calls (Issue 169)
+ - bugfix SmartyBC.class.php should use require_once to load Smarty.class.php (forum topic 24683)
+ 
+ ===== 3.1.16 =====
+ 15.12.2013
+ - bugfix {include} with {block} tag handling (forum topic 24599, 24594, 24682) (Issue 161)
+   Read 3.1.16_RELEASE_NOTES for more details
+ - enhancement additional debug output at $smarty->_parserdebug = true;
+ 
+ 07.11.2013
+ - bugfix too restrictive handling of {include} within {block} tags. 3.1.15 did throw errors where 3.1.14 did not (forum topic 24599)
+ - bugfix compiler could fail if PHP mbstring.func_overload is enabled  (Issue 164)
+ 
+ 28.10.2013
+ - bugfix variable resource name at custom resource plugin did not work within {block} tags (Issue 163)
+ - bugfix notice "Trying to get property of non-object" removed (Issue 163)
+ - bugfix correction of modifier capitalize fix from 3.10.2013  (issue 159)
+ - bugfix multiple {block}s with same name in parent did not work (forum topic 24631) 
+ 
+ 20.10.2013
+ - bugfix a variable file name at {extends} tag did fail (forum topic 24618)
+ 
+ 14.10.2013
+ - bugfix yesterdays fix could result in an undefined variable
+ 
+ 13.10.2013
+ - bugfix variable names on {include} in template inheritance did unextepted error message (forum topic 24594) (Issue 161)
+.- bugfix relative includes with same name like {include './foo.tpl'} from different folder failed (forum topic 24590)(Issue 161) 
+
+ 04.10.2013
+ - bugfix variable file names at {extends} had been disbabled by mistake with the rewrite of 
+   template inheritance of 24.08.2013   (forum topic 24585)
+   
+03.10.2013
+ - bugfix loops using modifier capitalize did eat up memory (issue 159)
+ 
+ ===== Smarty 3.1.15 =====
 01.10.2013
  - use current delimiters in compiler error messages (issue 157)
  - improvement on performance when using error handler and multiple template folders (issue 152)

lib/classes/Smarty-3.1.21/demo/index.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ * Example Application
+ *
+ * @package Example-application
+ */
+
+require '../libs/Smarty.class.php';
+
+$smarty = new Smarty;
+
+//$smarty->force_compile = true;
+$smarty->debugging = true;
+$smarty->caching = true;
+$smarty->cache_lifetime = 120;
+
+$smarty->assign("Name", "Fred Irving Johnathan Bradley Peppergill", true);
+$smarty->assign("FirstName", array("John", "Mary", "James", "Henry"));
+$smarty->assign("LastName", array("Doe", "Smith", "Johnson", "Case"));
+$smarty->assign("Class", array(array("A", "B", "C", "D"), array("E", "F", "G", "H"),
+                               array("I", "J", "K", "L"), array("M", "N", "O", "P")));
+
+$smarty->assign("contacts", array(array("phone" => "1", "fax" => "2", "cell" => "3"),
+                                  array("phone" => "555-4444", "fax" => "555-3333", "cell" => "760-1234")));
+
+$smarty->assign("option_values", array("NY", "NE", "KS", "IA", "OK", "TX"));
+$smarty->assign("option_output", array("New York", "Nebraska", "Kansas", "Iowa", "Oklahoma", "Texas"));
+$smarty->assign("option_selected", "NE");
+
+$smarty->display('index.tpl');

lib/classes/Smarty-3.1.21/demo/plugins/cacheresource.apc.php

@@ -2,10 +2,10 @@
 
 /**
  * APC CacheResource
- *
  * CacheResource Implementation based on the KeyValueStore API to use
  * memcache as the storage resource for Smarty's output caching.
  * *
+ *
  * @package CacheResource-examples
  * @author  Uwe Tews
  */
@@ -23,6 +23,7 @@ class Smarty_CacheResource_Apc extends Smarty_CacheResource_KeyValueStore
      * 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
      * @return boolean true on success, false on failure
      */
@@ -42,6 +43,7 @@ class Smarty_CacheResource_Apc extends Smarty_CacheResource_KeyValueStore
      *
      * @param  array $keys   list of values to save
      * @param  int   $expire expiration time
+     *
      * @return boolean true on success, false on failure
      */
     protected function write(array $keys, $expire = null)
@@ -57,6 +59,7 @@ class Smarty_CacheResource_Apc extends Smarty_CacheResource_KeyValueStore
      * Remove values from cache
      *
      * @param  array $keys list of keys to delete
+     *
      * @return boolean true on success, false on failure
      */
     protected function delete(array $keys)

lib/classes/Smarty-3.1.21/demo/plugins/cacheresource.memcache.php

@@ -2,10 +2,8 @@
 
 /**
  * Memcache CacheResource
- *
  * CacheResource Implementation based on the KeyValueStore API to use
  * memcache as the storage resource for Smarty's output caching.
- *
  * Note that memcache has a limitation of 256 characters per cache-key.
  * To avoid complications all cache-keys are translated to a sha1 hash.
  *
@@ -16,6 +14,7 @@ class Smarty_CacheResource_Memcache extends Smarty_CacheResource_KeyValueStore
 {
     /**
      * memcache instance
+     *
      * @var Memcache
      */
     protected $memcache = null;
@@ -30,6 +29,7 @@ class Smarty_CacheResource_Memcache extends Smarty_CacheResource_KeyValueStore
      * 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
      * @return boolean true on success, false on failure
      */
@@ -55,6 +55,7 @@ class Smarty_CacheResource_Memcache extends Smarty_CacheResource_KeyValueStore
      *
      * @param  array $keys   list of values to save
      * @param  int   $expire expiration time
+     *
      * @return boolean true on success, false on failure
      */
     protected function write(array $keys, $expire = null)
@@ -71,6 +72,7 @@ class Smarty_CacheResource_Memcache extends Smarty_CacheResource_KeyValueStore
      * Remove values from cache
      *
      * @param  array $keys list of keys to delete
+     *
      * @return boolean true on success, false on failure
      */
     protected function delete(array $keys)
@@ -90,6 +92,6 @@ class Smarty_CacheResource_Memcache extends Smarty_CacheResource_KeyValueStore
      */
     protected function purge()
     {
-        return $this->memcache->flush();
+        $this->memcache->flush();
     }
 }

lib/classes/Smarty-3.1.21/demo/plugins/cacheresource.mysql.php

@@ -2,10 +2,8 @@
 
 /**
  * MySQL CacheResource
- *
  * CacheResource Implementation based on the Custom API to use
  * MySQL as the storage resource for Smarty's output caching.
- *
  * Table definition:
  * <pre>CREATE TABLE IF NOT EXISTS `output_cache` (
  *   `id` CHAR(40) NOT NULL COMMENT 'sha1 hash',
@@ -36,7 +34,8 @@ class Smarty_CacheResource_Mysql extends Smarty_CacheResource_Custom
     {
         try {
             $this->db = new PDO("mysql:dbname=test;host=127.0.0.1", "smarty");
-        } catch (PDOException $e) {
+        }
+        catch (PDOException $e) {
             throw new SmartyException('Mysql Resource failed: ' . $e->getMessage());
         }
         $this->fetch = $this->db->prepare('SELECT modified, content FROM output_cache WHERE id = :id');
@@ -54,6 +53,7 @@ class Smarty_CacheResource_Mysql extends Smarty_CacheResource_Custom
      * @param  string  $compile_id compile id
      * @param  string  $content    cached content
      * @param  integer $mtime      cache modification timestamp (epoch)
+     *
      * @return void
      */
     protected function fetch($id, $name, $cache_id, $compile_id, &$content, &$mtime)
@@ -74,10 +74,12 @@ class Smarty_CacheResource_Mysql extends Smarty_CacheResource_Custom
      * Fetch cached content's modification timestamp from data source
      *
      * @note 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)
@@ -98,6 +100,7 @@ class Smarty_CacheResource_Mysql extends Smarty_CacheResource_Custom
      * @param  string       $compile_id compile id
      * @param  integer|null $exp_time   seconds till expiration time in seconds or null
      * @param  string       $content    content to cache
+     *
      * @return boolean      success
      */
     protected function save($id, $name, $cache_id, $compile_id, $exp_time, $content)
@@ -120,6 +123,7 @@ class Smarty_CacheResource_Mysql extends Smarty_CacheResource_Custom
      * @param  string       $cache_id   cache id
      * @param  string       $compile_id compile id
      * @param  integer|null $exp_time   seconds till expiration or null
+     *
      * @return integer      number of deleted caches
      */
     protected function delete($name, $cache_id, $compile_id, $exp_time)

lib/classes/Smarty-3.1.21/demo/plugins/resource.extendsall.php

@@ -2,7 +2,6 @@
 
 /**
  * Extends All Resource
- *
  * Resource Implementation modifying the extends-Resource to walk
  * through the template_dirs and inherit all templates of the same name
  *
@@ -16,6 +15,7 @@ class Smarty_Resource_Extendsall extends Smarty_Internal_Resource_Extends
      *
      * @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)
@@ -31,7 +31,9 @@ class Smarty_Resource_Extendsall extends Smarty_Internal_Resource_Extends
                 }
                 $sources[$s->uid] = $s;
                 $uid .= $s->filepath;
-            } catch (SmartyException $e) {}
+            }
+            catch (SmartyException $e) {
+            }
         }
 
         if (!$sources) {

lib/classes/Smarty-3.1.21/demo/plugins/resource.mysql.php

@@ -2,10 +2,8 @@
 
 /**
  * MySQL Resource
- *
  * Resource Implementation based on the Custom API to use
  * MySQL as the storage resource for Smarty's templates and configs.
- *
  * Table definition:
  * <pre>CREATE TABLE IF NOT EXISTS `templates` (
  *   `name` varchar(100) NOT NULL,
@@ -13,7 +11,6 @@
  *   `source` text,
  *   PRIMARY KEY (`name`)
  * ) ENGINE=InnoDB DEFAULT CHARSET=utf8;</pre>
- *
  * Demo data:
  * <pre>INSERT INTO `templates` (`name`, `modified`, `source`) VALUES ('test.tpl', "2010-12-25 22:00:00", '{$x="hello world"}{$x}');</pre>
  *
@@ -33,7 +30,8 @@ class Smarty_Resource_Mysql extends Smarty_Resource_Custom
     {
         try {
             $this->db = new PDO("mysql:dbname=test;host=127.0.0.1", "smarty");
-        } catch (PDOException $e) {
+        }
+        catch (PDOException $e) {
             throw new SmartyException('Mysql Resource failed: ' . $e->getMessage());
         }
         $this->fetch = $this->db->prepare('SELECT modified, source FROM templates WHERE name = :name');
@@ -46,6 +44,7 @@ class Smarty_Resource_Mysql extends Smarty_Resource_Custom
      * @param  string  $name   template name
      * @param  string  $source template source
      * @param  integer $mtime  template modification timestamp (epoch)
+     *
      * @return void
      */
     protected function fetch($name, &$source, &$mtime)
@@ -66,7 +65,9 @@ class Smarty_Resource_Mysql extends Smarty_Resource_Custom
      * Fetch a template's modification time from database
      *
      * @note implementing this method is optional. Only implement it if modification times can be accessed faster than loading the comple template source.
+     *
      * @param  string $name template name
+     *
      * @return integer timestamp (epoch) the template was modified
      */
     protected function fetchTimestamp($name)

lib/classes/Smarty-3.1.21/demo/plugins/resource.mysqls.php

@@ -2,13 +2,10 @@
 
 /**
  * MySQL Resource
- *
  * Resource Implementation based on the Custom API to use
  * MySQL as the storage resource for Smarty's templates and configs.
- *
  * Note that this MySQL implementation fetches the source and timestamps in
  * a single database query, instead of two separate like resource.mysql.php does.
- *
  * Table definition:
  * <pre>CREATE TABLE IF NOT EXISTS `templates` (
  *   `name` varchar(100) NOT NULL,
@@ -16,7 +13,6 @@
  *   `source` text,
  *   PRIMARY KEY (`name`)
  * ) ENGINE=InnoDB DEFAULT CHARSET=utf8;</pre>
- *
  * Demo data:
  * <pre>INSERT INTO `templates` (`name`, `modified`, `source`) VALUES ('test.tpl', "2010-12-25 22:00:00", '{$x="hello world"}{$x}');</pre>
  *
@@ -34,7 +30,8 @@ class Smarty_Resource_Mysqls extends Smarty_Resource_Custom
     {
         try {
             $this->db = new PDO("mysql:dbname=test;host=127.0.0.1", "smarty");
-        } catch (PDOException $e) {
+        }
+        catch (PDOException $e) {
             throw new SmartyException('Mysql Resource failed: ' . $e->getMessage());
         }
         $this->fetch = $this->db->prepare('SELECT modified, source FROM templates WHERE name = :name');
@@ -46,6 +43,7 @@ class Smarty_Resource_Mysqls extends Smarty_Resource_Custom
      * @param  string  $name   template name
      * @param  string  $source template source
      * @param  integer $mtime  template modification timestamp (epoch)
+     *
      * @return void
      */
     protected function fetch($name, &$source, &$mtime)

lib/classes/Smarty-3.1.21/demo/templates/index.tpl

@@ -0,0 +1,87 @@
+{config_load file="test.conf" section="setup"}
+{include file="header.tpl" title=foo}
+
+<PRE>
+
+{* bold and title are read from the config file *}
+    {if #bold#}<b>{/if}
+        {* capitalize the first letters of each word of the title *}
+        Title: {#title#|capitalize}
+        {if #bold#}</b>{/if}
+
+    The current date and time is {$smarty.now|date_format:"%Y-%m-%d %H:%M:%S"}
+
+    The value of global assigned variable $SCRIPT_NAME is {$SCRIPT_NAME}
+
+    Example of accessing server environment variable SERVER_NAME: {$smarty.server.SERVER_NAME}
+
+    The value of {ldelim}$Name{rdelim} is <b>{$Name}</b>
+
+variable modifier example of {ldelim}$Name|upper{rdelim}
+
+<b>{$Name|upper}</b>
+
+
+An example of a section loop:
+
+    {section name=outer
+    loop=$FirstName}
+        {if $smarty.section.outer.index is odd by 2}
+            {$smarty.section.outer.rownum} . {$FirstName[outer]} {$LastName[outer]}
+        {else}
+            {$smarty.section.outer.rownum} * {$FirstName[outer]} {$LastName[outer]}
+        {/if}
+        {sectionelse}
+        none
+    {/section}
+
+    An example of section looped key values:
+
+    {section name=sec1 loop=$contacts}
+        phone: {$contacts[sec1].phone}
+        <br>
+
+            fax: {$contacts[sec1].fax}
+        <br>
+
+            cell: {$contacts[sec1].cell}
+        <br>
+    {/section}
+    <p>
+
+        testing strip tags
+        {strip}
+<table border=0>
+    <tr>
+        <td>
+            <A HREF="{$SCRIPT_NAME}">
+                <font color="red">This is a test </font>
+            </A>
+        </td>
+    </tr>
+</table>
+    {/strip}
+
+</PRE>
+
+This is an example of the html_select_date function:
+
+<form>
+    {html_select_date start_year=1998 end_year=2010}
+</form>
+
+This is an example of the html_select_time function:
+
+<form>
+    {html_select_time use_24_hours=false}
+</form>
+
+This is an example of the html_options function:
+
+<form>
+    <select name=states>
+        {html_options values=$option_values selected=$option_selected output=$option_output}
+    </select>
+</form>
+
+{include file="footer.tpl"}

lib/classes/Smarty-3.1.21/libs/Smarty.class.php

@@ -2,22 +2,18 @@
 /**
  * Project:     Smarty: the PHP compiling template engine
  * File:        Smarty.class.php
- * SVN:         $Id: Smarty.class.php 4778 2013-09-17 20:44:41Z Uwe.Tews@googlemail.com $
+ * SVN:         $Id: Smarty.class.php 4897 2014-10-14 22:29:58Z Uwe.Tews@googlemail.com $
- *
  * 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
@@ -28,7 +24,7 @@
  * @author    Uwe Tews
  * @author    Rodney Rehm
  * @package   Smarty
- * @version 3.1.15
+ * @version   3.1.21
  */
 
 /**
@@ -102,6 +98,7 @@ include_once SMARTY_SYSPLUGINS_DIR.'smarty_internal_cacheresource_file.php';
 
 /**
  * This is the main Smarty class
+ *
  * @package Smarty
  */
 class Smarty extends Smarty_Internal_TemplateBase
@@ -113,7 +110,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = 'Smarty-3.1.15';
+    const SMARTY_VERSION = 'Smarty-3.1.21-dev';
 
     /**
      * define variable scopes
@@ -206,106 +203,133 @@ class Smarty extends Smarty_Internal_TemplateBase
 
     /**
      * 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();
     /**
      * joined template directory string used in cache keys
+     *
      * @var string
      */
     public $joined_template_dir = null;
     /**
      * joined config directory string used in cache keys
+     *
      * @var string
      */
     public $joined_config_dir = null;
     /**
      * 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 = null;
     /**
      * plugins directory
+     *
      * @var array
      */
     private $plugins_dir = array();
     /**
      * cache directory
+     *
      * @var string
      */
     private $cache_dir = null;
     /**
      * config directory
+     *
      * @var array
      */
     private $config_dir = array();
     /**
      * 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;
     /**
      * caching enabled
+     *
      * @var boolean
      */
     public $caching = false;
     /**
      * merge compiled includes
+     *
      * @var boolean
      */
     public $merge_compiled_includes = false;
+    /**
+     * template inheritance merge compiled includes
+     *
+     * @var boolean
+     */
+    public $inheritance_merge_compiled_includes = true;
     /**
      * cache lifetime in seconds
+     *
      * @var integer
      */
     public $cache_lifetime = 3600;
     /**
      * force cache file creation
+     *
      * @var boolean
      */
     public $force_cache = false;
@@ -325,11 +349,13 @@ class Smarty extends Smarty_Internal_TemplateBase
     public $compile_id = null;
     /**
      * template left-delimiter
+     *
      * @var string
      */
     public $left_delimiter = "{";
     /**
      * template right-delimiter
+     *
      * @var string
      */
     public $right_delimiter = "}";
@@ -338,7 +364,6 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     /**
      * class name
-     *
      * This should be instance of Smarty_Security.
      *
      * @var string
@@ -365,7 +390,6 @@ class Smarty extends Smarty_Internal_TemplateBase
     public $allow_php_templates = false;
     /**
      * Should compiled-templates be prevented from being called directly?
-     *
      * {@internal
      * Currently used by Smarty_Internal_Template only.
      * }}
@@ -376,7 +400,6 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**#@-*/
     /**
      * debug mode
-     *
      * Setting this to true enables the debug-console.
      *
      * @var boolean
@@ -388,12 +411,12 @@ class Smarty extends Smarty_Internal_TemplateBase
      *  <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.
      *
@@ -402,16 +425,19 @@ class Smarty extends Smarty_Internal_TemplateBase
     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;
@@ -422,16 +448,19 @@ class Smarty extends Smarty_Internal_TemplateBase
 
     /**
      * 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;
@@ -444,16 +473,19 @@ class Smarty extends Smarty_Internal_TemplateBase
 
     /**
      * 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;
@@ -462,19 +494,19 @@ class Smarty extends Smarty_Internal_TemplateBase
 
     /**
      * global template functions
+     *
      * @var array
      */
     public $template_functions = array();
     /**
      * 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
@@ -482,121 +514,145 @@ class Smarty extends Smarty_Internal_TemplateBase
     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 $template_objects = array();
     /**
      * 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();
     /**
      * self pointer to Smarty object
+     *
      * @var Smarty
      */
     public $smarty;
     /**
      * required by the compiler for BC
+     *
      * @var string
      */
     public $_current_file = null;
     /**
      * internal flag to enable parser debugging
+     *
      * @var bool
      */
     public $_parserdebug = false;
@@ -606,11 +662,19 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @var array
      */
     public $merged_templates_func = array();
+
+    /**
+     * Cache of is_file results of loadPlugin()
+     * 
+     * @var array
+     */
+    public static $_is_file_cache= array();
+
     /**#@-*/
 
     /**
      * Initialize new Smarty object
-     *
+
      */
     public function __construct()
     {
@@ -651,11 +715,11 @@ class Smarty extends Smarty_Internal_TemplateBase
 
     /**
      * <<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)
@@ -677,7 +741,6 @@ class Smarty extends Smarty_Internal_TemplateBase
 
     /**
      * <<magic>> Generic setter.
-     *
      * Calls the appropriate setter function.
      * Issues an E_USER_NOTICE if no valid setter is found.
      *
@@ -705,6 +768,7 @@ class Smarty extends Smarty_Internal_TemplateBase
      * Check if a template resource exists
      *
      * @param  string $resource_name template name
+     *
      * @return boolean status
      */
     public function templateExists($resource_name)
@@ -722,8 +786,8 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * Returns a single or all global  variables
      *
-     * @param  object $smarty
      * @param  string $varname variable name or null
+     *
      * @return string variable value or or array of variables
      */
     public function getGlobal($varname = null)
@@ -749,6 +813,7 @@ class Smarty extends Smarty_Internal_TemplateBase
      *
      * @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)
@@ -768,6 +833,7 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @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)
@@ -783,6 +849,7 @@ class Smarty extends Smarty_Internal_TemplateBase
      * 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
      */
@@ -811,6 +878,7 @@ class Smarty extends Smarty_Internal_TemplateBase
 
     /**
      * Disable security
+     *
      * @return Smarty current Smarty instance for chaining
      */
     public function disableSecurity()
@@ -824,13 +892,14 @@ class Smarty extends Smarty_Internal_TemplateBase
      * 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->template_dir[$k] = preg_replace('#(\w+)(/|\\\\){1,}#', '$1$2', rtrim($v, '/\\')) . DS;
         }
 
         $this->joined_template_dir = join(DIRECTORY_SEPARATOR, $this->template_dir);
@@ -843,6 +912,7 @@ class Smarty extends Smarty_Internal_TemplateBase
      *
      * @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
      */
@@ -853,20 +923,24 @@ class Smarty extends Smarty_Internal_TemplateBase
 
         if (is_array($template_dir)) {
             foreach ($template_dir as $k => $v) {
+                $v = preg_replace('#(\w+)(/|\\\\){1,}#', '$1$2', rtrim($v, '/\\')) . DS;
                 if (is_int($k)) {
                     // indexes are not merged but appended
-                    $this->template_dir[] = rtrim($v, '/\\') . DS;
+                    $this->template_dir[] = $v;
                 } else {
                     // string indexes are overridden
-                    $this->template_dir[$k] = rtrim($v, '/\\') . DS;
+                    $this->template_dir[$k] = $v;
                 }
             }
-        } elseif ($key !== null) {
+        } else {
+            $v = preg_replace('#(\w+)(/|\\\\){1,}#', '$1$2', rtrim($template_dir, '/\\')) . DS;
+            if ($key !== null) {
                 // override directory at specified index
-            $this->template_dir[$key] = rtrim($template_dir, '/\\') . DS;
+                $this->template_dir[$key] = $v;
             } else {
                 // append new directory
-            $this->template_dir[] = rtrim($template_dir, '/\\') . DS;
+                $this->template_dir[] = $v;
+            }
         }
         $this->joined_template_dir = join(DIRECTORY_SEPARATOR, $this->template_dir);
 
@@ -876,7 +950,8 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * Get template directories
      *
-     * @param mixed index of directory to get, null to get all
+     * @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)
@@ -891,14 +966,15 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * Set config directory
      *
-     * @param  string|array $template_dir directory(s) of configuration sources
+     * @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->config_dir[$k] = preg_replace('#(\w+)(/|\\\\){1,}#', '$1$2', rtrim($v, '/\\')) . DS;
         }
 
         $this->joined_config_dir = join(DIRECTORY_SEPARATOR, $this->config_dir);
@@ -910,7 +986,8 @@ class Smarty extends Smarty_Internal_TemplateBase
      * Add config directory(s)
      *
      * @param string|array        $config_dir directory(s) of config sources
-     * @param string key of the array element to assign the config dir to
+     * @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)
@@ -920,20 +997,24 @@ class Smarty extends Smarty_Internal_TemplateBase
 
         if (is_array($config_dir)) {
             foreach ($config_dir as $k => $v) {
+                $v = preg_replace('#(\w+)(/|\\\\){1,}#', '$1$2', rtrim($v, '/\\')) . DS;
                 if (is_int($k)) {
                     // indexes are not merged but appended
-                    $this->config_dir[] = rtrim($v, '/\\') . DS;
+                    $this->config_dir[] = $v;
                 } else {
                     // string indexes are overridden
-                    $this->config_dir[$k] = rtrim($v, '/\\') . DS;
+                    $this->config_dir[$k] = $v;
                 }
             }
-        } elseif ($key !== null) {
+        } else {
+            $v = preg_replace('#(\w+)(/|\\\\){1,}#', '$1$2', rtrim($config_dir, '/\\')) . DS;
+            if ($key !== null) {
                 // override directory at specified index
-            $this->config_dir[$key] = rtrim($config_dir, '/\\') . DS;
+                $this->config_dir[$key] = rtrim($v, '/\\') . DS;
             } else {
                 // append new directory
-            $this->config_dir[] = rtrim($config_dir, '/\\') . DS;
+                $this->config_dir[] = rtrim($v, '/\\') . DS;
+            }
         }
 
         $this->joined_config_dir = join(DIRECTORY_SEPARATOR, $this->config_dir);
@@ -944,7 +1025,8 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * Get config directory
      *
-     * @param mixed index of directory to get, null to get all
+     * @param mixed $index index of directory to get, null to get all
+     *
      * @return array|string configuration directory
      */
     public function getConfigDir($index = null)
@@ -960,6 +1042,7 @@ class Smarty extends Smarty_Internal_TemplateBase
      * Set plugins directory
      *
      * @param  string|array $plugins_dir directory(s) of plugins
+     *
      * @return Smarty       current Smarty instance for chaining
      */
     public function setPluginsDir($plugins_dir)
@@ -975,8 +1058,8 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * Adds directory of plugin files
      *
-     * @param object $smarty
+     * @param $plugins_dir
-     * @param string $ |array $ plugins folder
+     *
      * @return Smarty current Smarty instance for chaining
      */
     public function addPluginsDir($plugins_dir)
@@ -1018,6 +1101,7 @@ class Smarty extends Smarty_Internal_TemplateBase
      * 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)
@@ -1044,6 +1128,7 @@ class Smarty extends Smarty_Internal_TemplateBase
      * 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)
@@ -1070,6 +1155,7 @@ class Smarty extends Smarty_Internal_TemplateBase
      * 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)
@@ -1083,6 +1169,7 @@ class Smarty extends Smarty_Internal_TemplateBase
      * 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)
@@ -1106,12 +1193,12 @@ class Smarty extends Smarty_Internal_TemplateBase
         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)
@@ -1130,6 +1217,7 @@ class Smarty extends Smarty_Internal_TemplateBase
      *
      * @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)
@@ -1157,6 +1245,7 @@ class Smarty extends Smarty_Internal_TemplateBase
      * 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)
@@ -1182,6 +1271,7 @@ class Smarty extends Smarty_Internal_TemplateBase
      * set the debug template
      *
      * @param  string $tpl_name
+     *
      * @return Smarty          current Smarty instance for chaining
      * @throws SmartyException if file is not readable
      */
@@ -1203,15 +1293,16 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @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 (!empty($cache_id) && (is_object($cache_id) || is_array($cache_id))) {
+        if ($cache_id !== null && (is_object($cache_id) || is_array($cache_id))) {
             $parent = $cache_id;
             $cache_id = null;
         }
-        if (!empty($parent) && is_array($parent)) {
+        if ($parent !== null && is_array($parent)) {
             $data = $parent;
             $parent = null;
         } else {
@@ -1262,7 +1353,6 @@ class Smarty extends Smarty_Internal_TemplateBase
         return $tpl;
     }
 
-
     /**
      * Takes unknown classes and loads plugin files for them
      * class name format: Smarty_PluginType_PluginName
@@ -1270,6 +1360,8 @@ class Smarty extends Smarty_Internal_TemplateBase
      *
      * @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)
@@ -1284,15 +1376,12 @@ class Smarty extends Smarty_Internal_TemplateBase
         // 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");
-
-            return false;
         }
         // if type is "internal", get plugin from sysplugins
         if (strtolower($_name_parts[1]) == 'internal') {
             $file = SMARTY_SYSPLUGINS_DIR . strtolower($plugin_name) . '.php';
-            if (file_exists($file)) {
+            if (isset(self::$_is_file_cache[$file]) ? self::$_is_file_cache[$file] : self::$_is_file_cache[$file] = is_file($file)) {
                 require_once($file);
-
                 return $file;
             } else {
                 return false;
@@ -1310,9 +1399,8 @@ class Smarty extends Smarty_Internal_TemplateBase
                 $_plugin_dir . strtolower($_plugin_filename),
             );
             foreach ($names as $file) {
-                if (file_exists($file)) {
+                if (isset(self::$_is_file_cache[$file]) ? self::$_is_file_cache[$file] : self::$_is_file_cache[$file] = is_file($file)) {
                     require_once($file);
-
                     return $file;
                 }
                 if ($this->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_plugin_dir)) {
@@ -1342,6 +1430,7 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @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)
@@ -1356,6 +1445,7 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @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)
@@ -1369,6 +1459,7 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @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)
@@ -1376,11 +1467,11 @@ class Smarty extends Smarty_Internal_TemplateBase
         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  object $templae template object
+     * @param Smarty_Internal_Template $template
+     *
      * @return array  of tag/attributes
      */
     public function getTags(Smarty_Internal_Template $template)
@@ -1392,6 +1483,7 @@ class Smarty extends Smarty_Internal_TemplateBase
      * 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)
@@ -1403,7 +1495,13 @@ class Smarty extends Smarty_Internal_TemplateBase
      * 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)
@@ -1506,6 +1604,7 @@ if (Smarty::$_CHARSET !== 'UTF-8') {
 
 /**
  * Smarty exception class
+ *
  * @package Smarty
  */
 class SmartyException extends Exception
@@ -1520,6 +1619,7 @@ class SmartyException extends Exception
 
 /**
  * Smarty compiler exception class
+ *
  * @package Smarty
  */
 class SmartyCompilerException extends SmartyException
@@ -1528,23 +1628,28 @@ class SmartyCompilerException extends SmartyException
     {
         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;

lib/classes/Smarty-3.1.21/libs/SmartyBC.class.php

@@ -3,21 +3,17 @@
  * 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
@@ -32,7 +28,7 @@
 /**
  * @ignore
  */
-require(dirname(__FILE__) . '/Smarty.class.php');
+require_once(dirname(__FILE__) . '/Smarty.class.php');
 
 /**
  * Smarty Backward Compatability Wrapper Class
@@ -43,6 +39,7 @@ class SmartyBC extends Smarty
 {
     /**
      * Smarty 2 BC
+     *
      * @var string
      */
     public $_version = self::SMARTY_VERSION;
@@ -122,7 +119,10 @@ class SmartyBC extends Smarty
      * @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_functs list of methods that are block format
+     * @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())
     {
@@ -309,6 +309,7 @@ class SmartyBC extends Smarty
      * @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)
@@ -320,6 +321,7 @@ class SmartyBC extends Smarty
      * clear the entire contents of cache (all templates)
      *
      * @param  string $exp_time expire time
+     *
      * @return boolean
      */
     public function clear_all_cache($exp_time = null)
@@ -333,6 +335,7 @@ class SmartyBC extends Smarty
      * @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)
@@ -356,6 +359,7 @@ class SmartyBC extends Smarty
      * @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)
@@ -367,6 +371,7 @@ class SmartyBC extends Smarty
      * Checks whether requested template exists.
      *
      * @param  string $tpl_file
+     *
      * @return boolean
      */
     public function template_exists($tpl_file)
@@ -378,6 +383,7 @@ class SmartyBC extends Smarty
      * Returns an array containing template variables
      *
      * @param  string $name
+     *
      * @return array
      */
     public function get_template_vars($name = null)
@@ -389,6 +395,7 @@ class SmartyBC extends Smarty
      * Returns an array containing config variables
      *
      * @param  string $name
+     *
      * @return array
      */
     public function get_config_vars($name = null)
@@ -412,6 +419,7 @@ class SmartyBC extends Smarty
      * return a reference to a registered object
      *
      * @param  string $name
+     *
      * @return object
      */
     public function get_registered_object($name)
@@ -439,7 +447,6 @@ class SmartyBC extends Smarty
     {
         trigger_error("Smarty error: $error_msg", $error_type);
     }
-
 }
 
 /**
@@ -449,6 +456,7 @@ class SmartyBC extends Smarty
  * @param string  $content  contents of the block
  * @param object  $template template object
  * @param boolean &$repeat  repeat flag
+ *
  * @return string content re-formatted
  */
 function smarty_php_tag($params, $content, $template, &$repeat)

lib/classes/Smarty-3.1.21/libs/debug.tpl

@@ -0,0 +1,137 @@
+{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, 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;
+            }
+
+            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;
+                width: 50%;
+            }
+
+            td {
+                color: green;
+            }
+
+            .odd {
+                background-color: #eeeeee;
+            }
+
+            .even {
+                background-color: #fafafa;
+            }
+
+            .exectime {
+                font-size: 0.8em;
+                font-style: italic;
+            }
+
+            #table_assigned_vars th {
+                color: blue;
+            }
+
+            #table_config_vars th {
+                color: maroon;
+            }
+
+            {/literal}
+        </style>
+    </head>
+    <body>
+
+    <h1>Smarty Debug Console
+        -  {if isset($template_name)}{$template_name|debug_print_var nofilter}{else}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>
+                <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}">
+                <th>${$vars@key|escape:'html'}</th>
+                <td>{$vars|debug_print_var nofilter}</td>
+            </tr>
+        {/foreach}
+    </table>
+
+    <h2>assigned config file variables (outer template scope)</h2>
+
+    <table id="table_config_vars">
+        {foreach $config_vars as $vars}
+            <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">
+                <th>{$vars@key|escape:'html'}</th>
+                <td>{$vars|debug_print_var nofilter}</td>
+            </tr>
+        {/foreach}
+
+    </table>
+    </body>
+    </html>
+{/capture}
+<script type="text/javascript">
+    {$id = $template_name|default:''|md5}
+    _smarty_console = window.open("", "console{$id}", "width=680,height=600,resizable,scrollbars=yes");
+    _smarty_console.document.write("{$debug_output|escape:'javascript' nofilter}");
+    _smarty_console.document.close();
+</script>

lib/classes/Smarty-3.1.21/libs/plugins/block.textformat.php

@@ -8,7 +8,6 @@
 
 /**
  * Smarty {textformat}{/textformat} block plugin
- *
  * Type:     block function<br>
  * Name:     textformat<br>
  * Purpose:  format text a certain way with preset styles
@@ -25,10 +24,12 @@
  *
  * @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>
  */
@@ -76,7 +77,6 @@ function smarty_block_textformat($params, $content, $template, &$repeat)
     }
     // split into paragraphs
     $_paragraphs = preg_split('![\r\n]{2}!', $content);
-    $_output = '';
 
     foreach ($_paragraphs as &$_paragraph) {
         if (!$_paragraph) {

lib/classes/Smarty-3.1.21/libs/plugins/function.counter.php

@@ -1,13 +1,13 @@
 <?php
 /**
  * Smarty plugin
+ *
  * @package    Smarty
  * @subpackage PluginsFunction
  */
 
 /**
  * Smarty {counter} function plugin
- *
  * Type:     function<br>
  * Name:     counter<br>
  * Purpose:  print out a counter value
@@ -15,8 +15,10 @@
  * @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)
@@ -66,11 +68,11 @@ function smarty_function_counter($params, $template)
         $counter['direction'] = $params['direction'];
     }
 
-    if ($counter['direction'] == "down")
+    if ($counter['direction'] == "down") {
         $counter['count'] -= $counter['skip'];
-    else
+    } else {
         $counter['count'] += $counter['skip'];
+    }
 
     return $retval;
-
 }

lib/classes/Smarty-3.1.21/libs/plugins/function.cycle.php

@@ -8,7 +8,6 @@
 
 /**
  * Smarty {cycle} function plugin
- *
  * Type:     function<br>
  * Name:     cycle<br>
  * Date:     May 3, 2002<br>
@@ -38,8 +37,10 @@
  * @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
  */
 
@@ -60,7 +61,8 @@ function smarty_function_cycle($params, $template)
         }
     } else {
         if (isset($cycle_vars[$name]['values'])
-            && $cycle_vars[$name]['values'] != $params['values'] ) {
+            && $cycle_vars[$name]['values'] != $params['values']
+        ) {
             $cycle_vars[$name]['index'] = 0;
         }
         $cycle_vars[$name]['values'] = $params['values'];

lib/classes/Smarty-3.1.21/libs/plugins/function.fetch.php

@@ -8,7 +8,6 @@
 
 /**
  * Smarty {fetch} plugin
- *
  * Type:     function<br>
  * Name:     fetch<br>
  * Purpose:  fetch file, web or ftp data and display results
@@ -16,8 +15,11 @@
  * @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)

lib/classes/Smarty-3.1.21/libs/plugins/function.html_checkboxes.php

@@ -8,7 +8,6 @@
 
 /**
  * Smarty {html_checkboxes} function plugin
- *
  * File:       function.html_checkboxes.php<br>
  * Type:       function<br>
  * Name:       html_checkboxes<br>
@@ -37,8 +36,10 @@
  * @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()
  */
@@ -116,7 +117,8 @@ function smarty_function_html_checkboxes($params, $template)
             case 'assign':
                 break;
 
-            case 'strict': break;
+            case 'strict':
+                break;
 
             case 'disabled':
             case 'readonly':
@@ -143,8 +145,9 @@ function smarty_function_html_checkboxes($params, $template)
         }
     }
 
-    if (!isset($options) && !isset($values))
+    if (!isset($options) && !isset($values)) {
-        return ''; /* raise error here? */
+        return '';
+    } /* raise error here? */
 
     $_html_result = array();
 
@@ -164,7 +167,6 @@ function smarty_function_html_checkboxes($params, $template)
     } else {
         return implode("\n", $_html_result);
     }
-
 }
 
 function smarty_function_html_checkboxes_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids, $escape = true)

lib/classes/Smarty-3.1.21/libs/plugins/function.html_image.php

@@ -8,7 +8,6 @@
 
 /**
  * Smarty {html_image} function plugin
- *
  * Type:     function<br>
  * Name:     html_image<br>
  * Date:     Feb 24, 2003<br>
@@ -29,8 +28,11 @@
  * @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()
  */
@@ -112,7 +114,7 @@ function smarty_function_html_image($params, $template)
             }
         } else {
             // local file
-            if (!$template->smarty->security_policy->isTrustedResourceDir($params['file'])) {
+            if (!$template->smarty->security_policy->isTrustedResourceDir($_image_path)) {
                 return;
             }
         }

lib/classes/Smarty-3.1.21/libs/plugins/function.html_options.php

@@ -8,7 +8,6 @@
 
 /**
  * Smarty {html_options} function plugin
- *
  * Type:     function<br>
  * Name:     html_options<br>
  * Purpose:  Prints the list of <option> tags generated from
@@ -28,12 +27,13 @@
  *           (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
- * @param Smarty_Internal_Template $template template object
+ *
  * @return string
  * @uses     smarty_function_escape_special_chars()
  */
-function smarty_function_html_options($params, $template)
+function smarty_function_html_options($params)
 {
     require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
 
@@ -91,7 +91,8 @@ function smarty_function_html_options($params, $template)
                 }
                 break;
 
-            case 'strict': break;
+            case 'strict':
+                break;
 
             case 'disabled':
             case 'readonly':

lib/classes/Smarty-3.1.21/libs/plugins/function.html_radios.php

@@ -8,7 +8,6 @@
 
 /**
  * Smarty {html_radios} function plugin
- *
  * File:       function.html_radios.php<br>
  * Type:       function<br>
  * Name:       html_radios<br>
@@ -37,8 +36,10 @@
  * @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()
  */
@@ -102,7 +103,8 @@ function smarty_function_html_radios($params, $template)
             case 'assign':
                 break;
 
-            case 'strict': break;
+            case 'strict':
+                break;
 
             case 'disabled':
             case 'readonly':

lib/classes/Smarty-3.1.21/libs/plugins/function.html_select_date.php

@@ -17,11 +17,9 @@ 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
@@ -47,11 +45,12 @@ require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
  * @author   Andrei Zmievski
  * @author   Monte Ohrt <monte at ohrt dot com>
  * @author   Rodney Rehm
+ *
  * @param array $params parameters
- * @param Smarty_Internal_Template $template template object
+ *
  * @return string
  */
-function smarty_function_html_select_date($params, $template)
+function smarty_function_html_select_date($params)
 {
     // generate timestamps used for month names only
     static $_month_timestamps = null;
@@ -187,7 +186,6 @@ function smarty_function_html_select_date($params, $template)
                     ? $params['time'][$prefix . $_elementName]
                     : date($_elementKey);
             }
-            $time = mktime(0, 0, 0, $_month, $_day, $_year);
         } elseif (isset($params['time'][$field_array][$prefix . 'Year'])) {
             // $_REQUEST given
             foreach (array('Y' => 'Year', 'm' => 'Month', 'd' => 'Day') as $_elementKey => $_elementName) {
@@ -196,7 +194,6 @@ function smarty_function_html_select_date($params, $template)
                     ? $params['time'][$field_array][$prefix . $_elementName]
                     : date($_elementKey);
             }
-            $time = mktime(0, 0, 0, $_month, $_day, $_year);
         } else {
             // no date found, use NOW
             list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
@@ -219,9 +216,9 @@ function smarty_function_html_select_date($params, $template)
         if ($t === null) {
             $$key = (int) $_current_year;
         } elseif ($t[0] == '+') {
-            $$key = (int) ($_current_year + trim(substr($t, 1)));
+            $$key = (int) ($_current_year + (int)trim(substr($t, 1)));
         } elseif ($t[0] == '-') {
-            $$key = (int) ($_current_year - trim(substr($t, 1)));
+            $$key = (int) ($_current_year - (int)trim(substr($t, 1)));
         } else {
             $$key = (int) $$key;
         }
@@ -236,7 +233,6 @@ function smarty_function_html_select_date($params, $template)
 
     // generate year <select> or <input>
     if ($display_years) {
-        $_html_years = '';
         $_extra = '';
         $_name = $field_array ? ($field_array . '[' . $prefix . 'Year]') : ($prefix . 'Year');
         if ($all_extra) {
@@ -277,7 +273,6 @@ function smarty_function_html_select_date($params, $template)
 
     // generate month <select> or <input>
     if ($display_months) {
-        $_html_month = '';
         $_extra = '';
         $_name = $field_array ? ($field_array . '[' . $prefix . 'Month]') : ($prefix . 'Month');
         if ($all_extra) {
@@ -316,7 +311,6 @@ function smarty_function_html_select_date($params, $template)
 
     // generate day <select> or <input>
     if ($display_days) {
-        $_html_day = '';
         $_extra = '';
         $_name = $field_array ? ($field_array . '[' . $prefix . 'Day]') : ($prefix . 'Day');
         if ($all_extra) {

lib/classes/Smarty-3.1.21/libs/plugins/function.html_select_time.php

@@ -17,7 +17,6 @@ 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
@@ -26,12 +25,13 @@ require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
  *           (Smarty online manual)
  * @author   Roberto Berto <roberto@berto.net>
  * @author   Monte Ohrt <monte AT ohrt DOT com>
+ *
  * @param array $params parameters
- * @param Smarty_Internal_Template $template template object
+ *
  * @return string
  * @uses     smarty_make_timestamp()
  */
-function smarty_function_html_select_time($params, $template)
+function smarty_function_html_select_time($params)
 {
     $prefix = "Time_";
     $field_array = null;

lib/classes/Smarty-3.1.21/libs/plugins/function.html_table.php

@@ -8,7 +8,6 @@
 
 /**
  * Smarty {html_table} function plugin
- *
  * Type:     function<br>
  * Name:     html_table<br>
  * Date:     Feb 17, 2003<br>
@@ -43,11 +42,12 @@
  * @version  1.1
  * @link     http://www.smarty.net/manual/en/language.function.html.table.php {html_table}
  *           (Smarty online manual)
+ *
  * @param array $params parameters
- * @param Smarty_Internal_Template $template template object
+ *
  * @return string
  */
-function smarty_function_html_table($params, $template)
+function smarty_function_html_table($params)
 {
     $table_attr = 'border="1"';
     $tr_attr = '';

lib/classes/Smarty-3.1.21/libs/plugins/function.mailto.php

@@ -8,7 +8,6 @@
 
 /**
  * Smarty {mailto} function plugin
- *
  * Type:     function<br>
  * Name:     mailto<br>
  * Date:     May 21, 2002
@@ -44,11 +43,12 @@
  * @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
- * @param Smarty_Internal_Template $template template object
+ *
  * @return string
  */
-function smarty_function_mailto($params, $template)
+function smarty_function_mailto($params)
 {
     static $_allowed_encoding = array('javascript' => true, 'javascript_charcode' => true, 'hex' => true, 'none' => true);
     $extra = '';
@@ -72,8 +72,9 @@ function smarty_function_mailto($params, $template)
             case 'cc':
             case 'bcc':
             case 'followupto':
-                if (!empty($value))
+            if (!empty($value)) {
                 $mail_parms[] = $var . '=' . str_replace($search, $replace, rawurlencode($value));
+            }
                 break;
 
             case 'subject':

lib/classes/Smarty-3.1.21/libs/plugins/function.math.php

@@ -1,15 +1,14 @@
 <?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
@@ -17,8 +16,10 @@
  * @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)

lib/classes/Smarty-3.1.21/libs/plugins/modifier.capitalize.php

@@ -8,16 +8,15 @@
 
 /**
  * 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
@@ -30,7 +29,7 @@ function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = fals
             $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, create_function ('$matches', 'return stripslashes($matches[1]).mb_convert_case(stripslashes($matches[2]),MB_CASE_UPPER, "' . addslashes(Smarty::$_CHARSET) . '");'), $string);
+            $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) {
@@ -40,8 +39,7 @@ function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = fals
                 }
             }
         }
-        $upper_string = preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, create_function ('$matches', 'return stripslashes($matches[1]).mb_convert_case(stripslashes($matches[3]),MB_CASE_UPPER, "' . addslashes(Smarty::$_CHARSET) . '");'), $upper_string);
+        $upper_string = preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_mbconvert2_cb', $upper_string);
-
         return $upper_string;
     }
 
@@ -50,7 +48,7 @@ function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = fals
         $string = strtolower($string);
     }
     // uppercase (including hyphenated words)
-    $upper_string = preg_replace_callback("!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER, create_function ('$matches', 'return stripslashes($matches[1]).ucfirst(stripslashes($matches[2]));'), $string);
+    $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)) {
@@ -59,7 +57,34 @@ function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = fals
             }
         }
     }
-    $upper_string = preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, create_function ('$matches', 'return stripslashes($matches[1]).ucfirst(stripslashes($matches[3]));'), $upper_string);
+    $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]));
+}

lib/classes/Smarty-3.1.21/libs/plugins/modifier.date_format.php

@@ -8,7 +8,6 @@
 
 /**
  * Smarty date_format modifier plugin
- *
  * Type:     modifier<br>
  * Name:     date_format<br>
  * Purpose:  format datestamps via strftime<br>
@@ -19,10 +18,12 @@
  *
  * @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()
  */

lib/classes/Smarty-3.1.21/libs/plugins/modifier.debug_print_var.php

@@ -8,15 +8,16 @@
 
 /**
  * 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 integer      $depth  maximum recursion depth if $var is an array
  * @param integer      $length maximum string length if $var is a string
+ *
  * @return string
  */
 function smarty_modifier_debug_print_var($var, $depth = 0, $length = 40)

lib/classes/Smarty-3.1.21/libs/plugins/modifier.escape.php

@@ -8,17 +8,18 @@
 
 /**
  * Smarty escape modifier plugin
- *
  * Type:     modifier<br>
  * Name:     escape<br>
  * Purpose:  escape string for output
  *
- * @link http://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online manual)
+ * @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)

lib/classes/Smarty-3.1.21/libs/plugins/modifier.regex_replace.php

@@ -8,7 +8,6 @@
 
 /**
  * Smarty regex_replace modifier plugin
- *
  * Type:     modifier<br>
  * Name:     regex_replace<br>
  * Purpose:  regular expression search/replace
@@ -16,9 +15,11 @@
  * @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)
@@ -36,6 +37,7 @@ function smarty_modifier_regex_replace($string, $search, $replace)
 
 /**
  * @param  string $search string(s) that should be replaced
+ *
  * @return string
  * @ignore
  */

lib/classes/Smarty-3.1.21/libs/plugins/modifier.replace.php

@@ -1,13 +1,13 @@
 <?php
 /**
  * Smarty plugin
+ *
  * @package    Smarty
  * @subpackage PluginsModifier
  */
 
 /**
  * Smarty replace modifier plugin
- *
  * Type:     modifier<br>
  * Name:     replace<br>
  * Purpose:  simple search/replace
@@ -15,9 +15,11 @@
  * @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)

lib/classes/Smarty-3.1.21/libs/plugins/modifier.spacify.php

@@ -1,21 +1,23 @@
 <?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 = ' ')

lib/classes/Smarty-3.1.21/libs/plugins/modifier.truncate.php

@@ -8,7 +8,6 @@
 
 /**
  * Smarty truncate modifier plugin
- *
  * Type:     modifier<br>
  * Name:     truncate<br>
  * Purpose:  Truncate a string to a certain length if necessary,
@@ -17,17 +16,20 @@
  *
  * @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)
+    if ($length == 0) {
         return '';
+    }
 
     if (Smarty::$_MBSTRING) {
         if (mb_strlen($string, Smarty::$_CHARSET) > $length) {

lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.cat.php

@@ -8,7 +8,6 @@
 
 /**
  * Smarty cat modifier plugin
- *
  * Type:     modifier<br>
  * Name:     cat<br>
  * Date:     Feb 24, 2003<br>
@@ -19,10 +18,12 @@
  * @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, $compiler)
+function smarty_modifiercompiler_cat($params)
 {
     return '(' . implode(').(', $params) . ')';
 }

lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.count_characters.php

@@ -8,17 +8,18 @@
 
 /**
  * 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, $compiler)
+function smarty_modifiercompiler_count_characters($params)
 {
     if (!isset($params[1]) || $params[1] != 'true') {
         return 'preg_match_all(\'/[^\s]/' . Smarty::$_UTF8_MODIFIER . '\',' . $params[0] . ', $tmp)';

lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.count_paragraphs.php

@@ -8,7 +8,6 @@
 
 /**
  * Smarty count_paragraphs modifier plugin
- *
  * Type:     modifier<br>
  * Name:     count_paragraphs<br>
  * Purpose:  count the number of paragraphs in a text
@@ -16,10 +15,12 @@
  * @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, $compiler)
+function smarty_modifiercompiler_count_paragraphs($params)
 {
     // count \r or \n characters
     return '(preg_match_all(\'#[\r\n]+#\', ' . $params[0] . ', $tmp)+1)';

lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.count_sentences.php

@@ -8,7 +8,6 @@
 
 /**
  * Smarty count_sentences modifier plugin
- *
  * Type:     modifier<br>
  * Name:     count_sentences
  * Purpose:  count the number of sentences in a text
@@ -16,10 +15,12 @@
  * @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, $compiler)
+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)';

lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.count_words.php

@@ -8,17 +8,18 @@
 
 /**
  * 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, $compiler)
+function smarty_modifiercompiler_count_words($params)
 {
     if (Smarty::$_MBSTRING) {
         // return 'preg_match_all(\'#[\w\pL]+#' . Smarty::$_UTF8_MODIFIER . '\', ' . $params[0] . ', $tmp)';

lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.default.php

@@ -8,17 +8,18 @@
 
 /**
  * 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, $compiler)
+function smarty_modifiercompiler_default($params)
 {
     $output = $params[0];
     if (!isset($params[1])) {

lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.escape.php

@@ -13,14 +13,16 @@ 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)
@@ -105,9 +107,9 @@ function smarty_modifiercompiler_escape($params, $compiler)
             case 'javascript':
                 // escape quotes and backslashes, newlines, etc.
                 return 'strtr(' . $params[0] . ', array("\\\\" => "\\\\\\\\", "\'" => "\\\\\'", "\"" => "\\\\\"", "\\r" => "\\\\r", "\\n" => "\\\n", "</" => "<\/" ))';
-
         }
-    } catch (SmartyException $e) {
+    }
+    catch (SmartyException $e) {
         // pass through to regular plugin fallback
     }
 

lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.from_charset.php

@@ -8,16 +8,17 @@
 
 /**
  * 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, $compiler)
+function smarty_modifiercompiler_from_charset($params)
 {
     if (!Smarty::$_MBSTRING) {
         // FIXME: (rodneyrehm) shouldn't this throw an error?

lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.indent.php

@@ -1,24 +1,26 @@
 <?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, $compiler)
+function smarty_modifiercompiler_indent($params)
 {
     if (!isset($params[1])) {
         $params[1] = 4;

lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.lower.php

@@ -1,13 +1,13 @@
 <?php
 /**
  * Smarty plugin
+ *
  * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty lower modifier plugin
- *
  * Type:     modifier<br>
  * Name:     lower<br>
  * Purpose:  convert string to lowercase
@@ -15,11 +15,13 @@
  * @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, $compiler)
+function smarty_modifiercompiler_lower($params)
 {
     if (Smarty::$_MBSTRING) {
         return 'mb_strtolower(' . $params[0] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';

lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.noprint.php

@@ -8,16 +8,14 @@
 
 /**
  * Smarty noprint modifier plugin
- *
  * Type:     modifier<br>
  * Name:     noprint<br>
  * Purpose:  return an empty string
  *
  * @author   Uwe Tews
- * @param array $params parameters
  * @return string with compiled code
  */
-function smarty_modifiercompiler_noprint($params, $compiler)
+function smarty_modifiercompiler_noprint()
 {
     return "''";
 }

lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.string_format.php

@@ -8,17 +8,18 @@
 
 /**
  * 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, $compiler)
+function smarty_modifiercompiler_string_format($params)
 {
     return 'sprintf(' . $params[1] . ',' . $params[0] . ')';
 }

lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.strip.php

@@ -8,7 +8,6 @@
 
 /**
  * Smarty strip modifier plugin
- *
  * Type:     modifier<br>
  * Name:     strip<br>
  * Purpose:  Replace all repeated spaces, newlines, tabs
@@ -18,11 +17,13 @@
  *
  * @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, $compiler)
+function smarty_modifiercompiler_strip($params)
 {
     if (!isset($params[1])) {
         $params[1] = "' '";

lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.strip_tags.php

@@ -8,17 +8,18 @@
 
 /**
  * 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, $compiler)
+function smarty_modifiercompiler_strip_tags($params)
 {
     if (!isset($params[1]) || $params[1] === true || trim($params[1], '"') == 'true') {
         return "preg_replace('!<[^>]*?>!', ' ', {$params[0]})";

lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.to_charset.php

@@ -8,16 +8,17 @@
 
 /**
  * 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, $compiler)
+function smarty_modifiercompiler_to_charset($params)
 {
     if (!Smarty::$_MBSTRING) {
         // FIXME: (rodneyrehm) shouldn't this throw an error?

lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.unescape.php

@@ -8,16 +8,17 @@
 
 /**
  * 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, $compiler)
+function smarty_modifiercompiler_unescape($params)
 {
     if (!isset($params[1])) {
         $params[1] = 'html';

lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.upper.php

@@ -8,17 +8,18 @@
 
 /**
  * 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, $compiler)
+function smarty_modifiercompiler_upper($params)
 {
     if (Smarty::$_MBSTRING) {
         return 'mb_strtoupper(' . $params[0] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';

lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.wordwrap.php

@@ -8,14 +8,16 @@
 
 /**
  * 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)

lib/classes/Smarty-3.1.21/libs/plugins/outputfilter.trimwhitespace.php

@@ -8,16 +8,16 @@
 
 /**
  * Smarty trimwhitespace outputfilter plugin
- *
  * Trim unnecessary whitespace from HTML markup.
  *
  * @author   Rodney Rehm
+ *
  * @param string $source input string
- * @param Smarty_Internal_Template $smarty Smarty object
+ *
  * @return string filtered output
  * @todo     substr_replace() is not overloaded by mbstring.func_overload - so this function might fail!
  */
-function smarty_outputfilter_trimwhitespace($source, Smarty_Internal_Template $smarty)
+function smarty_outputfilter_trimwhitespace($source)
 {
     $store = array();
     $_store = 0;

lib/classes/Smarty-3.1.21/libs/plugins/shared.escape_special_chars.php

@@ -9,13 +9,14 @@
 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)
@@ -29,13 +30,14 @@ if (version_compare(PHP_VERSION, '5.2.3', '>=')) {
 } 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)