Changeset 788

Timestamp:

05/31/07 10:33:31 (2 years ago)

Author:

swiss

Message:

Added the code supplied by Didier to allow browsing websites via the hardware player. Addresses are stored in the filesystem as Windows/IE shortcuts (.url files).

Files:

• trunk/swisscenter/base/settings.php (modified) (1 diff)
• trunk/swisscenter/config/config_connect.php (modified) (2 diffs)
• trunk/swisscenter/database/update_119.sql (added)
• trunk/swisscenter/index.php (modified) (1 diff)
• trunk/swisscenter/media_search.php (modified) (4 diffs)
• trunk/swisscenter/web_urls.php (added)

trunk/swisscenter/base/settings.php

@@ -23 +23 @@
-  define('MEDIA_TYPE_VIDEO',3);
-  define('MEDIA_TYPE_RADIO',4);
+  define('MEDIA_TYPE_WEB',5);
-  
-  define('THUMBNAIL_X_SIZE',130);

trunk/swisscenter/config/config_connect.php

@@ -38 +38 @@
-    form_label(str('INTERNET_RADIO_PROMPT'));
-
+    form_radio_static('web',str('BROWSE_WEB'),$option_vals,get_sys_pref('web_enabled','YES'),false,true);
+    form_label(str('BROWSE_WEB_PROMPT'));
+    
-    form_radio_static('weather',str('WEATHER_FORECAST'),$option_vals,get_sys_pref('weather_enabled','YES'),false,true);
-    form_label(str('WEATHER_FORECAST_PROMPT', '<a href="http://www.weather.com">'.str('WEATHER_CHANNEL').'</a>'));
@@ -71 +74 @@
-  {
-    set_sys_pref('radio_enabled',$_REQUEST["radio"]);
+    set_sys_pref('web_enabled',$_REQUEST["web"]);
-    set_sys_pref('weather_enabled',$_REQUEST["weather"]);
-    set_sys_pref('wikipedia_lookups',$_REQUEST["wiki"]);

trunk/swisscenter/index.php

@@ -26 +26 @@
-
-  $menu->add_item( str('VIEW_PHOTO'),'photo.php',true);
+  
+  if (internet_available() && get_sys_pref('web_enabled','YES') == 'YES')
+        $menu->add_item(str('BROWSE_WEB'),'web_urls.php',true);
-
-  if (internet_available() && get_sys_pref('weather_enabled','YES') == 'YES')

trunk/swisscenter/media_search.php

@@ -44 +44 @@
-      if ($media_type == MEDIA_TYPE_MUSIC)
-        musicip_server_add_dir($location["NAME"]);    
-  
-
+
+
-  }
-
@@ -53 +53 @@
-
-  media_indicator('BLINK');
-
+
-  // If there are parameters for the media search then read them and then remove them.
-  $media_type = get_sys_pref('MEDIA_SCAN_MEDIA_TYPE');
@@ -63 +63 @@
-  // Set the percent_scanned to zero for all locations due to be scanned.
-  db_sqlcommand("update media_locations set percent_scanned=0 
-media_type != ".MEDIA_TYPE_RADIO
+(media_type not in (".MEDIA_TYPE_RADIO.",".MEDIA_TYPE_WEB."))"
-                  (empty($cat_id) ? '' : " and cat_id = $cat_id").
-                  (empty($media_type) ? '' : " and media_type = $media_type")
@@ -79 +79 @@
-  eliminate_duplicates();
-  media_indicator('OFF');
-
+
-  // Update media search status
-  set_sys_pref('MEDIA_SCAN_STATUS',str('MEDIA_SCAN_STATUS_COMPLETE'));