R55075 - in /trunk: infolog/inc/ phpgwapi/inc/ phpgwapi/inc/HTTP/WebDAV/ tracker/inc/

ralfbecker_sf 2016-02-19 08:54:54 UTC #1

Author: ralfbecker
New Revision: 55075

URL: http://svn.stylite.de/viewvc/egroupware?rev=55075&view=rev
Log:
remove in php70 deprecated php4 constructors

Modified:
trunk/infolog/inc/class.infolog_bo.inc.php
trunk/phpgwapi/inc/HTTP/WebDAV/Server.php
trunk/phpgwapi/inc/class.Template.inc.php
trunk/phpgwapi/inc/class.about.inc.php
trunk/phpgwapi/inc/class.arrayfunctions.inc.php
trunk/phpgwapi/inc/class.asyncservice.inc.php
trunk/phpgwapi/inc/class.categories.inc.php
trunk/phpgwapi/inc/class.groupdav.inc.php
trunk/phpgwapi/inc/class.historylog.inc.php
trunk/phpgwapi/inc/class.hooks.inc.php
trunk/phpgwapi/inc/class.nextmatchs.inc.php
trunk/phpgwapi/inc/class.send.inc.php
trunk/phpgwapi/inc/class.solink.inc.php
trunk/phpgwapi/inc/class.vfs_webdav_server.inc.php
trunk/tracker/inc/class.tracker_escalations.inc.php

Modified: trunk/infolog/inc/class.infolog_bo.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/infolog/inc/class.infolog_bo.inc.php?rev=55075&r1=55074&r2=55075&view=diff

— trunk/infolog/inc/class.infolog_bo.inc.php (original)
+++ trunk/infolog/inc/class.infolog_bo.inc.php Fri Feb 19 09:54:53 2016
@@ -6,7 +6,7 @@

@author Ralf Becker <RalfBecker-AT-outdoor-training.de>
@author Joerg Lehrke jlehrke@noc.de
@package infolog

- @copyright © 2003-12 by Ralf Becker <RalfBecker-AT-outdoor-training.de>

- @copyright © 2003-16 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
- @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
- @version $Id$
  */
  @@ -752,7 +752,7 @@
  {
  return false;
  }

  // Make sure status is still valid if the type changes
  if($old['info_type'] != $values['info_type'] && $values['info_status'])
  {

@@ -1558,9 +1558,9 @@
if (!($email = $GLOBALS[‘egw’]->accounts->id2name($user,‘account_email’))) continue;
// create the enviroment for $user
$this->user = $GLOBALS[‘egw_info’][‘user’][‘account_id’] = $user;

  	$GLOBALS['egw']->preferences->preferences($user);

  	$GLOBALS['egw']->preferences->__construct($user);
  	$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository();

```
  	$GLOBALS['egw']->acl->acl($user);
```

  	$GLOBALS['egw']->acl->__construct($user);
  	$GLOBALS['egw']->acl->read_repository();
  	$this->grants = $GLOBALS['egw']->acl->get_grants('infolog',$this->group_owners ? $this->group_owners : true);
  	$this->so = new infolog_so($this->grants);	// so caches it's filters

Modified: trunk/phpgwapi/inc/HTTP/WebDAV/Server.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/inc/HTTP/WebDAV/Server.php?rev=55075&r1=55074&r2=55075&view=diff

— trunk/phpgwapi/inc/HTTP/WebDAV/Server.php (original)
+++ trunk/phpgwapi/inc/HTTP/WebDAV/Server.php Fri Feb 19 09:54:53 2016
@@ -172,7 +172,7 @@
*
* @param void
*/

function HTTP_WebDAV_Server()

function __construct()
{
// PHP messages destroy XML output -> switch them off
ini_set(“display_errors”, 0);

Modified: trunk/phpgwapi/inc/class.Template.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/inc/class.Template.inc.php?rev=55075&r1=55074&r2=55075&view=diff

— trunk/phpgwapi/inc/class.Template.inc.php (original)
+++ trunk/phpgwapi/inc/class.Template.inc.php Fri Feb 19 09:54:53 2016
@@ -55,7 +55,7 @@
* root: template directory.
* unknowns: how to handle unknown variables.
*/

  function Template($root = '.', $unknowns = 'remove')

  function __construct($root = '.', $unknowns = 'remove')
  {
  	$this->set_root($root);
  	$this->set_unknowns($unknowns);

Modified: trunk/phpgwapi/inc/class.about.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/inc/class.about.inc.php?rev=55075&r1=55074&r2=55075&view=diff

— trunk/phpgwapi/inc/class.about.inc.php (original)
+++ trunk/phpgwapi/inc/class.about.inc.php Fri Feb 19 09:54:53 2016
@@ -44,7 +44,7 @@
*
* @since 1.4
*/

function about()

function __construct()
{
translation::add_app(‘admin’);

Modified: trunk/phpgwapi/inc/class.arrayfunctions.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/inc/class.arrayfunctions.inc.php?rev=55075&r1=55074&r2=55075&view=diff

— trunk/phpgwapi/inc/class.arrayfunctions.inc.php (original)
+++ trunk/phpgwapi/inc/class.arrayfunctions.inc.php Fri Feb 19 09:54:53 2016
@@ -24,10 +24,6 @@

class arrayfunctions
{

```
  function arrayfunctions($vars='')
```
```
  {
```
```
  }
```

  /*
  * arfsort() - (AR)ray (F)ield Sort.
  * Sort a multi-dimensional array according

@@ -35,11 +31,11 @@
* @param $a The array to sort
* @param $fl Field list (in order of importance)
*/

  function arfsort( $a, $fl, $_sort='ASC' )
  {
  	$GLOBALS['__ARFSORT_LIST__'] = $fl;

  	$this->sort=$_sort;

  	if (is_array($a))

@@ -74,4 +70,3 @@
}

} // end class arrayfunctions

-?>

Modified: trunk/phpgwapi/inc/class.asyncservice.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/inc/class.asyncservice.inc.php?rev=55075&r1=55074&r2=55075&view=diff

— trunk/phpgwapi/inc/class.asyncservice.inc.php (original)
+++ trunk/phpgwapi/inc/class.asyncservice.inc.php Fri Feb 19 09:54:53 2016
@@ -39,7 +39,7 @@
/**
* constructor of the class
*/

function asyncservice()

function __construct()
{
if (is_object($GLOBALS[‘egw’]->db))
{

Modified: trunk/phpgwapi/inc/class.categories.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/inc/class.categories.inc.php?rev=55075&r1=55074&r2=55075&view=diff

— trunk/phpgwapi/inc/class.categories.inc.php (original)
+++ trunk/phpgwapi/inc/class.categories.inc.php Fri Feb 19 09:54:53 2016
@@ -147,16 +147,6 @@
}

/**

- php4 constructor
- @deprecated
*/
function categories($accountid=’’,$app_name=’’)
{

  self::__construct($accountid,$app_name);

}
/**
- returns array with id’s of all children from $cat_id and $cat_id itself!
- @param int|array $cat_id (array of) integer cat-id to search for

Modified: trunk/phpgwapi/inc/class.groupdav.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/inc/class.groupdav.inc.php?rev=55075&r1=55074&r2=55075&view=diff

— trunk/phpgwapi/inc/class.groupdav.inc.php (original)
+++ trunk/phpgwapi/inc/class.groupdav.inc.php Fri Feb 19 09:54:53 2016
@@ -256,7 +256,7 @@
$this->dav_powered_by = str_replace(‘EGroupware’,'EGroupware '.$GLOBALS[‘egw_info’][‘server’][‘versions’][‘phpgwapi’],
$this->dav_powered_by);

```
  parent::HTTP_WebDAV_Server();
```

  parent::__Construct();
  // hack to allow to use query parameters in WebDAV, which HTTP_WebDAV_Server interprets as part of the path
  list($this->_SERVER['REQUEST_URI']) = explode('?',$this->_SERVER['REQUEST_URI']);
  /*if (substr($this->_SERVER['REQUEST_URI'],-13) == '/;add-member/')

Modified: trunk/phpgwapi/inc/class.historylog.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/inc/class.historylog.inc.php?rev=55075&r1=55074&r2=55075&view=diff

— trunk/phpgwapi/inc/class.historylog.inc.php (original)
+++ trunk/phpgwapi/inc/class.historylog.inc.php Fri Feb 19 09:54:53 2016
@@ -57,7 +57,7 @@
* @param string $appname app name this instance operates on
* @return historylog
*/

function historylog($appname=’’,$user=null)

function __construct($appname=’’,$user=null)
{
$this->appname = $appname ? $appname : $GLOBALS[‘egw_info’][‘flags’][‘currentapp’];
$this->user = !is_null($user) ? $user : $GLOBALS[‘egw_info’][‘user’][‘account_id’];

Modified: trunk/phpgwapi/inc/class.hooks.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/inc/class.hooks.inc.php?rev=55075&r1=55074&r2=55075&view=diff

— trunk/phpgwapi/inc/class.hooks.inc.php (original)
+++ trunk/phpgwapi/inc/class.hooks.inc.php Fri Feb 19 09:54:53 2016
@@ -66,17 +66,6 @@
}

/**

- php4 constructor
- @param egw_db $db
- @deprecated use __construct()
*/
function hooks($db=null)
{
```
  self::__construct($db);
```
}
/**
- Executes all the hooks (the user has rights to) for a given location
- If no $order given, hooks are executed in the order of the applications!

Modified: trunk/phpgwapi/inc/class.nextmatchs.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/inc/class.nextmatchs.inc.php?rev=55075&r1=55074&r2=55075&view=diff

— trunk/phpgwapi/inc/class.nextmatchs.inc.php (original)
+++ trunk/phpgwapi/inc/class.nextmatchs.inc.php Fri Feb 19 09:54:53 2016
@@ -36,11 +36,11 @@
var $template;
var $extra_filters = array();

```
  function nextmatchs($website=False)
```

  function __construct($website=False)
  {
  	if(!$website)
  	{

  		$this->template = createobject('phpgwapi.Template',EGW_TEMPLATE_DIR);

  		$this->template = new Template(EGW_TEMPLATE_DIR);
  		$this->template->set_file(array(
  			'_nextmatchs' => 'nextmatchs.tpl'
  		));

Modified: trunk/phpgwapi/inc/class.send.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/inc/class.send.inc.php?rev=55075&r1=55074&r2=55075&view=diff

— trunk/phpgwapi/inc/class.send.inc.php (original)
+++ trunk/phpgwapi/inc/class.send.inc.php Fri Feb 19 09:54:53 2016
@@ -15,21 +15,6 @@
*/
class send extends egw_mailer
{

/**
- eGW specific initialisation of the PHPMailer: charset, language, smtp-host, …
- To be able to call PHPMailer’s Send function, we check if a subject, body or address is set and call it in that case,
- else we do our constructors work.
*/
function send()
{

  if ($this->Subject || $this->Body || count($this->to))

```
  {
```
```
  	return parent::send();
```
```
  }
```

  parent::__construct();	// calling parent constructor

}
/**
- Reset all Settings to send multiple Messages
  */

Modified: trunk/phpgwapi/inc/class.solink.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/inc/class.solink.inc.php?rev=55075&r1=55074&r2=55075&view=diff

— trunk/phpgwapi/inc/class.solink.inc.php (original)
+++ trunk/phpgwapi/inc/class.solink.inc.php Fri Feb 19 09:54:53 2016
@@ -172,7 +172,7 @@
return is_array($id) ? $links : ($links[$id] ? $links[$id] : array());
}

private function _add2links($row,$left,$only_app,$not_only,array &$links)

private static function _add2links($row,$left,$only_app,$not_only,array &$links)
{
$linked_app = $left ? $row[‘link_app2’] : $row[‘link_app1’];
$linked_id = $left ? $row[‘link_id2’] : $row[‘link_id1’];

Modified: trunk/phpgwapi/inc/class.vfs_webdav_server.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/inc/class.vfs_webdav_server.inc.php?rev=55075&r1=55074&r2=55075&view=diff

— trunk/phpgwapi/inc/class.vfs_webdav_server.inc.php (original)
+++ trunk/phpgwapi/inc/class.vfs_webdav_server.inc.php Fri Feb 19 09:54:53 2016
@@ -121,7 +121,6 @@
{
$path = $this->_unslashify($this->base .$options[“path”]);
$parent = egw_vfs::dirname($path);

   $name   = egw_vfs::basename($path);

   if (!file_exists($parent)) {
       return "409 Conflict";

@@ -631,7 +630,7 @@
{
$_SERVER[‘REQUEST_URI’] = substr($_SERVER[‘REQUEST_URI’],0,$this->force_download);
}

```
  parent::HTTP_WebDAV_Server();
```

```
  parent::__construct();
```
}

/**

Modified: trunk/tracker/inc/class.tracker_escalations.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/tracker/inc/class.tracker_escalations.inc.php?rev=55075&r1=55074&r2=55075&view=diff

— trunk/tracker/inc/class.tracker_escalations.inc.php (original)
+++ trunk/tracker/inc/class.tracker_escalations.inc.php Fri Feb 19 09:54:53 2016
@@ -618,7 +618,7 @@
{
unset(self::$tracker->tracking->skip_notify);
}

  // Get a list of users
  $users = self::$tracker->users_with_open_entries();

@@ -627,15 +627,15 @@
if (isset($notified)) $notified=array();
// Create environment for user
if (!($email = $GLOBALS[‘egw’]->accounts->id2name($user,‘account_email’))) continue;

  	self::$tracker->user = $GLOBALS['egw_info']['user']['account_id'] = $user;

  	$GLOBALS['egw']->preferences->preferences($user);

  	$GLOBALS['egw']->preferences->__construct($user);
  	$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository();

```
  	$GLOBALS['egw']->acl->acl($user);
```

  	$GLOBALS['egw']->acl->__construct($user);
  	$GLOBALS['egw']->acl->read_repository();

  	// load the right language if needed

  	if ($GLOBALS['egw_info']['user']['preferences']['common']['lang'] != translation::$userlang)

  	if ($GLOBALS['egw_info']['user']['preferences']['common']['lang'] != translation::$userlang)
  	{
  		translation::init();
  		// Make sure translations are loaded

@@ -644,7 +644,7 @@

		// Load date/time preferences into egw_time
		egw_time::init();

  	// Keep a list of tickets so we only send the user one notification / ticket
  	$notified = array();

Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs