X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fui%2Fui_controls.inc;h=65e0071cf925dda04087868e2bfeca505aed7cb5;hb=7010ff2972dfbc8be4e577bdeac6b8da7278b691;hp=774dbd0e8f0d112f8a1f7e884e4af1ccf4979152;hpb=35b63dfa6002b68aebace1632e497146c76913a0;p=fa-stable.git
diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc
index 774dbd0e..65e0071c 100644
--- a/includes/ui/ui_controls.inc
+++ b/includes/ui/ui_controls.inc
@@ -53,7 +53,7 @@ function start_form($multi=false, $dummy=false, $action="", $name="")
function end_form($breaks=0)
{
- global $Ajax;
+ global $Ajax, $hidden_fields;
$_SESSION['csrf_token'] = hash('sha256', uniqid(mt_rand(), true));
if ($breaks)
@@ -61,8 +61,9 @@ function end_form($breaks=0)
hidden('_focus');
hidden('_modified', get_post('_modified', 0));
hidden('_token', $_SESSION['csrf_token']);
- echo "\n";
- $Ajax->activate('token');
+
+ echo implode('', $hidden_fields)."\n";
+ $Ajax->activate('_token');
}
function check_csrf_token()
@@ -87,7 +88,7 @@ function start_table($class=false, $extra="", $padding='2', $spacing='0')
echo " class='tablestyle'";
if ($extra != "")
echo " $extra";
- echo " cellpadding=$padding cellspacing=$spacing>\n";
+ echo " cellpadding='$padding' cellspacing='$spacing'>\n";
}
function end_table($breaks=0)
@@ -110,7 +111,7 @@ function table_section($number=1, $width=false)
if ($number > 1)
{
echo "\n";
- $width = ($width ? "width=$width" : "");
+ $width = ($width ? "width='$width'" : "");
//echo "
\n"; // outer table
echo " | \n"; // outer table
}
@@ -166,7 +167,7 @@ function access_string($label, $clean=false)
return $clean ? $label : array($label, $access);
}
-function hyperlink_back($center=true, $no_menu=true, $type_no=0, $trans_no=0)
+function hyperlink_back($center=true, $no_menu=true, $type_no=0, $trans_no=0, $final=false)
{
global $path_to_root;
@@ -177,17 +178,17 @@ function hyperlink_back($center=true, $no_menu=true, $type_no=0, $trans_no=0)
{
include_once($path_to_root."/admin/db/attachments_db.inc");
$id = has_attachment($type_no, $trans_no);
- }
+ $attach = get_attachment_string($type_no, $trans_no);
+ echo $attach;
+ }
$width = ($id != 0 ? "30%" : "20%");
- start_table(false, "width=$width");
+ start_table(false, "width='$width'");
start_row();
if ($no_menu)
{
- if ($id != 0)
- echo " | "._("View Attachment")." | \n";
echo ""._("Print")." | \n";
- }
- echo "".($no_menu ? _("Close") : _("Back"))." | \n";
+ }
+ echo "".($no_menu ? _("Close") : _("Back"))." | \n";
end_row();
end_table();
if ($center)
@@ -306,18 +307,20 @@ function hyperlink_params_separate_td($target, $label, $params)
//--------------------------------------------------------------------------------------------------
-function alt_table_row_color(&$k)
+function alt_table_row_color(&$k, $extra_class=null)
{
+ $classes = $extra_class ? array($extra_class) : array();
if ($k == 1)
{
- echo "\n";
+ array_push($classes, 'oddrow');
$k = 0;
}
else
{
- echo "
\n";
+ array_push($classes, 'evenrow');
$k++;
}
+ echo "
\n";
}
function table_section_title($msg, $colspan=2)