Removed old acls

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4961 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/gofon/fonreports/class_fonreport.inc b/plugins/gofon/fonreports/class_fonreport.inc
index 9056f91a9635a97ae31f6fb93b68f3ca55684bfa..55b48b1e6e38057170a3036b16a90e3f491a06c3 100644 (file)
--- a/plugins/gofon/fonreports/class_fonreport.inc
+++ b/plugins/gofon/fonreports/class_fonreport.inc
@@ -127,14 +127,6 @@ class fonreport extends plugin
       Smarty 
      *****************/
 
-    foreach($this->fields as $field){
-      if(chkacl($this->acl,$field)==""){
-        $smarty->assign($field."ACL","");      
-      }else{
-        $smarty->assign($field."ACL"," disabled ");    
-      }
-    }
-
     $smarty->assign("plug",           "?plug=".validate($_GET['plug']));
     $smarty->assign("launchimage",    get_template_path('images/launch.png'));
     $smarty->assign("search_image",   get_template_path('images/search.png'));
@@ -321,10 +313,10 @@ class fonreport extends plugin
     /* Create string with all fields seperated by ,*/
     $fields_str ="";
     foreach($this->fields as $field){
-      if($field == "calldate") continue;       
-      if(chkacl($this->acl,$field)==""){
-        $fields_str .= $field.", ";
+      if($field == "calldate") {
+        continue;      
       }
+      $fields_str .= $field.", ";
     }
     $fields_str = preg_replace("/, $/","",$fields_str);
 

diff --git a/plugins/gofon/fonreports/contents.tpl b/plugins/gofon/fonreports/contents.tpl
index a128dcc358333bd9b211e8572c03cbc808a7db02..2a1807d17dbb3a55bcdc3bece8070115992f27ec 100644 (file)
--- a/plugins/gofon/fonreports/contents.tpl
+++ b/plugins/gofon/fonreports/contents.tpl
@@ -28,12 +28,12 @@
  <table style="width:100%; vertical-align:top; text-align:left; border:1px solid #B0B0B0;" cellpadding=2 cellspacing=1 border=0 rules="cols" summary="">
   <tr style="background-color: #E8E8E8; height:26px; font-weight:bold">
    <td><a href="main.php{$plug}&amp;sort=0">{t}Date{/t} {$mode0}</a></td>
-   {if $srcACL == ""}          <td><a href="main.php{$plug}&amp;sort=1">{t}Source{/t} {$mode1}</a></td>                        {/if}
-   {if $dstACL == ""}       <td><a href="main.php{$plug}&amp;sort=2">{t}Destination{/t} {$mode2}</a></td>              {/if}
-   {if $channelACL == ""}       <td><a href="main.php{$plug}&amp;sort=3">{t}Channel{/t} {$mode3}</a></td>                      {/if}
-   {if $lastappACL == ""}       <td><a href="main.php{$plug}&amp;sort=4">{t}Application{/t} {$mode4}</a></td>          {/if}
-   {if $dispositionACL == ""}       <td><a href="main.php{$plug}&amp;sort=5">{t}Status{/t} {$mode5}</a></td>                   {/if}
-   {if $durationACL == ""}       <td><a href="main.php{$plug}&amp;sort=6">{t}Duration{/t} {$mode6}</a></td>                    {/if}
+   <td><a href="main.php{$plug}&amp;sort=1">{t}Source{/t} {$mode1}</a></td>
+   <td><a href="main.php{$plug}&amp;sort=2">{t}Destination{/t} {$mode2}</a></td>       
+   <td><a href="main.php{$plug}&amp;sort=3">{t}Channel{/t} {$mode3}</a></td>   
+   <td><a href="main.php{$plug}&amp;sort=4">{t}Application{/t} {$mode4}</a></td>       
+   <td><a href="main.php{$plug}&amp;sort=5">{t}Status{/t} {$mode5}</a></td>    
+   <td><a href="main.php{$plug}&amp;sort=6">{t}Duration{/t} {$mode6}</a></td>  
   </tr>
   {$search_result}
  </table>

diff --git a/plugins/gofon/fonreports/main.inc b/plugins/gofon/fonreports/main.inc
index 394450fcb8808790bc21b9ba4786e49f2486910f..5d1741db644db15c272567cdddfd9347c878173f 100644 (file)
--- a/plugins/gofon/fonreports/main.inc
+++ b/plugins/gofon/fonreports/main.inc
@@ -7,11 +7,6 @@ if (!$remove_lock){
        }
        $fonreport= $_SESSION['fonreport'];
 
-       /* set permissions */
-       $acl= get_permissions ($ui->dn, $ui->subtreeACL);
-       $fonreport->acl= get_module_permission($acl, "fonreport", $ui->dn);
-
-
        /* Execute formular */
        $fonreport->save_object();
        $display= $fonreport->execute ();