Index: branches/unlabeled/unlabeled-1.75.2/kernel/frontaction.php
===================================================================
diff -u -r5653 -r6031
--- branches/unlabeled/unlabeled-1.75.2/kernel/frontaction.php (.../frontaction.php) (revision 5653)
+++ branches/unlabeled/unlabeled-1.75.2/kernel/frontaction.php (.../frontaction.php) (revision 6031)
@@ -632,9 +632,9 @@
'Country' => $_POST['country'],
'dob' => $dob,
'MinPwResetDelay' => $_POST['minpwresetdelay'],
-
+
);
-
+
$user =& $objUsers->Edit_User_NEW($UserId, $fields_hash);
saveCustomFields('u', $u->Get('ResourceId'), 6);
}
@@ -652,7 +652,7 @@
$objSession->SetPersistantVariable($field,$value);
}
}
-
+
}
break;
case "m_set_lang":
@@ -667,12 +667,12 @@
}
}
if($LangId)
- {
+ {
if($objSession->Get("PortalUserId")>0)
{
- $objSession->SetPersistantVariable("Language",$LangId);
+ $objSession->SetPersistantVariable("Language",$LangId);
}
- $objSession->Set("Language",$LangId);
+ $objSession->Set("Language",$LangId);
$objSession->Update();
$m_var_list_update["lang"] = $LangId;
$m_var_list["lang"] = $LangId;
@@ -685,15 +685,15 @@
$id = $_GET["ThemeId"];
if($id)
{
- $objSession->SetThemeName($id);
+ $objSession->SetThemeName($id);
$m_var_list["t"] = "index";
$m_var_list_update["theme"] = $id;
- $m_var_list["theme"] = $id;
+ $m_var_list["theme"] = $id;
unset($CurrentTheme);
}
break;
-
- case "m_sort_cats":
+
+ case "m_sort_cats":
$objSession->SetVariable("Category_Sortfield",$_POST["Category_Sortfield"]);
$objSession->SetVariable("Category_Sortorder",$_POST["Category_Sortorder"]);
$objSession->SetVariable("Perpage_Category",$_POST["Perpage_Category"]);
@@ -764,9 +764,8 @@
'AutomaticFilename' => 1,
'Filename' => '',
'CategoryTemplate' => '',
- 'ItemTemplate' => '',
);
-
+
$cat =& $objCatList->Add_NEW($fields_hash);
saveCustomFields('c', $cat->Get('ResourceId'), $cat->type);
@@ -785,21 +784,21 @@
}
DeleteModuleTagCache('kernel');
break;
- case "m_front_review_add":
+ case "m_front_review_add":
if($objSession->InSpamControl($_POST["ItemId"]))
{
$StatusMessage["review"] = language("la_Review_AlreadyReviewed");
}
else
- {
+ {
$objReviews = new clsItemReviewList();
$Status = $objConfig->Get("Review_DefaultStatus");
$CreatedOn = adodb_date("U");
$html = (int)$objConfig->Get("Review_Html");
$ReviewText = inp_striptags($_POST["review_text"]);
-
- $r = $objReviews->AddReview($CreatedOn,$ReviewText,$Status, $IPAddress,
- 0, $_POST["ItemId"], $_POST["ItemType"], $objSession->Get("PortalUserId"));
+
+ $r = $objReviews->AddReview($CreatedOn,$ReviewText,$Status, $IPAddress,
+ 0, $_POST["ItemId"], $_POST["ItemType"], $objSession->Get("PortalUserId"));
foreach($ItemTypes as $type=>$id)
{
if($id==$_POST["ItemType"])
@@ -810,13 +809,13 @@
}
}
if(strlen($ValName) && strlen($IntName))
- {
+ {
$exp_secs = $objConfig->Get($ValName) * $objConfig->Get($IntName);
$objSession->AddToSpamControl($_POST["ItemId"],$exp_secs);
if(is_object($r))
- {
+ {
if($Status)
- {
+ {
$StatusMessage["review"] = language("la_Review_Added");
}
else
@@ -830,21 +829,21 @@
}
DeleteModuleTagCache('kernel');
break;
-
+
case "m_suggest_email":
$cutoff = adodb_mktime()+(int)$objConfig->Get("Suggest_MinInterval");
- $email = inp_striptags($_POST["suggest_email"]);
-
+ $email = inp_striptags($_POST["suggest_email"]);
+
if (strlen($email))
{
if(ValidEmail($email))
{
$sql = "SELECT * FROM ".GetTablePrefix()."SuggestMail WHERE email='".$email."' and sent<".$cutoff;
$adodbConnection = &GetADODBConnection();
$rs = $adodbConnection->Execute($sql);
-
+
$rs = false;
-
+
if($rs && !$rs->EOF)
{
if(strlen($_GET["Error"])>0)
@@ -858,41 +857,41 @@
{
if($Event->Get("Enabled")=="1")
{
- $Event->Item = null;
- $Event->SendToAddress($email);
+ $Event->Item = null;
+ $Event->SendToAddress($email);
$sql = "INSERT INTO ".GetTablePrefix()."SuggestMail (email,sent) VALUES ('".$email."','".adodb_mktime()."')";
-
+
$rs = $adodbConnection->Execute($sql);
$objSession->SetVariable('suggest_result', language("lu_suggest_success")." ".$email);
}
}
- $e =& $objMessageList->GetEmailEventObject("USER.SUGGEST",1);
-
+ $e =& $objMessageList->GetEmailEventObject("USER.SUGGEST",1);
+
if($e->Get("Enabled")==1)
$e->SendAdmin();
-
+
if(strlen($_GET["Confirm"])>0)
$var_list["t"] = $_GET["Confirm"];
}
}
- else
+ else
{
if(strlen($_GET["Error"])>0)
$var_list["t"] = $_GET["Error"];
$objSession->SetVariable('suggest_result', language("lu_invalid_emailaddress"));
- }
+ }
}
else
{
if(strlen($_GET["Error"])>0)
$var_list["t"] = $_GET["Error"];
$objSession->SetVariable('suggest_result', language("lu_suggest_no_address"));
- }
+ }
break;
- case "m_simple_search":
+ case "m_simple_search":
$keywords = trim($_POST["keywords"]);
- $type = $objItemTypes->GetTypeByName("Category");
+ $type = $objItemTypes->GetTypeByName("Category");
$objSearch = new clsSearchResults("Category","clsCategory");
$length = $objConfig->Get('Search_MinKeyword_Length');
@@ -906,27 +905,27 @@
}
else {
$key_arr = explode(' ', $keywords);
-
+
/*foreach($key_arr as $value) {
if (strlen(str_replace("+", "", $value)) < $length || strlen(str_replace("-", "", $value)) < $length) {
$keywords = str_replace($value, '', $keywords);
- //$keywords = str_replace($value, '', $keywords);
+ //$keywords = str_replace($value, '', $keywords);
}
}
-
+
//$keywords = str_replace(' ', ' ', $keywords);
//$keywords = str_replace('\"', '', $keywords);
*/
$tmp_keywords = str_replace("+", "", $keywords);
$tmp_keywords = str_replace("-", "", $tmp_keywords);
-
+
$performSearch = (strlen($tmp_keywords) >= $length);
}
-
+
if ($performSearch) {
$objSearchList = new clsSearchLogList();
$objSearchList->UpdateKeyword($keywords,0);
-
+
$objSearch->SetKeywords($keywords);
$objSearch->AddSimpleFields('c');
if (is_numeric($objConfig->Get("SearchRel_Pop_category"))) {
@@ -938,7 +937,7 @@
if (is_numeric($objConfig->Get("SearchRel_Rating_category"))) {
$objSearch->PctRating = ($objConfig->Get("SearchRel_Rating_category")/100);
}
-
+
//echo "Searching On $keywords
\n";
$objSearch->PerformSearch(1,$SortOrder,TRUE);
$SearchPerformed = TRUE;
@@ -948,35 +947,35 @@
else {
if(strlen($_GET["Error"])>0)
$var_list["t"] = $_GET["Error"];
-
- $MissingCount = SetMissingDataErrors("m_simplesearch");
+
+ $MissingCount = SetMissingDataErrors("m_simplesearch");
$MissingCount++;
setSearchError(lu_keywords_tooshort);
- }
+ }
}
- else
+ else
{
if (strlen($_GET["Error"])>0) {
$var_list["t"] = $_GET["Error"];
}
-
+
$MissingCount = SetMissingDataErrors("m_simplesearch");
$MissingCount++;
setSearchError('lu_no_keyword');
}
break;
- case "m_adv_search":
-
+ case "m_adv_search":
+
if ($_GET['type']) {
$modules = Array( 1 => 'In-Portal', 2 => 'In-News',
- 3 => 'In-Bulletin', 4 => 'In-Link',
+ 3 => 'In-Bulletin', 4 => 'In-Link',
11 => 'In-Commerce');
$module = $modules[$_GET["type"]];
}
else {
$module = 0;
}
-
+
if( !is_object($objSearchConfig) ) $objSearchConfig = new clsSearchConfigList($module);
switch($_GET["type"])
{
@@ -998,7 +997,7 @@
}
}
else
- {
+ {
$Value = $_POST["value"][$field->Get("FieldName")];
}
switch( $_POST["andor"][$field->Get("FieldName")])
@@ -1008,36 +1007,36 @@
break;
case 2:
$Conjuction = "OR";
- break;
+ break;
default:
$Conjuction = "";
break;
}
-
- if (strlen($Value) && $Verb=="any")
+
+ if (strlen($Value) && $Verb=="any")
{
$Verb = 'contains';
}
-
- if(strlen($Value) && strlen($Verb)>0 && $Verb!="any")
+
+ if(strlen($Value) && strlen($Verb)>0 && $Verb!="any")
{
// echo "Adding CAT SearchField: [".$field->Get("TableName")."]; [".$field->Get("FieldName")."]; [$Verb]; [$Value]; [$Conjuction]
";
$objAdvSearch->AddAdvancedField($field->Get("TableName"),$field->Get("FieldName"),$Verb,$Value,$Conjuction, 'c');
}
-
+
}
$objAdvSearch->PerformSearch(1,NULL,TRUE);
break;
}
break;
-
+
case "m_id":
$application->ApplicationDie($Action.':'.$DownloadId);
break;
-
+
case "m_simple_subsearch":
$keywords = $_POST["keywords"];
- $type = $objItemTypes->GetTypeByName("Category");
+ $type = $objItemTypes->GetTypeByName("Category");
$objSearch = new clsSearchResults("Category","clsCategory");
$length = $objConfig->Get('Search_MinKeyword_Length');
@@ -1051,23 +1050,23 @@
}
else {
$key_arr = explode(' ', $keywords);
-
+
/*foreach($key_arr as $value) {
if (strlen($value) < $length) {
$keywords = str_replace(' '.$value, '', $keywords);
$keywords = str_replace($value.' ', '', $keywords);
}
}*/
-
+
//$keywords = str_replace(' ', ' ', $keywords);
-
+
$tmp_keywords = str_replace("+", "", $keywords);
$tmp_keywords = str_replace("-", "", $tmp_keywords);
-
- $performSearch = (strlen($tmp_keywords) >= $length);
+
+ $performSearch = (strlen($tmp_keywords) >= $length);
}
-
- if ($performSearch) {
+
+ if ($performSearch) {
$objSearchList = new clsSearchLogList();
$objSearchList->UpdateKeyword($keywords,0);
@@ -1085,20 +1084,20 @@
$SearchResultIdList = $objSearch->Result_IdList();
if(count($SearchResultIdList)>0)
- {
+ {
$objSearch->PerformSearch(1,$SortOrder, TRUE,$SearchResultIdList);
//$objSearch->SetRelevence($type->Get("ItemType"), "CategoryId");
}
$SearchPerformed = TRUE;
}
- else {
- $MissingCount = SetMissingDataErrors("m_simplesearch");
+ else {
+ $MissingCount = SetMissingDataErrors("m_simplesearch");
$MissingCount++;
setSearchError('lu_keywords_tooshort');
- }
+ }
}
else {
- $MissingCount = SetMissingDataErrors("m_simplesearch");
+ $MissingCount = SetMissingDataErrors("m_simplesearch");
$MissingCount++;
setSearchError('lu_no_keyword');
}