Inspection of "Merge pull request #568 from bossloper/patch-46" - evolution-cms/evolution - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — develop ( af3527...fe939b )

by Dmytro

created 2018-03-12 10:57 UTC

Status

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

@@ -4,237 +4,237 @@  discard block
 block discarded – undo
 */
 
 $sitemenu['bars'] = array(
-	'bars',
-	'main',
-	'<i class="fa fa-bars"></i>',
-	'javascript:;',
-	$_lang['home'],
-	'modx.resizer.toggle(); return false;',
-	' return false;',
-	'',
-	0,
-	10,
-	''
+    'bars',
+    'main',
+    '<i class="fa fa-bars"></i>',
+    'javascript:;',
+    $_lang['home'],
+    'modx.resizer.toggle(); return false;',
+    ' return false;',
+    '',
+    0,
+    10,
+    ''
 );
 
 //mainMenu
 $sitemenu['site'] = array(
-	'site',
-	'main',
-	'<i class="fa fa-tachometer"></i>' . $_lang['home'],
-	'index.php?a=2',
-	$_lang['home'],
-	'',
-	'',
-	'main',
-	0,
-	10,
-	'active'
+    'site',
+    'main',
+    '<i class="fa fa-tachometer"></i>' . $_lang['home'],
+    'index.php?a=2',
+    $_lang['home'],
+    '',
+    '',
+    'main',
+    0,
+    10,
+    'active'
 );
 
 if($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('file_manager')) {
-	$sitemenu['elements'] = array(
-		'elements',
-		'main',
-		'<i class="fa fa-th"></i>' . $_lang['elements'],
-		'javascript:;',
-		$_lang['elements'],
-		' return false;',
-		'',
-		'',
-		0,
-		20,
-		''
-	);
+    $sitemenu['elements'] = array(
+        'elements',
+        'main',
+        '<i class="fa fa-th"></i>' . $_lang['elements'],
+        'javascript:;',
+        $_lang['elements'],
+        ' return false;',
+        '',
+        '',
+        0,
+        20,
+        ''
+    );
 }
 
 if($modx->hasPermission('exec_module')) {
-	$sitemenu['modules'] = array(
-		'modules',
-		'main',
-		'<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['modules'],
-		'javascript:;',
-		$_lang['modules'],
-		' return false;',
-		'',
-		'',
-		0,
-		30,
-		''
-	);
+    $sitemenu['modules'] = array(
+        'modules',
+        'main',
+        '<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['modules'],
+        'javascript:;',
+        $_lang['modules'],
+        ' return false;',
+        '',
+        '',
+        0,
+        30,
+        ''
+    );
 }
 
 if($modx->hasPermission('edit_user') || $modx->hasPermission('edit_web_user') || $modx->hasPermission('edit_role') || $modx->hasPermission('access_permissions') || $modx->hasPermission('web_access_permissions')) {
-	$sitemenu['users'] = array(
-		'users',
-		'main',
-		'<i class="fa fa-users"></i>' . $_lang['users'],
-		'javascript:;',
-		$_lang['users'],
-		' return false;',
-		'edit_user',
-		'',
-		0,
-		40,
-		''
-	);
+    $sitemenu['users'] = array(
+        'users',
+        'main',
+        '<i class="fa fa-users"></i>' . $_lang['users'],
+        'javascript:;',
+        $_lang['users'],
+        ' return false;',
+        'edit_user',
+        '',
+        0,
+        40,
+        ''
+    );
 }
 
 if($modx->hasPermission('empty_cache') || $modx->hasPermission('bk_manager') || $modx->hasPermission('remove_locks') || $modx->hasPermission('import_static') || $modx->hasPermission('export_static')) {
-	$sitemenu['tools'] = array(
-		'tools',
-		'main',
-		'<i class="fa fa-wrench"></i>' . $_lang['tools'],
-		'javascript:;',
-		$_lang['tools'],
-		' return false;',
-		'',
-		'',
-		0,
-		50,
-		''
-	);
+    $sitemenu['tools'] = array(
+        'tools',
+        'main',
+        '<i class="fa fa-wrench"></i>' . $_lang['tools'],
+        'javascript:;',
+        $_lang['tools'],
+        ' return false;',
+        '',
+        '',
+        0,
+        50,
+        ''
+    );
 }
 
 $tab = 0;
 if($modx->hasPermission('edit_template')) {
-	$sitemenu['element_templates'] = array(
-		'element_templates',
-		'elements',
-		'<i class="fa fa-newspaper-o"></i>' . $_lang['manage_templates'] . '<i class="fa fa-angle-right toggle"></i>',
-		'index.php?a=76&tab=' . $tab++,
-		$_lang['manage_templates'],
-		'',
-		'new_template,edit_template',
-		'main',
-		0,
-		10,
-		'dropdown-toggle'
-	);
+    $sitemenu['element_templates'] = array(
+        'element_templates',
+        'elements',
+        '<i class="fa fa-newspaper-o"></i>' . $_lang['manage_templates'] . '<i class="fa fa-angle-right toggle"></i>',
+        'index.php?a=76&tab=' . $tab++,
+        $_lang['manage_templates'],
+        '',
+        'new_template,edit_template',
+        'main',
+        0,
+        10,
+        'dropdown-toggle'
+    );
 }
 if($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
-	$sitemenu['element_tplvars'] = array(
-		'element_tplvars',
-		'elements',
-		'<i class="fa fa-list-alt"></i>' . $_lang['tmplvars'] . '<i class="fa fa-angle-right toggle"></i>',
-		'index.php?a=76&tab=' . $tab++,
-		$_lang['tmplvars'],
-		'',
-		'new_template,edit_template',
-		'main',
-		0,
-		20,
-		'dropdown-toggle'
-	);
+    $sitemenu['element_tplvars'] = array(
+        'element_tplvars',
+        'elements',
+        '<i class="fa fa-list-alt"></i>' . $_lang['tmplvars'] . '<i class="fa fa-angle-right toggle"></i>',
+        'index.php?a=76&tab=' . $tab++,
+        $_lang['tmplvars'],
+        '',
+        'new_template,edit_template',
+        'main',
+        0,
+        20,
+        'dropdown-toggle'
+    );
 }
 if($modx->hasPermission('edit_chunk')) {
-	$sitemenu['element_htmlsnippets'] = array(
-		'element_htmlsnippets',
-		'elements',
-		'<i class="fa fa-th-large"></i>' . $_lang['manage_htmlsnippets'] . '<i class="fa fa-angle-right toggle"></i>',
-		'index.php?a=76&tab=' . $tab++,
-		$_lang['manage_htmlsnippets'],
-		'',
-		'new_chunk,edit_chunk',
-		'main',
-		0,
-		30,
-		'dropdown-toggle'
-	);
+    $sitemenu['element_htmlsnippets'] = array(
+        'element_htmlsnippets',
+        'elements',
+        '<i class="fa fa-th-large"></i>' . $_lang['manage_htmlsnippets'] . '<i class="fa fa-angle-right toggle"></i>',
+        'index.php?a=76&tab=' . $tab++,
+        $_lang['manage_htmlsnippets'],
+        '',
+        'new_chunk,edit_chunk',
+        'main',
+        0,
+        30,
+        'dropdown-toggle'
+    );
 }
 if($modx->hasPermission('edit_snippet')) {
-	$sitemenu['element_snippets'] = array(
-		'element_snippets',
-		'elements',
-		'<i class="fa fa-code"></i>' . $_lang['manage_snippets'] . '<i class="fa fa-angle-right toggle"></i>',
-		'index.php?a=76&tab=' . $tab++,
-		$_lang['manage_snippets'],
-		'',
-		'new_snippet,edit_snippet',
-		'main',
-		0,
-		40,
-		'dropdown-toggle'
-	);
+    $sitemenu['element_snippets'] = array(
+        'element_snippets',
+        'elements',
+        '<i class="fa fa-code"></i>' . $_lang['manage_snippets'] . '<i class="fa fa-angle-right toggle"></i>',
+        'index.php?a=76&tab=' . $tab++,
+        $_lang['manage_snippets'],
+        '',
+        'new_snippet,edit_snippet',
+        'main',
+        0,
+        40,
+        'dropdown-toggle'
+    );
 }
 if($modx->hasPermission('edit_plugin')) {
-	$sitemenu['element_plugins'] = array(
-		'element_plugins',
-		'elements',
-		'<i class="fa fa-plug"></i>' . $_lang['manage_plugins'] . '<i class="fa fa-angle-right toggle"></i>',
-		'index.php?a=76&tab=' . $tab++,
-		$_lang['manage_plugins'],
-		'',
-		'new_plugin,edit_plugin',
-		'main',
-		0,
-		50,
-		'dropdown-toggle'
-	);
+    $sitemenu['element_plugins'] = array(
+        'element_plugins',
+        'elements',
+        '<i class="fa fa-plug"></i>' . $_lang['manage_plugins'] . '<i class="fa fa-angle-right toggle"></i>',
+        'index.php?a=76&tab=' . $tab++,
+        $_lang['manage_plugins'],
+        '',
+        'new_plugin,edit_plugin',
+        'main',
+        0,
+        50,
+        'dropdown-toggle'
+    );
 }
 //$sitemenu['element_categories']     = array('element_categories','elements',$_lang['element_categories'],'index.php?a=76&tab=5',$_lang['element_categories'],'','new_template,edit_template,new_snippet,edit_snippet,new_chunk,edit_chunk,new_plugin,edit_plugin','main',1,60,'');
 
 if($modx->hasPermission('file_manager')) {
-	$sitemenu['manage_files'] = array(
-		'manage_files',
-		'elements',
-		'<i class="fa fa-folder-open-o"></i>' . $_lang['manage_files'],
-		'index.php?a=31',
-		$_lang['manage_files'],
-		'',
-		'file_manager',
-		'main',
-		0,
-		70,
-		''
-	);
+    $sitemenu['manage_files'] = array(
+        'manage_files',
+        'elements',
+        '<i class="fa fa-folder-open-o"></i>' . $_lang['manage_files'],
+        'index.php?a=31',
+        $_lang['manage_files'],
+        '',
+        'file_manager',
+        'main',
+        0,
+        70,
+        ''
+    );
 }
 if($modx->hasPermission('category_manager')) {
-	$sitemenu['manage_categories'] = array(
-		'manage_categories',
-		'elements',
-		'<i class="fa fa-object-group"></i>' . $_lang['manage_categories'],
-		'index.php?a=120',
-		$_lang['manage_categories'],
-		'',
-		'category_manager',
-		'main',
-		0,
-		80,
-		''
-	);
+    $sitemenu['manage_categories'] = array(
+        'manage_categories',
+        'elements',
+        '<i class="fa fa-object-group"></i>' . $_lang['manage_categories'],
+        'index.php?a=120',
+        $_lang['manage_categories'],
+        '',
+        'category_manager',
+        'main',
+        0,
+        80,
+        ''
+    );
 }
 
 // Modules Menu Items
 if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('save_module')) {
-	$sitemenu['new_module'] = array(
-		'new_module',
-		'modules',
-		'<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['module_management'],
-		'index.php?a=106',
-		$_lang['module_management'],
-		'',
-		'new_module,edit_module',
-		'main',
-		1,
-		0,
-		''
-	);
+    $sitemenu['new_module'] = array(
+        'new_module',
+        'modules',
+        '<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['module_management'],
+        'index.php?a=106',
+        $_lang['module_management'],
+        '',
+        'new_module,edit_module',
+        'main',
+        1,
+        0,
+        ''
+    );
 }
 
 if($modx->hasPermission('exec_module')) {
-	if($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
-		$rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, sm.icon, mg.member
+    if($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
+        $rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, sm.icon, mg.member
 				FROM ' . $modx->getFullTableName('site_modules') . ' AS sm
 				LEFT JOIN ' . $modx->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id
 				LEFT JOIN ' . $modx->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group
                 WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID() . ') AND sm.disabled != 1 AND sm.locked != 1
                 ORDER BY sm.name');
-	} else {
-		$rs = $modx->db->select('*', $modx->getFullTableName('site_modules'), 'disabled != 1', 'name');
-	}
-	if($modx->db->getRecordCount($rs)) {
-	    while ($row = $modx->db->getRow($rs)) {
+    } else {
+        $rs = $modx->db->select('*', $modx->getFullTableName('site_modules'), 'disabled != 1', 'name');
+    }
+    if($modx->db->getRecordCount($rs)) {
+        while ($row = $modx->db->getRow($rs)) {
             $sitemenu['module' . $row['id']] = array(
                 'module' . $row['id'],
                 'modules',
@@ -255,83 +255,83 @@  discard block
 block discarded – undo
 // security menu items (users)
 
 if($modx->hasPermission('edit_user')) {
-	$sitemenu['user_management_title'] = array(
-		'user_management_title',
-		'users',
-		'<i class="fa fa fa-user"></i>' . $_lang['user_management_title'] . '<i class="fa fa-angle-right toggle"></i>',
-		'index.php?a=75',
-		$_lang['user_management_title'],
-		'',
-		'edit_user',
-		'main',
-		0,
-		10,
-		'dropdown-toggle'
-	);
+    $sitemenu['user_management_title'] = array(
+        'user_management_title',
+        'users',
+        '<i class="fa fa fa-user"></i>' . $_lang['user_management_title'] . '<i class="fa fa-angle-right toggle"></i>',
+        'index.php?a=75',
+        $_lang['user_management_title'],
+        '',
+        'edit_user',
+        'main',
+        0,
+        10,
+        'dropdown-toggle'
+    );
 }
 
 if($modx->hasPermission('edit_web_user')) {
-	$sitemenu['web_user_management_title'] = array(
-		'web_user_management_title',
-		'users',
-		'<i class="fa fa-users"></i>' . $_lang['web_user_management_title'] . '<i class="fa fa-angle-right toggle"></i>',
-		'index.php?a=99',
-		$_lang['web_user_management_title'],
-		'',
-		'edit_web_user',
-		'main',
-		0,
-		20,
-		'dropdown-toggle'
-	);
+    $sitemenu['web_user_management_title'] = array(
+        'web_user_management_title',
+        'users',
+        '<i class="fa fa-users"></i>' . $_lang['web_user_management_title'] . '<i class="fa fa-angle-right toggle"></i>',
+        'index.php?a=99',
+        $_lang['web_user_management_title'],
+        '',
+        'edit_web_user',
+        'main',
+        0,
+        20,
+        'dropdown-toggle'
+    );
 }
 
 if($modx->hasPermission('edit_role')) {
-	$sitemenu['role_management_title'] = array(
-		'role_management_title',
-		'users',
-		'<i class="fa fa-legal"></i>' . $_lang['role_management_title'],
-		'index.php?a=86',
-		$_lang['role_management_title'],
-		'',
-		'new_role,edit_role,delete_role',
-		'main',
-		0,
-		30,
-		''
-	);
+    $sitemenu['role_management_title'] = array(
+        'role_management_title',
+        'users',
+        '<i class="fa fa-legal"></i>' . $_lang['role_management_title'],
+        'index.php?a=86',
+        $_lang['role_management_title'],
+        '',
+        'new_role,edit_role,delete_role',
+        'main',
+        0,
+        30,
+        ''
+    );
 }
 
 if($modx->hasPermission('access_permissions')) {
-	$sitemenu['manager_permissions'] = array(
-		'manager_permissions',
-		'users',
-		'<i class="fa fa-male"></i>' . $_lang['manager_permissions'],
-		'index.php?a=40',
-		$_lang['manager_permissions'],
-		'',
-		'access_permissions',
-		'main',
-		0,
-		40,
-		''
-	);
+    $sitemenu['manager_permissions'] = array(
+        'manager_permissions',
+        'users',
+        '<i class="fa fa-male"></i>' . $_lang['manager_permissions'],
+        'index.php?a=40',
+        $_lang['manager_permissions'],
+        '',
+        'access_permissions',
+        'main',
+        0,
+        40,
+        ''
+    );
 }
 
 if($modx->hasPermission('web_access_permissions')) {
-	$sitemenu['web_permissions'] = array(
-		'web_permissions',
-		'users',
-		'<i class="fa fa-universal-access"></i>' . $_lang['web_permissions'],
-		'index.php?a=91',
-		$_lang['web_permissions'],
-		'',
-		'web_access_permissions',
-		'main',
-		0,
-		50,
-		''
-	);
+    $sitemenu['web_permissions'] = array(
+        'web_permissions',
+        'users',
+        '<i class="fa fa-universal-access"></i>' . $_lang['web_permissions'],
+        'index.php?a=91',
+        $_lang['web_permissions'],
+        '',
+        'web_access_permissions',
+        'main',
+        0,
+        50,
+        ''
+    );
 }
 
 // Tools Menu
@@ -361,104 +361,104 @@  discard block
 block discarded – undo
 );
 
 $sitemenu['search'] = array(
-	'search',
-	'tools',
-	'<i class="fa fa-search"></i>' . $_lang['search'],
-	'index.php?a=71',
-	$_lang['search'],
-	'',
-	'',
-	'main',
-	1,
-	9,
-	''
+    'search',
+    'tools',
+    '<i class="fa fa-search"></i>' . $_lang['search'],
+    'index.php?a=71',
+    $_lang['search'],
+    '',
+    '',
+    'main',
+    1,
+    9,
+    ''
 );
 
 if($modx->hasPermission('bk_manager')) {
-	$sitemenu['bk_manager'] = array(
-		'bk_manager',
-		'tools',
-		'<i class="fa fa-database"></i>' . $_lang['bk_manager'],
-		'index.php?a=93',
-		$_lang['bk_manager'],
-		'',
-		'bk_manager',
-		'main',
-		0,
-		10,
-		''
-	);
+    $sitemenu['bk_manager'] = array(
+        'bk_manager',
+        'tools',
+        '<i class="fa fa-database"></i>' . $_lang['bk_manager'],
+        'index.php?a=93',
+        $_lang['bk_manager'],
+        '',
+        'bk_manager',
+        'main',
+        0,
+        10,
+        ''
+    );
 }
 
 if($modx->hasPermission('remove_locks')) {
-	$sitemenu['remove_locks'] = array(
-		'remove_locks',
-		'tools',
-		'<i class="fa fa-hourglass"></i>' . $_lang['remove_locks'],
-		'javascript:modx.removeLocks();',
-		$_lang['remove_locks'],
-		'',
-		'remove_locks',
-		'',
-		0,
-		20,
-		''
-	);
+    $sitemenu['remove_locks'] = array(
+        'remove_locks',
+        'tools',
+        '<i class="fa fa-hourglass"></i>' . $_lang['remove_locks'],
+        'javascript:modx.removeLocks();',
+        $_lang['remove_locks'],
+        '',
+        'remove_locks',
+        '',
+        0,
+        20,
+        ''
+    );
 }
 
 if($modx->hasPermission('import_static')) {
-	$sitemenu['import_site'] = array(
-		'import_site',
-		'tools',
-		'<i class="fa fa-upload"></i>' . $_lang['import_site'],
-		'index.php?a=95',
-		$_lang['import_site'],
-		'',
-		'import_static',
-		'main',
-		0,
-		30,
-		''
-	);
+    $sitemenu['import_site'] = array(
+        'import_site',
+        'tools',
+        '<i class="fa fa-upload"></i>' . $_lang['import_site'],
+        'index.php?a=95',
+        $_lang['import_site'],
+        '',
+        'import_static',
+        'main',
+        0,
+        30,
+        ''
+    );
 }
 
 if($modx->hasPermission('export_static')) {
-	$sitemenu['export_site'] = array(
-		'export_site',
-		'tools',
-		'<i class="fa fa-download"></i>' . $_lang['export_site'],
-		'index.php?a=83',
-		$_lang['export_site'],
-		'',
-		'export_static',
-		'main',
-		1,
-		40,
-		''
-	);
+    $sitemenu['export_site'] = array(
+        'export_site',
+        'tools',
+        '<i class="fa fa-download"></i>' . $_lang['export_site'],
+        'index.php?a=83',
+        $_lang['export_site'],
+        '',
+        'export_static',
+        'main',
+        1,
+        40,
+        ''
+    );
 }
 
 $menu = $modx->invokeEvent("OnManagerMenuPrerender", array('menu' => $sitemenu));
 if(is_array($menu)) {
-	$newmenu = array();
-	foreach($menu as $item){
-		if(is_array(unserialize($item))){
-			$newmenu = array_merge($newmenu, unserialize($item));
-		}
-	}
-	if(count($newmenu)> 0) $sitemenu = $newmenu;
+    $newmenu = array();
+    foreach($menu as $item){
+        if(is_array(unserialize($item))){
+            $newmenu = array_merge($newmenu, unserialize($item));
+        }
+    }
+    if(count($newmenu)> 0) $sitemenu = $newmenu;
 }
 
 if(file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php')) {
-	include_once(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php');
+    include_once(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php');
 } else {
-	include_once(MODX_MANAGER_PATH . 'includes/menu.class.inc.php');
+    include_once(MODX_MANAGER_PATH . 'includes/menu.class.inc.php');
 }
 $menu = new EVOmenu();
 $menu->Build($sitemenu, array(
-	'outerClass' => 'nav',
-	'innerClass' => 'dropdown-menu',
-	'parentClass' => 'dropdown',
+    'outerClass' => 'nav',
+    'innerClass' => 'dropdown-menu',
+    'parentClass' => 'dropdown',
     'parentLinkClass' => 'dropdown-toggle',
     'parentLinkAttr' => '',
     'parentLinkIn' => ''

Please login to merge, or discard this patch.

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

@@ -21,7 +21,7 @@  discard block
 block discarded – undo
 $sitemenu['site'] = array(
 	'site',
 	'main',
-	'<i class="fa fa-tachometer"></i>' . $_lang['home'],
+	'<i class="fa fa-tachometer"></i>'.$_lang['home'],
 	'index.php?a=2',
 	$_lang['home'],
 	'',
@@ -32,11 +32,11 @@  discard block
 block discarded – undo
 	'active'
 );
 
-if($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('file_manager')) {
+if ($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('file_manager')) {
 	$sitemenu['elements'] = array(
 		'elements',
 		'main',
-		'<i class="fa fa-th"></i>' . $_lang['elements'],
+		'<i class="fa fa-th"></i>'.$_lang['elements'],
 		'javascript:;',
 		$_lang['elements'],
 		' return false;',
@@ -48,11 +48,11 @@  discard block
 block discarded – undo
 	);
 }
 
-if($modx->hasPermission('exec_module')) {
+if ($modx->hasPermission('exec_module')) {
 	$sitemenu['modules'] = array(
 		'modules',
 		'main',
-		'<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['modules'],
+		'<i class="'.$_style['icons_modules'].'"></i>'.$_lang['modules'],
 		'javascript:;',
 		$_lang['modules'],
 		' return false;',
@@ -64,11 +64,11 @@  discard block
 block discarded – undo
 	);
 }
 
-if($modx->hasPermission('edit_user') || $modx->hasPermission('edit_web_user') || $modx->hasPermission('edit_role') || $modx->hasPermission('access_permissions') || $modx->hasPermission('web_access_permissions')) {
+if ($modx->hasPermission('edit_user') || $modx->hasPermission('edit_web_user') || $modx->hasPermission('edit_role') || $modx->hasPermission('access_permissions') || $modx->hasPermission('web_access_permissions')) {
 	$sitemenu['users'] = array(
 		'users',
 		'main',
-		'<i class="fa fa-users"></i>' . $_lang['users'],
+		'<i class="fa fa-users"></i>'.$_lang['users'],
 		'javascript:;',
 		$_lang['users'],
 		' return false;',
@@ -80,11 +80,11 @@  discard block
 block discarded – undo
 	);
 }
 
-if($modx->hasPermission('empty_cache') || $modx->hasPermission('bk_manager') || $modx->hasPermission('remove_locks') || $modx->hasPermission('import_static') || $modx->hasPermission('export_static')) {
+if ($modx->hasPermission('empty_cache') || $modx->hasPermission('bk_manager') || $modx->hasPermission('remove_locks') || $modx->hasPermission('import_static') || $modx->hasPermission('export_static')) {
 	$sitemenu['tools'] = array(
 		'tools',
 		'main',
-		'<i class="fa fa-wrench"></i>' . $_lang['tools'],
+		'<i class="fa fa-wrench"></i>'.$_lang['tools'],
 		'javascript:;',
 		$_lang['tools'],
 		' return false;',
@@ -97,12 +97,12 @@  discard block
 block discarded – undo
 }
 
 $tab = 0;
-if($modx->hasPermission('edit_template')) {
+if ($modx->hasPermission('edit_template')) {
 	$sitemenu['element_templates'] = array(
 		'element_templates',
 		'elements',
-		'<i class="fa fa-newspaper-o"></i>' . $_lang['manage_templates'] . '<i class="fa fa-angle-right toggle"></i>',
-		'index.php?a=76&tab=' . $tab++,
+		'<i class="fa fa-newspaper-o"></i>'.$_lang['manage_templates'].'<i class="fa fa-angle-right toggle"></i>',
+		'index.php?a=76&tab='.$tab++,
 		$_lang['manage_templates'],
 		'',
 		'new_template,edit_template',
@@ -112,12 +112,12 @@  discard block
 block discarded – undo
 		'dropdown-toggle'
 	);
 }
-if($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
+if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
 	$sitemenu['element_tplvars'] = array(
 		'element_tplvars',
 		'elements',
-		'<i class="fa fa-list-alt"></i>' . $_lang['tmplvars'] . '<i class="fa fa-angle-right toggle"></i>',
-		'index.php?a=76&tab=' . $tab++,
+		'<i class="fa fa-list-alt"></i>'.$_lang['tmplvars'].'<i class="fa fa-angle-right toggle"></i>',
+		'index.php?a=76&tab='.$tab++,
 		$_lang['tmplvars'],
 		'',
 		'new_template,edit_template',
@@ -127,12 +127,12 @@  discard block
 block discarded – undo
 		'dropdown-toggle'
 	);
 }
-if($modx->hasPermission('edit_chunk')) {
+if ($modx->hasPermission('edit_chunk')) {
 	$sitemenu['element_htmlsnippets'] = array(
 		'element_htmlsnippets',
 		'elements',
-		'<i class="fa fa-th-large"></i>' . $_lang['manage_htmlsnippets'] . '<i class="fa fa-angle-right toggle"></i>',
-		'index.php?a=76&tab=' . $tab++,
+		'<i class="fa fa-th-large"></i>'.$_lang['manage_htmlsnippets'].'<i class="fa fa-angle-right toggle"></i>',
+		'index.php?a=76&tab='.$tab++,
 		$_lang['manage_htmlsnippets'],
 		'',
 		'new_chunk,edit_chunk',
@@ -142,12 +142,12 @@  discard block
 block discarded – undo
 		'dropdown-toggle'
 	);
 }
-if($modx->hasPermission('edit_snippet')) {
+if ($modx->hasPermission('edit_snippet')) {
 	$sitemenu['element_snippets'] = array(
 		'element_snippets',
 		'elements',
-		'<i class="fa fa-code"></i>' . $_lang['manage_snippets'] . '<i class="fa fa-angle-right toggle"></i>',
-		'index.php?a=76&tab=' . $tab++,
+		'<i class="fa fa-code"></i>'.$_lang['manage_snippets'].'<i class="fa fa-angle-right toggle"></i>',
+		'index.php?a=76&tab='.$tab++,
 		$_lang['manage_snippets'],
 		'',
 		'new_snippet,edit_snippet',
@@ -157,12 +157,12 @@  discard block
 block discarded – undo
 		'dropdown-toggle'
 	);
 }
-if($modx->hasPermission('edit_plugin')) {
+if ($modx->hasPermission('edit_plugin')) {
 	$sitemenu['element_plugins'] = array(
 		'element_plugins',
 		'elements',
-		'<i class="fa fa-plug"></i>' . $_lang['manage_plugins'] . '<i class="fa fa-angle-right toggle"></i>',
-		'index.php?a=76&tab=' . $tab++,
+		'<i class="fa fa-plug"></i>'.$_lang['manage_plugins'].'<i class="fa fa-angle-right toggle"></i>',
+		'index.php?a=76&tab='.$tab++,
 		$_lang['manage_plugins'],
 		'',
 		'new_plugin,edit_plugin',
@@ -174,11 +174,11 @@  discard block
 block discarded – undo
 }
 //$sitemenu['element_categories']     = array('element_categories','elements',$_lang['element_categories'],'index.php?a=76&tab=5',$_lang['element_categories'],'','new_template,edit_template,new_snippet,edit_snippet,new_chunk,edit_chunk,new_plugin,edit_plugin','main',1,60,'');
 
-if($modx->hasPermission('file_manager')) {
+if ($modx->hasPermission('file_manager')) {
 	$sitemenu['manage_files'] = array(
 		'manage_files',
 		'elements',
-		'<i class="fa fa-folder-open-o"></i>' . $_lang['manage_files'],
+		'<i class="fa fa-folder-open-o"></i>'.$_lang['manage_files'],
 		'index.php?a=31',
 		$_lang['manage_files'],
 		'',
@@ -189,11 +189,11 @@  discard block
 block discarded – undo
 		''
 	);
 }
-if($modx->hasPermission('category_manager')) {
+if ($modx->hasPermission('category_manager')) {
 	$sitemenu['manage_categories'] = array(
 		'manage_categories',
 		'elements',
-		'<i class="fa fa-object-group"></i>' . $_lang['manage_categories'],
+		'<i class="fa fa-object-group"></i>'.$_lang['manage_categories'],
 		'index.php?a=120',
 		$_lang['manage_categories'],
 		'',
@@ -206,11 +206,11 @@  discard block
 block discarded – undo
 }
 
 // Modules Menu Items
-if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('save_module')) {
+if ($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('save_module')) {
 	$sitemenu['new_module'] = array(
 		'new_module',
 		'modules',
-		'<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['module_management'],
+		'<i class="'.$_style['icons_modules'].'"></i>'.$_lang['module_management'],
 		'index.php?a=106',
 		$_lang['module_management'],
 		'',
@@ -222,24 +222,24 @@  discard block
 block discarded – undo
 	);
 }
 
-if($modx->hasPermission('exec_module')) {
-	if($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
+if ($modx->hasPermission('exec_module')) {
+	if ($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
 		$rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, sm.icon, mg.member
-				FROM ' . $modx->getFullTableName('site_modules') . ' AS sm
-				LEFT JOIN ' . $modx->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id
-				LEFT JOIN ' . $modx->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group
-                WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID() . ') AND sm.disabled != 1 AND sm.locked != 1
+				FROM ' . $modx->getFullTableName('site_modules').' AS sm
+				LEFT JOIN ' . $modx->getFullTableName('site_module_access').' AS sma ON sma.module = sm.id
+				LEFT JOIN ' . $modx->getFullTableName('member_groups').' AS mg ON sma.usergroup = mg.user_group
+                WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID().') AND sm.disabled != 1 AND sm.locked != 1
                 ORDER BY sm.name');
 	} else {
 		$rs = $modx->db->select('*', $modx->getFullTableName('site_modules'), 'disabled != 1', 'name');
 	}
-	if($modx->db->getRecordCount($rs)) {
+	if ($modx->db->getRecordCount($rs)) {
 	    while ($row = $modx->db->getRow($rs)) {
-            $sitemenu['module' . $row['id']] = array(
-                'module' . $row['id'],
+            $sitemenu['module'.$row['id']] = array(
+                'module'.$row['id'],
                 'modules',
-                ($row['icon'] != '' ? '<i class="'.$row['icon'].'"></i>' : '<i class="'.$_style['icons_module'].'"></i>') . $row['name'],
-                'index.php?a=112&id=' . $row['id'],
+                ($row['icon'] != '' ? '<i class="'.$row['icon'].'"></i>' : '<i class="'.$_style['icons_module'].'"></i>').$row['name'],
+                'index.php?a=112&id='.$row['id'],
                 $row['name'],
                 '',
                 '',
@@ -254,11 +254,11 @@  discard block
 block discarded – undo
 
 // security menu items (users)
 
-if($modx->hasPermission('edit_user')) {
+if ($modx->hasPermission('edit_user')) {
 	$sitemenu['user_management_title'] = array(
 		'user_management_title',
 		'users',
-		'<i class="fa fa fa-user"></i>' . $_lang['user_management_title'] . '<i class="fa fa-angle-right toggle"></i>',
+		'<i class="fa fa fa-user"></i>'.$_lang['user_management_title'].'<i class="fa fa-angle-right toggle"></i>',
 		'index.php?a=75',
 		$_lang['user_management_title'],
 		'',
@@ -270,11 +270,11 @@  discard block
 block discarded – undo
 	);
 }
 
-if($modx->hasPermission('edit_web_user')) {
+if ($modx->hasPermission('edit_web_user')) {
 	$sitemenu['web_user_management_title'] = array(
 		'web_user_management_title',
 		'users',
-		'<i class="fa fa-users"></i>' . $_lang['web_user_management_title'] . '<i class="fa fa-angle-right toggle"></i>',
+		'<i class="fa fa-users"></i>'.$_lang['web_user_management_title'].'<i class="fa fa-angle-right toggle"></i>',
 		'index.php?a=99',
 		$_lang['web_user_management_title'],
 		'',
@@ -286,11 +286,11 @@  discard block
 block discarded – undo
 	);
 }
 
-if($modx->hasPermission('edit_role')) {
+if ($modx->hasPermission('edit_role')) {
 	$sitemenu['role_management_title'] = array(
 		'role_management_title',
 		'users',
-		'<i class="fa fa-legal"></i>' . $_lang['role_management_title'],
+		'<i class="fa fa-legal"></i>'.$_lang['role_management_title'],
 		'index.php?a=86',
 		$_lang['role_management_title'],
 		'',
@@ -302,11 +302,11 @@  discard block
 block discarded – undo
 	);
 }
 
-if($modx->hasPermission('access_permissions')) {
+if ($modx->hasPermission('access_permissions')) {
 	$sitemenu['manager_permissions'] = array(
 		'manager_permissions',
 		'users',
-		'<i class="fa fa-male"></i>' . $_lang['manager_permissions'],
+		'<i class="fa fa-male"></i>'.$_lang['manager_permissions'],
 		'index.php?a=40',
 		$_lang['manager_permissions'],
 		'',
@@ -318,11 +318,11 @@  discard block
 block discarded – undo
 	);
 }
 
-if($modx->hasPermission('web_access_permissions')) {
+if ($modx->hasPermission('web_access_permissions')) {
 	$sitemenu['web_permissions'] = array(
 		'web_permissions',
 		'users',
-		'<i class="fa fa-universal-access"></i>' . $_lang['web_permissions'],
+		'<i class="fa fa-universal-access"></i>'.$_lang['web_permissions'],
 		'index.php?a=91',
 		$_lang['web_permissions'],
 		'',
@@ -339,7 +339,7 @@  discard block
 block discarded – undo
 $sitemenu['refresh_site'] = array(
     'refresh_site',
     'tools',
-    '<i class="fa fa-recycle"></i>' . $_lang['refresh_site'],
+    '<i class="fa fa-recycle"></i>'.$_lang['refresh_site'],
     'index.php?a=26',
     $_lang['refresh_site'],
     '',
@@ -353,7 +353,7 @@  discard block
 block discarded – undo
             'a', // tag
             'javascript:;', // href
             'btn btn-secondary', // class or btn-success
-            'modx.popup({url:\'index.php?a=26\', title:\'' . $_lang['refresh_site'] . '\', icon: \'fa-recycle\', iframe: \'ajax\', selector: \'.tab-page>.container\', position: \'right top\', width: \'auto\', maxheight: \'50%\', wrap: \'body\' })', // onclick
+            'modx.popup({url:\'index.php?a=26\', title:\''.$_lang['refresh_site'].'\', icon: \'fa-recycle\', iframe: \'ajax\', selector: \'.tab-page>.container\', position: \'right top\', width: \'auto\', maxheight: \'50%\', wrap: \'body\' })', // onclick
             $_lang['refresh_site'], // title
             '<i class="fa fa-recycle"></i>' // innerHTML
         )
@@ -363,7 +363,7 @@  discard block
 block discarded – undo
 $sitemenu['search'] = array(
 	'search',
 	'tools',
-	'<i class="fa fa-search"></i>' . $_lang['search'],
+	'<i class="fa fa-search"></i>'.$_lang['search'],
 	'index.php?a=71',
 	$_lang['search'],
 	'',
@@ -374,11 +374,11 @@  discard block
 block discarded – undo
 	''
 );
 
-if($modx->hasPermission('bk_manager')) {
+if ($modx->hasPermission('bk_manager')) {
 	$sitemenu['bk_manager'] = array(
 		'bk_manager',
 		'tools',
-		'<i class="fa fa-database"></i>' . $_lang['bk_manager'],
+		'<i class="fa fa-database"></i>'.$_lang['bk_manager'],
 		'index.php?a=93',
 		$_lang['bk_manager'],
 		'',
@@ -390,11 +390,11 @@  discard block
 block discarded – undo
 	);
 }
 
-if($modx->hasPermission('remove_locks')) {
+if ($modx->hasPermission('remove_locks')) {
 	$sitemenu['remove_locks'] = array(
 		'remove_locks',
 		'tools',
-		'<i class="fa fa-hourglass"></i>' . $_lang['remove_locks'],
+		'<i class="fa fa-hourglass"></i>'.$_lang['remove_locks'],
 		'javascript:modx.removeLocks();',
 		$_lang['remove_locks'],
 		'',
@@ -406,11 +406,11 @@  discard block
 block discarded – undo
 	);
 }
 
-if($modx->hasPermission('import_static')) {
+if ($modx->hasPermission('import_static')) {
 	$sitemenu['import_site'] = array(
 		'import_site',
 		'tools',
-		'<i class="fa fa-upload"></i>' . $_lang['import_site'],
+		'<i class="fa fa-upload"></i>'.$_lang['import_site'],
 		'index.php?a=95',
 		$_lang['import_site'],
 		'',
@@ -422,11 +422,11 @@  discard block
 block discarded – undo
 	);
 }
 
-if($modx->hasPermission('export_static')) {
+if ($modx->hasPermission('export_static')) {
 	$sitemenu['export_site'] = array(
 		'export_site',
 		'tools',
-		'<i class="fa fa-download"></i>' . $_lang['export_site'],
+		'<i class="fa fa-download"></i>'.$_lang['export_site'],
 		'index.php?a=83',
 		$_lang['export_site'],
 		'',
@@ -439,20 +439,20 @@  discard block
 block discarded – undo
 }
 
 $menu = $modx->invokeEvent("OnManagerMenuPrerender", array('menu' => $sitemenu));
-if(is_array($menu)) {
+if (is_array($menu)) {
 	$newmenu = array();
-	foreach($menu as $item){
-		if(is_array(unserialize($item))){
+	foreach ($menu as $item) {
+		if (is_array(unserialize($item))) {
 			$newmenu = array_merge($newmenu, unserialize($item));
 		}
 	}
-	if(count($newmenu)> 0) $sitemenu = $newmenu;
+	if (count($newmenu) > 0) $sitemenu = $newmenu;
 }
 
-if(file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php')) {
-	include_once(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php');
+if (file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/includes/menu.class.inc.php')) {
+	include_once(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/includes/menu.class.inc.php');
 } else {
-	include_once(MODX_MANAGER_PATH . 'includes/menu.class.inc.php');
+	include_once(MODX_MANAGER_PATH.'includes/menu.class.inc.php');
 }
 $menu = new EVOmenu();
 $menu->Build($sitemenu, array(

Please login to merge, or discard this patch.

		@@ -4,237 +4,237 @@ discard block
		block discarded – undo
4	4	*/
5	5
6	6	$sitemenu['bars'] = array(
7		- 'bars',
8		- 'main',
9		- '<i class="fa fa-bars"></i>',
10		- 'javascript:;',
11		- $_lang['home'],
12		- 'modx.resizer.toggle(); return false;',
13		- ' return false;',
14		- '',
15		- 0,
16		- 10,
17		- ''
	7	+ 'bars',
	8	+ 'main',
	9	+ '<i class="fa fa-bars"></i>',
	10	+ 'javascript:;',
	11	+ $_lang['home'],
	12	+ 'modx.resizer.toggle(); return false;',
	13	+ ' return false;',
	14	+ '',
	15	+ 0,
	16	+ 10,
	17	+ ''
18	18	);
19	19
20	20	//mainMenu
21	21	$sitemenu['site'] = array(
22		- 'site',
23		- 'main',
24		- '<i class="fa fa-tachometer"></i>' . $_lang['home'],
25		- 'index.php?a=2',
26		- $_lang['home'],
27		- '',
28		- '',
29		- 'main',
30		- 0,
31		- 10,
32		- 'active'
	22	+ 'site',
	23	+ 'main',
	24	+ '<i class="fa fa-tachometer"></i>' . $_lang['home'],
	25	+ 'index.php?a=2',
	26	+ $_lang['home'],
	27	+ '',
	28	+ '',
	29	+ 'main',
	30	+ 0,
	31	+ 10,
	32	+ 'active'
33	33	);
34	34
35	35	if($modx->hasPermission('edit_template') \|\| $modx->hasPermission('edit_snippet') \|\| $modx->hasPermission('edit_chunk') \|\| $modx->hasPermission('edit_plugin') \|\| $modx->hasPermission('file_manager')) {
36		- $sitemenu['elements'] = array(
37		- 'elements',
38		- 'main',
39		- '<i class="fa fa-th"></i>' . $_lang['elements'],
40		- 'javascript:;',
41		- $_lang['elements'],
42		- ' return false;',
43		- '',
44		- '',
45		- 0,
46		- 20,
47		- ''
48		- );
	36	+ $sitemenu['elements'] = array(
	37	+ 'elements',
	38	+ 'main',
	39	+ '<i class="fa fa-th"></i>' . $_lang['elements'],
	40	+ 'javascript:;',
	41	+ $_lang['elements'],
	42	+ ' return false;',
	43	+ '',
	44	+ '',
	45	+ 0,
	46	+ 20,
	47	+ ''
	48	+ );
49	49	}
50	50
51	51	if($modx->hasPermission('exec_module')) {
52		- $sitemenu['modules'] = array(
53		- 'modules',
54		- 'main',
55		- '<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['modules'],
56		- 'javascript:;',
57		- $_lang['modules'],
58		- ' return false;',
59		- '',
60		- '',
61		- 0,
62		- 30,
63		- ''
64		- );
	52	+ $sitemenu['modules'] = array(
	53	+ 'modules',
	54	+ 'main',
	55	+ '<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['modules'],
	56	+ 'javascript:;',
	57	+ $_lang['modules'],
	58	+ ' return false;',
	59	+ '',
	60	+ '',
	61	+ 0,
	62	+ 30,
	63	+ ''
	64	+ );
65	65	}
66	66
67	67	if($modx->hasPermission('edit_user') \|\| $modx->hasPermission('edit_web_user') \|\| $modx->hasPermission('edit_role') \|\| $modx->hasPermission('access_permissions') \|\| $modx->hasPermission('web_access_permissions')) {
68		- $sitemenu['users'] = array(
69		- 'users',
70		- 'main',
71		- '<i class="fa fa-users"></i>' . $_lang['users'],
72		- 'javascript:;',
73		- $_lang['users'],
74		- ' return false;',
75		- 'edit_user',
76		- '',
77		- 0,
78		- 40,
79		- ''
80		- );
	68	+ $sitemenu['users'] = array(
	69	+ 'users',
	70	+ 'main',
	71	+ '<i class="fa fa-users"></i>' . $_lang['users'],
	72	+ 'javascript:;',
	73	+ $_lang['users'],
	74	+ ' return false;',
	75	+ 'edit_user',
	76	+ '',
	77	+ 0,
	78	+ 40,
	79	+ ''
	80	+ );
81	81	}
82	82
83	83	if($modx->hasPermission('empty_cache') \|\| $modx->hasPermission('bk_manager') \|\| $modx->hasPermission('remove_locks') \|\| $modx->hasPermission('import_static') \|\| $modx->hasPermission('export_static')) {
84		- $sitemenu['tools'] = array(
85		- 'tools',
86		- 'main',
87		- '<i class="fa fa-wrench"></i>' . $_lang['tools'],
88		- 'javascript:;',
89		- $_lang['tools'],
90		- ' return false;',
91		- '',
92		- '',
93		- 0,
94		- 50,
95		- ''
96		- );
	84	+ $sitemenu['tools'] = array(
	85	+ 'tools',
	86	+ 'main',
	87	+ '<i class="fa fa-wrench"></i>' . $_lang['tools'],
	88	+ 'javascript:;',
	89	+ $_lang['tools'],
	90	+ ' return false;',
	91	+ '',
	92	+ '',
	93	+ 0,
	94	+ 50,
	95	+ ''
	96	+ );
97	97	}
98	98
99	99	$tab = 0;
100	100	if($modx->hasPermission('edit_template')) {
101		- $sitemenu['element_templates'] = array(
102		- 'element_templates',
103		- 'elements',
104		- '<i class="fa fa-newspaper-o"></i>' . $_lang['manage_templates'] . '<i class="fa fa-angle-right toggle"></i>',
105		- 'index.php?a=76&tab=' . $tab++,
106		- $_lang['manage_templates'],
107		- '',
108		- 'new_template,edit_template',
109		- 'main',
110		- 0,
111		- 10,
112		- 'dropdown-toggle'
113		- );
	101	+ $sitemenu['element_templates'] = array(
	102	+ 'element_templates',
	103	+ 'elements',
	104	+ '<i class="fa fa-newspaper-o"></i>' . $_lang['manage_templates'] . '<i class="fa fa-angle-right toggle"></i>',
	105	+ 'index.php?a=76&tab=' . $tab++,
	106	+ $_lang['manage_templates'],
	107	+ '',
	108	+ 'new_template,edit_template',
	109	+ 'main',
	110	+ 0,
	111	+ 10,
	112	+ 'dropdown-toggle'
	113	+ );
114	114	}
115	115	if($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
116		- $sitemenu['element_tplvars'] = array(
117		- 'element_tplvars',
118		- 'elements',
119		- '<i class="fa fa-list-alt"></i>' . $_lang['tmplvars'] . '<i class="fa fa-angle-right toggle"></i>',
120		- 'index.php?a=76&tab=' . $tab++,
121		- $_lang['tmplvars'],
122		- '',
123		- 'new_template,edit_template',
124		- 'main',
125		- 0,
126		- 20,
127		- 'dropdown-toggle'
128		- );
	116	+ $sitemenu['element_tplvars'] = array(
	117	+ 'element_tplvars',
	118	+ 'elements',
	119	+ '<i class="fa fa-list-alt"></i>' . $_lang['tmplvars'] . '<i class="fa fa-angle-right toggle"></i>',
	120	+ 'index.php?a=76&tab=' . $tab++,
	121	+ $_lang['tmplvars'],
	122	+ '',
	123	+ 'new_template,edit_template',
	124	+ 'main',
	125	+ 0,
	126	+ 20,
	127	+ 'dropdown-toggle'
	128	+ );
129	129	}
130	130	if($modx->hasPermission('edit_chunk')) {
131		- $sitemenu['element_htmlsnippets'] = array(
132		- 'element_htmlsnippets',
133		- 'elements',
134		- '<i class="fa fa-th-large"></i>' . $_lang['manage_htmlsnippets'] . '<i class="fa fa-angle-right toggle"></i>',
135		- 'index.php?a=76&tab=' . $tab++,
136		- $_lang['manage_htmlsnippets'],
137		- '',
138		- 'new_chunk,edit_chunk',
139		- 'main',
140		- 0,
141		- 30,
142		- 'dropdown-toggle'
143		- );
	131	+ $sitemenu['element_htmlsnippets'] = array(
	132	+ 'element_htmlsnippets',
	133	+ 'elements',
	134	+ '<i class="fa fa-th-large"></i>' . $_lang['manage_htmlsnippets'] . '<i class="fa fa-angle-right toggle"></i>',
	135	+ 'index.php?a=76&tab=' . $tab++,
	136	+ $_lang['manage_htmlsnippets'],
	137	+ '',
	138	+ 'new_chunk,edit_chunk',
	139	+ 'main',
	140	+ 0,
	141	+ 30,
	142	+ 'dropdown-toggle'
	143	+ );
144	144	}
145	145	if($modx->hasPermission('edit_snippet')) {
146		- $sitemenu['element_snippets'] = array(
147		- 'element_snippets',
148		- 'elements',
149		- '<i class="fa fa-code"></i>' . $_lang['manage_snippets'] . '<i class="fa fa-angle-right toggle"></i>',
150		- 'index.php?a=76&tab=' . $tab++,
151		- $_lang['manage_snippets'],
152		- '',
153		- 'new_snippet,edit_snippet',
154		- 'main',
155		- 0,
156		- 40,
157		- 'dropdown-toggle'
158		- );
	146	+ $sitemenu['element_snippets'] = array(
	147	+ 'element_snippets',
	148	+ 'elements',
	149	+ '<i class="fa fa-code"></i>' . $_lang['manage_snippets'] . '<i class="fa fa-angle-right toggle"></i>',
	150	+ 'index.php?a=76&tab=' . $tab++,
	151	+ $_lang['manage_snippets'],
	152	+ '',
	153	+ 'new_snippet,edit_snippet',
	154	+ 'main',
	155	+ 0,
	156	+ 40,
	157	+ 'dropdown-toggle'
	158	+ );
159	159	}
160	160	if($modx->hasPermission('edit_plugin')) {
161		- $sitemenu['element_plugins'] = array(
162		- 'element_plugins',
163		- 'elements',
164		- '<i class="fa fa-plug"></i>' . $_lang['manage_plugins'] . '<i class="fa fa-angle-right toggle"></i>',
165		- 'index.php?a=76&tab=' . $tab++,
166		- $_lang['manage_plugins'],
167		- '',
168		- 'new_plugin,edit_plugin',
169		- 'main',
170		- 0,
171		- 50,
172		- 'dropdown-toggle'
173		- );
	161	+ $sitemenu['element_plugins'] = array(
	162	+ 'element_plugins',
	163	+ 'elements',
	164	+ '<i class="fa fa-plug"></i>' . $_lang['manage_plugins'] . '<i class="fa fa-angle-right toggle"></i>',
	165	+ 'index.php?a=76&tab=' . $tab++,
	166	+ $_lang['manage_plugins'],
	167	+ '',
	168	+ 'new_plugin,edit_plugin',
	169	+ 'main',
	170	+ 0,
	171	+ 50,
	172	+ 'dropdown-toggle'
	173	+ );
174	174	}
175	175	//$sitemenu['element_categories'] = array('element_categories','elements',$_lang['element_categories'],'index.php?a=76&tab=5',$_lang['element_categories'],'','new_template,edit_template,new_snippet,edit_snippet,new_chunk,edit_chunk,new_plugin,edit_plugin','main',1,60,'');
176	176
177	177	if($modx->hasPermission('file_manager')) {
178		- $sitemenu['manage_files'] = array(
179		- 'manage_files',
180		- 'elements',
181		- '<i class="fa fa-folder-open-o"></i>' . $_lang['manage_files'],
182		- 'index.php?a=31',
183		- $_lang['manage_files'],
184		- '',
185		- 'file_manager',
186		- 'main',
187		- 0,
188		- 70,
189		- ''
190		- );
	178	+ $sitemenu['manage_files'] = array(
	179	+ 'manage_files',
	180	+ 'elements',
	181	+ '<i class="fa fa-folder-open-o"></i>' . $_lang['manage_files'],
	182	+ 'index.php?a=31',
	183	+ $_lang['manage_files'],
	184	+ '',
	185	+ 'file_manager',
	186	+ 'main',
	187	+ 0,
	188	+ 70,
	189	+ ''
	190	+ );
191	191	}
192	192	if($modx->hasPermission('category_manager')) {
193		- $sitemenu['manage_categories'] = array(
194		- 'manage_categories',
195		- 'elements',
196		- '<i class="fa fa-object-group"></i>' . $_lang['manage_categories'],
197		- 'index.php?a=120',
198		- $_lang['manage_categories'],
199		- '',
200		- 'category_manager',
201		- 'main',
202		- 0,
203		- 80,
204		- ''
205		- );
	193	+ $sitemenu['manage_categories'] = array(
	194	+ 'manage_categories',
	195	+ 'elements',
	196	+ '<i class="fa fa-object-group"></i>' . $_lang['manage_categories'],
	197	+ 'index.php?a=120',
	198	+ $_lang['manage_categories'],
	199	+ '',
	200	+ 'category_manager',
	201	+ 'main',
	202	+ 0,
	203	+ 80,
	204	+ ''
	205	+ );
206	206	}
207	207
208	208	// Modules Menu Items
209	209	if($modx->hasPermission('new_module') \|\| $modx->hasPermission('edit_module') \|\| $modx->hasPermission('save_module')) {
210		- $sitemenu['new_module'] = array(
211		- 'new_module',
212		- 'modules',
213		- '<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['module_management'],
214		- 'index.php?a=106',
215		- $_lang['module_management'],
216		- '',
217		- 'new_module,edit_module',
218		- 'main',
219		- 1,
220		- 0,
221		- ''
222		- );
	210	+ $sitemenu['new_module'] = array(
	211	+ 'new_module',
	212	+ 'modules',
	213	+ '<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['module_management'],
	214	+ 'index.php?a=106',
	215	+ $_lang['module_management'],
	216	+ '',
	217	+ 'new_module,edit_module',
	218	+ 'main',
	219	+ 1,
	220	+ 0,
	221	+ ''
	222	+ );
223	223	}
224	224
225	225	if($modx->hasPermission('exec_module')) {
226		- if($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
227		- $rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, sm.icon, mg.member
	226	+ if($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
	227	+ $rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, sm.icon, mg.member
228	228	FROM ' . $modx->getFullTableName('site_modules') . ' AS sm
229	229	LEFT JOIN ' . $modx->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id
230	230	LEFT JOIN ' . $modx->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group
231	231	WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID() . ') AND sm.disabled != 1 AND sm.locked != 1
232	232	ORDER BY sm.name');
233		- } else {
234		- $rs = $modx->db->select('*', $modx->getFullTableName('site_modules'), 'disabled != 1', 'name');
235		- }
236		- if($modx->db->getRecordCount($rs)) {
237		- while ($row = $modx->db->getRow($rs)) {
	233	+ } else {
	234	+ $rs = $modx->db->select('*', $modx->getFullTableName('site_modules'), 'disabled != 1', 'name');
	235	+ }
	236	+ if($modx->db->getRecordCount($rs)) {
	237	+ while ($row = $modx->db->getRow($rs)) {
238	238	$sitemenu['module' . $row['id']] = array(
239	239	'module' . $row['id'],
240	240	'modules',
		@@ -255,83 +255,83 @@ discard block
		block discarded – undo
255	255	// security menu items (users)
256	256
257	257	if($modx->hasPermission('edit_user')) {
258		- $sitemenu['user_management_title'] = array(
259		- 'user_management_title',
260		- 'users',
261		- '<i class="fa fa fa-user"></i>' . $_lang['user_management_title'] . '<i class="fa fa-angle-right toggle"></i>',
262		- 'index.php?a=75',
263		- $_lang['user_management_title'],
264		- '',
265		- 'edit_user',
266		- 'main',
267		- 0,
268		- 10,
269		- 'dropdown-toggle'
270		- );
	258	+ $sitemenu['user_management_title'] = array(
	259	+ 'user_management_title',
	260	+ 'users',
	261	+ '<i class="fa fa fa-user"></i>' . $_lang['user_management_title'] . '<i class="fa fa-angle-right toggle"></i>',
	262	+ 'index.php?a=75',
	263	+ $_lang['user_management_title'],
	264	+ '',
	265	+ 'edit_user',
	266	+ 'main',
	267	+ 0,
	268	+ 10,
	269	+ 'dropdown-toggle'
	270	+ );
271	271	}
272	272
273	273	if($modx->hasPermission('edit_web_user')) {
274		- $sitemenu['web_user_management_title'] = array(
275		- 'web_user_management_title',
276		- 'users',
277		- '<i class="fa fa-users"></i>' . $_lang['web_user_management_title'] . '<i class="fa fa-angle-right toggle"></i>',
278		- 'index.php?a=99',
279		- $_lang['web_user_management_title'],
280		- '',
281		- 'edit_web_user',
282		- 'main',
283		- 0,
284		- 20,
285		- 'dropdown-toggle'
286		- );
	274	+ $sitemenu['web_user_management_title'] = array(
	275	+ 'web_user_management_title',
	276	+ 'users',
	277	+ '<i class="fa fa-users"></i>' . $_lang['web_user_management_title'] . '<i class="fa fa-angle-right toggle"></i>',
	278	+ 'index.php?a=99',
	279	+ $_lang['web_user_management_title'],
	280	+ '',
	281	+ 'edit_web_user',
	282	+ 'main',
	283	+ 0,
	284	+ 20,
	285	+ 'dropdown-toggle'
	286	+ );
287	287	}
288	288
289	289	if($modx->hasPermission('edit_role')) {
290		- $sitemenu['role_management_title'] = array(
291		- 'role_management_title',
292		- 'users',
293		- '<i class="fa fa-legal"></i>' . $_lang['role_management_title'],
294		- 'index.php?a=86',
295		- $_lang['role_management_title'],
296		- '',
297		- 'new_role,edit_role,delete_role',
298		- 'main',
299		- 0,
300		- 30,
301		- ''
302		- );
	290	+ $sitemenu['role_management_title'] = array(
	291	+ 'role_management_title',
	292	+ 'users',
	293	+ '<i class="fa fa-legal"></i>' . $_lang['role_management_title'],
	294	+ 'index.php?a=86',
	295	+ $_lang['role_management_title'],
	296	+ '',
	297	+ 'new_role,edit_role,delete_role',
	298	+ 'main',
	299	+ 0,
	300	+ 30,
	301	+ ''
	302	+ );
303	303	}
304	304
305	305	if($modx->hasPermission('access_permissions')) {
306		- $sitemenu['manager_permissions'] = array(
307		- 'manager_permissions',
308		- 'users',
309		- '<i class="fa fa-male"></i>' . $_lang['manager_permissions'],
310		- 'index.php?a=40',
311		- $_lang['manager_permissions'],
312		- '',
313		- 'access_permissions',
314		- 'main',
315		- 0,
316		- 40,
317		- ''
318		- );
	306	+ $sitemenu['manager_permissions'] = array(
	307	+ 'manager_permissions',
	308	+ 'users',
	309	+ '<i class="fa fa-male"></i>' . $_lang['manager_permissions'],
	310	+ 'index.php?a=40',
	311	+ $_lang['manager_permissions'],
	312	+ '',
	313	+ 'access_permissions',
	314	+ 'main',
	315	+ 0,
	316	+ 40,
	317	+ ''
	318	+ );
319	319	}
320	320
321	321	if($modx->hasPermission('web_access_permissions')) {
322		- $sitemenu['web_permissions'] = array(
323		- 'web_permissions',
324		- 'users',
325		- '<i class="fa fa-universal-access"></i>' . $_lang['web_permissions'],
326		- 'index.php?a=91',
327		- $_lang['web_permissions'],
328		- '',
329		- 'web_access_permissions',
330		- 'main',
331		- 0,
332		- 50,
333		- ''
334		- );
	322	+ $sitemenu['web_permissions'] = array(
	323	+ 'web_permissions',
	324	+ 'users',
	325	+ '<i class="fa fa-universal-access"></i>' . $_lang['web_permissions'],
	326	+ 'index.php?a=91',
	327	+ $_lang['web_permissions'],
	328	+ '',
	329	+ 'web_access_permissions',
	330	+ 'main',
	331	+ 0,
	332	+ 50,
	333	+ ''
	334	+ );
335	335	}
336	336
337	337	// Tools Menu
		@@ -361,104 +361,104 @@ discard block
		block discarded – undo
361	361	);
362	362
363	363	$sitemenu['search'] = array(
364		- 'search',
365		- 'tools',
366		- '<i class="fa fa-search"></i>' . $_lang['search'],
367		- 'index.php?a=71',
368		- $_lang['search'],
369		- '',
370		- '',
371		- 'main',
372		- 1,
373		- 9,
374		- ''
	364	+ 'search',
	365	+ 'tools',
	366	+ '<i class="fa fa-search"></i>' . $_lang['search'],
	367	+ 'index.php?a=71',
	368	+ $_lang['search'],
	369	+ '',
	370	+ '',
	371	+ 'main',
	372	+ 1,
	373	+ 9,
	374	+ ''
375	375	);
376	376
377	377	if($modx->hasPermission('bk_manager')) {
378		- $sitemenu['bk_manager'] = array(
379		- 'bk_manager',
380		- 'tools',
381		- '<i class="fa fa-database"></i>' . $_lang['bk_manager'],
382		- 'index.php?a=93',
383		- $_lang['bk_manager'],
384		- '',
385		- 'bk_manager',
386		- 'main',
387		- 0,
388		- 10,
389		- ''
390		- );
	378	+ $sitemenu['bk_manager'] = array(
	379	+ 'bk_manager',
	380	+ 'tools',
	381	+ '<i class="fa fa-database"></i>' . $_lang['bk_manager'],
	382	+ 'index.php?a=93',
	383	+ $_lang['bk_manager'],
	384	+ '',
	385	+ 'bk_manager',
	386	+ 'main',
	387	+ 0,
	388	+ 10,
	389	+ ''
	390	+ );
391	391	}
392	392
393	393	if($modx->hasPermission('remove_locks')) {
394		- $sitemenu['remove_locks'] = array(
395		- 'remove_locks',
396		- 'tools',
397		- '<i class="fa fa-hourglass"></i>' . $_lang['remove_locks'],
398		- 'javascript:modx.removeLocks();',
399		- $_lang['remove_locks'],
400		- '',
401		- 'remove_locks',
402		- '',
403		- 0,
404		- 20,
405		- ''
406		- );
	394	+ $sitemenu['remove_locks'] = array(
	395	+ 'remove_locks',
	396	+ 'tools',
	397	+ '<i class="fa fa-hourglass"></i>' . $_lang['remove_locks'],
	398	+ 'javascript:modx.removeLocks();',
	399	+ $_lang['remove_locks'],
	400	+ '',
	401	+ 'remove_locks',
	402	+ '',
	403	+ 0,
	404	+ 20,
	405	+ ''
	406	+ );
407	407	}
408	408
409	409	if($modx->hasPermission('import_static')) {
410		- $sitemenu['import_site'] = array(
411		- 'import_site',
412		- 'tools',
413		- '<i class="fa fa-upload"></i>' . $_lang['import_site'],
414		- 'index.php?a=95',
415		- $_lang['import_site'],
416		- '',
417		- 'import_static',
418		- 'main',
419		- 0,
420		- 30,
421		- ''
422		- );
	410	+ $sitemenu['import_site'] = array(
	411	+ 'import_site',
	412	+ 'tools',
	413	+ '<i class="fa fa-upload"></i>' . $_lang['import_site'],
	414	+ 'index.php?a=95',
	415	+ $_lang['import_site'],
	416	+ '',
	417	+ 'import_static',
	418	+ 'main',
	419	+ 0,
	420	+ 30,
	421	+ ''
	422	+ );
423	423	}
424	424
425	425	if($modx->hasPermission('export_static')) {
426		- $sitemenu['export_site'] = array(
427		- 'export_site',
428		- 'tools',
429		- '<i class="fa fa-download"></i>' . $_lang['export_site'],
430		- 'index.php?a=83',
431		- $_lang['export_site'],
432		- '',
433		- 'export_static',
434		- 'main',
435		- 1,
436		- 40,
437		- ''
438		- );
	426	+ $sitemenu['export_site'] = array(
	427	+ 'export_site',
	428	+ 'tools',
	429	+ '<i class="fa fa-download"></i>' . $_lang['export_site'],
	430	+ 'index.php?a=83',
	431	+ $_lang['export_site'],
	432	+ '',
	433	+ 'export_static',
	434	+ 'main',
	435	+ 1,
	436	+ 40,
	437	+ ''
	438	+ );
439	439	}
440	440
441	441	$menu = $modx->invokeEvent("OnManagerMenuPrerender", array('menu' => $sitemenu));
442	442	if(is_array($menu)) {
443		- $newmenu = array();
444		- foreach($menu as $item){
445		- if(is_array(unserialize($item))){
446		- $newmenu = array_merge($newmenu, unserialize($item));
447		- }
448		- }
449		- if(count($newmenu)> 0) $sitemenu = $newmenu;
	443	+ $newmenu = array();
	444	+ foreach($menu as $item){
	445	+ if(is_array(unserialize($item))){
	446	+ $newmenu = array_merge($newmenu, unserialize($item));
	447	+ }
	448	+ }
	449	+ if(count($newmenu)> 0) $sitemenu = $newmenu;
450	450	}
451	451
452	452	if(file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php')) {
453		- include_once(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php');
	453	+ include_once(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php');
454	454	} else {
455		- include_once(MODX_MANAGER_PATH . 'includes/menu.class.inc.php');
	455	+ include_once(MODX_MANAGER_PATH . 'includes/menu.class.inc.php');
456	456	}
457	457	$menu = new EVOmenu();
458	458	$menu->Build($sitemenu, array(
459		- 'outerClass' => 'nav',
460		- 'innerClass' => 'dropdown-menu',
461		- 'parentClass' => 'dropdown',
	459	+ 'outerClass' => 'nav',
	460	+ 'innerClass' => 'dropdown-menu',
	461	+ 'parentClass' => 'dropdown',
462	462	'parentLinkClass' => 'dropdown-toggle',
463	463	'parentLinkAttr' => '',
464	464	'parentLinkIn' => ''

		@@ -21,7 +21,7 @@ discard block
		block discarded – undo
21	21	$sitemenu['site'] = array(
22	22	'site',
23	23	'main',
24		- '<i class="fa fa-tachometer"></i>' . $_lang['home'],
	24	+ '<i class="fa fa-tachometer"></i>'.$_lang['home'],
25	25	'index.php?a=2',
26	26	$_lang['home'],
27	27	'',
		@@ -32,11 +32,11 @@ discard block
		block discarded – undo
32	32	'active'
33	33	);
34	34
35		-if($modx->hasPermission('edit_template') \|\| $modx->hasPermission('edit_snippet') \|\| $modx->hasPermission('edit_chunk') \|\| $modx->hasPermission('edit_plugin') \|\| $modx->hasPermission('file_manager')) {
	35	+if ($modx->hasPermission('edit_template') \|\| $modx->hasPermission('edit_snippet') \|\| $modx->hasPermission('edit_chunk') \|\| $modx->hasPermission('edit_plugin') \|\| $modx->hasPermission('file_manager')) {
36	36	$sitemenu['elements'] = array(
37	37	'elements',
38	38	'main',
39		- '<i class="fa fa-th"></i>' . $_lang['elements'],
	39	+ '<i class="fa fa-th"></i>'.$_lang['elements'],
40	40	'javascript:;',
41	41	$_lang['elements'],
42	42	' return false;',
		@@ -48,11 +48,11 @@ discard block
		block discarded – undo
48	48	);
49	49	}
50	50
51		-if($modx->hasPermission('exec_module')) {
	51	+if ($modx->hasPermission('exec_module')) {
52	52	$sitemenu['modules'] = array(
53	53	'modules',
54	54	'main',
55		- '<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['modules'],
	55	+ '<i class="'.$_style['icons_modules'].'"></i>'.$_lang['modules'],
56	56	'javascript:;',
57	57	$_lang['modules'],
58	58	' return false;',
		@@ -64,11 +64,11 @@ discard block
		block discarded – undo
64	64	);
65	65	}
66	66
67		-if($modx->hasPermission('edit_user') \|\| $modx->hasPermission('edit_web_user') \|\| $modx->hasPermission('edit_role') \|\| $modx->hasPermission('access_permissions') \|\| $modx->hasPermission('web_access_permissions')) {
	67	+if ($modx->hasPermission('edit_user') \|\| $modx->hasPermission('edit_web_user') \|\| $modx->hasPermission('edit_role') \|\| $modx->hasPermission('access_permissions') \|\| $modx->hasPermission('web_access_permissions')) {
68	68	$sitemenu['users'] = array(
69	69	'users',
70	70	'main',
71		- '<i class="fa fa-users"></i>' . $_lang['users'],
	71	+ '<i class="fa fa-users"></i>'.$_lang['users'],
72	72	'javascript:;',
73	73	$_lang['users'],
74	74	' return false;',
		@@ -80,11 +80,11 @@ discard block
		block discarded – undo
80	80	);
81	81	}
82	82
83		-if($modx->hasPermission('empty_cache') \|\| $modx->hasPermission('bk_manager') \|\| $modx->hasPermission('remove_locks') \|\| $modx->hasPermission('import_static') \|\| $modx->hasPermission('export_static')) {
	83	+if ($modx->hasPermission('empty_cache') \|\| $modx->hasPermission('bk_manager') \|\| $modx->hasPermission('remove_locks') \|\| $modx->hasPermission('import_static') \|\| $modx->hasPermission('export_static')) {
84	84	$sitemenu['tools'] = array(
85	85	'tools',
86	86	'main',
87		- '<i class="fa fa-wrench"></i>' . $_lang['tools'],
	87	+ '<i class="fa fa-wrench"></i>'.$_lang['tools'],
88	88	'javascript:;',
89	89	$_lang['tools'],
90	90	' return false;',
		@@ -97,12 +97,12 @@ discard block
		block discarded – undo
97	97	}
98	98
99	99	$tab = 0;
100		-if($modx->hasPermission('edit_template')) {
	100	+if ($modx->hasPermission('edit_template')) {
101	101	$sitemenu['element_templates'] = array(
102	102	'element_templates',
103	103	'elements',
104		- '<i class="fa fa-newspaper-o"></i>' . $_lang['manage_templates'] . '<i class="fa fa-angle-right toggle"></i>',
105		- 'index.php?a=76&tab=' . $tab++,
	104	+ '<i class="fa fa-newspaper-o"></i>'.$_lang['manage_templates'].'<i class="fa fa-angle-right toggle"></i>',
	105	+ 'index.php?a=76&tab='.$tab++,
106	106	$_lang['manage_templates'],
107	107	'',
108	108	'new_template,edit_template',
		@@ -112,12 +112,12 @@ discard block
		block discarded – undo
112	112	'dropdown-toggle'
113	113	);
114	114	}
115		-if($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
	115	+if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
116	116	$sitemenu['element_tplvars'] = array(
117	117	'element_tplvars',
118	118	'elements',
119		- '<i class="fa fa-list-alt"></i>' . $_lang['tmplvars'] . '<i class="fa fa-angle-right toggle"></i>',
120		- 'index.php?a=76&tab=' . $tab++,
	119	+ '<i class="fa fa-list-alt"></i>'.$_lang['tmplvars'].'<i class="fa fa-angle-right toggle"></i>',
	120	+ 'index.php?a=76&tab='.$tab++,
121	121	$_lang['tmplvars'],
122	122	'',
123	123	'new_template,edit_template',
		@@ -127,12 +127,12 @@ discard block
		block discarded – undo
127	127	'dropdown-toggle'
128	128	);
129	129	}
130		-if($modx->hasPermission('edit_chunk')) {
	130	+if ($modx->hasPermission('edit_chunk')) {
131	131	$sitemenu['element_htmlsnippets'] = array(
132	132	'element_htmlsnippets',
133	133	'elements',
134		- '<i class="fa fa-th-large"></i>' . $_lang['manage_htmlsnippets'] . '<i class="fa fa-angle-right toggle"></i>',
135		- 'index.php?a=76&tab=' . $tab++,
	134	+ '<i class="fa fa-th-large"></i>'.$_lang['manage_htmlsnippets'].'<i class="fa fa-angle-right toggle"></i>',
	135	+ 'index.php?a=76&tab='.$tab++,
136	136	$_lang['manage_htmlsnippets'],
137	137	'',
138	138	'new_chunk,edit_chunk',
		@@ -142,12 +142,12 @@ discard block
		block discarded – undo
142	142	'dropdown-toggle'
143	143	);
144	144	}
145		-if($modx->hasPermission('edit_snippet')) {
	145	+if ($modx->hasPermission('edit_snippet')) {
146	146	$sitemenu['element_snippets'] = array(
147	147	'element_snippets',
148	148	'elements',
149		- '<i class="fa fa-code"></i>' . $_lang['manage_snippets'] . '<i class="fa fa-angle-right toggle"></i>',
150		- 'index.php?a=76&tab=' . $tab++,
	149	+ '<i class="fa fa-code"></i>'.$_lang['manage_snippets'].'<i class="fa fa-angle-right toggle"></i>',
	150	+ 'index.php?a=76&tab='.$tab++,
151	151	$_lang['manage_snippets'],
152	152	'',
153	153	'new_snippet,edit_snippet',
		@@ -157,12 +157,12 @@ discard block
		block discarded – undo
157	157	'dropdown-toggle'
158	158	);
159	159	}
160		-if($modx->hasPermission('edit_plugin')) {
	160	+if ($modx->hasPermission('edit_plugin')) {
161	161	$sitemenu['element_plugins'] = array(
162	162	'element_plugins',
163	163	'elements',
164		- '<i class="fa fa-plug"></i>' . $_lang['manage_plugins'] . '<i class="fa fa-angle-right toggle"></i>',
165		- 'index.php?a=76&tab=' . $tab++,
	164	+ '<i class="fa fa-plug"></i>'.$_lang['manage_plugins'].'<i class="fa fa-angle-right toggle"></i>',
	165	+ 'index.php?a=76&tab='.$tab++,
166	166	$_lang['manage_plugins'],
167	167	'',
168	168	'new_plugin,edit_plugin',
		@@ -174,11 +174,11 @@ discard block
		block discarded – undo
174	174	}
175	175	//$sitemenu['element_categories'] = array('element_categories','elements',$_lang['element_categories'],'index.php?a=76&tab=5',$_lang['element_categories'],'','new_template,edit_template,new_snippet,edit_snippet,new_chunk,edit_chunk,new_plugin,edit_plugin','main',1,60,'');
176	176
177		-if($modx->hasPermission('file_manager')) {
	177	+if ($modx->hasPermission('file_manager')) {
178	178	$sitemenu['manage_files'] = array(
179	179	'manage_files',
180	180	'elements',
181		- '<i class="fa fa-folder-open-o"></i>' . $_lang['manage_files'],
	181	+ '<i class="fa fa-folder-open-o"></i>'.$_lang['manage_files'],
182	182	'index.php?a=31',
183	183	$_lang['manage_files'],
184	184	'',
		@@ -189,11 +189,11 @@ discard block
		block discarded – undo
189	189	''
190	190	);
191	191	}
192		-if($modx->hasPermission('category_manager')) {
	192	+if ($modx->hasPermission('category_manager')) {
193	193	$sitemenu['manage_categories'] = array(
194	194	'manage_categories',
195	195	'elements',
196		- '<i class="fa fa-object-group"></i>' . $_lang['manage_categories'],
	196	+ '<i class="fa fa-object-group"></i>'.$_lang['manage_categories'],
197	197	'index.php?a=120',
198	198	$_lang['manage_categories'],
199	199	'',
		@@ -206,11 +206,11 @@ discard block
		block discarded – undo
206	206	}
207	207
208	208	// Modules Menu Items
209		-if($modx->hasPermission('new_module') \|\| $modx->hasPermission('edit_module') \|\| $modx->hasPermission('save_module')) {
	209	+if ($modx->hasPermission('new_module') \|\| $modx->hasPermission('edit_module') \|\| $modx->hasPermission('save_module')) {
210	210	$sitemenu['new_module'] = array(
211	211	'new_module',
212	212	'modules',
213		- '<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['module_management'],
	213	+ '<i class="'.$_style['icons_modules'].'"></i>'.$_lang['module_management'],
214	214	'index.php?a=106',
215	215	$_lang['module_management'],
216	216	'',
		@@ -222,24 +222,24 @@ discard block
		block discarded – undo
222	222	);
223	223	}
224	224
225		-if($modx->hasPermission('exec_module')) {
226		- if($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
	225	+if ($modx->hasPermission('exec_module')) {
	226	+ if ($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
227	227	$rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, sm.icon, mg.member
228		- FROM ' . $modx->getFullTableName('site_modules') . ' AS sm
229		- LEFT JOIN ' . $modx->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id
230		- LEFT JOIN ' . $modx->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group
231		- WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID() . ') AND sm.disabled != 1 AND sm.locked != 1
	228	+ FROM ' . $modx->getFullTableName('site_modules').' AS sm
	229	+ LEFT JOIN ' . $modx->getFullTableName('site_module_access').' AS sma ON sma.module = sm.id
	230	+ LEFT JOIN ' . $modx->getFullTableName('member_groups').' AS mg ON sma.usergroup = mg.user_group
	231	+ WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID().') AND sm.disabled != 1 AND sm.locked != 1
232	232	ORDER BY sm.name');
233	233	} else {
234	234	$rs = $modx->db->select('*', $modx->getFullTableName('site_modules'), 'disabled != 1', 'name');
235	235	}
236		- if($modx->db->getRecordCount($rs)) {
	236	+ if ($modx->db->getRecordCount($rs)) {
237	237	while ($row = $modx->db->getRow($rs)) {
238		- $sitemenu['module' . $row['id']] = array(
239		- 'module' . $row['id'],
	238	+ $sitemenu['module'.$row['id']] = array(
	239	+ 'module'.$row['id'],
240	240	'modules',
241		- ($row['icon'] != '' ? '<i class="'.$row['icon'].'"></i>' : '<i class="'.$_style['icons_module'].'"></i>') . $row['name'],
242		- 'index.php?a=112&id=' . $row['id'],
	241	+ ($row['icon'] != '' ? '<i class="'.$row['icon'].'"></i>' : '<i class="'.$_style['icons_module'].'"></i>').$row['name'],
	242	+ 'index.php?a=112&id='.$row['id'],
243	243	$row['name'],
244	244	'',
245	245	'',
		@@ -254,11 +254,11 @@ discard block
		block discarded – undo
254	254
255	255	// security menu items (users)
256	256
257		-if($modx->hasPermission('edit_user')) {
	257	+if ($modx->hasPermission('edit_user')) {
258	258	$sitemenu['user_management_title'] = array(
259	259	'user_management_title',
260	260	'users',
261		- '<i class="fa fa fa-user"></i>' . $_lang['user_management_title'] . '<i class="fa fa-angle-right toggle"></i>',
	261	+ '<i class="fa fa fa-user"></i>'.$_lang['user_management_title'].'<i class="fa fa-angle-right toggle"></i>',
262	262	'index.php?a=75',
263	263	$_lang['user_management_title'],
264	264	'',
		@@ -270,11 +270,11 @@ discard block
		block discarded – undo
270	270	);
271	271	}
272	272
273		-if($modx->hasPermission('edit_web_user')) {
	273	+if ($modx->hasPermission('edit_web_user')) {
274	274	$sitemenu['web_user_management_title'] = array(
275	275	'web_user_management_title',
276	276	'users',
277		- '<i class="fa fa-users"></i>' . $_lang['web_user_management_title'] . '<i class="fa fa-angle-right toggle"></i>',
	277	+ '<i class="fa fa-users"></i>'.$_lang['web_user_management_title'].'<i class="fa fa-angle-right toggle"></i>',
278	278	'index.php?a=99',
279	279	$_lang['web_user_management_title'],
280	280	'',
		@@ -286,11 +286,11 @@ discard block
		block discarded – undo
286	286	);
287	287	}
288	288
289		-if($modx->hasPermission('edit_role')) {
	289	+if ($modx->hasPermission('edit_role')) {
290	290	$sitemenu['role_management_title'] = array(
291	291	'role_management_title',
292	292	'users',
293		- '<i class="fa fa-legal"></i>' . $_lang['role_management_title'],
	293	+ '<i class="fa fa-legal"></i>'.$_lang['role_management_title'],
294	294	'index.php?a=86',
295	295	$_lang['role_management_title'],
296	296	'',
		@@ -302,11 +302,11 @@ discard block
		block discarded – undo
302	302	);
303	303	}
304	304
305		-if($modx->hasPermission('access_permissions')) {
	305	+if ($modx->hasPermission('access_permissions')) {
306	306	$sitemenu['manager_permissions'] = array(
307	307	'manager_permissions',
308	308	'users',
309		- '<i class="fa fa-male"></i>' . $_lang['manager_permissions'],
	309	+ '<i class="fa fa-male"></i>'.$_lang['manager_permissions'],
310	310	'index.php?a=40',
311	311	$_lang['manager_permissions'],
312	312	'',
		@@ -318,11 +318,11 @@ discard block
		block discarded – undo
318	318	);
319	319	}
320	320
321		-if($modx->hasPermission('web_access_permissions')) {
	321	+if ($modx->hasPermission('web_access_permissions')) {
322	322	$sitemenu['web_permissions'] = array(
323	323	'web_permissions',
324	324	'users',
325		- '<i class="fa fa-universal-access"></i>' . $_lang['web_permissions'],
	325	+ '<i class="fa fa-universal-access"></i>'.$_lang['web_permissions'],
326	326	'index.php?a=91',
327	327	$_lang['web_permissions'],
328	328	'',
		@@ -339,7 +339,7 @@ discard block
		block discarded – undo
339	339	$sitemenu['refresh_site'] = array(
340	340	'refresh_site',
341	341	'tools',
342		- '<i class="fa fa-recycle"></i>' . $_lang['refresh_site'],
	342	+ '<i class="fa fa-recycle"></i>'.$_lang['refresh_site'],
343	343	'index.php?a=26',
344	344	$_lang['refresh_site'],
345	345	'',
		@@ -353,7 +353,7 @@ discard block
		block discarded – undo
353	353	'a', // tag
354	354	'javascript:;', // href
355	355	'btn btn-secondary', // class or btn-success
356		- 'modx.popup({url:\'index.php?a=26\', title:\'' . $_lang['refresh_site'] . '\', icon: \'fa-recycle\', iframe: \'ajax\', selector: \'.tab-page>.container\', position: \'right top\', width: \'auto\', maxheight: \'50%\', wrap: \'body\' })', // onclick
	356	+ 'modx.popup({url:\'index.php?a=26\', title:\''.$_lang['refresh_site'].'\', icon: \'fa-recycle\', iframe: \'ajax\', selector: \'.tab-page>.container\', position: \'right top\', width: \'auto\', maxheight: \'50%\', wrap: \'body\' })', // onclick
357	357	$_lang['refresh_site'], // title
358	358	'<i class="fa fa-recycle"></i>' // innerHTML
359	359	)
		@@ -363,7 +363,7 @@ discard block
		block discarded – undo
363	363	$sitemenu['search'] = array(
364	364	'search',
365	365	'tools',
366		- '<i class="fa fa-search"></i>' . $_lang['search'],
	366	+ '<i class="fa fa-search"></i>'.$_lang['search'],
367	367	'index.php?a=71',
368	368	$_lang['search'],
369	369	'',
		@@ -374,11 +374,11 @@ discard block
		block discarded – undo
374	374	''
375	375	);
376	376
377		-if($modx->hasPermission('bk_manager')) {
	377	+if ($modx->hasPermission('bk_manager')) {
378	378	$sitemenu['bk_manager'] = array(
379	379	'bk_manager',
380	380	'tools',
381		- '<i class="fa fa-database"></i>' . $_lang['bk_manager'],
	381	+ '<i class="fa fa-database"></i>'.$_lang['bk_manager'],
382	382	'index.php?a=93',
383	383	$_lang['bk_manager'],
384	384	'',
		@@ -390,11 +390,11 @@ discard block
		block discarded – undo
390	390	);
391	391	}
392	392
393		-if($modx->hasPermission('remove_locks')) {
	393	+if ($modx->hasPermission('remove_locks')) {
394	394	$sitemenu['remove_locks'] = array(
395	395	'remove_locks',
396	396	'tools',
397		- '<i class="fa fa-hourglass"></i>' . $_lang['remove_locks'],
	397	+ '<i class="fa fa-hourglass"></i>'.$_lang['remove_locks'],
398	398	'javascript:modx.removeLocks();',
399	399	$_lang['remove_locks'],
400	400	'',
		@@ -406,11 +406,11 @@ discard block
		block discarded – undo
406	406	);
407	407	}
408	408
409		-if($modx->hasPermission('import_static')) {
	409	+if ($modx->hasPermission('import_static')) {
410	410	$sitemenu['import_site'] = array(
411	411	'import_site',
412	412	'tools',
413		- '<i class="fa fa-upload"></i>' . $_lang['import_site'],
	413	+ '<i class="fa fa-upload"></i>'.$_lang['import_site'],
414	414	'index.php?a=95',
415	415	$_lang['import_site'],
416	416	'',
		@@ -422,11 +422,11 @@ discard block
		block discarded – undo
422	422	);
423	423	}
424	424
425		-if($modx->hasPermission('export_static')) {
	425	+if ($modx->hasPermission('export_static')) {
426	426	$sitemenu['export_site'] = array(
427	427	'export_site',
428	428	'tools',
429		- '<i class="fa fa-download"></i>' . $_lang['export_site'],
	429	+ '<i class="fa fa-download"></i>'.$_lang['export_site'],
430	430	'index.php?a=83',
431	431	$_lang['export_site'],
432	432	'',
		@@ -439,20 +439,20 @@ discard block
		block discarded – undo
439	439	}
440	440
441	441	$menu = $modx->invokeEvent("OnManagerMenuPrerender", array('menu' => $sitemenu));
442		-if(is_array($menu)) {
	442	+if (is_array($menu)) {
443	443	$newmenu = array();
444		- foreach($menu as $item){
445		- if(is_array(unserialize($item))){
	444	+ foreach ($menu as $item) {
	445	+ if (is_array(unserialize($item))) {
446	446	$newmenu = array_merge($newmenu, unserialize($item));
447	447	}
448	448	}
449		- if(count($newmenu)> 0) $sitemenu = $newmenu;
	449	+ if (count($newmenu) > 0) $sitemenu = $newmenu;
450	450	}
451	451
452		-if(file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php')) {
453		- include_once(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php');
	452	+if (file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/includes/menu.class.inc.php')) {
	453	+ include_once(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/includes/menu.class.inc.php');
454	454	} else {
455		- include_once(MODX_MANAGER_PATH . 'includes/menu.class.inc.php');
	455	+ include_once(MODX_MANAGER_PATH.'includes/menu.class.inc.php');
456	456	}
457	457	$menu = new EVOmenu();
458	458	$menu->Build($sitemenu, array(

evolution-cms / evolution

Push — develop ( af3527...fe939b )

Status

Category

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

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