[geeklog-cvs] geeklog: Bah, wrong function name: COM_outputMessageAndAbort -> ...

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/9100c5b15c9d
changeset: 7193:9100c5b15c9d
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon Jul 27 21:39:26 2009 +0200
description:
Bah, wrong function name: COM_outputMessageAndAbort -> COM_displayMessageAndAbort

diffstat:

 public_html/admin/auth.inc.php |  2 +-
 public_html/profiles.php       |  4 ++--
 public_html/submit.php         |  4 ++--
 public_html/users.php          |  2 +-
 public_html/usersettings.php   |  2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diffs (78 lines):

diff -r 6ccc5481bbf6 -r 9100c5b15c9d public_html/admin/auth.inc.php
--- a/public_html/admin/auth.inc.php	Sun Jul 26 10:51:06 2009 +0200
+++ b/public_html/admin/auth.inc.php	Mon Jul 27 21:39:26 2009 +0200
@@ -39,7 +39,7 @@
 // MAIN
 COM_clearSpeedlimit($_CONF['login_speedlimit'], 'login');
 if (COM_checkSpeedlimit('login', $_CONF['login_attempts']) > 0) {
-    COM_outputMessageAndAbort($LANG04[112], '', 403, 'Access denied');
+    COM_displayMessageAndAbort($LANG04[112], '', 403, 'Access denied');
 }
 
 $uid = '';
diff -r 6ccc5481bbf6 -r 9100c5b15c9d public_html/profiles.php
--- a/public_html/profiles.php	Sun Jul 26 10:51:06 2009 +0200
+++ b/public_html/profiles.php	Mon Jul 27 21:39:26 2009 +0200
@@ -104,7 +104,7 @@
             $result = PLG_checkforSpam ($mailtext, $_CONF['spamx']);
             if ($result > 0) {
                 COM_updateSpeedlimit ('mail');
-                COM_outputMessageAndAbort ($result, 'spamx', 403, 'Forbidden');
+                COM_displayMessageAndAbort ($result, 'spamx', 403, 'Forbidden');
             }
 
             $msg = PLG_itemPreSave ('contact', $message);
@@ -327,7 +327,7 @@
     $result = PLG_checkforSpam ($mailtext, $_CONF['spamx']);
     if ($result > 0) {
         COM_updateSpeedlimit ('mail');
-        COM_outputMessageAndAbort ($result, 'spamx', 403, 'Forbidden');
+        COM_displayMessageAndAbort ($result, 'spamx', 403, 'Forbidden');
     }
 
     $mailtext .= '------------------------------------------------------------'
diff -r 6ccc5481bbf6 -r 9100c5b15c9d public_html/submit.php
--- a/public_html/submit.php	Sun Jul 26 10:51:06 2009 +0200
+++ b/public_html/submit.php	Mon Jul 27 21:39:26 2009 +0200
@@ -97,7 +97,7 @@
                 $formresult = PLG_showSubmitForm($type);
                 if ($formresult == false) {
                     COM_errorLog("Someone tried to submit an item to the $type-plugin, which cannot be found.", 1);
-                    COM_outputMessageAndAbort (79, '', 410, 'Gone');
+                    COM_displayMessageAndAbort (79, '', 410, 'Gone');
                 } else {
                     $retval .= $formresult;
                 }
@@ -292,7 +292,7 @@
     if ($result > 0)
     {
         COM_updateSpeedlimit ('submit');
-        COM_outputMessageAndAbort ($result, 'spamx', 403, 'Forbidden');
+        COM_displayMessageAndAbort ($result, 'spamx', 403, 'Forbidden');
     }
 
     COM_updateSpeedlimit ('submit');
diff -r 6ccc5481bbf6 -r 9100c5b15c9d public_html/users.php
--- a/public_html/users.php	Sun Jul 26 10:51:06 2009 +0200
+++ b/public_html/users.php	Mon Jul 27 21:39:26 2009 +0200
@@ -100,7 +100,7 @@
     $A = DB_fetchArray ($result);
 
     if ($A['status'] == USER_ACCOUNT_DISABLED && !SEC_hasRights ('user.edit')) {
-        COM_outputMessageAndAbort (30, '', 403, 'Forbidden');
+        COM_displayMessageAndAbort (30, '', 403, 'Forbidden');
     }
 
     $display_name = htmlspecialchars(COM_getDisplayName($user, $A['username'],
diff -r 6ccc5481bbf6 -r 9100c5b15c9d public_html/usersettings.php
--- a/public_html/usersettings.php	Sun Jul 26 10:51:06 2009 +0200
+++ b/public_html/usersettings.php	Mon Jul 27 21:39:26 2009 +0200
@@ -969,7 +969,7 @@
              . $A['about'] . '<br' . XHTML . '>' . $A['pgpkey'] . '</p>';
     $result = PLG_checkforSpam ($profile, $_CONF['spamx']);
     if ($result > 0) {
-        COM_outputMessageAndAbort ($result, 'spamx', 403, 'Forbidden');
+        COM_displayMessageAndAbort ($result, 'spamx', 403, 'Forbidden');
     }
 
     $A['email'] = COM_applyFilter ($A['email']);