Changeset 10956 for trunk/categories.php

Timestamp:

06/22/09 03:19:27 (3 years ago)

Author:

Alexey Penskikh

Message:

Add categories

File:

• trunk/categories.php (modified) (18 diffs)

trunk/categories.php

@@ -16 +16 @@
 $bAjaxMode = isset($_SERVER['HTTP_X_REQUESTED_WITH']) and $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest' ? true : false;
 
-function showCategories($aParam = array(), $iBoxId = 1, $sAction = '', $isBox = false, $sTitle)
+function showCategories($aParam = array(), $iBoxId = 1, $sAction = '', $isBox = false, $bOrderPanel = false, $sTitle)
 {
     $oCateg = new BxTemplCategories();
@@ -24 +24 @@
     $aParam['type'] = isset($_REQUEST['tags_mode']) ? $_REQUEST['tags_mode'] : $oCateg->getFirstObject();
     
-    $sCode = $oCateg->display($aParam, $iBoxId, $sAction);
+    $sCode = $oCateg->display($aParam, $iBoxId, $sAction, $bOrderPanel, getParam('categ_show_columns'));
     
     if ($isBox)
@@ -38 +38 @@
             $oCateg->getCategTopMenu($aParam, $sAction),
             array(),
-            ($sDate ? _t('_tags_by_day') . $sDate : '')
+            ($sDate ? _t('_categ_by_day') . $sDate : '')
         );
 }
@@ -74 +74 @@
         return $oDb->getAll("SELECT *, DAYOFMONTH(`Date`) AS `Day`
             FROM `sys_categories`
-            WHERE `Date` >= TIMESTAMP('{$this->iYear}-{$this->iMonth}-1') AND `Date` < TIMESTAMP('{$this->iNextYear}-{$this->iNextMonth}-1')");
+            WHERE `Date` >= TIMESTAMP('{$this->iYear}-{$this->iMonth}-1') 
+            AND `Date` < TIMESTAMP('{$this->iNextYear}-{$this->iNextMonth}-1') 
+            AND `Owner` <> 0");
     }
     
@@ -89 +91 @@
     function getEntriesNames () 
     {
-        return array(_t('_cat_single'), _t('_cat_plural'));
+        return array(_t('_categ_single'), _t('_categ_plural'));
     }
     
@@ -155 +157 @@
     function CategoriesCalendarPage() 
     {
-        $this->sPage = 'cat_calendar';
+        $this->sPage = 'categ_calendar';
         parent::BxDolPageView($this->sPage);
     }
@@ -173 +175 @@
         {
             $aParam = array(
-                'pagination' => getParam('cat_perpage_browse'),
+                'pagination' => getParam('categ_perpage_browse'),
                 'date' => array(
                     'year' => $_REQUEST['year'],
@@ -181 +183 @@
             );
             
-            return showCategories($aParam, $iBlockId, BX_CATEG_ACTION_CALENDAR, false, _t('_cat_caption_calendar'));
+            return showCategories($aParam, $iBlockId, BX_CATEG_ACTION_CALENDAR, false, false, _t('_categ_caption_calendar'));
         }
         else
@@ -196 +198 @@
     function CategoriesSearchPage() 
     {
-        $this->sPage = 'cat_search';
+        $this->sPage = 'categ_search';
         parent::BxDolPageView($this->sPage);
         
@@ -202 +204 @@
         $this->aSearchForm = array(
             'form_attrs' => array(
-                'name'     => 'form_search_tags',
+                'name'     => 'form_search_categories',
                 'action'   => '',
                 'method'   => 'post',
@@ -217 +219 @@
                     'type' => 'text',
                     'name' => 'Keyword',
-                    'caption' => _t('_tags_caption_keyword'),
+                    'caption' => _t('_categ_caption_keyword'),
                     'required' => true,
                     'checker' => array (
                         'func' => 'length',
                         'params' => array(1, 100),
-                        'error' => _t ('_tags_err_keyword'),
+                        'error' => _t ('_categ_err_keyword'),
                     ),
                     'db' => array (
@@ -249 +251 @@
     {
         $aParam = array(
-            'pagination' => getParam('cat_perpage_browse')
+            'pagination' => getParam('categ_perpage_browse')
         );
         
@@ -258 +260 @@
         
         if (isset($aParam['filter']))
-            return showCategories($aParam, $iBlockId, BX_CATEG_ACTION_SEARCH, false, _t('_cat_caption_founded_tags'));
+            return showCategories($aParam, $iBlockId, BX_CATEG_ACTION_SEARCH, false, false, _t('_categ_caption_founded_categ'));
         else
             return MsgBox(_t('_Empty'));
@@ -267 +269 @@
 {
     $aParam = array(
-        'pagination' => getParam('cat_perpage_browse')
+        'pagination' => getParam('categ_perpage_browse')
     );
     
-    if (isset($_REQUEST['orderby']) && $_REQUEST['orderby'])
-        $aParam['orderby'] = $_REQUEST['orderby'];
-    
-    return showCategories($aParam, 1, BX_CATEG_ACTION_ALL, true, _t('_cat_caption_all'));
+    return showCategories($aParam, 1, BX_CATEG_ACTION_ALL, true, true, _t('_categ_caption_all'));
 }
 
@@ -279 +278 @@
 {
     $aParam = array(
-        'pagination' => getParam('cat_perpage_browse'),
+        'pagination' => getParam('categ_perpage_browse'),
         'admin' => true,
     );
     
-    return showCategories($aParam, 1, BX_CATEG_ACTION_ADMIN, true, _t('_cat_caption_admin'));
+    return showCategories($aParam, 1, BX_CATEG_ACTION_ADMIN, true, false, _t('_categ_caption_admin'));
 }
 
@@ -289 +288 @@
 {
     $aParam = array(
-        'pagination' => getParam('cat_perpage_browse'),
+        'pagination' => getParam('categ_perpage_browse'),
         'admin' => false
     );
     
-    return showCategories($aParam, 1, BX_CATEG_ACTION_USERS, true, _t('_cat_caption_users'));
+    return showCategories($aParam, 1, BX_CATEG_ACTION_USERS, true, false, _t('_categ_caption_users'));
 }
 
@@ -310 +309 @@
 }
 
-$sContent = DesignBoxContent(_t('_Categories'), MsgBox('Under development'), 1);
-
-/*
 switch ($_REQUEST['action'])
 {
@@ -334 +330 @@
         $sContent = getPage_All();
 }
-*/
+
 if (!$bAjaxMode)
 {