Index: trunk/kernel/include/portaluser.php
===================================================================
diff -u -r13 -r98
--- trunk/kernel/include/portaluser.php (.../portaluser.php) (revision 13)
+++ trunk/kernel/include/portaluser.php (.../portaluser.php) (revision 98)
@@ -180,44 +180,7 @@
}
return $value;
}
-
- function LoadFromDatabase($id)
- {
- global $objSession,$Errors;
-
- if(!isset($id))
- {
- $Errors->AddError("error.AppError",NULL,'Internal error: LoadFromDatabase id',"","clsPortalUser","LoadFromDatabase");
- return FALSE;
- }
- if($id)
- {
- $utable = $this->tablename;
- $gtable = GetTablePrefix()."UserGroup";
- $sql = "SELECT * FROM $utable "; //LEFT JOIN $gtable ON ($utable.PortalUserId=$gtable.PortalUserId)";
- $sql .=" WHERE PortalUserId=$id";
- //echo $sql."
\n";
- $result = $this->adodbConnection->Execute($sql);
- if ($result === FALSE)
- {
- $Errors->AddError("error.DatabaseError",NULL,$this->adodbConnection->ErrorMsg(),"",get_class($this),"LoadFromDatabase");
- return FALSE;
- }
-
- $data = $result->fields;
- if(is_array($data))
- {
- $this->SetFromArray($data);
- $this->Clean();
- }
- else
- return FALSE;
- return TRUE;
- }
- else
- return FALSE;
- }
-
+
function LoadPersistantVars()
{
unset($this->Vars);
@@ -854,6 +817,8 @@
function &Edit_User($UserId, $Login, $Password, $Email, $CreatedOn, $FirstName="", $LastName="",
$Status=2, $Phone="", $Street="", $City="", $State="", $Zip="", $Country="", $dob=0)
{
+ //echo "Editing User: [$UserId]
";
+
$u =& $this->GetItem($UserId);
if(!$CreatedOn)