X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=includes%2Fui%2Fui_controls.inc;h=2693b07943db5c0caa04a5479ee328f995800f8d;hb=b1c79afd0a78ec37ff813f1305e9e0804be78ef3;hp=ad0c8a2468e65e787d7c96bfdbe64a615abdcb54;hpb=f6e1b649fc75750383b17c2ced6a5c1d6f19fe2e;p=fa-stable.git diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc index ad0c8a24..2693b079 100644 --- a/includes/ui/ui_controls.inc +++ b/includes/ui/ui_controls.inc @@ -12,13 +12,13 @@ function start_form($multi=false, $sid=false, $action="", $name="") { if (strpos($action, "?")) $action .= "&" . SID; - else + else $action .= "?" . SID; - } + } if ($multi) - echo "
\n"; + echo "\n"; else - echo "\n"; + echo "\n"; } @@ -28,7 +28,7 @@ function end_form($breaks=0) { if ($breaks) br($breaks); - echo "\n"; + echo "\n"; echo "
\n"; } @@ -38,7 +38,7 @@ function start_table($extra="", $padding='2', $spacing='0') if ($extra != "") echo " $extra"; echo " cellpadding=$padding cellspacing=$spacing>\n"; -} +} function end_table($breaks=0) { @@ -52,28 +52,52 @@ function meta_forward($forward_to, $params="") global $Ajax; echo "\n"; echo "

" . _("You should automatically be forwarded."); - echo " " . _("If this does not happen") . " " . "" . _("click here") . " " . _("to continue") . ".

\n"; - $Ajax->redirect($forward_to.'?'.$params); + echo " " . _("If this does not happen") . " " . "" . _("click here") . " " . _("to continue") . ".

\n"; + if ($params !='') $params = '?'.$params; + $Ajax->redirect($forward_to.$params); exit; } //----------------------------------------------------------------------------------- +// Find and replace hotkey marker. +// if $clean == true marker is removed and clean label is returned +// (for use in wiki help system), otherwise result is array of label +// with underlined hotkey letter and access property string. +// +function access_string($label, $clean=false) +{ + $access = ''; + $slices = array(); + + if (preg_match('/(.*)&([a-zA-Z0-9])(.*)/', $label, $slices)) + { + $label = $clean ? $slices[1].$slices[2].$slices[3] : + $slices[1].''.$slices[2].''.$slices[3]; + $access = " accesskey='".strtoupper($slices[2])."'"; + } + + $label = str_replace( '&&', '&', $label); + + return $clean ? $label : array($label, $access); +} function hyperlink_back($center=true) { if ($center) echo "
"; - echo ""._("Back")."\n"; + //echo ""._("Back")."\n"; + echo "

"._("Back")."

\n"; if ($center) echo "
"; - echo "
"; + echo "
"; } function hyperlink_no_params($target, $label, $center=true) { + $pars = access_string($label); if ($center) echo "
"; - echo "$label\n"; + echo "$pars[0]\n"; if ($center) echo "
"; } @@ -89,9 +113,10 @@ function hyperlink_no_params_td($target, $label) function hyperlink_params($target, $label, $params, $center=true) { + $pars = access_string($label); if ($center) echo "
"; - echo "$label\n"; + echo "$pars[0]\n"; if ($center) echo "
"; } @@ -99,7 +124,7 @@ function hyperlink_params($target, $label, $params, $center=true) function hyperlink_params_td($target, $label, $params) { echo ""; - hyperlink_params($target, $label, $params); + hyperlink_params($target, $label, $params, false); echo "\n"; } @@ -107,9 +132,10 @@ function hyperlink_params_td($target, $label, $params) function hyperlink_params_separate($target, $label, $params, $center=false) { + $pars = access_string($label); if ($center) echo "
"; - echo "$label\n"; + echo "$pars[0]\n"; if ($center) echo "
"; } @@ -129,56 +155,70 @@ function alt_table_row_color(&$k) { echo "\n"; $k = 0; - } - else + } + else { echo "\n"; $k++; } } -function table_section_title($msg) +function table_section_title($msg) { echo "$msg\n"; } -function table_header($labels) +function table_header($labels) { start_row(); foreach ($labels as $label) labelheader_cell($label); - end_row(); + end_row(); +} + +function edit_link_cell($param, $title=false) +{ + label_cell("" . _("Edit") . "", "nowrap"); } -function edit_link_cell($param) +function delete_link_cell($param, $title=false) { - label_cell("" . _("Edit") . "", "nowrap"); + label_cell("" . _("Delete") . "", "nowrap"); } -function delete_link_cell($param) +function edit_button($name, $value, $title=false) { - label_cell("" . _("Delete") . "", "nowrap"); +// php silently changes dots,spaces,'[' and characters 128-159 +// to underscore in POST names, to maintain compatibility with register_globals + echo "'=2E',' '=>'=20','='=>'=3D','['=>'=5B'))) + ."\" value=\"$value\"" + .($title ? " title='$title'":'')." />\n"; } -function edit_button_cell($name, $value) +function edit_button_cell($name, $value, $title=false) { - label_cell("\n"); + echo ""; + edit_button($name, $value, $title); + echo ""; } //----------------------------------------------------------------------------------- -function start_row($param="") +function start_row($param="") { if ($param != "") echo "\n"; - else + else echo "\n"; } -function end_row() +function end_row() { echo "\n"; -} +} function br($num=1) { @@ -188,23 +228,105 @@ 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 "
"; - ob_start(); + if ($non_ajax) { // div for non-ajax elements + array_push($ajax_divs, array($id, null)); + echo ""; } } + +/* + 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