Completed
Push — develop ( cb7ecf...5e631f )
by Dmytro
17s
created
manager/actions/mutate_password.dynamic.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove 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
 
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
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 )
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
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 ?>
Please login to merge, or discard this patch.
manager/processors/purge_plugin.processor.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -4,8 +4,8 @@
 block discarded – undo
4 4
 }
5 5
 
6 6
 if(!$modx->hasPermission('delete_plugin')) {
7
-	$e->setError(3);
8
-	$e->dumpError();
7
+    $e->setError(3);
8
+    $e->dumpError();
9 9
 }
10 10
 
11 11
 $tbl_site_plugins = $modx->getFullTablename('site_plugins');
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
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
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
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
 }
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
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
 
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
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
 }
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
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 {
Please login to merge, or discard this patch.