Index: trunk/admin/install/upgrades/changelog_1_1_4.txt
===================================================================
diff -u -N -r3221 -r3226
--- trunk/admin/install/upgrades/changelog_1_1_4.txt (.../changelog_1_1_4.txt) (revision 3221)
+++ trunk/admin/install/upgrades/changelog_1_1_4.txt (.../changelog_1_1_4.txt) (revision 3226)
@@ -30,6 +30,7 @@
File in-portal/admin/install/inportal_schema.sql changed
File in-portal/admin/install/langpacks/english.lang changed
File in-portal/admin/install/upgrades/changelog_1_1_3.txt changed
+File in-portal/admin/install/upgrades/changelog_1_1_4.txt is new
File in-portal/admin/install/upgrades/inportal_check_v1.1.4.php is new
File in-portal/admin/install/upgrades/inportal_upgrade_v1.1.2.sql changed
File in-portal/admin/install/upgrades/inportal_upgrade_v1.1.3.sql changed
@@ -168,9 +169,15 @@
Added label "la_config_use_modrewrite" of type "1"
Added label "la_Description_in-portal:visits" of type "1"
+Added label "la_prompt_AutomaticDirectoryName" of type "1"
+Added label "la_prompt_AutomaticFilename" of type "1"
+Added label "la_prompt_CustomFilename" of type "1"
+Added label "la_prompt_DirectoryName" of type "1"
Added label "la_prompt_session_cookie_name" of type "1"
Added label "la_promt_ReferrerCheck" of type "1"
Added label "la_ToolTip_Import" of type "1"
+Changed label "lu_fieldcustom__a" of type "2"
+Changed label "lu_fieldcustom__a" of type "2"
Added label "lu_getting_rated" of type "0"
Added label "lu_getting_rated_text" of type "0"
Added label "lu_redirecting_text" of type "0"
Index: trunk/kernel/units/users/users_event_handler.php
===================================================================
diff -u -N -r3207 -r3226
--- trunk/kernel/units/users/users_event_handler.php (.../users_event_handler.php) (revision 3207)
+++ trunk/kernel/units/users/users_event_handler.php (.../users_event_handler.php) (revision 3226)
@@ -80,9 +80,9 @@
$event->status = erFAIL;
}
- $next_template = $this->Application->GetVar('next_template');
- if($next_template) $event->redirect = $next_template;
- $event->SetRedirectParam('js_redirect', 1);
+ $next_template = $this->Application->GetVar('next_template');
+ if($next_template) $event->redirect = $next_template;
+ $event->SetRedirectParam('js_redirect', 1);
}
else
{
@@ -120,7 +120,7 @@
$group_list = $this->Application->ConfigValue('User_GuestGroup').','.$this->Application->ConfigValue('User_LoggedInGroup');
$session->SetField('GroupList', $group_list);
$this->Application->StoreVar('UserGroups', $group_list);
-
+
$event->SetRedirectParam('js_redirect', 1);
}
Index: trunk/core/units/users/users_event_handler.php
===================================================================
diff -u -N -r3207 -r3226
--- trunk/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 3207)
+++ trunk/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 3226)
@@ -80,9 +80,9 @@
$event->status = erFAIL;
}
- $next_template = $this->Application->GetVar('next_template');
- if($next_template) $event->redirect = $next_template;
- $event->SetRedirectParam('js_redirect', 1);
+ $next_template = $this->Application->GetVar('next_template');
+ if($next_template) $event->redirect = $next_template;
+ $event->SetRedirectParam('js_redirect', 1);
}
else
{
@@ -120,7 +120,7 @@
$group_list = $this->Application->ConfigValue('User_GuestGroup').','.$this->Application->ConfigValue('User_LoggedInGroup');
$session->SetField('GroupList', $group_list);
$this->Application->StoreVar('UserGroups', $group_list);
-
+
$event->SetRedirectParam('js_redirect', 1);
}
Index: trunk/admin/install/langpacks/english.lang
===================================================================
diff -u -N -r3187 -r3226
--- trunk/admin/install/langpacks/english.lang (.../english.lang) (revision 3187)
+++ trunk/admin/install/langpacks/english.lang (.../english.lang) (revision 3226)
@@ -106,7 +106,7 @@
VGltZSB6b25lIG9mIHRoZSBzaXRl
U1NMIEZ1bGwgVVJMIChodHRwczovL3d3dy5kb21haW4uY29tL3BhdGgp
VGltZSB6b25lIG9mIHRoZSBzZXJ2ZXI=
- VXNlIE1PRCBSRVdSSVRF
+ RW5hYmxlIG1vZF9yZXdyaXRlIChhcGFjaGUgb25seSk=
V2Vic2l0ZSBhZGRyZXNz
V2Vic2l0ZSBuYW1l
V2ViIGFkZHJlc3M=
@@ -479,6 +479,8 @@
QXR0ZW50aW9uIQ==
QXV0aG9y
R2VuZXJhdGUgZnJvbSB0aGUgYXJ0aWNsZSBib2R5
+ VXNlIEF1dG9tYXRpYyBEaXJlY3RvcnkgTmFtZSAoZm9yIG1vZF9yZXdyaXRlKQ==
+ VXNlIEF1dG9tYXRpYyBGaWxlIE5hbWUgKGZvciBtb2RfcmV3cml0ZSk=
TW9kdWxlcw==
QmFjayBVcCBEYXRl
QmFja3VwIFBhdGg=
@@ -503,6 +505,7 @@
Q3JlYXRlZCBvbg==
Q3JlYXRlZCBhdA==
Q3VycmVudCBTZXNzaW9ucw==
+ RmlsZSBOYW1lIChmb3IgbW9kX3Jld3JpdGUp
RGF0YWJhc2UgU2V0dGluZ3M=
VG90YWwgU2l6ZSBvZiB0aGUgRGF0YWJhc2U=
KG1tLWRkLXl5eXkp
@@ -513,6 +516,7 @@
RGVmYXVsdA==
RGVsZXRl
RGVzY3JpcHRpb24=
+ RGlyZWN0b3J5IE5hbWUgKGZvciBtb2RfcmV3cml0ZSk=
RGlzYWJsZWQgQXJ0aWNsZXM=
RGlzYWJsZWQgQ2F0ZWdvcmllcw==
RGlzYWJsZWQgTGlua3M=
@@ -782,7 +786,7 @@
V2FybmluZyE=
V2VpZ2h0
Wmlw
- U2Vzc2lvbiBSZWZlcnJlciBDaGVja2luZw==
+ RW5hYmxlIFJlZmVycmVyIENoZWNraW5n
QWxyZWFkeSB2b3RlZA==
UmVtb3ZlIEZyb20=
Tm90IGFsbCByZXF1aXJlZCBmaWVsZHMgYXJlIGZpbGxlZC4gUGxlYXNlIGZpbGwgdGhlbSBmaXJzdC4=
@@ -1531,7 +1535,7 @@
VXNlciBuYW1lIGlzIHRvbyBzaG9ydA==
V3JvbmcgZmlsZSB0eXBl
- YQ==
+ YQ==
QWdl
Y2Mx
Y2My
Index: trunk/core/kernel/processors/main_processor.php
===================================================================
diff -u -N -r2837 -r3226
--- trunk/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 2837)
+++ trunk/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 3226)
@@ -83,7 +83,7 @@
unset($params['template']);
$prefix=isset($params['prefix']) ? $params['prefix'] : ''; unset($params['prefix']);
$index_file = isset($params['index_file']) ? $params['index_file'] : null; unset($params['index_file']);
-
+
if( !getArrayValue($params,'no_amp') )
{
return str_replace('&', '&', $this->Application->HREF($t,$prefix,$params,$index_file));
@@ -219,6 +219,9 @@
$ret = $this->Application->RecallVar( $this->SelectParam($params,'name,var,param') );
$ret = ($ret === false && isset($params['no_null'])) ? '' : $ret;
if( getArrayValue($params,'special') || getArrayValue($params,'htmlchars')) $ret = htmlspecialchars($ret);
+
+ if ( getArrayValue($params, 'urlencode') ) $ret = urlencode($ret);
+
return $ret;
}
@@ -298,7 +301,7 @@
if( getArrayValue($params, 'escape') ) $ret = addslashes($ret);
return $ret;
}
-
+
function ConfigEquals($params)
{
$option = $this->SelectParam($params, 'name,option,var');
@@ -676,7 +679,7 @@
if( !$this->Application->LoggedIn() )
{
$t = $this->Application->GetVar('t');
- $this->Application->Redirect( $params['login_template'], Array('next_template'=>$t) );
+ $this->Application->Redirect( $params['login_template'], Array('next_template'=>$t) );
}
else
{