Mercurial > hg > fapweb

changeset 874:ffb5643eff4f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename functions.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 26 Nov 2014 15:12:59 +0200
parents 9a8fe613e73a
children 920e33605102
files admlogin.php msite.inc.php msitegen.inc.php usrlogin.php
diffstat 4 files changed, 22 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/admlogin.php	Wed Nov 26 15:00:16 2014 +0200
+++ b/admlogin.php	Wed Nov 26 15:12:59 2014 +0200
@@ -23,13 +23,13 @@
 if (stGetRequestItem("admpass", FALSE) == $password)
 {
   if (!stSessionStart(SESS_ADMIN, $password, "admTimeout"))
-    stErrorLog("Admin session AUTH LOGIN failed (session setup) @ ".$sfrom);
+    stLogError("Admin session AUTH LOGIN failed (session setup) @ ".$sfrom);
   else
-    stErrorLog("Admin session LOGIN SUCCESS @ ".$sfrom);
+    stLogError("Admin session LOGIN SUCCESS @ ".$sfrom);
 }
 else
 {
-  stErrorLog("Admin session AUTH LOGIN failed (password) @ ".$sfrom);
+  stLogError("Admin session AUTH LOGIN failed (password) @ ".$sfrom);
 }
 
 header("Location: admin.php");
--- a/msite.inc.php	Wed Nov 26 15:00:16 2014 +0200
+++ b/msite.inc.php	Wed Nov 26 15:12:59 2014 +0200
@@ -1015,7 +1015,7 @@
   // Get file magic info
   if (($finfo = finfo_open()) === false)
   {
-    stErrorLog("Internal error. Failed to initialize finfo().");
+    stLogError("Internal error. Failed to initialize finfo().");
     return stError("Internal error, failed to probe file.");
   }
 
@@ -1026,7 +1026,7 @@
   // Did we get anything?
   if ($sdata === FALSE || $smime === FALSE)
   {
-    stErrorLog("Failed to probe file '".$filename."'.");
+    stLogError("Failed to probe file '".$filename."'.");
     return stError("Internal error, failed to probe file.");
   }
 
@@ -1045,14 +1045,14 @@
       return $fdata;
   }
 
-  stErrorLog("File '".$filename."' (".$smime.") did not match any allowed file types.");
+  stLogError("File '".$filename."' (".$smime.") did not match any allowed file types.");
   return stError("No matching allowed file type found for '".$smime."'.");
 }
 
 
 function stFileError($userID, $adminMsg, $userMsg)
 {
-  stErrorLog($adminMsg);
+  stLogError($adminMsg);
   stError(($userID === 0) ? $adminMsg : $userMsg);
   return FALSE;
 }
--- a/msitegen.inc.php	Wed Nov 26 15:00:16 2014 +0200
+++ b/msitegen.inc.php	Wed Nov 26 15:12:59 2014 +0200
@@ -36,13 +36,19 @@
 }
 
 
-function stErrorLog($msg)
+function stLogError($msg)
 {
   error_log("FAPWeb: ".$msg);
   return FALSE;
 }
 
 
+function stLogSQLError($dbh, $sql)
+{
+  stLogError("SQL error '".implode("; ", $dbh->errorInfo())."' in statement: \"".$sql."\"");
+}
+
+
 function stError($msg)
 {
   global $errorSet, $errorMsgs;
@@ -150,7 +156,7 @@
     return $default;
   else
   {
-    stErrorLog("No config value for '".$name."'");
+    stLogError("No config value for '".$name."'");
     die("No config value for '".$name."'.\n");
   }
 }
@@ -352,7 +358,7 @@
           $str .= $argv[$n];
         else
         {
-          stErrorLog("Invalid stErrorStrF() format string, arg #".$n.
+          stLogError("Invalid stErrorStrF() format string, arg #".$n.
             " referenced, but only has ".$argc." arguments: '".$fmt."'\n");
           return FALSE;
         }
@@ -519,7 +525,7 @@
     $dbh = new PDO($dbspec);
   }
   catch (PDOException $e) {
-    stErrorLog("Could not connect to SQL database: ".$e->getMessage().".");
+    stLogError("Could not connect to SQL database: ".$e->getMessage().".");
     return FALSE;
   }
   return $dbh;
@@ -541,12 +547,6 @@
 }
 
 
-function stLogSQLError($dbh, $sql)
-{
-  stErrorLog("SQL error '".implode("; ", $dbh->errorInfo())."' in statement: \"".$sql."\"");
-}
-
-
 function stConnectSQLDB()
 {
   global $db;
@@ -557,7 +557,7 @@
       stGetSetting("sqlOptions", array()));
   }
   catch (PDOException $e) {
-    stErrorLog("Could not connect to SQL database: ".$e->getMessage().".");
+    stLogError("Could not connect to SQL database: ".$e->getMessage().".");
     return FALSE;
   }
   $db = stConnectSQLDBSpec(stGetSetting("sqlDB"));
@@ -595,7 +595,7 @@
         $sql .= stDBGetSQLParam($dbh, $fmt[++$pos], $argv[$argn++]);
       else
       {
-        stErrorLog("Invalid SQL statement format string '".$fmt.
+        stLogError("Invalid SQL statement format string '".$fmt.
           "', not enough parameters specified (".$argn." of ".$argc.")");
         return FALSE;
       }
@@ -626,7 +626,7 @@
         $sql .= stDBGetSQLParam($db, $fmt[++$pos], $argv[$argn++]);
       else
       {
-        stErrorLog("Invalid SQL statement format string '".$fmt.
+        stLogError("Invalid SQL statement format string '".$fmt.
           "', not enough parameters specified (".$argn." of ".$argc.")");
         return FALSE;
       }
--- a/usrlogin.php	Wed Nov 26 15:00:16 2014 +0200
+++ b/usrlogin.php	Wed Nov 26 15:12:59 2014 +0200
@@ -55,7 +55,7 @@
   {
     if (!stSessionStart(SESS_USER, $password, "userTimeout"))
     {
-      stErrorLog("User session AUTH LOGIN failed (session setup)");
+      stLogError("User session AUTH LOGIN failed (session setup)");
       $error = 2;
     }
     else
@@ -67,7 +67,7 @@
 }
 else
 {
-  stErrorLog("User session AUTH LOGIN failed (password)");
+  stLogError("User session AUTH LOGIN failed (password)");
   $error = 1;
 }