Several sieve filter updates

[gosa.git] / include / functions.inc

diff --git a/include/functions.inc b/include/functions.inc
index 2cc2e8cf35697805698481b76cbeaa208e96684e..62ef01a1edf71db442e37ef64aa69f8f848f51b2 100644 (file)
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -291,7 +291,8 @@ function ldap_init ($server, $base, $binddn='', $pass='')
 {
   global $config;
 
-  $ldap = new LDAP ($binddn, $pass, $server, isset($config->current['RECURSIVE'])                                                && $config->current['RECURSIVE'] == "true",
+  $ldap = new LDAP ($binddn, $pass, $server,
+      isset($config->current['RECURSIVE']) && $config->current['RECURSIVE'] == "true",
       isset($config->current['TLS']) && $config->current['TLS'] == "true");
 
   /* Sadly we've no proper return values here. Use the error message instead. */
@@ -462,7 +463,6 @@ function ldap_expired_account($config, $userdn, $username)
 function add_lock ($object, $user)
 {
   global $config;
-  echo "ADDING.. -> ".$object."<br>";
 
   /* Just a sanity check... */
   if ($object == "" || $user == ""){
@@ -503,13 +503,6 @@ function del_lock ($object)
 {
   global $config;
 
-  if(isset($_POST['delete_lock'])){
-    echo "REMOVING -> ".$object."<br>";
-  }else{
-    echo "SKIP REMOVING -> ".$object."<br>";
-    return;
-  }
-
   /* Sanity check */
   if ($object == ""){
     return;
@@ -2133,5 +2126,11 @@ function gosa_ldap_explode_dn($dn,$config = NULL,$verify_in_ldap=false)
   return($ret);
 }
 
+function is_php4()
+{
+  return (preg_match('/^4/', phpversion()));
+}
+
+
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>