Update acl_prefs, many minor formatting changes

addressbook/acl_preferences.php

@@ -1,6 +1,6 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare - Addressbook                                               *
+  * phpGroupWare - Calendar                                                  *
   * http://www.phpgroupware.org                                              *
   * --------------------------------------------                             *
   *  This program is free software; you can redistribute it and/or modify it *
@@ -11,7 +11,14 @@
 
   /* $Id$ */
 
-  $phpgw_info['flags'] = array('currentapp' => 'addressbook', 'enable_nextmatchs_class' => True, 'noappheader' => True, 'noappfooter' => True);
+	$phpgw_flags = Array(
+		'currentapp'				=>	'addressbook',
+		'enable_nextmatchs_class'	=>	True,
+		'noappheader'				=>	True,
+		'noappfooter'				=>	True
+  	);
+
+	$phpgw_info['flags'] = $phpgw_flags;
 	include('../header.inc.php');
 
 	$private_acl = True;
@@ -26,20 +33,20 @@
 		global $phpgw_info, $p;
 
 		$p->set_var($acl,$label.$phpgw_info['flags']['currentapp'].'['.$id.']['.$right.']');
-    if ($rights & $right) {
+		if ($rights & $right)
+		{
 			$p->set_var($acl.'_selected',' checked');
-    } else {
+		}
+		else
+		{
 			$p->set_var($acl.'_selected','');
 		}
 	}
   
 
-  function display_row($bg_color,$label,$id,$name) {
+	function display_row($bg_color,$label,$id,$name)
-    global $p;
+	{
-    global $phpgw;
+		global $phpgw_info, $acl, $private_acl, $p;
-    global $phpgw_info;
-    global $acl;
-    global $private_acl;
     
 		$p->set_var('row_color',$bg_color);
 		$p->set_var('user',$name);
@@ -61,25 +68,35 @@
 		$p->parse('row','acl_row',True);
 	}
 
-  if(!isset($owner) || !$phpgw_info['user']['apps']['admin']) {
+	if(!isset($owner) || !$phpgw_info['user']['apps']['admin'])
+	{
 		$owner = $phpgw_info['user']['account_id'];
 	}
-  $groups = $phpgw->accounts->memberships($owner);
+
+	$acct = CreateObject('phpgwapi.accounts',$owner);
+	$groups = $acct->memberships($owner);
+	unset($acct);
 	$acl = CreateObject('phpgwapi.acl',intval($owner));
 	$acl->read_repository();
   
-  if ($submit) {
+	if ($submit)
+	{
 		$to_remove = unserialize(urldecode($processed));
-    for($i=0;$i<count($to_remove);$i++) {
+		
+		for($i=0;$i<count($to_remove);$i++)
+		{
 			$acl->delete($phpgw_info['flags']['currentapp'],$to_remove[$i]);
 		}
+		
 		// Group records
 		$group_variable = 'g_'.$phpgw_info['flags']['currentapp'];
 
 		@reset($$group_variable);
-    while(list($group_id,$acllist) = each($$group_variable)) {
+		while(list($group_id,$acllist) = each($$group_variable))
+		{
 			$totalacl = 0;
-      while(list($right,$permission) = each($acllist)) {
+			while(list($right,$permission) = each($acllist))
+			{
 				$totalacl += $right;
 			}
 			$acl->add($phpgw_info['flags']['currentapp'],$group_id,$totalacl);
@@ -89,9 +106,11 @@
 		$user_variable = 'u_'.$phpgw_info['flags']['currentapp'];
     
 		@reset($$user_variable);
-    while(list($user_id,$acllist) = each($$user_variable)) {
+		while(list($user_id,$acllist) = each($$user_variable))
+		{
 			$totalacl = 0;
-      while(list($right,$permission) = each($acllist)) {
+			while(list($right,$permission) = each($acllist))
+			{
 				$totalacl += $right;
 			}
 			$acl->add($phpgw_info['flags']['currentapp'],$user_id,$totalacl);
@@ -103,32 +122,39 @@
 
 	$total = 0;
 
-  if(!isset($start)) {
+	if(!isset($start))
+	{
 		$start = 0;
 	}
 
-  if(!$start) {
+	if(!$start)
+	{
 		$s_groups = 0;
 		$s_users = 0;
 	}
   
-  if(!isset($s_groups)) {
+	if(!isset($s_groups))
+	{
 		$s_groups = 0;
 	}
 
-  if(!isset($s_users)) {
+	if(!isset($s_users))
+	{
 		$s_users = 0;
 	}
 
-  if(!isset($query)) {
+	if(!isset($query))
+	{
 		$query = "";
 	}
 
-  if(!isset($maxm)) {
+	if(!isset($maxm))
+	{
 		$maxm = $phpgw_info['user']['preferences']['common']['maxmatchs'];
 	}
 
-  if(!isset($totalentries)) {
+	if(!isset($totalentries))
+	{
 		$totalentries = count($groups);
 		$db = $phpgw->db;
 		$db->query("SELECT count(*) FROM phpgw_accounts WHERE account_type='u'");
@@ -139,24 +165,23 @@
 	$p = CreateObject('phpgwapi.Template',$phpgw_info['server']['app_tpl']);
 	if($private_acl == True)
 	{
-    $p->set_file(array('preferences' => 'preference_acl.tpl',
+		$templates = Array (
+									'preferences'	=>	'preference_acl.tpl',
 									'row_colspan'	=>	'preference_colspan_private.tpl',
-                       'acl_row' => 'preference_acl_row_private.tpl'));
+									'acl_row'		=> 'preference_acl_row_private.tpl'
+		);
   }
   else
   {
-    $p->set_file(array('preferences' => 'preference_acl.tpl',
+		$templates = Array (
+									'preferences'	=>	'preference_acl.tpl',
 									'row_colspan'	=>	'preference_colspan.tpl',
-                       'acl_row' => 'preference_acl_row.tpl'));
+									'acl_row'		=> 'preference_acl_row.tpl'
+		);
   }
 
+	$p->set_file($templates);
 //	$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('errors','');
-  $p->set_var('title','<p><b>'.lang($phpgw_info["flags"]["currentapp"]." 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'));
 
 	$common_hidden_vars = '     <input type="hidden" name="s_groups" value="'.$s_groups.'">'."\n"
 							. '     <input type="hidden" name="s_users" value="'.$s_users.'">'."\n"
@@ -165,74 +190,113 @@
 							. '     <input type="hidden" name="start" value="'.$start.'">'."\n"
 							. '     <input type="hidden" name="query" value="'.$query.'">'."\n"
 							. '     <input type="hidden" name="owner" value="'.$owner.'">'."\n";
-  $p->set_var('common_hidden_vars_form',$common_hidden_vars);
+
+	$var = Array(
+						'errors'							=>	'',
+						'title'							=>	'<p><b>'.lang($phpgw_info['flags']['currentapp'].' preferences').' - '.lang('acl').':</b><hr><p>',
+						'action_url'					=>	$phpgw->link(''),
+						'bg_color'						=>	$phpgw_info['theme']['th_bg'],
+						'submit_lang'					=> lang('submit'),
+						'common_hidden_vars_form'	=>	$common_hidden_vars
+	);
+	
+	$p->set_var($var);
 
 	if(isset($query_result) && $query_result)
+	{
 		$common_hidden_vars .= '<input type="hidden" name="query_result" value="'.$query_result.'">'."\n";
+	}
 
 	$p->set_var('common_hidden_vars',$common_hidden_vars);
-  $p->set_var(array('read_lang' => lang('Read'),
+
+	$var = Array(
+						'read_lang'		=>	lang('Read'),
 						'add_lang'		=>	lang('Add'),
 						'edit_lang'		=>	lang('Edit'),
-                    'delete_lang' => lang('Delete')));
+						'delete_lang'	=>	lang('Delete')
+	);
+	
+	$p->set_var($var);
                     
 	if($private_acl == True)
 	{
 		$p->set_var('private_lang',lang('Private'));
 	}
 
-  if(intval($s_groups) <> count($groups)) {
+	if(intval($s_groups) <> count($groups))
+	{
 		$p->set_var('string',lang('Groups'));
 		$p->parse('row','row_colspan',True);
 
 		reset($groups);
-    for($k=0;$k<count($groups);$k++) {
+		for($k=0;$k<count($groups);$k++)
+		{
 			$group = $groups[$k];
 			$go = True;
-      if($query) {
+			
-        if(!strpos(' '.$group['account_id'].' ',$query)) {
+			if($query)
+			{
+				if(!strpos(' '.$group['account_id'].' ',$query))
+				{
 					$go = False;
 				}
 			}
-      if($go) {
+			
+			if($go)
+			{
 				$tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color);
 				display_row($tr_color,'g_',$group['account_id'],$group['account_name']);
 				$s_groups++;
 				$processed[] = $group['account_id'];
 				$total++;
-        if($total == $maxm) break;
+				if($total == $maxm)
+				{
+					break;
+				}
 			}
 		}
 	}
 
-  if($total <> $maxm) {
+	if($total <> $maxm)
-    if(!is_object($db)) {
+	{
+		if(!is_object($db))
+		{
 			$db = $phpgw->db;
 		}
   
 		$db->query("select account_id, account_firstname, account_lastname, account_lid FROM phpgw_accounts WHERE account_type='u' ORDER BY account_lastname, account_firstname, account_lid ".$db->limit(intval($s_users),$maxm),__LINE__,__FILE__);
 		$users = $db->num_rows();
-    if($total <> $maxm) {
+		if($total <> $maxm)
-      if($users) {
+		{
+			if($users)
+			{
 				$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()) {
+				while($db->next_record())
+				{
 					$go = True;
-          if($query) {
+					if($query)
+					{
 						$name = ' '.$db->f('account_firstname').' '.$db->f('account_lastname').' '.$db->f('account_lid').' ';
-            if(!strpos($name,$query)) {
+						if(!strpos($name,$query))
+						{
 							$go = False;
 						}
 					}
-          if($go) {
+					
+					if($go)
+					{
 						$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));
 						$s_users++;
 						$processed[] = $id;
 						$total++;
-            if($total == $maxm) break;
+						if($total == $maxm)
+						{
+							break;
+						}
 					}
 				}
 			}
@@ -241,13 +305,16 @@
 
 	$extra_parms = '&s_users='.$s_users.'&s_groups='.$s_groups.'&maxm='.$maxm.'&totalentries='.$totalentries.'&total='.($start + $total).'&owner='.$owner;
 
-  $p->set_var('nml',$phpgw->nextmatchs->left('',$start,$totalentries,$extra_parms));
+	$var = Array(
-  $p->set_var('nmr',$phpgw->nextmatchs->right('',$start,$totalentries,$extra_parms));
+						'nml'				=>	$phpgw->nextmatchs->left('',$start,$totalentries,$extra_parms),
+						'nmr'				=>	$phpgw->nextmatchs->right('',$start,$totalentries,$extra_parms),
+						'search_value'	=>	(isset($query) && $query?$query:''),
+						'search'			=>	lang('search'),
+						'processed'		=>	urlencode(serialize($processed))
+	);
 	
-  $p->set_var('search_value',(isset($query) && $query?$query:''));
+	$p->set_var($var);
-  $p->set_var('search',lang('search'));
 
-  $p->set_var('processed',urlencode(serialize($processed)));
 	$p->pparse('out','preferences');
 	$phpgw->common->phpgw_footer();
 ?>

addressbook/add.php

@@ -23,7 +23,6 @@
 	$phpgw_info["flags"]["enable_addressbook_class"] = True;
 	include("../header.inc.php");
 	
-	#$t = new Template($phpgw_info["server"]["app_tpl"]);
 	$t = new Template($phpgw->common->get_tpl_dir("addressbook"));
 	$t->set_file(array("add" => "add.tpl"));
 	
@@ -83,7 +82,6 @@
 		addressbook_add_entry($phpgw_info["user"]["account_id"],$fields);
 		$ab_id = addressbook_get_lastid();
 
-		//Header("Location: " . $phpgw->link($phpgw_info["server"]["webserver_url"]."/addressbook/","cd=14"));
 		Header("Location: " . $phpgw->link("view.php","&ab_id=$ab_id&order=$order&sort=$sort&filter=$filter&start=$start"));
 		$phpgw->common->phpgw_exit();
 	}

addressbook/delete.php

@@ -13,7 +13,10 @@
 /* $Id$ */
 
 	if ($confirm) {
-		$phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True);
+		$phpgw_info["flags"] = array(
+			"noheader" => True,
+			"nonavbar" => True
+		);
 	}
 
 	$phpgw_info["flags"]["currentapp"] = "addressbook";
@@ -26,7 +29,7 @@
 
 	$this = CreateObject("phpgwapi.contacts");
 	$fields = $this->read_single_entry($ab_id,array("owner" => "owner"));
-	$owner = $fields[0]["owner"];
+	//$record_owner = $fields[0]["owner"];
 
 	$t = new Template($phpgw->common->get_tpl_dir("addressbook"));
 	$t->set_file(array("delete" => "delete.tpl"));

addressbook/edit.php

@@ -13,7 +13,10 @@
 /* $Id$ */
 
 	if ($submit || ! $ab_id) {
-		$phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True);
+		$phpgw_info["flags"] = array(
+			"noheader" => True,
+			"nonavbar" => True
+		);
 	}
 
 	$phpgw_info["flags"]["currentapp"] = "addressbook";

addressbook/inc/functions.inc.php

@@ -38,10 +38,10 @@
 			"org_name"			=> "company name",  //company
 			"org_unit"			=> "department",  //division
 			"title"				=> "title",
-			"n_given"			=> "first name",   //firstname
-			"n_family"			=> "last name",  //lastname
-			"n_middle"			=> "middle name",
 			"n_prefix"			=> "prefix",
+			"n_given"			=> "first name",   //firstname
+			"n_middle"			=> "middle name",
+			"n_family"			=> "last name",  //lastname
 			"n_suffix"			=> "suffix",
 			"label"				=> "label",
 			"adr_street"		=> "street",
@@ -160,7 +160,7 @@
 		$country      = $fields["adr_countryname"];
 		$timezone     = $fields["tz"];
 		$bday         = $fields["bday"];
-		$notes        = $fields["notes"];
+		$notes        = stripslashes($fields["notes"]);
 		$company      = $fields["org_name"];
 		$department   = $fields["org_unit"];
 		$url          = $fields["url"];

addressbook/index.php

@@ -15,7 +15,8 @@
 	$phpgw_info["flags"] = array(
 		"currentapp" => "addressbook",
 		"enable_contacts_class" => True,
-		"enable_nextmatchs_class" => True);
+		"enable_nextmatchs_class" => True
+	);
 
 	include("../header.inc.php");
 

addressbook/preferences.php

@@ -11,11 +11,13 @@
 
 /* $Id$ */
 
-	$phpgw_info["flags"] = array("noheader" => True, 
+	$phpgw_info["flags"] = array(
+		"noheader" => True, 
 		"nonavbar" => True, 
 		"currentapp" => "addressbook", 
 		"enable_addressbook_class" => True,
-								"enable_nextmatchs_class" => True);
+		"enable_nextmatchs_class" => True
+	);
                                
 	include("../header.inc.php");
 

addressbook/vcardout.php

@@ -13,9 +13,15 @@
 /* $Id$ */
 
 	if ($nolname || $nofname) {
-		$phpgw_info["flags"] = array("noheader" => False, "nonavbar" => False);
+		$phpgw_info["flags"] = array(
+			"noheader" => False,
+			"nonavbar" => False
+		);
 	} else {
-		$phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True);
+		$phpgw_info["flags"] = array(
+			"noheader" => True,
+			"nonavbar" => True
+		);
 	}
 
 	$phpgw_info["flags"]["enable_addressbook_class"] = True;

addressbook/view.php

@@ -13,7 +13,10 @@
 /* $Id$ */
 
 	if ($submit || ! $ab_id) {
-		$phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True);
+		$phpgw_info["flags"] = array(
+			"noheader" => True,
+			"nonavbar" => True
+		);
 	}
 
 	$phpgw_info["flags"] = array(
@@ -52,7 +55,7 @@
 	$qfields = $this->stock_contact_fields + $extrafields;
 	$fields  = addressbook_read_entry($ab_id,$qfields);
 	
-	$owner  = $fields[0]["owner"];
+	$record_owner  = $fields[0]["owner"];
 
 	$view_header  = "<p>&nbsp;<b>" . lang("Address book - view") . "</b><hr><p>";
 	$view_header .= '<table border="0" cellspacing="2" cellpadding="2" width="80%" align="center">';
@@ -90,10 +93,10 @@
 */
 	$columns_html .= '<tr><td colspan="4">&nbsp;</td></tr>'
 		. '<tr><td><b>' . lang("Record owner") . '</b></td><td>'
-		. $phpgw->common->grab_owner_name($owner) . '</td><td><b>' 
+		. $phpgw->common->grab_owner_name($record_owner) . '</td><td><b>' 
 		. $access_link . '</b></td><td></table>';
 
-	$editlink  = $phpgw->common->check_owner($owner,"edit.php",lang("edit"),"ab_id=" . $ab_id . "&start=".$start."&sort=".$sort."&order=".$order);
+	$editlink  = $phpgw->common->check_owner($record_owner,"edit.php",lang("edit"),"ab_id=" . $ab_id . "&start=".$start."&sort=".$sort."&order=".$order);
 	$vcardlink = '<form action="'.$phpgw->link("vcardout.php","ab_id=$ab_id&order=$order&start=$start&filter=$filter&query=$query&sort=$sort").'">';
 	$donelink  = '<form action="'.$phpgw->link("index.php","order=$order&start=$start&filter=$filter&query=$query&sort=$sort").'">';