Index: trunk/themes/default/misc/right_loggedin.tpl =================================================================== diff -u -N -r640 -r943 --- trunk/themes/default/misc/right_loggedin.tpl (.../right_loggedin.tpl) (revision 640) +++ trunk/themes/default/misc/right_loggedin.tpl (.../right_loggedin.tpl) (revision 943) @@ -53,6 +53,10 @@
+ + ">
+ "> + Index: trunk/themes/default/sort_cats.tpl =================================================================== diff -u -N --- trunk/themes/default/sort_cats.tpl (revision 0) +++ trunk/themes/default/sort_cats.tpl (revision 943) @@ -0,0 +1,83 @@ + + + + + + + + + "> + + + + + + + + + +
+ + + + () + +
+ +
+ +

+ + + + + + + + + + + + + + "> + +

+ +
+ +
\ No newline at end of file Index: trunk/kernel/include/parseditem.php =================================================================== diff -u -N -r904 -r943 --- trunk/kernel/include/parseditem.php (.../parseditem.php) (revision 904) +++ trunk/kernel/include/parseditem.php (.../parseditem.php) (revision 943) @@ -1910,7 +1910,7 @@ { $FieldVar = $this->Query_SortField[$x]; $OrderVar = $this->Query_SortOrder[$x]; - + if(is_object($objSession)) { $FieldVarData = $objSession->GetPersistantVariable($FieldVar); @@ -2545,8 +2545,9 @@ $catid = (int)$attribs["_catid"]; $scope = (int)$attribs["_scope"]; + $show_since_last = (int)$attribs["_show_since_last"]; //$JoinCats = (int)$attribs["_catinfo"] || $scope; - + //echo "Last: $scope

"; $TableName = $this->SourceTable; if($attribs["_today"]) { @@ -2559,8 +2560,13 @@ if (!$catid) { $catid = $objCatList->CurrentCategoryID(); - } - $cutoff = $this->GetNewValue($catid); + } + if (!$show_since_last) { + $cutoff = $this->GetNewValue($catid); + } + else { + $cutoff = $scope; + } } else $cutoff = $this->GetNewValue(); @@ -2572,7 +2578,12 @@ $catid = $objCatList->CurrentCategoryID(); } - $where = "CategoryId =".$catid." AND ((".$TableName.".CreatedOn >=".$cutoff." AND ".$TableName.".NewItem != 0) OR ".$TableName.".NewItem=1 ) AND ".$TableName.".Status=1 "; + if (!$show_since_last) { + $where = "CategoryId =".$catid." AND ((".$TableName.".CreatedOn >=".$cutoff." AND ".$TableName.".NewItem != 0) OR ".$TableName.".NewItem=1 ) AND ".$TableName.".Status=1 "; + } + else { + $where = $TableName.".CreatedOn >=".$cutoff." AND ".$TableName.".Status=1 "; + } } else { @@ -2585,7 +2596,8 @@ $sql .= $this->GetJoinedSQL($p,$CatUd,$where); $OrderBy = $this->QueryOrderByClause(TRUE,TRUE,TRUE); - $sql .= " ".$OrderBy; + $sql .= " ".$OrderBy; + //echo $sql; return $sql; } Index: trunk/themes/default/items_since_last.tpl =================================================================== diff -u -N --- trunk/themes/default/items_since_last.tpl (revision 0) +++ trunk/themes/default/items_since_last.tpl (revision 943) @@ -0,0 +1,85 @@ + + + + + + + +
+ + + + + + + + + + + + + +



+ + + + + + + + + + +

+ + + + + + +

"> > + + + + + + + +
" width="18" height="12" alt="" />
   
+
+ +
+ + + + +
+ + + + + + + + + + + + + + + +

+ + + + +
+ + +

+
+ + + + Index: trunk/kernel/frontaction.php =================================================================== diff -u -N -r923 -r943 --- trunk/kernel/frontaction.php (.../frontaction.php) (revision 923) +++ trunk/kernel/frontaction.php (.../frontaction.php) (revision 943) @@ -28,7 +28,7 @@ $LoginCheck = $objSession->Login( $_POST["login_user"], md5($_POST["login_password"]) ); if($LoginCheck === true) { - if( !headers_sent() && GetVar('usercookie') == 1 ) + if( !headers_sent() && GetVar('usercookie') == 1 ) { $c = $_POST["login_user"]."|"; $pw = $_POST["login_password"]; @@ -589,6 +589,7 @@ case "m_sort_cats": $objSession->SetVariable("Category_Sortfield",$_POST["cat_sort_field"]); $objSession->SetVariable("Category_Sortorder",$_POST["cat_sort_order"]); + $objSession->SetVariable("Perpage_Category",$_POST["cat_perpage"]); break; case "m_add_cat_confirm": // phpinfo(INFO_VARIABLES); Index: trunk/admin/logs/session_list.php =================================================================== diff -u -N -r923 -r943 --- trunk/admin/logs/session_list.php (.../session_list.php) (revision 923) +++ trunk/admin/logs/session_list.php (.../session_list.php) (revision 943) @@ -155,6 +155,9 @@ if($_GET["resetpage"]==1) $objSession->SetVariable("Page_Sessions","1"); + +if ($_POST['fieldname'] == "Perpage_Sessionlist") + $objSession->SetVariable("Page_Sessionlist","1"); /* determine current view menu settings */ $SessionView = $objConfig->Get("Session_View");