Updated FAI entry listing

[gosa.git] / gosa-core / include / functions.inc

diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc
index d862ebb64604b75e9b47c1fc170274a64d75c3ca..dec99bbc2122eb6c8a77f587efdf0aae06637eae 100644 (file)
--- a/gosa-core/include/functions.inc
+++ b/gosa-core/include/functions.inc
@@ -1246,7 +1246,7 @@ function print_sizelimit_warning()
 {
   if (session::global_is_set('size_limit') && session::global_get('size_limit') >= 10000000 ||
       (session::is_set('limit_exceeded') && session::get('limit_exceeded'))){
-    $config= "<input type='submit' name='edit_sizelimit' value="._("Configure").">";
+    $config= "<button type='submit' name='edit_sizelimit'>"._("Configure")."</button>";
   } else {
     $config= "";
   }
@@ -1629,15 +1629,7 @@ function gen_locked_message($user, $dn, $allow_readonly = FALSE)
   /* Prepare and show template */
   $smarty= get_smarty();
   $smarty->assign("allow_readonly",$allow_readonly);
-  if(is_array($dn)){
-    $msg = "<pre>";
-    foreach($dn as $sub_dn){
-      $msg .= "\n".$sub_dn.", ";
-    }
-    $msg = preg_replace("/, $/","</pre>",$msg);
-  }else{
-    $msg = $dn;
-  }
+  $msg= msgPool::buildList($dn);
 
   $smarty->assign ("dn", $msg);
   if ($remove){
@@ -1645,7 +1637,8 @@ function gen_locked_message($user, $dn, $allow_readonly = FALSE)
   } else {
     $smarty->assign ("action", _("Edit anyway"));
   }
-  $smarty->assign ("message", sprintf(_("You're going to edit the LDAP entry/entries %s"), "<b>".$msg."</b>", ""));
+
+  $smarty->assign ("message", _("These entries are currently locked:"). $msg);
 
   return ($smarty->fetch (get_template_path('islocked.tpl')));
 }
@@ -3636,6 +3629,19 @@ function image($path, $action= "", $title= "", $align= "middle")
   }
 }
 
+/*! \brief    Encodes a complex string to be useable in HTML posts.
+ */
+function postEncode($str)
+{
+  return(preg_replace("/=/","_", base64_encode($str)));
+}
+
+/*! \brief    Decodes a string encoded by postEncode
+ */
+function postDecode($str)
+{
+  return(base64_decode(preg_replace("/_/","=", $str)));
+}
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>