evolution-cms / evolution

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

Doc Comments +12 added lines

@@ -268,6 +268,7 @@ 
     /**
      * @name:  delete
      *
+     * @param string $from
      */
     public function delete($from, $where = '', $orderby = '', $limit = '')
     {
@@ -414,6 +415,9 @@ 
         }
     }
 
+    /**
+     * @param string $table
+     */
     public function save($fields, $table, $where = '')
     {
 
@@ -444,6 +448,7 @@ 
     /**
      * @name:  freeResult
      *
+     * @param mysqli_result $rs
      */
     public function freeResult($rs)
     {
@@ -554,6 +559,7 @@ 
      * @name:  getColumn
      * @desc:  returns an array of the values found on colun $name
      * @param: $dsq - dataset or query string
+     * @param string $name
      */
     public function getColumn($name, $dsq)
     {
@@ -720,6 +726,9 @@ 
         return $result;
     }
 
+    /**
+     * @param string $table_name
+     */
     public function optimize($table_name)
     {
         $rs = $this->query("OPTIMIZE TABLE {$table_name}");
@@ -730,6 +739,9 @@ 
         return $rs;
     }
 
+    /**
+     * @param string $table_name
+     */
     public function truncate($table_name)
     {
         $rs = $this->query("TRUNCATE {$table_name}");

manager/includes/functions/tv.php

Doc Comments +3 added lines, -3 removed lines

@@ -172,7 +172,7 @@ 
      *
      * @param string $param
      * @param array $tvsArray
-     * @return mixed
+     * @return string
      */
     function parseTvValues($param, $tvsArray)
     {
@@ -566,7 +566,7 @@ 
     /**
      * returns an array if a delimiter is present. returns array is a recordset is present
      *
-     * @param $src
+     * @param string $src
      * @param string $delim
      * @param string $type
      * @param bool $columns
@@ -1022,7 +1022,7 @@ 
 
 if (! function_exists('ParseIntputOptions')) {
     /**
-     * @param string|array|mysqli_result $v
+     * @param string $v
      * @return array
      */
     function ParseIntputOptions($v)

Spacing +76 added lines, -76 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (! function_exists('ProcessTVCommand')) {
+if (!function_exists('ProcessTVCommand')) {
     /**
      * @param string $value
      * @param string $name
@@ -12,7 +12,7 @@ 
     function ProcessTVCommand($value, $name = '', $docid = '', $src = 'docform', $tvsArray = array())
     {
         $modx = evolutionCMS();
-        $docid = (int)$docid > 0 ? (int)$docid : $modx->documentIdentifier;
+        $docid = (int) $docid > 0 ? (int) $docid : $modx->documentIdentifier;
         $nvalue = trim($value);
         if (substr($nvalue, 0, 1) != '@') {
             return $value;
@@ -77,8 +77,8 @@ 
                         // if an inherited value is found and if there is content following the @INHERIT binding
                         // remove @INHERIT and output that following content. This content could contain other
                         // @ bindings, that are processed in the next step
-                        if ((string)$tv['value'] !== '' && !preg_match('%^@INHERIT[\s\n\r]*$%im', $tv['value'])) {
-                            $output = trim(str_replace('@INHERIT', '', (string)$tv['value']));
+                        if ((string) $tv['value'] !== '' && !preg_match('%^@INHERIT[\s\n\r]*$%im', $tv['value'])) {
+                            $output = trim(str_replace('@INHERIT', '', (string) $tv['value']));
                             break 2;
                         }
                     }
@@ -86,7 +86,7 @@ 
 
                 case 'DIRECTORY' :
                     $files = array();
-                    $path = $modx->config['base_path'] . $param;
+                    $path = $modx->config['base_path'].$param;
                     if (substr($path, -1, 1) != '/') {
                         $path .= '/';
                     }
@@ -117,7 +117,7 @@ 
     }
 }
 
-if (! function_exists('ProcessFile')) {
+if (!function_exists('ProcessFile')) {
     /**
      * @param $file
      * @return string
@@ -134,7 +134,7 @@ 
     }
 }
 
-if (! function_exists('ParseCommand')) {
+if (!function_exists('ParseCommand')) {
     /**
      * ParseCommand - separate @ cmd from params
      *
@@ -155,7 +155,7 @@ 
 
         $binding_array = array();
         foreach ($BINDINGS as $cmd) {
-            if (strpos($binding_string, '@' . $cmd) === 0) {
+            if (strpos($binding_string, '@'.$cmd) === 0) {
                 $code = substr($binding_string, strlen($cmd) + 1);
                 $binding_array = array($cmd, trim($code));
                 break;
@@ -166,7 +166,7 @@ 
     }
 }
 
-if (! function_exists('parseTvValues')) {
+if (!function_exists('parseTvValues')) {
     /**
      * Parse MODX Template-Variables
      *
@@ -197,7 +197,7 @@ 
     }
 }
 
-if (! function_exists('getTVDisplayFormat')) {
+if (!function_exists('getTVDisplayFormat')) {
     /**
      * @param string $name
      * @param string $value
@@ -215,7 +215,7 @@ 
         $o = '';
 
         // process any TV commands in value
-        $docid = (int)$docid > 0 ? (int)$docid : $modx->documentIdentifier;
+        $docid = (int) $docid > 0 ? (int) $docid : $modx->documentIdentifier;
         $value = ProcessTVCommand($value, $name, $docid);
 
         $params = array();
@@ -254,12 +254,12 @@ 
                             $attr['align'] = $params['align'];
                         }
                         foreach ($attr as $k => $v) {
-                            $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+                            $attributes .= ($v ? ' '.$k.'="'.$v.'"' : '');
                         }
-                        $attributes .= ' ' . $params['attrib'];
+                        $attributes .= ' '.$params['attrib'];
 
                         // Output the image with attributes
-                        $o .= '<img' . rtrim($attributes) . ' />';
+                        $o .= '<img'.rtrim($attributes).' />';
                     }
                 }
                 break;
@@ -331,12 +331,12 @@ 
                             'target' => $params['target'],
                         );
                         foreach ($attr as $k => $v) {
-                            $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+                            $attributes .= ($v ? ' '.$k.'="'.$v.'"' : '');
                         }
-                        $attributes .= ' ' . $params['attrib']; // add extra
+                        $attributes .= ' '.$params['attrib']; // add extra
 
                         // Output the link
-                        $o .= '<a' . rtrim($attributes) . '>' . ($params['text'] ? $modx->htmlspecialchars($params['text']) : $name) . '</a>';
+                        $o .= '<a'.rtrim($attributes).'>'.($params['text'] ? $modx->htmlspecialchars($params['text']) : $name).'</a>';
                     }
                 }
                 break;
@@ -362,12 +362,12 @@ 
                         'style' => $params['style'],
                     );
                     foreach ($attr as $k => $v) {
-                        $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+                        $attributes .= ($v ? ' '.$k.'="'.$v.'"' : '');
                     }
-                    $attributes .= ' ' . $params['attrib']; // add extra
+                    $attributes .= ' '.$params['attrib']; // add extra
 
                     // Output the HTML Tag
-                    $o .= '<' . $tagname . rtrim($attributes) . '>' . $tagvalue . '</' . $tagname . '>';
+                    $o .= '<'.$tagname.rtrim($attributes).'>'.$tagvalue.'</'.$tagname.'>';
                 }
                 break;
 
@@ -376,7 +376,7 @@ 
                 $w = $params['w'] ? $params['w'] : '100%';
                 $h = $params['h'] ? $params['h'] : '400px';
                 $richtexteditor = $params['edt'] ? $params['edt'] : "";
-                $o = '<div class="MODX_RichTextWidget"><textarea id="' . $id . '" name="' . $id . '" style="width:' . $w . '; height:' . $h . ';">';
+                $o = '<div class="MODX_RichTextWidget"><textarea id="'.$id.'" name="'.$id.'" style="width:'.$w.'; height:'.$h.';">';
                 $o .= $modx->htmlspecialchars($value);
                 $o .= '</textarea></div>';
                 $replace_richtext = array($id);
@@ -403,7 +403,7 @@ 
 
             case "viewport":
                 $value = parseInput($value);
-                $id = '_' . time();
+                $id = '_'.time();
                 if (!$params['vpid']) {
                     $params['vpid'] = $id;
                 }
@@ -417,41 +417,41 @@ 
                     $h = "100%";
                 }
                 if ($params['asize'] == 'Yes' || ($params['awidth'] == 'Yes' && $params['aheight'] == 'Yes')) {
-                    $autoMode = "3";  //both
+                    $autoMode = "3"; //both
                 } else {
                     if ($params['awidth'] == 'Yes') {
                         $autoMode = "1"; //width only
                     } else {
                         if ($params['aheight'] == 'Yes') {
-                            $autoMode = "2";    //height only
+                            $autoMode = "2"; //height only
                         }
                     }
                 }
 
-                $modx->regClientStartupScript(MODX_MANAGER_URL . "media/script/bin/viewport.js", array(
+                $modx->regClientStartupScript(MODX_MANAGER_URL."media/script/bin/viewport.js", array(
                     'name'      => 'viewport',
                     'version'   => '0',
                     'plaintext' => false
                 ));
-                $o = $sTag . " id='" . $params['vpid'] . "' name='" . $params['vpid'] . "' ";
+                $o = $sTag." id='".$params['vpid']."' name='".$params['vpid']."' ";
                 if ($params['class']) {
-                    $o .= " class='" . $params['class'] . "' ";
+                    $o .= " class='".$params['class']."' ";
                 }
                 if ($params['style']) {
-                    $o .= " style='" . $params['style'] . "' ";
+                    $o .= " style='".$params['style']."' ";
                 }
                 if ($params['attrib']) {
-                    $o .= $params['attrib'] . " ";
+                    $o .= $params['attrib']." ";
                 }
-                $o .= "scrolling='" . ($params['sbar'] == 'No' ? "no" : ($params['sbar'] == 'Yes' ? "yes" : "auto")) . "' ";
-                $o .= "src='" . $value . "' frameborder='" . $params['borsize'] . "' ";
-                $o .= "onload=\"window.setTimeout('ResizeViewPort(\\'" . $params['vpid'] . "\\'," . $autoMode . ")',100);\" width='" . $w . "' height='" . $h . "' ";
+                $o .= "scrolling='".($params['sbar'] == 'No' ? "no" : ($params['sbar'] == 'Yes' ? "yes" : "auto"))."' ";
+                $o .= "src='".$value."' frameborder='".$params['borsize']."' ";
+                $o .= "onload=\"window.setTimeout('ResizeViewPort(\\'".$params['vpid']."\\',".$autoMode.")',100);\" width='".$w."' height='".$h."' ";
                 $o .= ">";
                 $o .= $eTag;
                 break;
 
             case "datagrid":
-                include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
+                include_once MODX_MANAGER_PATH."includes/controls/datagrid.class.php";
                 $grd = new DataGrid('', $value);
 
                 $grd->noRecordMsg = $params['egmsg'];
@@ -498,16 +498,16 @@ 
                 $o = '';
                 /* If we are loading a file */
                 if (substr($params['output'], 0, 5) == "@FILE") {
-                    $file_name = MODX_BASE_PATH . trim(substr($params['output'], 6));
+                    $file_name = MODX_BASE_PATH.trim(substr($params['output'], 6));
                     if (!file_exists($file_name)) {
-                        $widget_output = $file_name . ' does not exist';
+                        $widget_output = $file_name.' does not exist';
                     } else {
                         $widget_output = file_get_contents($file_name);
                     }
                 } elseif (substr($params['output'], 0, 8) == '@INCLUDE') {
-                    $file_name = MODX_BASE_PATH . trim(substr($params['output'], 9));
+                    $file_name = MODX_BASE_PATH.trim(substr($params['output'], 9));
                     if (!file_exists($file_name)) {
-                        $widget_output = $file_name . ' does not exist';
+                        $widget_output = $file_name.' does not exist';
                     } else {
                         /* The included file needs to set $widget_output. Can be string, array, object */
                         include $file_name;
@@ -549,7 +549,7 @@ 
     }
 }
 
-if (! function_exists('decodeParamValue')) {
+if (!function_exists('decodeParamValue')) {
     /**
      * @param string $s
      * @return string
@@ -562,7 +562,7 @@ 
     }
 }
 
-if (! function_exists('parseInput')) {
+if (!function_exists('parseInput')) {
     /**
      * returns an array if a delimiter is present. returns array is a recordset is present
      *
@@ -594,7 +594,7 @@ 
     }
 }
 
-if (! function_exists('getUnixtimeFromDateString')) {
+if (!function_exists('getUnixtimeFromDateString')) {
     /**
      * @param string $value
      * @return bool|false|int
@@ -622,7 +622,7 @@ 
     }
 }
 
-if (! function_exists('renderFormElement')) {
+if (!function_exists('renderFormElement')) {
     /**
      * DISPLAY FORM ELEMENTS
      *
@@ -645,7 +645,7 @@ 
         $field_style = '',
         $row = array(),
         $tvsArray = array()
-    ) {
+    ){
         $modx = evolutionCMS();
         global $_style;
         global $_lang;
@@ -665,22 +665,22 @@ 
 
                 case "text": // handler for regular text boxes
                 case "rawtext"; // non-htmlentity converted text boxes
-                    $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' tvtype="' . $field_type . '" onchange="documentDirty=true;" style="width:100%" />';
+                    $field_html .= '<input type="text" id="tv'.$field_id.'" name="tv'.$field_id.'" value="'.$modx->htmlspecialchars($field_value).'" '.$field_style.' tvtype="'.$field_type.'" onchange="documentDirty=true;" style="width:100%" />';
                     break;
                 case "email": // handles email input fields
-                    $field_html .= '<input type="email" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' tvtype="' . $field_type . '" onchange="documentDirty=true;" style="width:100%"/>';
+                    $field_html .= '<input type="email" id="tv'.$field_id.'" name="tv'.$field_id.'" value="'.$modx->htmlspecialchars($field_value).'" '.$field_style.' tvtype="'.$field_type.'" onchange="documentDirty=true;" style="width:100%"/>';
                     break;
                 case "number": // handles the input of numbers
-                    $field_html .= '<input type="number" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' tvtype="' . $field_type . '" onchange="documentDirty=true;" style="width:100%" onkeyup="this.value=this.value.replace(/[^\d-,.+]/,\'\')"/>';
+                    $field_html .= '<input type="number" id="tv'.$field_id.'" name="tv'.$field_id.'" value="'.$modx->htmlspecialchars($field_value).'" '.$field_style.' tvtype="'.$field_type.'" onchange="documentDirty=true;" style="width:100%" onkeyup="this.value=this.value.replace(/[^\d-,.+]/,\'\')"/>';
                     break;
                 case "textareamini": // handler for textarea mini boxes
-                    $field_html .= '<textarea id="tv' . $field_id . '" name="tv' . $field_id . '" cols="40" rows="5" onchange="documentDirty=true;" style="width:100%">' . $modx->htmlspecialchars($field_value) . '</textarea>';
+                    $field_html .= '<textarea id="tv'.$field_id.'" name="tv'.$field_id.'" cols="40" rows="5" onchange="documentDirty=true;" style="width:100%">'.$modx->htmlspecialchars($field_value).'</textarea>';
                     break;
                 case "textarea": // handler for textarea boxes
                 case "rawtextarea": // non-htmlentity convertex textarea boxes
                 case "htmlarea": // handler for textarea boxes (deprecated)
                 case "richtext": // handler for textarea boxes
-                    $field_html .= '<textarea id="tv' . $field_id . '" name="tv' . $field_id . '" cols="40" rows="15" onchange="documentDirty=true;" style="width:100%">' . $modx->htmlspecialchars($field_value) . '</textarea>';
+                    $field_html .= '<textarea id="tv'.$field_id.'" name="tv'.$field_id.'" cols="40" rows="15" onchange="documentDirty=true;" style="width:100%">'.$modx->htmlspecialchars($field_value).'</textarea>';
                     break;
                 case "date":
                     $field_id = str_replace(array(
@@ -690,12 +690,12 @@ 
                     if ($field_value == '') {
                         $field_value = 0;
                     }
-                    $field_html .= '<input id="tv' . $field_id . '" name="tv' . $field_id . '" class="DatePicker" type="text" value="' . ($field_value == 0 || !isset($field_value) ? "" : $field_value) . '" onblur="documentDirty=true;" />';
-                    $field_html .= ' <a onclick="document.forms[\'mutate\'].elements[\'tv' . $field_id . '\'].value=\'\';document.forms[\'mutate\'].elements[\'tv' . $field_id . '\'].onblur(); return true;" onmouseover="window.status=\'clear the date\'; return true;" onmouseout="window.status=\'\'; return true;" style="cursor:pointer; cursor:hand"><i class="' . $_style["actions_calendar_delete"] . '"></i></a>';
+                    $field_html .= '<input id="tv'.$field_id.'" name="tv'.$field_id.'" class="DatePicker" type="text" value="'.($field_value == 0 || !isset($field_value) ? "" : $field_value).'" onblur="documentDirty=true;" />';
+                    $field_html .= ' <a onclick="document.forms[\'mutate\'].elements[\'tv'.$field_id.'\'].value=\'\';document.forms[\'mutate\'].elements[\'tv'.$field_id.'\'].onblur(); return true;" onmouseover="window.status=\'clear the date\'; return true;" onmouseout="window.status=\'\'; return true;" style="cursor:pointer; cursor:hand"><i class="'.$_style["actions_calendar_delete"].'"></i></a>';
 
                     break;
                 case "dropdown": // handler for select boxes
-                    $field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '" size="1" onchange="documentDirty=true;">';
+                    $field_html .= '<select id="tv'.$field_id.'" name="tv'.$field_id.'" size="1" onchange="documentDirty=true;">';
                     $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform',
                         $tvsArray));
                     while (list($item, $itemvalue) = each($index_list)) {
@@ -703,12 +703,12 @@ 
                         if (strlen($itemvalue) == 0) {
                             $itemvalue = $item;
                         }
-                        $field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . ($itemvalue == $field_value ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>';
+                        $field_html .= '<option value="'.$modx->htmlspecialchars($itemvalue).'"'.($itemvalue == $field_value ? ' selected="selected"' : '').'>'.$modx->htmlspecialchars($item).'</option>';
                     }
                     $field_html .= "</select>";
                     break;
                 case "listbox": // handler for select boxes
-                    $field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '" onchange="documentDirty=true;" size="8">';
+                    $field_html .= '<select id="tv'.$field_id.'" name="tv'.$field_id.'" onchange="documentDirty=true;" size="8">';
                     $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform',
                         $tvsArray));
                     while (list($item, $itemvalue) = each($index_list)) {
@@ -716,13 +716,13 @@ 
                         if (strlen($itemvalue) == 0) {
                             $itemvalue = $item;
                         }
-                        $field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . ($itemvalue == $field_value ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>';
+                        $field_html .= '<option value="'.$modx->htmlspecialchars($itemvalue).'"'.($itemvalue == $field_value ? ' selected="selected"' : '').'>'.$modx->htmlspecialchars($item).'</option>';
                     }
                     $field_html .= "</select>";
                     break;
                 case "listbox-multiple": // handler for select boxes where you can choose multiple items
                     $field_value = explode("||", $field_value);
-                    $field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '[]" multiple="multiple" onchange="documentDirty=true;" size="8">';
+                    $field_html .= '<select id="tv'.$field_id.'" name="tv'.$field_id.'[]" multiple="multiple" onchange="documentDirty=true;" size="8">';
                     $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform',
                         $tvsArray));
                     while (list($item, $itemvalue) = each($index_list)) {
@@ -730,8 +730,8 @@ 
                         if (strlen($itemvalue) == 0) {
                             $itemvalue = $item;
                         }
-                        $field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . (in_array($itemvalue,
-                                $field_value) ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>';
+                        $field_html .= '<option value="'.$modx->htmlspecialchars($itemvalue).'"'.(in_array($itemvalue,
+                                $field_value) ? ' selected="selected"' : '').'>'.$modx->htmlspecialchars($item).'</option>';
                     }
                     $field_html .= "</select>";
                     break;
@@ -743,17 +743,17 @@ 
                         'ftp://'   => 'ftp://',
                         'mailto:'  => 'mailto:'
                     );
-                    $field_html = '<table border="0" cellspacing="0" cellpadding="0"><tr><td><select id="tv' . $field_id . '_prefix" name="tv' . $field_id . '_prefix" onchange="documentDirty=true;">';
+                    $field_html = '<table border="0" cellspacing="0" cellpadding="0"><tr><td><select id="tv'.$field_id.'_prefix" name="tv'.$field_id.'_prefix" onchange="documentDirty=true;">';
                     foreach ($urls as $k => $v) {
                         if (strpos($field_value, $v) === false) {
-                            $field_html .= '<option value="' . $v . '">' . $k . '</option>';
+                            $field_html .= '<option value="'.$v.'">'.$k.'</option>';
                         } else {
                             $field_value = str_replace($v, '', $field_value);
-                            $field_html .= '<option value="' . $v . '" selected="selected">' . $k . '</option>';
+                            $field_html .= '<option value="'.$v.'" selected="selected">'.$k.'</option>';
                         }
                     }
                     $field_html .= '</select></td><td>';
-                    $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" width="100" ' . $field_style . ' onchange="documentDirty=true;" /></td></tr></table>';
+                    $field_html .= '<input type="text" id="tv'.$field_id.'" name="tv'.$field_id.'" value="'.$modx->htmlspecialchars($field_value).'" width="100" '.$field_style.' onchange="documentDirty=true;" /></td></tr></table>';
                     break;
                 case 'checkbox': // handles check boxes
                     $values = !is_array($field_value) ? explode('||', $field_value) : $field_value;
@@ -795,7 +795,7 @@ 
                         if (strlen($itemvalue) == 0) {
                             $itemvalue = $item;
                         }
-                        $field_html .= '<input type="radio" value="' . $modx->htmlspecialchars($itemvalue) . '" id="tv_' . $i . '" name="tv' . $field_id . '" ' . ($itemvalue == $field_value ? 'checked="checked"' : '') . ' onchange="documentDirty=true;" /><label for="tv_' . $i . '" class="radio">' . $item . '</label><br />';
+                        $field_html .= '<input type="radio" value="'.$modx->htmlspecialchars($itemvalue).'" id="tv_'.$i.'" name="tv'.$field_id.'" '.($itemvalue == $field_value ? 'checked="checked"' : '').' onchange="documentDirty=true;" /><label for="tv_'.$i.'" class="radio">'.$item.'</label><br />';
                         $i++;
                     }
                     break;
@@ -825,13 +825,13 @@ 
 									lastImageCtrl = ctrl;
 									var w = screen.width * 0.5;
 									var h = screen.height * 0.5;
-									OpenServerBrowser('" . MODX_MANAGER_URL . "media/browser/{$which_browser}/browser.php?Type=images', w, h);
+									OpenServerBrowser('" . MODX_MANAGER_URL."media/browser/{$which_browser}/browser.php?Type=images', w, h);
 								}
 								function BrowseFileServer(ctrl) {
 									lastFileCtrl = ctrl;
 									var w = screen.width * 0.5;
 									var h = screen.height * 0.5;
-									OpenServerBrowser('" . MODX_MANAGER_URL . "media/browser/{$which_browser}/browser.php?Type=files', w, h);
+									OpenServerBrowser('".MODX_MANAGER_URL."media/browser/{$which_browser}/browser.php?Type=files', w, h);
 								}
 								function SetUrlChange(el) {
 									if ('createEvent' in document) {
@@ -865,7 +865,7 @@ 
 						</script>";
                         $ResourceManagerLoaded = true;
                     }
-                    $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '"  value="' . $field_value . '" ' . $field_style . ' onchange="documentDirty=true;" /><input type="button" value="' . $_lang['insert'] . '" onclick="BrowseServer(\'tv' . $field_id . '\')" />';
+                    $field_html .= '<input type="text" id="tv'.$field_id.'" name="tv'.$field_id.'"  value="'.$field_value.'" '.$field_style.' onchange="documentDirty=true;" /><input type="button" value="'.$_lang['insert'].'" onclick="BrowseServer(\'tv'.$field_id.'\')" />';
                     break;
                 case "file": // handles the input of file uploads
                     /* Modified by Timon for use with resource browser */
@@ -895,13 +895,13 @@ 
 									lastImageCtrl = ctrl;
 									var w = screen.width * 0.5;
 									var h = screen.height * 0.5;
-									OpenServerBrowser('" . MODX_MANAGER_URL . "media/browser/{$which_browser}/browser.php?Type=images', w, h);
+									OpenServerBrowser('" . MODX_MANAGER_URL."media/browser/{$which_browser}/browser.php?Type=images', w, h);
 								}
 								function BrowseFileServer(ctrl) {
 									lastFileCtrl = ctrl;
 									var w = screen.width * 0.5;
 									var h = screen.height * 0.5;
-									OpenServerBrowser('" . MODX_MANAGER_URL . "media/browser/{$which_browser}/browser.php?Type=files', w, h);
+									OpenServerBrowser('".MODX_MANAGER_URL."media/browser/{$which_browser}/browser.php?Type=files', w, h);
 								}
 								function SetUrlChange(el) {
 									if ('createEvent' in document) {
@@ -935,7 +935,7 @@ 
 						</script>";
                         $ResourceManagerLoaded = true;
                     }
-                    $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '"  value="' . $field_value . '" ' . $field_style . ' onchange="documentDirty=true;" /><input type="button" value="' . $_lang['insert'] . '" onclick="BrowseFileServer(\'tv' . $field_id . '\')" />';
+                    $field_html .= '<input type="text" id="tv'.$field_id.'" name="tv'.$field_id.'"  value="'.$field_value.'" '.$field_style.' onchange="documentDirty=true;" /><input type="button" value="'.$_lang['insert'].'" onclick="BrowseFileServer(\'tv'.$field_id.'\')" />';
 
                     break;
 
@@ -943,16 +943,16 @@ 
                     $custom_output = '';
                     /* If we are loading a file */
                     if (substr($field_elements, 0, 5) == "@FILE") {
-                        $file_name = MODX_BASE_PATH . trim(substr($field_elements, 6));
+                        $file_name = MODX_BASE_PATH.trim(substr($field_elements, 6));
                         if (!file_exists($file_name)) {
-                            $custom_output = $file_name . ' does not exist';
+                            $custom_output = $file_name.' does not exist';
                         } else {
                             $custom_output = file_get_contents($file_name);
                         }
                     } elseif (substr($field_elements, 0, 8) == '@INCLUDE') {
-                        $file_name = MODX_BASE_PATH . trim(substr($field_elements, 9));
+                        $file_name = MODX_BASE_PATH.trim(substr($field_elements, 9));
                         if (!file_exists($file_name)) {
-                            $custom_output = $file_name . ' does not exist';
+                            $custom_output = $file_name.' does not exist';
                         } else {
                             ob_start();
                             include $file_name;
@@ -963,7 +963,7 @@ 
                         $chunk_name = trim(substr($field_elements, 7));
                         $chunk_body = $modx->getChunk($chunk_name);
                         if ($chunk_body == false) {
-                            $custom_output = $_lang['chunk_no_exist'] . '(' . $_lang['htmlsnippet_name'] . ':' . $chunk_name . ')';
+                            $custom_output = $_lang['chunk_no_exist'].'('.$_lang['htmlsnippet_name'].':'.$chunk_name.')';
                         } else {
                             $custom_output = $chunk_body;
                         }
@@ -988,15 +988,15 @@ 
                     break;
 
                 default: // the default handler -- for errors, mostly
-                    $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' onchange="documentDirty=true;" />';
+                    $field_html .= '<input type="text" id="tv'.$field_id.'" name="tv'.$field_id.'" value="'.$modx->htmlspecialchars($field_value).'" '.$field_style.' onchange="documentDirty=true;" />';
 
             } // end switch statement
         } else {
             $custom = explode(":", $field_type);
             $custom_output = '';
-            $file_name = MODX_BASE_PATH . 'assets/tvs/' . $custom['1'] . '/' . $custom['1'] . '.customtv.php';
+            $file_name = MODX_BASE_PATH.'assets/tvs/'.$custom['1'].'/'.$custom['1'].'.customtv.php';
             if (!file_exists($file_name)) {
-                $custom_output = $file_name . ' does not exist';
+                $custom_output = $file_name.' does not exist';
             } else {
                 ob_start();
                 include $file_name;
@@ -1020,7 +1020,7 @@ 
     } // end renderFormElement function
 }
 
-if (! function_exists('ParseIntputOptions')) {
+if (!function_exists('ParseIntputOptions')) {
     /**
      * @param string|array|mysqli_result $v
      * @return array

Braces +2 added lines, -1 removed lines

@@ -573,7 +573,8 @@
      * @return array|string
      */
     function parseInput($src, $delim = "||", $type = "string", $columns = true)
-    { // type can be: string, array
+    {
+// type can be: string, array
         $modx = evolutionCMS();
         if ($modx->db->isResult($src)) {
             // must be a recordset

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

@@ -51,7 +51,7 @@
                         $modx->setPlaceholder($rvKey, $rvValue);
                     }
                     $param = $modx->mergePlaceholderContent($param);
-                    $rs = $modx->db->query("SELECT $param;");
+                    $rs = $modx->db->query("select $param;");
                     $output = $rs;
                     break;
 

manager/includes/src/Event.php

Doc Comments +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
     }
 
     /**
-     * @return mixed
+     * @return string
      */
     public function getOutput()
     {

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,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>";
         }

install/cli-install.php

Spacing +331 added lines, -332 removed lines

@@ -5,8 +5,8 @@ 
  */
 
 $self = 'install/cli-install.php';
-$path = dirname(__FILE__) . '/';
-$base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
+$path = dirname(__FILE__).'/';
+$base_path = str_replace($self, '', str_replace('\\', '/', __FILE__));
 define('MODX_API_MODE', true);
 define('MODX_BASE_PATH', $base_path);
 define('MODX_SITE_URL', '/');
@@ -19,7 +19,7 @@ 
 if (is_file($base_path."assets/cache/siteManager.php")) {
     include_once($base_path."assets/cache/siteManager.php");
 }
-if(!defined('MGR_DIR') && is_dir($base_path."manager")) {
+if (!defined('MGR_DIR') && is_dir($base_path."manager")) {
     define('MGR_DIR', 'manager');
 }
 
@@ -33,43 +33,43 @@ 
 $moduleSQLDataFile = $path."setup.data.sql";
 $moduleSQLResetFile = $path."setup.data.reset.sql";
 
-$moduleChunks = array (); // chunks - array : name, description, type - 0:file or 1:content, file or content
-$moduleTemplates = array (); // templates - array : name, description, type - 0:file or 1:content, file or content
-$moduleSnippets = array (); // snippets - array : name, description, type - 0:file or 1:content, file or content,properties
-$modulePlugins = array (); // plugins - array : name, description, type - 0:file or 1:content, file or content,properties, events,guid
-$moduleModules = array (); // modules - array : name, description, type - 0:file or 1:content, file or content,properties, guid
-$moduleTemplates = array (); // templates - array : name, description, type - 0:file or 1:content, file or content,properties
-$moduleTVs = array (); // template variables - array : name, description, type - 0:file or 1:content, file or content,properties
+$moduleChunks = array(); // chunks - array : name, description, type - 0:file or 1:content, file or content
+$moduleTemplates = array(); // templates - array : name, description, type - 0:file or 1:content, file or content
+$moduleSnippets = array(); // snippets - array : name, description, type - 0:file or 1:content, file or content,properties
+$modulePlugins = array(); // plugins - array : name, description, type - 0:file or 1:content, file or content,properties, events,guid
+$moduleModules = array(); // modules - array : name, description, type - 0:file or 1:content, file or content,properties, guid
+$moduleTemplates = array(); // templates - array : name, description, type - 0:file or 1:content, file or content,properties
+$moduleTVs = array(); // template variables - array : name, description, type - 0:file or 1:content, file or content,properties
 $moduleDependencies = array(); // module depedencies - array : module, table, column, type, name
-$errors= 0;
+$errors = 0;
 
 
-$installMode= 0;
+$installMode = 0;
 $installData = 0;
 $tableprefixauto = base_convert(rand(10, 20), 10, 36).substr(str_shuffle('0123456789abcdefghijklmnopqrstuvwxyz'), rand(0, 33), 3).'_';
 
 $args = array_slice($argv, 1);
 
-if ( empty($args) ){
+if (empty($args)) {
     echo 'Install Evolution CMS'.PHP_EOL;
     //$installYes = readline("Type 'y' to continue: ");
     //if ($installYes != 'y') return;
 
     //set param manual
-    $databasehost = readline($_lang['connection_screen_database_host']. ' [localhost] ');
-    $databaseloginname = readline($_lang['connection_screen_database_login']. ' ');
-    $databaseloginpassword = readline($_lang['connection_screen_database_pass']. ' ');
-    $database_name = readline($_lang['connection_screen_database_name']. ' ');
-    $tableprefix = readline($_lang['connection_screen_table_prefix']. ' ['.$tableprefixauto.'] ');
-    $database_connection_method = readline($_lang['connection_screen_connection_method']. ' [SET CHARACTER SET] ');
-    $database_collation = readline($_lang['connection_screen_collation']. ' [utf8_general_ci] ');
-    $cmsadmin = readline($_lang['connection_screen_default_admin_login']. ' [admin] ');
-    $cmsadminemail = readline($_lang['connection_screen_default_admin_email']. ' ');
-    $cmspassword = readline($_lang['connection_screen_default_admin_password']. ' ');
-    $managerlanguage = readline('Мanager language:' . ' [en] ');
-    $installData = readline('Instal demo-site (y/n):' . ' [n] ');
-
-}else{
+    $databasehost = readline($_lang['connection_screen_database_host'].' [localhost] ');
+    $databaseloginname = readline($_lang['connection_screen_database_login'].' ');
+    $databaseloginpassword = readline($_lang['connection_screen_database_pass'].' ');
+    $database_name = readline($_lang['connection_screen_database_name'].' ');
+    $tableprefix = readline($_lang['connection_screen_table_prefix'].' ['.$tableprefixauto.'] ');
+    $database_connection_method = readline($_lang['connection_screen_connection_method'].' [SET CHARACTER SET] ');
+    $database_collation = readline($_lang['connection_screen_collation'].' [utf8_general_ci] ');
+    $cmsadmin = readline($_lang['connection_screen_default_admin_login'].' [admin] ');
+    $cmsadminemail = readline($_lang['connection_screen_default_admin_email'].' ');
+    $cmspassword = readline($_lang['connection_screen_default_admin_password'].' ');
+    $managerlanguage = readline('Мanager language:'.' [en] ');
+    $installData = readline('Instal demo-site (y/n):'.' [n] ');
+
+} else {
 
     $cli_variables = [];
     foreach ($args as $arg) {
@@ -100,14 +100,14 @@ 
 }
 
 
-if ($databasehost == '') { $databasehost= 'localhost'; }
-if ($tableprefix == ''){ $tableprefix = $tableprefixauto; }
+if ($databasehost == '') { $databasehost = 'localhost'; }
+if ($tableprefix == '') { $tableprefix = $tableprefixauto; }
 if ($database_connection_method == '') { $database_connection_method = 'SET CHARACTER SET'; }
 if ($database_collation == '') { $database_collation = 'utf8_general_ci'; }
-if ($cmsadmin == ''){ $cmsadmin = 'admin'; }
+if ($cmsadmin == '') { $cmsadmin = 'admin'; }
 if ($managerlanguage == '') { $managerlanguage = 'en'; }
-if ($installData == 'y') { $installData = 1;}
-if ($mode == 'upgrade') { $installMode = 1;}
+if ($installData == 'y') { $installData = 1; }
+if ($mode == 'upgrade') { $installMode = 1; }
 
 //добавить обработку языка
 
@@ -123,7 +123,7 @@ 
 }
 
 //////////////////////////////////////////////////////////////////////////////////////
-if( ! function_exists('f_owc')){
+if (!function_exists('f_owc')) {
     /**
      * @param $path
      * @param $data
@@ -136,8 +136,8 @@ 
             fwrite($hnd, $data);
             fclose($hnd);
 
-            if(null !== $mode) chmod($path, $mode);
-        }catch(Exception $e){
+            if (null !== $mode) chmod($path, $mode);
+        } catch (Exception $e) {
             // Nothing, this is NOT normal
             unset($e);
         }
@@ -147,24 +147,24 @@ 
 // check PHP version
 define('PHP_MIN_VERSION', '5.4.0');
 $phpMinVersion = PHP_MIN_VERSION; // Maybe not necessary. For backward compatibility
-echo PHP_EOL . $_lang['checking_php_version'];
+echo PHP_EOL.$_lang['checking_php_version'];
 // -1 if left is less, 0 if equal, +1 if left is higher
 if (version_compare(phpversion(), PHP_MIN_VERSION) < 0) {
     $errors++;
-    $tmp = $_lang['you_running_php'] . phpversion() . str_replace('[+min_version+]', PHP_MIN_VERSION, $_lang["modx_requires_php"]);
-    echo $_lang['failed'] . ' ' . $tmp . PHP_EOL;
+    $tmp = $_lang['you_running_php'].phpversion().str_replace('[+min_version+]', PHP_MIN_VERSION, $_lang["modx_requires_php"]);
+    echo $_lang['failed'].' '.$tmp.PHP_EOL;
 } else {
-    echo $_lang['ok'] . PHP_EOL;
+    echo $_lang['ok'].PHP_EOL;
 }
 
 // check directories
 // cache exists?
 echo strip_tags($_lang['checking_if_cache_exist']);
 if (!file_exists($path."../assets/cache") || !file_exists($path."../assets/cache/rss")) {
-    echo $_lang['failed'] . PHP_EOL;
+    echo $_lang['failed'].PHP_EOL;
     $errors++;
 } else {
-    echo $_lang['ok'] . PHP_EOL;
+    echo $_lang['ok'].PHP_EOL;
 }
 
 
@@ -172,82 +172,82 @@ 
 echo strip_tags($_lang['checking_if_cache_writable']);
 if (!is_writable($path."../assets/cache")) {
     $errors++;
-    echo $_lang['failed'] . PHP_EOL;
+    echo $_lang['failed'].PHP_EOL;
 } else {
-    echo $_lang['ok'] . PHP_EOL;
+    echo $_lang['ok'].PHP_EOL;
 }
 
 
 // cache files writable?
 echo strip_tags($_lang['checking_if_cache_file_writable']);
 $tmp = $path."../assets/cache/siteCache.idx.php";
-if ( ! file_exists($tmp)) {
+if (!file_exists($tmp)) {
     f_owc($tmp, "<?php //EVO site cache file ?>");
 }
-if ( ! is_writable($tmp)) {
+if (!is_writable($tmp)) {
     $errors++;
-    echo $_lang['failed'] . PHP_EOL;
+    echo $_lang['failed'].PHP_EOL;
 } else {
-    echo $_lang['ok'] . PHP_EOL;
+    echo $_lang['ok'].PHP_EOL;
 }
 
 
 echo strip_tags($_lang['checking_if_cache_file2_writable']);
-if ( ! is_writable($path."../assets/cache/sitePublishing.idx.php")) {
+if (!is_writable($path."../assets/cache/sitePublishing.idx.php")) {
     $errors++;
-    echo $_lang['failed'] . PHP_EOL;
+    echo $_lang['failed'].PHP_EOL;
 } else {
-    echo $_lang['ok'] . PHP_EOL;
+    echo $_lang['ok'].PHP_EOL;
 }
 
 
 // File Browser directories exists?
 echo strip_tags($_lang['checking_if_images_exist']);
-switch(true){
+switch (true) {
     case !file_exists($path."../assets/images"):
     case !file_exists($path."../assets/files"):
     case !file_exists($path."../assets/backup"):
     //case !file_exists("../assets/.thumbs"):
         $errors++;
-        echo $_lang['failed'] . PHP_EOL;
+        echo $_lang['failed'].PHP_EOL;
         break;
     default:
-        echo $_lang['ok'] . PHP_EOL;
+        echo $_lang['ok'].PHP_EOL;
 }
 
 
 // File Browser directories writable?
 echo strip_tags($_lang['checking_if_images_writable']);
-switch(true){
+switch (true) {
     case !is_writable($path."../assets/images"):
     case !is_writable($path."../assets/files"):
     case !is_writable($path."../assets/backup"):
     //case !is_writable("../assets/.thumbs"):
         $errors++;
-        echo $_lang['failed'] . PHP_EOL;
+        echo $_lang['failed'].PHP_EOL;
         break;
     default:
-        echo $_lang['ok'] . PHP_EOL;
+        echo $_lang['ok'].PHP_EOL;
 }
 
 
 // export exists?
 echo strip_tags($_lang['checking_if_export_exists']);
 if (!file_exists($path."../assets/export")) {
-    echo $_lang['failed'] . PHP_EOL;
+    echo $_lang['failed'].PHP_EOL;
     $errors++;
 } else {
-    echo $_lang['ok'] . PHP_EOL;
+    echo $_lang['ok'].PHP_EOL;
 }
 
 
 // export writable?
 echo strip_tags($_lang['checking_if_export_writable']);
 if (!is_writable($path."../assets/export")) {
-    echo $_lang['failed'] . PHP_EOL;
+    echo $_lang['failed'].PHP_EOL;
     $errors++;
 } else {
-    echo $_lang['ok'] . PHP_EOL;
+    echo $_lang['ok'].PHP_EOL;
 }
 
 
@@ -262,9 +262,9 @@ 
 $isWriteable = is_writable($tmp);
 if (!$isWriteable) {
     $errors++;
-    echo $_lang['failed'] . PHP_EOL;
+    echo $_lang['failed'].PHP_EOL;
 } else {
-    echo $_lang['ok'] . PHP_EOL;
+    echo $_lang['ok'].PHP_EOL;
 }
 
 
@@ -280,7 +280,7 @@ 
     $database_charset = substr($database_collation, 0, strpos($database_collation, '_') - 1);
     $database_connection_charset = $database_collation;
     $database_connection_method = $database_connection_method;
-    $dbase = '`' . $database_name . '`';
+    $dbase = '`'.$database_name.'`';
     $table_prefix = $tableprefix;
 }
 echo $_lang['creating_database_connection'];
@@ -320,33 +320,33 @@ 
 
 // check table prefix
 if ($conn && $installMode == 0) {
-    echo $_lang['checking_table_prefix'] . $table_prefix . '`: ';
-    if ($rs= mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`" . $table_prefix . "site_content`")) {
-        echo $_lang['failed'] . ' ' . $_lang['table_prefix_already_inuse_note'] . PHP_EOL;
+    echo $_lang['checking_table_prefix'].$table_prefix.'`: ';
+    if ($rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`".$table_prefix."site_content`")) {
+        echo $_lang['failed'].' '.$_lang['table_prefix_already_inuse_note'].PHP_EOL;
         $errors++;
 
     } else {
-        echo $_lang['ok'] . PHP_EOL;
+        echo $_lang['ok'].PHP_EOL;
     }
 } elseif ($conn && $installMode == 2) {
-    echo $_lang['checking_table_prefix'] . $table_prefix . '`: ';
-    if (!$rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`" . $table_prefix . "site_content`")) {
-        echo $_lang['failed'] . ' ' . $_lang['table_prefix_not_exist'] . PHP_EOL;
+    echo $_lang['checking_table_prefix'].$table_prefix.'`: ';
+    if (!$rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`".$table_prefix."site_content`")) {
+        echo $_lang['failed'].' '.$_lang['table_prefix_not_exist'].PHP_EOL;
         $errors++;
 
   } else {
-        echo $_lang['ok'] . PHP_EOL;
+        echo $_lang['ok'].PHP_EOL;
   }
 }
 
 // check mysql version
 if ($conn) {
     echo $_lang['checking_mysql_version'];
-    if ( version_compare(mysqli_get_server_info($conn), '5.0.51', '=') ) {
-        echo $_lang['warning'] . ' ' . $_lang['mysql_5051'] . PHP_EOL;
-        echo $_lang['mysql_5051_warning'] . PHP_EOL;
+    if (version_compare(mysqli_get_server_info($conn), '5.0.51', '=')) {
+        echo $_lang['warning'].' '.$_lang['mysql_5051'].PHP_EOL;
+        echo $_lang['mysql_5051_warning'].PHP_EOL;
     } else {
-        echo $_lang['ok'] . ' ' . $_lang['mysql_version_is'] . mysqli_get_server_info($conn) . PHP_EOL;
+        echo $_lang['ok'].' '.$_lang['mysql_version_is'].mysqli_get_server_info($conn).PHP_EOL;
     }
 }
 
@@ -354,20 +354,20 @@ 
 if ($conn) {
     echo $_lang['checking_mysql_strict_mode'];
     $mysqlmode = mysqli_query($conn, "SELECT @@global.sql_mode");
-    if (mysqli_num_rows($mysqlmode) > 0){
+    if (mysqli_num_rows($mysqlmode) > 0) {
         $modes = mysqli_fetch_array($mysqlmode, MYSQLI_NUM);
         //$modes = array("STRICT_TRANS_TABLES"); // for testing
         // print_r($modes);
         foreach ($modes as $mode) {
             if (stristr($mode, "STRICT_TRANS_TABLES") !== false || stristr($mode, "STRICT_ALL_TABLES") !== false) {
-                echo $_lang['warning'] . ' ' . $_lang['strict_mode'] . PHP_EOL;
-                echo $_lang['strict_mode_error'] . PHP_EOL;
+                echo $_lang['warning'].' '.$_lang['strict_mode'].PHP_EOL;
+                echo $_lang['strict_mode_error'].PHP_EOL;
             } else {
-                echo $_lang['ok'] . PHP_EOL;
+                echo $_lang['ok'].PHP_EOL;
             }
         }
     } else {
-        echo $_lang['ok'] . PHP_EOL;
+        echo $_lang['ok'].PHP_EOL;
     }
 }
 // Version and strict mode check end
@@ -383,17 +383,17 @@ 
     f_owc($path."../assets/cache/installProc.inc.php", '<?php $installStartTime = '.time().'; ?>');
 }
 
-if($installMode > 0 && $_POST['installdata'] == "1") {
-    echo $_lang['sample_web_site'] . ': ' . $_lang['sample_web_site_note'] . PHP_EOL;
+if ($installMode > 0 && $_POST['installdata'] == "1") {
+    echo $_lang['sample_web_site'].': '.$_lang['sample_web_site_note'].PHP_EOL;
 }
 
 if ($errors > 0) {
-    echo $_lang['setup_cannot_continue'] . ' ';
+    echo $_lang['setup_cannot_continue'].' ';
 
-    if($errors > 1){
-        echo $errors . " " . $_lang['errors'] . $_lang['please_correct_errors'] . $_lang['and_try_again_plural'];
-    }else{
-        echo $_lang['error'] . $_lang['please_correct_error'] . $_lang['and_try_again']. PHP_EOL;
+    if ($errors > 1) {
+        echo $errors." ".$_lang['errors'].$_lang['please_correct_errors'].$_lang['and_try_again_plural'];
+    } else {
+        echo $_lang['error'].$_lang['please_correct_error'].$_lang['and_try_again'].PHP_EOL;
     }
 
     die();
@@ -422,7 +422,7 @@ 
     $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
     $database_connection_charset = $database_charset;
     $database_connection_method = $database_connection_method;
-    $dbase = "`" .$database_name. "`";
+    $dbase = "`".$database_name."`";
     $table_prefix = $tableprefix;
     $adminname = $cmsadmin;
     $adminemail = $cmsadminemail;
@@ -433,7 +433,7 @@ 
 
 // set session name variable
 if (!isset ($site_sessionname)) {
-    $site_sessionname = 'SN' . uniqid('');
+    $site_sessionname = 'SN'.uniqid('');
 }
 
 // get base path and url
@@ -447,8 +447,8 @@ 
     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 $_lang['setup_database_create_connection'].': ';
@@ -460,7 +460,7 @@ 
 }
 
 // select database
-echo $_lang['setup_database_selection']. str_replace("`", "", $dbase) . "`: ";
+echo $_lang['setup_database_selection'].str_replace("`", "", $dbase)."`: ";
 if (!mysqli_select_db($conn, str_replace("`", "", $dbase))) {
     echo $_lang['setup_database_selection_failed']." ".$_lang['setup_database_selection_failed_note'].PHP_EOL;
     $create = true;
@@ -472,16 +472,16 @@ 
 
 // try to create the database
 if ($create) {
-    echo $_lang['setup_database_creation']. str_replace("`", "", $dbase) . "`: ";
+    echo $_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 $_lang['setup_database_creation_failed']." ".$_lang['setup_database_creation_failed_note'].PHP_EOL;
         $errors += 1;
 
-        echo 'database charset: ' . $database_charset . PHP_EOL;
-        echo 'database collation: ' . $database_collation . PHP_EOL;
+        echo 'database charset: '.$database_charset.PHP_EOL;
+        echo 'database collation: '.$database_collation.PHP_EOL;
 
-        echo $_lang['setup_database_creation_failed_note2'] . PHP_EOL;
+        echo $_lang['setup_database_creation_failed_note2'].PHP_EOL;
 
         die();
 
@@ -492,18 +492,18 @@ 
 
 // check table prefix
 if ($installMode == 0) {
-    echo $_lang['checking_table_prefix'] . $table_prefix . "`: ";
-    if (@ $rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`" . $table_prefix . "site_content`")) {
-        echo $_lang['failed'] . " " . $_lang['table_prefix_already_inuse'] . PHP_EOL;
+    echo $_lang['checking_table_prefix'].$table_prefix."`: ";
+    if (@ $rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`".$table_prefix."site_content`")) {
+        echo $_lang['failed']." ".$_lang['table_prefix_already_inuse'].PHP_EOL;
         $errors += 1;
-        echo $_lang['table_prefix_already_inuse_note'] . PHP_EOL;
+        echo $_lang['table_prefix_already_inuse_note'].PHP_EOL;
         return;
     } else {
         echo $_lang['ok'].PHP_EOL;
     }
 }
 
-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
@@ -511,20 +511,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];
                 }
             }
         }
@@ -535,20 +535,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';
                 }
             }
@@ -570,17 +570,16 @@ 
 
 // setup Template template files - array : name, description, type - 0:file or 1:content, parameters, category
 $mt = &$moduleTemplates;
-if(is_dir($templatePath) && is_readable($templatePath)) {
+if (is_dir($templatePath) && is_readable($templatePath)) {
     $d = dir($templatePath);
     while (false !== ($tplfile = $d->read()))
     {
-        if(substr($tplfile, -4) != '.tpl') continue;
+        if (substr($tplfile, -4) != '.tpl') continue;
         $params = parse_docblock($templatePath, $tplfile);
-        if(is_array($params) && (count($params)>0))
+        if (is_array($params) && (count($params) > 0))
         {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
-            $mt[] = array
-            (
+            $mt[] = array(
                 $params['name'],
                 $description,
                 // Don't think this is gonna be used ... but adding it just in case 'type'
@@ -598,12 +597,12 @@ 
 
 // setup Template Variable template files
 $mtv = &$moduleTVs;
-if(is_dir($tvPath) && is_readable($tvPath)) {
+if (is_dir($tvPath) && is_readable($tvPath)) {
     $d = dir($tvPath);
     while (false !== ($tplfile = $d->read())) {
-        if(substr($tplfile, -4) != '.tpl') continue;
+        if (substr($tplfile, -4) != '.tpl') continue;
         $params = parse_docblock($tvPath, $tplfile);
-        if(is_array($params) && (count($params)>0)) {
+        if (is_array($params) && (count($params) > 0)) {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
             $mtv[] = array(
                 $params['name'],
@@ -615,9 +614,9 @@ 
                 $params['output_widget'],
                 $params['output_widget_params'],
                 "$templatePath/{$params['filename']}", /* not currently used */
-                $params['template_assignments']!="*"?$params['template_assignments']:implode(",",array_map(create_function('$v','return $v[0];'),$mt)), /* comma-separated list of template names */
+                $params['template_assignments'] != "*" ? $params['template_assignments'] : implode(",", array_map(create_function('$v', 'return $v[0];'), $mt)), /* comma-separated list of template names */
                 $params['modx_category'],
-                $params['lock_tv'],  /* value should be 1 or 0 */
+                $params['lock_tv'], /* value should be 1 or 0 */
                 array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false
             );
         }
@@ -627,14 +626,14 @@ 
 
 // setup chunks template files - array : name, description, type - 0:file or 1:content, file or content
 $mc = &$moduleChunks;
-if(is_dir($chunkPath) && is_readable($chunkPath)) {
+if (is_dir($chunkPath) && is_readable($chunkPath)) {
     $d = dir($chunkPath);
     while (false !== ($tplfile = $d->read())) {
-        if(substr($tplfile, -4) != '.tpl') {
+        if (substr($tplfile, -4) != '.tpl') {
             continue;
         }
         $params = parse_docblock($chunkPath, $tplfile);
-        if(is_array($params) && count($params) > 0) {
+        if (is_array($params) && count($params) > 0) {
             $mc[] = array(
                 $params['name'],
                 $params['description'],
@@ -650,14 +649,14 @@ 
 
 // setup snippets template files - array : name, description, type - 0:file or 1:content, file or content,properties
 $ms = &$moduleSnippets;
-if(is_dir($snippetPath) && is_readable($snippetPath)) {
+if (is_dir($snippetPath) && is_readable($snippetPath)) {
     $d = dir($snippetPath);
     while (false !== ($tplfile = $d->read())) {
-        if(substr($tplfile, -4) != '.tpl') {
+        if (substr($tplfile, -4) != '.tpl') {
             continue;
         }
         $params = parse_docblock($snippetPath, $tplfile);
-        if(is_array($params) && count($params) > 0) {
+        if (is_array($params) && count($params) > 0) {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
             $ms[] = array(
                 $params['name'],
@@ -674,14 +673,14 @@ 
 
 // setup plugins template files - array : name, description, type - 0:file or 1:content, file or content,properties
 $mp = &$modulePlugins;
-if(is_dir($pluginPath) && is_readable($pluginPath)) {
+if (is_dir($pluginPath) && is_readable($pluginPath)) {
     $d = dir($pluginPath);
     while (false !== ($tplfile = $d->read())) {
-        if(substr($tplfile, -4) != '.tpl') {
+        if (substr($tplfile, -4) != '.tpl') {
             continue;
         }
         $params = parse_docblock($pluginPath, $tplfile);
-        if(is_array($params) && count($params) > 0) {
+        if (is_array($params) && count($params) > 0) {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
             $mp[] = array(
                 $params['name'],
@@ -693,7 +692,7 @@ 
                 $params['modx_category'],
                 $params['legacy_names'],
                 array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false,
-                (int)$params['disabled']
+                (int) $params['disabled']
             );
         }
     }
@@ -703,14 +702,14 @@ 
 // setup modules - array : name, description, type - 0:file or 1:content, file or content,properties, guid,enable_sharedparams
 $mm = &$moduleModules;
 $mdp = &$moduleDependencies;
-if(is_dir($modulePath) && is_readable($modulePath)) {
+if (is_dir($modulePath) && is_readable($modulePath)) {
     $d = dir($modulePath);
     while (false !== ($tplfile = $d->read())) {
-        if(substr($tplfile, -4) != '.tpl') {
+        if (substr($tplfile, -4) != '.tpl') {
             continue;
         }
         $params = parse_docblock($modulePath, $tplfile);
-        if(is_array($params) && count($params) > 0) {
+        if (is_array($params) && count($params) > 0) {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
             $mm[] = array(
                 $params['name'],
@@ -718,12 +717,12 @@ 
                 "$modulePath/{$params['filename']}",
                 $params['properties'],
                 $params['guid'],
-                (int)$params['shareparams'],
+                (int) $params['shareparams'],
                 $params['modx_category'],
                 array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false
             );
         }
-        if ((int)$params['shareparams'] || !empty($params['dependencies'])) {
+        if ((int) $params['shareparams'] || !empty($params['dependencies'])) {
             $dependencies = explode(',', $params['dependencies']);
             foreach ($dependencies as $dependency) {
                 $dependency = explode(':', $dependency);
@@ -794,103 +793,103 @@ 
 // setup callback function
 $callBackFnc = "clean_up";
 
-function clean_up($sqlParser) {
+function clean_up($sqlParser){
     $ids = array();
 
     // secure web documents - privateweb
-    mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 0 WHERE privateweb = 1");
-    $sql =  "SELECT DISTINCT sc.id
+    mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 0 WHERE privateweb = 1");
+    $sql = "SELECT DISTINCT sc.id
              FROM `".$sqlParser->prefix."site_content` sc
              LEFT JOIN `".$sqlParser->prefix."document_groups` dg ON dg.document = sc.id
              LEFT JOIN `".$sqlParser->prefix."webgroup_access` wga ON wga.documentgroup = dg.document_group
              WHERE wga.id>0";
-    $ds = mysqli_query($sqlParser->conn,$sql);
-    if(!$ds) {
+    $ds = mysqli_query($sqlParser->conn, $sql);
+    if (!$ds) {
         echo "An error occurred while executing a query: ".mysqli_error($sqlParser->conn);
     }
     else {
-        while($r = mysqli_fetch_assoc($ds)) $ids[]=$r["id"];
-        if(count($ids)>0) {
-            mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 1 WHERE id IN (".implode(", ",$ids).")");
+        while ($r = mysqli_fetch_assoc($ds)) $ids[] = $r["id"];
+        if (count($ids) > 0) {
+            mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 1 WHERE id IN (".implode(", ", $ids).")");
             unset($ids);
         }
     }
 
     // secure manager documents privatemgr
-    mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 0 WHERE privatemgr = 1");
-    $sql =  "SELECT DISTINCT sc.id
+    mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 0 WHERE privatemgr = 1");
+    $sql = "SELECT DISTINCT sc.id
              FROM `".$sqlParser->prefix."site_content` sc
              LEFT JOIN `".$sqlParser->prefix."document_groups` dg ON dg.document = sc.id
              LEFT JOIN `".$sqlParser->prefix."membergroup_access` mga ON mga.documentgroup = dg.document_group
              WHERE mga.id>0";
-    $ds = mysqli_query($sqlParser->conn,$sql);
-    if(!$ds) {
+    $ds = mysqli_query($sqlParser->conn, $sql);
+    if (!$ds) {
         echo "An error occurred while executing a query: ".mysqli_error($sqlParser->conn);
     }
     else {
-        while($r = mysqli_fetch_assoc($ds)) $ids[]=$r["id"];
-        if(count($ids)>0) {
-            mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 1 WHERE id IN (".implode(", ",$ids).")");
+        while ($r = mysqli_fetch_assoc($ds)) $ids[] = $r["id"];
+        if (count($ids) > 0) {
+            mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 1 WHERE id IN (".implode(", ", $ids).")");
             unset($ids);
         }
     }
 }
 
-function parse_docblock($element_dir, $filename) {
+function parse_docblock($element_dir, $filename){
     $params = array();
-    $fullpath = $element_dir . '/' . $filename;
-    if(is_readable($fullpath)) {
+    $fullpath = $element_dir.'/'.$filename;
+    if (is_readable($fullpath)) {
         $tpl = @fopen($fullpath, "r");
-        if($tpl) {
+        if ($tpl) {
             $params['filename'] = $filename;
             $docblock_start_found = false;
             $name_found = false;
             $description_found = false;
 
-            while(!feof($tpl)) {
+            while (!feof($tpl)) {
                 $line = fgets($tpl);
-                if(!$docblock_start_found) {
+                if (!$docblock_start_found) {
                     // find docblock start
-                    if(strpos($line, '/**') !== false) {
+                    if (strpos($line, '/**') !== false) {
                         $docblock_start_found = true;
                     }
                     continue;
-                } elseif(!$name_found) {
+                } elseif (!$name_found) {
                     // find name
                     $ma = null;
-                    if(preg_match("/^\s+\*\s+(.+)/", $line, $ma)) {
+                    if (preg_match("/^\s+\*\s+(.+)/", $line, $ma)) {
                         $params['name'] = trim($ma[1]);
                         $name_found = !empty($params['name']);
                     }
                     continue;
-                } elseif(!$description_found) {
+                } elseif (!$description_found) {
                     // find description
                     $ma = null;
-                    if(preg_match("/^\s+\*\s+(.+)/", $line, $ma)) {
+                    if (preg_match("/^\s+\*\s+(.+)/", $line, $ma)) {
                         $params['description'] = trim($ma[1]);
                         $description_found = !empty($params['description']);
                     }
                     continue;
                 } else {
                     $ma = null;
-                    if(preg_match("/^\s+\*\s+\@([^\s]+)\s+(.+)/", $line, $ma)) {
+                    if (preg_match("/^\s+\*\s+\@([^\s]+)\s+(.+)/", $line, $ma)) {
                         $param = trim($ma[1]);
                         $val = trim($ma[2]);
-                        if(!empty($param) && !empty($val)) {
-                            if($param == 'internal') {
+                        if (!empty($param) && !empty($val)) {
+                            if ($param == 'internal') {
                                 $ma = null;
-                                if(preg_match("/\@([^\s]+)\s+(.+)/", $val, $ma)) {
+                                if (preg_match("/\@([^\s]+)\s+(.+)/", $val, $ma)) {
                                     $param = trim($ma[1]);
                                     $val = trim($ma[2]);
                                 }
                                 //if($val !== '0' && (empty($param) || empty($val))) {
-                                if(empty($param)) {
+                                if (empty($param)) {
                                     continue;
                                 }
                             }
                             $params[$param] = $val;
                         }
-                    } elseif(preg_match("/^\s*\*\/\s*$/", $line)) {
+                    } elseif (preg_match("/^\s*\*\/\s*$/", $line)) {
                         break;
                     }
                 }
@@ -921,13 +920,13 @@ 
     // display database results
     if ($sqlParser->installFailed == true) {
         $errors += 1;
-        echo $_lang['database_alerts'] . PHP_EOL;
-        echo $_lang['setup_couldnt_install'] . PHP_EOL;
-        echo $_lang['installation_error_occured'] . PHP_EOL;
+        echo $_lang['database_alerts'].PHP_EOL;
+        echo $_lang['setup_couldnt_install'].PHP_EOL;
+        echo $_lang['installation_error_occured'].PHP_EOL;
         for ($i = 0; $i < count($sqlParser->mysqlErrors); $i++) {
-            echo $sqlParser->mysqlErrors[$i]["error"] . " " . $_lang['during_execution_of_sql'] . " " . strip_tags($sqlParser->mysqlErrors[$i]["sql"]) . PHP_EOL;
+            echo $sqlParser->mysqlErrors[$i]["error"]." ".$_lang['during_execution_of_sql']." ".strip_tags($sqlParser->mysqlErrors[$i]["sql"]).PHP_EOL;
         }
-        echo $_lang['some_tables_not_updated'] . PHP_EOL;
+        echo $_lang['some_tables_not_updated'].PHP_EOL;
         die();
     } else {
         echo $_lang['ok'].PHP_EOL;
@@ -937,7 +936,7 @@ 
 // custom or not
 if (file_exists($path."../assets/cache/siteManager.php")) {
     $mgrdir = 'include_once(dirname(__FILE__)."/../../assets/cache/siteManager.php");';
-}else{
+} else {
     $mgrdir = 'define(\'MGR_DIR\', \'manager\');';
 }
 
@@ -974,16 +973,16 @@ 
 $chmodSuccess = @chmod($filename, 0404);
 
 if ($configFileFailed == true) {
-    echo $_lang['failed'] . PHP_EOL;
+    echo $_lang['failed'].PHP_EOL;
     $errors += 1;
 
-    echo $_lang['cant_write_config_file'] . ' ' . MGR_DIR .'/includes/config.inc.php' .PHP_EOL;
+    echo $_lang['cant_write_config_file'].' '.MGR_DIR.'/includes/config.inc.php'.PHP_EOL;
     echo ' '.PHP_EOL;
     echo ' '.PHP_EOL;
     echo $configString;
     echo ' '.PHP_EOL;
     echo ' '.PHP_EOL;
-    echo $_lang['cant_write_config_file_note'] . PHP_EOL;
+    echo $_lang['cant_write_config_file_note'].PHP_EOL;
     die();
 
 } else {
@@ -993,16 +992,16 @@ 
 // 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')");
         }
     }
 }
@@ -1014,29 +1013,29 @@ 
     // display database results
     if ($sqlParser->installFailed == true) {
         $errors += 1;
-        echo $_lang['database_alerts'] . PHP_EOL;
-        echo $_lang['setup_couldnt_install'] . PHP_EOL;
-        echo $_lang['installation_error_occured'] . PHP_EOL . PHP_EOL;
+        echo $_lang['database_alerts'].PHP_EOL;
+        echo $_lang['setup_couldnt_install'].PHP_EOL;
+        echo $_lang['installation_error_occured'].PHP_EOL.PHP_EOL;
         /*
         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 "</p>";*/
-        echo $_lang['some_tables_not_updated'] . PHP_EOL;
+        echo $_lang['some_tables_not_updated'].PHP_EOL;
         die();
     } else {
-        echo $_lang['ok'] . PHP_EOL;
+        echo $_lang['ok'].PHP_EOL;
     }
 }
 
 // Install Templates
 $moduleTemplate = $mt;
 if (!empty($moduleTemplate) || $installData) {
-    echo PHP_EOL . $_lang['templates'] . ":" . PHP_EOL;
+    echo PHP_EOL.$_lang['templates'].":".PHP_EOL;
     //$selTemplates = $_POST['template'];
     foreach ($moduleTemplates as $k=>$moduleTemplate) {
         $installSample = in_array('sample', $moduleTemplate[6]) && $installData == 1;
-        if($installSample || is_array($moduleTemplate)) {
+        if ($installSample || is_array($moduleTemplate)) {
             $name = mysqli_real_escape_string($conn, $moduleTemplate[0]);
             $desc = mysqli_real_escape_string($conn, $moduleTemplate[1]);
             $category = mysqli_real_escape_string($conn, $moduleTemplate[4]);
@@ -1044,7 +1043,7 @@ 
             $filecontent = $moduleTemplate[3];
             $save_sql_id_as = $moduleTemplate[7]; // Nessecary for demo-site
             if (!file_exists($filecontent)) {
-                echo "  $name: " . $_lang['unable_install_template'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL;
+                echo "  $name: ".$_lang['unable_install_template']." '$filecontent' ".$_lang['not_found'].PHP_EOL;
             } else {
                 // Create the category if it does not already exist
                 $category_id = getCreateDbCategory($category, $sqlParser);
@@ -1054,31 +1053,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 mysqli_error($sqlParser->conn) . PHP_EOL;
+                        echo mysqli_error($sqlParser->conn).PHP_EOL;
                         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 "  $name: " . $_lang['upgraded'] . PHP_EOL;
+                    echo "  $name: ".$_lang['upgraded'].PHP_EOL;
                 } 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 mysqli_error($sqlParser->conn) . PHP_EOL;
+                        echo mysqli_error($sqlParser->conn).PHP_EOL;
                         die();
                     }
-                    if(!is_null($save_sql_id_as)) $custom_placeholders[$save_sql_id_as] = @mysqli_insert_id($sqlParser->conn);
-                    echo "  $name: " . $_lang['installed'] . PHP_EOL;
+                    if (!is_null($save_sql_id_as)) $custom_placeholders[$save_sql_id_as] = @mysqli_insert_id($sqlParser->conn);
+                    echo "  $name: ".$_lang['installed'].PHP_EOL;
                 }
             }
         }
@@ -1088,11 +1087,11 @@ 
 // Install Template Variables
 $moduleTVs = $mtv;
 if (is_array($moduleTVs) || $installData) {
-    echo PHP_EOL . $_lang['tvs'].': '.PHP_EOL;
+    echo PHP_EOL.$_lang['tvs'].': '.PHP_EOL;
     //$selTVs = $_POST['tv'];
     foreach ($moduleTVs as $k=>$moduleTV) {
         $installSample = in_array('sample', $moduleTV[12]) && $installData == 1;
-        if($installSample || is_array($moduleTVs)) {
+        if ($installSample || is_array($moduleTVs)) {
             $name = mysqli_real_escape_string($conn, $moduleTV[0]);
             $caption = mysqli_real_escape_string($conn, $moduleTV[1]);
             $desc = mysqli_real_escape_string($conn, $moduleTV[2]);
@@ -1110,24 +1109,24 @@ 
             // 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 mysqli_error($sqlParser->conn) . PHP_EOL;
+                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 mysqli_error($sqlParser->conn).PHP_EOL;
                         return;
                     }
                     $insert = false;
                 }
-                echo "  $name: " . $_lang['upgraded'] . PHP_EOL;
+                echo "  $name: ".$_lang['upgraded'].PHP_EOL;
             } 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',$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 mysqli_error($sqlParser->conn) . PHP_EOL;
+                    echo mysqli_error($sqlParser->conn).PHP_EOL;
                     return;
                 }
-                echo "  $name: " . $_lang['installed'] . PHP_EOL;
+                echo "  $name: ".$_lang['installed'].PHP_EOL;
             }
 
             // add template assignments
@@ -1136,10 +1135,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) {
@@ -1148,7 +1147,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)");
                    }
                 }
             }
@@ -1159,12 +1158,12 @@ 
 
 $moduleChunks = $mc;
 // Install Chunks
-if (is_array ($moduleChunks) || $installData) {
-    echo PHP_EOL . $_lang['chunks'] . ": " . PHP_EOL;
+if (is_array($moduleChunks) || $installData) {
+    echo PHP_EOL.$_lang['chunks'].": ".PHP_EOL;
     foreach ($moduleChunks as $k=>$moduleChunk) {
         $installSample = in_array('sample', $moduleChunk[5]) && $installData == 1;
         $count_new_name = 0;
-        if($installSample || is_array ($moduleChunks)) {
+        if ($installSample || is_array($moduleChunks)) {
 
             $name = mysqli_real_escape_string($conn, $moduleChunk[0]);
             $desc = mysqli_real_escape_string($conn, $moduleChunk[1]);
@@ -1173,7 +1172,7 @@ 
             $filecontent = $moduleChunk[2];
 
             if (!file_exists($filecontent))
-                echo "  $name: " . $_lang['unable_install_chunk'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL;
+                echo "  $name: ".$_lang['unable_install_chunk']." '$filecontent' ".$_lang['not_found'].PHP_EOL;
             else {
 
                 // Create the category if it does not already exist
@@ -1181,31 +1180,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 mysqli_error($sqlParser->conn) . PHP_EOL;
+                        echo mysqli_error($sqlParser->conn).PHP_EOL;
                         return;
                     }
-                    echo "  $name: " . $_lang['upgraded'] . PHP_EOL;
-                } elseif($count_new_name == 0) {
-                    if($count_original_name > 0 && $overwrite == 'false') {
+                    echo "  $name: ".$_lang['upgraded'].PHP_EOL;
+                } 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 mysqli_error($sqlParser->conn) . PHP_EOL;
+                        echo mysqli_error($sqlParser->conn).PHP_EOL;
                         return;
                     }
-                    echo "  $name: " . $_lang['installed'] . PHP_EOL;
+                    echo "  $name: ".$_lang['installed'].PHP_EOL;
                 }
             }
         }
@@ -1215,11 +1214,11 @@ 
 // Install Modules
 $moduleModules = $mm;
 if (is_array($moduleModules) || $installData) {
-    echo PHP_EOL . $_lang['modules'] . ":" . PHP_EOL;
+    echo PHP_EOL.$_lang['modules'].":".PHP_EOL;
     //$selModules = $_POST['module'];
     foreach ($moduleModules as $k=>$moduleModule) {
         $installSample = in_array('sample', $moduleModule[7]) && $installData == 1;
-        if($installSample || is_array($moduleModules)) {
+        if ($installSample || is_array($moduleModules)) {
             $name = mysqli_real_escape_string($conn, $moduleModule[0]);
             $desc = mysqli_real_escape_string($conn, $moduleModule[1]);
             $filecontent = $moduleModule[2];
@@ -1228,7 +1227,7 @@ 
             $shared = mysqli_real_escape_string($conn, $moduleModule[5]);
             $category = mysqli_real_escape_string($conn, $moduleModule[6]);
             if (!file_exists($filecontent))
-                echo "  $name: " . $_lang['unable_install_module'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL;
+                echo "  $name: ".$_lang['unable_install_module']." '$filecontent' ".$_lang['not_found'].PHP_EOL;
             else {
 
                 // Create the category if it does not already exist
@@ -1237,24 +1236,24 @@ 
                 $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 mysqli_error($sqlParser->conn) . PHP_EOL;
+                    $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 mysqli_error($sqlParser->conn).PHP_EOL;
                         return;
                     }
-                    echo "  $name: " . $_lang['upgraded'] . PHP_EOL;
+                    echo "  $name: ".$_lang['upgraded'].PHP_EOL;
                 } else {
-                    if ($properties != NULL ){
+                    if ($properties != NULL) {
                         $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 "  $name: " . $_lang['installed'] . PHP_EOL;
+                    echo "  $name: ".$_lang['installed'].PHP_EOL;
                 }
             }
         }
@@ -1264,11 +1263,11 @@ 
 // Install Plugins
 $modulePlugins = $mp;
 if (is_array($modulePlugins) || $installData) {
-    echo PHP_EOL . $_lang['plugins'] . ":" . PHP_EOL;
+    echo PHP_EOL.$_lang['plugins'].":".PHP_EOL;
     $selPlugs = $_POST['plugin'];
     foreach ($modulePlugins as $k=>$modulePlugin) {
         //$installSample = in_array('sample', $modulePlugin[8]) && $installData == 1;
-        if($installSample || is_array($modulePlugins)) {
+        if ($installSample || is_array($modulePlugins)) {
             $name = mysqli_real_escape_string($conn, $modulePlugin[0]);
             $desc = mysqli_real_escape_string($conn, $modulePlugin[1]);
             $filecontent = $modulePlugin[2];
@@ -1278,17 +1277,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 "  $name: " . $_lang['unable_install_plugin'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL;
+                echo "  $name: ".$_lang['unable_install_plugin']." '$filecontent' ".$_lang['not_found'].PHP_EOL;
             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);
                 }
 
@@ -1298,52 +1297,52 @@ 
                 $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 mysqli_error($sqlParser->conn) . PHP_EOL;
+                    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 mysqli_error($sqlParser->conn).PHP_EOL;
                                 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 mysqli_error($sqlParser->conn).PHP_EOL;
                                 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 mysqli_error($sqlParser->conn).PHP_EOL;
                             return;
                         }
                     }
-                    echo "  $name: " . $_lang['upgraded'] . PHP_EOL;
+                    echo "  $name: ".$_lang['upgraded'].PHP_EOL;
                 } else {
-                    if ($properties != NULL ){
+                    if ($properties != NULL) {
                         $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 mysqli_error($sqlParser->conn) . PHP_EOL;
+                    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 mysqli_error($sqlParser->conn).PHP_EOL;
                         return;
                     }
-                    echo "  $name: " . $_lang['installed'] . PHP_EOL;
+                    echo "  $name: ".$_lang['installed'].PHP_EOL;
                 }
                 // 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)."')");
                     }
                 }
             }
@@ -1354,18 +1353,18 @@ 
 // Install Snippets
 $moduleSnippet = $ms;
 if (is_array($moduleSnippet) || $installData) {
-    echo PHP_EOL . $_lang['snippets'] . ":" . PHP_EOL;
+    echo PHP_EOL.$_lang['snippets'].":".PHP_EOL;
     //$selSnips = $_POST['snippet'];
     foreach ($moduleSnippets as $k=>$moduleSnippet) {
         $installSample = in_array('sample', $moduleSnippet[5]) && $installData == 1;
-        if($installSample || is_array($moduleSnippet)) {
+        if ($installSample || is_array($moduleSnippet)) {
             $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 "  $name: " . $_lang['unable_install_snippet'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL;
+                echo "  $name: ".$_lang['unable_install_snippet']." '$filecontent' ".$_lang['not_found'].PHP_EOL;
             else {
 
                 // Create the category if it does not already exist
@@ -1374,24 +1373,24 @@ 
                 $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 mysqli_error($sqlParser->conn) . PHP_EOL;
+                    $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 mysqli_error($sqlParser->conn).PHP_EOL;
                         return;
                     }
-                    echo "  $name: " . $_lang['upgraded'] . PHP_EOL;
+                    echo "  $name: ".$_lang['upgraded'].PHP_EOL;
                 } else {
-                    if ($properties != NULL ){
+                    if ($properties != NULL) {
                         $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 mysqli_error($sqlParser->conn) . PHP_EOL;
+                    if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_snippets` (name,description,snippet,properties,category) VALUES('$name','$desc','$snippet','$properties',$category);")) {
+                        echo mysqli_error($sqlParser->conn).PHP_EOL;
                         return;
                     }
-                    echo "  $name: " . $_lang['installed'] . PHP_EOL;
+                    echo "  $name: ".$_lang['installed'].PHP_EOL;
                 }
             }
         }
@@ -1400,24 +1399,24 @@ 
 
 // Install demo-site
 if ($installData && $moduleSQLDataFile) {
-    echo PHP_EOL . $_lang['installing_demo_site'];
+    echo PHP_EOL.$_lang['installing_demo_site'];
     $sqlParser->process($moduleSQLDataFile);
     // display database results
     if ($sqlParser->installFailed == true) {
         $errors += 1;
-        echo $_lang['database_alerts'] . PHP_EOL;
-        echo $_lang['setup_couldnt_install'] . PHP_EOL;
-        echo $_lang['installation_error_occured'] . PHP_EOL . PHP_EOL;
+        echo $_lang['database_alerts'].PHP_EOL;
+        echo $_lang['setup_couldnt_install'].PHP_EOL;
+        echo $_lang['installation_error_occured'].PHP_EOL.PHP_EOL;
         for ($i = 0; $i < count($sqlParser->mysqlErrors); $i++) {
-            echo $sqlParser->mysqlErrors[$i]["error"] . " " . $_lang['during_execution_of_sql'] . " " . strip_tags($sqlParser->mysqlErrors[$i]["sql"]) . PHP_EOL;
+            echo $sqlParser->mysqlErrors[$i]["error"]." ".$_lang['during_execution_of_sql']." ".strip_tags($sqlParser->mysqlErrors[$i]["sql"]).PHP_EOL;
         }
 
-        echo $_lang['some_tables_not_updated'] . PHP_EOL;
+        echo $_lang['some_tables_not_updated'].PHP_EOL;
         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);
@@ -1429,9 +1428,9 @@ 
 // Install Dependencies
 $moduleDependencies = $mdp;
 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 mysqli_error($sqlParser->conn) . PHP_EOL;
+        echo mysqli_error($sqlParser->conn).PHP_EOL;
         return;
     } else {
         $row = mysqli_fetch_assoc($ds);
@@ -1439,37 +1438,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 mysqli_error($sqlParser->conn) . PHP_EOL;
+        echo mysqli_error($sqlParser->conn).PHP_EOL;
         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 mysqli_error($sqlParser->conn) . PHP_EOL;
+        echo mysqli_error($sqlParser->conn).PHP_EOL;
         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 $dependency['module'] . ' Module: ' . $_lang['depedency_create'] . PHP_EOL;
+            mysqli_query($sqlParser->conn, 'INSERT INTO '.$dbase.'`'.$sqlParser->prefix.'site_module_depobj` (module, resource, type) VALUES('.$moduleId.','.$extraId.','.$dependency['type'].')');
+            echo $dependency['module'].' Module: '.$_lang['depedency_create'].PHP_EOL;
         } 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 $dependency['module'] . ' Module: ' . $_lang['depedency_update'] . PHP_EOL;
+            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 $dependency['module'].' Module: '.$_lang['depedency_update'].PHP_EOL;
         }
         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 mysqli_error($sqlParser->conn) . PHP_EOL;
+                echo mysqli_error($sqlParser->conn).PHP_EOL;
                 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 $dependency['name'] . ': ' . $_lang['guid_set'] . PHP_EOL;
+                    mysqli_query($sqlParser->conn, 'UPDATE '.$dbase.'`'.$sqlParser->prefix.'site_'.$dependency['table'].'` SET moduleguid = '.$moduleGuid.' WHERE id='.$extraId);
+                    echo $dependency['name'].': '.$_lang['guid_set'].PHP_EOL;
                 }
             }
         }
@@ -1478,7 +1477,7 @@ 
 
 // call back function
 if ($callBackFnc != "")
-    $callBackFnc ($sqlParser);
+    $callBackFnc($sqlParser);
 
 // Setup the MODX API -- needed for the cache processor
 if (!defined('MODX_MANAGER_PATH')) define('MODX_MANAGER_PATH', $base_path.MGR_DIR.'/');
@@ -1510,17 +1509,17 @@ 
 }
 
 // setup completed!
-echo PHP_EOL . $_lang['installation_successful'] . PHP_EOL . PHP_EOL;
+echo PHP_EOL.$_lang['installation_successful'].PHP_EOL.PHP_EOL;
 //echo "<p>" . $_lang['to_log_into_content_manager'] . "</p>";
 if ($installMode == 0) {
-   echo strip_tags($_lang['installation_note']) . PHP_EOL;
+   echo strip_tags($_lang['installation_note']).PHP_EOL;
 } else {
-   echo strip_tags($_lang['upgrade_note']) . PHP_EOL;
+   echo strip_tags($_lang['upgrade_note']).PHP_EOL;
 }
 
 
-if ( empty($args) ){
-    echo PHP_EOL . 'Remove install folder?'.PHP_EOL;
+if (empty($args)) {
+    echo PHP_EOL.'Remove install folder?'.PHP_EOL;
     $removeInstall = readline("Type 'y' or 'n' to continue: ");
 }
 //remove installFolder
@@ -1528,7 +1527,7 @@ 
     removeFolder($path);
     removeFolder($base_path.'.tx');
     unlink($base_path.'README.md');
-    echo 'Install folder deleted!'. PHP_EOL . PHP_EOL;
+    echo 'Install folder deleted!'.PHP_EOL.PHP_EOL;
 }
 
 /**
@@ -1567,11 +1566,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'];
         }
     }
@@ -1586,30 +1585,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;
             }
 
@@ -1633,7 +1632,7 @@ 
 
         }
     // new json-format
-    } else if(!empty($jsonFormat)){
+    } else if (!empty($jsonFormat)) {
         $property = $jsonFormat;
     }
     if ($json) {
@@ -1648,7 +1647,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;
 }
@@ -1658,20 +1657,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);
             }
         }
@@ -1686,12 +1685,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';
@@ -1707,7 +1706,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

manager/includes/error.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  * @deprecated EvolutionCMS\Legacy\ErrorHandler
  * @todo could be unnecessary
  */
-class errorHandler extends EvolutionCMS\Legacy\ErrorHandler {
+class errorHandler extends EvolutionCMS\Legacy\ErrorHandler{
     public function include_lang($context = 'common')
     {
         parent::includeLang($context);

Braces +2 added lines, -1 removed lines

@@ -5,7 +5,8 @@
  * @deprecated EvolutionCMS\Legacy\ErrorHandler
  * @todo could be unnecessary
  */
-class errorHandler extends EvolutionCMS\Legacy\ErrorHandler {
+class errorHandler extends EvolutionCMS\Legacy\ErrorHandler
+{
     public function include_lang($context = 'common')
     {
         parent::includeLang($context);

manager/includes/log.class.inc.php

Braces +3 added lines, -1 removed lines

@@ -3,4 +3,6 @@
 /**
  * @deprecated use EvolutionCMS\Legacy\LogHandler
  */
-class logHandler extends EvolutionCMS\Legacy\LogHandler{}
+class logHandler extends EvolutionCMS\Legacy\LogHandler
+{
+}

manager/includes/src/Legacy/mgrResources.php

Spacing +36 added lines, -36 removed lines

@@ -1,6 +1,6 @@ 
 <?php namespace EvolutionCMS\Legacy;
 
-class mgrResources {
+class mgrResources{
     /**
      * @var array
      */
@@ -21,7 +21,7 @@ 
     /**
      * mgrResources constructor.
      */
-    public function __construct() {
+    public function __construct(){
         $this->setTypes();
         $this->queryItemsFromDB();
         $this->prepareCategoryArrays();
@@ -30,47 +30,47 @@ 
     /**
      * @return void
      */
-    public function setTypes() {
+    public function setTypes(){
         global $_lang;
-        $this->types['site_templates']    = array(
+        $this->types['site_templates'] = array(
             'title'=>$_lang["manage_templates"],
-            'actions'=>array( 'edit'=>array(16,'edit_template'), 'duplicate'=>array(96,'new_template'), 'remove'=>array(21,'delete_template') ),
-            'permissions'=>array('new_template','edit_template'),
+            'actions'=>array('edit'=>array(16, 'edit_template'), 'duplicate'=>array(96, 'new_template'), 'remove'=>array(21, 'delete_template')),
+            'permissions'=>array('new_template', 'edit_template'),
             'name'=>'templatename'
         );
-        $this->types['site_tmplvars']     = array(
+        $this->types['site_tmplvars'] = array(
             'title'=>$_lang["tmplvars"],
-            'actions'=>array('edit'=>array(301,'edit_template'), 'duplicate'=>array(304,'edit_template'), 'remove'=>array(303,'edit_template')),
-            'permissions'=>array('new_template','edit_template'),
+            'actions'=>array('edit'=>array(301, 'edit_template'), 'duplicate'=>array(304, 'edit_template'), 'remove'=>array(303, 'edit_template')),
+            'permissions'=>array('new_template', 'edit_template'),
         );
         $this->types['site_htmlsnippets'] = array(
             'title'=>$_lang["manage_htmlsnippets"],
-            'actions'=>array('edit'=>array(78,'edit_chunk'), 'duplicate'=>array(97,'new_chunk'), 'remove'=>array(80,'delete_chunk')),
-            'permissions'=>array('new_chunk','edit_chunk'),
+            'actions'=>array('edit'=>array(78, 'edit_chunk'), 'duplicate'=>array(97, 'new_chunk'), 'remove'=>array(80, 'delete_chunk')),
+            'permissions'=>array('new_chunk', 'edit_chunk'),
         );
-        $this->types['site_snippets']     = array(
+        $this->types['site_snippets'] = array(
             'title'=>$_lang["manage_snippets"],
-            'actions'=>array('edit'=>array(22,'edit_snippet'), 'duplicate'=>array(98,'new_snippet'), 'remove'=>array(25,'delete_snippet')),
-            'permissions'=>array('new_snippet','edit_snippet'),
+            'actions'=>array('edit'=>array(22, 'edit_snippet'), 'duplicate'=>array(98, 'new_snippet'), 'remove'=>array(25, 'delete_snippet')),
+            'permissions'=>array('new_snippet', 'edit_snippet'),
         );
-        $this->types['site_plugins']      = array(
+        $this->types['site_plugins'] = array(
             'title'=>$_lang["manage_plugins"],
-            'actions'=>array('edit'=>array(102,'edit_plugin'), 'duplicate'=>array(105,'new_plugin'), 'remove'=>array(104,'delete_plugin')),
-            'permissions'=>array('new_plugin','edit_plugin'),
+            'actions'=>array('edit'=>array(102, 'edit_plugin'), 'duplicate'=>array(105, 'new_plugin'), 'remove'=>array(104, 'delete_plugin')),
+            'permissions'=>array('new_plugin', 'edit_plugin'),
         );
-        $this->types['site_modules']      = array(
+        $this->types['site_modules'] = array(
             'title'=>$_lang["manage_modules"],
-            'actions'=>array('edit'=>array(108,'edit_module'), 'duplicate'=>array(111,'new_module'), 'remove'=>array(110,'delete_module')),
-            'permissions'=>array('new_module','edit_module'),
+            'actions'=>array('edit'=>array(108, 'edit_module'), 'duplicate'=>array(111, 'new_module'), 'remove'=>array(110, 'delete_module')),
+            'permissions'=>array('new_module', 'edit_module'),
         );
     }
 
     /**
      * @return void
      */
-    public function queryItemsFromDB() {
-        foreach($this->types as $resourceTable=>$type) {
-            if($this->hasAnyPermissions($type['permissions'])) {
+    public function queryItemsFromDB(){
+        foreach ($this->types as $resourceTable=>$type) {
+            if ($this->hasAnyPermissions($type['permissions'])) {
                 $nameField = isset($type['name']) ? $type['name'] : 'name';
                 $this->items[$resourceTable] = $this->queryResources($resourceTable, $nameField);
             }
@@ -81,11 +81,11 @@ 
      * @param array $permissions
      * @return bool
      */
-    public function hasAnyPermissions($permissions) {
+    public function hasAnyPermissions($permissions){
         $modx = evolutionCMS();
 
-        foreach($permissions as $p)
-            if($modx->hasPermission($p)) return true;
+        foreach ($permissions as $p)
+            if ($modx->hasPermission($p)) return true;
 
         return false;
     }
@@ -95,7 +95,7 @@ 
      * @param string $nameField
      * @return array|bool
      */
-    public function queryResources($resourceTable, $nameField = 'name') {
+    public function queryResources($resourceTable, $nameField = 'name'){
         $modx = evolutionCMS(); global $_lang;
 
         $allowed = array(
@@ -104,7 +104,7 @@ 
             'site_plugins',
             'site_modules'
         );
-        $pluginsql = !empty($resourceTable) && in_array($resourceTable, $allowed) ? $resourceTable . '.disabled, ' : '';
+        $pluginsql = !empty($resourceTable) && in_array($resourceTable, $allowed) ? $resourceTable.'.disabled, ' : '';
 
         $tvsql  = '';
         $tvjoin = '';
@@ -119,14 +119,14 @@ 
 
         $rs = $modx->db->select(
             "{$sttfield} {$pluginsql} {$tvsql} {$resourceTable}.{$nameField} as name, {$resourceTable}.id, {$resourceTable}.description, {$resourceTable}.locked, {$selectableTemplates}IF(isnull(categories.category),'{$_lang['no_category']}',categories.category) as category, categories.id as catid",
-            $modx->getFullTableName($resourceTable) . " AS {$resourceTable}
-	            LEFT JOIN " . $modx->getFullTableName('categories') . " AS categories ON {$resourceTable}.category = categories.id {$tvjoin}",
+            $modx->getFullTableName($resourceTable)." AS {$resourceTable}
+	            LEFT JOIN ".$modx->getFullTableName('categories')." AS categories ON {$resourceTable}.category = categories.id {$tvjoin}",
             "",
             "category,name"
         );
         $limit = $modx->db->getRecordCount($rs);
 
-        if($limit < 1) return false;
+        if ($limit < 1) return false;
 
         $result = array();
         while ($row = $modx->db->getRow($rs)) {
@@ -138,9 +138,9 @@ 
     /**
      * @return void
      */
-    public function prepareCategoryArrays() {
-        foreach($this->items as $type=>$items) {
-            foreach((array)$items as $item) {
+    public function prepareCategoryArrays(){
+        foreach ($this->items as $type=>$items) {
+            foreach ((array) $items as $item) {
                 $catid = $item['catid'] ? $item['catid'] : 0;
                 $this->categories[$catid] = $item['category'];
 
@@ -153,8 +153,8 @@ 
         natcasesort($this->categories);
 
         // Now sort by name
-        foreach($this->itemsPerCategory as $catid=>$items) {
-            usort($this->itemsPerCategory[$catid], function ($a, $b) {
+        foreach ($this->itemsPerCategory as $catid=>$items) {
+            usort($this->itemsPerCategory[$catid], function($a, $b){
                 return strcasecmp($a['name'], $b['name']);
             });
         }

Braces +23 added lines, -12 removed lines

@@ -1,6 +1,7 @@ 
 <?php namespace EvolutionCMS\Legacy;
 
-class mgrResources {
+class mgrResources
+{
     /**
      * @var array
      */
@@ -21,7 +22,8 @@ 
     /**
      * mgrResources constructor.
      */
-    public function __construct() {
+    public function __construct()
+    {
         $this->setTypes();
         $this->queryItemsFromDB();
         $this->prepareCategoryArrays();
@@ -30,7 +32,8 @@ 
     /**
      * @return void
      */
-    public function setTypes() {
+    public function setTypes()
+    {
         global $_lang;
         $this->types['site_templates']    = array(
             'title'=>$_lang["manage_templates"],
@@ -68,7 +71,8 @@ 
     /**
      * @return void
      */
-    public function queryItemsFromDB() {
+    public function queryItemsFromDB()
+    {
         foreach($this->types as $resourceTable=>$type) {
             if($this->hasAnyPermissions($type['permissions'])) {
                 $nameField = isset($type['name']) ? $type['name'] : 'name';
@@ -81,11 +85,13 @@ 
      * @param array $permissions
      * @return bool
      */
-    public function hasAnyPermissions($permissions) {
+    public function hasAnyPermissions($permissions)
+    {
         $modx = evolutionCMS();
 
-        foreach($permissions as $p)
-            if($modx->hasPermission($p)) return true;
+        foreach($permissions as $p) {
+                    if($modx->hasPermission($p)) return true;
+        }
 
         return false;
     }
@@ -95,7 +101,8 @@ 
      * @param string $nameField
      * @return array|bool
      */
-    public function queryResources($resourceTable, $nameField = 'name') {
+    public function queryResources($resourceTable, $nameField = 'name')
+    {
         $modx = evolutionCMS(); global $_lang;
 
         $allowed = array(
@@ -112,8 +119,9 @@ 
             $tvsql    = 'site_tmplvars.caption, ';
             $tvjoin   = sprintf('LEFT JOIN %s AS stt ON site_tmplvars.id=stt.tmplvarid GROUP BY site_tmplvars.id,reltpl', $modx->getFullTableName('site_tmplvar_templates'));
             $sttfield = 'IF(stt.templateid,1,0) AS reltpl,';
+        } else {
+            $sttfield = '';
         }
-        else $sttfield = '';
 
         $selectableTemplates = $resourceTable === 'site_templates' ? "{$resourceTable}.selectable, " : "";
 
@@ -126,7 +134,9 @@ 
         );
         $limit = $modx->db->getRecordCount($rs);
 
-        if($limit < 1) return false;
+        if($limit < 1) {
+            return false;
+        }
 
         $result = array();
         while ($row = $modx->db->getRow($rs)) {
@@ -138,7 +148,8 @@ 
     /**
      * @return void
      */
-    public function prepareCategoryArrays() {
+    public function prepareCategoryArrays()
+    {
         foreach($this->items as $type=>$items) {
             foreach((array)$items as $item) {
                 $catid = $item['catid'] ? $item['catid'] : 0;
@@ -154,7 +165,7 @@ 
 
         // Now sort by name
         foreach($this->itemsPerCategory as $catid=>$items) {
-            usort($this->itemsPerCategory[$catid], function ($a, $b) {
+            usort($this->itemsPerCategory[$catid], function ($a, $b){
                 return strcasecmp($a['name'], $b['name']);
             });
         }

manager/includes/src/Legacy/TemplateParser.php

Spacing +32 added lines, -32 removed lines

@@ -8,46 +8,46 @@ 
      * @param array $data
      * @return string
      */
-    public function output($config = array(), $data = array()) {
+    public function output($config = array(), $data = array()){
         $modx = evolutionCMS();
 
         $output = '';
         $action = !empty($config['action']) ? $config['action'] : (!empty($_REQUEST['a']) ? $_REQUEST['a'] : '');
-        $tab = isset($config['tab']) ? ' AND tab IN(' . $config['tab'] . ')' : '';
+        $tab = isset($config['tab']) ? ' AND tab IN('.$config['tab'].')' : '';
 
-        if($action) {
+        if ($action) {
             $sql = $modx->db->query('SELECT t1.*, IF(t1.alias=\'\',t1.name,t1.alias) AS alias, t2.category AS category_name
-			FROM ' . $modx->getFullTableName('system_templates') . ' AS t1
-			INNER JOIN ' . $modx->getFullTableName('categories') . ' AS t2 ON t2.id=t1.category
-			WHERE t1.action IN(' . $action . ') ' . $tab . '
+			FROM ' . $modx->getFullTableName('system_templates').' AS t1
+			INNER JOIN ' . $modx->getFullTableName('categories').' AS t2 ON t2.id=t1.category
+			WHERE t1.action IN(' . $action.') '.$tab.'
 			ORDER BY t1.tab ASC, t1.rank ASC');
 
-            if($modx->db->getRecordCount($sql)) {
+            if ($modx->db->getRecordCount($sql)) {
                 $tabs = array();
-                while($row = $modx->db->getRow($sql)) {
-                    if(!$row['value'] && !empty($data[$row['name']])) {
+                while ($row = $modx->db->getRow($sql)) {
+                    if (!$row['value'] && !empty($data[$row['name']])) {
                         $row['value'] = $data[$row['name']];
                     }
                     $tabs[$row['tab']]['category_name'] = $row['category_name'];
                     $tabs[$row['tab']][$row['name']] = $this->render($row);
                 }
 
-                if(!empty($config['toArray'])) {
+                if (!empty($config['toArray'])) {
                     $output = $tabs;
                 } else {
-                    $output .= '<div class="tab-pane" id="pane_' . $action . '">';
+                    $output .= '<div class="tab-pane" id="pane_'.$action.'">';
                     $output .= '
 					<script type="text/javascript">
-						var pane_' . $action . ' = new WebFXTabPane(document.getElementById("pane_' . $action . '"), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false') . ');
+						var pane_' . $action.' = new WebFXTabPane(document.getElementById("pane_'.$action.'"), '.($modx->config['remember_last_tab'] == 1 ? 'true' : 'false').');
 					</script>';
 
-                    foreach($tabs as $idTab => $tab) {
-                        $output .= '<div class="tab-page" id="tab_' . $action . '_' . $idTab . '">';
+                    foreach ($tabs as $idTab => $tab) {
+                        $output .= '<div class="tab-page" id="tab_'.$action.'_'.$idTab.'">';
                         $output .= '
-						<h2 class="tab">' . (!empty($config['tabs'][$idTab]) ? $config['tabs'][$idTab] : $tab['category_name']) . '</h2>
-						<script type="text/javascript">pane_' . $action . '.addTabPage(document.getElementById("tab_' . $action . '_' . $idTab . '"));</script>';
+						<h2 class="tab">' . (!empty($config['tabs'][$idTab]) ? $config['tabs'][$idTab] : $tab['category_name']).'</h2>
+						<script type="text/javascript">pane_' . $action.'.addTabPage(document.getElementById("tab_'.$action.'_'.$idTab.'"));</script>';
                         unset($tab['category_name']);
-                        foreach($tab as $item) {
+                        foreach ($tab as $item) {
                             $output .= $item;
                         }
                         $output .= '</div>';
@@ -64,7 +64,7 @@ 
      * @param array $data
      * @return string
      */
-    private function render($data) {
+    private function render($data){
         $modx = evolutionCMS(); global $_lang, $_country_lang;
 
         $data['lang.name'] = (isset($_lang[$data['alias']]) ? $_lang[$data['alias']] : $data['alias']);
@@ -74,7 +74,7 @@ 
         $output = '';
         $output .= '<div class="form-group row">';
 
-        switch($data['type']) {
+        switch ($data['type']) {
 
             case 'text':
                 $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>
@@ -108,18 +108,18 @@ 
                 $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';
                 $output .= '<div class="col-sm-7">';
                 $output .= '<select name="[+name+]" class="form-control" id="[+name+]" onChange="documentDirty=true;">';
-                if($data['name'] == 'country' && isset($_country_lang)) {
+                if ($data['name'] == 'country' && isset($_country_lang)) {
                     $chosenCountry = isset($_POST['country']) ? $_POST['country'] : $data['country'];
-                    $output .= '<option value=""' . (!isset($chosenCountry) ? ' selected' : '') . '>&nbsp;</option>';
-                    foreach($_country_lang as $key => $value) {
-                        $output .= '<option value="' . $key . '"' . (isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '') . '>' . $value . '</option>';
+                    $output .= '<option value=""'.(!isset($chosenCountry) ? ' selected' : '').'>&nbsp;</option>';
+                    foreach ($_country_lang as $key => $value) {
+                        $output .= '<option value="'.$key.'"'.(isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '').'>'.$value.'</option>';
                     }
                 } else {
-                    if($data['elements']) {
+                    if ($data['elements']) {
                         $elements = explode('||', $data['elements']);
-                        foreach($elements as $key => $value) {
+                        foreach ($elements as $key => $value) {
                             $value = explode('==', $value);
-                            $output .= '<option value="' . $value[1] . '">' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]) . '</option>';
+                            $output .= '<option value="'.$value[1].'">'.(isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]).'</option>';
                         }
                     }
                 }
@@ -133,11 +133,11 @@ 
                 $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';
                 $output .= '<div class="col-sm-7">';
                 $output .= '<input type="checkbox" name="[+name+]" class="form-control" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />';
-                if($data['elements']) {
+                if ($data['elements']) {
                     $elements = explode('||', $data['elements']);
-                    foreach($elements as $key => $value) {
+                    foreach ($elements as $key => $value) {
                         $value = explode('==', $value);
-                        $output .= '<br /><input type="checkbox" name="' . $value[0] . '" class="form-control" id="' . $value[0] . '" value="' . $value[1] . '" onChange="documentDirty=true;"[+readonly+] /> ' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]);
+                        $output .= '<br /><input type="checkbox" name="'.$value[0].'" class="form-control" id="'.$value[0].'" value="'.$value[1].'" onChange="documentDirty=true;"[+readonly+] /> '.(isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]);
                     }
                 }
                 $output .= $data['content'];
@@ -149,11 +149,11 @@ 
                 $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';
                 $output .= '<div class="col-sm-7">';
                 $output .= '<input type="radio" name="[+name+]" class="form-control" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />';
-                if($data['elements']) {
+                if ($data['elements']) {
                     $elements = explode('||', $data['elements']);
-                    foreach($elements as $key => $value) {
+                    foreach ($elements as $key => $value) {
                         $value = explode('==', $value);
-                        $output .= '<br /><input type="radio" name="[+name+]" class="form-control" id="[+name+]_' . $key . '" value="' . $value[1] . '" onChange="documentDirty=true;"[+readonly+] /> ' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]);
+                        $output .= '<br /><input type="radio" name="[+name+]" class="form-control" id="[+name+]_'.$key.'" value="'.$value[1].'" onChange="documentDirty=true;"[+readonly+] /> '.(isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]);
                     }
                 }
                 $output .= $data['content'];

Braces +4 added lines, -2 removed lines

@@ -8,7 +8,8 @@ 
      * @param array $data
      * @return string
      */
-    public function output($config = array(), $data = array()) {
+    public function output($config = array(), $data = array())
+    {
         $modx = evolutionCMS();
 
         $output = '';
@@ -64,7 +65,8 @@ 
      * @param array $data
      * @return string
      */
-    private function render($data) {
+    private function render($data)
+    {
         $modx = evolutionCMS(); global $_lang, $_country_lang;
 
         $data['lang.name'] = (isset($_lang[$data['alias']]) ? $_lang[$data['alias']] : $data['alias']);

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

@@ -1,6 +1,6 @@
 <?php namespace EvolutionCMS\Legacy;
 
-Class TemplateParser
+class TemplateParser
 {
 
     /**

manager/includes/src/Legacy/ModuleCategoriesManager.php

Spacing +5 added lines, -5 removed lines

@@ -85,8 +85,8 @@ 
     {
         global $_lang, $_style;
 
-        $filename = trim($view_name) . '.tpl.phtml';
-        $file = self::get('views_dir') . $filename;
+        $filename = trim($view_name).'.tpl.phtml';
+        $file = self::get('views_dir').$filename;
         $view = &$this;
 
         if (is_file($file)
@@ -111,14 +111,14 @@ 
     {
 
         $_update = array(
-            'id'       => (int)$element_id,
-            'category' => (int)$category_id
+            'id'       => (int) $element_id,
+            'category' => (int) $category_id
         );
 
         $this->db->update(
             $_update,
             $this->db_tbl[$element],
-            "`id` = '" . (int)$element_id . "'"
+            "`id` = '".(int) $element_id."'"
         );
 
         return $this->db->getAffectedRows() === 1;