[eGroupWare-svn] r55864 - in /trunk/egroupware/api/src: Accounts.php Auth.php Hooks.php Link.php

Author: ralfbecker
Date: Tue Apr 26 20:56:51 2016
New Revision: 55864

URL: http://svn.stylite.de/viewvc/egroupware?rev=55864&view=rev
Log:
using now Egw and Egw\Applications direct

Modified:
    trunk/egroupware/api/src/Accounts.php
    trunk/egroupware/api/src/Auth.php
    trunk/egroupware/api/src/Hooks.php
    trunk/egroupware/api/src/Link.php

Modified: trunk/egroupware/api/src/Accounts.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Accounts.php?rev=55864&r1=55863&r2=55864&view=diff
==============================================================================
--- trunk/egroupware/api/src/Accounts.php (original)
+++ trunk/egroupware/api/src/Accounts.php Tue Apr 26 20:56:51 2016
@@ -17,9 +17,6 @@
  */
 
 namespace EGroupware\Api;
-
-// explicitly reference classes still in phpgwapi of old structure
-use egw;	// invalidate_session_cache
 
 /**
  * API - accounts
@@ -1134,7 +1131,7 @@
 
 		if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
 		{
-			egw::invalidate_session_cache();	// invalidates whole egw-enviroment if stored in the session
+			Egw::invalidate_session_cache();	// invalidates whole egw-enviroment if stored in the session
 		}
 	}
 

Modified: trunk/egroupware/api/src/Auth.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Auth.php?rev=55864&r1=55863&r2=55864&view=diff
==============================================================================
--- trunk/egroupware/api/src/Auth.php (original)
+++ trunk/egroupware/api/src/Auth.php Tue Apr 26 20:56:51 2016
@@ -13,9 +13,6 @@
  */
 
 namespace EGroupware\Api;
-
-// explicit import classes still in phpgwapi
-use egw;	// invalidate_session_cache
 
 // allow to set an application depending authentication type (eg. for syncml, groupdav, ...)
 if (isset($GLOBALS['egw_info']['server']['auth_type_'.$GLOBALS['egw_info']['flags']['currentapp']]) &&
@@ -253,7 +250,7 @@
 				$GLOBALS['egw_info']['user']['passwd'] = $new_passwd;
 				$GLOBALS['egw_info']['user']['account_lastpwd_change'] = DateTime::to('now','ts');
 				// invalidate EGroupware session, as password is stored in egw_info in session
-				egw::invalidate_session_cache();
+				Egw::invalidate_session_cache();
 			}
 			Accounts::cache_invalidate($account_id);
 			// run changepwasswd hook

Modified: trunk/egroupware/api/src/Hooks.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Hooks.php?rev=55864&r1=55863&r2=55864&view=diff
==============================================================================
--- trunk/egroupware/api/src/Hooks.php (original)
+++ trunk/egroupware/api/src/Hooks.php Tue Apr 26 20:56:51 2016
@@ -13,9 +13,6 @@
  */
 
 namespace EGroupware\Api;
-
-// explicitly import old not namespaced api classes
-use applications;
 
 /**
  * Allow applications to set and use hooks to communicate with each other
@@ -221,7 +218,7 @@
 			// if we run in setup, we need to read installed apps first
 			if (!$GLOBALS['egw_info']['apps'])
 			{
-				$applications = new applications();
+				$applications = new Egw\Applications();
 				$applications->read_installed_apps();
 			}
 

Modified: trunk/egroupware/api/src/Link.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Link.php?rev=55864&r1=55863&r2=55864&view=diff
==============================================================================
--- trunk/egroupware/api/src/Link.php (original)
+++ trunk/egroupware/api/src/Link.php Tue Apr 26 20:56:51 2016
@@ -16,9 +16,6 @@
  */
 
 namespace EGroupware\Api;
-
-// explicitly reference classes still in phpgwapi
-use egw;	// on_shutdown
 
 /**
  * Generalized linking between entries of EGroupware apps
@@ -258,7 +255,7 @@
 		}
 
 		// register self::save_session_cache to run on shutdown
-		egw::on_shutdown(array(__CLASS__, 'save_session_cache'));
+		Egw::on_shutdown(array(__CLASS__, 'save_session_cache'));
 
 		//error_log(__METHOD__.'() items in title-cache: '.count(self::$title_cache).' file-access-cache: '.count(self::$file_access_cache));
 	}
@@ -295,7 +292,7 @@
 	}
 
 	/**
-	 * Called by egw::shutdown to store the title-cache in session and run notifications
+	 * Called by Egw::shutdown to store the title-cache in session and run notifications
 	 *
 	 * Would probably better called shutdown as well.
 	 */
@@ -1507,7 +1504,7 @@
 		{
 			if (!self::$notifies)
 			{
-				egw::on_shutdown(array(__CLASS__, 'run_notifies'));
+				Egw::on_shutdown(array(__CLASS__, 'run_notifies'));
 			}
 			self::$notifies[] = array(
 				'method'     => self::$app_register[$notify_app]['notify'],
@@ -1522,7 +1519,7 @@
 	}
 
 	/**
-	 * Run notifications called by egw::on_shutdown(), after regular processing is finished
+	 * Run notifications called by Egw::on_shutdown(), after regular processing is finished
 	 */
 	static public function run_notifies()
 	{


------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z