X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fgroups%2Fclass_groupApplication.inc;h=fd4da27d2ebbb7fcd3b851d50e51852269733f16;hb=ca98ca8c7d1adccfcf78ccc86faa5d9e2d69967e;hp=3f181c18fd8630e964ac1c5b845916212a49951a;hpb=c1670b6da3890246c0f40c8d3d065320f4772ba1;p=gosa.git

diff --git a/plugins/admin/groups/class_groupApplication.inc b/plugins/admin/groups/class_groupApplication.inc
index 3f181c18f..fd4da27d2 100644
--- a/plugins/admin/groups/class_groupApplication.inc
+++ b/plugins/admin/groups/class_groupApplication.inc
@@ -27,6 +27,7 @@ class appgroup extends plugin
   var $attributes= array();
   var $objectclasses= array("gosaApplicationGroup");
 
+
   function appgroup ($config, $dn= NULL)
   {
     plugin::plugin ($config, $dn);
@@ -109,150 +110,144 @@ class appgroup extends plugin
     $this->curbase = $this->config->current['BASE'];
   }
 
-  function catDown($id){
-   /* Get all cats depinding on current dir */
-    $cats = $this->GetSubdirs($this->curCatDir);
+
+  /* Combine new array */
+  function combineArrays($ar0,$ar1,$ar2)
+  {
     $ret = array();
-    if((in_array($id,array_flip($cats)))&&(count($cats)>1)){
-      if(count($cats) == 2){
-        $ret = array_reverse($cats);
-      }else{
-        $cnt = 0;
-        $hit = 0;
-        foreach($cats as $cat=>$name){
-          if($cat  == $id){
-            $hit = $cnt;
-          }
-          $cnt ++;
-        }
-        if($hit == 0){ 
-          $first  = array_slice($cats,0,0);
-          $middle = array_slice($cats,0,2);
-          $last   = array_slice($cats,$hit+2,$cnt);
-        }else{
-          $first  = array_slice($cats,0,$hit);
-          $middle = array_slice($cats,$hit,2);
-          $last   = array_slice($cats,$hit+2,$cnt);
-        }
-        foreach($first as $cat => $name){
-          $ret[$cat]=$name;
-        }
-        foreach(array_reverse($middle) as $cat => $name){
-          $ret[$cat]=$name;
-        }
-        foreach($last as $cat => $name){
-          $ret[$cat]=$name;
-        }
-      }
-      foreach($cats as $cat => $name){
-        unset($this->Categories[$cat]);
-      }
-      foreach($ret as $cat => $name){
-        $this->Categories[$cat]=$name;
+    if(is_array($ar0))
+    foreach($ar0 as $ar => $a){
+        $ret[$ar]=$a;
+    }
+    if(is_array($ar1))
+    foreach($ar1 as $ar => $a){
+        $ret[$ar]=$a;
+    }
+    if(is_array($ar2))
+    foreach($ar2 as $ar => $a){
+        $ret[$ar]=$a;
+    }
+    return($ret);
+  }
+
+  function getpos($atr,$attrs)
+  {
+    $i = 0;
+    foreach($attrs as $attr => $name)    {
+      $i++;
+      if($attr == $atr){
+        return($i);
       }
     }
+    return(-1);
   }
 
+
+  /* TRansports the geiven Arraykey one position up*/
+  function ArrayUp($atr,$attrs)
+  {
+    $ret = $attrs;
+    $pos = $this->getpos($atr,$attrs) ;
+    $cn = count($attrs);
+    if(!(($pos == -1)||($pos == 1))){
+      $before = array_slice($attrs,0,($pos-2));
+      $mitte  = array_reverse(array_slice($attrs,($pos-2),2));
+      $unten  = array_slice($attrs,$pos);
+      $ret = array();
+      $ret = $this->combineArrays($before,$mitte,$unten);
+    }
+    return($ret);
+  }
+
+
+  /* TRansports the geiven Arraykey one position up*/
+  function ArrayDown($atr,$attrs)
+  {
+    $ret = $attrs;
+    $pos = $this->getpos($atr,$attrs) ;
+    $cn = count($attrs);
+    if(!(($pos == -1)||($pos == $cn))){
+      $before = array_slice($attrs,0,($pos-1));
+      $mitte  = array_reverse(array_slice($attrs,($pos-1),2));
+      $unten  = array_slice($attrs,($pos+1));
+      $ret = array();
+      $ret = $this->combineArrays($before,$mitte,$unten);
+    }
+    return($ret);
+  }
+
+
   function catUp($id)
   {
     /* Get all cats depinding on current dir */
     $cats = $this->GetSubdirs($this->curCatDir);
+    $newcats =$this->ArrayUp($id,$cats);
 
-    $ret = array();
-
-    if((in_array($id,array_flip($cats)))&&(count($cats)>1)){
-      if(count($cats) == 2){
-        $ret = array_reverse($cats);
-      }else{
-        $cnt = 0;
-        $hit = 0;
-        foreach($cats as $cat => $name){
-          $cnt ++;
-          if($cat  == $id){
-            $hit = $cnt;
-          }
-        }
+    foreach($newcats as $cat => $name){
+      unset($this->Categories[$cat]);
+    }
+    foreach($newcats as $cat => $name){
+      $this->Categories[$cat]=$name;
+    }
+  }
 
-        if($hit>1){
-          if($hit == 2){ 
-            $first  = array_slice($cats,0,$hit-2);
-            $middle = array_slice($cats,$hit-2,$hit);
-            $last   = array_slice($cats,$hit,$cnt); 
-          }else{
-            $first  = array_slice($cats,0,$hit-2);
-            $middle = array_slice($cats,$hit-2,2);
-            $last   = array_slice($cats,$hit,$cnt); 
-          }
-          foreach($first as $cat => $name){
-            $ret[$cat]=$name;
-          }
-          foreach(array_reverse($middle) as $cat => $name){
-            $ret[$cat]=$name;
-          }
-          foreach($last as $cat => $name){
-            $ret[$cat]=$name;
-          }
-        }
-      }
+  
+  function catDown($id)
+  {
+   /* Get all cats depinding on current dir */
+    $cats = $this->GetSubdirs($this->curCatDir);
+     
+    $newcats =$this->ArrayDown($id,$cats);
 
-      foreach($cats as $cat => $name){
-        unset($this->Categories[$cat]);
-      } 
-      foreach($ret as $cat => $name){
-        $this->Categories[$cat]=$name;
-      }
+    foreach($newcats as $cat => $name){
+      unset($this->Categories[$cat]);
+    }
+    foreach($newcats as $cat => $name){
+      $this->Categories[$cat]=$name;
     }
-    
-
   }
 
+
   function getOneUp($appl)
-  {
-    $cat = $this->curCatDir;
-    if(!isset($this->gosaMemberApplication[$cat][($appl-1)])) return;
-    $f = 1;
-    if($appl == 1 ){
-      $f = 0;
-    }
-    $first  = array_slice($this->gosaMemberApplication[$cat],0,($appl-1));
-    $middle = array_slice($this->gosaMemberApplication[$cat],$appl-1,(($appl+1)-$f));
-    $last   = array_slice($this->gosaMemberApplication[$cat],($appl+1));
-    $tmp = array();
-    foreach($first as $entry){
-      $tmp[] = $entry;
-    }
-    foreach(array_reverse($middle) as $entry){
-      $tmp[] = $entry;
+  { 
+    $cat  = $this->curCatDir;
+    $apps = $this->gosaMemberApplication[$cat];
+
+    $appsA = array();
+    foreach ($apps as $appkey => $name){
+      $appsA[$name['App']] =$name['App'];
     }
-    foreach($last as $entry){
-      $tmp[] = $entry;
+ 
+    $result = $this->ArrayUp($appl,$appsA);
+
+    $ret = array();
+    foreach($result as $app){
+      $ret[]=array("App"=>$app);
     }
-    $this->gosaMemberApplication[$cat] =$tmp;
+    $this->gosaMemberApplication[$cat] = $ret;
   }
-  
-  function getOneDown($appl){
-    $cat = $this->curCatDir;
-    if(!isset($this->gosaMemberApplication[$cat][($appl+1)])) return;
-    $f = 0;
-    if($appl == 0 ){
-      $f = 1;
-    }
-    $first  = array_slice($this->gosaMemberApplication[$cat],0,($appl));
-    $middle = array_slice($this->gosaMemberApplication[$cat],$appl,(($appl+1+$f)));
-    $last   = array_slice($this->gosaMemberApplication[$cat],($appl+2));
-  
-    $tmp = array();
-    foreach($first as $entry){
-      $tmp[] = $entry;
-    }
-    foreach(array_reverse($middle) as $entry){
-      $tmp[] = $entry;
+
+
+  function getOneDown($appl)
+  {
+    $cat  = $this->curCatDir;
+    $apps = $this->gosaMemberApplication[$cat];
+
+    $appsA = array();
+    foreach ($apps as $appkey => $name){
+      $appsA[$name['App']] =$name['App'];
     }
-    foreach($last as $entry){
-      $tmp[] = $entry;
+
+    $result = $this->ArrayDown($appl,$appsA);
+
+    $ret = array();
+    foreach($result as $app){
+      $ret[]=array("App"=>$app);
     }
-    $this->gosaMemberApplication[$cat] =$tmp;
-  }
+    $this->gosaMemberApplication[$cat] = $ret;
+  } 
+
+   
   
   function AddSeperator($id)
   {
@@ -319,7 +314,7 @@ class appgroup extends plugin
     
     if((isset($_POST['AddCat']))&&(isset($_POST['CatName']))&&(!empty($_POST['CatName']))){
       
-      if(preg_match("/[^0-9a-z,\.-;:_#\+\- ]/i",$_POST['CatName'])){
+      if(preg_match("/[\\\\\/]/i",$_POST['CatName'])){
         print_red(_("Invalid character in category name."));
       }elseif(!in_array($_POST['CatName'],$this->Categories)){ 
         if(empty($this->curCatDir)){
@@ -342,7 +337,6 @@ class appgroup extends plugin
 
       if(preg_match("/DelApp_/",$name)){
         $app = $value; 
-
         foreach($this->gosaMemberApplication as $key =>  $cat){
           foreach($cat as $key2 => $app){
             if($app['App'] == $value){
@@ -355,9 +349,10 @@ class appgroup extends plugin
         }
       }
       if(preg_match("/DelCat_/",$name)){
-        $app = $value; 
+        $n = preg_replace("/DelCat_/","",$name);
+        $app = base64_decode( preg_replace("/_.*$/","",$n));
         foreach($this->Categories as $key =>  $cat){
-          if($cat == $value){
+          if($cat == $app){
             unset($this->Categories[$key]);
           }
         }
@@ -513,10 +508,10 @@ class appgroup extends plugin
 
     if((isset($_GET['act']))&&(($_GET['act'] == "cat_up")||($_GET['act']=="cat_down"))){
       if($_GET['act']=="cat_up"){
-        $this->catUp($_GET['id']);
+        $this->catUp(base64_decode($_GET['id']));
       }
       if($_GET['act']=="cat_down"){
-        $this->catDown($_GET['id']);
+        $this->catDown(base64_decode($_GET['id']));
       }
     }
 
@@ -524,21 +519,11 @@ class appgroup extends plugin
       if(isset($_GET['id'])){
         $id   = $_GET['id'];
         $act  = $_GET['act']; 
-        $found = -1;
-        if(isset($this->gosaMemberApplication[$this->curCatDir])){
-          foreach($this->gosaMemberApplication[$this->curCatDir] as $key =>  $member){
-            if($id == $member['App']){
-              $found = $key;
-            }
-          }
-        }
 
-        if($found != -1){
-          if($act == "one_up"){
-            $this->getOneUp($found);
-          }elseif($act == "one_down")   { 
-            $this->getOneDown($found);
-          }
+        if($act == "one_up"){
+          $this->getOneUp($id);
+        }elseif($act == "one_down")   { 
+          $this->getOneDown($id);
         }
       }
     }
@@ -546,13 +531,13 @@ class appgroup extends plugin
     $div2 = new DivSelectBox("appgroup");
     $div2->SetHeight(400);
 
-    $linkopen       = "<img src='images/folder.png'>&nbsp;<a href='?plug=".$_GET['plug']."&amp;act=open&amp;id=%s'>%s</a>";
-    $catremove      = "&nbsp;<input type='image' src='images/edittrash.png' name='DelCat_%s' value='%s'>";
-    $app            = "<img src='images/select_application.png'>&nbsp;%s";
+    $linkopen       = "<img src='images/folder.png' alt=\"\">&nbsp;<a href='?plug=".$_GET['plug']."&amp;act=open&amp;id=%s'>%s</a>";
+    $catremove      = "&nbsp;<input type='image' src='images/edittrash.png' title='"._("Delete entry")."' name='DelCat_%s' value='%s'>";
+    $app            = "<img src='images/select_application.png' alt=\"\">&nbsp;%s";
     
-    $catupdown        = "<a href='?plug=".$_GET['plug']."&amp;act=cat_up&id=%s'>
-                       <img src='images/sort_up.png' border=0></a>&nbsp;<a href='?plug=".$_GET['plug']."&amp;act=cat_down&id=%s'> 
-                       <img src='images/sort_down.png' border=0></a>";
+    $catupdown        = "<a href='?plug=".$_GET['plug']."&amp;act=cat_up&amp;id=%s'>
+                       <img align='top' alt=\"\" src='images/sort_up.png' border=0 title='"._("Move up")."'></a>&nbsp;<a href='?plug=".$_GET['plug']."&amp;act=cat_down&amp;id=%s'> 
+                       <img alt=\"\" src='images/sort_down.png' title='"._("Move down")."' border=0></a>";
 
     if(empty($this->curCatDir)){
       $cnt =0;
@@ -570,8 +555,8 @@ class appgroup extends plugin
 
     foreach($this->GetSubdirs($this->curCatDir) as $path => $name){
       $div2 ->AddEntry(array( 
-            array("string"=>sprintf($linkopen,$path,$name)),
-            array("string"=>preg_replace("/%s/",$path,$catupdown.$catremove),
+            array("string"=>sprintf($linkopen,base64_encode($path),$name)),
+            array("string"=>preg_replace("/%s/",base64_encode($path),$catupdown.$catremove),
               "attach"=>"align='right' style='width:80px;border-right:0px;'"))); 
     }
 
@@ -579,21 +564,21 @@ class appgroup extends plugin
 
     $separator ="<hr height=1  size=1></hr>"; 
 
-    $sep = "<input type='image' src='images/back.png' value='%s' name='AddSep_%s'>";
+    $sep = "<input type='image' src='images/back.png' title='"._("Insert seperator")."' value='%s' name='AddSep_%s'>";
   
-    $upudown ="<a href='?plug=".$_GET['plug']."&amp;act=one_up&id=%s'>   <img src='images/sort_up.png' border=0></a>".
-      "&nbsp;<a href='?plug=".$_GET['plug']."&amp;act=one_down&id=%s'> <img src='images/sort_down.png' border=0></a>".
-      "&nbsp;<input type='image' src='images/edittrash.png' name='DelApp_%s' value='%s'>";
-    $edit=      "&nbsp;<input type='image' src='images/edit.png' name='EdiApp_%s' value='%s'>";
+    $upudown ="<a href='?plug=".$_GET['plug']."&amp;act=one_up&amp;id=%s'>   <img alt='{t}sort{/t}' align='top' src='images/sort_up.png' title='"._("Move up")."' border=0></a>".
+      "&nbsp;<a href='?plug=".$_GET['plug']."&amp;act=one_down&amp;id=%s'> <img alt='{t}sort{/t}' src='images/sort_down.png' title='"._("Move down")."' border=0></a>".
+      "&nbsp;<input type='image' src='images/edittrash.png' title='"._("Delete entry")."' name='DelApp_%s' value='%s' alt='{t}delete{/t}' >";
+    $edit=      "&nbsp;<input type='image' src='images/edit.png' title='"._("Edit entry")."' name='EdiApp_%s' value='%s' alt='{t}edit{/t}' >";
 
     if(isset($this->gosaMemberApplication[$this->curCatDir])){
       foreach($this->gosaMemberApplication[$this->curCatDir] as $cat => $entry){
         if(preg_match("/__SEPARATOR__/",$entry['App'])){
           $div2 ->AddEntry(array(array("string"=>$separator),
-                array("string"=>preg_replace("/\%s/",$entry['App'],$upudown),"attach"=>"align='right' style='border-right:0px;'")));
+                array("string"=>preg_replace("/\%s/",htmlentities($entry['App']),$upudown),"attach"=>"align='right' style='border-right:0px;'")));
         }else{
           $div2 ->AddEntry(array(array("string"=>sprintf($app,$entry['App'])),
-                array("string"=>preg_replace("/\%s/",$entry['App'],$sep.$edit.$upudown),"attach"=>"align='right' style='border-right:0px;'")));
+                array("string"=>preg_replace("/\%s/",htmlentities($entry['App']),$sep.$edit.$upudown),"attach"=>"align='right' style='border-right:0px;'")));
         }
       }
     }