";
- $o .= "";
+ $o = '';
+ $o .= '';
$CatCount = $objCatList->NumItems();
foreach($objCatList->Items as $cat)
{
$parsed=0;
if($count==$per_row)
{
- $o .= " | ";
+ $o .= ' | ';
$count=0;
}
if($row==0 && strlen($attribs["_firstitemtemplate"]))
@@ -1599,7 +1595,7 @@
$row++;
}
if($count != $per_row)
- $o .= " | ";
+ $o .= '';
$o .= "\n \n";
}
else
@@ -1808,12 +1804,12 @@
LoadLinkList($attribs);
}
*/
- $o = $objCatList->GetPageLinkList($DestTemplate);
+ $o = $objCatList->GetPageLinkList($DestTemplate, '', 10, true, ExtraAttributes($attribs) );
if (strlen($image)) {
$o_i = ' ';
}
if(strlen($o) && strlen($attribs["_label"]))
- $o = $o_i.language($attribs["_label"]).$o;
+ $o = $o_i.language($attribs["_label"]).' '.$o;
return $o;
}
@@ -1846,9 +1842,9 @@
{
LoadCatSearchResults($attribs);
}
- $o = $objSearchCats->GetPageLinkList($DestTemplate);
+ $o = $objSearchCats->GetPageLinkList($DestTemplate, '', 10, true, ExtraAttributes($attribs));
if(strlen($o) && strlen($attribs["_label"]))
- $o = language($attribs["_label"]).$o;
+ $o = language($attribs["_label"]).' '.$o;
return $o;
}
@@ -2313,8 +2309,9 @@
*/
function m_codevalidationresult($attribs=Array())
{
- global $m_var_list_update;
- return $m_var_list_update['codevalidationresult'];
+ global $objSession;
+ $result_phrase = $objSession->GetVariable('codevalidationresult');
+ return $result_phrase ? language($result_phrase) : '';
}
/*
@@ -3710,6 +3707,49 @@
return IsDebugMode() ? true : '';
}
+ function m_param($params)
+ {
+ $parser_params = GetVar('parser_params');
+ $param_name = strtolower($params['_name']);
+ $value = getArrayValue($parser_params, $param_name);
+
+ if ($value) {
+ if (getArrayValue($params, '_asphrase')) {
+ $value = language($value);
+ }
+ }
+
+ return $value;
+ }
+
+ function m_set_category($params)
+ {
+ global $m_var_list;
+
+ if (getArrayValue($params, '_onlyonce') && $m_var_list['cat']) return ;
+
+ $db =& GetADODBConnection();
+ $category_id = getArrayValue($params, '_catid');
+ if (!$category_id) {
+ $module = getArrayValue($params, '_module');
+ if ($module) {
+
+ $sql = 'SELECT RootCat FROM '.GetTablePrefix().'Modules WHERE LOWER(Name) = '.$db->qstr( strtolower($module) );
+ $category_id = $db->GetOne($sql);
+ }
+ }
+
+ if ($category_id) {
+ $m_var_list['cat'] = $category_id;
+ }
+ }
+
+ function m_template_equals($params)
+ {
+ $t = preg_replace('/(.*)\.tpl/', '\\1', $params['_template']);
+ return $GLOBALS['var_list']['t'] == $t ? true : '';
+ }
+
/*function m_object($attribs=Array())
{
$element = new clsHtmlTag();
Index: trunk/kernel/units/users/users_config.php
===================================================================
diff -u -N -r3306 -r3576
--- trunk/kernel/units/users/users_config.php (.../users_config.php) (revision 3306)
+++ trunk/kernel/units/users/users_config.php (.../users_config.php) (revision 3576)
@@ -6,6 +6,10 @@
'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
'EventHandlerClass' => Array('class'=>'UsersEventHandler','file'=>'users_event_handler.php','build_event'=>'OnBuild'),
'TagProcessorClass' => Array('class'=>'UsersTagProcessor','file'=>'users_tag_processor.php','build_event'=>'OnBuild'),
+ 'RegisterClasses' => Array(
+ Array('pseudo' => 'UsersSyncronizeManager', 'class' => 'UsersSyncronizeManager', 'file' => 'users_syncronize.php', 'build_event' => ''),
+ ),
+
'AutoLoad' => true,
'Hooks' => Array(
Array(
Index: trunk/kernel/frontaction.php
===================================================================
diff -u -N -r3282 -r3576
--- trunk/kernel/frontaction.php (.../frontaction.php) (revision 3282)
+++ trunk/kernel/frontaction.php (.../frontaction.php) (revision 3576)
@@ -61,7 +61,8 @@
$var_list['t'] = 'index';
}
- $application->HandleEvent( new kEvent('u:OnInpLogin') );
+ $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'];
$application->Redirect($redirect_template);
@@ -98,7 +99,7 @@
$u->Set("PwRequestTime", 0);
if ($exp_time > adodb_mktime())
{
- $m_var_list_update['codevalidationresult'] = 'lu_resetpw_confirm_text';
+ $objSession->SetVariable('codevalidationresult', 'lu_resetpw_confirm_text');
$newpw = makepassword();
SetVar('user_password', $newpw);
$u->Set("Password",$newpw);
@@ -112,10 +113,10 @@
$u->Update();
$u->Clean();
} else {
- $m_var_list_update['codevalidationresult'] = 'lu_code_expired';
+ $objSession->SetVariable('codevalidationresult', 'lu_code_expired');
}
} else {
- $m_var_list_update['codevalidationresult'] = 'lu_code_is_not_valid';
+ $objSession->SetVariable('codevalidationresult', 'lu_code_is_not_valid');
}
break;
@@ -217,7 +218,7 @@
if(!ValidEmail($SubscribeAddress)&& strlen($SubscribeAddress))
{
$t = $_GET["Error"];
- $SubscribeError = "lu_invalid_emailaddress";
+ $objSession->SetVariable('SubscribeError', 'lu_invalid_emailaddress');
}
else
{
@@ -236,7 +237,7 @@
if($u->CheckBanned())
{
$t = $_GET["Error"];
- $SubscribeError ="lu_subscribe_banned";
+ $objSession->SetVariable('SubscribeError', 'lu_subscribe_banned');
}
else
{
@@ -254,22 +255,22 @@
else
{
$t = $_GET["Error"];
- $SubscribeError ="lu_subscribe_no_address";
+ $objSession->SetVariable('SubscribeError', 'lu_subscribe_no_address');
}
}
else
{
$t = $_GET["Error"];
- $SubscribeError ="lu_subscribe_unknown_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":
@@ -829,6 +830,7 @@
}
DeleteModuleTagCache('kernel');
break;
+
case "m_suggest_email":
$cutoff = adodb_mktime()+(int)$objConfig->Get("Suggest_MinInterval");
$email = inp_striptags($_POST["suggest_email"]);
@@ -847,7 +849,7 @@
{
if(strlen($_GET["Error"])>0)
$var_list["t"] = $_GET["Error"];
- $suggest_result = "$email ".language("lu_already_suggested ")." ".LangDate($rs->fields["sent"]);
+ $objSession->SetVariable('suggest_result', "$email ".language("lu_already_suggested ")." ".LangDate($rs->fields["sent"]) );
}
else
{
@@ -862,7 +864,7 @@
$sql = "INSERT INTO ".GetTablePrefix()."SuggestMail (email,sent) VALUES ('".$email."','".adodb_mktime()."')";
$rs = $adodbConnection->Execute($sql);
- $suggest_result=language("lu_suggest_success")." ".$email;
+ $objSession->SetVariable('suggest_result', language("lu_suggest_success")." ".$email);
}
}
$e =& $objMessageList->GetEmailEventObject("USER.SUGGEST",1);
@@ -878,14 +880,14 @@
{
if(strlen($_GET["Error"])>0)
$var_list["t"] = $_GET["Error"];
- $suggest_result=language("lu_invalid_emailaddress");
+ $objSession->SetVariable('suggest_result', language("lu_invalid_emailaddress"));
}
}
else
{
if(strlen($_GET["Error"])>0)
$var_list["t"] = $_GET["Error"];
- $suggest_result=language("lu_suggest_no_address");
+ $objSession->SetVariable('suggest_result', language("lu_suggest_no_address"));
}
break;
case "m_simple_search":
Index: trunk/kernel/include/category.php
===================================================================
diff -u -N -r3330 -r3576
--- trunk/kernel/include/category.php (.../category.php) (revision 3330)
+++ trunk/kernel/include/category.php (.../category.php) (revision 3576)
@@ -1766,7 +1766,7 @@
return TableCount($this->SourceTable,"Status=".STATUS_PENDING,0);
}
- function GetPageLinkList($dest_template=NULL,$page="",$PagesToList=10,$HideEmpty=TRUE)
+ function GetPageLinkList($dest_template=NULL,$page="",$PagesToList=10,$HideEmpty=TRUE, $extra_attributes = '')
{
global $objConfig, $m_var_list_update, $var_list_update, $var_list;
@@ -1806,7 +1806,7 @@
{
$m_var_list_update["p"] = $this->Page-$PagesToList;
$prev_url = HREF_Wrapper();
- $o .= "<<";
+ $o .= '<<';
}
@@ -1816,7 +1816,7 @@
{
$m_var_list_update["p"]=$p;
$href = HREF_Wrapper();
- $o .= " $p ";
+ $o .= ' '.$p.' ';
}
else
{
@@ -1827,7 +1827,7 @@
{
$m_var_list_update["p"]=$this->Page+$PagesToList;
$next_url = HREF_Wrapper();
- $o .= " >>";
+ $o .= ' >>';
}
unset($m_var_list_update,$var_list_update["t"] );
return $o;
Index: trunk/kernel/include/modules.php
===================================================================
diff -u -N -r3330 -r3576
--- trunk/kernel/include/modules.php (.../modules.php) (revision 3330)
+++ trunk/kernel/include/modules.php (.../modules.php) (revision 3576)
@@ -856,6 +856,10 @@
if($Action == 'm_logout')
{
$u = new clsUserSession($var_list['sid'] ,($SessionQueryString && $FrontEnd==1));
+
+ $application =& kApplication::Instance();
+ $application->HandleEvent( new kEvent('u:OnInpLogout') );
+
$u->Logout();
unset($u);
$var_list_update['t'] = 'index';
Index: trunk/core/kernel/db/db_connection.php
===================================================================
diff -u -N -r1560 -r3576
--- trunk/core/kernel/db/db_connection.php (.../db_connection.php) (revision 1560)
+++ trunk/core/kernel/db/db_connection.php (.../db_connection.php) (revision 3576)
@@ -538,5 +538,35 @@
{
return $this->errorMessage;
}
+
+ function doInsert($fields_hash, $table)
+ {
+ $fields_sql = '';
+ $values_sql = '';
+ foreach ($fields_hash as $field_name => $field_value) {
+ $fields_sql .= '`'.$field_name.'`,';
+ $values_sql .= $this->qstr($field_value).',';
+ }
+
+ $fields_sql = preg_replace('/(.*),$/', '\\1', $fields_sql);
+ $values_sql = preg_replace('/(.*),$/', '\\1', $values_sql);
+ $sql = 'INSERT INTO `'.$table.'` ('.$fields_sql.') VALUES ('.$values_sql.')';
+
+ return $this->ChangeQuery($sql);
+ }
+
+ function doUpdate($fields_hash, $table, $key_clause)
+ {
+ $fields_sql = '';
+ foreach ($fields_hash as $field_name => $field_value) {
+ $fields_sql .= '`'.$field_name.'` = '.$this->qstr($field_value).',';
+ }
+
+ $fields_sql = preg_replace('/(.*),$/', '\\1', $fields_sql);
+
+ $sql = 'UPDATE `'.$table.'` SET '.$fields_sql.' WHERE '.$key_clause;
+
+ return $this->ChangeQuery($sql);
+ }
}
?>
\ No newline at end of file
|