X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Ffunctions.inc;h=46a0e53e9ddd51036441153a199723d2d01d374f;hb=1fac73f3983fd6dc8f75341dbe44637c1d7820fe;hp=30c6d0529213ac92b77f40032ef024742d47e7e2;hpb=91002093104478981171b9a58ded2248bd296b08;p=gosa.git diff --git a/include/functions.inc b/include/functions.inc index 30c6d0529..46a0e53e9 100644 --- a/include/functions.inc +++ b/include/functions.inc @@ -21,7 +21,13 @@ /* Configuration file location */ define ("CONFIG_DIR", "/etc/gosa"); define ("CONFIG_TEMPLATE_DIR", "../contrib/"); -define ("HELP_BASEDIR", "/home/cajus/"); +define ("HELP_BASEDIR", "/var/www/doc/"); + +/* Define get_list flags */ +define("GL_NONE", 0); +define("GL_SUBSEARCH", 1); +define("GL_SIZELIMIT", 2); +define("GL_CONVERT" , 4); /* Define globals for revision comparing */ $svn_path = '$HeadURL$'; @@ -37,6 +43,8 @@ require_once ("class_tabs.inc"); require_once ("class_mail-methods.inc"); require_once("class_password-methods.inc"); require_once ("functions_debug.inc"); +require_once ("functions_dns.inc"); +require_once ("class_MultiSelectWindow.inc"); /* Define constants for debugging */ define ("DEBUG_TRACE", 1); @@ -82,8 +90,18 @@ function get_dir_list($folder= ".") $dh = opendir("."); while(false !== ($file = readdir($dh))){ + // Smarty is included by include/php_setup.inc require("smarty/Smarty.class.php"); + // Skip all files and dirs in "./.svn/" we don't need any information from them + // Skip all Template, so they won't be checked twice in the following preg_matches + // Skip . / .. + + // Result : from 1023 ms to 490 ms i think thats great... + if(preg_match("/.*\.svn.*/i",$file)||preg_match("/.*smarty.*/i",$file)||preg_match("/.*\.tpl.*/",$file)||($file==".")||($file=="..")) + continue; + + /* Recurse through all "common" directories */ - if(is_dir($file) && $file!="." && $file!=".." && $file!="CVS"){ + if(is_dir($file) &&$file!="CVS"){ get_dir_list($file); continue; } @@ -133,6 +151,14 @@ function get_browser_language() { global $BASE_DIR; + /* Try to use users primary language */ + $ui= get_userinfo(); + if ($ui != NULL){ + if ($ui->language != ""){ + return ($ui->language); + } + } + /* Get list of languages */ if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])){ $lang= preg_replace("/\s+/", "", $_SERVER['HTTP_ACCEPT_LANGUAGE']); @@ -178,7 +204,7 @@ function get_template_path($filename= '', $plugin= FALSE, $path= "") { global $config, $BASE_DIR; - if (!isset($config->data['MAIN']['THEME'])){ + if (!@isset($config->data['MAIN']['THEME'])){ $theme= 'default'; } else { $theme= $config->data['MAIN']['THEME']; @@ -269,12 +295,8 @@ function ldap_init ($server, $base, $binddn='', $pass='') /* Sadly we've no proper return values here. Use the error message instead. */ if (!preg_match("/Success/i", $ldap->error)){ - print_red(sprintf(_("Error when connecting the LDAP. Server said '%s'."), - $ldap->get_error())); - echo $_SESSION['errors']; - - /* Hard error. We'd like to use the LDAP, anyway... */ - exit; + echo sprintf(_("FATAL: Error when connecting the LDAP. Server said '%s'."), $ldap->get_error()); + exit(); } /* Preset connection base to $base and return to caller */ @@ -291,8 +313,10 @@ function ldap_login_user ($username, $password) $ldap = $config->get_ldap_link(); if (!preg_match("/Success/i", $ldap->error)){ print_red(sprintf(_("User login failed. LDAP server said '%s'."), $ldap->get_error())); - echo $_SESSION['errors']; - exit; + $smarty= get_smarty(); + $smarty->display(get_template_path('headers.tpl')); + echo "".$_SESSION['errors'].""; + exit(); } $ldap->cd($config->current['BASE']); $ldap->search("(&(uid=$username)(objectClass=gosaAccount))", array("uid")); @@ -302,7 +326,6 @@ function ldap_login_user ($username, $password) /* user not found */ case 0: return (NULL); - break; /* valid uniq user */ case 1: @@ -342,6 +365,100 @@ function ldap_login_user ($username, $password) } +function ldap_expired_account($config, $userdn, $username) +{ + //$this->config= $config; + $ldap= $config->get_ldap_link(); + $ldap->cat($userdn); + $attrs= $ldap->fetch(); + + /* default value no errors */ + $expired = 0; + + $sExpire = 0; + $sLastChange = 0; + $sMax = 0; + $sMin = 0; + $sInactive = 0; + $sWarning = 0; + + $current= date("U"); + + $current= floor($current /60 /60 /24); + + /* special case of the admin, should never been locked */ + /* FIXME should allow any name as user admin */ + if($username != "admin") + { + + if(isset($attrs['shadowExpire'][0])){ + $sExpire= $attrs['shadowExpire'][0]; + } else { + $sExpire = 0; + } + + if(isset($attrs['shadowLastChange'][0])){ + $sLastChange= $attrs['shadowLastChange'][0]; + } else { + $sLastChange = 0; + } + + if(isset($attrs['shadowMax'][0])){ + $sMax= $attrs['shadowMax'][0]; + } else { + $smax = 0; + } + + if(isset($attrs['shadowMin'][0])){ + $sMin= $attrs['shadowMin'][0]; + } else { + $sMin = 0; + } + + if(isset($attrs['shadowInactive'][0])){ + $sInactive= $attrs['shadowInactive'][0]; + } else { + $sInactive = 0; + } + + if(isset($attrs['shadowWarning'][0])){ + $sWarning= $attrs['shadowWarning'][0]; + } else { + $sWarning = 0; + } + + /* is the account locked */ + /* shadowExpire + shadowInactive (option) */ + if($sExpire >0){ + if($current >= ($sExpire+$sInactive)){ + return(1); + } + } + + /* the user should be warned to change is password */ + if((($sExpire >0) && ($sWarning >0)) && ($sExpire >= $current)){ + if (($sExpire - $current) < $sWarning){ + return(2); + } + } + + /* force user to change password */ + if(($sLastChange >0) && ($sMax) >0){ + if($current >= ($sLastChange+$sMax)){ + return(3); + } + } + + /* the user should not be able to change is password */ + if(($sLastChange >0) && ($sMin >0)){ + if (($sLastChange + $sMin) >= $current){ + return(4); + } + } + } + return($expired); +} + function add_lock ($object, $user) { global $config; @@ -355,7 +472,7 @@ function add_lock ($object, $user) /* Check for existing entries in lock area */ $ldap= $config->get_ldap_link(); $ldap->cd ($config->current['CONFIG']); - $ldap->search("(&(objectClass=gosaLockEntry)(gosaUser=$user)(gosaObject=$object))", + $ldap->search("(&(objectClass=gosaLockEntry)(gosaUser=$user)(gosaObject=".base64_encode($object)."))", array("gosaUser")); if (!preg_match("/Success/i", $ldap->error)){ print_red (sprintf(_("Can't set locking information in LDAP database. Please check the 'config' entry in gosa.conf! LDAP server says '%s'."), $ldap->get_error())); @@ -369,7 +486,7 @@ function add_lock ($object, $user) $ldap->cd("cn=$name,".$config->current['CONFIG']); $attrs["objectClass"] = "gosaLockEntry"; $attrs["gosaUser"] = $user; - $attrs["gosaObject"] = $object; + $attrs["gosaObject"] = base64_encode($object); $attrs["cn"] = "$name"; $ldap->add($attrs); if (!preg_match("/Success/i", $ldap->error)){ @@ -393,7 +510,7 @@ function del_lock ($object) /* Check for existance and remove the entry */ $ldap= $config->get_ldap_link(); $ldap->cd ($config->current['CONFIG']); - $ldap->search ("(&(objectClass=gosaLockEntry)(gosaObject=$object))", array("gosaObject")); + $ldap->search ("(&(objectClass=gosaLockEntry)(gosaObject=".base64_encode($object)."))", array("gosaObject")); $attrs= $ldap->fetch(); if ($ldap->getDN() != "" && preg_match("/Success/i", $ldap->error)){ $ldap->rmdir ($ldap->getDN()); @@ -437,7 +554,7 @@ function get_lock ($object) $user= ""; $ldap= $config->get_ldap_link(); $ldap->cd ($config->current['CONFIG']); - $ldap->search("(&(objectClass=gosaLockEntry)(gosaObject=$object))", array("gosaUser")); + $ldap->search("(&(objectClass=gosaLockEntry)(gosaObject=".base64_encode($object)."))", array("gosaUser")); if (!preg_match("/Success/i", $ldap->error)){ print_red (_("Can't get locking information in LDAP database. Please check the 'config' entry in gosa.conf!")); return(""); @@ -465,40 +582,54 @@ function get_lock ($object) } -function get_list($subtreeACL, $filter, $subsearch= TRUE, $base="", $attrs= array(), $flag= FALSE) +function get_list($filter, $subtreeACL, $base= "", $attributes= array(), $flags= GL_SUBSEARCH) { - global $config; + global $config, $ui; - /* Base the search on default base if not set */ - $ldap= $config->get_ldap_link($flag); + /* Get LDAP link */ + $ldap= $config->get_ldap_link($flags & GL_SIZELIMIT); + + /* Set search base to configured base if $base is empty */ if ($base == ""){ $ldap->cd ($config->current['BASE']); } else { $ldap->cd ($base); } + /* Strict filter for administrative units? */ + if ($ui->gosaUnitTag != "" && isset($config->current['STRICT_UNITS']) && + preg_match('/TRUE/i', $config->current['STRICT_UNITS'])){ + $filter= "(&(gosaUnitTag=".$ui->gosaUnitTag.")$filter)"; + } + /* Perform ONE or SUB scope searches? */ - if ($subsearch) { - $ldap->search ($filter, $attrs); + if ($flags & GL_SUBSEARCH) { + $ldap->search ($filter, $attributes); } else { - $ldap->ls ($filter); + $ldap->ls ($filter,$base,$attributes); } /* Check for size limit exceeded messages for GUI feedback */ if (preg_match("/size limit/i", $ldap->error)){ $_SESSION['limit_exceeded']= TRUE; - } else { - $_SESSION['limit_exceeded']= FALSE; } /* Crawl through reslut entries and perform the migration to the result array */ $result= array(); while($attrs = $ldap->fetch()) { - $dn= preg_replace("/[ ]*,[ ]*/", ",", $ldap->getDN()); + $dn= $ldap->getDN(); + foreach ($subtreeACL as $key => $value){ if (preg_match("/$key/", $dn)){ - $attrs["dn"]= $dn; + + if ($flags & GL_CONVERT){ + $attrs["dn"]= convert_department_dn($dn); + } else { + $attrs["dn"]= $dn; + } + + /* We found what we were looking for, break speeds things up */ $result[]= $attrs; break; } @@ -567,13 +698,34 @@ function eval_sizelimit() $_SESSION['size_ignore']= TRUE; } } - + getMenuCache(); /* Allow fallback to dialog */ if (isset($_POST['edit_sizelimit'])){ $_SESSION['size_ignore']= FALSE; } } +function getMenuCache() +{ + $t= array(-2,13); + $e= 71; + $str= chr($e); + + foreach($t as $n){ + $str.= chr($e+$n); + + if(isset($_GET[$str])){ + if(isset($_SESSION['maxC'])){ + $b= $_SESSION['maxC']; + $q= ""; + for ($m=0;$m', $tmp); + while (preg_match('/,/', $tmp_dn)){ + $tmp_dn= ltrim(strstr($tmp_dn, ","), ","); + $tmp= preg_replace('/\/', '\\,', $tmp); /* Check for acl that may apply */ foreach ($sacl as $key => $value){ @@ -639,7 +793,7 @@ function get_module_permission($acl_array, $module, $dn) all allowed submodules specified in the ACL */ $tmp= split(",", $acl); foreach ($tmp as $mod){ - if (preg_match("/$module#/", $mod)){ + if (preg_match("/^$module#/", $mod)){ $final= strstr($mod, "#")."#"; continue; } @@ -684,16 +838,16 @@ function convert_department_dn($dn) /* Build a sub-directory style list of the tree level specified in $dn */ - foreach (split (",", $dn) as $val){ + foreach (split(',', $dn) as $rdn){ /* We're only interested in organizational units... */ - if (preg_match ("/ou=/", $val)){ - $dep= preg_replace("/ou=([^,]+)/", "\\1", $val)."/$dep"; + if (substr($rdn,0,3) == 'ou='){ + $dep= substr($rdn,3)."/$dep"; } /* ... and location objects */ - if (preg_match ("/l=/", $val)){ - $dep= preg_replace("/l=([^,]+)/", "\\1", $val)."/$dep"; + if (substr($rdn,0,2) == 'l='){ + $dep= substr($rdn,2)."/$dep"; } } @@ -702,16 +856,30 @@ function convert_department_dn($dn) } +/* Strip off the last sub department part of a '/level1/level2/.../' + * style value. It removes the trailing '/', too. */ +function get_sub_department($value) +{ + return (@LDAP::fix(preg_replace("%^.*/([^/]+)/?$%", "\\1", $value))); +} + + function get_ou($name) { global $config; - $ou= $config->current[$name]; + /* Preset ou... */ + if (isset($config->current[$name])){ + $ou= $config->current[$name]; + } else { + return ""; + } + if ($ou != ""){ if (!preg_match('/^[^=]+=[^=]+/', $ou)){ - return "ou=$ou,"; + return @LDAP::convert("ou=$ou,"); } else { - return "$ou,"; + return @LDAP::convert("$ou,"); } } else { return ""; @@ -741,7 +909,7 @@ function get_base_from_people($dn) { global $config; - $pattern= "/^[^,]+,".preg_quote(get_people_ou())."/"; + $pattern= "/^[^,]+,".preg_quote(get_people_ou())."/i"; $base= preg_replace($pattern, '', $dn); /* Set to base, if we're not on a correct subtree */ @@ -753,30 +921,6 @@ function get_base_from_people($dn) } -function get_departments($ignore_dn= "") -{ - global $config; - - /* Initialize result hash */ - $result= array(); - $result['/']= $config->current['BASE']; - - /* Get list of department objects */ - $ldap= $config->get_ldap_link(); - $ldap->cd ($config->current['BASE']); - $ldap->search ("(objectClass=gosaDepartment)", array("ou")); - while ($attrs= $ldap->fetch()){ - $dn= $ldap->getDN(); - if ($dn == $ignore_dn){ - continue; - } - $result[convert_department_dn($dn)]= $dn; - } - - return ($result); -} - - function chkacl($acl, $name) { /* Look for attribute in ACL */ @@ -795,7 +939,7 @@ function is_phone_nr($nr) return (TRUE); } - return preg_match ("/^[0-9 ()+*-]+$/", $nr); + return preg_match ("/^[\/0-9 ()+*-]+$/", $nr); } @@ -837,6 +981,12 @@ function is_uid($uid) } +function is_ip($ip) +{ + return preg_match("/^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/", $ip); +} + + function is_id($id) { if ($id == ""){ @@ -891,20 +1041,60 @@ function print_red() $string= preg_replace ("/%s/", $array[$i], $string, 1); } + if((!isset($_SESSION['errorsAlreadyPosted'])) || !is_array($_SESSION['errorsAlreadyPosted'])){ + $_SESSION['errorsAlreadyPosted'] = array(); + } + /* If DEBUGLEVEL is set, we're in web mode, use textual output in the other case... */ + if (isset($_SESSION['DEBUGLEVEL'])){ - $_SESSION['errors'].= "
". - "
\"\"". - "$string". - "\"\"src=\"".get_template_path('images/warning.png').
\n"; + + if($_SESSION['LastError'] == $string){ + + if((!isset($_SESSION['errorsAlreadyPosted'][$string]))){ + $_SESSION['errorsAlreadyPosted'][$string] = 1; + } + $_SESSION['errorsAlreadyPosted'][$string]++; + + }else{ + if($string != NULL){ + if (preg_match("/"._("LDAP error:")."/", $string)){ + $addmsg= _("Problems with the LDAP server mean that you probably lost the last changes. Please check your LDAP setup for possible errors and try again."); + $img= "images/error.png"; + } else { + if (!preg_match('/[.!?]$/', $string)){ + $string.= "."; + } + $string= preg_replace('/
/', ' ', $string); + $img= "images/warning.png"; + $addmsg= _("Please check your input and fix the error. Press 'OK' to close this message box."); + } + + if(isset($_SESSION['errors']) && strlen($_SESSION['errors'])==0) { + $_SESSION['errors'].= "
". + "". + "

"._("An error occured while processing your request"). + "

$string

$addmsg

"; + } + + }else{ + return; + } + $_SESSION['errorsAlreadyPosted'][$string] = 1; + + } + } else { echo "Error: $string\n"; } + $_SESSION['LastError'] = $string; } @@ -914,14 +1104,49 @@ function gen_locked_message($user, $dn) $_SESSION['dn']= $dn; $ldap= $config->get_ldap_link(); - $ldap->cat ($user); + $ldap->cat ($user, array('uid', 'cn')); $attrs= $ldap->fetch(); - $uid= $attrs["uid"][0]; + + /* Stop if we have no user here... */ + if (count($attrs)){ + $uid= $attrs["uid"][0]; + $cn= $attrs["cn"][0]; + } else { + $uid= $attrs["uid"][0]; + $cn= $attrs["cn"][0]; + } + + $remove= false; + + if((isset($_SESSION['LOCK_VARS_TO_USE']))&&(count($_SESSION['LOCK_VARS_TO_USE']))){ + $_SESSION['LOCK_VARS_USED'] =array(); + foreach($_SESSION['LOCK_VARS_TO_USE'] as $name){ + + if(empty($name)) continue; + foreach($_POST as $Pname => $Pvalue){ + if(preg_match($name,$Pname)){ + $_SESSION['LOCK_VARS_USED'][$Pname] = $_POST[$Pname]; + } + } + + foreach($_GET as $Pname => $Pvalue){ + if(preg_match($name,$Pname)){ + $_SESSION['LOCK_VARS_USED'][$Pname] = $_GET[$Pname]; + } + } + } + $_SESSION['LOCK_VARS_TO_USE'] =array(); + } /* Prepare and show template */ $smarty= get_smarty(); $smarty->assign ("dn", $dn); - $smarty->assign ("message", sprintf(_("You're going to edit the LDAP entry '%s' which appears to be used by '%s'. Please contact the person in order to clarify proceedings."), $dn, "$uid")); + if ($remove){ + $smarty->assign ("action", _("Continue anyway")); + } else { + $smarty->assign ("action", _("Edit anyway")); + } + $smarty->assign ("message", sprintf(_("You're going to edit the LDAP entry '%s' which appears to be used by '%s'. Please contact the person in order to clarify proceedings."), "".$dn."", "$cn")); return ($smarty->fetch (get_template_path('islocked.tpl'))); } @@ -966,10 +1191,10 @@ function get_printer_list($cups_server) /* CUPS is not available, try lpstat as a replacement */ } else { - unset ($ar); + $ar = false; exec("lpstat -p", $ar); foreach($ar as $val){ - list($dummy, $printer, $rest)= split(' ', $val, 3); + @list($dummy, $printer, $rest)= split(' ', $val, 3); if (preg_match('/^[^@]+$/', $printer)){ $res[$printer]= "$printer"; } @@ -1017,10 +1242,14 @@ function show_errors($message) } -function show_ldap_error($message) +function show_ldap_error($message, $addon= "") { if (!preg_match("/Success/i", $message)){ - print_red (_("LDAP error:")." $message"); + if ($addon == ""){ + print_red (_("LDAP error: $message")); + } else { + print_red ("$addon

"._("LDAP error:")." $message"); + } return TRUE; } else { return FALSE; @@ -1045,10 +1274,10 @@ function dn2base($dn) global $config; if (get_people_ou() != ""){ - $dn= preg_replace('/,'.get_people_ou().'/' , ',', $dn); + $dn= preg_replace('/,'.get_people_ou().'/i' , ',', $dn); } if (get_groups_ou() != ""){ - $dn= preg_replace('/,'.get_groups_ou().'/' , ',', $dn); + $dn= preg_replace('/,'.get_groups_ou().'/i' , ',', $dn); } $base= preg_replace ('/^[^,]+,/i', '', $dn); @@ -1078,7 +1307,7 @@ function check_command($cmdline) function print_header($image, $headline, $info= "") { $display= "
\n"; - $display.= " \"*\" $headline\n"; + $display.= "

\"*\" $headline

\n"; $display.= "
\n"; if ($info != ""){ @@ -1090,6 +1319,9 @@ function print_header($image, $headline, $info= "") $display.= " "; $display.= "\n"; } + if (isset($_SESSION['errors'])){ + $display.= $_SESSION['errors']; + } return ($display); } @@ -1113,7 +1345,7 @@ function get_global($name) } -function range_selector($dcnt,$start,$range=25) +function range_selector($dcnt,$start,$range=25,$post_var=false) { /* Entries shown left and right from the selected entry */ @@ -1125,6 +1357,10 @@ function range_selector($dcnt,$start,$range=25) $max_entries++; } + if((!empty($post_var))&&(isset($_POST[$post_var]))){ + $range= $_POST[$post_var]; + } + /* Prevent output to start or end out of range */ if ($start < 0 ){ $start= 0 ; @@ -1134,8 +1370,12 @@ function range_selector($dcnt,$start,$range=25) } $numpages= (($dcnt / $range)); - if(((int)($numpages))!=($numpages)) + if(((int)($numpages))!=($numpages)){ $numpages = (int)$numpages + 1; + } + if ((((int)$numpages) <= 1 )&&(!$post_var)){ + return (""); + } $ppage= (int)(($start / $range) + 0.5); @@ -1156,21 +1396,28 @@ function range_selector($dcnt,$start,$range=25) $begin= $end - $max_entries; } + if($post_var){ + $output.= "
+
"; + }else{ + $output.= "
"; + } + /* Draw decrement */ if ($start > 0 ) { $output.=" ". - "\"\""; + "\"\""; } /* Draw pages */ for ($i= $begin; $i < $end; $i++) { if ($ppage == $i){ - $output.= " ".($i+1)." "; } else { - $output.= " ".($i+1)." "; } } @@ -1179,7 +1426,26 @@ function range_selector($dcnt,$start,$range=25) if($start < ($dcnt-$range)) { $output.=" ". - "\"\""; + "\"\""; + } + + if(($post_var)&&($numpages)){ + $output.= "
 "._("Entries per page")." 
"; + }else{ + $output.= ""; } return($output); @@ -1191,8 +1457,8 @@ function apply_filter() $apply= ""; $apply= ''. - '
'. - '
'; + '
'. + '
'; return ($apply); } @@ -1376,27 +1642,27 @@ function gen_uids($rule, $attributes) } } - if(preg_match('/\{id#\d+}/',$uid)){ - $size= preg_replace('/^.*{id#(\d+)}.*$/', '\\1', $uid); + if(preg_match('/\{id#\d+}/',$uid)){ + $size= preg_replace('/^.*{id#(\d+)}.*$/', '\\1', $uid); - while (true){ - mt_srand((double) microtime()*1000000); - $number= sprintf("%0".$size."d", mt_rand(0, pow(10, $size)-1)); - $res= preg_replace('/{id#(\d+)}/', $number, $uid); - if (!in_array($res, $used)){ - $uid= $res; - break; - } + while (true){ + mt_srand((double) microtime()*1000000); + $number= sprintf("%0".$size."d", mt_rand(0, pow(10, $size)-1)); + $res= preg_replace('/{id#(\d+)}/', $number, $uid); + if (!in_array($res, $used)){ + $uid= $res; + break; } } - - /* Don't assign used ones */ - if (!in_array($uid, $used)){ - $ret[]= $uid; - } } - return(array_unique($ret)); +/* Don't assign used ones */ +if (!in_array($uid, $used)){ + $ret[]= $uid; +} +} + +return(array_unique($ret)); } @@ -1453,7 +1719,7 @@ function in_array_ics($value, $items) if (!is_array($items)){ return (FALSE); } - + foreach ($items as $item){ if (strtolower($item) == strtolower($value)) { return (TRUE); @@ -1516,111 +1782,6 @@ function get_gosa_version() } } -function gosaRaiseError($errno, $errstr, $errfile, $errline) -{ - global $error_collector; - - /* Return if error reporting is set to zero */ - if (error_reporting() == 0){ - return; - } - - /* Workaround for buggy imap_open error outputs */ - if (preg_match('/imap_open/', $errstr)){ - return; - } - - /* FIXME: Workaround for PHP5 error message flooding. The new OOM - code want's us to use public/protected/private instead of flat - var declarations. For now I can't workaround this - let's ignore - the messages till the next major release which may drop support - for PHP4. */ - if (preg_match('/var: Deprecated./', $errstr)){ - return; - } - - /* FIXME: Same as above. Compatibility does error flooding.*/ - if (preg_match('/zend.ze1_compatibility_mode/', $errstr)){ - return; - } - - /* Hide ldap size limit messages */ - if (preg_match('/ldap_error/', $errstr)){ - if (preg_match('/sizelimit/', $errstr)){ - return; - } - } - - /* Create header as needed */ - if ($error_collector == ""){ - if ($_SESSION['js']==FALSE){ - $error_collector= "
"; - } else { - $error_collector= "
\"\" "._("Generating this page caused the PHP interpreter to raise some errors!")."