evolution-cms / evolution

manager/includes/active_user_locks.php

Indentation +1 added lines, -1 removed lines

@@ -21,5 +21,5 @@
 if($ok) {
     echo '{status:"ok"}';
 } else {
-  echo '{status:"null"}';
+    echo '{status:"null"}';
 }

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

Indentation +151 added lines, -151 removed lines

@@ -9,178 +9,178 @@
 

 Class TemplateParser {

 

-	function __construct() {

-	}

-

-	/**

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

-	 * @param array $data

-	 * @return string

-	 */

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

-		global $modx;

-

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

+    function __construct() {

+    }

+

+    /**

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

+     * @param array $data

+     * @return string

+     */

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

+        global $modx;

+

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

 			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;

-	}

-

-	private function render($data) {

-		global $modx, $_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' : '');

-

-		$output = '';

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

-

-		switch($data['type']) {

-

-			case 'text':

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

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

+                        foreach($tab as $item) {

+                            $output .= $item;

+                        }

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

+                    }

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

+                }

+            }

+        }

+

+        return $output;

+    }

+

+    private function render($data) {

+        global $modx, $_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' : '');

+

+        $output = '';

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

+

+        switch($data['type']) {

+

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

+    }

 

 }

 

manager/includes/debug.inc.php

Indentation +3 added lines, -3 removed lines

@@ -3,7 +3,7 @@ 
 
 // show debug information
 if(isset($enable_debug) && $enable_debug==true) {
-	?>
+    ?>
 	<script language="javascript">
 	//document.onload = removeDebug();
 	
@@ -33,8 +33,8 @@ 
 	}
 	</style>
 	<?php
-	$mtime = microtime(); $mtime = explode(" ",$mtime); $mtime = $mtime[1] + $mtime[0]; $tend = $mtime; $totaltime = ($tend - $tstart);
-	?>
+    $mtime = microtime(); $mtime = explode(" ",$mtime); $mtime = $mtime[1] + $mtime[0]; $tend = $mtime; $totaltime = ($tend - $tstart);
+    ?>
 	<div class='debug' id='debug' name='debug' onClick="removeDebugDiv();">
 		<table border="0" cellspacing="0" cellpadding="0">
 		  <tr>

manager/includes/settings.inc.php

Indentation +4 added lines, -4 removed lines

@@ -5,10 +5,10 @@
 $settings = array();
 if ($modx && count($modx->config)>0) $settings = $modx->config;
 else{
-	$rs = $modx->db->select('setting_name, setting_value', $modx->getFullTableName('system_settings'));
-	while ($row = $modx->db->getRow($rs)) {
-		$settings[$row['setting_name']] = $row['setting_value'];
-	}
+    $rs = $modx->db->select('setting_name, setting_value', $modx->getFullTableName('system_settings'));
+    while ($row = $modx->db->getRow($rs)) {
+        $settings[$row['setting_name']] = $row['setting_value'];
+    }
 }
 
 extract($settings, EXTR_OVERWRITE);

manager/includes/session_keepalive.php

Indentation +3 added lines, -3 removed lines

@@ -12,13 +12,13 @@
 $modx->invokeEvent('OnManagerPageInit');
 $ok = false;
 if(isset($_SESSION['mgrToken']) && $_GET['tok'] == $_SESSION['mgrToken']) {
-  $ok = true;
-  $modx->updateValidatedUserSession();
+    $ok = true;
+    $modx->updateValidatedUserSession();
 }
 
 header('Content-type: application/json');
 if($ok) {
     echo '{"status":"ok"}';
 } else {
-  echo '{"status":"null"}';
+    echo '{"status":"null"}';
 }

manager/includes/header.inc.php

Indentation +4 added lines, -4 removed lines

@@ -363,10 +363,10 @@
         stopWorker();

 

           <?php

-          if (isset($_REQUEST['r']) && preg_match('@^[0-9]+$@', $_REQUEST['r'])) {

-              echo 'doRefresh(' . $_REQUEST['r'] . ");\n";

-          }

-          ?>

+            if (isset($_REQUEST['r']) && preg_match('@^[0-9]+$@', $_REQUEST['r'])) {

+                echo 'doRefresh(' . $_REQUEST['r'] . ");\n";

+            }

+            ?>

 

         var actionButtons = document.getElementById('actions'), actionSelect = document.getElementById('stay');

         if (actionButtons !== null && actionSelect !== null) {

manager/includes/extenders/message.quit.inc.php

Indentation +34 added lines, -34 removed lines

@@ -19,60 +19,60 @@
 </head><body>
 ";
 if($is_error) {
-	$parsedMessageString .= "<h3 style='color:red;background:#e0e0e0;padding:2px;'>&nbsp;MODX Parse Error </h3>
+    $parsedMessageString .= "<h3 style='color:red;background:#e0e0e0;padding:2px;'>&nbsp;MODX Parse Error </h3>
 	<table border='0' cellpadding='1' cellspacing='0'>
 	<tr><td colspan='3'>MODX encountered the following error while attempting to parse the requested resource:</td></tr>
 	<tr><td colspan='3'><b style='color:red;'>&laquo; $msg &raquo;</b></td></tr>";
 } else {
-	$parsedMessageString .= "<h3 style='color:#003399; background:#eeeeee;padding:2px;'>&nbsp;MODX Debug/ stop message </h3>
+    $parsedMessageString .= "<h3 style='color:#003399; background:#eeeeee;padding:2px;'>&nbsp;MODX Debug/ stop message </h3>
 	<table border='0' cellpadding='1' cellspacing='0'>
 	<tr><td colspan='3'>The MODX parser recieved the following debug/ stop message:</td></tr>
 	<tr><td colspan='3'><b style='color:#003399;'>&laquo; $msg &raquo;</b></td></tr>";
 }
 
 if(!empty($query)) {
-	$parsedMessageString .= "<tr><td colspan='3'><hr size='1' width='98%' style='color:#e0e0e0'/><b style='color:#999;font-size: 9px;border-left:1px solid #c0c0c0; margin-left:10px;'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;SQL:&nbsp;<span id='sqlHolder'>$query</span></b><hr size='1' width='98%' style='color:#e0e0e0'/>
+    $parsedMessageString .= "<tr><td colspan='3'><hr size='1' width='98%' style='color:#e0e0e0'/><b style='color:#999;font-size: 9px;border-left:1px solid #c0c0c0; margin-left:10px;'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;SQL:&nbsp;<span id='sqlHolder'>$query</span></b><hr size='1' width='98%' style='color:#e0e0e0'/>
 	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href='javascript:copyToClip();' style='color:#821517;font-size: 9px; text-decoration: none'>[Copy SQL to ClipBoard]</a><textarea id='holdtext' style='display:none;'></textarea></td></tr>";
 }
 
 if($text!='') {
 
-	$errortype = array (
-		E_ERROR          => "Error",
-		E_WARNING        => "Warning",
-		E_PARSE          => "Parsing Error",
-		E_NOTICE          => "Notice",
-		E_CORE_ERROR      => "Core Error",
-		E_CORE_WARNING    => "Core Warning",
-		E_COMPILE_ERROR  => "Compile Error",
-		E_COMPILE_WARNING => "Compile Warning",
-		E_USER_ERROR      => "User Error",
-		E_USER_WARNING    => "User Warning",
-		E_USER_NOTICE    => "User Notice",
-	);
+    $errortype = array (
+        E_ERROR          => "Error",
+        E_WARNING        => "Warning",
+        E_PARSE          => "Parsing Error",
+        E_NOTICE          => "Notice",
+        E_CORE_ERROR      => "Core Error",
+        E_CORE_WARNING    => "Core Warning",
+        E_COMPILE_ERROR  => "Compile Error",
+        E_COMPILE_WARNING => "Compile Warning",
+        E_USER_ERROR      => "User Error",
+        E_USER_WARNING    => "User Warning",
+        E_USER_NOTICE    => "User Notice",
+    );
 
-	$parsedMessageString .= "<tr><td>&nbsp;</td></tr><tr><td colspan='3'><b>PHP error debug</b></td></tr>";
+    $parsedMessageString .= "<tr><td>&nbsp;</td></tr><tr><td colspan='3'><b>PHP error debug</b></td></tr>";
 
-	$parsedMessageString .= "<tr><td valign='top'>&nbsp;&nbsp;Error: </td>";
-	$parsedMessageString .= "<td colspan='2'>$text</td><td>&nbsp;</td>";
-	$parsedMessageString .= "</tr>";
+    $parsedMessageString .= "<tr><td valign='top'>&nbsp;&nbsp;Error: </td>";
+    $parsedMessageString .= "<td colspan='2'>$text</td><td>&nbsp;</td>";
+    $parsedMessageString .= "</tr>";
 
-	$parsedMessageString .= "<tr><td valign='top'>&nbsp;&nbsp;Error type/ Nr.: </td>";
-	$parsedMessageString .= "<td colspan='2'>".$errortype[$nr]." - $nr</b></td><td>&nbsp;</td>";
-	$parsedMessageString .= "</tr>";
+    $parsedMessageString .= "<tr><td valign='top'>&nbsp;&nbsp;Error type/ Nr.: </td>";
+    $parsedMessageString .= "<td colspan='2'>".$errortype[$nr]." - $nr</b></td><td>&nbsp;</td>";
+    $parsedMessageString .= "</tr>";
 
-	$parsedMessageString .= "<tr><td>&nbsp;&nbsp;File: </td>";
-	$parsedMessageString .= "<td colspan='2'>$file</td><td>&nbsp;</td>";
-	$parsedMessageString .= "</tr>";
+    $parsedMessageString .= "<tr><td>&nbsp;&nbsp;File: </td>";
+    $parsedMessageString .= "<td colspan='2'>$file</td><td>&nbsp;</td>";
+    $parsedMessageString .= "</tr>";
 
-	$parsedMessageString .= "<tr><td>&nbsp;&nbsp;Line: </td>";
-	$parsedMessageString .= "<td colspan='2'>$line</td><td>&nbsp;</td>";
-	$parsedMessageString .= "</tr>";
-	if($source!='') {
-		$parsedMessageString .= "<tr><td valign='top'>&nbsp;&nbsp;Line $line source: </td>";
-		$parsedMessageString .= "<td colspan='2'>$source</td><td>&nbsp;</td>";
-		$parsedMessageString .= "</tr>";
-	}
+    $parsedMessageString .= "<tr><td>&nbsp;&nbsp;Line: </td>";
+    $parsedMessageString .= "<td colspan='2'>$line</td><td>&nbsp;</td>";
+    $parsedMessageString .= "</tr>";
+    if($source!='') {
+        $parsedMessageString .= "<tr><td valign='top'>&nbsp;&nbsp;Line $line source: </td>";
+        $parsedMessageString .= "<td colspan='2'>$source</td><td>&nbsp;</td>";
+        $parsedMessageString .= "</tr>";
+    }
 }
 
 $parsedMessageString .= "<tr><td>&nbsp;</td></tr><tr><td colspan='3'><b>Parser timing</b></td></tr>";

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

Indentation +183 added lines, -183 removed lines

@@ -10,215 +10,215 @@
 // Content manager wrapper class
 class ManagerAPI {
 	
-	var $action; // action directive
+    var $action; // action directive
 
-	function __construct(){
-		global $action;
-		$this->action = $action; // set action directive
-	}
+    function __construct(){
+        global $action;
+        $this->action = $action; // set action directive
+    }
 	
-	function initPageViewState($id=0){
-		global $_PAGE;
-		$vsid = isset($_SESSION["mgrPageViewSID"]) ? $_SESSION["mgrPageViewSID"] : '';
-		if($vsid!=$this->action) {
-			$_SESSION["mgrPageViewSDATA"] = array(); // new view state
-			$_SESSION["mgrPageViewSID"] = $id>0 ? $id:$this->action; // set id
-		}
-		$_PAGE['vs'] = &$_SESSION["mgrPageViewSDATA"]; // restore viewstate
-	}
+    function initPageViewState($id=0){
+        global $_PAGE;
+        $vsid = isset($_SESSION["mgrPageViewSID"]) ? $_SESSION["mgrPageViewSID"] : '';
+        if($vsid!=$this->action) {
+            $_SESSION["mgrPageViewSDATA"] = array(); // new view state
+            $_SESSION["mgrPageViewSID"] = $id>0 ? $id:$this->action; // set id
+        }
+        $_PAGE['vs'] = &$_SESSION["mgrPageViewSDATA"]; // restore viewstate
+    }
 
-	// save page view state - not really necessary,
-	function savePageViewState($id=0){
-		global $_PAGE;
-		$_SESSION["mgrPageViewSDATA"] = $_PAGE['vs'];
-		$_SESSION["mgrPageViewSID"] = $id>0 ? $id:$this->action;
-	}
+    // save page view state - not really necessary,
+    function savePageViewState($id=0){
+        global $_PAGE;
+        $_SESSION["mgrPageViewSDATA"] = $_PAGE['vs'];
+        $_SESSION["mgrPageViewSID"] = $id>0 ? $id:$this->action;
+    }
 	
-	// check for saved form
-	function hasFormValues() {
-		if(isset($_SESSION["mgrFormValueId"])) {		
-			if($this->action==$_SESSION["mgrFormValueId"]) {
-				return true;
-			}
-			else {
-				$this->clearSavedFormValues();
-			}
-		}
-		return false;
-	}	
-	// saved form post from $_POST
-	function saveFormValues($id=0){
-		$_SESSION["mgrFormValues"] = $_POST;
-		$_SESSION["mgrFormValueId"] = $id>0 ? $id:$this->action;
-	}		
-	// load saved form values into $_POST
-	function loadFormValues(){
+    // check for saved form
+    function hasFormValues() {
+        if(isset($_SESSION["mgrFormValueId"])) {		
+            if($this->action==$_SESSION["mgrFormValueId"]) {
+                return true;
+            }
+            else {
+                $this->clearSavedFormValues();
+            }
+        }
+        return false;
+    }	
+    // saved form post from $_POST
+    function saveFormValues($id=0){
+        $_SESSION["mgrFormValues"] = $_POST;
+        $_SESSION["mgrFormValueId"] = $id>0 ? $id:$this->action;
+    }		
+    // load saved form values into $_POST
+    function loadFormValues(){
 		
-		if(!$this->hasFormValues()) return false;
+        if(!$this->hasFormValues()) return false;
 		
-		$p = $_SESSION["mgrFormValues"];
-		$this->clearSavedFormValues();
-		foreach($p as $k=>$v) {
-			$_POST[$k]=$v;
-		}
-		return true;
-	}
-	// clear form post
-	function clearSavedFormValues(){
-		unset($_SESSION["mgrFormValues"]);
-		unset($_SESSION["mgrFormValueId"]);	
-	}
+        $p = $_SESSION["mgrFormValues"];
+        $this->clearSavedFormValues();
+        foreach($p as $k=>$v) {
+            $_POST[$k]=$v;
+        }
+        return true;
+    }
+    // clear form post
+    function clearSavedFormValues(){
+        unset($_SESSION["mgrFormValues"]);
+        unset($_SESSION["mgrFormValueId"]);	
+    }
 	
-	function getHashType($db_value='') { // md5 | v1 | phpass
-		$c = substr($db_value,0,1);
-		if($c==='$')                                      return 'phpass';
-		elseif(strlen($db_value)===32)                    return 'md5';
-		elseif($c!=='$' && strpos($db_value,'>')!==false) return 'v1';
-		else                                              return 'unknown';
-	}
+    function getHashType($db_value='') { // md5 | v1 | phpass
+        $c = substr($db_value,0,1);
+        if($c==='$')                                      return 'phpass';
+        elseif(strlen($db_value)===32)                    return 'md5';
+        elseif($c!=='$' && strpos($db_value,'>')!==false) return 'v1';
+        else                                              return 'unknown';
+    }
 	
-	function genV1Hash($password, $seed='1')
-	{ // $seed is user_id basically
-		global $modx;
+    function genV1Hash($password, $seed='1')
+    { // $seed is user_id basically
+        global $modx;
 		
-		if(isset($modx->config['pwd_hash_algo']) && !empty($modx->config['pwd_hash_algo']))
-			$algorithm = $modx->config['pwd_hash_algo'];
-		else $algorithm = 'UNCRYPT';
+        if(isset($modx->config['pwd_hash_algo']) && !empty($modx->config['pwd_hash_algo']))
+            $algorithm = $modx->config['pwd_hash_algo'];
+        else $algorithm = 'UNCRYPT';
 		
-		$salt = md5($password . $seed);
+        $salt = md5($password . $seed);
 		
-		switch($algorithm)
-		{
-			case 'BLOWFISH_Y':
-				$salt = '$2y$07$' . substr($salt,0,22);
-				break;
-			case 'BLOWFISH_A':
-				$salt = '$2a$07$' . substr($salt,0,22);
-				break;
-			case 'SHA512':
-				$salt = '$6$' . substr($salt,0,16);
-				break;
-			case 'SHA256':
-				$salt = '$5$' . substr($salt,0,16);
-				break;
-			case 'MD5':
-				$salt = '$1$' . substr($salt,0,8);
-				break;
-		}
+        switch($algorithm)
+        {
+            case 'BLOWFISH_Y':
+                $salt = '$2y$07$' . substr($salt,0,22);
+                break;
+            case 'BLOWFISH_A':
+                $salt = '$2a$07$' . substr($salt,0,22);
+                break;
+            case 'SHA512':
+                $salt = '$6$' . substr($salt,0,16);
+                break;
+            case 'SHA256':
+                $salt = '$5$' . substr($salt,0,16);
+                break;
+            case 'MD5':
+                $salt = '$1$' . substr($salt,0,8);
+                break;
+        }
 		
-		if($algorithm!=='UNCRYPT')
-		{
-			$password = sha1($password) . crypt($password,$salt);
-		}
-		else $password = sha1($salt.$password);
+        if($algorithm!=='UNCRYPT')
+        {
+            $password = sha1($password) . crypt($password,$salt);
+        }
+        else $password = sha1($salt.$password);
 		
-		$result = strtolower($algorithm) . '>' . md5($salt.$password) . substr(md5($salt),0,8);
+        $result = strtolower($algorithm) . '>' . md5($salt.$password) . substr(md5($salt),0,8);
 		
-		return $result;
-	}
+        return $result;
+    }
 	
-	function getV1UserHashAlgorithm($uid)
-	{
-		global $modx;
-		$tbl_manager_users = $modx->getFullTableName('manager_users');
-		$rs = $modx->db->select('password',$tbl_manager_users,"id='{$uid}'");
-		$password = $modx->db->getValue($rs);
+    function getV1UserHashAlgorithm($uid)
+    {
+        global $modx;
+        $tbl_manager_users = $modx->getFullTableName('manager_users');
+        $rs = $modx->db->select('password',$tbl_manager_users,"id='{$uid}'");
+        $password = $modx->db->getValue($rs);
 		
-		if(strpos($password,'>')===false) $algo = 'NOSALT';
-		else
-		{
-			$algo = substr($password,0,strpos($password,'>'));
-		}
-		return strtoupper($algo);
-	}
+        if(strpos($password,'>')===false) $algo = 'NOSALT';
+        else
+        {
+            $algo = substr($password,0,strpos($password,'>'));
+        }
+        return strtoupper($algo);
+    }
 	
-	function checkHashAlgorithm($algorithm='')
-	{
-		$result = false;
-		if (!empty($algorithm))
-		{
-			switch ($algorithm)
-			{
-				case 'BLOWFISH_Y':
-					if (defined('CRYPT_BLOWFISH') && CRYPT_BLOWFISH == 1)
-					{
-						if (version_compare('5.3.7', PHP_VERSION) <= 0) $result = true;
-					}
-					break;
-				case 'BLOWFISH_A':
-					if (defined('CRYPT_BLOWFISH') && CRYPT_BLOWFISH == 1) $result = true;
-					break;
-				case 'SHA512':
-					if (defined('CRYPT_SHA512') && CRYPT_SHA512 == 1) $result = true;
-					break;
-				case 'SHA256':
-					if (defined('CRYPT_SHA256') && CRYPT_SHA256 == 1) $result = true;
-					break;
-				case 'MD5':
-					if (defined('CRYPT_MD5') && CRYPT_MD5 == 1 && PHP_VERSION != '5.3.7') $result = true;
-					break;
-				case 'UNCRYPT':
-					$result = true;
-					break;
-			}
-		}
-		return $result;
-	}
+    function checkHashAlgorithm($algorithm='')
+    {
+        $result = false;
+        if (!empty($algorithm))
+        {
+            switch ($algorithm)
+            {
+                case 'BLOWFISH_Y':
+                    if (defined('CRYPT_BLOWFISH') && CRYPT_BLOWFISH == 1)
+                    {
+                        if (version_compare('5.3.7', PHP_VERSION) <= 0) $result = true;
+                    }
+                    break;
+                case 'BLOWFISH_A':
+                    if (defined('CRYPT_BLOWFISH') && CRYPT_BLOWFISH == 1) $result = true;
+                    break;
+                case 'SHA512':
+                    if (defined('CRYPT_SHA512') && CRYPT_SHA512 == 1) $result = true;
+                    break;
+                case 'SHA256':
+                    if (defined('CRYPT_SHA256') && CRYPT_SHA256 == 1) $result = true;
+                    break;
+                case 'MD5':
+                    if (defined('CRYPT_MD5') && CRYPT_MD5 == 1 && PHP_VERSION != '5.3.7') $result = true;
+                    break;
+                case 'UNCRYPT':
+                    $result = true;
+                    break;
+            }
+        }
+        return $result;
+    }
 
-	function getSystemChecksum($check_files) {
-		$_ = array();
-		$check_files = trim($check_files);
-		$check_files = explode("\n", $check_files);
-		foreach($check_files as $file) {
-			$file = trim($file);
-			$file = MODX_BASE_PATH . $file;
-			if(!is_file($file)) continue;
-			$_[$file]= md5_file($file);
-		}
-		return serialize($_);
-	}
+    function getSystemChecksum($check_files) {
+        $_ = array();
+        $check_files = trim($check_files);
+        $check_files = explode("\n", $check_files);
+        foreach($check_files as $file) {
+            $file = trim($file);
+            $file = MODX_BASE_PATH . $file;
+            if(!is_file($file)) continue;
+            $_[$file]= md5_file($file);
+        }
+        return serialize($_);
+    }
 
-	function getModifiedSystemFilesList($check_files, $checksum) {
-		$_ = array();
-		$check_files = trim($check_files);
-		$check_files = explode("\n", $check_files);
-		$checksum = unserialize($checksum);
-		foreach($check_files as $file) {
-			$file = trim($file);
-			$filePath = MODX_BASE_PATH . $file;
-			if(!is_file($filePath)) continue;
-			if(md5_file($filePath) != $checksum[$filePath]) $_[] = $file;
-		}
-		return $_;
-	}
+    function getModifiedSystemFilesList($check_files, $checksum) {
+        $_ = array();
+        $check_files = trim($check_files);
+        $check_files = explode("\n", $check_files);
+        $checksum = unserialize($checksum);
+        foreach($check_files as $file) {
+            $file = trim($file);
+            $filePath = MODX_BASE_PATH . $file;
+            if(!is_file($filePath)) continue;
+            if(md5_file($filePath) != $checksum[$filePath]) $_[] = $file;
+        }
+        return $_;
+    }
 
-	function setSystemChecksum($checksum) {
-		global $modx;
-		$tbl_system_settings = $modx->getFullTableName('system_settings');
-		$sql = "REPLACE INTO {$tbl_system_settings} (setting_name, setting_value) VALUES ('sys_files_checksum','" . $modx->db->escape($checksum) . "')";
+    function setSystemChecksum($checksum) {
+        global $modx;
+        $tbl_system_settings = $modx->getFullTableName('system_settings');
+        $sql = "REPLACE INTO {$tbl_system_settings} (setting_name, setting_value) VALUES ('sys_files_checksum','" . $modx->db->escape($checksum) . "')";
         $modx->db->query($sql);
-	}
+    }
 	
-	function checkSystemChecksum() {
-		global $modx;
+    function checkSystemChecksum() {
+        global $modx;
 
-		if(!isset($modx->config['check_files_onlogin']) || empty($modx->config['check_files_onlogin'])) return '0';
+        if(!isset($modx->config['check_files_onlogin']) || empty($modx->config['check_files_onlogin'])) return '0';
 		
-		$current = $this->getSystemChecksum($modx->config['check_files_onlogin']);
-		if(empty($current)) return '0';
+        $current = $this->getSystemChecksum($modx->config['check_files_onlogin']);
+        if(empty($current)) return '0';
 		
-		if(!isset($modx->config['sys_files_checksum']) || empty($modx->config['sys_files_checksum']))
-		{
-			$this->setSystemChecksum($current);
-			return '0';
-		}
-		if($current===$modx->config['sys_files_checksum']) $result = '0';
-		else {
-			$result = $this->getModifiedSystemFilesList($modx->config['check_files_onlogin'], $modx->config['sys_files_checksum']);
-		} 
+        if(!isset($modx->config['sys_files_checksum']) || empty($modx->config['sys_files_checksum']))
+        {
+            $this->setSystemChecksum($current);
+            return '0';
+        }
+        if($current===$modx->config['sys_files_checksum']) $result = '0';
+        else {
+            $result = $this->getModifiedSystemFilesList($modx->config['check_files_onlogin'], $modx->config['sys_files_checksum']);
+        } 
 
-		return $result;
-	}
+        return $result;
+    }
 
     function getLastUserSetting($key=false) {
         global $modx;

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

Indentation +16 added lines, -16 removed lines

@@ -2,26 +2,26 @@
 // todo file_put_contents(), strftime(), mb_*()
 class PHPCOMPAT
 {
-	function __construct()
-	{
-	}
+    function __construct()
+    {
+    }
 	
-	function htmlspecialchars($str='', $flags = ENT_COMPAT, $encode='')
-	{
-		global $modx;
+    function htmlspecialchars($str='', $flags = ENT_COMPAT, $encode='')
+    {
+        global $modx;
 		
-		if($str=='') return '';
+        if($str=='') return '';
 		
-		if($encode=='') $encode = $modx->config['modx_charset'];
+        if($encode=='') $encode = $modx->config['modx_charset'];
 		
-		$ent_str = htmlspecialchars($str, $flags, $encode);
+        $ent_str = htmlspecialchars($str, $flags, $encode);
 		
-		if(!empty($str) && empty($ent_str))
-		{
-			$detect_order = implode(',', mb_detect_order());
-			$ent_str = mb_convert_encoding($str, $encode, $detect_order); 
-		}
+        if(!empty($str) && empty($ent_str))
+        {
+            $detect_order = implode(',', mb_detect_order());
+            $ent_str = mb_convert_encoding($str, $encode, $detect_order); 
+        }
 		
-		return $ent_str;
-	}
+        return $ent_str;
+    }
 }