From e88a7a6456bbcc9364c7a6a26d5011cbdb81b302 Mon Sep 17 00:00:00 2001 From: tbrehm Date: Fri, 4 Jan 2013 16:41:16 +0000 Subject: [PATCH] Merged revisions 3753-3756 from 3.0.5 stable branch. --- interface/web/dashboard/dashboard.php | 9 ++++++- interface/web/login/templates/index.htm | 4 +-- .../default/css/jquery-ui-1.8.16.custom.css | 5 ++-- interface/web/themes/default/css/styles.css | 2 +- .../tools/form/interface_settings.tform.php | 25 +++++++++++++------ 5 files changed, 32 insertions(+), 13 deletions(-) diff --git a/interface/web/dashboard/dashboard.php b/interface/web/dashboard/dashboard.php index 343ba9130..b0bb8090f 100644 --- a/interface/web/dashboard/dashboard.php +++ b/interface/web/dashboard/dashboard.php @@ -114,17 +114,24 @@ if($_SESSION["s"]["user"]["typ"] == 'admin') { $v1 = ISPC_APP_VERSION; $v2 = $_SESSION['s']['new_ispconfig_version']; $this_version = explode(".",$v1); + /* $this_fullversion = (($this_version[0] < 10) ? '0'.$this_version[0] : $this_version[0]) . ((isset($this_version[1]) && $this_version[1] < 10) ? '0'.$this_version[1] : $this_version[1]) . ((isset($this_version[2]) && $this_version[2] < 10) ? '0'.$this_version[2] : $this_version[2]) . ((isset($this_version[3]) && $this_version[3] < 10) ? (($this_version[3] < 1) ? '00' : '0'.$this_version[3]) : @$this_version[3]); - + */ + $new_version = explode(".",$v2); + /* $new_fullversion = (($new_version[0] < 10) ? '0'.$new_version[0] : $new_version[0]) . ((isset($new_version[1]) && $new_version[1] < 10) ? '0'.$new_version[1] : $new_version[1]) . ((isset($new_version[2]) && $new_version[2] < 10) ? '0'.$new_version[2] : $new_version[2]) . ((isset($new_version[3]) && $new_version[3] < 10) ? (($new_version[3] < 1) ? '00' : '0'.$new_version[3]) : @$new_version[3]); + */ + + $this_fullversion = str_pad($this_version[0], 2,'0',STR_PAD_LEFT).str_pad($this_version[1], 2,'0',STR_PAD_LEFT).@str_pad($this_version[2], 2,'0',STR_PAD_LEFT).@str_pad($this_version[3], 2,'0',STR_PAD_LEFT); + $new_fullversion = str_pad($new_version[0], 2,'0',STR_PAD_LEFT).str_pad($new_version[1], 2,'0',STR_PAD_LEFT).@str_pad($new_version[2], 2,'0',STR_PAD_LEFT).@str_pad($new_version[3], 2,'0',STR_PAD_LEFT); if($new_fullversion > $this_fullversion) { $info[] = array('info_msg' => '

There is a new Version of ISPConfig 3 available!

' . '

This Version: ' . $v1 . '

' . diff --git a/interface/web/login/templates/index.htm b/interface/web/login/templates/index.htm index dff5b41e9..b99a1dc2e 100644 --- a/interface/web/login/templates/index.htm +++ b/interface/web/login/templates/index.htm @@ -14,11 +14,11 @@
{tmpl_var name='login_txt'}Login
- +
- +
diff --git a/interface/web/themes/default/css/jquery-ui-1.8.16.custom.css b/interface/web/themes/default/css/jquery-ui-1.8.16.custom.css index ca3403900..54dfd6573 100644 --- a/interface/web/themes/default/css/jquery-ui-1.8.16.custom.css +++ b/interface/web/themes/default/css/jquery-ui-1.8.16.custom.css @@ -56,9 +56,10 @@ /* Component containers ----------------------------------*/ -.ui-widget { font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; font-size: 1.1em; } +/*.ui-widget { font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; font-size: 1.1em; }*/ +.ui-widget { font-size: 1.1em; } .ui-widget .ui-widget { font-size: 1em; } -.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; font-size: 1em; } +.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-size: 1em; } .ui-widget-content { border: 1px solid #a6c9e2; background: #fcfdfd url(images/ui-bg_inset-hard_100_fcfdfd_1x100.png) 50% bottom repeat-x; color: #222222; } .ui-widget-content a { color: #222222; } .ui-widget-header { border: 1px solid #4297d7; background: #5c9ccc url(images/ui-bg_gloss-wave_55_5c9ccc_500x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; } diff --git a/interface/web/themes/default/css/styles.css b/interface/web/themes/default/css/styles.css index 913c33cc0..a9f3df222 100644 --- a/interface/web/themes/default/css/styles.css +++ b/interface/web/themes/default/css/styles.css @@ -1782,7 +1782,7 @@ p.value { } .ui-widget { font-family: "Trebuchet MS", Arial, sans-serif; font-size: 100%; } .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: "Trebuchet MS", Arial, sans-serif; font-size: 100%; } -ul.ui-autocomplete { max-height: 250px; overflow-y: auto; min-width: 65px;} +ul.ui-autocomplete { max-height: 250px; overflow-y: auto; min-width: 85px;} .ui-combobox { position: relative; display: inline-block; margin-right: 17px; } .ui-combobox-toggle { position: absolute !important; top: 0; bottom: 0; margin-left: -1px; padding: 1px !important; background: none repeat scroll 0 0 #FFFFFF !important; border: 1px solid #DFDFDF !important;} .ui-combobox-input { background: none repeat scroll 0 0 #FFFFFF !important; border: 1px solid #DFDFDF !important; padding: 1px; font-weight: normal !important; } diff --git a/interface/web/tools/form/interface_settings.tform.php b/interface/web/tools/form/interface_settings.tform.php index 49ed62d16..52db8aae7 100644 --- a/interface/web/tools/form/interface_settings.tform.php +++ b/interface/web/tools/form/interface_settings.tform.php @@ -84,14 +84,25 @@ $form['auth_preset']['perm_other'] = ''; //* Pick out modules //* TODO: limit to activated modules of the user $modules_list = array(); -$handle = @opendir(ISPC_WEB_PATH); -while ($file = @readdir ($handle)) { - if ($file != '.' && $file != '..') { - if(@is_dir(ISPC_WEB_PATH."/$file")) { - if(is_file(ISPC_WEB_PATH."/$file/lib/module.conf.php") and $file != 'login' && $file != 'designer' && $file != 'mailuser') { - $modules_list[$file] = $file; +if($_SESSION["s"]["user"]["typ"] == 'admin') { + $handle = @opendir(ISPC_WEB_PATH); + while ($file = @readdir ($handle)) { + if ($file != '.' && $file != '..') { + if(@is_dir(ISPC_WEB_PATH."/$file")) { + if(is_file(ISPC_WEB_PATH."/$file/lib/module.conf.php") and $file != 'login' && $file != 'designer' && $file != 'mailuser') { + $modules_list[$file] = $file; + } } - } + } + } +} else { + $modules = $conf['interface_modules_enabled']; + if($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSION['s']['user']['userid'])) { + $modules .= ',client'; + } + $tmp = explode(',',$modules); + foreach($tmp as $m) { + $modules_list[$m] = $m; } } -- GitLab