Changeset 510

Timestamp:

02/22/06 00:25:26 (7 years ago)

Author:

anarcat

Message:

[project @ alternc: changeset 2005-01-19 22:42:19 by anarcat]
use the $db object to do sql requests wrap the ldap code within a
function_exists() so that it doesn't run if ldap is not availble

Original author: anarcat
Date: 2005-01-19 22:42:19

File:

• install/scripts/upgrades/0.9.2.php (modified) (3 diffs)

install/scripts/upgrades/0.9.2.php

@@ -21 +21 @@
  */
 require_once('/var/alternc/bureau/class/functions.php');
+require_once('/var/alternc/bureau/class/config_nochk.php');
 
 $config = "/var/alternc/bureau/class/local.php";
@@ -52 +53 @@
 // Connect to the ldap server
 
+if (function_exists("ldap_connect()")) {
 if (!($ds=ldap_connect($L_LDAP_HOST))) {
   echo "cannot connect to ldap server \"$L_LDAP_HOST\"\n";
@@ -136 +138 @@
 }
 echo " done\n";
+ldap_close($ds);
+
+} else {
+  echo "ldap module not loaded into php, skipping LDAP conversion\n";
+}
 
 echo "Step 2: encrypting user passwords\n";
 
-if ($q = mysql_query("SELECT LENGTH(`pass`) AS len FROM `membres` GROUP BY len ORDER BY len ASC;")) {
-  if ($res = mysql_fetch_array($q)) {
+if (!mysql_query("use $L_MYSQL_DATABASE")) {
+  echo "can't select database $L_MYSQL_DATABASE\n";
+}
+
+if ($db->query("SELECT LENGTH(`pass`) AS len FROM `membres` GROUP BY len ORDER BY len ASC;")) {
+  if ($db->next_record()) {
+    $res = $db->Record;
     if ($res['len'] == 34) {
       print "passwords already encrypted";
     } else {
-      $r=mysql_query("SELECT uid,pass FROM membres;");
+      $r=$db->query("SELECT uid,pass FROM membres;");
 
-      while ($c=mysql_fetch_array($r)) {
+      while ($db->next_record()) {
+        $c = $db->Record();
         $pass=_md5cr($c['pass']);
         $id=$c['uid'];
         echo "membre $id\n";
-        mysql_query("UPDATE membres SET pass='$pass' WHERE uid='$id';");
+        $db->query("UPDATE membres SET pass='$pass' WHERE uid='$id';");
       }
     }
+  } else {
+    echo "fetch_array() failed: ". mysql_error()."\n";
   }
+} else {
+  echo "query failed: ". mysql_error()."\n";
 }
 
 mysql_close();
-ldap_close($ds);
 
 ?>