Completed
Pull Request — develop (#518)
by Agel_Nash
05:24
created
manager/includes/manager.lockout.inc.php 3 patches
Indentation   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
 
23 23
     // load template
24 24
     if(!isset($modx->config['manager_lockout_tpl']) || empty($modx->config['manager_lockout_tpl'])) {
25
-    	$modx->config['manager_lockout_tpl'] = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl'; 
25
+        $modx->config['manager_lockout_tpl'] = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl'; 
26 26
     }
27 27
     
28 28
     $target = $modx->config['manager_lockout_tpl'];
@@ -30,40 +30,40 @@  discard block
 block discarded – undo
30 30
     $target = $modx->mergeSettingsContent($target);
31 31
     
32 32
     if(substr($target,0,1)==='@') {
33
-    	if(substr($target,0,6)==='@CHUNK') {
34
-    		$target = trim(substr($target,7));
35
-    		$lockout_tpl = $modx->getChunk($target);
36
-    	}
37
-    	elseif(substr($target,0,5)==='@FILE') {
38
-    		$target = trim(substr($target,6));
39
-    		$lockout_tpl = file_get_contents($target);
40
-    	}
41
-	} else {
42
-    	$chunk = $modx->getChunk($target);
43
-    	if($chunk!==false && !empty($chunk)) {
44
-    		$lockout_tpl = $chunk;
45
-    	}
46
-    	elseif(is_file(MODX_BASE_PATH . $target)) {
47
-    		$target = MODX_BASE_PATH . $target;
48
-    		$lockout_tpl = file_get_contents($target);
49
-    	}
50
-    	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl')) {
51
-    		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl';
52
-    		$lockout_tpl = file_get_contents($target);
53
-    	}
54
-	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl')) {
55
-		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl';
56
-		$login_tpl = file_get_contents($target);
57
-	}
58
-    	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html')) { // ClipperCMS compatible
59
-    		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html';
60
-    		$lockout_tpl = file_get_contents($target);
61
-    	}
62
-    	else {
63
-    		$target = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl';
64
-    		$lockout_tpl = file_get_contents($target);
65
-    	}
66
-	}
33
+        if(substr($target,0,6)==='@CHUNK') {
34
+            $target = trim(substr($target,7));
35
+            $lockout_tpl = $modx->getChunk($target);
36
+        }
37
+        elseif(substr($target,0,5)==='@FILE') {
38
+            $target = trim(substr($target,6));
39
+            $lockout_tpl = file_get_contents($target);
40
+        }
41
+    } else {
42
+        $chunk = $modx->getChunk($target);
43
+        if($chunk!==false && !empty($chunk)) {
44
+            $lockout_tpl = $chunk;
45
+        }
46
+        elseif(is_file(MODX_BASE_PATH . $target)) {
47
+            $target = MODX_BASE_PATH . $target;
48
+            $lockout_tpl = file_get_contents($target);
49
+        }
50
+        elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl')) {
51
+            $target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl';
52
+            $lockout_tpl = file_get_contents($target);
53
+        }
54
+    elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl')) {
55
+        $target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl';
56
+        $login_tpl = file_get_contents($target);
57
+    }
58
+        elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html')) { // ClipperCMS compatible
59
+            $target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html';
60
+            $lockout_tpl = file_get_contents($target);
61
+        }
62
+        else {
63
+            $target = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl';
64
+            $lockout_tpl = file_get_contents($target);
65
+        }
66
+    }
67 67
 
68 68
     // merge placeholders
69 69
     $lockout_tpl = $modx->mergePlaceholderContent($lockout_tpl);
Please login to merge, or discard this patch.
Spacing   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -1,73 +1,73 @@
 block discarded – undo
1 1
 <?php
2
-if(IN_MANAGER_MODE!="true") die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
2
+if (IN_MANAGER_MODE != "true") die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
3 3
 
4
-if($modx->manager->action!='8' && isset($_SESSION['mgrValidated'])){
4
+if ($modx->manager->action != '8' && isset($_SESSION['mgrValidated'])) {
5 5
     
6
-    $homeurl = $modx->makeUrl($manager_login_startup>0 ? $manager_login_startup:$site_start);
6
+    $homeurl = $modx->makeUrl($manager_login_startup > 0 ? $manager_login_startup : $site_start);
7 7
     $logouturl = MODX_MANAGER_URL.'index.php?a=8';
8 8
 
9
-    $modx->setPlaceholder('modx_charset',$modx_manager_charset);
10
-    $modx->setPlaceholder('theme',$manager_theme);
9
+    $modx->setPlaceholder('modx_charset', $modx_manager_charset);
10
+    $modx->setPlaceholder('theme', $manager_theme);
11 11
 
12
-    $modx->setPlaceholder('site_name',$site_name);
13
-    $modx->setPlaceholder('logo_slogan',$_lang["logo_slogan"]);
14
-    $modx->setPlaceholder('manager_lockout_message',$_lang["manager_lockout_message"]);
12
+    $modx->setPlaceholder('site_name', $site_name);
13
+    $modx->setPlaceholder('logo_slogan', $_lang["logo_slogan"]);
14
+    $modx->setPlaceholder('manager_lockout_message', $_lang["manager_lockout_message"]);
15 15
 
16
-    $modx->setPlaceholder('home',$_lang["home"]);
17
-    $modx->setPlaceholder('homeurl',$homeurl);
18
-    $modx->setPlaceholder('logout',$_lang["logout"]);
19
-    $modx->setPlaceholder('logouturl',$logouturl);
20
-    $modx->setPlaceholder('manager_theme_url',MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/');
21
-    $modx->setPlaceholder('year',date('Y'));
16
+    $modx->setPlaceholder('home', $_lang["home"]);
17
+    $modx->setPlaceholder('homeurl', $homeurl);
18
+    $modx->setPlaceholder('logout', $_lang["logout"]);
19
+    $modx->setPlaceholder('logouturl', $logouturl);
20
+    $modx->setPlaceholder('manager_theme_url', MODX_MANAGER_URL.'media/style/'.$modx->config['manager_theme'].'/');
21
+    $modx->setPlaceholder('year', date('Y'));
22 22
 
23 23
     // load template
24
-    if(!isset($modx->config['manager_lockout_tpl']) || empty($modx->config['manager_lockout_tpl'])) {
25
-    	$modx->config['manager_lockout_tpl'] = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl'; 
24
+    if (!isset($modx->config['manager_lockout_tpl']) || empty($modx->config['manager_lockout_tpl'])) {
25
+    	$modx->config['manager_lockout_tpl'] = MODX_MANAGER_PATH.'media/style/common/manager.lockout.tpl'; 
26 26
     }
27 27
     
28 28
     $target = $modx->config['manager_lockout_tpl'];
29 29
     $target = str_replace('[+base_path+]', MODX_BASE_PATH, $target);
30 30
     $target = $modx->mergeSettingsContent($target);
31 31
     
32
-    if(substr($target,0,1)==='@') {
33
-    	if(substr($target,0,6)==='@CHUNK') {
34
-    		$target = trim(substr($target,7));
32
+    if (substr($target, 0, 1) === '@') {
33
+    	if (substr($target, 0, 6) === '@CHUNK') {
34
+    		$target = trim(substr($target, 7));
35 35
     		$lockout_tpl = $modx->getChunk($target);
36 36
     	}
37
-    	elseif(substr($target,0,5)==='@FILE') {
38
-    		$target = trim(substr($target,6));
37
+    	elseif (substr($target, 0, 5) === '@FILE') {
38
+    		$target = trim(substr($target, 6));
39 39
     		$lockout_tpl = file_get_contents($target);
40 40
     	}
41 41
 	} else {
42 42
     	$chunk = $modx->getChunk($target);
43
-    	if($chunk!==false && !empty($chunk)) {
43
+    	if ($chunk !== false && !empty($chunk)) {
44 44
     		$lockout_tpl = $chunk;
45 45
     	}
46
-    	elseif(is_file(MODX_BASE_PATH . $target)) {
47
-    		$target = MODX_BASE_PATH . $target;
46
+    	elseif (is_file(MODX_BASE_PATH.$target)) {
47
+    		$target = MODX_BASE_PATH.$target;
48 48
     		$lockout_tpl = file_get_contents($target);
49 49
     	}
50
-    	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl')) {
51
-    		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl';
50
+    	elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/manager.lockout.tpl')) {
51
+    		$target = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/manager.lockout.tpl';
52 52
     		$lockout_tpl = file_get_contents($target);
53 53
     	}
54
-	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl')) {
55
-		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl';
54
+	elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/templates/actions/manager.lockout.tpl')) {
55
+		$target = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/templates/actions/manager.lockout.tpl';
56 56
 		$login_tpl = file_get_contents($target);
57 57
 	}
58
-    	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html')) { // ClipperCMS compatible
59
-    		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html';
58
+    	elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/manager.lockout.html')) { // ClipperCMS compatible
59
+    		$target = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/manager.lockout.html';
60 60
     		$lockout_tpl = file_get_contents($target);
61 61
     	}
62 62
     	else {
63
-    		$target = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl';
63
+    		$target = MODX_MANAGER_PATH.'media/style/common/manager.lockout.tpl';
64 64
     		$lockout_tpl = file_get_contents($target);
65 65
     	}
66 66
 	}
67 67
 
68 68
     // merge placeholders
69 69
     $lockout_tpl = $modx->mergePlaceholderContent($lockout_tpl);
70
-    $regx = strpos($lockout_tpl,'[[+')!==false ? '~\[\[\+(.*?)\]\]~' : '~\[\+(.*?)\+\]~'; // little tweak for newer parsers
70
+    $regx = strpos($lockout_tpl, '[[+') !== false ? '~\[\[\+(.*?)\]\]~' : '~\[\+(.*?)\+\]~'; // little tweak for newer parsers
71 71
     $lockout_tpl = preg_replace($regx, '', $lockout_tpl); //cleanup
72 72
 
73 73
     echo $lockout_tpl;    
Please login to merge, or discard this patch.
Braces   +11 added lines, -14 removed lines patch added patch discarded remove patch
@@ -1,7 +1,9 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(IN_MANAGER_MODE!="true") die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
2
+if(IN_MANAGER_MODE!="true") {
3
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4
+}
3 5
 
4
-if($modx->manager->action!='8' && isset($_SESSION['mgrValidated'])){
6
+if($modx->manager->action!='8' && isset($_SESSION['mgrValidated'])) {
5 7
     
6 8
     $homeurl = $modx->makeUrl($manager_login_startup>0 ? $manager_login_startup:$site_start);
7 9
     $logouturl = MODX_MANAGER_URL.'index.php?a=8';
@@ -33,8 +35,7 @@  discard block
 block discarded – undo
33 35
     	if(substr($target,0,6)==='@CHUNK') {
34 36
     		$target = trim(substr($target,7));
35 37
     		$lockout_tpl = $modx->getChunk($target);
36
-    	}
37
-    	elseif(substr($target,0,5)==='@FILE') {
38
+    	} elseif(substr($target,0,5)==='@FILE') {
38 39
     		$target = trim(substr($target,6));
39 40
     		$lockout_tpl = file_get_contents($target);
40 41
     	}
@@ -42,24 +43,20 @@  discard block
 block discarded – undo
42 43
     	$chunk = $modx->getChunk($target);
43 44
     	if($chunk!==false && !empty($chunk)) {
44 45
     		$lockout_tpl = $chunk;
45
-    	}
46
-    	elseif(is_file(MODX_BASE_PATH . $target)) {
46
+    	} elseif(is_file(MODX_BASE_PATH . $target)) {
47 47
     		$target = MODX_BASE_PATH . $target;
48 48
     		$lockout_tpl = file_get_contents($target);
49
-    	}
50
-    	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl')) {
49
+    	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl')) {
51 50
     		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl';
52 51
     		$lockout_tpl = file_get_contents($target);
53
-    	}
54
-	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl')) {
52
+    	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl')) {
55 53
 		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl';
56 54
 		$login_tpl = file_get_contents($target);
57
-	}
58
-    	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html')) { // ClipperCMS compatible
55
+	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html')) {
56
+// ClipperCMS compatible
59 57
     		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html';
60 58
     		$lockout_tpl = file_get_contents($target);
61
-    	}
62
-    	else {
59
+    	} else {
63 60
     		$target = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl';
64 61
     		$lockout_tpl = file_get_contents($target);
65 62
     	}
Please login to merge, or discard this patch.
manager/includes/tmplvars.inc.php 3 patches
Indentation   +250 added lines, -250 removed lines patch added patch discarded remove patch
@@ -1,159 +1,159 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 // DISPLAY FORM ELEMENTS
3 3
 function renderFormElement($field_type, $field_id, $default_text = '', $field_elements = '', $field_value = '', $field_style = '', $row = array(), $tvsArray = array()) {
4
-	global $modx;
5
-	global $_style;
6
-	global $_lang;
7
-	global $content;
8
-	global $which_browser;
4
+    global $modx;
5
+    global $_style;
6
+    global $_lang;
7
+    global $content;
8
+    global $which_browser;
9 9
 
10
-	if(substr($default_text, 0, 6) === '@@EVAL' && $field_value === $default_text) {
11
-		$eval_str = trim(substr($default_text, 7));
12
-		$default_text = eval($eval_str);
13
-		$field_value = $default_text;
14
-	}
10
+    if(substr($default_text, 0, 6) === '@@EVAL' && $field_value === $default_text) {
11
+        $eval_str = trim(substr($default_text, 7));
12
+        $default_text = eval($eval_str);
13
+        $field_value = $default_text;
14
+    }
15 15
 
16
-	$field_html = '';
17
-	$cimode = strpos($field_type, ':');
18
-	if($cimode === false) {
19
-		switch($field_type) {
16
+    $field_html = '';
17
+    $cimode = strpos($field_type, ':');
18
+    if($cimode === false) {
19
+        switch($field_type) {
20 20
 
21
-			case "text": // handler for regular text boxes
22
-			case "rawtext"; // non-htmlentity converted text boxes
23
-				$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%" />';
24
-				break;
25
-			case "email": // handles email input fields
26
-				$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%"/>';
27
-				break;
28
-			case "number": // handles the input of numbers
29
-				$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-,.+]/,\'\')"/>';
30
-				break;
31
-			case "textareamini": // handler for textarea mini boxes
32
-				$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>';
33
-				break;
34
-			case "textarea": // handler for textarea boxes
35
-			case "rawtextarea": // non-htmlentity convertex textarea boxes
36
-			case "htmlarea": // handler for textarea boxes (deprecated)
37
-			case "richtext": // handler for textarea boxes
38
-				$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>';
39
-				break;
40
-			case "date":
41
-				$field_id = str_replace(array(
42
-					'-',
43
-					'.'
44
-				), '_', urldecode($field_id));
45
-				if($field_value == '') {
46
-					$field_value = 0;
47
-				}
48
-				$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;" />';
49
-				$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>';
21
+            case "text": // handler for regular text boxes
22
+            case "rawtext"; // non-htmlentity converted text boxes
23
+                $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%" />';
24
+                break;
25
+            case "email": // handles email input fields
26
+                $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%"/>';
27
+                break;
28
+            case "number": // handles the input of numbers
29
+                $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-,.+]/,\'\')"/>';
30
+                break;
31
+            case "textareamini": // handler for textarea mini boxes
32
+                $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>';
33
+                break;
34
+            case "textarea": // handler for textarea boxes
35
+            case "rawtextarea": // non-htmlentity convertex textarea boxes
36
+            case "htmlarea": // handler for textarea boxes (deprecated)
37
+            case "richtext": // handler for textarea boxes
38
+                $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>';
39
+                break;
40
+            case "date":
41
+                $field_id = str_replace(array(
42
+                    '-',
43
+                    '.'
44
+                ), '_', urldecode($field_id));
45
+                if($field_value == '') {
46
+                    $field_value = 0;
47
+                }
48
+                $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;" />';
49
+                $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>';
50 50
 
51
-				break;
52
-			case "dropdown": // handler for select boxes
53
-				$field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '" size="1" onchange="documentDirty=true;">';
54
-				$index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
55
-				while(list($item, $itemvalue) = each($index_list)) {
56
-					list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
57
-					if(strlen($itemvalue) == 0) {
58
-						$itemvalue = $item;
59
-					}
60
-					$field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . ($itemvalue == $field_value ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>';
61
-				}
62
-				$field_html .= "</select>";
63
-				break;
64
-			case "listbox": // handler for select boxes
65
-				$field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '" onchange="documentDirty=true;" size="8">';
66
-				$index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
67
-				while(list($item, $itemvalue) = each($index_list)) {
68
-					list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
69
-					if(strlen($itemvalue) == 0) {
70
-						$itemvalue = $item;
71
-					}
72
-					$field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . ($itemvalue == $field_value ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>';
73
-				}
74
-				$field_html .= "</select>";
75
-				break;
76
-			case "listbox-multiple": // handler for select boxes where you can choose multiple items
77
-				$field_value = explode("||", $field_value);
78
-				$field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '[]" multiple="multiple" onchange="documentDirty=true;" size="8">';
79
-				$index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
80
-				while(list($item, $itemvalue) = each($index_list)) {
81
-					list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
82
-					if(strlen($itemvalue) == 0) {
83
-						$itemvalue = $item;
84
-					}
85
-					$field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . (in_array($itemvalue, $field_value) ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>';
86
-				}
87
-				$field_html .= "</select>";
88
-				break;
89
-			case "url": // handles url input fields
90
-				$urls = array(
91
-					'' => '--',
92
-					'http://' => 'http://',
93
-					'https://' => 'https://',
94
-					'ftp://' => 'ftp://',
95
-					'mailto:' => 'mailto:'
96
-				);
97
-				$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;">';
98
-				foreach($urls as $k => $v) {
99
-					if(strpos($field_value, $v) === false) {
100
-						$field_html .= '<option value="' . $v . '">' . $k . '</option>';
101
-					} else {
102
-						$field_value = str_replace($v, '', $field_value);
103
-						$field_html .= '<option value="' . $v . '" selected="selected">' . $k . '</option>';
104
-					}
105
-				}
106
-				$field_html .= '</select></td><td>';
107
-				$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>';
108
-				break;
109
-			case 'checkbox': // handles check boxes
110
-				$values = !is_array($field_value) ? explode('||', $field_value) : $field_value;
111
-				$index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
112
-				$tpl = '<label class="checkbox"><input type="checkbox" value="%s" id="tv_%s" name="tv%s[]" %s onchange="documentDirty=true;" />%s</label><br />';
113
-				static $i = 0;
114
-				$_ = array();
115
-				foreach($index_list as $c => $item) {
116
-					if(is_array($item)) {
117
-						$name = trim($item[0]);
118
-						$value = isset($item[1]) ? $item[1] : $name;
119
-					} else {
120
-						$item = trim($item);
121
-						list($name, $value) = (strpos($item, '==') !== false) ? explode('==', $item, 2) : array(
122
-							$item,
123
-							$item
124
-						);
125
-					}
126
-					$checked = in_array($value, $values) ? ' checked="checked"' : '';
127
-					$param = array(
128
-						$modx->htmlspecialchars($value),
129
-						$i,
130
-						$field_id,
131
-						$checked,
132
-						$modx->htmlspecialchars($name)
133
-					);
134
-					$_[] = vsprintf($tpl, $param);
135
-					$i++;
136
-				}
137
-				$field_html = join("\n", $_);
138
-				break;
139
-			case "option": // handles radio buttons
140
-				$index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
141
-				static $i = 0;
142
-				while(list($item, $itemvalue) = each($index_list)) {
143
-					list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
144
-					if(strlen($itemvalue) == 0) {
145
-						$itemvalue = $item;
146
-					}
147
-					$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 />';
148
-					$i++;
149
-				}
150
-				break;
151
-			case "image": // handles image fields using htmlarea image manager
152
-				global $_lang;
153
-				global $ResourceManagerLoaded;
154
-				global $content, $use_editor, $which_editor;
155
-				if(!$ResourceManagerLoaded && !(($content['richtext'] == 1 || $modx->manager->action == 4) && $use_editor == 1 && $which_editor == 3)) {
156
-					$field_html .= "
51
+                break;
52
+            case "dropdown": // handler for select boxes
53
+                $field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '" size="1" onchange="documentDirty=true;">';
54
+                $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
55
+                while(list($item, $itemvalue) = each($index_list)) {
56
+                    list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
57
+                    if(strlen($itemvalue) == 0) {
58
+                        $itemvalue = $item;
59
+                    }
60
+                    $field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . ($itemvalue == $field_value ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>';
61
+                }
62
+                $field_html .= "</select>";
63
+                break;
64
+            case "listbox": // handler for select boxes
65
+                $field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '" onchange="documentDirty=true;" size="8">';
66
+                $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
67
+                while(list($item, $itemvalue) = each($index_list)) {
68
+                    list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
69
+                    if(strlen($itemvalue) == 0) {
70
+                        $itemvalue = $item;
71
+                    }
72
+                    $field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . ($itemvalue == $field_value ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>';
73
+                }
74
+                $field_html .= "</select>";
75
+                break;
76
+            case "listbox-multiple": // handler for select boxes where you can choose multiple items
77
+                $field_value = explode("||", $field_value);
78
+                $field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '[]" multiple="multiple" onchange="documentDirty=true;" size="8">';
79
+                $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
80
+                while(list($item, $itemvalue) = each($index_list)) {
81
+                    list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
82
+                    if(strlen($itemvalue) == 0) {
83
+                        $itemvalue = $item;
84
+                    }
85
+                    $field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . (in_array($itemvalue, $field_value) ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>';
86
+                }
87
+                $field_html .= "</select>";
88
+                break;
89
+            case "url": // handles url input fields
90
+                $urls = array(
91
+                    '' => '--',
92
+                    'http://' => 'http://',
93
+                    'https://' => 'https://',
94
+                    'ftp://' => 'ftp://',
95
+                    'mailto:' => 'mailto:'
96
+                );
97
+                $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;">';
98
+                foreach($urls as $k => $v) {
99
+                    if(strpos($field_value, $v) === false) {
100
+                        $field_html .= '<option value="' . $v . '">' . $k . '</option>';
101
+                    } else {
102
+                        $field_value = str_replace($v, '', $field_value);
103
+                        $field_html .= '<option value="' . $v . '" selected="selected">' . $k . '</option>';
104
+                    }
105
+                }
106
+                $field_html .= '</select></td><td>';
107
+                $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>';
108
+                break;
109
+            case 'checkbox': // handles check boxes
110
+                $values = !is_array($field_value) ? explode('||', $field_value) : $field_value;
111
+                $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
112
+                $tpl = '<label class="checkbox"><input type="checkbox" value="%s" id="tv_%s" name="tv%s[]" %s onchange="documentDirty=true;" />%s</label><br />';
113
+                static $i = 0;
114
+                $_ = array();
115
+                foreach($index_list as $c => $item) {
116
+                    if(is_array($item)) {
117
+                        $name = trim($item[0]);
118
+                        $value = isset($item[1]) ? $item[1] : $name;
119
+                    } else {
120
+                        $item = trim($item);
121
+                        list($name, $value) = (strpos($item, '==') !== false) ? explode('==', $item, 2) : array(
122
+                            $item,
123
+                            $item
124
+                        );
125
+                    }
126
+                    $checked = in_array($value, $values) ? ' checked="checked"' : '';
127
+                    $param = array(
128
+                        $modx->htmlspecialchars($value),
129
+                        $i,
130
+                        $field_id,
131
+                        $checked,
132
+                        $modx->htmlspecialchars($name)
133
+                    );
134
+                    $_[] = vsprintf($tpl, $param);
135
+                    $i++;
136
+                }
137
+                $field_html = join("\n", $_);
138
+                break;
139
+            case "option": // handles radio buttons
140
+                $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
141
+                static $i = 0;
142
+                while(list($item, $itemvalue) = each($index_list)) {
143
+                    list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
144
+                    if(strlen($itemvalue) == 0) {
145
+                        $itemvalue = $item;
146
+                    }
147
+                    $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 />';
148
+                    $i++;
149
+                }
150
+                break;
151
+            case "image": // handles image fields using htmlarea image manager
152
+                global $_lang;
153
+                global $ResourceManagerLoaded;
154
+                global $content, $use_editor, $which_editor;
155
+                if(!$ResourceManagerLoaded && !(($content['richtext'] == 1 || $modx->manager->action == 4) && $use_editor == 1 && $which_editor == 3)) {
156
+                    $field_html .= "
157 157
 						<script type=\"text/javascript\">
158 158
 							/* <![CDATA[ */
159 159
 								var lastImageCtrl;
@@ -212,18 +212,18 @@  discard block
 block discarded – undo
212 212
 								}
213 213
 							/* ]]> */
214 214
 						</script>";
215
-					$ResourceManagerLoaded = true;
216
-				}
217
-				$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 . '\')" />';
218
-				break;
219
-			case "file": // handles the input of file uploads
220
-				/* Modified by Timon for use with resource browser */
221
-				global $_lang;
222
-				global $ResourceManagerLoaded;
223
-				global $content, $use_editor, $which_editor;
224
-				if(!$ResourceManagerLoaded && !(($content['richtext'] == 1 || $modx->manager->action == 4) && $use_editor == 1 && $which_editor == 3)) {
225
-					/* I didn't understand the meaning of the condition above, so I left it untouched ;-) */
226
-					$field_html .= "
215
+                    $ResourceManagerLoaded = true;
216
+                }
217
+                $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 . '\')" />';
218
+                break;
219
+            case "file": // handles the input of file uploads
220
+                /* Modified by Timon for use with resource browser */
221
+                global $_lang;
222
+                global $ResourceManagerLoaded;
223
+                global $content, $use_editor, $which_editor;
224
+                if(!$ResourceManagerLoaded && !(($content['richtext'] == 1 || $modx->manager->action == 4) && $use_editor == 1 && $which_editor == 3)) {
225
+                    /* I didn't understand the meaning of the condition above, so I left it untouched ;-) */
226
+                    $field_html .= "
227 227
 						<script type=\"text/javascript\">
228 228
 							/* <![CDATA[ */
229 229
 								var lastImageCtrl;
@@ -282,101 +282,101 @@  discard block
 block discarded – undo
282 282
 								}
283 283
 							/* ]]> */
284 284
 						</script>";
285
-					$ResourceManagerLoaded = true;
286
-				}
287
-				$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 . '\')" />';
285
+                    $ResourceManagerLoaded = true;
286
+                }
287
+                $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 . '\')" />';
288 288
 
289
-				break;
289
+                break;
290 290
 
291
-			case 'custom_tv':
292
-				$custom_output = '';
293
-				/* If we are loading a file */
294
-				if(substr($field_elements, 0, 5) == "@FILE") {
295
-					$file_name = MODX_BASE_PATH . trim(substr($field_elements, 6));
296
-					if(!file_exists($file_name)) {
297
-						$custom_output = $file_name . ' does not exist';
298
-					} else {
299
-						$custom_output = file_get_contents($file_name);
300
-					}
301
-				} elseif(substr($field_elements, 0, 8) == '@INCLUDE') {
302
-					$file_name = MODX_BASE_PATH . trim(substr($field_elements, 9));
303
-					if(!file_exists($file_name)) {
304
-						$custom_output = $file_name . ' does not exist';
305
-					} else {
306
-						ob_start();
307
-						include $file_name;
308
-						$custom_output = ob_get_contents();
309
-						ob_end_clean();
310
-					}
311
-				} elseif(substr($field_elements, 0, 6) == "@CHUNK") {
312
-					$chunk_name = trim(substr($field_elements, 7));
313
-					$chunk_body = $modx->getChunk($chunk_name);
314
-					if($chunk_body == false) {
315
-						$custom_output = $_lang['chunk_no_exist'] . '(' . $_lang['htmlsnippet_name'] . ':' . $chunk_name . ')';
316
-					} else {
317
-						$custom_output = $chunk_body;
318
-					}
319
-				} elseif(substr($field_elements, 0, 5) == "@EVAL") {
320
-					$eval_str = trim(substr($field_elements, 6));
321
-					$custom_output = eval($eval_str);
322
-				} else {
323
-					$custom_output = $field_elements;
324
-				}
325
-				$replacements = array(
326
-					'[+field_type+]' => $field_type,
327
-					'[+field_id+]' => $field_id,
328
-					'[+default_text+]' => $default_text,
329
-					'[+field_value+]' => $modx->htmlspecialchars($field_value),
330
-					'[+field_style+]' => $field_style,
331
-				);
332
-				$custom_output = str_replace(array_keys($replacements), $replacements, $custom_output);
333
-				$modx->documentObject = $content;
334
-				$modx->documentIdentifier = $content['id'];
335
-				$custom_output = $modx->parseDocumentSource($custom_output);
336
-				$field_html .= $custom_output;
337
-				break;
291
+            case 'custom_tv':
292
+                $custom_output = '';
293
+                /* If we are loading a file */
294
+                if(substr($field_elements, 0, 5) == "@FILE") {
295
+                    $file_name = MODX_BASE_PATH . trim(substr($field_elements, 6));
296
+                    if(!file_exists($file_name)) {
297
+                        $custom_output = $file_name . ' does not exist';
298
+                    } else {
299
+                        $custom_output = file_get_contents($file_name);
300
+                    }
301
+                } elseif(substr($field_elements, 0, 8) == '@INCLUDE') {
302
+                    $file_name = MODX_BASE_PATH . trim(substr($field_elements, 9));
303
+                    if(!file_exists($file_name)) {
304
+                        $custom_output = $file_name . ' does not exist';
305
+                    } else {
306
+                        ob_start();
307
+                        include $file_name;
308
+                        $custom_output = ob_get_contents();
309
+                        ob_end_clean();
310
+                    }
311
+                } elseif(substr($field_elements, 0, 6) == "@CHUNK") {
312
+                    $chunk_name = trim(substr($field_elements, 7));
313
+                    $chunk_body = $modx->getChunk($chunk_name);
314
+                    if($chunk_body == false) {
315
+                        $custom_output = $_lang['chunk_no_exist'] . '(' . $_lang['htmlsnippet_name'] . ':' . $chunk_name . ')';
316
+                    } else {
317
+                        $custom_output = $chunk_body;
318
+                    }
319
+                } elseif(substr($field_elements, 0, 5) == "@EVAL") {
320
+                    $eval_str = trim(substr($field_elements, 6));
321
+                    $custom_output = eval($eval_str);
322
+                } else {
323
+                    $custom_output = $field_elements;
324
+                }
325
+                $replacements = array(
326
+                    '[+field_type+]' => $field_type,
327
+                    '[+field_id+]' => $field_id,
328
+                    '[+default_text+]' => $default_text,
329
+                    '[+field_value+]' => $modx->htmlspecialchars($field_value),
330
+                    '[+field_style+]' => $field_style,
331
+                );
332
+                $custom_output = str_replace(array_keys($replacements), $replacements, $custom_output);
333
+                $modx->documentObject = $content;
334
+                $modx->documentIdentifier = $content['id'];
335
+                $custom_output = $modx->parseDocumentSource($custom_output);
336
+                $field_html .= $custom_output;
337
+                break;
338 338
 
339
-			default: // the default handler -- for errors, mostly
340
-				$field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' onchange="documentDirty=true;" />';
339
+            default: // the default handler -- for errors, mostly
340
+                $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' onchange="documentDirty=true;" />';
341 341
 
342
-		} // end switch statement
343
-	} else {
344
-		$custom = explode(":", $field_type);
345
-		$custom_output = '';
346
-		$file_name = MODX_BASE_PATH . 'assets/tvs/' . $custom['1'] . '/' . $custom['1'] . '.customtv.php';
347
-		if(!file_exists($file_name)) {
348
-			$custom_output = $file_name . ' does not exist';
349
-		} else {
350
-			ob_start();
351
-			include $file_name;
352
-			$custom_output = ob_get_contents();
353
-			ob_end_clean();
354
-		}
355
-		$replacements = array(
356
-			'[+field_type+]' => $field_type,
357
-			'[+field_id+]' => $field_id,
358
-			'[+default_text+]' => $default_text,
359
-			'[+field_value+]' => $modx->htmlspecialchars($field_value),
360
-			'[+field_style+]' => $field_style,
361
-		);
362
-		$custom_output = str_replace(array_keys($replacements), $replacements, $custom_output);
363
-		$modx->documentObject = $content;
364
-		$custom_output = $modx->parseDocumentSource($custom_output);
365
-		$field_html .= $custom_output;
366
-	}
342
+        } // end switch statement
343
+    } else {
344
+        $custom = explode(":", $field_type);
345
+        $custom_output = '';
346
+        $file_name = MODX_BASE_PATH . 'assets/tvs/' . $custom['1'] . '/' . $custom['1'] . '.customtv.php';
347
+        if(!file_exists($file_name)) {
348
+            $custom_output = $file_name . ' does not exist';
349
+        } else {
350
+            ob_start();
351
+            include $file_name;
352
+            $custom_output = ob_get_contents();
353
+            ob_end_clean();
354
+        }
355
+        $replacements = array(
356
+            '[+field_type+]' => $field_type,
357
+            '[+field_id+]' => $field_id,
358
+            '[+default_text+]' => $default_text,
359
+            '[+field_value+]' => $modx->htmlspecialchars($field_value),
360
+            '[+field_style+]' => $field_style,
361
+        );
362
+        $custom_output = str_replace(array_keys($replacements), $replacements, $custom_output);
363
+        $modx->documentObject = $content;
364
+        $custom_output = $modx->parseDocumentSource($custom_output);
365
+        $field_html .= $custom_output;
366
+    }
367 367
 
368
-	return $field_html;
368
+    return $field_html;
369 369
 } // end renderFormElement function
370 370
 
371 371
 function ParseIntputOptions($v) {
372
-	global $modx;
373
-	$a = array();
374
-	if(is_array($v)) {
375
-		return $v;
376
-	} else if($modx->db->isResult($v)) {
377
-		while($cols = $modx->db->getRow($v, 'num')) $a[] = $cols;
378
-	} else {
379
-		$a = explode("||", $v);
380
-	}
381
-	return $a;
372
+    global $modx;
373
+    $a = array();
374
+    if(is_array($v)) {
375
+        return $v;
376
+    } else if($modx->db->isResult($v)) {
377
+        while($cols = $modx->db->getRow($v, 'num')) $a[] = $cols;
378
+    } else {
379
+        $a = explode("||", $v);
380
+    }
381
+    return $a;
382 382
 }
Please login to merge, or discard this patch.
Spacing   +63 added lines, -63 removed lines patch added patch discarded remove patch
@@ -1,13 +1,13 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 // DISPLAY FORM ELEMENTS
3
-function renderFormElement($field_type, $field_id, $default_text = '', $field_elements = '', $field_value = '', $field_style = '', $row = array(), $tvsArray = array()) {
3
+function renderFormElement($field_type, $field_id, $default_text = '', $field_elements = '', $field_value = '', $field_style = '', $row = array(), $tvsArray = array()){
4 4
 	global $modx;
5 5
 	global $_style;
6 6
 	global $_lang;
7 7
 	global $content;
8 8
 	global $which_browser;
9 9
 
10
-	if(substr($default_text, 0, 6) === '@@EVAL' && $field_value === $default_text) {
10
+	if (substr($default_text, 0, 6) === '@@EVAL' && $field_value === $default_text) {
11 11
 		$eval_str = trim(substr($default_text, 7));
12 12
 		$default_text = eval($eval_str);
13 13
 		$field_value = $default_text;
@@ -15,74 +15,74 @@  discard block
 block discarded – undo
15 15
 
16 16
 	$field_html = '';
17 17
 	$cimode = strpos($field_type, ':');
18
-	if($cimode === false) {
19
-		switch($field_type) {
18
+	if ($cimode === false) {
19
+		switch ($field_type) {
20 20
 
21 21
 			case "text": // handler for regular text boxes
22 22
 			case "rawtext"; // non-htmlentity converted text boxes
23
-				$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%" />';
23
+				$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%" />';
24 24
 				break;
25 25
 			case "email": // handles email input fields
26
-				$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%"/>';
26
+				$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%"/>';
27 27
 				break;
28 28
 			case "number": // handles the input of numbers
29
-				$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-,.+]/,\'\')"/>';
29
+				$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-,.+]/,\'\')"/>';
30 30
 				break;
31 31
 			case "textareamini": // handler for textarea mini boxes
32
-				$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>';
32
+				$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>';
33 33
 				break;
34 34
 			case "textarea": // handler for textarea boxes
35 35
 			case "rawtextarea": // non-htmlentity convertex textarea boxes
36 36
 			case "htmlarea": // handler for textarea boxes (deprecated)
37 37
 			case "richtext": // handler for textarea boxes
38
-				$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>';
38
+				$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>';
39 39
 				break;
40 40
 			case "date":
41 41
 				$field_id = str_replace(array(
42 42
 					'-',
43 43
 					'.'
44 44
 				), '_', urldecode($field_id));
45
-				if($field_value == '') {
45
+				if ($field_value == '') {
46 46
 					$field_value = 0;
47 47
 				}
48
-				$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;" />';
49
-				$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>';
48
+				$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;" />';
49
+				$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>';
50 50
 
51 51
 				break;
52 52
 			case "dropdown": // handler for select boxes
53
-				$field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '" size="1" onchange="documentDirty=true;">';
53
+				$field_html .= '<select id="tv'.$field_id.'" name="tv'.$field_id.'" size="1" onchange="documentDirty=true;">';
54 54
 				$index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
55
-				while(list($item, $itemvalue) = each($index_list)) {
55
+				while (list($item, $itemvalue) = each($index_list)) {
56 56
 					list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
57
-					if(strlen($itemvalue) == 0) {
57
+					if (strlen($itemvalue) == 0) {
58 58
 						$itemvalue = $item;
59 59
 					}
60
-					$field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . ($itemvalue == $field_value ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>';
60
+					$field_html .= '<option value="'.$modx->htmlspecialchars($itemvalue).'"'.($itemvalue == $field_value ? ' selected="selected"' : '').'>'.$modx->htmlspecialchars($item).'</option>';
61 61
 				}
62 62
 				$field_html .= "</select>";
63 63
 				break;
64 64
 			case "listbox": // handler for select boxes
65
-				$field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '" onchange="documentDirty=true;" size="8">';
65
+				$field_html .= '<select id="tv'.$field_id.'" name="tv'.$field_id.'" onchange="documentDirty=true;" size="8">';
66 66
 				$index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
67
-				while(list($item, $itemvalue) = each($index_list)) {
67
+				while (list($item, $itemvalue) = each($index_list)) {
68 68
 					list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
69
-					if(strlen($itemvalue) == 0) {
69
+					if (strlen($itemvalue) == 0) {
70 70
 						$itemvalue = $item;
71 71
 					}
72
-					$field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . ($itemvalue == $field_value ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>';
72
+					$field_html .= '<option value="'.$modx->htmlspecialchars($itemvalue).'"'.($itemvalue == $field_value ? ' selected="selected"' : '').'>'.$modx->htmlspecialchars($item).'</option>';
73 73
 				}
74 74
 				$field_html .= "</select>";
75 75
 				break;
76 76
 			case "listbox-multiple": // handler for select boxes where you can choose multiple items
77 77
 				$field_value = explode("||", $field_value);
78
-				$field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '[]" multiple="multiple" onchange="documentDirty=true;" size="8">';
78
+				$field_html .= '<select id="tv'.$field_id.'" name="tv'.$field_id.'[]" multiple="multiple" onchange="documentDirty=true;" size="8">';
79 79
 				$index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
80
-				while(list($item, $itemvalue) = each($index_list)) {
80
+				while (list($item, $itemvalue) = each($index_list)) {
81 81
 					list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
82
-					if(strlen($itemvalue) == 0) {
82
+					if (strlen($itemvalue) == 0) {
83 83
 						$itemvalue = $item;
84 84
 					}
85
-					$field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . (in_array($itemvalue, $field_value) ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>';
85
+					$field_html .= '<option value="'.$modx->htmlspecialchars($itemvalue).'"'.(in_array($itemvalue, $field_value) ? ' selected="selected"' : '').'>'.$modx->htmlspecialchars($item).'</option>';
86 86
 				}
87 87
 				$field_html .= "</select>";
88 88
 				break;
@@ -94,17 +94,17 @@  discard block
 block discarded – undo
94 94
 					'ftp://' => 'ftp://',
95 95
 					'mailto:' => 'mailto:'
96 96
 				);
97
-				$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;">';
98
-				foreach($urls as $k => $v) {
99
-					if(strpos($field_value, $v) === false) {
100
-						$field_html .= '<option value="' . $v . '">' . $k . '</option>';
97
+				$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;">';
98
+				foreach ($urls as $k => $v) {
99
+					if (strpos($field_value, $v) === false) {
100
+						$field_html .= '<option value="'.$v.'">'.$k.'</option>';
101 101
 					} else {
102 102
 						$field_value = str_replace($v, '', $field_value);
103
-						$field_html .= '<option value="' . $v . '" selected="selected">' . $k . '</option>';
103
+						$field_html .= '<option value="'.$v.'" selected="selected">'.$k.'</option>';
104 104
 					}
105 105
 				}
106 106
 				$field_html .= '</select></td><td>';
107
-				$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>';
107
+				$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>';
108 108
 				break;
109 109
 			case 'checkbox': // handles check boxes
110 110
 				$values = !is_array($field_value) ? explode('||', $field_value) : $field_value;
@@ -112,8 +112,8 @@  discard block
 block discarded – undo
112 112
 				$tpl = '<label class="checkbox"><input type="checkbox" value="%s" id="tv_%s" name="tv%s[]" %s onchange="documentDirty=true;" />%s</label><br />';
113 113
 				static $i = 0;
114 114
 				$_ = array();
115
-				foreach($index_list as $c => $item) {
116
-					if(is_array($item)) {
115
+				foreach ($index_list as $c => $item) {
116
+					if (is_array($item)) {
117 117
 						$name = trim($item[0]);
118 118
 						$value = isset($item[1]) ? $item[1] : $name;
119 119
 					} else {
@@ -139,12 +139,12 @@  discard block
 block discarded – undo
139 139
 			case "option": // handles radio buttons
140 140
 				$index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
141 141
 				static $i = 0;
142
-				while(list($item, $itemvalue) = each($index_list)) {
142
+				while (list($item, $itemvalue) = each($index_list)) {
143 143
 					list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
144
-					if(strlen($itemvalue) == 0) {
144
+					if (strlen($itemvalue) == 0) {
145 145
 						$itemvalue = $item;
146 146
 					}
147
-					$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 />';
147
+					$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 />';
148 148
 					$i++;
149 149
 				}
150 150
 				break;
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 				global $_lang;
153 153
 				global $ResourceManagerLoaded;
154 154
 				global $content, $use_editor, $which_editor;
155
-				if(!$ResourceManagerLoaded && !(($content['richtext'] == 1 || $modx->manager->action == 4) && $use_editor == 1 && $which_editor == 3)) {
155
+				if (!$ResourceManagerLoaded && !(($content['richtext'] == 1 || $modx->manager->action == 4) && $use_editor == 1 && $which_editor == 3)) {
156 156
 					$field_html .= "
157 157
 						<script type=\"text/javascript\">
158 158
 							/* <![CDATA[ */
@@ -174,13 +174,13 @@  discard block
 block discarded – undo
174 174
 									lastImageCtrl = ctrl;
175 175
 									var w = screen.width * 0.5;
176 176
 									var h = screen.height * 0.5;
177
-									OpenServerBrowser('" . MODX_MANAGER_URL . "media/browser/{$which_browser}/browser.php?Type=images', w, h);
177
+									OpenServerBrowser('" . MODX_MANAGER_URL."media/browser/{$which_browser}/browser.php?Type=images', w, h);
178 178
 								}
179 179
 								function BrowseFileServer(ctrl) {
180 180
 									lastFileCtrl = ctrl;
181 181
 									var w = screen.width * 0.5;
182 182
 									var h = screen.height * 0.5;
183
-									OpenServerBrowser('" . MODX_MANAGER_URL . "media/browser/{$which_browser}/browser.php?Type=files', w, h);
183
+									OpenServerBrowser('".MODX_MANAGER_URL."media/browser/{$which_browser}/browser.php?Type=files', w, h);
184 184
 								}
185 185
 								function SetUrlChange(el) {
186 186
 									if ('createEvent' in document) {
@@ -214,14 +214,14 @@  discard block
 block discarded – undo
214 214
 						</script>";
215 215
 					$ResourceManagerLoaded = true;
216 216
 				}
217
-				$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 . '\')" />';
217
+				$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.'\')" />';
218 218
 				break;
219 219
 			case "file": // handles the input of file uploads
220 220
 				/* Modified by Timon for use with resource browser */
221 221
 				global $_lang;
222 222
 				global $ResourceManagerLoaded;
223 223
 				global $content, $use_editor, $which_editor;
224
-				if(!$ResourceManagerLoaded && !(($content['richtext'] == 1 || $modx->manager->action == 4) && $use_editor == 1 && $which_editor == 3)) {
224
+				if (!$ResourceManagerLoaded && !(($content['richtext'] == 1 || $modx->manager->action == 4) && $use_editor == 1 && $which_editor == 3)) {
225 225
 					/* I didn't understand the meaning of the condition above, so I left it untouched ;-) */
226 226
 					$field_html .= "
227 227
 						<script type=\"text/javascript\">
@@ -244,13 +244,13 @@  discard block
 block discarded – undo
244 244
 									lastImageCtrl = ctrl;
245 245
 									var w = screen.width * 0.5;
246 246
 									var h = screen.height * 0.5;
247
-									OpenServerBrowser('" . MODX_MANAGER_URL . "media/browser/{$which_browser}/browser.php?Type=images', w, h);
247
+									OpenServerBrowser('" . MODX_MANAGER_URL."media/browser/{$which_browser}/browser.php?Type=images', w, h);
248 248
 								}
249 249
 								function BrowseFileServer(ctrl) {
250 250
 									lastFileCtrl = ctrl;
251 251
 									var w = screen.width * 0.5;
252 252
 									var h = screen.height * 0.5;
253
-									OpenServerBrowser('" . MODX_MANAGER_URL . "media/browser/{$which_browser}/browser.php?Type=files', w, h);
253
+									OpenServerBrowser('".MODX_MANAGER_URL."media/browser/{$which_browser}/browser.php?Type=files', w, h);
254 254
 								}
255 255
 								function SetUrlChange(el) {
256 256
 									if ('createEvent' in document) {
@@ -284,39 +284,39 @@  discard block
 block discarded – undo
284 284
 						</script>";
285 285
 					$ResourceManagerLoaded = true;
286 286
 				}
287
-				$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 . '\')" />';
287
+				$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.'\')" />';
288 288
 
289 289
 				break;
290 290
 
291 291
 			case 'custom_tv':
292 292
 				$custom_output = '';
293 293
 				/* If we are loading a file */
294
-				if(substr($field_elements, 0, 5) == "@FILE") {
295
-					$file_name = MODX_BASE_PATH . trim(substr($field_elements, 6));
296
-					if(!file_exists($file_name)) {
297
-						$custom_output = $file_name . ' does not exist';
294
+				if (substr($field_elements, 0, 5) == "@FILE") {
295
+					$file_name = MODX_BASE_PATH.trim(substr($field_elements, 6));
296
+					if (!file_exists($file_name)) {
297
+						$custom_output = $file_name.' does not exist';
298 298
 					} else {
299 299
 						$custom_output = file_get_contents($file_name);
300 300
 					}
301
-				} elseif(substr($field_elements, 0, 8) == '@INCLUDE') {
302
-					$file_name = MODX_BASE_PATH . trim(substr($field_elements, 9));
303
-					if(!file_exists($file_name)) {
304
-						$custom_output = $file_name . ' does not exist';
301
+				} elseif (substr($field_elements, 0, 8) == '@INCLUDE') {
302
+					$file_name = MODX_BASE_PATH.trim(substr($field_elements, 9));
303
+					if (!file_exists($file_name)) {
304
+						$custom_output = $file_name.' does not exist';
305 305
 					} else {
306 306
 						ob_start();
307 307
 						include $file_name;
308 308
 						$custom_output = ob_get_contents();
309 309
 						ob_end_clean();
310 310
 					}
311
-				} elseif(substr($field_elements, 0, 6) == "@CHUNK") {
311
+				} elseif (substr($field_elements, 0, 6) == "@CHUNK") {
312 312
 					$chunk_name = trim(substr($field_elements, 7));
313 313
 					$chunk_body = $modx->getChunk($chunk_name);
314
-					if($chunk_body == false) {
315
-						$custom_output = $_lang['chunk_no_exist'] . '(' . $_lang['htmlsnippet_name'] . ':' . $chunk_name . ')';
314
+					if ($chunk_body == false) {
315
+						$custom_output = $_lang['chunk_no_exist'].'('.$_lang['htmlsnippet_name'].':'.$chunk_name.')';
316 316
 					} else {
317 317
 						$custom_output = $chunk_body;
318 318
 					}
319
-				} elseif(substr($field_elements, 0, 5) == "@EVAL") {
319
+				} elseif (substr($field_elements, 0, 5) == "@EVAL") {
320 320
 					$eval_str = trim(substr($field_elements, 6));
321 321
 					$custom_output = eval($eval_str);
322 322
 				} else {
@@ -337,15 +337,15 @@  discard block
 block discarded – undo
337 337
 				break;
338 338
 
339 339
 			default: // the default handler -- for errors, mostly
340
-				$field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' onchange="documentDirty=true;" />';
340
+				$field_html .= '<input type="text" id="tv'.$field_id.'" name="tv'.$field_id.'" value="'.$modx->htmlspecialchars($field_value).'" '.$field_style.' onchange="documentDirty=true;" />';
341 341
 
342 342
 		} // end switch statement
343 343
 	} else {
344 344
 		$custom = explode(":", $field_type);
345 345
 		$custom_output = '';
346
-		$file_name = MODX_BASE_PATH . 'assets/tvs/' . $custom['1'] . '/' . $custom['1'] . '.customtv.php';
347
-		if(!file_exists($file_name)) {
348
-			$custom_output = $file_name . ' does not exist';
346
+		$file_name = MODX_BASE_PATH.'assets/tvs/'.$custom['1'].'/'.$custom['1'].'.customtv.php';
347
+		if (!file_exists($file_name)) {
348
+			$custom_output = $file_name.' does not exist';
349 349
 		} else {
350 350
 			ob_start();
351 351
 			include $file_name;
@@ -368,13 +368,13 @@  discard block
 block discarded – undo
368 368
 	return $field_html;
369 369
 } // end renderFormElement function
370 370
 
371
-function ParseIntputOptions($v) {
371
+function ParseIntputOptions($v){
372 372
 	global $modx;
373 373
 	$a = array();
374
-	if(is_array($v)) {
374
+	if (is_array($v)) {
375 375
 		return $v;
376
-	} else if($modx->db->isResult($v)) {
377
-		while($cols = $modx->db->getRow($v, 'num')) $a[] = $cols;
376
+	} else if ($modx->db->isResult($v)) {
377
+		while ($cols = $modx->db->getRow($v, 'num')) $a[] = $cols;
378 378
 	} else {
379 379
 		$a = explode("||", $v);
380 380
 	}
Please login to merge, or discard this patch.
Braces   +7 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,6 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 // DISPLAY FORM ELEMENTS
3
-function renderFormElement($field_type, $field_id, $default_text = '', $field_elements = '', $field_value = '', $field_style = '', $row = array(), $tvsArray = array()) {
3
+function renderFormElement($field_type, $field_id, $default_text = '', $field_elements = '', $field_value = '', $field_style = '', $row = array(), $tvsArray = array())
4
+{
4 5
 	global $modx;
5 6
 	global $_style;
6 7
 	global $_lang;
@@ -368,13 +369,16 @@  discard block
 block discarded – undo
368 369
 	return $field_html;
369 370
 } // end renderFormElement function
370 371
 
371
-function ParseIntputOptions($v) {
372
+function ParseIntputOptions($v)
373
+{
372 374
 	global $modx;
373 375
 	$a = array();
374 376
 	if(is_array($v)) {
375 377
 		return $v;
376 378
 	} else if($modx->db->isResult($v)) {
377
-		while($cols = $modx->db->getRow($v, 'num')) $a[] = $cols;
379
+		while($cols = $modx->db->getRow($v, 'num')) {
380
+		    $a[] = $cols;
381
+		}
378 382
 	} else {
379 383
 		$a = explode("||", $v);
380 384
 	}
Please login to merge, or discard this patch.
manager/includes/footer.inc.php 2 patches
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 if(IN_MANAGER_MODE != "true") {
3
-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
3
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4 4
 }
5 5
 global $SystemAlertMsgQueque;
6 6
 // display system alert window if messages are available
7 7
 if(count($SystemAlertMsgQueque) > 0) {
8
-	include "sysalert.display.inc.php";
8
+    include "sysalert.display.inc.php";
9 9
 }
10 10
 ?>
11 11
 <script type='text/javascript'>
@@ -19,17 +19,17 @@  discard block
 block discarded – undo
19 19
 </script>
20 20
 <?php
21 21
 if(in_array($modx->manager->action, array(
22
-	85,
23
-	27,
24
-	4,
25
-	72,
26
-	13,
27
-	11,
28
-	12,
29
-	87,
30
-	88
22
+    85,
23
+    27,
24
+    4,
25
+    72,
26
+    13,
27
+    11,
28
+    12,
29
+    87,
30
+    88
31 31
 ))) {
32
-	echo $modx->manager->loadDatePicker($modx->config['mgr_date_picker_path']);
32
+    echo $modx->manager->loadDatePicker($modx->config['mgr_date_picker_path']);
33 33
 }
34 34
 ?>
35 35
 </body>
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(IN_MANAGER_MODE != "true") {
2
+if (IN_MANAGER_MODE != "true") {
3 3
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4 4
 }
5 5
 global $SystemAlertMsgQueque;
6 6
 // display system alert window if messages are available
7
-if(count($SystemAlertMsgQueque) > 0) {
7
+if (count($SystemAlertMsgQueque) > 0) {
8 8
 	include "sysalert.display.inc.php";
9 9
 }
10 10
 ?>
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 	});
19 19
 </script>
20 20
 <?php
21
-if(in_array($modx->manager->action, array(
21
+if (in_array($modx->manager->action, array(
22 22
 	85,
23 23
 	27,
24 24
 	4,
Please login to merge, or discard this patch.
manager/includes/extenders/ex_maketable.inc.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -5,9 +5,9 @@
 block discarded – undo
5 5
  * Time: 14:38
6 6
  */
7 7
 
8
-if (!include_once MODX_MANAGER_PATH . 'includes/extenders/maketable.class.php'){
8
+if (!include_once MODX_MANAGER_PATH.'includes/extenders/maketable.class.php') {
9 9
     return false;
10
-}else{
11
-    $this->table= new MakeTable;
10
+} else {
11
+    $this->table = new MakeTable;
12 12
     return true;
13 13
 }
14 14
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -5,9 +5,9 @@
 block discarded – undo
5 5
  * Time: 14:38
6 6
  */
7 7
 
8
-if (!include_once MODX_MANAGER_PATH . 'includes/extenders/maketable.class.php'){
8
+if (!include_once MODX_MANAGER_PATH . 'includes/extenders/maketable.class.php') {
9 9
     return false;
10
-}else{
10
+} else {
11 11
     $this->table= new MakeTable;
12 12
     return true;
13 13
 }
14 14
\ No newline at end of file
Please login to merge, or discard this patch.
manager/includes/extenders/ex_modifiers.inc.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -8,5 +8,5 @@
 block discarded – undo
8 8
 if (isset($this->filter) && is_object($this->filter)) return true;
9 9
 
10 10
 include_once(MODX_MANAGER_PATH.'includes/extenders/modifiers.class.inc.php');
11
-$this->filter= new MODIFIERS;
11
+$this->filter = new MODIFIERS;
12 12
 return true;
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,9 @@
 block discarded – undo
5 5
  * Time: 10:00
6 6
  */
7 7
 
8
-if (isset($this->filter) && is_object($this->filter)) return true;
8
+if (isset($this->filter) && is_object($this->filter)) {
9
+    return true;
10
+}
9 11
 
10 12
 include_once(MODX_MANAGER_PATH.'includes/extenders/modifiers.class.inc.php');
11 13
 $this->filter= new MODIFIERS;
Please login to merge, or discard this patch.
manager/includes/extenders/ex_managerapi.inc.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -5,9 +5,9 @@
 block discarded – undo
5 5
  * Time: 14:16
6 6
  */
7 7
 
8
-if (!include_once MODX_MANAGER_PATH . 'includes/extenders/manager.api.class.inc.php'){
8
+if (!include_once MODX_MANAGER_PATH.'includes/extenders/manager.api.class.inc.php') {
9 9
     return false;
10
-}else{
11
-    $this->manager= new ManagerAPI;
10
+} else {
11
+    $this->manager = new ManagerAPI;
12 12
     return true;
13 13
 }
14 14
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -5,9 +5,9 @@
 block discarded – undo
5 5
  * Time: 14:16
6 6
  */
7 7
 
8
-if (!include_once MODX_MANAGER_PATH . 'includes/extenders/manager.api.class.inc.php'){
8
+if (!include_once MODX_MANAGER_PATH . 'includes/extenders/manager.api.class.inc.php') {
9 9
     return false;
10
-}else{
10
+} else {
11 11
     $this->manager= new ManagerAPI;
12 12
     return true;
13 13
 }
14 14
\ No newline at end of file
Please login to merge, or discard this patch.
manager/includes/extenders/modifiers/mdf_moduser.inc.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,8 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 $userid = intval($value);
3 3
 if (!isset($modx->filter->cache['ui'][$userid])) {
4
-    if ($userid < 0) $user = $modx->getWebUserInfo(abs($userid));
5
-    else             $user = $modx->getUserInfo($userid);
4
+    if ($userid < 0) {
5
+        $user = $modx->getWebUserInfo(abs($userid));
6
+    } else {
7
+        $user = $modx->getUserInfo($userid);
8
+    }
6 9
     $modx->filter->cache['ui'][$userid] = $user;
7 10
 } else {
8 11
     $user = $modx->filter->cache['ui'][$userid];
Please login to merge, or discard this patch.
manager/includes/extenders/modifiers/mdf_getimage.inc.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,16 +1,16 @@
 block discarded – undo
1 1
 <?php
2 2
 $pattern = '/<img[\s\n]+.*src=[\s\n]*"([^"]+\.(jpg|jpeg|png|gif))"[^>]+>/i';
3
-preg_match_all($pattern , $value , $images);
4
-if($opt==='')
3
+preg_match_all($pattern, $value, $images);
4
+if ($opt === '')
5 5
 {
6
-    if($images[1][0])  return $images[1][0];
6
+    if ($images[1][0])  return $images[1][0];
7 7
     else               return '';
8 8
 }
9 9
 else
10 10
 {
11
-    foreach($images[0] as $i=>$image)
11
+    foreach ($images[0] as $i=>$image)
12 12
     {
13
-        if(strpos($image,$opt)!==false) return $images[1][$i];
13
+        if (strpos($image, $opt) !== false) return $images[1][$i];
14 14
     }
15 15
 }
16 16
 
Please login to merge, or discard this patch.
Braces   +11 added lines, -10 removed lines patch added patch discarded remove patch
@@ -1,16 +1,17 @@
 block discarded – undo
1 1
 <?php
2 2
 $pattern = '/<img[\s\n]+.*src=[\s\n]*"([^"]+\.(jpg|jpeg|png|gif))"[^>]+>/i';
3 3
 preg_match_all($pattern , $value , $images);
4
-if($opt==='')
5
-{
6
-    if($images[1][0])  return $images[1][0];
7
-    else               return '';
8
-}
9
-else
10
-{
11
-    foreach($images[0] as $i=>$image)
12
-    {
13
-        if(strpos($image,$opt)!==false) return $images[1][$i];
4
+if($opt==='') {
5
+    if($images[1][0]) {
6
+        return $images[1][0];
7
+    } else {
8
+        return '';
9
+    }
10
+    } else {
11
+    foreach($images[0] as $i=>$image) {
12
+        if(strpos($image,$opt)!==false) {
13
+            return $images[1][$i];
14
+        }
14 15
     }
15 16
 }
16 17
 
Please login to merge, or discard this patch.
manager/includes/extenders/modifiers/mdf_wordwrap.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,2 +1,2 @@
 block discarded – undo
1 1
 <?php
2
-return preg_replace_callback("~(\b\w+\b)~",function($m) use($wrapat) {return wordwrap($m[1],$wrapat,' ',1);},$value);
2
+return preg_replace_callback("~(\b\w+\b)~", function($m) use($wrapat) {return wordwrap($m[1], $wrapat, ' ', 1); },$value);
Please login to merge, or discard this patch.