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

remove unused upgrade procedures, migrated a few minor functions and files to PDO database, fixed FROXLOR_INSTALL_DIR define for master-cronjob, fixes #1294

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-11-04 09:03:29 +01:00
parent e549ab2cbb
commit e3750a2988
7 changed files with 56 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/functions/system/function.checklastguid.php
View File

@@ -15,23 +15,20 @@
*
*/
/*
/**
* Function checkLastGuid
*
* Checks if the system's last guid
* is not higher than the one saved
* in froxlor's database.
* If it's higher, froxlor needs to
* set its last guid to this one
* to avoid conflicts with libnss-users
* Checks if the system's last guid is not higher than the one saved
* in froxlor's database. If it's higher, froxlor needs to
* set its last guid to this one to avoid conflicts with libnss-users
*
* @param int guid (from froxlor database)
* @param int guid (from froxlor database)
*
* @return null
* @return null
*/
function checkLastGuid() {
global $log, $cronlog, $db, $settings, $theme;
global $log, $cronlog, $settings;
$mylog = null;
if (isset($cronlog) && $cronlog instanceof FroxlorLogger) {
@@ -45,7 +42,8 @@ function checkLastGuid() {
$update_to_guid = 0;
$froxlor_guid = 0;
$result = $db->query_first("SELECT MAX(`guid`) as `fguid` FROM `".TABLE_PANEL_CUSTOMERS."`");
$result_stmt = Database::query("SELECT MAX(`guid`) as `fguid` FROM `".TABLE_PANEL_CUSTOMERS."`");
$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
$froxlor_guid = $result['fguid'];
$g_file = '/etc/group';

1
lib/functions/system/function.makeCryptPassword.php
View File

@@ -32,7 +32,6 @@
* 3 - SHA-256 $5$
* 4 - SHA-512 $6$
*/
function makeCryptPassword ($password) {
global $settings;