evolution-cms / evolution

manager/includes/tmplvars.inc.php

Indentation +250 added lines, -250 removed lines

@@ -1,159 +1,159 @@ 
 <?php
 // DISPLAY FORM ELEMENTS
 function renderFormElement($field_type, $field_id, $default_text = '', $field_elements = '', $field_value = '', $field_style = '', $row = array(), $tvsArray = array()) {
-	global $modx;
-	global $_style;
-	global $_lang;
-	global $content;
-	global $which_browser;
+    global $modx;
+    global $_style;
+    global $_lang;
+    global $content;
+    global $which_browser;
 
-	if(substr($default_text, 0, 6) === '@@EVAL' && $field_value === $default_text) {
-		$eval_str = trim(substr($default_text, 7));
-		$default_text = eval($eval_str);
-		$field_value = $default_text;
-	}
+    if(substr($default_text, 0, 6) === '@@EVAL' && $field_value === $default_text) {
+        $eval_str = trim(substr($default_text, 7));
+        $default_text = eval($eval_str);
+        $field_value = $default_text;
+    }
 
-	$field_html = '';
-	$cimode = strpos($field_type, ':');
-	if($cimode === false) {
-		switch($field_type) {
+    $field_html = '';
+    $cimode = strpos($field_type, ':');
+    if($cimode === false) {
+        switch($field_type) {
 
-			case "text": // handler for regular text boxes
-			case "rawtext"; // non-htmlentity converted text boxes
-				$field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' tvtype="' . $field_type . '" onchange="documentDirty=true;" style="width:100%" />';
-				break;
-			case "email": // handles email input fields
-				$field_html .= '<input type="email" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' tvtype="' . $field_type . '" onchange="documentDirty=true;" style="width:100%"/>';
-				break;
-			case "number": // handles the input of numbers
-				$field_html .= '<input type="number" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' tvtype="' . $field_type . '" onchange="documentDirty=true;" style="width:100%" onkeyup="this.value=this.value.replace(/[^\d-,.+]/,\'\')"/>';
-				break;
-			case "textareamini": // handler for textarea mini boxes
-				$field_html .= '<textarea id="tv' . $field_id . '" name="tv' . $field_id . '" cols="40" rows="5" onchange="documentDirty=true;" style="width:100%">' . $modx->htmlspecialchars($field_value) . '</textarea>';
-				break;
-			case "textarea": // handler for textarea boxes
-			case "rawtextarea": // non-htmlentity convertex textarea boxes
-			case "htmlarea": // handler for textarea boxes (deprecated)
-			case "richtext": // handler for textarea boxes
-				$field_html .= '<textarea id="tv' . $field_id . '" name="tv' . $field_id . '" cols="40" rows="15" onchange="documentDirty=true;" style="width:100%">' . $modx->htmlspecialchars($field_value) . '</textarea>';
-				break;
-			case "date":
-				$field_id = str_replace(array(
-					'-',
-					'.'
-				), '_', urldecode($field_id));
-				if($field_value == '') {
-					$field_value = 0;
-				}
-				$field_html .= '<input id="tv' . $field_id . '" name="tv' . $field_id . '" class="DatePicker" type="text" value="' . ($field_value == 0 || !isset($field_value) ? "" : $field_value) . '" onblur="documentDirty=true;" />';
-				$field_html .= ' <a onclick="document.forms[\'mutate\'].elements[\'tv' . $field_id . '\'].value=\'\';document.forms[\'mutate\'].elements[\'tv' . $field_id . '\'].onblur(); return true;" onmouseover="window.status=\'clear the date\'; return true;" onmouseout="window.status=\'\'; return true;" style="cursor:pointer; cursor:hand"><i class="' . $_style["actions_calendar_delete"] . '"></i></a>';
+            case "text": // handler for regular text boxes
+            case "rawtext"; // non-htmlentity converted text boxes
+                $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' tvtype="' . $field_type . '" onchange="documentDirty=true;" style="width:100%" />';
+                break;
+            case "email": // handles email input fields
+                $field_html .= '<input type="email" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' tvtype="' . $field_type . '" onchange="documentDirty=true;" style="width:100%"/>';
+                break;
+            case "number": // handles the input of numbers
+                $field_html .= '<input type="number" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' tvtype="' . $field_type . '" onchange="documentDirty=true;" style="width:100%" onkeyup="this.value=this.value.replace(/[^\d-,.+]/,\'\')"/>';
+                break;
+            case "textareamini": // handler for textarea mini boxes
+                $field_html .= '<textarea id="tv' . $field_id . '" name="tv' . $field_id . '" cols="40" rows="5" onchange="documentDirty=true;" style="width:100%">' . $modx->htmlspecialchars($field_value) . '</textarea>';
+                break;
+            case "textarea": // handler for textarea boxes
+            case "rawtextarea": // non-htmlentity convertex textarea boxes
+            case "htmlarea": // handler for textarea boxes (deprecated)
+            case "richtext": // handler for textarea boxes
+                $field_html .= '<textarea id="tv' . $field_id . '" name="tv' . $field_id . '" cols="40" rows="15" onchange="documentDirty=true;" style="width:100%">' . $modx->htmlspecialchars($field_value) . '</textarea>';
+                break;
+            case "date":
+                $field_id = str_replace(array(
+                    '-',
+                    '.'
+                ), '_', urldecode($field_id));
+                if($field_value == '') {
+                    $field_value = 0;
+                }
+                $field_html .= '<input id="tv' . $field_id . '" name="tv' . $field_id . '" class="DatePicker" type="text" value="' . ($field_value == 0 || !isset($field_value) ? "" : $field_value) . '" onblur="documentDirty=true;" />';
+                $field_html .= ' <a onclick="document.forms[\'mutate\'].elements[\'tv' . $field_id . '\'].value=\'\';document.forms[\'mutate\'].elements[\'tv' . $field_id . '\'].onblur(); return true;" onmouseover="window.status=\'clear the date\'; return true;" onmouseout="window.status=\'\'; return true;" style="cursor:pointer; cursor:hand"><i class="' . $_style["actions_calendar_delete"] . '"></i></a>';
 
-				break;
-			case "dropdown": // handler for select boxes
-				$field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '" size="1" onchange="documentDirty=true;">';
-				$index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
-				while(list($item, $itemvalue) = each($index_list)) {
-					list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
-					if(strlen($itemvalue) == 0) {
-						$itemvalue = $item;
-					}
-					$field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . ($itemvalue == $field_value ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>';
-				}
-				$field_html .= "</select>";
-				break;
-			case "listbox": // handler for select boxes
-				$field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '" onchange="documentDirty=true;" size="8">';
-				$index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
-				while(list($item, $itemvalue) = each($index_list)) {
-					list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
-					if(strlen($itemvalue) == 0) {
-						$itemvalue = $item;
-					}
-					$field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . ($itemvalue == $field_value ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>';
-				}
-				$field_html .= "</select>";
-				break;
-			case "listbox-multiple": // handler for select boxes where you can choose multiple items
-				$field_value = explode("||", $field_value);
-				$field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '[]" multiple="multiple" onchange="documentDirty=true;" size="8">';
-				$index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
-				while(list($item, $itemvalue) = each($index_list)) {
-					list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
-					if(strlen($itemvalue) == 0) {
-						$itemvalue = $item;
-					}
-					$field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . (in_array($itemvalue, $field_value) ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>';
-				}
-				$field_html .= "</select>";
-				break;
-			case "url": // handles url input fields
-				$urls = array(
-					'' => '--',
-					'http://' => 'http://',
-					'https://' => 'https://',
-					'ftp://' => 'ftp://',
-					'mailto:' => 'mailto:'
-				);
-				$field_html = '<table border="0" cellspacing="0" cellpadding="0"><tr><td><select id="tv' . $field_id . '_prefix" name="tv' . $field_id . '_prefix" onchange="documentDirty=true;">';
-				foreach($urls as $k => $v) {
-					if(strpos($field_value, $v) === false) {
-						$field_html .= '<option value="' . $v . '">' . $k . '</option>';
-					} else {
-						$field_value = str_replace($v, '', $field_value);
-						$field_html .= '<option value="' . $v . '" selected="selected">' . $k . '</option>';
-					}
-				}
-				$field_html .= '</select></td><td>';
-				$field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" width="100" ' . $field_style . ' onchange="documentDirty=true;" /></td></tr></table>';
-				break;
-			case 'checkbox': // handles check boxes
-				$values = !is_array($field_value) ? explode('||', $field_value) : $field_value;
-				$index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
-				$tpl = '<label class="checkbox"><input type="checkbox" value="%s" id="tv_%s" name="tv%s[]" %s onchange="documentDirty=true;" />%s</label><br />';
-				static $i = 0;
-				$_ = array();
-				foreach($index_list as $c => $item) {
-					if(is_array($item)) {
-						$name = trim($item[0]);
-						$value = isset($item[1]) ? $item[1] : $name;
-					} else {
-						$item = trim($item);
-						list($name, $value) = (strpos($item, '==') !== false) ? explode('==', $item, 2) : array(
-							$item,
-							$item
-						);
-					}
-					$checked = in_array($value, $values) ? ' checked="checked"' : '';
-					$param = array(
-						$modx->htmlspecialchars($value),
-						$i,
-						$field_id,
-						$checked,
-						$modx->htmlspecialchars($name)
-					);
-					$_[] = vsprintf($tpl, $param);
-					$i++;
-				}
-				$field_html = join("\n", $_);
-				break;
-			case "option": // handles radio buttons
-				$index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
-				static $i = 0;
-				while(list($item, $itemvalue) = each($index_list)) {
-					list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
-					if(strlen($itemvalue) == 0) {
-						$itemvalue = $item;
-					}
-					$field_html .= '<input type="radio" value="' . $modx->htmlspecialchars($itemvalue) . '" id="tv_' . $i . '" name="tv' . $field_id . '" ' . ($itemvalue == $field_value ? 'checked="checked"' : '') . ' onchange="documentDirty=true;" /><label for="tv_' . $i . '" class="radio">' . $item . '</label><br />';
-					$i++;
-				}
-				break;
-			case "image": // handles image fields using htmlarea image manager
-				global $_lang;
-				global $ResourceManagerLoaded;
-				global $content, $use_editor, $which_editor;
-				if(!$ResourceManagerLoaded && !(($content['richtext'] == 1 || $modx->manager->action == 4) && $use_editor == 1 && $which_editor == 3)) {
-					$field_html .= "
+                break;
+            case "dropdown": // handler for select boxes
+                $field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '" size="1" onchange="documentDirty=true;">';
+                $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
+                while(list($item, $itemvalue) = each($index_list)) {
+                    list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
+                    if(strlen($itemvalue) == 0) {
+                        $itemvalue = $item;
+                    }
+                    $field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . ($itemvalue == $field_value ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>';
+                }
+                $field_html .= "</select>";
+                break;
+            case "listbox": // handler for select boxes
+                $field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '" onchange="documentDirty=true;" size="8">';
+                $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
+                while(list($item, $itemvalue) = each($index_list)) {
+                    list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
+                    if(strlen($itemvalue) == 0) {
+                        $itemvalue = $item;
+                    }
+                    $field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . ($itemvalue == $field_value ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>';
+                }
+                $field_html .= "</select>";
+                break;
+            case "listbox-multiple": // handler for select boxes where you can choose multiple items
+                $field_value = explode("||", $field_value);
+                $field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '[]" multiple="multiple" onchange="documentDirty=true;" size="8">';
+                $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
+                while(list($item, $itemvalue) = each($index_list)) {
+                    list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
+                    if(strlen($itemvalue) == 0) {
+                        $itemvalue = $item;
+                    }
+                    $field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . (in_array($itemvalue, $field_value) ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>';
+                }
+                $field_html .= "</select>";
+                break;
+            case "url": // handles url input fields
+                $urls = array(
+                    '' => '--',
+                    'http://' => 'http://',
+                    'https://' => 'https://',
+                    'ftp://' => 'ftp://',
+                    'mailto:' => 'mailto:'
+                );
+                $field_html = '<table border="0" cellspacing="0" cellpadding="0"><tr><td><select id="tv' . $field_id . '_prefix" name="tv' . $field_id . '_prefix" onchange="documentDirty=true;">';
+                foreach($urls as $k => $v) {
+                    if(strpos($field_value, $v) === false) {
+                        $field_html .= '<option value="' . $v . '">' . $k . '</option>';
+                    } else {
+                        $field_value = str_replace($v, '', $field_value);
+                        $field_html .= '<option value="' . $v . '" selected="selected">' . $k . '</option>';
+                    }
+                }
+                $field_html .= '</select></td><td>';
+                $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" width="100" ' . $field_style . ' onchange="documentDirty=true;" /></td></tr></table>';
+                break;
+            case 'checkbox': // handles check boxes
+                $values = !is_array($field_value) ? explode('||', $field_value) : $field_value;
+                $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
+                $tpl = '<label class="checkbox"><input type="checkbox" value="%s" id="tv_%s" name="tv%s[]" %s onchange="documentDirty=true;" />%s</label><br />';
+                static $i = 0;
+                $_ = array();
+                foreach($index_list as $c => $item) {
+                    if(is_array($item)) {
+                        $name = trim($item[0]);
+                        $value = isset($item[1]) ? $item[1] : $name;
+                    } else {
+                        $item = trim($item);
+                        list($name, $value) = (strpos($item, '==') !== false) ? explode('==', $item, 2) : array(
+                            $item,
+                            $item
+                        );
+                    }
+                    $checked = in_array($value, $values) ? ' checked="checked"' : '';
+                    $param = array(
+                        $modx->htmlspecialchars($value),
+                        $i,
+                        $field_id,
+                        $checked,
+                        $modx->htmlspecialchars($name)
+                    );
+                    $_[] = vsprintf($tpl, $param);
+                    $i++;
+                }
+                $field_html = join("\n", $_);
+                break;
+            case "option": // handles radio buttons
+                $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
+                static $i = 0;
+                while(list($item, $itemvalue) = each($index_list)) {
+                    list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
+                    if(strlen($itemvalue) == 0) {
+                        $itemvalue = $item;
+                    }
+                    $field_html .= '<input type="radio" value="' . $modx->htmlspecialchars($itemvalue) . '" id="tv_' . $i . '" name="tv' . $field_id . '" ' . ($itemvalue == $field_value ? 'checked="checked"' : '') . ' onchange="documentDirty=true;" /><label for="tv_' . $i . '" class="radio">' . $item . '</label><br />';
+                    $i++;
+                }
+                break;
+            case "image": // handles image fields using htmlarea image manager
+                global $_lang;
+                global $ResourceManagerLoaded;
+                global $content, $use_editor, $which_editor;
+                if(!$ResourceManagerLoaded && !(($content['richtext'] == 1 || $modx->manager->action == 4) && $use_editor == 1 && $which_editor == 3)) {
+                    $field_html .= "
 						<script type=\"text/javascript\">
 							/* <![CDATA[ */
 								var lastImageCtrl;
@@ -212,18 +212,18 @@ 
 								}
 							/* ]]> */
 						</script>";
-					$ResourceManagerLoaded = true;
-				}
-				$field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '"  value="' . $field_value . '" ' . $field_style . ' onchange="documentDirty=true;" /><input type="button" value="' . $_lang['insert'] . '" onclick="BrowseServer(\'tv' . $field_id . '\')" />';
-				break;
-			case "file": // handles the input of file uploads
-				/* Modified by Timon for use with resource browser */
-				global $_lang;
-				global $ResourceManagerLoaded;
-				global $content, $use_editor, $which_editor;
-				if(!$ResourceManagerLoaded && !(($content['richtext'] == 1 || $modx->manager->action == 4) && $use_editor == 1 && $which_editor == 3)) {
-					/* I didn't understand the meaning of the condition above, so I left it untouched ;-) */
-					$field_html .= "
+                    $ResourceManagerLoaded = true;
+                }
+                $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '"  value="' . $field_value . '" ' . $field_style . ' onchange="documentDirty=true;" /><input type="button" value="' . $_lang['insert'] . '" onclick="BrowseServer(\'tv' . $field_id . '\')" />';
+                break;
+            case "file": // handles the input of file uploads
+                /* Modified by Timon for use with resource browser */
+                global $_lang;
+                global $ResourceManagerLoaded;
+                global $content, $use_editor, $which_editor;
+                if(!$ResourceManagerLoaded && !(($content['richtext'] == 1 || $modx->manager->action == 4) && $use_editor == 1 && $which_editor == 3)) {
+                    /* I didn't understand the meaning of the condition above, so I left it untouched ;-) */
+                    $field_html .= "
 						<script type=\"text/javascript\">
 							/* <![CDATA[ */
 								var lastImageCtrl;
@@ -282,101 +282,101 @@ 
 								}
 							/* ]]> */
 						</script>";
-					$ResourceManagerLoaded = true;
-				}
-				$field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '"  value="' . $field_value . '" ' . $field_style . ' onchange="documentDirty=true;" /><input type="button" value="' . $_lang['insert'] . '" onclick="BrowseFileServer(\'tv' . $field_id . '\')" />';
+                    $ResourceManagerLoaded = true;
+                }
+                $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '"  value="' . $field_value . '" ' . $field_style . ' onchange="documentDirty=true;" /><input type="button" value="' . $_lang['insert'] . '" onclick="BrowseFileServer(\'tv' . $field_id . '\')" />';
 
-				break;
+                break;
 
-			case 'custom_tv':
-				$custom_output = '';
-				/* If we are loading a file */
-				if(substr($field_elements, 0, 5) == "@FILE") {
-					$file_name = MODX_BASE_PATH . trim(substr($field_elements, 6));
-					if(!file_exists($file_name)) {
-						$custom_output = $file_name . ' does not exist';
-					} else {
-						$custom_output = file_get_contents($file_name);
-					}
-				} elseif(substr($field_elements, 0, 8) == '@INCLUDE') {
-					$file_name = MODX_BASE_PATH . trim(substr($field_elements, 9));
-					if(!file_exists($file_name)) {
-						$custom_output = $file_name . ' does not exist';
-					} else {
-						ob_start();
-						include $file_name;
-						$custom_output = ob_get_contents();
-						ob_end_clean();
-					}
-				} elseif(substr($field_elements, 0, 6) == "@CHUNK") {
-					$chunk_name = trim(substr($field_elements, 7));
-					$chunk_body = $modx->getChunk($chunk_name);
-					if($chunk_body == false) {
-						$custom_output = $_lang['chunk_no_exist'] . '(' . $_lang['htmlsnippet_name'] . ':' . $chunk_name . ')';
-					} else {
-						$custom_output = $chunk_body;
-					}
-				} elseif(substr($field_elements, 0, 5) == "@EVAL") {
-					$eval_str = trim(substr($field_elements, 6));
-					$custom_output = eval($eval_str);
-				} else {
-					$custom_output = $field_elements;
-				}
-				$replacements = array(
-					'[+field_type+]' => $field_type,
-					'[+field_id+]' => $field_id,
-					'[+default_text+]' => $default_text,
-					'[+field_value+]' => $modx->htmlspecialchars($field_value),
-					'[+field_style+]' => $field_style,
-				);
-				$custom_output = str_replace(array_keys($replacements), $replacements, $custom_output);
-				$modx->documentObject = $content;
-				$modx->documentIdentifier = $content['id'];
-				$custom_output = $modx->parseDocumentSource($custom_output);
-				$field_html .= $custom_output;
-				break;
+            case 'custom_tv':
+                $custom_output = '';
+                /* If we are loading a file */
+                if(substr($field_elements, 0, 5) == "@FILE") {
+                    $file_name = MODX_BASE_PATH . trim(substr($field_elements, 6));
+                    if(!file_exists($file_name)) {
+                        $custom_output = $file_name . ' does not exist';
+                    } else {
+                        $custom_output = file_get_contents($file_name);
+                    }
+                } elseif(substr($field_elements, 0, 8) == '@INCLUDE') {
+                    $file_name = MODX_BASE_PATH . trim(substr($field_elements, 9));
+                    if(!file_exists($file_name)) {
+                        $custom_output = $file_name . ' does not exist';
+                    } else {
+                        ob_start();
+                        include $file_name;
+                        $custom_output = ob_get_contents();
+                        ob_end_clean();
+                    }
+                } elseif(substr($field_elements, 0, 6) == "@CHUNK") {
+                    $chunk_name = trim(substr($field_elements, 7));
+                    $chunk_body = $modx->getChunk($chunk_name);
+                    if($chunk_body == false) {
+                        $custom_output = $_lang['chunk_no_exist'] . '(' . $_lang['htmlsnippet_name'] . ':' . $chunk_name . ')';
+                    } else {
+                        $custom_output = $chunk_body;
+                    }
+                } elseif(substr($field_elements, 0, 5) == "@EVAL") {
+                    $eval_str = trim(substr($field_elements, 6));
+                    $custom_output = eval($eval_str);
+                } else {
+                    $custom_output = $field_elements;
+                }
+                $replacements = array(
+                    '[+field_type+]' => $field_type,
+                    '[+field_id+]' => $field_id,
+                    '[+default_text+]' => $default_text,
+                    '[+field_value+]' => $modx->htmlspecialchars($field_value),
+                    '[+field_style+]' => $field_style,
+                );
+                $custom_output = str_replace(array_keys($replacements), $replacements, $custom_output);
+                $modx->documentObject = $content;
+                $modx->documentIdentifier = $content['id'];
+                $custom_output = $modx->parseDocumentSource($custom_output);
+                $field_html .= $custom_output;
+                break;
 
-			default: // the default handler -- for errors, mostly
-				$field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' onchange="documentDirty=true;" />';
+            default: // the default handler -- for errors, mostly
+                $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' onchange="documentDirty=true;" />';
 
-		} // end switch statement
-	} else {
-		$custom = explode(":", $field_type);
-		$custom_output = '';
-		$file_name = MODX_BASE_PATH . 'assets/tvs/' . $custom['1'] . '/' . $custom['1'] . '.customtv.php';
-		if(!file_exists($file_name)) {
-			$custom_output = $file_name . ' does not exist';
-		} else {
-			ob_start();
-			include $file_name;
-			$custom_output = ob_get_contents();
-			ob_end_clean();
-		}
-		$replacements = array(
-			'[+field_type+]' => $field_type,
-			'[+field_id+]' => $field_id,
-			'[+default_text+]' => $default_text,
-			'[+field_value+]' => $modx->htmlspecialchars($field_value),
-			'[+field_style+]' => $field_style,
-		);
-		$custom_output = str_replace(array_keys($replacements), $replacements, $custom_output);
-		$modx->documentObject = $content;
-		$custom_output = $modx->parseDocumentSource($custom_output);
-		$field_html .= $custom_output;
-	}
+        } // end switch statement
+    } else {
+        $custom = explode(":", $field_type);
+        $custom_output = '';
+        $file_name = MODX_BASE_PATH . 'assets/tvs/' . $custom['1'] . '/' . $custom['1'] . '.customtv.php';
+        if(!file_exists($file_name)) {
+            $custom_output = $file_name . ' does not exist';
+        } else {
+            ob_start();
+            include $file_name;
+            $custom_output = ob_get_contents();
+            ob_end_clean();
+        }
+        $replacements = array(
+            '[+field_type+]' => $field_type,
+            '[+field_id+]' => $field_id,
+            '[+default_text+]' => $default_text,
+            '[+field_value+]' => $modx->htmlspecialchars($field_value),
+            '[+field_style+]' => $field_style,
+        );
+        $custom_output = str_replace(array_keys($replacements), $replacements, $custom_output);
+        $modx->documentObject = $content;
+        $custom_output = $modx->parseDocumentSource($custom_output);
+        $field_html .= $custom_output;
+    }
 
-	return $field_html;
+    return $field_html;
 } // end renderFormElement function
 
 function ParseIntputOptions($v) {
-	global $modx;
-	$a = array();
-	if(is_array($v)) {
-		return $v;
-	} else if($modx->db->isResult($v)) {
-		while($cols = $modx->db->getRow($v, 'num')) $a[] = $cols;
-	} else {
-		$a = explode("||", $v);
-	}
-	return $a;
+    global $modx;
+    $a = array();
+    if(is_array($v)) {
+        return $v;
+    } else if($modx->db->isResult($v)) {
+        while($cols = $modx->db->getRow($v, 'num')) $a[] = $cols;
+    } else {
+        $a = explode("||", $v);
+    }
+    return $a;
 }

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/deprecated.functions.inc.php

Indentation +6 added lines, -6 removed lines

@@ -40,7 +40,7 @@ 
     function getUserData() {
         $client['ip'] = $_SERVER['REMOTE_ADDR'];
         $client['ua'] = $_SERVER['HTTP_USER_AGENT'];
-    	return $client;
+        return $client;
     }
     
     # Returns true, install or interact when inside manager
@@ -60,12 +60,12 @@ 
 
     // deprecated
     function putChunk($chunkName) { // alias name >.<
-    	global $modx;
+        global $modx;
         return $modx->getChunk($chunkName);
     }
 
     function getDocGroups() {
-    	global $modx;
+        global $modx;
         return $modx->getUserDocGroups();
     } // deprecated
 
@@ -74,7 +74,7 @@ 
     } // deprecated
     
     function userLoggedIn() {
-    	global $modx;
+        global $modx;
         $userdetails= array ();
         if ($modx->isFrontend() && isset ($_SESSION['webValidated'])) {
             // web user
@@ -98,7 +98,7 @@ 
     
     function getFormVars($method= "", $prefix= "", $trim= "", $REQUEST_METHOD) {
         //  function to retrieve form results into an associative array
-    	global $modx;
+        global $modx;
         $results= array ();
         $method= strtoupper($method);
         if ($method == "")
@@ -130,7 +130,7 @@ 
      * @param string $url URL to redirect to
      */
     function webAlert($msg, $url= "") {
-    	global $modx;
+        global $modx;
         $msg= addslashes($modx->db->escape($msg));
         if (substr(strtolower($url), 0, 11) == "javascript:") {
             $act= "__WebAlert();";

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

Indentation +349 added lines, -349 removed lines

@@ -1,104 +1,104 @@ 
 <?php
 class DBAPI {
-	var $conn;
-	var $config;
-	var $lastQuery;
-	var $isConnected;
+    var $conn;
+    var $config;
+    var $lastQuery;
+    var $isConnected;
 
-	function __construct($host='', $dbase='', $uid='', $pwd='', $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'];
-		$this->config['pass'] = $pwd ? $pwd : $GLOBALS['database_password'];
-		$this->config['charset'] = $charset ? $charset : $GLOBALS['database_connection_charset'];
-		$this->config['connection_method'] =  $this->_dbconnectionmethod = (isset($GLOBALS['database_connection_method']) ? $GLOBALS['database_connection_method'] : $connection_method);
-		$this->config['table_prefix'] = ($pre !== NULL) ? $pre : $GLOBALS['table_prefix'];
-	}
+    function __construct($host='', $dbase='', $uid='', $pwd='', $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'];
+        $this->config['pass'] = $pwd ? $pwd : $GLOBALS['database_password'];
+        $this->config['charset'] = $charset ? $charset : $GLOBALS['database_connection_charset'];
+        $this->config['connection_method'] =  $this->_dbconnectionmethod = (isset($GLOBALS['database_connection_method']) ? $GLOBALS['database_connection_method'] : $connection_method);
+        $this->config['table_prefix'] = ($pre !== NULL) ? $pre : $GLOBALS['table_prefix'];
+    }
 
-	function connect($host = '', $dbase = '', $uid = '', $pwd = '', $tmp = 0) {
-		global $modx;
-		$uid     = $uid   ? $uid   : $this->config['user'];
-		$pwd     = $pwd   ? $pwd   : $this->config['pass'];
-		$host    = $host  ? $host  : $this->config['host'];
-		$dbase   = $dbase ? $dbase : $this->config['dbase'];
-		$dbase   = trim($dbase, '`'); // remove the `` chars
-		$charset = $this->config['charset'];
-		$connection_method = $this->config['connection_method'];
-		$tstart = $modx->getMicroTime();
-		$safe_count = 0;
-		do {
-			$this->conn = new mysqli($host, $uid, $pwd, $dbase);
-			if ($this->conn->connect_error) {
-				$this->conn = null;
-				if (isset($modx->config['send_errormail']) && $modx->config['send_errormail'] !== '0') {
-					if ($modx->config['send_errormail'] <= 2) {
-						$logtitle    = 'Failed to create the database connection!';
-						$request_uri = $modx->htmlspecialchars($_SERVER['REQUEST_URI']);
-						$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'],
-							'body' => "{$logtitle}\n{$request_uri}\n{$ua}\n{$referer}",
-							'type' => 'text'
-						));
-					}
-				}
-				sleep(1);
-				$safe_count++;
-			}
-		} while (!$this->conn && $safe_count<3);
-		if (!$this->conn) {
-			$modx->messageQuit("Failed to create the database connection!");
-			exit;
-		} else {
-			$this->conn->query("{$connection_method} {$charset}");
-			$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 />";
-			}
-			$this->conn->set_charset($this->config['charset']);
-			$this->isConnected = true;
-			$modx->queryTime += $totaltime;
-		}
-	}
+    function connect($host = '', $dbase = '', $uid = '', $pwd = '', $tmp = 0) {
+        global $modx;
+        $uid     = $uid   ? $uid   : $this->config['user'];
+        $pwd     = $pwd   ? $pwd   : $this->config['pass'];
+        $host    = $host  ? $host  : $this->config['host'];
+        $dbase   = $dbase ? $dbase : $this->config['dbase'];
+        $dbase   = trim($dbase, '`'); // remove the `` chars
+        $charset = $this->config['charset'];
+        $connection_method = $this->config['connection_method'];
+        $tstart = $modx->getMicroTime();
+        $safe_count = 0;
+        do {
+            $this->conn = new mysqli($host, $uid, $pwd, $dbase);
+            if ($this->conn->connect_error) {
+                $this->conn = null;
+                if (isset($modx->config['send_errormail']) && $modx->config['send_errormail'] !== '0') {
+                    if ($modx->config['send_errormail'] <= 2) {
+                        $logtitle    = 'Failed to create the database connection!';
+                        $request_uri = $modx->htmlspecialchars($_SERVER['REQUEST_URI']);
+                        $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'],
+                            'body' => "{$logtitle}\n{$request_uri}\n{$ua}\n{$referer}",
+                            'type' => 'text'
+                        ));
+                    }
+                }
+                sleep(1);
+                $safe_count++;
+            }
+        } while (!$this->conn && $safe_count<3);
+        if (!$this->conn) {
+            $modx->messageQuit("Failed to create the database connection!");
+            exit;
+        } else {
+            $this->conn->query("{$connection_method} {$charset}");
+            $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 />";
+            }
+            $this->conn->set_charset($this->config['charset']);
+            $this->isConnected = true;
+            $modx->queryTime += $totaltime;
+        }
+    }
 
-	function disconnect() {
-		$this->conn->close();
-		$this->conn = null;
-		$this->isConnected = false;
-	}
+    function disconnect() {
+        $this->conn->close();
+        $this->conn = null;
+        $this->isConnected = false;
+    }
 
-	function escape($s, $safecount=0) {
-		$safecount++;
-		if (1000<$safecount) exit("Too many loops '{$safecount}'");
-		if (empty ($this->conn) || !is_object($this->conn)) {
-			$this->connect();
-		}
-		if (is_array($s)) {
-			if (count($s) === 0) {
-				$s = '';
-			} else {
-				foreach ($s as $i=>$v) {
-					$s[$i] = $this->escape($v, $safecount);
-				}
-			}
-		} else {
-			$s = $this->conn->escape_string($s);
-		}
-		return $s;
-	}
+    function escape($s, $safecount=0) {
+        $safecount++;
+        if (1000<$safecount) exit("Too many loops '{$safecount}'");
+        if (empty ($this->conn) || !is_object($this->conn)) {
+            $this->connect();
+        }
+        if (is_array($s)) {
+            if (count($s) === 0) {
+                $s = '';
+            } else {
+                foreach ($s as $i=>$v) {
+                    $s[$i] = $this->escape($v, $safecount);
+                }
+            }
+        } else {
+            $s = $this->conn->escape_string($s);
+        }
+        return $s;
+    }
 
-	function query($sql,$watchError=true) {
-		global $modx;
-		if (empty ($this->conn) || !is_object($this->conn)) {
-			$this->connect();
-		}
-		$tstart = $modx->getMicroTime();
-		if(is_array($sql)) $sql = join("\n", $sql);
-		$this->lastQuery = $sql;
-		if (!($result = $this->conn->query($sql))) {
-			if(!$watchError) return;
+    function query($sql,$watchError=true) {
+        global $modx;
+        if (empty ($this->conn) || !is_object($this->conn)) {
+            $this->connect();
+        }
+        $tstart = $modx->getMicroTime();
+        if(is_array($sql)) $sql = join("\n", $sql);
+        $this->lastQuery = $sql;
+        if (!($result = $this->conn->query($sql))) {
+            if(!$watchError) return;
             switch(mysqli_errno($this->conn)) {
                 case 1054:
                 case 1060:
@@ -109,119 +109,119 @@ 
                 default:
                     $modx->messageQuit('Execution of a query to the database failed - ' . $this->getLastError(), $sql);
             }
-		} else {
-			$tend = $modx->getMicroTime();
-			$totaltime = $tend - $tstart;
-			$modx->queryTime = $modx->queryTime + $totaltime;
-			if ($modx->dumpSQL) {
-				$debug = debug_backtrace();
-				array_shift($debug);
-				$debug_path = array();
-				foreach ($debug as $line) $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>';
-				if ($modx->event->name) $modx->queryCode .= 'Current Event  => ' . $modx->event->name . '<br>';
-				if ($modx->event->activePlugin) $modx->queryCode .= 'Current Plugin => ' . $modx->event->activePlugin . '<br>';
-				if ($modx->currentSnippet) $modx->queryCode .= 'Current Snippet => ' . $modx->currentSnippet . '<br>';
-				if (stripos($sql, 'select')===0) $modx->queryCode .= 'Record Count => ' . $this->getRecordCount($result) . '<br>';
-				else $modx->queryCode .= 'Affected Rows => ' . $this->getAffectedRows() . '<br>';
-				$modx->queryCode .= 'Functions Path => ' . $debug_path . '<br>';
-				$modx->queryCode .= "</fieldset><br />";
-			}
-			$modx->executedQueries = $modx->executedQueries + 1;
-			return $result;
-		}
-	}
+        } else {
+            $tend = $modx->getMicroTime();
+            $totaltime = $tend - $tstart;
+            $modx->queryTime = $modx->queryTime + $totaltime;
+            if ($modx->dumpSQL) {
+                $debug = debug_backtrace();
+                array_shift($debug);
+                $debug_path = array();
+                foreach ($debug as $line) $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>';
+                if ($modx->event->name) $modx->queryCode .= 'Current Event  => ' . $modx->event->name . '<br>';
+                if ($modx->event->activePlugin) $modx->queryCode .= 'Current Plugin => ' . $modx->event->activePlugin . '<br>';
+                if ($modx->currentSnippet) $modx->queryCode .= 'Current Snippet => ' . $modx->currentSnippet . '<br>';
+                if (stripos($sql, 'select')===0) $modx->queryCode .= 'Record Count => ' . $this->getRecordCount($result) . '<br>';
+                else $modx->queryCode .= 'Affected Rows => ' . $this->getAffectedRows() . '<br>';
+                $modx->queryCode .= 'Functions Path => ' . $debug_path . '<br>';
+                $modx->queryCode .= "</fieldset><br />";
+            }
+            $modx->executedQueries = $modx->executedQueries + 1;
+            return $result;
+        }
+    }
 
-	function delete($from, $where='', $orderby='', $limit = '') {
-		global $modx;
-		if (!$from) {
-			$modx->messageQuit("Empty \$from parameters in DBAPI::delete().");
-		} else {
-			$from = $this->replaceFullTableName($from);
-			$where   = trim($where);
-			$orderby = trim($orderby);
-			$limit   = trim($limit);
-			if($where!==''    && stripos($where,  'WHERE')!==0)    $where   = "WHERE {$where}";
-			if($orderby!== '' && stripos($orderby,'ORDER BY')!==0) $orderby = "ORDER BY {$orderby}";
-			if($limit!== ''   && stripos($limit,  'LIMIT')!==0)    $limit   = "LIMIT {$limit}";
-			return $this->query("DELETE FROM {$from} {$where} {$orderby} {$limit}");
-		}
-	}
+    function delete($from, $where='', $orderby='', $limit = '') {
+        global $modx;
+        if (!$from) {
+            $modx->messageQuit("Empty \$from parameters in DBAPI::delete().");
+        } else {
+            $from = $this->replaceFullTableName($from);
+            $where   = trim($where);
+            $orderby = trim($orderby);
+            $limit   = trim($limit);
+            if($where!==''    && stripos($where,  'WHERE')!==0)    $where   = "WHERE {$where}";
+            if($orderby!== '' && stripos($orderby,'ORDER BY')!==0) $orderby = "ORDER BY {$orderby}";
+            if($limit!== ''   && stripos($limit,  'LIMIT')!==0)    $limit   = "LIMIT {$limit}";
+            return $this->query("DELETE FROM {$from} {$where} {$orderby} {$limit}");
+        }
+    }
 
-	function select($fields = "*", $from = "", $where = "", $orderby = "", $limit = "") {
-		global $modx;
+    function select($fields = "*", $from = "", $where = "", $orderby = "", $limit = "") {
+        global $modx;
 		
-		if(is_array($fields)) $fields = $this->_getFieldsStringFromArray($fields);
-		if(is_array($from))   $from   = $this->_getFromStringFromArray($from);
-		if(is_array($where))  $where  = join(' ', $where);
+        if(is_array($fields)) $fields = $this->_getFieldsStringFromArray($fields);
+        if(is_array($from))   $from   = $this->_getFromStringFromArray($from);
+        if(is_array($where))  $where  = join(' ', $where);
 		
-		if (!$from) {
-			$modx->messageQuit("Empty \$from parameters in DBAPI::select().");
-			exit;
-		}
+        if (!$from) {
+            $modx->messageQuit("Empty \$from parameters in DBAPI::select().");
+            exit;
+        }
 		
-		$fields = $this->replaceFullTableName($fields);
-		$from = $this->replaceFullTableName($from);
+        $fields = $this->replaceFullTableName($fields);
+        $from = $this->replaceFullTableName($from);
         $where   = trim($where);
         $orderby = trim($orderby);
         $limit   = trim($limit);
         if($where!==''   && stripos($where,'WHERE')!==0)   $where   = "WHERE {$where}";
         if($orderby!=='' && stripos($orderby,'ORDER')!==0) $orderby = "ORDER BY {$orderby}";
         if($limit!==''   && stripos($limit,'LIMIT')!==0)   $limit   = "LIMIT {$limit}";
-		return $this->query("SELECT {$fields} FROM {$from} {$where} {$orderby} {$limit}");
-	}
+        return $this->query("SELECT {$fields} FROM {$from} {$where} {$orderby} {$limit}");
+    }
 
-	function update($fields, $table, $where = "") {
-		global $modx;
-		if (!$table) {
-			$modx->messageQuit("Empty \$table parameter in DBAPI::update().");
-		} else {
-			$table = $this->replaceFullTableName($table);
-			if (is_array($fields)) {
-				foreach ($fields as $key => $value) {
-					if(is_null($value) || strtolower($value) === 'null'){
-						$flds = 'NULL';
-					}else{
-						$flds = "'" . $value . "'";
-					}
-					$fields[$key] = "`{$key}` = ".$flds;
-				}
-				$fields = implode(",", $fields);
-			}
-			$where = trim($where);
-			if($where!=='' && stripos($where, 'WHERE')!==0) $where = "WHERE {$where}";
-			return $this->query("UPDATE {$table} SET {$fields} {$where}");
-		}
-	}
+    function update($fields, $table, $where = "") {
+        global $modx;
+        if (!$table) {
+            $modx->messageQuit("Empty \$table parameter in DBAPI::update().");
+        } else {
+            $table = $this->replaceFullTableName($table);
+            if (is_array($fields)) {
+                foreach ($fields as $key => $value) {
+                    if(is_null($value) || strtolower($value) === 'null'){
+                        $flds = 'NULL';
+                    }else{
+                        $flds = "'" . $value . "'";
+                    }
+                    $fields[$key] = "`{$key}` = ".$flds;
+                }
+                $fields = implode(",", $fields);
+            }
+            $where = trim($where);
+            if($where!=='' && stripos($where, 'WHERE')!==0) $where = "WHERE {$where}";
+            return $this->query("UPDATE {$table} SET {$fields} {$where}");
+        }
+    }
 
-	function insert($fields, $intotable, $fromfields = "*", $fromtable = "", $where = "", $limit = "") {
-		global $modx;
-		if (!$intotable) {
-			$modx->messageQuit("Empty \$intotable parameters in DBAPI::insert().");
-		} else {
-			$intotable = $this->replaceFullTableName($intotable);
-			if (!is_array($fields)) {
-				$this->query("INSERT INTO {$intotable} {$fields}");
-			} else {
-				if (empty($fromtable)) {
-					$fields = "(`".implode("`, `", array_keys($fields))."`) VALUES('".implode("', '", array_values($fields))."')";
-					$rt = $this->query("INSERT INTO {$intotable} {$fields}");
-				} else {
-					$fromtable = $this->replaceFullTableName($fromtable);
-					$fields = "(".implode(",", array_keys($fields)).")";
-					$where = trim($where);
-					$limit = trim($limit);
-					if($where!=='' && stripos($where, 'WHERE')!==0) $where = "WHERE {$where}";
-					if($limit!=='' && stripos($limit, 'LIMIT')!==0) $limit = "LIMIT {$limit}";
-					$rt = $this->query("INSERT INTO {$intotable} {$fields} SELECT {$fromfields} FROM {$fromtable} {$where} {$limit}");
-				}
-			}
-			if (($lid = $this->getInsertId())===false) $modx->messageQuit("Couldn't get last insert key!");
-			return $lid;
-		}
-	}
+    function insert($fields, $intotable, $fromfields = "*", $fromtable = "", $where = "", $limit = "") {
+        global $modx;
+        if (!$intotable) {
+            $modx->messageQuit("Empty \$intotable parameters in DBAPI::insert().");
+        } else {
+            $intotable = $this->replaceFullTableName($intotable);
+            if (!is_array($fields)) {
+                $this->query("INSERT INTO {$intotable} {$fields}");
+            } else {
+                if (empty($fromtable)) {
+                    $fields = "(`".implode("`, `", array_keys($fields))."`) VALUES('".implode("', '", array_values($fields))."')";
+                    $rt = $this->query("INSERT INTO {$intotable} {$fields}");
+                } else {
+                    $fromtable = $this->replaceFullTableName($fromtable);
+                    $fields = "(".implode(",", array_keys($fields)).")";
+                    $where = trim($where);
+                    $limit = trim($limit);
+                    if($where!=='' && stripos($where, 'WHERE')!==0) $where = "WHERE {$where}";
+                    if($limit!=='' && stripos($limit, 'LIMIT')!==0) $limit = "LIMIT {$limit}";
+                    $rt = $this->query("INSERT INTO {$intotable} {$fields} SELECT {$fromfields} FROM {$fromtable} {$where} {$limit}");
+                }
+            }
+            if (($lid = $this->getInsertId())===false) $modx->messageQuit("Couldn't get last insert key!");
+            return $lid;
+        }
+    }
 
     function save($fields, $table, $where='') { // This is similar to "replace into table".
         
@@ -233,182 +233,182 @@ 
         else                 return $this->update($fields, $table, $where);
     }
     
-	function isResult($rs) {
-		return is_object($rs);
-	}
+    function isResult($rs) {
+        return is_object($rs);
+    }
 
-	function freeResult($rs) {
-		$rs->free_result();
-	}
+    function freeResult($rs) {
+        $rs->free_result();
+    }
 
-	function numFields($rs) {
-		return $rs->field_count;
-	}
+    function numFields($rs) {
+        return $rs->field_count;
+    }
 
-	function fieldName($rs,$col=0) {
-		$field = $rs->fetch_field_direct($col);
-		return $field->name;
-	}
+    function fieldName($rs,$col=0) {
+        $field = $rs->fetch_field_direct($col);
+        return $field->name;
+    }
 
-	function selectDb($name) {
-		$this->conn->select_db($name);
-	}
+    function selectDb($name) {
+        $this->conn->select_db($name);
+    }
 
 
-	function getInsertId($conn=NULL) {
-		if (!is_object($conn)) $conn =& $this->conn;
-		return $conn->insert_id;
-	}
+    function getInsertId($conn=NULL) {
+        if (!is_object($conn)) $conn =& $this->conn;
+        return $conn->insert_id;
+    }
 
-	function getAffectedRows($conn=NULL) {
-		if (!is_object($conn)) $conn =& $this->conn;
-		return $conn->affected_rows;
-	}
+    function getAffectedRows($conn=NULL) {
+        if (!is_object($conn)) $conn =& $this->conn;
+        return $conn->affected_rows;
+    }
 
-	function getLastError($conn=NULL) {
-		if (!is_object($conn)) $conn =& $this->conn;
-		return $conn->error;
-	}
+    function getLastError($conn=NULL) {
+        if (!is_object($conn)) $conn =& $this->conn;
+        return $conn->error;
+    }
 
-	function getRecordCount($ds) {
-		return (is_object($ds)) ? $ds->num_rows : 0;
-	}
+    function getRecordCount($ds) {
+        return (is_object($ds)) ? $ds->num_rows : 0;
+    }
 
-	function getRow($ds, $mode = 'assoc') {
-		if (is_object($ds)) {
-			if ($mode == 'assoc') {
-				return $ds->fetch_assoc();
-			} elseif ($mode == 'num') {
-				return $ds->fetch_row();
-			} elseif ($mode == 'object') {
-				return $ds->fetch_object();
-			} elseif ($mode == 'both') {
-				return $ds->fetch_array(MYSQLI_BOTH);
-			} else {
-				global $modx;
-				$modx->messageQuit("Unknown get type ($mode) specified for fetchRow - must be empty, 'assoc', 'num' or 'both'.");
-			}
-		}
-	}
+    function getRow($ds, $mode = 'assoc') {
+        if (is_object($ds)) {
+            if ($mode == 'assoc') {
+                return $ds->fetch_assoc();
+            } elseif ($mode == 'num') {
+                return $ds->fetch_row();
+            } elseif ($mode == 'object') {
+                return $ds->fetch_object();
+            } elseif ($mode == 'both') {
+                return $ds->fetch_array(MYSQLI_BOTH);
+            } else {
+                global $modx;
+                $modx->messageQuit("Unknown get type ($mode) specified for fetchRow - must be empty, 'assoc', 'num' or 'both'.");
+            }
+        }
+    }
 
-	function getColumn($name, $dsq) {
-		if (!is_object($dsq)) {
-			$dsq = $this->query($dsq);
-		}
-		if ($dsq) {
-			$col = array ();
-			while ($row = $this->getRow($dsq)) {
-				$col[] = $row[$name];
-			}
-			return $col;
-		}
-	}
+    function getColumn($name, $dsq) {
+        if (!is_object($dsq)) {
+            $dsq = $this->query($dsq);
+        }
+        if ($dsq) {
+            $col = array ();
+            while ($row = $this->getRow($dsq)) {
+                $col[] = $row[$name];
+            }
+            return $col;
+        }
+    }
 
-	function getColumnNames($dsq) {
-		if (!is_object($dsq)) {
-			$dsq = $this->query($dsq);
-		}
-		if ($dsq) {
-			$names = array ();
-			$limit = $this->numFields($dsq);
-			for ($i = 0; $i < $limit; $i++) {
-				$names[] = $this->fieldName($dsq, $i);
-			}
-			return $names;
-		}
-	}
+    function getColumnNames($dsq) {
+        if (!is_object($dsq)) {
+            $dsq = $this->query($dsq);
+        }
+        if ($dsq) {
+            $names = array ();
+            $limit = $this->numFields($dsq);
+            for ($i = 0; $i < $limit; $i++) {
+                $names[] = $this->fieldName($dsq, $i);
+            }
+            return $names;
+        }
+    }
 
-	function getValue($dsq) {
-		if (!is_object($dsq)) {
-			$dsq = $this->query($dsq);
-		}
-		if ($dsq) {
-			$r = $this->getRow($dsq, "num");
-			return $r[0];
-		}
-	}
+    function getValue($dsq) {
+        if (!is_object($dsq)) {
+            $dsq = $this->query($dsq);
+        }
+        if ($dsq) {
+            $r = $this->getRow($dsq, "num");
+            return $r[0];
+        }
+    }
 
-	function getTableMetaData($table) {
-		$metadata = false;
-		if (!empty ($table)) {
-			$sql = "SHOW FIELDS FROM $table";
-			if ($ds = $this->query($sql)) {
-				while ($row = $this->getRow($ds)) {
-					$fieldName = $row['Field'];
-					$metadata[$fieldName] = $row;
-				}
-			}
-		}
-		return $metadata;
-	}
+    function getTableMetaData($table) {
+        $metadata = false;
+        if (!empty ($table)) {
+            $sql = "SHOW FIELDS FROM $table";
+            if ($ds = $this->query($sql)) {
+                while ($row = $this->getRow($ds)) {
+                    $fieldName = $row['Field'];
+                    $metadata[$fieldName] = $row;
+                }
+            }
+        }
+        return $metadata;
+    }
 
-	function prepareDate($timestamp, $fieldType = 'DATETIME') {
-		$date = '';
-		if (!$timestamp === false && $timestamp > 0) {
-			switch ($fieldType) {
-				case 'DATE' :
-					$date = date('Y-m-d', $timestamp);
-					break;
-				case 'TIME' :
-					$date = date('H:i:s', $timestamp);
-					break;
-				case 'YEAR' :
-					$date = date('Y', $timestamp);
-					break;
-				default :
-					$date = date('Y-m-d H:i:s', $timestamp);
-					break;
-			}
-		}
-		return $date;
-	}
+    function prepareDate($timestamp, $fieldType = 'DATETIME') {
+        $date = '';
+        if (!$timestamp === false && $timestamp > 0) {
+            switch ($fieldType) {
+                case 'DATE' :
+                    $date = date('Y-m-d', $timestamp);
+                    break;
+                case 'TIME' :
+                    $date = date('H:i:s', $timestamp);
+                    break;
+                case 'YEAR' :
+                    $date = date('Y', $timestamp);
+                    break;
+                default :
+                    $date = date('Y-m-d H:i:s', $timestamp);
+                    break;
+            }
+        }
+        return $date;
+    }
 
-	function makeArray($rs='',$index=false){
-		if (!$rs) return false;
-		$rsArray = array();
-		$iterator = 0;
-		while ($row = $this->getRow($rs)) {
-			$returnIndex = $index !== false && isset($row[$index]) ? $row[$index] : $iterator; 
-			$rsArray[$returnIndex] = $row;
-			$iterator++;
-		}
-		return $rsArray;
-	}
+    function makeArray($rs='',$index=false){
+        if (!$rs) return false;
+        $rsArray = array();
+        $iterator = 0;
+        while ($row = $this->getRow($rs)) {
+            $returnIndex = $index !== false && isset($row[$index]) ? $row[$index] : $iterator; 
+            $rsArray[$returnIndex] = $row;
+            $iterator++;
+        }
+        return $rsArray;
+    }
 
-	function getVersion() {
-		return $this->conn->server_info;
-	}
+    function getVersion() {
+        return $this->conn->server_info;
+    }
 
-	function replaceFullTableName($str,$force=null) {
-		$str = trim($str);
-		$dbase  = trim($this->config['dbase'],'`');
-		$prefix = $this->config['table_prefix'];
-		if (!empty($force)) {
-			$result = "`{$dbase}`.`{$prefix}{$str}`";
-		} elseif (strpos($str,'[+prefix+]')!==false) {
-			$result = preg_replace('@\[\+prefix\+\]([0-9a-zA-Z_]+)@', "`{$dbase}`.`{$prefix}$1`", $str);
-		} else {
-			$result = $str;
-		}
-		return $result;
-	}
+    function replaceFullTableName($str,$force=null) {
+        $str = trim($str);
+        $dbase  = trim($this->config['dbase'],'`');
+        $prefix = $this->config['table_prefix'];
+        if (!empty($force)) {
+            $result = "`{$dbase}`.`{$prefix}{$str}`";
+        } elseif (strpos($str,'[+prefix+]')!==false) {
+            $result = preg_replace('@\[\+prefix\+\]([0-9a-zA-Z_]+)@', "`{$dbase}`.`{$prefix}$1`", $str);
+        } else {
+            $result = $str;
+        }
+        return $result;
+    }
 
-	function optimize($table_name) {
-		$rs = $this->query("OPTIMIZE TABLE {$table_name}");
-		if ($rs) {
-			$rs = $this->query("ALTER TABLE {$table_name}");
-		}
-		return $rs;
-	}
+    function optimize($table_name) {
+        $rs = $this->query("OPTIMIZE TABLE {$table_name}");
+        if ($rs) {
+            $rs = $this->query("ALTER TABLE {$table_name}");
+        }
+        return $rs;
+    }
 
-	function truncate($table_name) {
-		$rs = $this->query("TRUNCATE {$table_name}");
-		return $rs;
-	}
+    function truncate($table_name) {
+        $rs = $this->query("TRUNCATE {$table_name}");
+        return $rs;
+    }
 
-	function dataSeek($result, $row_number) {
-		return $result->data_seek($row_number);
-	}
+    function dataSeek($result, $row_number) {
+        return $result->data_seek($row_number);
+    }
 	
     function _getFieldsStringFromArray($fields=array()) {
         

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

Indentation +496 added lines, -496 removed lines

@@ -7,187 +7,187 @@ 
 
 class DBAPI {
 
-   var $conn;
-   var $config;
-   var $lastQuery;
-   var $isConnected;
+    var $conn;
+    var $config;
+    var $lastQuery;
+    var $isConnected;
 
-   /**
-    * @name:  DBAPI
-    *
-    */
-   function __construct($host='',$dbase='', $uid='',$pwd='',$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'];
-      $this->config['pass'] = $pwd ? $pwd : $GLOBALS['database_password'];
-      $this->config['charset'] = $charset ? $charset : $GLOBALS['database_connection_charset'];
-      $this->config['connection_method'] =  $this->_dbconnectionmethod = (isset($GLOBALS['database_connection_method']) ? $GLOBALS['database_connection_method'] : $connection_method);
-      $this->config['table_prefix'] = ($pre !== NULL) ? $pre : $GLOBALS['table_prefix'];
-      $this->initDataTypes();
-   }
+    /**
+     * @name:  DBAPI
+     *
+     */
+    function __construct($host='',$dbase='', $uid='',$pwd='',$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'];
+        $this->config['pass'] = $pwd ? $pwd : $GLOBALS['database_password'];
+        $this->config['charset'] = $charset ? $charset : $GLOBALS['database_connection_charset'];
+        $this->config['connection_method'] =  $this->_dbconnectionmethod = (isset($GLOBALS['database_connection_method']) ? $GLOBALS['database_connection_method'] : $connection_method);
+        $this->config['table_prefix'] = ($pre !== NULL) ? $pre : $GLOBALS['table_prefix'];
+        $this->initDataTypes();
+    }
 
-   /**
-    * @name:  initDataTypes
-    * @desc:  called in the constructor to set up arrays containing the types
-    *         of database fields that can be used with specific PHP types
-    */
-   function initDataTypes() {
-      $this->dataTypes['numeric'] = array (
-         'INT',
-         'INTEGER',
-         'TINYINT',
-         'BOOLEAN',
-         'DECIMAL',
-         'DEC',
-         'NUMERIC',
-         'FLOAT',
-         'DOUBLE PRECISION',
-         'REAL',
-         'SMALLINT',
-         'MEDIUMINT',
-         'BIGINT',
-         'BIT'
-      );
-      $this->dataTypes['string'] = array (
-         'CHAR',
-         'VARCHAR',
-         'BINARY',
-         'VARBINARY',
-         'TINYBLOB',
-         'BLOB',
-         'MEDIUMBLOB',
-         'LONGBLOB',
-         'TINYTEXT',
-         'TEXT',
-         'MEDIUMTEXT',
-         'LONGTEXT',
-         'ENUM',
-         'SET'
-      );
-      $this->dataTypes['date'] = array (
-         'DATE',
-         'DATETIME',
-         'TIMESTAMP',
-         'TIME',
-         'YEAR'
-      );
-   }
+    /**
+     * @name:  initDataTypes
+     * @desc:  called in the constructor to set up arrays containing the types
+     *         of database fields that can be used with specific PHP types
+     */
+    function initDataTypes() {
+        $this->dataTypes['numeric'] = array (
+            'INT',
+            'INTEGER',
+            'TINYINT',
+            'BOOLEAN',
+            'DECIMAL',
+            'DEC',
+            'NUMERIC',
+            'FLOAT',
+            'DOUBLE PRECISION',
+            'REAL',
+            'SMALLINT',
+            'MEDIUMINT',
+            'BIGINT',
+            'BIT'
+        );
+        $this->dataTypes['string'] = array (
+            'CHAR',
+            'VARCHAR',
+            'BINARY',
+            'VARBINARY',
+            'TINYBLOB',
+            'BLOB',
+            'MEDIUMBLOB',
+            'LONGBLOB',
+            'TINYTEXT',
+            'TEXT',
+            'MEDIUMTEXT',
+            'LONGTEXT',
+            'ENUM',
+            'SET'
+        );
+        $this->dataTypes['date'] = array (
+            'DATE',
+            'DATETIME',
+            'TIMESTAMP',
+            'TIME',
+            'YEAR'
+        );
+    }
 
-   /**
-    * @name:  connect
-    *
-    */
-   function connect($host = '', $dbase = '', $uid = '', $pwd = '', $persist = 0) {
-      global $modx;
-      $uid = $uid ? $uid : $this->config['user'];
-      $pwd = $pwd ? $pwd : $this->config['pass'];
-      $host = $host ? $host : $this->config['host'];
-      $dbase = $dbase ? $dbase : $this->config['dbase'];
-      $charset = $this->config['charset'];
-      $connection_method = $this->config['connection_method'];
-      $tstart = $modx->getMicroTime();
-      $safe_count = 0;
-      while(!$this->conn && $safe_count<3)
-      {
-          if($persist!=0) $this->conn = mysql_pconnect($host, $uid, $pwd);
-          else            $this->conn = mysql_connect($host, $uid, $pwd, true);
+    /**
+     * @name:  connect
+     *
+     */
+    function connect($host = '', $dbase = '', $uid = '', $pwd = '', $persist = 0) {
+        global $modx;
+        $uid = $uid ? $uid : $this->config['user'];
+        $pwd = $pwd ? $pwd : $this->config['pass'];
+        $host = $host ? $host : $this->config['host'];
+        $dbase = $dbase ? $dbase : $this->config['dbase'];
+        $charset = $this->config['charset'];
+        $connection_method = $this->config['connection_method'];
+        $tstart = $modx->getMicroTime();
+        $safe_count = 0;
+        while(!$this->conn && $safe_count<3)
+        {
+            if($persist!=0) $this->conn = mysql_pconnect($host, $uid, $pwd);
+            else            $this->conn = mysql_connect($host, $uid, $pwd, true);
           
-          if(!$this->conn)
-          {
+            if(!$this->conn)
+            {
             if(isset($modx->config['send_errormail']) && $modx->config['send_errormail'] !== '0')
             {
-               if($modx->config['send_errormail'] <= 2)
-               {
-                  $logtitle    = 'Failed to create the database connection!';
-                  $request_uri = $modx->htmlspecialchars($_SERVER['REQUEST_URI']);
-                  $ua          = $modx->htmlspecialchars($_SERVER['HTTP_USER_AGENT']);
-                  $referer     = $modx->htmlspecialchars($_SERVER['HTTP_REFERER']);
+                if($modx->config['send_errormail'] <= 2)
+                {
+                    $logtitle    = 'Failed to create the database connection!';
+                    $request_uri = $modx->htmlspecialchars($_SERVER['REQUEST_URI']);
+                    $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'],
-					  'body' => "{$logtitle}\n{$request_uri}\n{$ua}\n{$referer}",
-					  'type' => 'text')
-				  );
-               }
+                    $modx->sendmail(array(
+                        'subject' => 'Missing to create the database connection! from ' . $modx->config['site_name'],
+                        'body' => "{$logtitle}\n{$request_uri}\n{$ua}\n{$referer}",
+                        'type' => 'text')
+                    );
+                }
             }
             sleep(1);
             $safe_count++;
-          }
-      }
-      if (!$this->conn) {
-         $modx->messageQuit("Failed to create the database connection!");
-         exit;
-      } else {
-         $dbase = trim($dbase,'`'); // remove the `` chars
-         if (!@ mysql_select_db($dbase, $this->conn)) {
+            }
+        }
+        if (!$this->conn) {
+            $modx->messageQuit("Failed to create the database connection!");
+            exit;
+        } else {
+            $dbase = trim($dbase,'`'); // remove the `` chars
+            if (!@ mysql_select_db($dbase, $this->conn)) {
             $modx->messageQuit("Failed to select the database '" . $dbase . "'!");
             exit;
-         }
-         @mysql_query("{$connection_method} {$charset}", $this->conn);
-         $tend = $modx->getMicroTime();
-         $totaltime = $tend - $tstart;
-         if ($modx->dumpSQL) {
+            }
+            @mysql_query("{$connection_method} {$charset}", $this->conn);
+            $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 />";
-         }
+            }
             if (function_exists('mysql_set_charset')) {
                 mysql_set_charset($this->config['charset']);
             } else {
                 @mysql_query("SET NAMES {$this->config['charset']}", $this->conn);
             }
-         $this->isConnected = true;
-         // FIXME (Fixed by line below):
-         // this->queryTime = this->queryTime + $totaltime;
-         $modx->queryTime += $totaltime;
-      }
-   }
+            $this->isConnected = true;
+            // FIXME (Fixed by line below):
+            // this->queryTime = this->queryTime + $totaltime;
+            $modx->queryTime += $totaltime;
+        }
+    }
 
-   /**
-    * @name:  disconnect
-    *
-    */
-   function disconnect() {
-      @ mysql_close($this->conn);
-      $this->conn = null;
-      $this->isConnected = false;
-   }
+    /**
+     * @name:  disconnect
+     *
+     */
+    function disconnect() {
+        @ mysql_close($this->conn);
+        $this->conn = null;
+        $this->isConnected = false;
+    }
 
-   function escape($s, $safecount=0) {
+    function escape($s, $safecount=0) {
       
-      $safecount++;
-      if(1000<$safecount) exit("Too many loops '{$safecount}'");
+        $safecount++;
+        if(1000<$safecount) exit("Too many loops '{$safecount}'");
       
-      if (empty ($this->conn) || !is_resource($this->conn)) {
-         $this->connect();
-       }
+        if (empty ($this->conn) || !is_resource($this->conn)) {
+            $this->connect();
+        }
        
-      if(is_array($s)) {
-          if(count($s) === 0) $s = '';
-          else {
-              foreach($s as $i=>$v) {
-                  $s[$i] = $this->escape($v,$safecount);
-              }
-          }
-      }
-      else $s = mysql_real_escape_string($s, $this->conn);
-          return $s;
-   }
+        if(is_array($s)) {
+            if(count($s) === 0) $s = '';
+            else {
+                foreach($s as $i=>$v) {
+                    $s[$i] = $this->escape($v,$safecount);
+                }
+            }
+        }
+        else $s = mysql_real_escape_string($s, $this->conn);
+            return $s;
+    }
 
-   /**
-    * @name:  query
-    * @desc:  Mainly for internal use.
-    * Developers should use select, update, insert, delete where possible
-    */
-   function query($sql,$watchError=true) {
-      global $modx;
-      if (empty ($this->conn) || !is_resource($this->conn)) {
-         $this->connect();
-      }
-      $tstart = $modx->getMicroTime();
-      if(is_array($sql)) $sql = join("\n", $sql);
-      $this->lastQuery = $sql;
-      if (!$result = @ mysql_query($sql, $this->conn)) {
-         if(!$watchError) return;
+    /**
+     * @name:  query
+     * @desc:  Mainly for internal use.
+     * Developers should use select, update, insert, delete where possible
+     */
+    function query($sql,$watchError=true) {
+        global $modx;
+        if (empty ($this->conn) || !is_resource($this->conn)) {
+            $this->connect();
+        }
+        $tstart = $modx->getMicroTime();
+        if(is_array($sql)) $sql = join("\n", $sql);
+        $this->lastQuery = $sql;
+        if (!$result = @ mysql_query($sql, $this->conn)) {
+            if(!$watchError) return;
             switch(mysql_errno()) {
                 case 1054:
                 case 1060:
@@ -198,11 +198,11 @@ 
                 default:
                     $modx->messageQuit('Execution of a query to the database failed - ' . $this->getLastError(), $sql);
             }
-      } else {
-         $tend = $modx->getMicroTime();
-         $totaltime = $tend - $tstart;
-         $modx->queryTime = $modx->queryTime + $totaltime;
-         if ($modx->dumpSQL) {
+        } else {
+            $tend = $modx->getMicroTime();
+            $totaltime = $tend - $tstart;
+            $modx->queryTime = $modx->queryTime + $totaltime;
+            if ($modx->dumpSQL) {
             $debug = debug_backtrace();
             array_shift($debug);	
             $debug_path = array();
@@ -217,124 +217,124 @@ 
             else $modx->queryCode .= 'Affected Rows => ' . $this->getAffectedRows() . '<br>';
             $modx->queryCode .= 'Functions Path => ' . $debug_path . '<br>';
             $modx->queryCode .= "</fieldset><br />";
-         }
-         $modx->executedQueries = $modx->executedQueries + 1;
-         return $result;
-      }
-   }
+            }
+            $modx->executedQueries = $modx->executedQueries + 1;
+            return $result;
+        }
+    }
 
-   /**
-    * @name:  delete
-    *
-    */
-   function delete($from, $where='', $orderby='', $limit = '') {
-      global $modx;
-      if (!$from)
-         $modx->messageQuit("Empty \$from parameters in DBAPI::delete().");
-      else {
-         $from = $this->replaceFullTableName($from);
-         $where   = trim($where);
-         $orderby = trim($orderby);
-         $limit   = trim($limit);
-         if($where!==''   && stripos($where,   'WHERE')!==0)    $where   = "WHERE {$where}";
-         if($orderby!=='' && stripos($orderby, 'ORDER BY')!==0) $orderby = "ORDER BY {$orderby}";
-         if($limit!==''   && stripos($limit,   'LIMIT')!==0)    $limit   = "LIMIT {$limit}";
-         return $this->query("DELETE FROM {$from} {$where} {$orderby} {$limit}");
-      }
-   }
+    /**
+     * @name:  delete
+     *
+     */
+    function delete($from, $where='', $orderby='', $limit = '') {
+        global $modx;
+        if (!$from)
+            $modx->messageQuit("Empty \$from parameters in DBAPI::delete().");
+        else {
+            $from = $this->replaceFullTableName($from);
+            $where   = trim($where);
+            $orderby = trim($orderby);
+            $limit   = trim($limit);
+            if($where!==''   && stripos($where,   'WHERE')!==0)    $where   = "WHERE {$where}";
+            if($orderby!=='' && stripos($orderby, 'ORDER BY')!==0) $orderby = "ORDER BY {$orderby}";
+            if($limit!==''   && stripos($limit,   'LIMIT')!==0)    $limit   = "LIMIT {$limit}";
+            return $this->query("DELETE FROM {$from} {$where} {$orderby} {$limit}");
+        }
+    }
 
-   /**
-    * @name:  select
-    *
-    */
-   function select($fields = "*", $from = "", $where = "", $orderby = "", $limit = "") {
-      global $modx;
+    /**
+     * @name:  select
+     *
+     */
+    function select($fields = "*", $from = "", $where = "", $orderby = "", $limit = "") {
+        global $modx;
       
-      if(is_array($fields)) $fields = $this->_getFieldsStringFromArray($fields);
-      if(is_array($from))   $from   = $this->_getFromStringFromArray($from);
-      if(is_array($where))  $where  = join(' ', $where);
+        if(is_array($fields)) $fields = $this->_getFieldsStringFromArray($fields);
+        if(is_array($from))   $from   = $this->_getFromStringFromArray($from);
+        if(is_array($where))  $where  = join(' ', $where);
       
-      if (!$from) {
-         $modx->messageQuit("Empty \$from parameters in DBAPI::select().");
-         exit;
-      }
+        if (!$from) {
+            $modx->messageQuit("Empty \$from parameters in DBAPI::select().");
+            exit;
+        }
       
-      $fields = $this->replaceFullTableName($fields);
-      $from = $this->replaceFullTableName($from);
-      $where   = trim($where);
-      $orderby = trim($orderby);
-      $limit   = trim($limit);
-      if($where!==''   && stripos($where,'WHERE')!==0)   $where   = "WHERE {$where}";
-      if($orderby!=='' && stripos($orderby,'ORDER')!==0) $orderby = "ORDER BY {$orderby}";
-      if($limit!==''   && stripos($limit,'LIMIT')!==0)   $limit   = "LIMIT {$limit}";
-      return $this->query("SELECT {$fields} FROM {$from} {$where} {$orderby} {$limit}");
-   }
+        $fields = $this->replaceFullTableName($fields);
+        $from = $this->replaceFullTableName($from);
+        $where   = trim($where);
+        $orderby = trim($orderby);
+        $limit   = trim($limit);
+        if($where!==''   && stripos($where,'WHERE')!==0)   $where   = "WHERE {$where}";
+        if($orderby!=='' && stripos($orderby,'ORDER')!==0) $orderby = "ORDER BY {$orderby}";
+        if($limit!==''   && stripos($limit,'LIMIT')!==0)   $limit   = "LIMIT {$limit}";
+        return $this->query("SELECT {$fields} FROM {$from} {$where} {$orderby} {$limit}");
+    }
 
-   /**
-    * @name:  update
-    *
-    */
-   function update($fields, $table, $where = "") {
-      global $modx;
-      if (!$table)
-         $modx->messageQuit("Empty \$table parameter in DBAPI::update().");
-      else {
-         $table = $this->replaceFullTableName($table);
-         if (is_array($fields)) {
-			 foreach ($fields as $key => $value) {
-				 if(is_null($value) || strtolower($value) === 'null'){
-					 $flds = 'NULL';
-				 }else{
-					 $flds = "'" . $value . "'";
-				 }
-				 $fields[$key] = "`{$key}` = ".$flds;
-			 }
+    /**
+     * @name:  update
+     *
+     */
+    function update($fields, $table, $where = "") {
+        global $modx;
+        if (!$table)
+            $modx->messageQuit("Empty \$table parameter in DBAPI::update().");
+        else {
+            $table = $this->replaceFullTableName($table);
+            if (is_array($fields)) {
+                foreach ($fields as $key => $value) {
+                    if(is_null($value) || strtolower($value) === 'null'){
+                        $flds = 'NULL';
+                    }else{
+                        $flds = "'" . $value . "'";
+                    }
+                    $fields[$key] = "`{$key}` = ".$flds;
+                }
             $fields = implode(",", $fields);
-         }
-         $where = trim($where);
-         if($where!=='' && stripos($where, 'WHERE')!==0) $where = "WHERE {$where}";
-         return $this->query("UPDATE {$table} SET {$fields} {$where}");
-      }
-   }
+            }
+            $where = trim($where);
+            if($where!=='' && stripos($where, 'WHERE')!==0) $where = "WHERE {$where}";
+            return $this->query("UPDATE {$table} SET {$fields} {$where}");
+        }
+    }
 
-   /**
-    * @name:  insert
-    * @desc:  returns either last id inserted or the result from the query
-    */
-   function insert($fields, $intotable, $fromfields = "*", $fromtable = "", $where = "", $limit = "") {
-      global $modx;
-      if (!$intotable)
-         $modx->messageQuit("Empty \$intotable parameters in DBAPI::insert().");
-      else {
-         $intotable = $this->replaceFullTableName($intotable);
-         if (!is_array($fields)) {
+    /**
+     * @name:  insert
+     * @desc:  returns either last id inserted or the result from the query
+     */
+    function insert($fields, $intotable, $fromfields = "*", $fromtable = "", $where = "", $limit = "") {
+        global $modx;
+        if (!$intotable)
+            $modx->messageQuit("Empty \$intotable parameters in DBAPI::insert().");
+        else {
+            $intotable = $this->replaceFullTableName($intotable);
+            if (!is_array($fields)) {
             $this->query("INSERT INTO {$intotable} {$fields}");
-         } else {
+            } else {
             if (empty($fromtable)) {
-               $fields = "(`".implode("`, `", array_keys($fields))."`) VALUES('".implode("', '", array_values($fields))."')";
-               $rt = $this->query("INSERT INTO {$intotable} {$fields}");
+                $fields = "(`".implode("`, `", array_keys($fields))."`) VALUES('".implode("', '", array_values($fields))."')";
+                $rt = $this->query("INSERT INTO {$intotable} {$fields}");
             } else {
-               if (version_compare($this->getVersion(),"4.0.14")>=0) {
-                  $fromtable = $this->replaceFullTableName($fromtable);
-                  $fields = "(".implode(",", array_keys($fields)).")";
-                  $where = trim($where);
-                  $limit = trim($limit);
-                  if($where!=='' && stripos($where, 'WHERE')!==0) $where = "WHERE {$where}";
-                  if($limit!=='' && stripos($limit, 'LIMIT')!==0) $limit = "LIMIT {$limit}";
-                  $rt = $this->query("INSERT INTO {$intotable} {$fields} SELECT {$fromfields} FROM {$fromtable} {$where} {$limit}");
-               } else {
-                  $ds = $this->select($fromfields, $fromtable, $where, '', $limit);
-                  while ($row = $this->getRow($ds)) {
-                     $fields = "(".implode(",", array_keys($fields)).") VALUES('".implode("', '", $row)."')";
-                     $rt = $this->query("INSERT INTO {$intotable} {$fields}");
-                  }
-               }
+                if (version_compare($this->getVersion(),"4.0.14")>=0) {
+                    $fromtable = $this->replaceFullTableName($fromtable);
+                    $fields = "(".implode(",", array_keys($fields)).")";
+                    $where = trim($where);
+                    $limit = trim($limit);
+                    if($where!=='' && stripos($where, 'WHERE')!==0) $where = "WHERE {$where}";
+                    if($limit!=='' && stripos($limit, 'LIMIT')!==0) $limit = "LIMIT {$limit}";
+                    $rt = $this->query("INSERT INTO {$intotable} {$fields} SELECT {$fromfields} FROM {$fromtable} {$where} {$limit}");
+                } else {
+                    $ds = $this->select($fromfields, $fromtable, $where, '', $limit);
+                    while ($row = $this->getRow($ds)) {
+                        $fields = "(".implode(",", array_keys($fields)).") VALUES('".implode("', '", $row)."')";
+                        $rt = $this->query("INSERT INTO {$intotable} {$fields}");
+                    }
+                }
+            }
             }
-         }
-         if (($lid = $this->getInsertId())===false) $modx->messageQuit("Couldn't get last insert key!");
-         return $lid;
-      }
-   }
+            if (($lid = $this->getInsertId())===false) $modx->messageQuit("Couldn't get last insert key!");
+            return $lid;
+        }
+    }
    
     function save($fields, $table, $where='') {
         
@@ -346,277 +346,277 @@ 
         else                 return $this->update($fields, $table, $where);
     }
     
-   /**
-    * @name:  isResult
-    *
-    */
-   function isResult($rs) {
-      return is_resource($rs);
-   }
+    /**
+     * @name:  isResult
+     *
+     */
+    function isResult($rs) {
+        return is_resource($rs);
+    }
 
-   /**
-    * @name:  freeResult
-    *
-    */
-   function freeResult($rs) {
-      mysql_free_result($rs);
-   }
+    /**
+     * @name:  freeResult
+     *
+     */
+    function freeResult($rs) {
+        mysql_free_result($rs);
+    }
    
-   /**
-    * @name:  numFields
-    *
-    */
-   function numFields($rs) {
-      return mysql_num_fields($rs);
-   }
+    /**
+     * @name:  numFields
+     *
+     */
+    function numFields($rs) {
+        return mysql_num_fields($rs);
+    }
    
-   /**
-    * @name:  fieldName
-    *
-    */
-   function fieldName($rs,$col=0) {
-      return mysql_field_name($rs,$col);
-   }
+    /**
+     * @name:  fieldName
+     *
+     */
+    function fieldName($rs,$col=0) {
+        return mysql_field_name($rs,$col);
+    }
    
     /**
-    * @name:  selectDb
-    *
-    */
-   function selectDb($name) {
-      mysql_select_db($name);
-   }
+     * @name:  selectDb
+     *
+     */
+    function selectDb($name) {
+        mysql_select_db($name);
+    }
    
 
-   /**
-    * @name:  getInsertId
-    *
-    */
-   function getInsertId($conn=NULL) {
-      if( !is_resource($conn)) $conn =& $this->conn;
-      return mysql_insert_id($conn);
-   }
+    /**
+     * @name:  getInsertId
+     *
+     */
+    function getInsertId($conn=NULL) {
+        if( !is_resource($conn)) $conn =& $this->conn;
+        return mysql_insert_id($conn);
+    }
 
-   /**
-    * @name:  getAffectedRows
-    *
-    */
-   function getAffectedRows($conn=NULL) {
-      if (!is_resource($conn)) $conn =& $this->conn;
-      return mysql_affected_rows($conn);
-   }
+    /**
+     * @name:  getAffectedRows
+     *
+     */
+    function getAffectedRows($conn=NULL) {
+        if (!is_resource($conn)) $conn =& $this->conn;
+        return mysql_affected_rows($conn);
+    }
 
-   /**
-    * @name:  getLastError
-    *
-    */
-   function getLastError($conn=NULL) {
-      if (!is_resource($conn)) $conn =& $this->conn;
-      return mysql_error($conn);
-   }
+    /**
+     * @name:  getLastError
+     *
+     */
+    function getLastError($conn=NULL) {
+        if (!is_resource($conn)) $conn =& $this->conn;
+        return mysql_error($conn);
+    }
 
-   /**
-    * @name:  getRecordCount
-    *
-    */
-   function getRecordCount($ds) {
-      return (is_resource($ds)) ? mysql_num_rows($ds) : 0;
-   }
+    /**
+     * @name:  getRecordCount
+     *
+     */
+    function getRecordCount($ds) {
+        return (is_resource($ds)) ? mysql_num_rows($ds) : 0;
+    }
 
-   /**
-    * @name:  getRow
-    * @desc:  returns an array of column values
-    * @param: $dsq - dataset
-    *
-    */
-   function getRow($ds, $mode = 'assoc') {
-      if (is_resource($ds)) {
-         if ($mode == 'assoc') {
+    /**
+     * @name:  getRow
+     * @desc:  returns an array of column values
+     * @param: $dsq - dataset
+     *
+     */
+    function getRow($ds, $mode = 'assoc') {
+        if (is_resource($ds)) {
+            if ($mode == 'assoc') {
             return mysql_fetch_assoc($ds);
-         }
-         elseif ($mode == 'num') {
+            }
+            elseif ($mode == 'num') {
             return mysql_fetch_row($ds);
-         }
-		 elseif ($mode == 'object') {
+            }
+            elseif ($mode == 'object') {
             return mysql_fetch_object($ds);
-         }
-         elseif ($mode == 'both') {
+            }
+            elseif ($mode == 'both') {
             return mysql_fetch_array($ds, MYSQL_BOTH);
-         } else {
+            } else {
             global $modx;
             $modx->messageQuit("Unknown get type ($mode) specified for fetchRow - must be empty, 'assoc', 'num' or 'both'.");
-         }
-      }
-   }
+            }
+        }
+    }
 
-   /**
-    * @name:  getColumn
-    * @desc:  returns an array of the values found on colun $name
-    * @param: $dsq - dataset or query string
-    */
-   function getColumn($name, $dsq) {
-      if (!is_resource($dsq))
-         $dsq = $this->query($dsq);
-      if ($dsq) {
-         $col = array ();
-         while ($row = $this->getRow($dsq)) {
+    /**
+     * @name:  getColumn
+     * @desc:  returns an array of the values found on colun $name
+     * @param: $dsq - dataset or query string
+     */
+    function getColumn($name, $dsq) {
+        if (!is_resource($dsq))
+            $dsq = $this->query($dsq);
+        if ($dsq) {
+            $col = array ();
+            while ($row = $this->getRow($dsq)) {
             $col[] = $row[$name];
-         }
-         return $col;
-      }
-   }
+            }
+            return $col;
+        }
+    }
 
-   /**
-    * @name:  getColumnNames
-    * @desc:  returns an array containing the column $name
-    * @param: $dsq - dataset or query string
-    */
-   function getColumnNames($dsq) {
-      if (!is_resource($dsq))
-         $dsq = $this->query($dsq);
-      if ($dsq) {
-         $names = array ();
-         $limit = mysql_num_fields($dsq);
-         for ($i = 0; $i < $limit; $i++) {
+    /**
+     * @name:  getColumnNames
+     * @desc:  returns an array containing the column $name
+     * @param: $dsq - dataset or query string
+     */
+    function getColumnNames($dsq) {
+        if (!is_resource($dsq))
+            $dsq = $this->query($dsq);
+        if ($dsq) {
+            $names = array ();
+            $limit = mysql_num_fields($dsq);
+            for ($i = 0; $i < $limit; $i++) {
             $names[] = mysql_field_name($dsq, $i);
-         }
-         return $names;
-      }
-   }
+            }
+            return $names;
+        }
+    }
 
-   /**
-    * @name:  getValue
-    * @desc:  returns the value from the first column in the set
-    * @param: $dsq - dataset or query string
-    */
-   function getValue($dsq) {
-      if (!is_resource($dsq))
-         $dsq = $this->query($dsq);
-      if ($dsq) {
-         $r = $this->getRow($dsq, "num");
-         return $r[0];
-      }
-   }
+    /**
+     * @name:  getValue
+     * @desc:  returns the value from the first column in the set
+     * @param: $dsq - dataset or query string
+     */
+    function getValue($dsq) {
+        if (!is_resource($dsq))
+            $dsq = $this->query($dsq);
+        if ($dsq) {
+            $r = $this->getRow($dsq, "num");
+            return $r[0];
+        }
+    }
 
-   /**
-    * @name:  getTableMetaData
-    * @desc:  returns an array of MySQL structure detail for each column of a
-    *         table
-    * @param: $table: the full name of the database table
-    */
-   function getTableMetaData($table) {
-      $metadata = false;
-      if (!empty ($table)) {
-         $sql = "SHOW FIELDS FROM $table";
-         if ($ds = $this->query($sql)) {
+    /**
+     * @name:  getTableMetaData
+     * @desc:  returns an array of MySQL structure detail for each column of a
+     *         table
+     * @param: $table: the full name of the database table
+     */
+    function getTableMetaData($table) {
+        $metadata = false;
+        if (!empty ($table)) {
+            $sql = "SHOW FIELDS FROM $table";
+            if ($ds = $this->query($sql)) {
             while ($row = $this->getRow($ds)) {
-               $fieldName = $row['Field'];
-               $metadata[$fieldName] = $row;
+                $fieldName = $row['Field'];
+                $metadata[$fieldName] = $row;
+            }
             }
-         }
-      }
-      return $metadata;
-   }
+        }
+        return $metadata;
+    }
 
-   /**
-    * @name:  prepareDate
-    * @desc:  prepares a date in the proper format for specific database types
-    *         given a UNIX timestamp
-    * @param: $timestamp: a UNIX timestamp
-    * @param: $fieldType: the type of field to format the date for
-    *         (in MySQL, you have DATE, TIME, YEAR, and DATETIME)
-    */
-   function prepareDate($timestamp, $fieldType = 'DATETIME') {
-      $date = '';
-      if (!$timestamp === false && $timestamp > 0) {
-         switch ($fieldType) {
+    /**
+     * @name:  prepareDate
+     * @desc:  prepares a date in the proper format for specific database types
+     *         given a UNIX timestamp
+     * @param: $timestamp: a UNIX timestamp
+     * @param: $fieldType: the type of field to format the date for
+     *         (in MySQL, you have DATE, TIME, YEAR, and DATETIME)
+     */
+    function prepareDate($timestamp, $fieldType = 'DATETIME') {
+        $date = '';
+        if (!$timestamp === false && $timestamp > 0) {
+            switch ($fieldType) {
             case 'DATE' :
                $date = date('Y-m-d', $timestamp);
-               break;
+                break;
             case 'TIME' :
                $date = date('H:i:s', $timestamp);
-               break;
+                break;
             case 'YEAR' :
                $date = date('Y', $timestamp);
-               break;
+                break;
             default :
                $date = date('Y-m-d H:i:s', $timestamp);
-               break;
-         }
-      }
-      return $date;
-   }
+                break;
+            }
+        }
+        return $date;
+    }
 
-   /**
-   * @name:  makeArray
-   * @desc:  turns a recordset into a multidimensional array
-   * @return: an array of row arrays from recordset, or empty array
-   *          if the recordset was empty, returns false if no recordset
-   *          was passed
-   * @param: $rs Recordset to be packaged into an array
-   */
-	function makeArray($rs='',$index=false){
-		if (!$rs) return false;
-		$rsArray = array();
-		$iterator = 0;
-		while ($row = $this->getRow($rs)) {
-			$returnIndex = $index !== false && isset($row[$index]) ? $row[$index] : $iterator;
-			$rsArray[$returnIndex] = $row;
-			$iterator++;
-		}
-		return $rsArray;
-	}
+    /**
+     * @name:  makeArray
+     * @desc:  turns a recordset into a multidimensional array
+     * @return: an array of row arrays from recordset, or empty array
+     *          if the recordset was empty, returns false if no recordset
+     *          was passed
+     * @param: $rs Recordset to be packaged into an array
+     */
+    function makeArray($rs='',$index=false){
+        if (!$rs) return false;
+        $rsArray = array();
+        $iterator = 0;
+        while ($row = $this->getRow($rs)) {
+            $returnIndex = $index !== false && isset($row[$index]) ? $row[$index] : $iterator;
+            $rsArray[$returnIndex] = $row;
+            $iterator++;
+        }
+        return $rsArray;
+    }
    
-   /**
-    * @name	getVersion
-    * @desc	returns a string containing the database server version
-    *
-    * @return string
-    */
-   function getVersion() {
-       return mysql_get_server_info();
-   }
+    /**
+     * @name	getVersion
+     * @desc	returns a string containing the database server version
+     *
+     * @return string
+     */
+    function getVersion() {
+        return mysql_get_server_info();
+    }
    
-   /**
-    * @name replaceFullTableName
-    * @desc  Get full table name. Append table name and table prefix.
-    * 
-    * @param string $str
-    * @return string 
-    */
-   function replaceFullTableName($str,$force=null) {
+    /**
+     * @name replaceFullTableName
+     * @desc  Get full table name. Append table name and table prefix.
+     * 
+     * @param string $str
+     * @return string 
+     */
+    function replaceFullTableName($str,$force=null) {
        
-       $str = trim($str);
-       $dbase  = trim($this->config['dbase'],'`');
-       $prefix = $this->config['table_prefix'];
-       if(!empty($force))
-       {
-           $result = "`{$dbase}`.`{$prefix}{$str}`";
-       }
-       elseif(strpos($str,'[+prefix+]')!==false)
-       {
-           $result = preg_replace('@\[\+prefix\+\]([0-9a-zA-Z_]+)@', "`{$dbase}`.`{$prefix}$1`", $str);
-       }
-       else $result = $str;
+        $str = trim($str);
+        $dbase  = trim($this->config['dbase'],'`');
+        $prefix = $this->config['table_prefix'];
+        if(!empty($force))
+        {
+            $result = "`{$dbase}`.`{$prefix}{$str}`";
+        }
+        elseif(strpos($str,'[+prefix+]')!==false)
+        {
+            $result = preg_replace('@\[\+prefix\+\]([0-9a-zA-Z_]+)@', "`{$dbase}`.`{$prefix}$1`", $str);
+        }
+        else $result = $str;
        
-       return $result;
-   }
+        return $result;
+    }
    
-   function optimize($table_name)
-   {
-       $rs = $this->query("OPTIMIZE TABLE {$table_name}");
-       if($rs) $rs = $this->query("ALTER TABLE {$table_name}");
-       return $rs;
-   }
+    function optimize($table_name)
+    {
+        $rs = $this->query("OPTIMIZE TABLE {$table_name}");
+        if($rs) $rs = $this->query("ALTER TABLE {$table_name}");
+        return $rs;
+    }
    
-   function truncate($table_name)
-   {
-       $rs = $this->query("TRUNCATE {$table_name}");
-       return $rs;
-   }
+    function truncate($table_name)
+    {
+        $rs = $this->query("TRUNCATE {$table_name}");
+        return $rs;
+    }
 
-  function dataSeek($result, $row_number) {
+    function dataSeek($result, $row_number) {
     return mysql_data_seek($result, $row_number);
-  }
+    }
   
     function _getFieldsStringFromArray($fields=array()) {
         

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

Indentation +213 added lines, -213 removed lines

@@ -1,258 +1,258 @@ 
 <?php
 class EXPORT_SITE
 {
-	var $targetDir;
-	var $generate_mode;
-	var $total;
-	var $count;
-	var $ignore_ids;
-	var $exportstart;
-	var $repl_before;
-	var $repl_after;
-	var $output = array();
+    var $targetDir;
+    var $generate_mode;
+    var $total;
+    var $count;
+    var $ignore_ids;
+    var $exportstart;
+    var $repl_before;
+    var $repl_after;
+    var $output = array();
 	
-	function __construct()
-	{
-		global $modx;
+    function __construct()
+    {
+        global $modx;
 		
-		if(!defined('MODX_BASE_PATH'))  return false;
-		$this->exportstart = $this->get_mtime();
-		$this->count = 0;
-		$this->setUrlMode();
-		$this->dirCheckCount = 0;
-		$this->generate_mode = 'crawl';
-		$this->targetDir = $modx->config['base_path'] . 'temp/export';
-		if(!isset($this->total)) $this->getTotal();
-	}
+        if(!defined('MODX_BASE_PATH'))  return false;
+        $this->exportstart = $this->get_mtime();
+        $this->count = 0;
+        $this->setUrlMode();
+        $this->dirCheckCount = 0;
+        $this->generate_mode = 'crawl';
+        $this->targetDir = $modx->config['base_path'] . 'temp/export';
+        if(!isset($this->total)) $this->getTotal();
+    }
 	
-	function setExportDir($dir)
-	{
-		$dir = str_replace('\\','/',$dir);
-		$dir = rtrim($dir, '/');
-		$this->targetDir = $dir;
-	}
+    function setExportDir($dir)
+    {
+        $dir = str_replace('\\','/',$dir);
+        $dir = rtrim($dir, '/');
+        $this->targetDir = $dir;
+    }
 	
-	function get_mtime()
-	{
-		$mtime = microtime();
-		$mtime = explode(' ', $mtime);
-		$mtime = $mtime[1] + $mtime[0];
-		return $mtime;
-	}
+    function get_mtime()
+    {
+        $mtime = microtime();
+        $mtime = explode(' ', $mtime);
+        $mtime = $mtime[1] + $mtime[0];
+        return $mtime;
+    }
 	
-	function setUrlMode()
-	{
-		global $modx;
+    function setUrlMode()
+    {
+        global $modx;
 		
-		if($modx->config['friendly_urls']==0)
-		{
-			$modx->config['friendly_urls']  = 1;
-			$modx->config['use_alias_path'] = 1;
-			$modx->clearCache('full');
-		}
-		$modx->config['make_folders'] = '1';
-	}
+        if($modx->config['friendly_urls']==0)
+        {
+            $modx->config['friendly_urls']  = 1;
+            $modx->config['use_alias_path'] = 1;
+            $modx->clearCache('full');
+        }
+        $modx->config['make_folders'] = '1';
+    }
 	
-	function getTotal($ignore_ids='', $noncache='0')
-	{
-		global $modx;
-		$tbl_site_content = $modx->getFullTableName('site_content');
+    function getTotal($ignore_ids='', $noncache='0')
+    {
+        global $modx;
+        $tbl_site_content = $modx->getFullTableName('site_content');
 		
-		$ignore_ids = array_filter(array_map('intval', explode(',', $ignore_ids)));
-		if(count($ignore_ids)>0)
-		{
-			$ignore_ids = "AND NOT id IN ('".implode("','", $ignore_ids)."')";
-		} else {
-			$ignore_ids = '';
-		}
+        $ignore_ids = array_filter(array_map('intval', explode(',', $ignore_ids)));
+        if(count($ignore_ids)>0)
+        {
+            $ignore_ids = "AND NOT id IN ('".implode("','", $ignore_ids)."')";
+        } else {
+            $ignore_ids = '';
+        }
 		
-		$this->ignore_ids = $ignore_ids;
+        $this->ignore_ids = $ignore_ids;
 		
-		$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 = $modx->db->getValue($rs);
-		return $this->total;
-	}
+        $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 = $modx->db->getValue($rs);
+        return $this->total;
+    }
 	
-	function removeDirectoryAll($directory='')
-	{
-		if(empty($directory)) $directory = $this->targetDir;
-		$directory = rtrim($directory,'/');
-		// if the path is not valid or is not a directory ...
-		if(empty($directory)) return false;
-		if(strpos($directory,MODX_BASE_PATH)===false) return FALSE;
+    function removeDirectoryAll($directory='')
+    {
+        if(empty($directory)) $directory = $this->targetDir;
+        $directory = rtrim($directory,'/');
+        // if the path is not valid or is not a directory ...
+        if(empty($directory)) return false;
+        if(strpos($directory,MODX_BASE_PATH)===false) return FALSE;
 		
-		if(!is_dir($directory))          return FALSE;
-		elseif(!is_readable($directory)) return FALSE;
-		else
-		{
-			$files = glob($directory . '/*');
-			if(!empty($files))
-			{
-    			foreach($files as $path)
-    			{
-    				if(is_dir($path)) $this->removeDirectoryAll($path);
-    				else              $rs = unlink($path);
-    			}
-			}
-		}
-		if($directory !== $this->targetDir) $rs = rmdir($directory);
+        if(!is_dir($directory))          return FALSE;
+        elseif(!is_readable($directory)) return FALSE;
+        else
+        {
+            $files = glob($directory . '/*');
+            if(!empty($files))
+            {
+                foreach($files as $path)
+                {
+                    if(is_dir($path)) $this->removeDirectoryAll($path);
+                    else              $rs = unlink($path);
+                }
+            }
+        }
+        if($directory !== $this->targetDir) $rs = rmdir($directory);
 		
-		return $rs;
-	}
+        return $rs;
+    }
 
-	function makeFile($docid, $filepath)
-	{
-		global  $modx,$_lang;
-		$file_permission = octdec($modx->config['new_file_permissions']);
-		if($this->generate_mode==='direct')
-		{
-			$back_lang = $_lang;
-			$src = $modx->executeParser($docid);
+    function makeFile($docid, $filepath)
+    {
+        global  $modx,$_lang;
+        $file_permission = octdec($modx->config['new_file_permissions']);
+        if($this->generate_mode==='direct')
+        {
+            $back_lang = $_lang;
+            $src = $modx->executeParser($docid);
 			
-			$_lang = $back_lang;
-		}
-		else $src = $this->curl_get_contents(MODX_SITE_URL . "index.php?id={$docid}");
+            $_lang = $back_lang;
+        }
+        else $src = $this->curl_get_contents(MODX_SITE_URL . "index.php?id={$docid}");
 		
 		
-		if($src !== false)
-		{
-			if($this->repl_before!==$this->repl_after) $src = str_replace($this->repl_before,$this->repl_after,$src);
-			$result = file_put_contents($filepath,$src);
-			if($result!==false) @chmod($filepath, $file_permission);
+        if($src !== false)
+        {
+            if($this->repl_before!==$this->repl_after) $src = str_replace($this->repl_before,$this->repl_after,$src);
+            $result = file_put_contents($filepath,$src);
+            if($result!==false) @chmod($filepath, $file_permission);
 			
-			if($result !== false) return 'success';
-			else                  return 'failed_no_write';
-		}
-		else                      return 'failed_no_retrieve';
-	}
+            if($result !== false) return 'success';
+            else                  return 'failed_no_write';
+        }
+        else                      return 'failed_no_retrieve';
+    }
 
-	function getFileName($docid, $alias='', $prefix, $suffix)
-	{
-		global $modx;
+    function getFileName($docid, $alias='', $prefix, $suffix)
+    {
+        global $modx;
 		
-		if($alias==='') $filename = $prefix.$docid.$suffix;
-		else
-		{
-			if($modx->config['suffix_mode']==='1' && strpos($alias, '.')!==false)
-			{
-				$suffix = '';
-			}
-			$filename = $prefix.$alias.$suffix;
-		}
-		return $filename;
-	}
+        if($alias==='') $filename = $prefix.$docid.$suffix;
+        else
+        {
+            if($modx->config['suffix_mode']==='1' && strpos($alias, '.')!==false)
+            {
+                $suffix = '';
+            }
+            $filename = $prefix.$alias.$suffix;
+        }
+        return $filename;
+    }
 
-	function run($parent=0)
-	{
-		global $_lang;
-		global $modx;
+    function run($parent=0)
+    {
+        global $_lang;
+        global $modx;
 		
-		$tbl_site_content = $modx->getFullTableName('site_content');
+        $tbl_site_content = $modx->getFullTableName('site_content');
 		
-		$ignore_ids = $this->ignore_ids;
-		$dirpath = $this->targetDir . '/';
+        $ignore_ids = $this->ignore_ids;
+        $dirpath = $this->targetDir . '/';
 		
-		$prefix = $modx->config['friendly_url_prefix'];
-		$suffix = $modx->config['friendly_url_suffix'];
+        $prefix = $modx->config['friendly_url_prefix'];
+        $suffix = $modx->config['friendly_url_suffix'];
 		
-		$tpl = ' <span class="[+status+]">[+msg1+]</span> [+msg2+]</span>';
-		$ph = array();
+        $tpl = ' <span class="[+status+]">[+msg1+]</span> [+msg2+]</span>';
+        $ph = array();
 		
-		$ph['status'] = 'fail';
-		$ph['msg1']   = $_lang['export_site_failed'];
-		$ph['msg2']   = $_lang["export_site_failed_no_write"] . ' - ' . $dirpath;
-		$msg_failed_no_write    = $this->parsePlaceholder($tpl,$ph);
+        $ph['status'] = 'fail';
+        $ph['msg1']   = $_lang['export_site_failed'];
+        $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"];
-		$msg_failed_no_retrieve = $this->parsePlaceholder($tpl,$ph);
+        $ph['msg2']   = $_lang["export_site_failed_no_retrieve"];
+        $msg_failed_no_retrieve = $this->parsePlaceholder($tpl,$ph);
 		
-		$ph['status'] = 'success';
-		$ph['msg1']   = $_lang['export_site_success'];
-		$ph['msg2']   = '';
-		$msg_success            = $this->parsePlaceholder($tpl,$ph);
+        $ph['status'] = 'success';
+        $ph['msg1']   = $_lang['export_site_success'];
+        $ph['msg2']   = '';
+        $msg_success            = $this->parsePlaceholder($tpl,$ph);
 		
-		$ph['msg2']   = $_lang['export_site_success_skip_doc'];
-		$msg_success_skip_doc = $this->parsePlaceholder($tpl,$ph);
+        $ph['msg2']   = $_lang['export_site_success_skip_doc'];
+        $msg_success_skip_doc = $this->parsePlaceholder($tpl,$ph);
 		
-		$ph['msg2']   = $_lang['export_site_success_skip_dir'];
-		$msg_success_skip_dir = $this->parsePlaceholder($tpl,$ph);
+        $ph['msg2']   = $_lang['export_site_success_skip_dir'];
+        $msg_success_skip_dir = $this->parsePlaceholder($tpl,$ph);
 		
-		$fields = "id, alias, pagetitle, isfolder, (content = '' AND template = 0) AS wasNull, published";
-		$noncache = $_POST['includenoncache']==1 ? '' : 'AND cacheable=1';
-		$where = "parent = '{$parent}' AND deleted=0 AND ((published=1 AND type='document') OR (isfolder=1)) {$noncache} {$ignore_ids}";
-		$rs = $modx->db->select($fields,$tbl_site_content,$where);
+        $fields = "id, alias, pagetitle, isfolder, (content = '' AND template = 0) AS wasNull, published";
+        $noncache = $_POST['includenoncache']==1 ? '' : 'AND cacheable=1';
+        $where = "parent = '{$parent}' AND deleted=0 AND ((published=1 AND type='document') OR (isfolder=1)) {$noncache} {$ignore_ids}";
+        $rs = $modx->db->select($fields,$tbl_site_content,$where);
 		
-		$ph = array();
-		$ph['total']     = $this->total;
-		$folder_permission = octdec($modx->config['new_folder_permissions']);
-		while($row = $modx->db->getRow($rs))
-		{
-			$this->count++;
+        $ph = array();
+        $ph['total']     = $this->total;
+        $folder_permission = octdec($modx->config['new_folder_permissions']);
+        while($row = $modx->db->getRow($rs))
+        {
+            $this->count++;
 			
-			$row['count']     = $this->count;
-			$row['url'] = $modx->makeUrl($row['id']);
+            $row['count']     = $this->count;
+            $row['url'] = $modx->makeUrl($row['id']);
 			
-			if (!$row['wasNull'])
-			{ // needs writing a document
-				$docname = $this->getFileName($row['id'], $row['alias'], $prefix, $suffix);
-				$filename = $dirpath.$docname;
-				if (!is_file($filename))
-				{
-					if($row['published']==='1')
-					{
-						$status = $this->makeFile($row['id'], $filename);
-						switch($status)
-						{
-							case 'failed_no_write'   :
+            if (!$row['wasNull'])
+            { // needs writing a document
+                $docname = $this->getFileName($row['id'], $row['alias'], $prefix, $suffix);
+                $filename = $dirpath.$docname;
+                if (!is_file($filename))
+                {
+                    if($row['published']==='1')
+                    {
+                        $status = $this->makeFile($row['id'], $filename);
+                        switch($status)
+                        {
+                            case 'failed_no_write'   :
                                                             $row['status'] = $msg_failed_no_write;
                                                             break;
-							case 'failed_no_retrieve':
+                            case 'failed_no_retrieve':
                                                             $row['status'] = $msg_failed_no_retrieve;
                                                             break;
-							default:
+                            default:
                                                             $row['status'] = $msg_success;
-						}
-					}
-					else $row['status'] = $msg_failed_no_retrieve;
-				}
-				else     $row['status'] = $msg_success_skip_doc;
-				$this->output[] = $this->parsePlaceholder($_lang['export_site_exporting_document'], $row);
-			}
-			else
-			{
-				$row['status'] = $msg_success_skip_dir;
-				$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
-				$end_dir = ($row['alias']!=='') ? $row['alias'] : $row['id'];
-				$dir_path = $dirpath . $end_dir;
-				if(strpos($dir_path,MODX_BASE_PATH)===false) return FALSE;
-				if (!is_dir($dir_path))
-				{
-					if (is_file($dir_path)) @unlink($dir_path);
-					mkdir($dir_path);
-					@chmod($dir_path, $folder_permission);
+                        }
+                    }
+                    else $row['status'] = $msg_failed_no_retrieve;
+                }
+                else     $row['status'] = $msg_success_skip_doc;
+                $this->output[] = $this->parsePlaceholder($_lang['export_site_exporting_document'], $row);
+            }
+            else
+            {
+                $row['status'] = $msg_success_skip_dir;
+                $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
+                $end_dir = ($row['alias']!=='') ? $row['alias'] : $row['id'];
+                $dir_path = $dirpath . $end_dir;
+                if(strpos($dir_path,MODX_BASE_PATH)===false) return FALSE;
+                if (!is_dir($dir_path))
+                {
+                    if (is_file($dir_path)) @unlink($dir_path);
+                    mkdir($dir_path);
+                    @chmod($dir_path, $folder_permission);
 					
-				}
+                }
 				
 				
-				if($modx->config['make_folders']==='1' && $row['published']==='1')
-				{
-					if(is_file($filename)) rename($filename,$dir_path . '/index.html');
-				}
-				$this->targetDir = $dir_path;
-				$this->run($row['id']);
-			}
-		}
-		return implode("\n", $this->output);
-	}
+                if($modx->config['make_folders']==='1' && $row['published']==='1')
+                {
+                    if(is_file($filename)) rename($filename,$dir_path . '/index.html');
+                }
+                $this->targetDir = $dir_path;
+                $this->run($row['id']);
+            }
+        }
+        return implode("\n", $this->output);
+    }
 	
     function curl_get_contents($url, $timeout = 30 )
     {
-    	if(!function_exists('curl_init')) return @file_get_contents($url);
+        if(!function_exists('curl_init')) return @file_get_contents($url);
 
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $url);
@@ -269,12 +269,12 @@ 
 
     function parsePlaceholder($tpl,$ph=array())
     {
-    	foreach($ph as $k=>$v)
-    	{
-    		$k = "[+{$k}+]";
-    		$tpl = str_replace($k,$v,$tpl);
-    	}
-    	return $tpl;
+        foreach($ph as $k=>$v)
+        {
+            $k = "[+{$k}+]";
+            $tpl = str_replace($k,$v,$tpl);
+        }
+        return $tpl;
     }
 
 }

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

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

Indentation +2 added lines, -2 removed lines

@@ -598,7 +598,7 @@ 
                     else               $opt = true;
                 }
                 elseif(isset($modx->config['mce_element_format'])&&$modx->config['mce_element_format']==='html')
-                                       $opt = false;
+                                        $opt = false;
                 else                   $opt = true;
                 return nl2br($value,$opt);
             case 'ltrim':
@@ -1022,7 +1022,7 @@ 
         {
             $bt = $content;
             if(strpos($content,'[*')!==false && $modx->documentIdentifier)
-                                              $content = $modx->mergeDocumentContent($content);
+                                                $content = $modx->mergeDocumentContent($content);
             if(strpos($content,'[(')!==false) $content = $modx->mergeSettingsContent($content);
             if(strpos($content,'{{')!==false) $content = $modx->mergeChunkContent($content);
             if(strpos($content,'[!')!==false) $content = str_replace(array('[!','!]'),array('[[',']]'),$content);