evolution-cms / evolution

install/instprocessor.php

Doc Comments +1 added lines, -1 removed lines

@@ -130,7 +130,7 @@
      * duplicate of method in documentParser class
      *
      * @param string $propertyString
-     * @return array
+     * @return string
      */
     function parseProperties($propertyString) {
         $parameter= array ();

Spacing +183 added lines, -183 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 if (file_exists(dirname(__FILE__)."/../assets/cache/siteManager.php")) {
     include_once(dirname(__FILE__)."/../assets/cache/siteManager.php");
-}else{
+} else {
     define('MGR_DIR', 'manager');
 }
 
@@ -28,7 +28,7 @@ 
 
 echo "<p>{$_lang['setup_database']}</p>\n";
 
-$installMode= (int)$_POST['installmode'];
+$installMode = (int) $_POST['installmode'];
 $installData = $_POST['installdata'] == "1" ? 1 : 0;
 
 //if ($installMode == 1) {
@@ -42,7 +42,7 @@ 
 $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
 $database_connection_charset = $_POST['database_connection_charset'];
 $database_connection_method = $_POST['database_connection_method'];
-$dbase = "`" . $_POST['database_name'] . "`";
+$dbase = "`".$_POST['database_name']."`";
 $table_prefix = $_POST['tableprefix'];
 $adminname = $_POST['cmsadmin'];
 $adminemail = $_POST['cmsadminemail'];
@@ -53,7 +53,7 @@ 
 
 // set session name variable
 if (!isset ($site_sessionname)) {
-    $site_sessionname = 'SN' . uniqid('');
+    $site_sessionname = 'SN'.uniqid('');
 }
 
 // get base path and url
@@ -67,11 +67,11 @@ 
     array_pop($a);
 $pth = implode("install", $a);
 unset ($a);
-$base_url = $url . (substr($url, -1) != "/" ? "/" : "");
-$base_path = $pth . (substr($pth, -1) != "/" ? "/" : "");
+$base_url = $url.(substr($url, -1) != "/" ? "/" : "");
+$base_path = $pth.(substr($pth, -1) != "/" ? "/" : "");
 
 // connect to the database
-echo "<p>". $_lang['setup_database_create_connection'];
+echo "<p>".$_lang['setup_database_create_connection'];
 if (!$conn = mysqli_connect($database_server, $database_user, $database_password)) {
     echo '<span class="notok">'.$_lang["setup_database_create_connection_failed"]."</span></p><p>".$_lang['setup_database_create_connection_failed_note']."</p>";
     return;
@@ -80,7 +80,7 @@ 
 }
 
 // select database
-echo "<p>".$_lang['setup_database_selection']. str_replace("`", "", $dbase) . "`: ";
+echo "<p>".$_lang['setup_database_selection'].str_replace("`", "", $dbase)."`: ";
 if (!mysqli_select_db($conn, str_replace("`", "", $dbase))) {
     echo "<span class=\"notok\" style='color:#707070'>".$_lang['setup_database_selection_failed']."</span>".$_lang['setup_database_selection_failed_note']."</p>";
     $create = true;
@@ -92,9 +92,9 @@ 
 
 // try to create the database
 if ($create) {
-    echo "<p>".$_lang['setup_database_creation']. str_replace("`", "", $dbase) . "`: ";
+    echo "<p>".$_lang['setup_database_creation'].str_replace("`", "", $dbase)."`: ";
     //	if(!@mysqli_create_db(str_replace("`","",$dbase), $conn)) {
-    if (! mysqli_query($conn, "CREATE DATABASE $dbase DEFAULT CHARACTER SET $database_charset COLLATE $database_collation")) {
+    if (!mysqli_query($conn, "CREATE DATABASE $dbase DEFAULT CHARACTER SET $database_charset COLLATE $database_collation")) {
         echo '<span class="notok">'.$_lang['setup_database_creation_failed']."</span>".$_lang['setup_database_creation_failed_note']."</p>";
         $errors += 1;
 ?>
@@ -113,18 +113,18 @@ 
 
 // check table prefix
 if ($installMode == 0) {
-    echo "<p>" . $_lang['checking_table_prefix'] . $table_prefix . "`: ";
-    if (@ $rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`" . $table_prefix . "site_content`")) {
-        echo '<span class="notok">' . $_lang['failed'] . "</span>" . $_lang['table_prefix_already_inuse'] . "</p>";
+    echo "<p>".$_lang['checking_table_prefix'].$table_prefix."`: ";
+    if (@ $rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`".$table_prefix."site_content`")) {
+        echo '<span class="notok">'.$_lang['failed']."</span>".$_lang['table_prefix_already_inuse']."</p>";
         $errors += 1;
-        echo "<p>" . $_lang['table_prefix_already_inuse_note'] . "</p>";
+        echo "<p>".$_lang['table_prefix_already_inuse_note']."</p>";
         return;
     } else {
         echo '<span class="ok">'.$_lang['ok']."</span></p>";
     }
 }
 
-if(!function_exists('parseProperties')) {
+if (!function_exists('parseProperties')) {
     /**
      * parses a resource property string and returns the result as an array
      * duplicate of method in documentParser class
@@ -132,20 +132,20 @@ 
      * @param string $propertyString
      * @return array
      */
-    function parseProperties($propertyString) {
-        $parameter= array ();
+    function parseProperties($propertyString){
+        $parameter = array();
         if (!empty ($propertyString)) {
-            $tmpParams= explode("&", $propertyString);
+            $tmpParams = explode("&", $propertyString);
             $countParams = count($tmpParams);
-            for ($x= 0; $x < $countParams; $x++) {
+            for ($x = 0; $x < $countParams; $x++) {
                 if (strpos($tmpParams[$x], '=', 0)) {
-                    $pTmp= explode("=", $tmpParams[$x]);
-                    $pvTmp= explode(";", trim($pTmp[1]));
+                    $pTmp = explode("=", $tmpParams[$x]);
+                    $pvTmp = explode(";", trim($pTmp[1]));
                     if ($pvTmp[1] == 'list' && $pvTmp[3] != "")
-                        $parameter[trim($pTmp[0])]= $pvTmp[3]; //list default
+                        $parameter[trim($pTmp[0])] = $pvTmp[3]; //list default
                     else
                         if ($pvTmp[1] != 'list' && $pvTmp[2] != "")
-                            $parameter[trim($pTmp[0])]= $pvTmp[2];
+                            $parameter[trim($pTmp[0])] = $pvTmp[2];
                 }
             }
         }
@@ -156,20 +156,20 @@ 
 // check status of Inherit Parent Template plugin
 $auto_template_logic = 'parent';
 if ($installMode != 0) {
-    $rs = mysqli_query($conn, "SELECT properties, disabled FROM $dbase.`" . $table_prefix . "site_plugins` WHERE name='Inherit Parent Template'");
+    $rs = mysqli_query($conn, "SELECT properties, disabled FROM $dbase.`".$table_prefix."site_plugins` WHERE name='Inherit Parent Template'");
     $row = mysqli_fetch_row($rs);
-    if(!$row) {
+    if (!$row) {
         // not installed
         $auto_template_logic = 'system';
     } else {
-        if($row[1] == 1) {
+        if ($row[1] == 1) {
             // installed but disabled
             $auto_template_logic = 'system';
         } else {
             // installed, enabled .. see how it's configured
             $properties = parseProperties($row[0]);
-            if(isset($properties['inheritTemplate'])) {
-                if($properties['inheritTemplate'] == 'From First Sibling') {
+            if (isset($properties['inheritTemplate'])) {
+                if ($properties['inheritTemplate'] == 'From First Sibling') {
                     $auto_template_logic = 'sibling';
                 }
             }
@@ -193,20 +193,20 @@ 
 $sqlParser->connect();
 
 // install/update database
-echo "<p>" . $_lang['setup_database_creating_tables'];
+echo "<p>".$_lang['setup_database_creating_tables'];
 if ($moduleSQLBaseFile) {
     $sqlParser->process($moduleSQLBaseFile);
     // display database results
     if ($sqlParser->installFailed == true) {
         $errors += 1;
-        echo "<span class=\"notok\"><b>" . $_lang['database_alerts'] . "</span></p>";
-        echo "<p>" . $_lang['setup_couldnt_install'] . "</p>";
-        echo "<p>" . $_lang['installation_error_occured'] . "<br /><br />";
+        echo "<span class=\"notok\"><b>".$_lang['database_alerts']."</span></p>";
+        echo "<p>".$_lang['setup_couldnt_install']."</p>";
+        echo "<p>".$_lang['installation_error_occured']."<br /><br />";
         for ($i = 0; $i < count($sqlParser->mysqlErrors); $i++) {
-            echo "<em>" . $sqlParser->mysqlErrors[$i]["error"] . "</em>" . $_lang['during_execution_of_sql'] . "<span class='mono'>" . strip_tags($sqlParser->mysqlErrors[$i]["sql"]) . "</span>.<hr />";
+            echo "<em>".$sqlParser->mysqlErrors[$i]["error"]."</em>".$_lang['during_execution_of_sql']."<span class='mono'>".strip_tags($sqlParser->mysqlErrors[$i]["sql"])."</span>.<hr />";
         }
         echo "</p>";
-        echo "<p>" . $_lang['some_tables_not_updated'] . "</p>";
+        echo "<p>".$_lang['some_tables_not_updated']."</p>";
         return;
     } else {
         echo '<span class="ok">'.$_lang['ok']."</span></p>";
@@ -216,12 +216,12 @@ 
 // custom or not
 if (file_exists(dirname(__FILE__)."/../../assets/cache/siteManager.php")) {
     $mgrdir = 'include_once(dirname(__FILE__)."/../../assets/cache/siteManager.php");';
-}else{
+} else {
     $mgrdir = 'define(\'MGR_DIR\', \'manager\');';
 }
 
 // write the config.inc.php file if new installation
-echo "<p>" . $_lang['writing_config_file'];
+echo "<p>".$_lang['writing_config_file'];
 
 $confph = array();
 $confph['database_server']    = $database_server;
@@ -253,7 +253,7 @@ 
 $chmodSuccess = @chmod($filename, 0404);
 
 if ($configFileFailed == true) {
-    echo '<span class="notok">' . $_lang['failed'] . "</span></p>";
+    echo '<span class="notok">'.$_lang['failed']."</span></p>";
     $errors += 1;
 ?>
     <p><?php echo $_lang['cant_write_config_file']?><span class="mono"><?php echo MGR_DIR; ?>/includes/config.inc.php</span></p>
@@ -270,35 +270,35 @@ 
 // generate new site_id and set manager theme to default
 if ($installMode == 0) {
     $siteid = uniqid('');
-    mysqli_query($sqlParser->conn, "REPLACE INTO $dbase.`" . $table_prefix . "system_settings` (setting_name,setting_value) VALUES('site_id','$siteid'),('manager_theme','default')");
+    mysqli_query($sqlParser->conn, "REPLACE INTO $dbase.`".$table_prefix."system_settings` (setting_name,setting_value) VALUES('site_id','$siteid'),('manager_theme','default')");
 } else {
     // update site_id if missing
-    $ds = mysqli_query($sqlParser->conn, "SELECT setting_name,setting_value FROM $dbase.`" . $table_prefix . "system_settings` WHERE setting_name='site_id'");
+    $ds = mysqli_query($sqlParser->conn, "SELECT setting_name,setting_value FROM $dbase.`".$table_prefix."system_settings` WHERE setting_name='site_id'");
     if ($ds) {
         $r = mysqli_fetch_assoc($ds);
         $siteid = $r['setting_value'];
         if ($siteid == '' || $siteid = 'MzGeQ2faT4Dw06+U49x3') {
             $siteid = uniqid('');
-            mysqli_query($sqlParser->conn, "REPLACE INTO $dbase.`" . $table_prefix . "system_settings` (setting_name,setting_value) VALUES('site_id','$siteid')");
+            mysqli_query($sqlParser->conn, "REPLACE INTO $dbase.`".$table_prefix."system_settings` (setting_name,setting_value) VALUES('site_id','$siteid')");
         }
     }
 }
 
 // Reset database for installation of demo-site
 if ($installData && $moduleSQLDataFile && $moduleSQLResetFile) {
-	echo "<p>" . $_lang['resetting_database'];
+	echo "<p>".$_lang['resetting_database'];
 	$sqlParser->process($moduleSQLResetFile);
 	// display database results
 	if ($sqlParser->installFailed == true) {
 		$errors += 1;
-		echo "<span class=\"notok\"><b>" . $_lang['database_alerts'] . "</span></p>";
-		echo "<p>" . $_lang['setup_couldnt_install'] . "</p>";
-		echo "<p>" . $_lang['installation_error_occured'] . "<br /><br />";
+		echo "<span class=\"notok\"><b>".$_lang['database_alerts']."</span></p>";
+		echo "<p>".$_lang['setup_couldnt_install']."</p>";
+		echo "<p>".$_lang['installation_error_occured']."<br /><br />";
 		for ($i = 0; $i < count($sqlParser->mysqlErrors); $i++) {
-			echo "<em>" . $sqlParser->mysqlErrors[$i]["error"] . "</em>" . $_lang['during_execution_of_sql'] . "<span class='mono'>" . strip_tags($sqlParser->mysqlErrors[$i]["sql"]) . "</span>.<hr />";
+			echo "<em>".$sqlParser->mysqlErrors[$i]["error"]."</em>".$_lang['during_execution_of_sql']."<span class='mono'>".strip_tags($sqlParser->mysqlErrors[$i]["sql"])."</span>.<hr />";
 		}
 		echo "</p>";
-		echo "<p>" . $_lang['some_tables_not_updated'] . "</p>";
+		echo "<p>".$_lang['some_tables_not_updated']."</p>";
 		return;
 	} else {
 		echo '<span class="ok">'.$_lang['ok']."</span></p>";
@@ -307,11 +307,11 @@ 
 
 // Install Templates
 if (isset ($_POST['template']) || $installData) {
-    echo "<h3>" . $_lang['templates'] . ":</h3> ";
+    echo "<h3>".$_lang['templates'].":</h3> ";
     $selTemplates = $_POST['template'];
     foreach ($moduleTemplates as $k=>$moduleTemplate) {
         $installSample = in_array('sample', $moduleTemplate[6]) && $installData == 1;
-        if($installSample || in_array($k, $selTemplates)) {
+        if ($installSample || in_array($k, $selTemplates)) {
             $name = mysqli_real_escape_string($conn, $moduleTemplate[0]);
             $desc = mysqli_real_escape_string($conn, $moduleTemplate[1]);
             $category = mysqli_real_escape_string($conn, $moduleTemplate[4]);
@@ -319,7 +319,7 @@ 
             $filecontent = $moduleTemplate[3];
             $save_sql_id_as = $moduleTemplate[7]; // Nessecary for demo-site
             if (!file_exists($filecontent)) {
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_template'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
+                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">".$_lang['unable_install_template']." '$filecontent' ".$_lang['not_found'].".</span></p>";
             } else {
                 // Create the category if it does not already exist
                 $category_id = getCreateDbCategory($category, $sqlParser);
@@ -329,31 +329,31 @@ 
                 $template = mysqli_real_escape_string($conn, $template);
 
                 // See if the template already exists
-                $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_templates` WHERE templatename='$name'");
+                $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_templates` WHERE templatename='$name'");
 
                 if (mysqli_num_rows($rs)) {
-                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_templates` SET content='$template', description='$desc', category=$category_id, locked='$locked'  WHERE templatename='$name' LIMIT 1;")) {
+                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_templates` SET content='$template', description='$desc', category=$category_id, locked='$locked'  WHERE templatename='$name' LIMIT 1;")) {
                         $errors += 1;
-                        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                        echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                         return;
                     }
-                    if(!is_null($save_sql_id_as)) {
+                    if (!is_null($save_sql_id_as)) {
                         $sql_id = @mysqli_insert_id($sqlParser->conn);
-                        if(!$sql_id) {
-                            $idQuery = mysqli_fetch_assoc(mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`" . $table_prefix . "site_templates` WHERE templatename='$name' LIMIT 1;"));
+                        if (!$sql_id) {
+                            $idQuery = mysqli_fetch_assoc(mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."site_templates` WHERE templatename='$name' LIMIT 1;"));
                             $sql_id = $idQuery['id'];
                         }
                         $custom_placeholders[$save_sql_id_as] = $sql_id;
                     }
-                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['upgraded'] . "</span></p>";
+                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['upgraded']."</span></p>";
                 } else {
-                    if (!@ mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_templates` (templatename,description,content,category,locked) VALUES('$name','$desc','$template',$category_id,'$locked');")) {
+                    if (!@ mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_templates` (templatename,description,content,category,locked) VALUES('$name','$desc','$template',$category_id,'$locked');")) {
                         $errors += 1;
-                        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                        echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                         return;
                     }
-                    if(!is_null($save_sql_id_as)) $custom_placeholders[$save_sql_id_as] = @mysqli_insert_id($sqlParser->conn);
-                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['installed'] . "</span></p>";
+                    if (!is_null($save_sql_id_as)) $custom_placeholders[$save_sql_id_as] = @mysqli_insert_id($sqlParser->conn);
+                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['installed']."</span></p>";
                 }
             }
         }
@@ -362,11 +362,11 @@ 
 
 // Install Template Variables
 if (isset ($_POST['tv']) || $installData) {
-    echo "<h3>" . $_lang['tvs'] . ":</h3> ";
+    echo "<h3>".$_lang['tvs'].":</h3> ";
     $selTVs = $_POST['tv'];
     foreach ($moduleTVs as $k=>$moduleTV) {
         $installSample = in_array('sample', $moduleTV[12]) && $installData == 1;
-        if($installSample || in_array($k, $selTVs)) {
+        if ($installSample || in_array($k, $selTVs)) {
             $name = mysqli_real_escape_string($conn, $moduleTV[0]);
             $caption = mysqli_real_escape_string($conn, $moduleTV[1]);
             $desc = mysqli_real_escape_string($conn, $moduleTV[2]);
@@ -384,25 +384,25 @@ 
             // Create the category if it does not already exist
             $category = getCreateDbCategory($category, $sqlParser);
 
-            $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_tmplvars` WHERE name='$name'");
+            $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_tmplvars` WHERE name='$name'");
             if (mysqli_num_rows($rs)) {
                 $insert = true;
-                while($row = mysqli_fetch_assoc($rs)) {
-                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_tmplvars` SET type='$input_type', caption='$caption', description='$desc', category=$category, locked=$locked, elements='$input_options', display='$output_widget', display_params='$output_widget_params', default_text='$input_default' WHERE id={$row['id']};")) {
-                        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                while ($row = mysqli_fetch_assoc($rs)) {
+                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_tmplvars` SET type='$input_type', caption='$caption', description='$desc', category=$category, locked=$locked, elements='$input_options', display='$output_widget', display_params='$output_widget_params', default_text='$input_default' WHERE id={$row['id']};")) {
+                        echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                         return;
                     }
                     $insert = false;
                 }
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['upgraded'] . "</span></p>";
+                echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['upgraded']."</span></p>";
             } else {
                 //$q = "INSERT INTO $dbase.`" . $table_prefix . "site_tmplvars` (type,name,caption,description,category,locked,elements,display,display_params,default_text) VALUES('$input_type','$name','$caption','$desc',(SELECT (CASE COUNT(*) WHEN 0 THEN 0 ELSE `id` END) `id` FROM $dbase.`" . $table_prefix . "categories` WHERE `category` = '$category'),$locked,'$input_options','$output_widget','$output_widget_params','$input_default');";
-                $q = "INSERT INTO $dbase.`" . $table_prefix . "site_tmplvars` (type,name,caption,description,category,locked,elements,display,display_params,default_text) VALUES('$input_type','$name','$caption','$desc',$category,$locked,'$input_options','$output_widget','$output_widget_params','$input_default');";
+                $q = "INSERT INTO $dbase.`".$table_prefix."site_tmplvars` (type,name,caption,description,category,locked,elements,display,display_params,default_text) VALUES('$input_type','$name','$caption','$desc',$category,$locked,'$input_options','$output_widget','$output_widget_params','$input_default');";
                 if (!mysqli_query($sqlParser->conn, $q)) {
-                    echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                    echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                     return;
                 }
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['installed'] . "</span></p>";
+                echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['installed']."</span></p>";
             }
 
             // add template assignments
@@ -411,10 +411,10 @@ 
             if (count($assignments) > 0) {
 
                 // remove existing tv -> template assignments
-                $ds=mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."site_tmplvars` WHERE name='$name' AND description='$desc';");
+                $ds = mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."site_tmplvars` WHERE name='$name' AND description='$desc';");
                 $row = mysqli_fetch_assoc($ds);
                 $id = $row["id"];
-                mysqli_query($sqlParser->conn, 'DELETE FROM ' . $dbase . '.`' . $table_prefix . 'site_tmplvar_templates` WHERE tmplvarid = \'' . $id . '\'');
+                mysqli_query($sqlParser->conn, 'DELETE FROM '.$dbase.'.`'.$table_prefix.'site_tmplvar_templates` WHERE tmplvarid = \''.$id.'\'');
 
                 // add tv -> template assignments
                 foreach ($assignments as $assignment) {
@@ -423,7 +423,7 @@ 
                     if ($ds && $ts) {
                         $tRow = mysqli_fetch_assoc($ts);
                         $templateId = $tRow['id'];
-                        mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_tmplvar_templates` (tmplvarid, templateid) VALUES($id, $templateId)");
+                        mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_tmplvar_templates` (tmplvarid, templateid) VALUES($id, $templateId)");
                    }
                 }
             }
@@ -433,12 +433,12 @@ 
 
 // Install Chunks
 if (isset ($_POST['chunk']) || $installData) {
-    echo "<h3>" . $_lang['chunks'] . ":</h3> ";
+    echo "<h3>".$_lang['chunks'].":</h3> ";
     $selChunks = $_POST['chunk'];
     foreach ($moduleChunks as $k=>$moduleChunk) {
         $installSample = in_array('sample', $moduleChunk[5]) && $installData == 1;
         $count_new_name = 0;
-        if($installSample || in_array($k, $selChunks)) {
+        if ($installSample || in_array($k, $selChunks)) {
 
             $name = mysqli_real_escape_string($conn, $moduleChunk[0]);
             $desc = mysqli_real_escape_string($conn, $moduleChunk[1]);
@@ -447,7 +447,7 @@ 
             $filecontent = $moduleChunk[2];
 
             if (!file_exists($filecontent))
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_chunk'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
+                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">".$_lang['unable_install_chunk']." '$filecontent' ".$_lang['not_found'].".</span></p>";
             else {
 
                 // Create the category if it does not already exist
@@ -455,31 +455,31 @@ 
 
                 $chunk = preg_replace("/^.*?\/\*\*.*?\*\/\s+/s", '', file_get_contents($filecontent), 1);
                 $chunk = mysqli_real_escape_string($conn, $chunk);
-                $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_htmlsnippets` WHERE name='$name'");
+                $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_htmlsnippets` WHERE name='$name'");
                 $count_original_name = mysqli_num_rows($rs);
-                if($overwrite == 'false') {
-                    $newname = $name . '-' . str_replace('.', '_', $modx_version);
-                    $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_htmlsnippets` WHERE name='$newname'");
+                if ($overwrite == 'false') {
+                    $newname = $name.'-'.str_replace('.', '_', $modx_version);
+                    $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_htmlsnippets` WHERE name='$newname'");
                     $count_new_name = mysqli_num_rows($rs);
                 }
                 $update = $count_original_name > 0 && $overwrite == 'true';
                 if ($update) {
-                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_htmlsnippets` SET snippet='$chunk', description='$desc', category=$category_id WHERE name='$name';")) {
+                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_htmlsnippets` SET snippet='$chunk', description='$desc', category=$category_id WHERE name='$name';")) {
                         $errors += 1;
-                        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                        echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                         return;
                     }
-                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['upgraded'] . "</span></p>";
-                } elseif($count_new_name == 0) {
-                    if($count_original_name > 0 && $overwrite == 'false') {
+                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['upgraded']."</span></p>";
+                } elseif ($count_new_name == 0) {
+                    if ($count_original_name > 0 && $overwrite == 'false') {
                         $name = $newname;
                     }
-                    if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_htmlsnippets` (name,description,snippet,category) VALUES('$name','$desc','$chunk',$category_id);")) {
+                    if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_htmlsnippets` (name,description,snippet,category) VALUES('$name','$desc','$chunk',$category_id);")) {
                         $errors += 1;
-                        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                        echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                         return;
                     }
-                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['installed'] . "</span></p>";
+                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['installed']."</span></p>";
                 }
             }
         }
@@ -488,11 +488,11 @@ 
 
 // Install Modules
 if (isset ($_POST['module']) || $installData) {
-    echo "<h3>" . $_lang['modules'] . ":</h3> ";
+    echo "<h3>".$_lang['modules'].":</h3> ";
     $selModules = $_POST['module'];
     foreach ($moduleModules as $k=>$moduleModule) {
         $installSample = in_array('sample', $moduleModule[7]) && $installData == 1;
-        if($installSample || in_array($k, $selModules)) {
+        if ($installSample || in_array($k, $selModules)) {
             $name = mysqli_real_escape_string($conn, $moduleModule[0]);
             $desc = mysqli_real_escape_string($conn, $moduleModule[1]);
             $filecontent = $moduleModule[2];
@@ -501,7 +501,7 @@ 
             $shared = mysqli_real_escape_string($conn, $moduleModule[5]);
             $category = mysqli_real_escape_string($conn, $moduleModule[6]);
             if (!file_exists($filecontent))
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_module'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
+                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">".$_lang['unable_install_module']." '$filecontent' ".$_lang['not_found'].".</span></p>";
             else {
 
                 // Create the category if it does not already exist
@@ -510,22 +510,22 @@ 
                 $module = end(preg_split("/(\/\/)?\s*\<\?php/", file_get_contents($filecontent), 2));
                 // $module = removeDocblock($module, 'module'); // Modules have no fileBinding, keep docblock for info-tab
                 $module = mysqli_real_escape_string($conn, $module);
-                $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_modules` WHERE name='$name'");
+                $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_modules` WHERE name='$name'");
                 if (mysqli_num_rows($rs)) {
                     $row = mysqli_fetch_assoc($rs);
-                    $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties']));
-                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_modules` SET modulecode='$module', description='$desc', properties='$props', enable_sharedparams='$shared' WHERE name='$name';")) {
-                        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                    $props = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties']));
+                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_modules` SET modulecode='$module', description='$desc', properties='$props', enable_sharedparams='$shared' WHERE name='$name';")) {
+                        echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                         return;
                     }
-                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['upgraded'] . "</span></p>";
+                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['upgraded']."</span></p>";
                 } else {
                     $properties = mysqli_real_escape_string($conn, parseProperties($properties, true));
-                    if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_modules` (name,description,modulecode,properties,guid,enable_sharedparams,category) VALUES('$name','$desc','$module','$properties','$guid','$shared', $category);")) {
-                        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                    if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_modules` (name,description,modulecode,properties,guid,enable_sharedparams,category) VALUES('$name','$desc','$module','$properties','$guid','$shared', $category);")) {
+                        echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                         return;
                     }
-                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['installed'] . "</span></p>";
+                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['installed']."</span></p>";
                 }
             }
         }
@@ -534,11 +534,11 @@ 
 
 // Install Plugins
 if (isset ($_POST['plugin']) || $installData) {
-    echo "<h3>" . $_lang['plugins'] . ":</h3> ";
+    echo "<h3>".$_lang['plugins'].":</h3> ";
     $selPlugs = $_POST['plugin'];
     foreach ($modulePlugins as $k=>$modulePlugin) {
         $installSample = in_array('sample', $modulePlugin[8]) && $installData == 1;
-        if($installSample || in_array($k, $selPlugs)) {
+        if ($installSample || in_array($k, $selPlugs)) {
             $name = mysqli_real_escape_string($conn, $modulePlugin[0]);
             $desc = mysqli_real_escape_string($conn, $modulePlugin[1]);
             $filecontent = $modulePlugin[2];
@@ -548,17 +548,17 @@ 
             $category = mysqli_real_escape_string($conn, $modulePlugin[6]);
             $leg_names = '';
             $disabled = $modulePlugin[9];
-            if(array_key_exists(7, $modulePlugin)) {
+            if (array_key_exists(7, $modulePlugin)) {
                 // parse comma-separated legacy names and prepare them for sql IN clause
-                $leg_names = "'" . implode("','", preg_split('/\s*,\s*/', mysqli_real_escape_string($conn, $modulePlugin[7]))) . "'";
+                $leg_names = "'".implode("','", preg_split('/\s*,\s*/', mysqli_real_escape_string($conn, $modulePlugin[7])))."'";
             }
             if (!file_exists($filecontent))
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_plugin'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
+                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">".$_lang['unable_install_plugin']." '$filecontent' ".$_lang['not_found'].".</span></p>";
             else {
 
                 // disable legacy versions based on legacy_names provided
-                if(!empty($leg_names)) {
-                    $update_query = "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE name IN ($leg_names);";
+                if (!empty($leg_names)) {
+                    $update_query = "UPDATE $dbase.`".$table_prefix."site_plugins` SET disabled='1' WHERE name IN ($leg_names);";
                     $rs = mysqli_query($sqlParser->conn, $update_query);
                 }
 
@@ -568,50 +568,50 @@ 
                 $plugin = end(preg_split("/(\/\/)?\s*\<\?php/", file_get_contents($filecontent), 2));
                 $plugin = removeDocblock($plugin, 'plugin');
                 $plugin = mysqli_real_escape_string($conn, $plugin);
-                $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_plugins` WHERE name='$name'");
+                $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_plugins` WHERE name='$name'");
                 if (mysqli_num_rows($rs)) {
                     $insert = true;
-                    while($row = mysqli_fetch_assoc($rs)) {
-                        $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties']));
-                        if($row['description'] == $desc){
-                            if (! mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};")) {
-                                echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                    while ($row = mysqli_fetch_assoc($rs)) {
+                        $props = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties']));
+                        if ($row['description'] == $desc) {
+                            if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};")) {
+                                echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                                 return;
                             }
                             $insert = false;
                         } else {
-                            if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE id={$row['id']};")) {
+                            if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_plugins` SET disabled='1' WHERE id={$row['id']};")) {
                                 echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                                 return;
                             }
                         }
                     }
-                    if($insert === true) {
-                        $properties = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties']));
-                        if(!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_plugins` (name,description,plugincode,properties,moduleguid,disabled,category) VALUES('$name','$desc','$plugin','$properties','$guid','0',$category);")) {
+                    if ($insert === true) {
+                        $properties = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties']));
+                        if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_plugins` (name,description,plugincode,properties,moduleguid,disabled,category) VALUES('$name','$desc','$plugin','$properties','$guid','0',$category);")) {
                             echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                             return;
                         }
                     }
-                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['upgraded'] . "</span></p>";
+                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['upgraded']."</span></p>";
                 } else {
                     $properties = mysqli_real_escape_string($conn, parseProperties($properties, true));
-                    if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_plugins` (name,description,plugincode,properties,moduleguid,category,disabled) VALUES('$name','$desc','$plugin','$properties','$guid',$category,$disabled);")) {
-                        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                    if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_plugins` (name,description,plugincode,properties,moduleguid,category,disabled) VALUES('$name','$desc','$plugin','$properties','$guid',$category,$disabled);")) {
+                        echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                         return;
                     }
-                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['installed'] . "</span></p>";
+                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['installed']."</span></p>";
                 }
                 // add system events
                 if (count($events) > 0) {
-                    $ds=mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."site_plugins` WHERE name='$name' AND description='$desc';");
+                    $ds = mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."site_plugins` WHERE name='$name' AND description='$desc';");
                     if ($ds) {
                         $row = mysqli_fetch_assoc($ds);
                         $id = $row["id"];
                         // remove existing events
-                        mysqli_query($sqlParser->conn, 'DELETE FROM ' . $dbase . '.`' . $table_prefix . 'site_plugin_events` WHERE pluginid = \'' . $id . '\'');
+                        mysqli_query($sqlParser->conn, 'DELETE FROM '.$dbase.'.`'.$table_prefix.'site_plugin_events` WHERE pluginid = \''.$id.'\'');
                         // add new events
-                        mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_plugin_events` (pluginid, evtid) SELECT '$id' as 'pluginid',se.id as 'evtid' FROM $dbase.`" . $table_prefix . "system_eventnames` se WHERE name IN ('" . implode("','", $events) . "')");
+                        mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_plugin_events` (pluginid, evtid) SELECT '$id' as 'pluginid',se.id as 'evtid' FROM $dbase.`".$table_prefix."system_eventnames` se WHERE name IN ('".implode("','", $events)."')");
                     }
                 }
             }
@@ -621,18 +621,18 @@ 
 
 // Install Snippets
 if (isset ($_POST['snippet']) || $installData) {
-    echo "<h3>" . $_lang['snippets'] . ":</h3> ";
+    echo "<h3>".$_lang['snippets'].":</h3> ";
     $selSnips = $_POST['snippet'];
     foreach ($moduleSnippets as $k=>$moduleSnippet) {
         $installSample = in_array('sample', $moduleSnippet[5]) && $installData == 1;
-        if($installSample || in_array($k, $selSnips)) {
+        if ($installSample || in_array($k, $selSnips)) {
             $name = mysqli_real_escape_string($conn, $moduleSnippet[0]);
             $desc = mysqli_real_escape_string($conn, $moduleSnippet[1]);
             $filecontent = $moduleSnippet[2];
             $properties = $moduleSnippet[3];
             $category = mysqli_real_escape_string($conn, $moduleSnippet[4]);
             if (!file_exists($filecontent))
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_snippet'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
+                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">".$_lang['unable_install_snippet']." '$filecontent' ".$_lang['not_found'].".</span></p>";
             else {
 
                 // Create the category if it does not already exist
@@ -641,22 +641,22 @@ 
                 $snippet = end(preg_split("/(\/\/)?\s*\<\?php/", file_get_contents($filecontent)));
                 $snippet = removeDocblock($snippet, 'snippet');
                 $snippet = mysqli_real_escape_string($conn, $snippet);
-                $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_snippets` WHERE name='$name'");
+                $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_snippets` WHERE name='$name'");
                 if (mysqli_num_rows($rs)) {
                     $row = mysqli_fetch_assoc($rs);
-                    $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties']));
-                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_snippets` SET snippet='$snippet', description='$desc', properties='$props' WHERE name='$name';")) {
-                        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                    $props = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties']));
+                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_snippets` SET snippet='$snippet', description='$desc', properties='$props' WHERE name='$name';")) {
+                        echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                         return;
                     }
-                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['upgraded'] . "</span></p>";
+                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['upgraded']."</span></p>";
                 } else {
                     $properties = mysqli_real_escape_string($conn, parseProperties($properties, true));
-                    if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_snippets` (name,description,snippet,properties,category) VALUES('$name','$desc','$snippet','$properties',$category);")) {
-                        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                    if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_snippets` (name,description,snippet,properties,category) VALUES('$name','$desc','$snippet','$properties',$category);")) {
+                        echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                         return;
                     }
-                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['installed'] . "</span></p>";
+                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['installed']."</span></p>";
                 }
             }
         }
@@ -665,24 +665,24 @@ 
 
 // Install demo-site
 if ($installData && $moduleSQLDataFile) {
-    echo "<p>" . $_lang['installing_demo_site'];
+    echo "<p>".$_lang['installing_demo_site'];
     $sqlParser->process($moduleSQLDataFile);
     // display database results
     if ($sqlParser->installFailed == true) {
         $errors += 1;
-        echo "<span class=\"notok\"><b>" . $_lang['database_alerts'] . "</span></p>";
-        echo "<p>" . $_lang['setup_couldnt_install'] . "</p>";
-        echo "<p>" . $_lang['installation_error_occured'] . "<br /><br />";
+        echo "<span class=\"notok\"><b>".$_lang['database_alerts']."</span></p>";
+        echo "<p>".$_lang['setup_couldnt_install']."</p>";
+        echo "<p>".$_lang['installation_error_occured']."<br /><br />";
         for ($i = 0; $i < count($sqlParser->mysqlErrors); $i++) {
-            echo "<em>" . $sqlParser->mysqlErrors[$i]["error"] . "</em>" . $_lang['during_execution_of_sql'] . "<span class='mono'>" . strip_tags($sqlParser->mysqlErrors[$i]["sql"]) . "</span>.<hr />";
+            echo "<em>".$sqlParser->mysqlErrors[$i]["error"]."</em>".$_lang['during_execution_of_sql']."<span class='mono'>".strip_tags($sqlParser->mysqlErrors[$i]["sql"])."</span>.<hr />";
         }
         echo "</p>";
-        echo "<p>" . $_lang['some_tables_not_updated'] . "</p>";
+        echo "<p>".$_lang['some_tables_not_updated']."</p>";
         return;
     } else {
         $sql = sprintf("SELECT id FROM `%ssite_templates` WHERE templatename='EVO startup - Bootstrap'", $sqlParser->prefix);
         $rs = mysqli_query($sqlParser->conn, $sql);
-        if(mysqli_num_rows($rs)) {
+        if (mysqli_num_rows($rs)) {
             $row = mysqli_fetch_assoc($rs);
             $sql = sprintf('UPDATE `%ssite_content` SET template=%s WHERE template=4', $sqlParser->prefix, $row['id']);
             mysqli_query($sqlParser->conn, $sql);
@@ -693,9 +693,9 @@ 
 
 // Install Dependencies
 foreach ($moduleDependencies as $dependency) {
-	$ds = mysqli_query($sqlParser->conn, 'SELECT id, guid FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_modules` WHERE name="' . $dependency['module'] . '"');
+	$ds = mysqli_query($sqlParser->conn, 'SELECT id, guid FROM '.$dbase.'`'.$sqlParser->prefix.'site_modules` WHERE name="'.$dependency['module'].'"');
 	if (!$ds) {
-		echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+		echo "<p>".mysqli_error($sqlParser->conn)."</p>";
 		return;
 	} else {
 		$row = mysqli_fetch_assoc($ds);
@@ -703,37 +703,37 @@ 
 		$moduleGuid = $row["guid"];
 	}
 	// get extra id
-	$ds = mysqli_query($sqlParser->conn, 'SELECT id FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` WHERE ' . $dependency['column'] . '="' . $dependency['name'] . '"');
+	$ds = mysqli_query($sqlParser->conn, 'SELECT id FROM '.$dbase.'`'.$sqlParser->prefix.'site_'.$dependency['table'].'` WHERE '.$dependency['column'].'="'.$dependency['name'].'"');
 	if (!$ds) {
-		echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+		echo "<p>".mysqli_error($sqlParser->conn)."</p>";
 		return;
 	} else {
 		$row = mysqli_fetch_assoc($ds);
 		$extraId = $row["id"];
 	}
 	// setup extra as module dependency
-	$ds = mysqli_query($sqlParser->conn, 'SELECT module FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` WHERE module=' . $moduleId . ' AND resource=' . $extraId . ' AND type=' . $dependency['type'] . ' LIMIT 1');
+	$ds = mysqli_query($sqlParser->conn, 'SELECT module FROM '.$dbase.'`'.$sqlParser->prefix.'site_module_depobj` WHERE module='.$moduleId.' AND resource='.$extraId.' AND type='.$dependency['type'].' LIMIT 1');
 	if (!$ds) {
-		echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+		echo "<p>".mysqli_error($sqlParser->conn)."</p>";
 		return;
 	} else {
 		if (mysqli_num_rows($ds) === 0) {
-			mysqli_query($sqlParser->conn, 'INSERT INTO ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` (module, resource, type) VALUES(' . $moduleId . ',' . $extraId . ',' . $dependency['type'] . ')');
-			echo '<p>&nbsp;&nbsp;' . $dependency['module'] . ' Module: <span class="ok">' . $_lang['depedency_create'] . '</span></p>';
+			mysqli_query($sqlParser->conn, 'INSERT INTO '.$dbase.'`'.$sqlParser->prefix.'site_module_depobj` (module, resource, type) VALUES('.$moduleId.','.$extraId.','.$dependency['type'].')');
+			echo '<p>&nbsp;&nbsp;'.$dependency['module'].' Module: <span class="ok">'.$_lang['depedency_create'].'</span></p>';
 		} else {
-			mysqli_query($sqlParser->conn, 'UPDATE ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` SET module = ' . $moduleId . ', resource = ' . $extraId . ', type = ' . $dependency['type'] . ' WHERE module=' . $moduleId . ' AND resource=' . $extraId . ' AND type=' . $dependency['type']);
-			echo '<p>&nbsp;&nbsp;' . $dependency['module'] . ' Module: <span class="ok">' . $_lang['depedency_update'] . '</span></p>';
+			mysqli_query($sqlParser->conn, 'UPDATE '.$dbase.'`'.$sqlParser->prefix.'site_module_depobj` SET module = '.$moduleId.', resource = '.$extraId.', type = '.$dependency['type'].' WHERE module='.$moduleId.' AND resource='.$extraId.' AND type='.$dependency['type']);
+			echo '<p>&nbsp;&nbsp;'.$dependency['module'].' Module: <span class="ok">'.$_lang['depedency_update'].'</span></p>';
 		}
 		if ($dependency['type'] == 30 || $dependency['type'] == 40) {
 			// set extra guid for plugins and snippets
-			$ds = mysqli_query($sqlParser->conn, 'SELECT id FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` WHERE id=' . $extraId . ' LIMIT 1');
+			$ds = mysqli_query($sqlParser->conn, 'SELECT id FROM '.$dbase.'`'.$sqlParser->prefix.'site_'.$dependency['table'].'` WHERE id='.$extraId.' LIMIT 1');
 			if (!$ds) {
-				echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+				echo "<p>".mysqli_error($sqlParser->conn)."</p>";
 				return;
 			} else {
 				if (mysqli_num_rows($ds) != 0) {
-					mysqli_query($sqlParser->conn, 'UPDATE ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` SET moduleguid = ' . $moduleGuid . ' WHERE id=' . $extraId);
-					echo '<p>&nbsp;&nbsp;' . $dependency['name'] . ': <span class="ok">' . $_lang['guid_set'] . '</span></p>';
+					mysqli_query($sqlParser->conn, 'UPDATE '.$dbase.'`'.$sqlParser->prefix.'site_'.$dependency['table'].'` SET moduleguid = '.$moduleGuid.' WHERE id='.$extraId);
+					echo '<p>&nbsp;&nbsp;'.$dependency['name'].': <span class="ok">'.$_lang['guid_set'].'</span></p>';
 				}
 			}
 		}
@@ -742,7 +742,7 @@ 
 
 // call back function
 if ($callBackFnc != "")
-    $callBackFnc ($sqlParser);
+    $callBackFnc($sqlParser);
 
 // Setup the MODX API -- needed for the cache processor
 define('MODX_API_MODE', true);
@@ -777,12 +777,12 @@ 
 }
 
 // setup completed!
-echo "<p><b>" . $_lang['installation_successful'] . "</b></p>";
-echo "<p>" . $_lang['to_log_into_content_manager'] . "</p>";
+echo "<p><b>".$_lang['installation_successful']."</b></p>";
+echo "<p>".$_lang['to_log_into_content_manager']."</p>";
 if ($installMode == 0) {
-    echo "<p><img src=\"img/ico_info.png\" width=\"40\" height=\"42\" align=\"left\" style=\"margin-right:10px;\" />" . $_lang['installation_note'] . "</p>";
+    echo "<p><img src=\"img/ico_info.png\" width=\"40\" height=\"42\" align=\"left\" style=\"margin-right:10px;\" />".$_lang['installation_note']."</p>";
 } else {
-    echo "<p><img src=\"img/ico_info.png\" width=\"40\" height=\"42\" align=\"left\" style=\"margin-right:10px;\" />" . $_lang['upgrade_note'] . "</p>";
+    echo "<p><img src=\"img/ico_info.png\" width=\"40\" height=\"42\" align=\"left\" style=\"margin-right:10px;\" />".$_lang['upgrade_note']."</p>";
 }
 
 /**
@@ -792,11 +792,11 @@ 
  * @param string $old
  * @return string
  */
-function propUpdate($new,$old){
+function propUpdate($new, $old){
     $newArr = parseProperties($new);
     $oldArr = parseProperties($old);
-    foreach ($oldArr as $k => $v){
-        if (isset($v['0']['options'])){
+    foreach ($oldArr as $k => $v) {
+        if (isset($v['0']['options'])) {
             $oldArr[$k]['0']['options'] = $newArr[$k]['0']['options'];
         }
     }
@@ -811,30 +811,30 @@ 
  * @param bool|mixed $json
  * @return string
  */
-function parseProperties($propertyString, $json=false) {
-    $propertyString = str_replace('{}', '', $propertyString );
-    $propertyString = str_replace('} {', ',', $propertyString );
+function parseProperties($propertyString, $json = false){
+    $propertyString = str_replace('{}', '', $propertyString);
+    $propertyString = str_replace('} {', ',', $propertyString);
 
-    if(empty($propertyString)) return array();
-    if($propertyString=='{}' || $propertyString=='[]') return array();
+    if (empty($propertyString)) return array();
+    if ($propertyString == '{}' || $propertyString == '[]') return array();
 
     $jsonFormat = isJson($propertyString, true);
     $property = array();
     // old format
-    if ( $jsonFormat === false) {
-        $props= explode('&', $propertyString);
+    if ($jsonFormat === false) {
+        $props = explode('&', $propertyString);
         foreach ($props as $prop) {
             $prop = trim($prop);
-            if($prop === '') {
+            if ($prop === '') {
                 continue;
             }
 
             $arr = explode(';', $prop);
-            if( ! is_array($arr)) {
+            if (!is_array($arr)) {
                 $arr = array();
             }
             $key = explode('=', isset($arr[0]) ? $arr[0] : '');
-            if( ! is_array($key) || empty($key[0])) {
+            if (!is_array($key) || empty($key[0])) {
                 continue;
             }
 
@@ -858,7 +858,7 @@ 
 
         }
     // new json-format
-    } else if(!empty($jsonFormat)){
+    } else if (!empty($jsonFormat)) {
         $property = $jsonFormat;
     }
     if ($json) {
@@ -873,7 +873,7 @@ 
  * @param bool $returnData
  * @return bool|mixed
  */
-function isJson($string, $returnData=false) {
+function isJson($string, $returnData = false){
     $data = json_decode($string, true);
     return (json_last_error() == JSON_ERROR_NONE) ? ($returnData ? $data : true) : false;
 }
@@ -883,20 +883,20 @@ 
  * @param SqlParser $sqlParser
  * @return int
  */
-function getCreateDbCategory($category, $sqlParser) {
+function getCreateDbCategory($category, $sqlParser){
     $dbase = $sqlParser->dbname;
-    $dbase = '`' . trim($dbase,'`') . '`';
+    $dbase = '`'.trim($dbase, '`').'`';
     $table_prefix = $sqlParser->prefix;
     $category_id = 0;
-    if(!empty($category)) {
+    if (!empty($category)) {
         $category = mysqli_real_escape_string($sqlParser->conn, $category);
         $rs = mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."categories` WHERE category = '".$category."'");
-        if(mysqli_num_rows($rs) && ($row = mysqli_fetch_assoc($rs))) {
+        if (mysqli_num_rows($rs) && ($row = mysqli_fetch_assoc($rs))) {
             $category_id = $row['id'];
         } else {
             $q = "INSERT INTO $dbase.`".$table_prefix."categories` (`category`) VALUES ('{$category}');";
             $rs = mysqli_query($sqlParser->conn, $q);
-            if($rs) {
+            if ($rs) {
                 $category_id = mysqli_insert_id($sqlParser->conn);
             }
         }
@@ -911,12 +911,12 @@ 
  * @param string $type
  * @return string
  */
-function removeDocblock($code, $type) {
+function removeDocblock($code, $type){
 
     $cleaned = preg_replace("/^.*?\/\*\*.*?\*\/\s+/s", '', $code, 1);
 
     // Procedure taken from plugin.filesource.php
-    switch($type) {
+    switch ($type) {
         case 'snippet':
             $elm_name = 'snippets';
             $include = 'return require';
@@ -932,7 +932,7 @@ 
         default:
             return $cleaned;
     };
-    if(substr(trim($cleaned),0,$count) == $include.' MODX_BASE_PATH.\'assets/'.$elm_name.'/')
+    if (substr(trim($cleaned), 0, $count) == $include.' MODX_BASE_PATH.\'assets/'.$elm_name.'/')
         return $cleaned;
 
     // fileBinding not found - return code incl docblock

Braces +61 added lines, -38 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 if (file_exists(dirname(__FILE__)."/../assets/cache/siteManager.php")) {
     include_once(dirname(__FILE__)."/../assets/cache/siteManager.php");
-}else{
+} else {
     define('MGR_DIR', 'manager');
 }
 
@@ -58,13 +58,15 @@ 
 
 // get base path and url
 $a = explode("install", str_replace("\\", "/", dirname($_SERVER["PHP_SELF"])));
-if (count($a) > 1)
+if (count($a) > 1) {
     array_pop($a);
+}
 $url = implode("install", $a);
 reset($a);
 $a = explode("install", str_replace("\\", "/", realpath(dirname(__FILE__))));
-if (count($a) > 1)
+if (count($a) > 1) {
     array_pop($a);
+}
 $pth = implode("install", $a);
 unset ($a);
 $base_url = $url . (substr($url, -1) != "/" ? "/" : "");
@@ -85,7 +87,9 @@ 
     echo "<span class=\"notok\" style='color:#707070'>".$_lang['setup_database_selection_failed']."</span>".$_lang['setup_database_selection_failed_note']."</p>";
     $create = true;
 } else {
-	if (function_exists('mysqli_set_charset')) mysqli_set_charset($conn, $database_charset);
+	if (function_exists('mysqli_set_charset')) {
+	    mysqli_set_charset($conn, $database_charset);
+	}
     mysqli_query($conn, "{$database_connection_method} {$database_connection_charset}");
     echo '<span class="ok">'.$_lang['ok']."</span></p>";
 }
@@ -132,7 +136,8 @@ 
      * @param string $propertyString
      * @return array
      */
-    function parseProperties($propertyString) {
+    function parseProperties($propertyString)
+    {
         $parameter= array ();
         if (!empty ($propertyString)) {
             $tmpParams= explode("&", $propertyString);
@@ -141,11 +146,14 @@ 
                 if (strpos($tmpParams[$x], '=', 0)) {
                     $pTmp= explode("=", $tmpParams[$x]);
                     $pvTmp= explode(";", trim($pTmp[1]));
-                    if ($pvTmp[1] == 'list' && $pvTmp[3] != "")
-                        $parameter[trim($pTmp[0])]= $pvTmp[3]; //list default
+                    if ($pvTmp[1] == 'list' && $pvTmp[3] != "") {
+                                            $parameter[trim($pTmp[0])]= $pvTmp[3];
+                    }
+                    //list default
                     else
-                        if ($pvTmp[1] != 'list' && $pvTmp[2] != "")
-                            $parameter[trim($pTmp[0])]= $pvTmp[2];
+                        if ($pvTmp[1] != 'list' && $pvTmp[2] != "") {
+                                                    $parameter[trim($pTmp[0])]= $pvTmp[2];
+                        }
                 }
             }
         }
@@ -216,7 +224,7 @@ 
 // custom or not
 if (file_exists(dirname(__FILE__)."/../../assets/cache/siteManager.php")) {
     $mgrdir = 'include_once(dirname(__FILE__)."/../../assets/cache/siteManager.php");';
-}else{
+} else {
     $mgrdir = 'define(\'MGR_DIR\', \'manager\');';
 }
 
@@ -352,7 +360,9 @@ 
                         echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
                         return;
                     }
-                    if(!is_null($save_sql_id_as)) $custom_placeholders[$save_sql_id_as] = @mysqli_insert_id($sqlParser->conn);
+                    if(!is_null($save_sql_id_as)) {
+                        $custom_placeholders[$save_sql_id_as] = @mysqli_insert_id($sqlParser->conn);
+                    }
                     echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['installed'] . "</span></p>";
                 }
             }
@@ -446,9 +456,9 @@ 
             $overwrite = mysqli_real_escape_string($conn, $moduleChunk[4]);
             $filecontent = $moduleChunk[2];
 
-            if (!file_exists($filecontent))
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_chunk'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
-            else {
+            if (!file_exists($filecontent)) {
+                            echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_chunk'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
+            } else {
 
                 // Create the category if it does not already exist
                 $category_id = getCreateDbCategory($category, $sqlParser);
@@ -500,9 +510,9 @@ 
             $guid = mysqli_real_escape_string($conn, $moduleModule[4]);
             $shared = mysqli_real_escape_string($conn, $moduleModule[5]);
             $category = mysqli_real_escape_string($conn, $moduleModule[6]);
-            if (!file_exists($filecontent))
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_module'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
-            else {
+            if (!file_exists($filecontent)) {
+                            echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_module'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
+            } else {
 
                 // Create the category if it does not already exist
                 $category = getCreateDbCategory($category, $sqlParser);
@@ -552,9 +562,9 @@ 
                 // parse comma-separated legacy names and prepare them for sql IN clause
                 $leg_names = "'" . implode("','", preg_split('/\s*,\s*/', mysqli_real_escape_string($conn, $modulePlugin[7]))) . "'";
             }
-            if (!file_exists($filecontent))
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_plugin'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
-            else {
+            if (!file_exists($filecontent)) {
+                            echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_plugin'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
+            } else {
 
                 // disable legacy versions based on legacy_names provided
                 if(!empty($leg_names)) {
@@ -573,7 +583,7 @@ 
                     $insert = true;
                     while($row = mysqli_fetch_assoc($rs)) {
                         $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties']));
-                        if($row['description'] == $desc){
+                        if($row['description'] == $desc) {
                             if (! mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};")) {
                                 echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
                                 return;
@@ -631,9 +641,9 @@ 
             $filecontent = $moduleSnippet[2];
             $properties = $moduleSnippet[3];
             $category = mysqli_real_escape_string($conn, $moduleSnippet[4]);
-            if (!file_exists($filecontent))
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_snippet'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
-            else {
+            if (!file_exists($filecontent)) {
+                            echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_snippet'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
+            } else {
 
                 // Create the category if it does not already exist
                 $category = getCreateDbCategory($category, $sqlParser);
@@ -741,13 +751,16 @@ 
 }
 
 // call back function
-if ($callBackFnc != "")
+if ($callBackFnc != "") {
     $callBackFnc ($sqlParser);
+}
 
 // Setup the MODX API -- needed for the cache processor
 define('MODX_API_MODE', true);
 define('MODX_BASE_PATH', $base_path);
-if (!defined('MODX_MANAGER_PATH')) define('MODX_MANAGER_PATH', $base_path.MGR_DIR.'/');
+if (!defined('MODX_MANAGER_PATH')) {
+    define('MODX_MANAGER_PATH', $base_path.MGR_DIR.'/');
+}
 $database_type = 'mysqli';
 // initiate a new document parser
 include_once('../'.MGR_DIR.'/includes/document.parser.class.inc.php');
@@ -792,11 +805,12 @@ 
  * @param string $old
  * @return string
  */
-function propUpdate($new,$old){
+function propUpdate($new,$old)
+{
     $newArr = parseProperties($new);
     $oldArr = parseProperties($old);
-    foreach ($oldArr as $k => $v){
-        if (isset($v['0']['options'])){
+    foreach ($oldArr as $k => $v) {
+        if (isset($v['0']['options'])) {
             $oldArr[$k]['0']['options'] = $newArr[$k]['0']['options'];
         }
     }
@@ -811,12 +825,17 @@ 
  * @param bool|mixed $json
  * @return string
  */
-function parseProperties($propertyString, $json=false) {
+function parseProperties($propertyString, $json=false)
+{
     $propertyString = str_replace('{}', '', $propertyString );
     $propertyString = str_replace('} {', ',', $propertyString );
 
-    if(empty($propertyString)) return array();
-    if($propertyString=='{}' || $propertyString=='[]') return array();
+    if(empty($propertyString)) {
+        return array();
+    }
+    if($propertyString=='{}' || $propertyString=='[]') {
+        return array();
+    }
 
     $jsonFormat = isJson($propertyString, true);
     $property = array();
@@ -858,7 +877,7 @@ 
 
         }
     // new json-format
-    } else if(!empty($jsonFormat)){
+    } else if(!empty($jsonFormat)) {
         $property = $jsonFormat;
     }
     if ($json) {
@@ -873,7 +892,8 @@ 
  * @param bool $returnData
  * @return bool|mixed
  */
-function isJson($string, $returnData=false) {
+function isJson($string, $returnData=false)
+{
     $data = json_decode($string, true);
     return (json_last_error() == JSON_ERROR_NONE) ? ($returnData ? $data : true) : false;
 }
@@ -883,7 +903,8 @@ 
  * @param SqlParser $sqlParser
  * @return int
  */
-function getCreateDbCategory($category, $sqlParser) {
+function getCreateDbCategory($category, $sqlParser)
+{
     $dbase = $sqlParser->dbname;
     $dbase = '`' . trim($dbase,'`') . '`';
     $table_prefix = $sqlParser->prefix;
@@ -911,7 +932,8 @@ 
  * @param string $type
  * @return string
  */
-function removeDocblock($code, $type) {
+function removeDocblock($code, $type)
+{
 
     $cleaned = preg_replace("/^.*?\/\*\*.*?\*\/\s+/s", '', $code, 1);
 
@@ -932,8 +954,9 @@ 
         default:
             return $cleaned;
     };
-    if(substr(trim($cleaned),0,$count) == $include.' MODX_BASE_PATH.\'assets/'.$elm_name.'/')
-        return $cleaned;
+    if(substr(trim($cleaned),0,$count) == $include.' MODX_BASE_PATH.\'assets/'.$elm_name.'/') {
+            return $cleaned;
+    }
 
     // fileBinding not found - return code incl docblock
     return $code;

manager/actions/files.dynamic.php

Doc Comments +2 added lines, -2 removed lines

@@ -719,7 +719,7 @@ 
 
 /**
  * @param string $string
- * @return bool|string
+ * @return string|false
  */
 function removeLastPath($string)
 {
@@ -734,7 +734,7 @@ 
 
 /**
  * @param string $string
- * @return bool|string
+ * @return string|false
  */
 function getExtension($string)
 {

Spacing +106 added lines, -106 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('file_manager')) {
@@ -9,15 +9,15 @@ 
 $newToken = makeToken();
 
 // settings
-$theme_image_path = $modx->config['site_manager_url'] . 'media/style/' . $modx->config['manager_theme'] . '/images/';
+$theme_image_path = $modx->config['site_manager_url'].'media/style/'.$modx->config['manager_theme'].'/images/';
 $excludes = array(
     '.',
     '..',
     '.svn'
 );
-$alias_suffix = (!empty($friendly_url_suffix)) ? ',' . ltrim($friendly_url_suffix, '.') : '';
-$editablefiles = explode(',', 'txt,php,tpl,less,sass,shtml,html,htm,xml,js,css,pageCache,htaccess,json' . $alias_suffix);
-$inlineviewablefiles = explode(',', 'txt,php,tpl,less,sass,html,htm,xml,js,css,pageCache,htaccess,json' . $alias_suffix);
+$alias_suffix = (!empty($friendly_url_suffix)) ? ','.ltrim($friendly_url_suffix, '.') : '';
+$editablefiles = explode(',', 'txt,php,tpl,less,sass,shtml,html,htm,xml,js,css,pageCache,htaccess,json'.$alias_suffix);
+$inlineviewablefiles = explode(',', 'txt,php,tpl,less,sass,html,htm,xml,js,css,pageCache,htaccess,json'.$alias_suffix);
 $viewablefiles = explode(',', 'jpg,gif,png,ico');
 
 $editablefiles = add_dot($editablefiles);
@@ -30,31 +30,31 @@ 
 {
 */
 $protected_path[] = $modx->config['site_manager_path'];
-$protected_path[] = $modx->config['base_path'] . 'temp/backup';
-$protected_path[] = $modx->config['base_path'] . 'assets/backup';
+$protected_path[] = $modx->config['base_path'].'temp/backup';
+$protected_path[] = $modx->config['base_path'].'assets/backup';
 
 if (!$modx->hasPermission('save_plugin')) {
-    $protected_path[] = $modx->config['base_path'] . 'assets/plugins';
+    $protected_path[] = $modx->config['base_path'].'assets/plugins';
 }
 if (!$modx->hasPermission('save_snippet')) {
-    $protected_path[] = $modx->config['base_path'] . 'assets/snippets';
+    $protected_path[] = $modx->config['base_path'].'assets/snippets';
 }
 if (!$modx->hasPermission('save_template')) {
-    $protected_path[] = $modx->config['base_path'] . 'assets/templates';
+    $protected_path[] = $modx->config['base_path'].'assets/templates';
 }
 if (!$modx->hasPermission('save_module')) {
-    $protected_path[] = $modx->config['base_path'] . 'assets/modules';
+    $protected_path[] = $modx->config['base_path'].'assets/modules';
 }
 if (!$modx->hasPermission('empty_cache')) {
-    $protected_path[] = $modx->config['base_path'] . 'assets/cache';
+    $protected_path[] = $modx->config['base_path'].'assets/cache';
 }
 if (!$modx->hasPermission('import_static')) {
-    $protected_path[] = $modx->config['base_path'] . 'temp/import';
-    $protected_path[] = $modx->config['base_path'] . 'assets/import';
+    $protected_path[] = $modx->config['base_path'].'temp/import';
+    $protected_path[] = $modx->config['base_path'].'assets/import';
 }
 if (!$modx->hasPermission('export_static')) {
-    $protected_path[] = $modx->config['base_path'] . 'temp/export';
-    $protected_path[] = $modx->config['base_path'] . 'assets/export';
+    $protected_path[] = $modx->config['base_path'].'temp/export';
+    $protected_path[] = $modx->config['base_path'].'assets/export';
 }
 /*
 }
@@ -83,7 +83,7 @@ 
 {
     $count = count($array);
     for ($i = 0; $i < $count; $i++) {
-        $array[$i] = '.' . strtolower(trim($array[$i])); // add a dot :)
+        $array[$i] = '.'.strtolower(trim($array[$i])); // add a dot :)
     }
     return $array;
 }
@@ -108,15 +108,15 @@ 
 $rw = realpath('../');
 $webstart_path = str_replace('\\', '/', str_replace($rw, '', $rf));
 if (substr($webstart_path, 0, 1) == '/') {
-    $webstart_path = '..' . $webstart_path;
+    $webstart_path = '..'.$webstart_path;
 } else {
-    $webstart_path = '../' . $webstart_path;
+    $webstart_path = '../'.$webstart_path;
 }
 
 ?>
     <script type="text/javascript">
 
-        var current_path = '<?= $startpath;?>';
+        var current_path = '<?= $startpath; ?>';
 
         function viewfile (url)
         {
@@ -152,7 +152,7 @@ 
         function unzipFile (file)
         {
             if (confirmUnzip()) {
-                window.location.href = "index.php?a=31&mode=unzip&path=" + current_path + '/&file=' + file + "&token=<?= $newToken;?>";
+                window.location.href = "index.php?a=31&mode=unzip&path=" + current_path + '/&file=' + file + "&token=<?= $newToken; ?>";
                 return false;
             }
         }
@@ -174,7 +174,7 @@ 
         function deleteFolder (folder, status)
         {
             if (confirmDeleteFolder(status)) {
-                window.location.href = "index.php?a=31&mode=deletefolder&path=" + current_path + "&folderpath=" + current_path + '/' + folder + "&token=<?= $newToken;?>";
+                window.location.href = "index.php?a=31&mode=deletefolder&path=" + current_path + "&folderpath=" + current_path + '/' + folder + "&token=<?= $newToken; ?>";
                 return false;
             }
         }
@@ -182,7 +182,7 @@ 
         function deleteFile (file)
         {
             if (confirmDelete()) {
-                window.location.href = "index.php?a=31&mode=delete&path=" + current_path + '/' + file + "&token=<?= $newToken;?>";
+                window.location.href = "index.php?a=31&mode=delete&path=" + current_path + '/' + file + "&token=<?= $newToken; ?>";
                 return false;
             }
         }
@@ -191,7 +191,7 @@ 
         {
             var newFilename = prompt("<?= $_lang["files_dynamic_new_file_name"] ?>", file);
             if (newFilename !== null && newFilename !== file) {
-                window.location.href = "index.php?a=31&mode=duplicate&path=" + current_path + '/' + file + "&newFilename=" + newFilename + "&token=<?= $newToken;?>";
+                window.location.href = "index.php?a=31&mode=duplicate&path=" + current_path + '/' + file + "&newFilename=" + newFilename + "&token=<?= $newToken; ?>";
             }
         }
 
@@ -199,7 +199,7 @@ 
         {
             var newDirname = prompt("<?= $_lang["files_dynamic_new_folder_name"] ?>", dir);
             if (newDirname !== null && newDirname !== dir) {
-                window.location.href = "index.php?a=31&mode=renameFolder&path=" + current_path + '&dirname=' + dir + "&newDirname=" + newDirname + "&token=<?= $newToken;?>";
+                window.location.href = "index.php?a=31&mode=renameFolder&path=" + current_path + '&dirname=' + dir + "&newDirname=" + newDirname + "&token=<?= $newToken; ?>";
             }
         }
 
@@ -207,7 +207,7 @@ 
         {
             var newFilename = prompt("<?= $_lang["files_dynamic_new_file_name"] ?>", file);
             if (newFilename !== null && newFilename !== file) {
-                window.location.href = "index.php?a=31&mode=renameFile&path=" + current_path + '/' + file + "&newFilename=" + newFilename + "&token=<?= $newToken;?>";
+                window.location.href = "index.php?a=31&mode=renameFile&path=" + current_path + '/' + file + "&newFilename=" + newFilename + "&token=<?= $newToken; ?>";
             }
         }
 
@@ -226,7 +226,7 @@ 
             <?php endif ?>
             <?php
             if (isset($_GET['mode']) && $_GET['mode'] !== 'drill') {
-                $href = 'a=31&path=' . urlencode($_REQUEST['path']);
+                $href = 'a=31&path='.urlencode($_REQUEST['path']);
             } else {
                 $href = 'a=2';
             }
@@ -236,12 +236,12 @@ 
                 $tpl = '<a class="btn btn-secondary" href="[+href+]" onclick="return getFolderName(this);"><i class="[+image+]"></i><span>[+subject+]</span></a>';
                 $ph['image'] = $_style['files_folder-open'];
                 $ph['subject'] = $_lang['add_folder'];
-                $ph['href'] = 'index.php?a=31&mode=newfolder&path=' . urlencode($startpath) . '&name=';
+                $ph['href'] = 'index.php?a=31&mode=newfolder&path='.urlencode($startpath).'&name=';
                 $_ = parsePlaceholder($tpl, $ph);
 
-                $tpl = '<a class="btn btn-secondary" href="[+href+]" onclick="return getFileName(this);"><i class="[+image+]"></i><span>' . $_lang['files.dynamic.php1'] . '</span></a>';
+                $tpl = '<a class="btn btn-secondary" href="[+href+]" onclick="return getFileName(this);"><i class="[+image+]"></i><span>'.$_lang['files.dynamic.php1'].'</span></a>';
                 $ph['image'] = $_style['files_page_html'];
-                $ph['href'] = 'index.php?a=31&mode=newfile&path=' . urlencode($startpath) . '&name=';
+                $ph['href'] = 'index.php?a=31&mode=newfile&path='.urlencode($startpath).'&name=';
                 $_ .= parsePlaceholder($tpl, $ph);
                 echo $_;
             }
@@ -271,12 +271,12 @@ 
             $ph = array();
             $ph['style_path'] = $theme_image_path;
             // To Top Level with folder icon to the left
-            if ($startpath == $filemanager_path || $startpath . '/' == $filemanager_path) {
-                $ph['image'] = '' . $_style['files_top'] . '';
+            if ($startpath == $filemanager_path || $startpath.'/' == $filemanager_path) {
+                $ph['image'] = ''.$_style['files_top'].'';
                 $ph['subject'] = '<span>Top</span>';
             } else {
-                $ph['image'] = '' . $_style['files_top'] . '';
-                $ph['subject'] = '<a href="index.php?a=31&mode=drill&path=' . $filemanager_path . '">Top</a>/';
+                $ph['image'] = ''.$_style['files_top'].'';
+                $ph['subject'] = '<a href="index.php?a=31&mode=drill&path='.$filemanager_path.'">Top</a>/';
             }
 
             echo parsePlaceholder($tpl, $ph);
@@ -293,12 +293,12 @@ 
                     if (empty($v)) {
                         continue;
                     }
-                    $path .= rtrim($v, '/') . '/';
+                    $path .= rtrim($v, '/').'/';
                     if (1 < $count) {
-                        $href = 'index.php?a=31&mode=drill&path=' . urlencode($filemanager_path . $path);
-                        $pieces[$i] = '<a href="' . $href . '">' . trim($v, '/') . '</a>';
+                        $href = 'index.php?a=31&mode=drill&path='.urlencode($filemanager_path.$path);
+                        $pieces[$i] = '<a href="'.$href.'">'.trim($v, '/').'</a>';
                     } else {
-                        $pieces[$i] = '<span>' . trim($v, '/') . '</span>';
+                        $pieces[$i] = '<span>'.trim($v, '/').'</span>';
                     }
                     $count--;
                 }
@@ -311,16 +311,16 @@ 
         </div>
         <?php
         // check to see user isn't trying to move below the document_root
-        if (substr(strtolower(str_replace('//', '/', $startpath . "/")), 0, $len) != strtolower(str_replace('//', '/', $filemanager_path . '/'))) {
+        if (substr(strtolower(str_replace('//', '/', $startpath."/")), 0, $len) != strtolower(str_replace('//', '/', $filemanager_path.'/'))) {
             $modx->webAlertAndQuit($_lang["files_access_denied"]);
         }
 
         // Unzip .zip files - by Raymond
         if ($enablefileunzip && $_REQUEST['mode'] == 'unzip' && is_writable($startpath)) {
-            if (!$err = unzip(realpath("{$startpath}/" . $_REQUEST['file']), realpath($startpath))) {
-                echo '<span class="warning"><b>' . $_lang['file_unzip_fail'] . ($err === 0 ? 'Missing zip library (php_zip.dll / zip.so)' : '') . '</b></span><br /><br />';
+            if (!$err = unzip(realpath("{$startpath}/".$_REQUEST['file']), realpath($startpath))) {
+                echo '<span class="warning"><b>'.$_lang['file_unzip_fail'].($err === 0 ? 'Missing zip library (php_zip.dll / zip.so)' : '').'</b></span><br /><br />';
             } else {
-                echo '<span class="success"><b>' . $_lang['file_unzip'] . '</b></span><br /><br />';
+                echo '<span class="success"><b>'.$_lang['file_unzip'].'</b></span><br /><br />';
             }
         }
         // End Unzip - Raymond
@@ -332,9 +332,9 @@ 
             if ($_REQUEST['mode'] == 'deletefolder') {
                 $folder = $_REQUEST['folderpath'];
                 if (!$token_check || !@rrmdir($folder)) {
-                    echo '<span class="warning"><b>' . $_lang['file_folder_not_deleted'] . '</b></span><br /><br />';
+                    echo '<span class="warning"><b>'.$_lang['file_folder_not_deleted'].'</b></span><br /><br />';
                 } else {
-                    echo '<span class="success"><b>' . $_lang['file_folder_deleted'] . '</b></span><br /><br />';
+                    echo '<span class="success"><b>'.$_lang['file_folder_deleted'].'</b></span><br /><br />';
                 }
             }
 
@@ -345,10 +345,10 @@ 
                 if (!mkdirs("{$startpath}/{$foldername}", 0777)) {
                     echo '<span class="warning"><b>', $_lang['file_folder_not_created'], '</b></span><br /><br />';
                 } else {
-                    if (!@chmod($startpath . '/' . $foldername, $newfolderaccessmode)) {
-                        echo '<span class="warning"><b>' . $_lang['file_folder_chmod_error'] . '</b></span><br /><br />';
+                    if (!@chmod($startpath.'/'.$foldername, $newfolderaccessmode)) {
+                        echo '<span class="warning"><b>'.$_lang['file_folder_chmod_error'].'</b></span><br /><br />';
                     } else {
-                        echo '<span class="success"><b>' . $_lang['file_folder_created'] . '</b></span><br /><br />';
+                        echo '<span class="success"><b>'.$_lang['file_folder_created'].'</b></span><br /><br />';
                     }
                 }
                 umask($old_umask);
@@ -360,7 +360,7 @@ 
                 $filename = $modx->db->escape($filename);
 
                 if (!checkExtension($filename)) {
-                    echo '<span class="warning"><b>' . $_lang['files_filetype_notok'] . '</b></span><br /><br />';
+                    echo '<span class="warning"><b>'.$_lang['files_filetype_notok'].'</b></span><br /><br />';
                 } elseif (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $filename) !== 0) {
                     echo $_lang['files.dynamic.php3'];
                 } else {
@@ -382,11 +382,11 @@ 
                 $newFilename = $modx->db->escape($newFilename);
 
                 if (!checkExtension($newFilename)) {
-                    echo '<span class="warning"><b>' . $_lang['files_filetype_notok'] . '</b></span><br /><br />';
+                    echo '<span class="warning"><b>'.$_lang['files_filetype_notok'].'</b></span><br /><br />';
                 } elseif (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $newFilename) !== 0) {
                     echo $_lang['files.dynamic.php3'];
                 } else {
-                    if (!copy($filename, MODX_BASE_PATH . $newFilename)) {
+                    if (!copy($filename, MODX_BASE_PATH.$newFilename)) {
                         echo $_lang['files.dynamic.php5'];
                     }
                     umask($old_umask);
@@ -395,7 +395,7 @@ 
             // Rename folder here
             if ($_REQUEST['mode'] == 'renameFolder') {
                 $old_umask = umask(0);
-                $dirname = $_REQUEST['path'] . '/' . $_REQUEST['dirname'];
+                $dirname = $_REQUEST['path'].'/'.$_REQUEST['dirname'];
                 $dirname = $modx->db->escape($dirname);
                 $newDirname = str_replace(array(
                     '..\\',
@@ -407,7 +407,7 @@ 
 
                 if (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $newDirname) !== 0) {
                     echo $_lang['files.dynamic.php3'];
-                } else if (!rename($dirname, $_REQUEST['path'] . '/' . $newDirname)) {
+                } else if (!rename($dirname, $_REQUEST['path'].'/'.$newDirname)) {
                     echo '<span class="warning"><b>', $_lang['file_folder_not_created'], '</b></span><br /><br />';
                 }
                 umask($old_umask);
@@ -427,11 +427,11 @@ 
                 $newFilename = $modx->db->escape($newFilename);
 
                 if (!checkExtension($newFilename)) {
-                    echo '<span class="warning"><b>' . $_lang['files_filetype_notok'] . '</b></span><br /><br />';
+                    echo '<span class="warning"><b>'.$_lang['files_filetype_notok'].'</b></span><br /><br />';
                 } elseif (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $newFilename) !== 0) {
                     echo $_lang['files.dynamic.php3'];
                 } else {
-                    if (!rename($filename, $path . '/' . $newFilename)) {
+                    if (!rename($filename, $path.'/'.$newFilename)) {
                         echo $_lang['files.dynamic.php5'];
                     }
                     umask($old_umask);
@@ -464,7 +464,7 @@ 
                 ls($startpath);
                 echo "\n\n\n";
                 if ($folders == 0 && $files == 0) {
-                    echo '<tr><td colspan="4"><i class="' . $_style['files_deleted_folder'] . ' FilesDeletedFolder"></i> <span style="color:#888;cursor:default;"> ' . $_lang['files_directory_is_empty'] . ' </span></td></tr>';
+                    echo '<tr><td colspan="4"><i class="'.$_style['files_deleted_folder'].' FilesDeletedFolder"></i> <span style="color:#888;cursor:default;"> '.$_lang['files_directory_is_empty'].' </span></td></tr>';
                 }
                 ?>
             </table>
@@ -473,10 +473,10 @@ 
         <div class="container">
             <p>
                 <?php
-                echo $_lang['files_directories'] . ': <b>' . $folders . '</b> ';
-                echo $_lang['files_files'] . ': <b>' . $files . '</b> ';
-                echo $_lang['files_data'] . ': <b><span dir="ltr">' . $modx->nicesize($filesizes) . '</span></b> ';
-                echo $_lang['files_dirwritable'] . ' <b>' . (is_writable($startpath) == 1 ? $_lang['yes'] . '.' : $_lang['no']) . '.</b>'
+                echo $_lang['files_directories'].': <b>'.$folders.'</b> ';
+                echo $_lang['files_files'].': <b>'.$files.'</b> ';
+                echo $_lang['files_data'].': <b><span dir="ltr">'.$modx->nicesize($filesizes).'</span></b> ';
+                echo $_lang['files_dirwritable'].' <b>'.(is_writable($startpath) == 1 ? $_lang['yes'].'.' : $_lang['no']).'.</b>'
                 ?>
             </p>
 
@@ -501,7 +501,7 @@ 
                 </form>
                 <?php
             } else {
-                echo "<p>" . $_lang['files_upload_inhibited_msg'] . "</p>";
+                echo "<p>".$_lang['files_upload_inhibited_msg']."</p>";
             }
             ?>
             <div id="imageviewer"></div>
@@ -586,7 +586,7 @@ 
     if ($file == $selFile) {
         $icon = isset($icons[$mode]) ? $icons[$mode] : $icons['default'];
     }
-    return '<i class="' . $icon . ' FilesPage"></i>';
+    return '<i class="'.$icon.' FilesPage"></i>';
 }
 
 /**
@@ -604,7 +604,7 @@ 
     );
     if ($file == $selFile) {
         $class = isset($classNames[$mode]) ? $classNames[$mode] : $classNames['default'];
-        return ' class="' . $class . '"';
+        return ' class="'.$class.'"';
     }
     return '';
 }
@@ -618,7 +618,7 @@ 
     global $excludes, $protected_path, $editablefiles, $inlineviewablefiles, $viewablefiles, $enablefileunzip, $enablefiledownload, $uploadablefiles, $folders, $files, $filesizes, $len, $dirs_array, $files_array, $webstart_path, $modx;
     $dircounter = 0;
     $filecounter = 0;
-    $curpath = str_replace('//', '/', $curpath . '/');
+    $curpath = str_replace('//', '/', $curpath.'/');
 
     if (!is_dir($curpath)) {
         echo 'Invalid path "', $curpath, '"<br />';
@@ -628,7 +628,7 @@ 
 
     // first, get info
     foreach ($dir as $file) {
-        $newpath = $curpath . $file;
+        $newpath = $curpath.$file;
         if ($file === '..' || $file === '.') {
             continue;
         }
@@ -638,7 +638,7 @@ 
             if ($file === '..' || $file === '.') {
                 continue;
             } elseif (!in_array($file, $excludes) && !in_array($newpath, $protected_path)) {
-                $dirs_array[$dircounter]['text'] = '<i class="' . $_style['files_folder'] . ' FilesFolder"></i> <a href="index.php?a=31&mode=drill&path=' . urlencode($newpath) . '"><b>' . $file . '</b></a>';
+                $dirs_array[$dircounter]['text'] = '<i class="'.$_style['files_folder'].' FilesFolder"></i> <a href="index.php?a=31&mode=drill&path='.urlencode($newpath).'"><b>'.$file.'</b></a>';
 
                 $dfiles = scandir($newpath);
                 foreach ($dfiles as $i => $infile) {
@@ -651,13 +651,13 @@ 
                 }
                 $file_exists = (0 < count($dfiles)) ? 'file_exists' : '';
 
-                $dirs_array[$dircounter]['delete'] = is_writable($curpath) ? '<a href="javascript: deleteFolder(\'' . urlencode($file) . '\',\'' . $file_exists . '\');"><i class="' . $_style['files_delete'] . '" title="' . $_lang['file_delete_folder'] . '"></i></a>' : '';
+                $dirs_array[$dircounter]['delete'] = is_writable($curpath) ? '<a href="javascript: deleteFolder(\''.urlencode($file).'\',\''.$file_exists.'\');"><i class="'.$_style['files_delete'].'" title="'.$_lang['file_delete_folder'].'"></i></a>' : '';
             } else {
-                $dirs_array[$dircounter]['text'] = '<span><i class="' . $_style['files_deleted_folder'] . ' FilesDeletedFolder"></i> ' . $file . '</span>';
-                $dirs_array[$dircounter]['delete'] = is_writable($curpath) ? '<span class="disabled"><i class="' . $_style['files_delete'] . '" title="' . $_lang['file_delete_folder'] . '"></i></span>' : '';
+                $dirs_array[$dircounter]['text'] = '<span><i class="'.$_style['files_deleted_folder'].' FilesDeletedFolder"></i> '.$file.'</span>';
+                $dirs_array[$dircounter]['delete'] = is_writable($curpath) ? '<span class="disabled"><i class="'.$_style['files_delete'].'" title="'.$_lang['file_delete_folder'].'"></i></span>' : '';
             }
 
-            $dirs_array[$dircounter]['rename'] = is_writable($curpath) ? '<a href="javascript:renameFolder(\'' . urlencode($file) . '\');"><i class="' . $_style['files_rename'] . '" title="' . $_lang['rename'] . '"></i></a> ' : '';
+            $dirs_array[$dircounter]['rename'] = is_writable($curpath) ? '<a href="javascript:renameFolder(\''.urlencode($file).'\');"><i class="'.$_style['files_rename'].'" title="'.$_lang['rename'].'"></i></a> ' : '';
 
             // increment the counter
             $dircounter++;
@@ -665,14 +665,14 @@ 
             $type = getExtension($newpath);
             $files_array[$filecounter]['file'] = $newpath;
             $files_array[$filecounter]['stats'] = lstat($newpath);
-            $files_array[$filecounter]['text'] = determineIcon($newpath, $_REQUEST['path'], $_REQUEST['mode']) . ' ' . $file;
-            $files_array[$filecounter]['view'] = (in_array($type, $viewablefiles)) ? '<a href="javascript:;" onclick="viewfile(\'' . $webstart_path . substr($newpath, $len, strlen($newpath)) . '\');"><i class="' . $_style['files_view'] . '" title="' . $_lang['files_viewfile'] . '"></i></a>' : (($enablefiledownload && in_array($type, $uploadablefiles)) ? '<a href="' . $webstart_path . implode('/', array_map('rawurlencode', explode('/', substr($newpath, $len, strlen($newpath))))) . '" style="cursor:pointer;"><i class="' . $_style['files_download'] . '" title="' . $_lang['file_download_file'] . '"></i></a>' : '<span class="disabled"><i class="' . $_style['files_view'] . '" title="' . $_lang['files_viewfile'] . '"></i></span>');
-            $files_array[$filecounter]['view'] = (in_array($type, $inlineviewablefiles)) ? '<a href="index.php?a=31&mode=view&path=' . urlencode($newpath) . '"><i class="' . $_style['files_view'] . '" title="' . $_lang['files_viewfile'] . '"></i></a>' : $files_array[$filecounter]['view'];
-            $files_array[$filecounter]['unzip'] = ($enablefileunzip && $type == '.zip') ? '<a href="javascript:unzipFile(\'' . urlencode($file) . '\');"><i class="' . $_style['files_unzip'] . '" title="' . $_lang['file_download_unzip'] . '"></i></a>' : '';
-            $files_array[$filecounter]['edit'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="index.php?a=31&mode=edit&path=' . urlencode($newpath) . '#file_editfile"><i class="' . $_style['files_edit'] . '" title="' . $_lang['files_editfile'] . '"></i></a>' : '<span class="disabled"><i class="' . $_style['files_edit'] . '" title="' . $_lang['files_editfile'] . '"></i></span>';
-            $files_array[$filecounter]['duplicate'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="javascript:duplicateFile(\'' . urlencode($file) . '\');"><i class="' . $_style['files_duplicate'] . '" title="' . $_lang['duplicate'] . '"></i></a>' : '<span class="disabled"><i class="' . $_style['files_duplicate'] . '" align="absmiddle" title="' . $_lang['duplicate'] . '"></i></span>';
-            $files_array[$filecounter]['rename'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="javascript:renameFile(\'' . urlencode($file) . '\');"><i class="' . $_style['files_rename'] . '" align="absmiddle" title="' . $_lang['rename'] . '"></i></a>' : '<span class="disabled"><i class="' . $_style['files_rename'] . '" align="absmiddle" title="' . $_lang['rename'] . '"></i></span>';
-            $files_array[$filecounter]['delete'] = is_writable($curpath) && is_writable($newpath) ? '<a href="javascript:deleteFile(\'' . urlencode($file) . '\');"><i class="' . $_style['files_delete'] . '" title="' . $_lang['file_delete_file'] . '"></i></a>' : '<span class="disabled"><i class="' . $_style['files_delete'] . '" title="' . $_lang['file_delete_file'] . '"></i></span>';
+            $files_array[$filecounter]['text'] = determineIcon($newpath, $_REQUEST['path'], $_REQUEST['mode']).' '.$file;
+            $files_array[$filecounter]['view'] = (in_array($type, $viewablefiles)) ? '<a href="javascript:;" onclick="viewfile(\''.$webstart_path.substr($newpath, $len, strlen($newpath)).'\');"><i class="'.$_style['files_view'].'" title="'.$_lang['files_viewfile'].'"></i></a>' : (($enablefiledownload && in_array($type, $uploadablefiles)) ? '<a href="'.$webstart_path.implode('/', array_map('rawurlencode', explode('/', substr($newpath, $len, strlen($newpath))))).'" style="cursor:pointer;"><i class="'.$_style['files_download'].'" title="'.$_lang['file_download_file'].'"></i></a>' : '<span class="disabled"><i class="'.$_style['files_view'].'" title="'.$_lang['files_viewfile'].'"></i></span>');
+            $files_array[$filecounter]['view'] = (in_array($type, $inlineviewablefiles)) ? '<a href="index.php?a=31&mode=view&path='.urlencode($newpath).'"><i class="'.$_style['files_view'].'" title="'.$_lang['files_viewfile'].'"></i></a>' : $files_array[$filecounter]['view'];
+            $files_array[$filecounter]['unzip'] = ($enablefileunzip && $type == '.zip') ? '<a href="javascript:unzipFile(\''.urlencode($file).'\');"><i class="'.$_style['files_unzip'].'" title="'.$_lang['file_download_unzip'].'"></i></a>' : '';
+            $files_array[$filecounter]['edit'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="index.php?a=31&mode=edit&path='.urlencode($newpath).'#file_editfile"><i class="'.$_style['files_edit'].'" title="'.$_lang['files_editfile'].'"></i></a>' : '<span class="disabled"><i class="'.$_style['files_edit'].'" title="'.$_lang['files_editfile'].'"></i></span>';
+            $files_array[$filecounter]['duplicate'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="javascript:duplicateFile(\''.urlencode($file).'\');"><i class="'.$_style['files_duplicate'].'" title="'.$_lang['duplicate'].'"></i></a>' : '<span class="disabled"><i class="'.$_style['files_duplicate'].'" align="absmiddle" title="'.$_lang['duplicate'].'"></i></span>';
+            $files_array[$filecounter]['rename'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="javascript:renameFile(\''.urlencode($file).'\');"><i class="'.$_style['files_rename'].'" align="absmiddle" title="'.$_lang['rename'].'"></i></a>' : '<span class="disabled"><i class="'.$_style['files_rename'].'" align="absmiddle" title="'.$_lang['rename'].'"></i></span>';
+            $files_array[$filecounter]['delete'] = is_writable($curpath) && is_writable($newpath) ? '<a href="javascript:deleteFile(\''.urlencode($file).'\');"><i class="'.$_style['files_delete'].'" title="'.$_lang['file_delete_file'].'"></i></a>' : '<span class="disabled"><i class="'.$_style['files_delete'].'" title="'.$_lang['file_delete_file'].'"></i></span>';
 
             // increment the counter
             $filecounter++;
@@ -685,9 +685,9 @@ 
     for ($i = 0; $i < $folders; $i++) {
         $filesizes += $dirs_array[$i]['stats']['7'];
         echo '<tr>';
-        echo '<td>' . $dirs_array[$i]['text'] . '</td>';
-        echo '<td class="text-nowrap">' . $modx->toDateFormat($dirs_array[$i]['stats']['9']) . '</td>';
-        echo '<td class="text-right">' . $modx->nicesize($dirs_array[$i]['stats']['7']) . '</td>';
+        echo '<td>'.$dirs_array[$i]['text'].'</td>';
+        echo '<td class="text-nowrap">'.$modx->toDateFormat($dirs_array[$i]['stats']['9']).'</td>';
+        echo '<td class="text-right">'.$modx->nicesize($dirs_array[$i]['stats']['7']).'</td>';
         echo '<td class="actions text-right">';
         echo $dirs_array[$i]['rename'];
         echo $dirs_array[$i]['delete'];
@@ -700,10 +700,10 @@ 
     sort($files_array); // sorting the array alphabetically (Thanks pxl8r!)
     for ($i = 0; $i < $files; $i++) {
         $filesizes += $files_array[$i]['stats']['7'];
-        echo '<tr ' . markRow($files_array[$i]['file'], $_REQUEST['path'], $_REQUEST['mode']) . '>';
-        echo '<td>' . $files_array[$i]['text'] . '</td>';
-        echo '<td class="text-nowrap">' . $modx->toDateFormat($files_array[$i]['stats']['9']) . '</td>';
-        echo '<td class="text-right">' . $modx->nicesize($files_array[$i]['stats']['7']) . '</td>';
+        echo '<tr '.markRow($files_array[$i]['file'], $_REQUEST['path'], $_REQUEST['mode']).'>';
+        echo '<td>'.$files_array[$i]['text'].'</td>';
+        echo '<td class="text-nowrap">'.$modx->toDateFormat($files_array[$i]['stats']['9']).'</td>';
+        echo '<td class="text-right">'.$modx->nicesize($files_array[$i]['stats']['7']).'</td>';
         echo '<td class="actions text-right">';
         echo $files_array[$i]['unzip'];
         echo $files_array[$i]['view'];
@@ -840,17 +840,17 @@ 
     $zip = zip_open($file);
     if ($zip) {
         $old_umask = umask(0);
-        $path = rtrim($path, '/') . '/';
+        $path = rtrim($path, '/').'/';
         while ($zip_entry = zip_read($zip)) {
             if (zip_entry_filesize($zip_entry) > 0) {
                 // str_replace must be used under windows to convert "/" into "\"
                 $zip_entry_name = zip_entry_name($zip_entry);
-                $complete_path = $path . str_replace('\\', '/', dirname($zip_entry_name));
-                $complete_name = $path . str_replace('\\', '/', $zip_entry_name);
+                $complete_path = $path.str_replace('\\', '/', dirname($zip_entry_name));
+                $complete_name = $path.str_replace('\\', '/', $zip_entry_name);
                 if (!file_exists($complete_path)) {
                     $tmp = '';
                     foreach (explode('/', $complete_path) AS $k) {
-                        $tmp .= $k . '/';
+                        $tmp .= $k.'/';
                         if (!is_dir($tmp)) {
                             mkdir($tmp, 0777);
                         }
@@ -875,7 +875,7 @@ 
  */
 function rrmdir($dir)
 {
-    foreach (glob($dir . '/*') as $file) {
+    foreach (glob($dir.'/*') as $file) {
         if (is_dir($file)) {
             rrmdir($file);
         } else {
@@ -894,7 +894,7 @@ 
     $msg = '';
     foreach ($_FILES['userfile']['name'] as $i => $name) {
         if (empty($_FILES['userfile']['tmp_name'][$i])) continue;
-        $userfile= array();
+        $userfile = array();
 
         $userfile['tmp_name'] = $_FILES['userfile']['tmp_name'][$i];
         $userfile['error'] = $_FILES['userfile']['error'][$i];
@@ -911,12 +911,12 @@ 
         $userfile['type'] = $_FILES['userfile']['type'][$i];
 
         // this seems to be an upload action.
-        $path = $modx->config['site_url'] . substr($startpath, strlen($filemanager_path), strlen($startpath));
-        $path = rtrim($path, '/') . '/' . $userfile['name'];
+        $path = $modx->config['site_url'].substr($startpath, strlen($filemanager_path), strlen($startpath));
+        $path = rtrim($path, '/').'/'.$userfile['name'];
         $msg .= $path;
         if ($userfile['error'] == 0) {
-            $img = (strpos($userfile['type'], 'image') !== false) ? '<br /><img src="' . $path . '" height="75" />' : '';
-            $msg .= "<p>" . $_lang['files_file_type'] . $userfile['type'] . ", " . $modx->nicesize(filesize($userfile['tmp_name'])) . $img . '</p>';
+            $img = (strpos($userfile['type'], 'image') !== false) ? '<br /><img src="'.$path.'" height="75" />' : '';
+            $msg .= "<p>".$_lang['files_file_type'].$userfile['type'].", ".$modx->nicesize(filesize($userfile['tmp_name'])).$img.'</p>';
         }
 
         $userfilename = $userfile['tmp_name'];
@@ -924,15 +924,15 @@ 
         if (is_uploaded_file($userfilename)) {
             // file is uploaded file, process it!
             if (!checkExtension($userfile['name'])) {
-                $msg .= '<p><span class="warning">' . $_lang['files_filetype_notok'] . '</span></p>';
+                $msg .= '<p><span class="warning">'.$_lang['files_filetype_notok'].'</span></p>';
             } else {
-                if (@move_uploaded_file($userfile['tmp_name'], $_POST['path'] . '/' . $userfile['name'])) {
+                if (@move_uploaded_file($userfile['tmp_name'], $_POST['path'].'/'.$userfile['name'])) {
                     // Ryan: Repair broken permissions issue with file manager
                     if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
-                        @chmod($_POST['path'] . "/" . $userfile['name'], $new_file_permissions);
+                        @chmod($_POST['path']."/".$userfile['name'], $new_file_permissions);
                     }
                     // Ryan: End
-                    $msg .= '<p><span class="success">' . $_lang['files_upload_ok'] . '</span></p><hr/>';
+                    $msg .= '<p><span class="success">'.$_lang['files_upload_ok'].'</span></p><hr/>';
 
                     // invoke OnFileManagerUpload event
                     $modx->invokeEvent('OnFileManagerUpload', array(
@@ -940,13 +940,13 @@ 
                         'filename' => $userfile['name']
                     ));
                     // Log the change
-                    logFileChange('upload', $_POST['path'] . '/' . $userfile['name']);
+                    logFileChange('upload', $_POST['path'].'/'.$userfile['name']);
                 } else {
-                    $msg .= '<p><span class="warning">' . $_lang['files_upload_copyfailed'] . '</span> ' . $_lang["files_upload_permissions_error"] . '</p>';
+                    $msg .= '<p><span class="warning">'.$_lang['files_upload_copyfailed'].'</span> '.$_lang["files_upload_permissions_error"].'</p>';
                 }
             }
         } else {
-            $msg .= '<br /><span class="warning"><b>' . $_lang['files_upload_error'] . ':</b>';
+            $msg .= '<br /><span class="warning"><b>'.$_lang['files_upload_error'].':</b>';
             switch ($userfile['error']) {
                 case 0: //no error; possible file attack!
                     $msg .= $_lang['files_upload_error0'];
@@ -970,7 +970,7 @@ 
             $msg .= '</span><br />';
         }
     }
-    return $msg . '<br/>';
+    return $msg.'<br/>';
 }
 
 /**
@@ -986,9 +986,9 @@ 
 
     // Write $content to our opened file.
     if (file_put_contents($filename, $content) === false) {
-        $msg .= '<span class="warning"><b>' . $_lang['file_not_saved'] . '</b></span><br /><br />';
+        $msg .= '<span class="warning"><b>'.$_lang['file_not_saved'].'</b></span><br /><br />';
     } else {
-        $msg .= '<span class="success"><b>' . $_lang['file_saved'] . '</b></span><br /><br />';
+        $msg .= '<span class="success"><b>'.$_lang['file_saved'].'</b></span><br /><br />';
         $_REQUEST['mode'] = 'edit';
     }
     // Log the change
@@ -1007,9 +1007,9 @@ 
 
     $file = $_REQUEST['path'];
     if (!$token_check || !@unlink($file)) {
-        $msg .= '<span class="warning"><b>' . $_lang['file_not_deleted'] . '</b></span><br /><br />';
+        $msg .= '<span class="warning"><b>'.$_lang['file_not_deleted'].'</b></span><br /><br />';
     } else {
-        $msg .= '<span class="success"><b>' . $_lang['file_deleted'] . '</b></span><br /><br />';
+        $msg .= '<span class="success"><b>'.$_lang['file_deleted'].'</b></span><br /><br />';
     }
 
     // Log the change

Braces +3 added lines, -1 removed lines

@@ -893,7 +893,9 @@
     global $modx, $_lang, $startpath, $filemanager_path, $uploadablefiles, $new_file_permissions;
     $msg = '';
     foreach ($_FILES['userfile']['name'] as $i => $name) {
-        if (empty($_FILES['userfile']['tmp_name'][$i])) continue;
+        if (empty($_FILES['userfile']['tmp_name'][$i])) {
+            continue;
+        }
         $userfile= array();
 
         $userfile['tmp_name'] = $_FILES['userfile']['tmp_name'][$i];

manager/actions/import_site.static.php

Doc Comments +1 added lines, -1 removed lines

@@ -344,7 +344,7 @@
 
 /**
  * @param string $filepath
- * @return bool|string
+ * @return null|string
  */
 function getFileContent($filepath) {
 	global $_lang;

Indentation +333 added lines, -333 removed lines

@@ -1,17 +1,17 @@ 
 <?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('import_static')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 // Files to upload
 $allowedfiles = array(
-	'html',
-	'htm',
-	'shtml',
-	'xml'
+    'html',
+    'htm',
+    'shtml',
+    'xml'
 );
 ?>
 	<script language="javascript">
@@ -43,9 +43,9 @@ 
 	<div class="tab-page">
 		<div class="container container-body">
 			<?php
-			if(!isset($_POST['import'])) {
-				echo "<div class=\"element-edit-message\">" . $_lang['import_site_message'] . "</div>";
-				?>
+            if(!isset($_POST['import'])) {
+                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" />
 					<input type="hidden" name="a" value="95" />
@@ -85,18 +85,18 @@ 
 					<a href="javascript:;" class="btn btn-primary" onclick="window.importFrm.submit();"><i class="<?= $_style["actions_save"] ?>"></i> <?= $_lang["import_site_start"] ?></a>
 				</form>
 			<?php
-			} else {
-			run();
-			$modx->clearCache('full');
-			?>
+            } else {
+            run();
+            $modx->clearCache('full');
+            ?>
 				<a href="javascript:;" class="btn btn-primary" onclick="window.location.href='index.php?a=2';"><i class="<?= $_style["actions_close"] ?>"></i> <?= $_lang["close"] ?></a>
 				<script type="text/javascript">
 					top.mainMenu.reloadtree();
 					parent.tree.ca = 'open';
 				</script>
 				<?php
-			}
-			?>
+            }
+            ?>
 		</div>
 	</div>
 
@@ -105,64 +105,64 @@ 
  * @return string
  */
 function run() {
-	global $modx, $_lang;
+    global $modx, $_lang;
 
-	$tbl_site_content = $modx->getFullTableName('site_content');
-	$output = '';
-	$maxtime = $_POST['maxtime'];
+    $tbl_site_content = $modx->getFullTableName('site_content');
+    $output = '';
+    $maxtime = $_POST['maxtime'];
 
-	if(!is_numeric($maxtime)) {
-		$maxtime = 30;
-	}
+    if(!is_numeric($maxtime)) {
+        $maxtime = 30;
+    }
 
-	@set_time_limit($maxtime);
+    @set_time_limit($maxtime);
 
-	$mtime = microtime();
-	$mtime = explode(' ', $mtime);
-	$mtime = $mtime[1] + $mtime[0];
-	$importstart = $mtime;
+    $mtime = microtime();
+    $mtime = explode(' ', $mtime);
+    $mtime = $mtime[1] + $mtime[0];
+    $importstart = $mtime;
 
-	if($_POST['reset'] == 'on') {
-		$modx->db->truncate($tbl_site_content);
-		$modx->db->query("ALTER TABLE {$tbl_site_content} AUTO_INCREMENT = 1");
-	}
+    if($_POST['reset'] == 'on') {
+        $modx->db->truncate($tbl_site_content);
+        $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/';
-	} else {
+    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 = '';
     }
 
-	$filesfound = 0;
+    $filesfound = 0;
 
-	$files = getFiles($filedir);
-	$files = pop_index($files);
+    $files = getFiles($filedir);
+    $files = pop_index($files);
 
-	// no. of files to import
-	$output .= sprintf('<p>' . $_lang['import_files_found'] . '</p>', $filesfound);
+    // no. of files to import
+    $output .= sprintf('<p>' . $_lang['import_files_found'] . '</p>', $filesfound);
 
-	// import files
-	if(0 < count($files)) {
-		$modx->db->update(array('isfolder' => 1), $tbl_site_content, "id='{$parent}'");
-		importFiles($parent, $filedir, $files, 'root');
-	}
+    // import files
+    if(0 < count($files)) {
+        $modx->db->update(array('isfolder' => 1), $tbl_site_content, "id='{$parent}'");
+        importFiles($parent, $filedir, $files, 'root');
+    }
 
-	$mtime = microtime();
-	$mtime = explode(' ', $mtime);
-	$mtime = $mtime[1] + $mtime[0];
-	$importend = $mtime;
-	$totaltime = ($importend - $importstart);
-	$output .= sprintf('<p>' . $_lang['import_site_time'] . '</p>', round($totaltime, 3));
+    $mtime = microtime();
+    $mtime = explode(' ', $mtime);
+    $mtime = $mtime[1] + $mtime[0];
+    $importend = $mtime;
+    $totaltime = ($importend - $importstart);
+    $output .= sprintf('<p>' . $_lang['import_site_time'] . '</p>', round($totaltime, 3));
 
-	if($_POST['convert_link'] == 'on') {
-		convertLink();
-	}
+    if($_POST['convert_link'] == 'on') {
+        convertLink();
+    }
 
-	return $output;
+    return $output;
 }
 
 /**
@@ -172,144 +172,144 @@ 
  * @param string $mode
  */
 function importFiles($parent, $filedir, $files, $mode) {
-	global $modx;
-	global $_lang, $allowedfiles;
-	global $search_default, $cache_default, $publish_default;
-
-	$tbl_site_content = $modx->getFullTableName('site_content');
-	$tbl_system_settings = $modx->getFullTableName('system_settings');
-
-	$createdby = $modx->getLoginUserID();
-	if(!is_array($files)) {
-		return;
-	}
-	if($_POST['object'] === 'all') {
-		$modx->config['default_template'] = '0';
-		$richtext = '0';
-	} else {
-		$richtext = '1';
-	}
-
-	foreach($files as $id => $value) {
-		if(is_array($value)) {
-			// create folder
-			$alias = $id;
-			printf('<span>' . $_lang['import_site_importing_document'] . '</span>', $alias);
-			$field = array();
-			$field['type'] = 'document';
-			$field['contentType'] = 'text/html';
-			$field['published'] = $publish_default;
-			$field['parent'] = $parent;
-			$field['alias'] = $modx->stripAlias($alias);
-			$field['richtext'] = $richtext;
-			$field['template'] = $modx->config['default_template'];
-			$field['searchable'] = $search_default;
-			$field['cacheable'] = $cache_default;
-			$field['createdby'] = $createdby;
-			$field['isfolder'] = 1;
-			$field['menuindex'] = 1;
-			$find = false;
-			foreach(array(
-						'index.html',
-						'index.htm'
-					) as $filename) {
-				$filepath = $filedir . $alias . '/' . $filename;
-				if($find === false && file_exists($filepath)) {
-					$file = getFileContent($filepath);
-					list($pagetitle, $content, $description) = treatContent($file, $filename, $alias);
-
-					$date = filemtime($filepath);
-					$field['pagetitle'] = $pagetitle;
-					$field['longtitle'] = $pagetitle;
-					$field['description'] = $description;
-					$field['content'] = $modx->db->escape($content);
-					$field['createdon'] = $date;
-					$field['editedon'] = $date;
-					$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');
-					} else {
-						echo '<span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_db_error"] . $modx->db->getLastError();
-						exit;
-					}
-				}
-			}
-			if($find === false) {
-				$date = time();
-				$field['pagetitle'] = '---';
-				$field['content'] = '';
-				$field['createdon'] = $date;
-				$field['editedon'] = $date;
-				$field['hidemenu'] = '1';
-				$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');
-				} else {
-					echo '<span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_db_error"] . $modx->db->getLastError();
-					exit;
-				}
-			}
-		} else {
-			// create document
-			if($mode == 'sub' && $value == 'index.html') {
-				continue;
-			}
-			$filename = $value;
-			$fparts = explode('.', $value);
-			$alias = $fparts[0];
-			$ext = (count($fparts) > 1) ? $fparts[count($fparts) - 1] : "";
-			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";
-			} else {
-				$filepath = $filedir . $filename;
-				$file = getFileContent($filepath);
-				list($pagetitle, $content, $description) = treatContent($file, $filename, $alias);
-
-				$date = filemtime($filepath);
-				$field = array();
-				$field['type'] = 'document';
-				$field['contentType'] = 'text/html';
-				$field['pagetitle'] = $pagetitle;
-				$field['longtitle'] = $pagetitle;
-				$field['description'] = $description;
-				$field['alias'] = $modx->stripAlias($alias);
-				$field['published'] = $publish_default;
-				$field['parent'] = $parent;
-				$field['content'] = $modx->db->escape($content);
-				$field['richtext'] = $richtext;
-				$field['template'] = $modx->config['default_template'];
-				$field['searchable'] = $search_default;
-				$field['cacheable'] = $cache_default;
-				$field['createdby'] = $createdby;
-				$field['createdon'] = $date;
-				$field['editedon'] = $date;
-				$field['isfolder'] = 0;
-				$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";
-				} else {
-					echo '<span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_db_error"] . $modx->db->getLastError();
-					exit;
-				}
-
-				$is_site_start = false;
-				if($filename == 'index.html') {
-					$is_site_start = true;
-				}
-				if($is_site_start == true && $_POST['reset'] == 'on') {
-					$modx->db->update(array('setting_value' => $newid), $tbl_system_settings, "setting_name='site_start'");
-					$modx->db->update(array('menuindex' => 0), $tbl_site_content, "id='{$newid}'");
-				}
-			}
-		}
-	}
+    global $modx;
+    global $_lang, $allowedfiles;
+    global $search_default, $cache_default, $publish_default;
+
+    $tbl_site_content = $modx->getFullTableName('site_content');
+    $tbl_system_settings = $modx->getFullTableName('system_settings');
+
+    $createdby = $modx->getLoginUserID();
+    if(!is_array($files)) {
+        return;
+    }
+    if($_POST['object'] === 'all') {
+        $modx->config['default_template'] = '0';
+        $richtext = '0';
+    } else {
+        $richtext = '1';
+    }
+
+    foreach($files as $id => $value) {
+        if(is_array($value)) {
+            // create folder
+            $alias = $id;
+            printf('<span>' . $_lang['import_site_importing_document'] . '</span>', $alias);
+            $field = array();
+            $field['type'] = 'document';
+            $field['contentType'] = 'text/html';
+            $field['published'] = $publish_default;
+            $field['parent'] = $parent;
+            $field['alias'] = $modx->stripAlias($alias);
+            $field['richtext'] = $richtext;
+            $field['template'] = $modx->config['default_template'];
+            $field['searchable'] = $search_default;
+            $field['cacheable'] = $cache_default;
+            $field['createdby'] = $createdby;
+            $field['isfolder'] = 1;
+            $field['menuindex'] = 1;
+            $find = false;
+            foreach(array(
+                        'index.html',
+                        'index.htm'
+                    ) as $filename) {
+                $filepath = $filedir . $alias . '/' . $filename;
+                if($find === false && file_exists($filepath)) {
+                    $file = getFileContent($filepath);
+                    list($pagetitle, $content, $description) = treatContent($file, $filename, $alias);
+
+                    $date = filemtime($filepath);
+                    $field['pagetitle'] = $pagetitle;
+                    $field['longtitle'] = $pagetitle;
+                    $field['description'] = $description;
+                    $field['content'] = $modx->db->escape($content);
+                    $field['createdon'] = $date;
+                    $field['editedon'] = $date;
+                    $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');
+                    } else {
+                        echo '<span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_db_error"] . $modx->db->getLastError();
+                        exit;
+                    }
+                }
+            }
+            if($find === false) {
+                $date = time();
+                $field['pagetitle'] = '---';
+                $field['content'] = '';
+                $field['createdon'] = $date;
+                $field['editedon'] = $date;
+                $field['hidemenu'] = '1';
+                $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');
+                } else {
+                    echo '<span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_db_error"] . $modx->db->getLastError();
+                    exit;
+                }
+            }
+        } else {
+            // create document
+            if($mode == 'sub' && $value == 'index.html') {
+                continue;
+            }
+            $filename = $value;
+            $fparts = explode('.', $value);
+            $alias = $fparts[0];
+            $ext = (count($fparts) > 1) ? $fparts[count($fparts) - 1] : "";
+            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";
+            } else {
+                $filepath = $filedir . $filename;
+                $file = getFileContent($filepath);
+                list($pagetitle, $content, $description) = treatContent($file, $filename, $alias);
+
+                $date = filemtime($filepath);
+                $field = array();
+                $field['type'] = 'document';
+                $field['contentType'] = 'text/html';
+                $field['pagetitle'] = $pagetitle;
+                $field['longtitle'] = $pagetitle;
+                $field['description'] = $description;
+                $field['alias'] = $modx->stripAlias($alias);
+                $field['published'] = $publish_default;
+                $field['parent'] = $parent;
+                $field['content'] = $modx->db->escape($content);
+                $field['richtext'] = $richtext;
+                $field['template'] = $modx->config['default_template'];
+                $field['searchable'] = $search_default;
+                $field['cacheable'] = $cache_default;
+                $field['createdby'] = $createdby;
+                $field['createdon'] = $date;
+                $field['editedon'] = $date;
+                $field['isfolder'] = 0;
+                $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";
+                } else {
+                    echo '<span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_db_error"] . $modx->db->getLastError();
+                    exit;
+                }
+
+                $is_site_start = false;
+                if($filename == 'index.html') {
+                    $is_site_start = true;
+                }
+                if($is_site_start == true && $_POST['reset'] == 'on') {
+                    $modx->db->update(array('setting_value' => $newid), $tbl_system_settings, "setting_name='site_start'");
+                    $modx->db->update(array('menuindex' => 0), $tbl_site_content, "id='{$newid}'");
+                }
+            }
+        }
+    }
 }
 
 /**
@@ -319,27 +319,27 @@ 
  * @return array
  */
 function getFiles($directory, $listing = array(), $count = 0) {
-	global $_lang;
-	global $filesfound;
-	$dummy = $count;
-	if( ! empty($directory) && $files = scandir($directory)) {
-		foreach($files as $file) {
-			if($file == '.' || $file == '..') {
-				continue;
-			} elseif($h = @opendir($directory . $file . "/")) {
-				closedir($h);
-				$count = -1;
-				$listing[$file] = getFiles($directory . $file . "/", array(), $count + 1);
-			} elseif(strpos($file, '.htm') !== false) {
-				$listing[$dummy] = $file;
-				$dummy = $dummy + 1;
-				$filesfound++;
-			}
-		}
-	} else {
-		echo '<p><span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_no_open_dir"] . $directory . ".</p>";
-	}
-	return ($listing);
+    global $_lang;
+    global $filesfound;
+    $dummy = $count;
+    if( ! empty($directory) && $files = scandir($directory)) {
+        foreach($files as $file) {
+            if($file == '.' || $file == '..') {
+                continue;
+            } elseif($h = @opendir($directory . $file . "/")) {
+                closedir($h);
+                $count = -1;
+                $listing[$file] = getFiles($directory . $file . "/", array(), $count + 1);
+            } elseif(strpos($file, '.htm') !== false) {
+                $listing[$dummy] = $file;
+                $dummy = $dummy + 1;
+                $filesfound++;
+            }
+        }
+    } else {
+        echo '<p><span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_no_open_dir"] . $directory . ".</p>";
+    }
+    return ($listing);
 }
 
 /**
@@ -347,13 +347,13 @@ 
  * @return bool|string
  */
 function getFileContent($filepath) {
-	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>";
-	} else {
-		return $buffer;
-	}
+    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>";
+    } else {
+        return $buffer;
+    }
 }
 
 /**
@@ -361,20 +361,20 @@ 
  * @return array
  */
 function pop_index($array) {
-	$new_array = array();
-	foreach($array as $k => $v) {
-		if($v !== 'index.html' && $v !== 'index.htm') {
-			$new_array[$k] = $v;
-		} else {
-			array_unshift($new_array, $v);
-		}
-	}
-	foreach($array as $k => $v) {
-		if(is_array($v)) {
-			$new_array[$k] = $v;
-		}
-	}
-	return $new_array;
+    $new_array = array();
+    foreach($array as $k => $v) {
+        if($v !== 'index.html' && $v !== 'index.htm') {
+            $new_array[$k] = $v;
+        } else {
+            array_unshift($new_array, $v);
+        }
+    }
+    foreach($array as $k => $v) {
+        if(is_array($v)) {
+            $new_array[$k] = $v;
+        }
+    }
+    return $new_array;
 }
 
 /**
@@ -384,108 +384,108 @@ 
  * @return array
  */
 function treatContent($src, $filename, $alias) {
-	global $modx;
-
-	$src = mb_convert_encoding($src, $modx->config['modx_charset'], 'UTF-8,SJIS-win,eucJP-win,SJIS,EUC-JP,ASCII');
-
-	if(preg_match("@<title>(.*)</title>@i", $src, $matches)) {
-		$pagetitle = ($matches[1] !== '') ? $matches[1] : $filename;
-		$pagetitle = str_replace('[*pagetitle*]', '', $pagetitle);
-	} else {
-		$pagetitle = $alias;
-	}
-	if(!$pagetitle) {
-		$pagetitle = $alias;
-	}
-
-	if(preg_match('@<meta[^>]+"description"[^>]+content=[\'"](.*)[\'"].+>@i', $src, $matches)) {
-		$description = ($matches[1] !== '') ? $matches[1] : $filename;
-		$description = str_replace('[*description*]', '', $description);
-	} else {
-		$description = '';
-	}
-
-	if((preg_match("@<body[^>]*>(.*)[^<]+</body>@is", $src, $matches)) && $_POST['object'] == 'body') {
-		$content = $matches[1];
-	} else {
-		$content = $src;
-		$s = '/(<meta[^>]+charset\s*=)[^>"\'=]+(.+>)/i';
-		$r = '$1' . $modx->config['modx_charset'] . '$2';
-		$content = preg_replace($s, $r, $content);
-		$content = preg_replace('@<title>.*</title>@i', "<title>[*pagetitle*]</title>", $content);
-	}
-	$content = str_replace('[*content*]', '[ *content* ]', $content);
-	$content = trim($content);
-	$pagetitle = $modx->db->escape($pagetitle);
-	return array(
-		$pagetitle,
-		$content,
-		$description
-	);
+    global $modx;
+
+    $src = mb_convert_encoding($src, $modx->config['modx_charset'], 'UTF-8,SJIS-win,eucJP-win,SJIS,EUC-JP,ASCII');
+
+    if(preg_match("@<title>(.*)</title>@i", $src, $matches)) {
+        $pagetitle = ($matches[1] !== '') ? $matches[1] : $filename;
+        $pagetitle = str_replace('[*pagetitle*]', '', $pagetitle);
+    } else {
+        $pagetitle = $alias;
+    }
+    if(!$pagetitle) {
+        $pagetitle = $alias;
+    }
+
+    if(preg_match('@<meta[^>]+"description"[^>]+content=[\'"](.*)[\'"].+>@i', $src, $matches)) {
+        $description = ($matches[1] !== '') ? $matches[1] : $filename;
+        $description = str_replace('[*description*]', '', $description);
+    } else {
+        $description = '';
+    }
+
+    if((preg_match("@<body[^>]*>(.*)[^<]+</body>@is", $src, $matches)) && $_POST['object'] == 'body') {
+        $content = $matches[1];
+    } else {
+        $content = $src;
+        $s = '/(<meta[^>]+charset\s*=)[^>"\'=]+(.+>)/i';
+        $r = '$1' . $modx->config['modx_charset'] . '$2';
+        $content = preg_replace($s, $r, $content);
+        $content = preg_replace('@<title>.*</title>@i', "<title>[*pagetitle*]</title>", $content);
+    }
+    $content = str_replace('[*content*]', '[ *content* ]', $content);
+    $content = trim($content);
+    $pagetitle = $modx->db->escape($pagetitle);
+    return array(
+        $pagetitle,
+        $content,
+        $description
+    );
 }
 
 /**
  * @return void
  */
 function convertLink() {
-	global $modx;
-	$tbl_site_content = $modx->getFullTableName('site_content');
+    global $modx;
+    $tbl_site_content = $modx->getFullTableName('site_content');
 
-	$rs = $modx->db->select('id,content', $tbl_site_content);
-	$p = array();
+    $rs = $modx->db->select('id,content', $tbl_site_content);
+    $p = array();
     $target = array();
-	$dir = '';
-	while($row = $modx->db->getRow($rs)) {
-		$id = $row['id'];
-		$array = explode('<a href=', $row['content']);
-		$c = 0;
-		foreach($array as $v) {
-			if($v[0] === '"') {
-				$v = substr($v, 1);
-				list($href, $v) = explode('"', $v, 2);
-				$_ = $href;
-				if(strpos($_, $modx->config['site_url']) !== false) {
-					$_ = $modx->config['base_url'] . str_replace($modx->config['site_url'], '', $_);
-				}
-				if($_[0] === '/') {
-					$_ = substr($_, 1);
-				}
-				$_ = str_replace('/index.html', '.html', $_);
-				$level = substr_count($_, '../');
-				if(1 < $level) {
-					if(!isset($p[$id])) {
-						$p[$id] = $modx->getParentIds($id);
-					}
-					$k = array_keys($p[$id]);
-					while(0 < $level) {
-						$dir = array_shift($k);
-						$level--;
-					}
-					if($dir != '') {
-						$dir .= '/';
-					}
-				} else {
-					$dir = '';
-				}
-
-				$_ = trim($_, './');
-				if(strpos($_, '/') !== false) {
-					$_ = substr($_, strrpos($_, '/'));
-				}
-				$_ = $dir . str_replace('.html', '', $_);
-				if(!isset($target[$_])) {
-					$target[$_] = $modx->getIdFromAlias($_);
-				}
-				$target[$_] = trim($target[$_]);
-				if(!empty($target[$_])) {
-					$href = '[~' . $target[$_] . '~]';
-				}
-				$array[$c] = '<a href="' . $href . '"' . $v;
-			}
-			$c++;
-		}
-		$content = implode('', $array);
-		$f['content'] = $modx->db->escape($content);
-		$modx->db->update($f, $tbl_site_content, "id='{$id}'");
-	}
+    $dir = '';
+    while($row = $modx->db->getRow($rs)) {
+        $id = $row['id'];
+        $array = explode('<a href=', $row['content']);
+        $c = 0;
+        foreach($array as $v) {
+            if($v[0] === '"') {
+                $v = substr($v, 1);
+                list($href, $v) = explode('"', $v, 2);
+                $_ = $href;
+                if(strpos($_, $modx->config['site_url']) !== false) {
+                    $_ = $modx->config['base_url'] . str_replace($modx->config['site_url'], '', $_);
+                }
+                if($_[0] === '/') {
+                    $_ = substr($_, 1);
+                }
+                $_ = str_replace('/index.html', '.html', $_);
+                $level = substr_count($_, '../');
+                if(1 < $level) {
+                    if(!isset($p[$id])) {
+                        $p[$id] = $modx->getParentIds($id);
+                    }
+                    $k = array_keys($p[$id]);
+                    while(0 < $level) {
+                        $dir = array_shift($k);
+                        $level--;
+                    }
+                    if($dir != '') {
+                        $dir .= '/';
+                    }
+                } else {
+                    $dir = '';
+                }
+
+                $_ = trim($_, './');
+                if(strpos($_, '/') !== false) {
+                    $_ = substr($_, strrpos($_, '/'));
+                }
+                $_ = $dir . str_replace('.html', '', $_);
+                if(!isset($target[$_])) {
+                    $target[$_] = $modx->getIdFromAlias($_);
+                }
+                $target[$_] = trim($target[$_]);
+                if(!empty($target[$_])) {
+                    $href = '[~' . $target[$_] . '~]';
+                }
+                $array[$c] = '<a href="' . $href . '"' . $v;
+            }
+            $c++;
+        }
+        $content = implode('', $array);
+        $f['content'] = $modx->db->escape($content);
+        $modx->db->update($f, $tbl_site_content, "id='{$id}'");
+    }
 }

Spacing +83 added lines, -83 removed lines

@@ -1,8 +1,8 @@ 
 <?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('import_static')) {
+if (!$modx->hasPermission('import_static')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -43,8 +43,8 @@ 
 	<div class="tab-page">
 		<div class="container container-body">
 			<?php
-			if(!isset($_POST['import'])) {
-				echo "<div class=\"element-edit-message\">" . $_lang['import_site_message'] . "</div>";
+			if (!isset($_POST['import'])) {
+				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" />
@@ -104,14 +104,14 @@ 
 /**
  * @return string
  */
-function run() {
+function run(){
 	global $modx, $_lang;
 
 	$tbl_site_content = $modx->getFullTableName('site_content');
 	$output = '';
 	$maxtime = $_POST['maxtime'];
 
-	if(!is_numeric($maxtime)) {
+	if (!is_numeric($maxtime)) {
 		$maxtime = 30;
 	}
 
@@ -122,17 +122,17 @@ 
 	$mtime = $mtime[1] + $mtime[0];
 	$importstart = $mtime;
 
-	if($_POST['reset'] == 'on') {
+	if ($_POST['reset'] == 'on') {
 		$modx->db->truncate($tbl_site_content);
 		$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 = '';
     }
@@ -143,10 +143,10 @@ 
 	$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)) {
+	if (0 < count($files)) {
 		$modx->db->update(array('isfolder' => 1), $tbl_site_content, "id='{$parent}'");
 		importFiles($parent, $filedir, $files, 'root');
 	}
@@ -156,9 +156,9 @@ 
 	$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') {
+	if ($_POST['convert_link'] == 'on') {
 		convertLink();
 	}
 
@@ -171,7 +171,7 @@ 
  * @param array $files
  * @param string $mode
  */
-function importFiles($parent, $filedir, $files, $mode) {
+function importFiles($parent, $filedir, $files, $mode){
 	global $modx;
 	global $_lang, $allowedfiles;
 	global $search_default, $cache_default, $publish_default;
@@ -180,21 +180,21 @@ 
 	$tbl_system_settings = $modx->getFullTableName('system_settings');
 
 	$createdby = $modx->getLoginUserID();
-	if(!is_array($files)) {
+	if (!is_array($files)) {
 		return;
 	}
-	if($_POST['object'] === 'all') {
+	if ($_POST['object'] === 'all') {
 		$modx->config['default_template'] = '0';
 		$richtext = '0';
 	} else {
 		$richtext = '1';
 	}
 
-	foreach($files as $id => $value) {
-		if(is_array($value)) {
+	foreach ($files as $id => $value) {
+		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';
@@ -209,12 +209,12 @@ 
 			$field['isfolder'] = 1;
 			$field['menuindex'] = 1;
 			$find = false;
-			foreach(array(
+			foreach (array(
 						'index.html',
 						'index.htm'
 					) as $filename) {
-				$filepath = $filedir . $alias . '/' . $filename;
-				if($find === false && file_exists($filepath)) {
+				$filepath = $filedir.$alias.'/'.$filename;
+				if ($find === false && file_exists($filepath)) {
 					$file = getFileContent($filepath);
 					list($pagetitle, $content, $description) = treatContent($file, $filename, $alias);
 
@@ -226,17 +226,17 @@ 
 					$field['createdon'] = $date;
 					$field['editedon'] = $date;
 					$newid = $modx->db->insert($field, $tbl_site_content);
-					if($newid) {
+					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;
 					}
 				}
 			}
-			if($find === false) {
+			if ($find === false) {
 				$date = time();
 				$field['pagetitle'] = '---';
 				$field['content'] = '';
@@ -244,30 +244,30 @@ 
 				$field['editedon'] = $date;
 				$field['hidemenu'] = '1';
 				$newid = $modx->db->insert($field, $tbl_site_content);
-				if($newid) {
+				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;
 				}
 			}
 		} else {
 			// create document
-			if($mode == 'sub' && $value == 'index.html') {
+			if ($mode == 'sub' && $value == 'index.html') {
 				continue;
 			}
 			$filename = $value;
 			$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";
+			if (!in_array($ext, $allowedfiles)) {
+				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);
 
@@ -292,18 +292,18 @@ 
 				$field['isfolder'] = 0;
 				$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";
+				if ($newid) {
+					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;
 				}
 
 				$is_site_start = false;
-				if($filename == 'index.html') {
+				if ($filename == 'index.html') {
 					$is_site_start = true;
 				}
-				if($is_site_start == true && $_POST['reset'] == 'on') {
+				if ($is_site_start == true && $_POST['reset'] == 'on') {
 					$modx->db->update(array('setting_value' => $newid), $tbl_system_settings, "setting_name='site_start'");
 					$modx->db->update(array('menuindex' => 0), $tbl_site_content, "id='{$newid}'");
 				}
@@ -318,26 +318,26 @@ 
  * @param int $count
  * @return array
  */
-function getFiles($directory, $listing = array(), $count = 0) {
+function getFiles($directory, $listing = array(), $count = 0){
 	global $_lang;
 	global $filesfound;
 	$dummy = $count;
-	if( ! empty($directory) && $files = scandir($directory)) {
-		foreach($files as $file) {
-			if($file == '.' || $file == '..') {
+	if (!empty($directory) && $files = scandir($directory)) {
+		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);
-			} elseif(strpos($file, '.htm') !== false) {
+				$listing[$file] = getFiles($directory.$file."/", array(), $count + 1);
+			} elseif (strpos($file, '.htm') !== false) {
 				$listing[$dummy] = $file;
 				$dummy = $dummy + 1;
 				$filesfound++;
 			}
 		}
 	} 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);
 }
@@ -346,11 +346,11 @@ 
  * @param string $filepath
  * @return bool|string
  */
-function getFileContent($filepath) {
+function getFileContent($filepath){
 	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>";
+	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>";
 	} else {
 		return $buffer;
 	}
@@ -360,17 +360,17 @@ 
  * @param array $array
  * @return array
  */
-function pop_index($array) {
+function pop_index($array){
 	$new_array = array();
-	foreach($array as $k => $v) {
-		if($v !== 'index.html' && $v !== 'index.htm') {
+	foreach ($array as $k => $v) {
+		if ($v !== 'index.html' && $v !== 'index.htm') {
 			$new_array[$k] = $v;
 		} else {
 			array_unshift($new_array, $v);
 		}
 	}
-	foreach($array as $k => $v) {
-		if(is_array($v)) {
+	foreach ($array as $k => $v) {
+		if (is_array($v)) {
 			$new_array[$k] = $v;
 		}
 	}
@@ -383,34 +383,34 @@ 
  * @param string $alias
  * @return array
  */
-function treatContent($src, $filename, $alias) {
+function treatContent($src, $filename, $alias){
 	global $modx;
 
 	$src = mb_convert_encoding($src, $modx->config['modx_charset'], 'UTF-8,SJIS-win,eucJP-win,SJIS,EUC-JP,ASCII');
 
-	if(preg_match("@<title>(.*)</title>@i", $src, $matches)) {
+	if (preg_match("@<title>(.*)</title>@i", $src, $matches)) {
 		$pagetitle = ($matches[1] !== '') ? $matches[1] : $filename;
 		$pagetitle = str_replace('[*pagetitle*]', '', $pagetitle);
 	} else {
 		$pagetitle = $alias;
 	}
-	if(!$pagetitle) {
+	if (!$pagetitle) {
 		$pagetitle = $alias;
 	}
 
-	if(preg_match('@<meta[^>]+"description"[^>]+content=[\'"](.*)[\'"].+>@i', $src, $matches)) {
+	if (preg_match('@<meta[^>]+"description"[^>]+content=[\'"](.*)[\'"].+>@i', $src, $matches)) {
 		$description = ($matches[1] !== '') ? $matches[1] : $filename;
 		$description = str_replace('[*description*]', '', $description);
 	} else {
 		$description = '';
 	}
 
-	if((preg_match("@<body[^>]*>(.*)[^<]+</body>@is", $src, $matches)) && $_POST['object'] == 'body') {
+	if ((preg_match("@<body[^>]*>(.*)[^<]+</body>@is", $src, $matches)) && $_POST['object'] == 'body') {
 		$content = $matches[1];
 	} 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);
 	}
@@ -427,7 +427,7 @@ 
 /**
  * @return void
  */
-function convertLink() {
+function convertLink(){
 	global $modx;
 	$tbl_site_content = $modx->getFullTableName('site_content');
 
@@ -435,33 +435,33 @@ 
 	$p = array();
     $target = array();
 	$dir = '';
-	while($row = $modx->db->getRow($rs)) {
+	while ($row = $modx->db->getRow($rs)) {
 		$id = $row['id'];
 		$array = explode('<a href=', $row['content']);
 		$c = 0;
-		foreach($array as $v) {
-			if($v[0] === '"') {
+		foreach ($array as $v) {
+			if ($v[0] === '"') {
 				$v = substr($v, 1);
 				list($href, $v) = explode('"', $v, 2);
 				$_ = $href;
-				if(strpos($_, $modx->config['site_url']) !== false) {
-					$_ = $modx->config['base_url'] . str_replace($modx->config['site_url'], '', $_);
+				if (strpos($_, $modx->config['site_url']) !== false) {
+					$_ = $modx->config['base_url'].str_replace($modx->config['site_url'], '', $_);
 				}
-				if($_[0] === '/') {
+				if ($_[0] === '/') {
 					$_ = substr($_, 1);
 				}
 				$_ = str_replace('/index.html', '.html', $_);
 				$level = substr_count($_, '../');
-				if(1 < $level) {
-					if(!isset($p[$id])) {
+				if (1 < $level) {
+					if (!isset($p[$id])) {
 						$p[$id] = $modx->getParentIds($id);
 					}
 					$k = array_keys($p[$id]);
-					while(0 < $level) {
+					while (0 < $level) {
 						$dir = array_shift($k);
 						$level--;
 					}
-					if($dir != '') {
+					if ($dir != '') {
 						$dir .= '/';
 					}
 				} else {
@@ -469,18 +469,18 @@ 
 				}
 
 				$_ = trim($_, './');
-				if(strpos($_, '/') !== false) {
+				if (strpos($_, '/') !== false) {
 					$_ = substr($_, strrpos($_, '/'));
 				}
-				$_ = $dir . str_replace('.html', '', $_);
-				if(!isset($target[$_])) {
+				$_ = $dir.str_replace('.html', '', $_);
+				if (!isset($target[$_])) {
 					$target[$_] = $modx->getIdFromAlias($_);
 				}
 				$target[$_] = trim($target[$_]);
-				if(!empty($target[$_])) {
-					$href = '[~' . $target[$_] . '~]';
+				if (!empty($target[$_])) {
+					$href = '[~'.$target[$_].'~]';
 				}
-				$array[$c] = '<a href="' . $href . '"' . $v;
+				$array[$c] = '<a href="'.$href.'"'.$v;
 			}
 			$c++;
 		}

Braces +14 added lines, -7 removed lines

@@ -104,7 +104,8 @@ 
 /**
  * @return string
  */
-function run() {
+function run()
+{
 	global $modx, $_lang;
 
 	$tbl_site_content = $modx->getFullTableName('site_content');
@@ -171,7 +172,8 @@ 
  * @param array $files
  * @param string $mode
  */
-function importFiles($parent, $filedir, $files, $mode) {
+function importFiles($parent, $filedir, $files, $mode)
+{
 	global $modx;
 	global $_lang, $allowedfiles;
 	global $search_default, $cache_default, $publish_default;
@@ -318,7 +320,8 @@ 
  * @param int $count
  * @return array
  */
-function getFiles($directory, $listing = array(), $count = 0) {
+function getFiles($directory, $listing = array(), $count = 0)
+{
 	global $_lang;
 	global $filesfound;
 	$dummy = $count;
@@ -346,7 +349,8 @@ 
  * @param string $filepath
  * @return bool|string
  */
-function getFileContent($filepath) {
+function getFileContent($filepath)
+{
 	global $_lang;
 	// get the file
 	if(!$buffer = file_get_contents($filepath)) {
@@ -360,7 +364,8 @@ 
  * @param array $array
  * @return array
  */
-function pop_index($array) {
+function pop_index($array)
+{
 	$new_array = array();
 	foreach($array as $k => $v) {
 		if($v !== 'index.html' && $v !== 'index.htm') {
@@ -383,7 +388,8 @@ 
  * @param string $alias
  * @return array
  */
-function treatContent($src, $filename, $alias) {
+function treatContent($src, $filename, $alias)
+{
 	global $modx;
 
 	$src = mb_convert_encoding($src, $modx->config['modx_charset'], 'UTF-8,SJIS-win,eucJP-win,SJIS,EUC-JP,ASCII');
@@ -427,7 +433,8 @@ 
 /**
  * @return void
  */
-function convertLink() {
+function convertLink()
+{
 	global $modx;
 	$tbl_site_content = $modx->getFullTableName('site_content');
 

manager/includes/document.parser.class.inc.php

Doc Comments +24 added lines, -24 removed lines

@@ -256,7 +256,7 @@ 
      * MODX_MANAGER_PATH."includes/extenders/ex_{$extname}.inc.php"
      * $extname - extension name in lowercase
      *
-     * @param $extname
+     * @param string $extname
      * @param bool $reload
      * @return bool
      */
@@ -299,7 +299,7 @@ 
      * @param int $count_attempts
      * @param string $type $type
      * @param string $responseCode
-     * @return bool|null
+     * @return false|null
      * @global string $base_url
      * @global string $site_url
      */
@@ -1000,7 +1000,7 @@ 
     }
 
     /**
-     * @param $contents
+     * @param string $contents
      * @return mixed
      */
     public function RecoveryEscapedTags($contents)
@@ -1024,7 +1024,7 @@ 
     }
 
     /**
-     * @param $tstart
+     * @param double $tstart
      * @return array
      */
     public function getTimerStats($tstart)
@@ -1776,7 +1776,7 @@ 
 
     /**
      * Remove Comment-Tags from output like <!--@- Comment -@-->
-     * @param $content
+     * @param string $content
      * @param string $left
      * @param string $right
      * @return mixed
@@ -1949,7 +1949,7 @@ 
     /**
      * Run snippets as per the tags in $documentSource and replace the tags with the returned values.
      *
-     * @param $content
+     * @param string $content
      * @return string
      * @internal param string $documentSource
      */
@@ -2981,7 +2981,7 @@ 
 
     /**
      * @param $templateID
-     * @return mixed
+     * @return string
      */
     public function _getTemplateCodeFromDB($templateID)
     {
@@ -3022,9 +3022,9 @@ 
     }
 
     /**
-     * @param $id
+     * @param integer $id
      * @param int $top
-     * @return mixed
+     * @return string
      */
     public function getUltimateParentId($id, $top = 0)
     {
@@ -3355,7 +3355,7 @@ 
      *
      * @param int $type Types: 1=template, 2=tv, 3=chunk, 4=snippet, 5=plugin, 6=module, 7=resource, 8=role
      * @param int $id Element- / Resource-id
-     * @return bool
+     * @return false|null
      */
     public function lockElement($type, $id)
     {
@@ -3377,7 +3377,7 @@ 
      * @param int $type Types: 1=template, 2=tv, 3=chunk, 4=snippet, 5=plugin, 6=module, 7=resource, 8=role
      * @param int $id Element- / Resource-id
      * @param bool $includeAllUsers true = Deletes not only own user-locks
-     * @return bool
+     * @return false|null
      */
     public function unlockElement($type, $id, $includeAllUsers = false)
     {
@@ -3485,7 +3485,7 @@ 
      * @param array $params
      * @param string $msg
      * @param array $files
-     * @return mixed
+     * @return boolean
      */
     public function sendmail($params = array(), $msg = '', $files = array())
     {
@@ -3981,7 +3981,7 @@ 
      *
      * @param string $type
      * @param bool $report
-     * @return bool
+     * @return boolean|null
      */
     public function clearCache($type = '', $report = false)
     {
@@ -4348,7 +4348,7 @@ 
      * - Placeholders prefix. Default: '{'.
      * @param string $suffix {string}
      * - Placeholders suffix. Default: '}'.
-     * @return bool|mixed|string {string; false} - Parsed chunk or false if $chunkArr is not array.
+     * @return false|string {string; false} - Parsed chunk or false if $chunkArr is not array.
      * - Parsed chunk or false if $chunkArr is not array.
      */
     public function parseChunk($chunkName, $chunkArr, $prefix = '{', $suffix = '}')
@@ -5324,7 +5324,7 @@ 
      * Remove event listener - only for use within the current execution cycle
      *
      * @param string $evtName
-     * @return boolean
+     * @return false|null
      */
     public function removeEventListener($evtName)
     {
@@ -5348,7 +5348,7 @@ 
      *
      * @param string $evtName
      * @param array $extParams Parameters available to plugins. Each array key will be the PHP variable name, and the array value will be the variable value.
-     * @return boolean|array
+     * @return false|null
      */
     public function invokeEvent($evtName, $extParams = array())
     {
@@ -5947,7 +5947,7 @@ 
 
     /**
      * @param string $str
-     * @return bool|mixed|string
+     * @return string
      */
     public function atBindFileContent($str = '')
     {
@@ -5998,8 +5998,8 @@ 
     }
 
     /**
-     * @param $str
-     * @return bool|string
+     * @param string $str
+     * @return false|string
      */
     public function getExtFromFilename($str)
     {
@@ -6027,7 +6027,7 @@ 
      * @param string $text Error message
      * @param string $file File where the error was detected
      * @param string $line Line number within $file
-     * @return boolean
+     * @return boolean|null
      */
     public function phpError($nr, $text, $file, $line)
     {
@@ -6079,7 +6079,7 @@ 
      * @param string $text
      * @param string $line
      * @param string $output
-     * @return bool
+     * @return null|boolean
      */
     public function messageQuit($msg = 'unspecified error', $query = '', $is_error = true, $nr = '', $file = '', $source = '', $text = '', $line = '', $output = '')
     {
@@ -6501,7 +6501,7 @@ 
 
     /**
      * @param string $str
-     * @return bool|mixed|string
+     * @return string
      */
     public function atBindInclude($str = '')
     {
@@ -6552,7 +6552,7 @@ 
      * @param $str
      * @param int $flags
      * @param string $encode
-     * @return mixed
+     * @return string
      */
     public function htmlspecialchars($str, $flags = ENT_COMPAT, $encode = '')
     {
@@ -6561,7 +6561,7 @@ 
     }
 
     /**
-     * @param $string
+     * @param string $string
      * @param bool $returnData
      * @return bool|mixed
      */

Spacing +266 added lines, -266 removed lines

@@ -205,7 +205,7 @@ 
      */
     function __call($method_name, $arguments)
     {
-        include_once(MODX_MANAGER_PATH . 'includes/extenders/deprecated.functions.inc.php');
+        include_once(MODX_MANAGER_PATH.'includes/extenders/deprecated.functions.inc.php');
         if (method_exists($this->old, $method_name)) {
             $error_type = 1;
         } else {
@@ -223,12 +223,12 @@ 
             $info = debug_backtrace();
             $m[] = $msg;
             if (!empty($this->currentSnippet)) {
-                $m[] = 'Snippet - ' . $this->currentSnippet;
+                $m[] = 'Snippet - '.$this->currentSnippet;
             } elseif (!empty($this->event->activePlugin)) {
-                $m[] = 'Plugin - ' . $this->event->activePlugin;
+                $m[] = 'Plugin - '.$this->event->activePlugin;
             }
             $m[] = $this->decoded_request_uri;
-            $m[] = str_replace('\\', '/', $info[0]['file']) . '(line:' . $info[0]['line'] . ')';
+            $m[] = str_replace('\\', '/', $info[0]['file']).'(line:'.$info[0]['line'].')';
             $msg = implode('<br />', $m);
             $this->logEvent(0, $error_type, $msg, $title);
         }
@@ -245,7 +245,7 @@ 
     {
         $flag = false;
         if (is_scalar($connector) && !empty($connector) && isset($this->{$connector}) && $this->{$connector} instanceof DBAPI) {
-            $flag = (bool)$this->{$connector}->conn;
+            $flag = (bool) $this->{$connector}->conn;
         }
         return $flag;
     }
@@ -272,7 +272,7 @@ 
         }
         if (!$out && $flag) {
             $extname = trim(str_replace(array('..', '/', '\\'), '', strtolower($extname)));
-            $filename = MODX_MANAGER_PATH . "includes/extenders/ex_{$extname}.inc.php";
+            $filename = MODX_MANAGER_PATH."includes/extenders/ex_{$extname}.inc.php";
             $out = is_file($filename) ? include $filename : false;
         }
         if ($out && !in_array($extname, $this->extensions)) {
@@ -289,7 +289,7 @@ 
     public function getMicroTime()
     {
         list ($usec, $sec) = explode(' ', microtime());
-        return ((float)$usec + (float)$sec);
+        return ((float) $usec + (float) $sec);
     }
 
     /**
@@ -313,7 +313,7 @@ 
             // append the redirect count string to the url
             $currentNumberOfRedirects = isset ($_REQUEST['err']) ? $_REQUEST['err'] : 0;
             if ($currentNumberOfRedirects > 3) {
-                $this->messageQuit('Redirection attempt failed - please ensure the document you\'re trying to redirect to exists. <p>Redirection URL: <i>' . $url . '</i></p>');
+                $this->messageQuit('Redirection attempt failed - please ensure the document you\'re trying to redirect to exists. <p>Redirection URL: <i>'.$url.'</i></p>');
             } else {
                 $currentNumberOfRedirects += 1;
                 if (strpos($url, "?") > 0) {
@@ -324,9 +324,9 @@ 
             }
         }
         if ($type == 'REDIRECT_REFRESH') {
-            $header = 'Refresh: 0;URL=' . $url;
+            $header = 'Refresh: 0;URL='.$url;
         } elseif ($type == 'REDIRECT_META') {
-            $header = '<META HTTP-EQUIV="Refresh" CONTENT="0; URL=' . $url . '" />';
+            $header = '<META HTTP-EQUIV="Refresh" CONTENT="0; URL='.$url.'" />';
             echo $header;
             exit;
         } elseif ($type == 'REDIRECT_HEADER' || empty ($type)) {
@@ -334,10 +334,10 @@ 
             global $base_url, $site_url;
             if (substr($url, 0, strlen($base_url)) == $base_url) {
                 // append $site_url to make it work with Location:
-                $url = $site_url . substr($url, strlen($base_url));
+                $url = $site_url.substr($url, strlen($base_url));
             }
             if (strpos($url, "\n") === false) {
-                $header = 'Location: ' . $url;
+                $header = 'Location: '.$url;
             } else {
                 $this->messageQuit('No newline allowed in redirect url.');
             }
@@ -346,7 +346,7 @@ 
             header($responseCode);
         }
 
-        if(!empty($header)) {
+        if (!empty($header)) {
             header($header);
         }
 
@@ -450,8 +450,8 @@ 
 
     private function recoverySiteCache()
     {
-        $site_cache_dir = MODX_BASE_PATH . $this->getCacheFolder();
-        $site_cache_path = $site_cache_dir . 'siteCache.idx.php';
+        $site_cache_dir = MODX_BASE_PATH.$this->getCacheFolder();
+        $site_cache_path = $site_cache_dir.'siteCache.idx.php';
 
         if (is_file($site_cache_path)) {
             include($site_cache_path);
@@ -460,7 +460,7 @@ 
             return;
         }
 
-        include_once(MODX_MANAGER_PATH . 'processors/cache_sync.class.processor.php');
+        include_once(MODX_MANAGER_PATH.'processors/cache_sync.class.processor.php');
         $cache = new synccache();
         $cache->setCachepath($site_cache_dir);
         $cache->setReport(false);
@@ -512,8 +512,8 @@ 
                 $this->invokeEvent("OnBeforeManagerPageInit");
             }
 
-            if (isset ($_SESSION[$usrType . 'UsrConfigSet'])) {
-                $usrSettings = &$_SESSION[$usrType . 'UsrConfigSet'];
+            if (isset ($_SESSION[$usrType.'UsrConfigSet'])) {
+                $usrSettings = &$_SESSION[$usrType.'UsrConfigSet'];
             } else {
                 if ($usrType == 'web') {
                     $from = $tbl_web_user_settings;
@@ -533,7 +533,7 @@ 
                     $usrSettings[$row['setting_name']] = $row['setting_value'];
                 }
                 if (isset ($usrType)) {
-                    $_SESSION[$usrType . 'UsrConfigSet'] = $usrSettings;
+                    $_SESSION[$usrType.'UsrConfigSet'] = $usrSettings;
                 } // store user settings in session
             }
         }
@@ -678,10 +678,10 @@ 
         $suf = $this->config['friendly_url_suffix'];
         $pre = preg_quote($pre, '/');
         $suf = preg_quote($suf, '/');
-        if ($pre && preg_match('@^' . $pre . '(.*)$@', $q, $_)) {
+        if ($pre && preg_match('@^'.$pre.'(.*)$@', $q, $_)) {
             $q = $_[1];
         }
-        if ($suf && preg_match('@(.*)' . $suf . '$@', $q, $_)) {
+        if ($suf && preg_match('@(.*)'.$suf.'$@', $q, $_)) {
             $q = $_[1];
         }
 
@@ -703,7 +703,7 @@ 
         if (preg_match('@^[1-9][0-9]*$@', $q) && !isset($this->documentListing[$q])) { /* we got an ID returned, check to make sure it's not an alias */
             /* FS#476 and FS#308: check that id is valid in terms of virtualDir structure */
             if ($this->config['use_alias_path'] == 1) {
-                if (($this->virtualDir != '' && !isset($this->documentListing[$this->virtualDir . '/' . $q]) || ($this->virtualDir == '' && !isset($this->documentListing[$q]))) && (($this->virtualDir != '' && isset($this->documentListing[$this->virtualDir]) && in_array($q, $this->getChildIds($this->documentListing[$this->virtualDir], 1))) || ($this->virtualDir == '' && in_array($q, $this->getChildIds(0, 1))))) {
+                if (($this->virtualDir != '' && !isset($this->documentListing[$this->virtualDir.'/'.$q]) || ($this->virtualDir == '' && !isset($this->documentListing[$q]))) && (($this->virtualDir != '' && isset($this->documentListing[$this->virtualDir]) && in_array($q, $this->getChildIds($this->documentListing[$this->virtualDir], 1))) || ($this->virtualDir == '' && in_array($q, $this->getChildIds(0, 1))))) {
                     $this->documentMethod = 'id';
                     return $q;
                 } else { /* not a valid id in terms of virtualDir, treat as alias */
@@ -737,7 +737,7 @@ 
      */
     public function getHashFile($key)
     {
-        return $this->getCacheFolder() . "docid_" . $key . ".pageCache.php";
+        return $this->getCacheFolder()."docid_".$key.".pageCache.php";
     }
 
     /**
@@ -748,9 +748,9 @@ 
         $hash = $id;
         $tmp = null;
         $params = array();
-        if(!empty($this->systemCacheKey)){
+        if (!empty($this->systemCacheKey)) {
             $hash = $this->systemCacheKey;
-        }else {
+        } else {
             if (!empty($_GET)) {
                 // Sort GET parameters so that the order of parameters on the HTTP request don't affect the generated cache ID.
                 $params = $_GET;
@@ -758,8 +758,8 @@ 
                 $hash .= '_'.md5(http_build_query($params));
             }
         }
-        $evtOut = $this->invokeEvent("OnMakePageCacheKey", array ("hash" => $hash, "id" => $id, 'params' => $params));
-        if (is_array($evtOut) && count($evtOut) > 0){
+        $evtOut = $this->invokeEvent("OnMakePageCacheKey", array("hash" => $hash, "id" => $id, 'params' => $params));
+        if (is_array($evtOut) && count($evtOut) > 0) {
             $tmp = array_pop($evtOut);
         }
         return empty($tmp) ? $hash : $tmp;
@@ -901,12 +901,12 @@ 
         if ($js = $this->getRegisteredClientStartupScripts()) {
             // change to just before closing </head>
             // $this->documentContent = preg_replace("/(<head[^>]*>)/i", "\\1\n".$js, $this->documentContent);
-            $this->documentOutput = preg_replace("/(<\/head>)/i", $js . "\n\\1", $this->documentOutput);
+            $this->documentOutput = preg_replace("/(<\/head>)/i", $js."\n\\1", $this->documentOutput);
         }
 
         // Insert jscripts & html block into template - template must have a </body> tag
         if ($js = $this->getRegisteredClientScripts()) {
-            $this->documentOutput = preg_replace("/(<\/body>)/i", $js . "\n\\1", $this->documentOutput);
+            $this->documentOutput = preg_replace("/(<\/body>)/i", $js."\n\\1", $this->documentOutput);
         }
         // End fix by sirlancelot
 
@@ -917,7 +917,7 @@ 
         // send out content-type and content-disposition headers
         if (IN_PARSER_MODE == "true") {
             $type = !empty ($this->contentTypes[$this->documentIdentifier]) ? $this->contentTypes[$this->documentIdentifier] : "text/html";
-            header('Content-Type: ' . $type . '; charset=' . $this->config['modx_charset']);
+            header('Content-Type: '.$type.'; charset='.$this->config['modx_charset']);
             //            if (($this->documentIdentifier == $this->config['error_page']) || $redirect_error)
             //                header('HTTP/1.0 404 Not Found');
             if (!$this->checkPreview() && $this->documentObject['content_dispo'] == 1) {
@@ -935,7 +935,7 @@ 
                     $name = preg_replace('|-+|', '-', $name);
                     $name = trim($name, '-');
                 }
-                $header = 'Content-Disposition: attachment; filename=' . $name;
+                $header = 'Content-Disposition: attachment; filename='.$name;
                 header($header);
             }
         }
@@ -943,7 +943,7 @@ 
 
         $stats = $this->getTimerStats($this->tstart);
 
-        $out =& $this->documentOutput;
+        $out = & $this->documentOutput;
         $out = str_replace("[^q^]", $stats['queries'], $out);
         $out = str_replace("[^qt^]", $stats['queryTime'], $out);
         $out = str_replace("[^p^]", $stats['phpTime'], $out);
@@ -982,17 +982,17 @@ 
                 $sc .= sprintf("%s. %s (%s)<br>", $s, $sname, sprintf("%2.2f ms", $t)); // currentSnippet
                 $tt += $t;
             }
-            echo "<fieldset><legend><b>Snippets</b> (" . count($this->snippetsTime) . " / " . sprintf("%2.2f ms", $tt) . ")</legend>{$sc}</fieldset><br />";
+            echo "<fieldset><legend><b>Snippets</b> (".count($this->snippetsTime)." / ".sprintf("%2.2f ms", $tt).")</legend>{$sc}</fieldset><br />";
             echo $this->snippetsCode;
         }
         if ($this->dumpPlugins) {
             $ps = "";
             $tt = 0;
             foreach ($this->pluginsTime as $s => $t) {
-                $ps .= "$s (" . sprintf("%2.2f ms", $t * 1000) . ")<br>";
+                $ps .= "$s (".sprintf("%2.2f ms", $t * 1000).")<br>";
                 $tt += $t;
             }
-            echo "<fieldset><legend><b>Plugins</b> (" . count($this->pluginsTime) . " / " . sprintf("%2.2f ms", $tt * 1000) . ")</legend>{$ps}</fieldset><br />";
+            echo "<fieldset><legend><b>Plugins</b> (".count($this->pluginsTime)." / ".sprintf("%2.2f ms", $tt * 1000).")</legend>{$ps}</fieldset><br />";
             echo $this->pluginsCode;
         }
 
@@ -1018,7 +1018,7 @@ 
         $srcTags = explode(',', $tags);
         $repTags = array();
         foreach ($srcTags as $tag) {
-            $repTags[] = '\\' . $tag[0] . '\\' . $tag[1];
+            $repTags[] = '\\'.$tag[0].'\\'.$tag[1];
         }
         return array($srcTags, $repTags);
     }
@@ -1040,7 +1040,7 @@ 
         $stats['phpTime'] = sprintf("%2.4f s", $stats['phpTime']);
         $stats['source'] = $this->documentGenerated == 1 ? "database" : "cache";
         $stats['queries'] = isset ($this->executedQueries) ? $this->executedQueries : 0;
-        $stats['phpMemory'] = (memory_get_peak_usage(true) / 1024 / 1024) . " mb";
+        $stats['phpMemory'] = (memory_get_peak_usage(true) / 1024 / 1024)." mb";
 
         return $stats;
     }
@@ -1073,7 +1073,7 @@ 
     {
         $cacheRefreshTime = 0;
         $recent_update = 0;
-        @include(MODX_BASE_PATH . $this->getCacheFolder() . 'sitePublishing.idx.php');
+        @include(MODX_BASE_PATH.$this->getCacheFolder().'sitePublishing.idx.php');
         $this->recentUpdate = $recent_update;
 
         $timeNow = $_SERVER['REQUEST_TIME'] + $this->config['server_offset_time'];
@@ -1127,8 +1127,8 @@ 
                 }
 
                 $docObjSerial = serialize($this->documentObject);
-                $cacheContent = $docObjSerial . "<!--__MODxCacheSpliter__-->" . $this->documentContent;
-                $page_cache_path = MODX_BASE_PATH . $this->getHashFile($this->cacheKey);
+                $cacheContent = $docObjSerial."<!--__MODxCacheSpliter__-->".$this->documentContent;
+                $page_cache_path = MODX_BASE_PATH.$this->getHashFile($this->cacheKey);
                 file_put_contents($page_cache_path, "<?php die('Unauthorized access.'); ?>$cacheContent");
             }
         }
@@ -1170,16 +1170,16 @@ 
             return array();
         }
         $spacer = md5('<<<EVO>>>');
-        if($left==='{{' && strpos($content,';}}')!==false)  $content = str_replace(';}}', sprintf(';}%s}',   $spacer),$content);
-        if($left==='{{' && strpos($content,'{{}}')!==false) $content = str_replace('{{}}',sprintf('{%$1s{}%$1s}',$spacer),$content);
-        if($left==='[[' && strpos($content,']]]]')!==false) $content = str_replace(']]]]',sprintf(']]%s]]',  $spacer),$content);
-        if($left==='[[' && strpos($content,']]]')!==false)  $content = str_replace(']]]', sprintf(']%s]]',   $spacer),$content);
+        if ($left === '{{' && strpos($content, ';}}') !== false)  $content = str_replace(';}}', sprintf(';}%s}', $spacer), $content);
+        if ($left === '{{' && strpos($content, '{{}}') !== false) $content = str_replace('{{}}', sprintf('{%$1s{}%$1s}', $spacer), $content);
+        if ($left === '[[' && strpos($content, ']]]]') !== false) $content = str_replace(']]]]', sprintf(']]%s]]', $spacer), $content);
+        if ($left === '[[' && strpos($content, ']]]') !== false)  $content = str_replace(']]]', sprintf(']%s]]', $spacer), $content);
 
         $pos['<![CDATA['] = strpos($content, '<![CDATA[');
         $pos[']]>'] = strpos($content, ']]>');
 
         if ($pos['<![CDATA['] !== false && $pos[']]>'] !== false) {
-            $content = substr($content, 0, $pos['<![CDATA[']) . substr($content, $pos[']]>'] + 3);
+            $content = substr($content, 0, $pos['<![CDATA[']).substr($content, $pos[']]>'] + 3);
         }
 
         $lp = explode($left, $content);
@@ -1243,8 +1243,8 @@ 
                 }
             }
         }
-        foreach($tags as $i=>$tag) {
-            if(strpos($tag,$spacer)!==false) $tags[$i] = str_replace($spacer, '', $tag);
+        foreach ($tags as $i=>$tag) {
+            if (strpos($tag, $spacer) !== false) $tags[$i] = str_replace($spacer, '', $tag);
         }
         return $tags;
     }
@@ -1284,7 +1284,7 @@ 
         }
 
         foreach ($matches[1] as $i => $key) {
-            if(strpos($key,'[+')!==false) continue; // Allow chunk {{chunk?&param=`xxx`}} with [*tv_name_[+param+]*] as content
+            if (strpos($key, '[+') !== false) continue; // Allow chunk {{chunk?&param=`xxx`}} with [*tv_name_[+param+]*] as content
             if (substr($key, 0, 1) == '#') {
                 $key = substr($key, 1);
             } // remove # for QuickEdit format
@@ -1304,8 +1304,8 @@ 
             }
 
             if (is_array($value)) {
-                include_once(MODX_MANAGER_PATH . 'includes/tmplvars.format.inc.php');
-                include_once(MODX_MANAGER_PATH . 'includes/tmplvars.commands.inc.php');
+                include_once(MODX_MANAGER_PATH.'includes/tmplvars.format.inc.php');
+                include_once(MODX_MANAGER_PATH.'includes/tmplvars.commands.inc.php');
                 $value = getTVDisplayFormat($value[0], $value[1], $value[2], $value[3], $value[4]);
             }
 
@@ -1316,8 +1316,8 @@ 
 
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $value, $content);
-            } elseif($this->debug) {
-                $this->addLog('mergeDocumentContent parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('mergeDocumentContent parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
 
@@ -1484,8 +1484,8 @@ 
             $s = &$matches[0][$i];
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $value, $content);
-            } elseif($this->debug) {
-                $this->addLog('mergeSettingsContent parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('mergeSettingsContent parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
         return $content;
@@ -1538,7 +1538,7 @@ 
             }
 
             $value = $this->parseText($value, $params); // parse local scope placeholers for ConditionalTags
-            $value = $this->mergePlaceholderContent($value, $params);  // parse page global placeholers
+            $value = $this->mergePlaceholderContent($value, $params); // parse page global placeholers
             if ($this->config['enable_at_syntax']) {
                 $value = $this->mergeConditionalTagsContent($value);
             }
@@ -1553,8 +1553,8 @@ 
             $s = &$matches[0][$i];
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $value, $content);
-            } elseif($this->debug) {
-                $this->addLog('mergeChunkContent parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('mergeChunkContent parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
         return $content;
@@ -1612,8 +1612,8 @@ 
             $s = &$matches[0][$i];
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $value, $content);
-            } elseif($this->debug) {
-                $this->addLog('mergePlaceholderContent parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('mergePlaceholderContent parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
         return $content;
@@ -1637,7 +1637,7 @@ 
             return $content;
         }
 
-        $sp = '#' . md5('ConditionalTags' . $_SERVER['REQUEST_TIME']) . '#';
+        $sp = '#'.md5('ConditionalTags'.$_SERVER['REQUEST_TIME']).'#';
         $content = str_replace(array('<?php', '<?=', '<?', '?>'), array("{$sp}b", "{$sp}p", "{$sp}s", "{$sp}e"), $content);
 
         $pieces = explode('<@IF:', $content);
@@ -1648,7 +1648,7 @@ 
             }
             list($cmd, $text) = explode('>', $split, 2);
             $cmd = str_replace("'", "\'", $cmd);
-            $content .= "<?php if(\$this->_parseCTagCMD('" . $cmd . "')): ?>";
+            $content .= "<?php if(\$this->_parseCTagCMD('".$cmd."')): ?>";
             $content .= $text;
         }
         $pieces = explode('<@ELSEIF:', $content);
@@ -1659,13 +1659,13 @@ 
             }
             list($cmd, $text) = explode('>', $split, 2);
             $cmd = str_replace("'", "\'", $cmd);
-            $content .= "<?php elseif(\$this->_parseCTagCMD('" . $cmd . "')): ?>";
+            $content .= "<?php elseif(\$this->_parseCTagCMD('".$cmd."')): ?>";
             $content .= $text;
         }
 
         $content = str_replace(array('<@ELSE>', '<@ENDIF>'), array('<?php else:?>', '<?php endif;?>'), $content);
         ob_start();
-        $content = eval('?>' . $content);
+        $content = eval('?>'.$content);
         $content = ob_get_clean();
         $content = str_replace(array("{$sp}b", "{$sp}p", "{$sp}s", "{$sp}e"), array('<?php', '<?=', '<?', '?>'), $content);
 
@@ -1790,7 +1790,7 @@ 
         $matches = $this->getTagsFromContent($content, $left, $right);
         if (!empty($matches)) {
             foreach ($matches[0] as $i => $v) {
-                $addBreakMatches[$i] = $v . "\n";
+                $addBreakMatches[$i] = $v."\n";
             }
             $content = str_replace($addBreakMatches, '', $content);
             if (strpos($content, $left) !== false) {
@@ -1823,8 +1823,8 @@ 
             $s = &$matches[0][$i];
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $v, $content);
-            } elseif($this->debug) {
-                $this->addLog('ignoreCommentedTagsContent parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('ignoreCommentedTagsContent parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
         return $content;
@@ -1888,7 +1888,7 @@ 
                 $msg = ($msg === false) ? 'ob_get_contents() error' : $msg;
                 $this->messageQuit('PHP Parse Error', '', true, $error_info['type'], $error_info['file'], 'Plugin', $error_info['message'], $error_info['line'], $msg);
                 if ($this->isBackend()) {
-                    $this->event->alert('An error occurred while loading. Please see the event log for more information.<p>' . $msg . '</p>');
+                    $this->event->alert('An error occurred while loading. Please see the event log for more information.<p>'.$msg.'</p>');
                 }
             }
         } else {
@@ -1934,7 +1934,7 @@ 
                 $echo = ($echo === false) ? 'ob_get_contents() error' : $echo;
                 $this->messageQuit('PHP Parse Error', '', true, $error_info['type'], $error_info['file'], 'Snippet', $error_info['message'], $error_info['line'], $echo);
                 if ($this->isBackend()) {
-                    $this->event->alert('An error occurred while loading. Please see the event log for more information<p>' . $echo . $return . '</p>');
+                    $this->event->alert('An error occurred while loading. Please see the event log for more information<p>'.$echo.$return.'</p>');
                 }
             }
         }
@@ -1942,7 +1942,7 @@ 
         if (is_array($return) || is_object($return)) {
             return $return;
         } else {
-            return $echo . $return;
+            return $echo.$return;
         }
     }
 
@@ -1980,8 +1980,8 @@ 
                 }
                 if (strpos($content, $s) !== false) {
                     $content = str_replace($s, $value, $content);
-                } elseif($this->debug) {
-                    $this->addLog('evalSnippetsSGVar parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+                } elseif ($this->debug) {
+                    $this->addLog('evalSnippetsSGVar parse error', $_SERVER['REQUEST_URI'].$s, 2);
                 }
                 continue;
             }
@@ -1992,8 +1992,8 @@ 
 
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $value, $content);
-            } elseif($this->debug) {
-                $this->addLog('evalSnippets parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('evalSnippets parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
 
@@ -2084,7 +2084,7 @@ 
             $eventtime = sprintf('%2.2f ms', $eventtime * 1000);
             $code = str_replace("\t", '  ', $this->htmlspecialchars($value));
             $piece = str_replace("\t", '  ', $this->htmlspecialchars($piece));
-            $print_r_params = str_replace("\t", '  ', $this->htmlspecialchars('$modx->event->params = ' . print_r($params, true)));
+            $print_r_params = str_replace("\t", '  ', $this->htmlspecialchars('$modx->event->params = '.print_r($params, true)));
             $this->snippetsCode .= sprintf('<fieldset style="margin:1em;"><legend><b>%s</b>(%s)</legend><pre style="white-space: pre-wrap;background-color:#fff;width:90%%;">[[%s]]</pre><pre style="white-space: pre-wrap;background-color:#fff;width:90%%;">%s</pre><pre style="white-space: pre-wrap;background-color:#fff;width:90%%;">%s</pre></fieldset>', $snippetObject['name'], $eventtime, $piece, $print_r_params, $code);
             $this->snippetsTime[] = array('sname' => $key, 'time' => $eventtime);
         }
@@ -2328,7 +2328,7 @@ 
             $rs = $this->db->select('name,snippet,properties', '[+prefix+]site_snippets', $where);
             $count = $this->db->getRecordCount($rs);
             if (1 < $count) {
-                exit('Error $modx->_getSnippetObject()' . $snip_name);
+                exit('Error $modx->_getSnippetObject()'.$snip_name);
             }
             if ($count) {
                 $row = $this->db->getRow($rs);
@@ -2354,7 +2354,7 @@ 
     public function toAlias($text)
     {
         $suff = $this->config['friendly_url_suffix'];
-        return str_replace(array('.xml' . $suff, '.rss' . $suff, '.js' . $suff, '.css' . $suff, '.txt' . $suff, '.json' . $suff, '.pdf' . $suff), array('.xml', '.rss', '.js', '.css', '.txt', '.json', '.pdf'), $text);
+        return str_replace(array('.xml'.$suff, '.rss'.$suff, '.js'.$suff, '.css'.$suff, '.txt'.$suff, '.json'.$suff, '.pdf'.$suff), array('.xml', '.rss', '.js', '.css', '.txt', '.json', '.pdf'), $text);
     }
 
     /**
@@ -2386,7 +2386,7 @@ 
                 $suff = '/';
             }
 
-            $url = ($dir != '' ? $dir . '/' : '') . $pre . $alias . $suff;
+            $url = ($dir != '' ? $dir.'/' : '').$pre.$alias.$suff;
         }
 
         $evtOut = $this->invokeEvent('OnMakeDocUrl', array(
@@ -2423,7 +2423,7 @@ 
                 preg_match_all('!\[\~([0-9]+)\~\]!ise', $documentSource, $match);
                 $ids = implode(',', array_unique($match['1']));
                 if ($ids) {
-                    $res = $this->db->select("id,alias,isfolder,parent,alias_visible", $this->getFullTableName('site_content'), "id IN (" . $ids . ") AND isfolder = '0'");
+                    $res = $this->db->select("id,alias,isfolder,parent,alias_visible", $this->getFullTableName('site_content'), "id IN (".$ids.") AND isfolder = '0'");
                     while ($row = $this->db->getRow($res)) {
                         if ($this->config['use_alias_path'] == '1' && $row['parent'] != 0) {
                             $parent = $row['parent'];
@@ -2434,7 +2434,7 @@ 
                                 $parent = $this->aliasListing[$parent]['parent'];
                             }
 
-                            $aliases[$row['id']] = $path . '/' . $row['alias'];
+                            $aliases[$row['id']] = $path.'/'.$row['alias'];
                         } else {
                             $aliases[$row['id']] = $row['alias'];
                         }
@@ -2446,7 +2446,7 @@ 
             $isfriendly = ($this->config['friendly_alias_urls'] == 1 ? 1 : 0);
             $pref = $this->config['friendly_url_prefix'];
             $suff = $this->config['friendly_url_suffix'];
-            $documentSource = preg_replace_callback($in, function ($m) use ($aliases, $isfolder, $isfriendly, $pref, $suff) {
+            $documentSource = preg_replace_callback($in, function($m) use ($aliases, $isfolder, $isfriendly, $pref, $suff) {
                 global $modx;
                 $thealias = $aliases[$m[1]];
                 $thefolder = $isfolder[$m[1]];
@@ -2462,7 +2462,7 @@ 
 
         } else {
             $in = '!\[\~([0-9]+)\~\]!is';
-            $out = "index.php?id=" . '\1';
+            $out = "index.php?id=".'\1';
             $documentSource = preg_replace($in, $out, $documentSource);
         }
 
@@ -2483,7 +2483,7 @@ 
         $scheme = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http';
         $len_base_url = strlen($this->config['base_url']);
 
-        $url_path = $q;//LANG
+        $url_path = $q; //LANG
 
         if (substr($url_path, 0, $len_base_url) === $this->config['base_url']) {
             $url_path = substr($url_path, $len_base_url);
@@ -2495,7 +2495,7 @@ 
             $strictURL = substr($strictURL, $len_base_url);
         }
         $http_host = $_SERVER['HTTP_HOST'];
-        $requestedURL = "{$scheme}://{$http_host}" . '/' . $q; //LANG
+        $requestedURL = "{$scheme}://{$http_host}".'/'.$q; //LANG
 
         $site_url = $this->config['site_url'];
 
@@ -2511,7 +2511,7 @@ 
                 }
                 if ($this->config['base_url'] != $_SERVER['REQUEST_URI']) {
                     if (empty($_POST)) {
-                        if (($this->config['base_url'] . '?' . $qstring) != $_SERVER['REQUEST_URI']) {
+                        if (($this->config['base_url'].'?'.$qstring) != $_SERVER['REQUEST_URI']) {
                             $this->sendRedirect($url, 0, 'REDIRECT_HEADER', 'HTTP/1.0 301 Moved Permanently');
                             exit(0);
                         }
@@ -2574,7 +2574,7 @@ 
                 $docgrp = implode(",", $docgrp);
             }
             // get document
-            $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
+            $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='".$_SESSION['mgrRole']."' OR sc.privatemgr=0").(!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
             $rs = $this->db->select('sc.*', "{$tblsc} sc
                 LEFT JOIN {$tbldg} dg ON dg.document = sc.id", "sc.{$method} = '{$identifier}' AND ({$access})", "", 1);
             if ($this->db->getRecordCount($rs) < 1) {
@@ -2610,9 +2610,9 @@ 
             }
             if ($documentObject['template']) {
                 // load TVs and merge with document - Orig by Apodigm - Docvars
-                $rs = $this->db->select("tv.*, IF(tvc.value!='',tvc.value,tv.default_text) as value", $this->getFullTableName("site_tmplvars") . " tv
-                INNER JOIN " . $this->getFullTableName("site_tmplvar_templates") . " tvtpl ON tvtpl.tmplvarid = tv.id
-                LEFT JOIN " . $this->getFullTableName("site_tmplvar_contentvalues") . " tvc ON tvc.tmplvarid=tv.id AND tvc.contentid = '{$documentObject['id']}'", "tvtpl.templateid = '{$documentObject['template']}'");
+                $rs = $this->db->select("tv.*, IF(tvc.value!='',tvc.value,tv.default_text) as value", $this->getFullTableName("site_tmplvars")." tv
+                INNER JOIN " . $this->getFullTableName("site_tmplvar_templates")." tvtpl ON tvtpl.tmplvarid = tv.id
+                LEFT JOIN " . $this->getFullTableName("site_tmplvar_contentvalues")." tvc ON tvc.tmplvarid=tv.id AND tvc.contentid = '{$documentObject['id']}'", "tvtpl.templateid = '{$documentObject['template']}'");
                 $tmplvars = array();
                 while ($row = $this->db->getRow($rs)) {
                     $tmplvars[$row['name']] = array(
@@ -2658,7 +2658,7 @@ 
                 $st = md5($source);
             }
             if ($this->dumpSnippets == 1) {
-                $this->snippetsCode .= "<fieldset><legend><b style='color: #821517;'>PARSE PASS " . ($i + 1) . "</b></legend><p>The following snippets (if any) were parsed during this pass.</p>";
+                $this->snippetsCode .= "<fieldset><legend><b style='color: #821517;'>PARSE PASS ".($i + 1)."</b></legend><p>The following snippets (if any) were parsed during this pass.</p>";
             }
 
             // invoke OnParseDocument event
@@ -2744,7 +2744,7 @@ 
 
             // Check use_alias_path and check if $this->virtualDir is set to anything, then parse the path
             if ($this->config['use_alias_path'] == 1) {
-                $alias = (strlen($this->virtualDir) > 0 ? $this->virtualDir . '/' : '') . $this->documentIdentifier;
+                $alias = (strlen($this->virtualDir) > 0 ? $this->virtualDir.'/' : '').$this->documentIdentifier;
                 if (isset($this->documentListing[$alias])) {
                     $this->documentIdentifier = $this->documentListing[$alias];
                 } else {
@@ -2805,7 +2805,7 @@ 
                 } else {
                     $docAlias = $this->db->escape($this->documentIdentifier);
                     $rs = $this->db->select('id', $this->getFullTableName('site_content'), "deleted=0 and alias='{$docAlias}'");
-                    $this->documentIdentifier = (int)$this->db->getValue($rs);
+                    $this->documentIdentifier = (int) $this->db->getValue($rs);
                 }
             }
             $this->documentMethod = 'id';
@@ -2858,7 +2858,7 @@ 
                 $_REQUEST[$n] = $_GET[$n] = $v;
             }
         }
-        $_SERVER['PHP_SELF'] = $this->config['base_url'] . $qp['path'];
+        $_SERVER['PHP_SELF'] = $this->config['base_url'].$qp['path'];
         $this->q = $qp['path'];
         return $qp['path'];
     }
@@ -2952,7 +2952,7 @@ 
             $this->sendErrorPage();
         } else {
             // Inculde the necessary files to check document permissions
-            include_once(MODX_MANAGER_PATH . 'processors/user_documents_permissions.class.php');
+            include_once(MODX_MANAGER_PATH.'processors/user_documents_permissions.class.php');
             $udperms = new udperms();
             $udperms->user = $this->getLoginUserID();
             $udperms->document = $this->documentIdentifier;
@@ -3006,7 +3006,7 @@ 
         while ($id && $height--) {
             $thisid = $id;
             if ($this->config['aliaslistingfolder'] == 1) {
-                $id = isset($this->aliasListing[$id]['parent']) ? $this->aliasListing[$id]['parent'] : $this->db->getValue("SELECT `parent` FROM " . $this->getFullTableName("site_content") . " WHERE `id` = '{$id}' LIMIT 0,1");
+                $id = isset($this->aliasListing[$id]['parent']) ? $this->aliasListing[$id]['parent'] : $this->db->getValue("SELECT `parent` FROM ".$this->getFullTableName("site_content")." WHERE `id` = '{$id}' LIMIT 0,1");
                 if (!$id || $id == '0') {
                     break;
                 }
@@ -3057,15 +3057,15 @@ 
 
         if ($this->config['aliaslistingfolder'] == 1) {
 
-            $res = $this->db->select("id,alias,isfolder,parent", $this->getFullTableName('site_content'), "parent IN (" . $id . ") AND deleted = '0'");
+            $res = $this->db->select("id,alias,isfolder,parent", $this->getFullTableName('site_content'), "parent IN (".$id.") AND deleted = '0'");
             $idx = array();
             while ($row = $this->db->getRow($res)) {
                 $pAlias = '';
                 if (isset($this->aliasListing[$row['parent']])) {
-                    $pAlias .= !empty($this->aliasListing[$row['parent']]['path']) ? $this->aliasListing[$row['parent']]['path'] . '/' : '';
-                    $pAlias .= !empty($this->aliasListing[$row['parent']]['alias']) ? $this->aliasListing[$row['parent']]['alias'] . '/' : '';
+                    $pAlias .= !empty($this->aliasListing[$row['parent']]['path']) ? $this->aliasListing[$row['parent']]['path'].'/' : '';
+                    $pAlias .= !empty($this->aliasListing[$row['parent']]['alias']) ? $this->aliasListing[$row['parent']]['alias'].'/' : '';
                 };
-                $children[$pAlias . $row['alias']] = $row['id'];
+                $children[$pAlias.$row['alias']] = $row['id'];
                 if ($row['isfolder'] == 1) {
                     $idx[] = $row['id'];
                 }
@@ -3097,7 +3097,7 @@ 
                 $depth--;
 
                 foreach ($documentMap_cache[$id] as $childId) {
-                    $pkey = (strlen($this->aliasListing[$childId]['path']) ? "{$this->aliasListing[$childId]['path']}/" : '') . $this->aliasListing[$childId]['alias'];
+                    $pkey = (strlen($this->aliasListing[$childId]['path']) ? "{$this->aliasListing[$childId]['path']}/" : '').$this->aliasListing[$childId]['alias'];
                     if (!strlen($pkey)) {
                         $pkey = "{$childId}";
                     }
@@ -3126,7 +3126,7 @@ 
         if (substr(strtolower($url), 0, 11) == "javascript:") {
             $fnc = substr($url, 11);
         } elseif ($url) {
-            $fnc = "window.location.href='" . addslashes($url) . "';";
+            $fnc = "window.location.href='".addslashes($url)."';";
         } else {
             $fnc = "history.back(-1);";
         }
@@ -3135,7 +3135,7 @@ 
             <meta http-equiv=\"Content-Type\" content=\"text/html; charset={$modx_manager_charset};\">
             <script>
                 function __alertQuit() {
-                    alert('" . addslashes($msg) . "');
+                    alert('".addslashes($msg)."');
                     {$fnc}
                 }
                 window.setTimeout('__alertQuit();',100);
@@ -3159,7 +3159,7 @@ 
         if ($pms) {
             $state = ($pms[$pm] === 1);
         }
-        return (int)$state;
+        return (int) $state;
     }
 
     /**
@@ -3172,8 +3172,8 @@ 
      */
     public function elementIsLocked($type, $id, $includeThisUser = false)
     {
-        $id = (int)$id;
-        $type = (int)$type;
+        $id = (int) $id;
+        $type = (int) $type;
         if (!$type || !$id) {
             return null;
         }
@@ -3223,7 +3223,7 @@ 
             return $lockedElements;
         }
 
-        $type = (int)$type;
+        $type = (int) $type;
         if (isset($lockedElements[$type])) {
             return $lockedElements[$type];
         } else {
@@ -3240,7 +3240,7 @@ 
             $this->lockedElements = array();
             $this->cleanupExpiredLocks();
 
-            $rs = $this->db->select('sid,internalKey,elementType,elementId,lasthit,username', $this->getFullTableName('active_user_locks') . " ul
+            $rs = $this->db->select('sid,internalKey,elementType,elementId,lasthit,username', $this->getFullTableName('active_user_locks')." ul
                 LEFT JOIN {$this->getFullTableName('manager_users')} mu on ul.internalKey = mu.id");
             while ($row = $this->db->getRow($rs)) {
                 $this->lockedElements[$row['elementType']][$row['elementId']] = array(
@@ -3263,7 +3263,7 @@ 
     public function cleanupExpiredLocks()
     {
         // Clean-up active_user_sessions first
-        $timeout = (int)$this->config['session_timeout'] < 2 ? 120 : $this->config['session_timeout'] * 60; // session.js pings every 10min, updateMail() in mainMenu pings every minute, so 2min is minimum
+        $timeout = (int) $this->config['session_timeout'] < 2 ? 120 : $this->config['session_timeout'] * 60; // session.js pings every 10min, updateMail() in mainMenu pings every minute, so 2min is minimum
         $validSessionTimeLimit = $this->time - $timeout;
         $this->db->delete($this->getFullTableName('active_user_sessions'), "lasthit < {$validSessionTimeLimit}");
 
@@ -3276,7 +3276,7 @@ 
             foreach ($rs as $row) {
                 $userSids[] = $row['sid'];
             }
-            $userSids = "'" . implode("','", $userSids) . "'";
+            $userSids = "'".implode("','", $userSids)."'";
             $this->db->delete($this->getFullTableName('active_user_locks'), "sid NOT IN({$userSids})");
         } else {
             $this->db->delete($this->getFullTableName('active_user_locks'));
@@ -3360,8 +3360,8 @@ 
     public function lockElement($type, $id)
     {
         $userId = $this->isBackend() && $_SESSION['mgrInternalKey'] ? $_SESSION['mgrInternalKey'] : 0;
-        $type = (int)$type;
-        $id = (int)$id;
+        $type = (int) $type;
+        $id = (int) $id;
         if (!$type || !$id || !$userId) {
             return false;
         }
@@ -3382,8 +3382,8 @@ 
     public function unlockElement($type, $id, $includeAllUsers = false)
     {
         $userId = $this->isBackend() && $_SESSION['mgrInternalKey'] ? $_SESSION['mgrInternalKey'] : 0;
-        $type = (int)$type;
-        $id = (int)$id;
+        $type = (int) $type;
+        $id = (int) $id;
         if (!$type || !$id) {
             return false;
         }
@@ -3450,8 +3450,8 @@ 
         }
 
         $usertype = $this->isFrontend() ? 1 : 0;
-        $evtid = (int)$evtid;
-        $type = (int)$type;
+        $evtid = (int) $evtid;
+        $type = (int) $type;
 
         // Types: 1 = information, 2 = warning, 3 = error
         if ($type < 1) {
@@ -3473,8 +3473,8 @@ 
         if (isset($this->config['send_errormail']) && $this->config['send_errormail'] !== '0') {
             if ($this->config['send_errormail'] <= $type) {
                 $this->sendmail(array(
-                    'subject' => 'MODX System Error on ' . $this->config['site_name'],
-                    'body' => 'Source: ' . $source . ' - The details of the error could be seen in the MODX system events log.',
+                    'subject' => 'MODX System Error on '.$this->config['site_name'],
+                    'body' => 'Source: '.$source.' - The details of the error could be seen in the MODX system events log.',
                     'type' => 'text'
                 ));
             }
@@ -3522,7 +3522,7 @@ 
             $p['fromname'] = $userinfo['username'];
         }
         if ($msg === '' && !isset($p['body'])) {
-            $p['body'] = $_SERVER['REQUEST_URI'] . "\n" . $_SERVER['HTTP_USER_AGENT'] . "\n" . $_SERVER['HTTP_REFERER'];
+            $p['body'] = $_SERVER['REQUEST_URI']."\n".$_SERVER['HTTP_USER_AGENT']."\n".$_SERVER['HTTP_REFERER'];
         } elseif (is_string($msg) && 0 < strlen($msg)) {
             $p['body'] = $msg;
         }
@@ -3562,8 +3562,8 @@ 
             $files = array();
         }
         foreach ($files as $f) {
-            if (file_exists(MODX_BASE_PATH . $f) && is_file(MODX_BASE_PATH . $f) && is_readable(MODX_BASE_PATH . $f)) {
-                $this->mail->AddAttachment(MODX_BASE_PATH . $f);
+            if (file_exists(MODX_BASE_PATH.$f) && is_file(MODX_BASE_PATH.$f) && is_readable(MODX_BASE_PATH.$f)) {
+                $this->mail->AddAttachment(MODX_BASE_PATH.$f);
             }
         }
         $rs = $this->mail->send();
@@ -3608,7 +3608,7 @@ 
      */
     public function isFrontend()
     {
-        return ! $this->isBackend();
+        return !$this->isBackend();
     }
 
     /**
@@ -3633,14 +3633,14 @@ 
         $tblsc = $this->getFullTableName("site_content");
         $tbldg = $this->getFullTableName("document_groups");
         // modify field names to use sc. table reference
-        $fields = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
-        $sort = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
+        $fields = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
+        $sort = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
         // get document groups for current user
         if ($docgrp = $this->getUserDocGroups()) {
             $docgrp = implode(",", $docgrp);
         }
         // build query
-        $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
+        $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='".$_SESSION['mgrRole']."' OR sc.privatemgr=0").(!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
         $result = $this->db->select("DISTINCT {$fields}", "{$tblsc} sc
                 LEFT JOIN {$tbldg} dg on dg.document = sc.id", "sc.parent = '{$id}' AND ({$access}) GROUP BY sc.id", "{$sort} {$dir}");
         $resourceArray = $this->db->makeArray($result);
@@ -3670,14 +3670,14 @@ 
         $tbldg = $this->getFullTableName("document_groups");
 
         // modify field names to use sc. table reference
-        $fields = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
-        $sort = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
+        $fields = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
+        $sort = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
         // get document groups for current user
         if ($docgrp = $this->getUserDocGroups()) {
             $docgrp = implode(",", $docgrp);
         }
         // build query
-        $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
+        $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='".$_SESSION['mgrRole']."' OR sc.privatemgr=0").(!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
         $result = $this->db->select("DISTINCT {$fields}", "{$tblsc} sc
                 LEFT JOIN {$tbldg} dg on dg.document = sc.id", "sc.parent = '{$id}' AND sc.published=1 AND sc.deleted=0 AND ({$access}) GROUP BY sc.id", "{$sort} {$dir}");
         $resourceArray = $this->db->makeArray($result);
@@ -3712,16 +3712,16 @@ 
             return $this->tmpCache[__FUNCTION__][$cacheKey];
         }
 
-        $published = ($published !== 'all') ? 'AND sc.published = ' . $published : '';
-        $deleted = ($deleted !== 'all') ? 'AND sc.deleted = ' . $deleted : '';
+        $published = ($published !== 'all') ? 'AND sc.published = '.$published : '';
+        $deleted = ($deleted !== 'all') ? 'AND sc.deleted = '.$deleted : '';
 
         if ($where != '') {
-            $where = 'AND ' . $where;
+            $where = 'AND '.$where;
         }
 
         // modify field names to use sc. table reference
-        $fields = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
-        $sort = ($sort == '') ? '' : 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
+        $fields = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
+        $sort = ($sort == '') ? '' : 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
 
         // get document groups for current user
         if ($docgrp = $this->getUserDocGroups()) {
@@ -3729,7 +3729,7 @@ 
         }
 
         // build query
-        $access = ($this->isFrontend() ? 'sc.privateweb=0' : '1="' . $_SESSION['mgrRole'] . '" OR sc.privatemgr=0') . (!$docgrp ? '' : ' OR dg.document_group IN (' . $docgrp . ')');
+        $access = ($this->isFrontend() ? 'sc.privateweb=0' : '1="'.$_SESSION['mgrRole'].'" OR sc.privatemgr=0').(!$docgrp ? '' : ' OR dg.document_group IN ('.$docgrp.')');
 
         $tblsc = $this->getFullTableName('site_content');
         $tbldg = $this->getFullTableName('document_groups');
@@ -3781,10 +3781,10 @@ 
             return false;
         } else {
             // modify field names to use sc. table reference
-            $fields = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
-            $sort = ($sort == '') ? '' : 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
+            $fields = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
+            $sort = ($sort == '') ? '' : 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
             if ($where != '') {
-                $where = 'AND ' . $where;
+                $where = 'AND '.$where;
             }
 
             $published = ($published !== 'all') ? "AND sc.published = '{$published}'" : '';
@@ -3795,13 +3795,13 @@ 
                 $docgrp = implode(',', $docgrp);
             }
 
-            $access = ($this->isFrontend() ? 'sc.privateweb=0' : '1="' . $_SESSION['mgrRole'] . '" OR sc.privatemgr=0') . (!$docgrp ? '' : ' OR dg.document_group IN (' . $docgrp . ')');
+            $access = ($this->isFrontend() ? 'sc.privateweb=0' : '1="'.$_SESSION['mgrRole'].'" OR sc.privatemgr=0').(!$docgrp ? '' : ' OR dg.document_group IN ('.$docgrp.')');
 
             $tblsc = $this->getFullTableName('site_content');
             $tbldg = $this->getFullTableName('document_groups');
 
             $result = $this->db->select("DISTINCT {$fields}", "{$tblsc} sc
-                    LEFT JOIN {$tbldg} dg on dg.document = sc.id", "(sc.id IN (" . implode(',', $ids) . ") {$published} {$deleted} {$where}) AND ({$access}) GROUP BY sc.id", ($sort ? "{$sort} {$dir}" : ""), $limit);
+                    LEFT JOIN {$tbldg} dg on dg.document = sc.id", "(sc.id IN (".implode(',', $ids).") {$published} {$deleted} {$where}) AND ({$access}) GROUP BY sc.id", ($sort ? "{$sort} {$dir}" : ""), $limit);
 
             $resourceArray = $this->db->makeArray($result);
 
@@ -3906,12 +3906,12 @@ 
             $tbldg = $this->getFullTableName("document_groups");
             $activeSql = $active == 1 ? "AND sc.published=1 AND sc.deleted=0" : "";
             // modify field names to use sc. table reference
-            $fields = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
+            $fields = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
             // get document groups for current user
             if ($docgrp = $this->getUserDocGroups()) {
                 $docgrp = implode(",", $docgrp);
             }
-            $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
+            $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='".$_SESSION['mgrRole']."' OR sc.privatemgr=0").(!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
             $result = $this->db->select($fields, "{$tblsc} sc LEFT JOIN {$tbldg} dg on dg.document = sc.id", "(sc.id='{$pageid}' {$activeSql}) AND ({$access})", "", 1);
             $pageInfo = $this->db->getRow($result);
 
@@ -3958,7 +3958,7 @@ 
     {
         if ($this->currentSnippet) {
             $tbl = $this->getFullTableName("site_snippets");
-            $rs = $this->db->select('id', $tbl, "name='" . $this->db->escape($this->currentSnippet) . "'", '', 1);
+            $rs = $this->db->select('id', $tbl, "name='".$this->db->escape($this->currentSnippet)."'", '', 1);
             if ($snippetId = $this->db->getValue($rs)) {
                 return $snippetId;
             }
@@ -3985,23 +3985,23 @@ 
      */
     public function clearCache($type = '', $report = false)
     {
-        $cache_dir = MODX_BASE_PATH . $this->getCacheFolder();
+        $cache_dir = MODX_BASE_PATH.$this->getCacheFolder();
         if (is_array($type)) {
             foreach ($type as $_) {
                 $this->clearCache($_, $report);
             }
         } elseif ($type == 'full') {
-            include_once(MODX_MANAGER_PATH . 'processors/cache_sync.class.processor.php');
+            include_once(MODX_MANAGER_PATH.'processors/cache_sync.class.processor.php');
             $sync = new synccache();
             $sync->setCachepath($cache_dir);
             $sync->setReport($report);
             $sync->emptyCache();
         } elseif (preg_match('@^[1-9][0-9]*$@', $type)) {
             $key = ($this->config['cache_type'] == 2) ? $this->makePageCacheKey($type) : $type;
-            $file_name = "docid_" . $key . "_*.pageCache.php";
-            $cache_path = $cache_dir . $file_name;
+            $file_name = "docid_".$key."_*.pageCache.php";
+            $cache_path = $cache_dir.$file_name;
             $files = glob($cache_path);
-            $files[] = $cache_dir . "docid_" . $key . ".pageCache.php";
+            $files[] = $cache_dir."docid_".$key.".pageCache.php";
             foreach ($files as $file) {
                 if (!is_file($file)) {
                     continue;
@@ -4009,7 +4009,7 @@ 
                 unlink($file);
             }
         } else {
-            $files = glob($cache_dir . '*');
+            $files = glob($cache_dir.'*');
             foreach ($files as $file) {
                 $name = basename($file);
                 if (strpos($name, '.pageCache.php') === false) {
@@ -4078,7 +4078,7 @@ 
                         $f_url_suffix = '/';
                     }
 
-                    $alPath = !empty ($al['path']) ? $al['path'] . '/' : '';
+                    $alPath = !empty ($al['path']) ? $al['path'].'/' : '';
 
                     if ($al && $al['alias']) {
                         $alias = $al['alias'];
@@ -4086,7 +4086,7 @@ 
 
                 }
 
-                $alias = $alPath . $f_url_prefix . $alias . $f_url_suffix;
+                $alias = $alPath.$f_url_prefix.$alias.$f_url_suffix;
                 $url = "{$alias}{$args}";
             } else {
                 $url = "index.php?id={$id}{$args}";
@@ -4105,7 +4105,7 @@ 
             }
 
             //TODO: check to make sure that $site_url incudes the url :port (e.g. :8080)
-            $host = $scheme == 'full' ? $this->config['site_url'] : $scheme . '://' . $_SERVER['HTTP_HOST'] . $host;
+            $host = $scheme == 'full' ? $this->config['site_url'] : $scheme.'://'.$_SERVER['HTTP_HOST'].$host;
         }
 
         //fix strictUrl by Bumkaka
@@ -4114,9 +4114,9 @@ 
         }
 
         if ($this->config['xhtml_urls']) {
-            $url = preg_replace("/&(?!amp;)/", "&amp;", $host . $virtualDir . $url);
+            $url = preg_replace("/&(?!amp;)/", "&amp;", $host.$virtualDir.$url);
         } else {
-            $url = $host . $virtualDir . $url;
+            $url = $host.$virtualDir.$url;
         }
 
         $evtOut = $this->invokeEvent('OnMakeDocUrl', array(
@@ -4140,21 +4140,21 @@ 
         if (isset($this->aliasListing[$id])) {
             $out = $this->aliasListing[$id];
         } else {
-            $q = $this->db->query("SELECT id,alias,isfolder,parent FROM " . $this->getFullTableName("site_content") . " WHERE id=" . (int)$id);
+            $q = $this->db->query("SELECT id,alias,isfolder,parent FROM ".$this->getFullTableName("site_content")." WHERE id=".(int) $id);
             if ($this->db->getRecordCount($q) == '1') {
                 $q = $this->db->getRow($q);
                 $this->aliasListing[$id] = array(
-                    'id' => (int)$q['id'],
+                    'id' => (int) $q['id'],
                     'alias' => $q['alias'] == '' ? $q['id'] : $q['alias'],
-                    'parent' => (int)$q['parent'],
-                    'isfolder' => (int)$q['isfolder'],
+                    'parent' => (int) $q['parent'],
+                    'isfolder' => (int) $q['isfolder'],
                 );
                 if ($this->aliasListing[$id]['parent'] > 0) {
                     //fix alias_path_usage
                     if ($this->config['use_alias_path'] == '1') {
                         //&& $tmp['path'] != '' - fix error slash with epty path
                         $tmp = $this->getAliasListing($this->aliasListing[$id]['parent']);
-                        $this->aliasListing[$id]['path'] = $tmp['path'] . ($tmp['alias_visible'] ? (($tmp['parent'] > 0 && $tmp['path'] != '') ? '/' : '') . $tmp['alias'] : '');
+                        $this->aliasListing[$id]['path'] = $tmp['path'].($tmp['alias_visible'] ? (($tmp['parent'] > 0 && $tmp['path'] != '') ? '/' : '').$tmp['alias'] : '');
                     } else {
                         $this->aliasListing[$id]['path'] = '';
                     }
@@ -4195,7 +4195,7 @@ 
         $out = array();
         if (empty($this->version) || !is_array($this->version)) {
             //include for compatibility modx version < 1.0.10
-            include MODX_MANAGER_PATH . "includes/version.inc.php";
+            include MODX_MANAGER_PATH."includes/version.inc.php";
             $this->version = array();
             $this->version['version'] = isset($modx_version) ? $modx_version : '';
             $this->version['branch'] = isset($modx_branch) ? $modx_branch : '';
@@ -4217,18 +4217,18 @@ 
     {
         if (isset ($this->snippetCache[$snippetName])) {
             $snippet = $this->snippetCache[$snippetName];
-            $properties = !empty($this->snippetCache[$snippetName . "Props"]) ? $this->snippetCache[$snippetName . "Props"] : '';
+            $properties = !empty($this->snippetCache[$snippetName."Props"]) ? $this->snippetCache[$snippetName."Props"] : '';
         } else { // not in cache so let's check the db
-            $sql = "SELECT ss.`name`, ss.`snippet`, ss.`properties`, sm.properties as `sharedproperties` FROM " . $this->getFullTableName("site_snippets") . " as ss LEFT JOIN " . $this->getFullTableName('site_modules') . " as sm on sm.guid=ss.moduleguid WHERE ss.`name`='" . $this->db->escape($snippetName) . "'  AND ss.disabled=0;";
+            $sql = "SELECT ss.`name`, ss.`snippet`, ss.`properties`, sm.properties as `sharedproperties` FROM ".$this->getFullTableName("site_snippets")." as ss LEFT JOIN ".$this->getFullTableName('site_modules')." as sm on sm.guid=ss.moduleguid WHERE ss.`name`='".$this->db->escape($snippetName)."'  AND ss.disabled=0;";
             $result = $this->db->query($sql);
             if ($this->db->getRecordCount($result) == 1) {
                 $row = $this->db->getRow($result);
                 $snippet = $this->snippetCache[$snippetName] = $row['snippet'];
                 $mergedProperties = array_merge($this->parseProperties($row['properties']), $this->parseProperties($row['sharedproperties']));
-                $properties = $this->snippetCache[$snippetName . "Props"] = json_encode($mergedProperties);
+                $properties = $this->snippetCache[$snippetName."Props"] = json_encode($mergedProperties);
             } else {
                 $snippet = $this->snippetCache[$snippetName] = "return false;";
-                $properties = $this->snippetCache[$snippetName . "Props"] = '';
+                $properties = $this->snippetCache[$snippetName."Props"] = '';
             }
         }
         // load default params/properties
@@ -4328,8 +4328,8 @@ 
             }
             if (strpos($tpl, $s) !== false) {
                 $tpl = str_replace($s, $value, $tpl);
-            } elseif($this->debug) {
-                $this->addLog('parseText parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('parseText parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
 
@@ -4378,7 +4378,7 @@ 
             case 'CODE':
                 break;
             case 'FILE':
-                $template = file_get_contents(MODX_BASE_PATH . $template);
+                $template = file_get_contents(MODX_BASE_PATH.$template);
                 break;
             case 'CHUNK':
                 $template = $this->getChunk($template);
@@ -4411,7 +4411,7 @@ 
         if ($mode !== 'formatOnly' && empty($timestamp)) {
             return '-';
         }
-        $timestamp = (int)$timestamp;
+        $timestamp = (int) $timestamp;
 
         switch ($this->config['datetime_format']) {
             case 'YYYY/mm/dd':
@@ -4431,7 +4431,7 @@ 
         }
 
         if (empty($mode)) {
-            $strTime = strftime($dateFormat . " %H:%M:%S", $timestamp);
+            $strTime = strftime($dateFormat." %H:%M:%S", $timestamp);
         } elseif ($mode == 'dateOnly') {
             $strTime = strftime($dateFormat, $timestamp);
         } elseif ($mode == 'formatOnly') {
@@ -4485,7 +4485,7 @@ 
             $S = 0;
         }
         $timeStamp = mktime($H, $M, $S, $m, $d, $Y);
-        $timeStamp = (int)$timeStamp;
+        $timeStamp = (int) $timeStamp;
         return $timeStamp;
     }
 
@@ -4527,7 +4527,7 @@ 
                     if ($v === 'value') {
                         unset($_[$i]);
                     } else {
-                        $_[$i] = 'tv.' . $v;
+                        $_[$i] = 'tv.'.$v;
                     }
                 }
                 $fields = implode(',', $_);
@@ -4536,12 +4536,12 @@ 
             }
 
             if ($tvsort != '') {
-                $tvsort = 'tv.' . implode(',tv.', array_filter(array_map('trim', explode(',', $tvsort))));
+                $tvsort = 'tv.'.implode(',tv.', array_filter(array_map('trim', explode(',', $tvsort))));
             }
             if ($tvidnames == "*") {
                 $query = "tv.id<>0";
             } else {
-                $query = (is_numeric($tvidnames[0]) ? "tv.id" : "tv.name") . " IN ('" . implode("','", $tvidnames) . "')";
+                $query = (is_numeric($tvidnames[0]) ? "tv.id" : "tv.name")." IN ('".implode("','", $tvidnames)."')";
             }
 
             $this->getUserDocGroups();
@@ -4685,7 +4685,7 @@ 
             return $this->tmpCache[__FUNCTION__][$cacheKey];
         }
 
-        if (($idnames != '*' && !is_array($idnames)) || empty($idnames) ) {
+        if (($idnames != '*' && !is_array($idnames)) || empty($idnames)) {
             return false;
         } else {
 
@@ -4703,23 +4703,23 @@ 
             }
 
             // get user defined template variables
-            $fields = ($fields == '') ? 'tv.*' : 'tv.' . implode(',tv.', array_filter(array_map('trim', explode(',', $fields))));
-            $sort = ($sort == '') ? '' : 'tv.' . implode(',tv.', array_filter(array_map('trim', explode(',', $sort))));
+            $fields = ($fields == '') ? 'tv.*' : 'tv.'.implode(',tv.', array_filter(array_map('trim', explode(',', $fields))));
+            $sort = ($sort == '') ? '' : 'tv.'.implode(',tv.', array_filter(array_map('trim', explode(',', $sort))));
 
             if ($idnames == '*') {
                 $query = 'tv.id<>0';
             } else {
-                $query = (is_numeric($idnames[0]) ? 'tv.id' : 'tv.name') . " IN ('" . implode("','", $idnames) . "')";
+                $query = (is_numeric($idnames[0]) ? 'tv.id' : 'tv.name')." IN ('".implode("','", $idnames)."')";
             }
 
-            $rs = $this->db->select("{$fields}, IF(tvc.value != '', tvc.value, tv.default_text) as value", $this->getFullTableName('site_tmplvars') . " tv
-                    INNER JOIN " . $this->getFullTableName('site_tmplvar_templates') . " tvtpl ON tvtpl.tmplvarid = tv.id
-                    LEFT JOIN " . $this->getFullTableName('site_tmplvar_contentvalues') . " tvc ON tvc.tmplvarid=tv.id AND tvc.contentid = '{$docid}'", "{$query} AND tvtpl.templateid = '{$docRow['template']}'", ($sort ? "{$sort} {$dir}" : ""));
+            $rs = $this->db->select("{$fields}, IF(tvc.value != '', tvc.value, tv.default_text) as value", $this->getFullTableName('site_tmplvars')." tv
+                    INNER JOIN " . $this->getFullTableName('site_tmplvar_templates')." tvtpl ON tvtpl.tmplvarid = tv.id
+                    LEFT JOIN " . $this->getFullTableName('site_tmplvar_contentvalues')." tvc ON tvc.tmplvarid=tv.id AND tvc.contentid = '{$docid}'", "{$query} AND tvtpl.templateid = '{$docRow['template']}'", ($sort ? "{$sort} {$dir}" : ""));
 
             $result = $this->db->makeArray($rs);
 
             // get default/built-in template variables
-            if(is_array($docRow)){
+            if (is_array($docRow)) {
                 ksort($docRow);
 
                 foreach ($docRow as $key => $value) {
@@ -4757,22 +4757,22 @@ 
      */
     public function getTemplateVarOutput($idnames = array(), $docid = '', $published = 1, $sep = '')
     {
-        if (is_array($idnames) && empty($idnames) ) {
+        if (is_array($idnames) && empty($idnames)) {
             return false;
         } else {
             $output = array();
             $vars = ($idnames == '*' || is_array($idnames)) ? $idnames : array($idnames);
 
-            $docid = (int)$docid > 0 ? (int)$docid : $this->documentIdentifier;
+            $docid = (int) $docid > 0 ? (int) $docid : $this->documentIdentifier;
             // remove sort for speed
             $result = $this->getTemplateVars($vars, '*', $docid, $published, '', '');
 
             if ($result == false) {
                 return false;
             } else {
-                $baspath = MODX_MANAGER_PATH . 'includes';
-                include_once $baspath . '/tmplvars.format.inc.php';
-                include_once $baspath . '/tmplvars.commands.inc.php';
+                $baspath = MODX_MANAGER_PATH.'includes';
+                include_once $baspath.'/tmplvars.format.inc.php';
+                include_once $baspath.'/tmplvars.commands.inc.php';
 
                 for ($i = 0; $i < count($result); $i++) {
                     $row = $result[$i];
@@ -4797,7 +4797,7 @@ 
      */
     public function getFullTableName($tbl)
     {
-        return $this->db->config['dbase'] . ".`" . $this->db->config['table_prefix'] . $tbl . "`";
+        return $this->db->config['dbase'].".`".$this->db->config['table_prefix'].$tbl."`";
     }
 
     /**
@@ -4876,7 +4876,7 @@ 
     public function getCachePath()
     {
         global $base_url;
-        $pth = $base_url . $this->getCacheFolder();
+        $pth = $base_url.$this->getCacheFolder();
         return $pth;
     }
 
@@ -4928,8 +4928,8 @@ 
         $out = false;
 
         if (!empty($context)) {
-            if (is_scalar($context) && isset($_SESSION[$context . 'Validated'])) {
-                $out = $_SESSION[$context . 'InternalKey'];
+            if (is_scalar($context) && isset($_SESSION[$context.'Validated'])) {
+                $out = $_SESSION[$context.'InternalKey'];
             }
         } else {
             switch (true) {
@@ -4957,8 +4957,8 @@ 
         $out = false;
 
         if (!empty($context)) {
-            if (is_scalar($context) && isset($_SESSION[$context . 'Validated'])) {
-                $out = $_SESSION[$context . 'Shortname'];
+            if (is_scalar($context) && isset($_SESSION[$context.'Validated'])) {
+                $out = $_SESSION[$context.'Shortname'];
             }
         } else {
             switch (true) {
@@ -5029,8 +5029,8 @@ 
      */
     public function getWebUserInfo($uid)
     {
-        $rs = $this->db->select('wu.username, wu.password, wua.*', $this->getFullTableName("web_users") . " wu
-                INNER JOIN " . $this->getFullTableName("web_user_attributes") . " wua ON wua.internalkey=wu.id", "wu.id='{$uid}'");
+        $rs = $this->db->select('wu.username, wu.password, wua.*', $this->getFullTableName("web_users")." wu
+                INNER JOIN " . $this->getFullTableName("web_user_attributes")." wua ON wua.internalkey=wu.id", "wu.id='{$uid}'");
         if ($row = $this->db->getRow($rs)) {
             if (!isset($row['usertype']) or !$row["usertype"]) {
                 $row["usertype"] = "web";
@@ -5066,7 +5066,7 @@ 
         } else if (is_array($dg)) {
             // resolve ids to names
             $dgn = array();
-            $ds = $this->db->select('name', $this->getFullTableName("documentgroup_names"), "id IN (" . implode(",", $dg) . ")");
+            $ds = $this->db->select('name', $this->getFullTableName("documentgroup_names"), "id IN (".implode(",", $dg).")");
             while ($row = $this->db->getRow($ds)) {
                 $dgn[] = $row['name'];
             }
@@ -5094,7 +5094,7 @@ 
         $rt = false;
         if ($_SESSION["webValidated"] == 1) {
             $tbl = $this->getFullTableName("web_users");
-            $ds = $this->db->select('id, username, password', $tbl, "id='" . $this->getLoginUserID() . "'");
+            $ds = $this->db->select('id, username, password', $tbl, "id='".$this->getLoginUserID()."'");
             if ($row = $this->db->getRow($ds)) {
                 if ($row["password"] == md5($oldPwd)) {
                     if (strlen($newPwd) < 6) {
@@ -5104,7 +5104,7 @@ 
                     } else {
                         $this->db->update(array(
                             'password' => $this->db->escape($newPwd),
-                        ), $tbl, "id='" . $this->getLoginUserID() . "'");
+                        ), $tbl, "id='".$this->getLoginUserID()."'");
                         // invoke OnWebChangePassword event
                         $this->invokeEvent("OnWebChangePassword", array(
                             "userid" => $row["id"],
@@ -5135,8 +5135,8 @@ 
         // check cache
         $grpNames = isset ($_SESSION['webUserGroupNames']) ? $_SESSION['webUserGroupNames'] : false;
         if (!is_array($grpNames)) {
-            $rs = $this->db->select('wgn.name', $this->getFullTableName("webgroup_names") . " wgn
-                    INNER JOIN " . $this->getFullTableName("web_groups") . " wg ON wg.webgroup=wgn.id AND wg.webuser='" . $this->getLoginUserID() . "'");
+            $rs = $this->db->select('wgn.name', $this->getFullTableName("webgroup_names")." wgn
+                    INNER JOIN " . $this->getFullTableName("web_groups")." wg ON wg.webgroup=wgn.id AND wg.webuser='".$this->getLoginUserID()."'");
             $grpNames = $this->db->getColumn("name", $rs);
             // save to cache
             $_SESSION['webUserGroupNames'] = $grpNames;
@@ -5169,7 +5169,7 @@ 
         if (strpos(strtolower($src), "<style") !== false || strpos(strtolower($src), "<link") !== false) {
             $this->sjscripts[$nextpos] = $src;
         } else {
-            $this->sjscripts[$nextpos] = "\t" . '<link rel="stylesheet" type="text/css" href="' . $src . '" ' . ($media ? 'media="' . $media . '" ' : '') . '/>';
+            $this->sjscripts[$nextpos] = "\t".'<link rel="stylesheet" type="text/css" href="'.$src.'" '.($media ? 'media="'.$media.'" ' : '').'/>';
         }
     }
 
@@ -5248,7 +5248,7 @@ 
         }
 
         if ($useThisVer && $plaintext != true && (strpos(strtolower($src), "<script") === false)) {
-            $src = "\t" . '<script type="text/javascript" src="' . $src . '"></script>';
+            $src = "\t".'<script type="text/javascript" src="'.$src.'"></script>';
         }
         if ($startup) {
             $pos = isset($overwritepos) ? $overwritepos : max(array_merge(array(0), array_keys($this->sjscripts))) + 1;
@@ -5395,7 +5395,7 @@ 
                 $eventtime = $this->getMicroTime() - $eventtime;
                 $this->pluginsCode .= sprintf('<fieldset><legend><b>%s / %s</b> (%2.2f ms)</legend>', $evtName, $pluginName, $eventtime * 1000);
                 foreach ($parameter as $k => $v) {
-                    $this->pluginsCode .= "{$k} => " . print_r($v, true) . '<br>';
+                    $this->pluginsCode .= "{$k} => ".print_r($v, true).'<br>';
                 }
                 $this->pluginsCode .= '</fieldset><br />';
                 $this->pluginsTime["{$evtName} / {$pluginName}"] += $eventtime;
@@ -5423,13 +5423,13 @@ 
         $plugin = array();
         if (isset ($this->pluginCache[$pluginName])) {
             $pluginCode = $this->pluginCache[$pluginName];
-            $pluginProperties = isset($this->pluginCache[$pluginName . "Props"]) ? $this->pluginCache[$pluginName . "Props"] : '';
+            $pluginProperties = isset($this->pluginCache[$pluginName."Props"]) ? $this->pluginCache[$pluginName."Props"] : '';
         } else {
             $pluginName = $this->db->escape($pluginName);
             $result = $this->db->select('name, plugincode, properties', $this->getFullTableName("site_plugins"), "name='{$pluginName}' AND disabled=0");
             if ($row = $this->db->getRow($result)) {
                 $pluginCode = $this->pluginCache[$row['name']] = $row['plugincode'];
-                $pluginProperties = $this->pluginCache[$row['name'] . "Props"] = $row['properties'];
+                $pluginProperties = $this->pluginCache[$row['name']."Props"] = $row['properties'];
             } else {
                 $pluginCode = $this->pluginCache[$pluginName] = "return false;";
                 $pluginProperties = '';
@@ -5536,7 +5536,7 @@ 
     public function parseDocBlockFromFile($element_dir, $filename, $escapeValues = false)
     {
         $params = array();
-        $fullpath = $element_dir . '/' . $filename;
+        $fullpath = $element_dir.'/'.$filename;
         if (is_readable($fullpath)) {
             $tpl = @fopen($fullpath, "r");
             if ($tpl) {
@@ -5703,8 +5703,8 @@ 
         $ph = array('site_url' => MODX_SITE_URL);
         $regexUrl = "/((http|https|ftp|ftps)\:\/\/[^\/]+(\/[^\s]+[^,.?!:;\s])?)/";
         $regexEmail = '#([0-9a-z]([-_.]?[0-9a-z])*@[0-9a-z]([-.]?[0-9a-z])*\\.[a-wyz][a-z](fo|g|l|m|mes|o|op|pa|ro|seum|t|u|v|z)?)#i';
-        $emailSubject = isset($parsed['name']) ? '?subject=' . $parsed['name'] : '';
-        $emailSubject .= isset($parsed['version']) ? ' v' . $parsed['version'] : '';
+        $emailSubject = isset($parsed['name']) ? '?subject='.$parsed['name'] : '';
+        $emailSubject .= isset($parsed['version']) ? ' v'.$parsed['version'] : '';
         foreach ($parsed as $key => $val) {
             if (is_array($val)) {
                 foreach ($val as $key2 => $val2) {
@@ -5713,7 +5713,7 @@ 
                         $val2 = preg_replace($regexUrl, "<a href=\"{$url[0]}\" target=\"_blank\">{$url[0]}</a> ", $val2);
                     }
                     if (preg_match($regexEmail, $val2, $url)) {
-                        $val2 = preg_replace($regexEmail, '<a href="mailto:\\1' . $emailSubject . '">\\1</a>', $val2);
+                        $val2 = preg_replace($regexEmail, '<a href="mailto:\\1'.$emailSubject.'">\\1</a>', $val2);
                     }
                     $parsed[$key][$key2] = $val2;
                 }
@@ -5723,7 +5723,7 @@ 
                     $val = preg_replace($regexUrl, "<a href=\"{$url[0]}\" target=\"_blank\">{$url[0]}</a> ", $val);
                 }
                 if (preg_match($regexEmail, $val, $url)) {
-                    $val = preg_replace($regexEmail, '<a href="mailto:\\1' . $emailSubject . '">\\1</a>', $val);
+                    $val = preg_replace($regexEmail, '<a href="mailto:\\1'.$emailSubject.'">\\1</a>', $val);
                 }
                 $parsed[$key] = $val;
             }
@@ -5737,32 +5737,32 @@ 
         );
 
         $nl = "\n";
-        $list = isset($parsed['logo']) ? '<img src="' . $this->config['base_url'] . ltrim($parsed['logo'], "/") . '" style="float:right;max-width:100px;height:auto;" />' . $nl : '';
-        $list .= '<p>' . $nl;
-        $list .= isset($parsed['name']) ? '<strong>' . $parsed['name'] . '</strong><br/>' . $nl : '';
-        $list .= isset($parsed['description']) ? $parsed['description'] . $nl : '';
-        $list .= '</p><br/>' . $nl;
-        $list .= isset($parsed['version']) ? '<p><strong>' . $_lang['version'] . ':</strong> ' . $parsed['version'] . '</p>' . $nl : '';
-        $list .= isset($parsed['license']) ? '<p><strong>' . $_lang['license'] . ':</strong> ' . $parsed['license'] . '</p>' . $nl : '';
-        $list .= isset($parsed['lastupdate']) ? '<p><strong>' . $_lang['last_update'] . ':</strong> ' . $parsed['lastupdate'] . '</p>' . $nl : '';
-        $list .= '<br/>' . $nl;
+        $list = isset($parsed['logo']) ? '<img src="'.$this->config['base_url'].ltrim($parsed['logo'], "/").'" style="float:right;max-width:100px;height:auto;" />'.$nl : '';
+        $list .= '<p>'.$nl;
+        $list .= isset($parsed['name']) ? '<strong>'.$parsed['name'].'</strong><br/>'.$nl : '';
+        $list .= isset($parsed['description']) ? $parsed['description'].$nl : '';
+        $list .= '</p><br/>'.$nl;
+        $list .= isset($parsed['version']) ? '<p><strong>'.$_lang['version'].':</strong> '.$parsed['version'].'</p>'.$nl : '';
+        $list .= isset($parsed['license']) ? '<p><strong>'.$_lang['license'].':</strong> '.$parsed['license'].'</p>'.$nl : '';
+        $list .= isset($parsed['lastupdate']) ? '<p><strong>'.$_lang['last_update'].':</strong> '.$parsed['lastupdate'].'</p>'.$nl : '';
+        $list .= '<br/>'.$nl;
         $first = true;
         foreach ($arrayParams as $param => $label) {
             if (isset($parsed[$param])) {
                 if ($first) {
-                    $list .= '<p><strong>' . $_lang['references'] . '</strong></p>' . $nl;
-                    $list .= '<ul class="docBlockList">' . $nl;
+                    $list .= '<p><strong>'.$_lang['references'].'</strong></p>'.$nl;
+                    $list .= '<ul class="docBlockList">'.$nl;
                     $first = false;
                 }
-                $list .= '    <li><strong>' . $label . '</strong>' . $nl;
-                $list .= '        <ul>' . $nl;
+                $list .= '    <li><strong>'.$label.'</strong>'.$nl;
+                $list .= '        <ul>'.$nl;
                 foreach ($parsed[$param] as $val) {
-                    $list .= '            <li>' . $val . '</li>' . $nl;
+                    $list .= '            <li>'.$val.'</li>'.$nl;
                 }
-                $list .= '        </ul></li>' . $nl;
+                $list .= '        </ul></li>'.$nl;
             }
         }
-        $list .= !$first ? '</ul>' . $nl : '';
+        $list .= !$first ? '</ul>'.$nl : '';
 
         return $list;
     }
@@ -5838,7 +5838,7 @@ 
      */
     public function addSnippet($name, $phpCode)
     {
-        $this->snippetCache['#' . $name] = $phpCode;
+        $this->snippetCache['#'.$name] = $phpCode;
     }
 
     /**
@@ -5847,7 +5847,7 @@ 
      */
     public function addChunk($name, $text)
     {
-        $this->chunkCache['#' . $name] = $text;
+        $this->chunkCache['#'.$name] = $text;
     }
 
     /**
@@ -5883,7 +5883,7 @@ 
         }
 
         if (!$isSafe) {
-            $msg = $phpcode . "\n" . $this->currentSnippet . "\n" . print_r($_SERVER, true);
+            $msg = $phpcode."\n".$this->currentSnippet."\n".print_r($_SERVER, true);
             $title = sprintf('Unknown eval was executed (%s)', $this->htmlspecialchars(substr(trim($phpcode), 0, 50)));
             $this->messageQuit($title, '', true, '', '', 'Parser', $msg);
             return;
@@ -5897,7 +5897,7 @@ 
             return 'array()';
         }
 
-        $output = $echo . $return;
+        $output = $echo.$return;
         modx_sanitize_gpc($output);
         return $this->htmlspecialchars($output); // Maybe, all html tags are dangerous
     }
@@ -5915,8 +5915,8 @@ 
 
         $safe = explode(',', $safe_functions);
 
-        $phpcode = rtrim($phpcode, ';') . ';';
-        $tokens = token_get_all('<?php ' . $phpcode);
+        $phpcode = rtrim($phpcode, ';').';';
+        $tokens = token_get_all('<?php '.$phpcode);
         foreach ($tokens as $i => $token) {
             if (!is_array($token)) {
                 continue;
@@ -5952,7 +5952,7 @@ 
     public function atBindFileContent($str = '')
     {
 
-        $search_path = array('assets/tvs/', 'assets/chunks/', 'assets/templates/', $this->config['rb_base_url'] . 'files/', '');
+        $search_path = array('assets/tvs/', 'assets/chunks/', 'assets/templates/', $this->config['rb_base_url'].'files/', '');
 
         if (stripos($str, '@FILE') !== 0) {
             return $str;
@@ -5975,7 +5975,7 @@ 
         $errorMsg = sprintf("Could not retrieve string '%s'.", $str);
 
         foreach ($search_path as $path) {
-            $file_path = MODX_BASE_PATH . $path . $str;
+            $file_path = MODX_BASE_PATH.$path.$str;
             if (strpos($file_path, MODX_MANAGER_PATH) === 0) {
                 return $errorMsg;
             } elseif (is_file($file_path)) {
@@ -5989,7 +5989,7 @@ 
             return $errorMsg;
         }
 
-        $content = (string)file_get_contents($file_path);
+        $content = (string) file_get_contents($file_path);
         if ($content === false) {
             return $errorMsg;
         }
@@ -6102,22 +6102,22 @@ 
 
         $version = isset ($GLOBALS['modx_version']) ? $GLOBALS['modx_version'] : '';
         $release_date = isset ($GLOBALS['release_date']) ? $GLOBALS['release_date'] : '';
-        $request_uri = "http://" . $_SERVER['HTTP_HOST'] . ($_SERVER["SERVER_PORT"] == 80 ? "" : (":" . $_SERVER["SERVER_PORT"])) . $_SERVER['REQUEST_URI'];
+        $request_uri = "http://".$_SERVER['HTTP_HOST'].($_SERVER["SERVER_PORT"] == 80 ? "" : (":".$_SERVER["SERVER_PORT"])).$_SERVER['REQUEST_URI'];
         $request_uri = $this->htmlspecialchars($request_uri, ENT_QUOTES, $this->config['modx_charset']);
         $ua = $this->htmlspecialchars($_SERVER['HTTP_USER_AGENT'], ENT_QUOTES, $this->config['modx_charset']);
         $referer = $this->htmlspecialchars($_SERVER['HTTP_REFERER'], ENT_QUOTES, $this->config['modx_charset']);
         if ($is_error) {
             $str = '<h2 style="color:red">&laquo; Evo Parse Error &raquo;</h2>';
             if ($msg != 'PHP Parse Error') {
-                $str .= '<h3 style="color:red">' . $msg . '</h3>';
+                $str .= '<h3 style="color:red">'.$msg.'</h3>';
             }
         } else {
             $str = '<h2 style="color:#003399">&laquo; Evo Debug/ stop message &raquo;</h2>';
-            $str .= '<h3 style="color:#003399">' . $msg . '</h3>';
+            $str .= '<h3 style="color:#003399">'.$msg.'</h3>';
         }
 
         if (!empty ($query)) {
-            $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">SQL &gt; <span id="sqlHolder">' . $query . '</span></div>';
+            $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">SQL &gt; <span id="sqlHolder">'.$query.'</span></div>';
         }
 
         $errortype = array(
@@ -6140,13 +6140,13 @@ 
 
         if (!empty($nr) || !empty($file)) {
             if ($text != '') {
-                $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">Error : ' . $text . '</div>';
+                $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">Error : '.$text.'</div>';
             }
             if ($output != '') {
-                $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">' . $output . '</div>';
+                $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">'.$output.'</div>';
             }
             if ($nr !== '') {
-                $table[] = array('ErrorType[num]', $errortype [$nr] . "[" . $nr . "]");
+                $table[] = array('ErrorType[num]', $errortype [$nr]."[".$nr."]");
             }
             if ($file) {
                 $table[] = array('File', $file);
@@ -6166,7 +6166,7 @@ 
         }
 
         if (!empty($this->event->activePlugin)) {
-            $table[] = array('Current Plugin', $this->event->activePlugin . '(' . $this->event->name . ')');
+            $table[] = array('Current Plugin', $this->event->activePlugin.'('.$this->event->name.')');
         }
 
         $str .= $MakeTable->create($table, array('Error information', ''));
@@ -6176,17 +6176,17 @@ 
         $table[] = array('REQUEST_URI', $request_uri);
 
         if ($this->manager->action) {
-            include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php');
+            include_once(MODX_MANAGER_PATH.'includes/actionlist.inc.php');
             global $action_list;
             $actionName = (isset($action_list[$this->manager->action])) ? " - {$action_list[$this->manager->action]}" : '';
 
-            $table[] = array('Manager action', $this->manager->action . $actionName);
+            $table[] = array('Manager action', $this->manager->action.$actionName);
         }
 
         if (preg_match('@^[0-9]+@', $this->documentIdentifier)) {
             $resource = $this->getDocumentObject('id', $this->documentIdentifier);
             $url = $this->makeUrl($this->documentIdentifier, '', '', 'full');
-            $table[] = array('Resource', '[' . $this->documentIdentifier . '] <a href="' . $url . '" target="_blank">' . $resource['pagetitle'] . '</a>');
+            $table[] = array('Resource', '['.$this->documentIdentifier.'] <a href="'.$url.'" target="_blank">'.$resource['pagetitle'].'</a>');
         }
         $table[] = array('Referer', $referer);
         $table[] = array('User Agent', $ua);
@@ -6207,7 +6207,7 @@ 
 
         $mem = memory_get_peak_usage(true);
         $total_mem = $mem - $this->mstart;
-        $total_mem = ($total_mem / 1024 / 1024) . ' mb';
+        $total_mem = ($total_mem / 1024 / 1024).' mb';
 
         $queryTime = $this->queryTime;
         $phpTime = $totalTime - $queryTime;
@@ -6228,18 +6228,18 @@ 
         $str .= $this->get_backtrace(debug_backtrace());
         // Log error
         if (!empty($this->currentSnippet)) {
-            $source = 'Snippet - ' . $this->currentSnippet;
+            $source = 'Snippet - '.$this->currentSnippet;
         } elseif (!empty($this->event->activePlugin)) {
-            $source = 'Plugin - ' . $this->event->activePlugin;
+            $source = 'Plugin - '.$this->event->activePlugin;
         } elseif ($source !== '') {
-            $source = 'Parser - ' . $source;
+            $source = 'Parser - '.$source;
         } elseif ($query !== '') {
             $source = 'SQL Query';
         } else {
             $source = 'Parser';
         }
         if ($msg) {
-            $source .= ' / ' . $msg;
+            $source .= ' / '.$msg;
         }
         if (isset($actionName) && !empty($actionName)) {
             $source .= $actionName;
@@ -6271,12 +6271,12 @@ 
 
         // Display error
         if (isset($_SESSION['mgrValidated'])) {
-            echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"><html><head><title>EVO Content Manager ' . $version . ' &raquo; ' . $release_date . '</title>
+            echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"><html><head><title>EVO Content Manager '.$version.' &raquo; '.$release_date.'</title>
                  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-                 <link rel="stylesheet" type="text/css" href="' . $this->config['site_manager_url'] . 'media/style/' . $this->config['manager_theme'] . '/style.css" />
+                 <link rel="stylesheet" type="text/css" href="' . $this->config['site_manager_url'].'media/style/'.$this->config['manager_theme'].'/style.css" />
                  <style type="text/css">body { padding:10px; } td {font:inherit;}</style>
                  </head><body>
-                 ' . $str . '</body></html>';
+                 ' . $str.'</body></html>';
 
         } else {
             echo 'Error';
@@ -6314,7 +6314,7 @@ 
             switch ($val['type']) {
                 case '->':
                 case '::':
-                    $functionName = $val['function'] = $val['class'] . $val['type'] . $val['function'];
+                    $functionName = $val['function'] = $val['class'].$val['type'].$val['function'];
                     break;
                 default:
                     $functionName = $val['function'];
@@ -6324,7 +6324,7 @@ 
             $args = array_pad(array(), $_, '$var');
             $args = implode(", ", $args);
             $modx = &$this;
-            $args = preg_replace_callback('/\$var/', function () use ($modx, &$tmp, $val) {
+            $args = preg_replace_callback('/\$var/', function() use ($modx, &$tmp, $val) {
                 $arg = $val['args'][$tmp - 1];
                 switch (true) {
                     case is_null($arg): {
@@ -6336,7 +6336,7 @@ 
                         break;
                     }
                     case is_scalar($arg): {
-                        $out = strlen($arg) > 20 ? 'string $var' . $tmp : ("'" . $this->htmlspecialchars(str_replace("'", "\\'", $arg)) . "'");
+                        $out = strlen($arg) > 20 ? 'string $var'.$tmp : ("'".$this->htmlspecialchars(str_replace("'", "\\'", $arg))."'");
                         break;
                     }
                     case is_bool($arg): {
@@ -6344,23 +6344,23 @@ 
                         break;
                     }
                     case is_array($arg): {
-                        $out = 'array $var' . $tmp;
+                        $out = 'array $var'.$tmp;
                         break;
                     }
                     case is_object($arg): {
-                        $out = get_class($arg) . ' $var' . $tmp;
+                        $out = get_class($arg).' $var'.$tmp;
                         break;
                     }
                     default: {
-                        $out = '$var' . $tmp;
+                        $out = '$var'.$tmp;
                     }
                 }
                 $tmp++;
                 return $out;
             }, $args);
             $line = array(
-                "<strong>" . $functionName . "</strong>(" . $args . ")",
-                $path . " on line " . $val['line']
+                "<strong>".$functionName."</strong>(".$args.")",
+                $path." on line ".$val['line']
             );
             $table[] = array(implode("<br />", $line));
         }
@@ -6401,7 +6401,7 @@ 
             $alias = strip_tags($alias); // strip HTML
             $alias = preg_replace('/[^\.A-Za-z0-9 _-]/', '', $alias); // strip non-alphanumeric characters
             $alias = preg_replace('/\s+/', '-', $alias); // convert white-space to dash
-            $alias = preg_replace('/-+/', '-', $alias);  // convert multiple dashes to one
+            $alias = preg_replace('/-+/', '-', $alias); // convert multiple dashes to one
             $alias = trim($alias, '-'); // trim excess
             return $alias;
         }
@@ -6417,7 +6417,7 @@ 
         $precisions = count($sizes) - 1;
         foreach ($sizes as $unit => $bytes) {
             if ($size >= $bytes) {
-                return number_format($size / $bytes, $precisions) . ' ' . $unit;
+                return number_format($size / $bytes, $precisions).' '.$unit;
             }
             $precisions--;
         }
@@ -6521,10 +6521,10 @@ 
 
         if (strpos($str, MODX_MANAGER_PATH) === 0) {
             return false;
-        } elseif (is_file(MODX_BASE_PATH . $str)) {
-            $file_path = MODX_BASE_PATH . $str;
-        } elseif (is_file(MODX_BASE_PATH . "{$tpl_dir}{$str}")) {
-            $file_path = MODX_BASE_PATH . $tpl_dir . $str;
+        } elseif (is_file(MODX_BASE_PATH.$str)) {
+            $file_path = MODX_BASE_PATH.$str;
+        } elseif (is_file(MODX_BASE_PATH."{$tpl_dir}{$str}")) {
+            $file_path = MODX_BASE_PATH.$tpl_dir.$str;
         } else {
             return false;
         }
@@ -6650,7 +6650,7 @@ 
             $title = 'no title';
         }
         if (is_array($msg)) {
-            $msg = '<pre>' . print_r($msg, true) . '</pre>';
+            $msg = '<pre>'.print_r($msg, true).'</pre>';
         } elseif ($msg === '') {
             $msg = $_SERVER['REQUEST_URI'];
         }
@@ -6695,7 +6695,7 @@ 
         if (is_array($SystemAlertMsgQueque)) {
             $title = '';
             if ($this->name && $this->activePlugin) {
-                $title = "<div><b>" . $this->activePlugin . "</b> - <span style='color:maroon;'>" . $this->name . "</span></div>";
+                $title = "<div><b>".$this->activePlugin."</b> - <span style='color:maroon;'>".$this->name."</span></div>";
             }
             $SystemAlertMsgQueque[] = "$title<div style='margin-left:10px;margin-top:3px;'>$msg</div>";
         }

manager/includes/extenders/dbapi.mysqli.class.inc.php

Doc Comments +8 added lines, -8 removed lines

@@ -240,9 +240,9 @@ 
     }
 
     /**
-     * @param string|array $fields
-     * @param string|array $from
-     * @param string|array $where
+     * @param string $fields
+     * @param string $from
+     * @param string $where
      * @param string $orderBy
      * @param string $limit
      * @return bool|mysqli_result
@@ -326,7 +326,7 @@ 
      * @param string $fromtable
      * @param string $where
      * @param string $limit
-     * @return mixed
+     * @return null|integer
      */
     public function insert($fields, $intotable, $fromfields = "*", $fromtable = "", $where = "", $limit = "")
     {
@@ -435,7 +435,7 @@ 
 
     /**
      * @param null|mysqli $conn
-     * @return mixed
+     * @return integer
      */
     public function getInsertId($conn = null)
     {
@@ -513,7 +513,7 @@ 
     }
 
     /**
-     * @param $name
+     * @param string $name
      * @param mysqli_result|string $dsq
      * @return array
      */
@@ -572,7 +572,7 @@ 
 
     /**
      * @param string $table
-     * @return array
+     * @return boolean
      */
     public function getTableMetaData($table)
     {
@@ -619,7 +619,7 @@ 
     }
 
     /**
-     * @param string|mysqli_result $rs
+     * @param string $rs
      * @param bool $index
      * @return array
      */

Spacing +32 added lines, -32 removed lines

@@ -30,7 +30,7 @@ 
         $pre = null,
         $charset = '',
         $connection_method = 'SET CHARACTER SET'
-    ) {
+    ){
         $this->config['host'] = $host ? $host : $GLOBALS['database_server'];
         $this->config['dbase'] = $dbase ? $dbase : $GLOBALS['dbase'];
         $this->config['user'] = $uid ? $uid : $GLOBALS['database_user'];
@@ -70,7 +70,7 @@ 
                         $ua = $modx->htmlspecialchars($_SERVER['HTTP_USER_AGENT']);
                         $referer = $modx->htmlspecialchars($_SERVER['HTTP_REFERER']);
                         $modx->sendmail(array(
-                            'subject' => 'Missing to create the database connection! from ' . $modx->config['site_name'],
+                            'subject' => 'Missing to create the database connection! from '.$modx->config['site_name'],
                             'body'    => "{$logtitle}\n{$request_uri}\n{$ua}\n{$referer}",
                             'type'    => 'text'
                         ));
@@ -85,8 +85,8 @@ 
             $tend = $modx->getMicroTime();
             $totaltime = $tend - $tstart;
             if ($modx->dumpSQL) {
-                $modx->queryCode .= "<fieldset style='text-align:left'><legend>Database connection</legend>" . sprintf("Database connection was created in %2.4f s",
-                        $totaltime) . "</fieldset><br />";
+                $modx->queryCode .= "<fieldset style='text-align:left'><legend>Database connection</legend>".sprintf("Database connection was created in %2.4f s",
+                        $totaltime)."</fieldset><br />";
             }
             $this->conn->set_charset($this->config['charset']);
             $this->isConnected = true;
@@ -119,7 +119,7 @@ 
         if (1000 < $safeCount) {
             exit("Too many loops '{$safeCount}'");
         }
-        if ( ! ($this->conn instanceof mysqli)) {
+        if (!($this->conn instanceof mysqli)) {
             $this->connect();
         }
         if (is_array($s)) {
@@ -145,7 +145,7 @@ 
     public function query($sql, $watchError = true)
     {
         global $modx;
-        if ( ! ($this->conn instanceof mysqli)) {
+        if (!($this->conn instanceof mysqli)) {
             $this->connect();
         }
         $tStart = $modx->getMicroTime();
@@ -165,7 +165,7 @@ 
                 case 1091:
                     break;
                 default:
-                    $modx->messageQuit('Execution of a query to the database failed - ' . $this->getLastError(), $sql);
+                    $modx->messageQuit('Execution of a query to the database failed - '.$this->getLastError(), $sql);
             }
         } else {
             $tend = $modx->getMicroTime();
@@ -179,24 +179,24 @@ 
                     $debug_path[] = $line['function'];
                 }
                 $debug_path = implode(' > ', array_reverse($debug_path));
-                $modx->queryCode .= "<fieldset style='text-align:left'><legend>Query " . ($modx->executedQueries + 1) . " - " . sprintf("%2.2f ms",
-                        $totalTime * 1000) . "</legend>";
-                $modx->queryCode .= $sql . '<br><br>';
+                $modx->queryCode .= "<fieldset style='text-align:left'><legend>Query ".($modx->executedQueries + 1)." - ".sprintf("%2.2f ms",
+                        $totalTime * 1000)."</legend>";
+                $modx->queryCode .= $sql.'<br><br>';
                 if ($modx->event->name) {
-                    $modx->queryCode .= 'Current Event  => ' . $modx->event->name . '<br>';
+                    $modx->queryCode .= 'Current Event  => '.$modx->event->name.'<br>';
                 }
                 if ($modx->event->activePlugin) {
-                    $modx->queryCode .= 'Current Plugin => ' . $modx->event->activePlugin . '<br>';
+                    $modx->queryCode .= 'Current Plugin => '.$modx->event->activePlugin.'<br>';
                 }
                 if ($modx->currentSnippet) {
-                    $modx->queryCode .= 'Current Snippet => ' . $modx->currentSnippet . '<br>';
+                    $modx->queryCode .= 'Current Snippet => '.$modx->currentSnippet.'<br>';
                 }
                 if (stripos($sql, 'select') === 0) {
-                    $modx->queryCode .= 'Record Count => ' . $this->getRecordCount($result) . '<br>';
+                    $modx->queryCode .= 'Record Count => '.$this->getRecordCount($result).'<br>';
                 } else {
-                    $modx->queryCode .= 'Affected Rows => ' . $this->getAffectedRows() . '<br>';
+                    $modx->queryCode .= 'Affected Rows => '.$this->getAffectedRows().'<br>';
                 }
-                $modx->queryCode .= 'Functions Path => ' . $debug_path . '<br>';
+                $modx->queryCode .= 'Functions Path => '.$debug_path.'<br>';
                 $modx->queryCode .= "</fieldset><br />";
             }
             $modx->executedQueries++;
@@ -303,9 +303,9 @@ 
                     if ($value === null || strtolower($value) === 'null') {
                         $f = 'NULL';
                     } else {
-                        $f = "'" . $value . "'";
+                        $f = "'".$value."'";
                     }
-                    $fields[$key] = "`{$key}` = " . $f;
+                    $fields[$key] = "`{$key}` = ".$f;
                 }
                 $fields = implode(',', $fields);
             }
@@ -340,12 +340,12 @@ 
                 $this->query("INSERT INTO {$intotable} {$fields}");
             } else {
                 if (empty($fromtable)) {
-                    $fields = "(`" . implode("`, `", array_keys($fields)) . "`) VALUES('" . implode("', '",
-                            array_values($fields)) . "')";
+                    $fields = "(`".implode("`, `", array_keys($fields))."`) VALUES('".implode("', '",
+                            array_values($fields))."')";
                     $this->query("INSERT INTO {$intotable} {$fields}");
                 } else {
                     $fromtable = $this->replaceFullTableName($fromtable);
-                    $fields = "(" . implode(",", array_keys($fields)) . ")";
+                    $fields = "(".implode(",", array_keys($fields)).")";
                     $where = trim($where);
                     $limit = trim($limit);
                     if ($where !== '' && stripos($where, 'WHERE') !== 0) {
@@ -439,8 +439,8 @@ 
      */
     public function getInsertId($conn = null)
     {
-        if (! ($conn instanceof mysqli)) {
-            $conn =& $this->conn;
+        if (!($conn instanceof mysqli)) {
+            $conn = & $this->conn;
         }
 
         return $conn->insert_id;
@@ -452,8 +452,8 @@ 
      */
     public function getAffectedRows($conn = null)
     {
-        if (! ($conn instanceof mysqli)) {
-            $conn =& $this->conn;
+        if (!($conn instanceof mysqli)) {
+            $conn = & $this->conn;
         }
 
         return $conn->affected_rows;
@@ -465,8 +465,8 @@ 
      */
     public function getLastError($conn = null)
     {
-        if (! ($conn instanceof mysqli)) {
-            $conn =& $this->conn;
+        if (!($conn instanceof mysqli)) {
+            $conn = & $this->conn;
         }
 
         return $conn->error;
@@ -490,7 +490,7 @@ 
     {
         $out = false;
         if ($ds instanceof mysqli_result) {
-            switch($mode){
+            switch ($mode) {
                 case 'assoc':
                     $out = $ds->fetch_assoc();
                     break;
@@ -520,7 +520,7 @@ 
     public function getColumn($name, $dsq)
     {
         $col = array();
-        if ( ! ($dsq instanceof mysqli_result)) {
+        if (!($dsq instanceof mysqli_result)) {
             $dsq = $this->query($dsq);
         }
         if ($dsq) {
@@ -539,7 +539,7 @@ 
     public function getColumnNames($dsq)
     {
         $names = array();
-        if ( ! ($dsq instanceof mysqli_result)) {
+        if (!($dsq instanceof mysqli_result)) {
             $dsq = $this->query($dsq);
         }
         if ($dsq) {
@@ -559,7 +559,7 @@ 
     public function getValue($dsq)
     {
         $out = false;
-        if ( ! ($dsq instanceof mysqli_result)) {
+        if (!($dsq instanceof mysqli_result)) {
             $dsq = $this->query($dsq);
         }
         if ($dsq) {
@@ -657,7 +657,7 @@ 
         $tableName = trim($tableName);
         $dbase = trim($this->config['dbase'], '`');
         $prefix = $this->config['table_prefix'];
-        if ((bool)$force === true) {
+        if ((bool) $force === true) {
             $result = "`{$dbase}`.`{$prefix}{$tableName}`";
         } elseif (strpos($tableName, '[+prefix+]') !== false) {
             $result = preg_replace('@\[\+prefix\+\]([0-9a-zA-Z_]+)@', "`{$dbase}`.`{$prefix}$1`", $tableName);

Braces +3 added lines, -2 removed lines

@@ -373,7 +373,8 @@ 
      * @return bool|mixed|mysqli_result
      */
     public function save($fields, $table, $where = '')
-    { // This is similar to "replace into table".
+    {
+// This is similar to "replace into table".
 
         if ($where === '') {
             $mode = 'insert';
@@ -490,7 +491,7 @@ 
     {
         $out = false;
         if ($ds instanceof mysqli_result) {
-            switch($mode){
+            switch($mode) {
                 case 'assoc':
                     $out = $ds->fetch_assoc();
                     break;

Upper-Lower-Casing +7 added lines, -7 removed lines

@@ -225,13 +225,13 @@ 
             $orderBy = trim($orderBy);
             $limit = trim($limit);
             if ($where !== '' && stripos($where, 'WHERE') !== 0) {
-                $where = "WHERE {$where}";
+                $where = "where {$where}";
             }
             if ($orderBy !== '' && stripos($orderBy, 'ORDER BY') !== 0) {
                 $orderBy = "ORDER BY {$orderBy}";
             }
             if ($limit !== '' && stripos($limit, 'LIMIT') !== 0) {
-                $limit = "LIMIT {$limit}";
+                $limit = "limit {$limit}";
             }
 
             $out = $this->query("DELETE FROM {$from} {$where} {$orderBy} {$limit}");
@@ -272,16 +272,16 @@ 
         $orderBy = trim($orderBy);
         $limit = trim($limit);
         if ($where !== '' && stripos($where, 'WHERE') !== 0) {
-            $where = "WHERE {$where}";
+            $where = "where {$where}";
         }
         if ($orderBy !== '' && stripos($orderBy, 'ORDER') !== 0) {
             $orderBy = "ORDER BY {$orderBy}";
         }
         if ($limit !== '' && stripos($limit, 'LIMIT') !== 0) {
-            $limit = "LIMIT {$limit}";
+            $limit = "limit {$limit}";
         }
 
-        return $this->query("SELECT {$fields} FROM {$from} {$where} {$orderBy} {$limit}");
+        return $this->query("select {$fields} FROM {$from} {$where} {$orderBy} {$limit}");
     }
 
     /**
@@ -349,10 +349,10 @@ 
                     $where = trim($where);
                     $limit = trim($limit);
                     if ($where !== '' && stripos($where, 'WHERE') !== 0) {
-                        $where = "WHERE {$where}";
+                        $where = "where {$where}";
                     }
                     if ($limit !== '' && stripos($limit, 'LIMIT') !== 0) {
-                        $limit = "LIMIT {$limit}";
+                        $limit = "limit {$limit}";
                     }
                     $this->query("INSERT INTO {$intotable} {$fields} SELECT {$fromfields} FROM {$fromtable} {$where} {$limit}");
                 }

manager/includes/extenders/maketable.class.php

Doc Comments +4 added lines, -7 removed lines

@@ -278,8 +278,7 @@ 
     /**
      * Sets the width attribute of each column in the array.
      *
-     * @param array $value An Array of column widths in the order of the keys in the
-     *            source table array.
+     * @param string[] $widthArray
      */
     public function setColumnWidths($widthArray)
     {
@@ -289,7 +288,6 @@ 
     /**
      * An optional array of values that can be preselected when using
      *
-     * @param array $value Indicates the INPUT form element type attribute.
      */
     public function setSelectedValues($valueArray)
     {
@@ -326,7 +324,7 @@ 
     /**
      * Determines what class the current row should have applied.
      *
-     * @param int $value The position of the current row being rendered.
+     * @param integer $position
      * @return string
      */
     public function determineRowClass($position)
@@ -353,7 +351,6 @@ 
      * Generates an onclick action applied to the current cell, to execute
      * any specified cell actions.
      *
-     * @param string $value Indicates the INPUT form element type attribute.
      * @return string
      */
     public function getCellAction($currentActionFieldValue)
@@ -395,7 +392,7 @@ 
     /**
      * Function to prepare a link generated in the table cell/link actions.
      *
-     * @param string $value Indicates the INPUT form element type attribute.
+     * @param string $link
      * @return string
      */
     public function prepareLink($link)
@@ -414,7 +411,7 @@ 
      *
      * @param array $fieldsArray The associative array representing the table rows
      * and columns.
-     * @param array $fieldHeadersArray An optional array of values for providing
+     * @param string[] $fieldHeadersArray An optional array of values for providing
      * alternative field headers; this is an associative arrays of keys from
      * the $fieldsArray where the values represent the alt heading content
      * for each column.

Spacing +27 added lines, -27 removed lines

@@ -130,7 +130,7 @@ 
      */
     public function setTableWidth($value)
     {
-        $this->tableWidth = (int)$value;
+        $this->tableWidth = (int) $value;
     }
 
     /**
@@ -317,7 +317,7 @@ 
     {
         $currentWidth = '';
         if (is_array($this->columnWidths)) {
-            $currentWidth = $this->columnWidths[$columnPosition] ? ' width="' . $this->columnWidths[$columnPosition] . '" ' : '';
+            $currentWidth = $this->columnWidths[$columnPosition] ? ' width="'.$this->columnWidths[$columnPosition].'" ' : '';
         }
 
         return $currentWidth;
@@ -346,7 +346,7 @@ 
             $currentClass = $this->rowAlternateClass;
         }
 
-        return ' class="' . $currentClass . '"';
+        return ' class="'.$currentClass.'"';
     }
 
     /**
@@ -360,7 +360,7 @@ 
     {
         $cellAction = '';
         if ($this->cellAction) {
-            $cellAction = ' onClick="javascript:window.location=\'' . $this->cellAction . $this->actionField . '=' . urlencode($currentActionFieldValue) . '\'" ';
+            $cellAction = ' onClick="javascript:window.location=\''.$this->cellAction.$this->actionField.'='.urlencode($currentActionFieldValue).'\'" ';
         }
 
         return $cellAction;
@@ -377,7 +377,7 @@ 
     {
         $cell = $value;
         if ($this->linkAction) {
-            $cell = '<a href="' . $this->linkAction . $this->actionField . '=' . urlencode($currentActionFieldValue) . '">' . $cell . '</a>';
+            $cell = '<a href="'.$this->linkAction.$this->actionField.'='.urlencode($currentActionFieldValue).'">'.$cell.'</a>';
         }
 
         return $cell;
@@ -406,7 +406,7 @@ 
             $end = '?';
         }
 
-        return $link . $end;
+        return $link.$end;
     }
 
     /**
@@ -426,7 +426,7 @@ 
         if (is_array($fieldsArray)) {
             $i = 0;
             foreach ($fieldsArray as $fieldName => $fieldValue) {
-                $table .= "\t<tr" . $this->determineRowClass($i) . ">\n";
+                $table .= "\t<tr".$this->determineRowClass($i).">\n";
                 $currentActionFieldValue = $fieldValue[$this->actionField];
                 if (is_array($this->selectedValues)) {
                     $isChecked = array_search($currentActionFieldValue, $this->selectedValues) === false ? 0 : 1;
@@ -437,15 +437,15 @@ 
                 $colPosition = 0;
                 foreach ($fieldValue as $key => $value) {
                     if (!in_array($key, $this->excludeFields)) {
-                        $table .= "\t\t<td" . $this->getCellAction($currentActionFieldValue) . ">";
+                        $table .= "\t\t<td".$this->getCellAction($currentActionFieldValue).">";
                         $table .= $this->createCellText($currentActionFieldValue, $value);
                         $table .= "</td>\n";
                         if ($i == 0) {
                             if (empty ($header) && $this->formElementType) {
-                                $header .= "\t\t<th style=\"width:32px\" " . ($this->thClass ? 'class="' . $this->thClass . '"' : '') . ">" . ($this->allOption ? '<a href="javascript:clickAll()">all</a>' : '') . "</th>\n";
+                                $header .= "\t\t<th style=\"width:32px\" ".($this->thClass ? 'class="'.$this->thClass.'"' : '').">".($this->allOption ? '<a href="javascript:clickAll()">all</a>' : '')."</th>\n";
                             }
                             $headerText = array_key_exists($key, $fieldHeadersArray) ? $fieldHeadersArray[$key] : $key;
-                            $header .= "\t\t<th" . $this->getColumnWidth($colPosition) . ($this->thClass ? ' class="' . $this->thClass . '" ' : '') . ">" . $headerText . "</th>\n";
+                            $header .= "\t\t<th".$this->getColumnWidth($colPosition).($this->thClass ? ' class="'.$this->thClass.'" ' : '').">".$headerText."</th>\n";
                         }
                         $colPosition++;
                     }
@@ -453,9 +453,9 @@ 
                 $i++;
                 $table .= "\t</tr>\n";
             }
-            $table = "\n" . '<table' . ($this->tableWidth > 0 ? ' width="' . $this->tableWidth . '"' : '') . ($this->tableClass ? ' class="' . $this->tableClass . '"' : '') . ($this->tableID ? ' id="' . $this->tableID . '"' : '') . ">\n" . ($header ? "\t<thead>\n\t<tr class=\"" . $this->rowHeaderClass . "\">\n" . $header . "\t</tr>\n\t</thead>\n" : '') . $table . "</table>\n";
+            $table = "\n".'<table'.($this->tableWidth > 0 ? ' width="'.$this->tableWidth.'"' : '').($this->tableClass ? ' class="'.$this->tableClass.'"' : '').($this->tableID ? ' id="'.$this->tableID.'"' : '').">\n".($header ? "\t<thead>\n\t<tr class=\"".$this->rowHeaderClass."\">\n".$header."\t</tr>\n\t</thead>\n" : '').$table."</table>\n";
             if ($this->formElementType) {
-                $table = "\n" . '<form id="' . $this->formName . '" name="' . $this->formName . '" action="' . $this->formAction . '" method="POST">' . $table;
+                $table = "\n".'<form id="'.$this->formName.'" name="'.$this->formName.'" action="'.$this->formAction.'" method="POST">'.$table;
             }
             if (strlen($this->pageNav) > 1) {//changed to display the pagination if exists.
                 /* commented this part because of cookie
@@ -469,7 +469,7 @@ 
 
                 $table .= '</select>'.$_lang["pagination_table_perpage"].'</div>';
                 */
-                $table .= '<div id="pagination" class="paginate">' . $_lang["pagination_table_gotopage"] . '<ul>' . $this->pageNav . '</ul></div>';
+                $table .= '<div id="pagination" class="paginate">'.$_lang["pagination_table_gotopage"].'<ul>'.$this->pageNav.'</ul></div>';
                 //$table .= '<script language="javascript">function updatePageSize(size){window.location = \''.$this->prepareLink($linkpage).'pageSize=\'+size;}</script>';
 
             }
@@ -478,7 +478,7 @@ 
 <script language="javascript">
 	toggled = 0;
 	function clickAll() {
-		myform = document.getElementById("' . $this->formName . '");
+		myform = document.getElementById("' . $this->formName.'");
 		for(i=0;i<myform.length;i++) {
 			if(myform.elements[i].type==\'checkbox\') {
 				myform.elements[i].checked=(toggled?false:true);
@@ -490,9 +490,9 @@ 
             }
             if ($this->formElementType) {
                 if ($this->extra) {
-                    $table .= "\n" . $this->extra . "\n";
+                    $table .= "\n".$this->extra."\n";
                 }
-                $table .= "\n" . '</form>' . "\n";
+                $table .= "\n".'</form>'."\n";
             }
 
             return $table;
@@ -515,7 +515,7 @@ 
         $numPages = ceil($numRecords / MAX_DISPLAY_RECORDS_NUM);
         $nav = '';
         if ($numPages > 1) {
-            $currentURL = empty($qs) ? '' : '?' . $qs;
+            $currentURL = empty($qs) ? '' : '?'.$qs;
             if ($currentPage > 6) {
                 $nav .= $this->createPageLink($currentURL, 1, $_lang["pagination_table_first"]);
             }
@@ -540,7 +540,7 @@ 
                 $nav .= $this->createPageLink($currentURL, $numPages, $_lang["pagination_table_last"]);
             }
         }
-        $this->pageNav = ' ' . $nav;
+        $this->pageNav = ' '.$nav;
     }
 
     /**
@@ -556,14 +556,14 @@ 
     public function createPageLink($link = '', $pageNum, $displayText, $currentPage = false, $qs = '')
     {
         global $modx;
-        $orderBy = !empty($_GET['orderby']) ? '&orderby=' . $_GET['orderby'] : '';
-        $orderDir = !empty($_GET['orderdir']) ? '&orderdir=' . $_GET['orderdir'] : '';
+        $orderBy = !empty($_GET['orderby']) ? '&orderby='.$_GET['orderby'] : '';
+        $orderDir = !empty($_GET['orderdir']) ? '&orderdir='.$_GET['orderdir'] : '';
         if (!empty($qs)) {
             $qs = "?$qs";
         }
         $link = empty($link) ? $modx->makeUrl($modx->documentIdentifier, $modx->documentObject['alias'],
-            $qs . "page=$pageNum$orderBy$orderDir") : $this->prepareLink($link) . "page=$pageNum";
-        $nav = '<li' . ($currentPage ? ' class="currentPage"' : '') . '><a' . ($currentPage ? ' class="currentPage"' : '') . ' href="' . $link . '">' . $displayText . '</a></li>' . "\n";
+            $qs."page=$pageNum$orderBy$orderDir") : $this->prepareLink($link)."page=$pageNum";
+        $nav = '<li'.($currentPage ? ' class="currentPage"' : '').'><a'.($currentPage ? ' class="currentPage"' : '').' href="'.$link.'">'.$displayText.'</a></li>'."\n";
 
         return $nav;
     }
@@ -581,7 +581,7 @@ 
         $field = '';
         if ($this->formElementType) {
             $checked = $isChecked ? "checked " : "";
-            $field = "\t\t" . '<td><input type="' . $this->formElementType . '" name="' . ($this->formElementName ? $this->formElementName : $value) . '"  value="' . $value . '" ' . $checked . '/></td>' . "\n";
+            $field = "\t\t".'<td><input type="'.$this->formElementType.'" name="'.($this->formElementName ? $this->formElementName : $value).'"  value="'.$value.'" '.$checked.'/></td>'."\n";
         }
 
         return $field;
@@ -595,7 +595,7 @@ 
     public function handlePaging()
     {
         $offset = (is_numeric($_GET['page']) && $_GET['page'] > 0) ? $_GET['page'] - 1 : 0;
-        $limitClause = ' LIMIT ' . ($offset * MAX_DISPLAY_RECORDS_NUM) . ', ' . MAX_DISPLAY_RECORDS_NUM;
+        $limitClause = ' LIMIT '.($offset * MAX_DISPLAY_RECORDS_NUM).', '.MAX_DISPLAY_RECORDS_NUM;
 
         return $limitClause;
     }
@@ -610,10 +610,10 @@ 
     public function handleSorting($natural_order = false)
     {
         $orderByClause = '';
-        if ((bool)$natural_order === false) {
+        if ((bool) $natural_order === false) {
             $orderby = !empty($_GET['orderby']) ? $_GET['orderby'] : "id";
             $orderdir = !empty($_GET['orderdir']) ? $_GET['orderdir'] : "DESC";
-            $orderByClause = !empty($orderby) ? ' ORDER BY ' . $orderby . ' ' . $orderdir . ' ' : "";
+            $orderByClause = !empty($orderby) ? ' ORDER BY '.$orderby.' '.$orderdir.' ' : "";
         }
 
         return $orderByClause;
@@ -642,7 +642,7 @@ 
             }
         }
 
-        return '<a href="[~' . $modx->documentIdentifier . '~]?' . $qs . 'orderby=' . $key . $orderDir . '">' . $text . '</a>';
+        return '<a href="[~'.$modx->documentIdentifier.'~]?'.$qs.'orderby='.$key.$orderDir.'">'.$text.'</a>';
     }
 
 }

Braces +2 added lines, -1 removed lines

@@ -457,7 +457,8 @@
             if ($this->formElementType) {
                 $table = "\n" . '<form id="' . $this->formName . '" name="' . $this->formName . '" action="' . $this->formAction . '" method="POST">' . $table;
             }
-            if (strlen($this->pageNav) > 1) {//changed to display the pagination if exists.
+            if (strlen($this->pageNav) > 1) {
+//changed to display the pagination if exists.
                 /* commented this part because of cookie
                 $table .= '<div id="max-display-records" ><select style="display:inline" onchange="javascript:updatePageSize(this[this.selectedIndex].value);">';
                 $pageSizes= array (10, 25, 50, 100, 250);

manager/includes/extenders/modifiers.class.inc.php

Doc Comments +25 added lines, -1 removed lines

@@ -95,7 +95,7 @@ 
     /**
      * @param string $mode
      * @param string $modifiers
-     * @return bool|string
+     * @return false|string
      */
     public function _getDelim($mode,$modifiers) {
         $c = substr($modifiers,0,1);
@@ -132,6 +132,14 @@ 
             return $opt;
         }
     }
+
+    /**
+     * @param string $mode
+     * @param false|string $delim
+     * @param string $modifiers
+     *
+     * @return string
+     */
     public function _getRemainModifiers($mode,$delim,$modifiers) {
         if($delim) {
             if($mode=='(')
@@ -159,6 +167,9 @@ 
         return substr($string,strpos($string, $delim)+$len);
     }
 
+    /**
+     * @param string $modifiers
+     */
     public function splitEachModifiers($modifiers) {
         global $modx;
 
@@ -228,6 +239,9 @@ 
         return $result;
     }
 
+    /**
+     * @param string $key
+     */
     public function parsePhx($key,$value,$modifiers)
     {
         global $modx;
@@ -294,6 +308,9 @@ 
         else                  return true;
     }
 
+    /**
+     * @param string $cmd
+     */
     public function getValueFromPreset($key, $value, $cmd, $opt)
     {
         global $modx;
@@ -979,6 +996,9 @@ 
         return $value;
     }
 
+    /**
+     * @param string $cmd
+     */
     public function includeMdfFile($cmd) {
         global $modx;
         $key = $this->key;
@@ -1134,6 +1154,10 @@ 
     }
 
     // Sets a placeholder variable which can only be access by Modifiers
+
+    /**
+     * @param string $value
+     */
     public function setModifiersVariable($key, $value) {
         if ($key != 'phx' && $key != 'dummy') $this->placeholders[$key] = $value;
     }

Spacing +350 added lines, -350 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
-if(!defined('MODX_CORE_PATH')) define('MODX_CORE_PATH', MODX_MANAGER_PATH.'includes/');
+if (!defined('MODX_CORE_PATH')) define('MODX_CORE_PATH', MODX_MANAGER_PATH.'includes/');
 
-class MODIFIERS {
+class MODIFIERS{
     /**
      * @var array
      */
@@ -71,14 +71,14 @@ 
      * @param string $modifiers
      * @return bool|mixed|string
      */
-    public function phxFilter($key,$value,$modifiers)
+    public function phxFilter($key, $value, $modifiers)
     {
         global $modx;
-        if(substr($modifiers,0,3)!=='id(') $value = $this->parseDocumentSource($value);
+        if (substr($modifiers, 0, 3) !== 'id(') $value = $this->parseDocumentSource($value);
         $this->srcValue = $value;
         $modifiers = trim($modifiers);
-        $modifiers = ':'.trim($modifiers,':');
-        $modifiers = str_replace(array("\r\n","\r"), "\n", $modifiers);
+        $modifiers = ':'.trim($modifiers, ':');
+        $modifiers = str_replace(array("\r\n", "\r"), "\n", $modifiers);
         $modifiers = $this->splitEachModifiers($modifiers);
 
         $this->placeholders = array();
@@ -86,8 +86,8 @@ 
         $this->placeholders['dummy'] = '';
         $this->condition = array();
         $this->vars = array();
-        $this->vars['name']    = & $key;
-        $value = $this->parsePhx($key,$value,$modifiers);
+        $this->vars['name'] = & $key;
+        $value = $this->parsePhx($key, $value, $modifiers);
         $this->vars = array();
         return $value;
     }
@@ -97,13 +97,13 @@ 
      * @param string $modifiers
      * @return bool|string
      */
-    public function _getDelim($mode,$modifiers) {
-        $c = substr($modifiers,0,1);
-        if(!in_array($c, array('"', "'", '`')) ) return false;
+    public function _getDelim($mode, $modifiers){
+        $c = substr($modifiers, 0, 1);
+        if (!in_array($c, array('"', "'", '`'))) return false;
 
-        $modifiers = substr($modifiers,1);
-        $closure = $mode=='(' ? "{$c})" : $c;
-        if(strpos($modifiers, $closure)===false) return false;
+        $modifiers = substr($modifiers, 1);
+        $closure = $mode == '(' ? "{$c})" : $c;
+        if (strpos($modifiers, $closure) === false) return false;
 
         return  $c;
     }
@@ -114,101 +114,101 @@ 
      * @param string $modifiers
      * @return bool|string
      */
-    public function _getOpt($mode,$delim,$modifiers) {
-        if($delim) {
-            if($mode=='(') return substr($modifiers,1,strpos($modifiers, $delim . ')' )-1);
+    public function _getOpt($mode, $delim, $modifiers){
+        if ($delim) {
+            if ($mode == '(') return substr($modifiers, 1, strpos($modifiers, $delim.')') - 1);
 
-            return substr($modifiers,1,strpos($modifiers,$delim,1)-1);
+            return substr($modifiers, 1, strpos($modifiers, $delim, 1) - 1);
         }
         else {
-            if($mode=='(') return substr($modifiers,0,strpos($modifiers, ')') );
+            if ($mode == '(') return substr($modifiers, 0, strpos($modifiers, ')'));
 
             $chars = str_split($modifiers);
-            $opt='';
-            foreach($chars as $c) {
-                if($c==':' || $c==')') break;
-                $opt .=$c;
+            $opt = '';
+            foreach ($chars as $c) {
+                if ($c == ':' || $c == ')') break;
+                $opt .= $c;
             }
             return $opt;
         }
     }
-    public function _getRemainModifiers($mode,$delim,$modifiers) {
-        if($delim) {
-            if($mode=='(')
-                return $this->_fetchContent($modifiers, $delim . ')');
+    public function _getRemainModifiers($mode, $delim, $modifiers){
+        if ($delim) {
+            if ($mode == '(')
+                return $this->_fetchContent($modifiers, $delim.')');
             else {
                 $modifiers = trim($modifiers);
-                $modifiers = substr($modifiers,1);
+                $modifiers = substr($modifiers, 1);
                 return $this->_fetchContent($modifiers, $delim);
             }
         }
         else {
-            if($mode=='(') return $this->_fetchContent($modifiers, ')');
+            if ($mode == '(') return $this->_fetchContent($modifiers, ')');
             $chars = str_split($modifiers);
-            foreach($chars as $c) {
-                if($c==':') return $modifiers;
-                else $modifiers = substr($modifiers,1);
+            foreach ($chars as $c) {
+                if ($c == ':') return $modifiers;
+                else $modifiers = substr($modifiers, 1);
             }
             return $modifiers;
         }
     }
 
-    public function _fetchContent($string,$delim) {
+    public function _fetchContent($string, $delim){
         $len = strlen($delim);
         $string = $this->parseDocumentSource($string);
-        return substr($string,strpos($string, $delim)+$len);
+        return substr($string, strpos($string, $delim) + $len);
     }
 
-    public function splitEachModifiers($modifiers) {
+    public function splitEachModifiers($modifiers){
         global $modx;
 
         $cmd = '';
         $bt = '';
         $result = array();
-        while($bt!==$modifiers) {
+        while ($bt !== $modifiers) {
             $bt = $modifiers;
-            $c = substr($modifiers,0,1);
-            $modifiers = substr($modifiers,1);
+            $c = substr($modifiers, 0, 1);
+            $modifiers = substr($modifiers, 1);
 
-            if($c===':' && preg_match('@^(!?[<>=]{1,2})@', $modifiers, $match)) { // :=, :!=, :<=, :>=, :!<=, :!>=
-                $c = substr($modifiers,strlen($match[1]),1);
+            if ($c === ':' && preg_match('@^(!?[<>=]{1,2})@', $modifiers, $match)) { // :=, :!=, :<=, :>=, :!<=, :!>=
+                $c = substr($modifiers, strlen($match[1]), 1);
                 $debuginfo = "#i=0 #c=[{$c}] #m=[{$modifiers}]";
-                if($c==='(') $modifiers = substr($modifiers,strlen($match[1])+1);
-                else         $modifiers = substr($modifiers,strlen($match[1]));
+                if ($c === '(') $modifiers = substr($modifiers, strlen($match[1]) + 1);
+                else         $modifiers = substr($modifiers, strlen($match[1]));
 
-                $delim     = $this->_getDelim($c,$modifiers);
-                $opt       = $this->_getOpt($c,$delim,$modifiers);
-                $modifiers = trim($this->_getRemainModifiers($c,$delim,$modifiers));
+                $delim     = $this->_getDelim($c, $modifiers);
+                $opt       = $this->_getOpt($c, $delim, $modifiers);
+                $modifiers = trim($this->_getRemainModifiers($c, $delim, $modifiers));
 
-                $result[]=array('cmd'=>trim($match[1]),'opt'=>$opt,'debuginfo'=>$debuginfo);
+                $result[] = array('cmd'=>trim($match[1]), 'opt'=>$opt, 'debuginfo'=>$debuginfo);
                 $cmd = '';
             }
-            elseif(in_array($c,array('+','-','*','/')) && preg_match('@^[0-9]+@', $modifiers, $match)) { // :+3, :-3, :*3 ...
-                $modifiers = substr($modifiers,strlen($match[0]));
-                $result[]=array('cmd'=>'math','opt'=>'%s'.$c.$match[0]);
+            elseif (in_array($c, array('+', '-', '*', '/')) && preg_match('@^[0-9]+@', $modifiers, $match)) { // :+3, :-3, :*3 ...
+                $modifiers = substr($modifiers, strlen($match[0]));
+                $result[] = array('cmd'=>'math', 'opt'=>'%s'.$c.$match[0]);
                 $cmd = '';
             }
-            elseif($c==='(' || $c==='=') {
+            elseif ($c === '(' || $c === '=') {
                 $modifiers = $m1 = trim($modifiers);
-                $delim     = $this->_getDelim($c,$modifiers);
-                $opt       = $this->_getOpt($c,$delim,$modifiers);
-                $modifiers = trim($this->_getRemainModifiers($c,$delim,$modifiers));
+                $delim     = $this->_getDelim($c, $modifiers);
+                $opt       = $this->_getOpt($c, $delim, $modifiers);
+                $modifiers = trim($this->_getRemainModifiers($c, $delim, $modifiers));
                 $debuginfo = "#i=1 #c=[{$c}] #delim=[{$delim}] #m1=[{$m1}] remainMdf=[{$modifiers}]";
 
-                $result[]=array('cmd'=>trim($cmd),'opt'=>$opt,'debuginfo'=>$debuginfo);
+                $result[] = array('cmd'=>trim($cmd), 'opt'=>$opt, 'debuginfo'=>$debuginfo);
 
                 $cmd = '';
             }
-            elseif($c==':') {
+            elseif ($c == ':') {
                 $debuginfo = "#i=2 #c=[{$c}] #m=[{$modifiers}]";
-                if($cmd!=='') $result[]=array('cmd'=>trim($cmd),'opt'=>'','debuginfo'=>$debuginfo);
+                if ($cmd !== '') $result[] = array('cmd'=>trim($cmd), 'opt'=>'', 'debuginfo'=>$debuginfo);
 
                 $cmd = '';
             }
-            elseif(trim($modifiers)=='' && trim($cmd)!=='') {
+            elseif (trim($modifiers) == '' && trim($cmd) !== '') {
                 $debuginfo = "#i=3 #c=[{$c}] #m=[{$modifiers}]";
                 $cmd .= $c;
-                $result[]=array('cmd'=>trim($cmd),'opt'=>'','debuginfo'=>$debuginfo);
+                $result[] = array('cmd'=>trim($cmd), 'opt'=>'', 'debuginfo'=>$debuginfo);
 
                 break;
             }
@@ -217,65 +217,65 @@ 
             }
         }
 
-        if(empty($result)) return array();
+        if (empty($result)) return array();
 
-        foreach($result as $i=>$a)
+        foreach ($result as $i=>$a)
         {
             $a['opt'] = $this->parseDocumentSource($a['opt']);
-            $result[$i]['opt'] = $modx->mergePlaceholderContent($a['opt'],$this->placeholders);
+            $result[$i]['opt'] = $modx->mergePlaceholderContent($a['opt'], $this->placeholders);
         }
 
         return $result;
     }
 
-    public function parsePhx($key,$value,$modifiers)
+    public function parsePhx($key, $value, $modifiers)
     {
         global $modx;
         $lastKey = '';
-        $cacheKey = md5(sprintf('parsePhx#%s#%s#%s',$key,$value,print_r($modifiers,true)));
-        if(isset($this->tmpCache[$cacheKey])) return $this->tmpCache[$cacheKey];
-        if(empty($modifiers)) return '';
+        $cacheKey = md5(sprintf('parsePhx#%s#%s#%s', $key, $value, print_r($modifiers, true)));
+        if (isset($this->tmpCache[$cacheKey])) return $this->tmpCache[$cacheKey];
+        if (empty($modifiers)) return '';
 
-        foreach($modifiers as $m)
+        foreach ($modifiers as $m)
         {
             $lastKey = strtolower($m['cmd']);
         }
-        $_ = explode(',',$this->condModifiers);
-        if(in_array($lastKey,$_))
+        $_ = explode(',', $this->condModifiers);
+        if (in_array($lastKey, $_))
         {
-            $modifiers[] = array('cmd'=>'then','opt'=>'1');
-            $modifiers[] = array('cmd'=>'else','opt'=>'0');
+            $modifiers[] = array('cmd'=>'then', 'opt'=>'1');
+            $modifiers[] = array('cmd'=>'else', 'opt'=>'0');
         }
 
-        foreach($modifiers as $i=>$a)
+        foreach ($modifiers as $i=>$a)
         {
-            $value = $this->Filter($key,$value, $a['cmd'], $a['opt']);
+            $value = $this->Filter($key, $value, $a['cmd'], $a['opt']);
         }
         $this->tmpCache[$cacheKey] = $value;
         return $value;
     }
 
     // Parser: modifier detection and eXtended processing if needed
-    public function Filter($key, $value, $cmd, $opt='')
+    public function Filter($key, $value, $cmd, $opt = '')
     {
         global $modx;
 
-        if($key==='documentObject') $value = $modx->documentIdentifier;
+        if ($key === 'documentObject') $value = $modx->documentIdentifier;
         $cmd = $this->parseDocumentSource($cmd);
-        if(preg_match('@^[1-9][/0-9]*$@',$cmd))
+        if (preg_match('@^[1-9][/0-9]*$@', $cmd))
         {
-            if(strpos($cmd,'/')!==false)
-                $cmd = $this->substr($cmd,strrpos($cmd,'/')+1);
+            if (strpos($cmd, '/') !== false)
+                $cmd = $this->substr($cmd, strrpos($cmd, '/') + 1);
             $opt = $cmd;
             $cmd = 'id';
         }
 
-        if(isset($modx->snippetCache["phx:{$cmd}"]))   $this->elmName = "phx:{$cmd}";
-        elseif(isset($modx->chunkCache["phx:{$cmd}"])) $this->elmName = "phx:{$cmd}";
+        if (isset($modx->snippetCache["phx:{$cmd}"]))   $this->elmName = "phx:{$cmd}";
+        elseif (isset($modx->chunkCache["phx:{$cmd}"])) $this->elmName = "phx:{$cmd}";
         else                                           $this->elmName = '';
 
         $cmd = strtolower($cmd);
-        if($this->elmName!=='')
+        if ($this->elmName !== '')
             $value = $this->getValueFromElement($key, $value, $cmd, $opt);
         else
             $value = $this->getValueFromPreset($key, $value, $cmd, $opt);
@@ -285,12 +285,12 @@ 
         return $value;
     }
 
-    public function isEmpty($cmd,$value)
+    public function isEmpty($cmd, $value)
     {
-        if($value!=='') return false;
+        if ($value !== '') return false;
 
-        $_ = explode(',', $this->condModifiers . ',_default,default,if,input,or,and,show,this,select,switch,then,else,id,ifempty,smart_desc,smart_description,summary');
-        if(in_array($cmd,$_)) return false;
+        $_ = explode(',', $this->condModifiers.',_default,default,if,input,or,and,show,this,select,switch,then,else,id,ifempty,smart_desc,smart_description,summary');
+        if (in_array($cmd, $_)) return false;
         else                  return true;
     }
 
@@ -298,7 +298,7 @@ 
     {
         global $modx;
 
-        if($this->isEmpty($cmd,$value)) return '';
+        if ($this->isEmpty($cmd, $value)) return '';
 
         $this->key = $key;
         $this->value  = $value;
@@ -309,83 +309,83 @@ 
             #####  Conditional Modifiers
             case 'input':
             case 'if':
-                if(!$opt) return $value;
+                if (!$opt) return $value;
                 return $opt;
             case '=':
             case 'eq':
             case 'is':
             case 'equals':
-                $this->condition[] = (int)($value == $opt); break;
+                $this->condition[] = (int) ($value == $opt); break;
             case 'neq':
             case 'ne':
             case 'notequals':
             case 'isnot':
             case 'isnt':
             case 'not':
-                $this->condition[] = (int)($value != $opt);break;
+                $this->condition[] = (int) ($value != $opt); break;
             case '%':
-                $this->condition[] = (int)($value%$opt==0);break;
+                $this->condition[] = (int) ($value % $opt == 0); break;
             case 'isempty':
-                $this->condition[] = (int)(empty($value)); break;
+                $this->condition[] = (int) (empty($value)); break;
             case 'isntempty':
             case 'isnotempty':
-                $this->condition[] = (int)(!empty($value)); break;
+                $this->condition[] = (int) (!empty($value)); break;
             case '>=':
             case 'gte':
             case 'eg':
             case 'isgte':
-                $this->condition[] = (int)($value >= $opt);break;
+                $this->condition[] = (int) ($value >= $opt); break;
             case '<=':
             case 'lte':
             case 'el':
             case 'islte':
-                $this->condition[] = (int)($value <= $opt);break;
+                $this->condition[] = (int) ($value <= $opt); break;
             case '>':
             case 'gt':
             case 'greaterthan':
             case 'isgreaterthan':
             case 'isgt':
-                $this->condition[] = (int)($value > $opt);break;
+                $this->condition[] = (int) ($value > $opt); break;
             case '<':
             case 'lt':
             case 'lowerthan':
             case 'islowerthan':
             case 'islt':
-                $this->condition[] = (int)($value < $opt);break;
+                $this->condition[] = (int) ($value < $opt); break;
             case 'find':
-                $this->condition[] = (int)(strpos($value, $opt)!==false);break;
+                $this->condition[] = (int) (strpos($value, $opt) !== false); break;
             case 'inarray':
             case 'in_array':
             case 'in':
                 $opt = explode(',', $opt);
-                $this->condition[] = (int)(in_array($value, $opt)!==false);break;
+                $this->condition[] = (int) (in_array($value, $opt) !== false); break;
             case 'wildcard_match':
             case 'wcard_match':
             case 'wildcard':
             case 'wcard':
             case 'fnmatch':
-                $this->condition[] = (int)(fnmatch($opt, $value)!==false);break;
+                $this->condition[] = (int) (fnmatch($opt, $value) !== false); break;
             case 'is_file':
             case 'is_dir':
             case 'file_exists':
             case 'is_readable':
             case 'is_writable':
-                if(!$opt) $path = $value;
+                if (!$opt) $path = $value;
                 else      $path = $opt;
-                if(strpos($path,MODX_MANAGER_PATH)!==false) exit('Can not read core path');
-                if(strpos($path,$modx->config['base_path'])===false) $path = ltrim($path,'/');
-                $this->condition[] = (int)($cmd($path)!==false);break;
+                if (strpos($path, MODX_MANAGER_PATH) !== false) exit('Can not read core path');
+                if (strpos($path, $modx->config['base_path']) === false) $path = ltrim($path, '/');
+                $this->condition[] = (int) ($cmd($path) !== false); break;
             case 'is_image':
-                if(!$opt) $path = $value;
+                if (!$opt) $path = $value;
                 else      $path = $opt;
-                if(!is_file($path)) {$this->condition[]='0';break;}
+                if (!is_file($path)) {$this->condition[] = '0'; break; }
                 $_ = getimagesize($path);
-                $this->condition[] = (int)($_[0]);break;
+                $this->condition[] = (int) ($_[0]); break;
             case 'regex':
             case 'preg':
             case 'preg_match':
             case 'isinrole':
-            $this->condition[] = (int)(preg_match($opt,$value));break;
+            $this->condition[] = (int) (preg_match($opt, $value)); break;
             case 'ir':
             case 'memberof':
             case 'mo':
@@ -393,50 +393,50 @@ 
                 $this->condition[] = $this->includeMdfFile('memberof');
                 break;
             case 'or':
-                $this->condition[] = '||';break;
+                $this->condition[] = '||'; break;
             case 'and':
-                $this->condition[] = '&&';break;
+                $this->condition[] = '&&'; break;
             case 'show':
             case 'this':
-                $conditional = implode(' ',$this->condition);
-                $isvalid = (int)(eval("return ({$conditional});"));
+                $conditional = implode(' ', $this->condition);
+                $isvalid = (int) (eval("return ({$conditional});"));
                 if ($isvalid) return $this->srcValue;
                 return NULL;
             case 'then':
-                $conditional = implode(' ',$this->condition);
-                $isvalid = (int)eval("return ({$conditional});");
+                $conditional = implode(' ', $this->condition);
+                $isvalid = (int) eval("return ({$conditional});");
                 if ($isvalid)  return $opt;
                 return null;
             case 'else':
-                $conditional = implode(' ',$this->condition);
-                $isvalid = (int)eval("return ({$conditional});");
+                $conditional = implode(' ', $this->condition);
+                $isvalid = (int) eval("return ({$conditional});");
                 if (!$isvalid) return $opt;
                 break;
             case 'select':
             case 'switch':
-                $raw = explode('&',$opt);
+                $raw = explode('&', $opt);
                 $map = array();
                 $c = count($raw);
-                for($m=0; $m<$c; $m++) {
-                    $mi = explode('=',$raw[$m],2);
+                for ($m = 0; $m < $c; $m++) {
+                    $mi = explode('=', $raw[$m], 2);
                     $map[$mi[0]] = $mi[1];
                 }
-                if(isset($map[$value])) return $map[$value];
+                if (isset($map[$value])) return $map[$value];
                 else                    return '';
             ##### End of Conditional Modifiers
 
             #####  Encode / Decode / Hash / Escape
             case 'htmlent':
             case 'htmlentities':
-                return htmlentities($value,ENT_QUOTES,$modx->config['modx_charset']);
+                return htmlentities($value, ENT_QUOTES, $modx->config['modx_charset']);
             case 'html_entity_decode':
             case 'decode_html':
             case 'html_decode':
-                return html_entity_decode($value,ENT_QUOTES,$modx->config['modx_charset']);
+                return html_entity_decode($value, ENT_QUOTES, $modx->config['modx_charset']);
             case 'esc':
             case 'escape':
                 $value = preg_replace('/&amp;(#[0-9]+|[a-z]+);/i', '&$1;', htmlspecialchars($value, ENT_QUOTES, $modx->config['modx_charset']));
-                return str_replace(array('[', ']', '`'),array('&#91;', '&#93;', '&#96;'),$value);
+                return str_replace(array('[', ']', '`'), array('&#91;', '&#93;', '&#96;'), $value);
             case 'sql_escape':
             case 'encode_js':
                 return $modx->db->escape($value);
@@ -446,39 +446,39 @@ 
             case 'html_encode':
                 return preg_replace('/&amp;(#[0-9]+|[a-z]+);/i', '&$1;', htmlspecialchars($value, ENT_QUOTES, $modx->config['modx_charset']));
             case 'spam_protect':
-                return str_replace(array('@','.'),array('&#64;','&#46;'),$value);
+                return str_replace(array('@', '.'), array('&#64;', '&#46;'), $value);
             case 'strip':
-                if($opt==='') $opt = ' ';
+                if ($opt === '') $opt = ' ';
                 return preg_replace('/[\n\r\t\s]+/', $opt, $value);
             case 'strip_linefeeds':
-                return str_replace(array("\n","\r"), '', $value);
+                return str_replace(array("\n", "\r"), '', $value);
             case 'notags':
             case 'strip_tags':
             case 'remove_html':
-                if($opt!=='')
+                if ($opt !== '')
                 {
                     $param = array();
-                    foreach(explode(',',$opt) as $v)
+                    foreach (explode(',', $opt) as $v)
                     {
-                        $v = trim($v,'</> ');
+                        $v = trim($v, '</> ');
                         $param[] = "<{$v}>";
                     }
-                    $params = implode(',',$param);
+                    $params = implode(',', $param);
                 }
                 else $params = '';
-                if(!strpos($params,'<br>')===false) {
-                    $value = preg_replace('@(<br[ /]*>)\n@','$1',$value);
-                    $value = preg_replace('@<br[ /]*>@',"\n",$value);
+                if (!strpos($params, '<br>') === false) {
+                    $value = preg_replace('@(<br[ /]*>)\n@', '$1', $value);
+                    $value = preg_replace('@<br[ /]*>@', "\n", $value);
                 }
-                return $this->strip_tags($value,$params);
+                return $this->strip_tags($value, $params);
             case 'urlencode':
             case 'url_encode':
             case 'encode_url':
                 return urlencode($value);
             case 'base64_decode':
-                if($opt!=='false') $opt = true;
+                if ($opt !== 'false') $opt = true;
                 else               $opt = false;
-                return base64_decode($value,$opt);
+                return base64_decode($value, $opt);
             case 'encode_sha1': $cmd = 'sha1';
             case 'addslashes':
             case 'urldecode':
@@ -502,18 +502,18 @@ 
             case 'upper_case':
                 return $this->strtoupper($value);
             case 'capitalize':
-                $_ = explode(' ',$value);
-                foreach($_ as $i=>$v)
+                $_ = explode(' ', $value);
+                foreach ($_ as $i=>$v)
                 {
                     $_[$i] = ucfirst($v);
                 }
-                return implode(' ',$_);
+                return implode(' ', $_);
             case 'zenhan':
-                if(empty($opt)) $opt='VKas';
-                return mb_convert_kana($value,$opt,$modx->config['modx_charset']);
+                if (empty($opt)) $opt = 'VKas';
+                return mb_convert_kana($value, $opt, $modx->config['modx_charset']);
             case 'hanzen':
-                if(empty($opt)) $opt='VKAS';
-                return mb_convert_kana($value,$opt,$modx->config['modx_charset']);
+                if (empty($opt)) $opt = 'VKAS';
+                return mb_convert_kana($value, $opt, $modx->config['modx_charset']);
             case 'str_shuffle':
             case 'shuffle':
                 return $this->str_shuffle($value);
@@ -527,7 +527,7 @@ 
                 return $this->strlen($value);
             case 'count_words':
                 $value = trim($value);
-                return count(preg_split('/\s+/',$value));
+                return count(preg_split('/\s+/', $value));
             case 'str_word_count':
             case 'word_count':
             case 'wordcount':
@@ -535,55 +535,55 @@ 
             case 'count_paragraphs':
                 $value = trim($value);
                 $value = preg_replace('/\r/', '', $value);
-                return count(preg_split('/\n+/',$value));
+                return count(preg_split('/\n+/', $value));
             case 'strpos':
-                if($opt!=0&&empty($opt)) return $value;
-                return $this->strpos($value,$opt);
+                if ($opt != 0 && empty($opt)) return $value;
+                return $this->strpos($value, $opt);
             case 'wordwrap':
                 // default: 70
-                  $wrapat = (int)$opt > 0 ? (int)$opt : 70;
+                  $wrapat = (int) $opt > 0 ? (int) $opt : 70;
                 if (version_compare(PHP_VERSION, '5.3.0') >= 0) return $this->includeMdfFile('wordwrap');
-                else return preg_replace("@(\b\w+\b)@e","wordwrap('\\1',\$wrapat,' ',1)",$value);
+                else return preg_replace("@(\b\w+\b)@e", "wordwrap('\\1',\$wrapat,' ',1)", $value);
             case 'wrap_text':
-                $width = preg_match('/^[1-9][0-9]*$/',$opt) ? $opt : 70;
-                if($modx->config['manager_language']==='japanese-utf8') {
+                $width = preg_match('/^[1-9][0-9]*$/', $opt) ? $opt : 70;
+                if ($modx->config['manager_language'] === 'japanese-utf8') {
                     $chunk = array();
-                    $bt='';
-                    while($bt!=$value) {
+                    $bt = '';
+                    while ($bt != $value) {
                         $bt = $value;
-                        if($this->strlen($value)<$width) {
+                        if ($this->strlen($value) < $width) {
                             $chunk[] = $value;
                             break;
                         }
-                        $chunk[] = $this->substr($value,0,$width);
-                        $value = $this->substr($value,$width);
+                        $chunk[] = $this->substr($value, 0, $width);
+                        $value = $this->substr($value, $width);
                     }
-                    return implode("\n",$chunk);
+                    return implode("\n", $chunk);
                 }
                 else
-                    return wordwrap($value,$width,"\n",true);
+                    return wordwrap($value, $width, "\n", true);
             case 'substr':
-                if(empty($opt)) break;
-                if(strpos($opt,',')!==false) {
-                    list($b,$e) = explode(',',$opt,2);
-                    return $this->substr($value,$b,(int)$e);
+                if (empty($opt)) break;
+                if (strpos($opt, ',') !== false) {
+                    list($b, $e) = explode(',', $opt, 2);
+                    return $this->substr($value, $b, (int) $e);
                 }
-                else return $this->substr($value,$opt);
+                else return $this->substr($value, $opt);
             case 'limit':
             case 'trim_to': // http://www.movabletype.jp/documentation/appendices/modifiers/trim_to.html
-                if(strpos($opt,'+')!==false)
-                    list($len,$str) = explode('+',$opt,2);
+                if (strpos($opt, '+') !== false)
+                    list($len, $str) = explode('+', $opt, 2);
                 else {
                     $len = $opt;
                     $str = '';
                 }
-                if($len==='') $len = 100;
-                if(abs($len) > $this->strlen($value)) $str ='';
-                if(preg_match('/^[1-9][0-9]*$/',$len)) {
-                    return $this->substr($value,0,$len) . $str;
+                if ($len === '') $len = 100;
+                if (abs($len) > $this->strlen($value)) $str = '';
+                if (preg_match('/^[1-9][0-9]*$/', $len)) {
+                    return $this->substr($value, 0, $len).$str;
                 }
-                elseif(preg_match('/^\-[1-9][0-9]*$/',$len)) {
-                    return $str . $this->substr($value,$len);
+                elseif (preg_match('/^\-[1-9][0-9]*$/', $len)) {
+                    return $str.$this->substr($value, $len);
                 }
                 break;
             case 'summary':
@@ -592,81 +592,81 @@ 
                 return $this->includeMdfFile('summary');
             case 'replace':
             case 'str_replace':
-                if(empty($opt) || strpos($opt,',')===false) break;
-                if    (substr_count($opt, ',') ==1) $delim = ',';
-                elseif(substr_count($opt, '|') ==1) $delim = '|';
-                elseif(substr_count($opt, '=>')==1) $delim = '=>';
-                elseif(substr_count($opt, '/') ==1) $delim = '/';
+                if (empty($opt) || strpos($opt, ',') === false) break;
+                if (substr_count($opt, ',') == 1) $delim = ',';
+                elseif (substr_count($opt, '|') == 1) $delim = '|';
+                elseif (substr_count($opt, '=>') == 1) $delim = '=>';
+                elseif (substr_count($opt, '/') == 1) $delim = '/';
                 else break;
-                list($s,$r) = explode($delim,$opt);
-                if($value!=='') return str_replace($s,$r,$value);
+                list($s, $r) = explode($delim, $opt);
+                if ($value !== '') return str_replace($s, $r, $value);
                 break;
             case 'replace_to':
             case 'tpl':
-                if($value!=='') return str_replace(array('[+value+]','[+output+]','{value}','%s'),$value,$opt);
+                if ($value !== '') return str_replace(array('[+value+]', '[+output+]', '{value}', '%s'), $value, $opt);
                 break;
             case 'eachtpl':
-                $value = explode('||',$value);
+                $value = explode('||', $value);
                 $_ = array();
-                foreach($value as $v) {
-                    $_[] = str_replace(array('[+value+]','[+output+]','{value}','%s'),$v,$opt);
+                foreach ($value as $v) {
+                    $_[] = str_replace(array('[+value+]', '[+output+]', '{value}', '%s'), $v, $opt);
                 }
                 return implode("\n", $_);
             case 'array_pop':
             case 'array_shift':
-                if(strpos($value,'||')!==false) $delim = '||';
+                if (strpos($value, '||') !== false) $delim = '||';
                 else                            $delim = ',';
-                return $cmd(explode($delim,$value));
+                return $cmd(explode($delim, $value));
             case 'preg_replace':
             case 'regex_replace':
-                if(empty($opt) || strpos($opt,',')===false) break;
-                list($s,$r) = explode(',',$opt,2);
-                if($value!=='') return preg_replace($s,$r,$value);
+                if (empty($opt) || strpos($opt, ',') === false) break;
+                list($s, $r) = explode(',', $opt, 2);
+                if ($value !== '') return preg_replace($s, $r, $value);
                 break;
             case 'cat':
             case 'concatenate':
             case '.':
-                if($value!=='') return $value . $opt;
+                if ($value !== '') return $value.$opt;
                 break;
             case 'sprintf':
             case 'string_format':
-                if($value!=='') return sprintf($opt,$value);
+                if ($value !== '') return sprintf($opt, $value);
                 break;
             case 'number_format':
-                    if($opt=='') $opt = 0;
-                    return number_format($value,$opt);
+                    if ($opt == '') $opt = 0;
+                    return number_format($value, $opt);
             case 'money_format':
-                    setlocale(LC_MONETARY,setlocale(LC_TIME,0));
-                    if($value!=='') return money_format($opt,(double)$value);
+                    setlocale(LC_MONETARY, setlocale(LC_TIME, 0));
+                    if ($value !== '') return money_format($opt, (double) $value);
                     break;
             case 'tobool':
                 return boolval($value);
             case 'nl2lf':
-                if($value!=='') return str_replace(array("\r\n","\n", "\r"), '\n', $value);
+                if ($value !== '') return str_replace(array("\r\n", "\n", "\r"), '\n', $value);
                 break;
             case 'br2nl':
                 return preg_replace('@<br[\s/]*>@i', "\n", $value);
             case 'nl2br':
                 if (version_compare(PHP_VERSION, '5.3.0', '<'))
                     return nl2br($value);
-                if($opt!=='')
+                if ($opt !== '')
                 {
                     $opt = trim($opt);
                     $opt = strtolower($opt);
-                    if($opt==='false') $opt = false;
-                    elseif($opt==='0') $opt = false;
+                    if ($opt === 'false') $opt = false;
+                    elseif ($opt === '0') $opt = false;
                     else               $opt = true;
                 }
-                elseif(isset($modx->config['mce_element_format'])&&$modx->config['mce_element_format']==='html')
+                elseif (isset($modx->config['mce_element_format']) && $modx->config['mce_element_format'] === 'html')
                                        $opt = false;
                 else                   $opt = true;
-                return nl2br($value,$opt);
+                return nl2br($value, $opt);
             case 'ltrim':
             case 'rtrim':
             case 'trim': // ref http://mblo.info/modifiers/custom-modifiers/rtrim_opt.html
-                if($opt==='')
+                if ($opt === '')
                     return $cmd($value);
-                else return $cmd($value,$opt);
+                else return $cmd($value, $opt);
             // These are all straight wrappers for PHP functions
             case 'ucfirst':
             case 'lcfirst':
@@ -677,58 +677,58 @@ 
             case 'strftime':
             case 'date':
             case 'dateformat':
-                if(empty($opt)) $opt = $modx->toDateFormat(null, 'formatOnly');
-                if(!preg_match('@^[0-9]+$@',$value)) $value = strtotime($value);
-                if(strpos($opt,'%')!==false)
-                    return strftime($opt,0+$value);
+                if (empty($opt)) $opt = $modx->toDateFormat(null, 'formatOnly');
+                if (!preg_match('@^[0-9]+$@', $value)) $value = strtotime($value);
+                if (strpos($opt, '%') !== false)
+                    return strftime($opt, 0 + $value);
                 else
-                    return date($opt,0+$value);
+                    return date($opt, 0 + $value);
             case 'time':
-                if(empty($opt)) $opt = '%H:%M';
-                if(!preg_match('@^[0-9]+$@',$value)) $value = strtotime($value);
-                return strftime($opt,0+$value);
+                if (empty($opt)) $opt = '%H:%M';
+                if (!preg_match('@^[0-9]+$@', $value)) $value = strtotime($value);
+                return strftime($opt, 0 + $value);
             case 'strtotime':
                 return strtotime($value);
             #####  mathematical function
             case 'toint':
-                return (int)$value;
+                return (int) $value;
             case 'tofloat':
                 return floatval($value);
             case 'round':
-                if(!$opt) $opt = 0;
-                return $cmd($value,$opt);
+                if (!$opt) $opt = 0;
+                return $cmd($value, $opt);
             case 'max':
             case 'min':
-                return $cmd(explode(',',$value));
+                return $cmd(explode(',', $value));
             case 'floor':
             case 'ceil':
             case 'abs':
                 return $cmd($value);
             case 'math':
             case 'calc':
-                $value = (int)$value;
-                if(empty($value)) $value = '0';
-                $filter = str_replace(array('[+value+]','[+output+]','{value}','%s'),'?',$opt);
-                $filter = preg_replace('@([a-zA-Z\n\r\t\s])@','',$filter);
-                if(strpos($filter,'?')===false) $filter = "?{$filter}";
-                $filter = str_replace('?',$value,$filter);
+                $value = (int) $value;
+                if (empty($value)) $value = '0';
+                $filter = str_replace(array('[+value+]', '[+output+]', '{value}', '%s'), '?', $opt);
+                $filter = preg_replace('@([a-zA-Z\n\r\t\s])@', '', $filter);
+                if (strpos($filter, '?') === false) $filter = "?{$filter}";
+                $filter = str_replace('?', $value, $filter);
                 return eval("return {$filter};");
             case 'count':
-                if($value=='') return 0;
-                $value = explode(',',$value);
+                if ($value == '') return 0;
+                $value = explode(',', $value);
                 return count($value);
             case 'sort':
             case 'rsort':
-                if(strpos($value,"\n")!==false) $delim="\n";
+                if (strpos($value, "\n") !== false) $delim = "\n";
                 else $delim = ',';
-                $swap = explode($delim,$value);
-                if(!$opt) $opt = SORT_REGULAR;
+                $swap = explode($delim, $value);
+                if (!$opt) $opt = SORT_REGULAR;
                 else      $opt = constant($opt);
-                $cmd($swap,$opt);
-                return implode($delim,$swap);
+                $cmd($swap, $opt);
+                return implode($delim, $swap);
             #####  Resource fields
             case 'id':
-                if($opt) return $this->getDocumentObject($opt,$key);
+                if ($opt) return $this->getDocumentObject($opt, $key);
                 break;
             case 'type':
             case 'contenttype':
@@ -765,36 +765,36 @@ 
             case 'privatemgr':
             case 'content_dispo':
             case 'hidemenu':
-                if($cmd==='contenttype') $cmd = 'contentType';
-                return $this->getDocumentObject($value,$cmd);
+                if ($cmd === 'contenttype') $cmd = 'contentType';
+                return $this->getDocumentObject($value, $cmd);
             case 'title':
-                $pagetitle = $this->getDocumentObject($value,'pagetitle');
-                $longtitle = $this->getDocumentObject($value,'longtitle');
+                $pagetitle = $this->getDocumentObject($value, 'pagetitle');
+                $longtitle = $this->getDocumentObject($value, 'longtitle');
                 return $longtitle ? $longtitle : $pagetitle;
             case 'shorttitle':
-                $pagetitle = $this->getDocumentObject($value,'pagetitle');
-                $menutitle = $this->getDocumentObject($value,'menutitle');
+                $pagetitle = $this->getDocumentObject($value, 'pagetitle');
+                $menutitle = $this->getDocumentObject($value, 'menutitle');
                 return $menutitle ? $menutitle : $pagetitle;
             case 'templatename':
-                $rs = $modx->db->select('templatename','[+prefix+]site_templates',"id='{$value}'");
+                $rs = $modx->db->select('templatename', '[+prefix+]site_templates', "id='{$value}'");
                 $templateName = $modx->db->getValue($rs);
                 return !$templateName ? '(blank)' : $templateName;
             case 'getfield':
-                if(!$opt) $opt = 'content';
-                return $modx->getField($opt,$value);
+                if (!$opt) $opt = 'content';
+                return $modx->getField($opt, $value);
             case 'children':
             case 'childids':
-                if($value=='') $value = 0; // 値がない場合はルートと見なす
+                if ($value == '') $value = 0; // 値がない場合はルートと見なす
                 $published = 1;
-                if($opt=='') $opt = 'page';
-                $_ = explode(',',$opt);
+                if ($opt == '') $opt = 'page';
+                $_ = explode(',', $opt);
                 $where = array();
-                foreach($_ as $opt) {
-                    switch(trim($opt)) {
+                foreach ($_ as $opt) {
+                    switch (trim($opt)) {
                         case 'page'; case '!folder'; case '!isfolder': $where[] = 'sc.isfolder=0'; break;
                         case 'folder'; case 'isfolder':                $where[] = 'sc.isfolder=1'; break;
-                        case  'menu';  case  'show_menu':              $where[] = 'sc.hidemenu=0'; break;
-                        case '!menu';  case '!show_menu':              $where[] = 'sc.hidemenu=1'; break;
+                        case  'menu'; case  'show_menu':              $where[] = 'sc.hidemenu=0'; break;
+                        case '!menu'; case '!show_menu':              $where[] = 'sc.hidemenu=1'; break;
                         case  'published':                             $published = 1; break;
                         case '!published':                             $published = 0; break;
                     }
@@ -802,69 +802,69 @@ 
                 $where = implode(' AND ', $where);
                 $children = $modx->getDocumentChildren($value, $published, '0', 'id', $where);
                 $result = array();
-                foreach((array)$children as $child){
+                foreach ((array) $children as $child) {
                     $result[] = $child['id'];
                 }
                 return implode(',', $result);
             case 'fullurl':
-                if(!is_numeric($value)) return $value;
+                if (!is_numeric($value)) return $value;
                 return $modx->makeUrl($value);
             case 'makeurl':
-                if(!is_numeric($value)) return $value;
-                if(!$opt) $opt = 'full';
-                return $modx->makeUrl($value,'','',$opt);
+                if (!is_numeric($value)) return $value;
+                if (!$opt) $opt = 'full';
+                return $modx->makeUrl($value, '', '', $opt);
 
             #####  File system
             case 'getimageinfo':
             case 'imageinfo':
-                if(!is_file($value)) return '';
+                if (!is_file($value)) return '';
                 $_ = getimagesize($value);
-                if(!$_[0]) return '';
+                if (!$_[0]) return '';
                 $info['width']  = $_[0];
                 $info['height'] = $_[1];
-                if    ($_[0] > $_[1]) $info['aspect'] = 'landscape';
-                elseif($_[0] < $_[1]) $info['aspect'] = 'portrait';
+                if ($_[0] > $_[1]) $info['aspect'] = 'landscape';
+                elseif ($_[0] < $_[1]) $info['aspect'] = 'portrait';
                 else                  $info['aspect'] = 'square';
-                switch($_[2]) {
+                switch ($_[2]) {
                     case IMAGETYPE_GIF  : $info['type'] = 'gif'; break;
                     case IMAGETYPE_JPEG : $info['type'] = 'jpg'; break;
                     case IMAGETYPE_PNG  : $info['type'] = 'png'; break;
                     default             : $info['type'] = 'unknown';
                 }
                 $info['attrib'] = $_[3];
-                switch($opt) {
+                switch ($opt) {
                     case 'width' : return $info['width'];
                     case 'height': return $info['height'];
                     case 'aspect': return $info['aspect'];
                     case 'type'  : return $info['type'];
                     case 'attrib': return $info['attrib'];
-                    default      : return print_r($info,true);
+                    default      : return print_r($info, true);
                 }
 
             case 'file_get_contents':
             case 'readfile':
-                if(!is_file($value)) return $value;
+                if (!is_file($value)) return $value;
                 $value = realpath($value);
-                if(strpos($value,MODX_MANAGER_PATH)!==false) exit('Can not read core file');
-                $ext = strtolower(substr($value,-4));
-                if($ext==='.php') exit('Can not read php file');
-                if($ext==='.cgi') exit('Can not read cgi file');
+                if (strpos($value, MODX_MANAGER_PATH) !== false) exit('Can not read core file');
+                $ext = strtolower(substr($value, -4));
+                if ($ext === '.php') exit('Can not read php file');
+                if ($ext === '.cgi') exit('Can not read cgi file');
                 return file_get_contents($value);
             case 'filesize':
-                if($value == '') return '';
+                if ($value == '') return '';
                 $filename = $value;
 
                 $site_url = $modx->config['site_url'];
-                if(strpos($filename,$site_url) === 0)
-                    $filename = substr($filename,0,strlen($site_url));
-                $filename = trim($filename,'/');
+                if (strpos($filename, $site_url) === 0)
+                    $filename = substr($filename, 0, strlen($site_url));
+                $filename = trim($filename, '/');
 
-                $opt = trim($opt,'/');
-                if($opt!=='') $opt .= '/';
+                $opt = trim($opt, '/');
+                if ($opt !== '') $opt .= '/';
 
                 $filename = MODX_BASE_PATH.$opt.$filename;
 
-                if(is_file($filename)){
+                if (is_file($filename)) {
                     clearstatcache();
                     $size = filesize($filename);
                     return $size;
@@ -897,10 +897,10 @@ 
                 $this->opt = $cmd;
                 return $this->includeMdfFile('moduser');
             case 'userinfo':
-                if(empty($opt)) $this->opt = 'username';
+                if (empty($opt)) $this->opt = 'username';
                 return $this->includeMdfFile('moduser');
             case 'webuserinfo':
-                if(empty($opt)) $this->opt = 'username';
+                if (empty($opt)) $this->opt = 'username';
                 $this->value = -$value;
                 return $this->includeMdfFile('moduser');
             #####  Special functions
@@ -911,27 +911,27 @@ 
             case 'ifnotempty':
                 if (!empty($value)) return $opt; break;
             case 'datagrid':
-                include_once(MODX_CORE_PATH . 'controls/datagrid.class.php');
+                include_once(MODX_CORE_PATH.'controls/datagrid.class.php');
                 $grd = new DataGrid(null, trim($value));
                 $grd->itemStyle = '';
                 $grd->altItemStyle = '';
-                $pos = strpos($value,"\n");
-                if($pos) $_ = substr($value,0,$pos);
+                $pos = strpos($value, "\n");
+                if ($pos) $_ = substr($value, 0, $pos);
                 else $_ = $pos;
-                $grd->cdelim = strpos($_,"\t")!==false ? 'tab' : ',';
+                $grd->cdelim = strpos($_, "\t") !== false ? 'tab' : ',';
                 return $grd->render();
             case 'rotate':
             case 'evenodd':
-                if(strpos($opt,',')===false) $opt = 'odd,even';
+                if (strpos($opt, ',') === false) $opt = 'odd,even';
                 $_ = explode(',', $opt);
                 $c = count($_);
                 $i = $value + $c;
                 $i = $i % $c;
                 return $_[$i];
             case 'takeval':
-                $arr = explode(",",$opt);
+                $arr = explode(",", $opt);
                 $idx = $value;
-                if(!is_numeric($idx)) return $value;
+                if (!is_numeric($idx)) return $value;
                 return $arr[$idx];
             case 'getimage':
                 return $this->includeMdfFile('getimage');
@@ -939,17 +939,17 @@ 
                     return $modx->nicesize($value);
             case 'googlemap':
             case 'googlemaps':
-                if(empty($opt)) $opt = 'border:none;width:500px;height:350px;';
+                if (empty($opt)) $opt = 'border:none;width:500px;height:350px;';
                 $tpl = '<iframe style="[+style+]" src="https://maps.google.co.jp/maps?ll=[+value+]&output=embed&z=15"></iframe>';
                 $ph['style'] = $opt;
                 $ph['value'] = $value;
-                return $modx->parseText($tpl,$ph);
+                return $modx->parseText($tpl, $ph);
             case 'youtube':
             case 'youtube16x9':
-                if(empty($opt)) $opt = 560;
-                $h = round($opt*0.5625);
+                if (empty($opt)) $opt = 560;
+                $h = round($opt * 0.5625);
                 $tpl = '<iframe width="%s" height="%s" src="https://www.youtube.com/embed/%s" frameborder="0" allowfullscreen></iframe>';
-                return sprintf($tpl,$opt,$h,$value);
+                return sprintf($tpl, $opt, $h, $value);
             //case 'youtube4x3':%s*0.75＋25
             case 'setvar':
                 $modx->placeholders[$opt] = $value;
@@ -979,7 +979,7 @@ 
         return $value;
     }
 
-    public function includeMdfFile($cmd) {
+    public function includeMdfFile($cmd){
         global $modx;
         $key = $this->key;
         $value  = $this->value;
@@ -990,54 +990,54 @@ 
     public function getValueFromElement($key, $value, $cmd, $opt)
     {
         global $modx;
-        if( isset($modx->snippetCache[$this->elmName]) )
+        if (isset($modx->snippetCache[$this->elmName]))
         {
             $php = $modx->snippetCache[$this->elmName];
         }
         else
         {
             $esc_elmName = $modx->db->escape($this->elmName);
-            $result = $modx->db->select('snippet','[+prefix+]site_snippets',"name='{$esc_elmName}'");
+            $result = $modx->db->select('snippet', '[+prefix+]site_snippets', "name='{$esc_elmName}'");
             $total = $modx->db->getRecordCount($result);
-            if($total == 1)
+            if ($total == 1)
             {
                 $row = $modx->db->getRow($result);
                 $php = $row['snippet'];
             }
-            elseif($total == 0)
+            elseif ($total == 0)
             {
                 $assets_path = MODX_BASE_PATH.'assets/';
-                if(is_file($assets_path."modifiers/mdf_{$cmd}.inc.php"))
+                if (is_file($assets_path."modifiers/mdf_{$cmd}.inc.php"))
                     $modifiers_path = $assets_path."modifiers/mdf_{$cmd}.inc.php";
-                elseif(is_file($assets_path."plugins/phx/modifiers/{$cmd}.phx.php"))
+                elseif (is_file($assets_path."plugins/phx/modifiers/{$cmd}.phx.php"))
                     $modifiers_path = $assets_path."plugins/phx/modifiers/{$cmd}.phx.php";
-                elseif(is_file(MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php"))
+                elseif (is_file(MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php"))
                     $modifiers_path = MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php";
                 else $modifiers_path = false;
 
-                if($modifiers_path !== false) {
+                if ($modifiers_path !== false) {
                     $php = @file_get_contents($modifiers_path);
                     $php = trim($php);
-                    if(substr($php,0,5)==='<?php') $php = substr($php,6);
-                    if(substr($php,0,2)==='<?')    $php = substr($php,3);
-                    if(substr($php,-2)==='?>')     $php = substr($php,0,-2);
-                    if($this->elmName!=='')
+                    if (substr($php, 0, 5) === '<?php') $php = substr($php, 6);
+                    if (substr($php, 0, 2) === '<?')    $php = substr($php, 3);
+                    if (substr($php, -2) === '?>')     $php = substr($php, 0, -2);
+                    if ($this->elmName !== '')
                         $modx->snippetCache[$this->elmName.'Props'] = '';
                 }
                 else
                     $php = false;
             }
             else $php = false;
-            if($this->elmName!=='') $modx->snippetCache[$this->elmName]= $php;
+            if ($this->elmName !== '') $modx->snippetCache[$this->elmName] = $php;
         }
-        if($php==='') $php=false;
+        if ($php === '') $php = false;
 
-        if($php===false) $html = $modx->getChunk($this->elmName);
+        if ($php === false) $html = $modx->getChunk($this->elmName);
         else             $html = false;
 
         $self = '[+output+]';
 
-        if($php !== false)
+        if ($php !== false)
         {
             ob_start();
             $options = $opt;
@@ -1050,71 +1050,71 @@ 
             $this->vars['options'] = & $opt;
             $custom = eval($php);
             $msg = ob_get_contents();
-            if($value===$this->bt) $value = $msg . $custom;
+            if ($value === $this->bt) $value = $msg.$custom;
             ob_end_clean();
         }
-        elseif($html!==false && isset($value) && $value!=='')
+        elseif ($html !== false && isset($value) && $value !== '')
         {
-            $html = str_replace(array($self,'[+value+]'), $value, $html);
-            $value = str_replace(array('[+options+]','[+param+]'), $opt, $html);
+            $html = str_replace(array($self, '[+value+]'), $value, $html);
+            $value = str_replace(array('[+options+]', '[+param+]'), $opt, $html);
         }
         else return false;
 
-        if($php===false && $html===false && $value!==''
-           && (strpos($cmd,'[+value+]')!==false || strpos($cmd,$self)!==false))
+        if ($php === false && $html === false && $value !== ''
+           && (strpos($cmd, '[+value+]') !== false || strpos($cmd, $self) !== false))
         {
-            $value = str_replace(array('[+value+]',$self),$value,$cmd);
+            $value = str_replace(array('[+value+]', $self), $value, $cmd);
         }
         return $value;
     }
 
-    public function parseDocumentSource($content='')
+    public function parseDocumentSource($content = '')
     {
         global $modx;
 
-        if(strpos($content,'[')===false && strpos($content,'{')===false) return $content;
+        if (strpos($content, '[') === false && strpos($content, '{') === false) return $content;
 
-        if(!$modx->maxParserPasses) $modx->maxParserPasses = 10;
-        $bt='';
-        $i=0;
-        while($bt!==$content)
+        if (!$modx->maxParserPasses) $modx->maxParserPasses = 10;
+        $bt = '';
+        $i = 0;
+        while ($bt !== $content)
         {
             $bt = $content;
-            if(strpos($content,'[*')!==false && $modx->documentIdentifier)
+            if (strpos($content, '[*') !== false && $modx->documentIdentifier)
                                               $content = $modx->mergeDocumentContent($content);
-            if(strpos($content,'[(')!==false) $content = $modx->mergeSettingsContent($content);
-            if(strpos($content,'{{')!==false) $content = $modx->mergeChunkContent($content);
-            if(strpos($content,'[!')!==false) $content = str_replace(array('[!','!]'),array('[[',']]'),$content);
-            if(strpos($content,'[[')!==false) $content = $modx->evalSnippets($content);
+            if (strpos($content, '[(') !== false) $content = $modx->mergeSettingsContent($content);
+            if (strpos($content, '{{') !== false) $content = $modx->mergeChunkContent($content);
+            if (strpos($content, '[!') !== false) $content = str_replace(array('[!', '!]'), array('[[', ']]'), $content);
+            if (strpos($content, '[[') !== false) $content = $modx->evalSnippets($content);
 
-            if($content===$bt)              break;
-            if($modx->maxParserPasses < $i) break;
+            if ($content === $bt)              break;
+            if ($modx->maxParserPasses < $i) break;
             $i++;
         }
         return $content;
     }
 
-    public function getDocumentObject($target='',$field='pagetitle')
+    public function getDocumentObject($target = '', $field = 'pagetitle')
     {
         global $modx;
 
         $target = trim($target);
-        if(empty($target)) $target = $modx->config['site_start'];
-        if(preg_match('@^[1-9][0-9]*$@',$target)) $method='id';
+        if (empty($target)) $target = $modx->config['site_start'];
+        if (preg_match('@^[1-9][0-9]*$@', $target)) $method = 'id';
         else $method = 'alias';
 
-        if(!isset($this->documentObject[$target]))
+        if (!isset($this->documentObject[$target]))
         {
-            $this->documentObject[$target] = $modx->getDocumentObject($method,$target,'direct');
+            $this->documentObject[$target] = $modx->getDocumentObject($method, $target, 'direct');
         }
 
-        if($this->documentObject[$target]['publishedon']==='0')
+        if ($this->documentObject[$target]['publishedon'] === '0')
             return '';
-        elseif(isset($this->documentObject[$target][$field]))
+        elseif (isset($this->documentObject[$target][$field]))
         {
-            if(is_array($this->documentObject[$target][$field]))
+            if (is_array($this->documentObject[$target][$field]))
             {
-                $a = $modx->getTemplateVarOutput($field,$target);
+                $a = $modx->getTemplateVarOutput($field, $target);
                 $this->documentObject[$target][$field] = $a[$field];
             }
         }
@@ -1123,8 +1123,8 @@ 
         return $this->documentObject[$target][$field];
     }
 
-    public function setPlaceholders($value = '', $key = '', $path = '') {
-        if($path!=='') $key = "{$path}.{$key}";
+    public function setPlaceholders($value = '', $key = '', $path = ''){
+        if ($path !== '') $key = "{$path}.{$key}";
         if (is_array($value)) {
             foreach ($value as $subkey => $subval) {
                 $this->setPlaceholders($subval, $subkey, $key);
@@ -1134,77 +1134,77 @@ 
     }
 
     // Sets a placeholder variable which can only be access by Modifiers
-    public function setModifiersVariable($key, $value) {
+    public function setModifiersVariable($key, $value){
         if ($key != 'phx' && $key != 'dummy') $this->placeholders[$key] = $value;
     }
 
     //mbstring
-    public function substr($str, $s, $l = null) {
+    public function substr($str, $s, $l = null){
         global $modx;
-        if(is_null($l)) $l = $this->strlen($str);
+        if (is_null($l)) $l = $this->strlen($str);
         if (function_exists('mb_substr'))
         {
-            if(strpos($str,"\r")!==false)
-                $str = str_replace(array("\r\n","\r"), "\n", $str);
+            if (strpos($str, "\r") !== false)
+                $str = str_replace(array("\r\n", "\r"), "\n", $str);
             return mb_substr($str, $s, $l, $modx->config['modx_charset']);
         }
         return substr($str, $s, $l);
     }
-    public function strpos($haystack,$needle,$offset=0) {
+    public function strpos($haystack, $needle, $offset = 0){
         global $modx;
-        if (function_exists('mb_strpos')) return mb_strpos($haystack,$needle,$offset,$modx->config['modx_charset']);
-        return strpos($haystack,$needle,$offset);
+        if (function_exists('mb_strpos')) return mb_strpos($haystack, $needle, $offset, $modx->config['modx_charset']);
+        return strpos($haystack, $needle, $offset);
     }
-    public function strlen($str) {
+    public function strlen($str){
         global $modx;
-        if (function_exists('mb_strlen')) return mb_strlen(str_replace("\r\n", "\n", $str),$modx->config['modx_charset']);
+        if (function_exists('mb_strlen')) return mb_strlen(str_replace("\r\n", "\n", $str), $modx->config['modx_charset']);
         return strlen($str);
     }
-    public function strtolower($str) {
+    public function strtolower($str){
         if (function_exists('mb_strtolower')) return mb_strtolower($str);
         return strtolower($str);
     }
-    public function strtoupper($str) {
+    public function strtoupper($str){
         if (function_exists('mb_strtoupper')) return mb_strtoupper($str);
         return strtoupper($str);
     }
-    public function ucfirst($str) {
+    public function ucfirst($str){
         if (function_exists('mb_strtoupper'))
             return mb_strtoupper($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str));
         return ucfirst($str);
     }
-    public function lcfirst($str) {
+    public function lcfirst($str){
         if (function_exists('mb_strtolower'))
             return mb_strtolower($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str));
         return lcfirst($str);
     }
-    public function ucwords($str) {
+    public function ucwords($str){
         if (function_exists('mb_convert_case'))
             return mb_convert_case($str, MB_CASE_TITLE);
         return ucwords($str);
     }
-    public function strrev($str) {
+    public function strrev($str){
         preg_match_all('/./us', $str, $ar);
         return implode(array_reverse($ar[0]));
     }
-    public function str_shuffle($str) {
+    public function str_shuffle($str){
         preg_match_all('/./us', $str, $ar);
         shuffle($ar[0]);
         return implode($ar[0]);
     }
-    public function str_word_count($str) {
-        return count(preg_split('~[^\p{L}\p{N}\']+~u',$str));
+    public function str_word_count($str){
+        return count(preg_split('~[^\p{L}\p{N}\']+~u', $str));
     }
-    public function strip_tags($value,$params='') {
+    public function strip_tags($value, $params = ''){
         global $modx;
 
-        if(stripos($params,'style')===false && stripos($value,'</style>')!==false) {
+        if (stripos($params, 'style') === false && stripos($value, '</style>') !== false) {
             $value = preg_replace('@<style.*?>.*?</style>@is', '', $value);
         }
-        if(stripos($params,'script')===false && stripos($value,'</script>')!==false) {
+        if (stripos($params, 'script') === false && stripos($value, '</script>') !== false) {
             $value = preg_replace('@<script.*?>.*?</script>@is', '', $value);
         }
 
-        return trim(strip_tags($value,$params));
+        return trim(strip_tags($value, $params));
     }
 }

Braces +544 added lines, -282 removed lines

@@ -1,8 +1,11 @@ 
 <?php
 
-if(!defined('MODX_CORE_PATH')) define('MODX_CORE_PATH', MODX_MANAGER_PATH.'includes/');
+if(!defined('MODX_CORE_PATH')) {
+    define('MODX_CORE_PATH', MODX_MANAGER_PATH.'includes/');
+}
 
-class MODIFIERS {
+class MODIFIERS
+{
     /**
      * @var array
      */
@@ -61,7 +64,9 @@ 
     {
         global $modx;
 
-        if (function_exists('mb_internal_encoding')) mb_internal_encoding($modx->config['modx_charset']);
+        if (function_exists('mb_internal_encoding')) {
+            mb_internal_encoding($modx->config['modx_charset']);
+        }
         $this->condModifiers = '=,is,eq,equals,ne,neq,notequals,isnot,isnt,not,%,isempty,isnotempty,isntempty,>=,gte,eg,gte,greaterthan,>,gt,isgreaterthan,isgt,lowerthan,<,lt,<=,lte,islte,islowerthan,islt,el,find,in,inarray,in_array,fnmatch,wcard,wcard_match,wildcard,wildcard_match,is_file,is_dir,file_exists,is_readable,is_writable,is_image,regex,preg,preg_match,memberof,mo,isinrole,ir';
     }
 
@@ -74,7 +79,9 @@ 
     public function phxFilter($key,$value,$modifiers)
     {
         global $modx;
-        if(substr($modifiers,0,3)!=='id(') $value = $this->parseDocumentSource($value);
+        if(substr($modifiers,0,3)!=='id(') {
+            $value = $this->parseDocumentSource($value);
+        }
         $this->srcValue = $value;
         $modifiers = trim($modifiers);
         $modifiers = ':'.trim($modifiers,':');
@@ -97,13 +104,18 @@ 
      * @param string $modifiers
      * @return bool|string
      */
-    public function _getDelim($mode,$modifiers) {
+    public function _getDelim($mode,$modifiers)
+    {
         $c = substr($modifiers,0,1);
-        if(!in_array($c, array('"', "'", '`')) ) return false;
+        if(!in_array($c, array('"', "'", '`')) ) {
+            return false;
+        }
 
         $modifiers = substr($modifiers,1);
         $closure = $mode=='(' ? "{$c})" : $c;
-        if(strpos($modifiers, $closure)===false) return false;
+        if(strpos($modifiers, $closure)===false) {
+            return false;
+        }
 
         return  $c;
     }
@@ -114,52 +126,65 @@ 
      * @param string $modifiers
      * @return bool|string
      */
-    public function _getOpt($mode,$delim,$modifiers) {
+    public function _getOpt($mode,$delim,$modifiers)
+    {
         if($delim) {
-            if($mode=='(') return substr($modifiers,1,strpos($modifiers, $delim . ')' )-1);
+            if($mode=='(') {
+                return substr($modifiers,1,strpos($modifiers, $delim . ')' )-1);
+            }
 
             return substr($modifiers,1,strpos($modifiers,$delim,1)-1);
-        }
-        else {
-            if($mode=='(') return substr($modifiers,0,strpos($modifiers, ')') );
+        } else {
+            if($mode=='(') {
+                return substr($modifiers,0,strpos($modifiers, ')') );
+            }
 
             $chars = str_split($modifiers);
             $opt='';
             foreach($chars as $c) {
-                if($c==':' || $c==')') break;
+                if($c==':' || $c==')') {
+                    break;
+                }
                 $opt .=$c;
             }
             return $opt;
         }
     }
-    public function _getRemainModifiers($mode,$delim,$modifiers) {
+    public function _getRemainModifiers($mode,$delim,$modifiers)
+    {
         if($delim) {
-            if($mode=='(')
-                return $this->_fetchContent($modifiers, $delim . ')');
-            else {
+            if($mode=='(') {
+                            return $this->_fetchContent($modifiers, $delim . ')');
+            } else {
                 $modifiers = trim($modifiers);
                 $modifiers = substr($modifiers,1);
                 return $this->_fetchContent($modifiers, $delim);
             }
-        }
-        else {
-            if($mode=='(') return $this->_fetchContent($modifiers, ')');
+        } else {
+            if($mode=='(') {
+                return $this->_fetchContent($modifiers, ')');
+            }
             $chars = str_split($modifiers);
             foreach($chars as $c) {
-                if($c==':') return $modifiers;
-                else $modifiers = substr($modifiers,1);
+                if($c==':') {
+                    return $modifiers;
+                } else {
+                    $modifiers = substr($modifiers,1);
+                }
             }
             return $modifiers;
         }
     }
 
-    public function _fetchContent($string,$delim) {
+    public function _fetchContent($string,$delim)
+    {
         $len = strlen($delim);
         $string = $this->parseDocumentSource($string);
         return substr($string,strpos($string, $delim)+$len);
     }
 
-    public function splitEachModifiers($modifiers) {
+    public function splitEachModifiers($modifiers)
+    {
         global $modx;
 
         $cmd = '';
@@ -170,11 +195,15 @@ 
             $c = substr($modifiers,0,1);
             $modifiers = substr($modifiers,1);
 
-            if($c===':' && preg_match('@^(!?[<>=]{1,2})@', $modifiers, $match)) { // :=, :!=, :<=, :>=, :!<=, :!>=
+            if($c===':' && preg_match('@^(!?[<>=]{1,2})@', $modifiers, $match)) {
+// :=, :!=, :<=, :>=, :!<=, :!>=
                 $c = substr($modifiers,strlen($match[1]),1);
                 $debuginfo = "#i=0 #c=[{$c}] #m=[{$modifiers}]";
-                if($c==='(') $modifiers = substr($modifiers,strlen($match[1])+1);
-                else         $modifiers = substr($modifiers,strlen($match[1]));
+                if($c==='(') {
+                    $modifiers = substr($modifiers,strlen($match[1])+1);
+                } else {
+                    $modifiers = substr($modifiers,strlen($match[1]));
+                }
 
                 $delim     = $this->_getDelim($c,$modifiers);
                 $opt       = $this->_getOpt($c,$delim,$modifiers);
@@ -182,13 +211,12 @@ 
 
                 $result[]=array('cmd'=>trim($match[1]),'opt'=>$opt,'debuginfo'=>$debuginfo);
                 $cmd = '';
-            }
-            elseif(in_array($c,array('+','-','*','/')) && preg_match('@^[0-9]+@', $modifiers, $match)) { // :+3, :-3, :*3 ...
+            } elseif(in_array($c,array('+','-','*','/')) && preg_match('@^[0-9]+@', $modifiers, $match)) {
+// :+3, :-3, :*3 ...
                 $modifiers = substr($modifiers,strlen($match[0]));
                 $result[]=array('cmd'=>'math','opt'=>'%s'.$c.$match[0]);
                 $cmd = '';
-            }
-            elseif($c==='(' || $c==='=') {
+            } elseif($c==='(' || $c==='=') {
                 $modifiers = $m1 = trim($modifiers);
                 $delim     = $this->_getDelim($c,$modifiers);
                 $opt       = $this->_getOpt($c,$delim,$modifiers);
@@ -198,29 +226,29 @@ 
                 $result[]=array('cmd'=>trim($cmd),'opt'=>$opt,'debuginfo'=>$debuginfo);
 
                 $cmd = '';
-            }
-            elseif($c==':') {
+            } elseif($c==':') {
                 $debuginfo = "#i=2 #c=[{$c}] #m=[{$modifiers}]";
-                if($cmd!=='') $result[]=array('cmd'=>trim($cmd),'opt'=>'','debuginfo'=>$debuginfo);
+                if($cmd!=='') {
+                    $result[]=array('cmd'=>trim($cmd),'opt'=>'','debuginfo'=>$debuginfo);
+                }
 
                 $cmd = '';
-            }
-            elseif(trim($modifiers)=='' && trim($cmd)!=='') {
+            } elseif(trim($modifiers)=='' && trim($cmd)!=='') {
                 $debuginfo = "#i=3 #c=[{$c}] #m=[{$modifiers}]";
                 $cmd .= $c;
                 $result[]=array('cmd'=>trim($cmd),'opt'=>'','debuginfo'=>$debuginfo);
 
                 break;
-            }
-            else {
+            } else {
                 $cmd .= $c;
             }
         }
 
-        if(empty($result)) return array();
+        if(empty($result)) {
+            return array();
+        }
 
-        foreach($result as $i=>$a)
-        {
+        foreach($result as $i=>$a) {
             $a['opt'] = $this->parseDocumentSource($a['opt']);
             $result[$i]['opt'] = $modx->mergePlaceholderContent($a['opt'],$this->placeholders);
         }
@@ -233,22 +261,23 @@ 
         global $modx;
         $lastKey = '';
         $cacheKey = md5(sprintf('parsePhx#%s#%s#%s',$key,$value,print_r($modifiers,true)));
-        if(isset($this->tmpCache[$cacheKey])) return $this->tmpCache[$cacheKey];
-        if(empty($modifiers)) return '';
+        if(isset($this->tmpCache[$cacheKey])) {
+            return $this->tmpCache[$cacheKey];
+        }
+        if(empty($modifiers)) {
+            return '';
+        }
 
-        foreach($modifiers as $m)
-        {
+        foreach($modifiers as $m) {
             $lastKey = strtolower($m['cmd']);
         }
         $_ = explode(',',$this->condModifiers);
-        if(in_array($lastKey,$_))
-        {
+        if(in_array($lastKey,$_)) {
             $modifiers[] = array('cmd'=>'then','opt'=>'1');
             $modifiers[] = array('cmd'=>'else','opt'=>'0');
         }
 
-        foreach($modifiers as $i=>$a)
-        {
+        foreach($modifiers as $i=>$a) {
             $value = $this->Filter($key,$value, $a['cmd'], $a['opt']);
         }
         $this->tmpCache[$cacheKey] = $value;
@@ -260,25 +289,32 @@ 
     {
         global $modx;
 
-        if($key==='documentObject') $value = $modx->documentIdentifier;
+        if($key==='documentObject') {
+            $value = $modx->documentIdentifier;
+        }
         $cmd = $this->parseDocumentSource($cmd);
-        if(preg_match('@^[1-9][/0-9]*$@',$cmd))
-        {
-            if(strpos($cmd,'/')!==false)
-                $cmd = $this->substr($cmd,strrpos($cmd,'/')+1);
+        if(preg_match('@^[1-9][/0-9]*$@',$cmd)) {
+            if(strpos($cmd,'/')!==false) {
+                            $cmd = $this->substr($cmd,strrpos($cmd,'/')+1);
+            }
             $opt = $cmd;
             $cmd = 'id';
         }
 
-        if(isset($modx->snippetCache["phx:{$cmd}"]))   $this->elmName = "phx:{$cmd}";
-        elseif(isset($modx->chunkCache["phx:{$cmd}"])) $this->elmName = "phx:{$cmd}";
-        else                                           $this->elmName = '';
+        if(isset($modx->snippetCache["phx:{$cmd}"])) {
+            $this->elmName = "phx:{$cmd}";
+        } elseif(isset($modx->chunkCache["phx:{$cmd}"])) {
+            $this->elmName = "phx:{$cmd}";
+        } else {
+            $this->elmName = '';
+        }
 
         $cmd = strtolower($cmd);
-        if($this->elmName!=='')
-            $value = $this->getValueFromElement($key, $value, $cmd, $opt);
-        else
-            $value = $this->getValueFromPreset($key, $value, $cmd, $opt);
+        if($this->elmName!=='') {
+                    $value = $this->getValueFromElement($key, $value, $cmd, $opt);
+        } else {
+                    $value = $this->getValueFromPreset($key, $value, $cmd, $opt);
+        }
 
         $value = str_replace('[+key+]', $key, $value);
 
@@ -287,29 +323,37 @@ 
 
     public function isEmpty($cmd,$value)
     {
-        if($value!=='') return false;
+        if($value!=='') {
+            return false;
+        }
 
         $_ = explode(',', $this->condModifiers . ',_default,default,if,input,or,and,show,this,select,switch,then,else,id,ifempty,smart_desc,smart_description,summary');
-        if(in_array($cmd,$_)) return false;
-        else                  return true;
+        if(in_array($cmd,$_)) {
+            return false;
+        } else {
+            return true;
+        }
     }
 
     public function getValueFromPreset($key, $value, $cmd, $opt)
     {
         global $modx;
 
-        if($this->isEmpty($cmd,$value)) return '';
+        if($this->isEmpty($cmd,$value)) {
+            return '';
+        }
 
         $this->key = $key;
         $this->value  = $value;
         $this->opt    = $opt;
 
-        switch ($cmd)
-        {
+        switch ($cmd) {
             #####  Conditional Modifiers
             case 'input':
             case 'if':
-                if(!$opt) return $value;
+                if(!$opt) {
+                    return $value;
+                }
                 return $opt;
             case '=':
             case 'eq':
@@ -370,14 +414,24 @@ 
             case 'file_exists':
             case 'is_readable':
             case 'is_writable':
-                if(!$opt) $path = $value;
-                else      $path = $opt;
-                if(strpos($path,MODX_MANAGER_PATH)!==false) exit('Can not read core path');
-                if(strpos($path,$modx->config['base_path'])===false) $path = ltrim($path,'/');
+                if(!$opt) {
+                    $path = $value;
+                } else {
+                    $path = $opt;
+                }
+                if(strpos($path,MODX_MANAGER_PATH)!==false) {
+                    exit('Can not read core path');
+                }
+                if(strpos($path,$modx->config['base_path'])===false) {
+                    $path = ltrim($path,'/');
+                }
                 $this->condition[] = (int)($cmd($path)!==false);break;
             case 'is_image':
-                if(!$opt) $path = $value;
-                else      $path = $opt;
+                if(!$opt) {
+                    $path = $value;
+                } else {
+                    $path = $opt;
+                }
                 if(!is_file($path)) {$this->condition[]='0';break;}
                 $_ = getimagesize($path);
                 $this->condition[] = (int)($_[0]);break;
@@ -400,17 +454,23 @@ 
             case 'this':
                 $conditional = implode(' ',$this->condition);
                 $isvalid = (int)(eval("return ({$conditional});"));
-                if ($isvalid) return $this->srcValue;
+                if ($isvalid) {
+                    return $this->srcValue;
+                }
                 return NULL;
             case 'then':
                 $conditional = implode(' ',$this->condition);
                 $isvalid = (int)eval("return ({$conditional});");
-                if ($isvalid)  return $opt;
+                if ($isvalid) {
+                    return $opt;
+                }
                 return null;
             case 'else':
                 $conditional = implode(' ',$this->condition);
                 $isvalid = (int)eval("return ({$conditional});");
-                if (!$isvalid) return $opt;
+                if (!$isvalid) {
+                    return $opt;
+                }
                 break;
             case 'select':
             case 'switch':
@@ -421,8 +481,11 @@ 
                     $mi = explode('=',$raw[$m],2);
                     $map[$mi[0]] = $mi[1];
                 }
-                if(isset($map[$value])) return $map[$value];
-                else                    return '';
+                if(isset($map[$value])) {
+                    return $map[$value];
+                } else {
+                    return '';
+                }
             ##### End of Conditional Modifiers
 
             #####  Encode / Decode / Hash / Escape
@@ -448,24 +511,25 @@ 
             case 'spam_protect':
                 return str_replace(array('@','.'),array('&#64;','&#46;'),$value);
             case 'strip':
-                if($opt==='') $opt = ' ';
+                if($opt==='') {
+                    $opt = ' ';
+                }
                 return preg_replace('/[\n\r\t\s]+/', $opt, $value);
             case 'strip_linefeeds':
                 return str_replace(array("\n","\r"), '', $value);
             case 'notags':
             case 'strip_tags':
             case 'remove_html':
-                if($opt!=='')
-                {
+                if($opt!=='') {
                     $param = array();
-                    foreach(explode(',',$opt) as $v)
-                    {
+                    foreach(explode(',',$opt) as $v) {
                         $v = trim($v,'</> ');
                         $param[] = "<{$v}>";
                     }
                     $params = implode(',',$param);
+                } else {
+                    $params = '';
                 }
-                else $params = '';
                 if(!strpos($params,'<br>')===false) {
                     $value = preg_replace('@(<br[ /]*>)\n@','$1',$value);
                     $value = preg_replace('@<br[ /]*>@',"\n",$value);
@@ -476,8 +540,11 @@ 
             case 'encode_url':
                 return urlencode($value);
             case 'base64_decode':
-                if($opt!=='false') $opt = true;
-                else               $opt = false;
+                if($opt!=='false') {
+                    $opt = true;
+                } else {
+                    $opt = false;
+                }
                 return base64_decode($value,$opt);
             case 'encode_sha1': $cmd = 'sha1';
             case 'addslashes':
@@ -503,16 +570,19 @@ 
                 return $this->strtoupper($value);
             case 'capitalize':
                 $_ = explode(' ',$value);
-                foreach($_ as $i=>$v)
-                {
+                foreach($_ as $i=>$v) {
                     $_[$i] = ucfirst($v);
                 }
                 return implode(' ',$_);
             case 'zenhan':
-                if(empty($opt)) $opt='VKas';
+                if(empty($opt)) {
+                    $opt='VKas';
+                }
                 return mb_convert_kana($value,$opt,$modx->config['modx_charset']);
             case 'hanzen':
-                if(empty($opt)) $opt='VKAS';
+                if(empty($opt)) {
+                    $opt='VKAS';
+                }
                 return mb_convert_kana($value,$opt,$modx->config['modx_charset']);
             case 'str_shuffle':
             case 'shuffle':
@@ -537,13 +607,18 @@ 
                 $value = preg_replace('/\r/', '', $value);
                 return count(preg_split('/\n+/',$value));
             case 'strpos':
-                if($opt!=0&&empty($opt)) return $value;
+                if($opt!=0&&empty($opt)) {
+                    return $value;
+                }
                 return $this->strpos($value,$opt);
             case 'wordwrap':
                 // default: 70
                   $wrapat = (int)$opt > 0 ? (int)$opt : 70;
-                if (version_compare(PHP_VERSION, '5.3.0') >= 0) return $this->includeMdfFile('wordwrap');
-                else return preg_replace("@(\b\w+\b)@e","wordwrap('\\1',\$wrapat,' ',1)",$value);
+                if (version_compare(PHP_VERSION, '5.3.0') >= 0) {
+                    return $this->includeMdfFile('wordwrap');
+                } else {
+                    return preg_replace("@(\b\w+\b)@e","wordwrap('\\1',\$wrapat,' ',1)",$value);
+                }
             case 'wrap_text':
                 $width = preg_match('/^[1-9][0-9]*$/',$opt) ? $opt : 70;
                 if($modx->config['manager_language']==='japanese-utf8') {
@@ -559,30 +634,36 @@ 
                         $value = $this->substr($value,$width);
                     }
                     return implode("\n",$chunk);
+                } else {
+                                    return wordwrap($value,$width,"\n",true);
                 }
-                else
-                    return wordwrap($value,$width,"\n",true);
             case 'substr':
-                if(empty($opt)) break;
+                if(empty($opt)) {
+                    break;
+                }
                 if(strpos($opt,',')!==false) {
                     list($b,$e) = explode(',',$opt,2);
                     return $this->substr($value,$b,(int)$e);
+                } else {
+                    return $this->substr($value,$opt);
                 }
-                else return $this->substr($value,$opt);
             case 'limit':
             case 'trim_to': // http://www.movabletype.jp/documentation/appendices/modifiers/trim_to.html
-                if(strpos($opt,'+')!==false)
-                    list($len,$str) = explode('+',$opt,2);
-                else {
+                if(strpos($opt,'+')!==false) {
+                                    list($len,$str) = explode('+',$opt,2);
+                } else {
                     $len = $opt;
                     $str = '';
                 }
-                if($len==='') $len = 100;
-                if(abs($len) > $this->strlen($value)) $str ='';
+                if($len==='') {
+                    $len = 100;
+                }
+                if(abs($len) > $this->strlen($value)) {
+                    $str ='';
+                }
                 if(preg_match('/^[1-9][0-9]*$/',$len)) {
                     return $this->substr($value,0,$len) . $str;
-                }
-                elseif(preg_match('/^\-[1-9][0-9]*$/',$len)) {
+                } elseif(preg_match('/^\-[1-9][0-9]*$/',$len)) {
                     return $str . $this->substr($value,$len);
                 }
                 break;
@@ -592,18 +673,30 @@ 
                 return $this->includeMdfFile('summary');
             case 'replace':
             case 'str_replace':
-                if(empty($opt) || strpos($opt,',')===false) break;
-                if    (substr_count($opt, ',') ==1) $delim = ',';
-                elseif(substr_count($opt, '|') ==1) $delim = '|';
-                elseif(substr_count($opt, '=>')==1) $delim = '=>';
-                elseif(substr_count($opt, '/') ==1) $delim = '/';
-                else break;
+                if(empty($opt) || strpos($opt,',')===false) {
+                    break;
+                }
+                if    (substr_count($opt, ',') ==1) {
+                    $delim = ',';
+                } elseif(substr_count($opt, '|') ==1) {
+                    $delim = '|';
+                } elseif(substr_count($opt, '=>')==1) {
+                    $delim = '=>';
+                } elseif(substr_count($opt, '/') ==1) {
+                    $delim = '/';
+                } else {
+                    break;
+                }
                 list($s,$r) = explode($delim,$opt);
-                if($value!=='') return str_replace($s,$r,$value);
+                if($value!=='') {
+                    return str_replace($s,$r,$value);
+                }
                 break;
             case 'replace_to':
             case 'tpl':
-                if($value!=='') return str_replace(array('[+value+]','[+output+]','{value}','%s'),$value,$opt);
+                if($value!=='') {
+                    return str_replace(array('[+value+]','[+output+]','{value}','%s'),$value,$opt);
+                }
                 break;
             case 'eachtpl':
                 $value = explode('||',$value);
@@ -614,59 +707,83 @@ 
                 return implode("\n", $_);
             case 'array_pop':
             case 'array_shift':
-                if(strpos($value,'||')!==false) $delim = '||';
-                else                            $delim = ',';
+                if(strpos($value,'||')!==false) {
+                    $delim = '||';
+                } else {
+                    $delim = ',';
+                }
                 return $cmd(explode($delim,$value));
             case 'preg_replace':
             case 'regex_replace':
-                if(empty($opt) || strpos($opt,',')===false) break;
+                if(empty($opt) || strpos($opt,',')===false) {
+                    break;
+                }
                 list($s,$r) = explode(',',$opt,2);
-                if($value!=='') return preg_replace($s,$r,$value);
+                if($value!=='') {
+                    return preg_replace($s,$r,$value);
+                }
                 break;
             case 'cat':
             case 'concatenate':
             case '.':
-                if($value!=='') return $value . $opt;
+                if($value!=='') {
+                    return $value . $opt;
+                }
                 break;
             case 'sprintf':
             case 'string_format':
-                if($value!=='') return sprintf($opt,$value);
+                if($value!=='') {
+                    return sprintf($opt,$value);
+                }
                 break;
             case 'number_format':
-                    if($opt=='') $opt = 0;
+                    if($opt=='') {
+                        $opt = 0;
+                    }
                     return number_format($value,$opt);
             case 'money_format':
                     setlocale(LC_MONETARY,setlocale(LC_TIME,0));
-                    if($value!=='') return money_format($opt,(double)$value);
+                    if($value!=='') {
+                        return money_format($opt,(double)$value);
+                    }
                     break;
             case 'tobool':
                 return boolval($value);
             case 'nl2lf':
-                if($value!=='') return str_replace(array("\r\n","\n", "\r"), '\n', $value);
+                if($value!=='') {
+                    return str_replace(array("\r\n","\n", "\r"), '\n', $value);
+                }
                 break;
             case 'br2nl':
                 return preg_replace('@<br[\s/]*>@i', "\n", $value);
             case 'nl2br':
-                if (version_compare(PHP_VERSION, '5.3.0', '<'))
-                    return nl2br($value);
-                if($opt!=='')
-                {
+                if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+                                    return nl2br($value);
+                }
+                if($opt!=='') {
                     $opt = trim($opt);
                     $opt = strtolower($opt);
-                    if($opt==='false') $opt = false;
-                    elseif($opt==='0') $opt = false;
-                    else               $opt = true;
+                    if($opt==='false') {
+                        $opt = false;
+                    } elseif($opt==='0') {
+                        $opt = false;
+                    } else {
+                        $opt = true;
+                    }
+                } elseif(isset($modx->config['mce_element_format'])&&$modx->config['mce_element_format']==='html') {
+                                                       $opt = false;
+                } else {
+                    $opt = true;
                 }
-                elseif(isset($modx->config['mce_element_format'])&&$modx->config['mce_element_format']==='html')
-                                       $opt = false;
-                else                   $opt = true;
                 return nl2br($value,$opt);
             case 'ltrim':
             case 'rtrim':
             case 'trim': // ref http://mblo.info/modifiers/custom-modifiers/rtrim_opt.html
-                if($opt==='')
-                    return $cmd($value);
-                else return $cmd($value,$opt);
+                if($opt==='') {
+                                    return $cmd($value);
+                } else {
+                    return $cmd($value,$opt);
+                }
             // These are all straight wrappers for PHP functions
             case 'ucfirst':
             case 'lcfirst':
@@ -677,15 +794,24 @@ 
             case 'strftime':
             case 'date':
             case 'dateformat':
-                if(empty($opt)) $opt = $modx->toDateFormat(null, 'formatOnly');
-                if(!preg_match('@^[0-9]+$@',$value)) $value = strtotime($value);
-                if(strpos($opt,'%')!==false)
-                    return strftime($opt,0+$value);
-                else
-                    return date($opt,0+$value);
+                if(empty($opt)) {
+                    $opt = $modx->toDateFormat(null, 'formatOnly');
+                }
+                if(!preg_match('@^[0-9]+$@',$value)) {
+                    $value = strtotime($value);
+                }
+                if(strpos($opt,'%')!==false) {
+                                    return strftime($opt,0+$value);
+                } else {
+                                    return date($opt,0+$value);
+                }
             case 'time':
-                if(empty($opt)) $opt = '%H:%M';
-                if(!preg_match('@^[0-9]+$@',$value)) $value = strtotime($value);
+                if(empty($opt)) {
+                    $opt = '%H:%M';
+                }
+                if(!preg_match('@^[0-9]+$@',$value)) {
+                    $value = strtotime($value);
+                }
                 return strftime($opt,0+$value);
             case 'strtotime':
                 return strtotime($value);
@@ -695,7 +821,9 @@ 
             case 'tofloat':
                 return floatval($value);
             case 'round':
-                if(!$opt) $opt = 0;
+                if(!$opt) {
+                    $opt = 0;
+                }
                 return $cmd($value,$opt);
             case 'max':
             case 'min':
@@ -707,28 +835,42 @@ 
             case 'math':
             case 'calc':
                 $value = (int)$value;
-                if(empty($value)) $value = '0';
+                if(empty($value)) {
+                    $value = '0';
+                }
                 $filter = str_replace(array('[+value+]','[+output+]','{value}','%s'),'?',$opt);
                 $filter = preg_replace('@([a-zA-Z\n\r\t\s])@','',$filter);
-                if(strpos($filter,'?')===false) $filter = "?{$filter}";
+                if(strpos($filter,'?')===false) {
+                    $filter = "?{$filter}";
+                }
                 $filter = str_replace('?',$value,$filter);
                 return eval("return {$filter};");
             case 'count':
-                if($value=='') return 0;
+                if($value=='') {
+                    return 0;
+                }
                 $value = explode(',',$value);
                 return count($value);
             case 'sort':
             case 'rsort':
-                if(strpos($value,"\n")!==false) $delim="\n";
-                else $delim = ',';
+                if(strpos($value,"\n")!==false) {
+                    $delim="\n";
+                } else {
+                    $delim = ',';
+                }
                 $swap = explode($delim,$value);
-                if(!$opt) $opt = SORT_REGULAR;
-                else      $opt = constant($opt);
+                if(!$opt) {
+                    $opt = SORT_REGULAR;
+                } else {
+                    $opt = constant($opt);
+                }
                 $cmd($swap,$opt);
                 return implode($delim,$swap);
             #####  Resource fields
             case 'id':
-                if($opt) return $this->getDocumentObject($opt,$key);
+                if($opt) {
+                    return $this->getDocumentObject($opt,$key);
+                }
                 break;
             case 'type':
             case 'contenttype':
@@ -765,7 +907,9 @@ 
             case 'privatemgr':
             case 'content_dispo':
             case 'hidemenu':
-                if($cmd==='contenttype') $cmd = 'contentType';
+                if($cmd==='contenttype') {
+                    $cmd = 'contentType';
+                }
                 return $this->getDocumentObject($value,$cmd);
             case 'title':
                 $pagetitle = $this->getDocumentObject($value,'pagetitle');
@@ -780,13 +924,20 @@ 
                 $templateName = $modx->db->getValue($rs);
                 return !$templateName ? '(blank)' : $templateName;
             case 'getfield':
-                if(!$opt) $opt = 'content';
+                if(!$opt) {
+                    $opt = 'content';
+                }
                 return $modx->getField($opt,$value);
             case 'children':
             case 'childids':
-                if($value=='') $value = 0; // 値がない場合はルートと見なす
+                if($value=='') {
+                    $value = 0;
+                }
+                // 値がない場合はルートと見なす
                 $published = 1;
-                if($opt=='') $opt = 'page';
+                if($opt=='') {
+                    $opt = 'page';
+                }
                 $_ = explode(',',$opt);
                 $where = array();
                 foreach($_ as $opt) {
@@ -802,29 +953,43 @@ 
                 $where = implode(' AND ', $where);
                 $children = $modx->getDocumentChildren($value, $published, '0', 'id', $where);
                 $result = array();
-                foreach((array)$children as $child){
+                foreach((array)$children as $child) {
                     $result[] = $child['id'];
                 }
                 return implode(',', $result);
             case 'fullurl':
-                if(!is_numeric($value)) return $value;
+                if(!is_numeric($value)) {
+                    return $value;
+                }
                 return $modx->makeUrl($value);
             case 'makeurl':
-                if(!is_numeric($value)) return $value;
-                if(!$opt) $opt = 'full';
+                if(!is_numeric($value)) {
+                    return $value;
+                }
+                if(!$opt) {
+                    $opt = 'full';
+                }
                 return $modx->makeUrl($value,'','',$opt);
 
             #####  File system
             case 'getimageinfo':
             case 'imageinfo':
-                if(!is_file($value)) return '';
+                if(!is_file($value)) {
+                    return '';
+                }
                 $_ = getimagesize($value);
-                if(!$_[0]) return '';
+                if(!$_[0]) {
+                    return '';
+                }
                 $info['width']  = $_[0];
                 $info['height'] = $_[1];
-                if    ($_[0] > $_[1]) $info['aspect'] = 'landscape';
-                elseif($_[0] < $_[1]) $info['aspect'] = 'portrait';
-                else                  $info['aspect'] = 'square';
+                if    ($_[0] > $_[1]) {
+                    $info['aspect'] = 'landscape';
+                } elseif($_[0] < $_[1]) {
+                    $info['aspect'] = 'portrait';
+                } else {
+                    $info['aspect'] = 'square';
+                }
                 switch($_[2]) {
                     case IMAGETYPE_GIF  : $info['type'] = 'gif'; break;
                     case IMAGETYPE_JPEG : $info['type'] = 'jpg'; break;
@@ -843,33 +1008,47 @@ 
 
             case 'file_get_contents':
             case 'readfile':
-                if(!is_file($value)) return $value;
+                if(!is_file($value)) {
+                    return $value;
+                }
                 $value = realpath($value);
-                if(strpos($value,MODX_MANAGER_PATH)!==false) exit('Can not read core file');
+                if(strpos($value,MODX_MANAGER_PATH)!==false) {
+                    exit('Can not read core file');
+                }
                 $ext = strtolower(substr($value,-4));
-                if($ext==='.php') exit('Can not read php file');
-                if($ext==='.cgi') exit('Can not read cgi file');
+                if($ext==='.php') {
+                    exit('Can not read php file');
+                }
+                if($ext==='.cgi') {
+                    exit('Can not read cgi file');
+                }
                 return file_get_contents($value);
             case 'filesize':
-                if($value == '') return '';
+                if($value == '') {
+                    return '';
+                }
                 $filename = $value;
 
                 $site_url = $modx->config['site_url'];
-                if(strpos($filename,$site_url) === 0)
-                    $filename = substr($filename,0,strlen($site_url));
+                if(strpos($filename,$site_url) === 0) {
+                                    $filename = substr($filename,0,strlen($site_url));
+                }
                 $filename = trim($filename,'/');
 
                 $opt = trim($opt,'/');
-                if($opt!=='') $opt .= '/';
+                if($opt!=='') {
+                    $opt .= '/';
+                }
 
                 $filename = MODX_BASE_PATH.$opt.$filename;
 
-                if(is_file($filename)){
+                if(is_file($filename)) {
                     clearstatcache();
                     $size = filesize($filename);
                     return $size;
+                } else {
+                    return '';
                 }
-                else return '';
             #####  User info
             case 'username':
             case 'fullname':
@@ -897,32 +1076,47 @@ 
                 $this->opt = $cmd;
                 return $this->includeMdfFile('moduser');
             case 'userinfo':
-                if(empty($opt)) $this->opt = 'username';
+                if(empty($opt)) {
+                    $this->opt = 'username';
+                }
                 return $this->includeMdfFile('moduser');
             case 'webuserinfo':
-                if(empty($opt)) $this->opt = 'username';
+                if(empty($opt)) {
+                    $this->opt = 'username';
+                }
                 $this->value = -$value;
                 return $this->includeMdfFile('moduser');
             #####  Special functions
             case 'ifempty':
             case '_default':
             case 'default':
-                if (empty($value)) return $opt; break;
+                if (empty($value)) {
+                    return $opt;
+                }
+                break;
             case 'ifnotempty':
-                if (!empty($value)) return $opt; break;
+                if (!empty($value)) {
+                    return $opt;
+                }
+                break;
             case 'datagrid':
                 include_once(MODX_CORE_PATH . 'controls/datagrid.class.php');
                 $grd = new DataGrid(null, trim($value));
                 $grd->itemStyle = '';
                 $grd->altItemStyle = '';
                 $pos = strpos($value,"\n");
-                if($pos) $_ = substr($value,0,$pos);
-                else $_ = $pos;
+                if($pos) {
+                    $_ = substr($value,0,$pos);
+                } else {
+                    $_ = $pos;
+                }
                 $grd->cdelim = strpos($_,"\t")!==false ? 'tab' : ',';
                 return $grd->render();
             case 'rotate':
             case 'evenodd':
-                if(strpos($opt,',')===false) $opt = 'odd,even';
+                if(strpos($opt,',')===false) {
+                    $opt = 'odd,even';
+                }
                 $_ = explode(',', $opt);
                 $c = count($_);
                 $i = $value + $c;
@@ -931,7 +1125,9 @@ 
             case 'takeval':
                 $arr = explode(",",$opt);
                 $idx = $value;
-                if(!is_numeric($idx)) return $value;
+                if(!is_numeric($idx)) {
+                    return $value;
+                }
                 return $arr[$idx];
             case 'getimage':
                 return $this->includeMdfFile('getimage');
@@ -939,14 +1135,18 @@ 
                     return $modx->nicesize($value);
             case 'googlemap':
             case 'googlemaps':
-                if(empty($opt)) $opt = 'border:none;width:500px;height:350px;';
+                if(empty($opt)) {
+                    $opt = 'border:none;width:500px;height:350px;';
+                }
                 $tpl = '<iframe style="[+style+]" src="https://maps.google.co.jp/maps?ll=[+value+]&output=embed&z=15"></iframe>';
                 $ph['style'] = $opt;
                 $ph['value'] = $value;
                 return $modx->parseText($tpl,$ph);
             case 'youtube':
             case 'youtube16x9':
-                if(empty($opt)) $opt = 560;
+                if(empty($opt)) {
+                    $opt = 560;
+                }
                 $h = round($opt*0.5625);
                 $tpl = '<iframe width="%s" height="%s" src="https://www.youtube.com/embed/%s" frameborder="0" allowfullscreen></iframe>';
                 return sprintf($tpl,$opt,$h,$value);
@@ -979,7 +1179,8 @@ 
         return $value;
     }
 
-    public function includeMdfFile($cmd) {
+    public function includeMdfFile($cmd)
+    {
         global $modx;
         $key = $this->key;
         $value  = $this->value;
@@ -990,55 +1191,65 @@ 
     public function getValueFromElement($key, $value, $cmd, $opt)
     {
         global $modx;
-        if( isset($modx->snippetCache[$this->elmName]) )
-        {
+        if( isset($modx->snippetCache[$this->elmName]) ) {
             $php = $modx->snippetCache[$this->elmName];
-        }
-        else
-        {
+        } else {
             $esc_elmName = $modx->db->escape($this->elmName);
             $result = $modx->db->select('snippet','[+prefix+]site_snippets',"name='{$esc_elmName}'");
             $total = $modx->db->getRecordCount($result);
-            if($total == 1)
-            {
+            if($total == 1) {
                 $row = $modx->db->getRow($result);
                 $php = $row['snippet'];
-            }
-            elseif($total == 0)
-            {
+            } elseif($total == 0) {
                 $assets_path = MODX_BASE_PATH.'assets/';
-                if(is_file($assets_path."modifiers/mdf_{$cmd}.inc.php"))
-                    $modifiers_path = $assets_path."modifiers/mdf_{$cmd}.inc.php";
-                elseif(is_file($assets_path."plugins/phx/modifiers/{$cmd}.phx.php"))
-                    $modifiers_path = $assets_path."plugins/phx/modifiers/{$cmd}.phx.php";
-                elseif(is_file(MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php"))
-                    $modifiers_path = MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php";
-                else $modifiers_path = false;
+                if(is_file($assets_path."modifiers/mdf_{$cmd}.inc.php")) {
+                                    $modifiers_path = $assets_path."modifiers/mdf_{$cmd}.inc.php";
+                } elseif(is_file($assets_path."plugins/phx/modifiers/{$cmd}.phx.php")) {
+                                    $modifiers_path = $assets_path."plugins/phx/modifiers/{$cmd}.phx.php";
+                } elseif(is_file(MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php")) {
+                                    $modifiers_path = MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php";
+                } else {
+                    $modifiers_path = false;
+                }
 
                 if($modifiers_path !== false) {
                     $php = @file_get_contents($modifiers_path);
                     $php = trim($php);
-                    if(substr($php,0,5)==='<?php') $php = substr($php,6);
-                    if(substr($php,0,2)==='<?')    $php = substr($php,3);
-                    if(substr($php,-2)==='?>')     $php = substr($php,0,-2);
-                    if($this->elmName!=='')
-                        $modx->snippetCache[$this->elmName.'Props'] = '';
-                }
-                else
-                    $php = false;
+                    if(substr($php,0,5)==='<?php') {
+                        $php = substr($php,6);
+                    }
+                    if(substr($php,0,2)==='<?') {
+                        $php = substr($php,3);
+                    }
+                    if(substr($php,-2)==='?>') {
+                        $php = substr($php,0,-2);
+                    }
+                    if($this->elmName!=='') {
+                                            $modx->snippetCache[$this->elmName.'Props'] = '';
+                    }
+                } else {
+                                    $php = false;
+                }
+            } else {
+                $php = false;
+            }
+            if($this->elmName!=='') {
+                $modx->snippetCache[$this->elmName]= $php;
             }
-            else $php = false;
-            if($this->elmName!=='') $modx->snippetCache[$this->elmName]= $php;
         }
-        if($php==='') $php=false;
+        if($php==='') {
+            $php=false;
+        }
 
-        if($php===false) $html = $modx->getChunk($this->elmName);
-        else             $html = false;
+        if($php===false) {
+            $html = $modx->getChunk($this->elmName);
+        } else {
+            $html = false;
+        }
 
         $self = '[+output+]';
 
-        if($php !== false)
-        {
+        if($php !== false) {
             ob_start();
             $options = $opt;
             $output = $value;
@@ -1050,19 +1261,19 @@ 
             $this->vars['options'] = & $opt;
             $custom = eval($php);
             $msg = ob_get_contents();
-            if($value===$this->bt) $value = $msg . $custom;
+            if($value===$this->bt) {
+                $value = $msg . $custom;
+            }
             ob_end_clean();
-        }
-        elseif($html!==false && isset($value) && $value!=='')
-        {
+        } elseif($html!==false && isset($value) && $value!=='') {
             $html = str_replace(array($self,'[+value+]'), $value, $html);
             $value = str_replace(array('[+options+]','[+param+]'), $opt, $html);
+        } else {
+            return false;
         }
-        else return false;
 
         if($php===false && $html===false && $value!==''
-           && (strpos($cmd,'[+value+]')!==false || strpos($cmd,$self)!==false))
-        {
+           && (strpos($cmd,'[+value+]')!==false || strpos($cmd,$self)!==false)) {
             $value = str_replace(array('[+value+]',$self),$value,$cmd);
         }
         return $value;
@@ -1072,23 +1283,39 @@ 
     {
         global $modx;
 
-        if(strpos($content,'[')===false && strpos($content,'{')===false) return $content;
+        if(strpos($content,'[')===false && strpos($content,'{')===false) {
+            return $content;
+        }
 
-        if(!$modx->maxParserPasses) $modx->maxParserPasses = 10;
+        if(!$modx->maxParserPasses) {
+            $modx->maxParserPasses = 10;
+        }
         $bt='';
         $i=0;
-        while($bt!==$content)
-        {
+        while($bt!==$content) {
             $bt = $content;
-            if(strpos($content,'[*')!==false && $modx->documentIdentifier)
-                                              $content = $modx->mergeDocumentContent($content);
-            if(strpos($content,'[(')!==false) $content = $modx->mergeSettingsContent($content);
-            if(strpos($content,'{{')!==false) $content = $modx->mergeChunkContent($content);
-            if(strpos($content,'[!')!==false) $content = str_replace(array('[!','!]'),array('[[',']]'),$content);
-            if(strpos($content,'[[')!==false) $content = $modx->evalSnippets($content);
-
-            if($content===$bt)              break;
-            if($modx->maxParserPasses < $i) break;
+            if(strpos($content,'[*')!==false && $modx->documentIdentifier) {
+                                                          $content = $modx->mergeDocumentContent($content);
+            }
+            if(strpos($content,'[(')!==false) {
+                $content = $modx->mergeSettingsContent($content);
+            }
+            if(strpos($content,'{{')!==false) {
+                $content = $modx->mergeChunkContent($content);
+            }
+            if(strpos($content,'[!')!==false) {
+                $content = str_replace(array('[!','!]'),array('[[',']]'),$content);
+            }
+            if(strpos($content,'[[')!==false) {
+                $content = $modx->evalSnippets($content);
+            }
+
+            if($content===$bt) {
+                break;
+            }
+            if($modx->maxParserPasses < $i) {
+                break;
+            }
             $i++;
         }
         return $content;
@@ -1099,103 +1326,138 @@ 
         global $modx;
 
         $target = trim($target);
-        if(empty($target)) $target = $modx->config['site_start'];
-        if(preg_match('@^[1-9][0-9]*$@',$target)) $method='id';
-        else $method = 'alias';
+        if(empty($target)) {
+            $target = $modx->config['site_start'];
+        }
+        if(preg_match('@^[1-9][0-9]*$@',$target)) {
+            $method='id';
+        } else {
+            $method = 'alias';
+        }
 
-        if(!isset($this->documentObject[$target]))
-        {
+        if(!isset($this->documentObject[$target])) {
             $this->documentObject[$target] = $modx->getDocumentObject($method,$target,'direct');
         }
 
-        if($this->documentObject[$target]['publishedon']==='0')
-            return '';
-        elseif(isset($this->documentObject[$target][$field]))
-        {
-            if(is_array($this->documentObject[$target][$field]))
-            {
+        if($this->documentObject[$target]['publishedon']==='0') {
+                    return '';
+        } elseif(isset($this->documentObject[$target][$field])) {
+            if(is_array($this->documentObject[$target][$field])) {
                 $a = $modx->getTemplateVarOutput($field,$target);
                 $this->documentObject[$target][$field] = $a[$field];
             }
+        } else {
+            $this->documentObject[$target][$field] = false;
         }
-        else $this->documentObject[$target][$field] = false;
 
         return $this->documentObject[$target][$field];
     }
 
-    public function setPlaceholders($value = '', $key = '', $path = '') {
-        if($path!=='') $key = "{$path}.{$key}";
+    public function setPlaceholders($value = '', $key = '', $path = '')
+    {
+        if($path!=='') {
+            $key = "{$path}.{$key}";
+        }
         if (is_array($value)) {
             foreach ($value as $subkey => $subval) {
                 $this->setPlaceholders($subval, $subkey, $key);
             }
+        } else {
+            $this->setModifiersVariable($key, $value);
         }
-        else $this->setModifiersVariable($key, $value);
     }
 
     // Sets a placeholder variable which can only be access by Modifiers
-    public function setModifiersVariable($key, $value) {
-        if ($key != 'phx' && $key != 'dummy') $this->placeholders[$key] = $value;
+    public function setModifiersVariable($key, $value)
+    {
+        if ($key != 'phx' && $key != 'dummy') {
+            $this->placeholders[$key] = $value;
+        }
     }
 
     //mbstring
-    public function substr($str, $s, $l = null) {
+    public function substr($str, $s, $l = null)
+    {
         global $modx;
-        if(is_null($l)) $l = $this->strlen($str);
-        if (function_exists('mb_substr'))
-        {
-            if(strpos($str,"\r")!==false)
-                $str = str_replace(array("\r\n","\r"), "\n", $str);
+        if(is_null($l)) {
+            $l = $this->strlen($str);
+        }
+        if (function_exists('mb_substr')) {
+            if(strpos($str,"\r")!==false) {
+                            $str = str_replace(array("\r\n","\r"), "\n", $str);
+            }
             return mb_substr($str, $s, $l, $modx->config['modx_charset']);
         }
         return substr($str, $s, $l);
     }
-    public function strpos($haystack,$needle,$offset=0) {
+    public function strpos($haystack,$needle,$offset=0)
+    {
         global $modx;
-        if (function_exists('mb_strpos')) return mb_strpos($haystack,$needle,$offset,$modx->config['modx_charset']);
+        if (function_exists('mb_strpos')) {
+            return mb_strpos($haystack,$needle,$offset,$modx->config['modx_charset']);
+        }
         return strpos($haystack,$needle,$offset);
     }
-    public function strlen($str) {
+    public function strlen($str)
+    {
         global $modx;
-        if (function_exists('mb_strlen')) return mb_strlen(str_replace("\r\n", "\n", $str),$modx->config['modx_charset']);
+        if (function_exists('mb_strlen')) {
+            return mb_strlen(str_replace("\r\n", "\n", $str),$modx->config['modx_charset']);
+        }
         return strlen($str);
     }
-    public function strtolower($str) {
-        if (function_exists('mb_strtolower')) return mb_strtolower($str);
+    public function strtolower($str)
+    {
+        if (function_exists('mb_strtolower')) {
+            return mb_strtolower($str);
+        }
         return strtolower($str);
     }
-    public function strtoupper($str) {
-        if (function_exists('mb_strtoupper')) return mb_strtoupper($str);
+    public function strtoupper($str)
+    {
+        if (function_exists('mb_strtoupper')) {
+            return mb_strtoupper($str);
+        }
         return strtoupper($str);
     }
-    public function ucfirst($str) {
-        if (function_exists('mb_strtoupper'))
-            return mb_strtoupper($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str));
+    public function ucfirst($str)
+    {
+        if (function_exists('mb_strtoupper')) {
+                    return mb_strtoupper($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str));
+        }
         return ucfirst($str);
     }
-    public function lcfirst($str) {
-        if (function_exists('mb_strtolower'))
-            return mb_strtolower($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str));
+    public function lcfirst($str)
+    {
+        if (function_exists('mb_strtolower')) {
+                    return mb_strtolower($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str));
+        }
         return lcfirst($str);
     }
-    public function ucwords($str) {
-        if (function_exists('mb_convert_case'))
-            return mb_convert_case($str, MB_CASE_TITLE);
+    public function ucwords($str)
+    {
+        if (function_exists('mb_convert_case')) {
+                    return mb_convert_case($str, MB_CASE_TITLE);
+        }
         return ucwords($str);
     }
-    public function strrev($str) {
+    public function strrev($str)
+    {
         preg_match_all('/./us', $str, $ar);
         return implode(array_reverse($ar[0]));
     }
-    public function str_shuffle($str) {
+    public function str_shuffle($str)
+    {
         preg_match_all('/./us', $str, $ar);
         shuffle($ar[0]);
         return implode($ar[0]);
     }
-    public function str_word_count($str) {
+    public function str_word_count($str)
+    {
         return count(preg_split('~[^\p{L}\p{N}\']+~u',$str));
     }
-    public function strip_tags($value,$params='') {
+    public function strip_tags($value,$params='')
+    {
         global $modx;
 
         if(stripos($params,'style')===false && stripos($value,'</style>')!==false) {

manager/includes/paginate.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -149,7 +149,7 @@
     /**
      * This function returns the current page number.
      *
-     * @return int
+     * @return string
      */
     public function getCurrentPage()
     {

Spacing +6 added lines, -6 removed lines

@@ -101,14 +101,14 @@ 
         $array_paging['total'] = $this->int_nbr_row;
 
         if ($this->int_cur_position != 0) {
-            $array_paging['first_link'] = "<a href=\"$PHP_SELF?int_cur_position=0" . $this->str_ext_argv . "\">";
-            $array_paging['previous_link'] = "<a href=\"$PHP_SELF?int_cur_position=" . ($this->int_cur_position - $this->int_num_result) . $this->str_ext_argv . "\">";
+            $array_paging['first_link'] = "<a href=\"$PHP_SELF?int_cur_position=0".$this->str_ext_argv."\">";
+            $array_paging['previous_link'] = "<a href=\"$PHP_SELF?int_cur_position=".($this->int_cur_position - $this->int_num_result).$this->str_ext_argv."\">";
         }
 
         if (($this->int_nbr_row - $this->int_cur_position) > $this->int_num_result) {
             $int_new_position = $this->int_cur_position + $this->int_num_result;
-            $array_paging['last_link'] = "<a href=\"$PHP_SELF?int_cur_position=" . $this->int_nbr_row . $this->str_ext_argv . "\">";
-            $array_paging['next_link'] = "<a href=\"$PHP_SELF?int_cur_position=$int_new_position" . $this->str_ext_argv . "\">";
+            $array_paging['last_link'] = "<a href=\"$PHP_SELF?int_cur_position=".$this->int_nbr_row.$this->str_ext_argv."\">";
+            $array_paging['next_link'] = "<a href=\"$PHP_SELF?int_cur_position=$int_new_position".$this->str_ext_argv."\">";
         }
 
         return $array_paging;
@@ -126,10 +126,10 @@ 
         for ($i = 0; $i < $this->getNumberOfPage(); $i++) {
             // if current page, do not make a link
             if ($i == $this->getCurrentPage()) {
-                $array_all_page[$i] = "<b>" . ($i + 1) . "</b>&nbsp;";
+                $array_all_page[$i] = "<b>".($i + 1)."</b>&nbsp;";
             } else {
                 $int_new_position = ($i * $this->int_num_result);
-                $array_all_page[$i] = "<a href=\"" . $PHP_SELF . "?int_cur_position=$int_new_position$this->str_ext_argv\">" . ($i + 1) . "</a>&nbsp;";
+                $array_all_page[$i] = "<a href=\"".$PHP_SELF."?int_cur_position=$int_new_position$this->str_ext_argv\">".($i + 1)."</a>&nbsp;";
             }
         }
 

manager/includes/protect.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 // sanitize array
 if (!function_exists('modx_sanitize_gpc')) {
     /**
-     * @param array|string $values
+     * @param string $values
      * @param int $depth
      * @return array|string
      */

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 }
 
 global $sanitize_seed;
-$sanitize_seed = 'sanitize_seed_' . base_convert(md5(__FILE__), 16, 36);
+$sanitize_seed = 'sanitize_seed_'.base_convert(md5(__FILE__), 16, 36);
 
 // sanitize array
 if (!function_exists('modx_sanitize_gpc')) {