[geeklog-hg] geeklog: Reverted the part that should not be used COM_showMessa...

[geeklog-cvs at lists.geeklog.net]

changeset 9084:961e8234eacb
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/961e8234eacb
user: dengen
date: Wed May 22 22:12:00 2013 +0900
description:
Reverted the part that should not be used COM_showMessageText function.

diffstat:

 plugins/calendar/functions.inc    |   4 +++-
 plugins/links/functions.inc       |   4 +++-
 plugins/polls/functions.inc       |   4 +++-
 plugins/staticpages/functions.inc |   4 +++-
 public_html/calendar/event.php    |   4 +++-
 public_html/stats.php             |  16 ++++++++++++----
 public_html/usersettings.php      |   7 +++----
 7 files changed, 30 insertions(+), 13 deletions(-)

diffs (134 lines):

diff -r 2bb8593f4508 -r 961e8234eacb plugins/calendar/functions.inc
--- a/plugins/calendar/functions.inc	Wed May 22 21:15:08 2013 +0900
+++ b/plugins/calendar/functions.inc	Wed May 22 22:12:00 2013 +0900
@@ -1397,7 +1397,9 @@
         }
         $display .= ADMIN_simpleList("", $header_arr, $text_arr, $data_arr);
     } else {
-        $display .= COM_showMessageText($LANG_CAL_1[49], $LANG_CAL_1[47]);
+        $display .= COM_startBlock($LANG_CAL_1[47]);
+        $display .= $LANG_CAL_1[49];
+        $display .= COM_endBlock();
     }
 
     return $display;
diff -r 2bb8593f4508 -r 961e8234eacb plugins/links/functions.inc
--- a/plugins/links/functions.inc	Wed May 22 21:15:08 2013 +0900
+++ b/plugins/links/functions.inc	Wed May 22 22:12:00 2013 +0900
@@ -338,7 +338,9 @@
         }
         $retval .= ADMIN_simpleList('', $header_arr, $text_arr, $data_arr);
     } else {
-        $retval .= COM_showMessageText($LANG_LINKS_STATS['stats_no_hits'], $LANG_LINKS_STATS['stats_headline']);
+        $retval .= COM_startBlock($LANG_LINKS_STATS['stats_headline']);
+        $retval .= $LANG_LINKS_STATS['stats_no_hits'];
+        $retval .= COM_endBlock();
     }
 
     return $retval;
diff -r 2bb8593f4508 -r 961e8234eacb plugins/polls/functions.inc
--- a/plugins/polls/functions.inc	Wed May 22 21:15:08 2013 +0900
+++ b/plugins/polls/functions.inc	Wed May 22 22:12:00 2013 +0900
@@ -250,7 +250,9 @@
         }
         $retval .= ADMIN_simpleList('', $header_arr, $text_arr, $data_arr);
     } else {
-        $retval .= COM_showMessageText($LANG_POLLS['stats_none'], $LANG_POLLS['stats_top10']);
+        $retval .= COM_startBlock($LANG_POLLS['stats_top10']);
+        $retval .= $LANG_POLLS['stats_none'];
+        $retval .= COM_endBlock();
     }
 
     return $retval;
diff -r 2bb8593f4508 -r 961e8234eacb plugins/staticpages/functions.inc
--- a/plugins/staticpages/functions.inc	Wed May 22 21:15:08 2013 +0900
+++ b/plugins/staticpages/functions.inc	Wed May 22 22:12:00 2013 +0900
@@ -738,7 +738,9 @@
         }
         $retval .= ADMIN_simpleList("", $header_arr, $text_arr, $data_arr);
     } else {
-        $retval .= COM_showMessageText($LANG_STATIC['stats_no_hits'], $LANG_STATIC['stats_headline']);
+        $retval .= COM_startBlock($LANG_STATIC['stats_headline']);
+        $retval .= $LANG_STATIC['stats_no_hits'];
+        $retval .= COM_endBlock();
     }
 
     return $retval;
diff -r 2bb8593f4508 -r 961e8234eacb public_html/calendar/event.php
--- a/public_html/calendar/event.php	Wed May 22 21:15:08 2013 +0900
+++ b/public_html/calendar/event.php	Wed May 22 22:12:00 2013 +0900
@@ -413,7 +413,9 @@
             $result = DB_query ("SELECT * FROM {$_TABLES['personal_events']} WHERE (eid = '$eid') AND (uid = {$_USER['uid']})");
             if (DB_numRows ($result) == 1) {
                 $A = DB_fetchArray ($result);
-                $display .= COM_showMessageText(editpersonalevent($A), $LANG_CAL_2[38]);
+                $display .= COM_startBlock ($LANG_CAL_2[38])
+                         . editpersonalevent ($A)
+                         . COM_endBlock ();
                 $display = COM_createHTMLDocument($display, array('pagetitle' => $LANG_CAL_2[38]));
             } else {
                 $display = COM_refresh ($_CONF['site_url'] . '/index.php');
diff -r 2bb8593f4508 -r 961e8234eacb public_html/stats.php
--- a/public_html/stats.php	Wed May 22 21:15:08 2013 +0900
+++ b/public_html/stats.php	Wed May 22 22:12:00 2013 +0900
@@ -148,7 +148,9 @@
     }
     $display .= ADMIN_simpleList("", $header_arr, $text_arr, $data_arr);
 } else {
-    $display .= COM_showMessageText($LANG10[10], $LANG10[7]);
+    $display .= COM_startBlock($LANG10[7]);
+    $display .= $LANG10[10];
+    $display .= COM_endBlock();
 }
 
 // Top Ten Commented Stories
@@ -180,7 +182,9 @@
     $display .= ADMIN_simpleList("", $header_arr, $text_arr, $data_arr);
 
 } else {
-    $display .= COM_showMessageText($LANG10[13], $LANG10[11]);
+    $display .= COM_startBlock($LANG10[11]);
+    $display .= $LANG10[13];
+    $display .= COM_endBlock();
 }
 
 // Top Ten Trackback Comments
@@ -214,7 +218,9 @@
         $display .= ADMIN_simpleList("", $header_arr, $text_arr, $data_arr);
 
     } else {
-        $display .= COM_showMessageText($LANG10[26], $LANG10[25]);
+        $display .= COM_startBlock($LANG10[25]);
+        $display .= $LANG10[26];
+        $display .= COM_endBlock();
     }
 }
 
@@ -248,7 +254,9 @@
     }
     $display .= ADMIN_simpleList("", $header_arr, $text_arr, $data_arr);
 } else {
-    $display .= COM_showMessageText($LANG10[24], $LANG10[22]);
+    $display .= COM_startBlock($LANG10[22]);
+    $display .= $LANG10[24];
+    $display .= COM_endBlock();
 }
 
 // Now show stats for any plugins that want to be included
diff -r 2bb8593f4508 -r 961e8234eacb public_html/usersettings.php
--- a/public_html/usersettings.php	Wed May 22 21:15:08 2013 +0900
+++ b/public_html/usersettings.php	Wed May 22 22:12:00 2013 +0900
@@ -1465,10 +1465,9 @@
         break;
     }
 } else {
-    $display .= COM_showMessageText(
-                    '<br' . XHTML . '>' . $LANG04[71] . '<br' . XHTML . '><br' . XHTML . '>',
-                    $LANG04[70] . '!'
-    );
+    $display .= COM_startBlock ($LANG04[70] . '!');
+    $display .= '<br' . XHTML . '>' . $LANG04[71] . '<br' . XHTML . '><br' . XHTML . '>';
+    $display .= COM_endBlock ();
     $display = COM_createHTMLDocument($display);
 }