summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--frontends/php/index.php2
-rw-r--r--frontends/php/profile.php15
3 files changed, 8 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 8fe34e7c..9d9be68b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
Changes for 1.5.3
+ - [DEV-161] changed greeting message (Artem)
- [DEV-157] added fullscreen icon to monitoring screens (Artem)
Changes for 1.5.2:
diff --git a/frontends/php/index.php b/frontends/php/index.php
index 218f8f05..024c1b0b 100644
--- a/frontends/php/index.php
+++ b/frontends/php/index.php
@@ -146,7 +146,7 @@ include_once "include/page_header.php";
}
else{
$logoff = new CLink('here', '?reconnect=1', 'styled');
- echo '<div align="center" class="textcolorstyles">Press '.$logoff->ToString().' to disconnect/reconnect</div>';
+ echo '<div align="center" class="textcolorstyles">Welcom to ZABBIX! You are connected as <b>'.$USER_DETAILS['alias'].'</b>.</div>';
}
?>
<?php
diff --git a/frontends/php/profile.php b/frontends/php/profile.php
index b5725b38..e6e697b3 100644
--- a/frontends/php/profile.php
+++ b/frontends/php/profile.php
@@ -60,21 +60,18 @@ include_once "include/page_header.php";
check_fields($fields);
?>
<?php
- if(isset($_REQUEST["cancel"]))
- {
- Redirect('index.php');
+ if(isset($_REQUEST["cancel"])){
+ $url = get_profile('web.menu.view.last', 'index.php');
+ Redirect($url);
}
- elseif(isset($_REQUEST["save"]))
- {
+ else if(isset($_REQUEST["save"])){
$_REQUEST["password1"] = get_request("password1", null);
$_REQUEST["password2"] = get_request("password2", null);
- if(isset($_REQUEST["password1"]) && $_REQUEST["password1"] == "")
- {
+ if(isset($_REQUEST["password1"]) && $_REQUEST["password1"] == ""){
show_error_message(S_ONLY_FOR_GUEST_ALLOWED_EMPTY_PASSWORD);
}
- elseif($_REQUEST["password1"]==$_REQUEST["password2"])
- {
+ else if($_REQUEST["password1"]==$_REQUEST["password2"]){
$result=update_user_profile($USER_DETAILS["userid"],$_REQUEST["password1"],
$_REQUEST["url"],get_request("autologin",0),$_REQUEST["autologout"],
$_REQUEST["lang"],$_REQUEST['theme'],$_REQUEST["refresh"]