[geeklog-hg] geeklog: Added 404.log file and moved user login and password re...

[geeklog-cvs at lists.geeklog.net]

changeset 9101:70e6f24c59f5
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/70e6f24c59f5
user: Tom <websitemaster at cogeco.net>
date: Tue Jun 18 18:07:22 2013 -0400
description:
Added 404.log file and moved user login and password request failures to access.log file to clean up error.log file

diffstat:

 language/english.php       |   2 +-
 language/english_utf-8.php |   2 +-
 logs/404.log               |   1 +
 public_html/lib-common.php |  34 +++++++++++++++++++---------------
 system/lib-security.php    |   2 +-
 5 files changed, 23 insertions(+), 18 deletions(-)

diffs (112 lines):

diff -r 18d7f63f3eb8 -r 70e6f24c59f5 language/english.php
--- a/language/english.php	Tue Jun 18 12:56:31 2013 -0400
+++ b/language/english.php	Tue Jun 18 18:07:22 2013 -0400
@@ -81,7 +81,7 @@
     37 => 'No user stories',
     38 => 'Content Syndication',
     39 => 'Refresh',
-    40 => '',
+    40 => 'Error in password request, invalid username',
     41 => 'Guest Users',
     42 => 'Authored by:',
     43 => 'Reply to This',
diff -r 18d7f63f3eb8 -r 70e6f24c59f5 language/english_utf-8.php
--- a/language/english_utf-8.php	Tue Jun 18 12:56:31 2013 -0400
+++ b/language/english_utf-8.php	Tue Jun 18 18:07:22 2013 -0400
@@ -81,7 +81,7 @@
     37 => 'No user stories',
     38 => 'Content Syndication',
     39 => 'Refresh',
-    40 => '',
+    40 => 'Error in password request, invalid username',
     41 => 'Guest Users',
     42 => 'Authored by:',
     43 => 'Reply to This',
diff -r 18d7f63f3eb8 -r 70e6f24c59f5 logs/404.log
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/logs/404.log	Tue Jun 18 18:07:22 2013 -0400
@@ -0,0 +1,1 @@
+*** dummy entry ***
diff -r 18d7f63f3eb8 -r 70e6f24c59f5 public_html/lib-common.php
--- a/public_html/lib-common.php	Tue Jun 18 12:56:31 2013 -0400
+++ b/public_html/lib-common.php	Tue Jun 18 18:07:22 2013 -0400
@@ -4854,23 +4854,20 @@
 *
 */
 
-function COM_getPassword( $loginname )
+function COM_getPassword($loginname)
 {
     global $_TABLES, $LANG01;
 
-    $result = DB_query( "SELECT passwd FROM {$_TABLES['users']} WHERE username='$loginname'" );
+    $result = DB_query("SELECT passwd FROM {$_TABLES['users']} WHERE username='$loginname'");
     $tmp = DB_error();
-    $nrows = DB_numRows( $result );
-
-    if(( $tmp == 0 ) && ( $nrows == 1 ))
-    {
+    $nrows = DB_numRows($result);
+
+    if(($tmp == 0) && ($nrows == 1)) {
         $U = DB_fetchArray( $result );
         return $U['passwd'];
-    }
-    else
-    {
-        $tmp = $LANG01[32] . ": '" . $loginname . "'";
-        COM_errorLog( $tmp, 1 );
+    } else {
+        $tmp = $LANG01[40] . ": '" . $loginname . "'";
+        COM_accessLog($tmp);
     }
 
     return '';
@@ -6135,8 +6132,7 @@
 
 /**
 * Creates an HTML unordered list from the given array.
-* It formats one list item per array element, using the list.thtml
-* and listitem.thtml templates.
+* It formats one list item per array element, using the list.thtml template
 *
 * @param    array   $listofitems    Items to list out
 * @param    string  $classname      optional CSS class name for the list
@@ -7964,7 +7960,7 @@
  */
 function COM_handle404($alternate_url = '')
 {
-    global $_USER, $LANG_404;
+    global $_CONF, $_USER, $LANG_404;
     
 
     if (function_exists('CUSTOM_handle404')) {
@@ -7991,7 +7987,15 @@
         $byuser = 'anon@' . $_SERVER['REMOTE_ADDR'];
     }
     $refurl = $_SERVER['HTTP_REFERER'];
-    COM_errorLog("404 Error generated by $byuser for url: $url - Referring url: $refurl", 1);
+    $remoteaddress = $_SERVER['REMOTE_ADDR'];
+    $timestamp = @strftime( '%c' );
+    $logentry = "404 Error generated by $byuser for url: $url - Referring url: $refurl";
+    $logfile = $_CONF['path_log'] . '404.log';
+    if (!$file = fopen($logfile, 'a')) {
+        
+    } else {
+        fputs( $file, "$timestamp - $logentry \n" );
+    }
     
     $display .= sprintf($LANG_404[2], $url);
     if ($alternate_url != '') {
diff -r 18d7f63f3eb8 -r 70e6f24c59f5 system/lib-security.php
--- a/system/lib-security.php	Tue Jun 18 12:56:31 2013 -0400
+++ b/system/lib-security.php	Tue Jun 18 18:07:22 2013 -0400
@@ -757,7 +757,7 @@
         }
     } else {
         $tmp = $LANG01[32] . ": '" . $username . "'";
-        COM_errorLog($tmp, 1);
+        COM_accessLog($tmp);
         return -1;
     }
 }