Inspection of "Review" - evolution-cms/evolution - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — develop (#518)

by Agel_Nash

created 2018-02-21 21:57 UTC

Status

Switch Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -4,18 +4,18 @@
 block discarded – undo
 }
 
 switch ($modx->manager->action) {
-    case 78:
-        if (!$modx->hasPermission('edit_chunk')) {
-            $modx->webAlertAndQuit($_lang["error_no_privileges"]);
-        }
-        break;
-    case 77:
-        if (!$modx->hasPermission('new_chunk')) {
+        case 78:
+            if (!$modx->hasPermission('edit_chunk')) {
+                $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+            }
+            break;
+        case 77:
+            if (!$modx->hasPermission('new_chunk')) {
+                $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+            }
+            break;
+        default:
             $modx->webAlertAndQuit($_lang["error_no_privileges"]);
-        }
-        break;
-    default:
-        $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;

Please login to merge, or discard this patch.

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -65,7 +65,7 @@  discard block
 block discarded – undo
 // Add lock-element JS-Script
 $lockElementId = $id;
 $lockElementType = 3;
-require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php');
+require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php');
 
 // Print RTE Javascript function
 ?>
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
         <input type="hidden" name="mode" value="<?= $modx->manager->action ?>" />
 
         <h1>
-            <i class="fa fa-th-large"></i><?= ($content['name'] ? $content['name'] . '<small>(' . $content['id'] . ')</small>' : $_lang['new_htmlsnippet']) ?><i class="fa fa-question-circle help"></i>
+            <i class="fa fa-th-large"></i><?= ($content['name'] ? $content['name'].'<small>('.$content['id'].')</small>' : $_lang['new_htmlsnippet']) ?><i class="fa fa-question-circle help"></i>
         </h1>
 
         <?= $_style['actionbuttons']['dynamic']['element'] ?>
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
                             <div class="form-control-name clearfix">
                                 <input name="name" type="text" maxlength="100" value="<?= $modx->htmlspecialchars($content['name']) ?>" class="form-control form-control-lg" onchange="documentDirty=true;" />
                                 <?php if ($modx->hasPermission('save_role')): ?>
-                                    <label class="custom-control" title="<?= $_lang['lock_htmlsnippet'] . "\n" . $_lang['lock_htmlsnippet_msg'] ?>" tooltip>
+                                    <label class="custom-control" title="<?= $_lang['lock_htmlsnippet']."\n".$_lang['lock_htmlsnippet_msg'] ?>" tooltip>
                                         <input name="locked" type="checkbox" value="on"<?= ($content['locked'] == 1 || $content['locked'] == 'on' ? ' checked="checked"' : '') ?> />
                                         <i class="fa fa-lock"></i>
                                     </label>
@@ -184,9 +184,9 @@  discard block
 block discarded – undo
                             <select name="categoryid" class="form-control" onchange="documentDirty=true;">
                                 <option>&nbsp;</option>
                                 <?php
-                                include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
+                                include_once(MODX_MANAGER_PATH.'includes/categories.inc.php');
                                 foreach (getCategories() as $n => $v) {
-                                    echo "\t\t\t\t" . '<option value="' . $v['id'] . '"' . ($content['category'] == $v['id'] || (empty($content['category']) && $_POST['categoryid'] == $v['id']) ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($v['category']) . "</option>\n";
+                                    echo "\t\t\t\t".'<option value="'.$v['id'].'"'.($content['category'] == $v['id'] || (empty($content['category']) && $_POST['categoryid'] == $v['id']) ? ' selected="selected"' : '').'>'.$modx->htmlspecialchars($v['category'])."</option>\n";
                                 }
                                 ?>
                             </select>
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
                     </div>
                     <?php if ($_SESSION['mgrRole'] == 1): ?>
                         <div class="form-row">
-                            <label><input name="disabled" type="checkbox" value="on"<?= ($content['disabled'] == 1 ? ' checked="checked"' : '') ?> /> <?= ($content['disabled'] == 1 ? "<span class='text-danger'>" . $_lang['disabled'] . "</span>" : $_lang['disabled']) ?></label>
+                            <label><input name="disabled" type="checkbox" value="on"<?= ($content['disabled'] == 1 ? ' checked="checked"' : '') ?> /> <?= ($content['disabled'] == 1 ? "<span class='text-danger'>".$_lang['disabled']."</span>" : $_lang['disabled']) ?></label>
                         </div>
                     <?php endif; ?>
                 </div>
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
                             $evtOut = $modx->invokeEvent('OnRichTextEditorRegister');
                             if (is_array($evtOut)) {
                                 foreach ($evtOut as $i => $editor) {
-                                    echo "\t" . '<option value="' . $editor . '"' . ($which_editor == $editor ? ' selected="selected"' : '') . '>' . $editor . "</option>\n";
+                                    echo "\t".'<option value="'.$editor.'"'.($which_editor == $editor ? ' selected="selected"' : '').'>'.$editor."</option>\n";
                                 }
                             }
                             ?>

Please login to merge, or discard this patch.

manager/actions/help.static.php 3 patches

Indentation +31 added lines, -31 removed lines patch added patch discarded remove patch

@@ -1,6 +1,6 @@  discard block
 block discarded – undo
 <?php
 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.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 $helpBasePath = "actions/help/";
 ?>
@@ -16,36 +16,36 @@  discard block
 block discarded – undo
 		</script>
 
 		<?php
-		if($handle = opendir('actions/help')) {
-			while(false !== ($file = readdir($handle))) {
-				if($file != "." && $file != ".." && $file != ".svn" && $file != 'index.html' && !is_dir($helpBasePath . $file)) {
-					$help[] = $file;
-				}
-			}
-			closedir($handle);
-		}
-
-		natcasesort($help);
-
-		foreach($help as $k => $v) {
-
-			$helpname = substr($v, 0, strrpos($v, '.'));
-
-			$prefix = substr($helpname, 0, 2);
-			if(is_numeric($prefix)) {
-				$helpname = substr($helpname, 2, strlen($helpname) - 1);
-			}
-
-			$hnLower = strtolower($helpname);
-			$helpname = isset($_lang[$hnLower]) ? $_lang[$hnLower] : str_replace('_', ' ', $helpname);
-
-			echo '<div class="tab-page" id="tab' . $k . 'Help">';
-			echo '<h2 class="tab">' . $helpname . '</h2>';
-			echo '<script type="text/javascript">tp.addTabPage( document.getElementById( "tab' . $k . 'Help" ) );</script>';
-			include_once($helpBasePath . "{$v}");
-			echo '</div>';
-		}
-		?>
+        if($handle = opendir('actions/help')) {
+            while(false !== ($file = readdir($handle))) {
+                if($file != "." && $file != ".." && $file != ".svn" && $file != 'index.html' && !is_dir($helpBasePath . $file)) {
+                    $help[] = $file;
+                }
+            }
+            closedir($handle);
+        }
+
+        natcasesort($help);
+
+        foreach($help as $k => $v) {
+
+            $helpname = substr($v, 0, strrpos($v, '.'));
+
+            $prefix = substr($helpname, 0, 2);
+            if(is_numeric($prefix)) {
+                $helpname = substr($helpname, 2, strlen($helpname) - 1);
+            }
+
+            $hnLower = strtolower($helpname);
+            $helpname = isset($_lang[$hnLower]) ? $_lang[$hnLower] : str_replace('_', ' ', $helpname);
+
+            echo '<div class="tab-page" id="tab' . $k . 'Help">';
+            echo '<h2 class="tab">' . $helpname . '</h2>';
+            echo '<script type="text/javascript">tp.addTabPage( document.getElementById( "tab' . $k . 'Help" ) );</script>';
+            include_once($helpBasePath . "{$v}");
+            echo '</div>';
+        }
+        ?>
 	</div>
 </div>
 <script>

Please login to merge, or discard this patch.

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -1,12 +1,12 @@  discard block
 block discarded – undo
 <?php
-if(IN_MANAGER_MODE != "true") {
+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.");
 }
 $helpBasePath = "actions/help/";
 ?>
 
 <h1>
-	<?php echo $_style['page_help'];  echo $_lang['help']; ?>
+	<?php echo $_style['page_help']; echo $_lang['help']; ?>
 </h1>
 
 <div class="sectionBody">
@@ -16,9 +16,9 @@  discard block
 block discarded – undo
 		</script>
 
 		<?php
-		if($handle = opendir('actions/help')) {
-			while(false !== ($file = readdir($handle))) {
-				if($file != "." && $file != ".." && $file != ".svn" && $file != 'index.html' && !is_dir($helpBasePath . $file)) {
+		if ($handle = opendir('actions/help')) {
+			while (false !== ($file = readdir($handle))) {
+				if ($file != "." && $file != ".." && $file != ".svn" && $file != 'index.html' && !is_dir($helpBasePath.$file)) {
 					$help[] = $file;
 				}
 			}
@@ -27,22 +27,22 @@  discard block
 block discarded – undo
 
 		natcasesort($help);
 
-		foreach($help as $k => $v) {
+		foreach ($help as $k => $v) {
 
 			$helpname = substr($v, 0, strrpos($v, '.'));
 
 			$prefix = substr($helpname, 0, 2);
-			if(is_numeric($prefix)) {
+			if (is_numeric($prefix)) {
 				$helpname = substr($helpname, 2, strlen($helpname) - 1);
 			}
 
 			$hnLower = strtolower($helpname);
 			$helpname = isset($_lang[$hnLower]) ? $_lang[$hnLower] : str_replace('_', ' ', $helpname);
 
-			echo '<div class="tab-page" id="tab' . $k . 'Help">';
-			echo '<h2 class="tab">' . $helpname . '</h2>';
-			echo '<script type="text/javascript">tp.addTabPage( document.getElementById( "tab' . $k . 'Help" ) );</script>';
-			include_once($helpBasePath . "{$v}");
+			echo '<div class="tab-page" id="tab'.$k.'Help">';
+			echo '<h2 class="tab">'.$helpname.'</h2>';
+			echo '<script type="text/javascript">tp.addTabPage( document.getElementById( "tab'.$k.'Help" ) );</script>';
+			include_once($helpBasePath."{$v}");
 			echo '</div>';
 		}
 		?>

Please login to merge, or discard this patch.

Braces +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-if(IN_MANAGER_MODE != "true") {
+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.");
 }
 $helpBasePath = "actions/help/";
@@ -16,9 +16,9 @@  discard block
 block discarded – undo
 		</script>
 
 		<?php
-		if($handle = opendir('actions/help')) {
-			while(false !== ($file = readdir($handle))) {
-				if($file != "." && $file != ".." && $file != ".svn" && $file != 'index.html' && !is_dir($helpBasePath . $file)) {
+		if($handle = opendir('actions/help')) {
+			while(false !== ($file = readdir($handle))) {
+				if($file != "." && $file != ".." && $file != ".svn" && $file != 'index.html' && !is_dir($helpBasePath . $file)) {
 					$help[] = $file;
 				}
 			}
@@ -27,12 +27,12 @@  discard block
 block discarded – undo
 
 		natcasesort($help);
 
-		foreach($help as $k => $v) {
+		foreach($help as $k => $v) {
 
 			$helpname = substr($v, 0, strrpos($v, '.'));
 
 			$prefix = substr($helpname, 0, 2);
-			if(is_numeric($prefix)) {
+			if(is_numeric($prefix)) {
 				$helpname = substr($helpname, 2, strlen($helpname) - 1);
 			}
 

Please login to merge, or discard this patch.

manager/actions/help/04Changelog.php 3 patches

Indentation +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -5,8 +5,8 @@
 block discarded – undo
 <div class="sectionHeader">Changelog</div>
 <div class="sectionBody">
 <?php
-	$changeLog = MODX_BASE_PATH . 'assets/docs/changelog.txt';
-	if(is_readable($changeLog))
-		echo str_replace("\n",'<br>',file_get_contents($changeLog));
+    $changeLog = MODX_BASE_PATH . 'assets/docs/changelog.txt';
+    if(is_readable($changeLog))
+        echo str_replace("\n",'<br>',file_get_contents($changeLog));
 ?>
 </div>
\ No newline at end of file

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -5,8 +5,8 @@
 block discarded – undo
 <div class="sectionHeader">Changelog</div>
 <div class="sectionBody">
 <?php
-	$changeLog = MODX_BASE_PATH . 'assets/docs/changelog.txt';
-	if(is_readable($changeLog))
-		echo str_replace("\n",'<br>',file_get_contents($changeLog));
+	$changeLog = MODX_BASE_PATH.'assets/docs/changelog.txt';
+	if (is_readable($changeLog))
+		echo str_replace("\n", '<br>', file_get_contents($changeLog));
 ?>
 </div>
\ No newline at end of file

Please login to merge, or discard this patch.

Braces +7 added lines, -4 removed lines patch added patch discarded remove patch

@@ -1,12 +1,15 @@
 block discarded – undo
 <?php
-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.");
+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.");
+}
 ?>
 
 <div class="sectionHeader">Changelog</div>
 <div class="sectionBody">
 <?php
 	$changeLog = MODX_BASE_PATH . 'assets/docs/changelog.txt';
-	if(is_readable($changeLog))
-		echo str_replace("\n",'<br>',file_get_contents($changeLog));
-?>
+	if(is_readable($changeLog)) {
+			echo str_replace("\n",'<br>',file_get_contents($changeLog));
+	}
+	?>
 </div>
\ No newline at end of file

Please login to merge, or discard this patch.

manager/actions/help/02Documentation.php 2 patches

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@
 block discarded – undo
 <?php
-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.");
+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.");
 ?>
 
 <div class="sectionHeader"><?php echo $_lang['documentation']; ?></div><div class="sectionBody">

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,5 +1,7 @@
 block discarded – undo
 <?php
-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.");
+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.");
+}
 ?>
 
 <div class="sectionHeader"><?php echo $_lang['documentation']; ?></div><div class="sectionBody">

Please login to merge, or discard this patch.

manager/actions/help/03Version_Notices.php 2 patches

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-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.");
+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.");
 
     if ($handle = opendir('actions/help/version_notices')) {
         while (false !== ($file = readdir($handle))) {
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
     usort($notices, 'version_compare');
     $notices = array_reverse($notices);
     
-    foreach($notices as $v) {
+    foreach ($notices as $v) {
         if ($v >= '1.3.0') {
             $cms = 'EVO';
         }

Please login to merge, or discard this patch.

Braces +4 added lines, -3 removed lines patch added patch discarded remove patch

@@ -1,5 +1,7 @@  discard block
 block discarded – undo
 <?php
-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.");
+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.");
+}
 
     if ($handle = opendir('actions/help/version_notices')) {
         while (false !== ($file = readdir($handle))) {
@@ -16,8 +18,7 @@  discard block
 block discarded – undo
     foreach($notices as $v) {
         if ($v >= '1.3.0') {
             $cms = 'EVO';
-        }
-        else {
+        } else {
             $cms = 'MODX EVO';
         }
         echo '<div class="sectionHeader"> '.$cms.' '.$v.'</div><div class="sectionBody">';

Please login to merge, or discard this patch.

manager/actions/help/version_notices/1.3.4.php 2 patches

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@
 block discarded – undo
 <?php
-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.");
+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.");
 ?>
 <p></p>
 <ul>

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,5 +1,7 @@
 block discarded – undo
 <?php
-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.");
+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.");
+}
 ?>
 <p></p>
 <ul>

Please login to merge, or discard this patch.

manager/actions/help/version_notices/1.2.php 2 patches

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@
 block discarded – undo
 <?php
-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.");
+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.");
 ?>
 <p></p>
 <h1>Resource-Tree</h1>

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,5 +1,7 @@
 block discarded – undo
 <?php
-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.");
+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.");
+}
 ?>
 <p></p>
 <h1>Resource-Tree</h1>

Please login to merge, or discard this patch.

manager/actions/help/version_notices/1.2.2.php 2 patches

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@
 block discarded – undo
 <?php
-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.");
+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.");
 ?>
 <p></p>
 <h1>TinyMCE4</h1>

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,5 +1,7 @@
 block discarded – undo
 <?php
-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.");
+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.");
+}
 ?>
 <p></p>
 <h1>TinyMCE4</h1>

Please login to merge, or discard this patch.

manager/actions/help/version_notices/1.3.0.php 2 patches

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@
 block discarded – undo
 <?php
-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.");
+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.");
 ?>
 <p></p>
 <h1>EVOLUTION CMS 1.3.0</h1>

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,5 +1,7 @@
 block discarded – undo
 <?php
-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.");
+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.");
+}
 ?>
 <p></p>
 <h1>EVOLUTION CMS 1.3.0</h1>

Please login to merge, or discard this patch.

		@@ -65,7 +65,7 @@ discard block
		block discarded – undo
65	65	// Add lock-element JS-Script
66	66	$lockElementId = $id;
67	67	$lockElementType = 3;
68		-require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php');
	68	+require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php');
69	69
70	70	// Print RTE Javascript function
71	71	?>
		@@ -136,7 +136,7 @@ discard block
		block discarded – undo
136	136	<input type="hidden" name="mode" value="<?= $modx->manager->action ?>" />
137	137
138	138	<h1>
139		- <i class="fa fa-th-large"></i><?= ($content['name'] ? $content['name'] . '<small>(' . $content['id'] . ')</small>' : $_lang['new_htmlsnippet']) ?><i class="fa fa-question-circle help"></i>
	139	+ <i class="fa fa-th-large"></i><?= ($content['name'] ? $content['name'].'<small>('.$content['id'].')</small>' : $_lang['new_htmlsnippet']) ?><i class="fa fa-question-circle help"></i>
140	140	</h1>
141	141
142	142	<?= $_style['actionbuttons']['dynamic']['element'] ?>
		@@ -160,7 +160,7 @@ discard block
		block discarded – undo
160	160	<div class="form-control-name clearfix">
161	161	<input name="name" type="text" maxlength="100" value="<?= $modx->htmlspecialchars($content['name']) ?>" class="form-control form-control-lg" onchange="documentDirty=true;" />
162	162	<?php if ($modx->hasPermission('save_role')): ?>
163		- <label class="custom-control" title="<?= $_lang['lock_htmlsnippet'] . "\n" . $_lang['lock_htmlsnippet_msg'] ?>" tooltip>
	163	+ <label class="custom-control" title="<?= $_lang['lock_htmlsnippet']."\n".$_lang['lock_htmlsnippet_msg'] ?>" tooltip>
164	164	<input name="locked" type="checkbox" value="on"<?= ($content['locked'] == 1 \|\| $content['locked'] == 'on' ? ' checked="checked"' : '') ?> />
165	165	<i class="fa fa-lock"></i>
166	166	</label>
		@@ -184,9 +184,9 @@ discard block
		block discarded – undo
184	184	<select name="categoryid" class="form-control" onchange="documentDirty=true;">
185	185	<option> </option>
186	186	<?php
187		- include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
	187	+ include_once(MODX_MANAGER_PATH.'includes/categories.inc.php');
188	188	foreach (getCategories() as $n => $v) {
189		- echo "\t\t\t\t" . '<option value="' . $v['id'] . '"' . ($content['category'] == $v['id'] \|\| (empty($content['category']) && $_POST['categoryid'] == $v['id']) ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($v['category']) . "</option>\n";
	189	+ echo "\t\t\t\t".'<option value="'.$v['id'].'"'.($content['category'] == $v['id'] \|\| (empty($content['category']) && $_POST['categoryid'] == $v['id']) ? ' selected="selected"' : '').'>'.$modx->htmlspecialchars($v['category'])."</option>\n";
190	190	}
191	191	?>
192	192	</select>
		@@ -200,7 +200,7 @@ discard block
		block discarded – undo
200	200	</div>
201	201	<?php if ($_SESSION['mgrRole'] == 1): ?>
202	202	<div class="form-row">
203		- <label><input name="disabled" type="checkbox" value="on"<?= ($content['disabled'] == 1 ? ' checked="checked"' : '') ?> /> <?= ($content['disabled'] == 1 ? "<span class='text-danger'>" . $_lang['disabled'] . "</span>" : $_lang['disabled']) ?></label>
	203	+ <label><input name="disabled" type="checkbox" value="on"<?= ($content['disabled'] == 1 ? ' checked="checked"' : '') ?> /> <?= ($content['disabled'] == 1 ? "<span class='text-danger'>".$_lang['disabled']."</span>" : $_lang['disabled']) ?></label>
204	204	</div>
205	205	<?php endif; ?>
206	206	</div>
		@@ -216,7 +216,7 @@ discard block
		block discarded – undo
216	216	$evtOut = $modx->invokeEvent('OnRichTextEditorRegister');
217	217	if (is_array($evtOut)) {
218	218	foreach ($evtOut as $i => $editor) {
219		- echo "\t" . '<option value="' . $editor . '"' . ($which_editor == $editor ? ' selected="selected"' : '') . '>' . $editor . "</option>\n";
	219	+ echo "\t".'<option value="'.$editor.'"'.($which_editor == $editor ? ' selected="selected"' : '').'>'.$editor."</option>\n";
220	220	}
221	221	}
222	222	?>

		@@ -4,18 +4,18 @@
		block discarded – undo
4	4	}
5	5
6	6	switch ($modx->manager->action) {
7		- case 78:
8		- if (!$modx->hasPermission('edit_chunk')) {
9		- $modx->webAlertAndQuit($_lang["error_no_privileges"]);
10		- }
11		- break;
12		- case 77:
13		- if (!$modx->hasPermission('new_chunk')) {
	7	+ case 78:
	8	+ if (!$modx->hasPermission('edit_chunk')) {
	9	+ $modx->webAlertAndQuit($_lang["error_no_privileges"]);
	10	+ }
	11	+ break;
	12	+ case 77:
	13	+ if (!$modx->hasPermission('new_chunk')) {
	14	+ $modx->webAlertAndQuit($_lang["error_no_privileges"]);
	15	+ }
	16	+ break;
	17	+ default:
14	18	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
15		- }
16		- break;
17		- default:
18		- $modx->webAlertAndQuit($_lang["error_no_privileges"]);
19	19	}
20	20
21	21	$id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;

		@@ -1,6 +1,6 @@ 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	$helpBasePath = "actions/help/";
6	6	?>
		@@ -16,36 +16,36 @@ discard block
		block discarded – undo
16	16	</script>
17	17
18	18	<?php
19		- if($handle = opendir('actions/help')) {
20		- while(false !== ($file = readdir($handle))) {
21		- if($file != "." && $file != ".." && $file != ".svn" && $file != 'index.html' && !is_dir($helpBasePath . $file)) {
22		- $help[] = $file;
23		- }
24		- }
25		- closedir($handle);
26		- }
27		-
28		- natcasesort($help);
29		-
30		- foreach($help as $k => $v) {
31		-
32		- $helpname = substr($v, 0, strrpos($v, '.'));
33		-
34		- $prefix = substr($helpname, 0, 2);
35		- if(is_numeric($prefix)) {
36		- $helpname = substr($helpname, 2, strlen($helpname) - 1);
37		- }
38		-
39		- $hnLower = strtolower($helpname);
40		- $helpname = isset($_lang[$hnLower]) ? $_lang[$hnLower] : str_replace('_', ' ', $helpname);
41		-
42		- echo '<div class="tab-page" id="tab' . $k . 'Help">';
43		- echo '<h2 class="tab">' . $helpname . '</h2>';
44		- echo '<script type="text/javascript">tp.addTabPage( document.getElementById( "tab' . $k . 'Help" ) );</script>';
45		- include_once($helpBasePath . "{$v}");
46		- echo '</div>';
47		- }
48		- ?>
	19	+ if($handle = opendir('actions/help')) {
	20	+ while(false !== ($file = readdir($handle))) {
	21	+ if($file != "." && $file != ".." && $file != ".svn" && $file != 'index.html' && !is_dir($helpBasePath . $file)) {
	22	+ $help[] = $file;
	23	+ }
	24	+ }
	25	+ closedir($handle);
	26	+ }
	27	+
	28	+ natcasesort($help);
	29	+
	30	+ foreach($help as $k => $v) {
	31	+
	32	+ $helpname = substr($v, 0, strrpos($v, '.'));
	33	+
	34	+ $prefix = substr($helpname, 0, 2);
	35	+ if(is_numeric($prefix)) {
	36	+ $helpname = substr($helpname, 2, strlen($helpname) - 1);
	37	+ }
	38	+
	39	+ $hnLower = strtolower($helpname);
	40	+ $helpname = isset($_lang[$hnLower]) ? $_lang[$hnLower] : str_replace('_', ' ', $helpname);
	41	+
	42	+ echo '<div class="tab-page" id="tab' . $k . 'Help">';
	43	+ echo '<h2 class="tab">' . $helpname . '</h2>';
	44	+ echo '<script type="text/javascript">tp.addTabPage( document.getElementById( "tab' . $k . 'Help" ) );</script>';
	45	+ include_once($helpBasePath . "{$v}");
	46	+ echo '</div>';
	47	+ }
	48	+ ?>
49	49	</div>
50	50	</div>
51	51	<script>

		@@ -1,12 +1,12 @@ 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	$helpBasePath = "actions/help/";
6	6	?>
7	7
8	8	<h1>
9		- <?php echo $_style['page_help']; echo $_lang['help']; ?>
	9	+ <?php echo $_style['page_help']; echo $_lang['help']; ?>
10	10	</h1>
11	11
12	12	<div class="sectionBody">
		@@ -16,9 +16,9 @@ discard block
		block discarded – undo
16	16	</script>
17	17
18	18	<?php
19		- if($handle = opendir('actions/help')) {
20		- while(false !== ($file = readdir($handle))) {
21		- if($file != "." && $file != ".." && $file != ".svn" && $file != 'index.html' && !is_dir($helpBasePath . $file)) {
	19	+ if ($handle = opendir('actions/help')) {
	20	+ while (false !== ($file = readdir($handle))) {
	21	+ if ($file != "." && $file != ".." && $file != ".svn" && $file != 'index.html' && !is_dir($helpBasePath.$file)) {
22	22	$help[] = $file;
23	23	}
24	24	}
		@@ -27,22 +27,22 @@ discard block
		block discarded – undo
27	27
28	28	natcasesort($help);
29	29
30		- foreach($help as $k => $v) {
	30	+ foreach ($help as $k => $v) {
31	31
32	32	$helpname = substr($v, 0, strrpos($v, '.'));
33	33
34	34	$prefix = substr($helpname, 0, 2);
35		- if(is_numeric($prefix)) {
	35	+ if (is_numeric($prefix)) {
36	36	$helpname = substr($helpname, 2, strlen($helpname) - 1);
37	37	}
38	38
39	39	$hnLower = strtolower($helpname);
40	40	$helpname = isset($_lang[$hnLower]) ? $_lang[$hnLower] : str_replace('_', ' ', $helpname);
41	41
42		- echo '<div class="tab-page" id="tab' . $k . 'Help">';
43		- echo '<h2 class="tab">' . $helpname . '</h2>';
44		- echo '<script type="text/javascript">tp.addTabPage( document.getElementById( "tab' . $k . 'Help" ) );</script>';
45		- include_once($helpBasePath . "{$v}");
	42	+ echo '<div class="tab-page" id="tab'.$k.'Help">';
	43	+ echo '<h2 class="tab">'.$helpname.'</h2>';
	44	+ echo '<script type="text/javascript">tp.addTabPage( document.getElementById( "tab'.$k.'Help" ) );</script>';
	45	+ include_once($helpBasePath."{$v}");
46	46	echo '</div>';
47	47	}
48	48	?>

		@@ -1,5 +1,5 @@ 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	$helpBasePath = "actions/help/";
		@@ -16,9 +16,9 @@ discard block
		block discarded – undo
16	16	</script>
17	17
18	18	<?php
19		- if($handle = opendir('actions/help')) {
20		- while(false !== ($file = readdir($handle))) {
21		- if($file != "." && $file != ".." && $file != ".svn" && $file != 'index.html' && !is_dir($helpBasePath . $file)) {
	19	+ if($handle = opendir('actions/help')) {
	20	+ while(false !== ($file = readdir($handle))) {
	21	+ if($file != "." && $file != ".." && $file != ".svn" && $file != 'index.html' && !is_dir($helpBasePath . $file)) {
22	22	$help[] = $file;
23	23	}
24	24	}
		@@ -27,12 +27,12 @@ discard block
		block discarded – undo
27	27
28	28	natcasesort($help);
29	29
30		- foreach($help as $k => $v) {
	30	+ foreach($help as $k => $v) {
31	31
32	32	$helpname = substr($v, 0, strrpos($v, '.'));
33	33
34	34	$prefix = substr($helpname, 0, 2);
35		- if(is_numeric($prefix)) {
	35	+ if(is_numeric($prefix)) {
36	36	$helpname = substr($helpname, 2, strlen($helpname) - 1);
37	37	}
38	38

		@@ -5,8 +5,8 @@
		block discarded – undo
5	5	<div class="sectionHeader">Changelog</div>
6	6	<div class="sectionBody">
7	7	<?php
8		- $changeLog = MODX_BASE_PATH . 'assets/docs/changelog.txt';
9		- if(is_readable($changeLog))
10		- echo str_replace("\n",'<br>',file_get_contents($changeLog));
	8	+ $changeLog = MODX_BASE_PATH . 'assets/docs/changelog.txt';
	9	+ if(is_readable($changeLog))
	10	+ echo str_replace("\n",'<br>',file_get_contents($changeLog));
11	11	?>
12	12	</div>
13	13	\ No newline at end of file

		@@ -1,12 +1,15 @@
		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	6
5	7	<div class="sectionHeader">Changelog</div>
6	8	<div class="sectionBody">
7	9	<?php
8	10	$changeLog = MODX_BASE_PATH . 'assets/docs/changelog.txt';
9		- if(is_readable($changeLog))
10		- echo str_replace("\n",'<br>',file_get_contents($changeLog));
11		-?>
	11	+ if(is_readable($changeLog)) {
	12	+ echo str_replace("\n",'<br>',file_get_contents($changeLog));
	13	+ }
	14	+ ?>
12	15	</div>
13	16	\ No newline at end of file

		@@ -1,5 +1,5 @@
		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	4
5	5	<div class="sectionHeader"><?php echo $_lang['documentation']; ?></div><div class="sectionBody">

		@@ -1,5 +1,7 @@
		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	6
5	7	<div class="sectionHeader"><?php echo $_lang['documentation']; ?></div><div class="sectionBody">

		@@ -1,5 +1,7 @@ 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	6	if ($handle = opendir('actions/help/version_notices')) {
5	7	while (false !== ($file = readdir($handle))) {
		@@ -16,8 +18,7 @@ discard block
		block discarded – undo
16	18	foreach($notices as $v) {
17	19	if ($v >= '1.3.0') {
18	20	$cms = 'EVO';
19		- }
20		- else {
	21	+ } else {
21	22	$cms = 'MODX EVO';
22	23	}
23	24	echo '<div class="sectionHeader"> '.$cms.' '.$v.'</div><div class="sectionBody">';

evolution-cms / evolution

Pull Request — develop (#518)

Status

Category

Switch Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Indentation +31 added lines, -31 removed lines patch added patch discarded remove patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

Braces +6 added lines, -6 removed lines patch added patch discarded remove patch

Indentation +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Braces +7 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Braces +4 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch