Index: trunk/admin/users/user_list.php
===================================================================
diff -u -r137 -r228
--- trunk/admin/users/user_list.php (.../user_list.php) (revision 137)
+++ trunk/admin/users/user_list.php (.../user_list.php) (revision 228)
@@ -246,6 +246,7 @@
$objConfig->Set($SortFieldVar,$DefaultSortField);
$orderBy = trim($objConfig->Get($SortFieldVar)." ".$objConfig->Get($SortOrderVar));
+
if(strlen($orderBy))
$sql .=" ORDER BY ".$orderBy;
Index: trunk/kernel/include/usersession.php
===================================================================
diff -u -r168 -r228
--- trunk/kernel/include/usersession.php (.../usersession.php) (revision 168)
+++ trunk/kernel/include/usersession.php (.../usersession.php) (revision 228)
@@ -487,15 +487,15 @@
}
else
$sql = "INSERT INTO ".GetTablePrefix()."SessionData (VariableName,VariableValue,SessionKey) VALUES ('$variableName','$variableValue','$sessionkey')";
-
+
$this->adodbConnection->Execute($sql);
// echo "
UPDATE: $sql
";
//}
}
function SetPersistantVariable($variableName, $variableValue)
{
- global $objConfig;
+ global $objConfig, $objUsers;
$userid = (int)$this->Get("PortalUserId");
@@ -505,8 +505,9 @@
$this->CurrentUser = $objUsers->GetItem($this->Get("PortalUserId"));
if(!$this->CurrentUser->VarsLoaded)
$this->CurrentUser->LoadPersistantVars();
-
- $this->CurrentUser->SetPersistantVariable($variableName, $variableValue);
+ //echo "setting current user' $variableName, $variableValue
";
+ $this->CurrentUser->SetPersistantVariable($variableName, $variableValue);
+ //$this->SetVariable($variableName,$variableValue);
}
else
$this->SetVariable($variableName,$variableValue);
@@ -542,11 +543,6 @@
if(is_numeric($this->Get("PortalUserId")))
{
- if(!is_object($this->CurrentUser))
- $this->CurrentUser = $objUsers->GetItem($this->Get("PortalUserId"));
- if(!$this->CurrentUser->VarsLoaded)
- $this->CurrentUser->LoadPersistantVars();
-
$sql = "SELECT VariableName, VariableValue FROM ".GetTablePrefix()."SessionData where SessionKey='" . $this->Get("SessionKey") . "'";
//echo $sql."
\n";
$result = $this->adodbConnection->Execute($sql);
@@ -557,6 +553,11 @@
$objConfig->Set($data["VariableName"],$data["VariableValue"],FALSE);
$result->MoveNext();
}
+
+ if(!is_object($this->CurrentUser))
+ $this->CurrentUser = $objUsers->GetItem($this->Get("PortalUserId"));
+ if(!$this->CurrentUser->VarsLoaded)
+ $this->CurrentUser->LoadPersistantVars();
}
if((int)$this->GetPersistantVariable("Language"))
$this->Set("Language",$objConfig->Get("Language"));
Index: trunk/admin/listview/columnheader.php
===================================================================
diff -u -r13 -r228
--- trunk/admin/listview/columnheader.php (.../columnheader.php) (revision 13)
+++ trunk/admin/listview/columnheader.php (.../columnheader.php) (revision 228)
@@ -36,7 +36,7 @@
else
$o = "";
if($this->sortfield)
- {
+ {
if($this->asc=="desc")
{
$img_src = $adminURL."/images/list_arrow_dn.gif";
Index: trunk/kernel/include/portaluser.php
===================================================================
diff -u -r155 -r228
--- trunk/kernel/include/portaluser.php (.../portaluser.php) (revision 155)
+++ trunk/kernel/include/portaluser.php (.../portaluser.php) (revision 228)
@@ -183,7 +183,9 @@
function LoadPersistantVars()
{
- unset($this->Vars);
+ global $objConfig;
+
+ unset($this->Vars);
$this->Vars = array();
$user_id = $this->HasField('PortalUserId') ? $this->Get('PortalUserId') : 0;
$sql = "SELECT VariableName, VariableValue FROM ".GetTablePrefix()."PersistantSessionData WHERE PortalUserId = 0 OR PortalUserId = ".$user_id." ORDER BY PortalUserId ASC";
@@ -192,6 +194,7 @@
{
$data = $result->fields;
$this->Vars[$data["VariableName"]] = $data["VariableValue"];
+ $objConfig->Set($data["VariableName"], $data["VariableValue"], 1, 1);
$result->MoveNext();
}
$this->VarsLoaded=TRUE;
@@ -203,7 +206,7 @@
if(!$this->VarsLoaded)
$this->LoadPersistantVars();
- $userid = $this->Get("PortalUserId");
+ $userid = $this->Get("PortalUserId");
$objConfig->Set($variableName,$variableValue,1);
$fields = array_keys($this->Vars);
Index: trunk/kernel/include/language.php
===================================================================
diff -u -r39 -r228
--- trunk/kernel/include/language.php (.../language.php) (revision 39)
+++ trunk/kernel/include/language.php (.../language.php) (revision 228)
@@ -119,7 +119,24 @@
global $objSession;
$edit_table = $objSession->GetEditTable($this->SourceTable);
- $idlist = array();
+
+ $sql = "SELECT l.PhraseId AS pid FROM ".GetTablePrefix()."Phrase AS l LEFT JOIN $edit_table AS e ON e.PhraseId = l.PhraseId WHERE e.PhraseId IS NULL ORDER BY l.PhraseId";
+ $rs = $this->adodbConnection->Execute($sql);
+
+ $ids = '';
+ while ($rs && !$rs->EOF) {
+ $ids .= $rs->fields['pid'].',';
+ $rs->MoveNext();
+ }
+
+ $ids = substr($ids, 0, strlen($ids) - 1);
+
+ if (strlen($ids) > 0) {
+ $sql = "DELETE FROM ".GetTablePrefix()."Phrase WHERE PhraseId IN (".$ids.")";
+ $this->adodbConnection->Execute($sql);
+ }
+
+ //$idlist = array();
$sql = "SELECT * FROM $edit_table";
$this->Clear();
@@ -141,7 +158,8 @@
}
$rs->MoveNext();
- }
+ }
+
if((int)$_GLOBALS["debuglevel"])
echo $sql."
\n";
$this->adodbConnection->Execute($sql);
Index: trunk/admin/install/langpacks/english.lang
===================================================================
diff -u -r190 -r228
--- trunk/admin/install/langpacks/english.lang (.../english.lang) (revision 190)
+++ trunk/admin/install/langpacks/english.lang (.../english.lang) (revision 228)
@@ -1238,7 +1238,6 @@
RmllbGQgUHJvbXB0
SW5wdXQgVHlwZQ==
TGlzdCBvZiBWYWx1ZXM=
-VGVzdA==
VGhpcyBpcyBhIGdlbmVyYWwgY29uZmd1cmF0aW9uIHNlY3Rpb24=
TmV3cyBBcnRpY2xlIElE
SW1wb3J0IGEgTGFnbnVhZ2UgUGFja2FnZQ==
@@ -1532,6 +1531,16 @@
RWRpdG9yJ3MgUGlja3M=
QWR2YW5jZWQgVmlldw==
QWR2YW5jZWQgVmlldw==
+QWR2YW5jZWQgVmlldw==
+QWR2YW5jZWQgVmlldw==
+VXNlcm5hbWUgeW91IGhhdmUgZW50ZXJlZCBhbHJlYWR5IGV4aXN0cyBpbiB0aGUgc3lzdGVtLCBwbGVhc2UgY2hvb3NlIGFub3RoZXIgdXNlcm5hbWUu
+VGhpcyBzZWN0aW9uIGFsbG93cyB5b3UgdG8gbWFuYWdlIGNhdGVnb3JpZXMgYW5kIGl0ZW1zIGFjcm9zcyBhbGwgY2F0ZWdvcmllcw==
+RWRpdG9yJ3MgUGljayBMaW5rcw==
+RWRpdG9yJ3MgUGljayBBcnRpY2xlcw==
+VXNlcm5hbWUgeW91IGhhdmUgZW50ZXJlZCBhbHJlYWR5IGV4aXN0cyBpbiB0aGUgc3lzdGVtLCBwbGVhc2UgY2hvb3NlIGFub3RoZXIgdXNlcm5hbWUu
+VGhpcyBzZWN0aW9uIGFsbG93cyB5b3UgdG8gbWFuYWdlIGNhdGVnb3JpZXMgYW5kIGl0ZW1zIGFjcm9zcyBhbGwgY2F0ZWdvcmllcw==
+VXNlcm5hbWUgeW91IGhhdmUgZW50ZXJlZCBhbHJlYWR5IGV4aXN0cyBpbiB0aGUgc3lzdGVtLCBwbGVhc2UgY2hvb3NlIGFub3RoZXIgdXNlcm5hbWUu
+VGhpcyBzZWN0aW9uIGFsbG93cyB5b3UgdG8gbWFuYWdlIGNhdGVnb3JpZXMgYW5kIGl0ZW1zIGFjcm9zcyBhbGwgY2F0ZWdvcmllcw==
WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogSW4tcG9ydGFsIHJlZ2lzdHJhdGlvbgoKRGVhciA8aW5wOnRvdXNlciBfRmllbGQ9IkZpcnN0TmFtZSIgLz4gPGlucDp0b3VzZXIgX0ZpZWxkPSJMYXN0TmFtZSIgLz4sDQoNClRoYW5rIHlvdSBmb3IgcmVnaXN0ZXJpbmcgb24gPGlucDptX3BhZ2VfdGl0bGUgLz4uIFlvdXIgcmVnaXN0cmF0aW9uIGlzIG5vdyBhY3RpdmUu
WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogTmV3IHVzZXIgaGFzIGJlZW4gYWRkZWQKCkEgbmV3IHVzZXIgIjxpbnA6dG91c2VyIF9GaWVsZD0iVXNlck5hbWUiIC8+IiBoYXMgYmVlbiBhZGRlZC4=
WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogWW91IGhhdmUgYmVlbiBhcHByb3ZlZAoKV2VsY29tZSB0byBJbi1wb3J0YWwhDQpZb3VyIHVzZXIgcmVnaXN0cmF0aW9uIGhhcyBiZWVuIGFwcHJvdmVkLiBZb3VyIHVzZXIgbmFtZSBpcyAiPGlucDp0b3VzZXIgX0ZpZWxkPSJVc2VyTmFtZSIgLz4iLg==
Index: trunk/kernel/include/adodb/adodb.inc.php
===================================================================
diff -u -r13 -r228
--- trunk/kernel/include/adodb/adodb.inc.php (.../adodb.inc.php) (revision 13)
+++ trunk/kernel/include/adodb/adodb.inc.php (.../adodb.inc.php) (revision 228)
@@ -1107,9 +1107,10 @@
}
function GetCol($sql, $inputarr = false, $trim = false)
- {
+ {
$rv = false;
$rs = &$this->Execute($sql, $inputarr);
+
if ($rs) {
if ($trim) {
while (!$rs->EOF) {
@@ -1124,6 +1125,7 @@
}
$rs->Close();
}
+
return $rv;
}
Index: trunk/kernel/action.php
===================================================================
diff -u -r214 -r228
--- trunk/kernel/action.php (.../action.php) (revision 214)
+++ trunk/kernel/action.php (.../action.php) (revision 228)
@@ -285,7 +285,6 @@
case "m_SetVariable":
$objSession->SetPersistantVariable($_POST["fieldname"], $_POST["varvalue"]);
- //echo "Setting $fieldname to $varvalue
\n";
break;
case "m_SetSessionVariable":
$objSession->SetVariable($_POST["fieldname"], $_POST["varvalue"]);
|