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

migrated admin_tickets and admin_updates to PDO database, refs #1287

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-11-02 10:19:19 +01:00
parent a05fae7b75
commit 111804b665
2 changed files with 371 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

662
admin_tickets.php
View File

File diff suppressed because it is too large Load Diff

18
admin_updates.php
View File

@@ -23,7 +23,7 @@ if ($page == 'overview') {
/** /**
* this is a dirty hack but syscp 1.4.2.1 does not * this is a dirty hack but syscp 1.4.2.1 does not
* has any version/dbversion in the database (don't know why) * have any version/dbversion in the database (don't know why)
* so we have to set them both to run a correct upgrade * so we have to set them both to run a correct upgrade
*/ */
if (!isFroxlor()) { if (!isFroxlor()) {
@@ -31,7 +31,13 @@ if ($page == 'overview') {
|| $settings['panel']['version'] == '' || $settings['panel']['version'] == ''
) { ) {
$settings['panel']['version'] = '1.4.2.1'; $settings['panel']['version'] = '1.4.2.1';
$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('panel','version','".$settings['panel']['version']."')"); $stmt = Database::prepare("
INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET
`settinggroup` = 'panel',
`varname` = 'version',
`value` = :version"
);
Database::pexecute($stmt, array('version' => $settings['panel']['version']));
} }
if (!isset($settings['system']['dbversion']) if (!isset($settings['system']['dbversion'])
|| $settings['system']['dbversion'] == '' || $settings['system']['dbversion'] == ''
@@ -42,7 +48,10 @@ if ($page == 'overview') {
* and the svn-version has its value in the database * and the svn-version has its value in the database
* -> bug #54 * -> bug #54
*/ */
$result = $db->query_first("SELECT `value` FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `varname` = 'dbversion'"); $result_stmt = Database::query("
SELECT `value` FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `varname` = 'dbversion'"
);
$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
if (isset($result['value'])) { if (isset($result['value'])) {
$settings['system']['dbversion'] = (int)$result['value']; $settings['system']['dbversion'] = (int)$result['value'];
@@ -101,9 +110,6 @@ if ($page == 'overview') {
eval("echo \"" . getTemplate('update/index') . "\";"); eval("echo \"" . getTemplate('update/index') . "\";");
} }
} else { } else {
/*
* @TODO version-webcheck check here
*/
$success_message = $lng['update']['noupdatesavail']; $success_message = $lng['update']['noupdatesavail'];
$redirect_url = 'admin_index.php?s=' . $s; $redirect_url = 'admin_index.php?s=' . $s;
eval("echo \"" . getTemplate('update/noupdatesavail') . "\";"); eval("echo \"" . getTemplate('update/noupdatesavail') . "\";");