Changeset 15211 for trunk/categories.php

Timestamp:

06/07/11 23:41:51 (12 months ago)

Author:

Alexander Trofimov

Message:

Code cleaning:

• converting new lines to \n
• deleting spaces at the end of every line
• converting all tabs to 4 spaces
• automated script for future cleaning was added

File:

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

trunk/categories.php

@@ -41 +41 @@
 {
     $oCateg = new BxTemplCategories();
-        
+
     $oCateg->getTagObjectConfig($aParam);
-    
+
     if (empty($oCateg->aTagObjects))
     {
@@ -51 +51 @@
             return MsgBox(_t('_Empty'));
     }
-        
+
     $aParam['type'] = isset($_GET['tags_mode']) && isset($oCateg->aTagObjects[$_GET['tags_mode']]) ? $_GET['tags_mode'] : $oCateg->getFirstObject();
-    
+
     $sCode = $oCateg->display($aParam, $iBoxId, $sAction, $bOrderPanel, getParam('categ_show_columns'));
-    
+
     if ($isBox)
     {
@@ -73 +73 @@
 
 
-class CategoriesCalendar extends BxTemplCalendar 
-{
-    function CategoriesCalendar($iYear, $iMonth) 
+class CategoriesCalendar extends BxTemplCalendar
+{
+    function CategoriesCalendar($iYear, $iMonth)
     {
         parent::BxTemplCalendar($iYear, $iMonth);
     }
-    
+
     function display() {
         $aVars = array (
@@ -96 +96 @@
         $GLOBALS['oSysTemplate']->addCss('calendar.css');
         return $sHtml;
-    }    
-    
-    function getData() 
+    }
+
+    function getData()
     {
         $oDb = new BxDolDb();
-        
+
         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 AND `Status` = 'active'");
     }
-    
-    function getBaseUri() 
+
+    function getBaseUri()
     {
         return BX_DOL_URL_ROOT . 'categories.php?action=calendar';
     }
-    
-    function getBrowseUri() 
+
+    function getBrowseUri()
     {
         return BX_DOL_URL_ROOT . 'categories.php?action=calendar';
     }
-    
-    function getEntriesNames () 
+
+    function getEntriesNames ()
     {
         return array(_t('_categ_single'), _t('_categ_plural'));
     }
-    
-    function _getCalendar () 
+
+    function _getCalendar ()
     {
         $sBrowseUri = $this->getBrowseUri();
@@ -131 +131 @@
         $this->_getCalendarGrid($aCalendarGrid);
         $aRet = array ();
-        for ($i = 0; $i < 6; $i++) {            
+        for ($i = 0; $i < 6; $i++) {
 
             $aRow = array ('bx_repeat:cell');
@@ -156 +156 @@
                         'href' => $sBrowseUri . '&year=' . $this->iYear . '&month=' . $this->iMonth . '&day=' . $aCell['day'],
                         'entries' => 1 == $aCalendarGrid[$i][$j]['num'] ? $sEntriesSingle : $sEntriesMul,
-                    ));                    
+                    ));
                     $isRowEmpty = false;
                 } else {
@@ -166 +166 @@
                         'entries' => '',
                     ));
-                }       
+                }
 
                 if ($aCell)
@@ -178 +178 @@
         return $aRet;
     }
-    
-}
-
-class CategoriesCalendarPage extends BxDolPageView 
-{  
+
+}
+
+class CategoriesCalendarPage extends BxDolPageView
+{
     var $sPage;
-      
-    function CategoriesCalendarPage() 
+
+    function CategoriesCalendarPage()
     {
         $this->sPage = 'categ_calendar';
         parent::BxDolPageView($this->sPage);
     }
-    
+
     function getBlockCode_Calendar($iBlockId)
     {
@@ -196 +196 @@
         $sMonth = isset($_GET['month']) ? (int)$_GET['month'] : '';
         $oCalendar = new CategoriesCalendar($sYear, $sMonth);
-        
+
         return $oCalendar->display();
     }
-    
+
     function getBlockCode_CategoriesDate($iBlockId)
     {
@@ -212 +212 @@
                 )
             );
-            
+
             return showCategories($aParam, $iBlockId, BX_CATEG_ACTION_CALENDAR, false, false, _t('_categ_caption_calendar'));
         }
@@ -221 +221 @@
 
 class CategoriesSearchPage extends BxDolPageView {
-        
+
     var $aSearchForm;
     var $oForm;
     var $sPage;
-    
-    function CategoriesSearchPage() 
+
+    function CategoriesSearchPage()
     {
         $this->sPage = 'categ_search';
         parent::BxDolPageView($this->sPage);
-        
+
         bx_import('BxTemplFormView');
         $this->aSearchForm = array(
@@ -237 +237 @@
                 'action'   => '',
                 'method'   => 'post',
-            ),      
-    
+            ),
+
             'params' => array (
                 'db' => array(
@@ -244 +244 @@
                 ),
             ),
-                  
+
             'inputs' => array(
                 'Keyword' => array(
@@ -257 +257 @@
                     ),
                     'db' => array (
-                        'pass' => 'Xss', 
+                        'pass' => 'Xss',
                     ),
-                ),                
+                ),
                 'Submit' => array (
                     'type' => 'submit',
@@ -266 +266 @@
                     'colspan' => true,
                 ),
-            ),            
+            ),
         );
-        
+
         $this->oForm = new BxTemplFormView($this->aSearchForm);
         $this->oForm->initChecker();
     }
-    
+
     function getBlockCode_Form()
     {
         return $GLOBALS['oSysTemplate']->parseHtmlByName('search_tags_box.html', array('form' => $this->oForm->getCode()));
     }
-    
+
     function getBlockCode_Founded($iBlockId)
     {
@@ -288 +288 @@
         else if ($this->oForm->isSubmittedAndValid())
             $aParam['filter'] = $this->oForm->getCleanValue('Keyword');
-        
+
         if (isset($aParam['filter']))
             return showCategories($aParam, $iBlockId, BX_CATEG_ACTION_SEARCH, false, false, _t('_categ_caption_founded_categ'));
@@ -301 +301 @@
         'pagination' => getParam('categ_perpage_browse')
     );
-    
+
     return showCategories($aParam, 1, BX_CATEG_ACTION_ALL, true, true, _t('_categ_caption_all'));
 }
@@ -311 +311 @@
         'common' => true,
     );
-    
+
     return showCategories($aParam, 1, BX_CATEG_ACTION_COMMON, true, false, _t('_categ_caption_common'));
 }
@@ -321 +321 @@
         'common' => false
     );
-    
+
     return showCategories($aParam, 1, BX_CATEG_ACTION_USERS, true, false, _t('_categ_caption_users'));
 }
@@ -328 +328 @@
 {
     $oCalendarPage = new CategoriesCalendarPage();
-    
+
     return $oCalendarPage->getCode();
 }
@@ -335 +335 @@
 {
     $oSearchPage = new CategoriesSearchPage();
-    
+
     return $oSearchPage->getCode();
 }
@@ -345 +345 @@
         $sContent = getPage_Common();
         break;
-        
+
     case BX_CATEG_ACTION_USERS:
         $sContent = getPage_Users();
         break;
-        
+
     case BX_CATEG_ACTION_CALENDAR:
         $sContent = getPage_Calendar();
         break;
-        
+
     case BX_CATEG_ACTION_SEARCH:
         $sContent = getPage_Search();
         break;
-        
+
     default:
         $sContent = getPage_All();
@@ -367 +367 @@
     global $_page_cont;
     $iIndex = 25;
-    
+
     $_page['name_index']    = $iIndex;
     $_page['css_name']      = 'tags.css';
-    
+
     $_page['header'] = _t('_Categories');
     $_page['header_text'] = _t('_Categories');
     $_page_cont[$iIndex]['page_main_code'] = $sContent;
-    
+
     check_logged();
     PageCode();
 }
-else 
+else
     echo $sContent;