evolution-cms / evolution

manager/includes/messageCount.inc.php

Spacing +3 added lines, -3 removed lines

@@ -4,15 +4,15 @@
 }
 
 $rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_messages'),
-    "recipient=" . $modx->getLoginUserID() . " AND messageread=0");
+    "recipient=".$modx->getLoginUserID()." AND messageread=0");
 $nrnewmessages = $modx->db->getValue($rs);
-$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID());
+$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_messages'), "recipient=".$modx->getLoginUserID());
 $nrtotalmessages = $modx->db->getValue($rs);
 $messagesallowed = $modx->hasPermission('messages');
 
 // ajax response
 if (isset($_POST['updateMsgCount'])) {
     header("Content-Type: application/json; charset=utf-8");
-    print $nrnewmessages . ',' . $nrtotalmessages;
+    print $nrnewmessages.','.$nrtotalmessages;
     exit;
 }

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

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

@@ -7,7 +7,7 @@
  *

  */

 

-Class TemplateParser {

+class TemplateParser {

 

     /**

 	 * @param array $config [action, tabs, toArray]

Indentation +139 added lines, -139 removed lines

@@ -10,178 +10,178 @@
 Class TemplateParser {

 

     /**

-	 * @param array $config [action, tabs, toArray]

-	 * @param array $data

-	 * @return string

-	 */

-	public function output($config = array(), $data = array()) {

+     * @param array $config [action, tabs, toArray]

+     * @param array $data

+     * @return string

+     */

+    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'] . ')' : '';

+        $output = '';

+        $action = !empty($config['action']) ? $config['action'] : (!empty($_REQUEST['a']) ? $_REQUEST['a'] : '');

+        $tab = isset($config['tab']) ? ' AND tab IN(' . $config['tab'] . ')' : '';

 

-		if($action) {

-			$sql = $modx->db->query('SELECT t1.*, IF(t1.alias=\'\',t1.name,t1.alias) AS alias, t2.category AS category_name

+        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 . '

 			ORDER BY t1.tab ASC, t1.rank ASC');

 

-			if($modx->db->getRecordCount($sql)) {

-				$tabs = array();

-				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']] = TemplateParser::render($row);

-				}

-

-				if(!empty($config['toArray'])) {

-					$output = $tabs;

-				} else {

-					$output .= '<div class="tab-pane" id="pane_' . $action . '">';

-					$output .= '

+            if($modx->db->getRecordCount($sql)) {

+                $tabs = array();

+                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']] = TemplateParser::render($row);

+                }

+

+                if(!empty($config['toArray'])) {

+                    $output = $tabs;

+                } else {

+                    $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') . ');

 					</script>';

 

-					foreach($tabs as $idTab => $tab) {

-						$output .= '<div class="tab-page" id="tab_' . $action . '_' . $idTab . '">';

-						$output .= '

+                    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>';

-						unset($tab['category_name']);

-						foreach($tab as $item) {

-							$output .= $item;

-						}

-						$output .= '</div>';

-					}

-					$output .= '</div>';

-				}

-			}

-		}

-

-		return $output;

-	}

+                        unset($tab['category_name']);

+                        foreach($tab as $item) {

+                            $output .= $item;

+                        }

+                        $output .= '</div>';

+                    }

+                    $output .= '</div>';

+                }

+            }

+        }

+

+        return $output;

+    }

 

     /**

      * @param array $data

      * @return string

      */

-	private function render($data) {

-		$modx = evolutionCMS(); global $_lang, $_country_lang;

+    private function render($data) {

+        $modx = evolutionCMS(); global $_lang, $_country_lang;

 

-		$data['lang.name'] = (isset($_lang[$data['alias']]) ? $_lang[$data['alias']] : $data['alias']);

-		$data['value'] = (isset($_POST[$data['name']][$data['value']]) ? $_POST[$data['name']][$data['value']] : (isset($data['value']) ? $modx->htmlspecialchars($data['value']) : ''));

-		$data['readonly'] = ($data['readonly'] ? ' readonly' : '');

+        $data['lang.name'] = (isset($_lang[$data['alias']]) ? $_lang[$data['alias']] : $data['alias']);

+        $data['value'] = (isset($_POST[$data['name']][$data['value']]) ? $_POST[$data['name']][$data['value']] : (isset($data['value']) ? $modx->htmlspecialchars($data['value']) : ''));

+        $data['readonly'] = ($data['readonly'] ? ' readonly' : '');

 

-		$output = '';

-		$output .= '<div class="form-group row">';

+        $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>

+            case 'text':

+                $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>

 					<div class="col-sm-7">

 					<input type="text" name="[+name+]" class="form-control" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />';

-				$output .= $data['content'];

-				$output .= '</div>';

+                $output .= $data['content'];

+                $output .= '</div>';

 

-				break;

+                break;

 

-			case 'textarea':

-				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>

+            case 'textarea':

+                $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>

 					<div class="col-sm-7">

 					<textarea name="[+name+]" class="form-control" id="[+name+]" onChange="documentDirty=true;"[+readonly+]>[+value+]</textarea>';

-				$output .= $data['content'];

-				$output .= '</div>';

+                $output .= $data['content'];

+                $output .= '</div>';

 

-				break;

+                break;

 

-			case 'date':

-				$data['value'] = (isset($_POST[$data['name']][$data['value']]) ? $modx->toDateFormat($_POST[$data['name']][$data['value']]) : (isset($data['value']) ? $modx->toDateFormat($data['value']) : ''));

-				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>

+            case 'date':

+                $data['value'] = (isset($_POST[$data['name']][$data['value']]) ? $modx->toDateFormat($_POST[$data['name']][$data['value']]) : (isset($data['value']) ? $modx->toDateFormat($data['value']) : ''));

+                $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>

 					<div class="col-sm-7">

 					<input type="text" name="[+name+]" class="form-control DatePicker" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />';

-				$output .= $data['content'];

-				$output .= '</div>';

-

-				break;

-

-			case 'select':

-				$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)) {

-					$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>';

-					}

-				} else {

-					if($data['elements']) {

-						$elements = explode('||', $data['elements']);

-						foreach($elements as $key => $value) {

-							$value = explode('==', $value);

-							$output .= '<option value="' . $value[1] . '">' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]) . '</option>';

-						}

-					}

-				}

-				$output .= '</select>';

-				$output .= $data['content'];

-				$output .= '</div>';

-

-				break;

-

-			case 'checkbox':

-				$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']) {

-					$elements = explode('||', $data['elements']);

-					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 .= $data['content'];

-				$output .= '</div>';

-

-				break;

-

-			case 'radio':

-				$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']) {

-					$elements = explode('||', $data['elements']);

-					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 .= $data['content'];

-				$output .= '</div>';

-

-				break;

-

-			case 'custom':

-				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

-				$output .= '<div class="col-sm-7">';

-				$output .= $data['content'];

-				$output .= '</div>';

-

-				break;

-		}

-

-		$output .= '</div>';

-

-		$output = $modx->parseText($output, $data);

-

-		return $output;

-	}

+                $output .= $data['content'];

+                $output .= '</div>';

+

+                break;

+

+            case 'select':

+                $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)) {

+                    $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>';

+                    }

+                } else {

+                    if($data['elements']) {

+                        $elements = explode('||', $data['elements']);

+                        foreach($elements as $key => $value) {

+                            $value = explode('==', $value);

+                            $output .= '<option value="' . $value[1] . '">' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]) . '</option>';

+                        }

+                    }

+                }

+                $output .= '</select>';

+                $output .= $data['content'];

+                $output .= '</div>';

+

+                break;

+

+            case 'checkbox':

+                $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']) {

+                    $elements = explode('||', $data['elements']);

+                    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 .= $data['content'];

+                $output .= '</div>';

+

+                break;

+

+            case 'radio':

+                $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']) {

+                    $elements = explode('||', $data['elements']);

+                    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 .= $data['content'];

+                $output .= '</div>';

+

+                break;

+

+            case 'custom':

+                $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

+                $output .= '<div class="col-sm-7">';

+                $output .= $data['content'];

+                $output .= '</div>';

+

+                break;

+        }

+

+        $output .= '</div>';

+

+        $output = $modx->parseText($output, $data);

+

+        return $output;

+    }

 

 }

 

Spacing +33 added lines, -33 removed lines

@@ -7,53 +7,53 @@ 
  *

  */

 

-Class TemplateParser {

+Class TemplateParser{

 

     /**

 	 * @param array $config [action, tabs, toArray]

 	 * @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']] = TemplateParser::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>';

@@ -70,7 +70,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']);

@@ -80,7 +80,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>

@@ -114,18 +114,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>';

 						}

 					}

 				}

@@ -139,11 +139,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'];

@@ -155,11 +155,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 +24 added lines, -21 removed lines

@@ -7,53 +7,55 @@ 
  *

  */

 

-Class TemplateParser {

+Class TemplateParser
+{
 

     /**

 	 * @param array $config [action, tabs, toArray]

 	 * @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'] . ')' : '';

 

-		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 . '

 			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']] = TemplateParser::render($row);

 				}

 

-				if(!empty($config['toArray'])) {

+				if(!empty($config['toArray'])) {
 					$output = $tabs;

-				} else {

+				} else {
 					$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') . ');

 					</script>';

 

-					foreach($tabs as $idTab => $tab) {

+					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>';

 						unset($tab['category_name']);

-						foreach($tab as $item) {

+						foreach($tab as $item) {
 							$output .= $item;

 						}

 						$output .= '</div>';

@@ -70,7 +72,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']);

@@ -80,7 +83,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>

@@ -114,16 +117,16 @@ 
 				$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) {

+					foreach($_country_lang as $key => $value) {
 						$output .= '<option value="' . $key . '"' . (isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '') . '>' . $value . '</option>';

 					}

-				} else {

-					if($data['elements']) {

+				} else {
+					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>';

 						}

@@ -139,9 +142,9 @@ 
 				$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]);

 					}

@@ -155,9 +158,9 @@ 
 				$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]);

 					}

manager/includes/actionlist.inc.php

Indentation +129 added lines, -129 removed lines

@@ -5,133 +5,133 @@ 
 
 // action list
 $GLOBALS['action_list'] = array(
-	'1'	=> 'Loading a frame(set)',
-	'2'	=> 'Viewing home page/ online users',
-	'3'	=> 'Viewing data for resource',
-	'4'	=> 'Creating a resource',
-	'5'	=> 'Saving resource',
-	'6'	=> 'Deleting resource',
-	'7'	=> 'Waiting while MODX cleans up',
-	'8'	=> 'Logged out',
-	'9'	=> 'Viewing help',
-	'10'	=> 'Viewing/ composing messages',
-	'11'	=> 'Creating a user',
-	'12'	=> 'Editing user',
-	'13'	=> 'Viewing logging',
-	'14'	=> 'Editing a parser',
-	'15'	=> 'Saving a parser',
-	'16'	=> 'Editing template',
-	'17'	=> 'Editing settings',
-	'18'	=> 'Viewing Credits :)',
-	'19'	=> 'Creating a new template',
-	'20'	=> 'Saving template',
-	'21'	=> 'Deleting template',
-	'22'	=> 'Editing Snippet',
-	'23'	=> 'Creating a new Snippet',
-	'24'	=> 'Saving Snippet',
-	'25'	=> 'Deleting Snippet',
-	'26'	=> 'Refreshing site',
-	'27'	=> 'Editing resource',
-	'28'	=> 'Changing password',
-	'29'	=> 'Error',
-	'30'	=> 'Saving settings',
-	'31'	=> 'Using file manager',
-	'32'	=> 'Saving user',
-	'33'	=> 'Deleting user',
-	'34'	=> 'Saving new password',
-	'35'	=> 'Editing role',
-	'36'	=> 'Saving role',
-	'37'	=> 'Deleting role',
-	'38'	=> 'Creating new role',
-	'40'	=> 'Editing Access Permissions',
-	'41'	=> 'Editing Access Permissions',
-	'42'	=> 'Editing Access Permissions',
-	'43'	=> 'Editing Access Permissions',
-	'44'	=> 'Editing Access Permissions',
-	'45'	=> 'Idle',
-	'46'	=> 'Editing Access Permissions',
-	'47'	=> 'Editing Access Permissions',
-	'48'	=> 'Editing Access Permissions',
-	'49'	=> 'Editing Access Permissions',
-	'50'	=> 'Editing Access Permissions',
-	'51'	=> 'Moving resource',
-	'52'	=> 'Moved resource',
-	'53'	=> 'Viewing system info',
-	'54'	=> 'Optimizing a table',
-	'55'	=> 'Empty logs',
-	'56'	=> 'Refresh resource tree',
-	'57'	=> 'Refresh menu',
-	'58'	=> 'Logged in',
-	'59'    => 'About MODX',
-	'60'	=> 'Emptying Recycle Bin',
-	'61'	=> 'Publishing a resource',
-	'62'	=> 'Un-publishing a resource',
-	'63'	=> 'Un-deleting a resource',
-	'64'	=> 'Removing deleted content',
-	'65'	=> 'Deleting a message',
-	'66'	=> 'Sending a message',
-	'67'	=> 'Removing locks',
-	'68'	=> 'Viewing site logging',
-	'69'	=> 'Viewing online visitors',
-	'70'	=> 'Viewing site schedule',
-	'71'	=> 'Searching',
-	'72'	=> 'Adding a weblink',
-	'73'	=> 'Editing a weblink',
-		//case "74" : return "Changing personal preferences"; break;
-	'75'	=> 'User/ role management',
-	'76'	=> 'Element management',
-	'77'	=> 'Creating a new Chunk (HTML Snippet)',
-	'78'	=> 'Editing Chunk (HTML Snippet)',
-	'79'	=> 'Saving Chunk (HTML Snippet)',
-	'80'	=> 'Deleting Chunk (HTML Snippet)',
-	'83'	=> 'Exporting a resource to HTML',
-	'84'	=> 'Load Element Selector',
-	'85'	=> 'Create Folder',
-	'86'	=> 'Role management',
-	'87'	=> 'Create new web user',
-	'88'	=> 'Editing web user',
-	'89'	=> 'Saving web user',
-	'90'	=> 'Deleting web user',
-	'91'	=> 'Editing Web Access Permissions',
-	'92'	=> 'Editing Access Permissions',
-	'93'	=> 'Backup Manager',
-	'94'	=> 'Duplicate resource',
-	'95'	=> 'Importing resources from HTML',
-	'96'	=> 'Duplicate Template',
-	'97'	=> 'Duplicate Chunk (HTML Snippet)',
-	'98'	=> 'Duplicate Snippet',
-	'99'	=> 'Manage Web Users',
-	'100'	=> 'Previewing resource',
-	'101'	=> 'Create new plugin',
-	'102'	=> 'Edit plugin',
-	'103'	=> 'Saving plugin',
-	'104'	=> 'Delete plugin',
-	'105'	=> 'Duplicate plugin',
-	'106'	=> 'Viewing Modules',
-	'107'	=> 'Create new module',
-	'108'	=> 'Edit module',
-	'109'	=> 'Saving module',
-	'110'	=> 'Delete module',
-	'111'	=> 'Duplicate module',
-	'112'	=> 'Execute module',
-	'113'	=> 'Manage module dependencies',
-	'114'	=> 'View event log',
-	'115'	=> 'View event log details',
-	'116'	=> 'Delete event log',
-	'117'   => 'Editing tv rank',
-	'118'   => 'Call settings ajax include',
-	'119'   => 'Login Fail (Temporary Block)',
+    '1'	=> 'Loading a frame(set)',
+    '2'	=> 'Viewing home page/ online users',
+    '3'	=> 'Viewing data for resource',
+    '4'	=> 'Creating a resource',
+    '5'	=> 'Saving resource',
+    '6'	=> 'Deleting resource',
+    '7'	=> 'Waiting while MODX cleans up',
+    '8'	=> 'Logged out',
+    '9'	=> 'Viewing help',
+    '10'	=> 'Viewing/ composing messages',
+    '11'	=> 'Creating a user',
+    '12'	=> 'Editing user',
+    '13'	=> 'Viewing logging',
+    '14'	=> 'Editing a parser',
+    '15'	=> 'Saving a parser',
+    '16'	=> 'Editing template',
+    '17'	=> 'Editing settings',
+    '18'	=> 'Viewing Credits :)',
+    '19'	=> 'Creating a new template',
+    '20'	=> 'Saving template',
+    '21'	=> 'Deleting template',
+    '22'	=> 'Editing Snippet',
+    '23'	=> 'Creating a new Snippet',
+    '24'	=> 'Saving Snippet',
+    '25'	=> 'Deleting Snippet',
+    '26'	=> 'Refreshing site',
+    '27'	=> 'Editing resource',
+    '28'	=> 'Changing password',
+    '29'	=> 'Error',
+    '30'	=> 'Saving settings',
+    '31'	=> 'Using file manager',
+    '32'	=> 'Saving user',
+    '33'	=> 'Deleting user',
+    '34'	=> 'Saving new password',
+    '35'	=> 'Editing role',
+    '36'	=> 'Saving role',
+    '37'	=> 'Deleting role',
+    '38'	=> 'Creating new role',
+    '40'	=> 'Editing Access Permissions',
+    '41'	=> 'Editing Access Permissions',
+    '42'	=> 'Editing Access Permissions',
+    '43'	=> 'Editing Access Permissions',
+    '44'	=> 'Editing Access Permissions',
+    '45'	=> 'Idle',
+    '46'	=> 'Editing Access Permissions',
+    '47'	=> 'Editing Access Permissions',
+    '48'	=> 'Editing Access Permissions',
+    '49'	=> 'Editing Access Permissions',
+    '50'	=> 'Editing Access Permissions',
+    '51'	=> 'Moving resource',
+    '52'	=> 'Moved resource',
+    '53'	=> 'Viewing system info',
+    '54'	=> 'Optimizing a table',
+    '55'	=> 'Empty logs',
+    '56'	=> 'Refresh resource tree',
+    '57'	=> 'Refresh menu',
+    '58'	=> 'Logged in',
+    '59'    => 'About MODX',
+    '60'	=> 'Emptying Recycle Bin',
+    '61'	=> 'Publishing a resource',
+    '62'	=> 'Un-publishing a resource',
+    '63'	=> 'Un-deleting a resource',
+    '64'	=> 'Removing deleted content',
+    '65'	=> 'Deleting a message',
+    '66'	=> 'Sending a message',
+    '67'	=> 'Removing locks',
+    '68'	=> 'Viewing site logging',
+    '69'	=> 'Viewing online visitors',
+    '70'	=> 'Viewing site schedule',
+    '71'	=> 'Searching',
+    '72'	=> 'Adding a weblink',
+    '73'	=> 'Editing a weblink',
+        //case "74" : return "Changing personal preferences"; break;
+    '75'	=> 'User/ role management',
+    '76'	=> 'Element management',
+    '77'	=> 'Creating a new Chunk (HTML Snippet)',
+    '78'	=> 'Editing Chunk (HTML Snippet)',
+    '79'	=> 'Saving Chunk (HTML Snippet)',
+    '80'	=> 'Deleting Chunk (HTML Snippet)',
+    '83'	=> 'Exporting a resource to HTML',
+    '84'	=> 'Load Element Selector',
+    '85'	=> 'Create Folder',
+    '86'	=> 'Role management',
+    '87'	=> 'Create new web user',
+    '88'	=> 'Editing web user',
+    '89'	=> 'Saving web user',
+    '90'	=> 'Deleting web user',
+    '91'	=> 'Editing Web Access Permissions',
+    '92'	=> 'Editing Access Permissions',
+    '93'	=> 'Backup Manager',
+    '94'	=> 'Duplicate resource',
+    '95'	=> 'Importing resources from HTML',
+    '96'	=> 'Duplicate Template',
+    '97'	=> 'Duplicate Chunk (HTML Snippet)',
+    '98'	=> 'Duplicate Snippet',
+    '99'	=> 'Manage Web Users',
+    '100'	=> 'Previewing resource',
+    '101'	=> 'Create new plugin',
+    '102'	=> 'Edit plugin',
+    '103'	=> 'Saving plugin',
+    '104'	=> 'Delete plugin',
+    '105'	=> 'Duplicate plugin',
+    '106'	=> 'Viewing Modules',
+    '107'	=> 'Create new module',
+    '108'	=> 'Edit module',
+    '109'	=> 'Saving module',
+    '110'	=> 'Delete module',
+    '111'	=> 'Duplicate module',
+    '112'	=> 'Execute module',
+    '113'	=> 'Manage module dependencies',
+    '114'	=> 'View event log',
+    '115'	=> 'View event log details',
+    '116'	=> 'Delete event log',
+    '117'   => 'Editing tv rank',
+    '118'   => 'Call settings ajax include',
+    '119'   => 'Login Fail (Temporary Block)',
 
-	'300'	=> 'Create Template Variable',
-	'301'	=> 'Edit Template Variable',
-	'302'	=> 'Save Template Variable',
-	'303'	=> 'Delete Template Variable',
-	'304'	=> 'Duplicate Template Variable',
+    '300'	=> 'Create Template Variable',
+    '301'	=> 'Edit Template Variable',
+    '302'	=> 'Save Template Variable',
+    '303'	=> 'Delete Template Variable',
+    '304'	=> 'Duplicate Template Variable',
 
-	'200'	=> 'Viewing phpInfo()',
-	'501'   => 'Delete category',
-	'998'	=> 'Viewing web page',
-	'999'	=> 'Viewing test page',
+    '200'	=> 'Viewing phpInfo()',
+    '501'   => 'Delete category',
+    '998'	=> 'Viewing web page',
+    '999'	=> 'Viewing test page',
 );
 
 /**
@@ -140,10 +140,10 @@ 
  * @return string
  */
 function getAction($actionId, $itemid='') {
-	global $action_list;
+    global $action_list;
 
-	$ret = sprintf($action_list[$actionId], $itemid);
-	if (!$ret) $ret = "Idle (unknown)";
+    $ret = sprintf($action_list[$actionId], $itemid);
+    if (!$ret) $ret = "Idle (unknown)";
 
-	return $ret;
+    return $ret;
 }

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
@@ -139,7 +139,7 @@ 
  * @param string $itemid
  * @return string
  */
-function getAction($actionId, $itemid='') {
+function getAction($actionId, $itemid = ''){
 	global $action_list;
 
 	$ret = sprintf($action_list[$actionId], $itemid);

Braces +5 added lines, -2 removed lines

@@ -139,11 +139,14 @@
  * @param string $itemid
  * @return string
  */
-function getAction($actionId, $itemid='') {
+function getAction($actionId, $itemid='')
+{
 	global $action_list;
 
 	$ret = sprintf($action_list[$actionId], $itemid);
-	if (!$ret) $ret = "Idle (unknown)";
+	if (!$ret) {
+	    $ret = "Idle (unknown)";
+	}
 
 	return $ret;
 }

manager/includes/error.class.inc.php

Spacing +3 added lines, -3 removed lines

@@ -71,11 +71,11 @@
         }
 
         if ($context === 'common') {
-            $lang_path = MODX_MANAGER_PATH . 'includes/lang/';
+            $lang_path = MODX_MANAGER_PATH.'includes/lang/';
         } else {
-            $lang_path = MODX_MANAGER_PATH . "includes/lang/{$context}/";
+            $lang_path = MODX_MANAGER_PATH."includes/lang/{$context}/";
         }
-        include_once($lang_path . 'english.inc.php');
+        include_once($lang_path.'english.inc.php');
         $manager_language = $modx->config['manager_language'];
         if (is_file("{$lang_path}{$manager_language}.inc.php")) {
             include_once("{$lang_path}{$manager_language}.inc.php");

manager/includes/extenders/ex_dbapi.inc.php

Spacing +4 added lines, -4 removed lines

@@ -11,12 +11,12 @@
 
 $out = false;
 $class = 'DBAPI';
-if( ! class_exists($class)){
-    include_once MODX_MANAGER_PATH . 'includes/extenders/dbapi.' . $database_type . '.class.inc.php';
+if (!class_exists($class)) {
+    include_once MODX_MANAGER_PATH.'includes/extenders/dbapi.'.$database_type.'.class.inc.php';
 }
 
-if(class_exists($class)){
-    $this->db= new $class;
+if (class_exists($class)) {
+    $this->db = new $class;
     $out = true;
 }
 

Braces +5 added lines, -3 removed lines

@@ -7,15 +7,17 @@
 
 global $database_type;
 
-if (empty($database_type)) $database_type = 'mysql';
+if (empty($database_type)) {
+    $database_type = 'mysql';
+}
 
 $out = false;
 $class = 'DBAPI';
-if( ! class_exists($class)){
+if( ! class_exists($class)) {
     include_once MODX_MANAGER_PATH . 'includes/extenders/dbapi.' . $database_type . '.class.inc.php';
 }
 
-if(class_exists($class)){
+if(class_exists($class)) {
     $this->db= new $class;
     $out = true;
 }

manager/includes/extenders/ex_phpcompat.inc.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
     return true;
 }
 
-if (!include_once(MODX_MANAGER_PATH . 'includes/extenders/phpcompat.class.inc.php')) {
+if (!include_once(MODX_MANAGER_PATH.'includes/extenders/phpcompat.class.inc.php')) {
     return false;
 } else {
     $this->phpcompat = new PHPCOMPAT;

manager/includes/extenders/ex_export_site.inc.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  * Time: 14:24
  */
 
-if (include_once(MODX_MANAGER_PATH . 'includes/extenders/export.class.inc.php')) {
+if (include_once(MODX_MANAGER_PATH.'includes/extenders/export.class.inc.php')) {
     $this->export = new EXPORT_SITE;
 
     return true;

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

Braces +4 added lines, -2 removed lines

@@ -279,7 +279,8 @@ 
             $row['count'] = $this->count;
             $row['url'] = $modx->makeUrl($row['id']);
 
-            if (!$row['wasNull']) { // needs writing a document
+            if (!$row['wasNull']) {
+// needs writing a document
                 $docname = $this->getFileName($row['id'], $row['alias'], $prefix, $suffix);
                 $filename = $dirpath . $docname;
                 if (!is_file($filename)) {
@@ -307,7 +308,8 @@ 
                 $this->output[] = $this->parsePlaceholder($_lang['export_site_exporting_document'], $row);
             }
             if ($row['isfolder'] === '1' && ($modx->config['suffix_mode'] !== '1' || strpos($row['alias'],
-                        '.') === false)) { // needs making a folder
+                        '.') === false)) {
+// needs making a folder
                 $end_dir = ($row['alias'] !== '') ? $row['alias'] : $row['id'];
                 $dir_path = $dirpath . $end_dir;
                 if (strpos($dir_path, MODX_BASE_PATH) === false) {

Spacing +14 added lines, -14 removed lines

@@ -57,7 +57,7 @@ 
         $this->count = 0;
         $this->setUrlMode();
         $this->generate_mode = 'crawl';
-        $this->targetDir = $modx->config['base_path'] . 'temp/export';
+        $this->targetDir = $modx->config['base_path'].'temp/export';
         if (!isset($this->total)) {
             $this->getTotal();
         }
@@ -112,7 +112,7 @@ 
 
         $ignore_ids = array_filter(array_map('intval', explode(',', $ignore_ids)));
         if (count($ignore_ids) > 0) {
-            $ignore_ids = "AND NOT id IN ('" . implode("','", $ignore_ids) . "')";
+            $ignore_ids = "AND NOT id IN ('".implode("','", $ignore_ids)."')";
         } else {
             $ignore_ids = '';
         }
@@ -122,7 +122,7 @@ 
         $noncache = ($noncache == 1) ? '' : 'AND cacheable=1';
         $where = "deleted=0 AND ((published=1 AND type='document') OR (isfolder=1)) {$noncache} {$ignore_ids}";
         $rs = $modx->db->select('count(id)', $tbl_site_content, $where);
-        $this->total = (int)$modx->db->getValue($rs);
+        $this->total = (int) $modx->db->getValue($rs);
 
         return $this->total;
     }
@@ -151,7 +151,7 @@ 
         } elseif (!is_readable($directory)) {
             return $rs;
         } else {
-            $files = glob($directory . '/*');
+            $files = glob($directory.'/*');
             if (!empty($files)) {
                 foreach ($files as $path) {
                     $rs = is_dir($path) ? $this->removeDirectoryAll($path) : unlink($path);
@@ -180,7 +180,7 @@ 
 
             $_lang = $back_lang;
         } else {
-            $src = $this->curl_get_contents(MODX_SITE_URL . "index.php?id={$docid}");
+            $src = $this->curl_get_contents(MODX_SITE_URL."index.php?id={$docid}");
         }
 
 
@@ -215,12 +215,12 @@ 
         $modx = evolutionCMS();
 
         if ($alias === '') {
-            $filename = $prefix . $docid . $suffix;
+            $filename = $prefix.$docid.$suffix;
         } else {
             if ($modx->config['suffix_mode'] === '1' && strpos($alias, '.') !== false) {
                 $suffix = '';
             }
-            $filename = $prefix . $alias . $suffix;
+            $filename = $prefix.$alias.$suffix;
         }
 
         return $filename;
@@ -238,7 +238,7 @@ 
         $tbl_site_content = $modx->getFullTableName('site_content');
 
         $ignore_ids = $this->ignore_ids;
-        $dirpath = $this->targetDir . '/';
+        $dirpath = $this->targetDir.'/';
 
         $prefix = $modx->config['friendly_url_prefix'];
         $suffix = $modx->config['friendly_url_suffix'];
@@ -248,7 +248,7 @@ 
 
         $ph['status'] = 'fail';
         $ph['msg1'] = $_lang['export_site_failed'];
-        $ph['msg2'] = $_lang["export_site_failed_no_write"] . ' - ' . $dirpath;
+        $ph['msg2'] = $_lang["export_site_failed_no_write"].' - '.$dirpath;
         $msg_failed_no_write = $this->parsePlaceholder($tpl, $ph);
 
         $ph['msg2'] = $_lang["export_site_failed_no_retrieve"];
@@ -281,7 +281,7 @@ 
 
             if (!$row['wasNull']) { // needs writing a document
                 $docname = $this->getFileName($row['id'], $row['alias'], $prefix, $suffix);
-                $filename = $dirpath . $docname;
+                $filename = $dirpath.$docname;
                 if (!is_file($filename)) {
                     if ($row['published'] === '1') {
                         $status = $this->makeFile($row['id'], $filename);
@@ -309,7 +309,7 @@ 
             if ($row['isfolder'] === '1' && ($modx->config['suffix_mode'] !== '1' || strpos($row['alias'],
                         '.') === false)) { // needs making a folder
                 $end_dir = ($row['alias'] !== '') ? $row['alias'] : $row['id'];
-                $dir_path = $dirpath . $end_dir;
+                $dir_path = $dirpath.$end_dir;
                 if (strpos($dir_path, MODX_BASE_PATH) === false) {
                     return false;
                 }
@@ -325,7 +325,7 @@ 
 
                 if ($modx->config['make_folders'] === '1' && $row['published'] === '1') {
                     if (!empty($filename) && is_file($filename)) {
-                        rename($filename, $dir_path . '/index.html');
+                        rename($filename, $dir_path.'/index.html');
                     }
                 }
                 $this->targetDir = $dir_path;
@@ -349,8 +349,8 @@ 
 
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $url);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);    // 0 = DO NOT VERIFY AUTHENTICITY OF SSL-CERT
-        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);    // 2 = CERT MUST INDICATE BEING CONNECTED TO RIGHT SERVER
+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0); // 0 = DO NOT VERIFY AUTHENTICITY OF SSL-CERT
+        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2); // 2 = CERT MUST INDICATE BEING CONNECTED TO RIGHT SERVER
         curl_setopt($ch, CURLOPT_HEADER, false);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);

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

Braces +3 added lines, -2 removed lines

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

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

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

Doc Comments +9 added lines, -9 removed lines

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

Spacing +32 added lines, -32 removed lines

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