From 31d1ff34b584dcd749fd8dc66c96373da9781f2b Mon Sep 17 00:00:00 2001 From: Alex Aragon Date: Mon, 10 Oct 2016 17:41:11 -0500 Subject: [PATCH 1/3] Changing structure for global error message - refs BT#7683 --- main/inc/global_error_message.inc.php | 65 +++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/main/inc/global_error_message.inc.php b/main/inc/global_error_message.inc.php index 82a37b505d..b99ad9e136 100755 --- a/main/inc/global_error_message.inc.php +++ b/main/inc/global_error_message.inc.php @@ -153,6 +153,7 @@ if (is_int($global_error_code) && $global_error_code > 0) { $installChamiloImage = "data:image/png;base64,".base64_encode(file_get_contents("$root_sys/main/img/mr_chamilo_install.png")); $global_error_message['mr_chamilo'] = $installChamiloImage; + if ($global_error_code == 2) { $global_error_message_page = << @@ -249,6 +250,70 @@ if (is_int($global_error_code) && $global_error_code > 0) { EOM; + }else{ + $global_error_message_page = +<< + + + {TITLE} + + + + +
+
+
+
+
+
+ +
+
+
+
+ + +
+
+
+
+ +
+
+
+
+
+
+ + +EOM; + } foreach ($global_error_message as $key => $value) { $global_error_message_page = str_replace('{'.strtoupper($key).'}', $value, $global_error_message_page); } From 5ca9571a2baedd0076c34f61d7670e796dadb066 Mon Sep 17 00:00:00 2001 From: Alex Aragon Date: Mon, 10 Oct 2016 17:45:16 -0500 Subject: [PATCH 2/3] Changing structure for global error message - refs BT#7683 --- main/inc/global_error_message.inc.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/main/inc/global_error_message.inc.php b/main/inc/global_error_message.inc.php index b99ad9e136..50e702cf3f 100755 --- a/main/inc/global_error_message.inc.php +++ b/main/inc/global_error_message.inc.php @@ -153,8 +153,8 @@ if (is_int($global_error_code) && $global_error_code > 0) { $installChamiloImage = "data:image/png;base64,".base64_encode(file_get_contents("$root_sys/main/img/mr_chamilo_install.png")); $global_error_message['mr_chamilo'] = $installChamiloImage; - if ($global_error_code == 2) { - $global_error_message_page = + if ($global_error_code == 2) { + $global_error_message_page = << @@ -250,11 +250,11 @@ if (is_int($global_error_code) && $global_error_code > 0) { EOM; - }else{ + } else { $global_error_message_page = << - + + {TITLE} From cdc77c45ba9a954f769be7c9f2d480d65b518516 Mon Sep 17 00:00:00 2001 From: Alex Aragon Date: Mon, 10 Oct 2016 17:45:54 -0500 Subject: [PATCH 3/3] Changing structure for global error message - refs BT#7683 --- main/inc/global_error_message.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/inc/global_error_message.inc.php b/main/inc/global_error_message.inc.php index 50e702cf3f..79c31b89db 100755 --- a/main/inc/global_error_message.inc.php +++ b/main/inc/global_error_message.inc.php @@ -313,7 +313,7 @@ EOM; EOM; - } + } foreach ($global_error_message as $key => $value) { $global_error_message_page = str_replace('{'.strtoupper($key).'}', $value, $global_error_message_page); }