Index: trunk/admin/images/toolbar/tool_import_language_f2.gif
===================================================================
diff -u -r13 -r293
Binary files differ
Index: trunk/admin/install.php
===================================================================
diff -u -r283 -r293
--- trunk/admin/install.php (.../install.php) (revision 283)
+++ trunk/admin/install.php (.../install.php) (revision 293)
@@ -352,7 +352,7 @@
if (ConvertVersion($g_InPortal) >= ConvertVersion("1.0.5")) {
$act = 'check';
}
- $rfile = @fopen(GET_LICENSE_URL."?login=".md5($_POST['UserName'])."&password=".md5($_POST['UserPass'])."&action=$act&license_code=".base64_encode($g_LicenseCode)."&version=".ConvertVersion(GetMaxPortalVersion($pathtoroot.$admin))."&domain=".base64_encode($_SERVER['SERVER_NAME']), "r");
+ $rfile = @fopen(GET_LICENSE_URL."?login=".md5($_POST['UserName'])."&password=".md5($_POST['UserPass'])."&action=$act&license_code=".base64_encode($g_LicenseCode)."&version=".GetMaxPortalVersion($pathtoroot.$admin)."&domain=".base64_encode($_SERVER['SERVER_NAME']), "r");
if (!$rfile) {
$login_err_mesg = "Unable to connect to the Intechnic server!";
$LoggedIn = false;
@@ -695,7 +695,7 @@
if ($_POST['login'] != '' && $_POST['password'] != '') {
// Here we determine weather login is ok & check available licenses
- $rfile = @fopen(GET_LICENSE_URL."?login=".md5($_POST['login'])."&password=".md5($_POST['password'])."&version=".ConvertVersion(GetMaxPortalVersion($pathtoroot.$admin))."&domain=".base64_encode($_SERVER['SERVER_NAME']), "r");
+ $rfile = @fopen(GET_LICENSE_URL."?login=".md5($_POST['login'])."&password=".md5($_POST['password'])."&version=".GetMaxPortalVersion($pathtoroot.$admin)."&domain=".base64_encode($_SERVER['SERVER_NAME']), "r");
if (!$rfile) {
$get_license_error = "Unable to connect to the Intechnic server! Please try again later!";
$state = "get_license";
@@ -754,7 +754,7 @@
}
else {
// Here we download license
- $rfile = @fopen(GET_LICENSE_URL."?license_id=".md5($_POST['licenses'])."&dlog=".md5($_POST['dlog'])."&dpass=".md5($_POST['dpass'])."&version=".ConvertVersion(GetMaxPortalVersion($pathtoroot.$admin))."&domain=".base64_encode($_POST['domain']), "r");
+ $rfile = @fopen(GET_LICENSE_URL."?license_id=".md5($_POST['licenses'])."&dlog=".md5($_POST['dlog'])."&dpass=".md5($_POST['dpass'])."&version=".GetMaxPortalVersion($pathtoroot.$admin)."&domain=".base64_encode($_POST['domain']), "r");
if (!$rfile) {
$get_license_error = "Unable to connect to the Intechnic server! Please try again later!";
$state = "get_license";
@@ -1509,7 +1509,7 @@
}
$modules_str = substr($modules_str, 0, strlen($modules_str) - 1);
- $rfile = @fopen(GET_LICENSE_URL."?url=".base64_encode($_SERVER['SERVER_NAME'].$_POST['Site_Path'])."&modules=".base64_encode($modules_str)."&license_code=".base64_encode($g_LicenseCode)."&version=".str_replace('.', '', GetMaxPortalVersion($pathtoroot.$admin))."&domain=".md5($_SERVER['SERVER_NAME']), "r");
+ $rfile = @fopen(GET_LICENSE_URL."?url=".base64_encode($_SERVER['SERVER_NAME'].$_POST['Site_Path'])."&modules=".base64_encode($modules_str)."&license_code=".base64_encode($g_LicenseCode)."&version=".GetMaxPortalVersion($pathtoroot.$admin)."&domain=".md5($_SERVER['SERVER_NAME']), "r");
if (!$rfile) {
//$get_license_error = "Unable to connect to the Intechnic server! Please try again later!";
//$state = "postconfig_1";
Index: trunk/admin/images/toolbar/tool_import_language_f3.gif
===================================================================
diff -u -r13 -r293
Binary files differ
Index: trunk/admin/images/toolbar/tool_import_language.gif
===================================================================
diff -u -r13 -r293
Binary files differ
Index: trunk/kernel/include/parse.php
===================================================================
diff -u -r270 -r293
--- trunk/kernel/include/parse.php (.../parse.php) (revision 270)
+++ trunk/kernel/include/parse.php (.../parse.php) (revision 293)
@@ -251,7 +251,7 @@
}
else
{
- $ret = "{Unknown Tag:" .$this->name."}";
+ //$ret = "{Unknown Tag:" .$this->name."}";
}
}
return $ret;
Index: trunk/kernel/frontaction.php
===================================================================
diff -u -r289 -r293
--- trunk/kernel/frontaction.php (.../frontaction.php) (revision 289)
+++ trunk/kernel/frontaction.php (.../frontaction.php) (revision 293)
@@ -306,26 +306,26 @@
$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");
+ }
}
-
- 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");
- }
$u = $objUsers->GetItemByField("Login",$_POST["username"]);
Index: trunk/kernel/action.php
===================================================================
diff -u -r288 -r293
--- trunk/kernel/action.php (.../action.php) (revision 288)
+++ trunk/kernel/action.php (.../action.php) (revision 293)
@@ -2100,7 +2100,7 @@
/* category Edit */
if( GetVar('CatEditStatus') == 1 )
- {
+ {
$adodbConnection = GetADODBConnection();
// $sql = "SELECT * FROM ".$objSession->GetEditTable("Category")." WHERE CategoryId=0";
@@ -2116,7 +2116,7 @@
$objCatList->CopyFromEditTable("CategoryId");
$objCustomDataList->CopyFromEditTable("CustomDataId");
$objCatList->Clear();
-
+
if($_REQUEST['CategoryId'] > 0) // not root category is updated
{
$objImages = new clsImageList();
@@ -2125,13 +2125,14 @@
}
if( GetVar('CatEditStatus') == 2 )
- {
+ {
$objCatList->PurgeEditTable("CategoryId");
$objCustomDataList->PurgeEditTable("CustomDataId");
if($_REQUEST['CategoryId'] > 0) // not root category is updated
{
$objImages = new clsImageList();
- $objImages->PurgeEditTable("ImageId");
+ $objImages->CopyFromEditTable("ImageId");
+ //$objImages->PurgeEditTable("ImageId");
}
$objCatList->Clear();
}
Index: trunk/admin/users/group_addpermission.php
===================================================================
diff -u -r13 -r293
--- trunk/admin/users/group_addpermission.php (.../group_addpermission.php) (revision 13)
+++ trunk/admin/users/group_addpermission.php (.../group_addpermission.php) (revision 293)
@@ -150,7 +150,7 @@