From: <ny...@us...> - 2009-01-06 16:00:15
|
Revision: 16185 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=16185&view=rev Author: nyloth Date: 2009-01-06 16:00:13 +0000 (Tue, 06 Jan 2009) Log Message: ----------- [FIX] ajax: handle confirmation steps through AJAX using a javascript dialog Modified Paths: -------------- trunk/lib/ajax/ajaxlib.php trunk/tiki-adminusers.php Modified: trunk/lib/ajax/ajaxlib.php =================================================================== --- trunk/lib/ajax/ajaxlib.php 2009-01-06 15:20:34 UTC (rev 16184) +++ trunk/lib/ajax/ajaxlib.php 2009-01-06 16:00:13 UTC (rev 16185) @@ -189,6 +189,26 @@ $objResponse->script("tikitabs($tab,$max_tikitabs);"); } + } elseif ( $ajaxlib->templateIsRegistered('confirm.tpl') ) { + global $area; + + $params = array( + '_tag' => 'n', + '_keepall' => 'y' + ); + + if ( $prefs['feature_ticketlib2'] == 'y' ) { + $objResponse->confirmCommands(1, $smarty->get_template_vars('confirmation_text')); + $params['daconfirm'] = 'y'; + $params['ticket'] = $smarty->get_template_vars('ticket'); + } + + require_once('lib/smarty_tiki/block.self_link.php'); + require_once('lib/smarty_tiki/modifier.escape.php'); + + $uri = smarty_modifier_escape(smarty_block_self_link($params, '', $smarty), 'javascript'); + $objResponse->call("loadComponent('$uri','$template','$htmlElementId',".((int)$max_tikitabs).",'$last_user')"); + } else { $objResponse->alert(sprintf(tra("Template %s not registered"),$template)); } Modified: trunk/tiki-adminusers.php =================================================================== --- trunk/tiki-adminusers.php 2009-01-06 15:20:34 UTC (rev 16184) +++ trunk/tiki-adminusers.php 2009-01-06 16:00:13 UTC (rev 16185) @@ -189,7 +189,7 @@ } elseif (isset($_REQUEST["action"])) { if ( $_REQUEST["action"] == 'delete' && isset($_REQUEST["user"]) && $_REQUEST["user"] != 'admin' ) { $area = 'deluser'; - if ($prefs['feature_ticketlib2'] != 'y' or (isset($_POST['daconfirm']) and isset($_SESSION["ticket_$area"]))) { + if ($prefs['feature_ticketlib2'] != 'y' or (isset($_REQUEST['daconfirm']) and isset($_SESSION["ticket_$area"]))) { key_check($area); $userlib->remove_user($_REQUEST["user"]); $tikifeedback = array(); @@ -201,7 +201,7 @@ } if ( $_REQUEST["action"] == 'removegroup' && isset($_REQUEST["user"]) ) { $area = 'deluserfromgroup'; - if ($prefs['feature_ticketlib2'] != 'y' or (isset($_POST['daconfirm']) and isset($_SESSION["ticket_$area"]))) { + if ($prefs['feature_ticketlib2'] != 'y' or (isset($_REQUEST['daconfirm']) and isset($_SESSION["ticket_$area"]))) { key_check($area); $userlib->remove_user_from_group($_REQUEST["user"], $_REQUEST["group"]); $tikifeedback[] = array('num'=>0,'mes'=>sprintf(tra("%s %s removed from %s %s."),tra("user"),$_REQUEST["user"],tra("group"),$_REQUEST["group"])); @@ -216,7 +216,7 @@ } elseif (!empty($_REQUEST["submit_mult"]) && !empty($_REQUEST["checked"])) { if ($_REQUEST['submit_mult'] == 'remove_users' || $_REQUEST['submit_mult'] == 'remove_users_with_page') { $area = 'batchdeluser'; - if ($prefs['feature_ticketlib2'] == 'n' or (isset($_POST['daconfirm']) and isset($_SESSION["ticket_$area"]))) { + if ($prefs['feature_ticketlib2'] == 'n' or (isset($_REQUEST['daconfirm']) and isset($_SESSION["ticket_$area"]))) { key_check($area); foreach ($_REQUEST["checked"] as $deleteuser) if ( $deleteuser != 'admin' ) { $userlib->remove_user($deleteuser); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |