This should be the end of the hash marks problem on the Library search/browse pages - I restored the HUBBROWSE object to load for every page load, it slows things down but should make it stable again. Bug #2037. Also added some code docs to uiBase.

campcaster/src/modules/htmlUI/var/html/ui_browser.php

@@ -227,17 +227,19 @@ if (isset($_REQUEST['popup']) && is_array($_REQUEST['popup'])){
 	            break;
 
             case 'HUBBROWSE.getResults':
-       	        $HUBBROWSE = new uiHubBrowse($uiBrowser);
+       	        //$HUBBROWSE = new uiHubBrowse($uiBrowser);
 
 	            if (isset($_REQUEST['trtokid'])) {
 	                $Smarty->assign('trtokid', $_REQUEST['trtokid']);
-	                if ($HUBBROWSE->getSearchResults($_REQUEST['trtokid'])) {
+	                //if ($HUBBROWSE->getSearchResults($_REQUEST['trtokid'])) {
+	                if ($uiBrowser->HUBBROWSE->getSearchResults($_REQUEST['trtokid'])) {
 	                    $Smarty->assign('results', true);
 	                } else {
 	                    $Smarty->assign('results', false);
 	                }
 	            } else {
-	                $Smarty->assign('trtokid', $HUBBROWSE->searchDB());
+	                //$Smarty->assign('trtokid', $HUBBROWSE->searchDB());
+	                $Smarty->assign('trtokid', $uiBrowser->HUBBROWSE->searchDB());
 	                $Smarty->assign('results', false);
 	            }
 	            $Smarty->assign('polling_frequency', UI_HUB_POLLING_FREQUENCY);
@@ -335,8 +337,9 @@ if ($uiBrowser->userid) {
 	        break;
 
         case "HUBBROWSE":
-       	    $HUBBROWSE = new uiHubBrowse($uiBrowser);
+       	    //$HUBBROWSE = new uiHubBrowse($uiBrowser);
-	        $Smarty->assign('hubBrowseForm', $HUBBROWSE->browseForm($uiBrowser->id, $ui_fmask));
+	        //$Smarty->assign('hubBrowseForm', $HUBBROWSE->browseForm($uiBrowser->id, $ui_fmask));
+	        $Smarty->assign('hubBrowseForm', $uiBrowser->HUBBROWSE->browseForm($uiBrowser->id, $ui_fmask));
 	        $Smarty->assign('showLibrary', TRUE);
 	        $Smarty->assign('isHub', TRUE);
 	        break;

campcaster/src/modules/htmlUI/var/html/ui_handler.php

@@ -1,10 +1,6 @@
 <?php
 require(dirname(__FILE__).'/../ui_handler_init.php');
 
-if (strstr($_REQUEST['act'], "HUBBROWSE")) {
-	$HUBBROWSE = new uiHubBrowse($uiHandler);
-
-}
 switch ($_REQUEST['act']) {
     case "login":
 	    if ($uiHandler->login($_REQUEST, $ui_fmask["login"]) === TRUE) {
@@ -173,31 +169,31 @@ switch ($_REQUEST['act']) {
 	    break;
 
     case "HUBBROWSE.setCategory":
-	    $HUBBROWSE->setCategory($_REQUEST);
+	    $uiHandler->HUBBROWSE->setCategory($_REQUEST);
 	    break;
 
     case "HUBBROWSE.setValue":
-	    $HUBBROWSE->setValue($_REQUEST);
+	    $uiHandler->HUBBROWSE->setValue($_REQUEST);
 	    break;
 
     case "HUBBROWSE.reorder":
-	    $HUBBROWSE->reorder($_REQUEST['by']);
+	    $uiHandler->HUBBROWSE->reorder($_REQUEST['by']);
 	    break;
 
     case "HUBBROWSE.setDefaults":
-	    $HUBBROWSE->setDefaults(TRUE);
+	    $uiHandler->HUBBROWSE->setDefaults(TRUE);
 	    break;
 
     case "HUBBROWSE.setOffset":
-	    $HUBBROWSE->setOffset($_REQUEST['page']);
+	    $uiHandler->HUBBROWSE->setOffset($_REQUEST['page']);
 	    break;
 
     case "HUBBROWSE.setLimit":
-	    $HUBBROWSE->setLimit($_REQUEST['limit']);
+	    $uiHandler->HUBBROWSE->setLimit($_REQUEST['limit']);
 	    break;
 
     case "HUBBROWSE.setFiletype":
-	    $HUBBROWSE->setFiletype($_REQUEST['filetype']);
+	    $uiHandler->HUBBROWSE->setFiletype($_REQUEST['filetype']);
 	    break;
 
     case "HUBSEARCH.newSearch":
@@ -386,10 +382,14 @@ switch ($_REQUEST['act']) {
 	    break;
 
     case 'SCHEDULER.scheduleExportOpen':
-	    $_REQUEST['fromDay'] = strlen($_REQUEST['fromDay'])>1?$_REQUEST['fromDay']:'0'.$_REQUEST['fromDay'];
+        // Make sure days are always 2 digits.
-	    $_REQUEST['toDay'] = strlen($_REQUEST['toDay'])>1?$_REQUEST['toDay']:'0'.$_REQUEST['toDay'];
+	    $_REQUEST['fromDay'] = (strlen($_REQUEST['fromDay'])>1)?$_REQUEST['fromDay']:'0'.$_REQUEST['fromDay'];
-	    $fromTime=$_REQUEST['fromYear'].'-'.$_REQUEST['fromMonth'].'-'.$_REQUEST['fromDay'].' '.$_REQUEST['fromHour'].':'.$_REQUEST['fromMinute'].':00';
+	    $_REQUEST['toDay'] = (strlen($_REQUEST['toDay'])>1)?$_REQUEST['toDay']:'0'.$_REQUEST['toDay'];
-	    $toTime=$_REQUEST['toYear'].'-'.$_REQUEST['toMonth'].'-'.$_REQUEST['toDay'].' '.$_REQUEST['toHour'].':'.$_REQUEST['toMinute'].':00';
+
+	    $fromTime = $_REQUEST['fromYear'].'-'.$_REQUEST['fromMonth'].'-'.$_REQUEST['fromDay'].' '
+	               .$_REQUEST['fromHour'].':'.$_REQUEST['fromMinute'].':00';
+	    $toTime = $_REQUEST['toYear'].'-'.$_REQUEST['toMonth'].'-'.$_REQUEST['toDay'].' '
+	              .$_REQUEST['toHour'].':'.$_REQUEST['toMinute'].':00';
 	    //echo '<XMP style="background:yellow;">';echo "fromTime:$fromTime | toTime:$toTime";echo'</XMP>'."\n";
 	    $uiHandler->SCHEDULER->scheduleExportOpen($fromTime, $toTime);
 	    $uiHandler->redirUrl = UI_BROWSER.'?act=SCHEDULER';

campcaster/src/modules/htmlUI/var/ui_base.inc.php

@@ -115,25 +115,91 @@ function _getNumArr($start, $end, $step=1)
  */
 class uiBase
 {
-    public $gb; // GreenBox
+    /**
+     * @var GreenBox
+     */
+    public $gb;
+
     public $STATIONPREFS;
+
+    /**
+     * @var uiScratchPad
+     */
     public $SCRATCHPAD;
+
+    /**
+     * @var uiSearch
+     */
     public $SEARCH;
+
+    /**
+     * @var uiBrowse
+     */
     public $BROWSE;
-    // Note: loading HUBBROWSE on every page load slows things down
+
-    // a lot.  we only load it on demand.
+    /**
-    //public $HUBBROWSE;
+     * @todo loading HUBBROWSE on every page load slows things down
+     * a lot.  We should only load it on demand.
+     *
+     * @var uiHubBrowse
+     */
+    public $HUBBROWSE;
+
+    /**
+     * @var uiHubSearch
+     */
     public $HUBSEARCH;
+
+    /**
+     * @var uiPlaylist
+     */
     public $PLAYLIST;
+
+    /**
+     * @var uiScheduler
+     */
     public $SCHEDULER;
+
+    /**
+     * @var uiSubjects
+     */
     public $SUBJECTS;
+
+    /**
+     * @var uiExchange
+     */
     public $EXCHANGE;
+
+    /**
+     * @var uiTransfers
+     */
     public $TRANSFERS;
+
+    /**
+     * @var string
+     */
     public $redirUrl;
+
+    /**
+     * @var DB
+     */
     public $dbc;
+
+    /**
+     * @var array
+     */
     public $config;
+
+    /**
+     * @var string
+     */
     public $sessid;
+
+    /**
+     * @var int
+     */
     public $userid;
+
     public $login;
     public $id;
     public $langid;
@@ -141,11 +207,16 @@ class uiBase
     public $type;
     public $fid;
     public $homeid;
+
+    /**
+     * @var string
+     */
     public $alertMsg;
 
+
     /**
      * @param array $config
-     * 		configurartion data
+     * 		configuration data
      */
     public function __construct(&$config)
     {
@@ -188,7 +259,7 @@ class uiBase
         $this->SCRATCHPAD = new uiScratchPad($this);
         $this->SEARCH = new uiSearch($this);
         $this->BROWSE = new uiBrowse($this);
-        //$this->HUBBROWSE = new uiHubBrowse($this);
+        $this->HUBBROWSE = new uiHubBrowse($this);
         $this->HUBSEARCH = new uiHubSearch($this);
         $this->PLAYLIST = new uiPlaylist($this);
         $this->SCHEDULER = new uiScheduler($this);

campcaster/src/modules/htmlUI/var/ui_smartyExtensions.inc.php

@@ -1,7 +1,7 @@
 <?php
 $Smarty->register_object('UIBROWSER', $uiBrowser);
 $Smarty->register_object('BROWSE', $uiBrowser->BROWSE);
-$Smarty->register_object('HUBBROWSE', $HUBBROWSE);
+$Smarty->register_object('HUBBROWSE', $uiBrowser->HUBBROWSE);
 $Smarty->register_object('SEARCH', $uiBrowser->SEARCH);
 $Smarty->register_object('HUBSEARCH', $uiBrowser->HUBSEARCH);
 $Smarty->register_object('TRANSFERS', $uiBrowser->TRANSFERS);