evolution-cms / evolution

manager/processors/save_settings.processor.php

Indentation +106 added lines, -106 removed lines

@@ -3,7 +3,7 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('settings')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 $data = $_POST;
 // lose the POST now, gets rid of quirky issue with Safari 3 - see FS#972
@@ -11,41 +11,41 @@ 
 
 if($data['friendly_urls']==='1' && strpos($_SERVER['SERVER_SOFTWARE'],'IIS')===false)
 {
-	$htaccess        = $modx->config['base_path'] . '.htaccess';
-	$sample_htaccess = $modx->config['base_path'] . 'ht.access';
-	$dir = '/' . trim($modx->config['base_url'],'/');
-	if(is_file($htaccess))
-	{
-		$_ = file_get_contents($htaccess);
-		if(strpos($_,'RewriteBase')===false)
-		{
-			$warnings[] = $_lang["settings_friendlyurls_alert2"];
-		}
-		elseif(is_writable($htaccess))
-		{
-			$_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);
-			if(!@file_put_contents($htaccess,$_))
-			{
-				$warnings[] = $_lang["settings_friendlyurls_alert2"];
-			}
-		}
-	}
-	elseif(is_file($sample_htaccess))
-	{
-		if(!@rename($sample_htaccess,$htaccess))
+    $htaccess        = $modx->config['base_path'] . '.htaccess';
+    $sample_htaccess = $modx->config['base_path'] . 'ht.access';
+    $dir = '/' . trim($modx->config['base_url'],'/');
+    if(is_file($htaccess))
+    {
+        $_ = file_get_contents($htaccess);
+        if(strpos($_,'RewriteBase')===false)
         {
-        	$warnings[] = $_lang["settings_friendlyurls_alert"];
-		}
-		elseif($modx->config['base_url']!=='/')
-		{
-			$_ = file_get_contents($htaccess);
-			$_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);
-			if(!@file_put_contents($htaccess,$_))
-			{
-				$warnings[] = $_lang["settings_friendlyurls_alert2"];
-			}
-		}
-	}
+            $warnings[] = $_lang["settings_friendlyurls_alert2"];
+        }
+        elseif(is_writable($htaccess))
+        {
+            $_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);
+            if(!@file_put_contents($htaccess,$_))
+            {
+                $warnings[] = $_lang["settings_friendlyurls_alert2"];
+            }
+        }
+    }
+    elseif(is_file($sample_htaccess))
+    {
+        if(!@rename($sample_htaccess,$htaccess))
+        {
+            $warnings[] = $_lang["settings_friendlyurls_alert"];
+        }
+        elseif($modx->config['base_url']!=='/')
+        {
+            $_ = file_get_contents($htaccess);
+            $_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);
+            if(!@file_put_contents($htaccess,$_))
+            {
+                $warnings[] = $_lang["settings_friendlyurls_alert2"];
+            }
+        }
+    }
 }
 
 if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {
@@ -56,19 +56,19 @@ 
 $data['rb_base_dir']      = str_replace('[(base_path)]',MODX_BASE_PATH,$data['rb_base_dir']);
 
 if (isset($data) && count($data) > 0) {
-	if(isset($data['manager_language'])) {
-		$lang_path = MODX_MANAGER_PATH . 'includes/lang/' . $data['manager_language'] . '.inc.php';
-		if(is_file($lang_path)) {
-			include($lang_path);
+    if(isset($data['manager_language'])) {
+        $lang_path = MODX_MANAGER_PATH . 'includes/lang/' . $data['manager_language'] . '.inc.php';
+        if(is_file($lang_path)) {
+            include($lang_path);
             global $modx_lang_attribute;
             $data['lang_code'] = !$modx_lang_attribute ? 'en' : $modx_lang_attribute;
-		}
-	}
-	$savethese = array();
-	$data['sys_files_checksum'] = $modx->manager->getSystemChecksum($data['check_files_onlogin']);
-	$data['mail_check_timeperiod'] = (int)$data['mail_check_timeperiod'] < 60 ? 60 : $data['mail_check_timeperiod']; // updateMail() in mainMenu no faster than every minute
-	foreach ($data as $k => $v) {
-		switch ($k) {
+        }
+    }
+    $savethese = array();
+    $data['sys_files_checksum'] = $modx->manager->getSystemChecksum($data['check_files_onlogin']);
+    $data['mail_check_timeperiod'] = (int)$data['mail_check_timeperiod'] < 60 ? 60 : $data['mail_check_timeperiod']; // updateMail() in mainMenu no faster than every minute
+    foreach ($data as $k => $v) {
+        switch ($k) {
             case 'settings_version':{
                 if($modx->getVersionData('version')!=$data['settings_version']){
                     $modx->logEvent(17,2,'<pre>'.var_export($data['settings_version'],true).'</pre>','fake settings_version');
@@ -76,24 +76,24 @@ 
                 }
                 break;
             }
-			case 'error_page':
-			case 'unauthorized_page':
-			if (trim($v) == '' || !is_numeric($v)) {
-				$v = $data['site_start'];
-			}
-			break;
+            case 'error_page':
+            case 'unauthorized_page':
+            if (trim($v) == '' || !is_numeric($v)) {
+                $v = $data['site_start'];
+            }
+            break;
 
-			case 'lst_custom_contenttype':
-			case 'txt_custom_contenttype':
-				// Skip these
-				$k = '';
-				break;
-			case 'rb_base_dir':
-			case 'rb_base_url':
-			case 'filemanager_path':
-				$v = trim($v);
-				$v = rtrim($v,'/') . '/';
-				break;
+            case 'lst_custom_contenttype':
+            case 'txt_custom_contenttype':
+                // Skip these
+                $k = '';
+                break;
+            case 'rb_base_dir':
+            case 'rb_base_url':
+            case 'filemanager_path':
+                $v = trim($v);
+                $v = rtrim($v,'/') . '/';
+                break;
             case 'manager_language':
                 $langDir = realpath(MODX_MANAGER_PATH . 'includes/lang');
                 $langFile = realpath(MODX_MANAGER_PATH . 'includes/lang/' . $v . '.inc.php');
@@ -101,56 +101,56 @@ 
                 if($langDir !== $langFileDir || !file_exists($langFile)) {
                     $v = 'english';
                 }
-				break;
-			case 'smtppw':
-				if ($v !== '********************' && $v !== '') {
-					$v = trim($v);
-					$v = base64_encode($v) . substr(str_shuffle('abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789'), 0, 7);
-					$v = str_replace('=','%',$v);
-				} elseif ($v === '********************') {
-					$k = '';
-				}
-				break;
+                break;
+            case 'smtppw':
+                if ($v !== '********************' && $v !== '') {
+                    $v = trim($v);
+                    $v = base64_encode($v) . substr(str_shuffle('abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789'), 0, 7);
+                    $v = str_replace('=','%',$v);
+                } elseif ($v === '********************') {
+                    $k = '';
+                }
+                break;
             case 'valid_hostnames':
-				$v = str_replace(array(' ,', ', '), ',', $v);
-				if ($v !== ',') {
-					$v = ($v != 'MODX_SITE_HOSTNAMES') ? $v : '';
-					$configString = '<?php' . "\n" . 'define(\'MODX_SITE_HOSTNAMES\', \'' . $v . '\');' . "\n";
-					@file_put_contents(MODX_BASE_PATH . 'assets/cache/siteHostnames.php', $configString);
-				}
-				$k = '';
-				break;
-			case 'session_timeout':
-				$mail_check_timeperiod = $data['mail_check_timeperiod'];
-				$v = (int)$v < ($data['mail_check_timeperiod']/60+1) ? ($data['mail_check_timeperiod']/60+1) : $v; // updateMail() in mainMenu pings as per mail_check_timeperiod, so +1min is minimum
-				break;
-			default:
-			break;
-		}
-		$v = is_array($v) ? implode(",", $v) : $v;
+                $v = str_replace(array(' ,', ', '), ',', $v);
+                if ($v !== ',') {
+                    $v = ($v != 'MODX_SITE_HOSTNAMES') ? $v : '';
+                    $configString = '<?php' . "\n" . 'define(\'MODX_SITE_HOSTNAMES\', \'' . $v . '\');' . "\n";
+                    @file_put_contents(MODX_BASE_PATH . 'assets/cache/siteHostnames.php', $configString);
+                }
+                $k = '';
+                break;
+            case 'session_timeout':
+                $mail_check_timeperiod = $data['mail_check_timeperiod'];
+                $v = (int)$v < ($data['mail_check_timeperiod']/60+1) ? ($data['mail_check_timeperiod']/60+1) : $v; // updateMail() in mainMenu pings as per mail_check_timeperiod, so +1min is minimum
+                break;
+            default:
+            break;
+        }
+        $v = is_array($v) ? implode(",", $v) : $v;
 
-		$modx->config[$k] = $v;
+        $modx->config[$k] = $v;
 
-		if(!empty($k)) $savethese[] = '(\''.$modx->db->escape($k).'\', \''.$modx->db->escape($v).'\')';
-	}
+        if(!empty($k)) $savethese[] = '(\''.$modx->db->escape($k).'\', \''.$modx->db->escape($v).'\')';
+    }
 
-	// Run a single query to save all the values
-	$sql = "REPLACE INTO ".$modx->getFullTableName("system_settings")." (setting_name, setting_value)
+    // Run a single query to save all the values
+    $sql = "REPLACE INTO ".$modx->getFullTableName("system_settings")." (setting_name, setting_value)
 		VALUES ".implode(', ', $savethese);
-	$modx->db->query($sql);
+    $modx->db->query($sql);
 
-	// Reset Template Pages
-	if (isset($data['reset_template'])) {
-		$newtemplate = (int)$data['default_template'];
-		$oldtemplate = (int)$data['old_template'];
-		$tbl = $modx->getFullTableName('site_content');
-		$reset = $data['reset_template'];
-		if($reset==1) $modx->db->update(array('template' => $newtemplate), $tbl, "type='document'");
-		else if($reset==2) $modx->db->update(array('template' => $newtemplate), $tbl, "template='{$oldtemplate}'");
-	}
+    // Reset Template Pages
+    if (isset($data['reset_template'])) {
+        $newtemplate = (int)$data['default_template'];
+        $oldtemplate = (int)$data['old_template'];
+        $tbl = $modx->getFullTableName('site_content');
+        $reset = $data['reset_template'];
+        if($reset==1) $modx->db->update(array('template' => $newtemplate), $tbl, "type='document'");
+        else if($reset==2) $modx->db->update(array('template' => $newtemplate), $tbl, "template='{$oldtemplate}'");
+    }
 
-	// empty cache
-	$modx->clearCache('full');
+    // empty cache
+    $modx->clearCache('full');
 }
 $header="Location: index.php?a=7&r=10";
 header($header);

manager/processors/duplicate_plugin.processor.php

Indentation +18 added lines, -18 removed lines

@@ -3,12 +3,12 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('new_plugin')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id'])? (int)$_GET['id'] : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // count duplicates
@@ -19,25 +19,25 @@ 
 
 // duplicate Plugin
 $newid = $modx->db->insert(
-	array(
-		'name'=>'',
-		'description'=>'',
-		'disabled'=>'',
-		'moduleguid'=>'',
-		'plugincode'=>'',
-		'properties'=>'',
-		'category'=>'',
-		), $modx->getFullTableName('site_plugins'), // Insert into
-	"CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, description, '1' AS disabled, moduleguid, plugincode, properties, category", $modx->getFullTableName('site_plugins'), "id='{$id}'"); // Copy from
+    array(
+        'name'=>'',
+        'description'=>'',
+        'disabled'=>'',
+        'moduleguid'=>'',
+        'plugincode'=>'',
+        'properties'=>'',
+        'category'=>'',
+        ), $modx->getFullTableName('site_plugins'), // Insert into
+    "CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, description, '1' AS disabled, moduleguid, plugincode, properties, category", $modx->getFullTableName('site_plugins'), "id='{$id}'"); // Copy from
 
 // duplicate Plugin Event Listeners
 $modx->db->insert(
-	array(
-		'pluginid'=>'',
-		'evtid'=>'',
-		'priority'=>'',
-		), $modx->getFullTableName('site_plugin_events'), // Insert into
-	"'{$newid}', evtid, priority", $modx->getFullTableName('site_plugin_events'), "pluginid='{$id}'"); // Copy from
+    array(
+        'pluginid'=>'',
+        'evtid'=>'',
+        'priority'=>'',
+        ), $modx->getFullTableName('site_plugin_events'), // Insert into
+    "'{$newid}', evtid, priority", $modx->getFullTableName('site_plugin_events'), "pluginid='{$id}'"); // Copy from
 
 // Set the item name for logger
 $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_plugins'), "id='{$newid}'"));

manager/processors/delete_user.processor.php

Indentation +13 added lines, -13 removed lines

@@ -3,17 +3,17 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('delete_user')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id'])? (int)$_GET['id'] : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // delete the user, but first check if we are deleting our own record
 if($id==$modx->getLoginUserID()) {
-	$modx->webAlertAndQuit("You can't delete yourself!");
+    $modx->webAlertAndQuit("You can't delete yourself!");
 }
 
 // Set the item name for logger
@@ -22,9 +22,9 @@ 
 
 // invoke OnBeforeUserFormDelete event
 $modx->invokeEvent("OnBeforeUserFormDelete",
-	array(
-		"id"	=> $id
-	));
+    array(
+        "id"	=> $id
+    ));
 
 // delete the user.
 $modx->db->delete($modx->getFullTableName('manager_users'), "id='{$id}'");
@@ -39,16 +39,16 @@ 
 
 // invoke OnManagerDeleteUser event
 $modx->invokeEvent("OnManagerDeleteUser",
-	array(
-		"userid"		=> $id,
-		"username"		=> $username
-	));
+    array(
+        "userid"		=> $id,
+        "username"		=> $username
+    ));
 
 // invoke OnUserFormDelete event
 $modx->invokeEvent("OnUserFormDelete",
-	array(
-		"id"	=> $id
-	));
+    array(
+        "id"	=> $id
+    ));
 
 $header="Location: index.php?a=75";
 header($header);

manager/processors/duplicate_snippet.processor.php

Indentation +10 added lines, -10 removed lines

@@ -3,12 +3,12 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('new_snippet')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id'])? (int)$_GET['id'] : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // count duplicates
@@ -19,14 +19,14 @@ 
 
 // duplicate Snippet
 $newid = $modx->db->insert(
-	array(
-		'name'=>'',
-		'description'=>'',
-		'snippet'=>'',
-		'properties'=>'',
-		'category'=>'',
-		), $modx->getFullTableName('site_snippets'), // Insert into
-	"CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, description, snippet, properties, category", $modx->getFullTableName('site_snippets'), "id='{$id}'"); // Copy from
+    array(
+        'name'=>'',
+        'description'=>'',
+        'snippet'=>'',
+        'properties'=>'',
+        'category'=>'',
+        ), $modx->getFullTableName('site_snippets'), // Insert into
+    "CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, description, snippet, properties, category", $modx->getFullTableName('site_snippets'), "id='{$id}'"); // Copy from
 
 // Set the item name for logger
 $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_snippets'), "id='{$newid}'"));

manager/processors/unpublish_content.processor.php

Indentation +12 added lines, -12 removed lines

@@ -3,12 +3,12 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('save_document')||!$modx->hasPermission('publish_document')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_REQUEST['id'])? (int)$_REQUEST['id'] : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 /************webber ********/
@@ -33,20 +33,20 @@ 
 $udperms->role = $_SESSION['mgrRole'];
 
 if(!$udperms->checkPermissions()) {
-	$modx->webAlertAndQuit($_lang["access_permission_denied"]);
+    $modx->webAlertAndQuit($_lang["access_permission_denied"]);
 }
 
 // update the document
 $modx->db->update(
-	array(
-		'published'   => 0,
-		'pub_date'    => 0,
-		'unpub_date'  => 0,
-		'editedby'    => $modx->getLoginUserID(),
-		'editedon'    => time(),
-		'publishedby' => 0,
-		'publishedon' => 0,
-	), $modx->getFullTableName('site_content'), "id='{$id}'");
+    array(
+        'published'   => 0,
+        'pub_date'    => 0,
+        'unpub_date'  => 0,
+        'editedby'    => $modx->getLoginUserID(),
+        'editedon'    => time(),
+        'publishedby' => 0,
+        'publishedon' => 0,
+    ), $modx->getFullTableName('site_content'), "id='{$id}'");
 
 // invoke OnDocUnPublished  event
 $modx->invokeEvent("OnDocUnPublished",array("docid"=>$id));

manager/processors/delete_module.processor.php

Indentation +8 added lines, -8 removed lines

@@ -3,12 +3,12 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('delete_module')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id'])? (int)$_GET['id'] : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // Set the item name for logger
@@ -17,9 +17,9 @@ 
 
 // invoke OnBeforeModFormDelete event
 $modx->invokeEvent("OnBeforeModFormDelete",
-	array(
-		"id"	=> $id
-	));
+    array(
+        "id"	=> $id
+    ));
 
 // delete the module.
 $modx->db->delete($modx->getFullTableName('site_modules'), "id='{$id}'");
@@ -32,9 +32,9 @@ 
 
 // invoke OnModFormDelete event
 $modx->invokeEvent("OnModFormDelete",
-	array(
-		"id"	=> $id
-	));
+    array(
+        "id"	=> $id
+    ));
 
 // empty cache
 $modx->clearCache('full');

install/setup.info.php

Indentation +64 added lines, -64 removed lines

@@ -170,70 +170,70 @@
                 array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false
             );
         }
-		if ((int)$params['shareparams'] || !empty($params['dependencies'])) {
-			$dependencies = explode(',', $params['dependencies']);
-			foreach ($dependencies as $dependency) {
-				$dependency = explode(':', $dependency);
-				switch (trim($dependency[0])) {
-					case 'template':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'templates',
-							'column' => 'templatename',
-							'type' => 50,
-							'name' => trim($dependency[1])
-						);
-						break;
-					case 'tv':
-					case 'tmplvar':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'tmplvars',
-							'column' => 'name',
-							'type' => 60,
-							'name' => trim($dependency[1])
-						);
-						break;
-					case 'chunk':
-					case 'htmlsnippet':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'htmlsnippets',
-							'column' => 'name',
-							'type' => 10,
-							'name' => trim($dependency[1])
-						);
-						break;
-					case 'snippet':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'snippets',
-							'column' => 'name',
-							'type' => 40,
-							'name' => trim($dependency[1])
-						);
-						break;
-					case 'plugin':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'plugins',
-							'column' => 'name',
-							'type' => 30,
-							'name' => trim($dependency[1])
-						);
-						break;
-					case 'resource':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'content',
-							'column' => 'pagetitle',
-							'type' => 20,
-							'name' => trim($dependency[1])
-						);
-						break;
-				}
-			}
-		}
+        if ((int)$params['shareparams'] || !empty($params['dependencies'])) {
+            $dependencies = explode(',', $params['dependencies']);
+            foreach ($dependencies as $dependency) {
+                $dependency = explode(':', $dependency);
+                switch (trim($dependency[0])) {
+                    case 'template':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'templates',
+                            'column' => 'templatename',
+                            'type' => 50,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                    case 'tv':
+                    case 'tmplvar':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'tmplvars',
+                            'column' => 'name',
+                            'type' => 60,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                    case 'chunk':
+                    case 'htmlsnippet':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'htmlsnippets',
+                            'column' => 'name',
+                            'type' => 10,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                    case 'snippet':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'snippets',
+                            'column' => 'name',
+                            'type' => 40,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                    case 'plugin':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'plugins',
+                            'column' => 'name',
+                            'type' => 30,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                    case 'resource':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'content',
+                            'column' => 'pagetitle',
+                            'type' => 20,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                }
+            }
+        }
     }
     $d->close();
 }

manager/actions/welcome.static.php

Indentation +226 added lines, -226 removed lines

@@ -1,13 +1,13 @@ 
 <?php

 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {

-	die('<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.');

+    die('<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.');

 }

 

 unset($_SESSION['itemname']); // clear this, because it's only set for logging purposes

 

 if($modx->hasPermission('settings') && (!isset($settings_version) || $settings_version != $modx->getVersionData('version'))) {

-	// seems to be a new install - send the user to the configuration page

-	exit('<script type="text/javascript">document.location.href="index.php?a=17";</script>');

+    // seems to be a new install - send the user to the configuration page

+    exit('<script type="text/javascript">document.location.href="index.php?a=17";</script>');

 }

 

 // set placeholders

@@ -17,70 +17,70 @@ 
 

 // setup message info

 if($modx->hasPermission('messages')) {

-	include_once(MODX_MANAGER_PATH . 'includes/messageCount.inc.php');

-	$_SESSION['nrtotalmessages'] = $nrtotalmessages;

-	$_SESSION['nrnewmessages'] = $nrnewmessages;

-

-	$msg = array();

-	$msg[] = sprintf('<a href="index.php?a=10" target="main"><img src="%s" /></a>', $_style['icons_mail_large']);

-	$nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">' . $_SESSION['nrnewmessages'] . '</span>)' : '';

-	$msg[] = sprintf('<span style="color:#909090;font-size:15px;font-weight:bold">&nbsp;<a class="wm_messages_inbox_link" href="index.php?a=10" target="main">[%%inbox%%]</a>%s</span><br />', $nrnewmessages);

-	$nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">' . $_SESSION['nrnewmessages'] . '</span>' : '0';

-	$welcome_messages = sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages);

-	$msg[] = sprintf('<span class="comment">%s</span>', $welcome_messages);

-	$ph['MessageInfo'] = implode("\n", $msg);

+    include_once(MODX_MANAGER_PATH . 'includes/messageCount.inc.php');

+    $_SESSION['nrtotalmessages'] = $nrtotalmessages;

+    $_SESSION['nrnewmessages'] = $nrnewmessages;

+

+    $msg = array();

+    $msg[] = sprintf('<a href="index.php?a=10" target="main"><img src="%s" /></a>', $_style['icons_mail_large']);

+    $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">' . $_SESSION['nrnewmessages'] . '</span>)' : '';

+    $msg[] = sprintf('<span style="color:#909090;font-size:15px;font-weight:bold">&nbsp;<a class="wm_messages_inbox_link" href="index.php?a=10" target="main">[%%inbox%%]</a>%s</span><br />', $nrnewmessages);

+    $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">' . $_SESSION['nrnewmessages'] . '</span>' : '0';

+    $welcome_messages = sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages);

+    $msg[] = sprintf('<span class="comment">%s</span>', $welcome_messages);

+    $ph['MessageInfo'] = implode("\n", $msg);

 }

 

 // setup icons

 if($modx->hasPermission('new_user') || $modx->hasPermission('edit_user')) {

-	$icon = '<i class="[&icons_security_large&]" alt="[%user_management_title%]"> </i>[%user_management_title%]';

-	$ph['SecurityIcon'] = wrapIcon($icon, 75);

+    $icon = '<i class="[&icons_security_large&]" alt="[%user_management_title%]"> </i>[%user_management_title%]';

+    $ph['SecurityIcon'] = wrapIcon($icon, 75);

 }

 if($modx->hasPermission('new_web_user') || $modx->hasPermission('edit_web_user')) {

-	$icon = '<i class="[&icons_webusers_large&]" alt="[%web_user_management_title%]"> </i>[%web_user_management_title%]';

-	$ph['WebUserIcon'] = wrapIcon($icon, 99);

+    $icon = '<i class="[&icons_webusers_large&]" alt="[%web_user_management_title%]"> </i>[%web_user_management_title%]';

+    $ph['WebUserIcon'] = wrapIcon($icon, 99);

 }

 if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module')) {

-	$icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]';

-	$ph['ModulesIcon'] = wrapIcon($icon, 106);

+    $icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]';

+    $ph['ModulesIcon'] = wrapIcon($icon, 106);

 }

 if($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags')) {

-	$icon = '<i class="[&icons_resources_large&]" alt="[%element_management%]"> </i>[%elements%]';

-	$ph['ResourcesIcon'] = wrapIcon($icon, 76);

+    $icon = '<i class="[&icons_resources_large&]" alt="[%element_management%]"> </i>[%elements%]';

+    $ph['ResourcesIcon'] = wrapIcon($icon, 76);

 }

 if($modx->hasPermission('bk_manager')) {

-	$icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]';

-	$ph['BackupIcon'] = wrapIcon($icon, 93);

+    $icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]';

+    $ph['BackupIcon'] = wrapIcon($icon, 93);

 }

 if($modx->hasPermission('help')) {

-	$icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]';

-	$ph['HelpIcon'] = wrapIcon($icon, 9);

+    $icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]';

+    $ph['HelpIcon'] = wrapIcon($icon, 9);

 }

 // do some config checks

 if(($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {

-	include_once(MODX_MANAGER_PATH . 'includes/config_check.inc.php');

-	if($config_check_results != $_lang['configcheck_ok']) {

-		$ph['config_check_results'] = $config_check_results;

-		$ph['config_display'] = 'block';

-	} else {

-		$ph['config_display'] = 'none';

-	}

+    include_once(MODX_MANAGER_PATH . 'includes/config_check.inc.php');

+    if($config_check_results != $_lang['configcheck_ok']) {

+        $ph['config_check_results'] = $config_check_results;

+        $ph['config_display'] = 'block';

+    } else {

+        $ph['config_display'] = 'none';

+    }

 } else {

-	$ph['config_display'] = 'none';

+    $ph['config_display'] = 'none';

 }

 

 // Check logout-reminder

 if(isset($_SESSION['show_logout_reminder'])) {

-	switch($_SESSION['show_logout_reminder']['type']) {

-		case 'logout_reminder':

-			$date = $modx->toDateFormat($_SESSION['show_logout_reminder']['lastHit'], 'dateOnly');

-			$ph['logout_reminder_msg'] = str_replace('[+date+]', $date, $_lang['logout_reminder_msg']);

-			break;

-	}

-	$ph['show_logout_reminder'] = 'block';

-	unset($_SESSION['show_logout_reminder']);

+    switch($_SESSION['show_logout_reminder']['type']) {

+        case 'logout_reminder':

+            $date = $modx->toDateFormat($_SESSION['show_logout_reminder']['lastHit'], 'dateOnly');

+            $ph['logout_reminder_msg'] = str_replace('[+date+]', $date, $_lang['logout_reminder_msg']);

+            break;

+    }

+    $ph['show_logout_reminder'] = 'block';

+    unset($_SESSION['show_logout_reminder']);

 } else {

-	$ph['show_logout_reminder'] = 'none';

+    $ph['show_logout_reminder'] = 'none';

 }

 

 // Check multiple sessions

@@ -128,11 +128,11 @@ 
 $nrnewmessages = '<span class="text-danger">' . $_SESSION['nrnewmessages'] . '</span>';

 

 $ph['UserInfo'] = $modx->parseText($tpl, array(

-	'username' => $modx->getLoginUserName(),

-	'role' => $_SESSION['mgrPermissions']['name'],

-	'lastlogin' => $modx->toDateFormat($_SESSION['mgrLastlogin'] + $server_offset_time),

-	'logincount' => $_SESSION['mgrLogincount'] + 1,

-	'msginfo' => sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages)

+    'username' => $modx->getLoginUserName(),

+    'role' => $_SESSION['mgrPermissions']['name'],

+    'lastlogin' => $modx->toDateFormat($_SESSION['mgrLastlogin'] + $server_offset_time),

+    'logincount' => $_SESSION['mgrLogincount'] + 1,

+    'msginfo' => sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages)

 ));

 

 $from = array();

@@ -141,13 +141,13 @@ 
 $rs = $modx->db->select('*', $from, '', 'username ASC, au.sid ASC');

 

 if($modx->db->getRecordCount($rs) < 1) {

-	$html = '<p>[%no_active_users_found%]</p>';

+    $html = '<p>[%no_active_users_found%]</p>';

 } else {

-	include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php');

-	$now = $_SERVER['REQUEST_TIME'] + $server_offset_time;

-	$ph['now'] = strftime('%H:%M:%S', $now);

-	$timetocheck = ($now - (60 * 20)); //+$server_offset_time;

-	$html = '

+    include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php');

+    $now = $_SERVER['REQUEST_TIME'] + $server_offset_time;

+    $ph['now'] = strftime('%H:%M:%S', $now);

+    $timetocheck = ($now - (60 * 20)); //+$server_offset_time;

+    $html = '

 	<div class="card-body">

 		[%onlineusers_message%] 

 		<b>[+now+]</b>):

@@ -165,33 +165,33 @@ 
 	</thead>

 	<tbody>';

 

-	$userList = array();

-	$userCount = array();

-	// Create userlist with session-count first before output

-	while($activeusers = $modx->db->getRow($rs)) {

-		$userCount[$activeusers['internalKey']] = isset($userCount[$activeusers['internalKey']]) ? $userCount[$activeusers['internalKey']] + 1 : 1;

-

-		$idle = $activeusers['lasthit'] < $timetocheck ? ' class="userIdle"' : '';

-		$webicon = $activeusers['internalKey'] < 0 ? '<img src="[&tree_globe&]" alt="Web user" />&nbsp;' : '';

-		$ip = $activeusers['ip'] === '::1' ? '127.0.0.1' : $activeusers['ip'];

-		$currentaction = getAction($activeusers['action'], $activeusers['id']);

-		$userList[] = array(

-			$idle,

-			'',

-			$activeusers['username'],

-			$webicon,

-			abs($activeusers['internalKey']),

-			$ip,

-			strftime('%H:%M:%S', $activeusers['lasthit'] + $server_offset_time),

-			$currentaction

-		);

-	}

-	foreach($userList as $params) {

-		$params[1] = $userCount[$params[4]] > 1 ? ' class="userMultipleSessions"' : '';

-		$html .= "\n\t\t" . vsprintf('<tr%s><td><strong%s>%s</strong></td><td>%s%s</td><td>%s</td><td>%s</td><td>%s</td></tr>', $params);

-	}

-

-	$html .= '

+    $userList = array();

+    $userCount = array();

+    // Create userlist with session-count first before output

+    while($activeusers = $modx->db->getRow($rs)) {

+        $userCount[$activeusers['internalKey']] = isset($userCount[$activeusers['internalKey']]) ? $userCount[$activeusers['internalKey']] + 1 : 1;

+

+        $idle = $activeusers['lasthit'] < $timetocheck ? ' class="userIdle"' : '';

+        $webicon = $activeusers['internalKey'] < 0 ? '<img src="[&tree_globe&]" alt="Web user" />&nbsp;' : '';

+        $ip = $activeusers['ip'] === '::1' ? '127.0.0.1' : $activeusers['ip'];

+        $currentaction = getAction($activeusers['action'], $activeusers['id']);

+        $userList[] = array(

+            $idle,

+            '',

+            $activeusers['username'],

+            $webicon,

+            abs($activeusers['internalKey']),

+            $ip,

+            strftime('%H:%M:%S', $activeusers['lasthit'] + $server_offset_time),

+            $currentaction

+        );

+    }

+    foreach($userList as $params) {

+        $params[1] = $userCount[$params[4]] > 1 ? ' class="userMultipleSessions"' : '';

+        $html .= "\n\t\t" . vsprintf('<tr%s><td><strong%s>%s</strong></td><td>%s%s</td><td>%s</td><td>%s</td><td>%s</td></tr>', $params);

+    }

+

+    $html .= '

 	</tbody>

 	</table>

 </div>

@@ -232,17 +232,17 @@ 
 // invoke event OnManagerWelcomePrerender

 $evtOut = $modx->invokeEvent('OnManagerWelcomePrerender');

 if(is_array($evtOut)) {

-	$output = implode('', $evtOut);

-	$ph['OnManagerWelcomePrerender'] = $output;

+    $output = implode('', $evtOut);

+    $ph['OnManagerWelcomePrerender'] = $output;

 }

 

 $widgets['welcome'] = array(

-	'menuindex' => '10',

-	'id' => 'welcome',

-	'cols' => 'col-sm-6',

-	'icon' => 'fa-home',

-	'title' => '[%welcome_title%]',

-	'body' => '

+    'menuindex' => '10',

+    'id' => 'welcome',

+    'cols' => 'col-sm-6',

+    'icon' => 'fa-home',

+    'title' => '[%welcome_title%]',

+    'body' => '

 				<div class="wm_buttons card-body"> 

 					<!--@IF:[[#hasPermission?key=new_user]] OR [[#hasPermission?key=edit_user]]--> 

 					<span class="wm_button">

@@ -320,25 +320,25 @@ 
 					</table>

 				</div>

 		',

-	'hide'=>'0'

+    'hide'=>'0'

 );

 $widgets['onlineinfo'] = array(

-	'menuindex' => '20',

-	'id' => 'onlineinfo',

-	'cols' => 'col-sm-6',

-	'icon' => 'fa-user',

-	'title' => '[%onlineusers_title%]',

-	'body' => '<div class="userstable">[+OnlineInfo+]</div>',

-	'hide'=>'0'

+    'menuindex' => '20',

+    'id' => 'onlineinfo',

+    'cols' => 'col-sm-6',

+    'icon' => 'fa-user',

+    'title' => '[%onlineusers_title%]',

+    'body' => '<div class="userstable">[+OnlineInfo+]</div>',

+    'hide'=>'0'

 );

 $widgets['recentinfo'] = array(

-	'menuindex' => '30',

-	'id' => 'modxrecent_widget',

-	'cols' => 'col-sm-12',

-	'icon' => 'fa-pencil-square-o',

-	'title' => '[%activity_title%]',

-	'body' => '<div class="widget-stage">[+RecentInfo+]</div>',

-	'hide'=>'0'

+    'menuindex' => '30',

+    'id' => 'modxrecent_widget',

+    'cols' => 'col-sm-12',

+    'icon' => 'fa-pencil-square-o',

+    'title' => '[%activity_title%]',

+    'body' => '<div class="widget-stage">[+RecentInfo+]</div>',

+    'hide'=>'0'

 );

 if ($modx->config['rss_url_news']) {

     $widgets['news'] = array(

@@ -366,7 +366,7 @@ 
 // invoke OnManagerWelcomeHome event

 $sitewidgets = $modx->invokeEvent("OnManagerWelcomeHome", array('widgets' => $widgets));

 if(is_array($sitewidgets)) {

-	$newwidgets = array();

+    $newwidgets = array();

     foreach($sitewidgets as $widget){

         $newwidgets = array_merge($newwidgets, unserialize($widget));

     }

@@ -374,21 +374,21 @@ 
 }

 

 usort($widgets, function ($a, $b) {

-	return $a['menuindex'] - $b['menuindex'];

+    return $a['menuindex'] - $b['menuindex'];

 });

 

 $tpl = getTplWidget();

 $output = '';

 foreach($widgets as $widget) {

-	if ($widget['hide'] != '1'){

-		$output .= $modx->parseText($tpl, $widget);

-	}

+    if ($widget['hide'] != '1'){

+        $output .= $modx->parseText($tpl, $widget);

+    }

 }

 $ph['widgets'] = $output;

 

 // load template

 if(!isset($modx->config['manager_welcome_tpl']) || empty($modx->config['manager_welcome_tpl'])) {

-	$modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH . 'media/style/common/welcome.tpl';

+    $modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH . 'media/style/common/welcome.tpl';

 }

 

 $target = $modx->config['manager_welcome_tpl'];

@@ -396,27 +396,27 @@ 
 $target = $modx->mergeSettingsContent($target);

 

 if(substr($target, 0, 1) === '@') {

-	if(substr($target, 0, 6) === '@CHUNK') {

-		$content = $modx->getChunk(trim(substr($target, 7)));

-	} elseif(substr($target, 0, 5) === '@FILE') {

-		$content = file_get_contents(trim(substr($target, 6)));

-	} else {

-		$content = '';

-	}

+    if(substr($target, 0, 6) === '@CHUNK') {

+        $content = $modx->getChunk(trim(substr($target, 7)));

+    } elseif(substr($target, 0, 5) === '@FILE') {

+        $content = file_get_contents(trim(substr($target, 6)));

+    } else {

+        $content = '';

+    }

 } else {

-	$chunk = $modx->getChunk($target);

-	if($chunk !== false && !empty($chunk)) {

-		$content = $chunk;

-	} elseif(is_file(MODX_BASE_PATH . $target)) {

-		$content = file_get_contents(MODX_BASE_PATH . $target);

-	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {

-		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl');

-	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) // ClipperCMS compatible

-	{

-		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html');

-	} else {

-		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/common/welcome.tpl');

-	}

+    $chunk = $modx->getChunk($target);

+    if($chunk !== false && !empty($chunk)) {

+        $content = $chunk;

+    } elseif(is_file(MODX_BASE_PATH . $target)) {

+        $content = file_get_contents(MODX_BASE_PATH . $target);

+    } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {

+        $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl');

+    } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) // ClipperCMS compatible

+    {

+        $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html');

+    } else {

+        $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/common/welcome.tpl');

+    }

 }

 

 // merge placeholders

@@ -424,8 +424,8 @@ 
 $content = $modx->mergeSettingsContent($content);

 $content = $modx->parseText($content, $ph);

 if(strpos($content, '[+') !== false) {

-	$modx->toPlaceholders($ph);

-	$content = $modx->mergePlaceholderContent($content);

+    $modx->toPlaceholders($ph);

+    $content = $modx->mergePlaceholderContent($content);

 }

 $content = $modx->parseDocumentSource($content);

 $content = $modx->parseText($content, $_lang, '[%', '%]');

@@ -433,7 +433,7 @@ 
 $content = $modx->cleanUpMODXTags($content); //cleanup

 

 if($js = $modx->getRegisteredClientScripts()) {

-	$content .= $js;

+    $content .= $js;

 }

 

 echo $content;

@@ -443,7 +443,7 @@ 
 //  <a href="javascript:;" class="closed"><i class="fa fa-close"></i></a>

 //</span>

 function getTplWidget() { // recent document info

-	return '

+    return '

 		<div class="[+cols+]" id="[+id+]">

 			<div class="card"[+cardAttr+]>

 				<div class="card-header"[+headAttr+]> <i class="fa [+icon+]"></i> [+title+] </div>

@@ -454,11 +454,11 @@ 
 }

 

 function getRecentInfo() { // recent document info

-	global $modx;

+    global $modx;

 

-	$modx->addSnippet('recentInfoList', 'getRecentInfoList');

+    $modx->addSnippet('recentInfoList', 'getRecentInfoList');

 

-	$html = '

+    $html = '

 			<div class="table-responsive">

 				<table class="table data">

 					<thead>

@@ -476,96 +476,96 @@ 
 				</table>

 			</div>

 ';

-	return $html;

+    return $html;

 }

 

 function getRecentInfoList() {

-	global $modx;

-

-	$rs = $modx->db->select('*', '[+prefix+]site_content', '', 'editedon DESC', 10);

-

-	if($modx->db->getRecordCount($rs) < 1) {

-		return '<tr><td>[%no_activity_message%]</td></tr>';

-	}

-

-	$tpl = getRecentInfoRowTpl();

-

-	$btntpl['edit'] = '<a title="[%edit_resource%]" href="index.php?a=27&amp;id=[+id+]" target="main"><i class="fa fa-edit fa-fw"></i></a> ';

-	$btntpl['preview_btn'] = '<a [+preview_disabled+]" title="[%preview_resource%]" target="_blank" href="../index.php?&amp;id=[+id+]"><i class="fa fa-eye fa-fw"></i></a> ';

-

-	$output = array();

-	while($ph = $modx->db->getRow($rs)) {

-		$docid = $ph['id'];

-		$_ = $modx->getUserInfo($ph['editedby']);

-		$ph['username'] = $_['username'];

-

-		if($ph['deleted'] == 1) {

-			$ph['status'] = 'deleted text-danger';

-		} elseif($ph['published'] == 0) {

-			$ph['status'] = 'unpublished font-italic text-muted';

-		} else {

-			$ph['status'] = 'published';

-		}

-

-		if($modx->hasPermission('edit_document')) {

-			$ph['edit_btn'] = str_replace('[+id+]', $docid, $btntpl['edit']);

-		} else {

-			$ph['edit_btn'] = '';

-		}

-

-		$preview_disabled = ($ph['deleted'] == 1) ? 'disabled' : '';

-		$ph['preview_btn'] = str_replace(array(

-			'[+id+]',

-			'[+preview_disabled+]'

-		), array(

-			$docid,

-			$preview_disabled

-		), $btntpl['preview_btn']);

-

-		if($modx->hasPermission('delete_document')) {

-			if($ph['deleted'] == 0) {

-				$delete_btn = '<a onclick="return confirm(\'[%confirm_delete_record%]\')" title="[%delete_resource%]" href="index.php?a=6&amp;id=[+id+]" target="main"><i class="fa fa-trash fa-fw"></i></a> ';

-			} else {

-				$delete_btn = '<a onclick="return confirm(\'[%confirm_undelete%]\')" title="[%undelete_resource%]" href="index.php?a=63&amp;id=[+id+]" target="main"><i class="fa fa-arrow-circle-o-up fa-fw"></i></a> ';

-			}

-			$ph['delete_btn'] = str_replace('[+id+]', $docid, $delete_btn);

-		} else {

-			$ph['delete_btn'] = '';

-		}

-

-		if($ph['deleted'] == 1 && $ph['published'] == 0) {

-			$publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> ';

-		} elseif($ph['deleted'] == 1 && $ph['published'] == 1) {

-			$publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> ';

-		} elseif($ph['deleted'] == 0 && $ph['published'] == 0) {

-			$publish_btn = '<a title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> ';

-		} else {

-			$publish_btn = '<a title="[%unpublish_resource%]" href="index.php?a=62&amp;id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> ';

-		}

-		$ph['publish_btn'] = str_replace('[+id+]', $docid, $publish_btn);

-

-		$ph['info_btn'] = str_replace('[+id+]', $docid, '<a title="[%resource_overview%]" data-toggle="collapse" data-target=".collapse[+id+]"><i class="fa fa-info fa-fw"></i></a>');

-

-		if($ph['longtitle'] == '') {

-			$ph['longtitle'] = '(<i>[%not_set%]</i>)';

-		}

-		if($ph['description'] == '') {

-			$ph['description'] = '(<i>[%not_set%]</i>)';

-		}

-		if($ph['introtext'] == '') {

-			$ph['introtext'] = '(<i>[%not_set%]</i>)';

-		}

-		if($ph['alias'] == '') {

-			$ph['alias'] = '(<i>[%not_set%]</i>)';

-		}

-

-		$output[] = $modx->parseText($tpl, $ph);

-	}

-	return implode("\n", $output);

+    global $modx;

+

+    $rs = $modx->db->select('*', '[+prefix+]site_content', '', 'editedon DESC', 10);

+

+    if($modx->db->getRecordCount($rs) < 1) {

+        return '<tr><td>[%no_activity_message%]</td></tr>';

+    }

+

+    $tpl = getRecentInfoRowTpl();

+

+    $btntpl['edit'] = '<a title="[%edit_resource%]" href="index.php?a=27&amp;id=[+id+]" target="main"><i class="fa fa-edit fa-fw"></i></a> ';

+    $btntpl['preview_btn'] = '<a [+preview_disabled+]" title="[%preview_resource%]" target="_blank" href="../index.php?&amp;id=[+id+]"><i class="fa fa-eye fa-fw"></i></a> ';

+

+    $output = array();

+    while($ph = $modx->db->getRow($rs)) {

+        $docid = $ph['id'];

+        $_ = $modx->getUserInfo($ph['editedby']);

+        $ph['username'] = $_['username'];

+

+        if($ph['deleted'] == 1) {

+            $ph['status'] = 'deleted text-danger';

+        } elseif($ph['published'] == 0) {

+            $ph['status'] = 'unpublished font-italic text-muted';

+        } else {

+            $ph['status'] = 'published';

+        }

+

+        if($modx->hasPermission('edit_document')) {

+            $ph['edit_btn'] = str_replace('[+id+]', $docid, $btntpl['edit']);

+        } else {

+            $ph['edit_btn'] = '';

+        }

+

+        $preview_disabled = ($ph['deleted'] == 1) ? 'disabled' : '';

+        $ph['preview_btn'] = str_replace(array(

+            '[+id+]',

+            '[+preview_disabled+]'

+        ), array(

+            $docid,

+            $preview_disabled

+        ), $btntpl['preview_btn']);

+

+        if($modx->hasPermission('delete_document')) {

+            if($ph['deleted'] == 0) {

+                $delete_btn = '<a onclick="return confirm(\'[%confirm_delete_record%]\')" title="[%delete_resource%]" href="index.php?a=6&amp;id=[+id+]" target="main"><i class="fa fa-trash fa-fw"></i></a> ';

+            } else {

+                $delete_btn = '<a onclick="return confirm(\'[%confirm_undelete%]\')" title="[%undelete_resource%]" href="index.php?a=63&amp;id=[+id+]" target="main"><i class="fa fa-arrow-circle-o-up fa-fw"></i></a> ';

+            }

+            $ph['delete_btn'] = str_replace('[+id+]', $docid, $delete_btn);

+        } else {

+            $ph['delete_btn'] = '';

+        }

+

+        if($ph['deleted'] == 1 && $ph['published'] == 0) {

+            $publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> ';

+        } elseif($ph['deleted'] == 1 && $ph['published'] == 1) {

+            $publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> ';

+        } elseif($ph['deleted'] == 0 && $ph['published'] == 0) {

+            $publish_btn = '<a title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> ';

+        } else {

+            $publish_btn = '<a title="[%unpublish_resource%]" href="index.php?a=62&amp;id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> ';

+        }

+        $ph['publish_btn'] = str_replace('[+id+]', $docid, $publish_btn);

+

+        $ph['info_btn'] = str_replace('[+id+]', $docid, '<a title="[%resource_overview%]" data-toggle="collapse" data-target=".collapse[+id+]"><i class="fa fa-info fa-fw"></i></a>');

+

+        if($ph['longtitle'] == '') {

+            $ph['longtitle'] = '(<i>[%not_set%]</i>)';

+        }

+        if($ph['description'] == '') {

+            $ph['description'] = '(<i>[%not_set%]</i>)';

+        }

+        if($ph['introtext'] == '') {

+            $ph['introtext'] = '(<i>[%not_set%]</i>)';

+        }

+        if($ph['alias'] == '') {

+            $ph['alias'] = '(<i>[%not_set%]</i>)';

+        }

+

+        $output[] = $modx->parseText($tpl, $ph);

+    }

+    return implode("\n", $output);

 }

 

 function getRecentInfoRowTpl() {

-	$tpl = '

+    $tpl = '

 						<tr>

 							<td data-toggle="collapse" data-target=".collapse[+id+]" class="text-right"><span class="label label-info">[+id+]</span></td>

 							<td data-toggle="collapse" data-target=".collapse[+id+]"><a class="[+status+]" title="[%edit_resource%]" href="index.php?a=3&amp;id=[+id+]" target="main">[+pagetitle+]</a></td>

@@ -589,16 +589,16 @@ 
 								</div>

 							</td>

 						</tr>';

-	return $tpl;

+    return $tpl;

 }

 

 // setup icons

 function wrapIcon($i, $action) {

-	return sprintf('<a href="index.php?a=%s" target="main"><span class="wm_button" style="border:0">%s</span></a>', $action, $i);

+    return sprintf('<a href="index.php?a=%s" target="main"><span class="wm_button" style="border:0">%s</span></a>', $action, $i);

 }

 

 function getStartUpScript() {

-	$script = '

+    $script = '

         <script type="text/javascript">

         function hideConfigCheckWarning(key) {

         	var xhr = new XMLHttpRequest();

@@ -622,5 +622,5 @@ 
 		})(jQuery);        

         </script>

 ';

-	return $script;

+    return $script;

 }

manager/actions/mutate_tmplvars.dynamic.php

Indentation +117 added lines, -117 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('edit_template') && $modx->manager->action == '301') {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 if(!$modx->hasPermission('new_template') && $modx->manager->action == '300') {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
@@ -20,7 +20,7 @@ 
 
 // check to see the snippet editor isn't locked
 if($lockedEl = $modx->elementIsLocked(2, $id)) {
-	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['tmplvar']));
+    $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['tmplvar']));
 }
 // end check for lock
 
@@ -30,25 +30,25 @@ 
 global $content;
 $content = array();
 if(isset($_GET['id'])) {
-	$rs = $modx->db->select('*', $tbl_site_tmplvars, "id='{$id}'");
-	$content = $modx->db->getRow($rs);
-	if(!$content) {
-		header("Location: " . MODX_SITE_URL . "index.php?id={$site_start}");
-	}
-
-	$_SESSION['itemname'] = $content['caption'];
-	if($content['locked'] == 1 && $modx->hasPermission('save_role') != 1) {
-		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-	}
+    $rs = $modx->db->select('*', $tbl_site_tmplvars, "id='{$id}'");
+    $content = $modx->db->getRow($rs);
+    if(!$content) {
+        header("Location: " . MODX_SITE_URL . "index.php?id={$site_start}");
+    }
+
+    $_SESSION['itemname'] = $content['caption'];
+    if($content['locked'] == 1 && $modx->hasPermission('save_role') != 1) {
+        $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    }
 } else if(isset($_REQUEST['itemname'])) {
-	$content['name'] = $_REQUEST['itemname'];
+    $content['name'] = $_REQUEST['itemname'];
 } else {
-	$_SESSION['itemname'] = $_lang["new_tmplvars"];
-	$content['category'] = (int)$_REQUEST['catid'];
+    $_SESSION['itemname'] = $_lang["new_tmplvars"];
+    $content['category'] = (int)$_REQUEST['catid'];
 }
 
 if($modx->manager->hasFormValues()) {
-	$modx->manager->loadFormValues();
+    $modx->manager->loadFormValues();
 }
 
 $content = array_merge($content, $_POST);
@@ -62,7 +62,7 @@ 
 $RTEditors = '';
 $evtOut = $modx->invokeEvent('OnRichTextEditorRegister', array('forfrontend' => 1));
 if(is_array($evtOut)) {
-	$RTEditors = implode(',', $evtOut);
+    $RTEditors = implode(',', $evtOut);
 }
 
 ?>
@@ -277,12 +277,12 @@ 
 
 <form name="mutate" method="post" action="index.php" enctype="multipart/form-data">
 	<?php
-	// invoke OnTVFormPrerender event
-	$evtOut = $modx->invokeEvent('OnTVFormPrerender', array('id' => $id));
-	if(is_array($evtOut)) {
-		echo implode("", $evtOut);
-	}
-	?>
+    // invoke OnTVFormPrerender event
+    $evtOut = $modx->invokeEvent('OnTVFormPrerender', array('id' => $id));
+    if(is_array($evtOut)) {
+        echo implode("", $evtOut);
+    }
+    ?>
 	<input type="hidden" name="id" value="<?= $content['id'] ?>">
 	<input type="hidden" name="a" value="302">
 	<input type="hidden" name="or" value="<?= $origin ?>">
@@ -343,11 +343,11 @@ 
 						<select name="categoryid" class="form-control" onChange="documentDirty=true;">
 							<option>&nbsp;</option>
 							<?php
-							include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
-							foreach(getCategories() as $n => $v) {
-								echo "<option value='" . $v['id'] . "'" . ($content["category"] == $v["id"] ? " selected='selected'" : "") . ">" . $modx->htmlspecialchars($v["category"]) . "</option>";
-							}
-							?>
+                            include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
+                            foreach(getCategories() as $n => $v) {
+                                echo "<option value='" . $v['id'] . "'" . ($content["category"] == $v["id"] ? " selected='selected'" : "") . ">" . $modx->htmlspecialchars($v["category"]) . "</option>";
+                            }
+                            ?>
 						</select>
 					</div>
 				</div>
@@ -383,14 +383,14 @@ 
 							<optgroup label="Custom Type">
 								<option value="custom_tv" <?= ($content['type'] == 'custom_tv' ? "selected='selected'" : "") ?>>Custom Input</option>
 								<?php
-								$custom_tvs = scandir(MODX_BASE_PATH . 'assets/tvs');
-								foreach($custom_tvs as $ctv) {
-									if(strpos($ctv, '.') !== 0 && $ctv != 'index.html') {
-										$selected = ($content['type'] == 'custom_tv:' . $ctv ? "selected='selected'" : "");
-										echo '<option value="custom_tv:' . $ctv . '"  ' . $selected . '>' . $ctv . '</option>';
-									}
-								}
-								?>
+                                $custom_tvs = scandir(MODX_BASE_PATH . 'assets/tvs');
+                                foreach($custom_tvs as $ctv) {
+                                    if(strpos($ctv, '.') !== 0 && $ctv != 'index.html') {
+                                        $selected = ($content['type'] == 'custom_tv:' . $ctv ? "selected='selected'" : "");
+                                        echo '<option value="custom_tv:' . $ctv . '"  ' . $selected . '>' . $ctv . '</option>';
+                                    }
+                                }
+                                ?>
 							</optgroup>
 						</select>
 					</div>
@@ -455,63 +455,63 @@ 
 					<a class="btn btn-secondary btn-sm" href="javascript:;" onClick="check_toggle(); return false;"><?= $_lang['check_toggle'] ?></a>
 				</div>
 				<?php
-				$rs = $modx->db->select(sprintf("tpl.id AS id, templatename, tpl.description AS tpldescription, tpl.locked AS tpllocked, tpl.selectable AS selectable, tmplvarid, if(isnull(cat.category),'%s',cat.category) AS category, cat.id AS catid", $_lang['no_category']), sprintf("%s as tpl
+                $rs = $modx->db->select(sprintf("tpl.id AS id, templatename, tpl.description AS tpldescription, tpl.locked AS tpllocked, tpl.selectable AS selectable, tmplvarid, if(isnull(cat.category),'%s',cat.category) AS category, cat.id AS catid", $_lang['no_category']), sprintf("%s as tpl
                     LEFT JOIN %s as stt ON stt.templateid=tpl.id AND stt.tmplvarid='%s'
                     LEFT JOIN %s as cat ON tpl.category=cat.id", $modx->getFullTableName('site_templates'), $modx->getFullTableName('site_tmplvar_templates'), $id, $modx->getFullTableName('categories')), '', "category, templatename");
 
-				$tplList = '<ul>';
-				$preCat = '';
-				$insideUl = 0;
-				while($row = $modx->db->getRow($rs)) {
-					$row['category'] = stripslashes($row['category']); //pixelchutes
-					if($preCat !== $row['category']) {
-						$tplList .= $insideUl ? '</ul>' : '';
-						$tplList .= '<li><strong>' . $row['category'] . ($row['catid'] != '' ? ' <small>(' . $row['catid'] . ')</small>' : '') . '</strong><ul>';
-						$insideUl = 1;
-					}
-
-					if($modx->manager->action == '300' && $modx->config['default_template'] == $row['id']) {
-						$checked = true;
-					} elseif(isset($_GET['tpl']) && $_GET['tpl'] == $row['id']) {
-						$checked = true;
-					} elseif($id == 0 && is_array($_POST['template'])) {
-						$checked = in_array($row['id'], $_POST['template']);
-					} else {
-						$checked = $row['tmplvarid'];
-					}
-					$selectable = !$row['selectable'] ? ' class="disabled"' : '';
-					$checked = $checked ? ' checked="checked"' : '';
-					$tplId = '&nbsp;<small>(' . $row['id'] . ')</small>';
-					$desc = !empty($row['tpldescription']) ? ' - ' . $row['tpldescription'] : '';
-
-					$tplInfo = array();
-					if($row['tpllocked']) {
-						$tplInfo[] = $_lang['locked'];
-					}
-					if($row['id'] == $modx->config['default_template']) {
-						$tplInfo[] = $_lang['defaulttemplate_title'];
-					}
-					$tplInfo = !empty($tplInfo) ? ' <em>(' . implode(', ', $tplInfo) . ')</em>' : '';
-
-					$tplList .= sprintf('<li><label%s><input name="template[]" value="%s" type="checkbox" %s onchange="documentDirty=true;"> %s%s%s%s</label></li>', $selectable, $row['id'], $checked, $row['templatename'], $tplId, $desc, $tplInfo);
-					$tplList .= '</li>';
-
-					$preCat = $row['category'];
-				}
-				$tplList .= $insideUl ? '</ul>' : '';
-				$tplList .= '</ul>';
-				echo $tplList;
-
-				?>
+                $tplList = '<ul>';
+                $preCat = '';
+                $insideUl = 0;
+                while($row = $modx->db->getRow($rs)) {
+                    $row['category'] = stripslashes($row['category']); //pixelchutes
+                    if($preCat !== $row['category']) {
+                        $tplList .= $insideUl ? '</ul>' : '';
+                        $tplList .= '<li><strong>' . $row['category'] . ($row['catid'] != '' ? ' <small>(' . $row['catid'] . ')</small>' : '') . '</strong><ul>';
+                        $insideUl = 1;
+                    }
+
+                    if($modx->manager->action == '300' && $modx->config['default_template'] == $row['id']) {
+                        $checked = true;
+                    } elseif(isset($_GET['tpl']) && $_GET['tpl'] == $row['id']) {
+                        $checked = true;
+                    } elseif($id == 0 && is_array($_POST['template'])) {
+                        $checked = in_array($row['id'], $_POST['template']);
+                    } else {
+                        $checked = $row['tmplvarid'];
+                    }
+                    $selectable = !$row['selectable'] ? ' class="disabled"' : '';
+                    $checked = $checked ? ' checked="checked"' : '';
+                    $tplId = '&nbsp;<small>(' . $row['id'] . ')</small>';
+                    $desc = !empty($row['tpldescription']) ? ' - ' . $row['tpldescription'] : '';
+
+                    $tplInfo = array();
+                    if($row['tpllocked']) {
+                        $tplInfo[] = $_lang['locked'];
+                    }
+                    if($row['id'] == $modx->config['default_template']) {
+                        $tplInfo[] = $_lang['defaulttemplate_title'];
+                    }
+                    $tplInfo = !empty($tplInfo) ? ' <em>(' . implode(', ', $tplInfo) . ')</em>' : '';
+
+                    $tplList .= sprintf('<li><label%s><input name="template[]" value="%s" type="checkbox" %s onchange="documentDirty=true;"> %s%s%s%s</label></li>', $selectable, $row['id'], $checked, $row['templatename'], $tplId, $desc, $tplInfo);
+                    $tplList .= '</li>';
+
+                    $preCat = $row['category'];
+                }
+                $tplList .= $insideUl ? '</ul>' : '';
+                $tplList .= '</ul>';
+                echo $tplList;
+
+                ?>
 
 				<!-- Access Permissions -->
 				<?php
-				if($use_udperms == 1) {
-					// fetch permissions for the variable
-					$rs = $modx->db->select('documentgroup', $modx->getFullTableName('site_tmplvar_access'), "tmplvarid='{$id}'");
-					$groupsarray = $modx->db->getColumn('documentgroup', $rs);
+                if($use_udperms == 1) {
+                    // fetch permissions for the variable
+                    $rs = $modx->db->select('documentgroup', $modx->getFullTableName('site_tmplvar_access'), "tmplvarid='{$id}'");
+                    $groupsarray = $modx->db->getColumn('documentgroup', $rs);
 
-					?>
+                    ?>
 					<?php if($modx->hasPermission('access_permissions')) { ?>
 						<script type="text/javascript">
 							function makePublic(b) {
@@ -539,29 +539,29 @@ 
 						<!--<b><?php /*echo $_lang['access_permissions']; */ ?></b>-->
 						<p><?= $_lang['tmplvar_access_msg'] ?></p>
 						<?php
-						$chk = '';
-						$rs = $modx->db->select('name, id', $tbl_documentgroup_names);
-						if(empty($groupsarray) && is_array($_POST['docgroups']) && empty($_POST['id'])) {
-							$groupsarray = $_POST['docgroups'];
-						}
-						while($row = $modx->db->getRow($rs)) {
-							$checked = in_array($row['id'], $groupsarray);
-							if($modx->hasPermission('access_permissions')) {
-								if($checked) {
-									$notPublic = true;
-								}
-								$chks .= "<li><label><input type='checkbox' name='docgroups[]' value='" . $row['id'] . "' " . ($checked ? "checked='checked'" : '') . " onclick=\"makePublic(false)\" /> " . $row['name'] . "</label></li>";
-							} else {
-								if($checked) {
-									echo "<input type='hidden' name='docgroups[]'  value='" . $row['id'] . "' />";
-								}
-							}
-						}
-						if($modx->hasPermission('access_permissions')) {
-							$chks = "<li><label><input type='checkbox' name='chkalldocs' " . (!$notPublic ? "checked='checked'" : '') . " onclick=\"makePublic(true)\" /> <span class='warning'>" . $_lang['all_doc_groups'] . "</span></label></li>" . $chks;
-						}
-						echo '<ul>' . $chks . '</ul>';
-						?>
+                        $chk = '';
+                        $rs = $modx->db->select('name, id', $tbl_documentgroup_names);
+                        if(empty($groupsarray) && is_array($_POST['docgroups']) && empty($_POST['id'])) {
+                            $groupsarray = $_POST['docgroups'];
+                        }
+                        while($row = $modx->db->getRow($rs)) {
+                            $checked = in_array($row['id'], $groupsarray);
+                            if($modx->hasPermission('access_permissions')) {
+                                if($checked) {
+                                    $notPublic = true;
+                                }
+                                $chks .= "<li><label><input type='checkbox' name='docgroups[]' value='" . $row['id'] . "' " . ($checked ? "checked='checked'" : '') . " onclick=\"makePublic(false)\" /> " . $row['name'] . "</label></li>";
+                            } else {
+                                if($checked) {
+                                    echo "<input type='hidden' name='docgroups[]'  value='" . $row['id'] . "' />";
+                                }
+                            }
+                        }
+                        if($modx->hasPermission('access_permissions')) {
+                            $chks = "<li><label><input type='checkbox' name='chkalldocs' " . (!$notPublic ? "checked='checked'" : '') . " onclick=\"makePublic(true)\" /> <span class='warning'>" . $_lang['all_doc_groups'] . "</span></label></li>" . $chks;
+                        }
+                        echo '<ul>' . $chks . '</ul>';
+                        ?>
 					<?php } ?>
 				<?php } ?>
 
@@ -571,12 +571,12 @@ 
 		<input type="submit" name="save" style="display:none">
 
 		<?php
-		// invoke OnTVFormRender event
-		$evtOut = $modx->invokeEvent('OnTVFormRender', array('id' => $id));
-		if(is_array($evtOut)) {
-			echo implode('', $evtOut);
-		}
-		?>
+        // invoke OnTVFormRender event
+        $evtOut = $modx->invokeEvent('OnTVFormRender', array('id' => $id));
+        if(is_array($evtOut)) {
+            echo implode('', $evtOut);
+        }
+        ?>
 	</div>
 </form>
 <script type="text/javascript">setTimeout('showParameters()', 10);</script>