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

more work on interactive update process;

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2010-01-26 09:45:57 +00:00
parent 2f55490548
commit 3610c4aa23
6 changed files with 65 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
admin_updates.php
View File

@@ -18,8 +18,6 @@
define('AREA', 'admin'); define('AREA', 'admin');
require ("./lib/init.php"); require ("./lib/init.php");
if($page == '') $page = 'overview';
if($page == 'overview') if($page == 'overview')
{ {
$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_updates"); $log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_updates");
@@ -30,11 +28,11 @@ if($page == 'overview')
&& $_POST['send'] == 'send') && $_POST['send'] == 'send')
{ {
echo getTemplate("update/update_start"); eval("echo \"" . getTemplate("update/update_start") . "\";");
include_once('./install/updatesql.php'); include_once('./install/updatesql.php');
echo getTemplate("update/update_end"); eval("echo \"" . getTemplate("update/update_end") . "\";");
updateCounters(); updateCounters();
inserttask('1'); inserttask('1');

39
index.php
View File

@@ -33,28 +33,26 @@ if($action == '')
if($action == 'login') if($action == 'login')
{ {
if(isset($_POST['send']) if(isset($_POST['send'])
&& $_POST['send'] == 'send') && $_POST['send'] == 'send')
{ {
$loginname = validate($_POST['loginname'], 'loginname'); $loginname = validate($_POST['loginname'], 'loginname');
$password = validate($_POST['password'], 'password'); $password = validate($_POST['password'], 'password');
if(!hasUpdates($version)) $row = $db->query_first("SELECT `loginname` AS `customer` FROM `" . TABLE_PANEL_CUSTOMERS . "` WHERE `loginname`='" . $db->escape($loginname) . "'");
{
$row = $db->query_first("SELECT `loginname` AS `customer` FROM `" . TABLE_PANEL_CUSTOMERS . "` WHERE `loginname`='" . $db->escape($loginname) . "'");
if($row['customer'] == $loginname) if($row['customer'] == $loginname)
{ {
$table = "`" . TABLE_PANEL_CUSTOMERS . "`"; $table = "`" . TABLE_PANEL_CUSTOMERS . "`";
$uid = 'customerid'; $uid = 'customerid';
$adminsession = '0'; $adminsession = '0';
$is_admin = false; $is_admin = false;
}
else
{
$is_admin = true;
}
} }
else else
{
$is_admin = true;
}
if(hasUpdates($version) && $is_admin == false)
{ {
redirectTo('index.php'); redirectTo('index.php');
exit; exit;
@@ -95,7 +93,7 @@ if($action == 'login')
$userinfo = $db->query_first("SELECT * FROM $table WHERE `loginname`='" . $db->escape($loginname) . "'"); $userinfo = $db->query_first("SELECT * FROM $table WHERE `loginname`='" . $db->escape($loginname) . "'");
if($userinfo['loginfail_count'] >= $settings['login']['maxloginattempts'] if($userinfo['loginfail_count'] >= $settings['login']['maxloginattempts']
&& $userinfo['lastlogin_fail'] > (time() - $settings['login']['deactivatetime'])) && $userinfo['lastlogin_fail'] > (time() - $settings['login']['deactivatetime']))
{ {
redirectTo('index.php', Array('showmessage' => '3'), true); redirectTo('index.php', Array('showmessage' => '3'), true);
exit; exit;
@@ -120,7 +118,7 @@ if($action == 'login')
} }
if(isset($userinfo['userid']) if(isset($userinfo['userid'])
&& $userinfo['userid'] != '') && $userinfo['userid'] != '')
{ {
$s = md5(uniqid(microtime(), 1)); $s = md5(uniqid(microtime(), 1));
@@ -206,8 +204,7 @@ if($action == 'login')
$update_in_progress = ''; $update_in_progress = '';
if(hasUpdates($version)) if(hasUpdates($version))
{ {
$update_in_progress_msg = $lng['update']['updateinprogress_onlyadmincanlogin']; $update_in_progress = $lng['update']['updateinprogress_onlyadmincanlogin'];
$update_in_progress = getTemplate("updateinprogress");
} }
eval("echo \"" . getTemplate("login") . "\";"); eval("echo \"" . getTemplate("login") . "\";");
@@ -217,7 +214,7 @@ if($action == 'login')
if($action == 'forgotpwd') if($action == 'forgotpwd')
{ {
if(isset($_POST['send']) if(isset($_POST['send'])
&& $_POST['send'] == 'send') && $_POST['send'] == 'send')
{ {
$adminchecked = false; $adminchecked = false;
$loginname = validate($_POST['loginname'], 'loginname'); $loginname = validate($_POST['loginname'], 'loginname');
@@ -239,7 +236,7 @@ if($action == 'forgotpwd')
$user = $db->fetch_array($result); $user = $db->fetch_array($result);
if(($adminchecked && $settings['panel']['allow_preset_admin'] == '1') if(($adminchecked && $settings['panel']['allow_preset_admin'] == '1')
|| $adminchecked == false) || $adminchecked == false)
{ {
if($user !== false) if($user !== false)
{ {

1
install/install.php
View File

@@ -632,7 +632,6 @@ if(isset($_POST['installstep'])
`domains_used` = 0, `domains_used` = 0,
`domains_see_all` = 1, `domains_see_all` = 1,
`change_serversettings` = 1, `change_serversettings` = 1,
`edit_billingdata` = 1,
`diskspace` = -1024, `diskspace` = -1024,
`diskspace_used` = 0, `diskspace_used` = 0,
`mysqls` = -1, `mysqls` = -1,

14
install/updatesql.php
View File

@@ -34,7 +34,7 @@ if(!isset($settings['panel']['frontend'])
|| (substr($settings['panel']['version'], 0, 3) == '1.0' && $settings['panel']['version'] != '1.0.10')) || (substr($settings['panel']['version'], 0, 3) == '1.0' && $settings['panel']['version'] != '1.0.10'))
{ {
$updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.0 to 1.0.10"); $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.0 to 1.0.10");
include_once ('./updates/syscp/1.0/update_1.0_1.0.10.inc.php'); include_once (makeCorrectFile(dirname(__FILE__).'/updates/syscp/1.0/update_1.0_1.0.10.inc.php'));
} }
/** /**
@@ -44,7 +44,7 @@ if(!isset($settings['panel']['frontend'])
if($settings['panel']['version'] == '1.0.10') if($settings['panel']['version'] == '1.0.10')
{ {
$updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.0.10 to 1.2-beta1"); $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.0.10 to 1.2-beta1");
include_once ('./updates/syscp/1.0/update_1.0.10_1.2-beta1.inc.php'); include_once (makeCorrectFile(dirname(__FILE__).'/updates/syscp/1.0/update_1.0.10_1.2-beta1.inc.php'));
} }
/** /**
@@ -54,7 +54,7 @@ if(!isset($settings['panel']['frontend'])
if(substr($settings['panel']['version'], 0, 3) == '1.2') if(substr($settings['panel']['version'], 0, 3) == '1.2')
{ {
$updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2-beta1 to 1.2.19"); $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2-beta1 to 1.2.19");
include_once ('./updates/syscp/1.2/update_1.2-beta1_1.2.19.inc.php'); include_once (makeCorrectFile(dirname(__FILE__).'/updates/syscp/1.2/update_1.2-beta1_1.2.19.inc.php'));
} }
/** /**
@@ -64,7 +64,7 @@ if(!isset($settings['panel']['frontend'])
if(substr($settings['panel']['version'], 0, 6) == '1.2.19') if(substr($settings['panel']['version'], 0, 6) == '1.2.19')
{ {
$updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19 to 1.4"); $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19 to 1.4");
include_once ('./updates/syscp/1.2/update_1.2.19_1.4.inc.php'); include_once (makeCorrectFile(dirname(__FILE__).'/updates/syscp/1.2/update_1.2.19_1.4.inc.php'));
} }
/** /**
@@ -74,7 +74,7 @@ if(!isset($settings['panel']['frontend'])
if(substr($settings['panel']['version'], 0, 3) == '1.4') if(substr($settings['panel']['version'], 0, 3) == '1.4')
{ {
$updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.4"); $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.4");
include_once ('./updates/syscp/1.4/update_1.4.inc.php'); include_once (makeCorrectFile(dirname(__FILE__).'/updates/syscp/1.4/update_1.4.inc.php'));
} }
/** /**
@@ -87,7 +87,7 @@ if(!isset($settings['panel']['frontend'])
* From now on, these update-scripts will not * From now on, these update-scripts will not
* do their work on their own...they will ask! * do their work on their own...they will ask!
*/ */
include_once ('./updates/froxlor/upgrade_syscp.inc.php'); include_once (makeCorrectFile(dirname(__FILE__).'/updates/froxlor/upgrade_syscp.inc.php'));
} }
@@ -95,7 +95,7 @@ if(isFroxlor())
{ {
if(isFroxlorVersion('0.9-r0')) if(isFroxlorVersion('0.9-r0'))
{ {
include_once ('./updates/froxlor/0.9/update_0.9.inc.php'); include_once (makeCorrectFile(dirname(__FILE__).'/updates/froxlor/0.9/update_0.9.inc.php'));
} }
} }

26
lib/functions/froxlor/function.updateFunctions.php
View File

@@ -118,6 +118,12 @@ function showUpdateStep($task = null, $needs_status = true)
global $updatelog; global $updatelog;
// output // output
echo $task;
if(!$needs_status)
{
echo "<br />";
}
$updatelog->logAction(ADM_ACTION, LOG_WARNING, $task); $updatelog->logAction(ADM_ACTION, LOG_WARNING, $task);
} }
@@ -136,7 +142,27 @@ function lastStepStatus($status = -1)
{ {
global $updatelog; global $updatelog;
switch($status)
{
case 0:
$status_sign = '[OK]';
$status_color = '1dcd00';
break;
case 1:
$status_sign = '[??]';
$status_color = 'db7100';
break;
case 2:
$status_sign = '[!!]';
$status_color = 'ff0000';
break;
default:
$status_sign = '[unknown]';
$status_color = '000000';
break;
}
// output // output
echo "<span style=\"margin-left: 5em; color: #".$status_color."\">".$status_sign."</span>";
if($status == -1) if($status == -1)
{ {

7
templates/main.css
View File

@@ -436,3 +436,10 @@ TR.RowOverSelected {
margin-right: 3px; margin-right: 3px;
background-color: #C6DEFF; background-color: #C6DEFF;
} }
.update_progess
{
padding: 2em;
text-align: left;
}