diff --git a/backend/php/src/objects/class.pog_base.php b/backend/php/src/objects/class.pog_base.php
index 6a8f570..2eb6a9b 100644
--- a/backend/php/src/objects/class.pog_base.php
+++ b/backend/php/src/objects/class.pog_base.php
@@ -92,10 +92,10 @@ class POG_Base
return $objectList;
}
- private function CreateObjects($mysql_result, $objectClass, $lazyLoad = true)
+ private function CreateObjects($mysqli_result, $objectClass, $lazyLoad = true)
{
$objectList = array();
- while ($row = mysql_fetch_assoc($mysql_result))
+ while ($row = mysqli_fetch_assoc($mysqli_result))
{
$pog_object = new $objectClass();
$this->PopulateObjectAttributes($row, $pog_object);
@@ -140,4 +140,4 @@ class POG_Base
return false;
}
}
-?>
\ No newline at end of file
+?>
diff --git a/backend/php/src/setup/index.php b/backend/php/src/setup/index.php
index 93dea6f..712c1ac 100644
--- a/backend/php/src/setup/index.php
+++ b/backend/php/src/setup/index.php
@@ -164,24 +164,26 @@ if(count($_POST) > 0 && $_SESSION['diagnosticsSuccessful']==false)
if ($errors == 0)
{
AddTrace('File Structure....OK!');
- if (!mysql_connect ($GLOBALS['configuration']['host'].":".$GLOBALS['configuration']['port'], $GLOBALS['configuration']['user'], $GLOBALS['configuration']['pass']))
+ #if (!mysql_connect ($GLOBALS['configuration']['host'].":".$GLOBALS['configuration']['port'], $GLOBALS['configuration']['user'], $GLOBALS['configuration']['pass']))
+ if (!mysqli_connect ($GLOBALS['configuration']['host'], $GLOBALS['configuration']['user'], $GLOBALS['configuration']['pass'],$GLOBALS['configuration']['db'], $GLOBALS['configuration']['port']))
{
$errors++;
AddError('Cannot connect to the specified database server. Edit configuration.php');
+ AddError('Cannot find the specified database "'.$GLOBALS['configuration']['db'].'". Edit configuration.php');
}
if (isset($GLOBALS['configuration']['db_encoding']) && $GLOBALS['configuration']['db_encoding'] == 1 && !Base64::IsBase64FunctionInstalled())
{
$errors++;
AddError('$configuration[db_encoding] needs to be set to 0 until you install the base64 plugin. Set db_encoding to 0 by editing configuration.php, run setup again and go to the "Manage Plugins" tab. Install the base64 plugin. Then you can set db_encoding = 1');
}
- if ($errors == 0)
- {
- if (!@mysql_select_db ($GLOBALS['configuration']['db']))
- {
- $errors++;
- AddError('Cannot find the specified database "'.$GLOBALS['configuration']['db'].'". Edit configuration.php');
- }
- }
+# if ($errors == 0)
+# {
+# if (!@mysql_select_db ($GLOBALS['configuration']['db']))
+# {
+# $errors++;
+# AddError('Cannot find the specified database "'.$GLOBALS['configuration']['db'].'". Edit configuration.php');
+# }
+# }
}
/**
diff --git a/backend/php/src/setup/setup_library/setup_misc.php b/backend/php/src/setup/setup_library/setup_misc.php
index f0e4f0e..2fcbe07 100644
--- a/backend/php/src/setup/setup_library/setup_misc.php
+++ b/backend/php/src/setup/setup_library/setup_misc.php
@@ -276,10 +276,10 @@
{
$link = '';
$content = file_get_contents($objectFilePath);
- $contentParts = split("",$content);
+ $contentParts = explode("",$content);
if (isset($contentParts[1]))
{
- $contentParts2 = split("",$contentParts[1]);
+ $contentParts2 = explode("",$contentParts[1]);
}
if (isset($contentParts2[0]))
{
@@ -287,8 +287,8 @@
}
if (isset($className))
{
- $linkParts1 = split("\*\/", $contentParts[1]);
- $linkParts2 = split("\@link", $linkParts1[0]);
+ $linkParts1 = explode("\*\/", $contentParts[1]);
+ $linkParts2 = explode("\@link", $linkParts1[0]);
if (isset($linkParts2[1]))
{
$link = $linkParts2[1];
@@ -313,10 +313,10 @@
function GetObjectName($objectFilePath)
{
$content = file_get_contents($objectFilePath);
- $contentParts = split("",$content);
+ $contentParts = explode("",$content);
if (isset($contentParts[1]))
{
- $contentParts2 = split("",$contentParts[1]);
+ $contentParts2 = explode("",$contentParts[1]);
}
if (isset($contentParts2[0]))
{
@@ -593,10 +593,10 @@
//extract sql
$content = file_get_contents($objectFilePath);
- $contentParts = split("",$content);
+ $contentParts = explode("",$content);
if (isset($contentParts[1]))
{
- $contentParts2 = split("",$contentParts[1]);
+ $contentParts2 = explode("",$contentParts[1]);
}
if (isset($contentParts2[0]))
{
@@ -604,8 +604,8 @@
}
if (isset($className))
{
- $sqlParts = split(";",$contentParts[0]);
- $sqlPart = split("CREATE",$sqlParts[0]);
+ $sqlParts = explode(";",$contentParts[0]);
+ $sqlPart = explode("CREATE",$sqlParts[0]);
$sql = "CREATE ".$sqlPart[1].";";
//execute sql
@@ -2354,4 +2354,4 @@
}
return 0;
}
-?>
\ No newline at end of file
+?>