Changeset 764

Timestamp:

01/06/10 15:12:28 (8 months ago)

Author:

PavelVinogradov

Message:

Pertially merge [360] from branches/1.2.x

Files:

• branches/1.1.x/php/src/userbuttom_1_prop.php (modified) (1 diff)

branches/1.1.x/php/src/userbuttom_1_prop.php

@@ -49 +49 @@
   $passwd="none";
   if($auth=="ncsa"||$auth=="ip")
-   {
-     if(isset($_GET["passwd"])) $passwd=$_GET["passwd"];
+  {
+     $result2=mysql_query("SELECT passwd FROM squidusers WHERE id=\"$userid\" "); 
+     $row2=mysql_fetch_array($result2);
+     if(isset($_GET["passwd"]))
+             $passwd=$_GET["passwd"];
+     else
+             $passwd=$row2['passwd']; 
    }