Index: branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_1_8.txt =================================================================== diff -u -N -r4545 -r4550 --- branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_1_8.txt (.../changelog_1_1_8.txt) (revision 4545) +++ branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_1_8.txt (.../changelog_1_1_8.txt) (revision 4550) @@ -32,7 +32,7 @@ File in-portal/admin/install/inportal_schema.sql changed File in-portal/admin/install/install_lib.php changed File in-portal/admin/install/langpacks/english.lang changed -File in-portal/admin/install/upgrades/changelog_1_1_8.txt is new; release_1_1_8 revision 1.1.2.7 +File in-portal/admin/install/upgrades/changelog_1_1_8.txt is new; release_1_1_8 revision 1.1.2.8 File in-portal/admin/install/upgrades/inportal_upgrade_v1.1.8.php is new; release_1_1_8 revision 1.1 File in-portal/admin/install/upgrades/inportal_upgrade_v1.1.8.sql is new; release_1_1_8 revision 1.3.2.3 File in-portal/admin/install/upgrades/readme_1_1_8.txt is new; release_1_1_8 revision 1.1.2.3 Index: branches/unlabeled/unlabeled-1.73.2/kernel/frontaction.php =================================================================== diff -u -N -r4260 -r4550 --- branches/unlabeled/unlabeled-1.73.2/kernel/frontaction.php (.../frontaction.php) (revision 4260) +++ branches/unlabeled/unlabeled-1.73.2/kernel/frontaction.php (.../frontaction.php) (revision 4550) @@ -7,19 +7,19 @@ //echo $objSession->GetSessionKey()."
\n"; $url_params = Array(); $application =& kApplication::Instance(); - + if ($objConfig->Get("CookieSessions") == 1 && $_COOKIE["cookies_on"] != "1") { $FormError["login"]["login_user"] = language("lu_cookies_error"); } - else + else { - $MissingCount = SetMissingDataErrors("login"); + $MissingCount = SetMissingDataErrors("login"); if($MissingCount==2) { $FormError["login"]["login_user"]= language("lu_ferror_loginboth"); unset($FormError["login"]["login_password"]); } - + if($MissingCount==0) { if($_POST["login_user"]=="root") @@ -39,18 +39,18 @@ $c .= $pw; set_cookie('login', $c, adodb_mktime() + 2592000); } - + // set new destination template if passed $dest = GetVar('dest', true); if(!$dest) $dest = GetVar('DestTemplate', true); if($dest) $var_list['t'] = $dest; - + $next_template = $objSession->GetVariable('next_template'); if($next_template) { $objSession->SetVariable('next_template',''); $var_list_update['t'] = $next_template; - + $url_params['pass'] = 'all'; header('Location: ' . HREF_Wrapper('', $url_params) ); exit; @@ -60,13 +60,13 @@ { $var_list['t'] = 'index'; } - + $event_params = Array('user' => $_POST['login_user'], 'pass' => $_POST['login_password']); $application->HandleEvent( new kEvent('u:OnInpLogin', $event_params) ); - - $redirect_template = getArrayValue($var_list_update, 't') ? $var_list_update['t'] : $var_list['t']; + + $redirect_template = getArrayValue($var_list_update, 't') ? $var_list_update['t'] : $var_list['t']; $application->Redirect($redirect_template); - + } else { @@ -75,7 +75,7 @@ case -1: // user or/and pass wrong $FormError["login"]["login_password"] = language("lu_incorrect_login"); break; - + case -2: // user ok, but has no permission $FormError["login"]["login_password"] = language("la_text_nopermissions"); break; @@ -85,19 +85,19 @@ } } break; - + case "m_resetpw": $passed_key = $_GET['user_key']; - - $u = $objUsers->GetItemByField("PwResetConfirm", $passed_key); - $found = is_object($u); - + + $u = $objUsers->GetItemByField("PwResetConfirm", $passed_key); + $found = is_object($u); + if($found) - { + { $exp_time = $u->Get('PwRequestTime') + 3600; $u->Set("PwResetConfirm", ''); $u->Set("PwRequestTime", 0); - if ($exp_time > adodb_mktime()) + if ($exp_time > adodb_mktime()) { $objSession->SetVariable('codevalidationresult', 'lu_resetpw_confirm_text'); $newpw = makepassword(); @@ -117,15 +117,15 @@ } } else { $objSession->SetVariable('codevalidationresult', 'lu_code_is_not_valid'); - } + } break; - + case "m_forgotpw": $MissingCount = SetMissingDataErrors("forgotpw"); // $pass_reset_add = $objConfig->Get("Users_AllowReset"); - + if($MissingCount==0) - { + { $username = $_POST["username"]; $email = $_POST["email"]; $found = false; @@ -142,22 +142,22 @@ if(is_object($u)) $found = ($u->Get("Email")==$email && $u->Get("Status")==1) && strlen($u->Get("Password")); } - - if(is_object($u)) + + if(is_object($u)) { $PwResetConfirm = $u->Get('PwResetConfirm'); $PwRequestTime = $u->Get('PwRequestTime'); $PassResetTime = $u->Get('PassResetTime'); $MinPwResetDelay = $u->Get('MinPwResetDelay'); - $allow_reset = (strlen($PwResetConfirm) ? - adodb_mktime() > $PwRequestTime + $MinPwResetDelay : + $allow_reset = (strlen($PwResetConfirm) ? + adodb_mktime() > $PwRequestTime + $MinPwResetDelay : adodb_mktime() > $PassResetTime + $MinPwResetDelay); } - + if($found && $allow_reset) { //$newpw = makepassword(); - //$objSession->Set('password', $newpw); + //$objSession->Set('password', $newpw); $objSession->Set('tmp_user_id', $u->Get("PortalUserId")); $objSession->Set('tmp_email', $u->Get("Email")); //$u->Set("Password",$newpw); @@ -167,20 +167,20 @@ //$u->Set("Password",md5($newpw)); //$u->Update(); $u->Clean(); - + $var_list['t'] = GetVar('Confirm'); } else { if(!strlen($username) && !strlen($email)) - { + { $FormError["forgotpw"]["username"] = language("lu_ferror_forgotpw_nodata"); $MissingCount++; } else - { + { $error_phrases=Array(); - + if($allow_reset) { $error_phrases['username']='lu_ferror_unknown_username'; @@ -191,7 +191,7 @@ $error_phrases['username']='lu_ferror_reset_denied'; $error_phrases['email']='lu_ferror_reset_denied'; } - + foreach ($error_phrases as $field_name => $phrase_name) { if(GetVar($field_name)) { @@ -209,12 +209,12 @@ if(strlen($_GET["error"])) $var_list["t"] = $_GET["error"]; break; - case "m_subscribe_confirm": - - $t = ""; - $_GET["subscribe_email"] = $_POST["subscribe_email"]; - $SubscribeAddress = $_POST["subscribe_email"]; - + case "m_subscribe_confirm": + + $t = ""; + $_GET["subscribe_email"] = $_POST["subscribe_email"]; + $SubscribeAddress = $_POST["subscribe_email"]; + if(!ValidEmail($SubscribeAddress)&& strlen($SubscribeAddress)) { $t = $_GET["Error"]; @@ -231,15 +231,15 @@ if(strlen($email)>0) { $u = $objUsers->GetItemByField("Email",$email); - + if(is_object($u)) { if($u->CheckBanned()) { $t = $_GET["Error"]; $objSession->SetVariable('SubscribeError', 'lu_subscribe_banned'); } - else + else { if($u->IsInGroup($g->Get("GroupId"))) { @@ -256,36 +256,36 @@ { $t = $_GET["Error"]; $objSession->SetVariable('SubscribeError', 'lu_subscribe_no_address'); - } + } } else { $t = $_GET["Error"]; $objSession->SetVariable('SubscribeError', 'lu_subscribe_unknown_error'); } - } + } } if(strlen($t)) { $var_list["t"] = $t; $var_list_update["t"] = $t; } $objSession->SetVariable('SubscribeAddress', $SubscribeAddress); - + break; case "m_subscribe": if($_POST["buttons"][0]==language("lu_button_yes")) - { + { $SubscribeAddress = $_POST["subscribe_email"]; if(strlen($SubscribeAddress)>0) - { + { if(ValidEmail($SubscribeAddress)) - { + { $GroupId = (int)$objConfig->Get("User_SubscriberGroup"); if ($GroupId) - { - $g = $objGroups->GetItem($GroupId); + { + $g = $objGroups->GetItem($GroupId); $u = $objUsers->GetItemByField("Email",$SubscribeAddress); if(is_object($u)) { @@ -297,10 +297,10 @@ $bExists = FALSE; } if($bExists) - { + { $g->AddUser($u->Get("PortalUserId"),0,false); } - else + else { $u = new clsPortalUser(NULL); $u->Set("Email",$SubscribeAddress); @@ -313,104 +313,104 @@ $g->AddUser($u->Get("PortalUserId"),1,false); } else - $SubscribeResult = "lu_subscribe_banned"; + $SubscribeResult = "lu_subscribe_banned"; } - + $SubscribeResult = "lu_subscribe_success"; $u->SendUserEventMail("USER.SUBSCRIBE",$u->Get("PortalUserId")); $u->SendAdminEventMail("USER.SUBSCRIBE"); if(strlen($_GET["Subscribe"])>0) $var_list["t"] = $_GET["Subscribe"]; - } + } } - else + else { $SubscribeResult = "lu_invalid_emailaddress"; } } - else + else $SubscribeResult = "lu_subscribe_missing_address"; } - + if(!strlen($SubscribeResult)) - $SubscribeResult = "lu_subscribe_success"; - + $SubscribeResult = "lu_subscribe_success"; + break; case "m_unsubscribe": - + if($_POST["buttons"][0]==language("lu_button_yes")) { $MissingCount = SetMissingDataErrors("m_unsubscribe"); - + if($MissingCount==0) - { + { $email = $_POST["subscribe_email"]; $u = $objUsers->GetItemByField("Email",$email); if(is_object($u)) { if(strtolower($u->Get("Email"))==strtolower($email)) - { + { $GroupId = (int)$objConfig->Get("User_SubscriberGroup"); if($u->PrimaryGroup()==$GroupId) { $u_gorup_list = $u->GetGroupList(); - - if (count($u_gorup_list) > 1) { + + if (count($u_gorup_list) > 1) { $u->RemoveFromGroup($GroupId); } else { $u->RemoveFromAllGroups(); $u->Delete(); } - } - else + } + else { $u->RemoveFromGroup($GroupId); - } + } } } if(strlen($_GET["Subscribe"])>0) $var_list["t"] = $_GET["Subscribe"]; - } + } } - + break; - + case "m_register": $_POST=inp_escape($_POST); $MissingCount = SetMissingDataErrors("m_register"); - + if(!$objConfig->Get("User_Password_Auto")) - { + { if(($_POST["password"] != $_POST["passwordverify"]) || !strlen($_POST["passwordverify"])) { $MissingCount++; $FormError["m_register"]["passwordverify"] = language("lu_ferror_pswd_mismatch"); } - + if(strlen($_POST["password"])>30) { // echo "VAR: ".$_POST["password"]; die(); $MissingCount++; $FormError["m_register"]["password"] = language("lu_ferror_pswd_toolong"); } - + if (strlen($_POST['password']) < $objConfig->Get("Min_Password")) { $MissingCount++; - $FormError["m_register"]["password"] = language("lu_ferror_pswd_tooshort"); - } + $FormError["m_register"]["password"] = language("lu_ferror_pswd_tooshort"); + } } - + if(($_POST["username"]=="root")) { $MissingCount++; - $FormError["m_register"]["username"] = language("lu_user_exists"); + $FormError["m_register"]["username"] = language("lu_user_exists"); } else { - - $u = $objUsers->GetItemByField("Login",$_POST["username"]); + + $u = $objUsers->GetItemByField("Login",$_POST["username"]); if(is_object($u)) { if($u->Get("Login")==$_POST["username"]) @@ -420,23 +420,23 @@ } } } - - - + + + if (strlen($_POST['username']) < $objConfig->Get("Min_UserName")) { $MissingCount++; - $FormError["m_register"]["username"] = language("lu_ferror_username_tooshort"); - } - + $FormError["m_register"]["username"] = language("lu_ferror_username_tooshort"); + } + if(!$MissingCount) { $CreatedOn = adodb_date("U"); $GroupId = $objConfig->Get("User_NewGroup"); $Status=0; - + /* determine the status of new users */ - switch ($objConfig->Get("User_Allow_New")) + switch ($objConfig->Get("User_Allow_New")) { case "1": $Status=1; @@ -445,12 +445,12 @@ $Status=2; break; } - + /* set Destination template */ $var_list["t"] = strlen($_GET["dest"])? $_GET["dest"] : "index"; - + if($Status>0) - { + { if ($objConfig->Get("User_Password_Auto")) { $password = makepassword(); // $objSession->Set("password", $password); @@ -459,10 +459,10 @@ else { $password = $_POST["password"]; } - - $dob = adodb_mktime(0, 0, 0, $_POST['dob_month'], $_POST['dob_day'], $_POST['dob_year']); + + $dob = adodb_mktime(0, 0, 0, $_POST['dob_month'], $_POST['dob_day'], $_POST['dob_year']); $ip = $_SERVER['REMOTE_ADDR']; - + $fields_hash = Array('Login' => $_POST['username'], 'Password' => md5($password), 'FirstName' => $_POST['firstname'], @@ -482,13 +482,13 @@ 'dob' => $dob, 'ip' => $ip); $u =& $objUsers->Add_User_NEW($fields_hash, true); - + if(!is_object($u)) { $RuleId=$u; $r = $objBanList->GetItem($RuleId); $err = $r->Get("ErrorTag"); - + if(strlen($err)) { $FormError["m_register"][$r->Get("ItemField")] = language($err); @@ -504,7 +504,7 @@ $g = $objGroups->GetItem($GroupId); $g->AddUser($u->Get("PortalUserId"),1,false); } - + $custom = $_POST["custom"]; if (is_array($custom)) { for($x = 0; $x < count($custom); $x++) { @@ -514,21 +514,21 @@ } if($Status==1) - { + { if($objConfig->Get("User_Password_Auto")) { $u->SendUserEventMail("USER.VALIDATE",$u->Get("PortalUserId")); $u->SendAdminEventMail("USER.VALIDATE"); } else { - $doLoginNow = true; + $doLoginNow = true; $u->SendUserEventMail("USER.ADD",$u->Get("PortalUserId")); $u->SendAdminEventMail("USER.ADD"); } } else - { + { $u->SendUserEventMail("USER.ADD.PENDING",$u->Get("PortalUserId")); $u->SendAdminEventMail("USER.ADD.PENDING"); } @@ -547,12 +547,12 @@ exit; $var_list['t'] = $next_template.'.tpl'; } - + } } - } - } - } + } + } + } break; case "m_add_friend": $id = $_GET["UserId"]; @@ -570,8 +570,8 @@ $u =& $objUsers->GetItem($id); $u->DeleteFavorite(); DeleteModuleTagCache('kernel'); - break; - + break; + case 'm_acctinfo': $_POST = inp_escape($_POST); $MissingCount = SetMissingDataErrors("m_acctinfo"); @@ -580,7 +580,7 @@ $MissingCount++; $FormError["m_acctinfo"]["UserId"] = language("lu_ferror_m_profile_userid"); } - + if ($_POST["password"]) { if (($_POST["password"] != $_POST["passwordverify"]) || !strlen($_POST["passwordverify"])) { $MissingCount++; @@ -598,24 +598,25 @@ $FormError["m_acctinfo"]["password"] = language("lu_ferror_pswd_tooshort"); } } - + $db =& GetADODBConnection(); $email = GetVar('email'); $test_id = $db->GetOne('SELECT PortalUserId FROM '.GetTablePrefix().'PortalUser WHERE Email = '.$db->qstr($email)); if ($test_id && ($test_id != $objSession->Get('PortalUserId')) ) { $MissingCount++; $FormError["m_acctinfo"]["email"] = language("lu_ferror_email_duplicate"); } - - + + if (!$MissingCount) { /* save profile */ $u =& $objUsers->GetItem($UserId); $status = $u->Get("Status"); $dob = adodb_mktime(0, 0, 0, $_POST['dob_month'], $_POST['dob_day'], $_POST['dob_year']); $password = strlen($_POST["password"]) > 0 ? md5($_POST["password"]) : ''; - + $fields_hash = Array( 'Login' => $_POST['username'], + 'Password' => $password, 'FirstName' => $_POST['firstname'], 'LastName' => $_POST['lastname'], 'Company' => $_POST['company'],