From 98c96a7c814bd2121aa2444bbf3413e233ae4724 Mon Sep 17 00:00:00 2001
From: Dmitriy Simushev <simushevds@ossg.ru>
Date: Thu, 26 Dec 2013 14:24:34 +0000
Subject: [PATCH] Use autoload for \Mibew\PluginManager class

---
 src/mibew/install/dbperform.php                               | 2 +-
 src/mibew/install/index.php                                   | 2 +-
 .../classes/{plugin_manager.php => Mibew/PluginManager.php}   | 4 +++-
 src/mibew/libs/common/locale.php                              | 4 ++++
 src/mibew/libs/init.php                                       | 3 +--
 5 files changed, 10 insertions(+), 5 deletions(-)
 rename src/mibew/libs/classes/{plugin_manager.php => Mibew/PluginManager.php} (98%)

diff --git a/src/mibew/install/dbperform.php b/src/mibew/install/dbperform.php
index 7afcd982..7f64e0ee 100644
--- a/src/mibew/install/dbperform.php
+++ b/src/mibew/install/dbperform.php
@@ -30,7 +30,7 @@ session_start();
 require_once(MIBEW_FS_ROOT.'/libs/config.php');
 
 // Include some classes
-require_once(MIBEW_FS_ROOT.'/libs/classes/plugin_manager.php');
+require_once(MIBEW_FS_ROOT.'/libs/classes/Mibew/PluginManager.php');
 
 // Include common functions
 require_once(MIBEW_FS_ROOT.'/libs/common/constants.php');
diff --git a/src/mibew/install/index.php b/src/mibew/install/index.php
index 8bd62744..ed01b671 100644
--- a/src/mibew/install/index.php
+++ b/src/mibew/install/index.php
@@ -30,7 +30,7 @@ session_start();
 require_once(MIBEW_FS_ROOT.'/libs/config.php');
 
 // Include some classes
-require_once(MIBEW_FS_ROOT.'/libs/classes/plugin_manager.php');
+require_once(MIBEW_FS_ROOT.'/libs/classes/Mibew/PluginManager.php');
 
 // Include common functions
 require_once(MIBEW_FS_ROOT.'/libs/common/constants.php');
diff --git a/src/mibew/libs/classes/plugin_manager.php b/src/mibew/libs/classes/Mibew/PluginManager.php
similarity index 98%
rename from src/mibew/libs/classes/plugin_manager.php
rename to src/mibew/libs/classes/Mibew/PluginManager.php
index ac477b2f..2c5629eb 100644
--- a/src/mibew/libs/classes/plugin_manager.php
+++ b/src/mibew/libs/classes/Mibew/PluginManager.php
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+namespace Mibew;
+
 /**
  * Manage plugins
  */
@@ -30,7 +32,7 @@ Class PluginManager {
 	 * Returns plugin object
 	 *
 	 * @param string $plugin_name
-	 * @return Plugin
+	 * @return \Mibew\Plugin
 	 */
 	public static function getPlugin($plugin_name) {
 		if (empty(self::$loaded_plugins[$plugin_name])) {
diff --git a/src/mibew/libs/common/locale.php b/src/mibew/libs/common/locale.php
index 98a782aa..853d8789 100644
--- a/src/mibew/libs/common/locale.php
+++ b/src/mibew/libs/common/locale.php
@@ -15,6 +15,10 @@
  * limitations under the License.
  */
 
+// Import namespaces and classes of the core
+use Mibew\PluginManager;
+
+// Initialize libraries
 require_once(MIBEW_FS_ROOT.'/libs/common/converter.php');
 require_once(MIBEW_FS_ROOT.'/libs/common/verification.php');
 
diff --git a/src/mibew/libs/init.php b/src/mibew/libs/init.php
index 57424984..c5878346 100644
--- a/src/mibew/libs/init.php
+++ b/src/mibew/libs/init.php
@@ -37,7 +37,6 @@ require_once(MIBEW_FS_ROOT.'/libs/common/autoload.php');
 spl_autoload_register('class_autoload');
 
 // Include system classes
-require_once(MIBEW_FS_ROOT.'/libs/classes/plugin_manager.php');
 require_once(MIBEW_FS_ROOT.'/libs/classes/plugin.php');
 
 // Include common libs
@@ -83,7 +82,7 @@ if (function_exists("date_default_timezone_set")) {
 
 if (! empty($plugins_list)) {
 	// Variable $plugins_config defined in libs/config.php
-	PluginManager::loadPlugins($plugins_list);
+	\Mibew\PluginManager::loadPlugins($plugins_list);
 }
 
 ?>
\ No newline at end of file