evolution-cms / evolution

manager/actions/resources/functions.inc.php

Indentation +165 added lines, -165 removed lines

@@ -1,14 +1,14 @@ 
 <?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.");

 }

 

 $tpl = array(

-	'viewForm' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_viewForm.tpl'),

-	'panelGroup' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelGroup.tpl'),

-	'panelHeading' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelHeading.tpl'),

-	'panelCollapse' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelCollapse.tpl'),

-	'elementsRow' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_elementsRow.tpl')

+    'viewForm' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_viewForm.tpl'),

+    'panelGroup' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelGroup.tpl'),

+    'panelHeading' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelHeading.tpl'),

+    'panelCollapse' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelCollapse.tpl'),

+    'elementsRow' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_elementsRow.tpl')

 );

 

 /**

@@ -17,9 +17,9 @@ 
  * @return string

  */

 function parsePh($tpl, $ph) {

-	$modx = evolutionCMS(); global $_lang;

-	$tpl = $modx->parseText($tpl, $_lang, '[%', '%]');

-	return $modx->parseText($tpl, $ph);

+    $modx = evolutionCMS(); global $_lang;

+    $tpl = $modx->parseText($tpl, $_lang, '[%', '%]');

+    return $modx->parseText($tpl, $ph);

 }

 

 /**

@@ -27,11 +27,11 @@ 
  * @return string

  */

 function renderViewSwitchButtons($cssId) {

-	$modx = evolutionCMS(); global $_lang, $tpl;

+    $modx = evolutionCMS(); global $_lang, $tpl;

 

-	return parsePh($tpl['viewForm'], array(

-		'cssId' => $cssId

-	));

+    return parsePh($tpl['viewForm'], array(

+        'cssId' => $cssId

+    ));

 }

 

 /**

@@ -40,52 +40,52 @@ 
  * @return string

  */

 function createResourceList($resourceTable, $resources) {

-	$modx = evolutionCMS(); global $_lang, $_style, $modx_textdir, $tpl;

+    $modx = evolutionCMS(); global $_lang, $_style, $modx_textdir, $tpl;

 

-	$items = isset($resources->items[$resourceTable]) ? $resources->items[$resourceTable] : false;

+    $items = isset($resources->items[$resourceTable]) ? $resources->items[$resourceTable] : false;

 

-	if( ! is_array($items) || empty($items)) {

-		return $_lang['no_results'];

-	}

+    if( ! is_array($items) || empty($items)) {

+        return $_lang['no_results'];

+    }

 

-	// Prepare elements- and categories-list

-	$elements = array();

-	$categories = array();

-	foreach($items as $row) {

-		$catid = $row['catid'] ? $row['catid'] : 0;

-		$categories[$catid] = array('name' => stripslashes($row['category']));

-		$elements[$catid][] = prepareElementRowPh($row, $resourceTable, $resources);

-	}

+    // Prepare elements- and categories-list

+    $elements = array();

+    $categories = array();

+    foreach($items as $row) {

+        $catid = $row['catid'] ? $row['catid'] : 0;

+        $categories[$catid] = array('name' => stripslashes($row['category']));

+        $elements[$catid][] = prepareElementRowPh($row, $resourceTable, $resources);

+    }

 

-	// Now render categories / panel-collapse

-	$panelGroup = '';

-	foreach($elements as $catid => $elList) {

-		// Add panel-heading / category-collapse to output

-		$panelGroup .= parsePh($tpl['panelHeading'], array(

-			'tab' => $resourceTable,

-			'category' => $categories[$catid]['name'],

-			'categoryid' => $catid != '' ? ' <small>(' . $catid . ')</small>' : '',

-			'catid' => $catid,

-		));

+    // Now render categories / panel-collapse

+    $panelGroup = '';

+    foreach($elements as $catid => $elList) {

+        // Add panel-heading / category-collapse to output

+        $panelGroup .= parsePh($tpl['panelHeading'], array(

+            'tab' => $resourceTable,

+            'category' => $categories[$catid]['name'],

+            'categoryid' => $catid != '' ? ' <small>(' . $catid . ')</small>' : '',

+            'catid' => $catid,

+        ));

 

-		// Prepare content for panel-collapse

-		$panelCollapse = '';

-		foreach($elList as $el) {

-			$panelCollapse .= parsePh($tpl['elementsRow'], $el);

-		}

+        // Prepare content for panel-collapse

+        $panelCollapse = '';

+        foreach($elList as $el) {

+            $panelCollapse .= parsePh($tpl['elementsRow'], $el);

+        }

 

-		// Add panel-collapse with elements to output

-		$panelGroup .= parsePh($tpl['panelCollapse'], array(

-			'tab' => $resourceTable,

-			'catid' => $catid,

-			'wrapper' => $panelCollapse,

-		));

-	}

+        // Add panel-collapse with elements to output

+        $panelGroup .= parsePh($tpl['panelCollapse'], array(

+            'tab' => $resourceTable,

+            'catid' => $catid,

+            'wrapper' => $panelCollapse,

+        ));

+    }

 

-	return parsePh($tpl['panelGroup'], array(

-		'resourceTable' => $resourceTable,

-		'wrapper' => $panelGroup

-	));

+    return parsePh($tpl['panelGroup'], array(

+        'resourceTable' => $resourceTable,

+        'wrapper' => $panelGroup

+    ));

 }

 

 /**

@@ -93,54 +93,54 @@ 
  * @return string

  */

 function createCombinedView($resources) {

-	$modx = evolutionCMS(); global $_lang, $_style, $modx_textdir;

+    $modx = evolutionCMS(); global $_lang, $_style, $modx_textdir;

 

-	$itemsPerCategory = isset($resources->itemsPerCategory) ? $resources->itemsPerCategory : false;

-	$types = isset($resources->types) ? $resources->types : false;

-	$categories = isset($resources->categories) ? $resources->categories : false;

+    $itemsPerCategory = isset($resources->itemsPerCategory) ? $resources->itemsPerCategory : false;

+    $types = isset($resources->types) ? $resources->types : false;

+    $categories = isset($resources->categories) ? $resources->categories : false;

 

-	if(!$itemsPerCategory) {

-		return $_lang['no_results'];

-	}

+    if(!$itemsPerCategory) {

+        return $_lang['no_results'];

+    }

 

-	$tpl = array(

-		'panelGroup' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelGroup.tpl'),

-		'panelHeading' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelHeading.tpl'),

-		'panelCollapse' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelCollapse.tpl'),

-		'elementsRow' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_elementsRow.tpl'),

-	);

+    $tpl = array(

+        'panelGroup' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelGroup.tpl'),

+        'panelHeading' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelHeading.tpl'),

+        'panelCollapse' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelCollapse.tpl'),

+        'elementsRow' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_elementsRow.tpl'),

+    );

 

-	// Easily loop through $itemsPerCategory-Array

-	$panelGroup = '';

-	foreach($categories as $catid => $category) {

-		// Prepare collapse content / elements-list

-		$panelCollapse = '';

-		foreach($itemsPerCategory[$catid] as $el) {

-			$resourceTable = $el['type'];

-			$ph = prepareElementRowPh($el, $resourceTable, $resources);

-			$panelCollapse .= parsePh($tpl['elementsRow'], $ph);

-		}

+    // Easily loop through $itemsPerCategory-Array

+    $panelGroup = '';

+    foreach($categories as $catid => $category) {

+        // Prepare collapse content / elements-list

+        $panelCollapse = '';

+        foreach($itemsPerCategory[$catid] as $el) {

+            $resourceTable = $el['type'];

+            $ph = prepareElementRowPh($el, $resourceTable, $resources);

+            $panelCollapse .= parsePh($tpl['elementsRow'], $ph);

+        }

 

-		// Add panel-heading / button

-		$panelGroup .= parsePh($tpl['panelHeading'], array(

-			'tab' => 'categories_list',

-			'category' => $categories[$catid],

-			'categoryid' => $catid != '' ? ' <small>(' . $catid . ')</small>' : '',

-			'catid' => $catid,

-		));

+        // Add panel-heading / button

+        $panelGroup .= parsePh($tpl['panelHeading'], array(

+            'tab' => 'categories_list',

+            'category' => $categories[$catid],

+            'categoryid' => $catid != '' ? ' <small>(' . $catid . ')</small>' : '',

+            'catid' => $catid,

+        ));

 

-		// Add panel

-		$panelGroup .= parsePh($tpl['panelCollapse'], array(

-			'tab' => 'categories_list',

-			'catid' => $catid,

-			'wrapper' => $panelCollapse,

-		));

-	}

+        // Add panel

+        $panelGroup .= parsePh($tpl['panelCollapse'], array(

+            'tab' => 'categories_list',

+            'catid' => $catid,

+            'wrapper' => $panelCollapse,

+        ));

+    }

 

-	return parsePh($tpl['panelGroup'], array(

-		'resourceTable' => 'categories_list',

-		'wrapper' => $panelGroup

-	));

+    return parsePh($tpl['panelGroup'], array(

+        'resourceTable' => 'categories_list',

+        'wrapper' => $panelGroup

+    ));

 }

 

 /**

@@ -150,13 +150,13 @@ 
  * @return array

  */

 function prepareElementRowPh($row, $resourceTable, $resources) {

-	$modx = evolutionCMS(); global $modx_textdir, $_style, $_lang;

+    $modx = evolutionCMS(); global $modx_textdir, $_style, $_lang;

 

-	$types = isset($resources->types[$resourceTable]) ? $resources->types[$resourceTable] : false;

+    $types = isset($resources->types[$resourceTable]) ? $resources->types[$resourceTable] : false;

 

-	$_lang["confirm_delete"] = $_lang["delete"];

+    $_lang["confirm_delete"] = $_lang["delete"];

 

-	switch($resourceTable){

+    switch($resourceTable){

         case 'site_templates':

             $class = $row['selectable'] ? '' : 'disabledPlugin';

             $lockElementType = 1;

@@ -190,77 +190,77 @@ 
             return array();

     }

 

-	// Prepare displaying user-locks

-	$lockedByUser = '';

-	$rowLock = $modx->elementIsLocked($lockElementType, $row['id'], true);

-	if($rowLock && $modx->hasPermission('display_locks')) {

-		if($rowLock['sid'] == $modx->sid) {

-			$title = $modx->parseText($_lang["lock_element_editing"], array(

-				'element_type' => $_lang["lock_element_type_" . $lockElementType],

-				'lasthit_df' => $rowLock['lasthit_df']

-			));

-			$lockedByUser = '<span title="' . $title . '" class="editResource" style="cursor:context-menu;">' . $_style['tree_preview_resource'] . '</span>&nbsp;';

-		} else {

-			$title = $modx->parseText($_lang["lock_element_locked_by"], array(

-				'element_type' => $_lang["lock_element_type_" . $lockElementType],

-				'username' => $rowLock['username'],

-				'lasthit_df' => $rowLock['lasthit_df']

-			));

-			if($modx->hasPermission('remove_locks')) {

-				$lockedByUser = '<a href="javascript:;" onclick="unlockElement(' . $lockElementType . ', ' . $row['id'] . ', this);return false;" title="' . $title . '" class="lockedResource"><i class="' . $_style['icons_secured'] . '"></i></a>';

-			} else {

-				$lockedByUser = '<span title="' . $title . '" class="lockedResource" style="cursor:context-menu;"><i class="' . $_style['icons_secured'] . '"></i></span>';

-			}

-		}

-	}

-	if($lockedByUser) {

-		$lockedByUser = '<div class="lockCell">' . $lockedByUser . '</div>';

-	}

+    // Prepare displaying user-locks

+    $lockedByUser = '';

+    $rowLock = $modx->elementIsLocked($lockElementType, $row['id'], true);

+    if($rowLock && $modx->hasPermission('display_locks')) {

+        if($rowLock['sid'] == $modx->sid) {

+            $title = $modx->parseText($_lang["lock_element_editing"], array(

+                'element_type' => $_lang["lock_element_type_" . $lockElementType],

+                'lasthit_df' => $rowLock['lasthit_df']

+            ));

+            $lockedByUser = '<span title="' . $title . '" class="editResource" style="cursor:context-menu;">' . $_style['tree_preview_resource'] . '</span>&nbsp;';

+        } else {

+            $title = $modx->parseText($_lang["lock_element_locked_by"], array(

+                'element_type' => $_lang["lock_element_type_" . $lockElementType],

+                'username' => $rowLock['username'],

+                'lasthit_df' => $rowLock['lasthit_df']

+            ));

+            if($modx->hasPermission('remove_locks')) {

+                $lockedByUser = '<a href="javascript:;" onclick="unlockElement(' . $lockElementType . ', ' . $row['id'] . ', this);return false;" title="' . $title . '" class="lockedResource"><i class="' . $_style['icons_secured'] . '"></i></a>';

+            } else {

+                $lockedByUser = '<span title="' . $title . '" class="lockedResource" style="cursor:context-menu;"><i class="' . $_style['icons_secured'] . '"></i></span>';

+            }

+        }

+    }

+    if($lockedByUser) {

+        $lockedByUser = '<div class="lockCell">' . $lockedByUser . '</div>';

+    }

 

-	// Caption

-	if($resourceTable == 'site_tmplvars') {

-		$caption = !empty($row['description']) ? ' ' . $row['caption'] . ' &nbsp; <small>(' . $row['description'] . ')</small>' : ' ' . $row['caption'];

-	} else {

-		$caption = !empty($row['description']) ? ' ' . $row['description'] : '';

-	}

+    // Caption

+    if($resourceTable == 'site_tmplvars') {

+        $caption = !empty($row['description']) ? ' ' . $row['caption'] . ' &nbsp; <small>(' . $row['description'] . ')</small>' : ' ' . $row['caption'];

+    } else {

+        $caption = !empty($row['description']) ? ' ' . $row['description'] : '';

+    }

 

-	// Special marks

-	$tplInfo = array();

-	if($row['locked']) {

-		$tplInfo[] = $_lang['locked'];

-	}

-	if($row['id'] == $modx->config['default_template'] && $resourceTable == 'site_templates') {

-		$tplInfo[] = $_lang['defaulttemplate_title'];

-	}

-	$marks = !empty($tplInfo) ? ' <em>(' . implode(', ', $tplInfo) . ')</em>' : '';

+    // Special marks

+    $tplInfo = array();

+    if($row['locked']) {

+        $tplInfo[] = $_lang['locked'];

+    }

+    if($row['id'] == $modx->config['default_template'] && $resourceTable == 'site_templates') {

+        $tplInfo[] = $_lang['defaulttemplate_title'];

+    }

+    $marks = !empty($tplInfo) ? ' <em>(' . implode(', ', $tplInfo) . ')</em>' : '';

 

-	/* row buttons */

-	$buttons = '';

-	if($modx->hasPermission($types['actions']['edit'][1])) {

-		$buttons .= '<li><a title="' . $_lang["edit_resource"] . '" href="index.php?a=' . $types['actions']['edit'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-edit fa-fw"></i></a></li>';

-	}

-	if($modx->hasPermission($types['actions']['duplicate'][1])) {

-		$buttons .= '<li><a onclick="return confirm(\'' . $_lang["confirm_duplicate_record"] . '\')" title="' . $_lang["resource_duplicate"] . '" href="index.php?a=' . $types['actions']['duplicate'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-clone fa-fw"></i></a></li>';

-	}

-	if($modx->hasPermission($types['actions']['remove'][1])) {

-		$buttons .= '<li><a onclick="return confirm(\'' . $_lang["confirm_delete"] . '\')" title="' . $_lang["delete"] . '" href="index.php?a=' . $types['actions']['remove'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-trash fa-fw"></i></a></li>';

-	}

-	$buttons = $buttons ? '<div class="btnCell"><ul class="elements_buttonbar">' . $buttons . '</ul></div>' : '';

+    /* row buttons */

+    $buttons = '';

+    if($modx->hasPermission($types['actions']['edit'][1])) {

+        $buttons .= '<li><a title="' . $_lang["edit_resource"] . '" href="index.php?a=' . $types['actions']['edit'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-edit fa-fw"></i></a></li>';

+    }

+    if($modx->hasPermission($types['actions']['duplicate'][1])) {

+        $buttons .= '<li><a onclick="return confirm(\'' . $_lang["confirm_duplicate_record"] . '\')" title="' . $_lang["resource_duplicate"] . '" href="index.php?a=' . $types['actions']['duplicate'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-clone fa-fw"></i></a></li>';

+    }

+    if($modx->hasPermission($types['actions']['remove'][1])) {

+        $buttons .= '<li><a onclick="return confirm(\'' . $_lang["confirm_delete"] . '\')" title="' . $_lang["delete"] . '" href="index.php?a=' . $types['actions']['remove'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-trash fa-fw"></i></a></li>';

+    }

+    $buttons = $buttons ? '<div class="btnCell"><ul class="elements_buttonbar">' . $buttons . '</ul></div>' : '';

 

-	$catid = $row['catid'] ? $row['catid'] : 0;

+    $catid = $row['catid'] ? $row['catid'] : 0;

 

-	// Placeholders for elements-row

-	return array(

-		'class' => $class ? ' class="' . $class . '"' : '',

-		'lockedByUser' => $lockedByUser,

-		'name' => $row['name'],

-		'caption' => $caption,

-		'buttons' => $buttons,

-		'marks' => $marks,

-		'id' => $row['id'],

-		'resourceTable' => $resourceTable,

-		'actionEdit' => $types['actions']['edit'][0],

-		'catid' => $catid,

-		'textdir' => $modx_textdir ? '&rlm;' : '',

-	);

+    // Placeholders for elements-row

+    return array(

+        'class' => $class ? ' class="' . $class . '"' : '',

+        'lockedByUser' => $lockedByUser,

+        'name' => $row['name'],

+        'caption' => $caption,

+        'buttons' => $buttons,

+        'marks' => $marks,

+        'id' => $row['id'],

+        'resourceTable' => $resourceTable,

+        'actionEdit' => $types['actions']['edit'][0],

+        'catid' => $catid,

+        'textdir' => $modx_textdir ? '&rlm;' : '',

+    );

 }

Spacing +49 added lines, -49 removed lines

@@ -1,14 +1,14 @@ 
 <?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.");

 }

 

 $tpl = array(

-	'viewForm' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_viewForm.tpl'),

-	'panelGroup' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelGroup.tpl'),

-	'panelHeading' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelHeading.tpl'),

-	'panelCollapse' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelCollapse.tpl'),

-	'elementsRow' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_elementsRow.tpl')

+	'viewForm' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_viewForm.tpl'),

+	'panelGroup' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelGroup.tpl'),

+	'panelHeading' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelHeading.tpl'),

+	'panelCollapse' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelCollapse.tpl'),

+	'elementsRow' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_elementsRow.tpl')

 );

 

 /**

@@ -16,7 +16,7 @@ 
  * @param array $ph

  * @return string

  */

-function parsePh($tpl, $ph) {

+function parsePh($tpl, $ph){

 	$modx = evolutionCMS(); global $_lang;

 	$tpl = $modx->parseText($tpl, $_lang, '[%', '%]');

 	return $modx->parseText($tpl, $ph);

@@ -26,7 +26,7 @@ 
  * @param string|int $cssId

  * @return string

  */

-function renderViewSwitchButtons($cssId) {

+function renderViewSwitchButtons($cssId){

 	$modx = evolutionCMS(); global $_lang, $tpl;

 

 	return parsePh($tpl['viewForm'], array(

@@ -39,19 +39,19 @@ 
  * @param mgrResources $resources

  * @return string

  */

-function createResourceList($resourceTable, $resources) {

+function createResourceList($resourceTable, $resources){

 	$modx = evolutionCMS(); global $_lang, $_style, $modx_textdir, $tpl;

 

 	$items = isset($resources->items[$resourceTable]) ? $resources->items[$resourceTable] : false;

 

-	if( ! is_array($items) || empty($items)) {

+	if (!is_array($items) || empty($items)) {

 		return $_lang['no_results'];

 	}

 

 	// Prepare elements- and categories-list

 	$elements = array();

 	$categories = array();

-	foreach($items as $row) {

+	foreach ($items as $row) {

 		$catid = $row['catid'] ? $row['catid'] : 0;

 		$categories[$catid] = array('name' => stripslashes($row['category']));

 		$elements[$catid][] = prepareElementRowPh($row, $resourceTable, $resources);

@@ -59,18 +59,18 @@ 
 

 	// Now render categories / panel-collapse

 	$panelGroup = '';

-	foreach($elements as $catid => $elList) {

+	foreach ($elements as $catid => $elList) {

 		// Add panel-heading / category-collapse to output

 		$panelGroup .= parsePh($tpl['panelHeading'], array(

 			'tab' => $resourceTable,

 			'category' => $categories[$catid]['name'],

-			'categoryid' => $catid != '' ? ' <small>(' . $catid . ')</small>' : '',

+			'categoryid' => $catid != '' ? ' <small>('.$catid.')</small>' : '',

 			'catid' => $catid,

 		));

 

 		// Prepare content for panel-collapse

 		$panelCollapse = '';

-		foreach($elList as $el) {

+		foreach ($elList as $el) {

 			$panelCollapse .= parsePh($tpl['elementsRow'], $el);

 		}

 

@@ -92,30 +92,30 @@ 
  * @param mgrResources $resources

  * @return string

  */

-function createCombinedView($resources) {

+function createCombinedView($resources){

 	$modx = evolutionCMS(); global $_lang, $_style, $modx_textdir;

 

 	$itemsPerCategory = isset($resources->itemsPerCategory) ? $resources->itemsPerCategory : false;

 	$types = isset($resources->types) ? $resources->types : false;

 	$categories = isset($resources->categories) ? $resources->categories : false;

 

-	if(!$itemsPerCategory) {

+	if (!$itemsPerCategory) {

 		return $_lang['no_results'];

 	}

 

 	$tpl = array(

-		'panelGroup' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelGroup.tpl'),

-		'panelHeading' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelHeading.tpl'),

-		'panelCollapse' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelCollapse.tpl'),

-		'elementsRow' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_elementsRow.tpl'),

+		'panelGroup' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelGroup.tpl'),

+		'panelHeading' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelHeading.tpl'),

+		'panelCollapse' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelCollapse.tpl'),

+		'elementsRow' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_elementsRow.tpl'),

 	);

 

 	// Easily loop through $itemsPerCategory-Array

 	$panelGroup = '';

-	foreach($categories as $catid => $category) {

+	foreach ($categories as $catid => $category) {

 		// Prepare collapse content / elements-list

 		$panelCollapse = '';

-		foreach($itemsPerCategory[$catid] as $el) {

+		foreach ($itemsPerCategory[$catid] as $el) {

 			$resourceTable = $el['type'];

 			$ph = prepareElementRowPh($el, $resourceTable, $resources);

 			$panelCollapse .= parsePh($tpl['elementsRow'], $ph);

@@ -125,7 +125,7 @@ 
 		$panelGroup .= parsePh($tpl['panelHeading'], array(

 			'tab' => 'categories_list',

 			'category' => $categories[$catid],

-			'categoryid' => $catid != '' ? ' <small>(' . $catid . ')</small>' : '',

+			'categoryid' => $catid != '' ? ' <small>('.$catid.')</small>' : '',

 			'catid' => $catid,

 		));

 

@@ -149,14 +149,14 @@ 
  * @param mgrResources $resources

  * @return array

  */

-function prepareElementRowPh($row, $resourceTable, $resources) {

+function prepareElementRowPh($row, $resourceTable, $resources){

 	$modx = evolutionCMS(); global $modx_textdir, $_style, $_lang;

 

 	$types = isset($resources->types[$resourceTable]) ? $resources->types[$resourceTable] : false;

 

 	$_lang["confirm_delete"] = $_lang["delete"];

 

-	switch($resourceTable){

+	switch ($resourceTable) {

         case 'site_templates':

             $class = $row['selectable'] ? '' : 'disabledPlugin';

             $lockElementType = 1;

@@ -193,65 +193,65 @@ 
 	// Prepare displaying user-locks

 	$lockedByUser = '';

 	$rowLock = $modx->elementIsLocked($lockElementType, $row['id'], true);

-	if($rowLock && $modx->hasPermission('display_locks')) {

-		if($rowLock['sid'] == $modx->sid) {

+	if ($rowLock && $modx->hasPermission('display_locks')) {

+		if ($rowLock['sid'] == $modx->sid) {

 			$title = $modx->parseText($_lang["lock_element_editing"], array(

-				'element_type' => $_lang["lock_element_type_" . $lockElementType],

+				'element_type' => $_lang["lock_element_type_".$lockElementType],

 				'lasthit_df' => $rowLock['lasthit_df']

 			));

-			$lockedByUser = '<span title="' . $title . '" class="editResource" style="cursor:context-menu;">' . $_style['tree_preview_resource'] . '</span>&nbsp;';

+			$lockedByUser = '<span title="'.$title.'" class="editResource" style="cursor:context-menu;">'.$_style['tree_preview_resource'].'</span>&nbsp;';

 		} else {

 			$title = $modx->parseText($_lang["lock_element_locked_by"], array(

-				'element_type' => $_lang["lock_element_type_" . $lockElementType],

+				'element_type' => $_lang["lock_element_type_".$lockElementType],

 				'username' => $rowLock['username'],

 				'lasthit_df' => $rowLock['lasthit_df']

 			));

-			if($modx->hasPermission('remove_locks')) {

-				$lockedByUser = '<a href="javascript:;" onclick="unlockElement(' . $lockElementType . ', ' . $row['id'] . ', this);return false;" title="' . $title . '" class="lockedResource"><i class="' . $_style['icons_secured'] . '"></i></a>';

+			if ($modx->hasPermission('remove_locks')) {

+				$lockedByUser = '<a href="javascript:;" onclick="unlockElement('.$lockElementType.', '.$row['id'].', this);return false;" title="'.$title.'" class="lockedResource"><i class="'.$_style['icons_secured'].'"></i></a>';

 			} else {

-				$lockedByUser = '<span title="' . $title . '" class="lockedResource" style="cursor:context-menu;"><i class="' . $_style['icons_secured'] . '"></i></span>';

+				$lockedByUser = '<span title="'.$title.'" class="lockedResource" style="cursor:context-menu;"><i class="'.$_style['icons_secured'].'"></i></span>';

 			}

 		}

 	}

-	if($lockedByUser) {

-		$lockedByUser = '<div class="lockCell">' . $lockedByUser . '</div>';

+	if ($lockedByUser) {

+		$lockedByUser = '<div class="lockCell">'.$lockedByUser.'</div>';

 	}

 

 	// Caption

-	if($resourceTable == 'site_tmplvars') {

-		$caption = !empty($row['description']) ? ' ' . $row['caption'] . ' &nbsp; <small>(' . $row['description'] . ')</small>' : ' ' . $row['caption'];

+	if ($resourceTable == 'site_tmplvars') {

+		$caption = !empty($row['description']) ? ' '.$row['caption'].' &nbsp; <small>('.$row['description'].')</small>' : ' '.$row['caption'];

 	} else {

-		$caption = !empty($row['description']) ? ' ' . $row['description'] : '';

+		$caption = !empty($row['description']) ? ' '.$row['description'] : '';

 	}

 

 	// Special marks

 	$tplInfo = array();

-	if($row['locked']) {

+	if ($row['locked']) {

 		$tplInfo[] = $_lang['locked'];

 	}

-	if($row['id'] == $modx->config['default_template'] && $resourceTable == 'site_templates') {

+	if ($row['id'] == $modx->config['default_template'] && $resourceTable == 'site_templates') {

 		$tplInfo[] = $_lang['defaulttemplate_title'];

 	}

-	$marks = !empty($tplInfo) ? ' <em>(' . implode(', ', $tplInfo) . ')</em>' : '';

+	$marks = !empty($tplInfo) ? ' <em>('.implode(', ', $tplInfo).')</em>' : '';

 

 	/* row buttons */

 	$buttons = '';

-	if($modx->hasPermission($types['actions']['edit'][1])) {

-		$buttons .= '<li><a title="' . $_lang["edit_resource"] . '" href="index.php?a=' . $types['actions']['edit'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-edit fa-fw"></i></a></li>';

+	if ($modx->hasPermission($types['actions']['edit'][1])) {

+		$buttons .= '<li><a title="'.$_lang["edit_resource"].'" href="index.php?a='.$types['actions']['edit'][0].'&amp;id='.$row['id'].'"><i class="fa fa-edit fa-fw"></i></a></li>';

 	}

-	if($modx->hasPermission($types['actions']['duplicate'][1])) {

-		$buttons .= '<li><a onclick="return confirm(\'' . $_lang["confirm_duplicate_record"] . '\')" title="' . $_lang["resource_duplicate"] . '" href="index.php?a=' . $types['actions']['duplicate'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-clone fa-fw"></i></a></li>';

+	if ($modx->hasPermission($types['actions']['duplicate'][1])) {

+		$buttons .= '<li><a onclick="return confirm(\''.$_lang["confirm_duplicate_record"].'\')" title="'.$_lang["resource_duplicate"].'" href="index.php?a='.$types['actions']['duplicate'][0].'&amp;id='.$row['id'].'"><i class="fa fa-clone fa-fw"></i></a></li>';

 	}

-	if($modx->hasPermission($types['actions']['remove'][1])) {

-		$buttons .= '<li><a onclick="return confirm(\'' . $_lang["confirm_delete"] . '\')" title="' . $_lang["delete"] . '" href="index.php?a=' . $types['actions']['remove'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-trash fa-fw"></i></a></li>';

+	if ($modx->hasPermission($types['actions']['remove'][1])) {

+		$buttons .= '<li><a onclick="return confirm(\''.$_lang["confirm_delete"].'\')" title="'.$_lang["delete"].'" href="index.php?a='.$types['actions']['remove'][0].'&amp;id='.$row['id'].'"><i class="fa fa-trash fa-fw"></i></a></li>';

 	}

-	$buttons = $buttons ? '<div class="btnCell"><ul class="elements_buttonbar">' . $buttons . '</ul></div>' : '';

+	$buttons = $buttons ? '<div class="btnCell"><ul class="elements_buttonbar">'.$buttons.'</ul></div>' : '';

 

 	$catid = $row['catid'] ? $row['catid'] : 0;

 

 	// Placeholders for elements-row

 	return array(

-		'class' => $class ? ' class="' . $class . '"' : '',

+		'class' => $class ? ' class="'.$class.'"' : '',

 		'lockedByUser' => $lockedByUser,

 		'name' => $row['name'],

 		'caption' => $caption,

Braces +32 added lines, -27 removed lines

@@ -1,5 +1,5 @@ 
 <?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.");

 }

 

@@ -16,7 +16,8 @@ 
  * @param array $ph

  * @return string

  */

-function parsePh($tpl, $ph) {

+function parsePh($tpl, $ph)
+{
 	$modx = evolutionCMS(); global $_lang;

 	$tpl = $modx->parseText($tpl, $_lang, '[%', '%]');

 	return $modx->parseText($tpl, $ph);

@@ -26,7 +27,8 @@ 
  * @param string|int $cssId

  * @return string

  */

-function renderViewSwitchButtons($cssId) {

+function renderViewSwitchButtons($cssId)
+{
 	$modx = evolutionCMS(); global $_lang, $tpl;

 

 	return parsePh($tpl['viewForm'], array(

@@ -39,19 +41,20 @@ 
  * @param mgrResources $resources

  * @return string

  */

-function createResourceList($resourceTable, $resources) {

+function createResourceList($resourceTable, $resources)
+{
 	$modx = evolutionCMS(); global $_lang, $_style, $modx_textdir, $tpl;

 

 	$items = isset($resources->items[$resourceTable]) ? $resources->items[$resourceTable] : false;

 

-	if( ! is_array($items) || empty($items)) {

+	if( ! is_array($items) || empty($items)) {
 		return $_lang['no_results'];

 	}

 

 	// Prepare elements- and categories-list

 	$elements = array();

 	$categories = array();

-	foreach($items as $row) {

+	foreach($items as $row) {
 		$catid = $row['catid'] ? $row['catid'] : 0;

 		$categories[$catid] = array('name' => stripslashes($row['category']));

 		$elements[$catid][] = prepareElementRowPh($row, $resourceTable, $resources);

@@ -59,7 +62,7 @@ 
 

 	// Now render categories / panel-collapse

 	$panelGroup = '';

-	foreach($elements as $catid => $elList) {

+	foreach($elements as $catid => $elList) {
 		// Add panel-heading / category-collapse to output

 		$panelGroup .= parsePh($tpl['panelHeading'], array(

 			'tab' => $resourceTable,

@@ -70,7 +73,7 @@ 
 

 		// Prepare content for panel-collapse

 		$panelCollapse = '';

-		foreach($elList as $el) {

+		foreach($elList as $el) {
 			$panelCollapse .= parsePh($tpl['elementsRow'], $el);

 		}

 

@@ -92,14 +95,15 @@ 
  * @param mgrResources $resources

  * @return string

  */

-function createCombinedView($resources) {

+function createCombinedView($resources)
+{
 	$modx = evolutionCMS(); global $_lang, $_style, $modx_textdir;

 

 	$itemsPerCategory = isset($resources->itemsPerCategory) ? $resources->itemsPerCategory : false;

 	$types = isset($resources->types) ? $resources->types : false;

 	$categories = isset($resources->categories) ? $resources->categories : false;

 

-	if(!$itemsPerCategory) {

+	if(!$itemsPerCategory) {
 		return $_lang['no_results'];

 	}

 

@@ -112,10 +116,10 @@ 
 

 	// Easily loop through $itemsPerCategory-Array

 	$panelGroup = '';

-	foreach($categories as $catid => $category) {

+	foreach($categories as $catid => $category) {
 		// Prepare collapse content / elements-list

 		$panelCollapse = '';

-		foreach($itemsPerCategory[$catid] as $el) {

+		foreach($itemsPerCategory[$catid] as $el) {
 			$resourceTable = $el['type'];

 			$ph = prepareElementRowPh($el, $resourceTable, $resources);

 			$panelCollapse .= parsePh($tpl['elementsRow'], $ph);

@@ -149,14 +153,15 @@ 
  * @param mgrResources $resources

  * @return array

  */

-function prepareElementRowPh($row, $resourceTable, $resources) {

+function prepareElementRowPh($row, $resourceTable, $resources)
+{
 	$modx = evolutionCMS(); global $modx_textdir, $_style, $_lang;

 

 	$types = isset($resources->types[$resourceTable]) ? $resources->types[$resourceTable] : false;

 

 	$_lang["confirm_delete"] = $_lang["delete"];

 

-	switch($resourceTable){

+	switch($resourceTable) {
         case 'site_templates':

             $class = $row['selectable'] ? '' : 'disabledPlugin';

             $lockElementType = 1;

@@ -193,56 +198,56 @@ 
 	// Prepare displaying user-locks

 	$lockedByUser = '';

 	$rowLock = $modx->elementIsLocked($lockElementType, $row['id'], true);

-	if($rowLock && $modx->hasPermission('display_locks')) {

-		if($rowLock['sid'] == $modx->sid) {

+	if($rowLock && $modx->hasPermission('display_locks')) {
+		if($rowLock['sid'] == $modx->sid) {
 			$title = $modx->parseText($_lang["lock_element_editing"], array(

 				'element_type' => $_lang["lock_element_type_" . $lockElementType],

 				'lasthit_df' => $rowLock['lasthit_df']

 			));

 			$lockedByUser = '<span title="' . $title . '" class="editResource" style="cursor:context-menu;">' . $_style['tree_preview_resource'] . '</span>&nbsp;';

-		} else {

+		} else {
 			$title = $modx->parseText($_lang["lock_element_locked_by"], array(

 				'element_type' => $_lang["lock_element_type_" . $lockElementType],

 				'username' => $rowLock['username'],

 				'lasthit_df' => $rowLock['lasthit_df']

 			));

-			if($modx->hasPermission('remove_locks')) {

+			if($modx->hasPermission('remove_locks')) {
 				$lockedByUser = '<a href="javascript:;" onclick="unlockElement(' . $lockElementType . ', ' . $row['id'] . ', this);return false;" title="' . $title . '" class="lockedResource"><i class="' . $_style['icons_secured'] . '"></i></a>';

-			} else {

+			} else {
 				$lockedByUser = '<span title="' . $title . '" class="lockedResource" style="cursor:context-menu;"><i class="' . $_style['icons_secured'] . '"></i></span>';

 			}

 		}

 	}

-	if($lockedByUser) {

+	if($lockedByUser) {
 		$lockedByUser = '<div class="lockCell">' . $lockedByUser . '</div>';

 	}

 

 	// Caption

-	if($resourceTable == 'site_tmplvars') {

+	if($resourceTable == 'site_tmplvars') {
 		$caption = !empty($row['description']) ? ' ' . $row['caption'] . ' &nbsp; <small>(' . $row['description'] . ')</small>' : ' ' . $row['caption'];

-	} else {

+	} else {
 		$caption = !empty($row['description']) ? ' ' . $row['description'] : '';

 	}

 

 	// Special marks

 	$tplInfo = array();

-	if($row['locked']) {

+	if($row['locked']) {
 		$tplInfo[] = $_lang['locked'];

 	}

-	if($row['id'] == $modx->config['default_template'] && $resourceTable == 'site_templates') {

+	if($row['id'] == $modx->config['default_template'] && $resourceTable == 'site_templates') {
 		$tplInfo[] = $_lang['defaulttemplate_title'];

 	}

 	$marks = !empty($tplInfo) ? ' <em>(' . implode(', ', $tplInfo) . ')</em>' : '';

 

 	/* row buttons */

 	$buttons = '';

-	if($modx->hasPermission($types['actions']['edit'][1])) {

+	if($modx->hasPermission($types['actions']['edit'][1])) {
 		$buttons .= '<li><a title="' . $_lang["edit_resource"] . '" href="index.php?a=' . $types['actions']['edit'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-edit fa-fw"></i></a></li>';

 	}

-	if($modx->hasPermission($types['actions']['duplicate'][1])) {

+	if($modx->hasPermission($types['actions']['duplicate'][1])) {
 		$buttons .= '<li><a onclick="return confirm(\'' . $_lang["confirm_duplicate_record"] . '\')" title="' . $_lang["resource_duplicate"] . '" href="index.php?a=' . $types['actions']['duplicate'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-clone fa-fw"></i></a></li>';

 	}

-	if($modx->hasPermission($types['actions']['remove'][1])) {

+	if($modx->hasPermission($types['actions']['remove'][1])) {
 		$buttons .= '<li><a onclick="return confirm(\'' . $_lang["confirm_delete"] . '\')" title="' . $_lang["delete"] . '" href="index.php?a=' . $types['actions']['remove'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-trash fa-fw"></i></a></li>';

 	}

 	$buttons = $buttons ? '<div class="btnCell"><ul class="elements_buttonbar">' . $buttons . '</ul></div>' : '';

manager/actions/resources/mgrResources.class.php

Indentation +98 added lines, -98 removed lines

@@ -7,7 +7,7 @@ 
     /**
      * @var array
      */
-	public $types = array();
+    public $types = array();
     /**
      * @var array
      */
@@ -25,73 +25,73 @@ 
      * mgrResources constructor.
      */
     public function __construct() {
-		$this->setTypes();
-		$this->queryItemsFromDB();
-		$this->prepareCategoryArrays();
-	}
+        $this->setTypes();
+        $this->queryItemsFromDB();
+        $this->prepareCategoryArrays();
+    }
 
     /**
      * @return void
      */
     public function setTypes() {
-		global $_lang;
-		$this->types['site_templates']    = array(
-			'title'=>$_lang["manage_templates"],
-			'actions'=>array( 'edit'=>array(16,'edit_template'), 'duplicate'=>array(96,'new_template'), 'remove'=>array(21,'delete_template') ),
-			'permissions'=>array('new_template','edit_template'),
-			'name'=>'templatename'
-		);
-		$this->types['site_tmplvars']     = array(
-			'title'=>$_lang["tmplvars"],
-			'actions'=>array('edit'=>array(301,'edit_template'), 'duplicate'=>array(304,'edit_template'), 'remove'=>array(303,'edit_template')),
-			'permissions'=>array('new_template','edit_template'),
-		);
-		$this->types['site_htmlsnippets'] = array(
-			'title'=>$_lang["manage_htmlsnippets"],
-			'actions'=>array('edit'=>array(78,'edit_chunk'), 'duplicate'=>array(97,'new_chunk'), 'remove'=>array(80,'delete_chunk')),
-			'permissions'=>array('new_chunk','edit_chunk'),
-		);
-		$this->types['site_snippets']     = array(
-			'title'=>$_lang["manage_snippets"],
-			'actions'=>array('edit'=>array(22,'edit_snippet'), 'duplicate'=>array(98,'new_snippet'), 'remove'=>array(25,'delete_snippet')),
-			'permissions'=>array('new_snippet','edit_snippet'),
-		);
-		$this->types['site_plugins']      = array(
-			'title'=>$_lang["manage_plugins"],
-			'actions'=>array('edit'=>array(102,'edit_plugin'), 'duplicate'=>array(105,'new_plugin'), 'remove'=>array(104,'delete_plugin')),
-			'permissions'=>array('new_plugin','edit_plugin'),
-		);
-		$this->types['site_modules']      = array(
-			'title'=>$_lang["manage_modules"],
-			'actions'=>array('edit'=>array(108,'edit_module'), 'duplicate'=>array(111,'new_module'), 'remove'=>array(110,'delete_module')),
-			'permissions'=>array('new_module','edit_module'),
-		);
-	}
+        global $_lang;
+        $this->types['site_templates']    = array(
+            'title'=>$_lang["manage_templates"],
+            'actions'=>array( 'edit'=>array(16,'edit_template'), 'duplicate'=>array(96,'new_template'), 'remove'=>array(21,'delete_template') ),
+            'permissions'=>array('new_template','edit_template'),
+            'name'=>'templatename'
+        );
+        $this->types['site_tmplvars']     = array(
+            'title'=>$_lang["tmplvars"],
+            'actions'=>array('edit'=>array(301,'edit_template'), 'duplicate'=>array(304,'edit_template'), 'remove'=>array(303,'edit_template')),
+            'permissions'=>array('new_template','edit_template'),
+        );
+        $this->types['site_htmlsnippets'] = array(
+            'title'=>$_lang["manage_htmlsnippets"],
+            'actions'=>array('edit'=>array(78,'edit_chunk'), 'duplicate'=>array(97,'new_chunk'), 'remove'=>array(80,'delete_chunk')),
+            'permissions'=>array('new_chunk','edit_chunk'),
+        );
+        $this->types['site_snippets']     = array(
+            'title'=>$_lang["manage_snippets"],
+            'actions'=>array('edit'=>array(22,'edit_snippet'), 'duplicate'=>array(98,'new_snippet'), 'remove'=>array(25,'delete_snippet')),
+            'permissions'=>array('new_snippet','edit_snippet'),
+        );
+        $this->types['site_plugins']      = array(
+            'title'=>$_lang["manage_plugins"],
+            'actions'=>array('edit'=>array(102,'edit_plugin'), 'duplicate'=>array(105,'new_plugin'), 'remove'=>array(104,'delete_plugin')),
+            'permissions'=>array('new_plugin','edit_plugin'),
+        );
+        $this->types['site_modules']      = array(
+            'title'=>$_lang["manage_modules"],
+            'actions'=>array('edit'=>array(108,'edit_module'), 'duplicate'=>array(111,'new_module'), 'remove'=>array(110,'delete_module')),
+            'permissions'=>array('new_module','edit_module'),
+        );
+    }
 
     /**
      * @return void
      */
     public function queryItemsFromDB() {
-		foreach($this->types as $resourceTable=>$type) {
-			if($this->hasAnyPermissions($type['permissions'])) {
-				$nameField = isset($type['name']) ? $type['name'] : 'name';
-				$this->items[$resourceTable] = $this->queryResources($resourceTable, $nameField);
-		   }
-		 }
-	}
+        foreach($this->types as $resourceTable=>$type) {
+            if($this->hasAnyPermissions($type['permissions'])) {
+                $nameField = isset($type['name']) ? $type['name'] : 'name';
+                $this->items[$resourceTable] = $this->queryResources($resourceTable, $nameField);
+            }
+            }
+    }
 
     /**
      * @param array $permissions
      * @return bool
      */
     public function hasAnyPermissions($permissions) {
-		$modx = evolutionCMS();
+        $modx = evolutionCMS();
 
-		foreach($permissions as $p)
-			if($modx->hasPermission($p)) return true;
+        foreach($permissions as $p)
+            if($modx->hasPermission($p)) return true;
 
-		return false;
-	}
+        return false;
+    }
 
     /**
      * @param string $resourceTable
@@ -99,7 +99,7 @@ 
      * @return array|bool
      */
     public function queryResources($resourceTable, $nameField = 'name') {
-		$modx = evolutionCMS(); global $_lang;
+        $modx = evolutionCMS(); global $_lang;
 
         $allowed = array(
             'site_htmlsnippets',
@@ -107,59 +107,59 @@ 
             'site_plugins',
             'site_modules'
         );
-		$pluginsql = !empty($resourceTable) && in_array($resourceTable, $allowed) ? $resourceTable . '.disabled, ' : '';
-
-		$tvsql  = '';
-		$tvjoin = '';
-		if ($resourceTable === 'site_tmplvars') {
-			$tvsql    = 'site_tmplvars.caption, ';
-			$tvjoin   = sprintf('LEFT JOIN %s AS stt ON site_tmplvars.id=stt.tmplvarid GROUP BY site_tmplvars.id,reltpl', $modx->getFullTableName('site_tmplvar_templates'));
-			$sttfield = 'IF(stt.templateid,1,0) AS reltpl,';
-		}
-		else $sttfield = '';
-
-		$selectableTemplates = $resourceTable === 'site_templates' ? "{$resourceTable}.selectable, " : "";
-
-		$rs = $modx->db->select(
-			"{$sttfield} {$pluginsql} {$tvsql} {$resourceTable}.{$nameField} as name, {$resourceTable}.id, {$resourceTable}.description, {$resourceTable}.locked, {$selectableTemplates}IF(isnull(categories.category),'{$_lang['no_category']}',categories.category) as category, categories.id as catid",
-			$modx->getFullTableName($resourceTable) . " AS {$resourceTable}
+        $pluginsql = !empty($resourceTable) && in_array($resourceTable, $allowed) ? $resourceTable . '.disabled, ' : '';
+
+        $tvsql  = '';
+        $tvjoin = '';
+        if ($resourceTable === 'site_tmplvars') {
+            $tvsql    = 'site_tmplvars.caption, ';
+            $tvjoin   = sprintf('LEFT JOIN %s AS stt ON site_tmplvars.id=stt.tmplvarid GROUP BY site_tmplvars.id,reltpl', $modx->getFullTableName('site_tmplvar_templates'));
+            $sttfield = 'IF(stt.templateid,1,0) AS reltpl,';
+        }
+        else $sttfield = '';
+
+        $selectableTemplates = $resourceTable === 'site_templates' ? "{$resourceTable}.selectable, " : "";
+
+        $rs = $modx->db->select(
+            "{$sttfield} {$pluginsql} {$tvsql} {$resourceTable}.{$nameField} as name, {$resourceTable}.id, {$resourceTable}.description, {$resourceTable}.locked, {$selectableTemplates}IF(isnull(categories.category),'{$_lang['no_category']}',categories.category) as category, categories.id as catid",
+            $modx->getFullTableName($resourceTable) . " AS {$resourceTable}
 	            LEFT JOIN " . $modx->getFullTableName('categories') . " AS categories ON {$resourceTable}.category = categories.id {$tvjoin}",
-			"",
-			"category,name"
-		);
-		$limit = $modx->db->getRecordCount($rs);
+            "",
+            "category,name"
+        );
+        $limit = $modx->db->getRecordCount($rs);
 
-		if($limit < 1) return false;
+        if($limit < 1) return false;
 
-		$result = array();
-		while ($row = $modx->db->getRow($rs)) {
-			$result[] = $row;
-		}
-		return $result;
-	}
+        $result = array();
+        while ($row = $modx->db->getRow($rs)) {
+            $result[] = $row;
+        }
+        return $result;
+    }
 
     /**
      * @return void
      */
     public function prepareCategoryArrays() {
-		foreach($this->items as $type=>$items) {
-			foreach((array)$items as $item) {
-				$catid = $item['catid'] ? $item['catid'] : 0;
-				$this->categories[$catid] = $item['category'];
-
-				$item['type'] = $type;
-				$this->itemsPerCategory[$catid][] = $item;
-			}
-		}
-
-		// Sort categories by name
-		natcasesort($this->categories);
-
-		// Now sort by name
-		foreach($this->itemsPerCategory as $catid=>$items) {
-			usort($this->itemsPerCategory[$catid], function ($a, $b) {
-				return strcasecmp($a['name'], $b['name']);
-			});
-		}
-	}
+        foreach($this->items as $type=>$items) {
+            foreach((array)$items as $item) {
+                $catid = $item['catid'] ? $item['catid'] : 0;
+                $this->categories[$catid] = $item['category'];
+
+                $item['type'] = $type;
+                $this->itemsPerCategory[$catid][] = $item;
+            }
+        }
+
+        // Sort categories by name
+        natcasesort($this->categories);
+
+        // Now sort by name
+        foreach($this->itemsPerCategory as $catid=>$items) {
+            usort($this->itemsPerCategory[$catid], function ($a, $b) {
+                return strcasecmp($a['name'], $b['name']);
+            });
+        }
+    }
 }

Spacing +37 added lines, -37 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) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
-class mgrResources {
+class mgrResources{
     /**
      * @var array
      */
@@ -24,7 +24,7 @@ 
     /**
      * mgrResources constructor.
      */
-    public function __construct() {
+    public function __construct(){
 		$this->setTypes();
 		$this->queryItemsFromDB();
 		$this->prepareCategoryArrays();
@@ -33,47 +33,47 @@ 
     /**
      * @return void
      */
-    public function setTypes() {
+    public function setTypes(){
 		global $_lang;
-		$this->types['site_templates']    = array(
+		$this->types['site_templates'] = array(
 			'title'=>$_lang["manage_templates"],
-			'actions'=>array( 'edit'=>array(16,'edit_template'), 'duplicate'=>array(96,'new_template'), 'remove'=>array(21,'delete_template') ),
-			'permissions'=>array('new_template','edit_template'),
+			'actions'=>array('edit'=>array(16, 'edit_template'), 'duplicate'=>array(96, 'new_template'), 'remove'=>array(21, 'delete_template')),
+			'permissions'=>array('new_template', 'edit_template'),
 			'name'=>'templatename'
 		);
-		$this->types['site_tmplvars']     = array(
+		$this->types['site_tmplvars'] = array(
 			'title'=>$_lang["tmplvars"],
-			'actions'=>array('edit'=>array(301,'edit_template'), 'duplicate'=>array(304,'edit_template'), 'remove'=>array(303,'edit_template')),
-			'permissions'=>array('new_template','edit_template'),
+			'actions'=>array('edit'=>array(301, 'edit_template'), 'duplicate'=>array(304, 'edit_template'), 'remove'=>array(303, 'edit_template')),
+			'permissions'=>array('new_template', 'edit_template'),
 		);
 		$this->types['site_htmlsnippets'] = array(
 			'title'=>$_lang["manage_htmlsnippets"],
-			'actions'=>array('edit'=>array(78,'edit_chunk'), 'duplicate'=>array(97,'new_chunk'), 'remove'=>array(80,'delete_chunk')),
-			'permissions'=>array('new_chunk','edit_chunk'),
+			'actions'=>array('edit'=>array(78, 'edit_chunk'), 'duplicate'=>array(97, 'new_chunk'), 'remove'=>array(80, 'delete_chunk')),
+			'permissions'=>array('new_chunk', 'edit_chunk'),
 		);
-		$this->types['site_snippets']     = array(
+		$this->types['site_snippets'] = array(
 			'title'=>$_lang["manage_snippets"],
-			'actions'=>array('edit'=>array(22,'edit_snippet'), 'duplicate'=>array(98,'new_snippet'), 'remove'=>array(25,'delete_snippet')),
-			'permissions'=>array('new_snippet','edit_snippet'),
+			'actions'=>array('edit'=>array(22, 'edit_snippet'), 'duplicate'=>array(98, 'new_snippet'), 'remove'=>array(25, 'delete_snippet')),
+			'permissions'=>array('new_snippet', 'edit_snippet'),
 		);
-		$this->types['site_plugins']      = array(
+		$this->types['site_plugins'] = array(
 			'title'=>$_lang["manage_plugins"],
-			'actions'=>array('edit'=>array(102,'edit_plugin'), 'duplicate'=>array(105,'new_plugin'), 'remove'=>array(104,'delete_plugin')),
-			'permissions'=>array('new_plugin','edit_plugin'),
+			'actions'=>array('edit'=>array(102, 'edit_plugin'), 'duplicate'=>array(105, 'new_plugin'), 'remove'=>array(104, 'delete_plugin')),
+			'permissions'=>array('new_plugin', 'edit_plugin'),
 		);
-		$this->types['site_modules']      = array(
+		$this->types['site_modules'] = array(
 			'title'=>$_lang["manage_modules"],
-			'actions'=>array('edit'=>array(108,'edit_module'), 'duplicate'=>array(111,'new_module'), 'remove'=>array(110,'delete_module')),
-			'permissions'=>array('new_module','edit_module'),
+			'actions'=>array('edit'=>array(108, 'edit_module'), 'duplicate'=>array(111, 'new_module'), 'remove'=>array(110, 'delete_module')),
+			'permissions'=>array('new_module', 'edit_module'),
 		);
 	}
 
     /**
      * @return void
      */
-    public function queryItemsFromDB() {
-		foreach($this->types as $resourceTable=>$type) {
-			if($this->hasAnyPermissions($type['permissions'])) {
+    public function queryItemsFromDB(){
+		foreach ($this->types as $resourceTable=>$type) {
+			if ($this->hasAnyPermissions($type['permissions'])) {
 				$nameField = isset($type['name']) ? $type['name'] : 'name';
 				$this->items[$resourceTable] = $this->queryResources($resourceTable, $nameField);
 		   }
@@ -84,11 +84,11 @@ 
      * @param array $permissions
      * @return bool
      */
-    public function hasAnyPermissions($permissions) {
+    public function hasAnyPermissions($permissions){
 		$modx = evolutionCMS();
 
-		foreach($permissions as $p)
-			if($modx->hasPermission($p)) return true;
+		foreach ($permissions as $p)
+			if ($modx->hasPermission($p)) return true;
 
 		return false;
 	}
@@ -98,7 +98,7 @@ 
      * @param string $nameField
      * @return array|bool
      */
-    public function queryResources($resourceTable, $nameField = 'name') {
+    public function queryResources($resourceTable, $nameField = 'name'){
 		$modx = evolutionCMS(); global $_lang;
 
         $allowed = array(
@@ -107,7 +107,7 @@ 
             'site_plugins',
             'site_modules'
         );
-		$pluginsql = !empty($resourceTable) && in_array($resourceTable, $allowed) ? $resourceTable . '.disabled, ' : '';
+		$pluginsql = !empty($resourceTable) && in_array($resourceTable, $allowed) ? $resourceTable.'.disabled, ' : '';
 
 		$tvsql  = '';
 		$tvjoin = '';
@@ -122,14 +122,14 @@ 
 
 		$rs = $modx->db->select(
 			"{$sttfield} {$pluginsql} {$tvsql} {$resourceTable}.{$nameField} as name, {$resourceTable}.id, {$resourceTable}.description, {$resourceTable}.locked, {$selectableTemplates}IF(isnull(categories.category),'{$_lang['no_category']}',categories.category) as category, categories.id as catid",
-			$modx->getFullTableName($resourceTable) . " AS {$resourceTable}
-	            LEFT JOIN " . $modx->getFullTableName('categories') . " AS categories ON {$resourceTable}.category = categories.id {$tvjoin}",
+			$modx->getFullTableName($resourceTable)." AS {$resourceTable}
+	            LEFT JOIN ".$modx->getFullTableName('categories')." AS categories ON {$resourceTable}.category = categories.id {$tvjoin}",
 			"",
 			"category,name"
 		);
 		$limit = $modx->db->getRecordCount($rs);
 
-		if($limit < 1) return false;
+		if ($limit < 1) return false;
 
 		$result = array();
 		while ($row = $modx->db->getRow($rs)) {
@@ -141,9 +141,9 @@ 
     /**
      * @return void
      */
-    public function prepareCategoryArrays() {
-		foreach($this->items as $type=>$items) {
-			foreach((array)$items as $item) {
+    public function prepareCategoryArrays(){
+		foreach ($this->items as $type=>$items) {
+			foreach ((array) $items as $item) {
 				$catid = $item['catid'] ? $item['catid'] : 0;
 				$this->categories[$catid] = $item['category'];
 
@@ -156,8 +156,8 @@ 
 		natcasesort($this->categories);
 
 		// Now sort by name
-		foreach($this->itemsPerCategory as $catid=>$items) {
-			usort($this->itemsPerCategory[$catid], function ($a, $b) {
+		foreach ($this->itemsPerCategory as $catid=>$items) {
+			usort($this->itemsPerCategory[$catid], function($a, $b){
 				return strcasecmp($a['name'], $b['name']);
 			});
 		}

Braces +23 added lines, -12 removed lines

@@ -3,7 +3,8 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
-class mgrResources {
+class mgrResources
+{
     /**
      * @var array
      */
@@ -24,7 +25,8 @@ 
     /**
      * mgrResources constructor.
      */
-    public function __construct() {
+    public function __construct()
+    {
 		$this->setTypes();
 		$this->queryItemsFromDB();
 		$this->prepareCategoryArrays();
@@ -33,7 +35,8 @@ 
     /**
      * @return void
      */
-    public function setTypes() {
+    public function setTypes()
+    {
 		global $_lang;
 		$this->types['site_templates']    = array(
 			'title'=>$_lang["manage_templates"],
@@ -71,7 +74,8 @@ 
     /**
      * @return void
      */
-    public function queryItemsFromDB() {
+    public function queryItemsFromDB()
+    {
 		foreach($this->types as $resourceTable=>$type) {
 			if($this->hasAnyPermissions($type['permissions'])) {
 				$nameField = isset($type['name']) ? $type['name'] : 'name';
@@ -84,11 +88,13 @@ 
      * @param array $permissions
      * @return bool
      */
-    public function hasAnyPermissions($permissions) {
+    public function hasAnyPermissions($permissions)
+    {
 		$modx = evolutionCMS();
 
-		foreach($permissions as $p)
-			if($modx->hasPermission($p)) return true;
+		foreach($permissions as $p) {
+					if($modx->hasPermission($p)) return true;
+		}
 
 		return false;
 	}
@@ -98,7 +104,8 @@ 
      * @param string $nameField
      * @return array|bool
      */
-    public function queryResources($resourceTable, $nameField = 'name') {
+    public function queryResources($resourceTable, $nameField = 'name')
+    {
 		$modx = evolutionCMS(); global $_lang;
 
         $allowed = array(
@@ -115,8 +122,9 @@ 
 			$tvsql    = 'site_tmplvars.caption, ';
 			$tvjoin   = sprintf('LEFT JOIN %s AS stt ON site_tmplvars.id=stt.tmplvarid GROUP BY site_tmplvars.id,reltpl', $modx->getFullTableName('site_tmplvar_templates'));
 			$sttfield = 'IF(stt.templateid,1,0) AS reltpl,';
+		} else {
+		    $sttfield = '';
 		}
-		else $sttfield = '';
 
 		$selectableTemplates = $resourceTable === 'site_templates' ? "{$resourceTable}.selectable, " : "";
 
@@ -129,7 +137,9 @@ 
 		);
 		$limit = $modx->db->getRecordCount($rs);
 
-		if($limit < 1) return false;
+		if($limit < 1) {
+		    return false;
+		}
 
 		$result = array();
 		while ($row = $modx->db->getRow($rs)) {
@@ -141,7 +151,8 @@ 
     /**
      * @return void
      */
-    public function prepareCategoryArrays() {
+    public function prepareCategoryArrays()
+    {
 		foreach($this->items as $type=>$items) {
 			foreach((array)$items as $item) {
 				$catid = $item['catid'] ? $item['catid'] : 0;
@@ -157,7 +168,7 @@ 
 
 		// Now sort by name
 		foreach($this->itemsPerCategory as $catid=>$items) {
-			usort($this->itemsPerCategory[$catid], function ($a, $b) {
+			usort($this->itemsPerCategory[$catid], function ($a, $b){
 				return strcasecmp($a['name'], $b['name']);
 			});
 		}

manager/includes/veriword.php

Spacing +33 added lines, -33 removed lines

@@ -5,7 +5,7 @@ 
 $modx->getSettings();
 $modx->invokeEvent('OnWebPageInit');
 
-$vword = new VeriWord(148,60);
+$vword = new VeriWord(148, 60);
 $vword->output_image();
 $vword->destroy_image();
 
@@ -41,7 +41,7 @@ 
 ## see sample.php for test and usage
 ## sample URL: http://www.program-ruti.org/veriword/
 ####
-class VeriWord {
+class VeriWord{
 
     /* path to font directory*/
     public $dir_font   = "ttf/";
@@ -52,44 +52,44 @@ 
     public $im_height  = 0;
     public $im;
 
-    public function __construct($w=200, $h=80) {
+    public function __construct($w = 200, $h = 80){
         /* create session to set word for verification */
         $this->set_veriword();
-        $this->dir_font = dirname(__FILE__) . '/' . $this->dir_font;
+        $this->dir_font = dirname(__FILE__).'/'.$this->dir_font;
         $this->im_width         = $w;
         $this->im_height        = $h;
     }
 
-    public function set_veriword() {
+    public function set_veriword(){
         /* create session variable for verification,
            you may change the session variable name */
         $this->word             = $this->pick_word();
         $_SESSION['veriword']   = $this->word;
     }
 
-    public function output_image() {
+    public function output_image(){
         /* output the image as jpeg */
         $this->draw_image();
         header("Content-type: image/jpeg");
         imagejpeg($this->im);
     }
 
-    public function pick_word() {
+    public function pick_word(){
         $modx = evolutionCMS();
         // set default words
-        $words="MODX,Access,Better,BitCode,Chunk,Cache,Desc,Design,Excell,Enjoy,URLs,TechView,Gerald,Griff,Humphrey,Holiday,Intel,Integration,Joystick,Join(),Oscope,Genetic,Light,Likeness,Marit,Maaike,Niche,Netherlands,Ordinance,Oscillo,Parser,Phusion,Query,Question,Regalia,Righteous,Snippet,Sentinel,Template,Thespian,Unity,Enterprise,Verily,Veri,Website,WideWeb,Yap,Yellow,Zebra,Zygote";
+        $words = "MODX,Access,Better,BitCode,Chunk,Cache,Desc,Design,Excell,Enjoy,URLs,TechView,Gerald,Griff,Humphrey,Holiday,Intel,Integration,Joystick,Join(),Oscope,Genetic,Light,Likeness,Marit,Maaike,Niche,Netherlands,Ordinance,Oscillo,Parser,Phusion,Query,Question,Regalia,Righteous,Snippet,Sentinel,Template,Thespian,Unity,Enterprise,Verily,Veri,Website,WideWeb,Yap,Yellow,Zebra,Zygote";
         $words = $modx->config['captcha_words'] ? $modx->config['captcha_words'] : $words;
         $arr_words = array_filter(array_map('trim', explode(',', $words)));
 
         /* pick one randomly for text verification */
-        return (string) $arr_words[array_rand($arr_words)].rand(10,999);
+        return (string) $arr_words[array_rand($arr_words)].rand(10, 999);
     }
 
-    public function draw_text() {
+    public function draw_text(){
         $dir = dir($this->dir_font);
         $fontstmp = array();
         while (false !== ($file = $dir->read())) {
-            if(substr($file, -4) == '.ttf') {
+            if (substr($file, -4) == '.ttf') {
                 $fontstmp[] = $this->dir_font.$file;
             }
         }
@@ -97,35 +97,35 @@ 
         $text_font = (string) $fontstmp[array_rand($fontstmp)];
 
         /* angle for text inclination */
-        $text_angle = rand(-9,9);
+        $text_angle = rand(-9, 9);
         /* initial text size */
         $text_size  = 30;
         /* calculate text width and height */
-        $box        = imagettfbbox ( $text_size, $text_angle, $text_font, $this->word);
-        $text_width = $box[2]-$box[0]; //text width
-        $text_height= $box[5]-$box[3]; //text height
+        $box        = imagettfbbox($text_size, $text_angle, $text_font, $this->word);
+        $text_width = $box[2] - $box[0]; //text width
+        $text_height = $box[5] - $box[3]; //text height
 
         /* adjust text size */
-        $text_size  = round((20 * $this->im_width)/$text_width);
+        $text_size  = round((20 * $this->im_width) / $text_width);
 
         /* recalculate text width and height */
-        $box        = imagettfbbox ( $text_size, $text_angle, $text_font, $this->word);
-        $text_width = $box[2]-$box[0]; //text width
-        $text_height= $box[5]-$box[3]; //text height
+        $box        = imagettfbbox($text_size, $text_angle, $text_font, $this->word);
+        $text_width = $box[2] - $box[0]; //text width
+        $text_height = $box[5] - $box[3]; //text height
 
         /* calculate center position of text */
-        $text_x         = ($this->im_width - $text_width)/2;
-        $text_y         = ($this->im_height - $text_height)/2;
+        $text_x         = ($this->im_width - $text_width) / 2;
+        $text_y         = ($this->im_height - $text_height) / 2;
 
         /* create canvas for text drawing */
-        $im_text        = imagecreate ($this->im_width, $this->im_height);
-        $bg_color       = imagecolorallocate ($im_text, 255, 255, 255);
+        $im_text        = imagecreate($this->im_width, $this->im_height);
+        $bg_color       = imagecolorallocate($im_text, 255, 255, 255);
 
         /* pick color for text */
-        $text_color     = imagecolorallocate ($im_text, 0, 51, 153);
+        $text_color     = imagecolorallocate($im_text, 0, 51, 153);
 
         /* draw text into canvas */
-        imagettftext    (   $im_text,
+        imagettftext($im_text,
             $text_size,
             $text_angle,
             $text_x,
@@ -140,19 +140,19 @@ 
     }
 
 
-    public function draw_image() {
+    public function draw_image(){
 
         /* pick one background image randomly from image directory */
-        $img_file       = $this->dir_noise."noise".rand(1,4).".jpg";
+        $img_file       = $this->dir_noise."noise".rand(1, 4).".jpg";
 
         /* create "noise" background image from your image stock*/
-        $noise_img      = @imagecreatefromjpeg ($img_file);
+        $noise_img      = @imagecreatefromjpeg($img_file);
         $noise_width    = imagesx($noise_img);
         $noise_height   = imagesy($noise_img);
 
         /* resize the background image to fit the size of image output */
-        $this->im       = imagecreatetruecolor($this->im_width,$this->im_height);
-        imagecopyresampled ($this->im,
+        $this->im       = imagecreatetruecolor($this->im_width, $this->im_height);
+        imagecopyresampled($this->im,
             $noise_img,
             0, 0, 0, 0,
             $this->im_width,
@@ -161,17 +161,17 @@ 
             $noise_height);
 
         /* put text image into background image */
-        imagecopymerge (    $this->im,
+        imagecopymerge($this->im,
             $this->draw_text(),
             0, 0, 0, 0,
             $this->im_width,
             $this->im_height,
-            70 );
+            70);
 
         return $this->im;
     }
 
-    public function destroy_image() {
+    public function destroy_image(){
 
         imagedestroy($this->im);
 

Braces +16 added lines, -8 removed lines

@@ -41,7 +41,8 @@ 
 ## see sample.php for test and usage
 ## sample URL: http://www.program-ruti.org/veriword/
 ####
-class VeriWord {
+class VeriWord
+{
 
     /* path to font directory*/
     public $dir_font   = "ttf/";
@@ -52,7 +53,8 @@ 
     public $im_height  = 0;
     public $im;
 
-    public function __construct($w=200, $h=80) {
+    public function __construct($w=200, $h=80)
+    {
         /* create session to set word for verification */
         $this->set_veriword();
         $this->dir_font = dirname(__FILE__) . '/' . $this->dir_font;
@@ -60,21 +62,24 @@ 
         $this->im_height        = $h;
     }
 
-    public function set_veriword() {
+    public function set_veriword()
+    {
         /* create session variable for verification,
            you may change the session variable name */
         $this->word             = $this->pick_word();
         $_SESSION['veriword']   = $this->word;
     }
 
-    public function output_image() {
+    public function output_image()
+    {
         /* output the image as jpeg */
         $this->draw_image();
         header("Content-type: image/jpeg");
         imagejpeg($this->im);
     }
 
-    public function pick_word() {
+    public function pick_word()
+    {
         $modx = evolutionCMS();
         // set default words
         $words="MODX,Access,Better,BitCode,Chunk,Cache,Desc,Design,Excell,Enjoy,URLs,TechView,Gerald,Griff,Humphrey,Holiday,Intel,Integration,Joystick,Join(),Oscope,Genetic,Light,Likeness,Marit,Maaike,Niche,Netherlands,Ordinance,Oscillo,Parser,Phusion,Query,Question,Regalia,Righteous,Snippet,Sentinel,Template,Thespian,Unity,Enterprise,Verily,Veri,Website,WideWeb,Yap,Yellow,Zebra,Zygote";
@@ -85,7 +90,8 @@ 
         return (string) $arr_words[array_rand($arr_words)].rand(10,999);
     }
 
-    public function draw_text() {
+    public function draw_text()
+    {
         $dir = dir($this->dir_font);
         $fontstmp = array();
         while (false !== ($file = $dir->read())) {
@@ -140,7 +146,8 @@ 
     }
 
 
-    public function draw_image() {
+    public function draw_image()
+    {
 
         /* pick one background image randomly from image directory */
         $img_file       = $this->dir_noise."noise".rand(1,4).".jpg";
@@ -171,7 +178,8 @@ 
         return $this->im;
     }
 
-    public function destroy_image() {
+    public function destroy_image()
+    {
 
         imagedestroy($this->im);
 

manager/includes/extenders/manager.api.class.inc.php

Spacing +14 added lines, -14 removed lines

@@ -144,33 +144,33 @@ 
             $algorithm = 'UNCRYPT';
         }
 
-        $salt = md5($password . $seed);
+        $salt = md5($password.$seed);
 
         switch ($algorithm) {
             case 'BLOWFISH_Y':
-                $salt = '$2y$07$' . substr($salt, 0, 22);
+                $salt = '$2y$07$'.substr($salt, 0, 22);
                 break;
             case 'BLOWFISH_A':
-                $salt = '$2a$07$' . substr($salt, 0, 22);
+                $salt = '$2a$07$'.substr($salt, 0, 22);
                 break;
             case 'SHA512':
-                $salt = '$6$' . substr($salt, 0, 16);
+                $salt = '$6$'.substr($salt, 0, 16);
                 break;
             case 'SHA256':
-                $salt = '$5$' . substr($salt, 0, 16);
+                $salt = '$5$'.substr($salt, 0, 16);
                 break;
             case 'MD5':
-                $salt = '$1$' . substr($salt, 0, 8);
+                $salt = '$1$'.substr($salt, 0, 8);
                 break;
         }
 
         if ($algorithm !== 'UNCRYPT') {
-            $password = sha1($password) . crypt($password, $salt);
+            $password = sha1($password).crypt($password, $salt);
         } else {
-            $password = sha1($salt . $password);
+            $password = sha1($salt.$password);
         }
 
-        $result = strtolower($algorithm) . '>' . md5($salt . $password) . substr(md5($salt), 0, 8);
+        $result = strtolower($algorithm).'>'.md5($salt.$password).substr(md5($salt), 0, 8);
 
         return $result;
     }
@@ -252,7 +252,7 @@ 
         $check_files = explode("\n", $check_files);
         foreach ($check_files as $file) {
             $file = trim($file);
-            $file = MODX_BASE_PATH . $file;
+            $file = MODX_BASE_PATH.$file;
             if (!is_file($file)) {
                 continue;
             }
@@ -275,7 +275,7 @@ 
         $checksum = unserialize($checksum);
         foreach ($check_files as $file) {
             $file = trim($file);
-            $filePath = MODX_BASE_PATH . $file;
+            $filePath = MODX_BASE_PATH.$file;
             if (!is_file($filePath)) {
                 continue;
             }
@@ -294,7 +294,7 @@ 
     {
         $modx = evolutionCMS();
         $tbl_system_settings = $modx->getFullTableName('system_settings');
-        $sql = "REPLACE INTO {$tbl_system_settings} (setting_name, setting_value) VALUES ('sys_files_checksum','" . $modx->db->escape($checksum) . "')";
+        $sql = "REPLACE INTO {$tbl_system_settings} (setting_name, setting_value) VALUES ('sys_files_checksum','".$modx->db->escape($checksum)."')";
         $modx->db->query($sql);
     }
 
@@ -371,10 +371,10 @@ 
             foreach ($settings as $key => $val) {
                 $f = array();
                 $f['user'] = $_SESSION['mgrInternalKey'];
-                $f['setting_name'] = '_LAST_' . $key;
+                $f['setting_name'] = '_LAST_'.$key;
                 $f['setting_value'] = $val;
                 $f = $modx->db->escape($f);
-                $f = "(`" . implode("`, `", array_keys($f)) . "`) VALUES('" . implode("', '", array_values($f)) . "')";
+                $f = "(`".implode("`, `", array_keys($f))."`) VALUES('".implode("', '", array_values($f))."')";
                 $f .= " ON DUPLICATE KEY UPDATE setting_value = VALUES(setting_value)";
                 $modx->db->insert($f, $modx->getFullTableName('user_settings'));
             }

Braces +4 added lines, -2 removed lines

@@ -116,7 +116,8 @@ 
      * @return string
      */
     public function getHashType($db_value = '')
-    { // md5 | v1 | phpass
+    {
+// md5 | v1 | phpass
         $c = substr($db_value, 0, 1);
         if ($c === '$') {
             return 'phpass';
@@ -135,7 +136,8 @@ 
      * @return string
      */
     public function genV1Hash($password, $seed = '1')
-    { // $seed is user_id basically
+    {
+// $seed is user_id basically
         $modx = evolutionCMS();
 
         if (isset($modx->config['pwd_hash_algo']) && !empty($modx->config['pwd_hash_algo'])) {

manager/includes/preload.functions.inc.php

Spacing +5 added lines, -5 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')) {

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

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

                 throw new RuntimeException('MODX_CLASS not defined and DocumentParser class not exists');

             }

             define('MODX_CLASS', 'DocumentParser');

@@ -29,7 +29,7 @@ 
     $_ = crc32(__FILE__);

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

 

-    return 'evo' . base_convert($_, 10, 36);

+    return 'evo'.base_convert($_, 10, 36);

 }

 

 /**

@@ -50,7 +50,7 @@ 
     session_start();

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

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

-        $cookieLifetime = (int)$_SESSION[$key];

+        $cookieLifetime = (int) $_SESSION[$key];

         if ($cookieLifetime) {

             $cookieExpiration = $_SERVER['REQUEST_TIME'] + $cookieLifetime;

         }

Braces +17 added lines, -17 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,8 +35,8 @@ 
 /**

  * @return void

  */

-function startCMSSession()

-{

+function startCMSSession()
+{
 

     global $site_sessionname, $https_port, $session_cookie_path, $session_cookie_domain;

 

@@ -49,14 +49,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 +66,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,8 +77,8 @@ 
  * @param $session_name

  * @return void

  */

-function removeInvalidCmsSessionIds($session_name)

-{

+function removeInvalidCmsSessionIds($session_name)
+{
     // session ids is invalid iff it is empty string

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

     removeInvalidCmsSessionFromStorage($_COOKIE, $session_name);

manager/includes/log.class.inc.php

Spacing +6 added lines, -6 removed lines

@@ -36,16 +36,16 @@ 
         $action = "",
         $itemid = "",
         $itemname = ""
-    ) {
+    ){
         $modx = evolutionCMS();
         $this->entry['msg'] = $msg; // writes testmessage to the object
-        $this->entry['action'] = empty($action) ? $modx->manager->action : $action;    // writes the action to the object
+        $this->entry['action'] = empty($action) ? $modx->manager->action : $action; // writes the action to the object
 
         // User Credentials
         $this->entry['internalKey'] = $internalKey == "" ? $modx->getLoginUserID() : $internalKey;
         $this->entry['username'] = $username == "" ? $modx->getLoginUserName() : $username;
 
-        $this->entry['itemId'] = (empty($itemid) && isset($_REQUEST['id'])) ? (int)$_REQUEST['id'] : $itemid;  // writes the id to the object
+        $this->entry['itemId'] = (empty($itemid) && isset($_REQUEST['id'])) ? (int) $_REQUEST['id'] : $itemid; // writes the id to the object
         if ($this->entry['itemId'] == 0) {
             $this->entry['itemId'] = "-";
         } // to stop items having id 0
@@ -93,10 +93,10 @@ 
         $fields['message'] = $modx->db->escape($this->entry['msg']);
         $insert_id = $modx->db->insert($fields, $tbl_manager_log);
         if (!$insert_id) {
-            $modx->messageQuit("Logging error: couldn't save log to table! Error code: " . $modx->db->getLastError());
+            $modx->messageQuit("Logging error: couldn't save log to table! Error code: ".$modx->db->getLastError());
         } else {
-            $limit = (isset($modx->config['manager_log_limit'])) ? (int)$modx->config['manager_log_limit'] : 3000;
-            $trim = (isset($modx->config['manager_log_trim'])) ? (int)$modx->config['manager_log_trim'] : 100;
+            $limit = (isset($modx->config['manager_log_limit'])) ? (int) $modx->config['manager_log_limit'] : 3000;
+            $trim = (isset($modx->config['manager_log_trim'])) ? (int) $modx->config['manager_log_trim'] : 100;
             if (($insert_id % $trim) === 0) {
                 $modx->rotate_log('manager_log', $limit, $trim);
             }

manager/media/calendar/datepicker.inc.php

Indentation +7 added lines, -7 removed lines

@@ -1,13 +1,13 @@
 <?php

 

 class DATEPICKER {

-	function __construct() {

-	}

+    function __construct() {

+    }

 

-	function getDP() {

-		$modx = evolutionCMS(); global $_lang;

+    function getDP() {

+        $modx = evolutionCMS(); global $_lang;

 

-		$tpl = file_get_contents(dirname(__FILE__) . '/datepicker.tpl');

-		return $modx->parseText($tpl, $_lang, '[%', '%]');

-	}

+        $tpl = file_get_contents(dirname(__FILE__) . '/datepicker.tpl');

+        return $modx->parseText($tpl, $_lang, '[%', '%]');

+    }

 }

Spacing +4 added lines, -4 removed lines

@@ -1,13 +1,13 @@
 <?php

 

-class DATEPICKER {

-	function __construct() {

+class DATEPICKER{

+	function __construct(){

 	}

 

-	function getDP() {

+	function getDP(){

 		$modx = evolutionCMS(); global $_lang;

 

-		$tpl = file_get_contents(dirname(__FILE__) . '/datepicker.tpl');

+		$tpl = file_get_contents(dirname(__FILE__).'/datepicker.tpl');

 		return $modx->parseText($tpl, $_lang, '[%', '%]');

 	}

 }

Braces +6 added lines, -3 removed lines

@@ -1,10 +1,13 @@
 <?php

 

-class DATEPICKER {

-	function __construct() {

+class DATEPICKER
+{
+	function __construct()
+	{
 	}

 

-	function getDP() {

+	function getDP()
+	{
 		$modx = evolutionCMS(); global $_lang;

 

 		$tpl = file_get_contents(dirname(__FILE__) . '/datepicker.tpl');

manager/media/style/common/moo-datepicker/datepicker.inc.php

Spacing +4 added lines, -4 removed lines

@@ -1,11 +1,11 @@
 <?php
-class DATEPICKER {
-    function __construct() {
+class DATEPICKER{
+    function __construct(){
     }
-    function getDP() {
+    function getDP(){
         $modx = evolutionCMS(); global$_lang;
 
         $tpl = file_get_contents(dirname(__FILE__).'/datepicker.tpl');
-        return $modx->parseText($tpl,$_lang,'[%','%]');
+        return $modx->parseText($tpl, $_lang, '[%', '%]');
     }
 }

Braces +6 added lines, -3 removed lines

@@ -1,8 +1,11 @@
 <?php
-class DATEPICKER {
-    function __construct() {
+class DATEPICKER
+{
+    function __construct()
+    {
     }
-    function getDP() {
+    function getDP()
+    {
         $modx = evolutionCMS(); global$_lang;
 
         $tpl = file_get_contents(dirname(__FILE__).'/datepicker.tpl');

manager/processors/undelete_content.processor.php

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('delete_document')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_REQUEST['id'])? (int)$_REQUEST['id'] : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 /************ webber ********/
@@ -32,14 +32,14 @@ 
 $udperms->role = $_SESSION['mgrRole'];
 
 if(!$udperms->checkPermissions()) {
-	$modx->webAlertAndQuit($_lang["access_permission_denied"]);
+    $modx->webAlertAndQuit($_lang["access_permission_denied"]);
 }
 
 // get the timestamp on which the document was deleted.
 $rs = $modx->db->select('deletedon', $modx->getFullTableName('site_content'), "id='{$id}' AND deleted=1");
 $deltime = $modx->db->getValue($rs);
 if(!$deltime) {
-	$modx->webAlertAndQuit("Couldn't find document to determine it's date of deletion!");
+    $modx->webAlertAndQuit("Couldn't find document to determine it's date of deletion!");
 }
 
 $children = array();
@@ -49,36 +49,36 @@ 
  */
 function getChildren($parent) {
 
-	$modx = evolutionCMS();
-	global $children;
-	global $deltime;
-
-	$rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent='".(int)$parent."' AND deleted=1 AND deletedon='".(int)$deltime."'");
-		// the document has children documents, we'll need to delete those too
-		while ($row=$modx->db->getRow($rs)) {
-			$children[] = $row['id'];
-			getChildren($row['id']);
-			//echo "Found childNode of parentNode $parent: ".$row['id']."<br />";
-		}
+    $modx = evolutionCMS();
+    global $children;
+    global $deltime;
+
+    $rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent='".(int)$parent."' AND deleted=1 AND deletedon='".(int)$deltime."'");
+        // the document has children documents, we'll need to delete those too
+        while ($row=$modx->db->getRow($rs)) {
+            $children[] = $row['id'];
+            getChildren($row['id']);
+            //echo "Found childNode of parentNode $parent: ".$row['id']."<br />";
+        }
 }
 
 getChildren($id);
 
 if(count($children)>0) {
-	$modx->db->update(
-		array(
-			'deleted'   => 0,
-			'deletedby' => 0,
-			'deletedon' => 0,
-		), $modx->getFullTableName('site_content'), "id IN(".implode(", ", $children).")");
+    $modx->db->update(
+        array(
+            'deleted'   => 0,
+            'deletedby' => 0,
+            'deletedon' => 0,
+        ), $modx->getFullTableName('site_content'), "id IN(".implode(", ", $children).")");
 }
 //'undelete' the document.
 $modx->db->update(
-	array(
-		'deleted'   => 0,
-		'deletedby' => 0,
-		'deletedon' => 0,
-	), $modx->getFullTableName('site_content'), "id='{$id}'");
+    array(
+        'deleted'   => 0,
+        'deletedby' => 0,
+        'deletedon' => 0,
+    ), $modx->getFullTableName('site_content'), "id='{$id}'");
 
 $modx->invokeEvent("OnDocFormUnDelete",
     array(

Spacing +18 added lines, -18 removed lines

@@ -1,44 +1,44 @@ 
 <?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"]);
 }
 
-$id = isset($_REQUEST['id'])? (int)$_REQUEST['id'] : 0;
-if($id==0) {
+$id = isset($_REQUEST['id']) ? (int) $_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"]);
 }
 
 // get the timestamp on which the document was deleted.
 $rs = $modx->db->select('deletedon', $modx->getFullTableName('site_content'), "id='{$id}' AND deleted=1");
 $deltime = $modx->db->getValue($rs);
-if(!$deltime) {
+if (!$deltime) {
 	$modx->webAlertAndQuit("Couldn't find document to determine it's date of deletion!");
 }
 
@@ -47,15 +47,15 @@ 
 /**
  * @param int $parent
  */
-function getChildren($parent) {
+function getChildren($parent){
 
 	$modx = evolutionCMS();
 	global $children;
 	global $deltime;
 
-	$rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent='".(int)$parent."' AND deleted=1 AND deletedon='".(int)$deltime."'");
+	$rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent='".(int) $parent."' AND deleted=1 AND deletedon='".(int) $deltime."'");
 		// the document has children documents, we'll need to delete those too
-		while ($row=$modx->db->getRow($rs)) {
+		while ($row = $modx->db->getRow($rs)) {
 			$children[] = $row['id'];
 			getChildren($row['id']);
 			//echo "Found childNode of parentNode $parent: ".$row['id']."<br />";
@@ -64,7 +64,7 @@ 
 
 getChildren($id);
 
-if(count($children)>0) {
+if (count($children) > 0) {
 	$modx->db->update(
 		array(
 			'deleted'   => 0,
@@ -93,5 +93,5 @@ 
 $modx->clearCache('full');
 
 // finished emptying cache - redirect
-$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);

Braces +2 added lines, -1 removed lines

@@ -47,7 +47,8 @@
 /**
  * @param int $parent
  */
-function getChildren($parent) {
+function getChildren($parent)
+{
 
 	$modx = evolutionCMS();
 	global $children;