Merged changes from main CVS (up to 2.2.10)

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

diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index 36f99e9ce01bf0e7bd5fc69095c14a804bd3ea59..00bae3128d7ecf0829b150615e436fa19648781e 100644 (file)
--- a/includes/ui/ui_input.inc
+++ b/includes/ui/ui_input.inc
@@ -107,35 +107,43 @@ function hidden($name, $value=null, $echo=true)
                null  - button visible only in fallback mode; optional icon
         Ajax submit:
                true      - standard button; optional icon
-               'process' - displays progress bar during call; optional icon
+
                'default' - default form submit on Ctrl-Enter press; dflt ICON_OK icon
                'selector' - ditto with closing current popup editor window
                'cancel'  - cancel form entry on Escape press; dflt ICON_CANCEL
+               'process' - displays progress bar during call; optional icon
+
+       $atype can contain also multiply type selectors separated by space, 
+       however make sense only combination of 'process' and one of defualt/selector/cancel
 */
 function submit($name, $value, $echo=true, $title=false, $atype=false, $icon=false)
 {
        global $path_to_root;
 
        $aspect='';
-       if (!is_bool($atype)) // necessary: switch uses '=='
-         switch($atype) {
-               case 'process':
-                       $aspect = " aspect='process'"; break;
-               case 'selector':
-                       $aspect = " aspect='selector' rel = '$value'"; 
-                       $value = _("Select");
-                       if ($icon===false) $icon=ICON_SUBMIT; break;
-               case 'default':
-                       $aspect = " aspect='default'"; 
-                       if ($icon===false) $icon=ICON_SUBMIT; break;
-               case 'cancel':
-                       $aspect = " aspect='cancel'"; 
-                       if ($icon===false) $icon=ICON_ESCAPE; break;
-               case null: 
-                       $aspect = fallback_mode() ? 
-                               " aspect='fallback'" : " style='display:none;'"; break;
-        }
+       if ($atype === null) {
+               $aspect = fallback_mode() ? " aspect='fallback'" : " style='display:none;'";
+
+       } elseif (!is_bool($atype)) { // necessary: switch uses '=='
+
+               $aspect = "aspect='$atype' ";
+               $types = explode(' ', $atype);
 
+               foreach ($types as $type) {
+                       switch($type) {
+                               case 'selector':
+                                       $aspect = " aspect='selector' rel = '$value'"; 
+                                       $value = _("Select");
+                                       if ($icon===false) $icon=ICON_SUBMIT; break;
+
+                               case 'default':
+                                       if ($icon===false) $icon=ICON_SUBMIT; break;
+
+                               case 'cancel':
+                                       if ($icon===false) $icon=ICON_ESCAPE; break;
+                       }
+               }
+       }
        $submit_str = "<button class=\""
            .($atype ? 'ajaxsubmit' : 'inputsubmit')
                ."\" type=\"submit\""