From 92638f34266d4adce791c58b0ed830918fd974fd Mon Sep 17 00:00:00 2001
From: Ian <aristophian@googlemail.com>
Date: Mon, 26 Mar 2012 14:28:49 +0200
Subject: [PATCH] installer and upgrader hardcoded markup notices (no fallback)

---
 include/admin/installer.inc.php     | 10 +++++-----
 include/admin/tpl/installer.inc.tpl | 11 -----------
 include/admin/tpl/upgrader.inc.tpl  | 12 ------------
 include/admin/upgrader.inc.php      | 10 +++++-----
 4 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/include/admin/installer.inc.php b/include/admin/installer.inc.php
index 38333bd2..20c23bab 100644
--- a/include/admin/installer.inc.php
+++ b/include/admin/installer.inc.php
@@ -40,19 +40,19 @@ $data['basedir'] = $basedir;
  * @return string   returned String
  */
 function serendipity_installerResultDiagnose($result, $s) {
-    global $errorCount;
+    global $errorCount, $data;
     if ( $result === S9Y_I_SUCCESS ) {
-        $data['i_success'] = true;
-        return '<span class="serendipityAdminMsgSuccessInstall" style="color: green; font-weight: bold">'. $s .'</span>';
+        $data['i_success'] = true; // we dont need data here explicitely, but we keep it for possible future purposes
+        return '<span class="msg_success">'. $s .'</span>';
     }
     if ( $result === S9Y_I_WARNING ) {
         $data['i_warning'] = true;
-        return '<span class="serendipityAdminMsgWarningInstall" style="color: orange; font-weight: bold">'. $s .' [?]</span>';
+        return '<span class="msg_notice">'. $s .' [?]</span>';
     }
     if ( $result === S9Y_I_ERROR ) {
         $errorCount++;
         $data['i_error'] = true;
-        return '<span class="serendipityAdminMsgErrorInstall" style="color: red; font-weight: bold">'. $s .' [!]</span>';
+        return '<span class="msg_error">'. $s .' [!]</span>';
     }
 }
 
diff --git a/include/admin/tpl/installer.inc.tpl b/include/admin/tpl/installer.inc.tpl
index fd67e003..ce419142 100644
--- a/include/admin/tpl/installer.inc.tpl
+++ b/include/admin/tpl/installer.inc.tpl
@@ -1,14 +1,3 @@
-{** please return correct markup for these serendipity_installerResultDiagnose notices in the upper PHP file
-    {if $i_success}
-        return '<span class="serendipityAdminMsgSuccessInstall" style="color: green; font-weight: bold">'. $s .'</span>';
-    {/if}
-    {if $i_warning}
-        return '<span class="serendipityAdminMsgWarningInstall" style="color: orange; font-weight: bold">'. $s .' [?]</span>';
-    {/if}
-    {if $i_error}
-        return '<span class="serendipityAdminMsgErrorInstall" style="color: red; font-weight: bold">'. $s .' [!]</span>';
-    {/if}
-**}
 {* From configuration to install *}
 {if ( sizeof($smarty.post) > 1 && $s9yGETstep == 3 )}
 
diff --git a/include/admin/tpl/upgrader.inc.tpl b/include/admin/tpl/upgrader.inc.tpl
index 757e16a3..02b782c5 100644
--- a/include/admin/tpl/upgrader.inc.tpl
+++ b/include/admin/tpl/upgrader.inc.tpl
@@ -1,15 +1,3 @@
-{** please return correct markup for these serendipity_upgraderResultDiagnose notices in the upper PHP file
-    {if $u_success}
-        return '<span class="serendipityAdminMsgSuccessInstall" style="color: green; font-weight: bold">'. $s .'</span>';
-    {/if}
-    {if $u_warning}
-        return '<span class="serendipityAdminMsgWarningInstall" style="color: orange; font-weight: bold">'. $s .'</span>';
-    {/if}
-    {if $u_error}
-        return '<span class="serendipityAdminMsgErrorInstall" style="color: red; font-weight: bold">'. $s .'</span>';
-    {/if}
-**}
-
 {if $task_function}
     {'Calling %s ...<br />'|sprintf:(is_array($task['function']) ? $task['function'][0] . '::'. $task['function'][1] : $task['function'])}
 {/if}
diff --git a/include/admin/upgrader.inc.php b/include/admin/upgrader.inc.php
index bed9bbf2..36530683 100644
--- a/include/admin/upgrader.inc.php
+++ b/include/admin/upgrader.inc.php
@@ -23,22 +23,22 @@ define('S9Y_U_SUCCESS', 1);
  * @return string   returned String
  */
 function serendipity_upgraderResultDiagnose($result, $s) {
-    global $errorCount;
+    global $errorCount, $data;
 
     if ( $result === S9Y_U_SUCCESS ) {
-        $data['u_success'] = true;
-        return '<span class="serendipityAdminMsgSuccessInstall" style="color: green; font-weight: bold">'. $s .'</span>';
+        $data['u_success'] = true; // we dont need data here explicitely, but we keep it for possible future purposes
+        return '<span class="msg_success">'. $s .'</span>';
     }
 
     if ( $result === S9Y_U_WARNING ) {
         $data['u_warning'] = true;
-        return '<span class="serendipityAdminMsgWarningInstall" style="color: orange; font-weight: bold">'. $s .'</span>';
+        return '<span class="msg_notice">'. $s .'</span>';
     }
 
     if ( $result === S9Y_U_ERROR ) {
         $errorCount++;
         $data['u_error'] = true;
-        return '<span class="serendipityAdminMsgErrorInstall" style="color: red; font-weight: bold">'. $s .'</span>';
+        return '<span class="msg_error">'. $s .'</span>';
     }
 }