[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] addressbook/inc hook_sidebox_menu.inc.php, 1.6 hook_p
|
From: |
skwashd |
|
Subject: |
[Phpgroupware-cvs] addressbook/inc hook_sidebox_menu.inc.php, 1.6 hook_preferences.inc.php, 1.24 hook_notifywindow.inc.php, 1.11 hook_home.inc.php, 1.25 hook_manual.inc.php, 1.8 hook_deleteaccount.inc.php, 1.8 hook_config_validate.inc.php, 1.4 class.uicatalog_contact_comm_descr.inc.php, 1.4 class.uicatalog_contact_comm_type.inc.php, 1.4 class.uicatalog_contact_note_type.inc.php, 1.4 class.uicatalog_contact_addr_type.inc.php, 1.4 class.uiaddressbook_prefs.inc.php, 1.4 class.uiXport.inc.php, 1.22 class.uiaddressbook.inc.php, 1.60 class.uicategorize_contacts.inc.php, 1.4 class.uifields.inc.php, 1.14 hook_addressbook_add_def_acl.inc.php, 1.4 class.addressbook_importer.inc.php, 1.4 hook_add_def_pref.inc.php, 1.5 functions.inc.php, 1.105 class.uivcard.inc.php, 1.13 class.widget_lists.inc.php, 1.4 class.socatalog_contact_note_type.inc.php, 1.4 hook_admin.inc.php, 1.17 class.bocatalog_contact_comm_descr.inc.php, 1.4 class.bocatalog_contact_comm_type.inc.php, 1.4 class.bocatalog_contact_addr_type.inc.php, 1.4 class.boadd ressbook_prefs.inc.php, 1.4 class.boXport.inc.php, 1.12 class.boaddressbook.inc.php, 1.28 class.bocatalog_contact_note_type.inc.php, 1.4 class.catalog_manager.inc.php, 1.4 class.socatalog_contact_comm_descr.inc.php, 1.4 class.socatalog_contact_comm_type.inc.php, 1.4 class.socatalog_contact_addr_type.inc.php, 1.4 class.soaddressbook.inc.php, 1.20 class.ipc_addressbook.inc.php, 1.4 class.pdb.inc.php, 1.6 arr.php, 1.4 |
|
Date: |
Sun, 15 May 2005 15:34:00 +0200 |
Update of addressbook/inc
Modified Files:
Branch: MAIN
hook_sidebox_menu.inc.php lines: +1 -11
hook_preferences.inc.php lines: +12 -11
hook_notifywindow.inc.php lines: +12 -18
hook_home.inc.php lines: +12 -10
hook_manual.inc.php lines: +12 -11
hook_deleteaccount.inc.php lines: +12 -10
hook_config_validate.inc.php lines: +12 -15
class.uicatalog_contact_comm_descr.inc.php lines: +0 -17
class.uicatalog_contact_comm_type.inc.php lines: +0 -18
class.uicatalog_contact_note_type.inc.php lines: +0 -17
class.uicatalog_contact_addr_type.inc.php lines: +0 -19
class.uiaddressbook_prefs.inc.php lines: +65 -60
class.uiXport.inc.php lines: +13 -16
class.uiaddressbook.inc.php lines: +87 -22
class.uicategorize_contacts.inc.php lines: +18 -17
class.uifields.inc.php lines: +14 -17
hook_addressbook_add_def_acl.inc.php lines: +2 -11
class.addressbook_importer.inc.php lines: +17 -16
hook_add_def_pref.inc.php lines: +0 -10
functions.inc.php lines: +16 -24
class.uivcard.inc.php lines: +23 -26
class.widget_lists.inc.php lines: +17 -17
class.socatalog_contact_note_type.inc.php lines: +0 -15
hook_admin.inc.php lines: +14 -12
class.bocatalog_contact_comm_descr.inc.php lines: +0 -15
class.bocatalog_contact_comm_type.inc.php lines: +0 -15
class.bocatalog_contact_addr_type.inc.php lines: +0 -15
class.boaddressbook_prefs.inc.php lines: +24 -20
class.boXport.inc.php lines: +16 -19
class.boaddressbook.inc.php lines: +35 -32
class.bocatalog_contact_note_type.inc.php lines: +0 -15
class.catalog_manager.inc.php lines: +26 -20
class.socatalog_contact_comm_descr.inc.php lines: +0 -15
class.socatalog_contact_comm_type.inc.php lines: +0 -15
class.socatalog_contact_addr_type.inc.php lines: +0 -15
class.soaddressbook.inc.php lines: +20 -17
class.ipc_addressbook.inc.php lines: +8 -8
class.pdb.inc.php lines: +36 -25
Added Files:
Branch: MAIN
arr.php lines: +0 -0
Log Message:
merge from 16
====================================================
Index: addressbook/inc/hook_sidebox_menu.inc.php
diff -u addressbook/inc/hook_sidebox_menu.inc.php:1.5
addressbook/inc/hook_sidebox_menu.inc.php:1.6
--- addressbook/inc/hook_sidebox_menu.inc.php:1.5 Tue May 10 13:18:09 2005
+++ addressbook/inc/hook_sidebox_menu.inc.php Sun May 15 13:34:30 2005
@@ -1,14 +1,4 @@
<?php
- /**
- * Addressbook - Hook for sidebox menu
- *
- * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @subpackage hooks
- * @version $Id$
- */
-
$menu_title = $GLOBALS['phpgw_info']['apps'][$appname]['title'] . ' '.
lang('Menu');
$file = Array(
@@ -24,7 +14,7 @@
'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uivcard.in')),
array('text' => 'Categorize Persons',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uicategorize_contacts.index')),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uicategorize_contacts.index')),
array('text' => 'Import Contacts',
'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiXport.import')),
====================================================
Index: addressbook/inc/hook_preferences.inc.php
diff -u addressbook/inc/hook_preferences.inc.php:1.23
addressbook/inc/hook_preferences.inc.php:1.24
--- addressbook/inc/hook_preferences.inc.php:1.23 Tue May 10 13:18:09 2005
+++ addressbook/inc/hook_preferences.inc.php Sun May 15 13:34:30 2005
@@ -1,15 +1,16 @@
<?php
- /**
- * Addressbook - Hook for preferences
- *
- * @author Joseph Engo <address@hidden>
- * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @subpackage hooks
- * @version $Id$
- */
+ /**************************************************************************\
+ * phpGroupWare *
+ * http://www.phpgroupware.org *
+ * Written by Joseph Engo <address@hidden> *
+ * -------------------------------------------- *
+ * 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. *
+ \**************************************************************************/
+ /* $Id$ */
{
// Only Modify the $file and $title variables.....
$title = $appname;
@@ -18,7 +19,7 @@
'Grant Access' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uiaclprefs.index&acl_app='.$appname),
'Edit Categories' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uicategories.index&cats_app='.$appname
. '&cats_level=True&global_cats=True')
);
-// Do not modify below this line
+//Do not modify below this line
display_section($appname,$title,$file);
}
?>
====================================================
Index: addressbook/inc/hook_notifywindow.inc.php
diff -u addressbook/inc/hook_notifywindow.inc.php:1.10
addressbook/inc/hook_notifywindow.inc.php:1.11
--- addressbook/inc/hook_notifywindow.inc.php:1.10 Tue May 10 13:35:44 2005
+++ addressbook/inc/hook_notifywindow.inc.php Sun May 15 13:34:30 2005
@@ -1,27 +1,25 @@
<?php
- /**
- * Addressbook - Hook for notify window
- *
- * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @subpackage hooks
- * @version $Id$
- */
+ /**************************************************************************\
+ * phpGroupWare - Addressbook *
+ * http://www.phpgroupware.org *
+ * -------------------------------------------- *
+ * 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. *
+ \**************************************************************************/
+
+ /* $Id$ */
$d1 = strtolower(substr(PHPGW_APP_INC,0,3));
if($d1 == 'htt' || $d1 == 'ftp' )
{
- echo "Failed attempt to break in via an old Security
Hole!<br>\n";
+ echo "Failed attempt to break in via an old Security Hole!<br
/>\n";
$GLOBALS['phpgw']->common->phpgw_exit();
}
unset($d1);
$tmp_app_inc = PHPGW_APP_INC;
-
- /**
- * Define PHPGW_APP_INC
- */
define('PHPGW_APP_INC',$GLOBALS['phpgw']->common->get_inc_dir('addressbook'));
if ($GLOBALS['phpgw_info']['user']['apps']['addressbook']
@@ -68,9 +66,5 @@
echo "\n<!-- Birthday info -->\n";
}
- /**
- * Define PHPGW_APP_INC
- * @ignore
- */
define('PHPGW_APP_INC',$tmp_app_inc);
?>
====================================================
Index: addressbook/inc/hook_home.inc.php
diff -u addressbook/inc/hook_home.inc.php:1.24
addressbook/inc/hook_home.inc.php:1.25
--- addressbook/inc/hook_home.inc.php:1.24 Tue May 10 13:18:09 2005
+++ addressbook/inc/hook_home.inc.php Sun May 15 13:34:30 2005
@@ -1,19 +1,21 @@
<?php
- /**
- * Addressbook - Hook for preferences
- *
- * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @subpackage hooks
- * @version $Id$
- */
+ /**************************************************************************\
+ * phpGroupWare - E-Mail *
+ * http://www.phpgroupware.org *
+ * -------------------------------------------- *
+ * 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. *
+ \**************************************************************************/
+
+ /* $Id$ */
/* TODO Update for new contacts back end
$d1 = strtolower(substr(PHPGW_APP_INC,0,3));
if($d1 == 'htt' || $d1 == 'ftp' )
{
- echo "Failed attempt to break in via an old Security
Hole!<br>\n";
+ echo "Failed attempt to break in via an old Security Hole!<br
/>\n";
$GLOBALS['phpgw']->common->phpgw_exit();
}
unset($d1);
====================================================
Index: addressbook/inc/hook_manual.inc.php
diff -u addressbook/inc/hook_manual.inc.php:1.7
addressbook/inc/hook_manual.inc.php:1.8
--- addressbook/inc/hook_manual.inc.php:1.7 Tue May 10 13:18:09 2005
+++ addressbook/inc/hook_manual.inc.php Sun May 15 13:34:30 2005
@@ -1,15 +1,16 @@
<?php
- /**
- * Addressbook - Manual
- *
- * @author Mark Peters <address@hidden>
- * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @subpackage hooks
- * @version $Id$
- * @internal $Source$
- */
+ /**************************************************************************\
+ * phpGroupWare - Calendar Holidays *
+ * http://www.phpgroupware.org *
+ * Written by Mark Peters <address@hidden> *
+ * -------------------------------------------- *
+ * 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. *
+ \**************************************************************************/
+
+ /* $Id$ */
// Only Modify the $file variable.....
$file = Array();
====================================================
Index: addressbook/inc/hook_deleteaccount.inc.php
diff -u addressbook/inc/hook_deleteaccount.inc.php:1.7
addressbook/inc/hook_deleteaccount.inc.php:1.8
--- addressbook/inc/hook_deleteaccount.inc.php:1.7 Tue May 10 13:18:09 2005
+++ addressbook/inc/hook_deleteaccount.inc.php Sun May 15 13:34:30 2005
@@ -1,14 +1,16 @@
<?php
- /**
- * Addressbook - Hook for deleting an account
- *
- * @author Joseph Engo <address@hidden>
- * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @subpackage hooks
- * @version $Id$
- */
+ /**************************************************************************\
+ * phpGroupWare *
+ * http://www.phpgroupware.org *
+ * Written by Joseph Engo <address@hidden> *
+ * -------------------------------------------- *
+ * 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. *
+ \**************************************************************************/
+
+ /* $Id$ */
$contacts = CreateObject('phpgwapi.contacts');
====================================================
Index: addressbook/inc/hook_config_validate.inc.php
diff -u addressbook/inc/hook_config_validate.inc.php:1.3
addressbook/inc/hook_config_validate.inc.php:1.4
--- addressbook/inc/hook_config_validate.inc.php:1.3 Tue May 10 13:18:09 2005
+++ addressbook/inc/hook_config_validate.inc.php Sun May 15 13:34:30 2005
@@ -1,15 +1,16 @@
<?php
- /**
- * Addressbook - Hook for configuration validation
- *
- * @author Mark Peters <address@hidden>
- * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @subpackage hooks
- * @version $Id$
- */
+ /**************************************************************************\
+ * phpGroupWare *
+ * http://www.phpgroupware.org *
+ * Written by Mark Peters <address@hidden> *
+ * -------------------------------------------- *
+ * 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. *
+ \**************************************************************************/
+ /* $Id$ */
/*
Set a global flag to indicate this file was found by admin/config.php.
@@ -17,11 +18,7 @@
*/
$GLOBALS['phpgw_info']['server']['found_validation_hook'] = True;
- /**
- * Check a specific setting. Name must match the setting.
- *
- * @param string $value
- */
+ /* Check a specific setting. Name must match the setting. */
function ldap_contact_context($value='')
{
if($value == $GLOBALS['phpgw_info']['server']['ldap_context'])
====================================================
Index: addressbook/inc/class.uicatalog_contact_comm_descr.inc.php
diff -u addressbook/inc/class.uicatalog_contact_comm_descr.inc.php:1.3
addressbook/inc/class.uicatalog_contact_comm_descr.inc.php:1.4
--- addressbook/inc/class.uicatalog_contact_comm_descr.inc.php:1.3 Tue May
10 14:25:03 2005
+++ addressbook/inc/class.uicatalog_contact_comm_descr.inc.php Sun May 15
13:34:29 2005
@@ -1,23 +1,6 @@
<?php
- /**
- * Addressbook - user interface
- *
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @version $Id$
- */
-
- /**
- * Include catalog manager
- */
include('class.catalog_manager.inc.php');
- /**
- * user interface
- *
- * @package addressbook
- */
class uicatalog_contact_comm_descr extends catalog_manager
{
var $public_functions = array('view' => True);
====================================================
Index: addressbook/inc/class.uicatalog_contact_comm_type.inc.php
diff -u addressbook/inc/class.uicatalog_contact_comm_type.inc.php:1.3
addressbook/inc/class.uicatalog_contact_comm_type.inc.php:1.4
--- addressbook/inc/class.uicatalog_contact_comm_type.inc.php:1.3 Tue May
10 14:25:03 2005
+++ addressbook/inc/class.uicatalog_contact_comm_type.inc.php Sun May 15
13:34:29 2005
@@ -1,24 +1,6 @@
<?php
- /**
- * Addressbook - user interface
- *
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @version $Id$
- */
-
- /**
- * Include catalog manager
- */
include('class.catalog_manager.inc.php');
-
- /**
- * user interface
- *
- * @package addressbook
- */
class uicatalog_contact_comm_type extends catalog_manager
{
var $public_functions = array('view' => True);
====================================================
Index: addressbook/inc/class.uicatalog_contact_note_type.inc.php
diff -u addressbook/inc/class.uicatalog_contact_note_type.inc.php:1.3
addressbook/inc/class.uicatalog_contact_note_type.inc.php:1.4
--- addressbook/inc/class.uicatalog_contact_note_type.inc.php:1.3 Tue May
10 14:25:03 2005
+++ addressbook/inc/class.uicatalog_contact_note_type.inc.php Sun May 15
13:34:29 2005
@@ -1,23 +1,6 @@
<?php
- /**
- * Addressbook - user interface
- *
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @version $Id$
- */
-
- /**
- * Include catalog manager
- */
include('class.catalog_manager.inc.php');
- /**
- * user interface
- *
- * @package addressbook
- */
class uicatalog_contact_note_type extends catalog_manager
{
var $public_functions = array('view' => True);
====================================================
Index: addressbook/inc/class.uicatalog_contact_addr_type.inc.php
diff -u addressbook/inc/class.uicatalog_contact_addr_type.inc.php:1.3
addressbook/inc/class.uicatalog_contact_addr_type.inc.php:1.4
--- addressbook/inc/class.uicatalog_contact_addr_type.inc.php:1.3 Tue May
10 14:25:03 2005
+++ addressbook/inc/class.uicatalog_contact_addr_type.inc.php Sun May 15
13:34:29 2005
@@ -1,25 +1,6 @@
<?php
- /**
- * Addressbook - user interface
- *
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @version $Id$
- */
-
-
- /**
- * Include catalog manager
- */
include('class.catalog_manager.inc.php');
-
- /**
- * user interface
- *
- * @package addressbook
- */
class uicatalog_contact_addr_type extends catalog_manager
{
var $public_functions = array('view' => True);
====================================================
Index: addressbook/inc/class.uiaddressbook_prefs.inc.php
diff -u addressbook/inc/class.uiaddressbook_prefs.inc.php:1.3
addressbook/inc/class.uiaddressbook_prefs.inc.php:1.4
--- addressbook/inc/class.uiaddressbook_prefs.inc.php:1.3 Tue May 10
14:25:03 2005
+++ addressbook/inc/class.uiaddressbook_prefs.inc.php Sun May 15 13:34:29 2005
@@ -1,19 +1,24 @@
<?php
- /**
- * Addressbook - UI for addressbook preferences
- *
- * @author Alex Borges <address@hidden>
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @version $Id$
- */
-
- /**
- * UI for addressbook preferences
- *
- * @package addressbook
- */
+ /**************************************************************************\
+ * phpGroupWare API - Commononly used functions *
+ * This file written by Alex Borges <address@hidden> *
+ * UI for addressbook preferences *
+ * Copyright (C) 2003 Free Software Foundation *
+ * -------------------------------------------------------------------------*
+ * This library is part of the phpGroupWare Addressbook app *
+ * http://www.phpgroupware.org/ *
+ * ------------------------------------------------------------------------ *
+ * This library 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. *
+ * This library 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 Lesser General Public License for more details. *
+ * You should have received a copy of the GNU General Public License *
+ * along with this library; if not, write to the Free Software Foundation, *
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
+ \**************************************************************************/
class uiaddressbook_prefs
{
var $prefs;
@@ -91,7 +96,7 @@
if($this->is_current_admin())
{
$temp=get_var('adm_pref_type',array('get','post'));
- //print "<BR><B>Admin user var
is".$temp."</B><BR>";
+ //print "<br /><B>Admin user var
is".$temp."</B><br />";
//Changed preference type tav
if(isset($temp))
{
@@ -99,7 +104,7 @@
if($temp !=
$this->map_tpl_to_real['adm_pref_type'])
{
- //print "<BR><B>Flushing
cache</B><BR>";
+ //print "<br /><B>Flushing
cache</B><br />";
$this->clear_dinamic_data();
}
$this->map_tpl_to_real['adm_pref_type']=$temp;
@@ -107,7 +112,7 @@
$this->build_admin_tabs();
}
$this->bo->read_preferences($this->map_tpl_to_real['adm_pref_type']);
- // print "<BR><B>current tab
is".$this->map_tpl_to_real['adm_pref_type']."</B><BR>";
+ // print "<br /><B>current tab
is".$this->map_tpl_to_real['adm_pref_type']."</B><br />";
$this->map_tpl_to_real['org_preferences_link']=$GLOBALS['phpgw']->link('/index.php',
array(
@@ -140,11 +145,11 @@
$tmp->app_name='addressbook';
//Forced category, can be an administrator not the
forced
//preferences tab
- //print "<BR><B>Default category is
".$this->bo->default_category_forced."</B><BR>";
- // print "<BR><B>Tab is
".$this->map_tpl_to_real['adm_pref_type']."</B><BR>";
+ //print "<br /><B>Default category is
".$this->bo->default_category_forced."</B><br />";
+ // print "<br /><B>Tab is
".$this->map_tpl_to_real['adm_pref_type']."</B><br />";
if($this->bo->default_category_forced &&
$this->map_tpl_to_real['adm_pref_type']!='forced')
{
- //print "<BR><B>FORCED cat</B><BR";
+ //print "<br /><B>FORCED cat</B><BR";
$ret="<option value='"
.$this->bo->default_category.
"'>".
@@ -234,7 +239,7 @@
//They have hit the button to add selected fields
if(get_var('select_fields',array('post','get')))
{
- /* print '<BR><B>selectfields</B><BR>'; */
+ /* print '<br /><B>selectfields</B><br />'; */
$temp='select_fields';
}
elseif(get_var('save',array('post','get')))
@@ -248,7 +253,7 @@
else
{
$temp=get_var('remove_me',array('get','post'));
- /*print '<BR><B>remove type'.$temp.'</B><BR>';*/
+ /*print '<br /><B>remove type'.$temp.'</B><br
/>';*/
if($this->selected_fields[$this->org_or_person][$temp])
{
@@ -263,9 +268,9 @@
$this->submit=$temp;
- /*print '<BR><B>selected </B>';
+ /*print '<br /><B>selected </B>';
print_r($this->selected_fields);
- print '<BR><B>Submited</B>';
+ print '<br /><B>Submited</B>';
print $this->submit; */
$temp=get_var('org_or_person',array('get','post'));
if($temp=='Organizations' || $temp == 'Persons')
@@ -290,11 +295,11 @@
$this->map_tpl_to_real['cat_options']=$this->get_addressbook_cats($temp);
}
$this->map_tpl_to_real['cat_id']=$temp;
- //print '<br><b>Selected
catid!'.$temp.'</b><br>';
+ //print '<br /><b>Selected
catid!'.$temp.'</b><br />';
}
else
{
- /// print '<br><b>Cached catid</b><br>';
+ /// print '<br /><b>Cached catid</b><br />';
//fetch from preferences
$this->map_tpl_to_real['cat_id']=$this->bo->default_category;
@@ -312,7 +317,7 @@
$this->map_tpl_to_real['cat_options']=$this->get_addressbook_cats($this->map_tpl_to_real['cat_id']);
}
- // print '<br><b>Preference catid</b><br>';
+ // print '<br /><b>Preference catid</b><br
/>';
}
}
@@ -350,8 +355,8 @@
$org_person_array['Persons']=$this->contacts->get_person_properties();
$org_person_array['Organizations']=$this->contacts->get_organization_properties();
- //print "<BR><B>orgpersonarray
properties".$orgpersonarray."</B><BR>";
- /*print "<br><b>catalogs</b><br>";*/
+ //print "<br /><B>orgpersonarray
properties".$orgpersonarray."</B><br />";
+ /*print "<br /><b>catalogs</b><br />";*/
//now go translating each field
reset($this->contacts->stock_contact_fields);
//Constructing simple 'showable' fields
@@ -366,7 +371,7 @@
if(!
in_array($falsefield,$org_person_array['Organizations']) )
{
$this->fields_show_selectbox[$falsefield]=$GLOBALS['phpgw']->lang($this->contacts->stock_contact_fields[$falsefield]);
- // print "<br><br><b>
$falsefield<\b>";
+ // print "<br /><br /><b>
$falsefield<\b>";
$this->lang_fields[$falsefield]=$this->fields_show_selectbox[$falsefield];
}
unset($org_person_array['Organizations'][$falsefield]);
@@ -396,23 +401,23 @@
{
if(!$this->selected_fields[$this->org_or_person]['comm_types'][$v])
{
- // print "<B><BR>Commtypes
$this->selected_fields[$this->org_or_person]['comm_types'][$v]</b><br>";
+ // print "<B><br />Commtypes
$this->selected_fields[$this->org_or_person]['comm_types'][$v]</b><br />";
$this->fields_show_selectbox['comm_types'][$v]=$v;
}
else
{
- // print "<B><BR>langfields
$this->lang_fields[$v]=$v</b><br>";
+ // print "<B><br />langfields
$this->lang_fields[$v]=$v</b><br />";
$this->lang_fields[$v]=$v;
}
}
/*
- print "<br><b>Columns</b><br>";
+ print "<br /><b>Columns</b><br />";
print_r($this->lang_fields);
- print "<br><b>Columns</b><br>"; */
+ print "<br /><b>Columns</b><br />"; */
}
function linearize_query($qresult,$key)
{
@@ -427,40 +432,40 @@
function get_exact_fields()
{
//Selecting fields, let it roll
- /*print '<BR><B>SELECTFIELDS!</B><BR>';*/
+ /*print '<br /><B>SELECTFIELDS!</B><br />';*/
if(is_array($this->cached_selected_fields[$this->org_or_person]) &&
is_array($this->selected_fields[$this->org_or_person]))
{
//We have cached selected fields, and someone
selected more
//Need to agregate the selected to the cached
- /*print '<BR><B>Merging Selected
Fields</B><BR>';
+ /*print '<br /><B>Merging Selected
Fields</B><br />';
print_r($this->selected_fields[$this->org_or_person]);
- print '<BR><B>Merging Cached Selected
Fields</B><BR>';
+ print '<br /><B>Merging Cached Selected
Fields</B><br />';
print_r($this->cached_selected_fields[$this->org_or_person]);
*/
$this->cached_selected_fields[$this->org_or_person]=$this->selected_fields[$this->org_or_person]=array_merge_recursive($this->cached_selected_fields[$this->org_or_person],$this->selected_fields[$this->org_or_person]);
- // print '<BR><B>Merging Result</B><BR>';
+ // print '<br /><B>Merging Result</B><br />';
//
print_r($this->selected_fields[$this->org_or_person]);
}
elseif(is_array($this->selected_fields[$this->org_or_person]))
{
$this->cached_selected_fields[$this->org_or_person]=$this->selected_fields[$this->org_or_person];
- //print '<BR><B>Selected awright</B><BR>';
+ //print '<br /><B>Selected awright</B><br />';
}
elseif(is_array($this->cached_selected_fields[$this->org_or_person]))
{
$this->selected_fields[$this->org_or_person]=$this->cached_selected_fields[$this->org_or_person];
- //print '<BR><B>Cached awright</B><BR>';
+ //print '<br /><B>Cached awright</B><br />';
}
elseif($this->org_or_person == 'Persons' &&
is_array($this->bo->person_columns))
{
- //print '<BR><B>Old preferences found</B><BR>';
+ //print '<br /><B>Old preferences found</B><br
/>';
$this->selected_fields['Persons']=$this->cached_selected_fields['Persons']=$this->bo->person_columns;
}
elseif($this->org_or_person == 'Organizations' &&
is_array($this->bo->org_columns))
{
- //print '<BR><B>Old preferences found</B><BR>';
+ //print '<br /><B>Old preferences found</B><br
/>';
$this->selected_fields['Organizations']=$this->cached_selected_fields['Organizations']=$this->bo->org_columns;
}
@@ -468,7 +473,7 @@
function index()
{
$this->get_vars();
- /*print '<BR><B>It is a
!'.$this->org_or_person.'</B><BR>';*/
+ /*print '<br /><B>It is a
!'.$this->org_or_person.'</B><br />';*/
switch($this->submit)
{
@@ -504,10 +509,10 @@
$this->bo->org_columns=$org_columns;
- //print
'<BR><B>Catid'.$this->map_tpl_to_real['cat_id'].'</B><BR>';
+ //print '<br
/><B>Catid'.$this->map_tpl_to_real['cat_id'].'</B><br />';
$this->bo->default_category=$this->map_tpl_to_real['cat_id'];
- //print "<BR><B>Person Columns";
-
//print_r($this->bo->person_columns)."</B><BR>";
+ //print "<br /><B>Person Columns";
+
//print_r($this->bo->person_columns)."</B><br />";
$this->bo->save_preferences($this->map_tpl_to_real['adm_pref_type']);
// $this->save_sessiondata(true);
@@ -522,16 +527,16 @@
{
//if removing
- //print '<BR><B>Removing!</B><BR>';
+ //print '<br /><B>Removing!</B><br />';
if($this->cached_selected_fields[$this->org_or_person][$this->remove_me])
{
//kill the field to be removed
- //print
'<BR><B>Removing!'.$this->remove_me.'</B><BR>';
+ //print '<br
/><B>Removing!'.$this->remove_me.'</B><br />';
unset($this->cached_selected_fields[$this->org_or_person][$this->remove_me]);
}
elseif($this->cached_selected_fields[$this->org_or_person]['comm_types'][$this->remove_me])
{
- //print
'<BR><B>Removing!'.$this->remove_me.'</B><BR>';
+ //print '<br
/><B>Removing!'.$this->remove_me.'</B><br />';
unset($this->cached_selected_fields[$this->org_or_person]['comm_types'][$this->remove_me]);
}
//Look if we remove_me is the last
field to be removed
@@ -558,7 +563,7 @@
//Selecting fields, let it roll
- //print '<BR><B>SELECTFIELDS!</B><BR>';
+ //print '<br /><B>SELECTFIELDS!</B><br
/>';
$this->get_exact_fields();
//print_r($this->selected_fields);
@@ -629,7 +634,7 @@
$this->template->set_block('principal_tabs_t','principal_button');
$this->template->set_block('principal_tabs_t','principal_tab');
- //print '<BR><B>Now it is a '.$this->org_or_person.'</B><BR>';
+ //print '<br /><B>Now it is a '.$this->org_or_person.'</B><br
/>';
$this->parse_principal_tabs(
$this->map_tpl_to_real['person_preferences_link'],
$this->get_class_css(
@@ -680,7 +685,7 @@
if(count($this->fields_show_selectbox) > 1)
{
reset($this->fields_show_selectbox);
- // print "<BR><B> To Show in
Selectbox<br>".print_r($this->fields_show_selectbox)."</B><BR>";
+ // 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))
{
//not a comtype
@@ -722,7 +727,7 @@
}
$this->template->set_block('selected_rows_t','B_selected_rows','V_selected_rows');
- //print "<BR><B>Selected</B><BR>";
+ //print "<br /><B>Selected</B><br />";
//print_r($this->selected_fields[$this->org_or_person]);
reset($this->selected_fields[$this->org_or_person]);
while(list($k,$v)=each($this->selected_fields[$this->org_or_person]))
@@ -812,7 +817,7 @@
}
else
{
- // print '<BR><B>Clearing Cache </B><BR>';
+ // print '<br /><B>Clearing Cache </B><br />';
$GLOBALS['phpgw']->session->appsession('session_data','addressbookpref','');
}
@@ -820,7 +825,7 @@
function read_sessiondata()
{
-// print '<BR><B>READING SESSIONDATA!</B><BR>';
+// print '<br /><B>READING SESSIONDATA!</B><br />';
$data=$GLOBALS['phpgw']->session->appsession('session_data','addressbookpref');
$this->cached_selected_fields=$data['selected_fields'];
$this->map_tpl_to_real=$data['map_tpl_to_real'];
@@ -840,7 +845,7 @@
function session_data_saved()
{
$data=$GLOBALS['phpgw']->session->appsession('session_data','addressbookpref');
- //print "<BR><B>Actually got sessiondata</B><BR>";
+ //print "<br /><B>Actually got sessiondata</B><br />";
//print_r($data);
return is_array($data);
}
@@ -856,7 +861,7 @@
}
function get_class_css($tab, $current_tab)
{
- //print "<BR><B>ITS AN $tab == $current_tab";
+ //print "<br /><B>ITS AN $tab == $current_tab";
if ($tab == $current_tab)
{
return 'button_style_sel';
@@ -907,8 +912,8 @@
function is_current_admin()
{
-// print "<BR><B> Current is admin? ".
-
$GLOBALS['phpgw']->acl->check('run',1,'admin')."</B><BR>";
+// print "<br /><B> Current is admin? ".
+
$GLOBALS['phpgw']->acl->check('run',1,'admin')."</B><br />";
return $GLOBALS['phpgw']->acl->check('run',1,'admin');
}
====================================================
Index: addressbook/inc/class.uiXport.inc.php
diff -u addressbook/inc/class.uiXport.inc.php:1.21
addressbook/inc/class.uiXport.inc.php:1.22
--- addressbook/inc/class.uiXport.inc.php:1.21 Tue May 10 14:25:03 2005
+++ addressbook/inc/class.uiXport.inc.php Sun May 15 13:34:29 2005
@@ -1,20 +1,17 @@
<?php
- /**
- * Addressbook - user interface
- *
- * @author Joseph Engo <address@hidden>
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @version $Id$
- */
-
-
- /**
- * user interface
- *
- * @package addressbook
- */
+ /**************************************************************************\
+ * phpGroupWare - addressbook *
+ * http://www.phpgroupware.org *
+ * Written by Joseph Engo <address@hidden> *
+ * -------------------------------------------- *
+ * 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. *
+ \**************************************************************************/
+
+ /* $Id$ */
+
class uiXport
{
var $template;
====================================================
Index: addressbook/inc/class.uiaddressbook.inc.php
diff -u addressbook/inc/class.uiaddressbook.inc.php:1.59
addressbook/inc/class.uiaddressbook.inc.php:1.60
--- addressbook/inc/class.uiaddressbook.inc.php:1.59 Tue May 10 14:29:14 2005
+++ addressbook/inc/class.uiaddressbook.inc.php Sun May 15 13:34:29 2005
@@ -1,22 +1,20 @@
<?php
- /**
- * Addressbook - user interface
- *
- * @author Joseph Engo <address@hidden>
- * @author Miles Lott <address@hidden>
- * @author Jonathan Alberto Rivera <jarg@ co.com.mx>
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @version $Id$
- */
-
-
- /**
- * user interface
- *
- * @package addressbook
- */
+ /**************************************************************************\
+ * phpGroupWare - Addressbook *
+ * http://www.phpgroupware.org *
+ * Originally Written by Joseph Engo <address@hidden> and *
+ * Miles Lott <miloschphpgroupware.org> *
+ * Heavy changes (near rewrite) by Jonathan Alberto Rivera <jarg AT
co.com.mx> *
+ * -------------------------------------------- *
+ * 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. *
+ \**************************************************************************/
+
+ /* $Id$ */
+
+
class uiaddressbook
{
var $template;
@@ -37,6 +35,7 @@
var $filter;
var $cat_id;
var $bname;
+ var $template;
var $options_data;
var $old_tab;
@@ -149,7 +148,7 @@
'cat_id' => $this->cat_id,
'qfield' => $this->qfield
);
- echo '<br>UI:';
+ echo '<br />UI:';
_debug_array($data);
}
@@ -558,6 +557,9 @@
/**
* Add Person Enviromet, this controls all process to add a
person
+ *
+ * @param
+ * @return
*/
function add_person()
{
@@ -631,6 +633,9 @@
/**
* Edit Person Enviromet, this controls all process to edit a
person
+ *
+ * @param
+ * @return
*/
function edit_person()
{
@@ -719,6 +724,9 @@
/**
* Delete persons from db
+ *
+ * @param
+ * @return
*/
function delete_person($person_id='')
{
@@ -730,7 +738,10 @@
}
/**
- * View all persons data from db
+ * Viwe all persons data from db
+ *
+ * @param
+ * @return
*/
function view_person()
{
@@ -741,6 +752,9 @@
/**
* Copy all data from a person to new person
+ *
+ * @param
+ * @return
*/
function copy_person()
{
@@ -757,6 +771,9 @@
/**
* Add Organization Enviromet, this controls all process to add
orgs
+ *
+ * @param
+ * @return
*/
function add_org()
{
@@ -827,6 +844,9 @@
/**
* Edit Organization Enviromet, this controls all process to add
orgs
+ *
+ * @param
+ * @return
*/
function edit_org()
{
@@ -916,6 +936,9 @@
/**
* Delete Organization
+ *
+ * @param
+ * @return
*/
function delete_org($org_id='')
{
@@ -928,6 +951,9 @@
/**
* View Organization
+ *
+ * @param
+ * @return
*/
function view_org()
{
@@ -938,6 +964,9 @@
/**
* Copy Organization
+ *
+ * @param
+ * @return
*/
function copy_org()
{
@@ -954,6 +983,9 @@
/**
* Start to draw the html screens
+ *
+ * @param
+ * @return
*/
function main_form($fields, $section, $form_tab)
{
@@ -962,7 +994,7 @@
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
- //print 'fields:<br>';
+ //print 'fields:<br />';
$js_submit = '';
$fields['owner'] =
$fields['owner']?$fields['owner']:$this->owner;
if ($this->bo->check_delete($this->contact_id))
@@ -1077,6 +1109,9 @@
/**
* Get the screen from the selected tab
+ *
+ * @param
+ * @return
*/
function current_body($form_section,$fields, $section)
{
@@ -1148,6 +1183,9 @@
/**
* Draw the principal persons data tab window
+ *
+ * @param
+ * @return
*/
function person_form($fields)
{
@@ -1188,6 +1226,9 @@
/**
* Draw the principal organizations data tab window
+ *
+ * @param
+ * @return
*/
function org_form($fields)
{
@@ -1214,6 +1255,9 @@
/**
* Draw the comunications media tab window
+ *
+ * @param
+ * @return
*/
function comm_form($fields)
{
@@ -1248,6 +1292,9 @@
/**
* Draw the address tab window
+ *
+ * @param
+ * @return
*/
function address_form($fields)
{
@@ -1442,6 +1489,9 @@
/**
* This function draw the tab screen what is used for categories,
* Persons from an Organization and Organizations from a Person
+ *
+ * @param
+ * @return
*/
function many_actions_form($option, $all_data_name,
$my_data_name, $defaul_data_name, $all_opts,
$my_opts, $my_opts_array, $selected,
$section, $fields)
@@ -1595,6 +1645,9 @@
/**
* This function initialize the template for draw the tabs
windows
+ *
+ * @param
+ * @return
*/
function form_start()
{
@@ -1608,6 +1661,9 @@
/**
* This function end the template for draw the tabs windows
+ *
+ * @param
+ * @return
*/
function form_end()
{
@@ -1620,6 +1676,9 @@
/**
* Get the principal tabs (Persons and Organizations)
+ *
+ * @param
+ * @return
*/
function get_principal_tabs($action, $class_css, $name, $value)
{
@@ -1634,6 +1693,9 @@
/**
* Get the tabs
+ *
+ * @param
+ * @return
*/
function get_tabs($button_name, $button_caption, $class_css)
{
@@ -1646,6 +1708,9 @@
/**
* Get the correct css for the tab
+ *
+ * @param
+ * @return
*/
function get_class_css($tab, $current_tab)
{
@@ -2589,7 +2654,7 @@
$owner = $data['owner'];
- if(!$this->bo->can_delete($contact_id, $owner))
+ if(!$this->bo->check_delete($contact_id, $owner))
{
Header('Location: '
. $GLOBALS['phpgw']->link('/index.php',
====================================================
Index: addressbook/inc/class.uicategorize_contacts.inc.php
diff -u addressbook/inc/class.uicategorize_contacts.inc.php:1.3
addressbook/inc/class.uicategorize_contacts.inc.php:1.4
--- addressbook/inc/class.uicategorize_contacts.inc.php:1.3 Tue May 10
14:25:03 2005
+++ addressbook/inc/class.uicategorize_contacts.inc.php Sun May 15 13:34:29 2005
@@ -1,21 +1,22 @@
<?php
- /**
- * Addressbook - user interface
- *
- * @author Jonathan Alberto Rivera Gomez <address@hidden>
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @version $Id$
- * @internal Development of this application was funded by
http://www.sogrp.com/
- */
-
-
- /**
- * user interface
- *
- * @package addressbook
- */
+ /**************************************************************************\
+ * phpGroupWare - uicategorize_contacts *
+ * 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 uicategorize_contacts
{
var $public_functions = array(
====================================================
Index: addressbook/inc/class.uifields.inc.php
diff -u addressbook/inc/class.uifields.inc.php:1.13
addressbook/inc/class.uifields.inc.php:1.14
--- addressbook/inc/class.uifields.inc.php:1.13 Tue May 10 14:25:03 2005
+++ addressbook/inc/class.uifields.inc.php Sun May 15 13:34:29 2005
@@ -1,21 +1,18 @@
<?php
- /**
- * Addressbook - user interface
- *
- * @author Joseph Engo <address@hidden>
- * @author Miles Lott <miloschphpgroupware.org>
- * @copyright Copyright (C) 2002-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @version $Id$
- */
-
-
- /**
- * user interface
- *
- * @package addressbook
- */
+ /**************************************************************************\
+ * phpGroupWare - Addressbook *
+ * http://www.phpgroupware.org *
+ * Written by Joseph Engo <address@hidden> and *
+ * Miles Lott <miloschphpgroupware.org> *
+ * ----------------------------------------------- *
+ * 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. *
+ \**************************************************************************/
+
+ /* $Id$ */
+
class uifields
{
var $public_functions = array(
====================================================
Index: addressbook/inc/hook_addressbook_add_def_acl.inc.php
diff -u addressbook/inc/hook_addressbook_add_def_acl.inc.php:1.3
addressbook/inc/hook_addressbook_add_def_acl.inc.php:1.4
--- addressbook/inc/hook_addressbook_add_def_acl.inc.php:1.3 Tue May 10
13:18:09 2005
+++ addressbook/inc/hook_addressbook_add_def_acl.inc.php Sun May 15
13:34:30 2005
@@ -1,16 +1,7 @@
<?php
- /**
- * Addressbook - Hook for acls
- *
- * Add default acl to allow the new user to access their addressbook
- * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @subpackage hooks
- * @version $Id$
- */
-
global $acl,$account_id;
+ // Add default acl to allow the new user to access their
+ // addressbook
// This file is not really needed or used at this time
$acl->add('addressbook','u_'.$account_id,1);
?>
====================================================
Index: addressbook/inc/class.addressbook_importer.inc.php
diff -u addressbook/inc/class.addressbook_importer.inc.php:1.3
addressbook/inc/class.addressbook_importer.inc.php:1.4
--- addressbook/inc/class.addressbook_importer.inc.php:1.3 Tue May 10
13:35:44 2005
+++ addressbook/inc/class.addressbook_importer.inc.php Sun May 15 13:34:29 2005
@@ -1,21 +1,22 @@
<?php
- /**
- * Addressbook - Importer
- *
- * @author Jonathan Alberto Rivera Gomez <address@hidden>
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @version $Id$
- * @internal Development of this application was funded by
http://www.sogrp.com/
- */
+ /**************************************************************************\
+ * phpGroupWare - uicategorize_contacts *
+ * 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. *
+ \**************************************************************************/
-
- /**
- * Importer
- *
- * @package addressbook
- */
class addressbook_importer
{
var $record;
====================================================
Index: addressbook/inc/hook_add_def_pref.inc.php
diff -u addressbook/inc/hook_add_def_pref.inc.php:1.4
addressbook/inc/hook_add_def_pref.inc.php:1.5
--- addressbook/inc/hook_add_def_pref.inc.php:1.4 Tue May 10 13:18:09 2005
+++ addressbook/inc/hook_add_def_pref.inc.php Sun May 15 13:34:30 2005
@@ -1,14 +1,4 @@
<?php
- /**
- * Addressbook - Hook for preferences
- *
- * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @subpackage hooks
- * @version $Id$
- */
-
$GLOBALS['pref']->change('addressbook','company','addressbook_True');
$GLOBALS['pref']->change('addressbook','lastname','addressbook_True');
$GLOBALS['pref']->change('addressbook','firstname','addressbook_True');
====================================================
Index: addressbook/inc/functions.inc.php
diff -u addressbook/inc/functions.inc.php:1.104
addressbook/inc/functions.inc.php:1.105
--- addressbook/inc/functions.inc.php:1.104 Tue May 10 13:18:09 2005
+++ addressbook/inc/functions.inc.php Sun May 15 13:34:30 2005
@@ -1,30 +1,22 @@
<?php
- /**
- * Addressbook
- *
- * @author Joseph Engo <address@hidden>
- * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @version $Id$
- */
-
-
- /**
- * Create a HTML selectbox
- *
- * @param string $name Name for select box
- * @param array $list Key/value array with options for selectbox
- * @param string $id Key for preselected option
- * @param boolean $default Add "please select" as first option when true
- * @param boolean $java Unused
- * @return string String with HTML code for selection box
- */
+ /**************************************************************************\
+ * phpGroupWare - addressbook *
+ * http://www.phpgroupware.org *
+ * Written by Joseph Engo <address@hidden> *
+ * -------------------------------------------- *
+ * 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. *
+ \**************************************************************************/
+
+ /* $Id$ */
+
function formatted_list($name,$list,$id='',$default=False,$java=False)
{
if ($java)
{
- $jselect = ' onchange="this.form.submit();"';
+ $jselect = ' onChange="this.form.submit();"';
}
$select = "\n" .'<select name="' . $name . '"' . $jselect .
">\n";
@@ -37,7 +29,7 @@
$select .= '<option value="' . $key . '"';
if ($key == $id && $id != '')
{
- $select .= ' selected="selected"';
+ $select .= ' selected';
}
$select .= '>' . $val . '</option>'."\n";
}
@@ -158,7 +150,7 @@
}
else
{
- /* echo "<br>".$j.":
'".$fields[$j]['name']."'"; */
+ /* echo "<br />".$j.":
'".$fields[$j]['name']."'"; */
$j++;
}
}
====================================================
Index: addressbook/inc/class.uivcard.inc.php
diff -u addressbook/inc/class.uivcard.inc.php:1.12
addressbook/inc/class.uivcard.inc.php:1.13
--- addressbook/inc/class.uivcard.inc.php:1.12 Tue May 10 14:25:03 2005
+++ addressbook/inc/class.uivcard.inc.php Sun May 15 13:34:30 2005
@@ -1,21 +1,18 @@
<?php
- /**
- * Addressbook - user interface
- *
- * @author Joseph Engo <address@hidden>
- * @author Miles Lott <miloschphpgroupware.org>
- * @copyright Copyright (C) 2002-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @version $Id$
- */
-
-
- /**
- * user interface
- *
- * @package addressbook
- */
+ /**************************************************************************\
+ * phpGroupWare - Addressbook *
+ * http://www.phpgroupware.org *
+ * Written by Joseph Engo <address@hidden> and *
+ * Miles Lott <miloschphpgroupware.org> *
+ * -------------------------------------------- *
+ * 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. *
+ \**************************************************************************/
+
+ /* $Id$ */
+
class uivcard
{
var $template;
@@ -55,12 +52,12 @@
if ($action == 'GetFile')
{
- echo '<b><center>' . lang('You must select a
vcard. (*.vcf)') . '</b></center><br><br>';
+ echo '<b><center>' . lang('You must select a
vcard. (*.vcf)') . '</b></center><br /><br />';
}
$this->template->set_file(array('vcardin' =>
'vcardin.tpl'));
- $this->template->set_var('vcard_header','<p> <b>'
. lang('Address book - VCard in') . '</b><hr><p>');
+ $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'));
@@ -228,7 +225,7 @@
{
if ($myexport[$name] && ($value != "") )
{
- //echo
'<br>'.$name."=".$fields[$name]."\n";
+ //echo '<br
/>'.$name."=".$fields[$name]."\n";
$buffer[$myexport[$name]] =
$value;
}
}
@@ -247,9 +244,9 @@
if($nofname)
{
- echo '<br><br><center>';
- 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 '<br /><br /><center>';
+ 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>';
@@ -257,9 +254,9 @@
if($nolname)
{
- echo '<br><br><center>';
- 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 '<br /><br /><center>';
+ 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>';
====================================================
Index: addressbook/inc/class.widget_lists.inc.php
diff -u addressbook/inc/class.widget_lists.inc.php:1.3
addressbook/inc/class.widget_lists.inc.php:1.4
--- addressbook/inc/class.widget_lists.inc.php:1.3 Tue May 10 14:25:03 2005
+++ addressbook/inc/class.widget_lists.inc.php Sun May 15 13:34:30 2005
@@ -1,21 +1,21 @@
<?php
- /**
- * Addressbook - user interface
- *
- * @author Jonathan Alberto Rivera Gomez - <address@hidden>
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @version $Id$
- * @internal Development of this application was funded by
http://www.sogrp.com/
- */
-
-
- /**
- * user interface
- *
- * @package addressbook
- */
+ /**************************************************************************\
+ * phpGroupWare - widget_lists
*
+ * 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 widget_lists
{
var $title;
====================================================
Index: addressbook/inc/class.socatalog_contact_note_type.inc.php
diff -u addressbook/inc/class.socatalog_contact_note_type.inc.php:1.3
addressbook/inc/class.socatalog_contact_note_type.inc.php:1.4
--- addressbook/inc/class.socatalog_contact_note_type.inc.php:1.3 Tue May
10 14:14:18 2005
+++ addressbook/inc/class.socatalog_contact_note_type.inc.php Sun May 15
13:34:29 2005
@@ -1,19 +1,4 @@
<?php
- /**
- * Addressbook - storage class
- *
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @version $Id$
- */
-
-
- /**
- * storage class
- *
- * @package addressbook
- */
class socatalog_contact_note_type
{
function socatalog_contact_note_type()
====================================================
Index: addressbook/inc/hook_admin.inc.php
diff -u addressbook/inc/hook_admin.inc.php:1.16
addressbook/inc/hook_admin.inc.php:1.17
--- addressbook/inc/hook_admin.inc.php:1.16 Tue May 10 13:18:09 2005
+++ addressbook/inc/hook_admin.inc.php Sun May 15 13:34:30 2005
@@ -1,15 +1,17 @@
<?php
- /**
- * Addressbook - Hook for preferences
- *
- * @author Joseph Engo <address@hidden>
- * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @subpackage hooks
- * @version $Id$
- * @internal $Source$
- */
+
/**************************************************************************\
+ * phpGroupWare
*
+ * http://www.phpgroupware.org
*
+ * Written by Joseph Engo <address@hidden> *
+ * --------------------------------------------
*
+ * 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.
*
+
\**************************************************************************/
+
+ // $Id$
+ // $Source$
// Only Modify the $file and $title variables.....
$title = $appname;
@@ -22,6 +24,6 @@
'Location Manager' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uicatalog_contact_addr_type.view'),
'Notes Types Manager' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uicatalog_contact_note_type.view')
);
- // Do not modify below this line
+ //Do not modify below this line
display_section($appname,$title,$file);
?>
====================================================
Index: addressbook/inc/class.bocatalog_contact_comm_descr.inc.php
diff -u addressbook/inc/class.bocatalog_contact_comm_descr.inc.php:1.3
addressbook/inc/class.bocatalog_contact_comm_descr.inc.php:1.4
--- addressbook/inc/class.bocatalog_contact_comm_descr.inc.php:1.3 Tue May
10 13:55:15 2005
+++ addressbook/inc/class.bocatalog_contact_comm_descr.inc.php Sun May 15
13:34:29 2005
@@ -1,19 +1,4 @@
<?php
- /**
- * Addressbook - Business Logic for addressbook
- *
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @version $Id$
- */
-
-
- /**
- * Business Logic for addressbook
- *
- * @package addressbook
- */
class bocatalog_contact_comm_descr
{
function bocatalog_contact_comm_descr()
====================================================
Index: addressbook/inc/class.bocatalog_contact_comm_type.inc.php
diff -u addressbook/inc/class.bocatalog_contact_comm_type.inc.php:1.3
addressbook/inc/class.bocatalog_contact_comm_type.inc.php:1.4
--- addressbook/inc/class.bocatalog_contact_comm_type.inc.php:1.3 Tue May
10 13:55:15 2005
+++ addressbook/inc/class.bocatalog_contact_comm_type.inc.php Sun May 15
13:34:29 2005
@@ -1,19 +1,4 @@
<?php
- /**
- * Addressbook - Business Logic for addressbook
- *
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @version $Id$
- */
-
-
- /**
- * Business Logic for addressbook
- *
- * @package addressbook
- */
class bocatalog_contact_comm_type
{
function bocatalog_contact_comm_type()
====================================================
Index: addressbook/inc/class.bocatalog_contact_addr_type.inc.php
diff -u addressbook/inc/class.bocatalog_contact_addr_type.inc.php:1.3
addressbook/inc/class.bocatalog_contact_addr_type.inc.php:1.4
--- addressbook/inc/class.bocatalog_contact_addr_type.inc.php:1.3 Tue May
10 13:55:15 2005
+++ addressbook/inc/class.bocatalog_contact_addr_type.inc.php Sun May 15
13:34:29 2005
@@ -1,19 +1,4 @@
<?php
- /**
- * Addressbook - Business Logic for addressbook
- *
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @version $Id$
- */
-
-
- /**
- * Business Logic for addressbook
- *
- * @package addressbook
- */
class bocatalog_contact_addr_type
{
function bocatalog_contact_addr_type()
====================================================
Index: addressbook/inc/class.boaddressbook_prefs.inc.php
diff -u addressbook/inc/class.boaddressbook_prefs.inc.php:1.3
addressbook/inc/class.boaddressbook_prefs.inc.php:1.4
--- addressbook/inc/class.boaddressbook_prefs.inc.php:1.3 Tue May 10
13:55:15 2005
+++ addressbook/inc/class.boaddressbook_prefs.inc.php Sun May 15 13:34:29 2005
@@ -1,20 +1,24 @@
<?php
- /**
- * Addressbook - Business Logic for addressbook preferences
- *
- * @author Alex Borges <address@hidden>
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @version $Id$
- */
-
-
-/**
-* Business Logic for addressbook preferences
-*
-* @package addressbook
-*/
+ /**************************************************************************\
+ * phpGroupWare API - Commononly used functions *
+ * This file written by Alex Borges <address@hidden> *
+ * Business Logic for addressbook preferences *
+ * Copyright (C) 2003 Alex Borges *
+ * -------------------------------------------------------------------------*
+ * This library is part of the phpGroupWare Addressbook app *
+ * http://www.phpgroupware.org/ *
+ * ------------------------------------------------------------------------ *
+ * This library 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. *
+ * This library 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 library; if not, write to the Free Software Foundation, *
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
+ \**************************************************************************/
class boaddressbook_prefs
{
var $preferences;
@@ -39,13 +43,13 @@
isset($this->person_columns['comm_types'])
&&(count($this->person_columns['comm_types'])>0)))
{
- //print "<BR><B>count(Person )columns >=
1".print_r($this->person_columns)."</B><BR>";
+ //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);
}
else
{
- //print "<BR><B>Deleting person_columns
$type</B><BR>";
+ //print "<br /><B>Deleting person_columns
$type</B><br />";
$this->preferences->delete('addressbook',"person_columns",$type);
$this->remove_from_forced("person_columns");
}
@@ -70,7 +74,7 @@
{
$this->preferences->delete('addressbook','org_columns',$type);
- //print "<BR><B>Deleting person_columns
$type</B><BR>";
+ //print "<br /><B>Deleting person_columns
$type</B><br />";
$this->remove_from_forced("org_columns");
$this->org_columns_forced=false;
}
@@ -115,7 +119,7 @@
if(!$this->org_columns_forced && $type=='forced')
{
- //print "<BR><B>GRABLING</B><BR>";
+ //print "<br /><B>GRABLING</B><br />";
unset($this->org_columns);
}
====================================================
Index: addressbook/inc/class.boXport.inc.php
diff -u addressbook/inc/class.boXport.inc.php:1.11
addressbook/inc/class.boXport.inc.php:1.12
--- addressbook/inc/class.boXport.inc.php:1.11 Tue May 10 13:55:15 2005
+++ addressbook/inc/class.boXport.inc.php Sun May 15 13:34:29 2005
@@ -1,20 +1,17 @@
<?php
- /**
- * Addressbook - Business Logic for addressbook
- *
- * @author Joseph Engo <address@hidden>
- * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @version $Id$
- */
-
-
- /**
- * Business Logic for addressbook
- *
- * @package addressbook
- */
+ /**************************************************************************\
+ * phpGroupWare - addressbook *
+ * http://www.phpgroupware.org *
+ * Written by Joseph Engo <address@hidden> *
+ * -------------------------------------------- *
+ * 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. *
+ \**************************************************************************/
+
+ /* $Id$ */
+
class boXport
{
var $public_functions = array(
@@ -70,7 +67,7 @@
'filter' => $filter,
'cat_id' => $cat_id
);
- if($this->debug) { echo '<br>Save:';
_debug_array($data); }
+ if($this->debug) { echo '<br />Save:';
_debug_array($data); }
$GLOBALS['phpgw']->session->appsession('session_data','addressbook',$data);
}
}
@@ -78,7 +75,7 @@
function read_sessiondata()
{
$data =
$GLOBALS['phpgw']->session->appsession('session_data','addressbook');
- if($this->debug) { echo '<br>Read:';
_debug_array($data); }
+ if($this->debug) { echo '<br />Read:';
_debug_array($data); }
$this->start = $data['start'];
$this->limit = $data['limit'];
@@ -170,7 +167,7 @@
$name = "homeurl";
$value = $url. ':' .
$value;
}
- //echo '<br>'.$j.': '.$name.'
=> '.$value;
+ //echo '<br />'.$j.': '.$name.'
=> '.$value;
if ($contacts->import[$name] !=
'' && $value != '')
{
$buffer =
$contacts->import_new_attrib($buffer, $contacts->import[$name],$value);
====================================================
Index: addressbook/inc/class.boaddressbook.inc.php
diff -u addressbook/inc/class.boaddressbook.inc.php:1.27
addressbook/inc/class.boaddressbook.inc.php:1.28
--- addressbook/inc/class.boaddressbook.inc.php:1.27 Tue May 10 13:55:14 2005
+++ addressbook/inc/class.boaddressbook.inc.php Sun May 15 13:34:29 2005
@@ -1,21 +1,24 @@
<?php
- /**
- * Addressbook - Business Logic for addressbook
- *
- * @author Jonathan Alberto Rivera Gomez <address@hidden>
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @version $Id$
- * @internal Development of this application was funded by
http://www.sogrp.com/
- */
-
-
- /**
- * Business Logic for addressbook
- *
- * @package addressbook
- */
+ /**************************************************************************\
+ * phpGroupWare - boaddressbook *
+ * 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. *
+ \**************************************************************************/
+
+/* $Id$ */
+
class boaddressbook
{
var $debug = False;
@@ -68,7 +71,7 @@
{
if ($this->use_session)
{
- if($this->debug) { echo '<br>Save:';
_debug_array($data); }
+ if($this->debug) { echo '<br />Save:';
_debug_array($data); }
$GLOBALS['phpgw']->session->appsession('session_data','addressbook',$data);
}
}
@@ -77,7 +80,7 @@
function read_sessiondata()
{
$data =
$GLOBALS['phpgw']->session->appsession('session_data','addressbook');
- if($this->debug) { echo '<br>Read:';
_debug_array($data); }
+ if($this->debug) { echo '<br />Read:';
_debug_array($data); }
$this->start = $data['start'];
$this->limit = $data['limit'];
@@ -87,7 +90,7 @@
$this->filter = $data['filter'];
$this->cat_id = $data['cat_id'];
$this->qfield = $data['qfield'];
- if($this->debug) { echo '<br>read_sessiondata();';
$this->_debug_sqsof(); }
+ if($this->debug) { echo '<br />read_sessiondata();';
$this->_debug_sqsof(); }
}
function _set_session_data()
@@ -105,7 +108,7 @@
if(!empty($_start) || ($_start == '0') || ($_start ==
0))
{
- if($this->debug) { echo '<br>overriding $start:
"' . $this->start . '" now "' . $_start . '"'; }
+ if($this->debug) { echo '<br />overriding
$start: "' . $this->start . '" now "' . $_start . '"'; }
$this->start = $_start;
}
if($_limit)
@@ -114,7 +117,7 @@
}
if((empty($_query) && !empty($this->query)) ||
!empty($_query))
{
- if($this->debug) { echo '<br>overriding $query:
"' . $this->query . '" now "' . urldecode(addslashes($_query)) . '"'; }
+ if($this->debug) { echo '<br />overriding
$query: "' . $this->query . '" now "' . urldecode(addslashes($_query)) . '"'; }
if($this->query !=
urldecode(addslashes($_query)))
{
$this->start = 0;
@@ -124,7 +127,7 @@
if(isset($_fcat_id) && $_fcat_id!='')
{
- if($this->debug) { echo '<br>overriding
$cat_id: "' . $this->cat_id . '" now "' . $_fcat_id . '"'; }
+ if($this->debug) { echo '<br />overriding
$cat_id: "' . $this->cat_id . '" now "' . $_fcat_id . '"'; }
if($this->cat_id != $_fcat_id)
{
$this->start = 0;
@@ -134,19 +137,19 @@
if(isset($_sort) && !empty($_sort))
{
- if($this->debug) { echo '<br>overriding $sort:
"' . $this->sort . '" now "' . $_sort . '"'; }
+ if($this->debug) { echo '<br />overriding
$sort: "' . $this->sort . '" now "' . $_sort . '"'; }
$this->sort = $_sort;
}
if(isset($_order) && !empty($_order))
{
- if($this->debug) { echo '<br>overriding $order:
"' . $this->order . '" now "' . $_order . '"'; }
+ if($this->debug) { echo '<br />overriding
$order: "' . $this->order . '" now "' . $_order . '"'; }
$this->order = $_order;
}
if(isset($_filter) && !empty($_filter))
{
- if($this->debug) { echo '<br>overriding
$filter: "' . $this->filter . '" now "' . $_filter . '"'; }
+ if($this->debug) { echo '<br />overriding
$filter: "' . $this->filter . '" now "' . $_filter . '"'; }
if($this->filter != $_filter)
{
$this->start = 0;
@@ -237,7 +240,7 @@
* @param string $orderby The field which you want order
* @param string $sort ASC | DESC depending what you want
* @param mixed $criteria All criterias what you want
- * @param mixed $criteria_token same like $criteria but
builded<br>with sql_criteria class, more powerfull
+ * @param mixed $criteria_token same like $criteria but
builded<br />with sql_criteria class, more powerfull
* @return array with records
*/
function get_persons($fields, $start='', $limit='',
$orderby='', $sort='', $criteria='', $token_criteria='')
@@ -263,7 +266,7 @@
*
* @param integer $person_id The person what you want to edit
* @param array $fields The fields that you want
- * @return unknwon
+ * @return
*/
function edit_person($person_id, $fields)
{
@@ -346,7 +349,7 @@
* @param string $orderby The field which you want order
* @param string $sort ASC | DESC depending what you want
* @param array $criteria All criterias what you want
- * @param mixed $criteria_token same like $criteria but
builded<br>with sql_criteria class, more powerfull
+ * @param mixed $criteria_token same like $criteria but
builded<br />with sql_criteria class, more powerfull
* @return array with records
*/
function get_orgs($fields, $start='', $limit='', $orderby='',
$sort='', $criteria='', $token_criteria='')
@@ -372,7 +375,7 @@
*
* @param integer $org_id The org what you want to edit
* @param array $fields The fields that you want
- * @return unknwon
+ * @return
*/
function edit_org($org_id, $fields)
{
@@ -750,7 +753,7 @@
/* _debug_array($prefs);exit; */
while (list($pref,$x) = each($qfields))
{
- /* echo '<br>checking: ' . $pref . '='
. $prefs[$pref]; */
+ /* echo '<br />checking: ' . $pref .
'=' . $prefs[$pref]; */
if ($prefs[$pref] == 'on')
{
$GLOBALS['phpgw']->preferences->add('addressbook',$pref,'addressbook_on');
@@ -890,7 +893,7 @@
'cat_id' => $this->cat_id,
'qfield' => $this->qfield
);
- echo '<br>BO:';
+ echo '<br />BO:';
_debug_array($data);
}
====================================================
Index: addressbook/inc/class.bocatalog_contact_note_type.inc.php
diff -u addressbook/inc/class.bocatalog_contact_note_type.inc.php:1.3
addressbook/inc/class.bocatalog_contact_note_type.inc.php:1.4
--- addressbook/inc/class.bocatalog_contact_note_type.inc.php:1.3 Tue May
10 13:55:15 2005
+++ addressbook/inc/class.bocatalog_contact_note_type.inc.php Sun May 15
13:34:29 2005
@@ -1,19 +1,4 @@
<?php
- /**
- * Addressbook - Business Logic for addressbook
- *
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @version $Id$
- */
-
-
- /**
- * Business Logic for addressbook
- *
- * @package addressbook
- */
class bocatalog_contact_note_type
{
function bocatalog_contact_note_type()
====================================================
Index: addressbook/inc/class.catalog_manager.inc.php
diff -u addressbook/inc/class.catalog_manager.inc.php:1.3
addressbook/inc/class.catalog_manager.inc.php:1.4
--- addressbook/inc/class.catalog_manager.inc.php:1.3 Tue May 10 13:55:15 2005
+++ addressbook/inc/class.catalog_manager.inc.php Sun May 15 13:34:29 2005
@@ -1,21 +1,22 @@
<?php
- /**
- * Addressbook - catalog manager
- *
- * @author Jonathan Alberto Rivera Gomez <address@hidden>
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @version $Id$
- * @internal Development of this application was funded by
http://www.sogrp.com/
- */
-
-
- /**
- * Catalog manager
- *
- * @package addressbook
- */
+ /**************************************************************************\
+ * 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 catalog_manager
{
var $form_action;
@@ -52,9 +53,8 @@
/**
* Start to draw the html screens
*
- * @param string $catalog_name
- * @param string $entry
- * @param string $title
+ * @param
+ * @return
*/
function main_form($catalog_name, $entry, $title)
{
@@ -169,6 +169,9 @@
/**
* This function initialize the template for draw the tabs
windows
+ *
+ * @param
+ * @return
*/
function form_start()
{
@@ -179,6 +182,9 @@
/**
* This function end the template for draw the tabs windows
+ *
+ * @param
+ * @return
*/
function form_end()
{
====================================================
Index: addressbook/inc/class.socatalog_contact_comm_descr.inc.php
diff -u addressbook/inc/class.socatalog_contact_comm_descr.inc.php:1.3
addressbook/inc/class.socatalog_contact_comm_descr.inc.php:1.4
--- addressbook/inc/class.socatalog_contact_comm_descr.inc.php:1.3 Tue May
10 14:14:18 2005
+++ addressbook/inc/class.socatalog_contact_comm_descr.inc.php Sun May 15
13:34:29 2005
@@ -1,19 +1,4 @@
<?php
- /**
- * Addressbook - storage class
- *
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @version $Id$
- */
-
-
- /**
- * storage class
- *
- * @package addressbook
- */
class socatalog_contact_comm_descr
{
function socatalog_contact_comm_descr()
====================================================
Index: addressbook/inc/class.socatalog_contact_comm_type.inc.php
diff -u addressbook/inc/class.socatalog_contact_comm_type.inc.php:1.3
addressbook/inc/class.socatalog_contact_comm_type.inc.php:1.4
--- addressbook/inc/class.socatalog_contact_comm_type.inc.php:1.3 Tue May
10 14:14:18 2005
+++ addressbook/inc/class.socatalog_contact_comm_type.inc.php Sun May 15
13:34:29 2005
@@ -1,19 +1,4 @@
<?php
- /**
- * Addressbook - storage class
- *
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @version $Id$
- */
-
-
- /**
- * storage class
- *
- * @package addressbook
- */
class socatalog_contact_comm_type
{
function socatalog_contact_comm_type()
====================================================
Index: addressbook/inc/class.socatalog_contact_addr_type.inc.php
diff -u addressbook/inc/class.socatalog_contact_addr_type.inc.php:1.3
addressbook/inc/class.socatalog_contact_addr_type.inc.php:1.4
--- addressbook/inc/class.socatalog_contact_addr_type.inc.php:1.3 Tue May
10 14:14:18 2005
+++ addressbook/inc/class.socatalog_contact_addr_type.inc.php Sun May 15
13:34:29 2005
@@ -1,19 +1,4 @@
<?php
- /**
- * Addressbook - storage class
- *
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @version $Id$
- */
-
-
- /**
- * storage class
- *
- * @package addressbook
- */
class socatalog_contact_addr_type
{
function socatalog_contact_addr_type()
====================================================
Index: addressbook/inc/class.soaddressbook.inc.php
diff -u addressbook/inc/class.soaddressbook.inc.php:1.19
addressbook/inc/class.soaddressbook.inc.php:1.20
--- addressbook/inc/class.soaddressbook.inc.php:1.19 Wed May 11 19:59:38 2005
+++ addressbook/inc/class.soaddressbook.inc.php Sun May 15 13:34:29 2005
@@ -1,21 +1,24 @@
<?php
- /**
- * Addressbook - storage object
- *
- * @author Jonathan Alberto Rivera Gomez <address@hidden>
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @version $Id$
- * @internal Development of this application was funded by
http://www.sogrp.com
- */
-
-
- /**
- * storage object
- *
- * @package addressbook
- */
+ /**************************************************************************\
+ * phpGroupWare - soaddressbook *
+ * 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. *
+ \**************************************************************************/
+
+/* $Id$ */
+
class soaddressbook
{
function soaddressbook($useacl=True)
====================================================
Index: addressbook/inc/class.ipc_addressbook.inc.php
diff -u addressbook/inc/class.ipc_addressbook.inc.php:1.3
addressbook/inc/class.ipc_addressbook.inc.php:1.4
--- addressbook/inc/class.ipc_addressbook.inc.php:1.3 Tue May 10 13:55:15 2005
+++ addressbook/inc/class.ipc_addressbook.inc.php Sun May 15 13:34:29 2005
@@ -2,19 +2,19 @@
/**
* IPC Layer
*
- * @author Dirk Schaller <address@hidden>
- * @copyright Copyright (C) 2003,2005 Free Software Foundation
http://www.fsf.org/
- * @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
- * @package addressbook
- * @subpackage ipc
- * @version $Id$
+ * @author Dirk Schaller <address@hidden>
+ * @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$
*/
/**
* Fassade of the adressbook application.
*
- * @package addressbook
+ * @package notes
*/
class ipc_addressbook extends ipc_
{
@@ -231,7 +231,7 @@
{
if ($myexport[$name] && ($value != "") )
{
- //echo
'<br>'.$name."=".$fields[$name]."\n";
+ //echo '<br
/>'.$name."=".$fields[$name]."\n";
$buffer[$myexport[$name]] = $value;
}
}
====================================================
Index: addressbook/inc/class.pdb.inc.php
diff -u addressbook/inc/class.pdb.inc.php:1.5
addressbook/inc/class.pdb.inc.php:1.6
--- addressbook/inc/class.pdb.inc.php:1.5 Tue May 10 13:55:15 2005
+++ addressbook/inc/class.pdb.inc.php Sun May 15 13:34:29 2005
@@ -1,29 +1,40 @@
<?php
- /**
- * Addressbook - Palm Database Access
- *
- * Access to palm OS database structures
- * @author Miles Lott <address@hidden>
- * @copyright Copyright (C) 2000-2001,2004-2005 Free Software
Foundation, Inc. http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html LGNU Lesser General
Public License
- * @package addressbook
- * @version $Id$
- * @internal Portions of code from ToPTIP; Copyright (C) 2000-2001
Pierre Dittgen;
- * @internal This file is a translation of the txt2pdbdoc tool; written
in C Paul J. Lucas (address@hidden)
- * @internal ONLY THE FETCH FUNCTION SHOULD BE CALLED AT THIS TIME:
- * @internal $pdb = CreateObject('addressbook.pdb');
- * @internal $pdb->fetch($content, $title, $document);
- * @internal This will force a download of the pdb file.
- * @internal READ DOES NOT WORK
- * @internal FORMAT OF FILE IS A DOC, NOT A TRUE PALM ADDRESS BOOK
- */
-
-
- /**
- * Palm Database Access
- *
- * @package addressbook
- */
+ /**************************************************************************\
+ * phpGroupWare API - Palm Database Access *
+ * This file written by Miles Lott <address@hidden> *
+ * Access to palm OS database structures (?) *
+ * -------------------------------------------------------------------------*
+ * Portions of code from ToPTIP *
+ * Copyright (C) 2000-2001 Pierre Dittgen *
+ * This file is a translation of the txt2pdbdoc tool *
+ * written in C Paul J. Lucas (address@hidden)
*
+ * -------------------------------------------------------------------------*
+ * This library may be part of the phpGroupWare API *
+ * http://www.phpgroupware.org/api *
+ * ------------------------------------------------------------------------ *
+ * This library is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as published by *
+ * the Free Software Foundation; either version 2.1 of the License, *
+ * or any later version. *
+ * This library 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 Lesser General Public License for more details. *
+ * You should have received a copy of the GNU Lesser General Public License *
+ * along with this library; if not, write to the Free Software Foundation, *
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
+ \**************************************************************************/
+
+ /* $Id$ */
+
+ // ONLY THE FETCH FUNCTION SHOULD BE CALLED AT THIS TIME:
+ // $pdb = CreateObject('addressbook.pdb');
+ // $pdb->fetch($content, $title, $document);
+ //
+ // This will force a download of the pdb file.
+ //
+ // READ DOES NOT WORK
+ // FORMAT OF FILE IS A DOC, NOT A TRUE PALM ADDRESS BOOK
class pdb
{
var $record_size = 4096; // Size of text
record
====================================================
Index: arr.php
[comm] => Array (
[0] => Array (
[description] => asddsadsa
[value] => dsadsa
[type] =>
[preferred] => on )
[1] => Array (
[description] => weewq
[value] => dssadas
[type] =>
[preferred] => )
[2] => Array (
[description] => vfdhytjyt
[value] => trher
[type] =>
[preferred] => ))
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] addressbook/inc hook_sidebox_menu.inc.php, 1.6 hook_preferences.inc.php, 1.24 hook_notifywindow.inc.php, 1.11 hook_home.inc.php, 1.25 hook_manual.inc.php, 1.8 hook_deleteaccount.inc.php, 1.8 hook_config_validate.inc.php, 1.4 class.uicatalog_contact_comm_descr.inc.php, 1.4 class.uicatalog_contact_comm_type.inc.php, 1.4 class.uicatalog_contact_note_type.inc.php, 1.4 class.uicatalog_contact_addr_type.inc.php, 1.4 class.uiaddressbook_prefs.inc.php, 1.4 class.uiXport.inc.php, 1.22 class.uiaddressbook.inc.php, 1.60 class.uicategorize_contacts.inc.php, 1.4 class.uifields.inc.php, 1.14 hook_addressbook_add_def_acl.inc.php, 1.4 class.addressbook_importer.inc.php, 1.4 hook_add_def_pref.inc.php, 1.5 functions.inc.php, 1.105 class.uivcard.inc.php, 1.13 class.widget_lists.inc.php, 1.4 class.socatalog_contact_note_type.inc.php, 1.4 hook_admin.inc.php, 1.17 class.bocatalog_contact_comm_descr.inc.php, 1.4 class.bocatalog_contact_comm_type.inc.php, 1.4 class.bocatalog_contact_addr_type.inc.php, 1.4 class.boadd ressbook_prefs.inc.php, 1.4 class.boXport.inc.php, 1.12 class.boaddressbook.inc.php, 1.28 class.bocatalog_contact_note_type.inc.php, 1.4 class.catalog_manager.inc.php, 1.4 class.socatalog_contact_comm_descr.inc.php, 1.4 class.socatalog_contact_comm_type.inc.php, 1.4 class.socatalog_contact_addr_type.inc.php, 1.4 class.soaddressbook.inc.php, 1.20 class.ipc_addressbook.inc.php, 1.4 class.pdb.inc.php, 1.6 arr.php, 1.4,
skwashd <=