Another template update to allow for better customization in index.php.

addressbook/acl_preferences.php

@@ -0,0 +1,89 @@
+<?php
+  /**************************************************************************\
+  * phpGroupWare - Addressbook                                               *
+  * http://www.phpgroupware.org                                              *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \**************************************************************************/
+
+  /* $Id$ */
+
+  $phpgw_info["flags"] = array("currentapp" => "addressbook", "enable_addressbook_class" => True, "enable_nextmatchs_class" => True, "noappheader" => True, "noappfooter" => True);
+
+  if(isset($submit) && $submit) {
+    $phpgw_info["flags"]["noheader"] = True;
+    $phpgw_info["flags"]["nonavbar"] = True;
+  }
+  
+  include("../header.inc.php");
+
+  function display_row($bg_color,$label,$id,$name) {
+    global $p;
+    
+    $p->set_var('row_color',$bg_color);
+    $p->set_var('user',$name);
+    $p->set_var('read',$label.'addressbook['.$id.'][read]');
+    $p->set_var('add',$label.'[ddressbook'.$id.'][add]');
+    $p->set_var('edit',$label.'addressbook['.$id.'][edit]');
+    $p->set_var('delete',$label.'addressbook['.$id.'][delete]');
+    $p->parse('row','acl_row',True);
+  }
+
+  if ($submit) {
+//     $phpgw->db->query("DELETE FROM phpgw_acl WHERE acl_appname='addressbook' AND ");
+//     $phpgw->preferences->change("addressbook","defaultaddressbook");
+//     $phpgw->preferences->change("addressbook","defaultfilter");
+//     if ($mainscreen_showevents) {
+//        $phpgw->preferences->change("addressbook","mainscreen_showevents");
+//     } else {
+//        $phpgw->preferences->delete("addressbook","mainscreen_showevents");
+//     }
+//     $phpgw->preferences->commit();
+     
+     header("Location: ".$phpgw->link($phpgw_info["server"]["webserver_url"]."/preferences/index.php"));
+     $phpgw->common->phpgw_exit();
+  }
+
+  $p = CreateObject('phpgwapi.Template',$phpgw_info["server"]["app_tpl"]);
+  $p->set_file(array('preferences' => 'preference_acl.tpl',
+                     'row_colspan' => 'preference_colspan.tpl',
+                     'acl_row' => 'preference_acl_row.tpl'));
+
+  $p->set_var('errors','<p><center><b>This does nothing at this time!<br>Strictly as a template for use!</b></center>');
+  $p->set_var('title','<p><b>'.lang("Addressbook preferences").' - '.lang("acl").':</b><hr><p>');
+
+  $p->set_var('action_url',$phpgw->link(''));
+  $p->set_var('bg_color',$phpgw_info["theme"]["th_bg"]);
+  $p->set_var('submit_lang',lang('submit'));
+  $p->set_var('string',lang('Groups'));
+  $p->set_var('read_lang',lang('Read'));
+  $p->set_var('add_lang',lang('Add'));
+  $p->set_var('edit_lang',lang('Edit'));
+  $p->set_var('delete_lang',lang('Delete'));
+  $p->parse('row','row_colspan',True);
+
+  $groups = $phpgw->accounts->read_group_names($phpgw->info["user"]["account_id"]);
+  while(list(,$group) = each($groups)) {
+    $tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color);
+    display_row($tr_color,'g_',$group[0],$group[1]);
+  }
+
+  $db = $phpgw->db;
+
+  $db->query("select account_id from accounts ORDER BY account_lastname, account_firstname, account_lid",__LINE__,__FILE__);
+  if($db->num_rows()) {
+    $p->set_var('string',ucfirst(lang('Users')));
+    $p->parse('row','row_colspan',True);
+    $tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color);
+    while($db->next_record()) {
+      $tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color);
+      $id = $db->f("account_id");
+      display_row($tr_color,'u_',$id,$phpgw->common->grab_owner_name($id));
+    }
+  }
+  $p->pparse('out','preferences');
+  $phpgw->common->phpgw_footer();
+?>

addressbook/import.php

@@ -53,7 +53,7 @@
     $t->set_var("cancel_url",$phpgw->link("index.php"));
     $t->set_var("navbar_bg",$phpgw_info["theme"]["navbar_bg"]);
     $t->set_var("navbar_text",$phpgw_info["theme"]["navbar_text"]);
-    $t->set_var("import_text",lang("Import from Outlook"));
+    $t->set_var("import_text",lang("Import from Outlook or LDIF"));
     $t->set_var("action_url",$phpgw->link("import.php"));
     $t->set_var("tsvfilename","");
     $t->set_var("conv",$conv);

addressbook/inc/class.addressbook_ldap.inc.php

@@ -293,10 +293,10 @@
       while ($column = each($abc)) {
         if (isset($phpgw_info["user"]["preferences"]["addressbook"][$column[0]]) &&
           $phpgw_info["user"]["preferences"]["addressbook"][$column[0]]) {
-          $this->cols .= '<td height="21">';
+          $this->cols .= "  <td height=\"21\">\n";
-          $this->cols .= '<font size="-1" face="Arial, Helvetica, sans-serif">';
+          $this->cols .= '    <font size="-1" face="Arial, Helvetica, sans-serif">';
           $this->cols .= $phpgw->nextmatchs->show_sort_order($sort,"ab_" . $column[0],$order,"index.php",lang($column[1]));
-          $this->cols .= '</font></td>';
+          $this->cols .= "</font>\n  </td>";
           $this->cols .= "\n";
              
       // To be used when displaying the rows

addressbook/inc/class.addressbook_sql.inc.php

@@ -293,10 +293,10 @@
       while ($column = each($abc)) {
         if (isset($phpgw_info["user"]["preferences"]["addressbook"][$column[0]]) &&
           $phpgw_info["user"]["preferences"]["addressbook"][$column[0]]) {
-          $this->cols .= '<td height="21">';
+          $this->cols .= "  <td height=\"21\">\n";
-          $this->cols .= '<font size="-1" face="Arial, Helvetica, sans-serif">';
+          $this->cols .= '    <font size="-1" face="Arial, Helvetica, sans-serif">';
           $this->cols .= $phpgw->nextmatchs->show_sort_order($sort,"ab_" . $column[0],$order,"index.php",lang($column[1]));
-          $this->cols .= '</font></td>';
+          $this->cols .= "</font>\n  </td>";
           $this->cols .= "\n";
              
       // To be used when displaying the rows

addressbook/inc/hook_preferences.inc.php

@@ -25,8 +25,11 @@
   }
   section_start("Address Book",$imgpath);
 
-  $pg = $phpgw->link($phpgw_info["server"]["webserver_url"]."/addressbook/preferences.php");
+  $pg = $phpgw->link($phpgw_info["server"]["webserver_url"]."/".$appname."/preferences.php");
-  echo "<A href=".$pg.">" . lang("Addressbook preferences") . "</A>";
+  echo "<a href=".$pg.">" . lang("Addressbook preferences") . "</a><br>";
+
+  $pg = $phpgw->link($phpgw_info["server"]["webserver_url"]."/".$appname."/acl_preferences.php");
+  echo "<a href=".$pg.">" . lang("Grant Addressbook Access") . "</a>";
 
   section_end(); 
 }

addressbook/index.php

@@ -23,7 +23,6 @@
 
   $t = new Template($phpgw_info["server"]["app_tpl"]);
   $t->set_file(array( "addressbook_header"	=> "header.tpl",
-		      "searchfilter"		=> "searchfilter.tpl",
 		      "column"			=> "column.tpl",
 		      "row"			=> "row.tpl",
 		      "addressbook_footer"	=> "footer.tpl" ));
@@ -66,7 +65,6 @@
   $t->set_var("cols",$this->cols);
 
   $t->pparse("out","addressbook_header");
-  $t->pparse("out","searchfilter");
 
   for ($i=0;$i<$limit;$i++) { // each entry
     $t->set_var(columns,"");
@@ -90,7 +88,7 @@
         }
         $data=$coldata."</a>";
       } else { // But these do not
-        $ref=" "; $data=$coldata;
+        $ref=""; $data=$coldata;
       }
       $t->set_var(col_data,$ref.$data);
       $t->parse("columns","column",True);

addressbook/templates/default/header.tpl

@@ -1,5 +1,27 @@
 
 <!-- BEGIN addressbook_header -->
-  <center>{lang_addressbook}<br>{lang_showing}
+<center>{lang_addressbook}
-  <br>{searchreturn}
+<br>{lang_showing}
+<br>{searchreturn}
+{search_filter}
+
+<table width=75% border=0 cellspacing=1 cellpadding=3>
+<tr bgcolor="{th_bg}">
+{cols}
+  <td width="3%" height="21">
+    <font face="Arial, Helvetica, sans-serif" size="-1">
+    {lang_view}
+    </font>
+  </td>
+  <td width="3%" height="21">
+    <font face="Arial, Helvetica, sans-serif" size="-1">
+    {lang_vcard}
+    </font>
+  </td>
+  <td width="5%" height="21">
+    <font face="Arial, Helvetica, sans-serif" size="-1">
+    {lang_edit}
+    </font>
+  </td>
+</tr>
 <!-- END addressbook_header -->

addressbook/templates/justweb/header.tpl

@@ -1,5 +1,27 @@
 
 <!-- BEGIN addressbook_header -->
-  <center>{lang_addressbook}<br>{lang_showing}
+<center>{lang_addressbook}
-  <br>{searchreturn}
+<br>{lang_showing}
+<br>{searchreturn}
+{search_filter}
+
+<table width=75% border=0 cellspacing=1 cellpadding=3>
+<tr bgcolor="{th_bg}">
+{cols}
+  <td width="3%" height="21">
+    <font face="Arial, Helvetica, sans-serif" size="-1">
+    {lang_view}
+    </font>
+  </td>
+  <td width="3%" height="21">
+    <font face="Arial, Helvetica, sans-serif" size="-1">
+    {lang_vcard}
+    </font>
+  </td>
+  <td width="5%" height="21">
+    <font face="Arial, Helvetica, sans-serif" size="-1">
+    {lang_edit}
+    </font>
+  </td>
+</tr>
 <!-- END addressbook_header -->

addressbook/templates/verdilak/header.tpl

@@ -1,5 +1,27 @@
 
 <!-- BEGIN addressbook_header -->
-  <center>{lang_addressbook}<br>{lang_showing}
+<center>{lang_addressbook}
-  <br>{searchreturn}
+<br>{lang_showing}
+<br>{searchreturn}
+{search_filter}
+
+<table width=75% border=0 cellspacing=1 cellpadding=3>
+<tr bgcolor="{th_bg}">
+{cols}
+  <td width="3%" height="21">
+    <font face="Arial, Helvetica, sans-serif" size="-1">
+    {lang_view}
+    </font>
+  </td>
+  <td width="3%" height="21">
+    <font face="Arial, Helvetica, sans-serif" size="-1">
+    {lang_vcard}
+    </font>
+  </td>
+  <td width="5%" height="21">
+    <font face="Arial, Helvetica, sans-serif" size="-1">
+    {lang_edit}
+    </font>
+  </td>
+</tr>
 <!-- END addressbook_header -->