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

Completed

Pull Request — develop (#534)

by Agel_Nash

created 2018-02-25 12:47 UTC

Status

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

@@ -1,16 +1,16 @@
 block discarded – undo
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc GD image driver class
-  *   @package KCFinder
-  *   @version 2.54
-  *    @author Pavel Tzonkov <[email protected]>
-  * @copyright 2010-2014 KCFinder Project
-  *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
-  *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
-  *      @link http://kcfinder.sunhater.com
-  */
+ *
+ *      @desc GD image driver class
+ *   @package KCFinder
+ *   @version 2.54
+ *    @author Pavel Tzonkov <[email protected]>
+ * @copyright 2010-2014 KCFinder Project
+ *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
+ *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
+ *      @link http://kcfinder.sunhater.com
+ */
 
 class image_gd extends image {
 

Please login to merge, or discard this patch.

manager/media/browser/mcpuk/lib/helper_text.php 1 patch

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

@@ -1,30 +1,30 @@  discard block
 block discarded – undo
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc Text processing helper class
-  *   @package KCFinder
-  *   @version 2.54
-  *    @author Pavel Tzonkov <[email protected]>
-  * @copyright 2010-2014 KCFinder Project
-  *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
-  *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
-  *      @link http://kcfinder.sunhater.com
-  */
+ *
+ *      @desc Text processing helper class
+ *   @package KCFinder
+ *   @version 2.54
+ *    @author Pavel Tzonkov <[email protected]>
+ * @copyright 2010-2014 KCFinder Project
+ *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
+ *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
+ *      @link http://kcfinder.sunhater.com
+ */
 
 class text {
 
-  /** Replace repeated white spaces to single space
-    * @param string $string
-    * @return string */
+    /** Replace repeated white spaces to single space
+     * @param string $string
+     * @return string */
 
     static function clearWhitespaces($string) {
         return trim(preg_replace('/\s+/s', " ", $string));
     }
 
-  /** Normalize the string for HTML attribute value
-    * @param string $string
-    * @return string */
+    /** Normalize the string for HTML attribute value
+     * @param string $string
+     * @return string */
 
     static function htmlValue($string) {
         return
@@ -35,9 +35,9 @@  discard block
 block discarded – undo
         $string))));
     }
 
-  /** Normalize the string for JavaScript string value
-    * @param string $string
-    * @return string */
+    /** Normalize the string for JavaScript string value
+     * @param string $string
+     * @return string */
 
     static function jsValue($string) {
         return
@@ -48,9 +48,9 @@  discard block
 block discarded – undo
         $string))));
     }
 
-  /** Normalize the string for XML tag content data
-    * @param string $string
-    * @param bool $cdata */
+    /** Normalize the string for XML tag content data
+     * @param string $string
+     * @param bool $cdata */
 
     static function xmlData($string, $cdata=false) {
         $string = str_replace("]]>", "]]]]><![CDATA[>", $string);
@@ -59,9 +59,9 @@  discard block
 block discarded – undo
         return $string;
     }
 
-  /** Returns compressed content of given CSS code
-    * @param string $code
-    * @return string */
+    /** Returns compressed content of given CSS code
+     * @param string $code
+     * @return string */
 
     static function compressCSS($code) {
         $code = self::clearWhitespaces($code);

Please login to merge, or discard this patch.

manager/media/browser/mcpuk/lib/class_image_gmagick.php 1 patch

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

@@ -1,16 +1,16 @@
 block discarded – undo
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc GraphicsMagick image driver class
-  *   @package KCFinder
-  *   @version 2.54
-  *    @author Pavel Tzonkov <[email protected]>
-  * @copyright 2010-2014 KCFinder Project
-  *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
-  *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
-  *      @link http://kcfinder.sunhater.com
-  */
+ *
+ *      @desc GraphicsMagick image driver class
+ *   @package KCFinder
+ *   @version 2.54
+ *    @author Pavel Tzonkov <[email protected]>
+ * @copyright 2010-2014 KCFinder Project
+ *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
+ *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
+ *      @link http://kcfinder.sunhater.com
+ */
 
 class image_gmagick extends image {
 

Please login to merge, or discard this patch.

manager/media/browser/mcpuk/lib/class_zipFolder.php 1 patch

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

@@ -1,17 +1,17 @@
 block discarded – undo
 <?php
 
 /** This file is part of KCFinder project. The class are taken from
-  * http://www.php.net/manual/en/function.ziparchive-addemptydir.php
-  *
-  *      @desc Directory to ZIP file archivator
-  *   @package KCFinder
-  *   @version 2.54
-  *    @author Pavel Tzonkov <[email protected]>
-  * @copyright 2010-2014 KCFinder Project
-  *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
-  *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
-  *      @link http://kcfinder.sunhater.com
-  */
+ * http://www.php.net/manual/en/function.ziparchive-addemptydir.php
+ *
+ *      @desc Directory to ZIP file archivator
+ *   @package KCFinder
+ *   @version 2.54
+ *    @author Pavel Tzonkov <[email protected]>
+ * @copyright 2010-2014 KCFinder Project
+ *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
+ *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
+ *      @link http://kcfinder.sunhater.com
+ */
 
 class zipFolder {
     protected $zip;

Please login to merge, or discard this patch.

manager/media/browser/mcpuk/browse.php 1 patch

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

@@ -1,23 +1,23 @@
 block discarded – undo
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc Browser calling script
-  *   @package KCFinder
-  *   @version 2.54
-  *    @author Pavel Tzonkov <[email protected]>
-  * @copyright 2010-2014 KCFinder Project
-  *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
-  *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
-  *      @link http://kcfinder.sunhater.com
-  */
+ *
+ *      @desc Browser calling script
+ *   @package KCFinder
+ *   @version 2.54
+ *    @author Pavel Tzonkov <[email protected]>
+ * @copyright 2010-2014 KCFinder Project
+ *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
+ *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
+ *      @link http://kcfinder.sunhater.com
+ */
 
 require "core/autoload.php"; // Init MODX
 
 function returnNoPermissionsMessage($role) {
-	global $_lang;
-	echo sprintf($_lang['files_management_no_permission'], $role);
-	exit;
+    global $_lang;
+    echo sprintf($_lang['files_management_no_permission'], $role);
+    exit;
 }
 
 if( $_GET['type'] == 'images' && !$modx->hasPermission('file_manager') && !$modx->hasPermission('assets_images')) returnNoPermissionsMessage('assets_images');

Please login to merge, or discard this patch.

manager/media/browser/mcpuk/upload.php 1 patch

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

@@ -1,16 +1,16 @@
 block discarded – undo
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc Upload calling script
-  *   @package KCFinder
-  *   @version 2.54
-  *    @author Pavel Tzonkov <[email protected]>
-  * @copyright 2010-2014 KCFinder Project
-  *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
-  *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
-  *      @link http://kcfinder.sunhater.com
-  */
+ *
+ *      @desc Upload calling script
+ *   @package KCFinder
+ *   @version 2.54
+ *    @author Pavel Tzonkov <[email protected]>
+ * @copyright 2010-2014 KCFinder Project
+ *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
+ *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
+ *      @link http://kcfinder.sunhater.com
+ */
 
 require "core/autoload.php";
 $uploader = new uploader($modx);

Please login to merge, or discard this patch.

manager/media/style/default/style.php 1 patch

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

@@ -11,12 +11,12 @@  discard block
 block discarded – undo
 $style_path = 'media/style/' . $modx->config['manager_theme'] . '/images/';
 $modx->config['mgr_date_picker_path'] = 'media/calendar/datepicker.inc.php';
 if(!$modx->config['lang_code']) {
-	global $modx_lang_attribute;
-	$modx->config['lang_code'] = !$modx_lang_attribute ? 'en' : $modx_lang_attribute;
+    global $modx_lang_attribute;
+    $modx->config['lang_code'] = !$modx_lang_attribute ? 'en' : $modx_lang_attribute;
 }
 
 if($_GET['a'] == 2) {
-	include_once('welcome.php');
+    include_once('welcome.php');
 }
 
 // Favicon
@@ -274,66 +274,66 @@  discard block
 block discarded – undo
 $addnew = 0;
 $run = 0;
 switch($action) {
-	case '3':
-	case '4':
-	case '27':
-	case '72':
-		if($modx->hasPermission('new_document')) {
-			$addnew = 1;
-		}
-		break;
-	case '16':
-	case '19':
-		if($modx->hasPermission('new_template')) {
-			$addnew = 1;
-		}
-		break;
-	case '300':
-	case '301':
-		if($modx->hasPermission('new_snippet') && $modx->hasPermission('new_chunk') && $modx->hasPermission('new_plugin')) {
-			$addnew = 1;
-		}
-		break;
-	case '77':
-	case '78':
-		if($modx->hasPermission('new_chunk')) {
-			$addnew = 1;
-		}
-		break;
-	case '22':
-	case '23':
-		if($modx->hasPermission('new_snippet')) {
-			$addnew = 1;
-		}
-		break;
-	case '101':
-	case '102':
-		if($modx->hasPermission('new_plugin')) {
-			$addnew = 1;
-		}
-		break;
-	case '106':
-	case '107':
-	case '108':
-		if($modx->hasPermission('new_module')) {
-			$addnew = 1;
-		}
-		if($modx->hasPermission('exec_module')) {
-			$run = 1;
-		}
-		break;
-	case '88':
-		if($modx->hasPermission('new_web_user')) {
-			$addnew = 1;
-		}
-		break;
+    case '3':
+    case '4':
+    case '27':
+    case '72':
+        if($modx->hasPermission('new_document')) {
+            $addnew = 1;
+        }
+        break;
+    case '16':
+    case '19':
+        if($modx->hasPermission('new_template')) {
+            $addnew = 1;
+        }
+        break;
+    case '300':
+    case '301':
+        if($modx->hasPermission('new_snippet') && $modx->hasPermission('new_chunk') && $modx->hasPermission('new_plugin')) {
+            $addnew = 1;
+        }
+        break;
+    case '77':
+    case '78':
+        if($modx->hasPermission('new_chunk')) {
+            $addnew = 1;
+        }
+        break;
+    case '22':
+    case '23':
+        if($modx->hasPermission('new_snippet')) {
+            $addnew = 1;
+        }
+        break;
+    case '101':
+    case '102':
+        if($modx->hasPermission('new_plugin')) {
+            $addnew = 1;
+        }
+        break;
+    case '106':
+    case '107':
+    case '108':
+        if($modx->hasPermission('new_module')) {
+            $addnew = 1;
+        }
+        if($modx->hasPermission('exec_module')) {
+            $run = 1;
+        }
+        break;
+    case '88':
+        if($modx->hasPermission('new_web_user')) {
+            $addnew = 1;
+        }
+        break;
 }
 
 $disabled = ($action == '19' || $action == '300' || $action == '77' || $action == '23' || $action == '101' || $action == '4' || $action == '72' || $action == '87' || $action == '11' || $action == '107' || $action == '38') ? ' disabled' : '';
 
 $_style['actionbuttons'] = array(
-	'dynamic' => array(
-		'document' => '<div id="actions">
+    'dynamic' => array(
+        'document' => '<div id="actions">
 			<div class="btn-group">
 				<div class="btn-group">
 					<a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();">
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
 						<option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '') . '>' . $_lang['close'] . '</option>
 					</select>
 				</div>' .
-					($addnew ? '
+                    ($addnew ? '
 					<a id="Button6" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.duplicate();">
 						<i class="' . $_style["actions_duplicate"] . '"></i><span>' . $_lang['duplicate'] . '</span>
 					</a>
@@ -364,7 +364,7 @@  discard block
 block discarded – undo
 				</a>
 			</div>
 		</div>',
-		'user' => '<div id="actions">
+        'user' => '<div id="actions">
 			<div class="btn-group">
 				<div class="btn-group">
 					<a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();">
@@ -387,7 +387,7 @@  discard block
 block discarded – undo
 				</a>
 			</div>
 		</div>',
-		'element' => '<div id="actions">
+        'element' => '<div id="actions">
 			<div class="btn-group">
 				<div class="btn-group">
 					<a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();">
@@ -420,21 +420,21 @@  discard block
 block discarded – undo
 				' : '') . '
 			</div>
 		</div>',
-		'newmodule' => ($addnew ? '<div id="actions">
+        'newmodule' => ($addnew ? '<div id="actions">
 			<div class="btn-group">
 				<a id="newModule" class="btn btn-secondary" href="javascript:;" onclick="actions.new();">
 					<i class="' . $_style["actions_new"] . '"></i><span>' . $_lang['new_module'] . '</span>
 				</a>
 			</div>
 		</div>' : ''),
-		'close' => '<div id="actions">
+        'close' => '<div id="actions">
 			<div class="btn-group">
 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.close();">
 					<i class="' . $_style["actions_close"] . '"></i><span>' . $_lang['close'] . '</span>
 				</a>
 			</div>
 		</div>',
-		'save' => '<div id="actions">
+        'save' => '<div id="actions">
 			<div class="btn-group">
 				<a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();">
 					<i class="' . $_style["actions_save"] . '"></i><span>' . $_lang['save'] . '</span>
@@ -444,7 +444,7 @@  discard block
 block discarded – undo
 				</a>
 			</div>
 		</div>',
-		'savedelete' => '<div id="actions">
+        'savedelete' => '<div id="actions">
 			<div class="btn-group">
 				<a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();">
 					<i class="' . $_style["actions_save"] . '"></i><span>' . $_lang['save'] . '</span>
@@ -457,14 +457,14 @@  discard block
 block discarded – undo
 				</a>
 			</div>
 		</div>',
-		'cancel' => '<div id="actions">
+        'cancel' => '<div id="actions">
 			<div class="btn-group">
 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">
 					<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>
 				</a>
 			</div>
 		</div>',
-		'canceldelete' => '<div id="actions">
+        'canceldelete' => '<div id="actions">
 			<div class="btn-group">
 				<a id="Button3" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.delete();">
 					<i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span>
@@ -474,11 +474,11 @@  discard block
 block discarded – undo
 				</a>
 			</div>
 		</div>',
-	),
-	'static' => array(
-		'document' => '<div id="actions">
+    ),
+    'static' => array(
+        'document' => '<div id="actions">
 			<div class="btn-group">' .
-				($addnew ? '
+                ($addnew ? '
 					<a class="btn btn-secondary" href="javascript:;" onclick="actions.new();">
 						<i class="' . $_style["icons_new_document"] . '"></i><span>' . $_lang['create_resource_here'] . '</span>
 					</a>
@@ -503,12 +503,12 @@  discard block
 block discarded – undo
 				</a>
 			</div>
 		</div>',
-		'cancel' => '<div id="actions">
+        'cancel' => '<div id="actions">
 			<div class="btn-group">
 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">
 					<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>
 				</a>
 			</div>
 		</div>',
-	)
+    )
 );

Please login to merge, or discard this patch.

manager/media/rss/rss_fetch.inc 1 patch

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

@@ -166,7 +166,7 @@
 block discarded – undo
         $resp = _fetch_remote_file( $url, $request_headers );
         
         if (isset($resp) and $resp) {
-          if ($resp->status == '304' ) {
+            if ($resp->status == '304' ) {
                 // we have the most current copy
                 if ( MAGPIE_DEBUG > 1) {
                     debug("Got 304 for $url");

Please login to merge, or discard this patch.

manager/includes/categories.inc.php 1 patch

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

@@ -19,9 +19,9 @@  discard block
 block discarded – undo
     $useTable = $modx->getFullTableName('categories');
     $newCat = $modx->db->escape($newCat);
     $cats = $modx->db->select('id', $modx->getFullTableName('categories'), "category='{$newCat}'");
-	if($cat = $modx->db->getValue($cats)) {
-		return $cat;
-	}
+    if($cat = $modx->db->getValue($cats)) {
+        return $cat;
+    }
     return 0;
 }
 //Check for category, create new if not exists
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
     global $modx;
     $useTable = $modx->getFullTableName('categories');
     $cats = $modx->db->select('id, category', $modx->getFullTableName('categories'), '', 'category');
-	$resourceArray = array();
+    $resourceArray = array();
     while($row = $modx->db->getRow($cats)) {
         $row['category'] = stripslashes($row['category']);
         $resourceArray[] = $row;

Please login to merge, or discard this patch.

		@@ -166,7 +166,7 @@
		block discarded – undo
166	166	$resp = _fetch_remote_file( $url, $request_headers );
167	167
168	168	if (isset($resp) and $resp) {
169		- if ($resp->status == '304' ) {
	169	+ if ($resp->status == '304' ) {
170	170	// we have the most current copy
171	171	if ( MAGPIE_DEBUG > 1) {
172	172	debug("Got 304 for $url");

		@@ -1,16 +1,16 @@
		block discarded – undo
1	1	<?php
2	2
3	3	/** This file is part of KCFinder project
4		- *
5		- * @desc GD image driver class
6		- * @package KCFinder
7		- * @version 2.54
8		- * @author Pavel Tzonkov <[email protected]>
9		- * @copyright 2010-2014 KCFinder Project
10		- * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
11		- * @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
12		- * @link http://kcfinder.sunhater.com
13		- */
	4	+ *
	5	+ * @desc GD image driver class
	6	+ * @package KCFinder
	7	+ * @version 2.54
	8	+ * @author Pavel Tzonkov <[email protected]>
	9	+ * @copyright 2010-2014 KCFinder Project
	10	+ * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
	11	+ * @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
	12	+ * @link http://kcfinder.sunhater.com
	13	+ */
14	14
15	15	class image_gd extends image {
16	16

		@@ -1,30 +1,30 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3	3	/** This file is part of KCFinder project
4		- *
5		- * @desc Text processing helper class
6		- * @package KCFinder
7		- * @version 2.54
8		- * @author Pavel Tzonkov <[email protected]>
9		- * @copyright 2010-2014 KCFinder Project
10		- * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
11		- * @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
12		- * @link http://kcfinder.sunhater.com
13		- */
	4	+ *
	5	+ * @desc Text processing helper class
	6	+ * @package KCFinder
	7	+ * @version 2.54
	8	+ * @author Pavel Tzonkov <[email protected]>
	9	+ * @copyright 2010-2014 KCFinder Project
	10	+ * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
	11	+ * @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
	12	+ * @link http://kcfinder.sunhater.com
	13	+ */
14	14
15	15	class text {
16	16
17		- /** Replace repeated white spaces to single space
18		- * @param string $string
19		- * @return string */
	17	+ /** Replace repeated white spaces to single space
	18	+ * @param string $string
	19	+ * @return string */
20	20
21	21	static function clearWhitespaces($string) {
22	22	return trim(preg_replace('/\s+/s', " ", $string));
23	23	}
24	24
25		- /** Normalize the string for HTML attribute value
26		- * @param string $string
27		- * @return string */
	25	+ /** Normalize the string for HTML attribute value
	26	+ * @param string $string
	27	+ * @return string */
28	28
29	29	static function htmlValue($string) {
30	30	return
		@@ -35,9 +35,9 @@ discard block
		block discarded – undo
35	35	$string))));
36	36	}
37	37
38		- /** Normalize the string for JavaScript string value
39		- * @param string $string
40		- * @return string */
	38	+ /** Normalize the string for JavaScript string value
	39	+ * @param string $string
	40	+ * @return string */
41	41
42	42	static function jsValue($string) {
43	43	return
		@@ -48,9 +48,9 @@ discard block
		block discarded – undo
48	48	$string))));
49	49	}
50	50
51		- /** Normalize the string for XML tag content data
52		- * @param string $string
53		- * @param bool $cdata */
	51	+ /** Normalize the string for XML tag content data
	52	+ * @param string $string
	53	+ * @param bool $cdata */
54	54
55	55	static function xmlData($string, $cdata=false) {
56	56	$string = str_replace("]]>", "]]]]><![CDATA[>", $string);
		@@ -59,9 +59,9 @@ discard block
		block discarded – undo
59	59	return $string;
60	60	}
61	61
62		- /** Returns compressed content of given CSS code
63		- * @param string $code
64		- * @return string */
	62	+ /** Returns compressed content of given CSS code
	63	+ * @param string $code
	64	+ * @return string */
65	65
66	66	static function compressCSS($code) {
67	67	$code = self::clearWhitespaces($code);

		@@ -1,17 +1,17 @@
		block discarded – undo
1	1	<?php
2	2
3	3	/** This file is part of KCFinder project. The class are taken from
4		- * http://www.php.net/manual/en/function.ziparchive-addemptydir.php
5		- *
6		- * @desc Directory to ZIP file archivator
7		- * @package KCFinder
8		- * @version 2.54
9		- * @author Pavel Tzonkov <[email protected]>
10		- * @copyright 2010-2014 KCFinder Project
11		- * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
12		- * @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
13		- * @link http://kcfinder.sunhater.com
14		- */
	4	+ * http://www.php.net/manual/en/function.ziparchive-addemptydir.php
	5	+ *
	6	+ * @desc Directory to ZIP file archivator
	7	+ * @package KCFinder
	8	+ * @version 2.54
	9	+ * @author Pavel Tzonkov <[email protected]>
	10	+ * @copyright 2010-2014 KCFinder Project
	11	+ * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
	12	+ * @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
	13	+ * @link http://kcfinder.sunhater.com
	14	+ */
15	15
16	16	class zipFolder {
17	17	protected $zip;

		@@ -1,23 +1,23 @@
		block discarded – undo
1	1	<?php
2	2
3	3	/** This file is part of KCFinder project
4		- *
5		- * @desc Browser calling script
6		- * @package KCFinder
7		- * @version 2.54
8		- * @author Pavel Tzonkov <[email protected]>
9		- * @copyright 2010-2014 KCFinder Project
10		- * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
11		- * @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
12		- * @link http://kcfinder.sunhater.com
13		- */
	4	+ *
	5	+ * @desc Browser calling script
	6	+ * @package KCFinder
	7	+ * @version 2.54
	8	+ * @author Pavel Tzonkov <[email protected]>
	9	+ * @copyright 2010-2014 KCFinder Project
	10	+ * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
	11	+ * @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
	12	+ * @link http://kcfinder.sunhater.com
	13	+ */
14	14
15	15	require "core/autoload.php"; // Init MODX
16	16
17	17	function returnNoPermissionsMessage($role) {
18		- global $_lang;
19		- echo sprintf($_lang['files_management_no_permission'], $role);
20		- exit;
	18	+ global $_lang;
	19	+ echo sprintf($_lang['files_management_no_permission'], $role);
	20	+ exit;
21	21	}
22	22
23	23	if( $_GET['type'] == 'images' && !$modx->hasPermission('file_manager') && !$modx->hasPermission('assets_images')) returnNoPermissionsMessage('assets_images');

		@@ -11,12 +11,12 @@ discard block
		block discarded – undo
11	11	$style_path = 'media/style/' . $modx->config['manager_theme'] . '/images/';
12	12	$modx->config['mgr_date_picker_path'] = 'media/calendar/datepicker.inc.php';
13	13	if(!$modx->config['lang_code']) {
14		- global $modx_lang_attribute;
15		- $modx->config['lang_code'] = !$modx_lang_attribute ? 'en' : $modx_lang_attribute;
	14	+ global $modx_lang_attribute;
	15	+ $modx->config['lang_code'] = !$modx_lang_attribute ? 'en' : $modx_lang_attribute;
16	16	}
17	17
18	18	if($_GET['a'] == 2) {
19		- include_once('welcome.php');
	19	+ include_once('welcome.php');
20	20	}
21	21
22	22	// Favicon
		@@ -274,66 +274,66 @@ discard block
		block discarded – undo
274	274	$addnew = 0;
275	275	$run = 0;
276	276	switch($action) {
277		- case '3':
278		- case '4':
279		- case '27':
280		- case '72':
281		- if($modx->hasPermission('new_document')) {
282		- $addnew = 1;
283		- }
284		- break;
285		- case '16':
286		- case '19':
287		- if($modx->hasPermission('new_template')) {
288		- $addnew = 1;
289		- }
290		- break;
291		- case '300':
292		- case '301':
293		- if($modx->hasPermission('new_snippet') && $modx->hasPermission('new_chunk') && $modx->hasPermission('new_plugin')) {
294		- $addnew = 1;
295		- }
296		- break;
297		- case '77':
298		- case '78':
299		- if($modx->hasPermission('new_chunk')) {
300		- $addnew = 1;
301		- }
302		- break;
303		- case '22':
304		- case '23':
305		- if($modx->hasPermission('new_snippet')) {
306		- $addnew = 1;
307		- }
308		- break;
309		- case '101':
310		- case '102':
311		- if($modx->hasPermission('new_plugin')) {
312		- $addnew = 1;
313		- }
314		- break;
315		- case '106':
316		- case '107':
317		- case '108':
318		- if($modx->hasPermission('new_module')) {
319		- $addnew = 1;
320		- }
321		- if($modx->hasPermission('exec_module')) {
322		- $run = 1;
323		- }
324		- break;
325		- case '88':
326		- if($modx->hasPermission('new_web_user')) {
327		- $addnew = 1;
328		- }
329		- break;
	277	+ case '3':
	278	+ case '4':
	279	+ case '27':
	280	+ case '72':
	281	+ if($modx->hasPermission('new_document')) {
	282	+ $addnew = 1;
	283	+ }
	284	+ break;
	285	+ case '16':
	286	+ case '19':
	287	+ if($modx->hasPermission('new_template')) {
	288	+ $addnew = 1;
	289	+ }
	290	+ break;
	291	+ case '300':
	292	+ case '301':
	293	+ if($modx->hasPermission('new_snippet') && $modx->hasPermission('new_chunk') && $modx->hasPermission('new_plugin')) {
	294	+ $addnew = 1;
	295	+ }
	296	+ break;
	297	+ case '77':
	298	+ case '78':
	299	+ if($modx->hasPermission('new_chunk')) {
	300	+ $addnew = 1;
	301	+ }
	302	+ break;
	303	+ case '22':
	304	+ case '23':
	305	+ if($modx->hasPermission('new_snippet')) {
	306	+ $addnew = 1;
	307	+ }
	308	+ break;
	309	+ case '101':
	310	+ case '102':
	311	+ if($modx->hasPermission('new_plugin')) {
	312	+ $addnew = 1;
	313	+ }
	314	+ break;
	315	+ case '106':
	316	+ case '107':
	317	+ case '108':
	318	+ if($modx->hasPermission('new_module')) {
	319	+ $addnew = 1;
	320	+ }
	321	+ if($modx->hasPermission('exec_module')) {
	322	+ $run = 1;
	323	+ }
	324	+ break;
	325	+ case '88':
	326	+ if($modx->hasPermission('new_web_user')) {
	327	+ $addnew = 1;
	328	+ }
	329	+ break;
330	330	}
331	331
332	332	$disabled = ($action == '19' \|\| $action == '300' \|\| $action == '77' \|\| $action == '23' \|\| $action == '101' \|\| $action == '4' \|\| $action == '72' \|\| $action == '87' \|\| $action == '11' \|\| $action == '107' \|\| $action == '38') ? ' disabled' : '';
333	333
334	334	$_style['actionbuttons'] = array(
335		- 'dynamic' => array(
336		- 'document' => '<div id="actions">
	335	+ 'dynamic' => array(
	336	+ 'document' => '<div id="actions">
337	337	<div class="btn-group">
338	338	<div class="btn-group">
339	339	<a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();">
		@@ -348,7 +348,7 @@ discard block
		block discarded – undo
348	348	<option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '') . '>' . $_lang['close'] . '</option>
349	349	</select>
350	350	</div>' .
351		- ($addnew ? '
	351	+ ($addnew ? '
352	352	<a id="Button6" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.duplicate();">
353	353	<i class="' . $_style["actions_duplicate"] . '"></i><span>' . $_lang['duplicate'] . '</span>
354	354	</a>
		@@ -364,7 +364,7 @@ discard block
		block discarded – undo
364	364	</a>
365	365	</div>
366	366	</div>',
367		- 'user' => '<div id="actions">
	367	+ 'user' => '<div id="actions">
368	368	<div class="btn-group">
369	369	<div class="btn-group">
370	370	<a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();">
		@@ -387,7 +387,7 @@ discard block
		block discarded – undo
387	387	</a>
388	388	</div>
389	389	</div>',
390		- 'element' => '<div id="actions">
	390	+ 'element' => '<div id="actions">
391	391	<div class="btn-group">
392	392	<div class="btn-group">
393	393	<a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();">
		@@ -420,21 +420,21 @@ discard block
		block discarded – undo
420	420	' : '') . '
421	421	</div>
422	422	</div>',
423		- 'newmodule' => ($addnew ? '<div id="actions">
	423	+ 'newmodule' => ($addnew ? '<div id="actions">
424	424	<div class="btn-group">
425	425	<a id="newModule" class="btn btn-secondary" href="javascript:;" onclick="actions.new();">
426	426	<i class="' . $_style["actions_new"] . '"></i><span>' . $_lang['new_module'] . '</span>
427	427	</a>
428	428	</div>
429	429	</div>' : ''),
430		- 'close' => '<div id="actions">
	430	+ 'close' => '<div id="actions">
431	431	<div class="btn-group">
432	432	<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.close();">
433	433	<i class="' . $_style["actions_close"] . '"></i><span>' . $_lang['close'] . '</span>
434	434	</a>
435	435	</div>
436	436	</div>',
437		- 'save' => '<div id="actions">
	437	+ 'save' => '<div id="actions">
438	438	<div class="btn-group">
439	439	<a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();">
440	440	<i class="' . $_style["actions_save"] . '"></i><span>' . $_lang['save'] . '</span>
		@@ -444,7 +444,7 @@ discard block
		block discarded – undo
444	444	</a>
445	445	</div>
446	446	</div>',
447		- 'savedelete' => '<div id="actions">
	447	+ 'savedelete' => '<div id="actions">
448	448	<div class="btn-group">
449	449	<a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();">
450	450	<i class="' . $_style["actions_save"] . '"></i><span>' . $_lang['save'] . '</span>
		@@ -457,14 +457,14 @@ discard block
		block discarded – undo
457	457	</a>
458	458	</div>
459	459	</div>',
460		- 'cancel' => '<div id="actions">
	460	+ 'cancel' => '<div id="actions">
461	461	<div class="btn-group">
462	462	<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">
463	463	<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>
464	464	</a>
465	465	</div>
466	466	</div>',
467		- 'canceldelete' => '<div id="actions">
	467	+ 'canceldelete' => '<div id="actions">
468	468	<div class="btn-group">
469	469	<a id="Button3" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.delete();">
470	470	<i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span>
		@@ -474,11 +474,11 @@ discard block
		block discarded – undo
474	474	</a>
475	475	</div>
476	476	</div>',
477		- ),
478		- 'static' => array(
479		- 'document' => '<div id="actions">
	477	+ ),
	478	+ 'static' => array(
	479	+ 'document' => '<div id="actions">
480	480	<div class="btn-group">' .
481		- ($addnew ? '
	481	+ ($addnew ? '
482	482	<a class="btn btn-secondary" href="javascript:;" onclick="actions.new();">
483	483	<i class="' . $_style["icons_new_document"] . '"></i><span>' . $_lang['create_resource_here'] . '</span>
484	484	</a>
		@@ -503,12 +503,12 @@ discard block
		block discarded – undo
503	503	</a>
504	504	</div>
505	505	</div>',
506		- 'cancel' => '<div id="actions">
	506	+ 'cancel' => '<div id="actions">
507	507	<div class="btn-group">
508	508	<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">
509	509	<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>
510	510	</a>
511	511	</div>
512	512	</div>',
513		- )
	513	+ )
514	514	);

		@@ -19,9 +19,9 @@ discard block
		block discarded – undo
19	19	$useTable = $modx->getFullTableName('categories');
20	20	$newCat = $modx->db->escape($newCat);
21	21	$cats = $modx->db->select('id', $modx->getFullTableName('categories'), "category='{$newCat}'");
22		- if($cat = $modx->db->getValue($cats)) {
23		- return $cat;
24		- }
	22	+ if($cat = $modx->db->getValue($cats)) {
	23	+ return $cat;
	24	+ }
25	25	return 0;
26	26	}
27	27	//Check for category, create new if not exists
		@@ -35,7 +35,7 @@ discard block
		block discarded – undo
35	35	global $modx;
36	36	$useTable = $modx->getFullTableName('categories');
37	37	$cats = $modx->db->select('id, category', $modx->getFullTableName('categories'), '', 'category');
38		- $resourceArray = array();
	38	+ $resourceArray = array();
39	39	while($row = $modx->db->getRow($cats)) {
40	40	$row['category'] = stripslashes($row['category']);
41	41	$resourceArray[] = $row;

evolution-cms / evolution

Pull Request — develop (#534)

Status

Category

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

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

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

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

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

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

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

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

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