Inspection of "Revert 2 develop" - evolution-cms/evolution - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — develop (#731)

by Serg

created 2018-06-16 14:22 UTC

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

@@ -1,9 +1,9 @@
 block discarded – undo
 <?php
 if( ! defined('IN_MANAGER_MODE') || 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.");
 }
 if(!$modx->hasPermission('change_password')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 ?>
 

Please login to merge, or discard this patch.

manager/actions/category_mgr/inc/request_trigger.inc.php 1 patch

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

@@ -21,7 +21,7 @@  discard block
 block discarded – undo
 
             if( $uncategorized_elements = $cm->getAssignedElements( 0, $_data['elements'] ) )
             {
-               $output .= $cm->renderView('chunks/categorize/uncategorized_elements', $uncategorized_elements);
+                $output .= $cm->renderView('chunks/categorize/uncategorized_elements', $uncategorized_elements);
             }
 
             foreach( $cm->getCategories() as $category )
@@ -106,14 +106,14 @@  discard block
 block discarded – undo
 
     if( empty( $category ) )
     {
-       $cm->addMessage( $cm->txt('cm_enter_name_for_category'), 'add' );
-       return;
+        $cm->addMessage( $cm->txt('cm_enter_name_for_category'), 'add' );
+        return;
     }
 
     if( $cm->isCategoryExists( $category ) )
     {
-       $cm->addMessage( sprintf( $cm->txt('cm_category_x_exists'), $category ), 'add' );
-       return;
+        $cm->addMessage( sprintf( $cm->txt('cm_category_x_exists'), $category ), 'add' );
+        return;
     }
 
     if( $cm->addCategory( $category, $rank ) !== 0 )

Please login to merge, or discard this patch.

manager/actions/eventlog_details.dynamic.php 1 patch

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

@@ -1,9 +1,9 @@  discard block
 block discarded – undo
 <?php
 if( ! defined('IN_MANAGER_MODE') || 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.");
 }
 if(!$modx->hasPermission('view_eventlog')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 // get id
@@ -41,18 +41,18 @@  discard block
 block discarded – undo
 	<div class="tab-page">
 		<div class="container container-body">
 			<?php
-			$date = $modx->toDateFormat($content["createdon"]);
-			if($content["type"] == 1) {
-				$icon = $_style['actions_info'] . ' text-info';
-				$msgtype = $_lang["information"];
-			} else if($content["type"] == 2) {
-				$icon = $_style['actions_triangle'] . ' text-warning';
-				$msgtype = $_lang["warning"];
-			} else if($content["type"] == 3) {
-				$icon = $_style['actions_error'] . ' text-danger';
-				$msgtype = $_lang["error"];
-			}
-			?>
+            $date = $modx->toDateFormat($content["createdon"]);
+            if($content["type"] == 1) {
+                $icon = $_style['actions_info'] . ' text-info';
+                $msgtype = $_lang["information"];
+            } else if($content["type"] == 2) {
+                $icon = $_style['actions_triangle'] . ' text-warning';
+                $msgtype = $_lang["warning"];
+            } else if($content["type"] == 3) {
+                $icon = $_style['actions_error'] . ' text-danger';
+                $msgtype = $_lang["error"];
+            }
+            ?>
 			<p><b><?= $content['source'] . " - " . $_lang['eventlog_viewer'] ?></b></p>
 			<p>
 				<i class="<?= $icon ?>"></i> <?= $msgtype ?>

Please login to merge, or discard this patch.

manager/processors/delete_eventlog.processor.php 1 patch

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

@@ -3,17 +3,17 @@
 block discarded – undo
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('delete_eventlog')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 if (isset($_GET['cls']) && $_GET['cls']==1) {
-	$where = '';
+    $where = '';
 } else {
-	$id = isset($_GET['id'])? (int)$_GET['id'] : 0;
-	if($id==0) {
-		$modx->webAlertAndQuit($_lang["error_no_id"]);
-	}
-	$where = "id='{$id}'";
+    $id = isset($_GET['id'])? (int)$_GET['id'] : 0;
+    if($id==0) {
+        $modx->webAlertAndQuit($_lang["error_no_id"]);
+    }
+    $where = "id='{$id}'";
 }
 
 // delete event log

Please login to merge, or discard this patch.

manager/includes/actionlist.inc.php 1 patch

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

@@ -5,133 +5,133 @@  discard block
 block discarded – undo
 
 // action list
 $GLOBALS['action_list'] = array(
-	'1'	=> 'Loading a frame(set)',
-	'2'	=> 'Viewing home page/ online users',
-	'3'	=> 'Viewing data for resource',
-	'4'	=> 'Creating a resource',
-	'5'	=> 'Saving resource',
-	'6'	=> 'Deleting resource',
-	'7'	=> 'Waiting while MODX cleans up',
-	'8'	=> 'Logged out',
-	'9'	=> 'Viewing help',
-	'10'	=> 'Viewing/ composing messages',
-	'11'	=> 'Creating a user',
-	'12'	=> 'Editing user',
-	'13'	=> 'Viewing logging',
-	'14'	=> 'Editing a parser',
-	'15'	=> 'Saving a parser',
-	'16'	=> 'Editing template',
-	'17'	=> 'Editing settings',
-	'18'	=> 'Viewing Credits :)',
-	'19'	=> 'Creating a new template',
-	'20'	=> 'Saving template',
-	'21'	=> 'Deleting template',
-	'22'	=> 'Editing Snippet',
-	'23'	=> 'Creating a new Snippet',
-	'24'	=> 'Saving Snippet',
-	'25'	=> 'Deleting Snippet',
-	'26'	=> 'Refreshing site',
-	'27'	=> 'Editing resource',
-	'28'	=> 'Changing password',
-	'29'	=> 'Error',
-	'30'	=> 'Saving settings',
-	'31'	=> 'Using file manager',
-	'32'	=> 'Saving user',
-	'33'	=> 'Deleting user',
-	'34'	=> 'Saving new password',
-	'35'	=> 'Editing role',
-	'36'	=> 'Saving role',
-	'37'	=> 'Deleting role',
-	'38'	=> 'Creating new role',
-	'40'	=> 'Editing Access Permissions',
-	'41'	=> 'Editing Access Permissions',
-	'42'	=> 'Editing Access Permissions',
-	'43'	=> 'Editing Access Permissions',
-	'44'	=> 'Editing Access Permissions',
-	'45'	=> 'Idle',
-	'46'	=> 'Editing Access Permissions',
-	'47'	=> 'Editing Access Permissions',
-	'48'	=> 'Editing Access Permissions',
-	'49'	=> 'Editing Access Permissions',
-	'50'	=> 'Editing Access Permissions',
-	'51'	=> 'Moving resource',
-	'52'	=> 'Moved resource',
-	'53'	=> 'Viewing system info',
-	'54'	=> 'Optimizing a table',
-	'55'	=> 'Empty logs',
-	'56'	=> 'Refresh resource tree',
-	'57'	=> 'Refresh menu',
-	'58'	=> 'Logged in',
-	'59'    => 'About MODX',
-	'60'	=> 'Emptying Recycle Bin',
-	'61'	=> 'Publishing a resource',
-	'62'	=> 'Un-publishing a resource',
-	'63'	=> 'Un-deleting a resource',
-	'64'	=> 'Removing deleted content',
-	'65'	=> 'Deleting a message',
-	'66'	=> 'Sending a message',
-	'67'	=> 'Removing locks',
-	'68'	=> 'Viewing site logging',
-	'69'	=> 'Viewing online visitors',
-	'70'	=> 'Viewing site schedule',
-	'71'	=> 'Searching',
-	'72'	=> 'Adding a weblink',
-	'73'	=> 'Editing a weblink',
-		//case "74" : return "Changing personal preferences"; break;
-	'75'	=> 'User/ role management',
-	'76'	=> 'Element management',
-	'77'	=> 'Creating a new Chunk (HTML Snippet)',
-	'78'	=> 'Editing Chunk (HTML Snippet)',
-	'79'	=> 'Saving Chunk (HTML Snippet)',
-	'80'	=> 'Deleting Chunk (HTML Snippet)',
-	'83'	=> 'Exporting a resource to HTML',
-	'84'	=> 'Load Element Selector',
-	'85'	=> 'Create Folder',
-	'86'	=> 'Role management',
-	'87'	=> 'Create new web user',
-	'88'	=> 'Editing web user',
-	'89'	=> 'Saving web user',
-	'90'	=> 'Deleting web user',
-	'91'	=> 'Editing Web Access Permissions',
-	'92'	=> 'Editing Access Permissions',
-	'93'	=> 'Backup Manager',
-	'94'	=> 'Duplicate resource',
-	'95'	=> 'Importing resources from HTML',
-	'96'	=> 'Duplicate Template',
-	'97'	=> 'Duplicate Chunk (HTML Snippet)',
-	'98'	=> 'Duplicate Snippet',
-	'99'	=> 'Manage Web Users',
-	'100'	=> 'Previewing resource',
-	'101'	=> 'Create new plugin',
-	'102'	=> 'Edit plugin',
-	'103'	=> 'Saving plugin',
-	'104'	=> 'Delete plugin',
-	'105'	=> 'Duplicate plugin',
-	'106'	=> 'Viewing Modules',
-	'107'	=> 'Create new module',
-	'108'	=> 'Edit module',
-	'109'	=> 'Saving module',
-	'110'	=> 'Delete module',
-	'111'	=> 'Duplicate module',
-	'112'	=> 'Execute module',
-	'113'	=> 'Manage module dependencies',
-	'114'	=> 'View event log',
-	'115'	=> 'View event log details',
-	'116'	=> 'Delete event log',
-	'117'   => 'Editing tv rank',
-	'118'   => 'Call settings ajax include',
-	'119'   => 'Login Fail (Temporary Block)',
+    '1'	=> 'Loading a frame(set)',
+    '2'	=> 'Viewing home page/ online users',
+    '3'	=> 'Viewing data for resource',
+    '4'	=> 'Creating a resource',
+    '5'	=> 'Saving resource',
+    '6'	=> 'Deleting resource',
+    '7'	=> 'Waiting while MODX cleans up',
+    '8'	=> 'Logged out',
+    '9'	=> 'Viewing help',
+    '10'	=> 'Viewing/ composing messages',
+    '11'	=> 'Creating a user',
+    '12'	=> 'Editing user',
+    '13'	=> 'Viewing logging',
+    '14'	=> 'Editing a parser',
+    '15'	=> 'Saving a parser',
+    '16'	=> 'Editing template',
+    '17'	=> 'Editing settings',
+    '18'	=> 'Viewing Credits :)',
+    '19'	=> 'Creating a new template',
+    '20'	=> 'Saving template',
+    '21'	=> 'Deleting template',
+    '22'	=> 'Editing Snippet',
+    '23'	=> 'Creating a new Snippet',
+    '24'	=> 'Saving Snippet',
+    '25'	=> 'Deleting Snippet',
+    '26'	=> 'Refreshing site',
+    '27'	=> 'Editing resource',
+    '28'	=> 'Changing password',
+    '29'	=> 'Error',
+    '30'	=> 'Saving settings',
+    '31'	=> 'Using file manager',
+    '32'	=> 'Saving user',
+    '33'	=> 'Deleting user',
+    '34'	=> 'Saving new password',
+    '35'	=> 'Editing role',
+    '36'	=> 'Saving role',
+    '37'	=> 'Deleting role',
+    '38'	=> 'Creating new role',
+    '40'	=> 'Editing Access Permissions',
+    '41'	=> 'Editing Access Permissions',
+    '42'	=> 'Editing Access Permissions',
+    '43'	=> 'Editing Access Permissions',
+    '44'	=> 'Editing Access Permissions',
+    '45'	=> 'Idle',
+    '46'	=> 'Editing Access Permissions',
+    '47'	=> 'Editing Access Permissions',
+    '48'	=> 'Editing Access Permissions',
+    '49'	=> 'Editing Access Permissions',
+    '50'	=> 'Editing Access Permissions',
+    '51'	=> 'Moving resource',
+    '52'	=> 'Moved resource',
+    '53'	=> 'Viewing system info',
+    '54'	=> 'Optimizing a table',
+    '55'	=> 'Empty logs',
+    '56'	=> 'Refresh resource tree',
+    '57'	=> 'Refresh menu',
+    '58'	=> 'Logged in',
+    '59'    => 'About MODX',
+    '60'	=> 'Emptying Recycle Bin',
+    '61'	=> 'Publishing a resource',
+    '62'	=> 'Un-publishing a resource',
+    '63'	=> 'Un-deleting a resource',
+    '64'	=> 'Removing deleted content',
+    '65'	=> 'Deleting a message',
+    '66'	=> 'Sending a message',
+    '67'	=> 'Removing locks',
+    '68'	=> 'Viewing site logging',
+    '69'	=> 'Viewing online visitors',
+    '70'	=> 'Viewing site schedule',
+    '71'	=> 'Searching',
+    '72'	=> 'Adding a weblink',
+    '73'	=> 'Editing a weblink',
+        //case "74" : return "Changing personal preferences"; break;
+    '75'	=> 'User/ role management',
+    '76'	=> 'Element management',
+    '77'	=> 'Creating a new Chunk (HTML Snippet)',
+    '78'	=> 'Editing Chunk (HTML Snippet)',
+    '79'	=> 'Saving Chunk (HTML Snippet)',
+    '80'	=> 'Deleting Chunk (HTML Snippet)',
+    '83'	=> 'Exporting a resource to HTML',
+    '84'	=> 'Load Element Selector',
+    '85'	=> 'Create Folder',
+    '86'	=> 'Role management',
+    '87'	=> 'Create new web user',
+    '88'	=> 'Editing web user',
+    '89'	=> 'Saving web user',
+    '90'	=> 'Deleting web user',
+    '91'	=> 'Editing Web Access Permissions',
+    '92'	=> 'Editing Access Permissions',
+    '93'	=> 'Backup Manager',
+    '94'	=> 'Duplicate resource',
+    '95'	=> 'Importing resources from HTML',
+    '96'	=> 'Duplicate Template',
+    '97'	=> 'Duplicate Chunk (HTML Snippet)',
+    '98'	=> 'Duplicate Snippet',
+    '99'	=> 'Manage Web Users',
+    '100'	=> 'Previewing resource',
+    '101'	=> 'Create new plugin',
+    '102'	=> 'Edit plugin',
+    '103'	=> 'Saving plugin',
+    '104'	=> 'Delete plugin',
+    '105'	=> 'Duplicate plugin',
+    '106'	=> 'Viewing Modules',
+    '107'	=> 'Create new module',
+    '108'	=> 'Edit module',
+    '109'	=> 'Saving module',
+    '110'	=> 'Delete module',
+    '111'	=> 'Duplicate module',
+    '112'	=> 'Execute module',
+    '113'	=> 'Manage module dependencies',
+    '114'	=> 'View event log',
+    '115'	=> 'View event log details',
+    '116'	=> 'Delete event log',
+    '117'   => 'Editing tv rank',
+    '118'   => 'Call settings ajax include',
+    '119'   => 'Login Fail (Temporary Block)',
 
-	'300'	=> 'Create Template Variable',
-	'301'	=> 'Edit Template Variable',
-	'302'	=> 'Save Template Variable',
-	'303'	=> 'Delete Template Variable',
-	'304'	=> 'Duplicate Template Variable',
+    '300'	=> 'Create Template Variable',
+    '301'	=> 'Edit Template Variable',
+    '302'	=> 'Save Template Variable',
+    '303'	=> 'Delete Template Variable',
+    '304'	=> 'Duplicate Template Variable',
 
-	'200'	=> 'Viewing phpInfo()',
-	'501'   => 'Delete category',
-	'998'	=> 'Viewing web page',
-	'999'	=> 'Viewing test page',
+    '200'	=> 'Viewing phpInfo()',
+    '501'   => 'Delete category',
+    '998'	=> 'Viewing web page',
+    '999'	=> 'Viewing test page',
 );
 
 /**
@@ -140,10 +140,10 @@  discard block
 block discarded – undo
  * @return string
  */
 function getAction($actionId, $itemid='') {
-	global $action_list;
+    global $action_list;
 
-	$ret = sprintf($action_list[$actionId], $itemid);
-	if (!$ret) $ret = "Idle (unknown)";
+    $ret = sprintf($action_list[$actionId], $itemid);
+    if (!$ret) $ret = "Idle (unknown)";
 
-	return $ret;
+    return $ret;
 }

Please login to merge, or discard this patch.

manager/media/script/air-datepicker/datepicker.inc.php 1 patch

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

@@ -8,7 +8,7 @@
 block discarded – undo
 
         $load_script = file_get_contents(dirname(__FILE__).'/datepicker.tpl');
         if(!isset($modx->config['lang_code'])) $modx->config['lang_code'] = $this->getLangCode();
-		$modx->config['datetime_format_lc'] = isset($modx->config['datetime_format']) ? strtolower($modx->config['datetime_format']) : 'dd-mm-yyyy';
+        $modx->config['datetime_format_lc'] = isset($modx->config['datetime_format']) ? strtolower($modx->config['datetime_format']) : 'dd-mm-yyyy';
         return $modx->mergeSettingsContent($load_script);
     }
 

Please login to merge, or discard this patch.

manager/media/calendar/datepicker.inc.php 1 patch

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

@@ -1,13 +1,13 @@
 block discarded – undo
 <?php
 
 class DATEPICKER {
-	function __construct() {
-	}
+    function __construct() {
+    }
 
-	function getDP() {
-		$modx = evolutionCMS(); global $_lang;
+    function getDP() {
+        $modx = evolutionCMS(); global $_lang;
 
-		$tpl = file_get_contents(dirname(__FILE__) . '/datepicker.tpl');
-		return $modx->parseText($tpl, $_lang, '[%', '%]');
-	}
+        $tpl = file_get_contents(dirname(__FILE__) . '/datepicker.tpl');
+        return $modx->parseText($tpl, $_lang, '[%', '%]');
+    }
 }

Please login to merge, or discard this patch.

manager/processors/save_content.processor.php 1 patch

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

@@ -492,7 +492,7 @@
 block discarded – undo
                 }elseif ((!empty($pub_date)&& $pub_date<=$currentdate && $published)) {
                 $publishedon = $pub_date;
                 $publishedby = $modx->getLoginUserID();
-                   }elseif ($was_published && !$published) {
+                    }elseif ($was_published && !$published) {
                 $publishedon = 0;
                 $publishedby = 0;
             } else {

Please login to merge, or discard this patch.

manager/includes/accesscontrol.inc.php 1 patch

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

@@ -102,19 +102,19 @@
 block discarded – undo
     $modx->setPlaceholder('login_form_position_class', 'loginbox-' . $modx->config['login_form_position']);
     
     switch ($modx->config['manager_theme_mode']) {
-      case '1':
+        case '1':
         $modx->setPlaceholder('manager_theme_style', 'lightness');
         break;
-      case '2':
+        case '2':
         $modx->setPlaceholder('manager_theme_style', 'light');
         break;
-      case '3':
+        case '3':
         $modx->setPlaceholder('manager_theme_style', 'dark');
         break;
-      case '4':
+        case '4':
         $modx->setPlaceholder('manager_theme_style', 'darkness');
         break;
-	}
+    }
 
     // andrazk 20070416 - notify user of install/update
     if (isset($_GET['installGoingOn'])) {

Please login to merge, or discard this patch.

		@@ -1,9 +1,9 @@
		block discarded – undo
1	1	<?php
2	2	if( ! defined('IN_MANAGER_MODE') \|\| 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	if(!$modx->hasPermission('change_password')) {
6		- $modx->webAlertAndQuit($_lang["error_no_privileges"]);
	6	+ $modx->webAlertAndQuit($_lang["error_no_privileges"]);
7	7	}
8	8	?>
9	9

		@@ -21,7 +21,7 @@ discard block
		block discarded – undo
21	21
22	22	if( $uncategorized_elements = $cm->getAssignedElements( 0, $_data['elements'] ) )
23	23	{
24		- $output .= $cm->renderView('chunks/categorize/uncategorized_elements', $uncategorized_elements);
	24	+ $output .= $cm->renderView('chunks/categorize/uncategorized_elements', $uncategorized_elements);
25	25	}
26	26
27	27	foreach( $cm->getCategories() as $category )
		@@ -106,14 +106,14 @@ discard block
		block discarded – undo
106	106
107	107	if( empty( $category ) )
108	108	{
109		- $cm->addMessage( $cm->txt('cm_enter_name_for_category'), 'add' );
110		- return;
	109	+ $cm->addMessage( $cm->txt('cm_enter_name_for_category'), 'add' );
	110	+ return;
111	111	}
112	112
113	113	if( $cm->isCategoryExists( $category ) )
114	114	{
115		- $cm->addMessage( sprintf( $cm->txt('cm_category_x_exists'), $category ), 'add' );
116		- return;
	115	+ $cm->addMessage( sprintf( $cm->txt('cm_category_x_exists'), $category ), 'add' );
	116	+ return;
117	117	}
118	118
119	119	if( $cm->addCategory( $category, $rank ) !== 0 )

		@@ -1,9 +1,9 @@ discard block
		block discarded – undo
1	1	<?php
2	2	if( ! defined('IN_MANAGER_MODE') \|\| 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	if(!$modx->hasPermission('view_eventlog')) {
6		- $modx->webAlertAndQuit($_lang["error_no_privileges"]);
	6	+ $modx->webAlertAndQuit($_lang["error_no_privileges"]);
7	7	}
8	8
9	9	// get id
		@@ -41,18 +41,18 @@ discard block
		block discarded – undo
41	41	<div class="tab-page">
42	42	<div class="container container-body">
43	43	<?php
44		- $date = $modx->toDateFormat($content["createdon"]);
45		- if($content["type"] == 1) {
46		- $icon = $_style['actions_info'] . ' text-info';
47		- $msgtype = $_lang["information"];
48		- } else if($content["type"] == 2) {
49		- $icon = $_style['actions_triangle'] . ' text-warning';
50		- $msgtype = $_lang["warning"];
51		- } else if($content["type"] == 3) {
52		- $icon = $_style['actions_error'] . ' text-danger';
53		- $msgtype = $_lang["error"];
54		- }
55		- ?>
	44	+ $date = $modx->toDateFormat($content["createdon"]);
	45	+ if($content["type"] == 1) {
	46	+ $icon = $_style['actions_info'] . ' text-info';
	47	+ $msgtype = $_lang["information"];
	48	+ } else if($content["type"] == 2) {
	49	+ $icon = $_style['actions_triangle'] . ' text-warning';
	50	+ $msgtype = $_lang["warning"];
	51	+ } else if($content["type"] == 3) {
	52	+ $icon = $_style['actions_error'] . ' text-danger';
	53	+ $msgtype = $_lang["error"];
	54	+ }
	55	+ ?>
56	56	<p><b><?= $content['source'] . " - " . $_lang['eventlog_viewer'] ?></b></p>
57	57	<p>
58	58	<i class="<?= $icon ?>"></i> <?= $msgtype ?>

		@@ -3,17 +3,17 @@
		block discarded – undo
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	if(!$modx->hasPermission('delete_eventlog')) {
6		- $modx->webAlertAndQuit($_lang["error_no_privileges"]);
	6	+ $modx->webAlertAndQuit($_lang["error_no_privileges"]);
7	7	}
8	8
9	9	if (isset($_GET['cls']) && $_GET['cls']==1) {
10		- $where = '';
	10	+ $where = '';
11	11	} else {
12		- $id = isset($_GET['id'])? (int)$_GET['id'] : 0;
13		- if($id==0) {
14		- $modx->webAlertAndQuit($_lang["error_no_id"]);
15		- }
16		- $where = "id='{$id}'";
	12	+ $id = isset($_GET['id'])? (int)$_GET['id'] : 0;
	13	+ if($id==0) {
	14	+ $modx->webAlertAndQuit($_lang["error_no_id"]);
	15	+ }
	16	+ $where = "id='{$id}'";
17	17	}
18	18
19	19	// delete event log

		@@ -5,133 +5,133 @@ discard block
		block discarded – undo
5	5
6	6	// action list
7	7	$GLOBALS['action_list'] = array(
8		- '1' => 'Loading a frame(set)',
9		- '2' => 'Viewing home page/ online users',
10		- '3' => 'Viewing data for resource',
11		- '4' => 'Creating a resource',
12		- '5' => 'Saving resource',
13		- '6' => 'Deleting resource',
14		- '7' => 'Waiting while MODX cleans up',
15		- '8' => 'Logged out',
16		- '9' => 'Viewing help',
17		- '10' => 'Viewing/ composing messages',
18		- '11' => 'Creating a user',
19		- '12' => 'Editing user',
20		- '13' => 'Viewing logging',
21		- '14' => 'Editing a parser',
22		- '15' => 'Saving a parser',
23		- '16' => 'Editing template',
24		- '17' => 'Editing settings',
25		- '18' => 'Viewing Credits :)',
26		- '19' => 'Creating a new template',
27		- '20' => 'Saving template',
28		- '21' => 'Deleting template',
29		- '22' => 'Editing Snippet',
30		- '23' => 'Creating a new Snippet',
31		- '24' => 'Saving Snippet',
32		- '25' => 'Deleting Snippet',
33		- '26' => 'Refreshing site',
34		- '27' => 'Editing resource',
35		- '28' => 'Changing password',
36		- '29' => 'Error',
37		- '30' => 'Saving settings',
38		- '31' => 'Using file manager',
39		- '32' => 'Saving user',
40		- '33' => 'Deleting user',
41		- '34' => 'Saving new password',
42		- '35' => 'Editing role',
43		- '36' => 'Saving role',
44		- '37' => 'Deleting role',
45		- '38' => 'Creating new role',
46		- '40' => 'Editing Access Permissions',
47		- '41' => 'Editing Access Permissions',
48		- '42' => 'Editing Access Permissions',
49		- '43' => 'Editing Access Permissions',
50		- '44' => 'Editing Access Permissions',
51		- '45' => 'Idle',
52		- '46' => 'Editing Access Permissions',
53		- '47' => 'Editing Access Permissions',
54		- '48' => 'Editing Access Permissions',
55		- '49' => 'Editing Access Permissions',
56		- '50' => 'Editing Access Permissions',
57		- '51' => 'Moving resource',
58		- '52' => 'Moved resource',
59		- '53' => 'Viewing system info',
60		- '54' => 'Optimizing a table',
61		- '55' => 'Empty logs',
62		- '56' => 'Refresh resource tree',
63		- '57' => 'Refresh menu',
64		- '58' => 'Logged in',
65		- '59' => 'About MODX',
66		- '60' => 'Emptying Recycle Bin',
67		- '61' => 'Publishing a resource',
68		- '62' => 'Un-publishing a resource',
69		- '63' => 'Un-deleting a resource',
70		- '64' => 'Removing deleted content',
71		- '65' => 'Deleting a message',
72		- '66' => 'Sending a message',
73		- '67' => 'Removing locks',
74		- '68' => 'Viewing site logging',
75		- '69' => 'Viewing online visitors',
76		- '70' => 'Viewing site schedule',
77		- '71' => 'Searching',
78		- '72' => 'Adding a weblink',
79		- '73' => 'Editing a weblink',
80		- //case "74" : return "Changing personal preferences"; break;
81		- '75' => 'User/ role management',
82		- '76' => 'Element management',
83		- '77' => 'Creating a new Chunk (HTML Snippet)',
84		- '78' => 'Editing Chunk (HTML Snippet)',
85		- '79' => 'Saving Chunk (HTML Snippet)',
86		- '80' => 'Deleting Chunk (HTML Snippet)',
87		- '83' => 'Exporting a resource to HTML',
88		- '84' => 'Load Element Selector',
89		- '85' => 'Create Folder',
90		- '86' => 'Role management',
91		- '87' => 'Create new web user',
92		- '88' => 'Editing web user',
93		- '89' => 'Saving web user',
94		- '90' => 'Deleting web user',
95		- '91' => 'Editing Web Access Permissions',
96		- '92' => 'Editing Access Permissions',
97		- '93' => 'Backup Manager',
98		- '94' => 'Duplicate resource',
99		- '95' => 'Importing resources from HTML',
100		- '96' => 'Duplicate Template',
101		- '97' => 'Duplicate Chunk (HTML Snippet)',
102		- '98' => 'Duplicate Snippet',
103		- '99' => 'Manage Web Users',
104		- '100' => 'Previewing resource',
105		- '101' => 'Create new plugin',
106		- '102' => 'Edit plugin',
107		- '103' => 'Saving plugin',
108		- '104' => 'Delete plugin',
109		- '105' => 'Duplicate plugin',
110		- '106' => 'Viewing Modules',
111		- '107' => 'Create new module',
112		- '108' => 'Edit module',
113		- '109' => 'Saving module',
114		- '110' => 'Delete module',
115		- '111' => 'Duplicate module',
116		- '112' => 'Execute module',
117		- '113' => 'Manage module dependencies',
118		- '114' => 'View event log',
119		- '115' => 'View event log details',
120		- '116' => 'Delete event log',
121		- '117' => 'Editing tv rank',
122		- '118' => 'Call settings ajax include',
123		- '119' => 'Login Fail (Temporary Block)',
	8	+ '1' => 'Loading a frame(set)',
	9	+ '2' => 'Viewing home page/ online users',
	10	+ '3' => 'Viewing data for resource',
	11	+ '4' => 'Creating a resource',
	12	+ '5' => 'Saving resource',
	13	+ '6' => 'Deleting resource',
	14	+ '7' => 'Waiting while MODX cleans up',
	15	+ '8' => 'Logged out',
	16	+ '9' => 'Viewing help',
	17	+ '10' => 'Viewing/ composing messages',
	18	+ '11' => 'Creating a user',
	19	+ '12' => 'Editing user',
	20	+ '13' => 'Viewing logging',
	21	+ '14' => 'Editing a parser',
	22	+ '15' => 'Saving a parser',
	23	+ '16' => 'Editing template',
	24	+ '17' => 'Editing settings',
	25	+ '18' => 'Viewing Credits :)',
	26	+ '19' => 'Creating a new template',
	27	+ '20' => 'Saving template',
	28	+ '21' => 'Deleting template',
	29	+ '22' => 'Editing Snippet',
	30	+ '23' => 'Creating a new Snippet',
	31	+ '24' => 'Saving Snippet',
	32	+ '25' => 'Deleting Snippet',
	33	+ '26' => 'Refreshing site',
	34	+ '27' => 'Editing resource',
	35	+ '28' => 'Changing password',
	36	+ '29' => 'Error',
	37	+ '30' => 'Saving settings',
	38	+ '31' => 'Using file manager',
	39	+ '32' => 'Saving user',
	40	+ '33' => 'Deleting user',
	41	+ '34' => 'Saving new password',
	42	+ '35' => 'Editing role',
	43	+ '36' => 'Saving role',
	44	+ '37' => 'Deleting role',
	45	+ '38' => 'Creating new role',
	46	+ '40' => 'Editing Access Permissions',
	47	+ '41' => 'Editing Access Permissions',
	48	+ '42' => 'Editing Access Permissions',
	49	+ '43' => 'Editing Access Permissions',
	50	+ '44' => 'Editing Access Permissions',
	51	+ '45' => 'Idle',
	52	+ '46' => 'Editing Access Permissions',
	53	+ '47' => 'Editing Access Permissions',
	54	+ '48' => 'Editing Access Permissions',
	55	+ '49' => 'Editing Access Permissions',
	56	+ '50' => 'Editing Access Permissions',
	57	+ '51' => 'Moving resource',
	58	+ '52' => 'Moved resource',
	59	+ '53' => 'Viewing system info',
	60	+ '54' => 'Optimizing a table',
	61	+ '55' => 'Empty logs',
	62	+ '56' => 'Refresh resource tree',
	63	+ '57' => 'Refresh menu',
	64	+ '58' => 'Logged in',
	65	+ '59' => 'About MODX',
	66	+ '60' => 'Emptying Recycle Bin',
	67	+ '61' => 'Publishing a resource',
	68	+ '62' => 'Un-publishing a resource',
	69	+ '63' => 'Un-deleting a resource',
	70	+ '64' => 'Removing deleted content',
	71	+ '65' => 'Deleting a message',
	72	+ '66' => 'Sending a message',
	73	+ '67' => 'Removing locks',
	74	+ '68' => 'Viewing site logging',
	75	+ '69' => 'Viewing online visitors',
	76	+ '70' => 'Viewing site schedule',
	77	+ '71' => 'Searching',
	78	+ '72' => 'Adding a weblink',
	79	+ '73' => 'Editing a weblink',
	80	+ //case "74" : return "Changing personal preferences"; break;
	81	+ '75' => 'User/ role management',
	82	+ '76' => 'Element management',
	83	+ '77' => 'Creating a new Chunk (HTML Snippet)',
	84	+ '78' => 'Editing Chunk (HTML Snippet)',
	85	+ '79' => 'Saving Chunk (HTML Snippet)',
	86	+ '80' => 'Deleting Chunk (HTML Snippet)',
	87	+ '83' => 'Exporting a resource to HTML',
	88	+ '84' => 'Load Element Selector',
	89	+ '85' => 'Create Folder',
	90	+ '86' => 'Role management',
	91	+ '87' => 'Create new web user',
	92	+ '88' => 'Editing web user',
	93	+ '89' => 'Saving web user',
	94	+ '90' => 'Deleting web user',
	95	+ '91' => 'Editing Web Access Permissions',
	96	+ '92' => 'Editing Access Permissions',
	97	+ '93' => 'Backup Manager',
	98	+ '94' => 'Duplicate resource',
	99	+ '95' => 'Importing resources from HTML',
	100	+ '96' => 'Duplicate Template',
	101	+ '97' => 'Duplicate Chunk (HTML Snippet)',
	102	+ '98' => 'Duplicate Snippet',
	103	+ '99' => 'Manage Web Users',
	104	+ '100' => 'Previewing resource',
	105	+ '101' => 'Create new plugin',
	106	+ '102' => 'Edit plugin',
	107	+ '103' => 'Saving plugin',
	108	+ '104' => 'Delete plugin',
	109	+ '105' => 'Duplicate plugin',
	110	+ '106' => 'Viewing Modules',
	111	+ '107' => 'Create new module',
	112	+ '108' => 'Edit module',
	113	+ '109' => 'Saving module',
	114	+ '110' => 'Delete module',
	115	+ '111' => 'Duplicate module',
	116	+ '112' => 'Execute module',
	117	+ '113' => 'Manage module dependencies',
	118	+ '114' => 'View event log',
	119	+ '115' => 'View event log details',
	120	+ '116' => 'Delete event log',
	121	+ '117' => 'Editing tv rank',
	122	+ '118' => 'Call settings ajax include',
	123	+ '119' => 'Login Fail (Temporary Block)',
124	124
125		- '300' => 'Create Template Variable',
126		- '301' => 'Edit Template Variable',
127		- '302' => 'Save Template Variable',
128		- '303' => 'Delete Template Variable',
129		- '304' => 'Duplicate Template Variable',
	125	+ '300' => 'Create Template Variable',
	126	+ '301' => 'Edit Template Variable',
	127	+ '302' => 'Save Template Variable',
	128	+ '303' => 'Delete Template Variable',
	129	+ '304' => 'Duplicate Template Variable',
130	130
131		- '200' => 'Viewing phpInfo()',
132		- '501' => 'Delete category',
133		- '998' => 'Viewing web page',
134		- '999' => 'Viewing test page',
	131	+ '200' => 'Viewing phpInfo()',
	132	+ '501' => 'Delete category',
	133	+ '998' => 'Viewing web page',
	134	+ '999' => 'Viewing test page',
135	135	);
136	136
137	137	/**
		@@ -140,10 +140,10 @@ discard block
		block discarded – undo
140	140	* @return string
141	141	*/
142	142	function getAction($actionId, $itemid='') {
143		- global $action_list;
	143	+ global $action_list;
144	144
145		- $ret = sprintf($action_list[$actionId], $itemid);
146		- if (!$ret) $ret = "Idle (unknown)";
	145	+ $ret = sprintf($action_list[$actionId], $itemid);
	146	+ if (!$ret) $ret = "Idle (unknown)";
147	147
148		- return $ret;
	148	+ return $ret;
149	149	}

		@@ -8,7 +8,7 @@
		block discarded – undo
8	8
9	9	$load_script = file_get_contents(dirname(__FILE__).'/datepicker.tpl');
10	10	if(!isset($modx->config['lang_code'])) $modx->config['lang_code'] = $this->getLangCode();
11		- $modx->config['datetime_format_lc'] = isset($modx->config['datetime_format']) ? strtolower($modx->config['datetime_format']) : 'dd-mm-yyyy';
	11	+ $modx->config['datetime_format_lc'] = isset($modx->config['datetime_format']) ? strtolower($modx->config['datetime_format']) : 'dd-mm-yyyy';
12	12	return $modx->mergeSettingsContent($load_script);
13	13	}
14	14

		@@ -1,13 +1,13 @@
		block discarded – undo
1	1	<?php
2	2
3	3	class DATEPICKER {
4		- function __construct() {
5		- }
	4	+ function __construct() {
	5	+ }
6	6
7		- function getDP() {
8		- $modx = evolutionCMS(); global $_lang;
	7	+ function getDP() {
	8	+ $modx = evolutionCMS(); global $_lang;
9	9
10		- $tpl = file_get_contents(dirname(__FILE__) . '/datepicker.tpl');
11		- return $modx->parseText($tpl, $_lang, '[%', '%]');
12		- }
	10	+ $tpl = file_get_contents(dirname(__FILE__) . '/datepicker.tpl');
	11	+ return $modx->parseText($tpl, $_lang, '[%', '%]');
	12	+ }
13	13	}

		@@ -492,7 +492,7 @@
		block discarded – undo
492	492	}elseif ((!empty($pub_date)&& $pub_date<=$currentdate && $published)) {
493	493	$publishedon = $pub_date;
494	494	$publishedby = $modx->getLoginUserID();
495		- }elseif ($was_published && !$published) {
	495	+ }elseif ($was_published && !$published) {
496	496	$publishedon = 0;
497	497	$publishedby = 0;
498	498	} else {

		@@ -102,19 +102,19 @@
		block discarded – undo
102	102	$modx->setPlaceholder('login_form_position_class', 'loginbox-' . $modx->config['login_form_position']);
103	103
104	104	switch ($modx->config['manager_theme_mode']) {
105		- case '1':
	105	+ case '1':
106	106	$modx->setPlaceholder('manager_theme_style', 'lightness');
107	107	break;
108		- case '2':
	108	+ case '2':
109	109	$modx->setPlaceholder('manager_theme_style', 'light');
110	110	break;
111		- case '3':
	111	+ case '3':
112	112	$modx->setPlaceholder('manager_theme_style', 'dark');
113	113	break;
114		- case '4':
	114	+ case '4':
115	115	$modx->setPlaceholder('manager_theme_style', 'darkness');
116	116	break;
117		- }
	117	+ }
118	118
119	119	// andrazk 20070416 - notify user of install/update
120	120	if (isset($_GET['installGoingOn'])) {

evolution-cms / evolution

Pull Request — develop (#731)

Category

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

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

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

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

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

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

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

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

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