Skip to content
GitLab
Commit bd49e8f9 authored by Côme Bernigaud's avatar Côme Bernigaud Committed by Benoit Mortier
Browse files

Fixes: #2595 The code should follow code guidelines

parent dc827688
dev 6342-update-the-locales-for-1-5 6344-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen 6365-core-locking-mechanism-is-not-changing-the-mail-ressource-it-does-lock-the-mail-account 6365-core-when-lock-mechanism-is-trigger-the-user-should-not-be-editable-if-not-unlock 6378-orcid-test-method-is-wrong-and-break-orcid-saving core-php8 master fusiondirectory-1.5 fusiondirectory-1.4 fusiondirectory-1.3.1 fusiondirectory-1.3 fusiondirectory-1.2.3 fusiondirectory-1.2.2 fusiondirectory-1.2.1 fusiondirectory-1.2 fusiondirectory-1.1.1 fusiondirectory-1.1 fusiondirectory-1.0.20 fusiondirectory-1.0.19 fusiondirectory-1.0.18 fusiondirectory-1.0.17 fusiondirectory-1.0.16 fusiondirectory-1.0.15 fusiondirectory-1.0.14 fusiondirectory-1.0.13 fusiondirectory-1.0.12 fusiondirectory-1.0.11 fusiondirectory-1.0.10 fusiondirectory-1.0.9.3 fusiondirectory-1.0.9.2 fusiondirectory-1.0.9.1 fusiondirectory-1.0.9 fusiondirectory-1.0.8.9 fusiondirectory-1.0.8.8 fusiondirectory-1.0.8.7 fusiondirectory-1.0.8.6 fusiondirectory-1.0.8.5 fusiondirectory-1.0.8.4 fusiondirectory-1.0.8.3 fusiondirectory-1.0.8.2 fusiondirectory-1.0.8.1 fusiondirectory-1.0.8
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 49 additions and 46 deletions
+49 -46
include/class_msg_dialog.inc
+ 49
− 46
View file @ bd49e8f9
<?php <?php
/* /*
This code is part of FusionDirectory (http://www.fusiondirectory.org/) This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier Copyright (C) 2003-2010 Cajus Pollmeier
...@@ -24,12 +23,12 @@ ...@@ -24,12 +23,12 @@
* Source code for class message dialog * Source code for class message dialog
*/ */
define("INFO_DIALOG" , 10001); define("INFO_DIALOG", 10001);
define("WARNING_DIALOG" , 10002); define("WARNING_DIALOG", 10002);
define("ERROR_DIALOG" , 10003); define("ERROR_DIALOG", 10003);
define("CONFIRM_DIALOG" , 10004); define("CONFIRM_DIALOG", 10004);
define("OK_CANCEL_DIALOG" , 10005); define("OK_CANCEL_DIALOG", 10005);
define("FATAL_ERROR_DIALOG" , 10006); define("FATAL_ERROR_DIALOG", 10006);
/*! /*!
* \brief This class contains all the function needed to make messages * \brief This class contains all the function needed to make messages
...@@ -37,11 +36,11 @@ define("FATAL_ERROR_DIALOG" , 10006); ...@@ -37,11 +36,11 @@ define("FATAL_ERROR_DIALOG" , 10006);
*/ */
class msg_dialog class msg_dialog
{ {
private $s_Title = "Undefined"; private $s_Title = "Undefined";
private $s_Message = "Undefined"; private $s_Message = "Undefined";
private $i_Type = INFO_DIALOG ; private $i_Type = INFO_DIALOG;
private $i_ID = 0; private $i_ID = 0;
private $a_Trace = array(); private $a_Trace = array();
/*! /*!
...@@ -53,33 +52,35 @@ class msg_dialog ...@@ -53,33 +52,35 @@ class msg_dialog
* *
* \param string $i_type The type of the message dialog, by default = INFO_DIALOG * \param string $i_type The type of the message dialog, by default = INFO_DIALOG
*/ */
public function __construct($s_title,$s_message,$i_type) public function __construct($s_title, $s_message, $i_type)
{ {
global $config; global $config;
if(empty($s_message)) return; if (empty($s_message)) {
return;
}
if(!in_array($i_type,array(INFO_DIALOG,WARNING_DIALOG,ERROR_DIALOG,CONFIRM_DIALOG,FATAL_ERROR_DIALOG,OK_CANCEL_DIALOG))){ if (!in_array($i_type, array(INFO_DIALOG,WARNING_DIALOG,ERROR_DIALOG,CONFIRM_DIALOG,FATAL_ERROR_DIALOG,OK_CANCEL_DIALOG))) {
trigger_error("Invalid msg_dialog type."); trigger_error("Invalid msg_dialog type.");
$i_type = INFO_DIALOG; $i_type = INFO_DIALOG;
} }
if((!session::is_set('errorsAlreadyPosted')) || !is_array(session::get('errorsAlreadyPosted'))){ if ((!session::is_set('errorsAlreadyPosted')) || !is_array(session::get('errorsAlreadyPosted'))) {
session::set('errorsAlreadyPosted',array()); session::set('errorsAlreadyPosted', array());
} }
$errorsAlreadyPosted = session::get('errorsAlreadyPosted'); $errorsAlreadyPosted = session::get('errorsAlreadyPosted');
if(!isset($errorsAlreadyPosted[$s_title.$s_message])){ if (!isset($errorsAlreadyPosted[$s_title.$s_message])) {
$errorsAlreadyPosted[$s_title.$s_message] = 0; $errorsAlreadyPosted[$s_title.$s_message] = 0;
} }
$errorsAlreadyPosted[$s_title.$s_message]++; $errorsAlreadyPosted[$s_title.$s_message]++;
if($errorsAlreadyPosted[$s_title.$s_message] <=1 ){ if ($errorsAlreadyPosted[$s_title.$s_message] <= 1) {
$this->i_ID = preg_replace("/[^0-9]*/","",microtime()); $this->i_ID = preg_replace("/[^0-9]*/", "", microtime());
$this->s_Title = $s_title; $this->s_Title = $s_title;
$this->s_Message = $s_message; $this->s_Message = $s_message;
$this->i_Type = $i_type; $this->i_Type = $i_type;
/* Append trace information, only if error messages are enabled */ /* Append trace information, only if error messages are enabled */
if (isset($config) && is_object($config) && if (isset($config) && is_object($config) &&
...@@ -96,10 +97,10 @@ class msg_dialog ...@@ -96,10 +97,10 @@ class msg_dialog
} else { } else {
$msg_dialogs = session::get('msg_dialogs'); $msg_dialogs = session::get('msg_dialogs');
$msg_dialogs[] = $this; $msg_dialogs[] = $this;
session::set('msg_dialogs',$msg_dialogs); session::set('msg_dialogs', $msg_dialogs);
} }
} }
session::set('errorsAlreadyPosted',$errorsAlreadyPosted); session::set('errorsAlreadyPosted', $errorsAlreadyPosted);
} }
/*! /*!
...@@ -111,9 +112,9 @@ class msg_dialog ...@@ -111,9 +112,9 @@ class msg_dialog
* *
* \param string $i_type The type of the message dialog, by default = INFO_DIALOG * \param string $i_type The type of the message dialog, by default = INFO_DIALOG
*/ */
public static function display($s_title,$s_message,$i_type = INFO_DIALOG) public static function display($s_title, $s_message, $i_type = INFO_DIALOG)
{ {
new msg_dialog($s_title,$s_message,$i_type); new msg_dialog($s_title, $s_message, $i_type);
} }
/* /*
...@@ -124,7 +125,7 @@ class msg_dialog ...@@ -124,7 +125,7 @@ class msg_dialog
public static function displayChecks($messages) public static function displayChecks($messages)
{ {
/* Assemble the message array to a plain string */ /* Assemble the message array to a plain string */
foreach ($messages as $error){ foreach ($messages as $error) {
msg_dialog::display(_("Error"), $error, ERROR_DIALOG); msg_dialog::display(_("Error"), $error, ERROR_DIALOG);
} }
} }
...@@ -136,7 +137,7 @@ class msg_dialog ...@@ -136,7 +137,7 @@ class msg_dialog
*/ */
public function get_ID() public function get_ID()
{ {
return($this->i_ID); return $this->i_ID;
} }
/*! /*!
...@@ -145,7 +146,7 @@ class msg_dialog ...@@ -145,7 +146,7 @@ class msg_dialog
public function execute() public function execute()
{ {
global $config; global $config;
if($this->i_Type == FATAL_ERROR_DIALOG) { if ($this->i_Type == FATAL_ERROR_DIALOG) {
$display = $display =
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\"
\"http://www.w3.org/TR/html4/transitional.dtd\"> \"http://www.w3.org/TR/html4/transitional.dtd\">
...@@ -168,10 +169,10 @@ class msg_dialog ...@@ -168,10 +169,10 @@ class msg_dialog
</td></tr> </td></tr>
</table></body></html>"; </table></body></html>";
return $display; return $display;
}else{ } else {
$smarty = get_smarty(); $smarty = get_smarty();
$smarty->assign("s_Trace", print_a($this->a_Trace,TRUE)); $smarty->assign("s_Trace", print_a($this->a_Trace, TRUE));
$smarty->assign("i_TraceCnt", count($this->a_Trace)); $smarty->assign("i_TraceCnt", count($this->a_Trace));
$smarty->assign("i_Type", $this->i_Type); $smarty->assign("i_Type", $this->i_Type);
$smarty->assign("s_Message", $this->s_Message); $smarty->assign("s_Message", $this->s_Message);
...@@ -190,10 +191,10 @@ class msg_dialog ...@@ -190,10 +191,10 @@ class msg_dialog
*/ */
public function is_confirmed() public function is_confirmed()
{ {
if(isset($_POST['MSG_OK'.$this->i_ID])){ if (isset($_POST['MSG_OK'.$this->i_ID])) {
return(TRUE); return TRUE;
}else{ } else {
return(FALSE); return FALSE;
} }
} }
...@@ -202,15 +203,15 @@ class msg_dialog ...@@ -202,15 +203,15 @@ class msg_dialog
*/ */
public static function get_dialogs() public static function get_dialogs()
{ {
$return =""; $return = "";
$dialog_ids= ""; $dialog_ids = "";
$seen = ""; $seen = "";
if(isset($_POST['closed_msg_dialogs'])){ /*if (isset($_POST['closed_msg_dialogs'])) {
//$seen = $_POST['closed_msg_dialogs']; $seen = $_POST['closed_msg_dialogs'];
} }*/
if(session::is_set('msg_dialogs') && is_array(session::get('msg_dialogs')) && count(session::get('msg_dialogs'))){ if (session::is_set('msg_dialogs') && is_array(session::get('msg_dialogs')) && count(session::get('msg_dialogs'))) {
/* Get frame one */ /* Get frame one */
$smarty = get_smarty(); $smarty = get_smarty();
...@@ -220,6 +221,7 @@ class msg_dialog ...@@ -220,6 +221,7 @@ class msg_dialog
$msg_dialogs = session::get('msg_dialogs'); $msg_dialogs = session::get('msg_dialogs');
foreach ($msg_dialogs as $key => $dialog) { foreach ($msg_dialogs as $key => $dialog) {
if (preg_match("/".$dialog->get_ID()."/", $seen)) { if (preg_match("/".$dialog->get_ID()."/", $seen)) {
unset($msg_dialogs[$key]); unset($msg_dialogs[$key]);
} else { } else {
$return .= $dialog->execute(); $return .= $dialog->execute();
...@@ -228,15 +230,16 @@ class msg_dialog ...@@ -228,15 +230,16 @@ class msg_dialog
unset($msg_dialogs[$key]); unset($msg_dialogs[$key]);
} }
session::set('msg_dialogs', $msg_dialogs); session::set('msg_dialogs', $msg_dialogs);
$dialog_ids = preg_replace("/,$/", "", $dialog_ids); $dialog_ids = preg_replace("/,$/", "", $dialog_ids);
$return .= "</div>"; $return .= "</div>";
$return .="<input type='hidden' style='width:400px;' name='pending_msg_dialogs' id='pending_msg_dialogs' value='".$dialog_ids."'>"; $return .= "<input type='hidden' style='width:400px;' name='pending_msg_dialogs' id='pending_msg_dialogs' value='".$dialog_ids."'>";
$return .="<input type='hidden' style='width:400px;' name='closed_msg_dialogs' id='closed_msg_dialogs' value=''>"; $return .= "<input type='hidden' style='width:400px;' name='closed_msg_dialogs' id='closed_msg_dialogs' value=''>";
$return .="<input type='hidden' style='width:400px;' name='current_msg_dialogs' id='current_msg_dialogs' value=''>"; $return .= "<input type='hidden' style='width:400px;' name='current_msg_dialogs' id='current_msg_dialogs' value=''>";
$return .="<input type='hidden' style='width:700px;' name='js_debug' id='js_debug'>"; $return .= "<input type='hidden' style='width:700px;' name='js_debug' id='js_debug'>";
} }
return($return); return $return;
} }
} }
......
  • bmortier @bmortier

    mentioned in issue #876

    By Côme Chilliet on 2017-09-02T15:02:29 (imported from GitLab)

     ·

    mentioned in issue #876

    By Côme Chilliet on 2017-09-02T15:02:29 (imported from GitLab)

    Toggle commit list
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment