From 8e38755040c6c2073f92f0ffb087da530d0e7a0a Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Mon, 12 Nov 2012 11:49:26 -0500
Subject: [PATCH] - Changed a German translation. - Extended SEO redirect check for subdomains/alias domains.
---
interface/web/dashboard/dashboard.php | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/interface/web/dashboard/dashboard.php b/interface/web/dashboard/dashboard.php
index c077881..343ba91 100644
--- a/interface/web/dashboard/dashboard.php
+++ b/interface/web/dashboard/dashboard.php
@@ -48,7 +48,14 @@
/*
* Let the user welcome
*/
-$welcome = sprintf($wb['welcome_user_txt'], $_SESSION['s']['user']['username']);
+if($_SESSION['s']['user']['typ'] == 'admin') {
+ $name = $_SESSION['s']['user']['username'];
+} else {
+ $tmp = $app->db->queryOneRecord("SELECT contact_name FROM client WHERE username = '".$app->db->quote($_SESSION['s']['user']['username'])."'");
+ $name = $tmp['contact_name'];
+}
+
+$welcome = sprintf($wb['welcome_user_txt'], htmlentities($name, ENT_QUOTES, 'UTF-8'));
$app->tpl->setVar('welcome_user', $welcome);
@@ -86,6 +93,16 @@
*/
$info = array();
+if(isset($_SESSION['show_info_msg'])) {
+ $info[] = array('info_msg' => '<p>'.$_SESSION['show_info_msg'].'</p>');
+ unset($_SESSION['show_info_msg']);
+}
+if(isset($_SESSION['show_error_msg'])) {
+ $app->tpl->setloop('error', array(array('error_msg' => '<p>'.$_SESSION['show_error_msg'].'</p>')));
+ unset($_SESSION['show_error_msg']);
+}
+
+
/*
* Check the ISPConfig-Version (only for the admin)
*/
@@ -109,10 +126,10 @@
((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!<br>' .
- 'This Version: ' . $v1 . '<br>' .
- 'New Version : ' . $v2 .
- '<br><br><a href="http://www.ispconfig.org/ispconfig-3/download" target="ISPC">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>');
}
}
--
Gitblit v1.9.1