Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
083a6a5cea | ||
|
|
a2a216f9c9 | ||
|
|
3df61ed87a | ||
|
|
63f5452107 |
@@ -409,7 +409,11 @@ error_log("message");
|
||||
$recordStats["updateDate"] = $record->update_date;
|
||||
$recordsStats[$record->reference] = $recordStats;
|
||||
}
|
||||
if ( isset( $recordsStats ) ) {
|
||||
$result["recordsStats"] = $recordsStats;
|
||||
} else {
|
||||
$result["recordsStats"] = NULL;
|
||||
}
|
||||
|
||||
$result["statistics"] = $user->statistics;
|
||||
$result["version"] = $user->version;
|
||||
@@ -543,7 +547,11 @@ error_log("message");
|
||||
|
||||
$user->Save();
|
||||
|
||||
if (isset( $parameters["parameters"]["records"]["deleted"] ) ) {
|
||||
$recordToDeleteReferenceList = $parameters["parameters"]["records"]["deleted"];
|
||||
} else {
|
||||
$recordToDeleteReferenceList = NULL;
|
||||
}
|
||||
$recordList = array();
|
||||
$c = count($recordToDeleteReferenceList);
|
||||
for ($i=0; $i<$c; $i++) {
|
||||
|
||||
@@ -17,19 +17,12 @@
|
||||
$databaseUser = $GLOBALS['configuration']['user'];
|
||||
$databasePassword = $GLOBALS['configuration']['pass'];
|
||||
$databasePort = $GLOBALS['configuration']['port'];
|
||||
$this->connection = mysql_connect ($serverName.":".$databasePort, $databaseUser, $databasePassword);
|
||||
if ($this->connection)
|
||||
{
|
||||
if (!mysql_select_db ($databaseName))
|
||||
$this->connection = mysqli_connect ($serverName, $databaseUser, $databasePassword , $databaseName, $databasePort);
|
||||
if (!$this->connection)
|
||||
{
|
||||
throw new Exception('I cannot find the specified database "'.$databaseName.'". Please edit configuration.php.');
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new Exception('I cannot connect to the database. Please edit configuration.php with your database configuration.');
|
||||
}
|
||||
}
|
||||
|
||||
public static function Connect()
|
||||
{
|
||||
@@ -43,19 +36,19 @@
|
||||
|
||||
public static function Reader($query, $connection)
|
||||
{
|
||||
$cursor = mysql_query($query, $connection);
|
||||
$cursor = mysqli_query($connection, $query);
|
||||
return $cursor;
|
||||
}
|
||||
|
||||
public static function Read($cursor)
|
||||
{
|
||||
return mysql_fetch_assoc($cursor);
|
||||
return mysqli_fetch_assoc($cursor);
|
||||
}
|
||||
|
||||
public static function NonQuery($query, $connection)
|
||||
{
|
||||
mysql_query($query, $connection);
|
||||
$result = mysql_affected_rows($connection);
|
||||
mysqli_query($connection, $query);
|
||||
$result = mysqli_affected_rows($connection);
|
||||
if ($result == -1)
|
||||
{
|
||||
return false;
|
||||
@@ -66,14 +59,14 @@
|
||||
|
||||
public static function Query($query, $connection)
|
||||
{
|
||||
$result = mysql_query($query, $connection);
|
||||
return mysql_num_rows($result);
|
||||
$result = mysqli_query($connection, $query);
|
||||
return mysqli_num_rows($result);
|
||||
}
|
||||
|
||||
public static function InsertOrUpdate($query, $connection)
|
||||
{
|
||||
$result = mysql_query($query, $connection);
|
||||
return intval(mysql_insert_id($connection));
|
||||
$result = mysqli_query($connection, $query);
|
||||
return intval(mysqli_insert_id($connection));
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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');
|
||||
# }
|
||||
# }
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -276,10 +276,10 @@
|
||||
{
|
||||
$link = '';
|
||||
$content = file_get_contents($objectFilePath);
|
||||
$contentParts = split("<b>",$content);
|
||||
$contentParts = explode("<b>",$content);
|
||||
if (isset($contentParts[1]))
|
||||
{
|
||||
$contentParts2 = split("</b>",$contentParts[1]);
|
||||
$contentParts2 = explode("</b>",$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("<b>",$content);
|
||||
$contentParts = explode("<b>",$content);
|
||||
if (isset($contentParts[1]))
|
||||
{
|
||||
$contentParts2 = split("</b>",$contentParts[1]);
|
||||
$contentParts2 = explode("</b>",$contentParts[1]);
|
||||
}
|
||||
if (isset($contentParts2[0]))
|
||||
{
|
||||
@@ -593,10 +593,10 @@
|
||||
|
||||
//extract sql
|
||||
$content = file_get_contents($objectFilePath);
|
||||
$contentParts = split("<b>",$content);
|
||||
$contentParts = explode("<b>",$content);
|
||||
if (isset($contentParts[1]))
|
||||
{
|
||||
$contentParts2 = split("</b>",$contentParts[1]);
|
||||
$contentParts2 = explode("</b>",$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
|
||||
|
||||
Reference in New Issue
Block a user