bachir/materio-base-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated imce, colorbox, admin_menu_source, honey_pot

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2016-11-05 16:33:10 +01:00
parent 2e0abeed03
commit 7aeabebddf
28 changed files with 455 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sites/all/modules/contrib/admin/admin_menu_source/CHANGELOG.txt Normal file
View File

@@ -0,0 +1,3 @@
Admin Menu Source 7.x-1.1, 2016-04-01
-------------------
- Issue #2634278 by Tommy Cox: Missed dependency of Menu module

7
sites/all/modules/contrib/admin/admin_menu_source/admin_menu_source.inc
View File

@@ -1,5 +1,4 @@
<?php
/**
* @file
* Menu callbacks for admin_menu_source module
@@ -27,13 +26,13 @@ function admin_menu_source_settings() {
);
}
//add a custom submit handler
// Add a custom submit handler.
$form['#submit'][] = 'admin_menu_source_settings_submit';
return system_settings_form($form);
}
function admin_menu_source_settings_submit() {
//flush admin_menu's cache
// Flush admin_menu's cache.
admin_menu_flush_caches();
}
}

8
sites/all/modules/contrib/admin/admin_menu_source/admin_menu_source.info
View File

@@ -1,12 +1,14 @@
name = Administration Menu Source
description = Use a different menu as the Administration Menu.
dependencies[] = menu
dependencies[] = admin_menu
package = Administration
core = 7.x
configure = admin/config/administration/admin_menu/source
; Information added by drupal.org packaging script on 2012-04-03
version = "7.x-1.0"
; Information added by Drupal.org packaging script on 2016-04-01
version = "7.x-1.1"
core = "7.x"
project = "admin_menu_source"
datestamp = "1333434040"
datestamp = "1459490342"

32
sites/all/modules/contrib/admin/admin_menu_source/admin_menu_source.module
View File

@@ -1,5 +1,4 @@
<?php
/**
* @file
* Use a different menu as the Administration Menu.
@@ -56,14 +55,23 @@ function admin_menu_source_theme() {
function admin_menu_source_admin_menu_output_alter(&$content) {
global $user;
$rid = key(array_reverse($user->roles, TRUE));
$source_menu = _admin_menu_source_get_role_menu($rid);
if (!empty($source_menu)) {
$content['menu'] = admin_menu_links_menu(admin_menu_tree($source_menu));
$content['menu']['#theme'] = 'admin_menu_links';
$content['menu']['#weight'] = 0;
$content['menu']['#sorted'] = TRUE;
// $rid = key(array_reverse($user->roles, TRUE));
// Find the user role rid.
$roles_ids = array_keys(user_roles(TRUE, 'access administration menu'));
$user_roles_ids = array_keys($user->roles);
$user_roles = array_reverse(array_intersect($roles_ids, $user_roles_ids));
if (count($user_roles)) {
$rid = $user_roles[0];
$source_menu = _admin_menu_source_get_role_menu($rid);
if (!empty($source_menu)) {
$content['menu'] = admin_menu_links_menu(admin_menu_tree($source_menu));
$content['menu']['#theme'] = 'admin_menu_links';
$content['menu']['#weight'] = 0;
$content['menu']['#sorted'] = TRUE;
}
}
}
@@ -97,20 +105,20 @@ function theme_admin_menu_source_settings_form($variables) {
}
/**
* Helper function to get settings for admin_menu_source
* Helper function to get settings for admin_menu_source.
*/
function _admin_menu_source_get_settings() {
return variable_get('admin_menu_source_settings', array());
}
/**
* Helper function to get source menu per role
* Helper function to get source menu per role.
*
* @param $rid
* the user role id
*/
function _admin_menu_source_get_role_menu($rid) {
//load the settings
// Load the settings.
$settings = _admin_menu_source_get_settings();
return isset($settings[$rid]['source']) ? $settings[$rid]['source'] : '';