R55006 - /trunk/phpgwapi/inc/

ralfbecker_sf 2016-02-15 11:17:09 UTC #1

Author: ralfbecker
New Revision: 55006

URL: http://svn.stylite.de/viewvc/egroupware?rev=55006&view=rev
Log:
removing deprecated PHP4 constructors filling logs with deprecation notices under PHP 7

Modified:
trunk/phpgwapi/inc/class.accounts.inc.php
trunk/phpgwapi/inc/class.acl.inc.php
trunk/phpgwapi/inc/class.applications.inc.php
trunk/phpgwapi/inc/class.egw_session.inc.php
trunk/phpgwapi/inc/class.preferences.inc.php

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

— trunk/phpgwapi/inc/class.accounts.inc.php (original)
+++ trunk/phpgwapi/inc/class.accounts.inc.php Mon Feb 15 12:17:09 2016
@@ -207,19 +207,6 @@
}

/**

- Old constructor name
- @param int $account_id =0 depricated param to instanciate for the given account_id
- @deprecated use __construct
*/
function accounts($account_id=0)
{

  $this->account_id = (int) $account_id;

```
  $this->__construct();
```
}
/**
- set the accountId
- @param int $accountId

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

— trunk/phpgwapi/inc/class.acl.inc.php (original)
+++ trunk/phpgwapi/inc/class.acl.inc.php Mon Feb 15 12:17:09 2016
@@ -82,17 +82,6 @@
{
$this->account_id = get_account_id((int)$account_id,@$GLOBALS[‘egw_info’][‘user’][‘account_id’]);
}

}
/**
- PHP4 constructor
- @deprecated use __construct
- @param int $account_id = null
*/
function acl($account_id = null)
{
```
  $this->__construct($account_id);
```
}

function DONTlist_methods($_type=‘xmlrpc’)

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

— trunk/phpgwapi/inc/class.applications.inc.php (original)
+++ trunk/phpgwapi/inc/class.applications.inc.php Mon Feb 15 12:17:09 2016
@@ -41,7 +41,7 @@
*
* @param $account_id account id
*/

function applications($account_id = ‘’)

function __construct($account_id = ‘’)
{
if (is_object($GLOBALS[‘egw_setup’]) && is_object($GLOBALS[‘egw_setup’]->db))
{

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

— trunk/phpgwapi/inc/class.egw_session.inc.php (original)
+++ trunk/phpgwapi/inc/class.egw_session.inc.php Mon Feb 15 12:17:09 2016
@@ -530,7 +530,8 @@
}

		$GLOBALS['egw_info']['user']['account_id'] = $this->account_id;

  	$GLOBALS['egw']->accounts->accounts($this->account_id);

  	$GLOBALS['egw']->accounts->__construct();

  	$GLOBALS['egw']->accounts->setAccountId($this->account_id);

  	// for *DAV and eSync we use a pseudo sessionid created from md5(user:passwd)
  	// --> allows this stateless protocolls which use basic auth to use sessions!

@@ -989,9 +990,9 @@

	if ($fill_egw_info_and_repositories)
	{

  	$GLOBALS['egw']->acl->acl($this->account_id);

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

  	$GLOBALS['egw']->applications->applications($this->account_id);

  	$GLOBALS['egw']->acl->__construct($this->account_id);

  	$GLOBALS['egw']->preferences->__construct($this->account_id);

  	$GLOBALS['egw']->applications->__construct($this->account_id);
  }
  if (!$this->account_lid)
  {

@@ -1489,9 +1490,9 @@
*/
public function read_repositories()
{

  $GLOBALS['egw']->acl->acl($this->account_id);

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

  $GLOBALS['egw']->applications->applications($this->account_id);

  $GLOBALS['egw']->acl->__construct($this->account_id);

  $GLOBALS['egw']->preferences->__construct($this->account_id);

  $GLOBALS['egw']->applications->__construct($this->account_id);

  $user = $GLOBALS['egw']->accounts->read($this->account_id);
  // set homedirectory from auth_ldap or auth_ads, to be able to use it in vfs

@@ -1512,7 +1513,7 @@
$user[‘preferences’] = $GLOBALS[‘egw’]->preferences->read_repository();
if (is_object($GLOBALS[‘egw’]->datetime))
{

  	$GLOBALS['egw']->datetime->datetime();		// to set tz_offset from the now read prefs

  	$GLOBALS['egw']->datetime->__construct();		// to set tz_offset from the now read prefs
  }
  $user['apps']        = $GLOBALS['egw']->applications->read_repository();
  $user['domain']      = $this->account_domain;

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

— trunk/phpgwapi/inc/class.preferences.inc.php (original)
+++ trunk/phpgwapi/inc/class.preferences.inc.php Mon Feb 15 12:17:09 2016
@@ -165,18 +165,6 @@
}

/**

- Old PHP4 contstructor
- @param int|string $account_id =’’
- @return preferences
- @deprecated
*/
function preferences($account_id = ‘’)
{
```
  self::__construct($account_id);
```
}
/**
- Magic function to avoid storing perferences in session, as they get re-read on each request by egw_session::verify()
- @return array with class vars to store

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