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

Completed

Pull Request — develop (#725)

by Agel_Nash

created 2018-06-12 09:37 UTC

Status

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

@@ -1,6 +1,6 @@  discard block
 block discarded – undo
 <?php
 
-if(!function_exists('createGUID')) {
+if (!function_exists('createGUID')) {
     /**
      * create globally unique identifiers (guid)
      *
@@ -8,22 +8,22 @@  discard block
 block discarded – undo
      */
     function createGUID()
     {
-        srand((double)microtime() * 1000000);
+        srand((double) microtime() * 1000000);
         $r = rand();
-        $u = uniqid(getmypid() . $r . (double)microtime() * 1000000, 1);
+        $u = uniqid(getmypid().$r.(double) microtime() * 1000000, 1);
         $m = md5($u);
 
         return $m;
     }
 }
 
-if(!function_exists('generate_password')) {
+if (!function_exists('generate_password')) {
 // Generate password
     function generate_password($length = 10)
     {
         $allowable_characters = "abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789";
         $ps_len = strlen($allowable_characters);
-        mt_srand((double)microtime() * 1000000);
+        mt_srand((double) microtime() * 1000000);
         $pass = "";
         for ($i = 0; $i < $length; $i++) {
             $pass .= $allowable_characters[mt_rand(0, $ps_len - 1)];

Please login to merge, or discard this patch.

manager/includes/tmplvars.inc.php 1 patch

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

		@@ -1,3 +1,3 @@
		block discarded – undo
1	1	<?php
2	2
3		-include_once MODX_MANAGER_PATH . 'includes/functions/tv.php';
	3	+include_once MODX_MANAGER_PATH.'includes/functions/tv.php';

Please login to merge, or discard this patch.

manager/includes/tmplvars.commands.inc.php 1 patch

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

		@@ -1,3 +1,3 @@
		block discarded – undo
1	1	<?php
2	2
3		-include_once MODX_MANAGER_PATH . 'includes/functions/tv.php';
	3	+include_once MODX_MANAGER_PATH.'includes/functions/tv.php';

Please login to merge, or discard this patch.

manager/includes/tmplvars.format.inc.php 1 patch

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

		@@ -1,3 +1,3 @@
		block discarded – undo
1	1	<?php
2	2
3		-include_once MODX_MANAGER_PATH . 'includes/functions/tv.php';
	3	+include_once MODX_MANAGER_PATH.'includes/functions/tv.php';

Please login to merge, or discard this patch.

manager/processors/remove_installer.processor.php 1 patch

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

@@ -36,7 +36,7 @@  discard block
 block discarded – undo
 }
 
 $msg = '';
-$pth = dirname(dirname(__DIR__)) . '/install/';
+$pth = dirname(dirname(__DIR__)).'/install/';
 $pth = str_replace('\\', '/', $pth);
 
 if (isset($_GET['rminstall'])) {
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
     }
 }
 if ($msg) {
-    echo "<script>alert('" . addslashes($msg) . "');</script>";
+    echo "<script>alert('".addslashes($msg)."');</script>";
 }
 
 echo "<script>window.location='../index.php?a=2';</script>";

Please login to merge, or discard this patch.

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

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

@@ -8,19 +8,19 @@  discard block
 block discarded – undo
  * Version:        1.1
  * MODX version:   1.0.3
  */
-$style_path = 'media/style/' . $modx->config['manager_theme'] . '/images/';
+$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']) {
+if (!$modx->config['lang_code']) {
 	global $modx_lang_attribute;
 	$modx->config['lang_code'] = !$modx_lang_attribute ? 'en' : $modx_lang_attribute;
 }
 
-if(!empty($_GET['a']) && $_GET['a'] == 2) {
+if (!empty($_GET['a']) && $_GET['a'] == 2) {
 	include_once('welcome.php');
 }
 
 // Favicon
-$_style['favicon']                  = (file_exists(MODX_BASE_PATH . 'favicon.ico') ? MODX_SITE_URL . 'favicon.ico' : 'media/style/' . $modx->config['manager_theme'] . '/images/favicon.ico');
+$_style['favicon']                  = (file_exists(MODX_BASE_PATH.'favicon.ico') ? MODX_SITE_URL . 'favicon.ico' : 'media/style/'.$modx->config['manager_theme'].'/images/favicon.ico');
 
 //Main Menu
 $_style['menu_search']              = '<i class="fa fa-search"></i>';
@@ -99,10 +99,10 @@  discard block
 block discarded – undo
 $_style['tree_page_word']           = "<i class='fa fa-file-word-o'></i>";
 $_style['tree_page_excel']          = "<i class='fa fa-file-excel-o'></i>";
 
-$_style['tree_minusnode']           = "<i class='fa fa-angle-down'></i>";//$style_path.'tree/angle-down.png';
-$_style['tree_plusnode']            = "<i class='fa fa-angle-right'></i>";//$style_path.'tree/angle-right.png';
+$_style['tree_minusnode']           = "<i class='fa fa-angle-down'></i>"; //$style_path.'tree/angle-down.png';
+$_style['tree_plusnode']            = "<i class='fa fa-angle-right'></i>"; //$style_path.'tree/angle-right.png';
 $_style['tree_weblink']             = $style_path.'tree/link.png';
-$_style['tree_preview_resource']    = "<i class='fa fa-eye'></i>";//$style_path.'icons/eye.png';
+$_style['tree_preview_resource']    = "<i class='fa fa-eye'></i>"; //$style_path.'icons/eye.png';
 
 $_style['tree_showtree']            = '<i class="fa fa-sitemap"></i>';
 $_style['tree_working']             = '<i class="fa fa-warning"></i>';
@@ -137,8 +137,8 @@  discard block
 block discarded – undo
 $_style['icons_edit_document']      = $style_path.'icons/save.png';
 $_style['icons_delete_document']    = $style_path.'icons/trash.png';
 //locks
-$_style['icons_preview_resource']   = $style_path.'icons/eye.png';//$style_path.'icons/eye.png';
-$_style['icons_secured']            = "<i class='fa fa-lock'></i>";//$style_path.'icons/lock.png';
+$_style['icons_preview_resource']   = $style_path.'icons/eye.png'; //$style_path.'icons/eye.png';
+$_style['icons_secured']            = "<i class='fa fa-lock'></i>"; //$style_path.'icons/lock.png';
 
 //file manager icons
 $_style['files_save']               = 'fa fa-floppy-o';
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
 $_style['icons_set_parent']         = $style_path.'icons/folder-open.png';
 
 //modules
-$_style['icons_module']            = 'fa fa-cube';
+$_style['icons_module'] = 'fa fa-cube';
 $_style['icons_modules']            = 'fa fa-cubes'; //$style_path.'icons/modules.png';
 $_style['icons_run']                = $style_path.'icons/play.png';
 
@@ -273,57 +273,57 @@  discard block
 block discarded – undo
 $stay = isset($_REQUEST['stay']) ? $_REQUEST['stay'] : '';
 $addnew = 0;
 $run = 0;
-switch($action) {
+switch ($action) {
 	case '3':
 	case '4':
 	case '27':
 	case '72':
-		if($modx->hasPermission('new_document')) {
+		if ($modx->hasPermission('new_document')) {
 			$addnew = 1;
 		}
 		break;
 	case '16':
 	case '19':
-		if($modx->hasPermission('new_template')) {
+		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')) {
+		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')) {
+		if ($modx->hasPermission('new_chunk')) {
 			$addnew = 1;
 		}
 		break;
 	case '22':
 	case '23':
-		if($modx->hasPermission('new_snippet')) {
+		if ($modx->hasPermission('new_snippet')) {
 			$addnew = 1;
 		}
 		break;
 	case '101':
 	case '102':
-		if($modx->hasPermission('new_plugin')) {
+		if ($modx->hasPermission('new_plugin')) {
 			$addnew = 1;
 		}
 		break;
 	case '106':
 	case '107':
 	case '108':
-		if($modx->hasPermission('new_module')) {
+		if ($modx->hasPermission('new_module')) {
 			$addnew = 1;
 		}
-		if($modx->hasPermission('exec_module')) {
+		if ($modx->hasPermission('exec_module')) {
 			$run = 1;
 		}
 		break;
 	case '88':
-		if($modx->hasPermission('new_web_user')) {
+		if ($modx->hasPermission('new_web_user')) {
 			$addnew = 1;
 		}
 		break;
@@ -337,30 +337,30 @@  discard block
 block discarded – undo
 			<div class="btn-group">
 				<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>
+						<i class="' . $_style["actions_save"].'"></i><span>'.$_lang['save'].'</span>
 					</a>
 					<span class="btn btn-success plus dropdown-toggle"></span>
 					<select id="stay" name="stay">
 						' . ($addnew ? '
-							<option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '') . '>' . $_lang['stay_new'] . '</option>
-						' : '') . '
-						<option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '') . '>' . $_lang['stay'] . '</option>
-						<option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '') . '>' . $_lang['close'] . '</option>
+							<option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '').'>'.$_lang['stay_new'].'</option>
+						' : '').'
+						<option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '').'>'.$_lang['stay'].'</option>
+						<option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '').'>'.$_lang['close'].'</option>
 					</select>
 				</div>' .
 					($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 id="Button6" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.duplicate();">
+						<i class="' . $_style["actions_duplicate"].'"></i><span>'.$_lang['duplicate'].'</span>
 					</a>
-					' : '') . '
-				<a id="Button3" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.delete();">
-					<i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span>
+					' : '').'
+				<a id="Button3" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.delete();">
+					<i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span>
 				</a>
 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">
-					<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>
+					<i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>
 				</a>
 				<a id="Button4" class="btn btn-secondary" href="javascript:;" onclick="actions.view();">
-					<i class="' . $_style["actions_preview"] . '"></i><span>' . $_lang['preview'] . '</span>
+					<i class="' . $_style["actions_preview"].'"></i><span>'.$_lang['preview'].'</span>
 				</a>
 			</div>
 		</div>',
@@ -368,22 +368,22 @@  discard block
 block discarded – undo
 			<div class="btn-group">
 				<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>
+						<i class="' . $_style["actions_save"].'"></i><span>'.$_lang['save'].'</span>
 					</a>
 					<span class="btn btn-success plus dropdown-toggle"></span>
 					<select id="stay" name="stay">
 						' . ($addnew ? '
-							<option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '') . '>' . $_lang['stay_new'] . '</option>
-						' : '') . '
-						<option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '') . '>' . $_lang['stay'] . '</option>
-						<option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '') . '>' . $_lang['close'] . '</option>
+							<option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '').'>'.$_lang['stay_new'].'</option>
+						' : '').'
+						<option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '').'>'.$_lang['stay'].'</option>
+						<option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '').'>'.$_lang['close'].'</option>
 					</select>
 				</div>
-				<a id="Button3" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.delete();">
-					<i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span>
+				<a id="Button3" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.delete();">
+					<i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span>
 				</a>
 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">
-					<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>
+					<i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>
 				</a>
 			</div>
 		</div>',
@@ -391,86 +391,86 @@  discard block
 block discarded – undo
 			<div class="btn-group">
 				<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>
+						<i class="' . $_style["actions_save"].'"></i><span>'.$_lang['save'].'</span>
 					</a>
 					<span class="btn btn-success plus dropdown-toggle"></span>
 					<select id="stay" name="stay">
 						' . ($addnew ? '
-							<option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '') . '>' . $_lang['stay_new'] . '</option>
-						' : '') . '
-						<option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '') . '>' . $_lang['stay'] . '</option>
-						<option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '') . '>' . $_lang['close'] . '</option>
+							<option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '').'>'.$_lang['stay_new'].'</option>
+						' : '').'
+						<option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '').'>'.$_lang['stay'].'</option>
+						<option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '').'>'.$_lang['close'].'</option>
 					</select>
 				</div>
 				' . ($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 id="Button6" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.duplicate();">
+					<i class="' . $_style["actions_duplicate"].'"></i><span>'.$_lang['duplicate'].'</span>
 				</a>
-				' : '') . '
-				<a id="Button3" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.delete();">
-					<i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span>
+				' : '').'
+				<a id="Button3" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.delete();">
+					<i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span>
 				</a>
 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">
-					<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>
+					<i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>
 				</a>
 				' . ($run ? '
-				<a id="Button4" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.run();">
-					<i class="' . $_style["actions_run"] . '"></i><span>' . $_lang['run_module'] . '</span>
+				<a id="Button4" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.run();">
+					<i class="' . $_style["actions_run"].'"></i><span>'.$_lang['run_module'].'</span>
 				</a>
-				' : '') . '
+				' : '').'
 			</div>
 		</div>',
 		'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>
+					<i class="' . $_style["actions_new"].'"></i><span>'.$_lang['new_module'].'</span>
 				</a>
 			</div>
 		</div>' : ''),
 		'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>
+					<i class="' . $_style["actions_close"].'"></i><span>'.$_lang['close'].'</span>
 				</a>
 			</div>
 		</div>',
 		'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>
+					<i class="' . $_style["actions_save"].'"></i><span>'.$_lang['save'].'</span>
 				</a>
 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">
-					<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>
+					<i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>
 				</a>
 			</div>
 		</div>',
 		'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>
+					<i class="' . $_style["actions_save"].'"></i><span>'.$_lang['save'].'</span>
 				</a>
-				<a id="Button3" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.delete();">
-					<i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span>
+				<a id="Button3" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.delete();">
+					<i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span>
 				</a>
 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">
-					<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>
+					<i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>
 				</a>
 			</div>
 		</div>',
 		'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>
+					<i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>
 				</a>
 			</div>
 		</div>',
 		'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>
+				<a id="Button3" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.delete();">
+					<i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span>
 				</a>
 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">
-					<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>
+					<i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>
 				</a>
 			</div>
 		</div>',
@@ -480,33 +480,33 @@  discard block
 block discarded – undo
 			<div class="btn-group">' .
 				($addnew ? '
 					<a class="btn btn-secondary" href="javascript:;" onclick="actions.new();">
-						<i class="' . $_style["icons_new_document"] . '"></i><span>' . $_lang['create_resource_here'] . '</span>
+						<i class="' . $_style["icons_new_document"].'"></i><span>'.$_lang['create_resource_here'].'</span>
 					</a>
 					<a class="btn btn-secondary" href="javascript:;" onclick="actions.newlink();">
-						<i class="' . $_style["icons_new_weblink"] . '"></i><span>' . $_lang['create_weblink_here'] . '</span>
+						<i class="' . $_style["icons_new_weblink"].'"></i><span>'.$_lang['create_weblink_here'].'</span>
 					</a>
-				' : '') . '
+				' : '').'
 				<a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.edit();">
-					<i class="' . $_style["actions_edit"] . '"></i><span>' . $_lang['edit'] . '</span>
+					<i class="' . $_style["actions_edit"].'"></i><span>'.$_lang['edit'].'</span>
 				</a>
 				<a id="Button2" class="btn btn-secondary" href="javascript:;" onclick="actions.move();">
-					<i class="' . $_style["actions_move"] . '"></i><span>' . $_lang['move'] . '</span>
+					<i class="' . $_style["actions_move"].'"></i><span>'.$_lang['move'].'</span>
 				</a>
 				<a id="Button6" class="btn btn-secondary" href="javascript:;" onclick="actions.duplicate();">
-					<i class="' . $_style["actions_duplicate"] . '"></i><span>' . $_lang['duplicate'] . '</span>
+					<i class="' . $_style["actions_duplicate"].'"></i><span>'.$_lang['duplicate'].'</span>
 				</a>
 				<a id="Button3" class="btn btn-secondary" href="javascript:;" onclick="actions.delete();">
-					<i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span>
+					<i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span>
 				</a>
 				<a id="Button4" class="btn btn-secondary" href="javascript:;" onclick="actions.view();">
-					<i class="' . $_style["actions_preview"] . '"></i><span>' . $_lang['preview'] . '</span>
+					<i class="' . $_style["actions_preview"].'"></i><span>'.$_lang['preview'].'</span>
 				</a>
 			</div>
 		</div>',
 		'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>
+					<i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>
 				</a>
 			</div>
 		</div>',

Please login to merge, or discard this patch.

manager/includes/src/ManagerTheme.php 1 patch

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

@@ -37,7 +37,7 @@  discard block
 block discarded – undo
     {
         $found = $this->core->findElements(
             'chunk',
-            MODX_MANAGER_PATH . 'media/style/' . $this->theme . '/snippets/',
+            MODX_MANAGER_PATH.'media/style/'.$this->theme.'/snippets/',
             array('php')
         );
         foreach ($found as $name => $code) {
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
     {
         $found = $this->core->findElements(
             'chunk',
-            MODX_MANAGER_PATH . 'media/style/' . $this->theme . '/chunks/',
+            MODX_MANAGER_PATH.'media/style/'.$this->theme.'/chunks/',
             array('tpl', 'html')
         );
         foreach ($found as $name => $code) {
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
         $this->core->addSnippet(
             $name,
             $code,
-            $this->templateNamespace . '#',
+            $this->templateNamespace.'#',
             array(
                 'managerTheme' => $this
             )
@@ -71,6 +71,6 @@  discard block
 block discarded – undo
 
     public function addChunk($name, $code)
     {
-        $this->core->addChunk($name, $code, $this->templateNamespace . '#');
+        $this->core->addChunk($name, $code, $this->templateNamespace.'#');
     }
 }

Please login to merge, or discard this patch.

manager/actions/mutate_settings/tab4_manager_settings.inc.php 1 patch

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

@@ -56,7 +56,7 @@  discard block
 block discarded – undo
                             }
                             $themename = $file;
                             $selectedtext = $themename == $manager_theme ? "selected='selected'" : "";
-                            echo "<option value='$themename' $selectedtext>" . ucwords(str_replace("_", " ", $themename)) . "</option>";
+                            echo "<option value='$themename' $selectedtext>".ucwords(str_replace("_", " ", $themename))."</option>";
                         }
                     }
                     $dir->close();
@@ -130,9 +130,9 @@  discard block
 block discarded – undo
       <tr>
         <th><?php echo $_lang['login_form_position_title'] ?><br><small>[(login_form_position)]</small></th>
         <td>
-            <?php echo wrap_label($_lang['login_form_position_left'],form_radio('login_form_position', 'left'));?><br />
-            <?php echo wrap_label($_lang['login_form_position_center'], form_radio('login_form_position', 'center'));?><br />
-            <?php echo wrap_label($_lang['login_form_position_right'], form_radio('login_form_position', 'right'));?>
+            <?php echo wrap_label($_lang['login_form_position_left'], form_radio('login_form_position', 'left')); ?><br />
+            <?php echo wrap_label($_lang['login_form_position_center'], form_radio('login_form_position', 'center')); ?><br />
+            <?php echo wrap_label($_lang['login_form_position_right'], form_radio('login_form_position', 'right')); ?>
         </td>
       </tr>
          <tr>
@@ -144,8 +144,8 @@  discard block
 block discarded – undo
       <tr>
         <th><?php echo $_lang['manager_menu_position_title'] ?><br><small>[(manager_menu_position)]</small></th>
         <td>
-            <?php echo wrap_label($_lang['manager_menu_position_top'],form_radio('manager_menu_position', 'top'));?><br />
-            <?php echo wrap_label($_lang['manager_menu_position_left'], form_radio('manager_menu_position', 'left'));?><br />
+            <?php echo wrap_label($_lang['manager_menu_position_top'], form_radio('manager_menu_position', 'top')); ?><br />
+            <?php echo wrap_label($_lang['manager_menu_position_left'], form_radio('manager_menu_position', 'left')); ?><br />
         </td>
       </tr>
 
@@ -287,7 +287,7 @@  discard block
 block discarded – undo
             <td>
                 <select name="group_tvs" size="1" class="form-control">
                     <?php
-                    $tpl = '<option value="[+value+]" [+selected+]>[+title+]</option>' . "\n";
+                    $tpl = '<option value="[+value+]" [+selected+]>[+title+]</option>'."\n";
                     $option = explode(',', $_lang['settings_group_tv_options']);
                     $output = array();
                     foreach ($option as $k => $v) {
@@ -360,7 +360,7 @@  discard block
 block discarded – undo
             <td>
                 <select name="resource_tree_node_name" size="1" class="inputBox">
                     <?php
-                    $tpl = '<option value="[+value+]" [+selected+]>[*[+value+]*]</option>' . "\n";
+                    $tpl = '<option value="[+value+]" [+selected+]>[*[+value+]*]</option>'."\n";
                     $option = array('pagetitle', 'longtitle', 'menutitle', 'alias', 'createdon', 'editedon', 'publishedon');
                     $output = array();
                     foreach ($option as $v) {
@@ -446,8 +446,8 @@  discard block
 block discarded – undo
                     $str = '';
                     foreach ($datetime_format_list as $value) {
                         $selectedtext = ($datetime_format == $value) ? ' selected' : '';
-                        $str .= '<option value="' . $value . '"' . $selectedtext . '>';
-                        $str .= $value . '</option>' . PHP_EOL;
+                        $str .= '<option value="'.$value.'"'.$selectedtext.'>';
+                        $str .= $value.'</option>'.PHP_EOL;
                     }
                     echo $str;
                     ?>
@@ -557,10 +557,10 @@  discard block
 block discarded – undo
                 <select name="which_editor" onChange="documentDirty=true;">
                     <?php
                     // invoke OnRichTextEditorRegister event
-                    echo "<option value='none'" . ($which_editor == 'none' ? " selected='selected'" : "") . ">" . $_lang['none'] . "</option>\n";
+                    echo "<option value='none'".($which_editor == 'none' ? " selected='selected'" : "").">".$_lang['none']."</option>\n";
                     if (is_array($evtOut)) {
                         foreach ($evtOut as $editor) {
-                            echo "<option value='$editor'" . ($which_editor == $editor ? " selected='selected'" : "") . ">$editor</option>\n";
+                            echo "<option value='$editor'".($which_editor == $editor ? " selected='selected'" : "").">$editor</option>\n";
                         }
                     }
                     ?>
@@ -644,14 +644,14 @@  discard block
 block discarded – undo
     lastImageCtrl = ctrl;
     var w = screen.width * 0.7;
     var h = screen.height * 0.7;
-    OpenServerBrowser("<?php echo MODX_MANAGER_URL; ?>media/browser/<?php echo $which_browser;?>/browser.php?Type=images", w, h);
+    OpenServerBrowser("<?php echo MODX_MANAGER_URL; ?>media/browser/<?php echo $which_browser; ?>/browser.php?Type=images", w, h);
   }
 
   function BrowseFileServer(ctrl) {
     lastFileCtrl = ctrl;
     var w = screen.width * 0.7;
     var h = screen.height * 0.7;
-    OpenServerBrowser("<?php echo MODX_MANAGER_URL; ?>media/browser/<?php echo $which_browser;?>/browser.php?Type=files", w, h);
+    OpenServerBrowser("<?php echo MODX_MANAGER_URL; ?>media/browser/<?php echo $which_browser; ?>/browser.php?Type=files", w, h);
   }
 
   function SetUrlChange(el) {

Please login to merge, or discard this patch.

install/src/template/actions/install.php 1 patch

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

@@ -65,7 +65,7 @@  discard block
 block discarded – undo
     <?php endif; ?>
 <?php endif; ?>
 
-<?php if ($installLevel >=  2 && $moduleSQLBaseFile) : ?>
+<?php if ($installLevel >= 2 && $moduleSQLBaseFile) : ?>
     <?php if ($sqlParser->installFailed === false) : ?>
         <p>
             <?=$_lang['setup_database_creating_tables']?>
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
         <?php $sqlErrors = count($sqlParser->mysqlErrors); ?>
         <?php for ($i = 0; $i < $sqlErrors; $i++) : ?>
             <em><?=$sqlParser->mysqlErrors[$i]["error"]?></em>
-            <?=$_lang['during_execution_of_sql'];?>
+            <?=$_lang['during_execution_of_sql']; ?>
             <span class="mono"><?=strip_tags($sqlParser->mysqlErrors[$i]["sql"])?></span>
             <hr />
         <?php endfor; ?>
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
         <?php $sqlErrors = count($sqlParser->mysqlErrors); ?>
         <?php for ($i = 0; $i < $sqlErrors; $i++) : ?>
             <em><?=$sqlParser->mysqlErrors[$i]["error"]?></em> <?=$_lang['during_execution_of_sql']?>
-            <span class='mono'><?=strip_tags($sqlParser->mysqlErrors[$i]["sql"]);?></span>
+            <span class='mono'><?=strip_tags($sqlParser->mysqlErrors[$i]["sql"]); ?></span>
             <hr />
         <?php endfor; ?>
         </p>
@@ -130,9 +130,9 @@  discard block
 block discarded – undo
         <h3><?=$_lang['templates']?>:</h3>
         <?php foreach ($installDataLevel['templates'] as $itemName => $itemData) : ?>
             <?php if (empty($itemData['error'])) : ?>
-                <?php if($itemData['type'] === 'create') : ?>
+                <?php if ($itemData['type'] === 'create') : ?>
                     <p>&nbsp;&nbsp;&#10003;&nbsp;&nbsp;<?=$itemName?>: <span class="ok"><?=$_lang['installed']?></span></p>
-                <?php elseif($itemData['type'] === 'update') : ?>
+                <?php elseif ($itemData['type'] === 'update') : ?>
                     <p>&nbsp;&nbsp;&#10003;&nbsp;&nbsp;<?=$itemName?>: <span class="ok"><?=$_lang['upgraded']?></span></p>
                 <?php endif; ?>
             <?php else : ?>
@@ -154,11 +154,11 @@  discard block
 block discarded – undo
         <h3><?=$_lang['tvs']?>:</h3>
         <?php foreach ($installDataLevel['tvs'] as $itemName => $itemData) : ?>
             <?php if (empty($itemData['error'])) : ?>
-                <?php if($itemData['type'] === 'create') : ?>
+                <?php if ($itemData['type'] === 'create') : ?>
                     <p>&nbsp;&nbsp;&#10003;&nbsp;&nbsp;<?=$itemName?>: <span class="ok"><?=$_lang['installed']?></span></p>
-                <?php elseif($itemData['type'] === 'update') : ?>
+                <?php elseif ($itemData['type'] === 'update') : ?>
                     <p>&nbsp;&nbsp;&#10003;&nbsp;&nbsp;<?=$itemName?>: <span class="ok"><?=$_lang['upgraded']?></span></p>
-                <?php elseif($itemData['type'] === 'skip') : ?>
+                <?php elseif ($itemData['type'] === 'skip') : ?>
                     <!-- SKIP -->
                 <?php endif; ?>
             <?php else : ?>
@@ -173,13 +173,13 @@  discard block
 block discarded – undo
         <h3><?=$_lang['chunks']?>:</h3>
         <?php foreach ($installDataLevel['chunks'] as $itemName => $itemData) : ?>
             <?php if (empty($itemData['error'])) : ?>
-                <?php if($itemData['type'] === 'create') : ?>
+                <?php if ($itemData['type'] === 'create') : ?>
                     <p>&nbsp;&nbsp;&#10003;&nbsp;&nbsp;<?=$itemName?>: <span class="ok"><?=$_lang['installed']?></span></p>
-                <?php elseif($itemData['type'] === 'overwrite') : ?>
+                <?php elseif ($itemData['type'] === 'overwrite') : ?>
                     <p>&nbsp;&nbsp;&#10003;&nbsp;&nbsp;<?=$itemName?>: <span class="ok"><?=$_lang['installed']?></span></p>
-                <?php elseif($itemData['type'] === 'update') : ?>
+                <?php elseif ($itemData['type'] === 'update') : ?>
                     <p>&nbsp;&nbsp;&#10003;&nbsp;&nbsp;<?=$itemName?>: <span class="ok"><?=$_lang['upgraded']?></span></p>
-                <?php elseif($itemData['type'] === 'skip') : ?>
+                <?php elseif ($itemData['type'] === 'skip') : ?>
                     <!-- SKIP -->
                 <?php endif; ?>
             <?php else : ?>
@@ -201,11 +201,11 @@  discard block
 block discarded – undo
         <h3><?=$_lang['modules']?>:</h3>
         <?php foreach ($installDataLevel['modules'] as $itemName => $itemData) : ?>
             <?php if (empty($itemData['error'])) : ?>
-                <?php if($itemData['type'] === 'create') : ?>
+                <?php if ($itemData['type'] === 'create') : ?>
                     <p>&nbsp;&nbsp;&#10003;&nbsp;&nbsp;<?=$itemName?>: <span class="ok"><?=$_lang['installed']?></span></p>
-                <?php elseif($itemData['type'] === 'update') : ?>
+                <?php elseif ($itemData['type'] === 'update') : ?>
                     <p>&nbsp;&nbsp;&#10003;&nbsp;&nbsp;<?=$itemName?>: <span class="ok"><?=$_lang['upgraded']?></span></p>
-                <?php elseif($itemData['type'] === 'skip') : ?>
+                <?php elseif ($itemData['type'] === 'skip') : ?>
                     <!-- SKIP -->
                 <?php endif; ?>
             <?php else : ?>
@@ -227,11 +227,11 @@  discard block
 block discarded – undo
         <h3><?=$_lang['plugins']?>:</h3>
         <?php foreach ($installDataLevel['plugins'] as $itemName => $itemData) : ?>
             <?php if (empty($itemData['error'])) : ?>
-                <?php if($itemData['type'] === 'create') : ?>
+                <?php if ($itemData['type'] === 'create') : ?>
                     <p>&nbsp;&nbsp;&#10003;&nbsp;&nbsp;<?=$itemName?>: <span class="ok"><?=$_lang['installed']?></span></p>
-                <?php elseif($itemData['type'] === 'update') : ?>
+                <?php elseif ($itemData['type'] === 'update') : ?>
                     <p>&nbsp;&nbsp;&#10003;&nbsp;&nbsp;<?=$itemName?>: <span class="ok"><?=$_lang['upgraded']?></span></p>
-                <?php elseif($itemData['type'] === 'skip') : ?>
+                <?php elseif ($itemData['type'] === 'skip') : ?>
                     <!-- SKIP -->
                 <?php endif; ?>
             <?php else : ?>
@@ -253,13 +253,13 @@  discard block
 block discarded – undo
         <h3><?=$_lang['snippets']?>:</h3>
         <?php foreach ($installDataLevel['snippets'] as $itemName => $itemData) : ?>
             <?php if (empty($itemData['error'])) : ?>
-                <?php if($itemData['type'] === 'create') : ?>
+                <?php if ($itemData['type'] === 'create') : ?>
                     <p>&nbsp;&nbsp;&#10003;&nbsp;&nbsp;<?=$itemName?>: <span class="ok"><?=$_lang['installed']?></span></p>
-                <?php elseif($itemData['type'] === 'overwrite') : ?>
+                <?php elseif ($itemData['type'] === 'overwrite') : ?>
                     <p>&nbsp;&nbsp;&#10003;&nbsp;&nbsp;<?=$itemName?>: <span class="ok"><?=$_lang['installed']?></span></p>
-                <?php elseif($itemData['type'] === 'update') : ?>
+                <?php elseif ($itemData['type'] === 'update') : ?>
                     <p>&nbsp;&nbsp;&#10003;&nbsp;&nbsp;<?=$itemName?>: <span class="ok"><?=$_lang['upgraded']?></span></p>
-                <?php elseif($itemData['type'] === 'skip') : ?>
+                <?php elseif ($itemData['type'] === 'skip') : ?>
                     <!-- SKIP -->
                 <?php endif; ?>
             <?php else : ?>
@@ -286,7 +286,7 @@  discard block
 block discarded – undo
             <p><?=$_lang['setup_couldnt_install']?></p>
             <p><?=$_lang['installation_error_occured']?></p>
             <br /><br />
-            <?php foreach($installDataLevel['demo']['error'] as $error): ?>
+            <?php foreach ($installDataLevel['demo']['error'] as $error): ?>
                 <em><?=$error['content']?></em>
                 <?=$_lang['during_execution_of_sql']?>
                 <span class="mono"><?=htmlspecialchars($error['sql'])?></span>
@@ -300,9 +300,9 @@  discard block
 block discarded – undo
 <?php if ($installLevel >= 6): ?>
     <?php foreach ($installDependencyLevel as $itemName => $itemData) : ?>
         <?php if (empty($itemData['error'])) : ?>
-            <?php if($itemData['type'] === 'create') : ?>
+            <?php if ($itemData['type'] === 'create') : ?>
                 <p>&nbsp;&nbsp;&#10003;&nbsp;&nbsp;<?=$itemName?>Module: <span class="ok"><?=$_lang['depedency_create']?></span></p>
-            <?php elseif($itemData['type'] === 'update') : ?>
+            <?php elseif ($itemData['type'] === 'update') : ?>
                 <p>&nbsp;&nbsp;&#10003;&nbsp;&nbsp;<?=$itemName?>Module: <span class="ok"><?=$_lang['depedency_update']?></span></p>
             <?php endif; ?>
 
@@ -370,10 +370,10 @@  discard block
 block discarded – undo
                 var chk = document.install.rminstaller;
                 if (chk && chk.checked) {
                     // remove install folder and files
-                    window.location.href = "../<?=MGR_DIR;?>/processors/remove_installer.processor.php?rminstall=1";
+                    window.location.href = "../<?=MGR_DIR; ?>/processors/remove_installer.processor.php?rminstall=1";
                 }
                 else {
-                    window.location.href = "../<?=MGR_DIR;?>/";
+                    window.location.href = "../<?=MGR_DIR; ?>/";
                 }
             }
             /* ]]> */

Please login to merge, or discard this patch.

		@@ -56,7 +56,7 @@ discard block
		block discarded – undo
56	56	}
57	57	$themename = $file;
58	58	$selectedtext = $themename == $manager_theme ? "selected='selected'" : "";
59		- echo "<option value='$themename' $selectedtext>" . ucwords(str_replace("_", " ", $themename)) . "</option>";
	59	+ echo "<option value='$themename' $selectedtext>".ucwords(str_replace("_", " ", $themename))."</option>";
60	60	}
61	61	}
62	62	$dir->close();
		@@ -130,9 +130,9 @@ discard block
		block discarded – undo
130	130	<tr>
131	131	<th><?php echo $_lang['login_form_position_title'] ?><br><small>[(login_form_position)]</small></th>
132	132	<td>
133		- <?php echo wrap_label($_lang['login_form_position_left'],form_radio('login_form_position', 'left'));?><br />
134		- <?php echo wrap_label($_lang['login_form_position_center'], form_radio('login_form_position', 'center'));?><br />
135		- <?php echo wrap_label($_lang['login_form_position_right'], form_radio('login_form_position', 'right'));?>
	133	+ <?php echo wrap_label($_lang['login_form_position_left'], form_radio('login_form_position', 'left')); ?><br />
	134	+ <?php echo wrap_label($_lang['login_form_position_center'], form_radio('login_form_position', 'center')); ?><br />
	135	+ <?php echo wrap_label($_lang['login_form_position_right'], form_radio('login_form_position', 'right')); ?>
136	136	</td>
137	137	</tr>
138	138	<tr>
		@@ -144,8 +144,8 @@ discard block
		block discarded – undo
144	144	<tr>
145	145	<th><?php echo $_lang['manager_menu_position_title'] ?><br><small>[(manager_menu_position)]</small></th>
146	146	<td>
147		- <?php echo wrap_label($_lang['manager_menu_position_top'],form_radio('manager_menu_position', 'top'));?><br />
148		- <?php echo wrap_label($_lang['manager_menu_position_left'], form_radio('manager_menu_position', 'left'));?><br />
	147	+ <?php echo wrap_label($_lang['manager_menu_position_top'], form_radio('manager_menu_position', 'top')); ?><br />
	148	+ <?php echo wrap_label($_lang['manager_menu_position_left'], form_radio('manager_menu_position', 'left')); ?><br />
149	149	</td>
150	150	</tr>
151	151
		@@ -287,7 +287,7 @@ discard block
		block discarded – undo
287	287	<td>
288	288	<select name="group_tvs" size="1" class="form-control">
289	289	<?php
290		- $tpl = '<option value="[+value+]" [+selected+]>[+title+]</option>' . "\n";
	290	+ $tpl = '<option value="[+value+]" [+selected+]>[+title+]</option>'."\n";
291	291	$option = explode(',', $_lang['settings_group_tv_options']);
292	292	$output = array();
293	293	foreach ($option as $k => $v) {
		@@ -360,7 +360,7 @@ discard block
		block discarded – undo
360	360	<td>
361	361	<select name="resource_tree_node_name" size="1" class="inputBox">
362	362	<?php
363		- $tpl = '<option value="[+value+]" [+selected+]>[[+value+]]</option>' . "\n";
	363	+ $tpl = '<option value="[+value+]" [+selected+]>[[+value+]]</option>'."\n";
364	364	$option = array('pagetitle', 'longtitle', 'menutitle', 'alias', 'createdon', 'editedon', 'publishedon');
365	365	$output = array();
366	366	foreach ($option as $v) {
		@@ -446,8 +446,8 @@ discard block
		block discarded – undo
446	446	$str = '';
447	447	foreach ($datetime_format_list as $value) {
448	448	$selectedtext = ($datetime_format == $value) ? ' selected' : '';
449		- $str .= '<option value="' . $value . '"' . $selectedtext . '>';
450		- $str .= $value . '</option>' . PHP_EOL;
	449	+ $str .= '<option value="'.$value.'"'.$selectedtext.'>';
	450	+ $str .= $value.'</option>'.PHP_EOL;
451	451	}
452	452	echo $str;
453	453	?>
		@@ -557,10 +557,10 @@ discard block
		block discarded – undo
557	557	<select name="which_editor" onChange="documentDirty=true;">
558	558	<?php
559	559	// invoke OnRichTextEditorRegister event
560		- echo "<option value='none'" . ($which_editor == 'none' ? " selected='selected'" : "") . ">" . $_lang['none'] . "</option>\n";
	560	+ echo "<option value='none'".($which_editor == 'none' ? " selected='selected'" : "").">".$_lang['none']."</option>\n";
561	561	if (is_array($evtOut)) {
562	562	foreach ($evtOut as $editor) {
563		- echo "<option value='$editor'" . ($which_editor == $editor ? " selected='selected'" : "") . ">$editor</option>\n";
	563	+ echo "<option value='$editor'".($which_editor == $editor ? " selected='selected'" : "").">$editor</option>\n";
564	564	}
565	565	}
566	566	?>
		@@ -644,14 +644,14 @@ discard block
		block discarded – undo
644	644	lastImageCtrl = ctrl;
645	645	var w = screen.width * 0.7;
646	646	var h = screen.height * 0.7;
647		- OpenServerBrowser("<?php echo MODX_MANAGER_URL; ?>media/browser/<?php echo $which_browser;?>/browser.php?Type=images", w, h);
	647	+ OpenServerBrowser("<?php echo MODX_MANAGER_URL; ?>media/browser/<?php echo $which_browser; ?>/browser.php?Type=images", w, h);
648	648	}
649	649
650	650	function BrowseFileServer(ctrl) {
651	651	lastFileCtrl = ctrl;
652	652	var w = screen.width * 0.7;
653	653	var h = screen.height * 0.7;
654		- OpenServerBrowser("<?php echo MODX_MANAGER_URL; ?>media/browser/<?php echo $which_browser;?>/browser.php?Type=files", w, h);
	654	+ OpenServerBrowser("<?php echo MODX_MANAGER_URL; ?>media/browser/<?php echo $which_browser; ?>/browser.php?Type=files", w, h);
655	655	}
656	656
657	657	function SetUrlChange(el) {

		@@ -65,7 +65,7 @@ discard block
		block discarded – undo
65	65	<?php endif; ?>
66	66	<?php endif; ?>
67	67
68		-<?php if ($installLevel >= 2 && $moduleSQLBaseFile) : ?>
	68	+<?php if ($installLevel >= 2 && $moduleSQLBaseFile) : ?>
69	69	<?php if ($sqlParser->installFailed === false) : ?>
70	70	<p>
71	71	<?=$_lang['setup_database_creating_tables']?>
		@@ -76,7 +76,7 @@ discard block
		block discarded – undo
76	76	<?php $sqlErrors = count($sqlParser->mysqlErrors); ?>
77	77	<?php for ($i = 0; $i < $sqlErrors; $i++) : ?>
78	78	<em><?=$sqlParser->mysqlErrors[$i]["error"]?></em>
79		- <?=$_lang['during_execution_of_sql'];?>
	79	+ <?=$_lang['during_execution_of_sql']; ?>
80	80	<span class="mono"><?=strip_tags($sqlParser->mysqlErrors[$i]["sql"])?></span>
81	81	<hr />
82	82	<?php endfor; ?>
		@@ -112,7 +112,7 @@ discard block
		block discarded – undo
112	112	<?php $sqlErrors = count($sqlParser->mysqlErrors); ?>
113	113	<?php for ($i = 0; $i < $sqlErrors; $i++) : ?>
114	114	<em><?=$sqlParser->mysqlErrors[$i]["error"]?></em> <?=$_lang['during_execution_of_sql']?>
115		- <span class='mono'><?=strip_tags($sqlParser->mysqlErrors[$i]["sql"]);?></span>
	115	+ <span class='mono'><?=strip_tags($sqlParser->mysqlErrors[$i]["sql"]); ?></span>
116	116	<hr />
117	117	<?php endfor; ?>
118	118	</p>
		@@ -130,9 +130,9 @@ discard block
		block discarded – undo
130	130	<h3><?=$_lang['templates']?>:</h3>
131	131	<?php foreach ($installDataLevel['templates'] as $itemName => $itemData) : ?>
132	132	<?php if (empty($itemData['error'])) : ?>
133		- <?php if($itemData['type'] === 'create') : ?>
	133	+ <?php if ($itemData['type'] === 'create') : ?>
134	134	<p>  ✓  <?=$itemName?>: <span class="ok"><?=$_lang['installed']?></span></p>
135		- <?php elseif($itemData['type'] === 'update') : ?>
	135	+ <?php elseif ($itemData['type'] === 'update') : ?>
136	136	<p>  ✓  <?=$itemName?>: <span class="ok"><?=$_lang['upgraded']?></span></p>
137	137	<?php endif; ?>
138	138	<?php else : ?>
		@@ -154,11 +154,11 @@ discard block
		block discarded – undo
154	154	<h3><?=$_lang['tvs']?>:</h3>
155	155	<?php foreach ($installDataLevel['tvs'] as $itemName => $itemData) : ?>
156	156	<?php if (empty($itemData['error'])) : ?>
157		- <?php if($itemData['type'] === 'create') : ?>
	157	+ <?php if ($itemData['type'] === 'create') : ?>
158	158	<p>  ✓  <?=$itemName?>: <span class="ok"><?=$_lang['installed']?></span></p>
159		- <?php elseif($itemData['type'] === 'update') : ?>
	159	+ <?php elseif ($itemData['type'] === 'update') : ?>
160	160	<p>  ✓  <?=$itemName?>: <span class="ok"><?=$_lang['upgraded']?></span></p>
161		- <?php elseif($itemData['type'] === 'skip') : ?>
	161	+ <?php elseif ($itemData['type'] === 'skip') : ?>
162	162	<!-- SKIP -->
163	163	<?php endif; ?>
164	164	<?php else : ?>
		@@ -173,13 +173,13 @@ discard block
		block discarded – undo
173	173	<h3><?=$_lang['chunks']?>:</h3>
174	174	<?php foreach ($installDataLevel['chunks'] as $itemName => $itemData) : ?>
175	175	<?php if (empty($itemData['error'])) : ?>
176		- <?php if($itemData['type'] === 'create') : ?>
	176	+ <?php if ($itemData['type'] === 'create') : ?>
177	177	<p>  ✓  <?=$itemName?>: <span class="ok"><?=$_lang['installed']?></span></p>
178		- <?php elseif($itemData['type'] === 'overwrite') : ?>
	178	+ <?php elseif ($itemData['type'] === 'overwrite') : ?>
179	179	<p>  ✓  <?=$itemName?>: <span class="ok"><?=$_lang['installed']?></span></p>
180		- <?php elseif($itemData['type'] === 'update') : ?>
	180	+ <?php elseif ($itemData['type'] === 'update') : ?>
181	181	<p>  ✓  <?=$itemName?>: <span class="ok"><?=$_lang['upgraded']?></span></p>
182		- <?php elseif($itemData['type'] === 'skip') : ?>
	182	+ <?php elseif ($itemData['type'] === 'skip') : ?>
183	183	<!-- SKIP -->
184	184	<?php endif; ?>
185	185	<?php else : ?>
		@@ -201,11 +201,11 @@ discard block
		block discarded – undo
201	201	<h3><?=$_lang['modules']?>:</h3>
202	202	<?php foreach ($installDataLevel['modules'] as $itemName => $itemData) : ?>
203	203	<?php if (empty($itemData['error'])) : ?>
204		- <?php if($itemData['type'] === 'create') : ?>
	204	+ <?php if ($itemData['type'] === 'create') : ?>
205	205	<p>  ✓  <?=$itemName?>: <span class="ok"><?=$_lang['installed']?></span></p>
206		- <?php elseif($itemData['type'] === 'update') : ?>
	206	+ <?php elseif ($itemData['type'] === 'update') : ?>
207	207	<p>  ✓  <?=$itemName?>: <span class="ok"><?=$_lang['upgraded']?></span></p>
208		- <?php elseif($itemData['type'] === 'skip') : ?>
	208	+ <?php elseif ($itemData['type'] === 'skip') : ?>
209	209	<!-- SKIP -->
210	210	<?php endif; ?>
211	211	<?php else : ?>
		@@ -227,11 +227,11 @@ discard block
		block discarded – undo
227	227	<h3><?=$_lang['plugins']?>:</h3>
228	228	<?php foreach ($installDataLevel['plugins'] as $itemName => $itemData) : ?>
229	229	<?php if (empty($itemData['error'])) : ?>
230		- <?php if($itemData['type'] === 'create') : ?>
	230	+ <?php if ($itemData['type'] === 'create') : ?>
231	231	<p>  ✓  <?=$itemName?>: <span class="ok"><?=$_lang['installed']?></span></p>
232		- <?php elseif($itemData['type'] === 'update') : ?>
	232	+ <?php elseif ($itemData['type'] === 'update') : ?>
233	233	<p>  ✓  <?=$itemName?>: <span class="ok"><?=$_lang['upgraded']?></span></p>
234		- <?php elseif($itemData['type'] === 'skip') : ?>
	234	+ <?php elseif ($itemData['type'] === 'skip') : ?>
235	235	<!-- SKIP -->
236	236	<?php endif; ?>
237	237	<?php else : ?>
		@@ -253,13 +253,13 @@ discard block
		block discarded – undo
253	253	<h3><?=$_lang['snippets']?>:</h3>
254	254	<?php foreach ($installDataLevel['snippets'] as $itemName => $itemData) : ?>
255	255	<?php if (empty($itemData['error'])) : ?>
256		- <?php if($itemData['type'] === 'create') : ?>
	256	+ <?php if ($itemData['type'] === 'create') : ?>
257	257	<p>  ✓  <?=$itemName?>: <span class="ok"><?=$_lang['installed']?></span></p>
258		- <?php elseif($itemData['type'] === 'overwrite') : ?>
	258	+ <?php elseif ($itemData['type'] === 'overwrite') : ?>
259	259	<p>  ✓  <?=$itemName?>: <span class="ok"><?=$_lang['installed']?></span></p>
260		- <?php elseif($itemData['type'] === 'update') : ?>
	260	+ <?php elseif ($itemData['type'] === 'update') : ?>
261	261	<p>  ✓  <?=$itemName?>: <span class="ok"><?=$_lang['upgraded']?></span></p>
262		- <?php elseif($itemData['type'] === 'skip') : ?>
	262	+ <?php elseif ($itemData['type'] === 'skip') : ?>
263	263	<!-- SKIP -->
264	264	<?php endif; ?>
265	265	<?php else : ?>
		@@ -286,7 +286,7 @@ discard block
		block discarded – undo
286	286	<p><?=$_lang['setup_couldnt_install']?></p>
287	287	<p><?=$_lang['installation_error_occured']?></p>
288	288	<br /><br />
289		- <?php foreach($installDataLevel['demo']['error'] as $error): ?>
	289	+ <?php foreach ($installDataLevel['demo']['error'] as $error): ?>
290	290	<em><?=$error['content']?></em>
291	291	<?=$_lang['during_execution_of_sql']?>
292	292	<span class="mono"><?=htmlspecialchars($error['sql'])?></span>
		@@ -300,9 +300,9 @@ discard block
		block discarded – undo
300	300	<?php if ($installLevel >= 6): ?>
301	301	<?php foreach ($installDependencyLevel as $itemName => $itemData) : ?>
302	302	<?php if (empty($itemData['error'])) : ?>
303		- <?php if($itemData['type'] === 'create') : ?>
	303	+ <?php if ($itemData['type'] === 'create') : ?>
304	304	<p>  ✓  <?=$itemName?>Module: <span class="ok"><?=$_lang['depedency_create']?></span></p>
305		- <?php elseif($itemData['type'] === 'update') : ?>
	305	+ <?php elseif ($itemData['type'] === 'update') : ?>
306	306	<p>  ✓  <?=$itemName?>Module: <span class="ok"><?=$_lang['depedency_update']?></span></p>
307	307	<?php endif; ?>
308	308
		@@ -370,10 +370,10 @@ discard block
		block discarded – undo
370	370	var chk = document.install.rminstaller;
371	371	if (chk && chk.checked) {
372	372	// remove install folder and files
373		- window.location.href = "../<?=MGR_DIR;?>/processors/remove_installer.processor.php?rminstall=1";
	373	+ window.location.href = "../<?=MGR_DIR; ?>/processors/remove_installer.processor.php?rminstall=1";
374	374	}
375	375	else {
376		- window.location.href = "../<?=MGR_DIR;?>/";
	376	+ window.location.href = "../<?=MGR_DIR; ?>/";
377	377	}
378	378	}
379	379	/* ]]> */

		@@ -1,6 +1,6 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3		-if(!function_exists('createGUID')) {
	3	+if (!function_exists('createGUID')) {
4	4	/**
5	5	* create globally unique identifiers (guid)
6	6	*
		@@ -8,22 +8,22 @@ discard block
		block discarded – undo
8	8	*/
9	9	function createGUID()
10	10	{
11		- srand((double)microtime() * 1000000);
	11	+ srand((double) microtime() * 1000000);
12	12	$r = rand();
13		- $u = uniqid(getmypid() . $r . (double)microtime() * 1000000, 1);
	13	+ $u = uniqid(getmypid().$r.(double) microtime() * 1000000, 1);
14	14	$m = md5($u);
15	15
16	16	return $m;
17	17	}
18	18	}
19	19
20		-if(!function_exists('generate_password')) {
	20	+if (!function_exists('generate_password')) {
21	21	// Generate password
22	22	function generate_password($length = 10)
23	23	{
24	24	$allowable_characters = "abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789";
25	25	$ps_len = strlen($allowable_characters);
26		- mt_srand((double)microtime() * 1000000);
	26	+ mt_srand((double) microtime() * 1000000);
27	27	$pass = "";
28	28	for ($i = 0; $i < $length; $i++) {
29	29	$pass .= $allowable_characters[mt_rand(0, $ps_len - 1)];

		@@ -36,7 +36,7 @@ discard block
		block discarded – undo
36	36	}
37	37
38	38	$msg = '';
39		-$pth = dirname(dirname(__DIR__)) . '/install/';
	39	+$pth = dirname(dirname(__DIR__)).'/install/';
40	40	$pth = str_replace('\\', '/', $pth);
41	41
42	42	if (isset($_GET['rminstall'])) {
		@@ -47,7 +47,7 @@ discard block
		block discarded – undo
47	47	}
48	48	}
49	49	if ($msg) {
50		- echo "<script>alert('" . addslashes($msg) . "');</script>";
	50	+ echo "<script>alert('".addslashes($msg)."');</script>";
51	51	}
52	52
53	53	echo "<script>window.location='../index.php?a=2';</script>";

		@@ -8,19 +8,19 @@ discard block
		block discarded – undo
8	8	* Version: 1.1
9	9	* MODX version: 1.0.3
10	10	*/
11		-$style_path = 'media/style/' . $modx->config['manager_theme'] . '/images/';
	11	+$style_path = 'media/style/'.$modx->config['manager_theme'].'/images/';
12	12	$modx->config['mgr_date_picker_path'] = 'media/calendar/datepicker.inc.php';
13		-if(!$modx->config['lang_code']) {
	13	+if (!$modx->config['lang_code']) {
14	14	global $modx_lang_attribute;
15	15	$modx->config['lang_code'] = !$modx_lang_attribute ? 'en' : $modx_lang_attribute;
16	16	}
17	17
18		-if(!empty($_GET['a']) && $_GET['a'] == 2) {
	18	+if (!empty($_GET['a']) && $_GET['a'] == 2) {
19	19	include_once('welcome.php');
20	20	}
21	21
22	22	// Favicon
23		-$_style['favicon'] = (file_exists(MODX_BASE_PATH . 'favicon.ico') ? MODX_SITE_URL . 'favicon.ico' : 'media/style/' . $modx->config['manager_theme'] . '/images/favicon.ico');
	23	+$_style['favicon'] = (file_exists(MODX_BASE_PATH.'favicon.ico') ? MODX_SITE_URL . 'favicon.ico' : 'media/style/'.$modx->config['manager_theme'].'/images/favicon.ico');
24	24
25	25	//Main Menu
26	26	$_style['menu_search'] = '<i class="fa fa-search"></i>';
		@@ -99,10 +99,10 @@ discard block
		block discarded – undo
99	99	$_style['tree_page_word'] = "<i class='fa fa-file-word-o'></i>";
100	100	$_style['tree_page_excel'] = "<i class='fa fa-file-excel-o'></i>";
101	101
102		-$_style['tree_minusnode'] = "<i class='fa fa-angle-down'></i>";//$style_path.'tree/angle-down.png';
103		-$_style['tree_plusnode'] = "<i class='fa fa-angle-right'></i>";//$style_path.'tree/angle-right.png';
	102	+$_style['tree_minusnode'] = "<i class='fa fa-angle-down'></i>"; //$style_path.'tree/angle-down.png';
	103	+$_style['tree_plusnode'] = "<i class='fa fa-angle-right'></i>"; //$style_path.'tree/angle-right.png';
104	104	$_style['tree_weblink'] = $style_path.'tree/link.png';
105		-$_style['tree_preview_resource'] = "<i class='fa fa-eye'></i>";//$style_path.'icons/eye.png';
	105	+$_style['tree_preview_resource'] = "<i class='fa fa-eye'></i>"; //$style_path.'icons/eye.png';
106	106
107	107	$_style['tree_showtree'] = '<i class="fa fa-sitemap"></i>';
108	108	$_style['tree_working'] = '<i class="fa fa-warning"></i>';
		@@ -137,8 +137,8 @@ discard block
		block discarded – undo
137	137	$_style['icons_edit_document'] = $style_path.'icons/save.png';
138	138	$_style['icons_delete_document'] = $style_path.'icons/trash.png';
139	139	//locks
140		-$_style['icons_preview_resource'] = $style_path.'icons/eye.png';//$style_path.'icons/eye.png';
141		-$_style['icons_secured'] = "<i class='fa fa-lock'></i>";//$style_path.'icons/lock.png';
	140	+$_style['icons_preview_resource'] = $style_path.'icons/eye.png'; //$style_path.'icons/eye.png';
	141	+$_style['icons_secured'] = "<i class='fa fa-lock'></i>"; //$style_path.'icons/lock.png';
142	142
143	143	//file manager icons
144	144	$_style['files_save'] = 'fa fa-floppy-o';
		@@ -213,7 +213,7 @@ discard block
		block discarded – undo
213	213	$_style['icons_set_parent'] = $style_path.'icons/folder-open.png';
214	214
215	215	//modules
216		-$_style['icons_module'] = 'fa fa-cube';
	216	+$_style['icons_module'] = 'fa fa-cube';
217	217	$_style['icons_modules'] = 'fa fa-cubes'; //$style_path.'icons/modules.png';
218	218	$_style['icons_run'] = $style_path.'icons/play.png';
219	219
		@@ -273,57 +273,57 @@ discard block
		block discarded – undo
273	273	$stay = isset($_REQUEST['stay']) ? $_REQUEST['stay'] : '';
274	274	$addnew = 0;
275	275	$run = 0;
276		-switch($action) {
	276	+switch ($action) {
277	277	case '3':
278	278	case '4':
279	279	case '27':
280	280	case '72':
281		- if($modx->hasPermission('new_document')) {
	281	+ if ($modx->hasPermission('new_document')) {
282	282	$addnew = 1;
283	283	}
284	284	break;
285	285	case '16':
286	286	case '19':
287		- if($modx->hasPermission('new_template')) {
	287	+ if ($modx->hasPermission('new_template')) {
288	288	$addnew = 1;
289	289	}
290	290	break;
291	291	case '300':
292	292	case '301':
293		- if($modx->hasPermission('new_snippet') && $modx->hasPermission('new_chunk') && $modx->hasPermission('new_plugin')) {
	293	+ if ($modx->hasPermission('new_snippet') && $modx->hasPermission('new_chunk') && $modx->hasPermission('new_plugin')) {
294	294	$addnew = 1;
295	295	}
296	296	break;
297	297	case '77':
298	298	case '78':
299		- if($modx->hasPermission('new_chunk')) {
	299	+ if ($modx->hasPermission('new_chunk')) {
300	300	$addnew = 1;
301	301	}
302	302	break;
303	303	case '22':
304	304	case '23':
305		- if($modx->hasPermission('new_snippet')) {
	305	+ if ($modx->hasPermission('new_snippet')) {
306	306	$addnew = 1;
307	307	}
308	308	break;
309	309	case '101':
310	310	case '102':
311		- if($modx->hasPermission('new_plugin')) {
	311	+ if ($modx->hasPermission('new_plugin')) {
312	312	$addnew = 1;
313	313	}
314	314	break;
315	315	case '106':
316	316	case '107':
317	317	case '108':
318		- if($modx->hasPermission('new_module')) {
	318	+ if ($modx->hasPermission('new_module')) {
319	319	$addnew = 1;
320	320	}
321		- if($modx->hasPermission('exec_module')) {
	321	+ if ($modx->hasPermission('exec_module')) {
322	322	$run = 1;
323	323	}
324	324	break;
325	325	case '88':
326		- if($modx->hasPermission('new_web_user')) {
	326	+ if ($modx->hasPermission('new_web_user')) {
327	327	$addnew = 1;
328	328	}
329	329	break;
		@@ -337,30 +337,30 @@ discard block
		block discarded – undo
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();">
340		- <i class="' . $_style["actions_save"] . '"></i><span>' . $_lang['save'] . '</span>
	340	+ <i class="' . $_style["actions_save"].'"></i><span>'.$_lang['save'].'</span>
341	341	</a>
342	342	<span class="btn btn-success plus dropdown-toggle"></span>
343	343	<select id="stay" name="stay">
344	344	' . ($addnew ? '
345		- <option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '') . '>' . $_lang['stay_new'] . '</option>
346		- ' : '') . '
347		- <option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '') . '>' . $_lang['stay'] . '</option>
348		- <option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '') . '>' . $_lang['close'] . '</option>
	345	+ <option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '').'>'.$_lang['stay_new'].'</option>
	346	+ ' : '').'
	347	+ <option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '').'>'.$_lang['stay'].'</option>
	348	+ <option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '').'>'.$_lang['close'].'</option>
349	349	</select>
350	350	</div>' .
351	351	($addnew ? '
352		- <a id="Button6" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.duplicate();">
353		- <i class="' . $_style["actions_duplicate"] . '"></i><span>' . $_lang['duplicate'] . '</span>
	352	+ <a id="Button6" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.duplicate();">
	353	+ <i class="' . $_style["actions_duplicate"].'"></i><span>'.$_lang['duplicate'].'</span>
354	354	</a>
355		- ' : '') . '
356		- <a id="Button3" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.delete();">
357		- <i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span>
	355	+ ' : '').'
	356	+ <a id="Button3" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.delete();">
	357	+ <i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span>
358	358	</a>
359	359	<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">
360		- <i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>
	360	+ <i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>
361	361	</a>
362	362	<a id="Button4" class="btn btn-secondary" href="javascript:;" onclick="actions.view();">
363		- <i class="' . $_style["actions_preview"] . '"></i><span>' . $_lang['preview'] . '</span>
	363	+ <i class="' . $_style["actions_preview"].'"></i><span>'.$_lang['preview'].'</span>
364	364	</a>
365	365	</div>
366	366	</div>',
		@@ -368,22 +368,22 @@ discard block
		block discarded – undo
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();">
371		- <i class="' . $_style["actions_save"] . '"></i><span>' . $_lang['save'] . '</span>
	371	+ <i class="' . $_style["actions_save"].'"></i><span>'.$_lang['save'].'</span>
372	372	</a>
373	373	<span class="btn btn-success plus dropdown-toggle"></span>
374	374	<select id="stay" name="stay">
375	375	' . ($addnew ? '
376		- <option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '') . '>' . $_lang['stay_new'] . '</option>
377		- ' : '') . '
378		- <option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '') . '>' . $_lang['stay'] . '</option>
379		- <option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '') . '>' . $_lang['close'] . '</option>
	376	+ <option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '').'>'.$_lang['stay_new'].'</option>
	377	+ ' : '').'
	378	+ <option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '').'>'.$_lang['stay'].'</option>
	379	+ <option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '').'>'.$_lang['close'].'</option>
380	380	</select>
381	381	</div>
382		- <a id="Button3" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.delete();">
383		- <i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span>
	382	+ <a id="Button3" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.delete();">
	383	+ <i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span>
384	384	</a>
385	385	<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">
386		- <i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>
	386	+ <i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>
387	387	</a>
388	388	</div>
389	389	</div>',
		@@ -391,86 +391,86 @@ discard block
		block discarded – undo
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();">
394		- <i class="' . $_style["actions_save"] . '"></i><span>' . $_lang['save'] . '</span>
	394	+ <i class="' . $_style["actions_save"].'"></i><span>'.$_lang['save'].'</span>
395	395	</a>
396	396	<span class="btn btn-success plus dropdown-toggle"></span>
397	397	<select id="stay" name="stay">
398	398	' . ($addnew ? '
399		- <option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '') . '>' . $_lang['stay_new'] . '</option>
400		- ' : '') . '
401		- <option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '') . '>' . $_lang['stay'] . '</option>
402		- <option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '') . '>' . $_lang['close'] . '</option>
	399	+ <option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '').'>'.$_lang['stay_new'].'</option>
	400	+ ' : '').'
	401	+ <option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '').'>'.$_lang['stay'].'</option>
	402	+ <option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '').'>'.$_lang['close'].'</option>
403	403	</select>
404	404	</div>
405	405	' . ($addnew ? '
406		- <a id="Button6" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.duplicate();">
407		- <i class="' . $_style["actions_duplicate"] . '"></i><span>' . $_lang['duplicate'] . '</span>
	406	+ <a id="Button6" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.duplicate();">
	407	+ <i class="' . $_style["actions_duplicate"].'"></i><span>'.$_lang['duplicate'].'</span>
408	408	</a>
409		- ' : '') . '
410		- <a id="Button3" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.delete();">
411		- <i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span>
	409	+ ' : '').'
	410	+ <a id="Button3" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.delete();">
	411	+ <i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span>
412	412	</a>
413	413	<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">
414		- <i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>
	414	+ <i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>
415	415	</a>
416	416	' . ($run ? '
417		- <a id="Button4" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.run();">
418		- <i class="' . $_style["actions_run"] . '"></i><span>' . $_lang['run_module'] . '</span>
	417	+ <a id="Button4" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.run();">
	418	+ <i class="' . $_style["actions_run"].'"></i><span>'.$_lang['run_module'].'</span>
419	419	</a>
420		- ' : '') . '
	420	+ ' : '').'
421	421	</div>
422	422	</div>',
423	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		- <i class="' . $_style["actions_new"] . '"></i><span>' . $_lang['new_module'] . '</span>
	426	+ <i class="' . $_style["actions_new"].'"></i><span>'.$_lang['new_module'].'</span>
427	427	</a>
428	428	</div>
429	429	</div>' : ''),
430	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		- <i class="' . $_style["actions_close"] . '"></i><span>' . $_lang['close'] . '</span>
	433	+ <i class="' . $_style["actions_close"].'"></i><span>'.$_lang['close'].'</span>
434	434	</a>
435	435	</div>
436	436	</div>',
437	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		- <i class="' . $_style["actions_save"] . '"></i><span>' . $_lang['save'] . '</span>
	440	+ <i class="' . $_style["actions_save"].'"></i><span>'.$_lang['save'].'</span>
441	441	</a>
442	442	<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">
443		- <i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>
	443	+ <i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>
444	444	</a>
445	445	</div>
446	446	</div>',
447	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		- <i class="' . $_style["actions_save"] . '"></i><span>' . $_lang['save'] . '</span>
	450	+ <i class="' . $_style["actions_save"].'"></i><span>'.$_lang['save'].'</span>
451	451	</a>
452		- <a id="Button3" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.delete();">
453		- <i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span>
	452	+ <a id="Button3" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.delete();">
	453	+ <i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span>
454	454	</a>
455	455	<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">
456		- <i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>
	456	+ <i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>
457	457	</a>
458	458	</div>
459	459	</div>',
460	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		- <i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>
	463	+ <i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>
464	464	</a>
465	465	</div>
466	466	</div>',
467	467	'canceldelete' => '<div id="actions">
468	468	<div class="btn-group">
469		- <a id="Button3" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.delete();">
470		- <i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span>
	469	+ <a id="Button3" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.delete();">
	470	+ <i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span>
471	471	</a>
472	472	<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">
473		- <i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>
	473	+ <i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>
474	474	</a>
475	475	</div>
476	476	</div>',
		@@ -480,33 +480,33 @@ discard block
		block discarded – undo
480	480	<div class="btn-group">' .
481	481	($addnew ? '
482	482	<a class="btn btn-secondary" href="javascript:;" onclick="actions.new();">
483		- <i class="' . $_style["icons_new_document"] . '"></i><span>' . $_lang['create_resource_here'] . '</span>
	483	+ <i class="' . $_style["icons_new_document"].'"></i><span>'.$_lang['create_resource_here'].'</span>
484	484	</a>
485	485	<a class="btn btn-secondary" href="javascript:;" onclick="actions.newlink();">
486		- <i class="' . $_style["icons_new_weblink"] . '"></i><span>' . $_lang['create_weblink_here'] . '</span>
	486	+ <i class="' . $_style["icons_new_weblink"].'"></i><span>'.$_lang['create_weblink_here'].'</span>
487	487	</a>
488		- ' : '') . '
	488	+ ' : '').'
489	489	<a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.edit();">
490		- <i class="' . $_style["actions_edit"] . '"></i><span>' . $_lang['edit'] . '</span>
	490	+ <i class="' . $_style["actions_edit"].'"></i><span>'.$_lang['edit'].'</span>
491	491	</a>
492	492	<a id="Button2" class="btn btn-secondary" href="javascript:;" onclick="actions.move();">
493		- <i class="' . $_style["actions_move"] . '"></i><span>' . $_lang['move'] . '</span>
	493	+ <i class="' . $_style["actions_move"].'"></i><span>'.$_lang['move'].'</span>
494	494	</a>
495	495	<a id="Button6" class="btn btn-secondary" href="javascript:;" onclick="actions.duplicate();">
496		- <i class="' . $_style["actions_duplicate"] . '"></i><span>' . $_lang['duplicate'] . '</span>
	496	+ <i class="' . $_style["actions_duplicate"].'"></i><span>'.$_lang['duplicate'].'</span>
497	497	</a>
498	498	<a id="Button3" class="btn btn-secondary" href="javascript:;" onclick="actions.delete();">
499		- <i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span>
	499	+ <i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span>
500	500	</a>
501	501	<a id="Button4" class="btn btn-secondary" href="javascript:;" onclick="actions.view();">
502		- <i class="' . $_style["actions_preview"] . '"></i><span>' . $_lang['preview'] . '</span>
	502	+ <i class="' . $_style["actions_preview"].'"></i><span>'.$_lang['preview'].'</span>
503	503	</a>
504	504	</div>
505	505	</div>',
506	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		- <i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>
	509	+ <i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>
510	510	</a>
511	511	</div>
512	512	</div>',

		@@ -37,7 +37,7 @@ discard block
		block discarded – undo
37	37	{
38	38	$found = $this->core->findElements(
39	39	'chunk',
40		- MODX_MANAGER_PATH . 'media/style/' . $this->theme . '/snippets/',
	40	+ MODX_MANAGER_PATH.'media/style/'.$this->theme.'/snippets/',
41	41	array('php')
42	42	);
43	43	foreach ($found as $name => $code) {
		@@ -49,7 +49,7 @@ discard block
		block discarded – undo
49	49	{
50	50	$found = $this->core->findElements(
51	51	'chunk',
52		- MODX_MANAGER_PATH . 'media/style/' . $this->theme . '/chunks/',
	52	+ MODX_MANAGER_PATH.'media/style/'.$this->theme.'/chunks/',
53	53	array('tpl', 'html')
54	54	);
55	55	foreach ($found as $name => $code) {
		@@ -62,7 +62,7 @@ discard block
		block discarded – undo
62	62	$this->core->addSnippet(
63	63	$name,
64	64	$code,
65		- $this->templateNamespace . '#',
	65	+ $this->templateNamespace.'#',
66	66	array(
67	67	'managerTheme' => $this
68	68	)
		@@ -71,6 +71,6 @@ discard block
		block discarded – undo
71	71
72	72	public function addChunk($name, $code)
73	73	{
74		- $this->core->addChunk($name, $code, $this->templateNamespace . '#');
	74	+ $this->core->addChunk($name, $code, $this->templateNamespace.'#');
75	75	}
76	76	}

evolution-cms / evolution

Pull Request — develop (#725)

Status

Category

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

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

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

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

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

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

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

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

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