[phpwiki-checkins] CVS: phpwiki/lib WikiUserNew.php,1.134,1.135

[Reini U. <ru...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv464

Modified Files:
	WikiUserNew.php 
Log Message:
fix DBAUTH arguments to be position independent, fixes bug #1358973

Index: WikiUserNew.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiUserNew.php,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -2 -b -p -d -r1.134 -r1.135
--- WikiUserNew.php	19 Mar 2006 15:01:00 -0000	1.134
+++ WikiUserNew.php	19 Mar 2006 16:26:39 -0000	1.135
@@ -1007,5 +1007,9 @@ extends _AnonUser
 
     // TODO: use it again for the auth and member tables
-    function prepare ($stmt, $variables, $oldstyle = false) {
+    // sprintfstyle vs prepare style: %s or ?
+    //   multiple vars should be executed via prepare(?,?)+execute, 
+    //   single vars with execute(sprintf(quote(var)))
+    // help with position independency
+    function prepare ($stmt, $variables, $oldstyle = false, $sprintfstyle = true) {
         global $request;
         $dbi = $request->getDbh();
@@ -1016,4 +1020,5 @@ extends _AnonUser
         $new = array();
         if (is_array($variables)) {
+            //$sprintfstyle = false;
             for ($i=0; $i < count($variables); $i++) { 
                 $var = $this->_normalize_stmt_var($variables[$i], $oldstyle);
@@ -1023,5 +1028,8 @@ extends _AnonUser
                 $variables[$i] = $var;
                 if (!$var) $new[] = '';
-                else $new[] = '%s';
+                else {
+                    $s = "%" . ($i+1) . "s";	
+                    $new[] = $sprintfstyle ? $s : "?";
+                }
             }
         } else {
@@ -1032,5 +1040,5 @@ extends _AnonUser
             $variables = $var;
             if (!$var) $new = ''; 
-            else $new = '%s'; 
+            else $new = $sprintfstyle ? '%s' : "?"; 
         }
         $prefix = $dbi->getParam('prefix');
@@ -2097,4 +2105,7 @@ extends UserPreferences
 
 // $Log$
+// Revision 1.135  2006/03/19 16:26:39  rurban
+// fix DBAUTH arguments to be position independent, fixes bug #1358973
+//
 // Revision 1.134  2006/03/19 15:01:00  rurban
 // sf.net patch #1333957 by Matt Brown: Authentication cookie identical across all wikis on a host