From 2cb1563f63386b35a69e460051aa9b4a2851d104 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Wed, 30 May 2012 07:30:44 -0400
Subject: [PATCH] - Added (clickable) placeholders to client messaging function. - Added check so that the client password isn't inserted into the message (for security reasons).
---
interface/web/dashboard/dashboard.php | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/interface/web/dashboard/dashboard.php b/interface/web/dashboard/dashboard.php
index 0277058..59a04f1 100644
--- a/interface/web/dashboard/dashboard.php
+++ b/interface/web/dashboard/dashboard.php
@@ -90,22 +90,29 @@
* Check the ISPConfig-Version (only for the admin)
*/
if($_SESSION["s"]["user"]["typ"] == 'admin') {
- $new_version = @file_get_contents('http://www.ispconfig.org/downloads/ispconfig3_version.txt');
- $new_version = trim($new_version);
- $this_version = explode(".",ISPC_APP_VERSION);
+ if(!isset($_SESSION['s']['new_ispconfig_version'])) {
+ $new_version = @file_get_contents('http://www.ispconfig.org/downloads/ispconfig3_version.txt');
+ $_SESSION['s']['new_ispconfig_version'] = trim($new_version);
+ }
+ $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]) .
- (($this_version[1] < 10) ? '0'.$this_version[1] : $this_version[1]) .
- (($this_version[2] < 10) ? '0'.$this_version[2] : $this_version[2]) .
- (($this_version[3] < 10) ? (($this_version[3] < 1) ? '00' : '0'.$this_version[3]) : $this_version[3]);
+ ((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(".",$new_version);
+ $new_version = explode(".",$v2);
$new_fullversion = (($new_version[0] < 10) ? '0'.$new_version[0] : $new_version[0]) .
- (($new_version[1] < 10) ? '0'.$new_version[1] : $new_version[1]) .
- (($new_version[2] < 10) ? '0'.$new_version[2] : $new_version[2]) .
- (($new_version[3] < 10) ? (($new_version[3] < 1) ? '00' : '0'.$new_version[3]) : $new_version[3]);
+ ((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]);
if($new_fullversion > $this_fullversion) {
- $info[] = array('info_msg' => 'There is a new Version of ISPConfig 3 available! <a href="http://www.ispconfig.org/ispconfig-3/download">See more...</a>');
+ $info[] = array('info_msg' => '<p>There is a new Version of ISPConfig 3 available!</p>' .
+ '<p>This Version: <b>' . $v1 . '</b></p>' .
+ '<p>New Version : <b>' . $v2 . '</b></p>' .
+ '<p><a href="http://www.ispconfig.org/ispconfig-3/download" target="ISPC">See more...</a></p>');
}
}
@@ -126,7 +133,7 @@
/* Which dashlets in which column */
/******************************************************************************/
-$leftcol_dashlets = array('modules');
+$leftcol_dashlets = array('modules','invoices');
$rightcol_dashlets = array('limits');
/******************************************************************************/
--
Gitblit v1.9.1