diff options
| -rw-r--r-- | lib/class/catalog.class.php | 17 | ||||
| -rw-r--r-- | server/ajax.server.php | 2 | ||||
| -rw-r--r-- | templates/sidebar.inc.php | 4 | ||||
| -rw-r--r-- | templates/sidebar_localplay.inc.php | 1 | ||||
| -rw-r--r-- | templates/sidebar_search.inc.php | 12 |
5 files changed, 13 insertions, 23 deletions
diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php index af99fcb9..fc77db8f 100644 --- a/lib/class/catalog.class.php +++ b/lib/class/catalog.class.php @@ -417,10 +417,11 @@ class Catalog { $this->count++; if ( !($this->count%10)) { $file = str_replace(array('(',')','\''),'',$full_file); - echo "<script type=\"text/javascript\"><!--"; + echo "<script type=\"text/javascript\">"; echo "update_txt('" . $this->count ."','add_count_" . $this->id . "');"; echo "update_txt('" . htmlentities($file) . "','add_dir_" . $this->id . "');"; - echo "--></script>\n"; + echo "</script>\n"; + flush(); } // update our current state } // not found @@ -532,10 +533,10 @@ class Catalog { /* Stupid little cutesie thing */ $search_count++; if ( !($search_count%5)) { - echo "<script type=\"text/javascript\"><!--"; + echo "<script type=\"text/javascript\">"; echo "update_txt('" . $search_count ."','count_art_" . $this->id . "');"; echo "update_txt('" . $album->name . "','read_art_" . $this->id . "');"; - echo "--></script>\n"; + echo "</script>\n"; flush(); } //echos song count @@ -839,9 +840,9 @@ class Catalog { /* Get the songs and then insert them into the db */ $this->add_files($this->path,$type,$parse_m3u); - echo "<script type=\"text/javascript\"><!--"; + echo "<script type=\"text/javascript\">"; echo "update_txt('" . $this->count . "','count_add_" . $this->id ."');"; - echo "--></script>\n"; + echo "</script>\n"; flush(); @@ -1258,10 +1259,10 @@ class Catalog { $count++; if (!($count%10)) { $file = str_replace(array('(',')','\''),'',$results['file']); - echo "<script type=\"text/javascript\"><!--"; + echo "<script type=\"text/javascript\">"; echo "update_txt('" . $count ."','clean_count_" . $this->id . "');"; echo "update_txt('" . htmlentities($file) . "','clean_dir_" . $this->id . "');"; - echo "--></script>\n"; + echo "</script>\n"; flush(); } //echos song count diff --git a/server/ajax.server.php b/server/ajax.server.php index 640097c2..16fc6bd2 100644 --- a/server/ajax.server.php +++ b/server/ajax.server.php @@ -318,7 +318,7 @@ switch ($action) { switch ($_REQUEST['button']) { case 'home': case 'browse': - case 'search': + case 'localplay': case 'player': case 'preferences': $button = $_REQUEST['button']; diff --git a/templates/sidebar.inc.php b/templates/sidebar.inc.php index 191458f7..73797e15 100644 --- a/templates/sidebar.inc.php +++ b/templates/sidebar.inc.php @@ -33,8 +33,8 @@ $ajax_url = Config::get('ajax_url'); <li <?php echo $sidebar_browse; ?>> <?php echo Ajax::button("?action=sidebar&button=browse",'browse',_('Browse'),'sidebar_browse'); ?> </li> -<li <?php echo $sidebar_search; ?>> - <?php echo Ajax::button("?action=sidebar&button=search",'view',_('Search'),'sidebar_search'); ?> +<li <?php echo $sidebar_localplay; ?>> + <?php echo Ajax::button("?action=sidebar&button=localplay",'volumeup',_('Localplay'),'sidebar_localplay'); ?> </li> <li <?php echo $sidebar_preferences; ?>> <?php echo Ajax::button("?action=sidebar&button=preferences",'edit',_('Preferences'),'sidebar_prefs'); ?> diff --git a/templates/sidebar_localplay.inc.php b/templates/sidebar_localplay.inc.php new file mode 100644 index 00000000..954454e4 --- /dev/null +++ b/templates/sidebar_localplay.inc.php @@ -0,0 +1 @@ +<h4><?php echo _('Localplay'); ?></h4> diff --git a/templates/sidebar_search.inc.php b/templates/sidebar_search.inc.php deleted file mode 100644 index 45db9548..00000000 --- a/templates/sidebar_search.inc.php +++ /dev/null @@ -1,12 +0,0 @@ -<h4><?php echo _('Search'); ?></h4> -<!-- -<form method="post" action="#" id="search_side" name="search_side"> -<input type="textbox" name="string" value="" size="8" /> -<hr /> -<h4><?php echo _('Fields'); ?></h4> -<input type="checkbox" name="all" value="1" /> <?php echo _('Titles'); ?><br /> -<input type="checkbox" name="year" value="1" /> <?php echo _('Year'); ?><br /> -</form> ---> -DISABLED -<hr /> |