Merged bugfixes upto [0000072] (version 2.0.3).

[fa-stable.git] / includes / ui / ui_controls.inc

diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc
index d9d1f05759994e08cb910ad7fbb22cea81e9755f..1883ba2aeafc12ebdff7334f7161f8ddb0aa1ac8 100644 (file)
--- a/includes/ui/ui_controls.inc
+++ b/includes/ui/ui_controls.inc
@@ -28,7 +28,7 @@ function end_form($breaks=0)
 {
        if ($breaks)
                br($breaks);
-       echo "<input type=\"hidden\" name=\"_focus\" value=\"".$_POST['_focus']."\">\n";
+       echo "<input type=\"hidden\" name=\"_focus\" value=\"".get_post('_focus')."\">\n";
        echo "</form>\n";
 }
 
@@ -52,8 +52,9 @@ function meta_forward($forward_to, $params="")
     global $Ajax;
        echo "<meta http-equiv='Refresh' content='0; url=$forward_to?$params'>\n";
        echo "<center><br>" . _("You should automatically be forwarded.");
-       echo " " . _("If this does not happen") . " " . "<a href='$forward_to'>" . _("click here") . "</a> " . _("to continue") . ".<br><br></center>\n";
-       $Ajax->redirect($forward_to.'?'.$params);
+       echo " " . _("If this does not happen") . " " . "<a href='$forward_to?$params'>" . _("click here") . "</a> " . _("to continue") . ".<br><br></center>\n";
+       if ($params !='') $params = '?'.$params;
+       $Ajax->redirect($forward_to.$params);
        exit;
 }
 
@@ -100,7 +101,7 @@ function hyperlink_params($target, $label, $params, $center=true)
 function hyperlink_params_td($target, $label, $params)
 {
        echo "<td>";
-       hyperlink_params($target, $label, $params);
+       hyperlink_params($target, $label, $params, false);
        echo "</td>\n";
 }
 
@@ -163,10 +164,21 @@ function delete_link_cell($param, $title=false)
        .($title ? " title='$title'":'') .">" . _("Delete") . "</a>", "nowrap");
 }
 
+function edit_button($name, $value, $title=false)
+{
+// php silently changes dots,spaces,'[' and characters 128-159
+// to underscore in POST names, to maintain compatibility with register_globals
+       echo "<input type=\"submit\" class=\"editbutton\" name=\""
+               .htmlentities(strtr($name, array('.'=>'=2E',' '=>'=20','='=>'=3D','['=>'=5B')))
+               ."\" value=\"$value\""
+               .($title ? " title='$title'":'')." />\n";
+}
+
 function edit_button_cell($name, $value, $title=false)
 {
-    label_cell("<input type=\"submit\" class=\"editbutton\" name=\"$name\" value=\"$value\""
-       .($title ? " title='$title'":'')." />\n");
+       echo "<td>";
+       edit_button($name, $value, $title);
+       echo "</td>";
 }
 
 //-----------------------------------------------------------------------------------
@@ -192,13 +204,18 @@ function br($num=1)
 
 $ajax_divs = array();
 
-function div_start($id='')
+function div_start($id='', $trigger=null, $non_ajax=false)
 {
     global $ajax_divs;
 
-    array_push($ajax_divs, $id);
-    echo "<div ". ($id !='' ? "id='$id'" : '').">";
-    ob_start();
+       if ($non_ajax) { // div for non-ajax elements
+               array_push($ajax_divs, array($id, null));
+               echo "<div style='display:none' class='js_only' ".($id !='' ? "id='$id'" : '').">";
+       } else { // ajax ready div
+               array_push($ajax_divs, array($id, $trigger===null ? $id : $trigger));
+               echo "<div ". ($id !='' ? "id='$id'" : '').">";
+               ob_start();
+       }
 }
 
 function div_end()
@@ -207,9 +224,85 @@ function div_end()
 
     if (count($ajax_divs))
     {
-               $id = array_pop($ajax_divs);
-               $Ajax->addUpdate($id, $id, ob_get_flush());
+               $div = array_pop($ajax_divs);
+               if ($div[1] !== null)
+                       $Ajax->addUpdate($div[1], $div[0], ob_get_flush());
                echo "</div>";
     }
 }
+
+/*
+       External page call with saving current context.
+       $call - url of external page
+       $ctx - optional. name of SESSION context object or array of names of POST 
+               variables saved on call
+*/
+function context_call($call, $ctx='')
+{
+       if (is_array($ctx)) 
+       {
+               foreach($ctx as $postname)
+               {
+                       $context[$postname] = get_post($postname);
+               }
+       } else 
+               $context = isset($_SESSION[$ctx]) ? $_SESSION[$ctx] : null;
+
+       array_unshift($_SESSION['Context'], array('name' => $ctx, 
+               'ctx' => $context,
+               'caller' => $_SERVER['PHP_SELF'],
+               'ret' => array()));
+       meta_forward($call);
+}
+/*
+       Restores context after external page call and
+       returns array of data passed by external page.
+*/
+function context_restore()
+{
+       if ( count($_SESSION['Context'])) {
+               if ($_SERVER['PHP_SELF'] == $_SESSION['Context'][0]['caller']) {
+                       $ctx = array_shift($_SESSION['Context']);
+                       if ($ctx) {
+                               if (is_array($ctx['ctx'])) {
+                                       foreach($ctx['ctx'] as $name => $val) 
+                                       {
+                                               $_POST[$name] = $val;
+                                       }
+                               } else
+                                       if ($ctx['name']!='')
+                                               $_SESSION[$ctx['name']] = $ctx['ctx'];
+                               return $ctx['ret'];
+                       }
+               }
+       }
+       return false;
+}
+
+/*
+       Return to caller page if the page was called from external context.
+*/
+function context_return($ret)
+{
+       if ( count($_SESSION['Context'])) {
+               $ctx = &$_SESSION['Context'][0];
+               $ctx['ret'] = $ret;
+               meta_forward( $ctx['caller'] );
+       }
+}
+/*
+       Clearing context stack after page cancel.
+*/
+function context_reset()
+{
+       $_SESSION['Context'] = array();
+}
+
+/*
+       Context stack initialization
+*/
+if (!isset($_SESSION['Context'])) {
+               context_reset();
+}
+
 ?>
\ No newline at end of file