updated etxlink, ctools, colorbox, computed_field
This commit is contained in:
@@ -245,10 +245,10 @@ function ctools_access_admin_form_submit($form, &$form_state) {
|
||||
|
||||
// --------------------------------------------------------------------------
|
||||
// AJAX menu entry points.
|
||||
|
||||
/**
|
||||
* AJAX callback to add a new access test to the list.
|
||||
*/
|
||||
|
||||
function ctools_access_ajax_add($fragment = NULL, $name = NULL) {
|
||||
ctools_include('ajax');
|
||||
ctools_include('modal');
|
||||
@@ -263,7 +263,7 @@ function ctools_access_ajax_add($fragment = NULL, $name = NULL) {
|
||||
ctools_ajax_render_error();
|
||||
}
|
||||
|
||||
// Separate the fragment into 'module' and 'argument'
|
||||
// Separate the fragment into 'module' and 'argument'.
|
||||
if (strpos($fragment, '-') === FALSE) {
|
||||
$module = $fragment;
|
||||
$argument = NULL;
|
||||
@@ -279,7 +279,7 @@ function ctools_access_ajax_add($fragment = NULL, $name = NULL) {
|
||||
|
||||
list($access, $contexts) = $function($argument);
|
||||
|
||||
// Make sure we have the logged in user context
|
||||
// Make sure we have the logged in user context.
|
||||
if (!isset($contexts['logged-in-user'])) {
|
||||
$contexts['logged-in-user'] = ctools_access_get_loggedin_context();
|
||||
}
|
||||
@@ -306,6 +306,9 @@ function ctools_access_ajax_add($fragment = NULL, $name = NULL) {
|
||||
);
|
||||
|
||||
$output = ctools_modal_form_wrapper('ctools_access_ajax_edit_item', $form_state);
|
||||
$access = $form_state['access'];
|
||||
$access['plugins'][$id] = $form_state['test'];
|
||||
|
||||
if (!isset($output[0])) {
|
||||
$function = $module . '_ctools_access_set';
|
||||
if (function_exists($function)) {
|
||||
@@ -333,7 +336,7 @@ function ctools_access_ajax_edit($fragment = NULL, $id = NULL) {
|
||||
ctools_ajax_render_error();
|
||||
}
|
||||
|
||||
// Separate the fragment into 'module' and 'argument'
|
||||
// Separate the fragment into 'module' and 'argument'.
|
||||
if (strpos($fragment, '-') === FALSE) {
|
||||
$module = $fragment;
|
||||
$argument = NULL;
|
||||
@@ -353,7 +356,7 @@ function ctools_access_ajax_edit($fragment = NULL, $id = NULL) {
|
||||
ctools_ajax_render_error();
|
||||
}
|
||||
|
||||
// Make sure we have the logged in user context
|
||||
// Make sure we have the logged in user context.
|
||||
if (!isset($contexts['logged-in-user'])) {
|
||||
$contexts['logged-in-user'] = ctools_access_get_loggedin_context();
|
||||
}
|
||||
@@ -372,6 +375,9 @@ function ctools_access_ajax_edit($fragment = NULL, $id = NULL) {
|
||||
);
|
||||
|
||||
$output = ctools_modal_form_wrapper('ctools_access_ajax_edit_item', $form_state);
|
||||
$access = $form_state['access'];
|
||||
$access['plugins'][$id] = $form_state['test'];
|
||||
|
||||
if (!isset($output[0])) {
|
||||
$function = $module . '_ctools_access_set';
|
||||
if (function_exists($function)) {
|
||||
@@ -451,7 +457,7 @@ function ctools_access_ajax_delete($fragment = NULL, $id = NULL) {
|
||||
ajax_render_error();
|
||||
}
|
||||
|
||||
// Separate the fragment into 'module' and 'argument'
|
||||
// Separate the fragment into 'module' and 'argument'.
|
||||
if (strpos($fragment, '-') === FALSE) {
|
||||
$module = $fragment;
|
||||
$argument = NULL;
|
||||
@@ -471,7 +477,7 @@ function ctools_access_ajax_delete($fragment = NULL, $id = NULL) {
|
||||
unset($access['plugins'][$id]);
|
||||
}
|
||||
|
||||
// re-cache
|
||||
// re-cache.
|
||||
$function = $module . '_ctools_access_set';
|
||||
if (function_exists($function)) {
|
||||
$function($argument, $access);
|
||||
|
||||
Reference in New Issue
Block a user