maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

- set correct version for svn1

Browse Source 
- correct default-php.ini for open_basedir
- fix upgrading from SysCP (getPhpConfigs() fails cause the table is being added after it's being used in the update-process)
This commit is contained in:
Michael Kaufmann (d00p)
2011-01-26 15:01:19 +00:00
parent 1396aca657
commit a7ae6e54de
6 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/classes/database/class.db.php
View File

@@ -181,23 +181,37 @@ class db
* @return string RessourceId
*/
function query($query_str, $unbuffered = false)
function query($query_str, $unbuffered = false, $suppress_error = false)
{
global $numbqueries;
if(!$unbuffered)
{
$this->query_id = mysql_query($query_str, $this->link_id);
if($suppress_error)
{
$this->query_id = @mysql_query($query_str, $this->link_id);
} else {
$this->query_id = mysql_query($query_str, $this->link_id);
}
}
else
{
$this->query_id = mysql_unbuffered_query($query_str, $this->link_id);
if($suppress_error)
{
$this->query_id = @mysql_unbuffered_query($query_str, $this->link_id);
} else {
$this->query_id = mysql_unbuffered_query($query_str, $this->link_id);
}
}
if(!$this->query_id)
if(!$this->query_id && !$suppress_error)
{
$this->showerror('Invalid SQL: ' . $query_str);
}
elseif(!$this->query_id && $suppress_error)
{
return false;
}
$numbqueries++;

19
lib/functions/froxlor/function.getPhpConfigs.php
View File

@@ -25,17 +25,24 @@ function getPhpConfigs()
global $db;
$query = 'SELECT * FROM `' . TABLE_PANEL_PHPCONFIGS . '` ';
$result = $db->query($query);
$result = $db->query($query, false, true);
$configs_array = array();
while($row = $db->fetch_array($result))
// if the table does not yet exist, we just use the default php.ini
if(!$result)
{
if(!isset($configs_array[$row['id']])
&& !in_array($row['id'], $configs_array))
$configs_array[1] = 'Default php.ini';
}
else
{
while($row = $db->fetch_array($result))
{
$configs_array[$row['id']] = html_entity_decode($row['description']);
if(!isset($configs_array[$row['id']])
&& !in_array($row['id'], $configs_array))
{
$configs_array[$row['id']] = html_entity_decode($row['description']);
}
}
}
return $configs_array;
}

2
lib/tables.inc.php
View File

@@ -73,7 +73,7 @@ define('PACKAGE_ENABLED', 2);
// VERSION INFO
$version = '0.9.17';
$version = '0.9.18-svn1';
$dbversion = '2';
$branding = '';