evolution-cms / evolution

manager/processors/duplicate_content.processor.php

Braces +18 added lines, -10 removed lines

@@ -42,7 +42,8 @@ 
  * @param int $_toplevel
  * @return int
  */
-function duplicateDocument($docid, $parent=null, $_toplevel=0) {
+function duplicateDocument($docid, $parent=null, $_toplevel=0)
+{
 	$modx = evolutionCMS(); global $_lang;
 
 	// invoke OnBeforeDocDuplicate event
@@ -63,8 +64,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");
@@ -85,8 +85,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;
@@ -95,7 +98,9 @@ 
 	}
 
 	// change the parent accordingly
-	if ($parent !== null) $content['parent'] = $parent;
+	if ($parent !== null) {
+	    $content['parent'] = $parent;
+	}
 
 	// Change the author
 	$content['createdby'] = $userID;
@@ -135,8 +140,9 @@ 
 	// 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;
@@ -148,7 +154,8 @@ 
  * @param int $oldid
  * @param int $newid
  */
-function duplicateTVs($oldid, $newid){
+function duplicateTVs($oldid, $newid)
+{
 	$modx = evolutionCMS();
 
 	$tbltvc = $modx->getFullTableName('site_tmplvar_contentvalues');
@@ -168,7 +175,8 @@ 
  * @param int $oldid
  * @param int $newid
  */
-function duplicateAccess($oldid, $newid){
+function duplicateAccess($oldid, $newid)
+{
 	$modx = evolutionCMS();
 
 	$tbldg = $modx->getFullTableName('document_groups');

manager/processors/execute_module.processor.php

Braces +6 added lines, -8 removed lines

@@ -12,7 +12,7 @@ 
 }
 
 // check if user has access permission, except admins
-if($_SESSION['mgrRole']!=1){
+if($_SESSION['mgrRole']!=1) {
 	$rs = $modx->db->select(
 		'sma.usergroup,mg.member',
 		$modx->getFullTableName("site_module_access")." sma
@@ -70,7 +70,8 @@ 
  * @param array $params
  * @return string
  */
-function evalModule($moduleCode,$params){
+function evalModule($moduleCode,$params)
+{
 	$modx = evolutionCMS();
 	$modx->event->params = &$params; // store params inside event object
 	if(is_array($params)) {
@@ -80,11 +81,9 @@ 
 	$mod = eval($moduleCode);
 	$msg = ob_get_contents();
 	ob_end_clean();
-	if (isset($php_errormsg))
-	{
+	if (isset($php_errormsg)) {
 		$error_info = error_get_last();
-        switch($error_info['type'])
-        {
+        switch($error_info['type']) {
         	case E_NOTICE :
         		$error_level = 1;
         	case E_USER_NOTICE :
@@ -97,8 +96,7 @@ 
         	default:
         		$error_level = 99;
         }
-		if($modx->config['error_reporting']==='99' || 2<$error_level)
-		{
+		if($modx->config['error_reporting']==='99' || 2<$error_level) {
 			$modx->messageQuit('PHP Parse Error', '', true, $error_info['type'], $error_info['file'], $_SESSION['itemname'] . ' - Module', $error_info['message'], $error_info['line'], $msg);
 			$modx->event->alert("An error occurred while loading. Please see the event log for more information<p>{$msg}</p>");
 		}

manager/includes/preload.functions.inc.php

Braces +23 added lines, -19 removed lines

@@ -4,14 +4,14 @@ 
 $site_sessionname = genEvoSessionName(); // For legacy extras not using startCMSSession

 

 

-if( ! function_exists('evolutionCMS')) {

+if( ! function_exists('evolutionCMS')) {
     /**

      * @return DocumentParser

      */

-    function evolutionCMS()

-    {

-        if( ! defined('MODX_CLASS')) {

-            if( ! class_exists('DocumentParser')) {

+    function evolutionCMS()
+    {
+        if( ! defined('MODX_CLASS')) {
+            if( ! class_exists('DocumentParser')) {
                 throw new RuntimeException('MODX_CLASS not defined and DocumentParser class not exists');

             }

             define('MODX_CLASS', 'DocumentParser');

@@ -24,8 +24,8 @@ 
 /**

  * @return string

  */

-function genEvoSessionName()

-{

+function genEvoSessionName()
+{
     $_ = crc32(__FILE__);

     $_ = sprintf('%u', $_);

 

@@ -35,10 +35,12 @@ 
 /**

  * @return void

  */

-function startCMSSession()

-{

+function startCMSSession()
+{
     global $site_sessionname, $https_port, $session_cookie_path, $session_cookie_domain;

-    if(MODX_CLI) return;

+    if(MODX_CLI) {
+        return;
+    }
 

     session_name($site_sessionname);

     removeInvalidCmsSessionIds($site_sessionname);

@@ -49,14 +51,14 @@ 
     session_set_cookie_params($cookieExpiration, $cookiePath, $cookieDomain, $secure, true);

     session_start();

     $key = "modx.mgr.session.cookie.lifetime";

-    if (isset($_SESSION[$key]) && is_numeric($_SESSION[$key])) {

+    if (isset($_SESSION[$key]) && is_numeric($_SESSION[$key])) {
         $cookieLifetime = (int)$_SESSION[$key];

-        if ($cookieLifetime) {

+        if ($cookieLifetime) {
             $cookieExpiration = $_SERVER['REQUEST_TIME'] + $cookieLifetime;

         }

         setcookie(session_name(), session_id(), $cookieExpiration, $cookiePath, $cookieDomain, $secure, true);

     }

-    if (!isset($_SESSION['modx.session.created.time'])) {

+    if (!isset($_SESSION['modx.session.created.time'])) {
         $_SESSION['modx.session.created.time'] = $_SERVER['REQUEST_TIME'];

     }

 }

@@ -66,9 +68,9 @@ 
  * @param $session_name

  * @return void

  */

-function removeInvalidCmsSessionFromStorage(&$storage, $session_name)

-{

-    if (isset($storage[$session_name]) && ($storage[$session_name] === '' || $storage[$session_name] === 'deleted')) {

+function removeInvalidCmsSessionFromStorage(&$storage, $session_name)
+{
+    if (isset($storage[$session_name]) && ($storage[$session_name] === '' || $storage[$session_name] === 'deleted')) {
         unset($storage[$session_name]);

     }

 }

@@ -77,9 +79,11 @@ 
  * @param $session_name

  * @return void

  */

-function removeInvalidCmsSessionIds($session_name)

-{

-    if(MODX_CLI) return;

+function removeInvalidCmsSessionIds($session_name)
+{
+    if(MODX_CLI) {
+        return;
+    }
     // session ids is invalid iff it is empty string

     // storage priorioty can see in PHP source ext/session/session.c

     removeInvalidCmsSessionFromStorage($_COOKIE, $session_name);