Merge branch 'development' into h-node

2 files changed, 0 insertions, 53 deletions

diff --git a/h-source/admin/Library/Factory/Db.php b/h-source/admin/Library/Factory/Db.php
deleted file mode 100755
index 3a988dd..0000000
--- a/h-source/admin/Library/Factory/Db.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-// All EasyGiant code is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
-// See COPYRIGHT.txt and LICENSE.txt.
-
-if (!defined('EG')) die('Direct access not allowed!');
-
-//class to create the database layer class
-class Factory_Db {
-
-	//start the database connection
-	//$dbType: mysql,mysqli,pg
-	//$dbArrayParams: array containing the HOST, the USER, the PWD, and the DB of the database (see config.php)
-	public static function getInstance($dbType,$dbArrayParams = array()) {
-		if (!in_array($dbType,Params::$allowedDb)) {
-			throw new Exception('error in ' . __METHOD__ . ' : the database type has to be '.implode(' or ',Params::$allowedDb));
-		}
-		switch ($dbType) {
-			case 'Mysql':
-				return call_user_func_array(array('Db_'.$dbType,'getInstance'),$dbArrayParams);
-				break;
-			case 'Mysqli':
-				return call_user_func_array(array('Db_'.$dbType,'getInstance'),$dbArrayParams);
-				break;
-			case 'None':
-				return null;
-				break;
-		}
-	}
-
-	//close the database connection
-	public static function disconnect($dbType)
-	{
-		if (!in_array($dbType,Params::$allowedDb)) {
-			throw new Exception('error in ' . __METHOD__ . ' : the database type has to be '.implode(' or ',Params::$allowedDb));
-		}
-		switch ($dbType) {
-			case 'Mysql':
-				$mysql = Db_Mysql::getInstance();
-				$mysql->disconnect();
-				break;
-			case 'Mysqli':
-				$mysqli = Db_Mysqli::getInstance();
-				$mysqli->disconnect();
-				break;
-			case 'None':
-				return null;
-				break;
-		}
-	}
-
-}
diff --git a/h-source/admin/Library/Factory/index.html b/h-source/admin/Library/Factory/index.html
deleted file mode 100644
index 8d1c8b6..0000000
--- a/h-source/admin/Library/Factory/index.html
+++ /dev/null
@@ -1 +0,0 @@
-