GLobalize the field management

This commit is contained in:
Miles Lott
2001-12-04 01:04:21 +00:00
parent 53339ea82c
commit 15529d717a
5 changed files with 222 additions and 199 deletions

View File

@ -2,32 +2,37 @@
/**************************************************************************\ /**************************************************************************\
* phpGroupWare - Addressbook * * phpGroupWare - Addressbook *
* http://www.phpgroupware.org * * http://www.phpgroupware.org *
* Written by Bettina Gille [ceb@phpgroupware.org] * * Written by Miles Lott <milosch@phpgroupware.org> *
* ----------------------------------------------- * * ----------------------------------------------- *
* This program is free software; you can redistribute it and/or modify it * * 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 * * 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 * * Free Software Foundation; either version 2 of the License, or (at your *
* option) any later version. * * option) any later version. *
\**************************************************************************/ \**************************************************************************/
/* $Id$ */ /* $Id$ */
$phpgw_info['flags']['currentapp'] = 'addressbook'; $GLOBALS['phpgw_info']['flags']['currentapp'] = 'addressbook';
include('../header.inc.php'); include('../header.inc.php');
if(!$phpgw->acl->check('run',1,'admin')) if(!$GLOBALS['phpgw']->acl->check('run',1,'admin'))
{ {
echo lang('access not permitted'); echo lang('access not permitted');
$phpgw->common->phpgw_footer(); $GLOBALS['phpgw']->common->phpgw_footer();
$phpgw->common->phpgw_exit(); $GLOBALS['phpgw']->common->phpgw_exit();
} }
$t = new Template(PHPGW_APP_TPL); $field = $HTTP_POST_VARS['field'];
$t->set_file(array('form' => 'field_form.tpl')); $field_name = $HTTP_POST_VARS['field_name'];
$t->set_block('form','add','addhandle'); $start = $HTTP_POST_VARS['start'];
$t->set_block('form','edit','edithandle'); $query = $HTTP_POST_VARS['query'];
$sort = $HTTP_POST_VARS['sort'];
if ($submit) $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');
if ($HTTP_POST_VARS['submit'])
{ {
$errorcount = 0; $errorcount = 0;
@ -49,27 +54,27 @@
} }
} }
if ($errorcount) { $t->set_var('message',$phpgw->common->error_list($error)); } if ($errorcount) { $GLOBALS['phpgw']->template->set_var('message',$GLOBALS['phpgw']->common->error_list($error)); }
if (($submit) && (! $error) && (! $errorcount)) { $t->set_var('message',lang('Field x has been added !', $field_name)); } if (($submit) && (! $error) && (! $errorcount)) { $GLOBALS['phpgw']->template->set_var('message',lang('Field x has been added !', $field_name)); }
if ((! $submit) && (! $error) && (! $errorcount)) { $t->set_var('message',''); } if ((! $submit) && (! $error) && (! $errorcount)) { $GLOBALS['phpgw']->template->set_var('message',''); }
$t->set_var('title_fields',lang('Add'). ' ' . lang('Custom Field')); $GLOBALS['phpgw']->template->set_var('title_fields',lang('Add'). ' ' . lang('Custom Field'));
$t->set_var('actionurl',$phpgw->link('/addressbook/addfield.php')); $GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/addressbook/addfield.php'));
$t->set_var('doneurl',$phpgw->link('/addressbook/fields.php')); $GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/addressbook/fields.php'));
$t->set_var('hidden_vars','<input type="hidden" name="field" value="' . $field . '">'); $GLOBALS['phpgw']->template->set_var('hidden_vars','<input type="hidden" name="field" value="' . $field . '">');
$t->set_var('lang_name',lang('Field name')); $GLOBALS['phpgw']->template->set_var('lang_name',lang('Field name'));
$t->set_var('lang_add',lang('Add')); $GLOBALS['phpgw']->template->set_var('lang_add',lang('Add'));
$t->set_var('lang_reset',lang('Clear Form')); $GLOBALS['phpgw']->template->set_var('lang_reset',lang('Clear Form'));
$t->set_var('lang_done',lang('Done')); $GLOBALS['phpgw']->template->set_var('lang_done',lang('Done'));
$t->set_var('field_name',$field_name); $GLOBALS['phpgw']->template->set_var('field_name',$field_name);
$t->set_var('edithandle',''); $GLOBALS['phpgw']->template->set_var('edithandle','');
$t->set_var('addhandle',''); $GLOBALS['phpgw']->template->set_var('addhandle','');
$t->pparse('out','form'); $GLOBALS['phpgw']->template->pparse('out','form');
$t->pparse('addhandle','add'); $GLOBALS['phpgw']->template->pparse('addhandle','add');
$phpgw->common->phpgw_footer(); $GLOBALS['phpgw']->common->phpgw_footer();
?> ?>

View File

@ -12,29 +12,25 @@
/* $Id$ */ /* $Id$ */
$phpgw_info['flags']['currentapp'] = 'addressbook'; $GLOBALS['phpgw_info']['flags']['currentapp'] = 'addressbook';
$phpgw_info['flags']['enable_contacts_class'] = True; $GLOBALS['phpgw_info']['flags']['enable_contacts_class'] = True;
include('../header.inc.php'); include('../header.inc.php');
$phpgw->contacts = createobject('phpgwapi.contacts'); $GLOBALS['phpgw']->contacts = createobject('phpgwapi.contacts');
$t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL); // $t->unknows = 'keep'; $t->debug = 1; $GLOBALS['phpgw']->template->set_file(array('import' => 'csv_import.tpl'));
$t->set_file(array('import' => 'csv_import.tpl')); $GLOBALS['phpgw']->template->set_block('import','filename','filenamehandle');
$t->set_block('import','filename','filenamehandle'); $GLOBALS['phpgw']->template->set_block('import','fheader','fheaderhandle');
$t->set_block('import','fheader','fheaderhandle'); $GLOBALS['phpgw']->template->set_block('import','fields','fieldshandle');
$t->set_block('import','fields','fieldshandle'); $GLOBALS['phpgw']->template->set_block('import','ffooter','ffooterhandle');
$t->set_block('import','ffooter','ffooterhandle'); $GLOBALS['phpgw']->template->set_block('import','imported','importedhandle');
$t->set_block('import','imported','importedhandle');
// $t->set_var("navbar_bg",$phpgw_info["theme"]["navbar_bg"]);
// $t->set_var("navbar_text",$phpgw_info["theme"]["navbar_next"]);
if ($action == 'download' && (!$fieldsep || !$csvfile || !($fp=fopen($csvfile,'r')))) if ($action == 'download' && (!$fieldsep || !$csvfile || !($fp=fopen($csvfile,'r'))))
{ {
$action = ''; $action = '';
} }
$t->set_var('action_url',$phpgw->link('/addressbook/csv_import.php')); $GLOBALS['phpgw']->template->set_var('action_url',$GLOBALS['phpgw']->link('/addressbook/csv_import.php'));
$t->set_var('lang_addr_action',lang('Import CSV-File into Addressbook')); $GLOBALS['phpgw']->template->set_var('lang_addr_action',lang('Import CSV-File into Addressbook'));
$PSep = '||'; // Pattern-Separator, separats the pattern-replacement-pairs in trans $PSep = '||'; // Pattern-Separator, separats the pattern-replacement-pairs in trans
$ASep = '|>'; // Assignment-Separator, separats pattern and replacesment $ASep = '|>'; // Assignment-Separator, separats pattern and replacesment
@ -66,14 +62,14 @@
// find in Addressbook, at least n_family AND (n_given OR org_name) have to match // find in Addressbook, at least n_family AND (n_given OR org_name) have to match
function addr_id( $n_family,$n_given,$org_name ) function addr_id( $n_family,$n_given,$org_name )
{ {
$addrs = $phpgw->contacts->read( 0,0,array('id'),'',"n_family=$n_family,n_given=$n_given,org_name=$org_name" ); $addrs = $GLOBALS['phpgw']->contacts->read( 0,0,array('id'),'',"n_family=$n_family,n_given=$n_given,org_name=$org_name" );
if (!count($addrs)) if (!count($addrs))
{ {
$addrs = $phpgw->contacts->read( 0,0,array('id'),'',"n_family=$n_family,n_given=$n_given" ); $addrs = $GLOBALS['phpgw']->contacts->read( 0,0,array('id'),'',"n_family=$n_family,n_given=$n_given" );
} }
if (!count($addrs)) if (!count($addrs))
{ {
$addrs = $phpgw->contacts->read( 0,0,array('id'),'',"n_family=$n_family,org_name=$org_name" ); $addrs = $GLOBALS['phpgw']->contacts->read( 0,0,array('id'),'',"n_family=$n_family,org_name=$org_name" );
} }
if (count($addrs)) if (count($addrs))
@ -103,18 +99,18 @@
} }
else else
{ {
if (!is_object($phpgw->categories)) if (!is_object($GLOBALS['phpgw']->categories))
{ {
$phpgw->categories = createobject('phpgwapi.categories'); $GLOBALS['phpgw']->categories = createobject('phpgwapi.categories');
} }
if ($id = $phpgw->categories->name2id( $cat )) if ($id = $GLOBALS['phpgw']->categories->name2id( $cat ))
{ // cat exists { // cat exists
$cat2id[$cat] = $ids[$cat] = $id; $cat2id[$cat] = $ids[$cat] = $id;
} }
else else
{ // create new cat { // create new cat
$phpgw->categories->add( $cat,0,$cat,'','public',0); $GLOBALS['phpgw']->categories->add( $cat,0,$cat,'','public',0);
$cat2id[$cat] = $ids[$cat] = $phpgw->categories->name2id( $cat ); $cat2id[$cat] = $ids[$cat] = $GLOBALS['phpgw']->categories->name2id( $cat );
} }
} }
} }
@ -124,15 +120,15 @@
switch ($action) switch ($action)
{ {
case '': // Start, ask Filename case '': // Start, ask Filename
$t->set_var('lang_csvfile',lang('CSV-Filename')); $GLOBALS['phpgw']->template->set_var('lang_csvfile',lang('CSV-Filename'));
$t->set_var('lang_fieldsep',lang('Fieldseparator')); $GLOBALS['phpgw']->template->set_var('lang_fieldsep',lang('Fieldseparator'));
$t->set_var('fieldsep',$fieldsep ? $fieldsep : ','); $GLOBALS['phpgw']->template->set_var('fieldsep',$fieldsep ? $fieldsep : ',');
$t->set_var('submit',lang('Download')); $GLOBALS['phpgw']->template->set_var('submit',lang('Download'));
$t->set_var('csvfile',$csvfile); $GLOBALS['phpgw']->template->set_var('csvfile',$csvfile);
$t->set_var('enctype','ENCTYPE="multipart/form-data"'); $GLOBALS['phpgw']->template->set_var('enctype','ENCTYPE="multipart/form-data"');
$hiddenvars .= '<input type="hidden" name="action" value="download">'."\n"; $hiddenvars .= '<input type="hidden" name="action" value="download">'."\n";
$t->parse('filenamehandle','filename'); $GLOBALS['phpgw']->template->parse('filenamehandle','filename');
break; break;
case 'download': case 'download':
@ -142,17 +138,17 @@
eval("fread\(\$prefs,8000\);"); eval("fread\(\$prefs,8000\);");
// echo "<p>defaults = array".dump_array($defaults)."</p>\n"; // echo "<p>defaults = array".dump_array($defaults)."</p>\n";
} }
$t->set_var('lang_csv_fieldname',lang('CSV-Fieldname')); $GLOBALS['phpgw']->template->set_var('lang_csv_fieldname',lang('CSV-Fieldname'));
$t->set_var('lang_addr_fieldname',lang('Addressbook-Fieldname')); $GLOBALS['phpgw']->template->set_var('lang_addr_fieldname',lang('Addressbook-Fieldname'));
$t->set_var('lang_translation',lang("Translation").' <a href="#help">'.lang('help').'</a>'); $GLOBALS['phpgw']->template->set_var('lang_translation',lang("Translation").' <a href="#help">'.lang('help').'</a>');
$t->set_var('submit',lang('Import')); $GLOBALS['phpgw']->template->set_var('submit',lang('Import'));
$t->set_var('lang_debug',lang('Test Import (show importable records <u>only</u> in browser)')); $GLOBALS['phpgw']->template->set_var('lang_debug',lang('Test Import (show importable records <u>only</u> in browser)'));
$t->parse('fheaderhandle','fheader'); $GLOBALS['phpgw']->template->parse('fheaderhandle','fheader');
$hiddenvars .= '<input type="hidden" name="action" value="import">'."\n" $hiddenvars .= '<input type="hidden" name="action" value="import">'."\n"
. '<input type="hidden" name="fieldsep" value="'.$fieldsep."\">\n" . '<input type="hidden" name="fieldsep" value="'.$fieldsep."\">\n"
. '<input type="hidden" name="pref_file" value="'.$pref_file."\">\n"; . '<input type="hidden" name="pref_file" value="'.$pref_file."\">\n";
$addr_names = $phpgw->contacts->stock_contact_fields + array( $addr_names = $GLOBALS['phpgw']->contacts->stock_contact_fields + array(
'cat_id' => 'Categories: @cat_id(Cat1,Cat2)', 'cat_id' => 'Categories: @cat_id(Cat1,Cat2)',
'access' => 'Access: public,private', 'access' => 'Access: public,private',
'owner' => 'Owner: defaults to user' 'owner' => 'Owner: defaults to user'
@ -169,7 +165,7 @@
reset($addr_names); reset($addr_names);
while (list($field,$name) = each($addr_names)) while (list($field,$name) = each($addr_names))
{ {
$addr_name_options .= "<option value=\"$field\">".$phpgw->strip_html($name)."\n"; $addr_name_options .= "<option value=\"$field\">".$GLOBALS['phpgw']->strip_html($name)."\n";
} }
$csv_fields = fgetcsv($fp,8000,$fieldsep); $csv_fields = fgetcsv($fp,8000,$fieldsep);
$csv_fields[] = 'no CSV 1'; // eg. for static assignments $csv_fields[] = 'no CSV 1'; // eg. for static assignments
@ -177,28 +173,28 @@
$csv_fields[] = 'no CSV 3'; $csv_fields[] = 'no CSV 3';
while (list($csv_idx,$csv_field) = each($csv_fields)) while (list($csv_idx,$csv_field) = each($csv_fields))
{ {
$t->set_var('csv_field',$csv_field); $GLOBALS['phpgw']->template->set_var('csv_field',$csv_field);
$t->set_var('csv_idx',$csv_idx); $GLOBALS['phpgw']->template->set_var('csv_idx',$csv_idx);
if ($def = $defaults[$csv_field]) if ($def = $defaults[$csv_field])
{ {
list( $addr,$trans ) = explode($PSep,$def,2); list( $addr,$trans ) = explode($PSep,$def,2);
$t->set_var('trans',$trans); $GLOBALS['phpgw']->template->set_var('trans',$trans);
$t->set_var('addr_fields',str_replace('="'.$addr.'">','="'.$addr.'" selected>',$addr_name_options)); $GLOBALS['phpgw']->template->set_var('addr_fields',str_replace('="'.$addr.'">','="'.$addr.'" selected>',$addr_name_options));
} }
else else
{ {
$t->set_var('trans',''); $GLOBALS['phpgw']->template->set_var('trans','');
$t->set_var('addr_fields',$addr_name_options); $GLOBALS['phpgw']->template->set_var('addr_fields',$addr_name_options);
} }
$t->parse('fieldshandle','fields',True); $GLOBALS['phpgw']->template->parse('fieldshandle','fields',True);
} }
$t->set_var('lang_start',lang('Startrecord')); $GLOBALS['phpgw']->template->set_var('lang_start',lang('Startrecord'));
$t->set_var('start',$start); $GLOBALS['phpgw']->template->set_var('start',$start);
$t->set_var('lang_max',lang('Number of records to read (<=200)')); $GLOBALS['phpgw']->template->set_var('lang_max',lang('Number of records to read (<=200)'));
$t->set_var('max',200); $GLOBALS['phpgw']->template->set_var('max',200);
$t->parse('ffooterhandle','ffooter'); $GLOBALS['phpgw']->template->parse('ffooterhandle','ffooter');
fclose($fp); fclose($fp);
$old = $csvfile; $csvfile = $phpgw_info['server']['temp_dir'].'/addrbook_import_'.basename($csvfile); $old = $csvfile; $csvfile = $GLOBALS['phpgw_info']['server']['temp_dir'].'/addrbook_import_'.basename($csvfile);
rename($old,$csvfile); rename($old,$csvfile);
$hiddenvars .= '<input type="hidden" name="csvfile" value="'.$csvfile.'">'; $hiddenvars .= '<input type="hidden" name="csvfile" value="'.$csvfile.'">';
$help_on_trans = "<a name='help'><b>How to use Translation's</b><p>". $help_on_trans = "<a name='help'><b>How to use Translation's</b><p>".
@ -233,9 +229,8 @@
"will be automaticaly added.<p>". "will be automaticaly added.<p>".
"I hope that helped to understand the features, if not <a href='mailto:RalfBecker@outdoor-training.de'>ask</a>."; "I hope that helped to understand the features, if not <a href='mailto:RalfBecker@outdoor-training.de'>ask</a>.";
$t->set_var('help_on_trans',lang($help_on_trans)); // I don't think anyone will translate this $GLOBALS['phpgw']->template->set_var('help_on_trans',lang($help_on_trans)); // I don't think anyone will translate this
break; break;
case 'import': case 'import':
$fp=fopen($csvfile,"r"); $fp=fopen($csvfile,"r");
$csv_fields = fgetcsv($fp,8000,$fieldsep); $csv_fields = fgetcsv($fp,8000,$fieldsep);
@ -341,22 +336,22 @@
if (!$debug) if (!$debug)
{ {
$phpgw->contacts->add( $values['owner'] ? $values['owner'] : $phpgw_info['user']['account_id'], $GLOBALS['phpgw']->contacts->add( $values['owner'] ? $values['owner'] : $GLOBALS['phpgw_info']['user']['account_id'],
$values,$values['access'],$values['cat_id']); $values,$values['access'],$values['cat_id']);
// echo "<p>adding: ".dump_array($values)."</p>\n"; // echo "<p>adding: ".dump_array($values)."</p>\n";
} }
} }
$log .= "\t</tr>\n</table>\n"; $log .= "\t</tr>\n</table>\n";
$t->set_var('anz_imported',$debug ? lang( '%1 records read (not yet imported, you may go back and uncheck Test Import)', $GLOBALS['phpgw']->template->set_var('anz_imported',$debug ? lang( '%1 records read (not yet imported, you may go back and uncheck Test Import)',
$anz,'<a href="javascript:history.back()">','</a>' ) : $anz,'<a href="javascript:history.back()">','</a>' ) :
lang( '%1 records imported',$anz )); lang( '%1 records imported',$anz ));
$t->set_var('log',$log); $GLOBALS['phpgw']->template->set_var('log',$log);
$t->parse('importedhandle','imported'); $GLOBALS['phpgw']->template->parse('importedhandle','imported');
break; break;
} }
$t->set_var('hiddenvars',$hiddenvars); $GLOBALS['phpgw']->template->set_var('hiddenvars',$hiddenvars);
$t->pfp('out','import',True); $GLOBALS['phpgw']->template->pfp('out','import',True);
$phpgw->common->phpgw_footer(); $GLOBALS['phpgw']->common->phpgw_footer();
?> ?>

View File

@ -11,26 +11,32 @@
\**************************************************************************/ \**************************************************************************/
/* $Id$ */ /* $Id$ */
if ($confirm) if ($HTTP_POST_VARS['confirm'])
{ {
$phpgw_info['flags'] = array( $GLOBALS['phpgw_info']['flags'] = array(
'noheader' => True, 'noheader' => True,
'nonavbar' => True 'nonavbar' => True
); );
} }
$phpgw_info['flags']['currentapp'] = 'addressbook'; $GLOBALS['phpgw_info']['flags']['currentapp'] = 'addressbook';
include('../header.inc.php'); include('../header.inc.php');
if (!$field) if (!$HTTP_POST_VARS['field'])
{ {
Header('Location: ' . $phpgw->link('/addressbook/fields.php')); Header('Location: ' . $GLOBALS['phpgw']->link('/addressbook/fields.php'));
} }
if ($confirm) $field = $HTTP_POST_VARS['field'];
$field_id = $HTTP_POST_VARS['field_id'] ? $HTTP_POST_VARS['field_id'] : $HTTP_GET_VARS['field_id'];
$start = $HTTP_POST_VARS['start'];
$query = $HTTP_POST_VARS['query'];
$sort = $HTTP_POST_VARS['sort'];
if ($HTTP_POST_VARS['confirm'])
{ {
save_custom_field($field); save_custom_field($field);
Header('Location: ' . $phpgw->link('/addressbook/fields.php',"start=$start&query=$query&sort=$sort")); Header('Location: ' . $GLOBALS['phpgw']->link('/addressbook/fields.php',"start=$start&query=$query&sort=$sort"));
} }
else else
{ {
@ -40,16 +46,15 @@
. '<input type="hidden" name="start" value="' . $start .'">' . "\n" . '<input type="hidden" name="start" value="' . $start .'">' . "\n"
. '<input type="hidden" name="field" value="' . $field .'">' . "\n"; . '<input type="hidden" name="field" value="' . $field .'">' . "\n";
$t = new Template(PHPGW_APP_TPL); $GLOBALS['phpgw']->template->set_file(array('field_delete' => 'delete_common.tpl'));
$t->set_file(array('field_delete' => 'delete_common.tpl')); $GLOBALS['phpgw']->template->set_var('messages',lang('Are you sure you want to delete this field?'));
$t->set_var('messages',lang('Are you sure you want to delete this field?'));
$nolinkf = $phpgw->link('/addressbook/fields.php',"field_id=$field_id&start=$start&query=$query&sort=$sort"); $nolinkf = $GLOBALS['phpgw']->link('/addressbook/fields.php',"field_id=$field_id&start=$start&query=$query&sort=$sort");
$nolink = '<a href="' . $nolinkf . '">' . lang('No') . '</a>'; $nolink = '<a href="' . $nolinkf . '">' . lang('No') . '</a>';
$t->set_var('no',$nolink); $phpgw->template->set_var('no',$nolink);
$yeslinkf = $phpgw->link('/addressbook/deletefield.php','field_id=' . $field_id . '&confirm=True'); $yeslinkf = $GLOBALS['phpgw']->link('/addressbook/deletefield.php','field_id=' . $field_id . '&confirm=True');
$yeslinkf = '<form method="POST" name="yesbutton" action="' . $phpgw->link('/addressbook/deletefield.php') . '\">' $yeslinkf = '<form method="POST" name="yesbutton" action="' . $GLOBALS['phpgw']->link('/addressbook/deletefield.php') . '\">'
. $hidden_vars . $hidden_vars
. '<input type="hidden" name="field_id" value="' . $field_id . '">' . '<input type="hidden" name="field_id" value="' . $field_id . '">'
. '<input type="hidden" name="confirm" value="True">' . '<input type="hidden" name="confirm" value="True">'
@ -58,10 +63,10 @@
$yeslink = '<a href="' . $yeslinkf . '">' . lang('Yes') . '</a>'; $yeslink = '<a href="' . $yeslinkf . '">' . lang('Yes') . '</a>';
$yeslink = $yeslinkf; $yeslink = $yeslinkf;
$t->set_var('yes',$yeslink); $GLOBALS['phpgw']->template->set_var('yes',$yeslink);
$t->pparse('out','field_delete'); $GLOBALS['phpgw']->template->pparse('out','field_delete');
} }
$phpgw->common->phpgw_footer(); $GLOBALS['phpgw']->common->phpgw_footer();
?> ?>

View File

@ -11,33 +11,38 @@
\**************************************************************************/ \**************************************************************************/
/* $Id$ */ /* $Id$ */
$phpgw_info['flags']['currentapp'] = 'addressbook'; $GLOBALS['phpgw']_info['flags']['currentapp'] = 'addressbook';
include('../header.inc.php'); include('../header.inc.php');
if(!$phpgw->acl->check('run',1,'admin')) if(!$GLOBALS['phpgw']->acl->check('run',1,'admin'))
{ {
echo lang('access not permitted'); echo lang('access not permitted');
$phpgw->common->phpgw_footer(); $GLOBALS['phpgw']->common->phpgw_footer();
$phpgw->common->phpgw_exit(); $GLOBALS['phpgw']->common->phpgw_exit();
} }
$field = $HTTP_POST_VARS['field'];
$field_name = $HTTP_POST_VARS['field_name'];
$start = $HTTP_POST_VARS['start'];
$query = $HTTP_POST_VARS['query'];
$sort = $HTTP_POST_VARS['sort'];
if (!$field) if (!$field)
{ {
Header('Location: ' . $phpgw->link('/addressbook/fields.php',"sort=$sort&query=$query&start=$start")); Header('Location: ' . $GLOBALS['phpgw']->link('/addressbook/fields.php',"sort=$sort&query=$query&start=$start"));
} }
$t = new Template(PHPGW_APP_TPL); $GLOBALS['phpgw']->template->set_file(array('form' => 'field_form.tpl'));
$t->set_file(array('form' => 'field_form.tpl')); $GLOBALS['phpgw']->template->set_block('form','add','addhandle');
$t->set_block('form','add','addhandle'); $GLOBALS['phpgw']->template->set_block('form','edit','edithandle');
$t->set_block('form','edit','edithandle');
$hidden_vars = '<input type="hidden" name="sort" value="' . $sort . '">' . "\n" $hidden_vars = '<input type="hidden" name="sort" value="' . $sort . '">' . "\n"
. '<input type="hidden" name="query" value="' . $query . '">' . "\n" . '<input type="hidden" name="query" value="' . $query . '">' . "\n"
. '<input type="hidden" name="start" value="' . $start . '">' . "\n" . '<input type="hidden" name="start" value="' . $start . '">' . "\n"
. '<input type="hidden" name="field" value="' . $field . '">' . "\n"; . '<input type="hidden" name="field" value="' . $field . '">' . "\n";
if ($submit) if ($HTTP_POST_VARS['submit'])
{ {
$errorcount = 0; $errorcount = 0;
if (!$field_name) { $error[$errorcount++] = lang('Please enter a name for that field!'); } if (!$field_name) { $error[$errorcount++] = lang('Please enter a name for that field!'); }
@ -52,15 +57,15 @@
if ($errorcount) if ($errorcount)
{ {
$t->set_var('message',$phpgw->common->error_list($error)); $GLOBALS['phpgw']->template->set_var('message',$GLOBALS['phpgw']->common->error_list($error));
} }
if (($submit) && (! $error) && (! $errorcount)) if (($submit) && (! $error) && (! $errorcount))
{ {
$t->set_var('message',lang('Field x has been updated !', $field_name)); $GLOBALS['phpgw']->template->set_var('message',lang('Field x has been updated !', $field_name));
} }
if ((! $submit) && (! $error) && (! $errorcount)) if ((! $submit) && (! $error) && (! $errorcount))
{ {
$t->set_var('message',''); $GLOBALS['phpgw']->template->set_var('message','');
} }
if ($submit) if ($submit)
@ -70,28 +75,28 @@
else else
{ {
$fields = read_custom_fields($start,$limit,$field); $fields = read_custom_fields($start,$limit,$field);
$field = $phpgw->strip_html($fields[0]['name']); $field = $GLOBALS['phpgw']->strip_html($fields[0]['name']);
} }
$t->set_var('title_fields',lang('Edit Field')); $GLOBALS['phpgw']->template->set_var('title_fields',lang('Edit Field'));
$t->set_var('actionurl',$phpgw->link('/addressbook/editfield.php')); $GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/addressbook/editfield.php'));
$t->set_var('deleteurl',$phpgw->link('/addressbook/deletefield.php',"field=$field&start=$start&query=$query&sort=$sort")); $GLOBALS['phpgw']->template->set_var('deleteurl',$GLOBALS['phpgw']->link('/addressbook/deletefield.php',"field=$field&start=$start&query=$query&sort=$sort"));
$t->set_var('doneurl',$phpgw->link('/addressbook/fields.php',"start=$start&query=$query&sort=$sort")); $GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/addressbook/fields.php',"start=$start&query=$query&sort=$sort"));
$t->set_var('hidden_vars',$hidden_vars); $GLOBALS['phpgw']->template->set_var('hidden_vars',$hidden_vars);
$t->set_var('lang_name',lang('Field name')); $GLOBALS['phpgw']->template->set_var('lang_name',lang('Field name'));
$t->set_var('lang_done',lang('Done')); $GLOBALS['phpgw']->template->set_var('lang_done',lang('Done'));
$t->set_var('lang_edit',lang('Edit')); $GLOBALS['phpgw']->template->set_var('lang_edit',lang('Edit'));
$t->set_var('lang_delete',lang('Delete')); $GLOBALS['phpgw']->template->set_var('lang_delete',lang('Delete'));
$t->set_var('field_name',$field); $GLOBALS['phpgw']->template->set_var('field_name',$field);
$t->set_var('edithandle',''); $GLOBALS['phpgw']->template->set_var('edithandle','');
$t->set_var('addhandle',''); $GLOBALS['phpgw']->template->set_var('addhandle','');
$t->pparse('out','form'); $GLOBALS['phpgw']->template->pparse('out','form');
$t->pparse('edithandle','edit'); $GLOBALS['phpgw']->template->pparse('edithandle','edit');
$phpgw->common->phpgw_footer(); $GLOBALS['phpgw']->common->phpgw_footer();
?> ?>

View File

@ -11,18 +11,25 @@
\**************************************************************************/ \**************************************************************************/
/* $Id$ */ /* $Id$ */
$phpgw_info['flags'] = array( $GLOBALS['phpgw_info']['flags'] = array(
'currentapp' => 'addressbook', 'currentapp' => 'addressbook',
'enable_nextmatchs_class' => True 'enable_nextmatchs_class' => True
); );
include('../header.inc.php'); include('../header.inc.php');
$phpgw->template->set_file(array( $GLOBALS['phpgw']->template->set_file(array(
'field_list_t' => 'listfields.tpl', 'field_list_t' => 'listfields.tpl',
'field_list' => 'listfields.tpl' 'field_list' => 'listfields.tpl'
)); ));
$phpgw->template->set_block('field_list_t','field_list','list'); $GLOBALS['phpgw']->template->set_block('field_list_t','field_list','list');
$field = $HTTP_POST_VARS['field'];
$start = $HTTP_POST_VARS['start'];
$query = $HTTP_POST_VARS['query'];
$sort = $HTTP_POST_VARS['sort'];
$order = $HTTP_POST_VARS['order'];
$filter = $HTTP_POST_VARS['filter'];
$common_hidden_vars = $common_hidden_vars =
'<input type="hidden" name="sort" value="' . $sort . '">' . "\n" '<input type="hidden" name="sort" value="' . $sort . '">' . "\n"
@ -31,51 +38,57 @@
. '<input type="hidden" name="start" value="' . $start . '">' . "\n" . '<input type="hidden" name="start" value="' . $start . '">' . "\n"
. '<input type="hidden" name="filter" value="' . $filter . '">' . "\n"; . '<input type="hidden" name="filter" value="' . $filter . '">' . "\n";
$phpgw->template->set_var('lang_action',lang('Custom Fields')); $GLOBALS['phpgw']->template->set_var('lang_action',lang('Custom Fields'));
$phpgw->template->set_var('add_action',$phpgw->link('/addressbook/addfield.php')); $GLOBALS['phpgw']->template->set_var('add_action',$GLOBALS['phpgw']->link('/addressbook/addfield.php'));
$phpgw->template->set_var('lang_add',lang('Add')); $GLOBALS['phpgw']->template->set_var('lang_add',lang('Add'));
$phpgw->template->set_var('title_fields',lang('addressbook').' - '.lang('Custom Fields')); $GLOBALS['phpgw']->template->set_var('title_fields',lang('addressbook').' - '.lang('Custom Fields'));
$phpgw->template->set_var('lang_search',lang('Search')); $GLOBALS['phpgw']->template->set_var('lang_search',lang('Search'));
$phpgw->template->set_var('actionurl',$phpgw->link('/addressbook/fields.php')); $GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/addressbook/fields.php'));
$phpgw->template->set_var('lang_done',lang('Done')); $GLOBALS['phpgw']->template->set_var('lang_done',lang('Done'));
$phpgw->template->set_var('doneurl',$phpgw->link('/admin/index.php')); $GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/admin/index.php'));
if (!$start) { $start = 0; } if (!$start)
{
$start = 0;
}
if (!$sort) { $sort = 'ASC'; } if (!$sort)
{
$sort = 'ASC';
}
$fields = read_custom_fields($start,$limit,$query,$sort,$order); $fields = read_custom_fields($start,$limit,$query,$sort,$order);
$total_records = count($fields); $total_records = count($fields);
$phpgw->template->set_var('left',$phpgw->nextmatchs->left('/addressbook/fields.php',$start,$total_records)); $GLOBALS['phpgw']->template->set_var('left',$GLOBALS['phpgw']->nextmatchs->left('/addressbook/fields.php',$start,$total_records));
$phpgw->template->set_var('right',$phpgw->nextmatchs->right('/addressbook/fields.php',$start,$total_records)); $GLOBALS['phpgw']->template->set_var('right',$GLOBALS['phpgw']->nextmatchs->right('/addressbook/fields.php',$start,$total_records));
$phpgw->template->set_var('lang_showing',$phpgw->nextmatchs->show_hits($total_records,$start)); $GLOBALS['phpgw']->template->set_var('lang_showing',$GLOBALS['phpgw']->nextmatchs->show_hits($total_records,$start));
$phpgw->template->set_var('th_bg',$phpgw_info['theme']['th_bg']); $GLOBALS['phpgw']->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
$phpgw->template->set_var('sort_field',$phpgw->nextmatchs->show_sort_order($sort,'name',$order,'/addressbook/fields.php',lang('Name'))); $GLOBALS['phpgw']->template->set_var('sort_field',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'name',$order,'/addressbook/fields.php',lang('Name')));
$phpgw->template->set_var('lang_edit',lang('Edit')); $GLOBALS['phpgw']->template->set_var('lang_edit',lang('Edit'));
$phpgw->template->set_var('lang_delete',lang('Delete')); $GLOBALS['phpgw']->template->set_var('lang_delete',lang('Delete'));
for ($i=0;$i<count($fields);$i++) for ($i=0;$i<count($fields);$i++)
{ {
$tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color); $tr_color = $GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
$phpgw->template->set_var(tr_color,$tr_color); $GLOBALS['phpgw']->template->set_var(tr_color,$tr_color);
$field = $fields[$i]['name']; $field = $fields[$i]['name'];
$phpgw->template->set_var('cfield',$field); $GLOBALS['phpgw']->template->set_var('cfield',$field);
$phpgw->template->set_var('edit',$phpgw->link('/addressbook/editfield.php',"field=$field&start=$start&query=$query&sort=$sort&order=$order&filter=$filter")); $GLOBALS['phpgw']->template->set_var('edit',$GLOBALS['phpgw']->link('/addressbook/editfield.php',"field=$field&start=$start&query=$query&sort=$sort&order=$order&filter=$filter"));
$phpgw->template->set_var('lang_edit_entry',lang('Edit')); $GLOBALS['phpgw']->template->set_var('lang_edit_entry',lang('Edit'));
$phpgw->template->set_var('delete',$phpgw->link('/addressbook/deletefield.php',"field=$field&start=$start&query=$query&sort=$sort&order=$order&filter=$filter")); $GLOBALS['phpgw']->template->set_var('delete',$GLOBALS['phpgw']->link('/addressbook/deletefield.php',"field=$field&start=$start&query=$query&sort=$sort&order=$order&filter=$filter"));
$phpgw->template->set_var('lang_delete_entry',lang('Delete')); $GLOBALS['phpgw']->template->set_var('lang_delete_entry',lang('Delete'));
$phpgw->template->parse('list','field_list',True); $GLOBALS['phpgw']->template->parse('list','field_list',True);
} }
$phpgw->template->parse('out','field_list_t',True); $GLOBALS['phpgw']->template->parse('out','field_list_t',True);
$phpgw->template->p('out'); $GLOBALS['phpgw']->template->p('out');
$phpgw->common->phpgw_footer(); $GLOBALS['phpgw']->common->phpgw_footer();
?> ?>