X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Ffunctions_FAI.inc;h=26c0a572659f10287d156965b74bdb68579e2095;hb=387a8ff163da84a9885feaa4fb936031c93eebf5;hp=a54100c03e90b5125f14a7af7d982b81e3b6b26e;hpb=119350072dd50696b161c03a4b4463a16126131d;p=gosa.git
diff --git a/include/functions_FAI.inc b/include/functions_FAI.inc
index a54100c03..26c0a5726 100644
--- a/include/functions_FAI.inc
+++ b/include/functions_FAI.inc
@@ -13,12 +13,16 @@ function get_all_objects_for_given_base($Current_DN,$filter,$detailed = false)
global $config;
$ldap = $config->get_ldap_link();
$ldap->cd($config->current['BASE']);
+ $res = array();
+ $tmp = array();
+
+ if(!is_release_department($Current_DN)) {
+ return($res);
+ }
/* Collect some basic informations and initialize some variables */
$base_release = get_release_dn($Current_DN);
$previous_releases = array_reverse(get_previous_releases_of_this_release($base_release,true));
- $res = array();
- $tmp = array();
/* We must also include the given release dn */
$previous_releases[] = $base_release;
@@ -33,14 +37,13 @@ function get_all_objects_for_given_base($Current_DN,$filter,$detailed = false)
foreach($deps_to_search as $fai_base){
/* Ldap search for fai classes specified in this release */
- $ldap->cd($fai_base);
- $ldap->search($filter,array("dn","objectClass","FAIstate"));
-
+ $res_tmp = get_list($filter,"fai",$fai_base,array("dn","objectClass","FAIstate"),GL_SUBSEARCH | GL_SIZELIMIT);
+
/* check the returned objects, and add/replace them in our return variable */
- while($attr = $ldap->fetch()){
+ foreach($res_tmp as $attr){
$buffer = array();
- $name = str_ireplace($release,"",$attr['dn']);
+ $name = preg_replace("/".normalizePreg($release)."/i","",$attr['dn']);
if(isset($attr['FAIstate'][0])){
if(preg_match("/removed$/",$attr['FAIstate'][0])){
@@ -78,24 +81,6 @@ function get_all_objects_for_given_base($Current_DN,$filter,$detailed = false)
}
-
-/* Return the object defining ObjectClass e.g. FAIscriptEntry */
-function get_FAI_type($attr)
-{
- $arr = array( "FAIprofile","FAIpartitionTable", "FAIpartitionDisk","FAIpartitionEntry","FAIhook","FAIhookEntry",
- "FAIscriptEntry","FAIscript","FAIvariable","FAIvariableEntry","FAIpackageList","FAItemplate",
- "FAItemplateEntry","FAIdebconfInfo","FAIrepository","FAIrepositoryServer","FAIbranch","FAIreleaseTag");
- foreach($arr as $name){
- if(in_array($name,$attr['objectClass'])){
- preg_match("");
- return($name);
- }
- }
- if(DEBUG_FAI_FUNC) { echo "Not found"; }
- return("");
-}
-
-
/* Return all relevant FAI departments */
function get_FAI_departments($suffix = "")
{
@@ -119,7 +104,12 @@ function get_FAI_departments($suffix = "")
function get_all_releases_from_base($dn,$appendedName=false)
{
global $config;
- $base = "ou=fai,ou=configs,ou=systems,".$dn;
+
+ if(!preg_match("/ou=fai,ou=configs,ou=systems,/",$dn)){
+ $base = "ou=fai,ou=configs,ou=systems,".$dn;
+ }else{
+ $base = $dn;
+ }
$res = array();
$ldap = $config->get_ldap_link();
@@ -169,22 +159,32 @@ function prepare_to_save_FAI_object($Current_DN,$objectAttrs,$removed = false)
/* Detect differences in attribute arrays */
function array_diff_FAI($ar1,$ar2)
{
+
+ if((!isset($ar1['description'])) || (isset($ar1['description']) && (count($ar1['description']) == 0))){
+ $ar1['description'] = "";
+ }
+ if((!isset($ar2['description'])) || (isset($ar2['description']) && (count($ar2['description']) == 0))){
+ $ar2['description'] = "";
+ }
+
+ if(count($ar1) != count($ar2)) {
+ return (true);
+ }
+
foreach($ar1 as $key1 => $val1){
if((is_array($val1)) && (count($val1)==1)){
$ar1[$key1] = $val1[0];
}
- if(!isset($ar2[$key1])){
- return(true);
- }
-
if((is_array($ar2[$key1])) && (count($ar2[$key1])==1)){
$val1 = $val1[0];
$ar2[$key1] = $ar2[$key1][0];
}
}
- if(count( array_diff($ar1,$ar2))){
+ ksort($ar1);
+ ksort($ar2);
+ if(count( array_diff($ar1,$ar2)) || arr_diff($ar1,$ar2)){
return(true);
}else{
return(false);
@@ -192,6 +192,21 @@ function array_diff_FAI($ar1,$ar2)
}
+function arr_diff($ar1,$ar2)
+{
+ foreach($ar1 as $ak1 => $av1){
+ if(!isset($ar2[$ak1]) || (!($av1 === $ar2[$ak1]))){
+ return(true);
+ }elseif(is_array($av1)){
+ return(arr_diff($av1,$ar2[$ak1]));
+ }
+ }
+ return(FALSE);
+}
+
+
+
+
/* check which objects must be saved, and save them */
function save_release_changes_now()
{
@@ -278,7 +293,7 @@ function save_release_changes_now()
/* Check if this a leaf release or not */
if(count($following_releases) == 0 ){
- /* This is a leaf object. It isn't unherited by any other object */
+ /* This is a leaf object. It isn't inherited by any other object */
if(DEBUG_FAI_FUNC) {
echo "Saving directly, is a leaf object
".$Current_DN;
print_a($objectAttrs);
@@ -401,7 +416,8 @@ function clean_up_releases($Current_DN)
while($attr = $ldap->fetch()){
$buffer = array();
- $name = str_ireplace($release,"",$attr['dn']);
+# $name = str_ireplace($release,"",$attr['dn']);
+ $name = preg_replace("/".normalizePreg($release)."/i","",$attr['dn']);
if(isset($attr['FAIstate'][0])&&(preg_match("/removed$/",$attr['FAIstate'][0]))){
@@ -422,6 +438,7 @@ function clean_up_releases($Current_DN)
}
+/* Remove numeric index and 'count' from ldap->fetch result */
function prepare_ldap_fetch_to_be_saved($attrs)
{
foreach($attrs as $key => $value){
@@ -436,6 +453,7 @@ function prepare_ldap_fetch_to_be_saved($attrs)
}
+/* Save given attrs to specified dn*/
function save_FAI_object($dn,$attrs)
{
global $config;
@@ -447,18 +465,26 @@ function save_FAI_object($dn,$attrs)
$ldap->cat($dn,array("dn"));
if($ldap->count()){
+ /* Remove FAIstate*/
if(!isset($attrs['FAIstate'])){
$attrs['FAIstate'] = array();
}
$ldap->modify($attrs);
}else{
+
+ /* Unset description if empty */
+ if(empty($attrs['description'])){
+ unset($attrs['description']);
+ }
+
$ldap->add($attrs);
}
show_ldap_error($ldap->get_error(),sprintf(_("Release management failed, can't save '%s'"),$dn));
}
+/* Return FAIstate freeze branch or "" for specified release department */
function get_release_tag($dn)
{
global $config;
@@ -496,7 +522,8 @@ function get_following_releases_that_inherit_this_object($dn)
$sub_releases = get_sub_releases_of_this_release($base_release);
/* Get dn suffix. Example "FAIvairableEntry=keksdose,FAIvariable=Keksregal," */
- $dn_suffix = str_ireplace($base_release,"",$dn);
+# $dn_suffix = str_ireplace($base_release,"",$dn);
+ $dn_suffix = preg_replace("/".normalizePreg($base_release)."/i","",$dn);
/* Check if given object also exists whitin one of these releases */
foreach($sub_releases as $p_release => $name){
@@ -536,7 +563,8 @@ function get_parent_release_object($dn,$include_myself=true)
}
/* Get dn suffix. Example "FAIvairableEntry=keksdose,FAIvariable=Keksregal," */
- $dn_suffix = str_ireplace($base_release,"",$dn);
+# $dn_suffix = str_ireplace($base_release,"",$dn);
+ $dn_suffix = preg_replace("/".normalizePreg($base_release)."/i","",$dn);
/* Check if given object also exists whitin one of these releases */
foreach($previous_releases as $p_release){
@@ -560,7 +588,8 @@ function get_previous_releases_of_this_release($dn,$flat)
$ret = array();
/* Explode dns into pieces, to be able to build parent dns */
- $dns_to_check = ldap_explode_dn(str_ireplace(",".$config->current['BASE'],"",$dn),0);
+ $dns_to_check = gosa_ldap_explode_dn(preg_replace("/".normalizePreg(",".$config->current['BASE'])."/i","",$dn));
+
if(!is_array($dns_to_check)){
return;
}
@@ -664,7 +693,8 @@ function get_release_dn($Current_DN)
$ldap->cd($config->current['BASE']);
/* Split dn into pices */
- $dns_to_check = ldap_explode_dn(str_ireplace(",".$config->current['BASE'],"",$Current_DN),0);
+ $dns_to_check = gosa_ldap_explode_dn(preg_replace("/".normalizePreg(",".$config->current['BASE'])."/i","",$Current_DN));
+
if(!is_array($dns_to_check)){
return;
}