Inspection of "Merge pull request #526 from DanyaDaro/develop" - evolution-cms/evolution - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — develop ( 663a1f...4a4b5c )

by Agel_Nash

created 2018-02-23 16:53 UTC

Status

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

@@ -3,12 +3,12 @@  discard block
 block discarded – undo
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('save_document')||!$modx->hasPermission('publish_document')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_REQUEST['id'])? intval($_REQUEST['id']) : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 /************webber ********/
@@ -33,20 +33,20 @@  discard block
 block discarded – undo
 $udperms->role = $_SESSION['mgrRole'];
 
 if(!$udperms->checkPermissions()) {
-	$modx->webAlertAndQuit($_lang["access_permission_denied"]);
+    $modx->webAlertAndQuit($_lang["access_permission_denied"]);
 }
 
 // update the document
 $modx->db->update(
-	array(
-		'published'   => 1,
-		'pub_date'    => 0,
-		'unpub_date'  => 0,
-		'editedby'    => $modx->getLoginUserID(),
-		'editedon'    => time(),
-		'publishedby' => $modx->getLoginUserID(),
-		'publishedon' => time(),
-	), $modx->getFullTableName('site_content'), "id='{$id}'");
+    array(
+        'published'   => 1,
+        'pub_date'    => 0,
+        'unpub_date'  => 0,
+        'editedby'    => $modx->getLoginUserID(),
+        'editedon'    => time(),
+        'publishedby' => $modx->getLoginUserID(),
+        'publishedon' => time(),
+    ), $modx->getFullTableName('site_content'), "id='{$id}'");
 
 // invoke OnDocPublished  event
 $modx->invokeEvent("OnDocPublished",array("docid"=>$id));

Please login to merge, or discard this patch.

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

@@ -1,38 +1,38 @@  discard block
 block discarded – undo
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('save_document')||!$modx->hasPermission('publish_document')) {
+if (!$modx->hasPermission('save_document') || !$modx->hasPermission('publish_document')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_REQUEST['id'])? intval($_REQUEST['id']) : 0;
-if($id==0) {
+$id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 /************webber ********/
-$content=$modx->db->getRow($modx->db->select('parent, pagetitle', $modx->getFullTableName('site_content'), "id='{$id}'"));
-$pid=($content['parent']==0?$id:$content['parent']);
+$content = $modx->db->getRow($modx->db->select('parent, pagetitle', $modx->getFullTableName('site_content'), "id='{$id}'"));
+$pid = ($content['parent'] == 0 ? $id : $content['parent']);
 
 /************** webber *************/
-$sd=isset($_REQUEST['dir'])?'&dir='.$_REQUEST['dir']:'&dir=DESC';
-$sb=isset($_REQUEST['sort'])?'&sort='.$_REQUEST['sort']:'&sort=createdon';
-$pg=isset($_REQUEST['page'])?'&page='.(int)$_REQUEST['page']:'';
-$add_path=$sd.$sb.$pg;
+$sd = isset($_REQUEST['dir']) ? '&dir='.$_REQUEST['dir'] : '&dir=DESC';
+$sb = isset($_REQUEST['sort']) ? '&sort='.$_REQUEST['sort'] : '&sort=createdon';
+$pg = isset($_REQUEST['page']) ? '&page='.(int) $_REQUEST['page'] : '';
+$add_path = $sd.$sb.$pg;
 
 /***********************************/
 
 
 
 // check permissions on the document
-include_once MODX_MANAGER_PATH . "processors/user_documents_permissions.class.php";
+include_once MODX_MANAGER_PATH."processors/user_documents_permissions.class.php";
 $udperms = new udperms();
 $udperms->user = $modx->getLoginUserID();
 $udperms->document = $id;
 $udperms->role = $_SESSION['mgrRole'];
 
-if(!$udperms->checkPermissions()) {
+if (!$udperms->checkPermissions()) {
 	$modx->webAlertAndQuit($_lang["access_permission_denied"]);
 }
 
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
 	), $modx->getFullTableName('site_content'), "id='{$id}'");
 
 // invoke OnDocPublished  event
-$modx->invokeEvent("OnDocPublished",array("docid"=>$id));
+$modx->invokeEvent("OnDocPublished", array("docid"=>$id));
 
 // Set the item name for logger
 $_SESSION['itemname'] = $content['pagetitle'];
@@ -57,6 +57,6 @@  discard block
 block discarded – undo
 // empty cache
 $modx->clearCache('full');
 
-$header="Location: index.php?a=3&id=$pid&r=1".$add_path;
+$header = "Location: index.php?a=3&id=$pid&r=1".$add_path;
 
 header($header);

Please login to merge, or discard this patch.

manager/processors/remove_content.processor.php 2 patches

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

@@ -3,7 +3,7 @@  discard block
 block discarded – undo
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('delete_document')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "deleted=1");
@@ -11,9 +11,9 @@  discard block
 block discarded – undo
 
 // invoke OnBeforeEmptyTrash event
 $modx->invokeEvent("OnBeforeEmptyTrash",
-						array(
-							"ids"=>$ids
-						));
+                        array(
+                            "ids"=>$ids
+                        ));
 
 // remove the document groups link.
 $sql = "DELETE document_groups
@@ -32,15 +32,15 @@  discard block
 block discarded – undo
 //'undelete' the document.
 $modx->db->delete($modx->getFullTableName('site_content'), "deleted=1");
 
-	// invoke OnEmptyTrash event
-	$modx->invokeEvent("OnEmptyTrash",
-						array(
-							"ids"=>$ids
-						));
+    // invoke OnEmptyTrash event
+    $modx->invokeEvent("OnEmptyTrash",
+                        array(
+                            "ids"=>$ids
+                        ));
 
-	// empty cache
-	$modx->clearCache('full');
+    // empty cache
+    $modx->clearCache('full');
 
-	// finished emptying cache - redirect
-	$header="Location: index.php?a=2&r=1";
-	header($header);
+    // finished emptying cache - redirect
+    $header="Location: index.php?a=2&r=1";
+    header($header);

Please login to merge, or discard this patch.

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

@@ -1,8 +1,8 @@  discard block
 block discarded – undo
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('delete_document')) {
+if (!$modx->hasPermission('delete_document')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -42,5 +42,5 @@  discard block
 block discarded – undo
 	$modx->clearCache('full');
 
 	// finished emptying cache - redirect
-	$header="Location: index.php?a=2&r=1";
+	$header = "Location: index.php?a=2&r=1";
 	header($header);

Please login to merge, or discard this patch.

manager/processors/save_password.processor.php 3 patches

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

@@ -3,7 +3,7 @@  discard block
 block discarded – undo
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('save_password')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = $_POST['id'];
@@ -11,26 +11,26 @@  discard block
 block discarded – undo
 $pass2 = $_POST['pass2'];
 
 if($pass1!=$pass2){
-	$modx->webAlertAndQuit("Passwords don't match!");
+    $modx->webAlertAndQuit("Passwords don't match!");
 }
 
 if(strlen($pass1)<6){
-	$modx->webAlertAndQuit("Password is too short. Please specify a password of at least 6 characters.");
+    $modx->webAlertAndQuit("Password is too short. Please specify a password of at least 6 characters.");
 }
 
     $pass1 = $modx->htmlspecialchars($pass1, ENT_NOQUOTES);
-	$tbl_manager_users = $modx->getFullTableName('manager_users');
-	$uid = $modx->getLoginUserID();
-	$modx->loadExtension('phpass');
-	$f['password'] = $modx->phpass->HashPassword($pass1);
-	$modx->db->update($f,$tbl_manager_users,"id='{$uid}'");
+    $tbl_manager_users = $modx->getFullTableName('manager_users');
+    $uid = $modx->getLoginUserID();
+    $modx->loadExtension('phpass');
+    $f['password'] = $modx->phpass->HashPassword($pass1);
+    $modx->db->update($f,$tbl_manager_users,"id='{$uid}'");
 
-	// invoke OnManagerChangePassword event
-	$modx->invokeEvent('OnManagerChangePassword', array (
-		'userid' => $uid,
-		'username' => $_SESSION['mgrShortname'],
-		'userpassword' => $pass1
-	));
+    // invoke OnManagerChangePassword event
+    $modx->invokeEvent('OnManagerChangePassword', array (
+        'userid' => $uid,
+        'username' => $_SESSION['mgrShortname'],
+        'userpassword' => $pass1
+    ));
 
 $header="Location: index.php?a=2";
 header($header);

Please login to merge, or discard this patch.

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

@@ -1,8 +1,8 @@  discard block
 block discarded – undo
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('save_password')) {
+if (!$modx->hasPermission('save_password')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -10,11 +10,11 @@  discard block
 block discarded – undo
 $pass1 = $_POST['pass1'];
 $pass2 = $_POST['pass2'];
 
-if($pass1!=$pass2){
+if ($pass1 != $pass2) {
 	$modx->webAlertAndQuit("Passwords don't match!");
 }
 
-if(strlen($pass1)<6){
+if (strlen($pass1) < 6) {
 	$modx->webAlertAndQuit("Password is too short. Please specify a password of at least 6 characters.");
 }
 
@@ -23,14 +23,14 @@  discard block
 block discarded – undo
 	$uid = $modx->getLoginUserID();
 	$modx->loadExtension('phpass');
 	$f['password'] = $modx->phpass->HashPassword($pass1);
-	$modx->db->update($f,$tbl_manager_users,"id='{$uid}'");
+	$modx->db->update($f, $tbl_manager_users, "id='{$uid}'");
 
 	// invoke OnManagerChangePassword event
-	$modx->invokeEvent('OnManagerChangePassword', array (
+	$modx->invokeEvent('OnManagerChangePassword', array(
 		'userid' => $uid,
 		'username' => $_SESSION['mgrShortname'],
 		'userpassword' => $pass1
 	));
 
-$header="Location: index.php?a=2";
+$header = "Location: index.php?a=2";
 header($header);

Please login to merge, or discard this patch.

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

@@ -10,11 +10,11 @@
 block discarded – undo
 $pass1 = $_POST['pass1'];
 $pass2 = $_POST['pass2'];
 
-if($pass1!=$pass2){
+if($pass1!=$pass2) {
 	$modx->webAlertAndQuit("Passwords don't match!");
 }
 
-if(strlen($pass1)<6){
+if(strlen($pass1)<6) {
 	$modx->webAlertAndQuit("Password is too short. Please specify a password of at least 6 characters.");
 }
 

Please login to merge, or discard this patch.

manager/processors/duplicate_template.processor.php 3 patches

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

@@ -3,12 +3,12 @@  discard block
 block discarded – undo
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('new_template')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id'])? intval($_GET['id']) : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // count duplicates
@@ -19,22 +19,22 @@  discard block
 block discarded – undo
 
 // duplicate template
 $newid = $modx->db->insert(
-	array(
-		'templatename'=>'',
-		'description'=>'',
-		'content'=>'',
-		'category'=>'',
-		), $modx->getFullTableName('site_templates'), // Insert into
-	"CONCAT(templatename, ' {$_lang['duplicated_el_suffix']}{$count}') AS templatename, description, content, category", $modx->getFullTableName('site_templates'), "id='{$id}'"); // Copy from
+    array(
+        'templatename'=>'',
+        'description'=>'',
+        'content'=>'',
+        'category'=>'',
+        ), $modx->getFullTableName('site_templates'), // Insert into
+    "CONCAT(templatename, ' {$_lang['duplicated_el_suffix']}{$count}') AS templatename, description, content, category", $modx->getFullTableName('site_templates'), "id='{$id}'"); // Copy from
 
 // duplicate TV values
 $modx->db->insert(
-	array(
-		'tmplvarid'=>'',
-		'templateid'=>'',
-		'rank'=>'',
-		), $modx->getFullTableName('site_tmplvar_templates'), // Insert into
-	"tmplvarid, '{$newid}', rank", $modx->getFullTableName('site_tmplvar_templates'), "templateid='{$id}'"); // Copy from
+    array(
+        'tmplvarid'=>'',
+        'templateid'=>'',
+        'rank'=>'',
+        ), $modx->getFullTableName('site_tmplvar_templates'), // Insert into
+    "tmplvarid, '{$newid}', rank", $modx->getFullTableName('site_tmplvar_templates'), "templateid='{$id}'"); // Copy from
 
 // Set the item name for logger
 $name = $modx->db->getValue($modx->db->select('templatename', $modx->getFullTableName('site_templates'), "id='{$newid}'"));

Please login to merge, or discard this patch.

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

@@ -1,20 +1,20 @@  discard block
 block discarded – undo
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('new_template')) {
+if (!$modx->hasPermission('new_template')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_GET['id'])? intval($_GET['id']) : 0;
-if($id==0) {
+$id = isset($_GET['id']) ? intval($_GET['id']) : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // count duplicates
 $name = $modx->db->getValue($modx->db->select('templatename', $modx->getFullTableName('site_templates'), "id='{$id}'"));
 $count = $modx->db->getRecordCount($modx->db->select('templatename', $modx->getFullTableName('site_templates'), "templatename LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if($count>=1) $count = ' '.($count+1);
+if ($count >= 1) $count = ' '.($count + 1);
 else $count = '';
 
 // duplicate template
@@ -41,5 +41,5 @@  discard block
 block discarded – undo
 $_SESSION['itemname'] = $name;
 
 // finish duplicating - redirect to new template
-$header="Location: index.php?r=2&a=16&id=$newid";
+$header = "Location: index.php?r=2&a=16&id=$newid";
 header($header);

Please login to merge, or discard this patch.

Braces +5 added lines, -2 removed lines patch added patch discarded remove patch

@@ -14,8 +14,11 @@
 block discarded – undo
 // count duplicates
 $name = $modx->db->getValue($modx->db->select('templatename', $modx->getFullTableName('site_templates'), "id='{$id}'"));
 $count = $modx->db->getRecordCount($modx->db->select('templatename', $modx->getFullTableName('site_templates'), "templatename LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if($count>=1) $count = ' '.($count+1);
-else $count = '';
+if($count>=1) {
+    $count = ' '.($count+1);
+} else {
+    $count = '';
+}
 
 // duplicate template
 $newid = $modx->db->insert(

Please login to merge, or discard this patch.

manager/processors/duplicate_module.processor.php 3 patches

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

@@ -3,21 +3,21 @@  discard block
 block discarded – undo
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('new_module')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id'])? intval($_GET['id']) : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // create globally unique identifiers (guid)
 function createGUID(){
-	srand((double)microtime()*1000000);
-	$r = rand() ;
-	$u = uniqid(getmypid() . $r . (double)microtime()*1000000,1);
-	$m = md5 ($u);
-	return $m;
+    srand((double)microtime()*1000000);
+    $r = rand() ;
+    $u = uniqid(getmypid() . $r . (double)microtime()*1000000,1);
+    $m = md5 ($u);
+    return $m;
 }
 
 // count duplicates
@@ -28,40 +28,40 @@  discard block
 block discarded – undo
 
 // duplicate module
 $newid = $modx->db->insert(
-	array(
-		'name'=>'',
-		'description'=>'',
-		'disabled'=>'',
-		'category'=>'',
-		'wrap'=>'',
-		'icon'=>'',
-		'enable_resource'=>'',
-		'resourcefile'=>'',
-		'createdon'=>'',
-		'editedon'=>'',
-		'guid'=>'',
-		'enable_sharedparams'=>'',
-		'properties'=>'',
-		'modulecode'=>'',
-		), $modx->getFullTableName('site_modules'), // Insert into
-	"CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, description, '1' AS disabled, category, wrap, icon, enable_resource, resourcefile, createdon, editedon, '".createGUID()."' AS guid, enable_sharedparams, properties, modulecode", $modx->getFullTableName('site_modules'), "id='{$id}'"); // Copy from
+    array(
+        'name'=>'',
+        'description'=>'',
+        'disabled'=>'',
+        'category'=>'',
+        'wrap'=>'',
+        'icon'=>'',
+        'enable_resource'=>'',
+        'resourcefile'=>'',
+        'createdon'=>'',
+        'editedon'=>'',
+        'guid'=>'',
+        'enable_sharedparams'=>'',
+        'properties'=>'',
+        'modulecode'=>'',
+        ), $modx->getFullTableName('site_modules'), // Insert into
+    "CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, description, '1' AS disabled, category, wrap, icon, enable_resource, resourcefile, createdon, editedon, '".createGUID()."' AS guid, enable_sharedparams, properties, modulecode", $modx->getFullTableName('site_modules'), "id='{$id}'"); // Copy from
 
 // duplicate module dependencies
 $modx->db->insert(
-	array(
-		'module'=>'',
-		'resource'=>'',
-		'type'=>'',
-		), $modx->getFullTableName('site_module_depobj'), // Insert into
-	"'{$newid}', resource, type", $modx->getFullTableName('site_module_depobj'), "module='{$id}'"); // Copy from
+    array(
+        'module'=>'',
+        'resource'=>'',
+        'type'=>'',
+        ), $modx->getFullTableName('site_module_depobj'), // Insert into
+    "'{$newid}', resource, type", $modx->getFullTableName('site_module_depobj'), "module='{$id}'"); // Copy from
 
 // duplicate module user group access
 $modx->db->insert(
-	array(
-		'module'=>'',
-		'usergroup'=>'',
-		), $modx->getFullTableName('site_module_access'), // Insert into
-	"'{$newid}', usergroup", $modx->getFullTableName('site_module_access'), "module='{$id}'"); // Copy from
+    array(
+        'module'=>'',
+        'usergroup'=>'',
+        ), $modx->getFullTableName('site_module_access'), // Insert into
+    "'{$newid}', usergroup", $modx->getFullTableName('site_module_access'), "module='{$id}'"); // Copy from
 
 // Set the item name for logger
 $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_modules'), "id='{$newid}'"));

Please login to merge, or discard this patch.

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

@@ -1,29 +1,29 @@  discard block
 block discarded – undo
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('new_module')) {
+if (!$modx->hasPermission('new_module')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_GET['id'])? intval($_GET['id']) : 0;
-if($id==0) {
+$id = isset($_GET['id']) ? intval($_GET['id']) : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // create globally unique identifiers (guid)
 function createGUID(){
-	srand((double)microtime()*1000000);
-	$r = rand() ;
-	$u = uniqid(getmypid() . $r . (double)microtime()*1000000,1);
-	$m = md5 ($u);
+	srand((double) microtime() * 1000000);
+	$r = rand();
+	$u = uniqid(getmypid().$r.(double) microtime() * 1000000, 1);
+	$m = md5($u);
 	return $m;
 }
 
 // count duplicates
 $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_modules'), "id='{$id}'"));
 $count = $modx->db->getRecordCount($modx->db->select('name', $modx->getFullTableName('site_modules'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if($count>=1) $count = ' '.($count+1);
+if ($count >= 1) $count = ' '.($count + 1);
 else $count = '';
 
 // duplicate module
@@ -68,5 +68,5 @@  discard block
 block discarded – undo
 $_SESSION['itemname'] = $name;
 
 // finish duplicating - redirect to new module
-$header="Location: index.php?r=2&a=108&id=$newid";
+$header = "Location: index.php?r=2&a=108&id=$newid";
 header($header);

Please login to merge, or discard this patch.

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

@@ -12,7 +12,8 @@  discard block
 block discarded – undo
 }
 
 // create globally unique identifiers (guid)
-function createGUID(){
+function createGUID()
+{
 	srand((double)microtime()*1000000);
 	$r = rand() ;
 	$u = uniqid(getmypid() . $r . (double)microtime()*1000000,1);
@@ -23,8 +24,11 @@  discard block
 block discarded – undo
 // count duplicates
 $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_modules'), "id='{$id}'"));
 $count = $modx->db->getRecordCount($modx->db->select('name', $modx->getFullTableName('site_modules'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if($count>=1) $count = ' '.($count+1);
-else $count = '';
+if($count>=1) {
+    $count = ' '.($count+1);
+} else {
+    $count = '';
+}
 
 // duplicate module
 $newid = $modx->db->insert(

Please login to merge, or discard this patch.

manager/processors/empty_table.processor.php 2 patches

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

@@ -3,7 +3,7 @@
 block discarded – undo
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('settings')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $modx->db->truncate($modx->getFullTableName('manager_log'));

Please login to merge, or discard this patch.

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

@@ -1,12 +1,12 @@
 block discarded – undo
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('settings')) {
+if (!$modx->hasPermission('settings')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $modx->db->truncate($modx->getFullTableName('manager_log'));
 
-$header="Location: index.php?a=13";
+$header = "Location: index.php?a=13";
 header($header);

Please login to merge, or discard this patch.

manager/processors/optimize_table.processor.php 2 patches

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

@@ -3,33 +3,33 @@
 block discarded – undo
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!($modx->hasPermission('settings') && ($modx->hasPermission('logs')||$modx->hasPermission('bk_manager')))) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 if (isset($_REQUEST['t'])) {
 
-	if (empty($_REQUEST['t'])) {
-		$modx->webAlertAndQuit($_lang["error_no_optimise_tablename"]);
-	}
+    if (empty($_REQUEST['t'])) {
+        $modx->webAlertAndQuit($_lang["error_no_optimise_tablename"]);
+    }
 
-	// Set the item name for logger
-	$_SESSION['itemname'] = $_REQUEST['t'];
+    // Set the item name for logger
+    $_SESSION['itemname'] = $_REQUEST['t'];
 
-	$modx->db->optimize($_REQUEST['t']);
+    $modx->db->optimize($_REQUEST['t']);
 
 } elseif (isset($_REQUEST['u'])) {
 
-	if (empty($_REQUEST['u'])) {
-		$modx->webAlertAndQuit($_lang["error_no_truncate_tablename"]);
-	}
+    if (empty($_REQUEST['u'])) {
+        $modx->webAlertAndQuit($_lang["error_no_truncate_tablename"]);
+    }
 
-	// Set the item name for logger
-	$_SESSION['itemname'] = $_REQUEST['u'];
+    // Set the item name for logger
+    $_SESSION['itemname'] = $_REQUEST['u'];
 
-	$modx->db->truncate($_REQUEST['u']);
+    $modx->db->truncate($_REQUEST['u']);
 
 } else {
-	$modx->webAlertAndQuit($_lang["error_no_optimise_tablename"]);
+    $modx->webAlertAndQuit($_lang["error_no_optimise_tablename"]);
 }
 
 $mode = intval($_REQUEST['mode']);

Please login to merge, or discard this patch.

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

@@ -1,8 +1,8 @@  discard block
 block discarded – undo
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!($modx->hasPermission('settings') && ($modx->hasPermission('logs')||$modx->hasPermission('bk_manager')))) {
+if (!($modx->hasPermission('settings') && ($modx->hasPermission('logs') || $modx->hasPermission('bk_manager')))) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -33,5 +33,5 @@  discard block
 block discarded – undo
 }
 
 $mode = intval($_REQUEST['mode']);
-$header="Location: index.php?a={$mode}&s=4";
+$header = "Location: index.php?a={$mode}&s=4";
 header($header);

Please login to merge, or discard this patch.

manager/processors/delete_htmlsnippet.processor.php 2 patches

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

@@ -3,12 +3,12 @@  discard block
 block discarded – undo
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('delete_snippet')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id'])? intval($_GET['id']) : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // Set the item name for logger
@@ -17,18 +17,18 @@  discard block
 block discarded – undo
 
 // invoke OnBeforeChunkFormDelete event
 $modx->invokeEvent("OnBeforeChunkFormDelete",
-	array(
-		"id"	=> $id
-	));
+    array(
+        "id"	=> $id
+    ));
 
 // delete the chunk.
 $modx->db->delete($modx->getFullTableName('site_htmlsnippets'), "id='{$id}'");
 
 // invoke OnChunkFormDelete event
 $modx->invokeEvent("OnChunkFormDelete",
-	array(
-		"id"	=> $id
-	));
+    array(
+        "id"	=> $id
+    ));
 
 // empty cache
 $modx->clearCache('full');

Please login to merge, or discard this patch.

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

@@ -1,13 +1,13 @@  discard block
 block discarded – undo
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('delete_snippet')) {
+if (!$modx->hasPermission('delete_snippet')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_GET['id'])? intval($_GET['id']) : 0;
-if($id==0) {
+$id = isset($_GET['id']) ? intval($_GET['id']) : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
@@ -34,5 +34,5 @@  discard block
 block discarded – undo
 $modx->clearCache('full');
 
 // finished emptying cache - redirect
-$header="Location: index.php?a=76&r=2";
+$header = "Location: index.php?a=76&r=2";
 header($header);

Please login to merge, or discard this patch.

manager/processors/delete_tmplvars.processor.php 2 patches

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

@@ -1,26 +1,26 @@  discard block
 block discarded – undo
 <?php
 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('delete_template')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id']) ? intval($_GET['id']) : 0;
 if($id == 0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 $forced = isset($_GET['force']) ? $_GET['force'] : 0;
 
 // check for relations
 if(!$forced) {
-	$drs = $modx->db->select('sc.id, sc.pagetitle,sc.description', $modx->getFullTableName('site_content') . " AS sc
+    $drs = $modx->db->select('sc.id, sc.pagetitle,sc.description', $modx->getFullTableName('site_content') . " AS sc
 			INNER JOIN " . $modx->getFullTableName('site_tmplvar_contentvalues') . " AS stcv ON stcv.contentid=sc.id", "stcv.tmplvarid='{$id}'");
-	$count = $modx->db->getRecordCount($drs);
-	if($count > 0) {
-		include_once "header.inc.php";
-		?>
+    $count = $modx->db->getRecordCount($drs);
+    if($count > 0) {
+        include_once "header.inc.php";
+        ?>
 		<script>
 			var actions = {
 				delete: function() {
@@ -42,17 +42,17 @@  discard block
 block discarded – undo
 				<p><?= $_lang['tmplvar_inuse'] ?></p>
 				<ul>
 					<?php
-					while($row = $modx->db->getRow($drs)) {
-						echo '<li><span style="width: 200px"><a href="index.php?id=' . $row['id'] . '&a=27">' . $row['pagetitle'] . '</a></span>' . ($row['description'] != '' ? ' - ' . $row['description'] : '') . '</li>';
-					}
-					?>
+                    while($row = $modx->db->getRow($drs)) {
+                        echo '<li><span style="width: 200px"><a href="index.php?id=' . $row['id'] . '&a=27">' . $row['pagetitle'] . '</a></span>' . ($row['description'] != '' ? ' - ' . $row['description'] : '') . '</li>';
+                    }
+                    ?>
 				</ul>
 			</div>
 		</div>
 		<?php
-		include_once "footer.inc.php";
-		exit;
-	}
+        include_once "footer.inc.php";
+        exit;
+    }
 }
 
 // Set the item name for logger
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
 
 // invoke OnBeforeTVFormDelete event
 $modx->invokeEvent("OnBeforeTVFormDelete", array(
-	"id" => $id
+    "id" => $id
 ));
 
 // delete variable
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
 
 // invoke OnTVFormDelete event
 $modx->invokeEvent("OnTVFormDelete", array(
-	"id" => $id
+    "id" => $id
 ));
 
 // empty cache

Please login to merge, or discard this patch.

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

@@ -1,24 +1,24 @@  discard block
 block discarded – undo
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('delete_template')) {
+if (!$modx->hasPermission('delete_template')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id']) ? intval($_GET['id']) : 0;
-if($id == 0) {
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 $forced = isset($_GET['force']) ? $_GET['force'] : 0;
 
 // check for relations
-if(!$forced) {
-	$drs = $modx->db->select('sc.id, sc.pagetitle,sc.description', $modx->getFullTableName('site_content') . " AS sc
-			INNER JOIN " . $modx->getFullTableName('site_tmplvar_contentvalues') . " AS stcv ON stcv.contentid=sc.id", "stcv.tmplvarid='{$id}'");
+if (!$forced) {
+	$drs = $modx->db->select('sc.id, sc.pagetitle,sc.description', $modx->getFullTableName('site_content')." AS sc
+			INNER JOIN " . $modx->getFullTableName('site_tmplvar_contentvalues')." AS stcv ON stcv.contentid=sc.id", "stcv.tmplvarid='{$id}'");
 	$count = $modx->db->getRecordCount($drs);
-	if($count > 0) {
+	if ($count > 0) {
 		include_once "header.inc.php";
 		?>
 		<script>
@@ -42,8 +42,8 @@  discard block
 block discarded – undo
 				<p><?= $_lang['tmplvar_inuse'] ?></p>
 				<ul>
 					<?php
-					while($row = $modx->db->getRow($drs)) {
-						echo '<li><span style="width: 200px"><a href="index.php?id=' . $row['id'] . '&a=27">' . $row['pagetitle'] . '</a></span>' . ($row['description'] != '' ? ' - ' . $row['description'] : '') . '</li>';
+					while ($row = $modx->db->getRow($drs)) {
+						echo '<li><span style="width: 200px"><a href="index.php?id='.$row['id'].'&a=27">'.$row['pagetitle'].'</a></span>'.($row['description'] != '' ? ' - '.$row['description'] : '').'</li>';
 					}
 					?>
 				</ul>

Please login to merge, or discard this patch.

		@@ -3,12 +3,12 @@ discard block
		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('save_document')\|\|!$modx->hasPermission('publish_document')) {
6		- $modx->webAlertAndQuit($_lang["error_no_privileges"]);
	6	+ $modx->webAlertAndQuit($_lang["error_no_privileges"]);
7	7	}
8	8
9	9	$id = isset($_REQUEST['id'])? intval($_REQUEST['id']) : 0;
10	10	if($id==0) {
11		- $modx->webAlertAndQuit($_lang["error_no_id"]);
	11	+ $modx->webAlertAndQuit($_lang["error_no_id"]);
12	12	}
13	13
14	14	/**********webber ******/
		@@ -33,20 +33,20 @@ discard block
		block discarded – undo
33	33	$udperms->role = $_SESSION['mgrRole'];
34	34
35	35	if(!$udperms->checkPermissions()) {
36		- $modx->webAlertAndQuit($_lang["access_permission_denied"]);
	36	+ $modx->webAlertAndQuit($_lang["access_permission_denied"]);
37	37	}
38	38
39	39	// update the document
40	40	$modx->db->update(
41		- array(
42		- 'published' => 1,
43		- 'pub_date' => 0,
44		- 'unpub_date' => 0,
45		- 'editedby' => $modx->getLoginUserID(),
46		- 'editedon' => time(),
47		- 'publishedby' => $modx->getLoginUserID(),
48		- 'publishedon' => time(),
49		- ), $modx->getFullTableName('site_content'), "id='{$id}'");
	41	+ array(
	42	+ 'published' => 1,
	43	+ 'pub_date' => 0,
	44	+ 'unpub_date' => 0,
	45	+ 'editedby' => $modx->getLoginUserID(),
	46	+ 'editedon' => time(),
	47	+ 'publishedby' => $modx->getLoginUserID(),
	48	+ 'publishedon' => time(),
	49	+ ), $modx->getFullTableName('site_content'), "id='{$id}'");
50	50
51	51	// invoke OnDocPublished event
52	52	$modx->invokeEvent("OnDocPublished",array("docid"=>$id));

		@@ -1,38 +1,38 @@ discard block
		block discarded – undo
1	1	<?php
2		-if( ! defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
	2	+if (!defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
3	3	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4	4	}
5		-if(!$modx->hasPermission('save_document')\|\|!$modx->hasPermission('publish_document')) {
	5	+if (!$modx->hasPermission('save_document') \|\| !$modx->hasPermission('publish_document')) {
6	6	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
7	7	}
8	8
9		-$id = isset($_REQUEST['id'])? intval($_REQUEST['id']) : 0;
10		-if($id==0) {
	9	+$id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;
	10	+if ($id == 0) {
11	11	$modx->webAlertAndQuit($_lang["error_no_id"]);
12	12	}
13	13
14	14	/**********webber ******/
15		-$content=$modx->db->getRow($modx->db->select('parent, pagetitle', $modx->getFullTableName('site_content'), "id='{$id}'"));
16		-$pid=($content['parent']==0?$id:$content['parent']);
	15	+$content = $modx->db->getRow($modx->db->select('parent, pagetitle', $modx->getFullTableName('site_content'), "id='{$id}'"));
	16	+$pid = ($content['parent'] == 0 ? $id : $content['parent']);
17	17
18	18	/************ webber ***********/
19		-$sd=isset($_REQUEST['dir'])?'&dir='.$_REQUEST['dir']:'&dir=DESC';
20		-$sb=isset($_REQUEST['sort'])?'&sort='.$_REQUEST['sort']:'&sort=createdon';
21		-$pg=isset($_REQUEST['page'])?'&page='.(int)$_REQUEST['page']:'';
22		-$add_path=$sd.$sb.$pg;
	19	+$sd = isset($_REQUEST['dir']) ? '&dir='.$_REQUEST['dir'] : '&dir=DESC';
	20	+$sb = isset($_REQUEST['sort']) ? '&sort='.$_REQUEST['sort'] : '&sort=createdon';
	21	+$pg = isset($_REQUEST['page']) ? '&page='.(int) $_REQUEST['page'] : '';
	22	+$add_path = $sd.$sb.$pg;
23	23
24	24	/***********************************/
25	25
26	26
27	27
28	28	// check permissions on the document
29		-include_once MODX_MANAGER_PATH . "processors/user_documents_permissions.class.php";
	29	+include_once MODX_MANAGER_PATH."processors/user_documents_permissions.class.php";
30	30	$udperms = new udperms();
31	31	$udperms->user = $modx->getLoginUserID();
32	32	$udperms->document = $id;
33	33	$udperms->role = $_SESSION['mgrRole'];
34	34
35		-if(!$udperms->checkPermissions()) {
	35	+if (!$udperms->checkPermissions()) {
36	36	$modx->webAlertAndQuit($_lang["access_permission_denied"]);
37	37	}
38	38
		@@ -49,7 +49,7 @@ discard block
		block discarded – undo
49	49	), $modx->getFullTableName('site_content'), "id='{$id}'");
50	50
51	51	// invoke OnDocPublished event
52		-$modx->invokeEvent("OnDocPublished",array("docid"=>$id));
	52	+$modx->invokeEvent("OnDocPublished", array("docid"=>$id));
53	53
54	54	// Set the item name for logger
55	55	$_SESSION['itemname'] = $content['pagetitle'];
		@@ -57,6 +57,6 @@ discard block
		block discarded – undo
57	57	// empty cache
58	58	$modx->clearCache('full');
59	59
60		-$header="Location: index.php?a=3&id=$pid&r=1".$add_path;
	60	+$header = "Location: index.php?a=3&id=$pid&r=1".$add_path;
61	61
62	62	header($header);

		@@ -3,7 +3,7 @@ discard block
		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_document')) {
6		- $modx->webAlertAndQuit($_lang["error_no_privileges"]);
	6	+ $modx->webAlertAndQuit($_lang["error_no_privileges"]);
7	7	}
8	8
9	9	$rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "deleted=1");
		@@ -11,9 +11,9 @@ discard block
		block discarded – undo
11	11
12	12	// invoke OnBeforeEmptyTrash event
13	13	$modx->invokeEvent("OnBeforeEmptyTrash",
14		- array(
15		- "ids"=>$ids
16		- ));
	14	+ array(
	15	+ "ids"=>$ids
	16	+ ));
17	17
18	18	// remove the document groups link.
19	19	$sql = "DELETE document_groups
		@@ -32,15 +32,15 @@ discard block
		block discarded – undo
32	32	//'undelete' the document.
33	33	$modx->db->delete($modx->getFullTableName('site_content'), "deleted=1");
34	34
35		- // invoke OnEmptyTrash event
36		- $modx->invokeEvent("OnEmptyTrash",
37		- array(
38		- "ids"=>$ids
39		- ));
	35	+ // invoke OnEmptyTrash event
	36	+ $modx->invokeEvent("OnEmptyTrash",
	37	+ array(
	38	+ "ids"=>$ids
	39	+ ));
40	40
41		- // empty cache
42		- $modx->clearCache('full');
	41	+ // empty cache
	42	+ $modx->clearCache('full');
43	43
44		- // finished emptying cache - redirect
45		- $header="Location: index.php?a=2&r=1";
46		- header($header);
	44	+ // finished emptying cache - redirect
	45	+ $header="Location: index.php?a=2&r=1";
	46	+ header($header);

		@@ -1,8 +1,8 @@ discard block
		block discarded – undo
1	1	<?php
2		-if( ! defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
	2	+if (!defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
3	3	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4	4	}
5		-if(!$modx->hasPermission('delete_document')) {
	5	+if (!$modx->hasPermission('delete_document')) {
6	6	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
7	7	}
8	8
		@@ -42,5 +42,5 @@ discard block
		block discarded – undo
42	42	$modx->clearCache('full');
43	43
44	44	// finished emptying cache - redirect
45		- $header="Location: index.php?a=2&r=1";
	45	+ $header = "Location: index.php?a=2&r=1";
46	46	header($header);

		@@ -10,11 +10,11 @@
		block discarded – undo
10	10	$pass1 = $_POST['pass1'];
11	11	$pass2 = $_POST['pass2'];
12	12
13		-if($pass1!=$pass2){
	13	+if($pass1!=$pass2) {
14	14	$modx->webAlertAndQuit("Passwords don't match!");
15	15	}
16	16
17		-if(strlen($pass1)<6){
	17	+if(strlen($pass1)<6) {
18	18	$modx->webAlertAndQuit("Password is too short. Please specify a password of at least 6 characters.");
19	19	}
20	20

		@@ -1,20 +1,20 @@ discard block
		block discarded – undo
1	1	<?php
2		-if( ! defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
	2	+if (!defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
3	3	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4	4	}
5		-if(!$modx->hasPermission('new_template')) {
	5	+if (!$modx->hasPermission('new_template')) {
6	6	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
7	7	}
8	8
9		-$id = isset($_GET['id'])? intval($_GET['id']) : 0;
10		-if($id==0) {
	9	+$id = isset($_GET['id']) ? intval($_GET['id']) : 0;
	10	+if ($id == 0) {
11	11	$modx->webAlertAndQuit($_lang["error_no_id"]);
12	12	}
13	13
14	14	// count duplicates
15	15	$name = $modx->db->getValue($modx->db->select('templatename', $modx->getFullTableName('site_templates'), "id='{$id}'"));
16	16	$count = $modx->db->getRecordCount($modx->db->select('templatename', $modx->getFullTableName('site_templates'), "templatename LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
17		-if($count>=1) $count = ' '.($count+1);
	17	+if ($count >= 1) $count = ' '.($count + 1);
18	18	else $count = '';
19	19
20	20	// duplicate template
		@@ -41,5 +41,5 @@ discard block
		block discarded – undo
41	41	$_SESSION['itemname'] = $name;
42	42
43	43	// finish duplicating - redirect to new template
44		-$header="Location: index.php?r=2&a=16&id=$newid";
	44	+$header = "Location: index.php?r=2&a=16&id=$newid";
45	45	header($header);

		@@ -14,8 +14,11 @@
		block discarded – undo
14	14	// count duplicates
15	15	$name = $modx->db->getValue($modx->db->select('templatename', $modx->getFullTableName('site_templates'), "id='{$id}'"));
16	16	$count = $modx->db->getRecordCount($modx->db->select('templatename', $modx->getFullTableName('site_templates'), "templatename LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
17		-if($count>=1) $count = ' '.($count+1);
18		-else $count = '';
	17	+if($count>=1) {
	18	+ $count = ' '.($count+1);
	19	+} else {
	20	+ $count = '';
	21	+}
19	22
20	23	// duplicate template
21	24	$newid = $modx->db->insert(

		@@ -3,21 +3,21 @@ discard block
		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('new_module')) {
6		- $modx->webAlertAndQuit($_lang["error_no_privileges"]);
	6	+ $modx->webAlertAndQuit($_lang["error_no_privileges"]);
7	7	}
8	8
9	9	$id = isset($_GET['id'])? intval($_GET['id']) : 0;
10	10	if($id==0) {
11		- $modx->webAlertAndQuit($_lang["error_no_id"]);
	11	+ $modx->webAlertAndQuit($_lang["error_no_id"]);
12	12	}
13	13
14	14	// create globally unique identifiers (guid)
15	15	function createGUID(){
16		- srand((double)microtime()*1000000);
17		- $r = rand() ;
18		- $u = uniqid(getmypid() . $r . (double)microtime()*1000000,1);
19		- $m = md5 ($u);
20		- return $m;
	16	+ srand((double)microtime()*1000000);
	17	+ $r = rand() ;
	18	+ $u = uniqid(getmypid() . $r . (double)microtime()*1000000,1);
	19	+ $m = md5 ($u);
	20	+ return $m;
21	21	}
22	22
23	23	// count duplicates
		@@ -28,40 +28,40 @@ discard block
		block discarded – undo
28	28
29	29	// duplicate module
30	30	$newid = $modx->db->insert(
31		- array(
32		- 'name'=>'',
33		- 'description'=>'',
34		- 'disabled'=>'',
35		- 'category'=>'',
36		- 'wrap'=>'',
37		- 'icon'=>'',
38		- 'enable_resource'=>'',
39		- 'resourcefile'=>'',
40		- 'createdon'=>'',
41		- 'editedon'=>'',
42		- 'guid'=>'',
43		- 'enable_sharedparams'=>'',
44		- 'properties'=>'',
45		- 'modulecode'=>'',
46		- ), $modx->getFullTableName('site_modules'), // Insert into
47		- "CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, description, '1' AS disabled, category, wrap, icon, enable_resource, resourcefile, createdon, editedon, '".createGUID()."' AS guid, enable_sharedparams, properties, modulecode", $modx->getFullTableName('site_modules'), "id='{$id}'"); // Copy from
	31	+ array(
	32	+ 'name'=>'',
	33	+ 'description'=>'',
	34	+ 'disabled'=>'',
	35	+ 'category'=>'',
	36	+ 'wrap'=>'',
	37	+ 'icon'=>'',
	38	+ 'enable_resource'=>'',
	39	+ 'resourcefile'=>'',
	40	+ 'createdon'=>'',
	41	+ 'editedon'=>'',
	42	+ 'guid'=>'',
	43	+ 'enable_sharedparams'=>'',
	44	+ 'properties'=>'',
	45	+ 'modulecode'=>'',
	46	+ ), $modx->getFullTableName('site_modules'), // Insert into
	47	+ "CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, description, '1' AS disabled, category, wrap, icon, enable_resource, resourcefile, createdon, editedon, '".createGUID()."' AS guid, enable_sharedparams, properties, modulecode", $modx->getFullTableName('site_modules'), "id='{$id}'"); // Copy from
48	48
49	49	// duplicate module dependencies
50	50	$modx->db->insert(
51		- array(
52		- 'module'=>'',
53		- 'resource'=>'',
54		- 'type'=>'',
55		- ), $modx->getFullTableName('site_module_depobj'), // Insert into
56		- "'{$newid}', resource, type", $modx->getFullTableName('site_module_depobj'), "module='{$id}'"); // Copy from
	51	+ array(
	52	+ 'module'=>'',
	53	+ 'resource'=>'',
	54	+ 'type'=>'',
	55	+ ), $modx->getFullTableName('site_module_depobj'), // Insert into
	56	+ "'{$newid}', resource, type", $modx->getFullTableName('site_module_depobj'), "module='{$id}'"); // Copy from
57	57
58	58	// duplicate module user group access
59	59	$modx->db->insert(
60		- array(
61		- 'module'=>'',
62		- 'usergroup'=>'',
63		- ), $modx->getFullTableName('site_module_access'), // Insert into
64		- "'{$newid}', usergroup", $modx->getFullTableName('site_module_access'), "module='{$id}'"); // Copy from
	60	+ array(
	61	+ 'module'=>'',
	62	+ 'usergroup'=>'',
	63	+ ), $modx->getFullTableName('site_module_access'), // Insert into
	64	+ "'{$newid}', usergroup", $modx->getFullTableName('site_module_access'), "module='{$id}'"); // Copy from
65	65
66	66	// Set the item name for logger
67	67	$name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_modules'), "id='{$newid}'"));

		@@ -1,29 +1,29 @@ discard block
		block discarded – undo
1	1	<?php
2		-if( ! defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
	2	+if (!defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
3	3	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4	4	}
5		-if(!$modx->hasPermission('new_module')) {
	5	+if (!$modx->hasPermission('new_module')) {
6	6	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
7	7	}
8	8
9		-$id = isset($_GET['id'])? intval($_GET['id']) : 0;
10		-if($id==0) {
	9	+$id = isset($_GET['id']) ? intval($_GET['id']) : 0;
	10	+if ($id == 0) {
11	11	$modx->webAlertAndQuit($_lang["error_no_id"]);
12	12	}
13	13
14	14	// create globally unique identifiers (guid)
15	15	function createGUID(){
16		- srand((double)microtime()*1000000);
17		- $r = rand() ;
18		- $u = uniqid(getmypid() . $r . (double)microtime()*1000000,1);
19		- $m = md5 ($u);
	16	+ srand((double) microtime() * 1000000);
	17	+ $r = rand();
	18	+ $u = uniqid(getmypid().$r.(double) microtime() * 1000000, 1);
	19	+ $m = md5($u);
20	20	return $m;
21	21	}
22	22
23	23	// count duplicates
24	24	$name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_modules'), "id='{$id}'"));
25	25	$count = $modx->db->getRecordCount($modx->db->select('name', $modx->getFullTableName('site_modules'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
26		-if($count>=1) $count = ' '.($count+1);
	26	+if ($count >= 1) $count = ' '.($count + 1);
27	27	else $count = '';
28	28
29	29	// duplicate module
		@@ -68,5 +68,5 @@ discard block
		block discarded – undo
68	68	$_SESSION['itemname'] = $name;
69	69
70	70	// finish duplicating - redirect to new module
71		-$header="Location: index.php?r=2&a=108&id=$newid";
	71	+$header = "Location: index.php?r=2&a=108&id=$newid";
72	72	header($header);

		@@ -12,7 +12,8 @@ discard block
		block discarded – undo
12	12	}
13	13
14	14	// create globally unique identifiers (guid)
15		-function createGUID(){
	15	+function createGUID()
	16	+{
16	17	srand((double)microtime()*1000000);
17	18	$r = rand() ;
18	19	$u = uniqid(getmypid() . $r . (double)microtime()*1000000,1);
		@@ -23,8 +24,11 @@ discard block
		block discarded – undo
23	24	// count duplicates
24	25	$name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_modules'), "id='{$id}'"));
25	26	$count = $modx->db->getRecordCount($modx->db->select('name', $modx->getFullTableName('site_modules'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
26		-if($count>=1) $count = ' '.($count+1);
27		-else $count = '';
	27	+if($count>=1) {
	28	+ $count = ' '.($count+1);
	29	+} else {
	30	+ $count = '';
	31	+}
28	32
29	33	// duplicate module
30	34	$newid = $modx->db->insert(

		@@ -3,7 +3,7 @@
		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('settings')) {
6		- $modx->webAlertAndQuit($_lang["error_no_privileges"]);
	6	+ $modx->webAlertAndQuit($_lang["error_no_privileges"]);
7	7	}
8	8
9	9	$modx->db->truncate($modx->getFullTableName('manager_log'));

		@@ -1,12 +1,12 @@
		block discarded – undo
1	1	<?php
2		-if( ! defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
	2	+if (!defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
3	3	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4	4	}
5		-if(!$modx->hasPermission('settings')) {
	5	+if (!$modx->hasPermission('settings')) {
6	6	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
7	7	}
8	8
9	9	$modx->db->truncate($modx->getFullTableName('manager_log'));
10	10
11		-$header="Location: index.php?a=13";
	11	+$header = "Location: index.php?a=13";
12	12	header($header);

		@@ -3,33 +3,33 @@
		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('settings') && ($modx->hasPermission('logs')\|\|$modx->hasPermission('bk_manager')))) {
6		- $modx->webAlertAndQuit($_lang["error_no_privileges"]);
	6	+ $modx->webAlertAndQuit($_lang["error_no_privileges"]);
7	7	}
8	8
9	9	if (isset($_REQUEST['t'])) {
10	10
11		- if (empty($_REQUEST['t'])) {
12		- $modx->webAlertAndQuit($_lang["error_no_optimise_tablename"]);
13		- }
	11	+ if (empty($_REQUEST['t'])) {
	12	+ $modx->webAlertAndQuit($_lang["error_no_optimise_tablename"]);
	13	+ }
14	14
15		- // Set the item name for logger
16		- $_SESSION['itemname'] = $_REQUEST['t'];
	15	+ // Set the item name for logger
	16	+ $_SESSION['itemname'] = $_REQUEST['t'];
17	17
18		- $modx->db->optimize($_REQUEST['t']);
	18	+ $modx->db->optimize($_REQUEST['t']);
19	19
20	20	} elseif (isset($_REQUEST['u'])) {
21	21
22		- if (empty($_REQUEST['u'])) {
23		- $modx->webAlertAndQuit($_lang["error_no_truncate_tablename"]);
24		- }
	22	+ if (empty($_REQUEST['u'])) {
	23	+ $modx->webAlertAndQuit($_lang["error_no_truncate_tablename"]);
	24	+ }
25	25
26		- // Set the item name for logger
27		- $_SESSION['itemname'] = $_REQUEST['u'];
	26	+ // Set the item name for logger
	27	+ $_SESSION['itemname'] = $_REQUEST['u'];
28	28
29		- $modx->db->truncate($_REQUEST['u']);
	29	+ $modx->db->truncate($_REQUEST['u']);
30	30
31	31	} else {
32		- $modx->webAlertAndQuit($_lang["error_no_optimise_tablename"]);
	32	+ $modx->webAlertAndQuit($_lang["error_no_optimise_tablename"]);
33	33	}
34	34
35	35	$mode = intval($_REQUEST['mode']);

		@@ -1,13 +1,13 @@ discard block
		block discarded – undo
1	1	<?php
2		-if( ! defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
	2	+if (!defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
3	3	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4	4	}
5		-if(!$modx->hasPermission('delete_snippet')) {
	5	+if (!$modx->hasPermission('delete_snippet')) {
6	6	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
7	7	}
8	8
9		-$id = isset($_GET['id'])? intval($_GET['id']) : 0;
10		-if($id==0) {
	9	+$id = isset($_GET['id']) ? intval($_GET['id']) : 0;
	10	+if ($id == 0) {
11	11	$modx->webAlertAndQuit($_lang["error_no_id"]);
12	12	}
13	13
		@@ -34,5 +34,5 @@ discard block
		block discarded – undo
34	34	$modx->clearCache('full');
35	35
36	36	// finished emptying cache - redirect
37		-$header="Location: index.php?a=76&r=2";
	37	+$header = "Location: index.php?a=76&r=2";
38	38	header($header);

		@@ -1,26 +1,26 @@ 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('delete_template')) {
6		- $modx->webAlertAndQuit($_lang["error_no_privileges"]);
	6	+ $modx->webAlertAndQuit($_lang["error_no_privileges"]);
7	7	}
8	8
9	9	$id = isset($_GET['id']) ? intval($_GET['id']) : 0;
10	10	if($id == 0) {
11		- $modx->webAlertAndQuit($_lang["error_no_id"]);
	11	+ $modx->webAlertAndQuit($_lang["error_no_id"]);
12	12	}
13	13
14	14	$forced = isset($_GET['force']) ? $_GET['force'] : 0;
15	15
16	16	// check for relations
17	17	if(!$forced) {
18		- $drs = $modx->db->select('sc.id, sc.pagetitle,sc.description', $modx->getFullTableName('site_content') . " AS sc
	18	+ $drs = $modx->db->select('sc.id, sc.pagetitle,sc.description', $modx->getFullTableName('site_content') . " AS sc
19	19	INNER JOIN " . $modx->getFullTableName('site_tmplvar_contentvalues') . " AS stcv ON stcv.contentid=sc.id", "stcv.tmplvarid='{$id}'");
20		- $count = $modx->db->getRecordCount($drs);
21		- if($count > 0) {
22		- include_once "header.inc.php";
23		- ?>
	20	+ $count = $modx->db->getRecordCount($drs);
	21	+ if($count > 0) {
	22	+ include_once "header.inc.php";
	23	+ ?>
24	24	<script>
25	25	var actions = {
26	26	delete: function() {
		@@ -42,17 +42,17 @@ discard block
		block discarded – undo
42	42	<p><?= $_lang['tmplvar_inuse'] ?></p>
43	43	<ul>
44	44	<?php
45		- while($row = $modx->db->getRow($drs)) {
46		- echo '<li><span style="width: 200px"><a href="index.php?id=' . $row['id'] . '&a=27">' . $row['pagetitle'] . '</a></span>' . ($row['description'] != '' ? ' - ' . $row['description'] : '') . '</li>';
47		- }
48		- ?>
	45	+ while($row = $modx->db->getRow($drs)) {
	46	+ echo '<li><span style="width: 200px"><a href="index.php?id=' . $row['id'] . '&a=27">' . $row['pagetitle'] . '</a></span>' . ($row['description'] != '' ? ' - ' . $row['description'] : '') . '</li>';
	47	+ }
	48	+ ?>
49	49	</ul>
50	50	</div>
51	51	</div>
52	52	<?php
53		- include_once "footer.inc.php";
54		- exit;
55		- }
	53	+ include_once "footer.inc.php";
	54	+ exit;
	55	+ }
56	56	}
57	57
58	58	// Set the item name for logger
		@@ -61,7 +61,7 @@ discard block
		block discarded – undo
61	61
62	62	// invoke OnBeforeTVFormDelete event
63	63	$modx->invokeEvent("OnBeforeTVFormDelete", array(
64		- "id" => $id
	64	+ "id" => $id
65	65	));
66	66
67	67	// delete variable
		@@ -78,7 +78,7 @@ discard block
		block discarded – undo
78	78
79	79	// invoke OnTVFormDelete event
80	80	$modx->invokeEvent("OnTVFormDelete", array(
81		- "id" => $id
	81	+ "id" => $id
82	82	));
83	83
84	84	// empty cache

		@@ -1,24 +1,24 @@ discard block
		block discarded – undo
1	1	<?php
2		-if( ! defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
	2	+if (!defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
3	3	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4	4	}
5		-if(!$modx->hasPermission('delete_template')) {
	5	+if (!$modx->hasPermission('delete_template')) {
6	6	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
7	7	}
8	8
9	9	$id = isset($_GET['id']) ? intval($_GET['id']) : 0;
10		-if($id == 0) {
	10	+if ($id == 0) {
11	11	$modx->webAlertAndQuit($_lang["error_no_id"]);
12	12	}
13	13
14	14	$forced = isset($_GET['force']) ? $_GET['force'] : 0;
15	15
16	16	// check for relations
17		-if(!$forced) {
18		- $drs = $modx->db->select('sc.id, sc.pagetitle,sc.description', $modx->getFullTableName('site_content') . " AS sc
19		- INNER JOIN " . $modx->getFullTableName('site_tmplvar_contentvalues') . " AS stcv ON stcv.contentid=sc.id", "stcv.tmplvarid='{$id}'");
	17	+if (!$forced) {
	18	+ $drs = $modx->db->select('sc.id, sc.pagetitle,sc.description', $modx->getFullTableName('site_content')." AS sc
	19	+ INNER JOIN " . $modx->getFullTableName('site_tmplvar_contentvalues')." AS stcv ON stcv.contentid=sc.id", "stcv.tmplvarid='{$id}'");
20	20	$count = $modx->db->getRecordCount($drs);
21		- if($count > 0) {
	21	+ if ($count > 0) {
22	22	include_once "header.inc.php";
23	23	?>
24	24	<script>
		@@ -42,8 +42,8 @@ discard block
		block discarded – undo
42	42	<p><?= $_lang['tmplvar_inuse'] ?></p>
43	43	<ul>
44	44	<?php
45		- while($row = $modx->db->getRow($drs)) {
46		- echo '<li><span style="width: 200px"><a href="index.php?id=' . $row['id'] . '&a=27">' . $row['pagetitle'] . '</a></span>' . ($row['description'] != '' ? ' - ' . $row['description'] : '') . '</li>';
	45	+ while ($row = $modx->db->getRow($drs)) {
	46	+ echo '<li><span style="width: 200px"><a href="index.php?id='.$row['id'].'&a=27">'.$row['pagetitle'].'</a></span>'.($row['description'] != '' ? ' - '.$row['description'] : '').'</li>';
47	47	}
48	48	?>
49	49	</ul>

evolution-cms / evolution

Push — develop ( 663a1f...4a4b5c )

Status

Category

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

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

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

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

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

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

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

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

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

Braces +5 added lines, -2 removed lines patch added patch discarded remove patch

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

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

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

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

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

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

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

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

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

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

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