[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] addressbook csv_import.php inc/class.uiXport.in...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] addressbook csv_import.php inc/class.uiXport.in... |
|
Date: |
Wed, 29 Nov 2006 14:39:38 +0000 |
CVSROOT: /sources/phpgroupware
Module name: addressbook
Changes by: Sigurd Nes <sigurdne> 06/11/29 14:39:38
Modified files:
. : csv_import.php
inc : class.uiXport.inc.php class.uivcard.inc.php
Log message:
Notices and fixes
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/addressbook/csv_import.php?cvsroot=phpgroupware&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/addressbook/inc/class.uiXport.inc.php?cvsroot=phpgroupware&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/addressbook/inc/class.uivcard.inc.php?cvsroot=phpgroupware&r1=1.13&r2=1.14
Patches:
Index: csv_import.php
===================================================================
RCS file: /sources/phpgroupware/addressbook/csv_import.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- csv_import.php 15 May 2005 13:34:29 -0000 1.20
+++ csv_import.php 29 Nov 2006 14:39:38 -0000 1.21
@@ -10,7 +10,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: csv_import.php,v 1.20 2005/05/15 13:34:29 skwashd Exp $ */
+ /* $Id: csv_import.php,v 1.21 2006/11/29 14:39:38 sigurdne Exp $ */
$GLOBALS['phpgw_info']['flags'] = array(
'currentapp' => 'addressbook',
@@ -24,6 +24,7 @@
$GLOBALS['phpgw']->contacts = createobject('phpgwapi.contacts');
+ $GLOBALS['phpgw']->template->set_root(PHPGW_APP_TPL);
$GLOBALS['phpgw']->template->set_file(array('import' =>
'csv_import.tpl'));
$GLOBALS['phpgw']->template->set_block('import','filename','filenamehandle');
$GLOBALS['phpgw']->template->set_block('import','fheader','fheaderhandle');
Index: inc/class.uiXport.inc.php
===================================================================
RCS file: /sources/phpgroupware/addressbook/inc/class.uiXport.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- inc/class.uiXport.inc.php 15 May 2005 13:34:29 -0000 1.22
+++ inc/class.uiXport.inc.php 29 Nov 2006 14:39:38 -0000 1.23
@@ -10,7 +10,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.uiXport.inc.php,v 1.22 2005/05/15 13:34:29 skwashd Exp $ */
+ /* $Id: class.uiXport.inc.php,v 1.23 2006/11/29 14:39:38 sigurdne Exp $ */
class uiXport
{
@@ -89,8 +89,9 @@
{
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
+
$this->template->set_root(PHPGW_APP_TPL);
echo "<pre>$buffer</pre>";
- echo '<a
href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index')
. '">'.lang('OK').'</a>';
+ echo '<a
href="'.$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'addressbook.uiaddressbook.index'))
. '">'.lang('OK').'</a>';
$GLOBALS['phpgw']->common->phpgw_footer();
}
}
@@ -98,8 +99,9 @@
{
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
+
$this->template->set_root(PHPGW_APP_TPL);
echo "<pre>$buffer</pre>";
- echo '<a
href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index').
'">'.lang('OK').'</a>';
+ echo '<a
href="'.$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'addressbook.uiaddressbook.index')).
'">'.lang('OK').'</a>';
$GLOBALS['phpgw']->common->phpgw_footer();
}
@@ -108,7 +110,7 @@
{
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
-
+ $this->template->set_root(PHPGW_APP_TPL);
set_time_limit(0);
$this->template->set_file(array('import' =>
'import.tpl'));
@@ -133,11 +135,11 @@
$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','menuaction=addressbook.uiaddressbook.index'));
+
$this->template->set_var('cancel_url',$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'addressbook.uiaddressbook.index')));
$this->template->set_var('navbar_bg',$GLOBALS['phpgw_info']['theme']['navbar_bg']);
$this->template->set_var('navbar_text',$GLOBALS['phpgw_info']['theme']['navbar_text']);
$this->template->set_var('import_text',lang('Import from LDIF, CSV, or VCard'));
-
$this->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiXport.import'));
+
$this->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'addressbook.uiXport.import')));
$this->template->set_var('cat_link',$this->cat_option($this->cat_id,False,False));
//$this->template->set_var('cat_link',$this->cat_option($this->cat_id,True,False));
$this->template->set_var('tsvfilename','');
@@ -182,7 +184,7 @@
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
echo lang('<b>No conversion type
<none> could be located.</b> Please choose a conversion type from the
list');
- echo ' <a
href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiXport.export')
. '">' . lang('OK') . '</a>';
+ echo ' <a
href="'.$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'addressbook.uiXport.export'))
. '">' . lang('OK') . '</a>';
$GLOBALS['phpgw']->common->phpgw_footer();
$GLOBALS['phpgw']->common->phpgw_exit();
}
@@ -217,7 +219,7 @@
echo "<pre>\n";
echo $buffer;
echo "\n</pre>\n";
- echo '<a
href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiXport.export')
. '">' . lang('OK') . '</a>';
+ echo '<a
href="'.$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'addressbook.uiXport.export'))
. '">' . lang('OK') . '</a>';
$GLOBALS['phpgw']->common->phpgw_footer();
}
}
@@ -225,7 +227,7 @@
{
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
-
+ $this->template->set_root(PHPGW_APP_TPL);
set_time_limit(0);
$this->template->set_file(array('export' =>
'export.tpl'));
@@ -255,7 +257,7 @@
$this->template->set_var('navbar_bg',$GLOBALS['phpgw_info']['theme']['navbar_bg']);
$this->template->set_var('navbar_text',$GLOBALS['phpgw_info']['theme']['navbar_text']);
$this->template->set_var('export_text',lang('Export from Addressbook'));
-
$this->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiXport.export'));
+
$this->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'addressbook.uiXport.export')));
$this->template->set_var('filename',lang('Export file name'));
$this->template->set_var('conv',$conv);
$this->template->set_var('debug',lang(''));
Index: inc/class.uivcard.inc.php
===================================================================
RCS file: /sources/phpgroupware/addressbook/inc/class.uivcard.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- inc/class.uivcard.inc.php 15 May 2005 13:34:30 -0000 1.13
+++ inc/class.uivcard.inc.php 29 Nov 2006 14:39:38 -0000 1.14
@@ -11,7 +11,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.uivcard.inc.php,v 1.13 2005/05/15 13:34:30 skwashd Exp $ */
+ /* $Id: class.uivcard.inc.php,v 1.14 2006/11/29 14:39:38 sigurdne Exp $ */
class uivcard
{
@@ -47,7 +47,7 @@
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
-
+ $this->template->set_root(PHPGW_APP_TPL);
// echo '<body bgcolor="' .
$GLOBALS['phpgw_info']['theme']['bg_color'] . '">';
if ($action == 'GetFile')
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] addressbook csv_import.php inc/class.uiXport.in...,
Sigurd Nes <=