[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] calendar/inc/class.socalendar__.inc.php calenda...
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] calendar/inc/class.socalendar__.inc.php calenda... |
|
Date: |
Sat, 09 Sep 2006 14:43:07 +0000 |
CVSROOT: /cvsroot/phpgroupware
Module name: infolog
Changes by: Dave Hall <skwashd> 06/09/09 14:43:07
Modified files:
calendar/inc : class.socalendar__.inc.php
class.socalendar_.inc.php
class.socalendar_sql.inc.php
inc : class.sbox2.inc.php class.bolink.inc.php
class.solink.inc.php
Log message:
remove included_class global, use include_once instead
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.socalendar__.inc.php?cvsroot=phpgroupware&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.socalendar_.inc.php?cvsroot=phpgroupware&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.socalendar_sql.inc.php?cvsroot=phpgroupware&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/infolog/inc/class.sbox2.inc.php?cvsroot=phpgroupware&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/infolog/inc/class.bolink.inc.php?cvsroot=phpgroupware&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/infolog/inc/class.solink.inc.php?cvsroot=phpgroupware&r1=1.13&r2=1.14
Patches:
Index: calendar/inc/class.socalendar__.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.socalendar__.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- calendar/inc/class.socalendar__.inc.php 15 May 2005 06:57:37 -0000
1.16
+++ calendar/inc/class.socalendar__.inc.php 9 Sep 2006 14:43:07 -0000
1.17
@@ -12,14 +12,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.socalendar__.inc.php,v 1.16 2005/05/15 06:57:37 skwashd
Exp $ */
-
-if (@$GLOBALS['phpgw_info']['flags']['included_classes']['socalendar__'])
-{
- return;
-}
-
-$GLOBALS['phpgw_info']['flags']['included_classes']['socalendar__'] = True;
+ /* $Id: class.socalendar__.inc.php,v 1.17 2006/09/09 14:43:07 skwashd
Exp $ */
/* include(PHPGW_SERVER_ROOT.'/calendar/setup/setup.inc.php'); */
Index: calendar/inc/class.socalendar_.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.socalendar_.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- calendar/inc/class.socalendar_.inc.php 15 May 2005 06:57:37 -0000
1.7
+++ calendar/inc/class.socalendar_.inc.php 9 Sep 2006 14:43:07 -0000
1.8
@@ -12,18 +12,20 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.socalendar_.inc.php,v 1.7 2005/05/15 06:57:37 skwashd Exp $ */
+ /* $Id: class.socalendar_.inc.php,v 1.8 2006/09/09 14:43:07 skwashd Exp $ */
- if(@$GLOBALS['phpgw_info']['server']['calendar_type'] == 'mcal' &&
- extension_loaded('mcal') == False)
+ /*
+ if( isset($GLOBALS['phpgw_info']['server']['calendar_type'])
+ && $GLOBALS['phpgw_info']['server']['calendar_type'] == 'mcal'
+ && !extension_loaded('mcal') )
{
$GLOBALS['phpgw_info']['server']['calendar_type'] = 'sql';
}
-/* This will be elminated when ical is fully implemented */
else
{
$GLOBALS['phpgw_info']['server']['calendar_type'] = 'sql';
}
+ */
include(PHPGW_INCLUDE_ROOT.'/calendar/inc/class.socalendar__.inc.php');
-
include(PHPGW_INCLUDE_ROOT.'/calendar/inc/class.socalendar_'.$GLOBALS['phpgw_info']['server']['calendar_type'].'.inc.php');
+
include(PHPGW_INCLUDE_ROOT.'/calendar/inc/class.socalendar_sql.inc.php');
?>
Index: calendar/inc/class.socalendar_sql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.socalendar_sql.inc.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- calendar/inc/class.socalendar_sql.inc.php 6 Sep 2006 00:52:29 -0000
1.43
+++ calendar/inc/class.socalendar_sql.inc.php 9 Sep 2006 14:43:07 -0000
1.44
@@ -12,14 +12,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.socalendar_sql.inc.php,v 1.43 2006/09/06 00:52:29 skwashd Exp
$ */
-
-if (@$GLOBALS['phpgw_info']['flags']['included_classes']['socalendar_'])
-{
- return;
-}
-
-$GLOBALS['phpgw_info']['flags']['included_classes']['socalendar_'] = True;
+ /* $Id: class.socalendar_sql.inc.php,v 1.44 2006/09/09 14:43:07 skwashd Exp
$ */
class socalendar_ extends socalendar__
{
Index: infolog/inc/class.sbox2.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.sbox2.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- infolog/inc/class.sbox2.inc.php 5 Jan 2005 22:07:58 -0000 1.6
+++ infolog/inc/class.sbox2.inc.php 9 Sep 2006 14:43:07 -0000 1.7
@@ -14,13 +14,13 @@
* the Free Software Foundation; either version 2 of the License, or *
* at your option) any later version. *
\**********************************************************************/
- /* $Id: class.sbox2.inc.php,v 1.6 2005/01/05 22:07:58 ceb Exp $ */
+ /* $Id: class.sbox2.inc.php,v 1.7 2006/09/09 14:43:07 skwashd Exp $ */
- if(!isset($GLOBALS['phpgw_info']['flags']['included_classes']['sbox']))
- {
- include(PHPGW_API_INC . '/class.sbox.inc.php');
- $GLOBALS['phpgw_info']['flags']['included_classes']['sbox'] =
True;
- }
+ /**
+ * Include parent class
+ * @see sbox
+ */
+ include_once(PHPGW_API_INC . '/class.sbox.inc.php');
class sbox2 extends sbox
{
Index: infolog/inc/class.bolink.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.bolink.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- infolog/inc/class.bolink.inc.php 5 May 2005 14:32:33 -0000 1.24
+++ infolog/inc/class.bolink.inc.php 9 Sep 2006 14:43:07 -0000 1.25
@@ -14,12 +14,10 @@
* the Free Software Foundation; either version 2 of the License, or *
* at your option) any later version. *
\**********************************************************************/
- /* $Id: class.bolink.inc.php,v 1.24 2005/05/05 14:32:33 powerstat Exp $ */
+ /* $Id: class.bolink.inc.php,v 1.25 2006/09/09 14:43:07 skwashd Exp $ */
include_once(PHPGW_INCLUDE_ROOT . '/infolog/inc/class.solink.inc.php');
- $GLOBALS['phpgw_info']['flags']['included_classes']['bolink'] = True;
-
/*!
@class bolink
@author ralfbecker
@@ -109,11 +107,21 @@
$config = CreateObject('phpgwapi.config');
$config->read_repository();
+
+ $this->link_pathes = '';
+ $this->send_file_ips = '';
if (is_array($config->config_data))
{
+ if ( isset($config->config_data['link_pathes'])
)
+ {
$this->link_pathes =
$config->config_data['link_pathes'];
+ }
+
+ if (
isset($config->config_data['send_file_ips']) )
+ {
$this->send_file_ips =
$config->config_data['send_file_ips'];
}
+ }
unset($config);
// other apps can participate in the linking by
implementing a search_link hook, which
@@ -317,7 +325,7 @@
unlink has to be called with &$id so see the result !!!
@result the number of links deleted
*/
- function
unlink($link_id,$app='',&$id='',$owner='',$app2='',$id2='')
+ function unlink($link_id, $app='', &$id, $owner='', $app2='',
$id2='' )
{
if ($link_id < 0) // vfs-link?
{
Index: infolog/inc/class.solink.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.solink.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- infolog/inc/class.solink.inc.php 5 Jan 2005 22:07:58 -0000 1.13
+++ infolog/inc/class.solink.inc.php 9 Sep 2006 14:43:07 -0000 1.14
@@ -13,9 +13,8 @@
* the Free Software Foundation; either version 2 of the License, or *
* at your option) any later version. *
\**********************************************************************/
- /* $Id: class.solink.inc.php,v 1.13 2005/01/05 22:07:58 ceb Exp $ */
+ /* $Id: class.solink.inc.php,v 1.14 2006/09/09 14:43:07 skwashd Exp $ */
- $GLOBALS['phpgw_info']['flags']['included_classes']['solink'] = True;
/*!
@class solink
@author ralfbecker
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] calendar/inc/class.socalendar__.inc.php calenda...,
Dave Hall <=