Index: trunk/themes/inlink2/sort_cats.tpl =================================================================== diff -u -N -r626 -r916 --- trunk/themes/inlink2/sort_cats.tpl (.../sort_cats.tpl) (revision 626) +++ trunk/themes/inlink2/sort_cats.tpl (.../sort_cats.tpl) (revision 916) @@ -1,43 +1,85 @@ - - - - - "> - - - - +
- - - () -
-
-

- - - - - - - "> -

-
-
+ + + + + + + + "> + + + + + + + + +
+ + + + + + () + +
+ +
+ +

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

+ +
+ +
\ No newline at end of file Index: trunk/kernel/parser.php =================================================================== diff -u -N -r904 -r916 --- trunk/kernel/parser.php (.../parser.php) (revision 904) +++ trunk/kernel/parser.php (.../parser.php) (revision 916) @@ -754,6 +754,7 @@
  • m_simple_subsearch: Search within results
  • m_adv_searchtype: Form to select type of advanced search
  • m_adv_subsearch: Advanced Search +
  • m_sort_cats: Sort categories
  • error_access: form displayed on the access denied template
  • error_template: Form displayed on the template error page
  • m_set_theme: Form displayed for theme selection @@ -824,6 +825,9 @@ case "forgotpw_confirm": $ret = GetIndexURL(2)."?env=".BuildEnv(); break; + case "m_sort_cats": + $ret = GetIndexURL(2)."?env=".BuildEnv()."&Action=m_sort_cats"; + break; case "suggest": if(!$objSession->SessionEnabled()) { Index: trunk/themes/inlink2/index.tpl =================================================================== diff -u -N -r29 -r916 --- trunk/themes/inlink2/index.tpl (.../index.tpl) (revision 29) +++ trunk/themes/inlink2/index.tpl (.../index.tpl) (revision 916) @@ -1,37 +1,73 @@ - - - - - - -
    - -
    - - - - - - - - -

    - - - -     		- - -
    - - - - -
    - - - - - - + + + + + + + + + + + + +
    + + + +
    + + + + + + + + + + + + + + + + + +

    + + + + + + + +     		+ + + + + +
    + + + + + + + + + +
    + + + + + + + + + + + + + \ No newline at end of file Index: trunk/kernel/frontaction.php =================================================================== diff -u -N -r875 -r916 --- trunk/kernel/frontaction.php (.../frontaction.php) (revision 875) +++ trunk/kernel/frontaction.php (.../frontaction.php) (revision 916) @@ -587,7 +587,7 @@ break; case "m_sort_cats": - $objSession->SetVariable("Category_Sortfield",$_POST["cat_field_sort"]); + $objSession->SetVariable("Category_Sortfield",$_POST["cat_sort_field"]); $objSession->SetVariable("Category_Sortorder",$_POST["cat_sort_order"]); break; case "m_add_cat_confirm": Index: trunk/kernel/include/category.php =================================================================== diff -u -N -r904 -r916 --- trunk/kernel/include/category.php (.../category.php) (revision 904) +++ trunk/kernel/include/category.php (.../category.php) (revision 916) @@ -1554,7 +1554,7 @@ if(is_object($objSession)) { if(strlen($objSession->GetPersistantVariable($FieldVar))>0) - { + { $Orders[] = trim($TableName.$objSession->GetPersistantVariable($FieldVar) . " ". $objSession->GetPersistantVariable($OrderVar)); } @@ -1635,7 +1635,7 @@ $sql .= " ".$limit; if($objSession->HasSystemPermission("DEBUG.LIST")) echo $sql; - + //echo "SQL: $sql
    "; return $this->Query_item($sql); } Index: trunk/kernel/action.php =================================================================== diff -u -N -r912 -r916 --- trunk/kernel/action.php (.../action.php) (revision 912) +++ trunk/kernel/action.php (.../action.php) (revision 916) @@ -17,6 +17,20 @@ unset($script, $skipDebug); // ====== Debugger related: end ====== +// Session expiration related + +if (!admin_login()) +{ + if(!headers_sent()) + setcookie("sid"," ",time()-3600); + $objSession->Logout(); + header("Location: ".$adminURL."/login.php?expired=1"); + die(); + //require_once($pathtoroot."admin/login.php"); +} + +// End session exipration related + switch($Action) { case "m_save_import_config": Index: trunk/admin/users/adduser_groups.php =================================================================== diff -u -N -r881 -r916 --- trunk/admin/users/adduser_groups.php (.../adduser_groups.php) (revision 881) +++ trunk/admin/users/adduser_groups.php (.../adduser_groups.php) (revision 916) @@ -126,7 +126,7 @@ $sec = $objSections->GetSection($section); $envar = "env=" . BuildEnv() . "&en=$en"; -$SortFieldVar = "UserGroup_SortOrder"; +$SortFieldVar = "UserGroup_SortField"; $SortOrderVar = "UserGroup_SortOrder"; $DefaultSortField = "Name"; $PerPageVar = "Perpage_Groups"; @@ -256,7 +256,7 @@ $objListView->ColumnHeaders->Add("GroupName", admin_language("la_prompt_GroupName"),1,0,$order,"width=\"50%\"",$SortFieldVar,$SortOrderVar,"GroupName"); $objListView->ColumnHeaders->Add("UserCount",admin_language("la_prompt_UserCount"),1,0,$order,"width=\"50%\"",$SortFieldVar,$SortOrderVar,"UserCount"); -$objListView->ColumnHeaders->SetSort($objConfig->Get("Group_SortField"),$order); +$objListView->ColumnHeaders->SetSort($objConfig->Get("UserGroup_SortField"),$order); $objListView->PrintToolBar = FALSE; $objListView->SearchBar = TRUE;