Fixed edit in addressbook

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

diff --git a/plugins/addons/addressbook/class_addressbook.inc b/plugins/addons/addressbook/class_addressbook.inc
index 74377a86f9398e7c1e4f45b6cb82d9c3a3edda52..7b7b95ca0365ea5138364883e2b1e426bbda6641 100644 (file)
--- a/plugins/addons/addressbook/class_addressbook.inc
+++ b/plugins/addons/addressbook/class_addressbook.inc
@@ -131,6 +131,7 @@ class addressbook extends plugin
     $acl = $this->get_entry_acls($this->abobjectclass.",".$phonefilter['search_base']);
     $smarty->assign("internal_createable", preg_match("/c/",$acl));
     $smarty->assign("internal_removeable", preg_match("/d/",$acl));
+    $smarty->assign("internal_editable",   preg_match("/w/",$acl));
 
     /* Perform actions with CTI hook */
     if (isset($_GET['target'])
@@ -537,7 +538,7 @@ class addressbook extends plugin
       foreach ($this->attributes as $name){
 
         /* Skip entries we are not allowed to read */
-        if(!preg_match("/r/",$this->get_entry_acls($_SESSION['show_info'],$name))){
+        if(!preg_match("/r/",$this->get_entry_acls($this->dn,$name))){
           $smarty->assign("info_$name", "");
         }else
 

diff --git a/plugins/addons/addressbook/contents.tpl b/plugins/addons/addressbook/contents.tpl
index 80472c950f22174ba89aa1eaa4b2bdefb2275694..30d03124ba8e26e81a2b394d069bfdc701b9519a 100644 (file)
--- a/plugins/addons/addressbook/contents.tpl
+++ b/plugins/addons/addressbook/contents.tpl
@@ -43,18 +43,21 @@
    </div>
    <div class="contentboxb">
     <p class="contentboxb" style="vertical-align:middle;">
-     {if $internal_createable}
+{if $internal_createable}
      <img class="center" alt="" src="{$add_image}">&nbsp;
      <a href="main.php{$plug}&amp;global=add" style="text-align:center;vertical-align:middle;">{t}Add entry{/t}</a><br>
-     {/if}
-     {if $internal eq 0}
+{/if}
+
+{if $internal eq 0}
+ {if $internal_editable}
      <img alt="" src="{$edit_image}" class="center">&nbsp;
      <a href="main.php{$plug}&amp;global=edit">{t}Edit entry{/t}</a><br>
-       {if $internal_removeable}
+ {/if}
+ {if $internal_removeable}
             <img alt="" src="{$delete_image}" class="center">&nbsp;
             <a href="main.php{$plug}&amp;global=remove" style="vertical-align:middle;">{t}Remove entry{/t}</a><br>
-       {/if}
-     {/if}
+ {/if}
+{/if}
     </p>
    </div>
    <br>