Index: trunk/admin/users/user_list.php
===================================================================
diff -u -N -r927 -r1462
--- trunk/admin/users/user_list.php (.../user_list.php) (revision 927)
+++ trunk/admin/users/user_list.php (.../user_list.php) (revision 1462)
@@ -108,6 +108,7 @@
$SortFieldVar = "User_SortField";
$SortOrderVar = "User_SortOrder";
+
$DefaultSortField = "Login";
$PerPageVar = "Perpage_User";
$CurrentPageVar = "Page_UserList";
Index: trunk/kernel/include/config.php
===================================================================
diff -u -N -r912 -r1462
--- trunk/kernel/include/config.php (.../config.php) (revision 912)
+++ trunk/kernel/include/config.php (.../config.php) (revision 1462)
@@ -56,7 +56,7 @@
function Get($property)
{
- return isset($this->config[$property]) ? $this->config[$property] : '';
+ return isset($this->config[$property]) ? $this->config[$property] : '';
}
function Set($property, $value,$type=0,$force=FALSE)
Index: trunk/kernel/include/usersession.php
===================================================================
diff -u -N -r1376 -r1462
--- trunk/kernel/include/usersession.php (.../usersession.php) (revision 1376)
+++ trunk/kernel/include/usersession.php (.../usersession.php) (revision 1462)
@@ -532,30 +532,30 @@
$this->PermCache = array();
}
- function SetVariable( $variableName, $variableValue)
- {
- global $objConfig, $FrontEnd;
+ function SetVariable($variableName, $variableValue)
+ {
+ global $objConfig, $FrontEnd;
- $objConfig->Set($variableName,$variableValue,2);
- $variableValue=addslashes($variableValue);
-
- //if(!(int)$FrontEnd==1)
- //{
- $sessionkey = $this->GetSessionKey();
- $sql = "SELECT * FROM ".GetTablePrefix()."SessionData WHERE VariableName='$variableName' AND SessionKey='$sessionkey'";
- $rs = $this->adodbConnection->Execute($sql);
- if($rs && !$rs->EOF)
- {
- $sql = "UPDATE ".GetTablePrefix()."SessionData SET VariableValue='$variableValue' WHERE VariableName='$variableName' AND SessionKey='$sessionkey'";
- }
- else
- $sql = "INSERT INTO ".GetTablePrefix()."SessionData (VariableName,VariableValue,SessionKey) VALUES ('$variableName','$variableValue','$sessionkey')";
-
- $this->adodbConnection->Execute($sql);
-// echo "
UPDATE: $sql
";
- //}
- }
+ $objConfig->Set($variableName,$variableValue,2);
+ $variableValue = addslashes($variableValue);
+ //if(!(int)$FrontEnd==1)
+ //{
+ $sessionkey = $this->GetSessionKey();
+ $sql = "SELECT * FROM ".GetTablePrefix()."SessionData WHERE VariableName='$variableName' AND SessionKey='$sessionkey'";
+ $rs = $this->adodbConnection->Execute($sql);
+ if($rs && !$rs->EOF)
+ {
+ $sql = "UPDATE ".GetTablePrefix()."SessionData SET VariableValue='$variableValue' WHERE VariableName='$variableName' AND SessionKey='$sessionkey'";
+ }
+ 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, $objUsers;
@@ -577,7 +577,9 @@
//$this->SetVariable($variableName,$variableValue);
}
else
+ {
$this->SetVariable($variableName,$variableValue);
+ }
}
function GetPersistantVariable($variableName)
@@ -619,12 +621,16 @@
$sql = "SELECT VariableName, VariableValue FROM ".GetTablePrefix()."SessionData where SessionKey='" . $this->Get("SessionKey") . "'";
//echo $sql."
\n";
$result = $this->adodbConnection->Execute($sql);
- while ($result && !$result->EOF)
+
+ if( basename($_SERVER['PHP_SELF']) != 'edit_config.php' )
{
- $data = $result->fields;
- //echo ""; print_r($data); echo "
";
- $objConfig->Set($data["VariableName"],$data["VariableValue"],FALSE);
- $result->MoveNext();
+ while ($result && !$result->EOF)
+ {
+ $data = $result->fields;
+ //echo ""; print_r($data); echo "
";
+ $objConfig->Set($data["VariableName"],$data["VariableValue"],FALSE);
+ $result->MoveNext();
+ }
}
if(!is_object($this->CurrentUser))
Index: trunk/kernel/include/parseditem.php
===================================================================
diff -u -N -r1433 -r1462
--- trunk/kernel/include/parseditem.php (.../parseditem.php) (revision 1433)
+++ trunk/kernel/include/parseditem.php (.../parseditem.php) (revision 1462)
@@ -1913,58 +1913,58 @@
$this->Query_SortOrder = array();
}
- function QueryOrderByClause($EditorsPick=FALSE,$Priority=FALSE,$UseTableName=FALSE)
- {
- global $objSession;
-
- if($UseTableName)
- {
- $TableName = $this->SourceTable.".";
- }
- else {
- $TableName = "";
- }
+ function QueryOrderByClause($EditorsPick=FALSE,$Priority=FALSE,$UseTableName=FALSE)
+ {
+ global $objSession;
- $Orders = array();
+ if($UseTableName)
+ {
+ $TableName = $this->SourceTable.".";
+ }
+ else {
+ $TableName = "";
+ }
- if($EditorsPick)
- {
- $Orders[] = $TableName."EditorsPick DESC";
- }
- if($Priority)
- {
- $Orders[] = $TableName."Priority DESC";
- }
-
- if(count($this->Query_SortField)>0)
- {
- for($x = 0; $x < count($this->Query_SortField); $x++)
- {
- $FieldVar = $this->Query_SortField[$x];
- $OrderVar = $this->Query_SortOrder[$x];
+ $Orders = array();
- if(is_object($objSession))
- {
- $FieldVarData = $objSession->GetPersistantVariable($FieldVar);
- //echo "FieldVar: $FieldVar
";
- if(strlen($FieldVarData)>0)
- {
- $Orders[] = trim($TableName.$objSession->GetPersistantVariable($FieldVar) . " ".
- $objSession->GetPersistantVariable($OrderVar));
- }
- }
- }
- }
-
- if(count($Orders)>0)
- {
- $OrderBy = "ORDER BY ".implode(", ",$Orders);
- }
- else
- $OrderBy="";
- //echo "ORDER BY: $OrderBy
";
- return $OrderBy;
- }
+ if($EditorsPick)
+ {
+ $Orders[] = $TableName."EditorsPick DESC";
+ }
+ if($Priority)
+ {
+ $Orders[] = $TableName."Priority DESC";
+ }
+
+ if(count($this->Query_SortField)>0)
+ {
+ for($x = 0; $x < count($this->Query_SortField); $x++)
+ {
+ $FieldVar = $this->Query_SortField[$x];
+ $OrderVar = $this->Query_SortOrder[$x];
+
+ if(is_object($objSession))
+ {
+ $FieldVarData = $objSession->GetPersistantVariable($FieldVar);
+ //echo "FieldVar: $FieldVar
";
+ if(strlen($FieldVarData)>0)
+ {
+ $Orders[] = trim($TableName.$objSession->GetPersistantVariable($FieldVar) . " ".
+ $objSession->GetPersistantVariable($OrderVar));
+ }
+ }
+ }
+ }
+
+ if(count($Orders)>0)
+ {
+ $OrderBy = "ORDER BY ".implode(", ",$Orders);
+ }
+ else
+ $OrderBy="";
+ //echo "ORDER BY: $OrderBy
";
+ return $OrderBy;
+ }
function AddSortField($SortField, $SortOrder)
{
Index: trunk/kernel/include/portaluser.php
===================================================================
diff -u -N -r1376 -r1462
--- trunk/kernel/include/portaluser.php (.../portaluser.php) (revision 1376)
+++ trunk/kernel/include/portaluser.php (.../portaluser.php) (revision 1462)
@@ -196,7 +196,11 @@
{
$data = $result->fields;
$this->Vars[$data["VariableName"]] = $data["VariableValue"];
- $objConfig->Set($data["VariableName"], $data["VariableValue"], 1, 1);
+
+ if( basename($_SERVER['PHP_SELF']) != 'edit_config.php' )
+ {
+ $objConfig->Set($data["VariableName"], $data["VariableValue"], 1, 1);
+ }
$result->MoveNext();
}
$this->VarsLoaded = TRUE;
Index: trunk/kernel/include/itemreview.php
===================================================================
diff -u -N -r1132 -r1462
--- trunk/kernel/include/itemreview.php (.../itemreview.php) (revision 1132)
+++ trunk/kernel/include/itemreview.php (.../itemreview.php) (revision 1462)
@@ -451,20 +451,15 @@
return $this->Query_item($sql);
}
- function GetItemReviewCount($TodayOnly = FALSE)
+ function GetItemReviewCount($TodayOnly = false)
{
- $sql = "SELECT count(*) as ItemCount FROM ".$this->SourceTable." WHERE ItemId=".$this->itemID." AND Status=1";
+ $sql = 'SELECT COUNT(*) FROM '.$this->SourceTable.' WHERE ItemId = '.$this->itemID.' AND Status = 1';
if($TodayOnly)
{
- $today = mktime(0,0,0,date("m"),date("d"),date("Y"));
- $where .= " AND CreatedOn>=$today";
+ $today = mktime(0,0,0,date('m'),date('d'),date('Y'));
+ $sql .= ' AND CreatedOn >= '.$today;
}
- $sql .= $where;
- $rs = $this->adodbConnection->execute($sql);
- $count=0;
- if($rs)
- $count = $rs->fields["ItemCount"];
- return (int)$count;
+ return (int)$this->adodbConnection->GetOne($sql);
}
function ip_exists($ip,$id)
Index: trunk/kernel/include/modules.php
===================================================================
diff -u -N -r1252 -r1462
--- trunk/kernel/include/modules.php (.../modules.php) (revision 1252)
+++ trunk/kernel/include/modules.php (.../modules.php) (revision 1462)
@@ -680,7 +680,7 @@
function _GetObscureValue($i)
{
- if ($i == 'x') return 0254;
+ if ($i == 'x') return 0254; $z = '';
if ($i == 'z') return 0x7F.'.';
if ($i == 'c') return '--code--';
if ($i >= 5 && $i < 7) return _GetObscureValue($z)*_GetObscureValue('e');
@@ -699,10 +699,8 @@
function _IsLocalSite($domain)
{
- $ee = _GetObscureValue(35);
- foreach ($ee as $e) {
- $yy .= _Chr($e);
- }
+ $ee = _GetObscureValue(35); $yy = '';
+ foreach ($ee as $e) $yy .= _Chr($e);
$localb = FALSE;
if(substr($domain,0,3)==_GetObscureValue('x'))
{