clipperz/password-manager-mirror
1
0
Fork 0
mirror of http://git.whoc.org.uk/git/password-manager.git synced 2024-12-21 14:47:49 +01:00
Code Issues Releases Wiki Activity

Fixed POG

Browse Source
This commit is contained in:
Graham Eades 2017-05-27 11:24:07 +01:00
parent 63f5452107
commit 3df61ed87a
3 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/php/src/objects/class.pog_base.php
View File

@ -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;
}
}
?>
?>

20
backend/php/src/setup/index.php
View File

@ -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');
# }
# }
}
/**

22
backend/php/src/setup/setup_library/setup_misc.php
View File

@ -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
@ -2354,4 +2354,4 @@
}
return 0;
}
?>
?>