Index: branches/RC/admin/listview/listview.php =================================================================== diff -u -r8929 -r9389 --- branches/RC/admin/listview/listview.php (.../listview.php) (revision 8929) +++ branches/RC/admin/listview/listview.php (.../listview.php) (revision 9389) @@ -1,15 +1,15 @@ SetToolBar($ToolBar); $this->SetListItems($ListItems); - $this->ColumnHeaders = new clsColumnHeaderList(); + $this->ColumnHeaders = new clsColumnHeaderList(); $this->CurrentPage=1; $this->CheckboxName = "itemlist[]"; $this->SelectorType="checkbox"; @@ -50,10 +50,10 @@ $this->extra_env=""; $this->PriorityField="Priority"; $this->TotalItemCount = 0; - + if (!is_null($ToolBar)) $this->JSCheckboxName = $ToolBar->Get("CheckClass"); - $this->SetFormatters(); // for setting custom formatters + $this->SetFormatters(); // for setting custom formatters } function SetToolbar($ToolBar) @@ -62,22 +62,22 @@ if(is_object($this->ToolBar)) $this->CheckArray=$this->ToolBar->Get("CheckClass"); } - + function GetPage() { // get current page $this->RefreshPageVar(); return $this->CurrentPage; } - + function GetLimitSQL() { return GetLimitSQL($this->GetPage(), $this->GetPerPage() ); } - + function SetListItems(&$ListItems) { - $this->ListItems =& $ListItems; + $this->ListItems =& $ListItems; } function SetIDfield($field) @@ -98,14 +98,14 @@ function ConfigureViewMenu($SortFieldVar,$SortOrderVar,$DefaultSort,$FilterVar,$FilterValue,$FilterMax) { global $objConfig; - + //$FilterVal = $this->CurrentFilter; //$fMax = $this->Filtermax; //$sOrder = $this->CurrentSortOrder; //$sOrderVar = $this->OrderVar; //$sField = $this->CurrentSortField; - //$sDefault = $this->DefaultSortField; - + //$sDefault = $this->DefaultSortField; + $this->ViewMenu = new clsViewMenu(); $this->ViewMenu->PerPageVar = $this->PerPageVar; $this->ViewMenu->PerPageValue = (int)$objConfig->Get($this->PerPageVar); @@ -115,38 +115,38 @@ $this->ViewMenu->CurrentSortOrder = $objConfig->get($SortOrderVar); $this->ViewMenu->SortVar = $SortFieldVar; $this->ViewMenu->OrderVar = $SortOrderVar; - $this->ViewMenu->CurrentFilter= $FilterValue; + $this->ViewMenu->CurrentFilter= $FilterValue; $this->ViewMenu->FilterVar = $FilterVar; $this->ViewMenu->FilterMax = $FilterMax; foreach($this->ColumnHeaders->Columns as $col) { - $this->ViewMenu->AddSortField($col->field,$col->label,$DefaultSort==$col->field); + $this->ViewMenu->AddSortField($col->field,$col->label,$DefaultSort==$col->field); } } - + function AddViewMenuFilter($Label,$Bit) { if(is_object($this->ViewMenu)) - $this->ViewMenu->AddFilterField($Label,$Bit); + $this->ViewMenu->AddFilterField($Label,$Bit); } - + function GetViewMenu($imagesURL) - { - if(is_object($this->ViewMenu)) + { + if(is_object($this->ViewMenu)) { $this->ViewMenu->CheckboxName = $this->JSCheckboxName; - return $this->ViewMenu->GetViewMenuJS($imagesURL); + return $this->ViewMenu->GetViewMenuJS($imagesURL); } else return ""; } - + function SetFormatters() { - // for setting custom formatters + // for setting custom formatters // abstract } - + function SetFormatter($field, $type, $params) { // by Alex @@ -156,24 +156,24 @@ { case FT_OPTION: $this->Formatters[$field]['options'] = $params; - break; + break; } } - + function PrintItem($index) { if( !isset($this->ListItems->Items[$index]) ) return ''; $li = $this->ListItems->Items[$index]; - + $o = ""; - $first=1; + $first=1; if(is_object($li)) - { + { // ==== new by Alex: begin ==== $li->Formatters =& $this->Formatters; // ==== new by Alex: end ==== - + $id_field = $this->IdField; $row_id = $li->Get($id_field); if(is_numeric($li->Get($this->PriorityField))) @@ -185,31 +185,31 @@ $o = "
$lvErrorString | |||
'; $o .= $this->GetAdminPageLinkList($this->PageURL); $o .= " | \n"; @@ -401,23 +401,23 @@ { $val = inp_htmlize(str_replace(","," ", $this->SearchKeywords),1); $o .= ""; - $o .= $this->GetAdminPageLinkList($this->PageURL)." | "; + $o .= $this->GetAdminPageLinkList($this->PageURL).""; $o .= "$add_search".admin_language("la_prompt_Search");
$o .= " ";
$o .= " ![]() ![]() ![]() | ";
}
@@ -429,7 +429,7 @@
{
$o = '';
if($this->checkboxes)
- {
+ {
$o = "