Index: branches/unlabeled/unlabeled-1.2.56/themes/default/register/register_form.tpl =================================================================== diff -u -r1312 -r3972 --- branches/unlabeled/unlabeled-1.2.56/themes/default/register/register_form.tpl (.../register_form.tpl) (revision 1312) +++ branches/unlabeled/unlabeled-1.2.56/themes/default/register/register_form.tpl (.../register_form.tpl) (revision 3972) @@ -59,30 +59,49 @@
+
*

+
 
+
+ +   +
+ + + +
 
+
+ +   +
+ + + +
*  
+
* () @@ -96,34 +115,46 @@

+
+ +
+
+ + + +
 
+
 
+
 
- -
- -   - - - + +
+ +   + + + + +
Index: branches/unlabeled/unlabeled-1.2.64/themes/default/my_info/myinfo_form.tpl =================================================================== diff -u -r1021 -r3972 --- branches/unlabeled/unlabeled-1.2.64/themes/default/my_info/myinfo_form.tpl (.../myinfo_form.tpl) (revision 1021) +++ branches/unlabeled/unlabeled-1.2.64/themes/default/my_info/myinfo_form.tpl (.../myinfo_form.tpl) (revision 3972) @@ -49,11 +49,19 @@
+ + +
+
+ +
+ + *
@@ -62,6 +70,10 @@
+ +
+ +
@@ -85,12 +97,12 @@ : - + + + + + Index: branches/unlabeled/unlabeled-1.95.2/kernel/parser.php =================================================================== diff -u -r3962 -r3972 --- branches/unlabeled/unlabeled-1.95.2/kernel/parser.php (.../parser.php) (revision 3962) +++ branches/unlabeled/unlabeled-1.95.2/kernel/parser.php (.../parser.php) (revision 3972) @@ -785,14 +785,19 @@ $FormValues[$FormName]["firstname"] = $u->Get("FirstName"); $FormValues[$FormName]["lastname"] = $u->Get("LastName"); + $FormValues[$FormName]["company"] = $u->Get("Company"); $FormValues[$FormName]["email"] = $u->Get("Email"); $FormValues[$FormName]["phone"] = $u->Get("Phone"); + $FormValues[$FormName]["fax"] = $u->Get("Fax"); $FormValues[$FormName]["street"] = $u->Get("Street"); + $FormValues[$FormName]["street2"] = $u->Get("Street2"); $FormValues[$FormName]["city"] = $u->Get("City"); $FormValues[$FormName]["state"] = $u->Get("State"); $FormValues[$FormName]["zip"] = $u->Get("Zip"); $FormValues[$FormName]["country"] = $u->Get("Country"); + $FormValues[$FormName]["minpwresetdelay"] = $u->Get("MinPwResetDelay"); + // $FormValues[$FormName]["dob"] = LangDate($u->Get("dob"), 0, true); $FormValues[$FormName]["dob_day"] = adodb_date("d", $u->Get("dob")); $FormValues[$FormName]["dob_year"] = adodb_date("Y", $u->Get("dob")); Index: branches/unlabeled/unlabeled-1.65.2/kernel/frontaction.php =================================================================== diff -u -r3962 -r3972 --- branches/unlabeled/unlabeled-1.65.2/kernel/frontaction.php (.../frontaction.php) (revision 3962) +++ branches/unlabeled/unlabeled-1.65.2/kernel/frontaction.php (.../frontaction.php) (revision 3972) @@ -462,7 +462,25 @@ $dob = adodb_mktime(0, 0, 0, $_POST['dob_month'], $_POST['dob_day'], $_POST['dob_year']); $ip = $_SERVER['REMOTE_ADDR']; - $u = &$objUsers->Add_User($_POST["username"], md5($password), $_POST["email"], $CreatedOn, $_POST["firstname"], $_POST["lastname"], $Status, $_POST["phone"], $_POST["street"], $_POST["city"], $_POST["state"], $_POST["zip"], $_POST["country"], $dob, $ip, TRUE); + $fields_hash = Array('Login' => $_POST['username'], + 'Password' => md5($password), + 'FirstName' => $_POST['firstname'], + 'LastName' => $_POST['lastname'], + 'Company' => $_POST['company'], + 'Email' => $_POST['email'], + 'Status' => $Status, + 'Phone' => $_POST['phone'], + 'Fax' => $_POST['fax'], + 'Street' => $_POST['street'], + 'Street2' => $_POST['street2'], + 'City' => $_POST['city'], + 'State' => $_POST['state'], + 'Zip' => $_POST['zip'], + 'Country' => $_POST['country'], + 'CreatedOn' => $CreatedOn, + 'dob' => $dob, + 'ip' => $ip); + $u =& $objUsers->Add_User_NEW($fields_hash, true); if(!is_object($u)) { @@ -602,17 +620,29 @@ $u =& $objUsers->GetItem($UserId); $status = $u->Get("Status"); $dob = adodb_mktime(0, 0, 0, $_POST['dob_month'], $_POST['dob_day'], $_POST['dob_year']); - if(strlen($_POST["password"])>0) - { - $password = md5($_POST["password"]); - } - else - $password = ""; - $objUsers->Edit_User($UserId, $_POST["username"], $password, $_POST["email"], 0, - $_POST["firstname"], $_POST["lastname"], $status, $_POST["phone"], - $_POST["street"], $_POST["city"], $_POST["state"], $_POST["zip"], - $_POST["country"], $dob, $_POST['MinPwResetDelay']); + $password = strlen($_POST["password"]) > 0 ? md5($_POST["password"]) : ''; + $fields_hash = Array( 'Login' => $_POST['username'], + 'FirstName' => $_POST['firstname'], + 'LastName' => $_POST['lastname'], + 'Company' => $_POST['company'], + 'Email' => $_POST['email'], + 'Status' => $status, + 'Phone' => $_POST['phone'], + 'Fax' => $_POST['fax'], + 'Street' => $_POST['street'], + 'Street2' => $_POST['street2'], + 'City' => $_POST['city'], + 'State' => $_POST['state'], + 'Zip' => $_POST['zip'], + 'Country' => $_POST['country'], + 'dob' => $dob, + 'MinPwResetDelay' => $_POST['minpwresetdelay'], + + ); + + $user =& $objUsers->Edit_User_NEW($UserId, $fields_hash); + $ResourceId= $u->Get("ResourceId"); $objCustomDataList->LoadResource($ResourceId); $objCustomFields = new clsCustomFieldList(6); Index: branches/unlabeled/unlabeled-1.33.2/kernel/include/portaluser.php =================================================================== diff -u -r3962 -r3972 --- branches/unlabeled/unlabeled-1.33.2/kernel/include/portaluser.php (.../portaluser.php) (revision 3962) +++ branches/unlabeled/unlabeled-1.33.2/kernel/include/portaluser.php (.../portaluser.php) (revision 3972) @@ -884,9 +884,11 @@ $Phone, $Street, $City, $State, $Zip, $Country, $CreatedOn, $dob)); $BrokenRule = $CheckBanned ? $u->CheckBanned() : false; + if(!$BrokenRule) { $u->Create(); + $this->processEvent($u, 'OnAfterItemCreate'); return $u; } return $BrokenRule; @@ -905,6 +907,7 @@ $broken_rule = $check_banned ? $user->CheckBanned() : false; if (!$BrokenRule) { $user->Create(); + $this->processEvent($user, 'OnAfterItemCreate'); return $user; } @@ -933,6 +936,7 @@ } $user->Update(); + $this->processEvent($user, 'OnAfterItemUpdate'); return $user; } @@ -961,9 +965,32 @@ $u->Set("Password",$Password); $u->Update(); } + + $this->processEvent($u, 'OnAfterItemUpdate'); return $u; } + /** + * Enter description here... + * + * @param clsPortalUser $user + * @param string $event_name + */ + function processEvent(&$user, $event_name) + { + if ($user->UsingTempTable()) { + return true; + } + + $user_dummy =& $this->Application->recallObject('u.-item', null, Array('skip_autoload' => true)); + $user_dummy->SetDBFieldsFromHash($user->Data); + $user_dummy->setID($user->UniqueId()); + + $event = new kEvent('u.-item:'.$event_name); + $event->setEventParam('id', $user_dummy->GetID() ); + $this->Application->HandleEvent($event); + } + function Delete_User($UserId) { $u = $this->GetItemByField("ResourceId",$UserId);