Fixed multi query editor

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

diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc
index 24d9328ae29d984925b03cadf984c30a79a2a8b6..df32e69ea857864c9cb278cefa02afef3b14d365 100644 (file)
--- a/gosa-core/include/functions.inc
+++ b/gosa-core/include/functions.inc
@@ -528,6 +528,7 @@ function ldap_login_user_htaccess ($username)
   /* Bail out if we have login restrictions set, for security reasons
      the message is the same than failed user/pw */
   if (!$ui->loginAllowed()){
+    new log("security","login","",array(),"Login restriction for user \"$username\", login not permitted");
     return (NULL);
   }
 
@@ -624,6 +625,7 @@ function ldap_login_user ($username, $password)
   /* Bail out if we have login restrictions set, for security reasons
      the message is the same than failed user/pw */
   if (!$ui->loginAllowed()){
+    new log("security","login","",array(),"Login restriction for user \"$username\", login not permitted");
     return (NULL);
   }
 
@@ -3519,10 +3521,11 @@ function mark($needle, $haystack, $ignorecase= true)
 
 
 /* Return an image description using the path */
-function image($path, $label= null, $action= "", $title= "")
+function image($path, $action= "", $title= "", $align= "middle")
 {
   global $config;
   global $BASE_DIR;
+  $label= null;
 
   // Bail out, if there's no style file
   if(!session::global_is_set("img-styles")){
@@ -3544,6 +3547,11 @@ function image($path, $label= null, $action= "", $title= "")
   }
   $styles= session::global_get('img-styles');
 
+  /* Extract labels from path */
+  if (preg_match("/\.png\[(.*)\]$/", $path, $matches)) {
+    $label= $matches[1];
+  }
+
   $lbl= "";
   if ($label) {
     if (isset($styles["images/label-".$label.".png"])) {
@@ -3551,6 +3559,15 @@ function image($path, $label= null, $action= "", $title= "")
     } else {
       die("Invalid label specified: $label\n");
     }
+
+    $path= preg_replace("/\[.*\]$/", "", $path);
+  }
+
+  // Non middle layout?
+  if ($align == "middle") {
+    $align= "";
+  } else {
+    $align= ";vertical-align:$align";
   }
 
   // Clickable image or not?
@@ -3558,9 +3575,9 @@ function image($path, $label= null, $action= "", $title= "")
     $title= "title='$title'";
   }
   if ($action == "") {
-    return "<div class='img' $title style='".$styles[$path]."'>$lbl</div>";
+    return "<div class='img' $title style='".$styles[$path]."$align'>$lbl</div>";
   } else {
-    return "<input type='submit' class='img' id='$action' value='' name='$action' $title style='".$styles[$path]."'>";
+    return "<input type='submit' class='img' id='$action' value='' name='$action' $title style='".$styles[$path]."$align'>";
   }
 }