[20838] update addressbook
Sigurd Nes <[email protected]>
| Newsgroups | gmane.comp.web.phpgroupware.cvs |
|---|---|
| Message-ID | <[email protected]> |
Revision: 20838
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=20838
Author: sigurdne
Date: 2009-11-20 10:27:07 +0000 (Fri, 20 Nov 2009)
Log Message:
-----------
update addressbook
Modified Paths:
--------------
people/sigurdne/modules/addressbook/trunk/admin.php
people/sigurdne/modules/addressbook/trunk/csv_import.php
people/sigurdne/modules/addressbook/trunk/inc/class.boaddressbook.inc.php
people/sigurdne/modules/addressbook/trunk/inc/class.boaddressbook_prefs.inc.php
people/sigurdne/modules/addressbook/trunk/inc/class.catalog_manager.inc.php
people/sigurdne/modules/addressbook/trunk/inc/class.ipc_addressbook.inc.php
people/sigurdne/modules/addressbook/trunk/inc/class.menu.inc.php
people/sigurdne/modules/addressbook/trunk/inc/class.soaddressbook.inc.php
people/sigurdne/modules/addressbook/trunk/inc/class.uiXport.inc.php
people/sigurdne/modules/addressbook/trunk/inc/class.uiaddressbook.inc.php
people/sigurdne/modules/addressbook/trunk/inc/class.uiaddressbook_prefs.inc.php
people/sigurdne/modules/addressbook/trunk/inc/class.uicatalog_contact_addr_type.inc.php
people/sigurdne/modules/addressbook/trunk/inc/class.uicatalog_contact_comm_descr.inc.php
people/sigurdne/modules/addressbook/trunk/inc/class.uicatalog_contact_comm_type.inc.php
people/sigurdne/modules/addressbook/trunk/inc/class.uicatalog_contact_note_type.inc.php
people/sigurdne/modules/addressbook/trunk/inc/class.uicategorize_contacts.inc.php
people/sigurdne/modules/addressbook/trunk/inc/class.uifields.inc.php
people/sigurdne/modules/addressbook/trunk/inc/class.uivcard.inc.php
people/sigurdne/modules/addressbook/trunk/inc/functions.inc.php
people/sigurdne/modules/addressbook/trunk/inc/hook_deleteaccount.inc.php
people/sigurdne/modules/addressbook/trunk/setup/phpgw_it.lang
people/sigurdne/modules/addressbook/trunk/setup/phpgw_sk.lang
people/sigurdne/modules/addressbook/trunk/setup/phpgw_sv.lang
people/sigurdne/modules/addressbook/trunk/templates/base/config.tpl
people/sigurdne/modules/addressbook/trunk/templates/base/current_catalog_body.tpl
people/sigurdne/modules/addressbook/trunk/templates/base/form.tpl
people/sigurdne/modules/addressbook/trunk/templates/base/index.tpl
people/sigurdne/modules/addressbook/trunk/templates/base/preference_acl_row.tpl
people/sigurdne/modules/addressbook/trunk/templates/base/preferences.tpl
people/sigurdne/modules/addressbook/trunk/templates/base/principal_tabs.tpl
people/sigurdne/modules/addressbook/trunk/templates/base/tab.tpl
people/sigurdne/modules/addressbook/trunk/templates/probusiness/index.tpl
people/sigurdne/modules/addressbook/trunk/templates/probusiness/principal_tabs.tpl
people/sigurdne/modules/addressbook/trunk/templates/probusiness/tab.tpl
Added Paths:
-----------
people/sigurdne/modules/addressbook/trunk/templates/portico/
people/sigurdne/modules/addressbook/trunk/templates/portico/images/
people/sigurdne/modules/addressbook/trunk/templates/portico/images/navbar.png
Modified: people/sigurdne/modules/addressbook/trunk/admin.php
===================================================================
--- people/sigurdne/modules/addressbook/trunk/admin.php 2009-11-20 09:48:21 UTC (rev 20837)
+++ people/sigurdne/modules/addressbook/trunk/admin.php 2009-11-20 10:27:07 UTC (rev 20838)
@@ -23,7 +23,7 @@
include('../header.inc.php');
- $phpgw->config->read_repository();
+ $phpgw->config->read();
if ($submit)
{
@@ -37,7 +37,7 @@
}
$phpgw->config->save_repository(True);
- Header('Location: ' . $phpgw->link('/admin/index.php'));
+ $phpgw->redirect_link('/admin/index.php');
}
$phpgw->common->phpgw_header();
Modified: people/sigurdne/modules/addressbook/trunk/csv_import.php
===================================================================
--- people/sigurdne/modules/addressbook/trunk/csv_import.php 2009-11-20 09:48:21 UTC (rev 20837)
+++ people/sigurdne/modules/addressbook/trunk/csv_import.php 2009-11-20 10:27:07 UTC (rev 20838)
@@ -32,12 +32,21 @@
$GLOBALS['phpgw']->template->set_block('import','ffooter','ffooterhandle');
$GLOBALS['phpgw']->template->set_block('import','imported','importedhandle');
- $csvfile = isset($_POST['csvfile']) ? $_POST['csvfile'] : $_FILES['csvfile']['tmp_name'];
+ $csvfile = $_FILES['csvfile']['tmp_name'];
if($_POST['action'] == 'download' && (!$_POST['fieldsep'] || !$csvfile || !($fp=fopen($csvfile,'rb'))))
{
$_POST['action'] = '';
}
+ if($_POST['action'] == 'import')
+ {
+ $csvfile = $GLOBALS['phpgw']->session->appsession('import_data', 'addressbook');
+ if(!file_exists($csvfile))
+ {
+ $_POST['action'] = '';
+ }
+ }
+
$GLOBALS['phpgw']->template->set_var('action_url',$GLOBALS['phpgw']->link('/addressbook/csv_import.php'));
$PSep = '||'; // Pattern-Separator, separats the pattern-replacement-pairs in trans
@@ -86,7 +95,7 @@
break;
case 'download':
- $GLOBALS['phpgw']->preferences->read_repository();
+ $GLOBALS['phpgw']->preferences->read();
$defaults = $GLOBALS['phpgw_info']['user']['preferences']['addressbook']['cvs_import'];
if(!is_array($defaults))
{
@@ -113,7 +122,7 @@
$addr_names = $field_names + $comm_name + $loc_names;
$config = CreateObject('phpgwapi.config','addressbook');
- $config->read_repository();
+ $config->read();
while(list($name,$descr) = @each($config->config_data['custom_fields']))
{
$addr_names[$name] = $descr;
@@ -176,9 +185,10 @@
$GLOBALS['phpgw']->template->set_var('max',200);
$GLOBALS['phpgw']->template->parse('ffooterhandle','ffooter');
fclose($fp);
- $old = $csvfile; $csvfile = $GLOBALS['phpgw_info']['server']['temp_dir'].'/addrbook_import_'.basename($csvfile);
+ $old = $csvfile; $csvfile = $GLOBALS['phpgw_info']['server']['temp_dir'].'/addrbook_import_'.$GLOBALS['phpgw_info']['user']['account_id'].'_'.basename($csvfile);
rename($old,$csvfile);
- $hiddenvars .= '<input type="hidden" name="csvfile" value="'.$csvfile.'">';
+ $GLOBALS['phpgw']->session->appsession('import_data', 'addressbook', $csvfile);
+ //$hiddenvars .= '<input type="hidden" name="csvfile" value="'.$csvfile.'">';
$mktime_lotus = "${PSep}0?([0-9]+)[ .:-]+0?([0-9]*)[ .:-]+0?([0-9]*)[ .:-]+0?([0-9]*)[ .:-]+0?([0-9]*)[ .:-]+0?([0-9]*).*$ASep@mktime(${VPre}4,${VPre}5,${VPre}6,${VPre}2,${VPre}3,${VPre}1)";
$help_on_trans = "<a name=\"help\"></a><b>How to use Translation's</b><p>".
"Translations enable you to change / adapt the content of each CSV field for your needs. <br />".
@@ -241,7 +251,7 @@
}
}
- $GLOBALS['phpgw']->preferences->read_repository();
+ $GLOBALS['phpgw']->preferences->read();
$GLOBALS['phpgw']->preferences->add('addressbook','cvs_import',$defaults);
$GLOBALS['phpgw']->preferences->save_repository(True);
Modified: people/sigurdne/modules/addressbook/trunk/inc/class.boaddressbook.inc.php
===================================================================
--- people/sigurdne/modules/addressbook/trunk/inc/class.boaddressbook.inc.php 2009-11-20 09:48:21 UTC (rev 20837)
+++ people/sigurdne/modules/addressbook/trunk/inc/class.boaddressbook.inc.php 2009-11-20 10:27:07 UTC (rev 20838)
@@ -518,9 +518,9 @@
function criteria_contacts($access, $category, $field, $pattern, $show_fields)
{
$fields = array();
- if($pattern)
+ if ($pattern)
{
- switch($field)
+ switch ($field)
{
case 'person':
$fields = array
@@ -528,31 +528,22 @@
'per_full_name',
'per_prefix',
'per_suffix',
- 'per_birthday',
- 'per_pubkey',
- 'per_title',
- 'per_department',
- 'per_initials',
- 'per_sound',
- 'per_active'
+ 'per_initials'
);
break;
- case 'person_first':
- $fields = array('per_first_name');
- break;
- case 'person_last':
- $fields = array('per_last_name');
- break;
+
case 'org':
- $fields = array('org_name');
+ $fields = array ('org_name' );
break;
+
case 'comms':
- foreach($this->comm_descr as $data)
+ $fields['comm_media'] = array();
+ foreach ( $this->comm_descr as $data )
{
- $comms[] = $data['comm_description'];
+ $fields['comm_media'][] = $data ['comm_description'];
}
- $fields['comm_media'] = $comms;
break;
+
case 'location':
$fields = array
(
@@ -565,17 +556,17 @@
'addr_country'
);
break;
+
case 'other':
- $fields = array('other_value');
+ $fields = array ('other_value');
break;
+
case 'note':
- $fields = array('note_text');
+ $fields = array ('note_text');
break;
- /*
- not needed
- default:
- $fields = array();
- */
+
+ default :
+ $fields = array ();
}
}
return $this->so->criteria_contacts($GLOBALS['phpgw_info']['user']['account_id'], $access, $category, $fields, $pattern, $show_fields);
@@ -762,8 +753,7 @@
/* Delete the temp file. */
unlink($filename);
unlink($filename . '.info');
- Header('Location: ' . $GLOBALS['phpgw']->link('/index.php',array('menuaction' => 'addressbook.uiaddressbook.view_person', 'ab_id' => $ab_id)));
- exit();
+ $GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction' => 'addressbook.uiaddressbook.view_person', 'ab_id' => $ab_id));
}
}
@@ -780,7 +770,7 @@
//used
function save_preferences($prefs,$other,$qfields,$fcat_id)
{
- $GLOBALS['phpgw']->preferences->read_repository();
+ $GLOBALS['phpgw']->preferences->read();
if (is_array($prefs))
{
/* _debug_array($prefs);exit; */
@@ -824,7 +814,7 @@
$GLOBALS['phpgw']->preferences->save_repository(True);
/* _debug_array($prefs);exit; */
- Header('Location: ' . $GLOBALS['phpgw']->link('/preferences/index.php'));
+ $GLOBALS['phpgw']->redirect_link('/preferences/index.php');
}
//used
Modified: people/sigurdne/modules/addressbook/trunk/inc/class.boaddressbook_prefs.inc.php
===================================================================
--- people/sigurdne/modules/addressbook/trunk/inc/class.boaddressbook_prefs.inc.php 2009-11-20 09:48:21 UTC (rev 20837)
+++ people/sigurdne/modules/addressbook/trunk/inc/class.boaddressbook_prefs.inc.php 2009-11-20 10:27:07 UTC (rev 20838)
@@ -44,7 +44,7 @@
&&(count($this->person_columns['comm_types'])>0)))
{
//print "<br /><B>count(Person )columns >= 1".print_r($this->person_columns)."</B><br />";
- $this->preferences->add('addressbook','person_columns',serialize($this->person_columns),$type);
+ $this->preferences->add('addressbook', 'person_columns', $this->person_columns, $type);
}
else
{
@@ -68,7 +68,7 @@
if(count($this->org_columns) >=1)
{
- $this->preferences->add('addressbook','org_columns',serialize($this->org_columns),$type);
+ $this->preferences->add('addressbook', 'org_columns', $this->org_columns, $type);
}
else
{
@@ -98,15 +98,15 @@
$this->preferences->delete('addressbook','default_category',$type);
$this->remove_from_forced('default_category');
}
- $this->preferences->save_repository(true,$type);
+ $this->preferences->save_repository(true, $type);
}
function read_preferences($type='')
{
$this->preferences->read();
$temp=$this->preferences->data['addressbook'];
- $this->person_columns=unserialize($temp['person_columns']);
- $this->person_columns_forced=$this->is_forced_value('person_columns');
+ $this->person_columns = $temp['person_columns'];
+ $this->person_columns_forced = $this->is_forced_value('person_columns');
//Check that we dont reflect types that arent asked of us in 'type'
if(!$this->person_columns_forced && $type=='forced')
{
@@ -114,7 +114,7 @@
unset($this->person_columns);
}
- $this->org_columns=unserialize($temp['org_columns']);
+ $this->org_columns = $temp['org_columns'];
$this->org_columns_forced=$this->is_forced_value('org_columns');
if(!$this->org_columns_forced && $type=='forced')
{
@@ -130,7 +130,6 @@
{
$this->default_category='__NONE__';
}
-
}
function remove_from_forced($preference_name)
{
Modified: people/sigurdne/modules/addressbook/trunk/inc/class.catalog_manager.inc.php
===================================================================
--- people/sigurdne/modules/addressbook/trunk/inc/class.catalog_manager.inc.php 2009-11-20 09:48:21 UTC (rev 20837)
+++ people/sigurdne/modules/addressbook/trunk/inc/class.catalog_manager.inc.php 2009-11-20 10:27:07 UTC (rev 20838)
@@ -4,11 +4,11 @@
* http://www.phpgroupware.org *
* This program is part of the GNU project, see http://www.gnu.org/ *
* *
- * Copyright 2003 Free Software Foundation, Inc. *
+ * Copyright 2003, 2008 Free Software Foundation, Inc. *
* *
* Originally Written by Jonathan Alberto Rivera Gomez - jarg at co.com.mx *
* Current Maintained by Jonathan Alberto Rivera Gomez - jarg at co.com.mx *
- * jason king pizza at netspace.net.au *
+ * Written by Dave Hall <[email protected]> *
* -------------------------------------------- *
* Development of this application was funded by http://www.sogrp.com *
* -------------------------------------------- *
@@ -18,37 +18,35 @@
* option) any later version. *
\**************************************************************************/
- class catalog_manager
+ class addressbook_catalog_manager
{
- public $form_action;
- public $catalog_name;
- public $headers;
- public $array_name;
- public $array_value;
- public $objs_data;
- public $index;
- public $entry;
- public $action;
- public $form_fields;
- public $title;
- public $catalog_button_name;
- public $num_cols;
- public $key_edit_id;
- function catalog_manager()
- {
- }
+ var $form_action;
+ var $catalog_name;
+ var $headers;
+ var $array_name;
+ var $objs_data;
+ var $index;
+ var $entry;
+ var $action;
+ var $form_fields;
+ var $title;
+ var $catalog_button_name;
+ var $num_cols;
+ var $key_edit_id;
- function _constructor()
+ function __construct()
{
- $this->template = &$GLOBALS['phpgw']->template;
- $this->nextmatchs = CreateObject('phpgwapi.nextmatchs');
}
function create_window($catalog_name, $entry, $title)
{
- //start to draw the add window
- $GLOBALS['phpgw']->common->phpgw_header();
- echo parse_navbar();
+ $GLOBALS['phpgw']->common->phpgw_header(true);
+
+ $this->nextmatchs =& $GLOBALS['phpgw']->nextmatchs;
+ $this->template =& $GLOBALS['phpgw']->template;
+
+ $this->template->set_root(PHPGW_APP_TPL);
+
$this->main_form($catalog_name, $entry, $title);
}
@@ -60,13 +58,18 @@
*/
function main_form($catalog_name, $entry, $title)
{
- $this->template->set_file(array('form' => 'form.tpl'));
- $this->template->set_var('principal_tabs_inc', '');
- $this->template->set_var('action', $GLOBALS['phpgw']->link('/index.php',
- array('menuaction' => $this->form_action)));
- $this->template->set_var('tab', '');
- $this->template->set_var('current_tab_body', $this->current_body($catalog_name, $entry, $title));
- $this->template->set_var('control_buttons', '');
+ $this->template->set_file('form', 'form.tpl');
+
+ $vars = array
+ (
+ 'principal_tabs_inc' => '',
+ 'action' => $GLOBALS['phpgw']->link('/index.php', $this->form_action),
+ 'tab' => '',
+ 'current_tab_body' => $this->current_body($catalog_name, $entry, $title),
+ 'control_buttons' => ''
+ );
+ $this->template->set_var($vars);
+
$this->template->pparse('out', 'form');
}
@@ -114,7 +117,7 @@
if($button)
{
- $this->template->set_var('caption_detail', $this->title);
+ //$this->template->set_var('caption_detail', $title);
$this->template->set_var('add_button', $add_button);
}
else
@@ -123,6 +126,9 @@
$this->template->set_var('add_button', '');
}
+ $this->template->set_var('row_class', 'th');
+ $row_class = 'row_on';
+
$cols='';
foreach($headers as $head)
{
@@ -133,15 +139,15 @@
$this->template->fp('input_detail', 'input_detail_data', True);
$this->template->fp('detail_body_set', 'input_detail_row');
- $tr_class = 'row_off';
+
if (is_array($this->$array_name))
{
foreach($this->$array_name as $k => $v)
{
$this->array_value = $v;
- $tr_class = $this->nextmatchs->alternate_row_class($tr_class);
- $this->template->set_var('row_bgc', $tr_class);
+ $row_class = $this->nextmatchs->alternate_row_class($row_class);
+ $this->template->set_var('row_class', $row_class);
$cols='';
reset($objs_data);
@@ -184,14 +190,16 @@
function set_form_fields($form_fields)
{
+ // $tr_color = $GLOBALS['phpgw_info']['theme']['row_on'];
+ $row_class = 'row_on';
ksort($form_fields, SORT_NUMERIC);
$last_element = count($form_fields);
$cols='';
$count=1;
- $tr_class = 'row_off';
+
foreach($form_fields as $key => $row)
{
- $tr_class = $this->nextmatchs->alternate_row_class($tr_class);
+ $row_class = $this->nextmatchs->alternate_row_class($row_class);
$cols = $cols . '<td>'.$row[0].'</td>'.'<td>'.$row[1].'</td>';;
if($count == $this->num_cols || $key==$last_element)
{
@@ -241,13 +249,14 @@
case 'data':
$column_data = $this->array_value[$properties['field']];
break;
+
case 'text':
- $sub_name = "";
+ $sub_name = '';
if(isset($properties['field']) && $properties['field']!='')
{
- $sub_name = '[' . $this->array_value[$properties['field']] . ']" ';
+ $sub_name = "[{$this->array_value[$properties['field']]}] ";
}
- if($this->array_value[$properties['value']])
+ if ( isset($this->array_value[$properties['value']]) )
{
$value = $this->array_value[$properties['value']];
}
@@ -258,20 +267,29 @@
$name = $properties['name'] . $sub_name;
$column_data = '<input type="text" name="'.$name.'" value="'.$value.'">';
break;
+
case 'radio':
- if($this->array_value[$properties['field']]=='Y'){$checked='checked';}
- $column_data = '<input type="radio" name="' . $properties['name']
- .'" value="' . $this->array_value[$properties['value']] . '"'. $checked . '>';
+ $checked = '';
+ if ( $this->array_value[$properties['field']] == 'Y' )
+ {
+ $checked=' checked';
+ }
+
+ $column_data = "<input type=\"radio\" name=\"{$properties['name']}\""
+ . "\" value=\"{$this->array_value[$properties['value']]}\"{$checked}>";
break;
+
case 'link':
- $link_array = array(
- 'menuaction' => $this->form_action,
- 'action' => $this->array_value[$properties['key']]
- );
- $link = $GLOBALS['phpgw']->link('/index.php',$link_array);
- unset($link_array);
+ if (isset($properties['extra']) && $properties['extra'])// Sigurd: not sure where the 'extra' comes from
+ {
+ echo '$properties[extra] should be a part of the link</br>';
+ _debug_array($properties['extra']);
+ }
+ $link = $GLOBALS['phpgw']->link('/index.php', array_merge($this->form_action,
+ array($properties['action'] => $this->array_value[$properties['key']])));
$column_data = '<a href="'.$link.'">'.$properties['mode'].'</a>';
break;
+
case 'combo':
$column_data = '<select name="'.$properties['name'].'">'.$properties['value'].'</select>';
break;
@@ -312,17 +330,19 @@
$this->insert($this->entry);
unset($this->entry);
break;
+
case 'delete':
$this->delete($this->key);
unset($this->key);
break;
+
case 'edit':
$this->edit($this->key);
break;
+
case 'update':
$this->update($this->key, $this->entry);
break;
}
}
}
-?>
Modified: people/sigurdne/modules/addressbook/trunk/inc/class.ipc_addressbook.inc.php
===================================================================
--- people/sigurdne/modules/addressbook/trunk/inc/class.ipc_addressbook.inc.php 2009-11-20 09:48:21 UTC (rev 20837)
+++ people/sigurdne/modules/addressbook/trunk/inc/class.ipc_addressbook.inc.php 2009-11-20 10:27:07 UTC (rev 20838)
@@ -5,31 +5,31 @@
* @author Dirk Schaller <[email protected]>
* @copyright Copyright (C) 2003 Free Software Foundation http://www.fsf.org/
* @license http://www.fsf.org/licenses/gpl.html GNU General Public License
- * @package phpgwapi
- * @subpackage ipc
- * @version $Id$
+ * @package phpgroupware
+ * @subpackage phpgwapi
+ * @version $Id$
*/
- phpgw::import_class('phpgwapi.ipc_');
/**
* Fassade of the adressbook application.
*
- * @package notes
+ * @package phpgroupware
+ * @subpackage phpgwapi
+ * @category ipc
*/
- class ipc_addressbook extends ipc_
+ class phpgwapi_ipc_addressbook extends phpgwapi_ipc_
{
/**
* @var object $contacts phpgwapi contacts object
* @access private
*/
- var $contacts;
+ protected $contacts;
/**
* @var object $vcard import/export vcard object
- * @access private
*/
- var $vcard;
+ protected $vcard;
/**
@@ -54,16 +54,12 @@
*/
function addData($data, $type)
{
- switch($type)
- {
- case 'text/x-vcard':
- case 'text/vcard':
- break;
- default:
+ // 1: mapping the mime type to application data
+ if($type != 'text/x-vcard')
return false;
- }
- $data_lines = preg_split("/[\r\n]+/", $data);
+ $data = ereg_replace("\n\n", "\r\n", $data);
+ $data_lines = explode("\r\n", $data);
$buffer = array();
$temp_line = '';
@@ -71,7 +67,6 @@
while(list(, $line) = each($data_lines))
{
$line = trim($line);
-
if(substr($line, -1) == '=')
{
// '=' at end-of-line --line to be continued with next line
@@ -94,7 +89,6 @@
}
$fields = $this->vcard->in($buffer);
-
$fields['owner'] = $GLOBALS['phpgw_info']['user']['account_id'];
$fields['access'] = 'private';
@@ -127,12 +121,8 @@
*/
function getData($id, $type)
{
- switch($type)
+ if($type != 'text/x-vcard')
{
- case 'text/x-vcard':
- case 'text/vcard':
- break;
- default:
return false;
}
Modified: people/sigurdne/modules/addressbook/trunk/inc/class.menu.inc.php
===================================================================
--- people/sigurdne/modules/addressbook/trunk/inc/class.menu.inc.php 2009-11-20 09:48:21 UTC (rev 20837)
+++ people/sigurdne/modules/addressbook/trunk/inc/class.menu.inc.php 2009-11-20 10:27:07 UTC (rev 20838)
@@ -6,13 +6,13 @@
* @copyright Copyright (C) 2007 Free Software Foundation, Inc. http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
* @package addressbook
- * @version $Id: class.menu.inc.php 727 2008-02-08 04:13:28Z dave $
+ * @version $Id: class.menu.inc.php 1781 2008-11-02 19:51:19Z sigurd $
*/
/*
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 3 of the License, or
+ the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
Modified: people/sigurdne/modules/addressbook/trunk/inc/class.soaddressbook.inc.php
===================================================================
--- people/sigurdne/modules/addressbook/trunk/inc/class.soaddressbook.inc.php 2009-11-20 09:48:21 UTC (rev 20837)
+++ people/sigurdne/modules/addressbook/trunk/inc/class.soaddressbook.inc.php 2009-11-20 10:27:07 UTC (rev 20838)
@@ -504,9 +504,9 @@
if($account_id)
{
$account = CreateObject('phpgwapi.accounts',$account_id,'u');
- $account_data = $account->read_repository();
- $account_data['account_firstname'] = $fields['tab_person_data']['per_first_name'];
- $account_data['account_lastname'] = $fields['tab_person_data']['per_last_name'];
+ $account_data = $account->read();
+ $account_data->firstname = $fields['tab_person_data']['per_first_name'];
+ $account_data->lastname = $fields['tab_person_data']['per_last_name'];
$account->update_data($account_data);
$account->save_repository();
}
@@ -712,7 +712,7 @@
{
$fields['tab_comms']['comm_data']=array();
}
- $comms = array();
+
foreach($fields['tab_comms']['comm_data'] as $type_descr => $data)
{
if($data)
@@ -725,10 +725,7 @@
if(is_array($fields['addr_data']))
{
- if(isset($fields['tab_address']['addr_preferred']))
- {
$fields['addr_data'][$fields['tab_address']['addr_preferred']]['addr_preferred']='Y';
- }
$addr = $fields['addr_data'];
}
@@ -743,7 +740,7 @@
$persons = $fields['tab_persons']['my_person'];
- $cats = isset($fields['tab_cats']['my_cats']) ? $fields['tab_cats']['my_cats'] : '';
+ $cats = $fields['tab_cats']['my_cats'];
$type = $this->contacts->search_contact_type($this->contacts->get_org_name());
$c_id = $this->contacts->add_contact($type, $principal, $comms, $addr, $cats, $others, $persons);
@@ -1095,26 +1092,16 @@
*/
function read_preferences($contact_type)
{
- $prefs =& $GLOBALS['phpgw']->preferences->data['addressbook'];
-
- if($contact_type==$this->tab_main_persons)
- {
- if ( isset($prefs['person_columns'])
- && strlen($prefs['person_columns']) )
+ $prefs = $GLOBALS['phpgw']->preferences->read();
+ $prefs = isset($prefs['addressbook']) ? $prefs['addressbook'] : array();
+ if(isset($prefs['person_columns']) && $contact_type==$this->tab_main_persons)
{
- return unserialize($prefs['person_columns']);
- }
+
+ return $prefs['person_columns'];
}
- elseif($contact_type==$this->tab_main_organizations)
- {
- if ( isset($prefs['org_columns'])
- && strlen($prefs['org_columns']) )
+ elseif(isset($prefs['org_columns']) && $contact_type==$this->tab_main_organizations)
{
- return unserialize($prefs['org_columns']);
+ return $prefs['org_columns'];
}
}
- return array();//whoops
- }
-
}
-?>
Modified: people/sigurdne/modules/addressbook/trunk/inc/class.uiXport.inc.php
===================================================================
--- people/sigurdne/modules/addressbook/trunk/inc/class.uiXport.inc.php 2009-11-20 09:48:21 UTC (rev 20837)
+++ people/sigurdne/modules/addressbook/trunk/inc/class.uiXport.inc.php 2009-11-20 10:27:07 UTC (rev 20838)
@@ -73,7 +73,8 @@
function import()
{
- if ($_REQUEST['convert']) //&& ($_FILES['tsvfile']['error'] == UPLOAD_ERR_OK))
+ $conv_type_a = $GLOBALS['phpgw']->session->appsession('conv_type_values_i', 'addressbook');
+ if ($_REQUEST['convert'] && is_array($conv_type_a) && in_array($_REQUEST['conv_type'], $conv_type_a)) //&& ($_FILES['tsvfile']['error'] == UPLOAD_ERR_OK))
{
$buffer = $this->bo->import($_FILES['tsvfile']['tmp_name'],$_REQUEST['conv_type'],$_REQUEST['private'],$_REQUEST['fcat_id']);
@@ -133,6 +134,7 @@
$conv .= '<OPTION VALUE="' . $myfilearray[$i].'">' . $fname . '</OPTION>';
}
+ $GLOBALS['phpgw']->session->appsession('conv_type_values_i', 'addressbook', $myfilearray);
$this->template->set_var('lang_cancel',lang('Cancel'));
$this->template->set_var('lang_cat',lang('Select Category'));
$this->template->set_var('cancel_url',$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'addressbook.uiaddressbook.index')));
@@ -175,7 +177,8 @@
//$entries = $this->bo->$get_data_function($fields, $this->limit, $this->start, $this->order, $this->sort, '', $criteria);
- if ($_REQUEST['convert'])
+ $conv_type_a = $GLOBALS['phpgw']->session->appsession('conv_type_values_e', 'addressbook');
+ if ($_REQUEST['convert'] && is_array($conv_type_a) && in_array($_REQUEST['conv_type'], $conv_type_a))
{
if ($_REQUEST['conv_type'] == 'none')
{
@@ -250,6 +253,7 @@
$conv .= ' <option value="'.$myfilearray[$i].'">'.$fname.'</option>'."\n";
}
+ $GLOBALS['phpgw']->session->appsession('conv_type_values_e', 'addressbook', $myfilearray);
$this->template->set_var('lang_cancel',lang('Cancel'));
$this->template->set_var('lang_cat',lang('Select Category'));
$this->template->set_var('cat_link',$this->cat_option($this->cat_id,False,False));
Modified: people/sigurdne/modules/addressbook/trunk/inc/class.uiaddressbook.inc.php
===================================================================
--- people/sigurdne/modules/addressbook/trunk/inc/class.uiaddressbook.inc.php 2009-11-20 09:48:21 UTC (rev 20837)
+++ people/sigurdne/modules/addressbook/trunk/inc/class.uiaddressbook.inc.php 2009-11-20 10:27:07 UTC (rev 20838)
@@ -199,6 +199,30 @@
$this->section = $this->tab_main_persons;
}
+ $tabs = array();
+ $tabs[] = array(
+ 'label' => lang('persons'),
+ 'link' => $GLOBALS['phpgw']->link('/index.php',array('menuaction' => 'addressbook.uiaddressbook.index', 'section' => $this->tab_main_persons))
+ );
+ $tabs[] = array(
+ 'label' => lang('Organizations'),
+ 'link' => $GLOBALS['phpgw']->link('/index.php',array('menuaction' => 'addressbook.uiaddressbook.index', 'section' => $this->tab_main_organizations))
+ );
+
+ switch($this->section)
+ {
+ case 'Persons':
+ $selected = 0;
+ break;
+ case 'Organizations':
+ $selected = 1;
+ break;
+ default:
+ $selected = 0;
+ }
+
+ $GLOBALS['phpgw']->template->set_var('tabs', $GLOBALS['phpgw']->common->create_tabs($tabs, $selected));
+
switch ($this->filter)
{
case 'yours':
@@ -347,7 +371,7 @@
//$criteria = $this->bo->criteria_contacts($this->access, $category_filter, $fields_search, $this->query);
$criteria = $this->bo->criteria_contacts($this->access, $category_filter, $this->qfield, $this->query, $fields_search);
$total_all_persons = $this->bo->$count_function($criteria);
- $entries = $this->bo->$get_data_function($fields, $this->limit, $this->start, $this->order, $this->sort, '', $criteria);
+ $entries = $this->bo->$get_data_function($fields, $this->start, $this->limit, $this->order, $this->sort, '', $criteria);
if(is_array($entries) && count($entries) > 0)
{
@@ -1247,13 +1271,13 @@
function person_form($fields)
{
$userformat =& $GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
- if($userformat != $this->bo->bday_internformat && isset($fields['per_birthday']))
+ if($userformat != $this->bo->bday_internformat)
{
$fields['per_birthday'] = phpgwapi_datetime::convertDate($fields['per_birthday'], $this->bo->bday_internformat, $userformat);
}
- $bday = $this->jscal->input('entry[per_birthday]',isset($fields['per_birthday']) ? $fields['per_birthday'] : '');
+ $bday = $this->jscal->input('entry[per_birthday]',$fields['per_birthday']);
- if (isset($fields['ispublic']) && $fields['ispublic']=='private')
+ if ($fields['ispublic']=='private')
{
$access_check = '<input type="checkbox" name="entry[access]" checked>';
}
@@ -1266,12 +1290,12 @@
$this->template->set_var('lang_general_data', lang('General Data'));
$this->set_form_fields(array
(
- 1 => array('Prefix', 'entry[per_prefix]', isset($fields['per_prefix']) ? $fields['per_prefix'] : ''),
- 2 => array('First Name', 'entry[per_first_name]', isset($fields['per_first_name']) ? $fields['per_first_name'] : ''),
- 3 => array('Middle Name', 'entry[per_middle_name]', isset($fields['per_middle_name']) ? $fields['per_middle_name'] : ''),
- 4 => array('Last Name', 'entry[per_last_name]', isset($fields['per_last_name']) ? $fields['per_last_name'] : ''),
- 5 => array('Title', 'entry[per_title]', isset($fields['per_title']) ? $fields['per_title'] : ''),
- 6 => array('Department', 'entry[per_department]', isset($fields['per_department']) ? $fields['per_department'] : ''),
+ 1 => array('Prefix', 'entry[per_prefix]', $fields['per_prefix']),
+ 2 => array('First Name', 'entry[per_first_name]', $fields['per_first_name']),
+ 3 => array('Middle Name', 'entry[per_middle_name]', $fields['per_middle_name']),
+ 4 => array('Last Name', 'entry[per_last_name]', $fields['per_last_name']),
+ 5 => array('Title', 'entry[per_title]', $fields['per_title']),
+ 6 => array('Department', 'entry[per_department]', $fields['per_department']),
7 => array('Email', 'entry[email]', isset($fields['email']) ? $fields['email'] : ''),
8 => array('Phone', 'entry[wphone]', isset($fields['wphone']) ? $fields['wphone'] : ''),
9 => array('Private', $access_check, 'special'),
@@ -1289,7 +1313,7 @@
*/
function org_form($fields)
{
- if (isset($fields['ispublic']) && $fields['ispublic'] == 'private')
+ if (isset($fields['ispublic']) && $fields['ispublic']=='private')
{
$access_check = '<input type="checkbox" name="entry[access]" checked>';
}
@@ -1303,7 +1327,7 @@
$this->template->set_var('lang_general_data', lang('Organizations Data'));
$this->set_form_fields(array(1 => array('Name', 'entry[org_name]', isset($fields['org_name']) ? $fields['org_name'] : ''),
- 2 => array('Phone', 'entry[wphone]', $fields['wphone']),
+ 2 => array('Phone', 'entry[wphone]', isset($fields['wphone']) ? $fields['wphone'] : ''),
3 => array('Private', $access_check, 'special'),
4 => array('','','special')));
return $this->template->fp('out', 'tab_body_general_data');
@@ -1334,7 +1358,7 @@
(
'comm_description' => $value['comm_description'],
'comm_data' => isset($fields['comm_data'][$value['comm_description']]) ? $fields['comm_data'][$value['comm_description']] : '',
- 'preferred' => $fields['preferred'] == $value['comm_description'] ? 'Y' : 'N'
+ 'preferred' => isset($fields['preferred']) && $fields['preferred'] == $value['comm_description'] ? 'Y' : 'N'
);
}
@@ -1765,7 +1789,7 @@
{
if ($tab == $current_tab)
{
- return 'activetab';
+ return 'selected';
}
return '';
}
@@ -2042,19 +2066,11 @@
}
else
{
- $entry['ispublic'] = isset($entry['access']) ? $entry['access'] : '';
$entry = $GLOBALS['phpgw']->session->appsession('tab_org_data', 'addressbook');
$entry = $this->stripslashes_from_array($entry);
}
$comms = $this->read_tab_session($this->tab_comms);
- if(isset($comms['comm_data']) && isset($comms['comm_data']['work phone']))
- {
- $entry['wphone'] = $comms['comm_data']['work phone'];
- }
- else
- {
- $entry['wphone'] = '';
- }
+ $entry['wphone'] = isset($comms['comm_data']['work phone']) ? $comms['comm_data']['work phone'] : '';
//$this->record_name = $entry['org_name'];
break;
case $this->tab_persons:
@@ -2316,6 +2332,7 @@
'others_data',
'addr_data');
+ $load_vars = array();
// $load_vars = $GLOBALS['phpgw']->session->appsession('load_vars', 'addressbook');
foreach($tabs_data as $tab)
{
@@ -2554,7 +2571,7 @@
$add_data = $this->entry['tmp_data'][$tab_section];
- if($add_data['action'] == 'insert')
+ if(isset($add_data['action']) && $add_data['action'] == 'insert')
{
$get_query = 'get_insert_'.$tab_section;
$add_data['action'] = 'insert';
@@ -2918,6 +2935,7 @@
}
}
+ $this->template->set_root(PHPGW_APP_TPL);
$this->template->set_file(array('view_t' => 'view.tpl'));
$this->template->set_block('view_t','view_header','view_header');
$this->template->set_block('view_t','view_row','view_row');
@@ -2945,7 +2963,7 @@
$this->template->set_var('display_col',lang($field));
if(strpos($field, 'email'))
{
- if ($GLOBALS['phpgw_info']['user']['apps']['email'])
+ if (isset($GLOBALS['phpgw_info']['user']['apps']['email']) && $GLOBALS['phpgw_info']['user']['apps']['email'])
{
$ref='<a href="'.$GLOBALS['phpgw']->link('/email/compose.php',array('to'=> urlencode($data))) .'" target="_new">';
}
@@ -3207,10 +3225,8 @@
function get_persons($fields_to_search, $current_person)
{
$criteria = $this->bo->criteria_contacts(PHPGW_CONTACTS_ALL,PHPGW_CONTACTS_CATEGORIES_ALL,array(),'',$fields_to_search);
- $persons = $this->bo->get_persons($fields_to_search,'','','first_name','','',$criteria);
+ $persons = $this->bo->get_persons($fields_to_search,'','','last_name','','',$criteria);
- $this->my_person_data = isset($this->my_person_data) ? $this->my_person_data : '';
- $this->all_person_data = isset($this->all_person_data) ? $this->all_person_data : '';
if ($persons)
{
foreach ($persons as $k => $v)
Modified: people/sigurdne/modules/addressbook/trunk/inc/class.uiaddressbook_prefs.inc.php
===================================================================
--- people/sigurdne/modules/addressbook/trunk/inc/class.uiaddressbook_prefs.inc.php 2009-11-20 09:48:21 UTC (rev 20837)
+++ people/sigurdne/modules/addressbook/trunk/inc/class.uiaddressbook_prefs.inc.php 2009-11-20 10:27:07 UTC (rev 20838)
@@ -422,6 +422,7 @@
print "<br /><b>Columns</b><br />"; */
}
+
function linearize_query($qresult,$key)
{
// print_r($qresult);
@@ -573,12 +574,10 @@
}
}
+ $this->template->set_root(PHPGW_APP_TPL);
$this->template->set_file(
array(
'addressbook_preferences_t' =>'preferences.tpl',
- 'preferences_bits_t' => 'preferences_bits.tpl',
- 'select_columns_form_options_t' => 'preferences_bits.tpl',
- 'select_columns_commtypes_options_t' => 'preferences_bits.tpl',
'selected_rows_t' => 'preferences_bits.tpl',
'principal_tabs_t' => 'principal_tabs.tpl'
)
@@ -677,51 +676,54 @@
}
function show_selectbox($org_or_person='')
{
-
if(empty($org_or_person))
{
$org_or_person=$this->org_or_person;
}
$this->fields_to_show();
- $this->template->set_block('select_columns_form_options_t','B_select_columns_form_options','V_select_columns_form_options');
- $this->template->set_block('select_columns_commtypes_options_t','B_select_ctypes_options','V_select_columns_commtypes_options');
- if(count($this->fields_show_selectbox) > 1)
+ $this->template->set_block('addressbook_preferences_t','B_select_columns_form_options','V_select_columns_form_options');
+ $this->template->set_block('addressbook_preferences_t', 'B_select_ctypes_options', 'V_select_ctypes_options');
+
+ if ( isset($this->fields_show_selectbox['comm_types']) )
{
- reset($this->fields_show_selectbox);
- // print "<br /><B> To Show in Selectbox<br />".print_r($this->fields_show_selectbox)."</B><br />";
- while(list($field,$lang)=each($this->fields_show_selectbox))
+ if ( is_array($this->fields_show_selectbox['comm_types'])
+ && count($this->fields_show_selectbox['comm_types']) )
{
- //not a comtype
-
- if(!is_array($lang))
+ foreach ( $this->fields_show_selectbox['comm_types'] as $k => $description )
{
- $this->template->set_var('lang_contact_field',$lang);
- $this->template->set_var('value',$field);
- $this->template->parse('V_select_columns_form_options','B_select_columns_form_options',True);
+ $this->template->set_var('lang_comtype_field', $description);
+ $this->template->set_var('commtype_description', $description);
+ $this->template->parse('V_select_ctypes_options', 'B_select_ctypes_options', True);
+ }
}
else
{
- while(list($k,$description)=each($lang))
- {
- $this->template->set_var('lang_comtype_field',$description);
- $this->template->set_var('commtype_description',$description);
- $this->template->parse('V_select_ctypes_options',
- 'B_select_ctypes_options',True);
-
+ $this->template->set_var('lang_comtype_field',$GLOBALS['phpgw']->lang('Empty'));
+ $this->template->set_var('value', '');
+ $this->template->parse('V_select_ctypes_options', 'B_select_ctypes_options', True);
}
+
+ unset($this->fields_show_selectbox['comm_types']);
}
+
+ if ( count($this->fields_show_selectbox) )
+ {
+ //print "<br /><B> To Show in Selectbox<br />".print_r($this->fields_show_selectbox, true)."</B><br />";
+ foreach ( $this->fields_show_selectbox as $field => $lang )
+ {
+ $this->template->set_var('lang_contact_field',$lang);
+ $this->template->set_var('value',$field);
+ $this->template->parse('V_select_columns_form_options','B_select_columns_form_options',True);
}
}
else
{
$this->template->set_var('lang_contact_field',$GLOBALS['phpgw']->lang('Empty'));
- $this->template->set_var('value',"");
- $this->template->parse('V_select_columns_form_options','B_select_columns_form_options');
+ $this->template->set_var('value', '');
+ $this->template->parse('V_select_columns_form_options','B_select_columns_form_options',True);
}
- $this->template->parse('B_select_columns_form_options','V_select_columns_form_options');
- $this->template->parse('B_select_ctypes_options', 'V_select_ctypes_options');
+ }
- }
function show_cols($org_or_person='')
{
if(empty($org_or_person))
Modified: people/sigurdne/modules/addressbook/trunk/inc/class.uicatalog_contact_addr_type.inc.php
===================================================================
--- people/sigurdne/modules/addressbook/trunk/inc/class.uicatalog_contact_addr_type.inc.php 2009-11-20 09:48:21 UTC (rev 20837)
+++ people/sigurdne/modules/addressbook/trunk/inc/class.uicatalog_contact_addr_type.inc.php 2009-11-20 10:27:07 UTC (rev 20838)
@@ -1,17 +1,36 @@
<?php
- include('class.catalog_manager.inc.php');
+ /**************************************************************************\
+ * phpGroupWare - catalog_manager *
+ * http://www.phpgroupware.org *
+ * This program is part of the GNU project, see http://www.gnu.org/ *
+ * *
+ * Copyright 2003,2008 Free Software Foundation, Inc. *
+ * *
+ * Originally Written by Jonathan Alberto Rivera Gomez - jarg at co.com.mx *
+ * Current Maintained by Jonathan Alberto Rivera Gomez - jarg at co.com.mx *
+ * Written by Dave Hall <[email protected]> *
+ * -------------------------------------------- *
+ * Development of this application was funded by http://www.sogrp.com *
+ * -------------------------------------------- *
+ * 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. *
+ \**************************************************************************/
- class uicatalog_contact_addr_type extends catalog_manager
+ phpgw::import_class('addressbook.catalog_manager');
+
+ class addressbook_uicatalog_contact_addr_type extends addressbook_catalog_manager
{
var $public_functions = array('view' => True);
var $modify = False;
- function uicatalog_contact_addr_type()
+ function __construct()
{
- $this->_constructor();
+ parent::__construct();
$this->bo = CreateObject('addressbook.bocatalog_contact_addr_type');
- $this->form_action = 'menuaction=addressbook.uicatalog_contact_addr_type.view';
+ $this->form_action = array('menuaction' => 'addressbook.uicatalog_contact_addr_type.view');
$this->catalog_name = 'addr_types';
$this->headers = array('Type', 'Edit', 'Delete');
$this->array_name = 'addr_types_array';
@@ -90,4 +109,3 @@
'value'=> $this->entry['addr_description']))));
}
}
-?>
Modified: people/sigurdne/modules/addressbook/trunk/inc/class.uicatalog_contact_comm_descr.inc.php
===================================================================
--- people/sigurdne/modules/addressbook/trunk/inc/class.uicatalog_contact_comm_descr.inc.php 2009-11-20 09:48:21 UTC (rev 20837)
+++ people/sigurdne/modules/addressbook/trunk/inc/class.uicatalog_contact_comm_descr.inc.php 2009-11-20 10:27:07 UTC (rev 20838)
@@ -1,18 +1,37 @@
<?php
- include('class.catalog_manager.inc.php');
+ /**************************************************************************\
+ * phpGroupWare - catalog_manager *
+ * http://www.phpgroupware.org *
+ * This program is part of the GNU project, see http://www.gnu.org/ *
+ * *
+ * Copyright 2003,2008 Free Software Foundation, Inc. *
+ * *
+ * Originally Written by Jonathan Alberto Rivera Gomez - jarg at co.com.mx *
+ * Current Maintained by Jonathan Alberto Rivera Gomez - jarg at co.com.mx *
+ * Written by Dave Hall <[email protected]> *
+ * -------------------------------------------- *
+ * Development of this application was funded by http://www.sogrp.com *
+ * -------------------------------------------- *
+ * 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. *
+ \**************************************************************************/
- class uicatalog_contact_comm_descr extends catalog_manager
+ phpgw::import_class('addressbook.catalog_manager');
+
+ class addressbook_uicatalog_contact_comm_descr extends addressbook_catalog_manager
{
var $public_functions = array('view' => True);
var $modify = False;
- function uicatalog_contact_comm_descr()
+ function __construct()
{
- $this->_constructor();
+ parent::__construct();
$this->bo = CreateObject('addressbook.bocatalog_contact_comm_descr');
- $this->form_action = 'menuaction=addressbook.uicatalog_contact_comm_descr.view';
+ $this->form_action = array('menuaction' => 'addressbook.uicatalog_contact_comm_descr.view');
$this->catalog_name = 'comm_descr';
$this->headers = array('Type', 'Description', 'Edit', 'Delete');
$this->array_name = 'comm_descr_array';
@@ -105,6 +124,7 @@
function get_options($selected='')
{
$this->comm_type_array = $this->bo->select_catalog_types();
+ $options = '';
foreach($this->comm_type_array as $option)
{
if ($option['comm_type_id'] == $selected)
@@ -122,4 +142,3 @@
return $options;
}
}
-?>
Modified: people/sigurdne/modules/addressbook/trunk/inc/class.uicatalog_contact_comm_type.inc.php
===================================================================
--- people/sigurdne/modules/addressbook/trunk/inc/class.uicatalog_contact_comm_type.inc.php 2009-11-20 09:48:21 UTC (rev 20837)
+++ people/sigurdne/modules/addressbook/trunk/inc/class.uicatalog_contact_comm_type.inc.php 2009-11-20 10:27:07 UTC (rev 20838)
@@ -1,18 +1,36 @@
<?php
- include('class.catalog_manager.inc.php');
+ /**************************************************************************\
+ * phpGroupWare - catalog_manager *
+ * http://www.phpgroupware.org *
+ * This program is part of the GNU project, see http://www.gnu.org/ *
+ * *
+ * Copyright 2003 Free Software Foundation, Inc. *
+ * *
+ * Originally Written by Jonathan Alberto Rivera Gomez - jarg at co.com.mx *
+ * Current Maintained by Jonathan Alberto Rivera Gomez - jarg at co.com.mx *
+ * -------------------------------------------- *
+ * Development of this application was funded by http://www.sogrp.com *
+ * -------------------------------------------- *
+ * 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. *
+ \**************************************************************************/
- class uicatalog_contact_comm_type extends catalog_manager
+ phpgw::import_class('addressbook.catalog_manager');
+
+ class addressbook_uicatalog_contact_comm_type extends addressbook_catalog_manager
{
var $public_functions = array('view' => True);
var $modify = False;
- function uicatalog_contact_comm_type()
+ function __construct()
{
- $this->_constructor();
+ parent::__construct();
$this->bo = CreateObject('addressbook.bocatalog_contact_comm_type');
- $this->form_action = 'menuaction=addressbook.uicatalog_contact_comm_type.view';
+ $this->form_action = array('menuaction' => 'addressbook.uicatalog_contact_comm_type.view');
$this->catalog_name = 'comm_types';
$this->headers = array('Type', 'Edit', 'Delete');
$this->array_name = 'comm_types_array';
@@ -85,10 +103,19 @@
$record = $this->bo->get_record($key);
$this->entry['comm_type_description'] = $record[0]['comm_type_description'];
- $this->form_fields = array(1 => array('Type', $this->get_column_data(
- array('type' => 'text',
+ $fields = array
+ (
+ 1 => array
+ (
+ 'Type',
+ $this->get_column_data(array
+ (
+ 'type' => 'text',
'name' => 'entry[comm_type_description]',
- 'value'=> $this->entry['comm_type_description']))));
+ 'value'=> $this->entry['comm_type_description']
+ ))
+ )
+ );
+ $this->form_fields = $fields;
}
}
-?>
Modified: people/sigurdne/modules/addressbook/trunk/inc/class.uicatalog_contact_note_type.inc.php
===================================================================
--- people/sigurdne/modules/addressbook/trunk/inc/class.uicatalog_contact_note_type.inc.php 2009-11-20 09:48:21 UTC (rev 20837)
+++ people/sigurdne/modules/addressbook/trunk/inc/class.uicatalog_contact_note_type.inc.php 2009-11-20 10:27:07 UTC (rev 20838)
@@ -1,18 +1,37 @@
<?php
- include('class.catalog_manager.inc.php');
+ /**************************************************************************\
+ * phpGroupWare - catalog_manager *
+ * http://www.phpgroupware.org *
+ * This program is part of the GNU project, see http://www.gnu.org/ *
+ * *
+ * Copyright 2003,2008 Free Software Foundation, Inc. *
+ * *
+ * Originally Written by Jonathan Alberto Rivera Gomez - jarg at co.com.mx *
+ * Current Maintained by Jonathan Alberto Rivera Gomez - jarg at co.com.mx *
+ * Written by Dave Hall <[email protected]> *
+ * -------------------------------------------- *
+ * Development of this application was funded by http://www.sogrp.com *
+ * -------------------------------------------- *
+ * 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. *
+ \**************************************************************************/
- class uicatalog_contact_note_type extends catalog_manager
+ phpgw::import_class('addressbook.catalog_manager');
+
+ class addressbook_uicatalog_contact_note_type extends addressbook_catalog_manager
{
var $public_functions = array('view' => True);
var $modify = False;
- function uicatalog_contact_note_type()
+ function __construct()
{
- $this->_constructor();
+ parent::__construct();
$this->bo = CreateObject('addressbook.bocatalog_contact_note_type');
- $this->form_action = 'menuaction=addressbook.uicatalog_contact_note_type.view';
+ $this->form_action = array('menuaction' => 'addressbook.uicatalog_contact_note_type.view');
$this->catalog_name = 'note_types';
$this->headers = array('Type', 'Edit', 'Delete');
$this->array_name = 'note_types_array';
@@ -91,4 +110,3 @@
'value'=> $this->entry['note_description']))));
}
}
-?>
Modified: people/sigurdne/modules/addressbook/trunk/inc/class.uicategorize_contacts.inc.php
===================================================================
--- people/sigurdne/modules/addressbook/trunk/inc/class.uicategorize_contacts.inc.php 2009-11-20 09:48:21 UTC (rev 20837)
+++ people/sigurdne/modules/addressbook/trunk/inc/class.uicategorize_contacts.inc.php 2009-11-20 10:27:07 UTC (rev 20838)
@@ -46,15 +46,9 @@
case 'save':
$persons = $this->lists->get_resul_list();
$this->save_categories_by_person($this->selected_cat, $persons);
- Header('Location: '
- . $GLOBALS['phpgw']->link('/index.php', array('menuaction' => 'addressbook.uicategorize_contacts.index')));
- $GLOBALS['phpgw']->common->phpgw_exit();
- break;
+ $GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' => 'addressbook.uicategorize_contacts.index', 'all_cats' => $this->selected_cat));
case 'cancel':
- Header('Location: '
- . $GLOBALS['phpgw']->link('/index.php',array('menuaction' => 'addressbook.uiaddressbook.index', 'section' => 'Persons')));
- $GLOBALS['phpgw']->common->phpgw_exit();
- break;
+ $GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction' => 'addressbook.uiaddressbook.index', 'section' => 'Persons'));
}
$this->draw_form();
}
@@ -141,7 +135,7 @@
$GLOBALS['phpgw_info']['user']['account_id'], $access, $cat_id);
$persons = $this->contacts->get_persons(
array('person_id', 'per_full_name'),
- '','','','','',$criteria);
+ '', '', 'last_name','ASC','',$criteria);
if(is_array($persons))
{
Modified: people/sigurdne/modules/addressbook/trunk/inc/class.uifields.inc.php
===================================================================
--- people/sigurdne/modules/addressbook/trunk/inc/class.uifields.inc.php 2009-11-20 09:48:21 UTC (rev 20837)
+++ people/sigurdne/modules/addressbook/trunk/inc/class.uifields.inc.php 2009-11-20 10:27:07 UTC (rev 20838)
@@ -42,6 +42,7 @@
$GLOBALS['phpgw']->common->phpgw_exit();
}
+ $GLOBALS['phpgw']->template->set_root(PHPGW_APP_TPL);
$GLOBALS['phpgw']->template->set_file(array
(
'field_list_t' => 'listfields.tpl',
@@ -142,6 +143,7 @@
$GLOBALS['phpgw']->common->phpgw_exit();
}
+ $GLOBALS['phpgw']->template->set_root(PHPGW_APP_TPL);
$GLOBALS['phpgw']->template->set_file(array('form' => 'field_form.tpl'));
$GLOBALS['phpgw']->template->set_block('form','add','addhandle');
$GLOBALS['phpgw']->template->set_block('form','edit','edithandle');
@@ -241,6 +243,7 @@
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' => 'addressbook.uifields.index', 'sort' => $sort, 'query' => $query, 'start' => $start) );
}
+ $GLOBALS['phpgw']->template->set_root(PHPGW_APP_TPL);
$GLOBALS['phpgw']->template->set_file(array('form' => 'field_form.tpl'));
$GLOBALS['phpgw']->template->set_block('form','add','addhandle');
$GLOBALS['phpgw']->template->set_block('form','edit','edithandle');
@@ -374,6 +377,7 @@
. '<input type="hidden" name="start" value="' . $start .'">' . "\n"
. '<input type="hidden" name="field" value="' . $field .'">' . "\n";
+ $GLOBALS['phpgw']->template->set_root(PHPGW_APP_TPL);
$GLOBALS['phpgw']->template->set_file(array('field_delete' => 'delete_common.tpl'));
$GLOBALS['phpgw']->template->set_var('messages',lang('Are you sure you want to delete this field?'));
@@ -465,16 +469,16 @@
function get_apply($key)
{
- if((is_array($this->per_custom_fields) && is_array($this->org_custom_fields)) &&
+ if(isset($this->per_custom_fields) && (is_array($this->per_custom_fields) && isset($this->org_custom_fields) && is_array($this->org_custom_fields)) &&
array_key_exists($key, $this->per_custom_fields) && array_key_exists($key, $this->org_custom_fields))
{
return 'both';
}
- elseif(is_array($this->per_custom_fields) && array_key_exists($key, $this->per_custom_fields))
+ elseif(isset($this->per_custom_fields) && is_array($this->per_custom_fields) && array_key_exists($key, $this->per_custom_fields))
{
return 'person';
}
- elseif(is_array($this->org_custom_fields) && array_key_exists($key, $this->org_custom_fields))
+ elseif(isset($this->org_custom_fields) && is_array($this->org_custom_fields) && array_key_exists($key, $this->org_custom_fields))
{
return 'org';
}
@@ -593,4 +597,3 @@
}
}
}
-?>
Modified: people/sigurdne/modules/addressbook/trunk/inc/class.uivcard.inc.php
===================================================================
--- people/sigurdne/modules/addressbook/trunk/inc/class.uivcard.inc.php 2009-11-20 09:48:21 UTC (rev 20837)
+++ people/sigurdne/modules/addressbook/trunk/inc/class.uivcard.inc.php 2009-11-20 10:27:07 UTC (rev 20838)
@@ -83,14 +83,12 @@
if(!$ab_id)
{
- Header('Location: ' . $GLOBALS['phpgw']->link('/addressbook/index.php'));
- $GLOBALS['phpgw']->common->phpgw_exit();
+ $GLOBALS['phpgw']->redirect_link('/addressbook/index.php');
}
if(!$this->contacts->check_edit($ab_id))
{
- Header("Location: " . $GLOBALS['phpgw']->link('/index.php', array('menuaction' => 'addressbook.uiaddressbook.index')));
- $GLOBALS['phpgw']->common->phpgw_exit();
+ $GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' => 'addressbook.uiaddressbook.index'));
}
// First, make sure they have permission to this entry
@@ -194,11 +192,11 @@
if($lastname == '')
{
/* Run away here. */
- Header('Location: ' . $GLOBALS['phpgw']->link('/index.php',"menuaction=addressbook.uivcard.out&nolname=1&ab_id=$ab_id"));
+ $GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction' => 'addressbook.uivcard.out', 'nolname' => 1, 'ab_id' => $ab_id));
}
if($firstname == '')
{
- Header('Location: ' . $GLOBALS['phpgw']->link('/index.php',"menuaction=addressbook.uivcard.out&nofname=1&ab_id=$ab_id"));
+ $GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction' => 'addressbook.uivcard.out', 'nofname' => 1, 'ab_id' =>$ab_id));
}
if ($email)
Modified: people/sigurdne/modules/addressbook/trunk/inc/functions.inc.php
===================================================================
--- people/sigurdne/modules/addressbook/trunk/inc/functions.inc.php 2009-11-20 09:48:21 UTC (rev 20837)
+++ people/sigurdne/modules/addressbook/trunk/inc/functions.inc.php 2009-11-20 10:27:07 UTC (rev 20838)
@@ -162,7 +162,7 @@
function save_custom_field($old='',$new='')
{
- $GLOBALS['phpgw']->preferences->read_repository($GLOBALS['phpgw_info']['user']['account_id']);
+ $GLOBALS['phpgw']->preferences->read($GLOBALS['phpgw_info']['user']['account_id']);
if ($old)
{
$GLOBALS['phpgw']->preferences->delete("addressbook","extra_".$old);
Modified: people/sigurdne/modules/addressbook/trunk/inc/hook_deleteaccount.inc.php
===================================================================
--- people/sigurdne/modules/addressbook/trunk/inc/hook_deleteaccount.inc.php 2009-11-20 09:48:21 UTC (rev 20837)
+++ people/sigurdne/modules/addressbook/trunk/inc/hook_deleteaccount.inc.php 2009-11-20 10:27:07 UTC (rev 20838)
@@ -1,20 +1,35 @@
<?php
- /**************************************************************************\
- * phpGroupWare *
- * http://www.phpgroupware.org *
- * Written by Joseph Engo <[email protected]> *
- * -------------------------------------------- *
- * 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. *
- \**************************************************************************/
+ /**
+ * phpGroupWare Addressbook - delete account hook
+ *
+ * @author Dave Hall <[email protected]>
+ * @author Joseph Engo <[email protected]>
+ * @copyright Copyright (C) 2000-2008 Free Software Foundation, Inc. http://www.fsf.org/
+ * @license http://www.gnu.org/licenses/ GNU General Public License v2 or later
+ * @package phpgroupware
+ * @subpackage addressbook
+ * @version $Id$
+ */
- /* $Id$ */
+ /*
+ 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.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
$contacts = CreateObject('phpgwapi.contacts');
- $new_owner = phpgw::get_var('new_owner', 'int', 'POST');
- $account_id = phpgw::get_var('account_id', 'int', 'POST');
+
+ $account_id = phpgw::get_var('account_id', 'int');
+ $new_owner = phpgw::get_var('new_owner', 'int');
if ( $new_owner == 0 )
{
$contacts->delete_all($account_id);
@@ -24,4 +39,4 @@
$contacts->change_owner($account_id, $new_owner);
$contacts->change_owner_others($account_id, $new_owner);
}
-?>
+ unset($contacts);
Modified: people/sigurdne/modules/addressbook/trunk/setup/phpgw_it.lang
===================================================================
--- people/sigurdne/modules/addressbook/trunk/setup/phpgw_it.lang 2009-11-20 09:48:21 UTC (rev 20837)
+++ people/sigurdne/modules/addressbook/trunk/setup/phpgw_it.lang 2009-11-20 10:27:07 UTC (rev 20838)
@@ -66,6 +66,7 @@
full name addressbook it Nome completo
geo addressbook it GEO
grant addressbook access common it Permetti accesso alla Rubrica
+grant addressbook access common it Permetti accesso alla Rubrica it
home address type addressbook it Tipo indirizzo Abitazione
home city addressbook it Città Abitazione
home country addressbook it Nazione Abitazione
@@ -145,3 +146,4 @@
you must select a vcard. (*.vcf) addressbook it Bisogna selezionare una vcard (*.vcf)
you must select at least 1 column to display addressbook it Bisogna selezionare almeno una colonna da visualizzare
zip code common it CAP
+
Modified: people/sigurdne/modules/addressbook/trunk/setup/phpgw_sk.lang
===================================================================
--- people/sigurdne/modules/addressbook/trunk/setup/phpgw_sk.lang 2009-11-20 09:48:21 UTC (rev 20837)
+++ people/sigurdne/modules/addressbook/trunk/setup/phpgw_sk.lang 2009-11-20 10:27:07 UTC (rev 20838)
@@ -1,27 +1,27 @@
-%1 records imported addressbook sk %1 záznamov naimportovaných
-%1 records read (not yet imported, you may go back and uncheck test import) addressbook sk %1 záznamov naèítaných (zatiaµ neimportované)
-access not permitted addressbook sk prístup bol odopretý
-add a single entry by passing the fields. addressbook sk Prida» záznam preskoèením polo¾iek.
-add custom field addressbook sk Pridaj pou¾ívateµskú polo¾ku
-address book common sk Adresár
-addressbook common sk Telefónny zoznam
-addressbook preferences addressbook sk Nastavenie adresára
-address book - vcard in addressbook sk Adresár - VCard v
-address book - view addressbook sk Adresár - pohµad
+%1 records imported addressbook sk %1 z\xE1znamov naimportovan\xFDch
+%1 records read (not yet imported, you may go back and uncheck test import) addressbook sk %1 z\xE1znamov na\xE8\xEDtan\xFDch (zatia\xB5 neimportovan\xE9)
+access not permitted addressbook sk pr\xEDstup bol odopret\xFD
+add a single entry by passing the fields. addressbook sk Prida\xBB z\xE1znam presko\xE8en\xEDm polo\xBEiek.
+add custom field addressbook sk Pridaj pou\xBE\xEDvate\xB5sk\xFA polo\xBEku
+address book common sk Adres\xE1r
+addressbook common sk Telef\xF3nny zoznam
+addressbook preferences addressbook sk Nastavenie adres\xE1ra
+address book - vcard in addressbook sk Adres\xE1r - VCard v
+address book - view addressbook sk Adres\xE1r - poh\xB5ad
address line 2 addressbook sk Adresa riadok 2
address line 3 addressbook sk Adresa riadok 3
address type addressbook sk Typ adresy
addvcard addressbook sk Pridaj vizitku Vcard
-all addressbook sk V¹etko
-alt. csv import addressbook sk Alternatívny import z CSV
-april addressbook sk apríl
-are you sure you want to delete this field? addressbook sk Naozaj zmaza» túto polo¾ku?
+all addressbook sk V\xB9etko
+alt. csv import addressbook sk Alternat\xEDvny import z CSV
+april addressbook sk apr\xEDl
+are you sure you want to delete this field? addressbook sk Naozaj zmaza\xBB t\xFAto polo\xBEku?
august addressbook sk august
-bbs phone addressbook sk Èíslo na BBS
+bbs phone addressbook sk \xC8\xEDslo na BBS
birthday common sk Narodeniny
birthdays addressbook sk Narodeniny
-blank addressbook sk Prázdna
-<b>no conversion type <none> could be located.</b> please choose a conversion type from the list addressbook sk <b>nena¹iel som typ konverzie <none>.</b> prosím zvoµte typ konverzie zo zoznamu
+blank addressbook sk Pr\xE1zdna
+<b>no conversion type <none> could be located.</b> please choose a conversion type from the list addressbook sk <b>nena\xB9iel som typ konverzie <none>.</b> pros\xEDm zvo\xB5te typ konverzie zo zoznamu
business address type addressbook sk Typ obchodnej adresy
business city addressbook sk Mesto obchodu
business common sk Obchod
@@ -29,140 +29,140 @@
business email addressbook sk E-mail obchodu
business email type addressbook sk Typ E-mailu obchodu
business fax addressbook sk Fax obchodu
-business phone addressbook sk Telefón obchodu
-business state addressbook sk ©tát obchodu
+business phone addressbook sk Telef\xF3n obchodu
+business state addressbook sk \xA9t\xE1t obchodu
business street addressbook sk Ulica obchodu
-business zip code addressbook sk PSÈ obchodu
-car phone addressbook sk Telefón do auta
-category addressbook sk Kategória
+business zip code addressbook sk PS\xC8 obchodu
+car phone addressbook sk Telef\xF3n do auta
+category addressbook sk Kateg\xF3ria
cell phone addressbook sk Mobil
city common sk Mesto
-company common sk Spoloènos»
-company name common sk Názov spoloènosti
+company common sk Spolo\xE8nos\xBB
+company name common sk N\xE1zov spolo\xE8nosti
contact application admin sk Kontakty
contact common sk Kontakt
contact settings admin sk Nastavenie kontaktov
country common sk Krajina
created by addressbook sk Vytvoril
-custom addressbook sk Vlastné
-custom fields addressbook sk Vlastné polo¾ky
-debug output in browser addressbook sk Ladiaci výstup v prehliadaèi
+custom addressbook sk Vlastn\xE9
+custom fields addressbook sk Vlastn\xE9 polo\xBEky
+debug output in browser addressbook sk Ladiaci v\xFDstup v prehliada\xE8i
december addressbook sk december
-default filter addressbook sk Predvolený filter
-delete addressbook sk Zmaza»
-delete a single entry by passing the id. addressbook sk Zmaza» záznam zadaním id.
+default filter addressbook sk Predvolen\xFD filter
+delete addressbook sk Zmaza\xBB
+delete a single entry by passing the id. addressbook sk Zmaza\xBB z\xE1znam zadan\xEDm id.
department common sk Oddelenie
-domestic addressbook sk Domáci
+domestic addressbook sk Dom\xE1ci
download addressbook sk Stiahnutie
-edit addressbook sk Opravi»
-edit custom field addressbook sk Opravi» vlastnú polo¾ku
-edit custom fields admin sk Opravi» vlastné polo¾ky
+edit addressbook sk Opravi\xBB
+edit custom field addressbook sk Opravi\xBB vlastn\xFA polo\xBEku
+edit custom fields admin sk Opravi\xBB vlastn\xE9 polo\xBEky
e-mail addressbook sk E-mail
export contacts addressbook sk Export kontaktov
-export file name addressbook sk Názov súboru exportu
-export from addressbook addressbook sk Export z adresára
+export file name addressbook sk N\xE1zov s\xFAboru exportu
+export from addressbook addressbook sk Export z adres\xE1ra
extra addressbook sk Extra
fax addressbook sk Fax
-fax number common sk Faxové èíslo
-february addressbook sk február
-field name addressbook sk Názov polo¾ky
-fields addressbook sk Polo¾ky
-fields to show in address list addressbook sk Viditeµné polo¾ky v zozname
-field %1 has been added ! addressbook sk Polo¾ka %1 bola pridaná
-field %1 has been updated ! addressbook sk Polo¾ka %1 bola aktualizovaná
+fax number common sk Faxov\xE9 \xE8\xEDslo
+february addressbook sk febru\xE1r
+field name addressbook sk N\xE1zov polo\xBEky
+fields addressbook sk Polo\xBEky
+fields to show in address list addressbook sk Vidite\xB5n\xE9 polo\xBEky v zozname
+field %1 has been added ! addressbook sk Polo\xBEka %1 bola pridan\xE1
+field %1 has been updated ! addressbook sk Polo\xBEka %1 bola aktualizovan\xE1
first name addressbook sk Meno
-full name addressbook sk Úplné meno
+full name addressbook sk \xDApln\xE9 meno
geo addressbook sk GEO
-grant addressbook access common sk Deleguj prístupové práva k adresáru
+grant addressbook access common sk Deleguj pr\xEDstupov\xE9 pr\xE1va k adres\xE1ru
home address type addressbook sk Typ adresy domov
home city addressbook sk Mesto - domov
home country addressbook sk Krajina - domov
home email addressbook sk E-mail - domov
home email type addressbook sk Typ E-mailu domov
-home phone addressbook sk Telefón - domov
-home state addressbook sk ©tát - domov
+home phone addressbook sk Telef\xF3n - domov
+home state addressbook sk \xA9t\xE1t - domov
home street addressbook sk Ulica -domov
-home zip code addressbook sk PSÈ - domov
+home zip code addressbook sk PS\xC8 - domov
import addressbook sk Import
import contacts addressbook sk Importuj kontakty
-import file addressbook sk Importuj súbor
+import file addressbook sk Importuj s\xFAbor
import from ldif, csv, or vcard addressbook sk Import z LDIF, CSV alebo VCard
import from outlook addressbook sk Importuj z Outlooku
-international addressbook sk Mezinárodné
-isdn phone addressbook sk ISDN èíslo
-january addressbook sk január
-july addressbook sk júl
-june addressbook sk jún
-label addressbook sk ©títok
+international addressbook sk Mezin\xE1rodn\xE9
+isdn phone addressbook sk ISDN \xE8\xEDslo
+january addressbook sk janu\xE1r
+july addressbook sk j\xFAl
+june addressbook sk j\xFAn
+label addressbook sk \xA9t\xEDtok
last name addressbook sk Priezvisko
ldap context for contacts admin sk LDAP kontext pre kontakty
-ldap host for contacts admin sk LDAP hostiteµ pre kontakty
+ldap host for contacts admin sk LDAP hostite\xB5 pre kontakty
ldap root dn for contacts admin sk LDAP root dn pre kontakty
ldap root pw for contacts admin sk LDAP root pw pre kontakty
ldif addressbook sk LDIF
line 2 addressbook sk Riadok 2
march addressbook sk marec
-may addressbook sk máj
-message phone addressbook sk Telefón pre správy
-middle name addressbook sk Prostredné meno
+may addressbook sk m\xE1j
+message phone addressbook sk Telef\xF3n pre spr\xE1vy
+middle name addressbook sk Prostredn\xE9 meno
mobile addressbook sk Mobil
mobile phone addressbook sk Mobil
-modem phone addressbook sk Èíslo na modem
+modem phone addressbook sk \xC8\xEDslo na modem
name addressbook sk Meno
no addressbook sk Nie
-none addressbook sk ¾iadne
-notes addressbook sk Poznámky
-no vcard addressbook sk ®iadna vizitka vcard
+none addressbook sk \xBEiadne
+notes addressbook sk Pozn\xE1mky
+no vcard addressbook sk \xAEiadna vizitka vcard
november addressbook sk november
-october addressbook sk október
+october addressbook sk okt\xF3ber
ok addressbook sk OK
-on addressbook sk zapnuté
-other number addressbook sk Telefón - ostatné
-other phone addressbook sk Ïal¹í telefón
+on addressbook sk zapnut\xE9
+other number addressbook sk Telef\xF3n - ostatn\xE9
+other phone addressbook sk \xCFal\xB9\xED telef\xF3n
pager addressbook sk Pager
pager common sk Pager
parcel addressbook sk Parcela
-phone number common sk Telefónne èíslo
-phone numbers common sk Telefónne èísla
-please enter a name for that field ! addressbook sk Prosím zadajte názov tejto polo¾ky!
-please select addressbook sk Vyberte prosím
-please set your preferences for this app addressbook sk Upravte si prosím voµby pre túto aplikáciu
-please set your preferences for this application addressbook sk Upravte si prosím voµby pre túto aplikáciu
-postal common sk Po¹tové
+phone number common sk Telef\xF3nne \xE8\xEDslo
+phone numbers common sk Telef\xF3nne \xE8\xEDsla
+please enter a name for that field ! addressbook sk Pros\xEDm zadajte n\xE1zov tejto polo\xBEky!
+please select addressbook sk Vyberte pros\xEDm
+please set your preferences for this app addressbook sk Upravte si pros\xEDm vo\xB5by pre t\xFAto aplik\xE1ciu
+please set your preferences for this application addressbook sk Upravte si pros\xEDm vo\xB5by pre t\xFAto aplik\xE1ciu
+postal common sk Po\xB9tov\xE9
pref addressbook sk Titul
prefix addressbook sk Titul
-private addressbook sk Súkromné
-public addressbook sk verejné
-public key addressbook sk verejný kµúè
-read a list of entries. addressbook sk Naèítaj zoznam záznamov
-read a single entry by passing the id and fieldlist. addressbook sk Naèítaj záznam zadaním id a zoznamu polo¾iek.
-read this list of methods. addressbook sk Naèítaj tento zoznam metód
-record access addressbook sk Prístup k záznamu
-record owner addressbook sk Vlastník záznamu
-retrieve contacts admin sk naèítaj kontakty
-select where you want to store admin sk Vyberte miesto pre ulo¾enie
+private addressbook sk S\xFAkromn\xE9
+public addressbook sk verejn\xE9
+public key addressbook sk verejn\xFD k\xB5\xFA\xE8
+read a list of entries. addressbook sk Na\xE8\xEDtaj zoznam z\xE1znamov
+read a single entry by passing the id and fieldlist. addressbook sk Na\xE8\xEDtaj z\xE1znam zadan\xEDm id a zoznamu polo\xBEiek.
+read this list of methods. addressbook sk Na\xE8\xEDtaj tento zoznam met\xF3d
+record access addressbook sk Pr\xEDstup k z\xE1znamu
+record owner addressbook sk Vlastn\xEDk z\xE1znamu
+retrieve contacts admin sk na\xE8\xEDtaj kontakty
+select where you want to store admin sk Vyberte miesto pre ulo\xBEenie
september addressbook sk september
-show birthday reminders on main screen addressbook sk Pripomína» narodeniny na základnej stránke
-state common sk ©tát
+show birthday reminders on main screen addressbook sk Pripom\xEDna\xBB narodeniny na z\xE1kladnej str\xE1nke
+state common sk \xA9t\xE1t
street common sk Ulica
-submit addressbook sk Odosla»
-successfully imported %1 records into your addressbook. addressbook sk Ùspe¹ne naimportovaných %1 záznamov do adresára.
-suffix addressbook sk Prípona
-that field name has been used already ! addressbook sk Taký názov polo¾ky u¾ existuje!
-this person's first name was not in the address book. addressbook sk Takéto meno som v adresári nena¹iel.
-this person's last name was not in the address book. addressbook sk Takéto priezvisko som v adresári nena¹iel.
-today is %1's birthday! common sk Dnes má narodeniny %1.
-tomorrow is %1's birthday. common sk Zajtra má narodeniny %1.
-update a single entry by passing the fields. addressbook sk Zmeni» záznam zadaním polo¾iek.
+submit addressbook sk Odosla\xBB
+successfully imported %1 records into your addressbook. addressbook sk \xD9spe\xB9ne naimportovan\xFDch %1 z\xE1znamov do adres\xE1ra.
+suffix addressbook sk Pr\xEDpona
+that field name has been used already ! addressbook sk Tak\xFD n\xE1zov polo\xBEky u\xBE existuje!
+this person's first name was not in the address book. addressbook sk Tak\xE9to meno som v adres\xE1ri nena\xB9iel.
+this person's last name was not in the address book. addressbook sk Tak\xE9to priezvisko som v adres\xE1ri nena\xB9iel.
+today is %1's birthday! common sk Dnes m\xE1 narodeniny %1.
+tomorrow is %1's birthday. common sk Zajtra m\xE1 narodeniny %1.
+update a single entry by passing the fields. addressbook sk Zmeni\xBB z\xE1znam zadan\xEDm polo\xBEiek.
vcard common sk Vizitka VCard
-vcards require a first name entry. addressbook sk K vizitke musíte zada» meno.
-vcards require a last name entry. addressbook sk K vizitke musíte zada» priezvisko.
-video phone addressbook sk Video telefón
-voice phone addressbook sk Voice telefón
-warning!! ldap is valid only if you are not using contacts for accounts storage! admin sk VAROVANIE!! LDAP sa nedá pou¾i», ak na úschovu pou¾ívateµských úètov pou¾ívate kontakty!
-work phone addressbook sk Telefón - práca
-yes addressbook sk Áno
-you appear to be running addressbook sk Zdá sa, ¾e pou¾ívate
-you must select at least 1 column to display addressbook sk Musíte vybra» aspoò 1 ståpec pre zobrazenie.
-you must select a vcard. (*.vcf) addressbook sk Musíte vybra» Vcard (*.vcf)
-zip code common sk PSÈ
+vcards require a first name entry. addressbook sk K vizitke mus\xEDte zada\xBB meno.
+vcards require a last name entry. addressbook sk K vizitke mus\xEDte zada\xBB priezvisko.
+video phone addressbook sk Video telef\xF3n
+voice phone addressbook sk Voice telef\xF3n
+warning!! ldap is valid only if you are not using contacts for accounts storage! admin sk VAROVANIE!! LDAP sa ned\xE1 pou\xBEi\xBB, ak na \xFAschovu pou\xBE\xEDvate\xB5sk\xFDch \xFA\xE8tov pou\xBE\xEDvate kontakty!
+work phone addressbook sk Telef\xF3n - pr\xE1ca
+yes addressbook sk \xC1no
+you appear to be running addressbook sk Zd\xE1 sa, \xBEe pou\xBE\xEDvate
+you must select at least 1 column to display addressbook sk Mus\xEDte vybra\xBB aspo\xF2 1 st\xE5pec pre zobrazenie.
+you must select a vcard. (*.vcf) addressbook sk Mus\xEDte vybra\xBB Vcard (*.vcf)
+zip code common sk PS\xC8
Modified: people/sigurdne/modules/addressbook/trunk/setup/phpgw_sv.lang
===================================================================
--- people/sigurdne/modules/addressbook/trunk/setup/phpgw_sv.lang 2009-11-20 09:48:21 UTC (rev 20837)
+++ people/sigurdne/modules/addressbook/trunk/setup/phpgw_sv.lang 2009-11-20 10:27:07 UTC (rev 20838)
@@ -1,30 +1,30 @@
%1 - %2 of %3 addressbook sv %1 - %2 av %3
-%1 - %2 of %3 user accounts addressbook sv %1 - %2 av %3 användarkonton
+%1 - %2 of %3 user accounts addressbook sv %1 - %2 av %3 anv\xE4ndarkonton
%1 records imported addressbook sv %1 poster importerade
-%1 records read (not yet imported, you may go %2back%3 and uncheck test import) addressbook sv %1 poster lästa (inte importerade ännu, du kan gå %2tillaka%3 och avmarkera Test import)
-<b>no conversion type <none> could be located.</b> please choose a conversion type from the list addressbook sv <b>Ingen konverteringstyp < ingen> kan vara placerad.</b> Välj en konverteringstyp från listan
-@-eval() is only availible to admins!!! addressbook sv @-eval() är bara tillgänglig för admins!!!
-add a single entry by passing the fields. addressbook sv Lägg till en enstaka företeelse genom att passera fälten.
-add custom field addressbook sv Lägg till Eget fält
-add new addressbook sv Lägg till ny
+%1 records read (not yet imported, you may go %2back%3 and uncheck test import) addressbook sv %1 poster l\xE4sta (inte importerade \xE4nnu, du kan g\xE5 %2tillaka%3 och avmarkera Test import)
+<b>no conversion type <none> could be located.</b> please choose a conversion type from the list addressbook sv <b>Ingen konverteringstyp < ingen> kan vara placerad.</b> V\xE4lj en konverteringstyp fr\xE5n listan
+@-eval() is only availible to admins!!! addressbook sv @-eval() \xE4r bara tillg\xE4nglig f\xF6r admins!!!
+add a single entry by passing the fields. addressbook sv L\xE4gg till en enstaka f\xF6reteelse genom att passera f\xE4lten.
+add custom field addressbook sv L\xE4gg till Eget f\xE4lt
+add new addressbook sv L\xE4gg till ny
address addressbook sv Adress
address book common sv Adressbok
address book - vcard in addressbook sv Adressbok - VCard i
address book - view addressbook sv Adressbok - visa
-address data for addressbook sv Adress data för
+address data for addressbook sv Adress data f\xF6r
address line 2 addressbook sv Adress rad 2
address line 3 addressbook sv Adress rad 3
address type addressbook sv Adress typ
addressbook common sv Adressbok
-addressbook preferences addressbook sv Adressbok inställningar
-addressbook-fieldname addressbook sv Adressbok-fältnamn
-addvcard addressbook sv Lägg till Vkort
+addressbook preferences addressbook sv Adressbok inst\xE4llningar
+addressbook-fieldname addressbook sv Adressbok-f\xE4ltnamn
+addvcard addressbook sv L\xE4gg till Vkort
all addressbook sv Alla
alt. csv import addressbook sv Alt. CSV import
-are you sure you want to delete this field? addressbook sv Är du säker på att du vill radera detta fält?
+are you sure you want to delete this field? addressbook sv \xC4r du s\xE4ker p\xE5 att du vill radera detta f\xE4lt?
bbs phone addressbook sv BBS tele
-birthday common sv Födelsedag
-birthdays common sv Födelsedagar
+birthday common sv F\xF6delsedag
+birthdays common sv F\xF6delsedagar
blank addressbook sv Blank
business common sv Arbete
business address type addressbook sv Arbete adress typ
@@ -34,77 +34,77 @@
business email type addressbook sv Arbete epost-typ
business fax addressbook sv Arbete fax
business phone addressbook sv Arbete tele
-business state addressbook sv Arbete län/state
+business state addressbook sv Arbete l\xE4n/state
business street addressbook sv Arbete gata
business zip code addressbook sv Arbete postnummer
car phone addressbook sv Biltelefon
cell phone addressbook sv Mobiltelefon
city common sv Stad
-communication data for addressbook sv Kommunikationsdata för
-company common sv Företag
-company name common sv Företags namn
+communication data for addressbook sv Kommunikationsdata f\xF6r
+company common sv F\xF6retag
+company name common sv F\xF6retags namn
contact common sv Kontakt
contact application admin sv Kontakt modul
-contact settings admin sv Kontakt inställningar
-copied by %1, from record #%2. addressbook sv Kopierad av %1, från post #%2.
+contact settings admin sv Kontakt inst\xE4llningar
+copied by %1, from record #%2. addressbook sv Kopierad av %1, fr\xE5n post #%2.
country common sv Land
-csv-fieldname addressbook sv CSV-fältnamn
+csv-fieldname addressbook sv CSV-f\xE4ltnamn
csv-filename addressbook sv CSV-filnamn
current addressbook sv Nuvarande
custom addressbook sv Egen
-custom fields addressbook sv Egna fält
-debug output in browser addressbook sv Debug utformat i webläsare
-defaul addressbook sv Förvalt
-default filter addressbook sv Förvalt filter
-default preferences addressbook sv Förvalda inställningar
+custom fields addressbook sv Egna f\xE4lt
+debug output in browser addressbook sv Debug utformat i webl\xE4sare
+defaul addressbook sv F\xF6rvalt
+default filter addressbook sv F\xF6rvalt filter
+default preferences addressbook sv F\xF6rvalda inst\xE4llningar
delete a single entry by passing the id. addressbook sv Radera en enstaka post genom att ange id.
department common sv Avdelning
domestic addressbook sv Internt
download addressbook sv Ladda ner
e-mail addressbook sv E-Post
-edit custom field addressbook sv Ändra eget fält
-edit custom fields admin sv Ändra egna fält
+edit custom field addressbook sv \xC4ndra eget f\xE4lt
+edit custom fields admin sv \xC4ndra egna f\xE4lt
empty addressbook sv Tom
export contacts addressbook sv Exportera kontakter
export file name addressbook sv Exportfil namn
-export from addressbook addressbook sv Exportera från adressbok
+export from addressbook addressbook sv Exportera fr\xE5n adressbok
extra addressbook sv Extra
fax addressbook sv Fax
fax number common sv Faxnummer
-field %1 has been added ! addressbook sv Fält %1 har lagts till !
-field %1 has been updated ! addressbook sv Fält %1 har uppdaterats !
-field name addressbook sv Fältnamn
-fields to show in address list addressbook sv Fält som ska visas i adresslistan
-fieldseparator addressbook sv Fältavskiljare
-first name addressbook sv Förnamn
-forced preferences addressbook sv Tvingade inställningar
+field %1 has been added ! addressbook sv F\xE4lt %1 har lagts till !
+field %1 has been updated ! addressbook sv F\xE4lt %1 har uppdaterats !
+field name addressbook sv F\xE4ltnamn
+fields to show in address list addressbook sv F\xE4lt som ska visas i adresslistan
+fieldseparator addressbook sv F\xE4ltavskiljare
+first name addressbook sv F\xF6rnamn
+forced preferences addressbook sv Tvingade inst\xE4llningar
full name addressbook sv Hela namnet
general data addressbook sv Huvuddata
geo addressbook sv GEO
-grant addressbook access common sv Behörighet för adressboksåtkomst
+grant addressbook access common sv Beh\xF6righet f\xF6r adressboks\xE5tkomst
home address type addressbook sv Hem adresstyp
home city addressbook sv Hem stad
home country addressbook sv Hem land
home email addressbook sv Hem epost
home email type addressbook sv Hem eposttyp
home phone addressbook sv Hem tele
-home state addressbook sv Hem län/state
+home state addressbook sv Hem l\xE4n/state
home street addressbook sv Hem gata
home zip code addressbook sv Hem postnummer
import addressbook sv Importera
import contacts addressbook sv Importera kontakter
import csv-file into addressbook addressbook sv Importera CSV-fil till adressbok
import file addressbook sv Importera fil
-import from ldif, csv, or vcard addressbook sv Importera från LDIF, CSV eller VCard
-import from outlook addressbook sv Importera från Outlook
+import from ldif, csv, or vcard addressbook sv Importera fr\xE5n LDIF, CSV eller VCard
+import from outlook addressbook sv Importera fr\xE5n Outlook
international addressbook sv Internationell
isdn phone addressbook sv ISDN tele
-label addressbook sv Märke
+label addressbook sv M\xE4rke
last name addressbook sv Efternamn
-ldap context for contacts admin sv LDAP info för kontakter
-ldap host for contacts admin sv LDAP värd för kontakter
-ldap root dn for contacts admin sv LDAP root dn för kontakter
-ldap root pw for contacts admin sv LDAP root pw för kontakter
+ldap context for contacts admin sv LDAP info f\xF6r kontakter
+ldap host for contacts admin sv LDAP v\xE4rd f\xF6r kontakter
+ldap root dn for contacts admin sv LDAP root dn f\xF6r kontakter
+ldap root pw for contacts admin sv LDAP root pw f\xF6r kontakter
ldif addressbook sv LDIF
line 2 addressbook sv Linje 2
message phone addressbook sv Telefonsvar
@@ -114,59 +114,59 @@
modem phone addressbook sv Modem tele
no vcard addressbook sv Inget VCard
notes addressbook sv Annat
-number of records to read (<=200) addressbook sv Antal poster att läsa (<=200)
+number of records to read (<=200) addressbook sv Antal poster att l\xE4sa (<=200)
organizations data addressbook sv Organisation info
orgs addressbook sv Org
-other data for addressbook sv Annan info för
+other data for addressbook sv Annan info f\xF6r
other number addressbook sv Annat nummer
other phone addressbook sv Annan telefon
-pager common sv Personsökare
+pager common sv Persons\xF6kare
parcel addressbook sv Paket
-person extra fields for addressbook sv Person extra fält för
+person extra fields for addressbook sv Person extra f\xE4lt f\xF6r
phone addressbook sv Telefon
phone number common sv Telefonnummer
phone numbers common sv Telefonnummer
-please enter a name for that field ! addressbook sv Fyll i ett namn i det fältet!
+please enter a name for that field ! addressbook sv Fyll i ett namn i det f\xE4ltet!
postal common sv Post
-pref addressbook sv förinst
+pref addressbook sv f\xF6rinst
preferred addressbook sv Prioriterad
prefix addressbook sv Prefix
public key addressbook sv Publik nyckel
-read a list of entries. addressbook sv Visa lista på poster
-read a single entry by passing the id and fieldlist. addressbook sv Visa enstaka post genom att ange id och fältlista.
-record access addressbook sv Uppgifts åtkomst
-record owner addressbook sv Uppgifts ägare
+read a list of entries. addressbook sv Visa lista p\xE5 poster
+read a single entry by passing the id and fieldlist. addressbook sv Visa enstaka post genom att ange id och f\xE4ltlista.
+record access addressbook sv Uppgifts \xE5tkomst
+record owner addressbook sv Uppgifts \xE4gare
remove addressbook sv radera
-retrieve contacts admin sv hämta in kontakter
-select addressbook columns to display addressbook sv Välj kolumner som skall visas i adressboken
-select fields addressbook sv välj fält
-select where you want to store admin sv Välj var du vill spara
-show birthday reminders on main screen addressbook sv Visa födelsedagspåminnelser på huvudskärm
+retrieve contacts admin sv h\xE4mta in kontakter
+select addressbook columns to display addressbook sv V\xE4lj kolumner som skall visas i adressboken
+select fields addressbook sv v\xE4lj f\xE4lt
+select where you want to store admin sv V\xE4lj var du vill spara
+show birthday reminders on main screen addressbook sv Visa f\xF6delsedagsp\xE5minnelser p\xE5 huvudsk\xE4rm
startrecord addressbook sv Startpost
state common sv Stat
street common sv Gata
suffix addressbook sv Suffix
-test import (show importable records <u>only</u> in browser) addressbook sv Test Import(visa importerbara poster <u>bara</u> i webläsare)
-that field name has been used already ! addressbook sv Detta fältnamn finns redan !
-this person's first name was not in the address book. addressbook sv Denna persons förnamn fanns inte i adressboken.
+test import (show importable records <u>only</u> in browser) addressbook sv Test Import(visa importerbara poster <u>bara</u> i webl\xE4sare)
+that field name has been used already ! addressbook sv Detta f\xE4ltnamn finns redan !
+this person's first name was not in the address book. addressbook sv Denna persons f\xF6rnamn fanns inte i adressboken.
this person's last name was not in the address book. addressbook sv Denna persons efternamn fanns inte i adressboken.
title addressbook sv Titel
-today is %1's birthday! common sv I dag har %1 födelsedag!
-tomorrow is %1's birthday. common sv I morgon är det %1's födelsedag.
+today is %1's birthday! common sv I dag har %1 f\xF6delsedag!
+tomorrow is %1's birthday. common sv I morgon \xE4r det %1's f\xF6delsedag.
type addressbook sv Typ
-update a single entry by passing the fields. addressbook sv Uppdatera en enstaka post genom att passera fälten.
+update a single entry by passing the fields. addressbook sv Uppdatera en enstaka post genom att passera f\xE4lten.
url addressbook sv URL
-use country list addressbook sv Använd land-lista
-value addressbook sv Värde
+use country list addressbook sv Anv\xE4nd land-lista
+value addressbook sv V\xE4rde
vcard common sv VCard
-vcards require a first name entry. addressbook sv Förnamn måste finnas i VCard.
-vcards require a last name entry. addressbook sv Efternamn måste finnas i VCard.
+vcards require a first name entry. addressbook sv F\xF6rnamn m\xE5ste finnas i VCard.
+vcards require a last name entry. addressbook sv Efternamn m\xE5ste finnas i VCard.
video phone addressbook sv Videotelefon
-voice phone addressbook sv Rösttelefon
-warning!! ldap is valid only if you are not using contacts for accounts storage! admin sv VARNING!! LDAP fungerar endast om du INTE använder kontakt för poster.
+voice phone addressbook sv R\xF6sttelefon
+warning!! ldap is valid only if you are not using contacts for accounts storage! admin sv VARNING!! LDAP fungerar endast om du INTE anv\xE4nder kontakt f\xF6r poster.
work phone addressbook sv Arbetstelefon
-you must select a vcard. (*.vcf) addressbook sv Du måste välja ett vcard. (*.vcf)
-you must select at least 1 column to display addressbook sv Du måste välja minst 1 kolumn att visa
-your preferences addressbook sv Dina inställningar
+you must select a vcard. (*.vcf) addressbook sv Du m\xE5ste v\xE4lja ett vcard. (*.vcf)
+you must select at least 1 column to display addressbook sv Du m\xE5ste v\xE4lja minst 1 kolumn att visa
+your preferences addressbook sv Dina inst\xE4llningar
zip code common sv Postnummer
Modified: people/sigurdne/modules/addressbook/trunk/templates/base/config.tpl
===================================================================
--- people/sigurdne/modules/addressbook/trunk/templates/base/config.tpl 2009-11-20 09:48:21 UTC (rev 20837)
+++ people/sigurdne/modules/addressbook/trunk/templates/base/config.tpl 2009-11-20 10:27:07 UTC (rev 20838)
@@ -1,31 +1,28 @@
<!-- BEGIN header -->
<form method="POST" action="{action_url}">
<table border="0" align="center">
- <thead>
- <tr>
- <td colspan="2"> <b>{title}</b></td>
+ <tr bgcolor="{th_bg}">
+ <td colspan="2"><font color="{th_text}"> <b>{title}</b></font></td>
</tr>
- <tr class="msg">
- <td colspan="2"> <b>{error}</b></td>
+ <tr bgcolor="{th_err}">
+ <td colspan="2"> <b>{error}</b></font></td>
</tr>
- </thead>
- <tbody>
<!-- END header -->
<!-- BEGIN body -->
- <tr class="row_on">
+ <tr bgcolor="{row_on}">
<td colspan="2"> </td>
</tr>
- <tr class="row_off">
+ <tr bgcolor="{row_off}">
<td colspan="2"> <b>{lang_Addressbook}/{lang_Contact_Settings}</b></font></td>
</tr>
- <tr class="row_on">
+ <tr bgcolor="{row_on}">
<td>{lang_Contact_application}:</td>
<td><input name="newsettings[contact_application]" value="{value_contact_application}"></td>
</tr>
- <tr class="row_off">
+ <tr bgcolor="{row_off}">
<td align="center" colspan="2">{lang_WARNING!!_LDAP_is_valid_only_if_you_are_NOT_using_contacts_for_accounts_storage!}</td>
</tr>
- <tr class="row_off">
+ <tr bgcolor="{row_off}">
<td>{lang_Select_where_you_want_to_store}/{lang_retrieve_contacts}.</td>
<td>
<select name="newsettings[contact_repository]">
@@ -34,25 +31,25 @@
</select>
</td>
</tr>
- <tr class="row_on">
+ <tr bgcolor="{row_on}">
<td>{lang_LDAP_host_for_contacts}:</td>
<td><input name="newsettings[ldap_contact_host]" value="{value_ldap_contact_host}"></td>
</tr>
- <tr class="row_off">
+ <tr bgcolor="{row_off}">
<td>{lang_LDAP_context_for_contacts}:</td>
<td><input name="newsettings[ldap_contact_context]" value="{value_ldap_contact_context}" size="40"></td>
</tr>
- <tr class="row_on">
+ <tr bgcolor="{row_on}">
<td>{lang_LDAP_root_dn_for_contacts}:</td>
<td><input name="newsettings[ldap_contact_dn]" value="{value_ldap_contact_dn}" size="40"></td>
</tr>
- <tr class="row_off">
+ <tr bgcolor="{row_off}">
<td>{lang_LDAP_root_pw_for_contacts}:</td>
<td><input name="newsettings[ldap_contact_pw]" type="password" value=""></td>
</tr>
<!-- END body -->
<!-- BEGIN footer -->
- <tr class="th">
+ <tr bgcolor="{th_bg}">
<td colspan="2">
</td>
@@ -63,7 +60,6 @@
<input type="submit" name="cancel" value="{lang_cancel}">
</td>
</tr>
- </tbody>
</table>
</form>
<!-- END footer -->
Modified: people/sigurdne/modules/addressbook/trunk/templates/base/current_catalog_body.tpl
===================================================================
--- people/sigurdne/modules/addressbook/trunk/templates/base/current_catalog_body.tpl 2009-11-20 09:48:21 UTC (rev 20837)
+++ people/sigurdne/modules/addressbook/trunk/templates/base/current_catalog_body.tpl 2009-11-20 10:27:07 UTC (rev 20838)
@@ -1,35 +1,27 @@
<!-- BEGIN tab_body_general_data -->
<td>
-<table width="80%" border="0" align="center" cellspacing="0" cellpadding="0">
-<tbody>
-<tr>
-<td>
<table width="80%" border="0" align="center" cellspacing="0" cellpadding="0">
- <tbody>
- <th bgcolor="{th_bg}">{lang_general_data}</th>
+ <thead>
<tr>
- <td valign="top" width="40%">
- <table width="100%" border="0" align="center" cellspacing="2" cellpadding="2">
+ <th>{lang_general_data}</th>
+ </tr>
+ </thead>
<tbody>
+ <tr>
+ <td>
<input type="hidden" name="{current_id_name}" value="{current_id}">
<input type="hidden" name="{current_action_name}" value="{current_action}">
+ </td>
{input_fields}
{detail_fields}
- </tbody>
- </table>
- </td>
</tr>
</tbody>
</table>
</td>
-</tr>
-</tbody>
-</table>
-</td>
<!-- END tab_body_general_data -->
<!-- BEGIN input_data -->
-<tr bgcolor="{row_bgc}">
-{input_fields_cols}
-</tr>
+ <tr class="{tr_class}">
+ {input_fields_cols}
+ </tr>
<!-- END input_data -->
\ No newline at end of file
Modified: people/sigurdne/modules/addressbook/trunk/templates/base/form.tpl
===================================================================
--- people/sigurdne/modules/addressbook/trunk/templates/base/form.tpl 2009-11-20 09:48:21 UTC (rev 20837)
+++ people/sigurdne/modules/addressbook/trunk/templates/base/form.tpl 2009-11-20 10:27:07 UTC (rev 20838)
@@ -1,10 +1,8 @@
<!-- BEGIN TABHOLDER -->
<table width="80%" border="0" align="center" cellspacing="2" cellpadding="2">
-<tbody>
+ <tbody>
<tr>
-
{principal_tabs_inc}
-
</tr>
<form action="{action}" method="post" name="body_form" cellspacing="0" cellpadding="0" {onsubjs}>
<tr>
@@ -20,6 +18,6 @@
</tr>
{control_buttons}
</form>
-</tbody>
+ </tbody>
</table>
<!-- END TABHOLDER -->
Modified: people/sigurdne/modules/addressbook/trunk/templates/base/index.tpl
===================================================================
--- people/sigurdne/modules/addressbook/trunk/templates/base/index.tpl 2009-11-20 09:48:21 UTC (rev 20837)
+++ people/sigurdne/modules/addressbook/trunk/templates/base/index.tpl 2009-11-20 10:27:07 UTC (rev 20838)
@@ -1,5 +1,6 @@
<!-- BEGIN addressbook_header -->
-{principal_tabs_inc}
+{tabs}
+<!--{principal_tabs_inc}-->
{lang_showing}
<br />{searchreturn}
Modified: people/sigurdne/modules/addressbook/trunk/templates/base/preference_acl_row.tpl
===================================================================
--- people/sigurdne/modules/addressbook/trunk/templates/base/preference_acl_row.tpl 2009-11-20 09:48:21 UTC (rev 20837)
+++ people/sigurdne/modules/addressbook/trunk/templates/base/preference_acl_row.tpl 2009-11-20 10:27:07 UTC (rev 20838)
@@ -1,5 +1,5 @@
<!-- $Id$ -->
- <tr bgcolor="{row_color}">
+ <tr class="{row_class}">
<td>{user}</td>
<td align="center"><input type="checkbox" name="{read}" value="Y"{read_selected}></td>
<td align="center"><input type="checkbox" name="{edit}" value="Y"{edit_selected}></td>
Modified: people/sigurdne/modules/addressbook/trunk/templates/base/preferences.tpl
===================================================================
--- people/sigurdne/modules/addressbook/trunk/templates/base/preferences.tpl 2009-11-20 09:48:21 UTC (rev 20837)
+++ people/sigurdne/modules/addressbook/trunk/templates/base/preferences.tpl 2009-11-20 10:27:07 UTC (rev 20838)
@@ -23,13 +23,16 @@
<td>
{hider_open}
<select name="{select_columns_selectbox_name}" multiple size="5">
-
- {B_select_columns_form_options}
+ <!-- BEGIN B_select_columns_form_options -->
+ <option value="{value}">{lang_contact_field}</option>
+ <!-- END B_select_columns_form_options -->
</select>
</td>
<td>
<select name="{select_columns_comtypes_name}" multiple size="5">
- {B_select_ctypes_options}
+ <!-- BEGIN B_select_ctypes_options -->
+ <option value="{commtype_description}">{lang_comtype_field}</option>
+ <!-- END B_select_ctypes_options -->
</select>
</td>
</tr>
Modified: people/sigurdne/modules/addressbook/trunk/templates/base/principal_tabs.tpl
===================================================================
--- people/sigurdne/modules/addressbook/trunk/templates/base/principal_tabs.tpl 2009-11-20 09:48:21 UTC (rev 20837)
+++ people/sigurdne/modules/addressbook/trunk/templates/base/principal_tabs.tpl 2009-11-20 10:27:07 UTC (rev 20838)
@@ -1,8 +1,9 @@
<!-- BEGIN principal_tab -->
- <ul id="contacts_tabs" class="tabs">
+<div class="yui-navset">
+ <ul id="contacts_tabs" class="yui-nav">
{principal_buttons}
- <li class="tablast"> </li>
</ul>
+</div>
<!-- END principal_tab -->
<!-- BEGIN principal_button -->
Modified: people/sigurdne/modules/addressbook/trunk/templates/base/tab.tpl
===================================================================
--- people/sigurdne/modules/addressbook/trunk/templates/base/tab.tpl 2009-11-20 09:48:21 UTC (rev 20837)
+++ people/sigurdne/modules/addressbook/trunk/templates/base/tab.tpl 2009-11-20 10:27:07 UTC (rev 20838)
@@ -1,10 +1,13 @@
<!-- BEGIN tab -->
-<ul id="contacts_section_tabs" class="tabs">
+<div class="yui-navset">
+ <ul id="contacts_section_tabs" class="yui-nav">
{buttons}
- <li class="tablast"></li>
-</ul>
+ </ul>
+</div>
<!-- END tab -->
<!-- BEGIN button -->
- <li><input class="{tab_css}" type="submit" name="{tab_name}" value="{tab_caption}"></li>
+ <li class="{tab_css}"><input type="submit" name="{tab_name}" value="{tab_caption}"></li>
<!-- END button -->
+
+
Added: people/sigurdne/modules/addressbook/trunk/templates/portico/images/navbar.png
===================================================================
(Binary files differ)
Property changes on: people/sigurdne/modules/addressbook/trunk/templates/portico/images/navbar.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: people/sigurdne/modules/addressbook/trunk/templates/probusiness/index.tpl
===================================================================
--- people/sigurdne/modules/addressbook/trunk/templates/probusiness/index.tpl 2009-11-20 09:48:21 UTC (rev 20837)
+++ people/sigurdne/modules/addressbook/trunk/templates/probusiness/index.tpl 2009-11-20 10:27:07 UTC (rev 20838)
@@ -1,7 +1,8 @@
<!-- BEGIN addressbook_header -->
<table class="basic" align="left">
<tr>
- {principal_tabs_inc}
+ {tabs}
+ <!--{principal_tabs_inc}-->
</tr>
</table>
<br /><br /><br />
@@ -37,9 +38,17 @@
<!-- BEGIN addressbook_footer -->
</table>
- <br />
- <form action="{add_url}" method="post">
- <input type="submit" name="Add" value="{lang_add}" />
- </form>
+<table align="center">
+ <tr>
+ <td>
+ <form action="{add_url}" method="post"><td width="16%"><input type="submit" name="Add" value="{lang_add}"></td></form>
+ <form action="{cat_cont_url}" method="post"><td width="16%"><input type="submit" name="Categorize" value="{lang_cat_cont}"></td></form>
+ <form action="{vcard_url}" method="post"><td width="16%"><input type="submit" name="AddVcard" value="{lang_addvcard}"></td></form>
+ <form action="{import_url}" method="post"><td width="16%"><input type="submit" name="Import" value="{lang_import}"></td></form>
+ <form action="{import_alt_url}" method="post"><td width="16%"><input type="submit" name="Import" value="{lang_import_alt}"></td></form>
+ <form action="{export_url}" method="post"><td width="16%"><input type="submit" name="Export" value="{lang_export}"></td></form>
+ </td>
+ </tr>
+</table>
<!-- END addressbook_footer -->
Modified: people/sigurdne/modules/addressbook/trunk/templates/probusiness/principal_tabs.tpl
===================================================================
--- people/sigurdne/modules/addressbook/trunk/templates/probusiness/principal_tabs.tpl 2009-11-20 09:48:21 UTC (rev 20837)
+++ people/sigurdne/modules/addressbook/trunk/templates/probusiness/principal_tabs.tpl 2009-11-20 10:27:07 UTC (rev 20838)
@@ -1,17 +1,11 @@
<!-- BEGIN principal_tab -->
-<td>
- <table>
- <tr>
+<div class="yui-navset">
+ <ul id="contacts_tabs" class="yui-nav">
{principal_buttons}
- </tr>
- </table>
-</td>
+ </ul>
+</div>
<!-- END principal_tab -->
<!-- BEGIN principal_button -->
-<td align="left">
- <form action="{principal_action}" method="post">
- <input class="{principal_class_css}" type="submit" name="{principal_name}" value="{principal_value}" />
- </form>
-</td>
+ <li {principal_tab_css}><a href="{principal_action}">{principal_value}</a>
<!-- END principal_button -->
Modified: people/sigurdne/modules/addressbook/trunk/templates/probusiness/tab.tpl
===================================================================
--- people/sigurdne/modules/addressbook/trunk/templates/probusiness/tab.tpl 2009-11-20 09:48:21 UTC (rev 20837)
+++ people/sigurdne/modules/addressbook/trunk/templates/probusiness/tab.tpl 2009-11-20 10:27:07 UTC (rev 20838)
@@ -1,13 +1,12 @@
<!-- BEGIN tab -->
-<td>
- <table>
- <tr>
+<div class="yui-navset">
+ <ul id="contacts_section_tabs" class="yui-nav">
{buttons}
- </tr>
- </table>
-</td>
+ </ul>
+</div>
<!-- END tab -->
<!-- BEGIN button -->
- <td class="left"><input class="{class_css}" type="submit" name="{button_name}" value="{button_caption}" /></td>
+ <li class="{tab_css}"><input type="submit" name="{tab_name}" value="{tab_caption}"></li>
<!-- END button -->
+