[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: addressbook/inc class.uivcard.inc.php,1.5,1.5.2.
|
From: |
Miles Lott <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: addressbook/inc class.uivcard.inc.php,1.5,1.5.2.1 |
|
Date: |
Wed, 24 Apr 2002 04:06:57 -0400 |
Update of /cvsroot/phpgroupware/addressbook/inc
In directory subversions:/tmp/cvs-serv3386
Modified Files:
Tag: Version-0_9_14-branch
class.uivcard.inc.php
Log Message:
Possible fix for #100710. formatting and globals; remove extra footer
Index: class.uivcard.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.uivcard.inc.php,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -r1.5 -r1.5.2.1
*** class.uivcard.inc.php 9 Aug 2001 00:19:28 -0000 1.5
--- class.uivcard.inc.php 24 Apr 2002 08:06:54 -0000 1.5.2.1
***************
*** 35,41 ****
function uivcard()
{
! global $phpgw;
!
! $this->template = $phpgw->template;
$this->contacts = CreateObject('phpgwapi.contacts');
$this->browser = CreateObject('phpgwapi.browser');
--- 35,39 ----
function uivcard()
{
! $this->template = $GLOBALS['phpgw']->template;
$this->contacts = CreateObject('phpgwapi.contacts');
$this->browser = CreateObject('phpgwapi.browser');
***************
*** 46,55 ****
function in()
{
! global $phpgw,$phpgw_info,$action;
! $phpgw->common->phpgw_header();
echo parse_navbar();
! echo '<body bgcolor="' .
$phpgw_info['theme']['bg_color'] . '">';
if ($action == 'GetFile')
--- 44,53 ----
function in()
{
! $action = $GLOBALS['HTTP_POST_VARS']['action'] ?
$GLOBALS['HTTP_POST_VARS']['action'] : $GLOBALS['HTTP_GET_VARS']['action'];
! $GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
! echo '<body bgcolor="' .
$GLOBALS['phpgw_info']['theme']['bg_color'] . '">';
if ($action == 'GetFile')
***************
*** 61,65 ****
$this->template->set_var('vcard_header','<p> <b>'
. lang('Address book - VCard in') . '</b><hr><p>');
!
$this->template->set_var('action_url',$phpgw->link('/index.php','menuaction=addressbook.boaddressbook.add_vcard'));
$this->template->set_var('lang_access',lang('Access'));
$this->template->set_var('lang_groups',lang('Which
groups'));
--- 59,63 ----
$this->template->set_var('vcard_header','<p> <b>'
. lang('Address book - VCard in') . '</b><hr><p>');
!
$this->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.boaddressbook.add_vcard'));
$this->template->set_var('lang_access',lang('Access'));
$this->template->set_var('lang_groups',lang('Which
groups'));
***************
*** 69,89 ****
$this->template->pparse('out','vcardin');
! $phpgw->common->phpgw_footer();
}
function out()
{
! global $phpgw,$phpgw_info,$ab_id,$nolname,$nofname;
! if ($nolname || $nofname)
{
! $phpgw->common->phpgw_header();
echo parse_navbar();
}
! if (!$ab_id)
{
! Header('Location: ' .
$phpgw->link('/addressbook/index.php'));
! $phpgw->common->phpgw_exit();
}
--- 67,89 ----
$this->template->pparse('out','vcardin');
! $GLOBALS['phpgw']->common->phpgw_footer();
}
function out()
{
! $ab_id = $GLOBALS['HTTP_GET_VARS']['ab_id'] ?
$GLOBALS['HTTP_GET_VARS']['ab_id'] : $GLOBALS['HTTP_POST_VARS']['ab_id'];
! $nolname = $GLOBALS['HTTP_GET_VARS']['nolname'];
! $nofname = $GLOBALS['HTTP_GET_VARS']['nofname'];
! if($nolname || $nofname)
{
! $GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
}
! if(!$ab_id)
{
! Header('Location: ' .
$GLOBALS['phpgw']->link('/addressbook/index.php'));
! $GLOBALS['phpgw']->common->phpgw_exit();
}
***************
*** 92,99 ****
$perms =
$this->contacts->check_perms($this->contacts->grants[$check[0]['owner']],PHPGW_ACL_READ);
! if ( (!$perms) && ($check[0]['owner'] !=
$phpgw_info['user']['account_id']) )
{
! Header("Location: " .
$phpgw->link('/index.php','menuaction=addressbook.uiaddressbook.get_list'));
! $phpgw->common->phpgw_exit();
}
--- 92,99 ----
$perms =
$this->contacts->check_perms($this->contacts->grants[$check[0]['owner']],PHPGW_ACL_READ);
! if ( (!$perms) && ($check[0]['owner'] !=
$GLOBALS['phpgw_info']['user']['account_id']) )
{
! Header("Location: " .
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.get_list'));
! $GLOBALS['phpgw']->common->phpgw_exit();
}
***************
*** 125,133 ****
{
/* Run away here. */
! Header('Location: ' .
$phpgw->link('/index.php',"menuaction=addressbook.uivcard.out&nolname=1&ab_id=$ab_id"));
}
if($firstname == '')
{
! Header('Location: ' .
$phpgw->link('/index.php',"menuaction=addressbook.uivcard.out&nofname=1&ab_id=$ab_id"));
}
--- 125,133 ----
{
/* Run away here. */
! Header('Location: ' .
$GLOBALS['phpgw']->link('/index.php',"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"));
}
***************
*** 167,171 ****
$this->browser->content_header($filename,'text/x-vcard');
echo $entry;
! $phpgw->common->exit;
} /* !nolname && !nofname */
--- 167,172 ----
$this->browser->content_header($filename,'text/x-vcard');
echo $entry;
! exit;
! //$GLOBALS['phpgw']->common->exit;
} /* !nolname && !nofname */
***************
*** 175,179 ****
echo lang("This person's first name was not in
the address book.") .'<br>';
echo lang('Vcards require a first name entry.')
. '<br><br>';
! echo '<a href="' .
$phpgw->link('/addressbook/index.php',
"order=$order&start=$start&filter=$filter&query=$query&sort=$sort&cat_id=$cat_id")
. '">' . lang('OK') . '</a>';
echo '</center>';
--- 176,180 ----
echo lang("This person's first name was not in
the address book.") .'<br>';
echo lang('Vcards require a first name entry.')
. '<br><br>';
! echo '<a href="' .
$GLOBALS['phpgw']->link('/addressbook/index.php',
"order=$order&start=$start&filter=$filter&query=$query&sort=$sort&cat_id=$cat_id")
. '">' . lang('OK') . '</a>';
echo '</center>';
***************
*** 185,189 ****
echo lang("This person's last name was not in
the address book.") . '<br>';
echo lang('Vcards require a last name entry.')
. '<br><br>';
! echo '<a href="' .
$phpgw->link('/addressbook/index.php',
"order=$order&start=$start&filter=$filter&query=$query&sort=$sort&cat_id=$cat_id")
. '">' . lang('OK') . '</a>';
echo '</center>';
--- 186,190 ----
echo lang("This person's last name was not in
the address book.") . '<br>';
echo lang('Vcards require a last name entry.')
. '<br><br>';
! echo '<a href="' .
$GLOBALS['phpgw']->link('/addressbook/index.php',
"order=$order&start=$start&filter=$filter&query=$query&sort=$sort&cat_id=$cat_id")
. '">' . lang('OK') . '</a>';
echo '</center>';
***************
*** 192,196 ****
if($nolname || $nofname)
{
! $phpgw->common->phpgw_footer();
}
}
--- 193,197 ----
if($nolname || $nofname)
{
! //$GLOBALS['phpgw']->common->phpgw_footer();
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: addressbook/inc class.uivcard.inc.php,1.5,1.5.2.1,
Miles Lott <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: preferences/inc class.uicategories.inc.php,1.2.2.4,1.2.2.5 class.bocategories.inc.php,1.2.2.1,1.2.2.2
- Next by Date:
[Phpgroupware-cvs] CVS: phpgwapi/inc class.contacts_ldap.inc.php,1.11,1.11.2.1 class.contacts_shared.inc.php,1.9,1.9.2.1
- Previous by thread:
[Phpgroupware-cvs] CVS: preferences/inc class.uicategories.inc.php,1.2.2.4,1.2.2.5 class.bocategories.inc.php,1.2.2.1,1.2.2.2
- Next by thread:
[Phpgroupware-cvs] CVS: phpgwapi/inc class.contacts_ldap.inc.php,1.11,1.11.2.1 class.contacts_shared.inc.php,1.9,1.9.2.1
- Index(es):