evolution-cms / evolution

manager/includes/functions/actions/import.php

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->db->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->db->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->db->getLastError();
+                            echo '<span class="fail">'.$_lang["import_site_failed"]."</span> ".$_lang["import_site_failed_db_error"].$modx->db->getLastError();
                             exit;
                         }
                     }
@@ -150,10 +150,10 @@ 
                     $newid = $modx->db->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->db->getLastError();
+                        echo '<span class="fail">'.$_lang["import_site_failed"]."</span> ".$_lang["import_site_failed_db_error"].$modx->db->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->db->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->db->getLastError();
+                        echo '<span class="fail">'.$_lang["import_site_failed"]."</span> ".$_lang["import_site_failed_db_error"].$modx->db->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/includes/functions/actions/bkmanager.php

Spacing +6 added lines, -6 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!function_exists('import_sql')) {
+if (!function_exists('import_sql')) {
     /**
      * @param string $source
      * @param string $result_code
@@ -40,7 +40,7 @@ 
     }
 }
 
-if(!function_exists('dumpSql')) {
+if (!function_exists('dumpSql')) {
     /**
      * @param string $dumpstring
      * @return bool
@@ -66,7 +66,7 @@ 
     }
 }
 
-if(!function_exists('snapshot')) {
+if (!function_exists('snapshot')) {
     /**
      * @param string $dumpstring
      * @return bool
@@ -80,7 +80,7 @@ 
     }
 }
 
-if(!function_exists('getSettings')) {
+if (!function_exists('getSettings')) {
     /**
      * @return array
      */
@@ -107,7 +107,7 @@ 
     }
 }
 
-if(!function_exists('restoreSettings')) {
+if (!function_exists('restoreSettings')) {
     /**
      * @param array $settings
      */
@@ -122,7 +122,7 @@ 
     }
 }
 
-if(!function_exists('parsePlaceholder')) {
+if (!function_exists('parsePlaceholder')) {
     /**
      * @param string $tpl
      * @param array $ph

manager/includes/functions/actions/mutate_role.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-if(!function_exists('render_form')) {
+if (!function_exists('render_form')) {
     /**
      * @param string $name
      * @param string $label

manager/includes/functions/helper.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!function_exists('createGUID')) {
+if (!function_exists('createGUID')) {
     /**
      * create globally unique identifiers (guid)
      *
@@ -8,22 +8,22 @@ 
      */
     function createGUID()
     {
-        srand((double)microtime() * 1000000);
+        srand((double) microtime() * 1000000);
         $r = rand();
-        $u = uniqid(getmypid() . $r . (double)microtime() * 1000000, 1);
+        $u = uniqid(getmypid().$r.(double) microtime() * 1000000, 1);
         $m = md5($u);
 
         return $m;
     }
 }
 
-if(!function_exists('generate_password')) {
+if (!function_exists('generate_password')) {
 // Generate password
     function generate_password($length = 10)
     {
         $allowable_characters = "abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789";
         $ps_len = strlen($allowable_characters);
-        mt_srand((double)microtime() * 1000000);
+        mt_srand((double) microtime() * 1000000);
         $pass = "";
         for ($i = 0; $i < $length; $i++) {
             $pass .= $allowable_characters[mt_rand(0, $ps_len - 1)];

manager/includes/tmplvars.inc.php

Spacing +1 added lines, -1 removed lines

@@ -1,3 +1,3 @@
 <?php
 
-include_once MODX_MANAGER_PATH . 'includes/functions/tv.php';
+include_once MODX_MANAGER_PATH.'includes/functions/tv.php';

manager/includes/tmplvars.commands.inc.php

Spacing +1 added lines, -1 removed lines

@@ -1,3 +1,3 @@
 <?php
 
-include_once MODX_MANAGER_PATH . 'includes/functions/tv.php';
+include_once MODX_MANAGER_PATH.'includes/functions/tv.php';

manager/includes/tmplvars.format.inc.php

Spacing +1 added lines, -1 removed lines

@@ -1,3 +1,3 @@
 <?php
 
-include_once MODX_MANAGER_PATH . 'includes/functions/tv.php';
+include_once MODX_MANAGER_PATH.'includes/functions/tv.php';

manager/includes/functions/processors.php

Spacing +32 added lines, -32 removed lines

@@ -36,7 +36,7 @@ 
     }
 }
 
-if(!function_exists('duplicateDocument')) {
+if (!function_exists('duplicateDocument')) {
     /**
      * @param int $docid
      * @param null|int $parent
@@ -90,12 +90,12 @@ 
             $count = $modx->db->getRecordCount($modx->db->select('pagetitle', $modx->getFullTableName('site_content'),
                 "pagetitle LIKE '{$pagetitle} Duplicate%'"));
             if ($count >= 1) {
-                $count = ' ' . ($count + 1);
+                $count = ' '.($count + 1);
             } else {
                 $count = '';
             }
 
-            $content['pagetitle'] = $_lang['duplicated_el_suffix'] . $count . ' ' . $content['pagetitle'];
+            $content['pagetitle'] = $_lang['duplicated_el_suffix'].$count.' '.$content['pagetitle'];
             $content['alias'] = null;
         } elseif ($modx->config['friendly_urls'] == 0 || $modx->config['allow_duplicate_alias'] == 0) {
             $content['alias'] = null;
@@ -153,7 +153,7 @@ 
     }
 }
 
-if(!function_exists('duplicateTVs')) {
+if (!function_exists('duplicateTVs')) {
     /**
      * Duplicate Document TVs
      *
@@ -166,8 +166,8 @@ 
 
         $tbltvc = $modx->getFullTableName('site_tmplvar_contentvalues');
 
-        $newid = (int)$newid;
-        $oldid = (int)$oldid;
+        $newid = (int) $newid;
+        $oldid = (int) $oldid;
 
         $modx->db->insert(
             array('contentid' => '', 'tmplvarid' => '', 'value' => ''), $tbltvc, // Insert into
@@ -176,7 +176,7 @@ 
     }
 }
 
-if(!function_exists('duplicateAccess')) {
+if (!function_exists('duplicateAccess')) {
     /**
      * Duplicate Document Access Permissions
      *
@@ -189,8 +189,8 @@ 
 
         $tbldg = $modx->getFullTableName('document_groups');
 
-        $newid = (int)$newid;
-        $oldid = (int)$oldid;
+        $newid = (int) $newid;
+        $oldid = (int) $oldid;
 
         $modx->db->insert(
             array('document' => '', 'document_group' => ''), $tbldg, // Insert into
@@ -199,7 +199,7 @@ 
     }
 }
 
-if(!function_exists('evalModule')) {
+if (!function_exists('evalModule')) {
     /**
      * evalModule
      *
@@ -235,17 +235,17 @@ 
             }
             if ($modx->config['error_reporting'] === '99' || 2 < $error_level) {
                 $modx->messageQuit('PHP Parse Error', '', true, $error_info['type'], $error_info['file'],
-                    $_SESSION['itemname'] . ' - Module', $error_info['message'], $error_info['line'], $msg);
+                    $_SESSION['itemname'].' - Module', $error_info['message'], $error_info['line'], $msg);
                 $modx->event->alert("An error occurred while loading. Please see the event log for more information<p>{$msg}</p>");
             }
         }
         unset($modx->event->params);
 
-        return $mod . $msg;
+        return $mod.$msg;
     }
 }
 
-if(!function_exists('allChildren')) {
+if (!function_exists('allChildren')) {
     /**
      * @param int $currDocID
      * @return array
@@ -265,7 +265,7 @@ 
     }
 }
 
-if(!function_exists('jsAlert')) {
+if (!function_exists('jsAlert')) {
     /**
      * show javascript alert
      *
@@ -275,14 +275,14 @@ 
     {
         $modx = evolutionCMS();
         if ($_POST['ajax'] != 1) {
-            echo "<script>window.setTimeout(\"alert('" . addslashes($modx->db->escape($msg)) . "')\",10);history.go(-1)</script>";
+            echo "<script>window.setTimeout(\"alert('".addslashes($modx->db->escape($msg))."')\",10);history.go(-1)</script>";
         } else {
-            echo $msg . "\n";
+            echo $msg."\n";
         }
     }
 }
 
-if(!function_exists('login')) {
+if (!function_exists('login')) {
     /**
      * @param string $username
      * @param string $givenPassword
@@ -297,7 +297,7 @@ 
     }
 }
 
-if(!function_exists('loginV1')) {
+if (!function_exists('loginV1')) {
     /**
      * @param int $internalKey
      * @param string $givenPassword
@@ -330,7 +330,7 @@ 
     }
 }
 
-if(!function_exists('loginMD5')) {
+if (!function_exists('loginMD5')) {
     /**
      * @param int $internalKey
      * @param string $givenPassword
@@ -351,7 +351,7 @@ 
     }
 }
 
-if(!function_exists('updateNewHash')) {
+if (!function_exists('updateNewHash')) {
     /**
      * @param string $username
      * @param string $password
@@ -366,7 +366,7 @@ 
     }
 }
 
-if(!function_exists('incrementFailedLoginCount')) {
+if (!function_exists('incrementFailedLoginCount')) {
     /**
      * @param int $internalKey
      * @param int $failedlogins
@@ -389,7 +389,7 @@ 
 
         if ($failedlogins < $failed_allowed) {
             //sleep to help prevent brute force attacks
-            $sleep = (int)$failedlogins / 2;
+            $sleep = (int) $failedlogins / 2;
             if ($sleep > 5) {
                 $sleep = 5;
             }
@@ -402,7 +402,7 @@ 
     }
 }
 
-if(!function_exists('saveUserGroupAccessPermissons')) {
+if (!function_exists('saveUserGroupAccessPermissons')) {
     /**
      * saves module user group access
      */
@@ -433,7 +433,7 @@ 
     }
 }
 
-if(!function_exists('saveEventListeners')) {
+if (!function_exists('saveEventListeners')) {
 # Save Plugin Event Listeners
     function saveEventListeners($id, $sysevents, $mode)
     {
@@ -486,7 +486,7 @@ 
     }
 }
 
-if(!function_exists('getEventIdByName')) {
+if (!function_exists('getEventIdByName')) {
     /**
      * @param string $name
      * @return string|int
@@ -509,7 +509,7 @@ 
     }
 }
 
-if(!function_exists('saveTemplateAccess')) {
+if (!function_exists('saveTemplateAccess')) {
     /**
      * @param int $id
      */
@@ -548,7 +548,7 @@ 
     }
 }
 
-if(!function_exists('saveTemplateVarAccess')) {
+if (!function_exists('saveTemplateVarAccess')) {
     /**
      * @return void
      */
@@ -587,7 +587,7 @@ 
     }
 }
 
-if(!function_exists('saveDocumentAccessPermissons')) {
+if (!function_exists('saveDocumentAccessPermissons')) {
     function saveDocumentAccessPermissons()
     {
         global $id, $newid;
@@ -756,10 +756,10 @@ 
         }
 
         foreach ($defaults as $k) {
-            if (isset($settings['default_' . $k]) && $settings['default_' . $k] == '1') {
+            if (isset($settings['default_'.$k]) && $settings['default_'.$k] == '1') {
                 unset($settings[$k]);
             }
-            unset($settings['default_' . $k]);
+            unset($settings['default_'.$k]);
         }
 
         $modx->db->delete($tbl_user_settings, "user='{$id}'");
@@ -791,7 +791,7 @@ 
         global $id, $modx;
         $mode = $_POST['mode'];
         $modx->manager->saveFormValues($mode);
-        $modx->webAlertAndQuit($msg, "index.php?a={$mode}" . ($mode === $action ? "&id={$id}" : ''));
+        $modx->webAlertAndQuit($msg, "index.php?a={$mode}".($mode === $action ? "&id={$id}" : ''));
     }
 }
 
@@ -807,7 +807,7 @@ 
         global $deltime;
 
         $rs = $modx->db->select('id', $modx->getFullTableName('site_content'),
-            "parent='" . (int)$parent . "' AND deleted=1 AND deletedon='" . (int)$deltime . "'");
+            "parent='".(int) $parent."' AND deleted=1 AND deletedon='".(int) $deltime."'");
         // the document has children documents, we'll need to delete those too
         while ($row = $modx->db->getRow($rs)) {
             $children[] = $row['id'];

manager/processors/remove_installer.processor.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
 }
 
 $msg = '';
-$pth = dirname(dirname(__DIR__)) . '/install/';
+$pth = dirname(dirname(__DIR__)).'/install/';
 $pth = str_replace('\\', '/', $pth);
 
 if (isset($_GET['rminstall'])) {
@@ -47,7 +47,7 @@ 
     }
 }
 if ($msg) {
-    echo "<script>alert('" . addslashes($msg) . "');</script>";
+    echo "<script>alert('".addslashes($msg)."');</script>";
 }
 
 echo "<script>window.location='../index.php?a=2';</script>";