evolution-cms / evolution

manager/captcha.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 $modx->getSettings();
 
 $modx->documentMethod = 'id';
-$modx->documentIdentifier = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 1;
+$modx->documentIdentifier = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 1;
 $modx->documentObject = $modx->getDocumentObject('id', $modx->documentIdentifier);
 
 $modx->invokeEvent('OnWebPageInit');

manager/includes/functions/actions/import.php

Doc Comments +1 added lines, -1 removed lines

@@ -357,7 +357,7 @@
 if(!function_exists('getFileContent')) {
     /**
      * @param string $filepath
-     * @return bool|string
+     * @return null|string
      */
     function getFileContent($filepath)
     {

Indentation +3 added lines, -3 removed lines

@@ -114,9 +114,9 @@
                 $field['menuindex'] = 1;
                 $find = false;
                 foreach (array(
-                             'index.html',
-                             'index.htm'
-                         ) as $filename) {
+                                'index.html',
+                                'index.htm'
+                            ) as $filename) {
                     $filepath = $filedir . $alias . '/' . $filename;
                     if ($find === false && file_exists($filepath)) {
                         $file = getFileContent($filepath);

Spacing +36 added lines, -36 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!function_exists('run')) {
+if (!function_exists('run')) {
     /**
      * @return string
      */
@@ -28,12 +28,12 @@ 
             $modx->getDatabase()->query("ALTER TABLE {$tbl_site_content} AUTO_INCREMENT = 1");
         }
 
-        $parent = (int)$_POST['parent'];
+        $parent = (int) $_POST['parent'];
 
-        if (is_dir(MODX_BASE_PATH . 'temp/import')) {
-            $filedir = MODX_BASE_PATH . 'temp/import/';
-        } elseif (is_dir(MODX_BASE_PATH . 'assets/import')) {
-            $filedir = MODX_BASE_PATH . 'assets/import/';
+        if (is_dir(MODX_BASE_PATH.'temp/import')) {
+            $filedir = MODX_BASE_PATH.'temp/import/';
+        } elseif (is_dir(MODX_BASE_PATH.'assets/import')) {
+            $filedir = MODX_BASE_PATH.'assets/import/';
         } else {
             $filedir = '';
         }
@@ -44,7 +44,7 @@ 
         $files = pop_index($files);
 
         // no. of files to import
-        $output .= sprintf('<p>' . $_lang['import_files_found'] . '</p>', $filesfound);
+        $output .= sprintf('<p>'.$_lang['import_files_found'].'</p>', $filesfound);
 
         // import files
         if (0 < count($files)) {
@@ -57,7 +57,7 @@ 
         $mtime = $mtime[1] + $mtime[0];
         $importend = $mtime;
         $totaltime = ($importend - $importstart);
-        $output .= sprintf('<p>' . $_lang['import_site_time'] . '</p>', round($totaltime, 3));
+        $output .= sprintf('<p>'.$_lang['import_site_time'].'</p>', round($totaltime, 3));
 
         if ($_POST['convert_link'] == 'on') {
             convertLink();
@@ -67,7 +67,7 @@ 
     }
 }
 
-if(!function_exists('importFiles')) {
+if (!function_exists('importFiles')) {
     /**
      * @param int $parent
      * @param string $filedir
@@ -98,7 +98,7 @@ 
             if (is_array($value)) {
                 // create folder
                 $alias = $id;
-                printf('<span>' . $_lang['import_site_importing_document'] . '</span>', $alias);
+                printf('<span>'.$_lang['import_site_importing_document'].'</span>', $alias);
                 $field = array();
                 $field['type'] = 'document';
                 $field['contentType'] = 'text/html';
@@ -117,7 +117,7 @@ 
                              'index.html',
                              'index.htm'
                          ) as $filename) {
-                    $filepath = $filedir . $alias . '/' . $filename;
+                    $filepath = $filedir.$alias.'/'.$filename;
                     if ($find === false && file_exists($filepath)) {
                         $file = getFileContent($filepath);
                         list($pagetitle, $content, $description) = treatContent($file, $filename, $alias);
@@ -132,10 +132,10 @@ 
                         $newid = $modx->getDatabase()->insert($field, $tbl_site_content);
                         if ($newid) {
                             $find = true;
-                            echo ' - <span class="success">' . $_lang['import_site_success'] . '</span><br />' . "\n";
-                            importFiles($newid, $filedir . $alias . '/', $value, 'sub');
+                            echo ' - <span class="success">'.$_lang['import_site_success'].'</span><br />'."\n";
+                            importFiles($newid, $filedir.$alias.'/', $value, 'sub');
                         } else {
-                            echo '<span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_db_error"] . $modx->getDatabase()->getLastError();
+                            echo '<span class="fail">'.$_lang["import_site_failed"]."</span> ".$_lang["import_site_failed_db_error"].$modx->getDatabase()->getLastError();
                             exit;
                         }
                     }
@@ -150,10 +150,10 @@ 
                     $newid = $modx->getDatabase()->insert($field, $tbl_site_content);
                     if ($newid) {
                         $find = true;
-                        echo ' - <span class="success">' . $_lang['import_site_success'] . '</span><br />' . "\n";
-                        importFiles($newid, $filedir . $alias . '/', $value, 'sub');
+                        echo ' - <span class="success">'.$_lang['import_site_success'].'</span><br />'."\n";
+                        importFiles($newid, $filedir.$alias.'/', $value, 'sub');
                     } else {
-                        echo '<span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_db_error"] . $modx->getDatabase()->getLastError();
+                        echo '<span class="fail">'.$_lang["import_site_failed"]."</span> ".$_lang["import_site_failed_db_error"].$modx->getDatabase()->getLastError();
                         exit;
                     }
                 }
@@ -166,12 +166,12 @@ 
                 $fparts = explode('.', $value);
                 $alias = $fparts[0];
                 $ext = (count($fparts) > 1) ? $fparts[count($fparts) - 1] : "";
-                printf("<span>" . $_lang['import_site_importing_document'] . "</span>", $filename);
+                printf("<span>".$_lang['import_site_importing_document']."</span>", $filename);
 
                 if (!in_array($ext, $allowedfiles)) {
-                    echo ' - <span class="fail">' . $_lang["import_site_skip"] . '</span><br />' . "\n";
+                    echo ' - <span class="fail">'.$_lang["import_site_skip"].'</span><br />'."\n";
                 } else {
-                    $filepath = $filedir . $filename;
+                    $filepath = $filedir.$filename;
                     $file = getFileContent($filepath);
                     list($pagetitle, $content, $description) = treatContent($file, $filename, $alias);
 
@@ -197,9 +197,9 @@ 
                     $field['menuindex'] = ($alias == 'index') ? 0 : 2;
                     $newid = $modx->getDatabase()->insert($field, $tbl_site_content);
                     if ($newid) {
-                        echo ' - <span class="success">' . $_lang['import_site_success'] . '</span><br />' . "\n";
+                        echo ' - <span class="success">'.$_lang['import_site_success'].'</span><br />'."\n";
                     } else {
-                        echo '<span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_db_error"] . $modx->getDatabase()->getLastError();
+                        echo '<span class="fail">'.$_lang["import_site_failed"]."</span> ".$_lang["import_site_failed_db_error"].$modx->getDatabase()->getLastError();
                         exit;
                     }
 
@@ -218,7 +218,7 @@ 
     }
 }
 
-if(!function_exists('getFiles')) {
+if (!function_exists('getFiles')) {
     /**
      * @param string $directory
      * @param array $listing
@@ -234,10 +234,10 @@ 
             foreach ($files as $file) {
                 if ($file == '.' || $file == '..') {
                     continue;
-                } elseif ($h = @opendir($directory . $file . "/")) {
+                } elseif ($h = @opendir($directory.$file."/")) {
                     closedir($h);
                     $count = -1;
-                    $listing[$file] = getFiles($directory . $file . "/", array(), $count + 1);
+                    $listing[$file] = getFiles($directory.$file."/", array(), $count + 1);
                 } elseif (strpos($file, '.htm') !== false) {
                     $listing[$dummy] = $file;
                     $dummy = $dummy + 1;
@@ -245,14 +245,14 @@ 
                 }
             }
         } else {
-            echo '<p><span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_no_open_dir"] . $directory . ".</p>";
+            echo '<p><span class="fail">'.$_lang["import_site_failed"]."</span> ".$_lang["import_site_failed_no_open_dir"].$directory.".</p>";
         }
 
         return ($listing);
     }
 }
 
-if(!function_exists('getFileContent')) {
+if (!function_exists('getFileContent')) {
     /**
      * @param string $filepath
      * @return bool|string
@@ -262,14 +262,14 @@ 
         global $_lang;
         // get the file
         if (!$buffer = file_get_contents($filepath)) {
-            echo '<p><span class="fail">' . $_lang['import_site_failed'] . "</span> " . $_lang["import_site_failed_no_retrieve_file"] . $filepath . ".</p>";
+            echo '<p><span class="fail">'.$_lang['import_site_failed']."</span> ".$_lang["import_site_failed_no_retrieve_file"].$filepath.".</p>";
         } else {
             return $buffer;
         }
     }
 }
 
-if(!function_exists('pop_index')) {
+if (!function_exists('pop_index')) {
     /**
      * @param array $array
      * @return array
@@ -294,7 +294,7 @@ 
     }
 }
 
-if(!function_exists('treatContent')) {
+if (!function_exists('treatContent')) {
     /**
      * @param string $src
      * @param string $filename
@@ -329,7 +329,7 @@ 
         } else {
             $content = $src;
             $s = '/(<meta[^>]+charset\s*=)[^>"\'=]+(.+>)/i';
-            $r = '$1' . $modx->config['modx_charset'] . '$2';
+            $r = '$1'.$modx->config['modx_charset'].'$2';
             $content = preg_replace($s, $r, $content);
             $content = preg_replace('@<title>.*</title>@i', "<title>[*pagetitle*]</title>", $content);
         }
@@ -345,7 +345,7 @@ 
     }
 }
 
-if(!function_exists('convertLink')) {
+if (!function_exists('convertLink')) {
     /**
      * @return void
      */
@@ -368,7 +368,7 @@ 
                     list($href, $v) = explode('"', $v, 2);
                     $_ = $href;
                     if (strpos($_, $modx->config['site_url']) !== false) {
-                        $_ = $modx->config['base_url'] . str_replace($modx->config['site_url'], '', $_);
+                        $_ = $modx->config['base_url'].str_replace($modx->config['site_url'], '', $_);
                     }
                     if ($_[0] === '/') {
                         $_ = substr($_, 1);
@@ -395,15 +395,15 @@ 
                     if (strpos($_, '/') !== false) {
                         $_ = substr($_, strrpos($_, '/'));
                     }
-                    $_ = $dir . str_replace('.html', '', $_);
+                    $_ = $dir.str_replace('.html', '', $_);
                     if (!isset($target[$_])) {
                         $target[$_] = $modx->getIdFromAlias($_);
                     }
                     $target[$_] = trim($target[$_]);
                     if (!empty($target[$_])) {
-                        $href = '[~' . $target[$_] . '~]';
+                        $href = '[~'.$target[$_].'~]';
                     }
-                    $array[$c] = '<a href="' . $href . '"' . $v;
+                    $array[$c] = '<a href="'.$href.'"'.$v;
                 }
                 $c++;
             }

manager/actions/help/01About_EVO.php

Indentation +9 added lines, -9 removed lines

@@ -4,18 +4,18 @@
 }
 $logo= '<img src="media/style/default/images/misc/login-logo.png" height="54" width="358" border="0">';
 $downloadLinks = array(
-	0=>array('title'=>$_lang["information"],'link'=>'https://evo.im/'),
-	1=>array('title'=>$_lang["download"],'link'=>'https://github.com/evolution-cms/evolution/releases'),
-	2=>array('title'=>$_lang["previous_releases"],'link'=>'https://modx.com/download/evolution/previous-releases.html'),
-	3=>array('title'=>$_lang["extras"],'link'=>array(
-		'http://extras.evolution-cms.com/',
-		'https://github.com/extras-evolution'
-	)),
+    0=>array('title'=>$_lang["information"],'link'=>'https://evo.im/'),
+    1=>array('title'=>$_lang["download"],'link'=>'https://github.com/evolution-cms/evolution/releases'),
+    2=>array('title'=>$_lang["previous_releases"],'link'=>'https://modx.com/download/evolution/previous-releases.html'),
+    3=>array('title'=>$_lang["extras"],'link'=>array(
+        'http://extras.evolution-cms.com/',
+        'https://github.com/extras-evolution'
+    )),
 );
 
 $translationLinks = array(
-	0=>array('title'=>'Evolution CMS','link'=>'https://www.transifex.com/evolutioncms/evolution/'),
-	1=>array('title'=>$_lang["extras"],'link'=>'https://www.transifex.com/evolutioncms/extras/'),
+    0=>array('title'=>'Evolution CMS','link'=>'https://www.transifex.com/evolutioncms/evolution/'),
+    1=>array('title'=>$_lang["extras"],'link'=>'https://www.transifex.com/evolutioncms/extras/'),
 );
 
 

Spacing +8 added lines, -8 removed lines

@@ -1,21 +1,21 @@
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+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.");
 }
-$logo= '<img src="media/style/default/images/misc/login-logo.png" height="54" width="358" border="0">';
+$logo = '<img src="media/style/default/images/misc/login-logo.png" height="54" width="358" border="0">';
 $downloadLinks = array(
-	0=>array('title'=>$_lang["information"],'link'=>'https://evo.im/'),
-	1=>array('title'=>$_lang["download"],'link'=>'https://github.com/evolution-cms/evolution/releases'),
-	2=>array('title'=>$_lang["previous_releases"],'link'=>'https://modx.com/download/evolution/previous-releases.html'),
-	3=>array('title'=>$_lang["extras"],'link'=>array(
+	0=>array('title'=>$_lang["information"], 'link'=>'https://evo.im/'),
+	1=>array('title'=>$_lang["download"], 'link'=>'https://github.com/evolution-cms/evolution/releases'),
+	2=>array('title'=>$_lang["previous_releases"], 'link'=>'https://modx.com/download/evolution/previous-releases.html'),
+	3=>array('title'=>$_lang["extras"], 'link'=>array(
 		'http://extras.evolution-cms.com/',
 		'https://github.com/extras-evolution'
 	)),
 );
 
 $translationLinks = array(
-	0=>array('title'=>'Evolution CMS','link'=>'https://www.transifex.com/evolutioncms/evolution/'),
-	1=>array('title'=>$_lang["extras"],'link'=>'https://www.transifex.com/evolutioncms/extras/'),
+	0=>array('title'=>'Evolution CMS', 'link'=>'https://www.transifex.com/evolutioncms/evolution/'),
+	1=>array('title'=>$_lang["extras"], 'link'=>'https://www.transifex.com/evolutioncms/extras/'),
 );
 
 

manager/actions/import_site.static.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
     <div class="container container-body">
         <?php
         if (!isset($_POST['import'])) {
-            echo "<div class=\"element-edit-message\">" . $_lang['import_site_message'] . "</div>";
+            echo "<div class=\"element-edit-message\">".$_lang['import_site_message']."</div>";
             ?>
             <form action="index.php" method="post" name="importFrm">
                 <input type="hidden" name="import" value="import"/>

manager/actions/bkmanager.static.php

Braces +3 added lines, -1 removed lines

@@ -491,4 +491,6 @@
 /**
  * @deprecated use EvolutionCMS\Support\MysqlDumper
  */
-class Mysqldumper extends EvolutionCMS\Support\MysqlDumper{}
+class Mysqldumper extends EvolutionCMS\Support\MysqlDumper
+{
+}

Spacing +35 added lines, -35 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+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.");
 }
 if (!$modx->hasPermission('bk_manager')) {
@@ -9,10 +9,10 @@ 
 $dbase = trim($dbase, '`');
 
 if (!isset($modx->config['snapshot_path'])) {
-    if (is_dir(MODX_BASE_PATH . 'temp/backup/')) {
-        $modx->config['snapshot_path'] = MODX_BASE_PATH . 'temp/backup/';
+    if (is_dir(MODX_BASE_PATH.'temp/backup/')) {
+        $modx->config['snapshot_path'] = MODX_BASE_PATH.'temp/backup/';
     } else {
-        $modx->config['snapshot_path'] = MODX_BASE_PATH . 'assets/backup/';
+        $modx->config['snapshot_path'] = MODX_BASE_PATH.'assets/backup/';
     }
 }
 
@@ -23,7 +23,7 @@ 
 if ($mode == 'restore1') {
     if (isset($_POST['textarea']) && !empty($_POST['textarea'])) {
         $source = trim($_POST['textarea']);
-        $_SESSION['textarea'] = $source . "\n";
+        $_SESSION['textarea'] = $source."\n";
     } else {
         $source = file_get_contents($_FILES['sqlfile']['tmp_name']);
     }
@@ -31,7 +31,7 @@ 
     header('Location: index.php?r=9&a=93');
     exit;
 } elseif ($mode == 'restore2') {
-    $path = $modx->config['snapshot_path'] . $_POST['filename'];
+    $path = $modx->config['snapshot_path'].$_POST['filename'];
     if (file_exists($path)) {
         $source = file_get_contents($path);
         import_sql($source);
@@ -77,7 +77,7 @@ 
     if (!is_writable(rtrim($modx->config['snapshot_path'], '/'))) {
         $modx->webAlertAndQuit(parsePlaceholder($_lang["bkmgr_alert_mkdir"], array('snapshot_path' => $modx->config['snapshot_path'])));
     }
-    $sql = "SHOW TABLE STATUS FROM `{$dbase}` LIKE '" . $modx->getDatabase()->escape($modx->getDatabase()->config['table_prefix']) . "%'";
+    $sql = "SHOW TABLE STATUS FROM `{$dbase}` LIKE '".$modx->getDatabase()->escape($modx->getDatabase()->config['table_prefix'])."%'";
     $rs = $modx->getDatabase()->query($sql);
     $tables = $modx->getDatabase()->getColumn('Name', $rs);
     $today = date('Y-m-d_H-i-s');
@@ -109,18 +109,18 @@ 
         $modx->webAlertAndQuit('Unable to Backup Database');
     }
 } else {
-    include_once MODX_MANAGER_PATH . "includes/header.inc.php";  // start normal header
+    include_once MODX_MANAGER_PATH."includes/header.inc.php"; // start normal header
 }
 
 if (isset($_SESSION['result_msg']) && $_SESSION['result_msg'] != '') {
     switch ($_SESSION['result_msg']) {
         case 'import_ok':
-            $ph['result_msg_import'] = '<div class="alert alert-success">' . $_lang["bkmgr_import_ok"] . '</div>';
-            $ph['result_msg_snapshot'] = '<div class="alert alert-success">' . $_lang["bkmgr_import_ok"] . '</div>';
+            $ph['result_msg_import'] = '<div class="alert alert-success">'.$_lang["bkmgr_import_ok"].'</div>';
+            $ph['result_msg_snapshot'] = '<div class="alert alert-success">'.$_lang["bkmgr_import_ok"].'</div>';
             break;
         case 'snapshot_ok':
             $ph['result_msg_import'] = '';
-            $ph['result_msg_snapshot'] = '<div class="alert alert-success">' . $_lang["bkmgr_snapshot_ok"] . '</div>';
+            $ph['result_msg_snapshot'] = '<div class="alert alert-success">'.$_lang["bkmgr_snapshot_ok"].'</div>';
             break;
     }
     $_SESSION['result_msg'] = '';
@@ -179,7 +179,7 @@ 
                 f.style.display = 'none';
             }
         }
-        <?= (isset($_REQUEST['r']) ? " doRefresh(" . $_REQUEST['r'] . ");" : "") ?>
+        <?= (isset($_REQUEST['r']) ? " doRefresh(".$_REQUEST['r'].");" : "") ?>
 
     </script>
 
@@ -223,7 +223,7 @@ 
                                 </thead>
                                 <tbody>
                                 <?php
-                                $sql = "SHOW TABLE STATUS FROM `{$dbase}` LIKE '" . $modx->getDatabase()->escape($modx->getDatabase()->config['table_prefix']) . "%'";
+                                $sql = "SHOW TABLE STATUS FROM `{$dbase}` LIKE '".$modx->getDatabase()->escape($modx->getDatabase()->config['table_prefix'])."%'";
                                 $rs = $modx->getDatabase()->query($sql);
                                 $i = 0;
                                 while ($db_status = $modx->getDatabase()->getRow($rs)) {
@@ -233,29 +233,29 @@ 
                                         $table_string = '';
                                     }
 
-                                    echo '<tr>' . "\n" . '<td><label class="form-check form-check-label"><input type="checkbox" name="chk[]" class="form-check-input" value="' . $db_status['Name'] . '"' . (strstr($table_string, $db_status['Name']) === false ? '' : ' checked="checked"') . ' /><b class="text-primary">' . $db_status['Name'] . '</b></label></td>' . "\n";
-                                    echo '<td class="text-xs-center">' . (!empty($db_status['Comment']) ? '<i class="' . $_style['actions_help'] . '" data-tooltip="' . $db_status['Comment'] . '"></i>' : '') . '</td>' . "\n";
-                                    echo '<td class="text-xs-right">' . $db_status['Rows'] . '</td>' . "\n";
-                                    echo '<td class="text-xs-right">' . $db_status['Collation'] . '</td>' . "\n";
+                                    echo '<tr>'."\n".'<td><label class="form-check form-check-label"><input type="checkbox" name="chk[]" class="form-check-input" value="'.$db_status['Name'].'"'.(strstr($table_string, $db_status['Name']) === false ? '' : ' checked="checked"').' /><b class="text-primary">'.$db_status['Name'].'</b></label></td>'."\n";
+                                    echo '<td class="text-xs-center">'.(!empty($db_status['Comment']) ? '<i class="'.$_style['actions_help'].'" data-tooltip="'.$db_status['Comment'].'"></i>' : '').'</td>'."\n";
+                                    echo '<td class="text-xs-right">'.$db_status['Rows'].'</td>'."\n";
+                                    echo '<td class="text-xs-right">'.$db_status['Collation'].'</td>'."\n";
 
                                     // Enable record deletion for certain tables (TRUNCATE TABLE) if they're not already empty
                                     $truncateable = array(
-                                        $modx->getDatabase()->config['table_prefix'] . 'event_log',
-                                        $modx->getDatabase()->config['table_prefix'] . 'manager_log',
+                                        $modx->getDatabase()->config['table_prefix'].'event_log',
+                                        $modx->getDatabase()->config['table_prefix'].'manager_log',
                                     );
                                     if ($modx->hasPermission('settings') && in_array($db_status['Name'], $truncateable) && $db_status['Rows'] > 0) {
-                                        echo '<td class="text-xs-right"><a class="text-danger" href="index.php?a=54&mode=' . $action . '&u=' . $db_status['Name'] . '" title="' . $_lang['truncate_table'] . '">' . $modx->nicesize($db_status['Data_length'] + $db_status['Data_free']) . '</a>' . '</td>' . "\n";
+                                        echo '<td class="text-xs-right"><a class="text-danger" href="index.php?a=54&mode='.$action.'&u='.$db_status['Name'].'" title="'.$_lang['truncate_table'].'">'.$modx->nicesize($db_status['Data_length'] + $db_status['Data_free']).'</a>'.'</td>'."\n";
                                     } else {
-                                        echo '<td class="text-xs-right">' . $modx->nicesize($db_status['Data_length'] + $db_status['Data_free']) . '</td>' . "\n";
+                                        echo '<td class="text-xs-right">'.$modx->nicesize($db_status['Data_length'] + $db_status['Data_free']).'</td>'."\n";
                                     }
 
                                     if ($modx->hasPermission('settings')) {
-                                        echo '<td class="text-xs-right">' . ($db_status['Data_free'] > 0 ? '<a class="text-danger" href="index.php?a=54&mode=' . $action . '&t=' . $db_status['Name'] . '" title="' . $_lang['optimize_table'] . '">' . $modx->nicesize($db_status['Data_free']) . '</a>' : '-') . '</td>' . "\n";
+                                        echo '<td class="text-xs-right">'.($db_status['Data_free'] > 0 ? '<a class="text-danger" href="index.php?a=54&mode='.$action.'&t='.$db_status['Name'].'" title="'.$_lang['optimize_table'].'">'.$modx->nicesize($db_status['Data_free']).'</a>' : '-').'</td>'."\n";
                                     } else {
-                                        echo '<td class="text-xs-right">' . ($db_status['Data_free'] > 0 ? $modx->nicesize($db_status['Data_free']) : '-') . '</td>' . "\n";
+                                        echo '<td class="text-xs-right">'.($db_status['Data_free'] > 0 ? $modx->nicesize($db_status['Data_free']) : '-').'</td>'."\n";
                                     }
 
-                                    echo '<td class="text-xs-right">' . $modx->nicesize($db_status['Data_length'] - $db_status['Data_free']) . '</td>' . "\n" . '<td class="text-xs-right">' . $modx->nicesize($db_status['Index_length']) . '</td>' . "\n" . '<td class="text-xs-right">' . $modx->nicesize($db_status['Index_length'] + $db_status['Data_length'] + $db_status['Data_free']) . '</td>' . "\n" . "</tr>";
+                                    echo '<td class="text-xs-right">'.$modx->nicesize($db_status['Data_length'] - $db_status['Data_free']).'</td>'."\n".'<td class="text-xs-right">'.$modx->nicesize($db_status['Index_length']).'</td>'."\n".'<td class="text-xs-right">'.$modx->nicesize($db_status['Index_length'] + $db_status['Data_length'] + $db_status['Data_free']).'</td>'."\n"."</tr>";
 
                                     $total = $total + $db_status['Index_length'] + $db_status['Data_length'];
                                     $totaloverhead = $totaloverhead + $db_status['Data_free'];
@@ -266,9 +266,9 @@ 
                                 <tr>
                                     <td class="text-xs-right"><?= $_lang['database_table_totals'] ?></td>
                                     <td colspan="4">&nbsp;</td>
-                                    <td class="text-xs-right"><?= $totaloverhead > 0 ? '<b class="text-danger">' . $modx->nicesize($totaloverhead) . '</b><br />(' . number_format($totaloverhead) . ' B)' : '-' ?></td>
+                                    <td class="text-xs-right"><?= $totaloverhead > 0 ? '<b class="text-danger">'.$modx->nicesize($totaloverhead).'</b><br />('.number_format($totaloverhead).' B)' : '-' ?></td>
                                     <td colspan="2">&nbsp;</td>
-                                    <td class="text-xs-right"><?= "<b>" . $modx->nicesize($total) . "</b><br />(" . number_format($total) . " B)" ?></td>
+                                    <td class="text-xs-right"><?= "<b>".$modx->nicesize($total)."</b><br />(".number_format($total)." B)" ?></td>
                                 </tr>
                                 </tfoot>
                             </table>
@@ -319,7 +319,7 @@ 
                             foreach ($last_result['0'] as $k => $v) {
                                 $title[] = $k;
                             }
-                            $result = '<thead><tr><th>' . implode('</th><th>', $title) . '</th></tr></thead>';
+                            $result = '<thead><tr><th>'.implode('</th><th>', $title).'</th></tr></thead>';
                             $result .= '<tbody>';
                             foreach ($last_result as $row) {
                                 $result_value = array();
@@ -327,11 +327,11 @@ 
                                     foreach ($row as $k => $v) {
                                         $result_value[] = $v;
                                     }
-                                    $result .= '<tr><td>' . implode('</td><td>', $result_value) . '</td></tr>';
+                                    $result .= '<tr><td>'.implode('</td><td>', $result_value).'</td></tr>';
                                 }
                             }
                             $result .= '</tbody>';
-                            $result = '<table class="table data">' . $result . '</table>';
+                            $result = '<table class="table data">'.$result.'</table>';
                         }
                     }
 
@@ -433,7 +433,7 @@ 
                                         while ($count < 11) {
                                             $line = fgets($file);
                                             foreach ($detailFields as $label) {
-                                                $fileLabel = '# ' . $label;
+                                                $fileLabel = '# '.$label;
                                                 if (strpos($line, $fileLabel) !== false) {
                                                     $details[$label] = htmlentities(trim(str_replace(array(
                                                         $fileLabel,
@@ -446,10 +446,10 @@ 
                                         };
                                         fclose($file);
 
-                                        $tooltip = "Generation Time: " . $details["Generation Time"] . "\n";
-                                        $tooltip .= "Server version: " . $details["Server version"] . "\n";
-                                        $tooltip .= "PHP Version: " . $details["PHP Version"] . "\n";
-                                        $tooltip .= "Host: " . $details["Host"] . "\n";
+                                        $tooltip = "Generation Time: ".$details["Generation Time"]."\n";
+                                        $tooltip .= "Server version: ".$details["Server version"]."\n";
+                                        $tooltip .= "PHP Version: ".$details["PHP Version"]."\n";
+                                        $tooltip .= "Host: ".$details["Host"]."\n";
                                         ?>
                                         <tr>
                                             <td><?= $filename ?></td>
@@ -481,7 +481,7 @@ 
 <?php
 
 if (is_numeric($_GET['tab'])) {
-    echo '<script type="text/javascript">tpDBM.setSelectedIndex( ' . $_GET['tab'] . ' );</script>';
+    echo '<script type="text/javascript">tpDBM.setSelectedIndex( '.$_GET['tab'].' );</script>';
 }
 
 include_once "footer.inc.php"; // send footer

manager/actions/resources/functions.inc.php

Spacing +49 added lines, -49 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+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.");
 }
 
@@ -9,11 +9,11 @@ 
  */
 
 $tpl = array(
-    'viewForm' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_viewForm.tpl'),
-    'panelGroup' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelGroup.tpl'),
-    'panelHeading' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelHeading.tpl'),
-    'panelCollapse' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelCollapse.tpl'),
-    'elementsRow' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_elementsRow.tpl')
+    'viewForm' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_viewForm.tpl'),
+    'panelGroup' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelGroup.tpl'),
+    'panelHeading' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelHeading.tpl'),
+    'panelCollapse' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelCollapse.tpl'),
+    'elementsRow' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_elementsRow.tpl')
 );
 
 /**
@@ -21,7 +21,7 @@ 
  * @param array $ph
  * @return string
  */
-function parsePh($tpl, $ph) {
+function parsePh($tpl, $ph){
     $modx = evolutionCMS(); global $_lang;
     $tpl = $modx->parseText($tpl, $_lang, '[%', '%]');
     return $modx->parseText($tpl, $ph);
@@ -31,7 +31,7 @@ 
  * @param string|int $cssId
  * @return string
  */
-function renderViewSwitchButtons($cssId) {
+function renderViewSwitchButtons($cssId){
     $modx = evolutionCMS(); global $_lang, $tpl;
 
     return parsePh($tpl['viewForm'], array(
@@ -44,19 +44,19 @@ 
  * @param mgrResources $resources
  * @return string
  */
-function createResourceList($resourceTable, $resources) {
+function createResourceList($resourceTable, $resources){
     $modx = evolutionCMS(); global $_lang, $_style, $modx_textdir, $tpl;
 
     $items = isset($resources->items[$resourceTable]) ? $resources->items[$resourceTable] : false;
 
-    if( ! is_array($items) || empty($items)) {
+    if (!is_array($items) || empty($items)) {
         return $_lang['no_results'];
     }
 
     // Prepare elements- and categories-list
     $elements = array();
     $categories = array();
-    foreach($items as $row) {
+    foreach ($items as $row) {
         $catid = $row['catid'] ? $row['catid'] : 0;
         $categories[$catid] = array('name' => stripslashes($row['category']));
         $elements[$catid][] = prepareElementRowPh($row, $resourceTable, $resources);
@@ -64,18 +64,18 @@ 
 
     // Now render categories / panel-collapse
     $panelGroup = '';
-    foreach($elements as $catid => $elList) {
+    foreach ($elements as $catid => $elList) {
         // Add panel-heading / category-collapse to output
         $panelGroup .= parsePh($tpl['panelHeading'], array(
             'tab' => $resourceTable,
             'category' => $categories[$catid]['name'],
-            'categoryid' => $catid != '' ? ' <small>(' . $catid . ')</small>' : '',
+            'categoryid' => $catid != '' ? ' <small>('.$catid.')</small>' : '',
             'catid' => $catid,
         ));
 
         // Prepare content for panel-collapse
         $panelCollapse = '';
-        foreach($elList as $el) {
+        foreach ($elList as $el) {
             $panelCollapse .= parsePh($tpl['elementsRow'], $el);
         }
 
@@ -97,30 +97,30 @@ 
  * @param mgrResources $resources
  * @return string
  */
-function createCombinedView($resources) {
+function createCombinedView($resources){
     $modx = evolutionCMS(); global $_lang, $_style, $modx_textdir;
 
     $itemsPerCategory = isset($resources->itemsPerCategory) ? $resources->itemsPerCategory : false;
     $types = isset($resources->types) ? $resources->types : false;
     $categories = isset($resources->categories) ? $resources->categories : false;
 
-    if(!$itemsPerCategory) {
+    if (!$itemsPerCategory) {
         return $_lang['no_results'];
     }
 
     $tpl = array(
-        'panelGroup' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelGroup.tpl'),
-        'panelHeading' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelHeading.tpl'),
-        'panelCollapse' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelCollapse.tpl'),
-        'elementsRow' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_elementsRow.tpl'),
+        'panelGroup' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelGroup.tpl'),
+        'panelHeading' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelHeading.tpl'),
+        'panelCollapse' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelCollapse.tpl'),
+        'elementsRow' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_elementsRow.tpl'),
     );
 
     // Easily loop through $itemsPerCategory-Array
     $panelGroup = '';
-    foreach($categories as $catid => $category) {
+    foreach ($categories as $catid => $category) {
         // Prepare collapse content / elements-list
         $panelCollapse = '';
-        foreach($itemsPerCategory[$catid] as $el) {
+        foreach ($itemsPerCategory[$catid] as $el) {
             $resourceTable = $el['type'];
             $ph = prepareElementRowPh($el, $resourceTable, $resources);
             $panelCollapse .= parsePh($tpl['elementsRow'], $ph);
@@ -130,7 +130,7 @@ 
         $panelGroup .= parsePh($tpl['panelHeading'], array(
             'tab' => 'categories_list',
             'category' => $categories[$catid],
-            'categoryid' => $catid != '' ? ' <small>(' . $catid . ')</small>' : '',
+            'categoryid' => $catid != '' ? ' <small>('.$catid.')</small>' : '',
             'catid' => $catid,
         ));
 
@@ -154,14 +154,14 @@ 
  * @param mgrResources $resources
  * @return array
  */
-function prepareElementRowPh($row, $resourceTable, $resources) {
+function prepareElementRowPh($row, $resourceTable, $resources){
     $modx = evolutionCMS(); global $modx_textdir, $_style, $_lang;
 
     $types = isset($resources->types[$resourceTable]) ? $resources->types[$resourceTable] : false;
 
     $_lang["confirm_delete"] = $_lang["delete"];
 
-    switch($resourceTable){
+    switch ($resourceTable) {
         case 'site_templates':
             $class = $row['selectable'] ? '' : 'disabledPlugin';
             $lockElementType = 1;
@@ -198,65 +198,65 @@ 
     // Prepare displaying user-locks
     $lockedByUser = '';
     $rowLock = $modx->elementIsLocked($lockElementType, $row['id'], true);
-    if($rowLock && $modx->hasPermission('display_locks')) {
-        if($rowLock['sid'] == $modx->sid) {
+    if ($rowLock && $modx->hasPermission('display_locks')) {
+        if ($rowLock['sid'] == $modx->sid) {
             $title = $modx->parseText($_lang["lock_element_editing"], array(
-                'element_type' => $_lang["lock_element_type_" . $lockElementType],
+                'element_type' => $_lang["lock_element_type_".$lockElementType],
                 'lasthit_df' => $rowLock['lasthit_df']
             ));
-            $lockedByUser = '<span title="' . $title . '" class="editResource" style="cursor:context-menu;">' . $_style['tree_preview_resource'] . '</span>&nbsp;';
+            $lockedByUser = '<span title="'.$title.'" class="editResource" style="cursor:context-menu;">'.$_style['tree_preview_resource'].'</span>&nbsp;';
         } else {
             $title = $modx->parseText($_lang["lock_element_locked_by"], array(
-                'element_type' => $_lang["lock_element_type_" . $lockElementType],
+                'element_type' => $_lang["lock_element_type_".$lockElementType],
                 'username' => $rowLock['username'],
                 'lasthit_df' => $rowLock['lasthit_df']
             ));
-            if($modx->hasPermission('remove_locks')) {
-                $lockedByUser = '<a href="javascript:;" onclick="unlockElement(' . $lockElementType . ', ' . $row['id'] . ', this);return false;" title="' . $title . '" class="lockedResource"><i class="' . $_style['icons_secured'] . '"></i></a>';
+            if ($modx->hasPermission('remove_locks')) {
+                $lockedByUser = '<a href="javascript:;" onclick="unlockElement('.$lockElementType.', '.$row['id'].', this);return false;" title="'.$title.'" class="lockedResource"><i class="'.$_style['icons_secured'].'"></i></a>';
             } else {
-                $lockedByUser = '<span title="' . $title . '" class="lockedResource" style="cursor:context-menu;"><i class="' . $_style['icons_secured'] . '"></i></span>';
+                $lockedByUser = '<span title="'.$title.'" class="lockedResource" style="cursor:context-menu;"><i class="'.$_style['icons_secured'].'"></i></span>';
             }
         }
     }
-    if($lockedByUser) {
-        $lockedByUser = '<div class="lockCell">' . $lockedByUser . '</div>';
+    if ($lockedByUser) {
+        $lockedByUser = '<div class="lockCell">'.$lockedByUser.'</div>';
     }
 
     // Caption
-    if($resourceTable == 'site_tmplvars') {
-        $caption = !empty($row['description']) ? ' ' . $row['caption'] . ' &nbsp; <small>(' . $row['description'] . ')</small>' : ' ' . $row['caption'];
+    if ($resourceTable == 'site_tmplvars') {
+        $caption = !empty($row['description']) ? ' '.$row['caption'].' &nbsp; <small>('.$row['description'].')</small>' : ' '.$row['caption'];
     } else {
-        $caption = !empty($row['description']) ? ' ' . $row['description'] : '';
+        $caption = !empty($row['description']) ? ' '.$row['description'] : '';
     }
 
     // Special marks
     $tplInfo = array();
-    if($row['locked']) {
+    if ($row['locked']) {
         $tplInfo[] = $_lang['locked'];
     }
-    if($row['id'] == $modx->config['default_template'] && $resourceTable == 'site_templates') {
+    if ($row['id'] == $modx->config['default_template'] && $resourceTable == 'site_templates') {
         $tplInfo[] = $_lang['defaulttemplate_title'];
     }
-    $marks = !empty($tplInfo) ? ' <em>(' . implode(', ', $tplInfo) . ')</em>' : '';
+    $marks = !empty($tplInfo) ? ' <em>('.implode(', ', $tplInfo).')</em>' : '';
 
     /* row buttons */
     $buttons = '';
-    if($modx->hasPermission($types['actions']['edit'][1])) {
-        $buttons .= '<li><a title="' . $_lang["edit_resource"] . '" href="index.php?a=' . $types['actions']['edit'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-edit fa-fw"></i></a></li>';
+    if ($modx->hasPermission($types['actions']['edit'][1])) {
+        $buttons .= '<li><a title="'.$_lang["edit_resource"].'" href="index.php?a='.$types['actions']['edit'][0].'&amp;id='.$row['id'].'"><i class="fa fa-edit fa-fw"></i></a></li>';
     }
-    if($modx->hasPermission($types['actions']['duplicate'][1])) {
-        $buttons .= '<li><a onclick="return confirm(\'' . $_lang["confirm_duplicate_record"] . '\')" title="' . $_lang["resource_duplicate"] . '" href="index.php?a=' . $types['actions']['duplicate'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-clone fa-fw"></i></a></li>';
+    if ($modx->hasPermission($types['actions']['duplicate'][1])) {
+        $buttons .= '<li><a onclick="return confirm(\''.$_lang["confirm_duplicate_record"].'\')" title="'.$_lang["resource_duplicate"].'" href="index.php?a='.$types['actions']['duplicate'][0].'&amp;id='.$row['id'].'"><i class="fa fa-clone fa-fw"></i></a></li>';
     }
-    if($modx->hasPermission($types['actions']['remove'][1])) {
-        $buttons .= '<li><a onclick="return confirm(\'' . $_lang["confirm_delete"] . '\')" title="' . $_lang["delete"] . '" href="index.php?a=' . $types['actions']['remove'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-trash fa-fw"></i></a></li>';
+    if ($modx->hasPermission($types['actions']['remove'][1])) {
+        $buttons .= '<li><a onclick="return confirm(\''.$_lang["confirm_delete"].'\')" title="'.$_lang["delete"].'" href="index.php?a='.$types['actions']['remove'][0].'&amp;id='.$row['id'].'"><i class="fa fa-trash fa-fw"></i></a></li>';
     }
-    $buttons = $buttons ? '<div class="btnCell"><ul class="elements_buttonbar">' . $buttons . '</ul></div>' : '';
+    $buttons = $buttons ? '<div class="btnCell"><ul class="elements_buttonbar">'.$buttons.'</ul></div>' : '';
 
     $catid = $row['catid'] ? $row['catid'] : 0;
 
     // Placeholders for elements-row
     return array(
-        'class' => $class ? ' class="' . $class . '"' : '',
+        'class' => $class ? ' class="'.$class.'"' : '',
         'lockedByUser' => $lockedByUser,
         'name' => $row['name'],
         'caption' => $caption,

Braces +11 added lines, -6 removed lines

@@ -21,7 +21,8 @@ 
  * @param array $ph
  * @return string
  */
-function parsePh($tpl, $ph) {
+function parsePh($tpl, $ph)
+{
     $modx = evolutionCMS(); global $_lang;
     $tpl = $modx->parseText($tpl, $_lang, '[%', '%]');
     return $modx->parseText($tpl, $ph);
@@ -31,7 +32,8 @@ 
  * @param string|int $cssId
  * @return string
  */
-function renderViewSwitchButtons($cssId) {
+function renderViewSwitchButtons($cssId)
+{
     $modx = evolutionCMS(); global $_lang, $tpl;
 
     return parsePh($tpl['viewForm'], array(
@@ -44,7 +46,8 @@ 
  * @param mgrResources $resources
  * @return string
  */
-function createResourceList($resourceTable, $resources) {
+function createResourceList($resourceTable, $resources)
+{
     $modx = evolutionCMS(); global $_lang, $_style, $modx_textdir, $tpl;
 
     $items = isset($resources->items[$resourceTable]) ? $resources->items[$resourceTable] : false;
@@ -97,7 +100,8 @@ 
  * @param mgrResources $resources
  * @return string
  */
-function createCombinedView($resources) {
+function createCombinedView($resources)
+{
     $modx = evolutionCMS(); global $_lang, $_style, $modx_textdir;
 
     $itemsPerCategory = isset($resources->itemsPerCategory) ? $resources->itemsPerCategory : false;
@@ -154,14 +158,15 @@ 
  * @param mgrResources $resources
  * @return array
  */
-function prepareElementRowPh($row, $resourceTable, $resources) {
+function prepareElementRowPh($row, $resourceTable, $resources)
+{
     $modx = evolutionCMS(); global $modx_textdir, $_style, $_lang;
 
     $types = isset($resources->types[$resourceTable]) ? $resources->types[$resourceTable] : false;
 
     $_lang["confirm_delete"] = $_lang["delete"];
 
-    switch($resourceTable){
+    switch($resourceTable) {
         case 'site_templates':
             $class = $row['selectable'] ? '' : 'disabledPlugin';
             $lockElementType = 1;

manager/includes/src/Interfaces/ManagerThemeInterface.php

Braces +3 added lines, -1 removed lines

@@ -1,3 +1,5 @@
 <?php namespace EvolutionCMS\Interfaces;
 
-interface ManagerThemeInterface{}
+interface ManagerThemeInterface
+{
+}

manager/includes/functions/actions/help.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!function_exists('createList')) {
+if (!function_exists('createList')) {
     /**
      * @param string $sectionHeader
      * @param array $linkArr
@@ -7,8 +7,8 @@ 
      */
     function createList($sectionHeader, $linkArr)
     {
-        $output = '<div class="sectionHeader">' . $sectionHeader . '</div><div class="sectionBody">' . "\n";
-        $output .= '<table width="500"  border="0" cellspacing="0" cellpadding="0">' . "\n";
+        $output = '<div class="sectionHeader">'.$sectionHeader.'</div><div class="sectionBody">'."\n";
+        $output .= '<table width="500"  border="0" cellspacing="0" cellpadding="0">'."\n";
         $links = '';
         foreach ($linkArr as $row) {
             if (!is_array($row['link'])) {
@@ -16,16 +16,16 @@ 
             }
             foreach ($row['link'] as $link) {
                 $links .= $links != '' ? '<br/>' : '';
-                $links .= '<a href="' . $link . '" target="_blank">' . $link . '</a>';
+                $links .= '<a href="'.$link.'" target="_blank">'.$link.'</a>';
             }
             $output .= '
 		<tr>
-			<td align="left"><strong>' . $row["title"] . '</strong></td>
-			<td align="left">' . $links . '</td>
+			<td align="left"><strong>' . $row["title"].'</strong></td>
+			<td align="left">' . $links.'</td>
 		</tr>';
             $links = '';
         }
-        $output .= '</table></div>' . "\n";
+        $output .= '</table></div>'."\n";
 
         return $output;
     }

manager/includes/functions/actions/mutate_plugin.php

Spacing +2 added lines, -2 removed lines

@@ -16,8 +16,8 @@
     {
         echo '<div class="row form-row">
                 <div class="col-sm-6 col-md-4 col-lg-3">' .
-                    implode('</div><div class="col-sm-6 col-md-4 col-lg-3">', $evtnames) .
-                '</div>' .
+                    implode('</div><div class="col-sm-6 col-md-4 col-lg-3">', $evtnames).
+                '</div>'.
         '</div>';
 
         $evtnames = array();