evolution-cms / evolution

manager/processors/duplicate_content.processor.php

Braces +18 added lines, -10 removed lines

@@ -36,7 +36,8 @@ 
 $header="Location: index.php?r=1&a=3&id=$id";
 header($header);
 
-function duplicateDocument($docid, $parent=null, $_toplevel=0) {
+function duplicateDocument($docid, $parent=null, $_toplevel=0)
+{
 	global $modx, $_lang;
 
 	// invoke OnBeforeDocDuplicate event
@@ -57,8 +58,7 @@ 
 	$content = $modx->db->getRow($rs);
 
 	// Handle incremental ID
-	switch($modx->config['docid_incrmnt_method'])
-	{
+	switch($modx->config['docid_incrmnt_method']) {
 		case '1':
 			$from = "{$tblsc} AS T0 LEFT JOIN {$tblsc} AS T1 ON T0.id + 1 = T1.id";
 			$rs = $modx->db->select('MIN(T0.id)+1', $from, "T1.id IS NULL");
@@ -79,8 +79,11 @@ 
 		$pagetitle = $modx->db->getValue($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "id='{$docid}'"));
 		$pagetitle = $modx->db->escape($pagetitle);
 		$count = $modx->db->getRecordCount($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "pagetitle LIKE '{$pagetitle} Duplicate%'"));
-		if($count>=1) $count = ' '.($count+1);
-		else $count = '';
+		if($count>=1) {
+		    $count = ' '.($count+1);
+		} else {
+		    $count = '';
+		}
 
 		$content['pagetitle'] = $_lang['duplicated_el_suffix'].$count.' '.$content['pagetitle'];
 		$content['alias'] = null;
@@ -89,7 +92,9 @@ 
 	}
 
 	// change the parent accordingly
-	if ($parent !== null) $content['parent'] = $parent;
+	if ($parent !== null) {
+	    $content['parent'] = $parent;
+	}
 
 	// Change the author
 	$content['createdby'] = $userID;
@@ -129,15 +134,17 @@ 
 	// Start duplicating all the child documents that aren't deleted.
 	$_toplevel++;
 	$rs = $modx->db->select('id', $tblsc, "parent='{$docid}' AND deleted=0", 'id ASC');
-		while ($row = $modx->db->getRow($rs))
-			duplicateDocument($row['id'], $newparent, $_toplevel);
+		while ($row = $modx->db->getRow($rs)) {
+					duplicateDocument($row['id'], $newparent, $_toplevel);
+		}
 
 	// return the new doc id
 	return $newparent;
 }
 
 // Duplicate Document TVs
-function duplicateTVs($oldid,$newid){
+function duplicateTVs($oldid,$newid)
+{
 	global $modx;
 
 	$tbltvc = $modx->getFullTableName('site_tmplvar_contentvalues');
@@ -149,7 +156,8 @@ 
 }
 
 // Duplicate Document Access Permissions
-function duplicateAccess($oldid,$newid){
+function duplicateAccess($oldid,$newid)
+{
 	global $modx;
 
 	$tbldg = $modx->getFullTableName('document_groups');

Indentation +96 added lines, -96 removed lines

@@ -3,12 +3,12 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('new_document') || !$modx->hasPermission('save_document')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id'])? (int)$_GET['id'] : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 $children = array();
@@ -22,7 +22,7 @@ 
 $udperms->duplicateDoc = true;
 
 if(!$udperms->checkPermissions()) {
-	$modx->webAlertAndQuit($_lang["access_permission_denied"]);
+    $modx->webAlertAndQuit($_lang["access_permission_denied"]);
 }
 
 // Run the duplicator
@@ -37,125 +37,125 @@ 
 header($header);
 
 function duplicateDocument($docid, $parent=null, $_toplevel=0) {
-	global $modx, $_lang;
-
-	// invoke OnBeforeDocDuplicate event
-	$evtOut = $modx->invokeEvent('OnBeforeDocDuplicate', array(
-		'id' => $docid
-	));
-
-	// if( !in_array( 'false', array_values( $evtOut ) ) ){}
-	// TODO: Determine necessary handling for duplicateDocument "return $newparent" if OnBeforeDocDuplicate were able to conditially control duplication
-	// [DISABLED]: Proceed with duplicateDocument if OnBeforeDocDuplicate did not return false via: $event->output('false');
-
-	$userID = $modx->getLoginUserID();
-
-	$tblsc = $modx->getFullTableName('site_content');
-
-	// Grab the original document
-	$rs = $modx->db->select('*', $tblsc, "id='{$docid}'");
-	$content = $modx->db->getRow($rs);
-
-	// Handle incremental ID
-	switch($modx->config['docid_incrmnt_method'])
-	{
-		case '1':
-			$from = "{$tblsc} AS T0 LEFT JOIN {$tblsc} AS T1 ON T0.id + 1 = T1.id";
-			$rs = $modx->db->select('MIN(T0.id)+1', $from, "T1.id IS NULL");
-			$content['id'] = $modx->db->getValue($rs);
-			break;
-		case '2':
-			$rs = $modx->db->select('MAX(id)+1',$tblsc);
-			$content['id'] = $modx->db->getValue($rs);
-			break;
-
-		default:
-			unset($content['id']); // remove the current id.
-	}
-
-	// Once we've grabbed the document object, start doing some modifications
-	if ($_toplevel == 0) {
-		// count duplicates
-		$pagetitle = $modx->db->getValue($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "id='{$docid}'"));
-		$pagetitle = $modx->db->escape($pagetitle);
-		$count = $modx->db->getRecordCount($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "pagetitle LIKE '{$pagetitle} Duplicate%'"));
-		if($count>=1) $count = ' '.($count+1);
-		else $count = '';
-
-		$content['pagetitle'] = $_lang['duplicated_el_suffix'].$count.' '.$content['pagetitle'];
-		$content['alias'] = null;
-	} elseif($modx->config['friendly_urls'] == 0 || $modx->config['allow_duplicate_alias'] == 0) {
-		$content['alias'] = null;
-	}
-
-	// change the parent accordingly
-	if ($parent !== null) $content['parent'] = $parent;
-
-	// Change the author
-	$content['createdby'] = $userID;
-	$content['createdon'] = time();
-	// Remove other modification times
-	$content['editedby'] = $content['editedon'] = $content['deleted'] = $content['deletedby'] = $content['deletedon'] = 0;
-
-	// [FS#922] Should the published status be honored? - sirlancelot
+    global $modx, $_lang;
+
+    // invoke OnBeforeDocDuplicate event
+    $evtOut = $modx->invokeEvent('OnBeforeDocDuplicate', array(
+        'id' => $docid
+    ));
+
+    // if( !in_array( 'false', array_values( $evtOut ) ) ){}
+    // TODO: Determine necessary handling for duplicateDocument "return $newparent" if OnBeforeDocDuplicate were able to conditially control duplication
+    // [DISABLED]: Proceed with duplicateDocument if OnBeforeDocDuplicate did not return false via: $event->output('false');
+
+    $userID = $modx->getLoginUserID();
+
+    $tblsc = $modx->getFullTableName('site_content');
+
+    // Grab the original document
+    $rs = $modx->db->select('*', $tblsc, "id='{$docid}'");
+    $content = $modx->db->getRow($rs);
+
+    // Handle incremental ID
+    switch($modx->config['docid_incrmnt_method'])
+    {
+        case '1':
+            $from = "{$tblsc} AS T0 LEFT JOIN {$tblsc} AS T1 ON T0.id + 1 = T1.id";
+            $rs = $modx->db->select('MIN(T0.id)+1', $from, "T1.id IS NULL");
+            $content['id'] = $modx->db->getValue($rs);
+            break;
+        case '2':
+            $rs = $modx->db->select('MAX(id)+1',$tblsc);
+            $content['id'] = $modx->db->getValue($rs);
+            break;
+
+        default:
+            unset($content['id']); // remove the current id.
+    }
+
+    // Once we've grabbed the document object, start doing some modifications
+    if ($_toplevel == 0) {
+        // count duplicates
+        $pagetitle = $modx->db->getValue($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "id='{$docid}'"));
+        $pagetitle = $modx->db->escape($pagetitle);
+        $count = $modx->db->getRecordCount($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "pagetitle LIKE '{$pagetitle} Duplicate%'"));
+        if($count>=1) $count = ' '.($count+1);
+        else $count = '';
+
+        $content['pagetitle'] = $_lang['duplicated_el_suffix'].$count.' '.$content['pagetitle'];
+        $content['alias'] = null;
+    } elseif($modx->config['friendly_urls'] == 0 || $modx->config['allow_duplicate_alias'] == 0) {
+        $content['alias'] = null;
+    }
+
+    // change the parent accordingly
+    if ($parent !== null) $content['parent'] = $parent;
+
+    // Change the author
+    $content['createdby'] = $userID;
+    $content['createdon'] = time();
+    // Remove other modification times
+    $content['editedby'] = $content['editedon'] = $content['deleted'] = $content['deletedby'] = $content['deletedon'] = 0;
+
+    // [FS#922] Should the published status be honored? - sirlancelot
 //	if ($modx->hasPermission('publish_document')) {
 //		if ($modx->config['publish_default'])
 //			$content['pub_date'] = $content['pub_date']; // should this be changed to 1?
 //		else	$content['pub_date'] = 0;
 //	} else {
-		// User can't publish documents
+        // User can't publish documents
 //		$content['published'] = $content['pub_date'] = 0;
 //	}
 
     // Set the published status to unpublished by default (see above ... commit #3388)
     $content['published'] = $content['pub_date'] = 0;
 
-	// Escape the proper strings
-	$content = $modx->db->escape($content);
+    // Escape the proper strings
+    $content = $modx->db->escape($content);
 
-	// Duplicate the Document
-	$newparent = $modx->db->insert($content, $tblsc);
+    // Duplicate the Document
+    $newparent = $modx->db->insert($content, $tblsc);
 
-	// duplicate document's TVs
-	duplicateTVs($docid, $newparent);
-	duplicateAccess($docid, $newparent);
+    // duplicate document's TVs
+    duplicateTVs($docid, $newparent);
+    duplicateAccess($docid, $newparent);
 
-	// invoke OnDocDuplicate event
-	$evtOut = $modx->invokeEvent('OnDocDuplicate', array(
-		'id' => $docid,
-		'new_id' => $newparent
-	));
+    // invoke OnDocDuplicate event
+    $evtOut = $modx->invokeEvent('OnDocDuplicate', array(
+        'id' => $docid,
+        'new_id' => $newparent
+    ));
 
-	// Start duplicating all the child documents that aren't deleted.
-	$_toplevel++;
-	$rs = $modx->db->select('id', $tblsc, "parent='{$docid}' AND deleted=0", 'id ASC');
-		while ($row = $modx->db->getRow($rs))
-			duplicateDocument($row['id'], $newparent, $_toplevel);
+    // Start duplicating all the child documents that aren't deleted.
+    $_toplevel++;
+    $rs = $modx->db->select('id', $tblsc, "parent='{$docid}' AND deleted=0", 'id ASC');
+        while ($row = $modx->db->getRow($rs))
+            duplicateDocument($row['id'], $newparent, $_toplevel);
 
-	// return the new doc id
-	return $newparent;
+    // return the new doc id
+    return $newparent;
 }
 
 // Duplicate Document TVs
 function duplicateTVs($oldid,$newid){
-	global $modx;
+    global $modx;
 
-	$tbltvc = $modx->getFullTableName('site_tmplvar_contentvalues');
+    $tbltvc = $modx->getFullTableName('site_tmplvar_contentvalues');
 
-	$modx->db->insert(
-		array('contentid'=>'', 'tmplvarid'=>'', 'value'=>''), $tbltvc, // Insert into
-		"{$newid}, tmplvarid, value", $tbltvc, "contentid='{$oldid}'" // Copy from
-	);
+    $modx->db->insert(
+        array('contentid'=>'', 'tmplvarid'=>'', 'value'=>''), $tbltvc, // Insert into
+        "{$newid}, tmplvarid, value", $tbltvc, "contentid='{$oldid}'" // Copy from
+    );
 }
 
 // Duplicate Document Access Permissions
 function duplicateAccess($oldid,$newid){
-	global $modx;
+    global $modx;
 
-	$tbldg = $modx->getFullTableName('document_groups');
+    $tbldg = $modx->getFullTableName('document_groups');
 
-	$modx->db->insert(
-		array('document'=>'', 'document_group'=>''), $tbldg, // Insert into
-		"{$newid}, document_group", $tbldg, "document='{$oldid}'" // Copy from
-	);
+    $modx->db->insert(
+        array('document'=>'', 'document_group'=>''), $tbldg, // Insert into
+        "{$newid}, document_group", $tbldg, "document='{$oldid}'" // Copy from
+    );
 }

Spacing +14 added lines, -14 removed lines

@@ -1,27 +1,27 @@ 
 <?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_document') || !$modx->hasPermission('save_document')) {
+if (!$modx->hasPermission('new_document') || !$modx->hasPermission('save_document')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_GET['id'])? (int)$_GET['id'] : 0;
-if($id==0) {
+$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 $children = array();
 
 // 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'];
 $udperms->duplicateDoc = true;
 
-if(!$udperms->checkPermissions()) {
+if (!$udperms->checkPermissions()) {
 	$modx->webAlertAndQuit($_lang["access_permission_denied"]);
 }
 
@@ -33,10 +33,10 @@ 
 $_SESSION['itemname'] = $name;
 
 // finish cloning - redirect
-$header="Location: index.php?r=1&a=3&id=$id";
+$header = "Location: index.php?r=1&a=3&id=$id";
 header($header);
 
-function duplicateDocument($docid, $parent=null, $_toplevel=0) {
+function duplicateDocument($docid, $parent = null, $_toplevel = 0){
 	global $modx, $_lang;
 
 	// invoke OnBeforeDocDuplicate event
@@ -57,7 +57,7 @@ 
 	$content = $modx->db->getRow($rs);
 
 	// Handle incremental ID
-	switch($modx->config['docid_incrmnt_method'])
+	switch ($modx->config['docid_incrmnt_method'])
 	{
 		case '1':
 			$from = "{$tblsc} AS T0 LEFT JOIN {$tblsc} AS T1 ON T0.id + 1 = T1.id";
@@ -65,7 +65,7 @@ 
 			$content['id'] = $modx->db->getValue($rs);
 			break;
 		case '2':
-			$rs = $modx->db->select('MAX(id)+1',$tblsc);
+			$rs = $modx->db->select('MAX(id)+1', $tblsc);
 			$content['id'] = $modx->db->getValue($rs);
 			break;
 
@@ -79,12 +79,12 @@ 
 		$pagetitle = $modx->db->getValue($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "id='{$docid}'"));
 		$pagetitle = $modx->db->escape($pagetitle);
 		$count = $modx->db->getRecordCount($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "pagetitle LIKE '{$pagetitle} Duplicate%'"));
-		if($count>=1) $count = ' '.($count+1);
+		if ($count >= 1) $count = ' '.($count + 1);
 		else $count = '';
 
 		$content['pagetitle'] = $_lang['duplicated_el_suffix'].$count.' '.$content['pagetitle'];
 		$content['alias'] = null;
-	} elseif($modx->config['friendly_urls'] == 0 || $modx->config['allow_duplicate_alias'] == 0) {
+	} elseif ($modx->config['friendly_urls'] == 0 || $modx->config['allow_duplicate_alias'] == 0) {
 		$content['alias'] = null;
 	}
 
@@ -137,7 +137,7 @@ 
 }
 
 // Duplicate Document TVs
-function duplicateTVs($oldid,$newid){
+function duplicateTVs($oldid, $newid){
 	global $modx;
 
 	$tbltvc = $modx->getFullTableName('site_tmplvar_contentvalues');
@@ -149,7 +149,7 @@ 
 }
 
 // Duplicate Document Access Permissions
-function duplicateAccess($oldid,$newid){
+function duplicateAccess($oldid, $newid){
 	global $modx;
 
 	$tbldg = $modx->getFullTableName('document_groups');

manager/processors/duplicate_plugin.processor.php

Braces +5 added lines, -2 removed lines

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

Indentation +18 added lines, -18 removed lines

@@ -3,12 +3,12 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('new_plugin')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id'])? (int)$_GET['id'] : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // count duplicates
@@ -19,25 +19,25 @@ 
 
 // duplicate Plugin
 $newid = $modx->db->insert(
-	array(
-		'name'=>'',
-		'description'=>'',
-		'disabled'=>'',
-		'moduleguid'=>'',
-		'plugincode'=>'',
-		'properties'=>'',
-		'category'=>'',
-		), $modx->getFullTableName('site_plugins'), // Insert into
-	"CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, description, '1' AS disabled, moduleguid, plugincode, properties, category", $modx->getFullTableName('site_plugins'), "id='{$id}'"); // Copy from
+    array(
+        'name'=>'',
+        'description'=>'',
+        'disabled'=>'',
+        'moduleguid'=>'',
+        'plugincode'=>'',
+        'properties'=>'',
+        'category'=>'',
+        ), $modx->getFullTableName('site_plugins'), // Insert into
+    "CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, description, '1' AS disabled, moduleguid, plugincode, properties, category", $modx->getFullTableName('site_plugins'), "id='{$id}'"); // Copy from
 
 // duplicate Plugin Event Listeners
 $modx->db->insert(
-	array(
-		'pluginid'=>'',
-		'evtid'=>'',
-		'priority'=>'',
-		), $modx->getFullTableName('site_plugin_events'), // Insert into
-	"'{$newid}', evtid, priority", $modx->getFullTableName('site_plugin_events'), "pluginid='{$id}'"); // Copy from
+    array(
+        'pluginid'=>'',
+        'evtid'=>'',
+        'priority'=>'',
+        ), $modx->getFullTableName('site_plugin_events'), // Insert into
+    "'{$newid}', evtid, priority", $modx->getFullTableName('site_plugin_events'), "pluginid='{$id}'"); // Copy from
 
 // Set the item name for logger
 $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_plugins'), "id='{$newid}'"));

Spacing +6 added lines, -6 removed lines

@@ -1,20 +1,20 @@ 
 <?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_plugin')) {
+if (!$modx->hasPermission('new_plugin')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_GET['id'])? (int)$_GET['id'] : 0;
-if($id==0) {
+$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // count duplicates
 $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_plugins'), "id='{$id}'"));
 $count = $modx->db->getRecordCount($modx->db->select('name', $modx->getFullTableName('site_plugins'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if($count>=1) $count = ' '.($count+1);
+if ($count >= 1) $count = ' '.($count + 1);
 else $count = '';
 
 // duplicate Plugin
@@ -44,5 +44,5 @@ 
 $_SESSION['itemname'] = $name;
 
 // finish duplicating - redirect to new plugin
-$header="Location: index.php?r=2&a=102&id=$newid";
+$header = "Location: index.php?r=2&a=102&id=$newid";
 header($header);

manager/processors/duplicate_tmplvars.processor.php

Braces +5 added lines, -2 removed lines

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

Indentation +26 added lines, -26 removed lines

@@ -3,12 +3,12 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('edit_template')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id'])? (int)$_GET['id'] : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // count duplicates
@@ -19,37 +19,37 @@ 
 
 // duplicate TV
 $newid = $modx->db->insert(
-	array(
-		'type'=>'',
-		'name'=>'',
-		'caption'=>'',
-		'description'=>'',
-		'default_text'=>'',
-		'elements'=>'',
-		'rank'=>'',
-		'display'=>'',
-		'display_params'=>'',
-		'category'=>'',
-		), $modx->getFullTableName('site_tmplvars'), // Insert into
-	"type, CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, CONCAT(caption, ' Duplicate{$count}') AS caption, description, default_text, elements, rank, display, display_params, category", $modx->getFullTableName('site_tmplvars'), "id='{$id}'"); // Copy from
+    array(
+        'type'=>'',
+        'name'=>'',
+        'caption'=>'',
+        'description'=>'',
+        'default_text'=>'',
+        'elements'=>'',
+        'rank'=>'',
+        'display'=>'',
+        'display_params'=>'',
+        'category'=>'',
+        ), $modx->getFullTableName('site_tmplvars'), // Insert into
+    "type, CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, CONCAT(caption, ' Duplicate{$count}') AS caption, description, default_text, elements, rank, display, display_params, category", $modx->getFullTableName('site_tmplvars'), "id='{$id}'"); // Copy from
 
 
 // duplicate TV Template Access Permissions
 $modx->db->insert(
-	array(
-		'tmplvarid'=>'',
-		'templateid'=>'',
-		'rank'=>'',
-		), $modx->getFullTableName('site_tmplvar_templates'), // Insert into
-	"'{$newid}', templateid, rank", $modx->getFullTableName('site_tmplvar_templates'), "tmplvarid='{$id}'"); // Copy from
+    array(
+        'tmplvarid'=>'',
+        'templateid'=>'',
+        'rank'=>'',
+        ), $modx->getFullTableName('site_tmplvar_templates'), // Insert into
+    "'{$newid}', templateid, rank", $modx->getFullTableName('site_tmplvar_templates'), "tmplvarid='{$id}'"); // Copy from
 
 // duplicate TV Access Permissions
 $modx->db->insert(
-	array(
-		'tmplvarid'=>'',
-		'documentgroup'=>'',
-		), $modx->getFullTableName('site_tmplvar_access'), // Insert into
-	"'{$newid}', documentgroup", $modx->getFullTableName('site_tmplvar_access'), "tmplvarid='{$id}'"); // Copy from
+    array(
+        'tmplvarid'=>'',
+        'documentgroup'=>'',
+        ), $modx->getFullTableName('site_tmplvar_access'), // Insert into
+    "'{$newid}', documentgroup", $modx->getFullTableName('site_tmplvar_access'), "tmplvarid='{$id}'"); // Copy from
 
 // Set the item name for logger
 $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_tmplvars'), "id='{$newid}'"));

Spacing +6 added lines, -6 removed lines

@@ -1,20 +1,20 @@ 
 <?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('edit_template')) {
+if (!$modx->hasPermission('edit_template')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_GET['id'])? (int)$_GET['id'] : 0;
-if($id==0) {
+$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // count duplicates
 $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_tmplvars'), "id='{$id}'"));
 $count = $modx->db->getRecordCount($modx->db->select('name', $modx->getFullTableName('site_tmplvars'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if($count>=1) $count = ' '.($count+1);
+if ($count >= 1) $count = ' '.($count + 1);
 else $count = '';
 
 // duplicate TV
@@ -56,5 +56,5 @@ 
 $_SESSION['itemname'] = $name;
 
 // finish duplicating - redirect to new variable
-$header="Location: index.php?r=2&a=301&id=$newid";
+$header = "Location: index.php?r=2&a=301&id=$newid";
 header($header);

manager/processors/remove_locks.processor.php

Braces +3 added lines, -1 removed lines

@@ -4,7 +4,9 @@
 }
 
 if(!isset($_GET['id'])) {
-	if(!$modx->hasPermission('remove_locks')) $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+	if(!$modx->hasPermission('remove_locks')) {
+	    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+	}
 
 	// Remove all locks
 	$modx->db->truncate($modx->getFullTableName('active_user_locks'));

Indentation +16 added lines, -16 removed lines

@@ -4,23 +4,23 @@
 }
 
 if(!isset($_GET['id'])) {
-	if(!$modx->hasPermission('remove_locks')) $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    if(!$modx->hasPermission('remove_locks')) $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 
-	// Remove all locks
-	$modx->db->truncate($modx->getFullTableName('active_user_locks'));
+    // Remove all locks
+    $modx->db->truncate($modx->getFullTableName('active_user_locks'));
 
-	$header = "Location: index.php?a=2";
-	header($header);
+    $header = "Location: index.php?a=2";
+    header($header);
 } else {
-	// Remove single locks via AJAX / window.onbeforeunload
-	$type = (int)$_GET['type'];
-	$id = (int)$_GET['id'];
-	$includeAllUsers = $modx->hasPermission('remove_locks'); // Enables usage of "unlock"-ajax-button
-	if($type && $id) {
-		$modx->unlockElement($type, $id, $includeAllUsers);
-		echo '1';
-		exit;
-	} else {
-		echo 'No type or id sent with request.';
-	}
+    // Remove single locks via AJAX / window.onbeforeunload
+    $type = (int)$_GET['type'];
+    $id = (int)$_GET['id'];
+    $includeAllUsers = $modx->hasPermission('remove_locks'); // Enables usage of "unlock"-ajax-button
+    if($type && $id) {
+        $modx->unlockElement($type, $id, $includeAllUsers);
+        echo '1';
+        exit;
+    } else {
+        echo 'No type or id sent with request.';
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -1,10 +1,10 @@ 
 <?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(!isset($_GET['id'])) {
-	if(!$modx->hasPermission('remove_locks')) $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+if (!isset($_GET['id'])) {
+	if (!$modx->hasPermission('remove_locks')) $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 
 	// Remove all locks
 	$modx->db->truncate($modx->getFullTableName('active_user_locks'));
@@ -13,10 +13,10 @@ 
 	header($header);
 } else {
 	// Remove single locks via AJAX / window.onbeforeunload
-	$type = (int)$_GET['type'];
-	$id = (int)$_GET['id'];
+	$type = (int) $_GET['type'];
+	$id = (int) $_GET['id'];
 	$includeAllUsers = $modx->hasPermission('remove_locks'); // Enables usage of "unlock"-ajax-button
-	if($type && $id) {
+	if ($type && $id) {
 		$modx->unlockElement($type, $id, $includeAllUsers);
 		echo '1';
 		exit;

manager/processors/web_access_groups.processor.php

Braces +1 added lines, -1 removed lines

@@ -117,7 +117,7 @@
 }
 
 // secure web documents - flag as private
-if($updategroupaccess==true){
+if($updategroupaccess==true) {
 	include MODX_MANAGER_PATH."includes/secure_web_documents.inc.php";
 	secureWebDocument();
 

Indentation +95 added lines, -95 removed lines

@@ -3,7 +3,7 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('web_access_permissions')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 // web access group processor.
@@ -20,111 +20,111 @@ 
 $operation = $_REQUEST['operation'];
 
 switch ($operation) {
-	case "add_user_group" :
-		$newgroup = $_REQUEST['newusergroup'];
-		if(empty($newgroup)) {
-			$modx->webAlertAndQuit("No group name specified.");
-		} else {
-			$id = $modx->db->insert(array('name'=>$modx->db->escape($newgroup)), $tbl_webgroup_names);
+    case "add_user_group" :
+        $newgroup = $_REQUEST['newusergroup'];
+        if(empty($newgroup)) {
+            $modx->webAlertAndQuit("No group name specified.");
+        } else {
+            $id = $modx->db->insert(array('name'=>$modx->db->escape($newgroup)), $tbl_webgroup_names);
 
-			// invoke OnWebCreateGroup event
-			$modx->invokeEvent('OnWebCreateGroup', array(
-				'groupid'   => $id,
-				'groupname' => $newgroup,
-			));
-		}
-	break;
-	case "add_document_group" :
-		$newgroup = $_REQUEST['newdocgroup'];
-		if(empty($newgroup)) {
-			$modx->webAlertAndQuit("No group name specified.");
-		} else {
-			$id = $modx->db->insert(array('name'=>$modx->db->escape($newgroup)), $tbl_documentgroup_names);
+            // invoke OnWebCreateGroup event
+            $modx->invokeEvent('OnWebCreateGroup', array(
+                'groupid'   => $id,
+                'groupname' => $newgroup,
+            ));
+        }
+    break;
+    case "add_document_group" :
+        $newgroup = $_REQUEST['newdocgroup'];
+        if(empty($newgroup)) {
+            $modx->webAlertAndQuit("No group name specified.");
+        } else {
+            $id = $modx->db->insert(array('name'=>$modx->db->escape($newgroup)), $tbl_documentgroup_names);
 
-			// invoke OnCreateDocGroup event
-			$modx->invokeEvent('OnCreateDocGroup', array(
-				'groupid'   => $id,
-				'groupname' => $newgroup,
-			));
-		}
-	break;
-	case "delete_user_group" :
-		$updategroupaccess = true;
-		$usergroup = (int)$_REQUEST['usergroup'];
-		if(empty($usergroup)) {
-			$modx->webAlertAndQuit("No user group id specified for deletion.");
-		} else {
-			$modx->db->delete($tbl_webgroup_names, "id='{$usergroup}'");
+            // invoke OnCreateDocGroup event
+            $modx->invokeEvent('OnCreateDocGroup', array(
+                'groupid'   => $id,
+                'groupname' => $newgroup,
+            ));
+        }
+    break;
+    case "delete_user_group" :
+        $updategroupaccess = true;
+        $usergroup = (int)$_REQUEST['usergroup'];
+        if(empty($usergroup)) {
+            $modx->webAlertAndQuit("No user group id specified for deletion.");
+        } else {
+            $modx->db->delete($tbl_webgroup_names, "id='{$usergroup}'");
 
-			$modx->db->delete($tbl_webgroup_access, "webgroup='{$usergroup}'");
+            $modx->db->delete($tbl_webgroup_access, "webgroup='{$usergroup}'");
 
-			$modx->db->delete($tbl_web_groups, "webuser='{$usergroup}'");
-		}
-	break;
-	case "delete_document_group" :
-		$group = (int)$_REQUEST['documentgroup'];
-		if(empty($group)) {
-			$modx->webAlertAndQuit("No document group id specified for deletion.");
-		} else {
-			$modx->db->delete($tbl_documentgroup_names, "id='{$group}'");
+            $modx->db->delete($tbl_web_groups, "webuser='{$usergroup}'");
+        }
+    break;
+    case "delete_document_group" :
+        $group = (int)$_REQUEST['documentgroup'];
+        if(empty($group)) {
+            $modx->webAlertAndQuit("No document group id specified for deletion.");
+        } else {
+            $modx->db->delete($tbl_documentgroup_names, "id='{$group}'");
 
-			$modx->db->delete($tbl_webgroup_access, "documentgroup='{$group}'");
+            $modx->db->delete($tbl_webgroup_access, "documentgroup='{$group}'");
 
-			$modx->db->delete($tbl_document_groups, "document_group='{$group}'");
-		}
-	break;
-	case "rename_user_group" :
-		$newgroupname = $_REQUEST['newgroupname'];
-		if(empty($newgroupname)) {
-			$modx->webAlertAndQuit("No group name specified.");
-		}
-		$groupid = (int)$_REQUEST['groupid'];
-		if(empty($groupid)) {
-			$modx->webAlertAndQuit("No user group id specified for rename.");
-		}
-		$modx->db->update(array('name' => $modx->db->escape($newgroupname)), $tbl_webgroup_names, "id='{$groupid}'");
-	break;
-	case "rename_document_group" :
-		$newgroupname = $_REQUEST['newgroupname'];
-		if(empty($newgroupname)) {
-			$modx->webAlertAndQuit("No group name specified.");
-		}
-		$groupid = (int)$_REQUEST['groupid'];
-		if(empty($groupid)) {
-			$modx->webAlertAndQuit("No document group id specified for rename.");
-		}
-		$modx->db->update(array('name' => $modx->db->escape($newgroupname)), $tbl_documentgroup_names, "id='{$groupid}'");
-	break;
-	case "add_document_group_to_user_group" :
-		$updategroupaccess = true;
-		$usergroup = (int)$_REQUEST['usergroup'];
-		$docgroup = (int)$_REQUEST['docgroup'];
-		$rs = $modx->db->select('COUNT(*)', $tbl_webgroup_access, "webgroup='{$usergroup}' AND documentgroup='{$docgroup}'");
-		$limit = $modx->db->getValue($rs);
-		if($limit<=0) {
-			$modx->db->insert(array('webgroup'=>$usergroup, 'documentgroup'=>$docgroup), $tbl_webgroup_access);
-		} else {
-			//alert user that coupling already exists?
-		}
-	break;
-	case "remove_document_group_from_user_group" :
-		$updategroupaccess = true;
-		$coupling = (int)$_REQUEST['coupling'];
-		$modx->db->delete($tbl_webgroup_access, "id='{$coupling}'");
-	break;
-	default :
-		$modx->webAlertAndQuit("No operation set in request.");
+            $modx->db->delete($tbl_document_groups, "document_group='{$group}'");
+        }
+    break;
+    case "rename_user_group" :
+        $newgroupname = $_REQUEST['newgroupname'];
+        if(empty($newgroupname)) {
+            $modx->webAlertAndQuit("No group name specified.");
+        }
+        $groupid = (int)$_REQUEST['groupid'];
+        if(empty($groupid)) {
+            $modx->webAlertAndQuit("No user group id specified for rename.");
+        }
+        $modx->db->update(array('name' => $modx->db->escape($newgroupname)), $tbl_webgroup_names, "id='{$groupid}'");
+    break;
+    case "rename_document_group" :
+        $newgroupname = $_REQUEST['newgroupname'];
+        if(empty($newgroupname)) {
+            $modx->webAlertAndQuit("No group name specified.");
+        }
+        $groupid = (int)$_REQUEST['groupid'];
+        if(empty($groupid)) {
+            $modx->webAlertAndQuit("No document group id specified for rename.");
+        }
+        $modx->db->update(array('name' => $modx->db->escape($newgroupname)), $tbl_documentgroup_names, "id='{$groupid}'");
+    break;
+    case "add_document_group_to_user_group" :
+        $updategroupaccess = true;
+        $usergroup = (int)$_REQUEST['usergroup'];
+        $docgroup = (int)$_REQUEST['docgroup'];
+        $rs = $modx->db->select('COUNT(*)', $tbl_webgroup_access, "webgroup='{$usergroup}' AND documentgroup='{$docgroup}'");
+        $limit = $modx->db->getValue($rs);
+        if($limit<=0) {
+            $modx->db->insert(array('webgroup'=>$usergroup, 'documentgroup'=>$docgroup), $tbl_webgroup_access);
+        } else {
+            //alert user that coupling already exists?
+        }
+    break;
+    case "remove_document_group_from_user_group" :
+        $updategroupaccess = true;
+        $coupling = (int)$_REQUEST['coupling'];
+        $modx->db->delete($tbl_webgroup_access, "id='{$coupling}'");
+    break;
+    default :
+        $modx->webAlertAndQuit("No operation set in request.");
 }
 
 // secure web documents - flag as private
 if($updategroupaccess==true){
-	include MODX_MANAGER_PATH."includes/secure_web_documents.inc.php";
-	secureWebDocument();
+    include MODX_MANAGER_PATH."includes/secure_web_documents.inc.php";
+    secureWebDocument();
 
-	// Update the private group column
-	$modx->db->update(
-		'dgn.private_webgroup = (wga.webgroup IS NOT NULL)',
-		"{$tbl_documentgroup_names} AS dgn LEFT JOIN {$tbl_webgroup_access} AS wga ON wga.documentgroup = dgn.id");
+    // Update the private group column
+    $modx->db->update(
+        'dgn.private_webgroup = (wga.webgroup IS NOT NULL)',
+        "{$tbl_documentgroup_names} AS dgn LEFT JOIN {$tbl_webgroup_access} AS wga ON wga.documentgroup = dgn.id");
 }
 
 $header = "Location: index.php?a=91";

Spacing +19 added lines, -19 removed lines

@@ -1,8 +1,8 @@ 
 <?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('web_access_permissions')) {
+if (!$modx->hasPermission('web_access_permissions')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -22,7 +22,7 @@ 
 switch ($operation) {
 	case "add_user_group" :
 		$newgroup = $_REQUEST['newusergroup'];
-		if(empty($newgroup)) {
+		if (empty($newgroup)) {
 			$modx->webAlertAndQuit("No group name specified.");
 		} else {
 			$id = $modx->db->insert(array('name'=>$modx->db->escape($newgroup)), $tbl_webgroup_names);
@@ -36,7 +36,7 @@ 
 	break;
 	case "add_document_group" :
 		$newgroup = $_REQUEST['newdocgroup'];
-		if(empty($newgroup)) {
+		if (empty($newgroup)) {
 			$modx->webAlertAndQuit("No group name specified.");
 		} else {
 			$id = $modx->db->insert(array('name'=>$modx->db->escape($newgroup)), $tbl_documentgroup_names);
@@ -50,8 +50,8 @@ 
 	break;
 	case "delete_user_group" :
 		$updategroupaccess = true;
-		$usergroup = (int)$_REQUEST['usergroup'];
-		if(empty($usergroup)) {
+		$usergroup = (int) $_REQUEST['usergroup'];
+		if (empty($usergroup)) {
 			$modx->webAlertAndQuit("No user group id specified for deletion.");
 		} else {
 			$modx->db->delete($tbl_webgroup_names, "id='{$usergroup}'");
@@ -62,8 +62,8 @@ 
 		}
 	break;
 	case "delete_document_group" :
-		$group = (int)$_REQUEST['documentgroup'];
-		if(empty($group)) {
+		$group = (int) $_REQUEST['documentgroup'];
+		if (empty($group)) {
 			$modx->webAlertAndQuit("No document group id specified for deletion.");
 		} else {
 			$modx->db->delete($tbl_documentgroup_names, "id='{$group}'");
@@ -75,33 +75,33 @@ 
 	break;
 	case "rename_user_group" :
 		$newgroupname = $_REQUEST['newgroupname'];
-		if(empty($newgroupname)) {
+		if (empty($newgroupname)) {
 			$modx->webAlertAndQuit("No group name specified.");
 		}
-		$groupid = (int)$_REQUEST['groupid'];
-		if(empty($groupid)) {
+		$groupid = (int) $_REQUEST['groupid'];
+		if (empty($groupid)) {
 			$modx->webAlertAndQuit("No user group id specified for rename.");
 		}
 		$modx->db->update(array('name' => $modx->db->escape($newgroupname)), $tbl_webgroup_names, "id='{$groupid}'");
 	break;
 	case "rename_document_group" :
 		$newgroupname = $_REQUEST['newgroupname'];
-		if(empty($newgroupname)) {
+		if (empty($newgroupname)) {
 			$modx->webAlertAndQuit("No group name specified.");
 		}
-		$groupid = (int)$_REQUEST['groupid'];
-		if(empty($groupid)) {
+		$groupid = (int) $_REQUEST['groupid'];
+		if (empty($groupid)) {
 			$modx->webAlertAndQuit("No document group id specified for rename.");
 		}
 		$modx->db->update(array('name' => $modx->db->escape($newgroupname)), $tbl_documentgroup_names, "id='{$groupid}'");
 	break;
 	case "add_document_group_to_user_group" :
 		$updategroupaccess = true;
-		$usergroup = (int)$_REQUEST['usergroup'];
-		$docgroup = (int)$_REQUEST['docgroup'];
+		$usergroup = (int) $_REQUEST['usergroup'];
+		$docgroup = (int) $_REQUEST['docgroup'];
 		$rs = $modx->db->select('COUNT(*)', $tbl_webgroup_access, "webgroup='{$usergroup}' AND documentgroup='{$docgroup}'");
 		$limit = $modx->db->getValue($rs);
-		if($limit<=0) {
+		if ($limit <= 0) {
 			$modx->db->insert(array('webgroup'=>$usergroup, 'documentgroup'=>$docgroup), $tbl_webgroup_access);
 		} else {
 			//alert user that coupling already exists?
@@ -109,7 +109,7 @@ 
 	break;
 	case "remove_document_group_from_user_group" :
 		$updategroupaccess = true;
-		$coupling = (int)$_REQUEST['coupling'];
+		$coupling = (int) $_REQUEST['coupling'];
 		$modx->db->delete($tbl_webgroup_access, "id='{$coupling}'");
 	break;
 	default :
@@ -117,7 +117,7 @@ 
 }
 
 // secure web documents - flag as private
-if($updategroupaccess==true){
+if ($updategroupaccess == true) {
 	include MODX_MANAGER_PATH."includes/secure_web_documents.inc.php";
 	secureWebDocument();
 

manager/processors/move_document.processor.php

Indentation +66 added lines, -66 removed lines

@@ -3,7 +3,7 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('edit_document')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $newParentID = isset($_REQUEST['new_parent']) ? (int)$_REQUEST['new_parent'] : 0;
@@ -25,82 +25,82 @@ 
 // check user has permission to move document to chosen location
 
 if ($use_udperms == 1) {
-	if ($oldparent != $newParentID) {
-		include_once MODX_MANAGER_PATH . "processors/user_documents_permissions.class.php";
-		$udperms = new udperms();
-		$udperms->user = $modx->getLoginUserID();
-		$udperms->document = $newParentID;
-		$udperms->role = $_SESSION['mgrRole'];
-
-		 if (!$udperms->checkPermissions()) {
-			$modx->webAlertAndQuit($_lang["access_permission_parent_denied"]);
-		 }
-	}
+    if ($oldparent != $newParentID) {
+        include_once MODX_MANAGER_PATH . "processors/user_documents_permissions.class.php";
+        $udperms = new udperms();
+        $udperms->user = $modx->getLoginUserID();
+        $udperms->document = $newParentID;
+        $udperms->role = $_SESSION['mgrRole'];
+
+            if (!$udperms->checkPermissions()) {
+            $modx->webAlertAndQuit($_lang["access_permission_parent_denied"]);
+            }
+    }
 }
 
 function allChildren($currDocID) {
-	global $modx;
-	$children= array();
-	$rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent = '{$currDocID}'");
-	while ($child= $modx->db->getRow($rs)) {
-		$children[]= $child['id'];
-		$nextgen= array();
-		$nextgen= allChildren($child['id']);
-		$children= array_merge($children, $nextgen);
-	}
-	return $children;
+    global $modx;
+    $children= array();
+    $rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent = '{$currDocID}'");
+    while ($child= $modx->db->getRow($rs)) {
+        $children[]= $child['id'];
+        $nextgen= array();
+        $nextgen= allChildren($child['id']);
+        $children= array_merge($children, $nextgen);
+    }
+    return $children;
 }
 
 $evtOut = $modx->invokeEvent("onBeforeMoveDocument", array (
-	"id_document" => $documentID,
-	"old_parent" => $oldparent,
-	"new_parent" => $newParentID
+    "id_document" => $documentID,
+    "old_parent" => $oldparent,
+    "new_parent" => $newParentID
 ));
 if (is_array($evtOut) && count($evtOut) > 0){
-	$newParent = array_pop($evtOut);
-	if($newParent == $oldparent) {
-		$modx->webAlertAndQuit($_lang["error_movedocument2"]);
-	}else{
-		$newParentID = $newParent;
-	}
+    $newParent = array_pop($evtOut);
+    if($newParent == $oldparent) {
+        $modx->webAlertAndQuit($_lang["error_movedocument2"]);
+    }else{
+        $newParentID = $newParent;
+    }
 }
 
 $children = allChildren($documentID);
 if (!array_search($newParentID, $children)) {
-	$modx->db->update(array(
-		'isfolder' => 1,
-	), $modx->getFullTableName('site_content'), "id='{$newParentID}'");
-
-	$modx->db->update(array(
-		'parent'   => $newParentID,
-		'editedby' => $modx->getLoginUserID(),
-		'editedon' => time(),
-	), $modx->getFullTableName('site_content'), "id='{$documentID}'");
-
-	// finished moving the document, now check to see if the old_parent should no longer be a folder.
-	$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('site_content'), "parent='{$oldparent}'");
-	$limit = $modx->db->getValue($rs);
-
-	if(!$limit>0) {
-		$modx->db->update(array(
-			'isfolder' => 0,
-		), $modx->getFullTableName('site_content'), "id='{$oldparent}'");
-	}
-	// Set the item name for logger
-	$pagetitle = $modx->db->getValue($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "id='{$documentID}'"));
-	$_SESSION['itemname'] = $pagetitle;
-
-	$modx->invokeEvent("onAfterMoveDocument", array (
-		"id_document" => $documentID,
-		"old_parent" => $oldparent,
-		"new_parent" => $newParentID
-	));
-
-	// empty cache & sync site
-	$modx->clearCache('full');
-
-	$header="Location: index.php?a=3&id={$documentID}&r=9";
-	header($header);
+    $modx->db->update(array(
+        'isfolder' => 1,
+    ), $modx->getFullTableName('site_content'), "id='{$newParentID}'");
+
+    $modx->db->update(array(
+        'parent'   => $newParentID,
+        'editedby' => $modx->getLoginUserID(),
+        'editedon' => time(),
+    ), $modx->getFullTableName('site_content'), "id='{$documentID}'");
+
+    // finished moving the document, now check to see if the old_parent should no longer be a folder.
+    $rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('site_content'), "parent='{$oldparent}'");
+    $limit = $modx->db->getValue($rs);
+
+    if(!$limit>0) {
+        $modx->db->update(array(
+            'isfolder' => 0,
+        ), $modx->getFullTableName('site_content'), "id='{$oldparent}'");
+    }
+    // Set the item name for logger
+    $pagetitle = $modx->db->getValue($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "id='{$documentID}'"));
+    $_SESSION['itemname'] = $pagetitle;
+
+    $modx->invokeEvent("onAfterMoveDocument", array (
+        "id_document" => $documentID,
+        "old_parent" => $oldparent,
+        "new_parent" => $newParentID
+    ));
+
+    // empty cache & sync site
+    $modx->clearCache('full');
+
+    $header="Location: index.php?a=3&id={$documentID}&r=9";
+    header($header);
 } else {
-	$modx->webAlertAndQuit("You cannot move a document to a child document!");
+    $modx->webAlertAndQuit("You cannot move a document to a child document!");
 }

Spacing +22 added lines, -22 removed lines

@@ -1,20 +1,20 @@ 
 <?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('edit_document')) {
+if (!$modx->hasPermission('edit_document')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$newParentID = isset($_REQUEST['new_parent']) ? (int)$_REQUEST['new_parent'] : 0;
-$documentID = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
+$newParentID = isset($_REQUEST['new_parent']) ? (int) $_REQUEST['new_parent'] : 0;
+$documentID = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
 
 // ok, two things to check.
 // first, document cannot be moved to itself
 // second, new parent must be a folder. If not, set it to folder.
-if($documentID==$newParentID) $modx->webAlertAndQuit($_lang["error_movedocument1"]);
-if($documentID <= 0) $modx->webAlertAndQuit($_lang["error_movedocument2"]);
-if($newParentID < 0) $modx->webAlertAndQuit($_lang["error_movedocument2"]);
+if ($documentID == $newParentID) $modx->webAlertAndQuit($_lang["error_movedocument1"]);
+if ($documentID <= 0) $modx->webAlertAndQuit($_lang["error_movedocument2"]);
+if ($newParentID < 0) $modx->webAlertAndQuit($_lang["error_movedocument2"]);
 
 $parents = $modx->getParentIds($newParentID);
 if (in_array($documentID, $parents))  $modx->webAlertAndQuit($_lang["error_movedocument2"]);
@@ -26,7 +26,7 @@ 
 
 if ($use_udperms == 1) {
 	if ($oldparent != $newParentID) {
-		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 = $newParentID;
@@ -38,29 +38,29 @@ 
 	}
 }
 
-function allChildren($currDocID) {
+function allChildren($currDocID){
 	global $modx;
-	$children= array();
+	$children = array();
 	$rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent = '{$currDocID}'");
-	while ($child= $modx->db->getRow($rs)) {
-		$children[]= $child['id'];
-		$nextgen= array();
-		$nextgen= allChildren($child['id']);
-		$children= array_merge($children, $nextgen);
+	while ($child = $modx->db->getRow($rs)) {
+		$children[] = $child['id'];
+		$nextgen = array();
+		$nextgen = allChildren($child['id']);
+		$children = array_merge($children, $nextgen);
 	}
 	return $children;
 }
 
-$evtOut = $modx->invokeEvent("onBeforeMoveDocument", array (
+$evtOut = $modx->invokeEvent("onBeforeMoveDocument", array(
 	"id_document" => $documentID,
 	"old_parent" => $oldparent,
 	"new_parent" => $newParentID
 ));
-if (is_array($evtOut) && count($evtOut) > 0){
+if (is_array($evtOut) && count($evtOut) > 0) {
 	$newParent = array_pop($evtOut);
-	if($newParent == $oldparent) {
+	if ($newParent == $oldparent) {
 		$modx->webAlertAndQuit($_lang["error_movedocument2"]);
-	}else{
+	} else {
 		$newParentID = $newParent;
 	}
 }
@@ -81,7 +81,7 @@ 
 	$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('site_content'), "parent='{$oldparent}'");
 	$limit = $modx->db->getValue($rs);
 
-	if(!$limit>0) {
+	if (!$limit > 0) {
 		$modx->db->update(array(
 			'isfolder' => 0,
 		), $modx->getFullTableName('site_content'), "id='{$oldparent}'");
@@ -90,7 +90,7 @@ 
 	$pagetitle = $modx->db->getValue($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "id='{$documentID}'"));
 	$_SESSION['itemname'] = $pagetitle;
 
-	$modx->invokeEvent("onAfterMoveDocument", array (
+	$modx->invokeEvent("onAfterMoveDocument", array(
 		"id_document" => $documentID,
 		"old_parent" => $oldparent,
 		"new_parent" => $newParentID
@@ -99,7 +99,7 @@ 
 	// empty cache & sync site
 	$modx->clearCache('full');
 
-	$header="Location: index.php?a=3&id={$documentID}&r=9";
+	$header = "Location: index.php?a=3&id={$documentID}&r=9";
 	header($header);
 } else {
 	$modx->webAlertAndQuit("You cannot move a document to a child document!");

Braces +16 added lines, -7 removed lines

@@ -12,12 +12,20 @@ 
 // ok, two things to check.
 // first, document cannot be moved to itself
 // second, new parent must be a folder. If not, set it to folder.
-if($documentID==$newParentID) $modx->webAlertAndQuit($_lang["error_movedocument1"]);
-if($documentID <= 0) $modx->webAlertAndQuit($_lang["error_movedocument2"]);
-if($newParentID < 0) $modx->webAlertAndQuit($_lang["error_movedocument2"]);
+if($documentID==$newParentID) {
+    $modx->webAlertAndQuit($_lang["error_movedocument1"]);
+}
+if($documentID <= 0) {
+    $modx->webAlertAndQuit($_lang["error_movedocument2"]);
+}
+if($newParentID < 0) {
+    $modx->webAlertAndQuit($_lang["error_movedocument2"]);
+}
 
 $parents = $modx->getParentIds($newParentID);
-if (in_array($documentID, $parents))  $modx->webAlertAndQuit($_lang["error_movedocument2"]);
+if (in_array($documentID, $parents)) {
+    $modx->webAlertAndQuit($_lang["error_movedocument2"]);
+}
 
 $rs = $modx->db->select('parent', $modx->getFullTableName('site_content'), "id='{$documentID}'");
 $oldparent = $modx->db->getValue($rs);
@@ -38,7 +46,8 @@ 
 	}
 }
 
-function allChildren($currDocID) {
+function allChildren($currDocID)
+{
 	global $modx;
 	$children= array();
 	$rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent = '{$currDocID}'");
@@ -56,11 +65,11 @@ 
 	"old_parent" => $oldparent,
 	"new_parent" => $newParentID
 ));
-if (is_array($evtOut) && count($evtOut) > 0){
+if (is_array($evtOut) && count($evtOut) > 0) {
 	$newParent = array_pop($evtOut);
 	if($newParent == $oldparent) {
 		$modx->webAlertAndQuit($_lang["error_movedocument2"]);
-	}else{
+	} else {
 		$newParentID = $newParent;
 	}
 }

manager/processors/save_role.processor.php

Indentation +106 added lines, -106 removed lines

@@ -1,135 +1,135 @@
 <?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('save_role')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 extract($_POST);
 
 if($name == '' || !isset ($name)) {
-	$modx->webAlertAndQuit("Please enter a name for this role!", "index.php?a={$mode}" . ($mode = 35 ? "&id={$id}" : ""));
+    $modx->webAlertAndQuit("Please enter a name for this role!", "index.php?a={$mode}" . ($mode = 35 ? "&id={$id}" : ""));
 }
 
 // setup fields
 $fields = array(
-	'name' => $name,
-	'description' => $description,
-	'frames' => $frames,
-	'home' => $home,
-	'view_document' => $view_document,
-	'new_document' => $new_document,
-	'save_document' => $save_document,
-	'publish_document' => $publish_document,
-	'delete_document' => $delete_document,
-	'empty_trash' => $empty_trash,
-	'action_ok' => $action_ok,
-	'logout' => $logout,
-	'help' => $help,
-	'messages' => $messages,
-	'new_user' => $new_user,
-	'edit_user' => $edit_user,
-	'logs' => $logs,
-	'edit_parser' => (isset ($edit_parser)) ? $edit_parser : '0',
-	'save_parser' => (isset ($save_parser)) ? $save_parser : '0',
-	'edit_template' => $edit_template,
-	'settings' => $settings,
-	'credits' => $credits,
-	'new_template' => $new_template,
-	'save_template' => $save_template,
-	'delete_template' => $delete_template,
-	'edit_snippet' => $edit_snippet,
-	'new_snippet' => $new_snippet,
-	'save_snippet' => $save_snippet,
-	'delete_snippet' => $delete_snippet,
-	'edit_chunk' => $edit_chunk,
-	'new_chunk' => $new_chunk,
-	'save_chunk' => $save_chunk,
-	'delete_chunk' => $delete_chunk,
-	'empty_cache' => $empty_cache,
-	'edit_document' => $edit_document,
-	'change_password' => $change_password,
-	'error_dialog' => $error_dialog,
-	'about' => $about,
-	'file_manager' => $file_manager,
-	'assets_files' => $assets_files,
-	'assets_images' => $assets_images,
-	'save_user' => $save_user,
-	'delete_user' => $delete_user,
-	'save_password' => $save_password,
-	'edit_role' => $edit_role,
-	'save_role' => $save_role,
-	'delete_role' => $delete_role,
-	'new_role' => $new_role,
-	'access_permissions' => $access_permissions,
-	'bk_manager' => $bk_manager,
-	'new_plugin' => $new_plugin,
-	'edit_plugin' => $edit_plugin,
-	'save_plugin' => $save_plugin,
-	'delete_plugin' => $delete_plugin,
-	'new_module' => $new_module,
-	'edit_module' => $edit_module,
-	'save_module' => $save_module,
-	'delete_module' => $delete_module,
-	'exec_module' => $exec_module,
-	'view_eventlog' => $view_eventlog,
-	'delete_eventlog' => $delete_eventlog,
-	'new_web_user' => $new_web_user,
-	'edit_web_user' => $edit_web_user,
-	'save_web_user' => $save_web_user,
-	'delete_web_user' => $delete_web_user,
-	'web_access_permissions' => $web_access_permissions,
-	'view_unpublished' => $view_unpublished,
-	'import_static' => $import_static,
-	'export_static' => $export_static,
-	'remove_locks' => $remove_locks,
-	'display_locks' => $display_locks,
-	'change_resourcetype' => $change_resourcetype,
-	'category_manager' => $category_manager
+    'name' => $name,
+    'description' => $description,
+    'frames' => $frames,
+    'home' => $home,
+    'view_document' => $view_document,
+    'new_document' => $new_document,
+    'save_document' => $save_document,
+    'publish_document' => $publish_document,
+    'delete_document' => $delete_document,
+    'empty_trash' => $empty_trash,
+    'action_ok' => $action_ok,
+    'logout' => $logout,
+    'help' => $help,
+    'messages' => $messages,
+    'new_user' => $new_user,
+    'edit_user' => $edit_user,
+    'logs' => $logs,
+    'edit_parser' => (isset ($edit_parser)) ? $edit_parser : '0',
+    'save_parser' => (isset ($save_parser)) ? $save_parser : '0',
+    'edit_template' => $edit_template,
+    'settings' => $settings,
+    'credits' => $credits,
+    'new_template' => $new_template,
+    'save_template' => $save_template,
+    'delete_template' => $delete_template,
+    'edit_snippet' => $edit_snippet,
+    'new_snippet' => $new_snippet,
+    'save_snippet' => $save_snippet,
+    'delete_snippet' => $delete_snippet,
+    'edit_chunk' => $edit_chunk,
+    'new_chunk' => $new_chunk,
+    'save_chunk' => $save_chunk,
+    'delete_chunk' => $delete_chunk,
+    'empty_cache' => $empty_cache,
+    'edit_document' => $edit_document,
+    'change_password' => $change_password,
+    'error_dialog' => $error_dialog,
+    'about' => $about,
+    'file_manager' => $file_manager,
+    'assets_files' => $assets_files,
+    'assets_images' => $assets_images,
+    'save_user' => $save_user,
+    'delete_user' => $delete_user,
+    'save_password' => $save_password,
+    'edit_role' => $edit_role,
+    'save_role' => $save_role,
+    'delete_role' => $delete_role,
+    'new_role' => $new_role,
+    'access_permissions' => $access_permissions,
+    'bk_manager' => $bk_manager,
+    'new_plugin' => $new_plugin,
+    'edit_plugin' => $edit_plugin,
+    'save_plugin' => $save_plugin,
+    'delete_plugin' => $delete_plugin,
+    'new_module' => $new_module,
+    'edit_module' => $edit_module,
+    'save_module' => $save_module,
+    'delete_module' => $delete_module,
+    'exec_module' => $exec_module,
+    'view_eventlog' => $view_eventlog,
+    'delete_eventlog' => $delete_eventlog,
+    'new_web_user' => $new_web_user,
+    'edit_web_user' => $edit_web_user,
+    'save_web_user' => $save_web_user,
+    'delete_web_user' => $delete_web_user,
+    'web_access_permissions' => $web_access_permissions,
+    'view_unpublished' => $view_unpublished,
+    'import_static' => $import_static,
+    'export_static' => $export_static,
+    'remove_locks' => $remove_locks,
+    'display_locks' => $display_locks,
+    'change_resourcetype' => $change_resourcetype,
+    'category_manager' => $category_manager
 );
 
 $fields = $modx->db->escape($fields);
 
 switch($_POST['mode']) {
-	case '38' :
-		$tbl = $modx->getFullTableName("user_roles");
+    case '38' :
+        $tbl = $modx->getFullTableName("user_roles");
 
-		// disallow duplicate names for role
-		$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_roles'), "name='{$fields['name']}'");
-		if($modx->db->getValue($rs) > 0) {
-			$modx->manager->saveFormValues(38);
-			$modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['role'], $name), "index.php?a=38");
-		}
+        // disallow duplicate names for role
+        $rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_roles'), "name='{$fields['name']}'");
+        if($modx->db->getValue($rs) > 0) {
+            $modx->manager->saveFormValues(38);
+            $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['role'], $name), "index.php?a=38");
+        }
 
-		$modx->db->insert($fields, $tbl);
+        $modx->db->insert($fields, $tbl);
 
-		// Set the item name for logger
-		$_SESSION['itemname'] = $_POST['name'];
+        // Set the item name for logger
+        $_SESSION['itemname'] = $_POST['name'];
 
-		$header = "Location: index.php?a=86&r=2";
-		header($header);
-		break;
-	case '35' :
-		$tbl = $modx->getFullTableName("user_roles");
+        $header = "Location: index.php?a=86&r=2";
+        header($header);
+        break;
+    case '35' :
+        $tbl = $modx->getFullTableName("user_roles");
 
-		// disallow duplicate names for role
-		$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_roles'), "name='{$fields['name']}' AND id!='{$id}'");
-		if($modx->db->getValue($rs) > 0) {
-			$modx->manager->saveFormValues(35);
-			$modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['role'], $name), "index.php?a=35&id={$id}");
-		}
+        // disallow duplicate names for role
+        $rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_roles'), "name='{$fields['name']}' AND id!='{$id}'");
+        if($modx->db->getValue($rs) > 0) {
+            $modx->manager->saveFormValues(35);
+            $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['role'], $name), "index.php?a=35&id={$id}");
+        }
 
-		$modx->db->update($fields, $tbl, "id='{$id}'");
+        $modx->db->update($fields, $tbl, "id='{$id}'");
 
-		// Set the item name for logger
-		$_SESSION['itemname'] = $_POST['name'];
+        // Set the item name for logger
+        $_SESSION['itemname'] = $_POST['name'];
 
-		$header = "Location: index.php?a=86&r=2";
-		header($header);
-		break;
-	default :
-		$modx->webAlertAndQuit("No operation set in request.");
+        $header = "Location: index.php?a=86&r=2";
+        header($header);
+        break;
+    default :
+        $modx->webAlertAndQuit("No operation set in request.");
 }
 
 $modx->unlockElement(8, $id);

Spacing +7 added lines, -7 removed lines

@@ -1,15 +1,15 @@ 
 <?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_role')) {
+if (!$modx->hasPermission('save_role')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 extract($_POST);
 
-if($name == '' || !isset ($name)) {
-	$modx->webAlertAndQuit("Please enter a name for this role!", "index.php?a={$mode}" . ($mode = 35 ? "&id={$id}" : ""));
+if ($name == '' || !isset ($name)) {
+	$modx->webAlertAndQuit("Please enter a name for this role!", "index.php?a={$mode}".($mode = 35 ? "&id={$id}" : ""));
 }
 
 // setup fields
@@ -91,13 +91,13 @@ 
 
 $fields = $modx->db->escape($fields);
 
-switch($_POST['mode']) {
+switch ($_POST['mode']) {
 	case '38' :
 		$tbl = $modx->getFullTableName("user_roles");
 
 		// disallow duplicate names for role
 		$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_roles'), "name='{$fields['name']}'");
-		if($modx->db->getValue($rs) > 0) {
+		if ($modx->db->getValue($rs) > 0) {
 			$modx->manager->saveFormValues(38);
 			$modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['role'], $name), "index.php?a=38");
 		}
@@ -115,7 +115,7 @@ 
 
 		// disallow duplicate names for role
 		$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_roles'), "name='{$fields['name']}' AND id!='{$id}'");
-		if($modx->db->getValue($rs) > 0) {
+		if ($modx->db->getValue($rs) > 0) {
 			$modx->manager->saveFormValues(35);
 			$modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['role'], $name), "index.php?a=35&id={$id}");
 		}

manager/processors/duplicate_snippet.processor.php

Braces +5 added lines, -2 removed lines

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

Indentation +10 added lines, -10 removed lines

@@ -3,12 +3,12 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('new_snippet')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id'])? (int)$_GET['id'] : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // count duplicates
@@ -19,14 +19,14 @@ 
 
 // duplicate Snippet
 $newid = $modx->db->insert(
-	array(
-		'name'=>'',
-		'description'=>'',
-		'snippet'=>'',
-		'properties'=>'',
-		'category'=>'',
-		), $modx->getFullTableName('site_snippets'), // Insert into
-	"CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, description, snippet, properties, category", $modx->getFullTableName('site_snippets'), "id='{$id}'"); // Copy from
+    array(
+        'name'=>'',
+        'description'=>'',
+        'snippet'=>'',
+        'properties'=>'',
+        'category'=>'',
+        ), $modx->getFullTableName('site_snippets'), // Insert into
+    "CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, description, snippet, properties, category", $modx->getFullTableName('site_snippets'), "id='{$id}'"); // Copy from
 
 // Set the item name for logger
 $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_snippets'), "id='{$newid}'"));

Spacing +6 added lines, -6 removed lines

@@ -1,20 +1,20 @@ 
 <?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_snippet')) {
+if (!$modx->hasPermission('new_snippet')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_GET['id'])? (int)$_GET['id'] : 0;
-if($id==0) {
+$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // count duplicates
 $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_snippets'), "id='{$id}'"));
 $count = $modx->db->getRecordCount($modx->db->select('name', $modx->getFullTableName('site_snippets'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if($count>=1) $count = ' '.($count+1);
+if ($count >= 1) $count = ' '.($count + 1);
 else $count = '';
 
 // duplicate Snippet
@@ -33,5 +33,5 @@ 
 $_SESSION['itemname'] = $name;
 
 // finish duplicating - redirect to new snippet
-$header="Location: index.php?r=2&a=22&id=$newid";
+$header = "Location: index.php?r=2&a=22&id=$newid";
 header($header);

manager/processors/purge_plugin.processor.php

Indentation +2 added lines, -2 removed lines

@@ -4,8 +4,8 @@
 }
 
 if(!$modx->hasPermission('delete_plugin')) {
-	$e->setError(3);
-	$e->dumpError();
+    $e->setError(3);
+    $e->dumpError();
 }
 
 $tbl_site_plugins = $modx->getFullTablename('site_plugins');

Spacing +5 added lines, -5 removed lines

@@ -1,9 +1,9 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     exit();
 }
 
-if(!$modx->hasPermission('delete_plugin')) {
+if (!$modx->hasPermission('delete_plugin')) {
 	$e->setError(3);
 	$e->dumpError();
 }
@@ -14,18 +14,18 @@ 
 // Get unique list of latest added plugins by highest sql-id
 $rs = $modx->db->query("SELECT t1.id FROM {$tbl_site_plugins} t1 LEFT JOIN {$tbl_site_plugins} t2 ON (t1.name = t2.name AND t1.id < t2.id) WHERE t2.id IS NULL;");
 $latestIds = array();
-while($row = $modx->db->getRow($rs)) {
+while ($row = $modx->db->getRow($rs)) {
     $latestIds[] = $row['id'];
 }
 
 // Get list of plugins with disabled and enabled versions
 $rs = $modx->db->query("SELECT id FROM {$tbl_site_plugins} t1 WHERE disabled = 1 AND name IN (SELECT name FROM {$tbl_site_plugins} t2 WHERE t1.name = t2.name AND t1.id != t2.id)");
 
-while($row = $modx->db->getRow($rs)) {
+while ($row = $modx->db->getRow($rs)) {
 
     $id = $row['id'];
 
-    if(in_array($id,$latestIds)) continue;	// Keep latest version of disabled plugins
+    if (in_array($id, $latestIds)) continue; // Keep latest version of disabled plugins
 
     // invoke OnBeforePluginFormDelete event
     $modx->invokeEvent('OnBeforePluginFormDelete', array('id'=> $id));

Braces +4 added lines, -1 removed lines

@@ -25,7 +25,10 @@
 
     $id = $row['id'];
 
-    if(in_array($id,$latestIds)) continue;	// Keep latest version of disabled plugins
+    if(in_array($id,$latestIds)) {
+        continue;
+    }
+    // Keep latest version of disabled plugins
 
     // invoke OnBeforePluginFormDelete event
     $modx->invokeEvent('OnBeforePluginFormDelete', array('id'=> $id));