Merged bugfixes since 2.0.6

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

diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc
index fd2fefb3474498153648790ef244950ac42e1ef9..6e2c664a7a8f9cc01a59ca65fa49fbed8fb4efa1 100644 (file)
--- a/includes/ui/ui_controls.inc
+++ b/includes/ui/ui_controls.inc
@@ -1,6 +1,6 @@
 <?php
 /**********************************************************************
-    Copyright (C) 2005-2008  FrontAccounting, LLC.
+    Copyright (C) FrontAccounting, LLC.
        Released under the terms of the GNU Affero General Public License,
        AGPL, as published by the Free Software Foundation, either version 
        3 of the License, or (at your option) any later version.
@@ -56,6 +56,37 @@ function end_table($breaks=0)
                br($breaks);
 }
 
+function start_outer_table($extra="", $padding='2', $spacing='0', $br=false)
+{
+       if ($br)
+               br();
+       start_table($extra, $padding, $spacing);
+       echo "<tr valign=top><td>\n"; // outer table
+}
+
+function table_section($number=1, $width=false)
+{
+       if ($number > 1)
+       {
+               echo "</table>\n";
+               $width = ($width ? "width=$width" : "");
+               echo "</td><td class='tableseparator' $width>\n"; // outer table
+       }
+       echo "<table>\n";
+}      
+
+function end_outer_table($breaks=0, $close_table=true)
+{
+       if ($close_table)
+               echo "</table>\n";
+       echo "</td></tr>\n";
+       end_table($breaks);
+}
+
+function vertical_space()
+{
+       echo "</td></tr><tr><td valign=center>"; // outer table
+}
 function meta_forward($forward_to, $params="")
 {
     global $Ajax;
@@ -172,56 +203,18 @@ function alt_table_row_color(&$k)
        }
 }
 
-function table_section_title($msg)
+function table_section_title($msg, $colspan=2)
 {
-       echo "<tr><td colspan=2 class='tableheader'>$msg</td><tr>\n";
+       echo "<tr><td colspan=$colspan class='tableheader'>$msg</td></tr>\n";
 }
 
-function table_header($labels)
+function table_header($labels, $params='')
 {
        start_row();
        foreach ($labels as $label)
-               labelheader_cell($label);
+               labelheader_cell($label, $params);
        end_row();
 }
-
-function edit_link_cell($param, $title=false)
-{
-    label_cell("<a href='" . $_SERVER['PHP_SELF']. "?" . "$param'"
-        .($title ? " title='$title'":'').">" . _("Edit") . "</a>", "nowrap");
-}
-
-function delete_link_cell($param, $title=false)
-{
-    label_cell("<a href='" . $_SERVER['PHP_SELF']. "?" . "$param'"
-       .($title ? " title='$title'":'') .">" . _("Delete") . "</a>", "nowrap");
-}
-
-function edit_button($name, $value, $title=false, $icon=false)
-{
-       // php silently changes dots,spaces,'[' and characters 128-159
-       // to underscore in POST names, to maintain compatibility with register_globals
-       if (user_graphic_links() && $icon)
-       {
-               global $path_to_root;
-               $name = htmlentities(strtr($name, array('.'=>'=2E',' '=>'=20','='=>'=3D','['=>'=5B')));
-               echo "<button type='submit' class='editbutton' name='$name' value='' /><img src='$path_to_root/themes/".user_theme().
-               "/images/$icon' width='14' height='14' border='0' ".($title ? "title='$title'" : "title='$value'")." />\n";
-       }
-       else
-               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, $icon=false)
-{
-       echo "<td>";
-       edit_button($name, $value, $title, $icon);
-       echo "</td>";
-}
-
 //-----------------------------------------------------------------------------------
 
 function start_row($param="")
@@ -345,5 +338,33 @@ function context_reset()
 if (!isset($_SESSION['Context'])) {
                context_reset();
 }
+/*
+       Redirector for selector F4 calls.
+       $sel_editors is array of selname=>editor_page
+*/
+function editor_redirect($sel_editors, $save_fun='') {
+       foreach ($sel_editors as $selname=>$editor)
+               if (isset($_POST['_'.$selname.'_editor'])) {
+                       if (function_exists($save_fun))
+                               $save_fun();
+                       unset($_POST['_'.$selname.'_editor']);
+                       context_call($editor, array_keys($_POST));
+               }
+}
+/*
+       Return procedure for selector F4 calls
+*/
+function editor_return($vars, $restore_fun='') {
+       if (function_exists($restore_fun))
+               $restore_fun();
+
+       if ($ret = context_restore()) {
+               foreach ($vars as $postname=>$retname)
+                       if (isset($ret[$retname])) {
+                               $_POST[$postname] = $ret[$retname];
+                               set_focus($postname);
+                       }
+       }
+}
 
 ?>
\ No newline at end of file