Changeset 1095

Timestamp:

10/06/08 01:30:52 (9 months ago)

Author:

Pernod

Message:

Removed the Video submenu. Also merged the 'DVD Video' and 'Video' media types.

If multiple videos are selected via Quick Play or Add to Playlist then DVD images will NOT be included as they cannot be played from a playlist.

Files:

• trunk/swisscenter/base/browse.php (modified) (3 diffs)
• trunk/swisscenter/base/capabilities.php (modified) (2 diffs)
• trunk/swisscenter/base/categories.php (modified) (1 diff)
• trunk/swisscenter/base/media.php (modified) (5 diffs)
• trunk/swisscenter/base/page.php (modified) (2 diffs)
• trunk/swisscenter/base/playlist.php (modified) (1 diff)
• trunk/swisscenter/base/search.php (modified) (2 diffs)
• trunk/swisscenter/base/settings.php (modified) (1 diff)
• trunk/swisscenter/config/config_dirs.php (modified) (3 diffs)
• trunk/swisscenter/config/config_movie.php (modified) (7 diffs)
• trunk/swisscenter/database/patch_0026.sql (added)
• trunk/swisscenter/gen_playlist.php (modified) (1 diff)
• trunk/swisscenter/images/style.ini (modified) (2 diffs)
• trunk/swisscenter/index.php (modified) (3 diffs)
• trunk/swisscenter/lang/en/en.xml (modified) (2 diffs)
• trunk/swisscenter/media_dir_refresh.php (modified) (1 diff)
• trunk/swisscenter/media_search.php (modified) (2 diffs)
• trunk/swisscenter/video.php (modified) (5 diffs)
• trunk/swisscenter/video_delete.php (modified) (1 diff)
• trunk/swisscenter/video_dvd.php (deleted)
• trunk/swisscenter/video_dvd_browse.php (deleted)
• trunk/swisscenter/video_dvd_search.php (deleted)
• trunk/swisscenter/video_dvd_selected.php (deleted)
• trunk/swisscenter/video_selected.php (modified) (5 diffs)

trunk/swisscenter/base/browse.php

@@ -173 +173 @@
-        $width = style_value("MENU_WEB_WIDTH");
-        $align = style_value("MENU_WEB_ALIGN");
-        break;
-      case MEDIA_TYPE_DVD   :
-        $width = style_value("MENU_DVD_WIDTH");
-        $align = style_value("MENU_DVD_ALIGN");
-        break;
-      default               :
@@ -297 +293 @@
-        $align = style_value("MENU_WEB_ALIGN");
-        break;
-      case MEDIA_TYPE_DVD   :
-        $width = style_value("MENU_DVD_WIDTH");
-        $align = style_value("MENU_DVD_ALIGN");
-        break;
-      default               :
-        $width = 650;
@@ -413 +405 @@
-      
-    // Should we present a link to select all files?
-, MEDIA_TYPE_DVD
+
-      $buttons[] = array('text'=>str('SELECT_ALL'), 'url'=>  output_link( '%/'.$dir) );
-      

trunk/swisscenter/base/capabilities.php

@@ -107 +107 @@
-{
-  // IP addresses of all connected NMT's
-
+
+
-  $shares = array();
-  foreach ( $nmt as $ip )
@@ -251 +252 @@
-    case MEDIA_TYPE_MUSIC : return media_exts_music();  break;
-    case MEDIA_TYPE_PHOTO : return media_exts_photos(); break;
-media_exts_movies(
+array_merge(media_exts_movies(), media_exts_dvd()
-    case MEDIA_TYPE_WEB   : return media_exts_web();    break;
-    case MEDIA_TYPE_TV    : return media_exts_movies(); break;
-    case MEDIA_TYPE_DVD   : return media_exts_dvd();    break;
-  }
-

trunk/swisscenter/base/categories.php

@@ -95 +95 @@
-        $width = style_value("MENU_WEB_WIDTH");
-        $align = style_value("MENU_WEB_ALIGN");
-        break;
-      case MEDIA_TYPE_DVD   :
-        $width = style_value("MENU_VIDEO_WIDTH");
-        $align = style_value("MENU_VIDEO_ALIGN");
-        break;
-      default               :

trunk/swisscenter/base/media.php

@@ -71 +71 @@
-                 ' using viewings left outer join movies '.
-                 '    on viewings.media_id = movies.file_id '.
-in ('.MEDIA_TYPE_VIDEO.','.MEDIA_TYPE_DVD.')
+= '.MEDIA_TYPE_VIDEO.'
-                 
-  @db_sqlcommand('delete from viewings '.
@@ -773 +773 @@
- */
-
-
+ 
-{
-  send_to_log(4,'Found Video    : '.$file);
@@ -1132 +1132 @@
- */
-
-
+share, $
-{
-  // Standard files to ignore (lowercase only - case insensitive match).
@@ -1156 +1156 @@
-
-          if ($recurse)
-
+share, $
-        }
-      }
@@ -1166 +1166 @@
-          {
-            case 'mp3s'   : process_mp3   ( $dir, $id, $file);  break;
-
+
+
+
+
+
-            case 'photos' : process_photo ( $dir, $id, $file);  break;
-            case 'tv'     : process_tv    ( $dir, $id, $file);  break;

trunk/swisscenter/base/page.php

@@ -106 +106 @@
-      case MEDIA_TYPE_TV    : if (style_img_exists("PAGE_TV"))    $page_background = style_img("PAGE_TV"); break;
-      case MEDIA_TYPE_WEB   : if (style_img_exists("PAGE_WEB"))   $page_background = style_img("PAGE_WEB"); break;
-      case MEDIA_TYPE_DVD   : if (style_img_exists("PAGE_DVD"))   $page_background = style_img("PAGE_DVD"); break;
-    }
-  }
@@ -283 +282 @@
-         pc_nav_button(str('PC_LINK_CONFIG') , '/config/index.php').
-         pc_nav_button(str('PC_LINK_MUSIC')  , '/music.php').
-
+
+
-         pc_nav_button(str('PC_LINK_INTERNET'),'/index.php?submenu=internet').
-         pc_nav_button(str('PC_LINK_PHOTOS') , '/photo.php').

trunk/swisscenter/base/playlist.php

@@ -233 +233 @@
-         break;
-
-    case MEDIA_TYPE_DVD:
-         $data = db_toarray("select m.dirname, m.filename, ml.name, ml.network_share from movies m, media_locations ml where file_id=$file_id and m.location_id=ml.location_id");
-         // If DVD Video then pass folder name
-         if ( strtoupper($data[0]["FILENAME"]) == 'VIDEO_TS.IFO' )
-           $file = rtrim($data[0]["DIRNAME"],'/');
-         else
-           $file = $data[0]["DIRNAME"].$data[0]["FILENAME"];
-         $file = str_replace($data[0]["NAME"], "", $file);
-         // Can't use gen_playlist as the PCH does something different with zcd=2.
-         $link   = 'href="file:///opt/sybhttpd/localhost.drives/'.$data[0]["NETWORK_SHARE"].$file.'" zcd="2" ';
-         break;
-  }
-

trunk/swisscenter/base/search.php

@@ -183 +183 @@
-    $buttons[] = array('text'=>str('SEARCH_ANYWHERE'), 'url'=>url_add_param($this_url,'any','%') );
-    $buttons[] = array('text'=>str('SEARCH_CLEAR'), 'url'=>url_add_param($this_url,'search','') );
-
-
+
-  }
-  else
@@ -190 +189 @@
-    $buttons[] = array('text'=>str('SEARCH_START'), 'url'=>url_add_param($this_url,'any','') );
-    $buttons[] = array('text'=>str('SEARCH_CLEAR'), 'url'=>url_add_param($this_url,'search','') );
-
-
+
-  }
-

trunk/swisscenter/base/settings.php

@@ -25 +25 @@
-  define('MEDIA_TYPE_WEB',5);
-  define('MEDIA_TYPE_TV',6);
-  define('MEDIA_TYPE_DVD',7);
-  
-  define('THUMBNAIL_X_SIZE',130);

trunk/swisscenter/config/config_dirs.php

@@ -33 +33 @@
-        $share_list[$share_opts[$i]["name"]] = $share_opts[$i]["path"];
-      }
-".str('PLEASE_SELECT')."
+
-    }
-    else
-    {
-".str('PLEASE_SELECT')."
+
-    }
-    $share_opts = array_merge(array(array("path"=>'', "name"=>'')), $share_opts);
-
-    $data = db_toarray("select location_id,media_name 'Type', cat_name 'Category', cert.name 'Certificate', ml.name 'Directory', ".
-name WHEN 'DVD Video'
+id WHEN ".MEDIA_TYPE_VIDEO."
-                       "from media_locations ml, media_types mt, categories cat, certificates cert ".
-                       "where ml.unrated=cert.cert_id and mt.media_id = ml.media_type and ml.cat_id = cat.cat_id order by 2,3,4");
@@ -155 +155 @@
-      elseif (empty($dir))
-        dirs_display('',"!".str('MEDIA_LOC_ERROR_LOC'));
-      elseif (empty($share) && $type_id==MEDIA_TYPE_DVD)
-        dirs_display('',"!".str('MEDIA_LOC_ERROR_SHARE'));
-      elseif (!file_exists($dir))
-      {
@@ -250 +248 @@
-    elseif (empty($_REQUEST["location"]))
-      dirs_display('',"!".str('MEDIA_LOC_ERROR_LOC'));
-    elseif (empty($share) && $_REQUEST["type"]==MEDIA_TYPE_DVD)
-      dirs_display('',"!".str('MEDIA_LOC_ERROR_SHARE'));
-    elseif (!file_exists($dir))
-    {

trunk/swisscenter/config/config_movie.php

@@ -166 +166 @@
-  foreach ($movie_list as $movie)
-  {
-    $media_type = db_value("select media_type from media_locations ml, movies m where ml.location_id=m.location_id and m.file_id=".$movie["FILE_ID"]);
-    $actors    = db_col_to_list("select actor_name from actors a,actors_in_movie aim where a.actor_id=aim.actor_id ".
-                                "and movie_id=$movie[FILE_ID] order by 1");
@@ -182 +181 @@
-             Year : '.nvl($movie["YEAR"]).'<br>
-             Viewed by : '.implode(', ',db_col_to_list("select u.name from users u, viewings v where ".
-$media_type
+".MEDIA_TYPE_VIDEO."
-           </td>
-           <td valign="top" width="21%">'.nvl(implode("<br>",$actors)).'</td>
@@ -270 +269 @@
-  form_hidden('last_where',$where);
-  echo  str('CATEGORY').' :
- ml.media_type=".MEDIA_TYPE_DVD." or
+
-        <a href="'.url_set_param($this_url,'list','LIST').'"><img align="absbottom" border="0"  src="/images/details.gif"></a>
-        <a href="'.url_set_param($this_url,'list','THUMBS').'"><img align="absbottom" border="0" src="/images/thumbs.gif"></a>
@@ -363 +362 @@
-  // Get actor/director/genre lists
-  $movie_id    = $_REQUEST["movie"][0];
-  $media_type  = db_value("select media_type from media_locations ml, movies m where ml.location_id=m.location_id and m.file_id=$movie_id");
-  $details     = db_toarray("select * from movies where file_id=".$movie_id);
-  $actors      = db_toarray("select actor_name name, actor_id id from actors order by 1");
@@ -422 +420 @@
-  foreach ( db_toarray("select * from users order by name") as $row)
-    echo '<input type="checkbox" name="viewed[]" value="'.$row["USER_ID"].'" '.
-$media_type
+MEDIA_TYPE_VIDEO
-         '>'.$row["NAME"].'<br>';
-
@@ -575 +573 @@
-        foreach ($movie_list as $movie)
-        {
-
-
-
+
+
-        }
-      }
@@ -583 +580 @@
-      {
-        // Remove all viewing information about these movies for this user
- in (".MEDIA_TYPE_VIDEO.",".MEDIA_TYPE_DVD.")
+=".MEDIA_TYPE_VIDEO."
-                      "and media_id in (".implode(',',$movie_list).")");
-      }

trunk/swisscenter/gen_playlist.php

@@ -74 +74 @@
-    if ($media_type == MEDIA_TYPE_VIDEO || $media_type == MEDIA_TYPE_TV ) // Movie
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-      else
-
-
-
-
-
+
+
+
+
+
+
+
-    }
-    else
-      $url = $server.'stream.php?'.current_session().'&tracklist='.$tracklist.'&media_type='.$media_type.'&idx='.$item_count.'&ext=.'.file_ext($row["FILENAME"]);
-    
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
-  }
-

trunk/swisscenter/images/style.ini

@@ -46 +46 @@
-;PAGE_TV                  = background.jpg
-;PAGE_WEB                 = background.jpg
-;PAGE_DVD                 = background.jpg
-
-PAGE_BACKGROUND_COLOUR   = #000000
@@ -148 +147 @@
-MENU_WEB_ALIGN           = center
-MENU_WEB_WIDTH           = 650
-MENU_DVD_ALIGN           = center
-MENU_DVD_WIDTH           = 650
-MENU_CONFIG_ALIGN        = center
-MENU_CONFIG_WIDTH        = 650

trunk/swisscenter/index.php

@@ -19 +19 @@
-    else
-      return false;
-  }
-
-  /**
-   * Display the Video submenu
-   */
-  function display_video_menu()
-  {
-    page_header( str('WATCH_MOVIE'),'','',1,false,'','PAGE_VIDEO');
-
-    /**
-     * Menu Items
-     */
-    $menu = new menu();
-    $page = (empty($_REQUEST["page"]) ? 1 : $_REQUEST["page"]);
-
-    // Only display the video options if the user has some videos stored in the database.
-    if ( media_exists(MEDIA_TYPE_VIDEO))
-      $menu->add_item(str('WATCH_MOVIE'),'video.php',true);
-
-    // Only display the TV Series options if the user has some TV episodes stored in the database.
-    if ( media_exists(MEDIA_TYPE_TV))
-      $menu->add_item(str('WATCH_TV'),'tv.php',true);
-
-    // Only display the DVD options if the user has some DVD images stored in the database.
-    if ( media_exists(MEDIA_TYPE_DVD))
-      $menu->add_item(str('WATCH_DVD'),'video_dvd.php',true);
-
-    /**
-    * Display the page content
-    */
-    if ($menu->num_items() == 1)
-      header('Location: '.server_address().$menu->item_url(0));
-    else
-      $menu->display(1, style_value("MENU_VIDEO_WIDTH"), style_value("MENU_VIDEO_ALIGN"));
-
-    page_footer('index.php');
-  }
-
@@ -79 +43 @@
-             && db_value("select 'YES' from media_locations where media_type=".MEDIA_TYPE_WEB." limit 1") == 'YES' )
-        || get_sys_pref('OVERRIDE_ENABLE_WEBLINKS','NO') == 'YES') )
-   
+  
-
-    // Only display the RSS options if an internet connection is active, the user has enabled RSS support and has defined some subscriptions.
@@ -148 +112 @@
-
-    // Only display the video options if the user has some videos stored in the database.
-
-
+
+
+
+
+
+
-
-    // Only display the music options if the user has some music stored in the database.

trunk/swisscenter/lang/en/en.xml

@@ -2329 +2329 @@
-      <string>
-        <id>NETWORK_SHARE_PROMPT</id>
-for the media type 'DVD Video', and will be ignored for all other media types. To play DVD Video
-0
+if you have DVD images (iso, img, etc) in this media location, and can only be used with a NMT media player. To play DVD image
+1
-      </string>
-      <string>
@@ -2419 +2419 @@
-      <string>
-        <id>ORG_TITLE</id>
-/DVD
-0
+
+1
-      </string>
-      <string>

trunk/swisscenter/media_dir_refresh.php

@@ -23 +23 @@
-    $media_type      = $_REQUEST["media_type"];
-    $table           = db_value("select media_table from media_types where  media_id=$media_type");
-
-
+
-    $media_locations = db_toarray("select * from media_locations where media_type=".$media_type);
-  
-    foreach ($media_locations as $row)
-table, $
+row["NETWORK_SHARE"], $table, $file
-    
-    header('Location: '.$rtn);

trunk/swisscenter/media_search.php

@@ -40 +40 @@
-      $types = media_exts( $location["MEDIA_TYPE"] );
-      send_to_log(4,'Refreshing '.strtoupper($table).' database');
-
+location["NETWORK_SHARE"], $
-      send_to_log(4,'Completed refreshing '.strtoupper($table).' database');
-      
@@ -86 +86 @@
-    
-    // Update video details from the Internet if enabled
-(in_array(MEDIA_TYPE_VIDEO, $media_types) || in_array(MEDIA_TYPE_DVD, $media_types)
+in_array(MEDIA_TYPE_VIDEO, $media_types
-    {
-      set_sys_pref('MEDIA_SCAN_STATUS',str('MEDIA_SCAN_STATUS_MOVIE'));

trunk/swisscenter/video.php

@@ -16 +16 @@
-      search_hist_init( 'video.php', get_rating_filter().filter_get_predicate() );
-    else
-3
+MEDIA_TYPE_VIDEO
-
-    if ($cat_id <= 0)
@@ -22 +22 @@
-    else
-      $prev_page = "video.php?subcat=".db_value("select parent_id from categories where cat_id=$cat_id");
-
+
-    echo '<p>';
-
@@ -30 +30 @@
-    if (get_sys_pref('browse_video_actor_enabled','YES') == 'YES')
-      $menu->add_item( str('BROWSE_ACTOR')       ,"video_search.php?sort=actor",true);
- 
+
-      $menu->add_item( str('BROWSE_DIRECTOR')    ,"video_search.php?sort=director",true);
- 
+
-      $menu->add_item( str('BROWSE_GENRE')       ,"video_search.php?sort=genre",true);
- 
+
-      $menu->add_item( str('BROWSE_YEAR')        ,"video_search.php?sort=year",true);
- 
+
-      $menu->add_item( str('BROWSE_CERTIFICATE') ,"video_search.php?sort=certificate",true);
- 
+
-      $menu->add_item( str('BROWSE_FILESYSTEM')  ,"video_browse.php",true);
-
+
-    if ($menu->num_items() == 1)
-    {
-3
+MEDIA_TYPE_VIDEO
-      header('Location: '.server_address().$menu->item_url(0));
- 
+
-    else
-    {
-      $menu->display(1, style_value("MENU_VIDEO_WIDTH"), style_value("MENU_VIDEO_ALIGN"));
-    }
-
+
-    $buttons = array();
-    $buttons[] = array('text' => str('QUICK_PLAY'),'url'  => quick_play_link(MEDIA_TYPE_VIDEO,$_SESSION["history"][0]["sql"]));
@@ -61 +61 @@
-      page_footer($prev_page, $buttons );
-  }
-
+
-/**************************************************************************************************
-   Main page output
@@ -67 +67 @@
-
-  page_header( str('WATCH_MOVIE') , '','',1,false,'',MEDIA_TYPE_VIDEO);
-
+
-  if( category_count(MEDIA_TYPE_VIDEO)==1 || isset($_REQUEST["cat"]) )
-    display_video_menu($_REQUEST["cat"]);
-  elseif ( isset($_REQUEST["subcat"]) )
-3
- 
-3
+MEDIA_TYPE_VIDEO
+
+MEDIA_TYPE_VIDEO
-
-/**************************************************************************************************

trunk/swisscenter/video_delete.php

@@ -24 +24 @@
-    case MEDIA_TYPE_TV    : $media_table = 'tv'    ; break;
-    case MEDIA_TYPE_VIDEO :
-    case MEDIA_TYPE_DVD   :
-    default               : $media_table = 'movies'; break;
-  }

trunk/swisscenter/video_selected.php

@@ -85 +85 @@
-                   'left outer join directors d on dom.director_id = d.director_id '.
-                   'left outer join genres g on gom.genre_id = g.genre_id'.
-and ml.media_type='.MEDIA_TYPE_VIDEO
+'
-  $select_fields = "file_id, dirname, filename, title, year, length";
-  $predicate     = search_process_passed_params();
@@ -99 +99 @@
-    $sql_table  .= 'left outer join genres_of_movie gom on media.file_id = gom.movie_id '.
-                   'left outer join genres g on gom.genre_id = g.genre_id ';
-and ml.media_type='.MEDIA_TYPE_VIDEO
+'
-  $file_ids      = db_col_to_list("select distinct media.file_id from $sql_table $predicate");
-  $playtime      = db_value("select sum(length) from movies where file_id in (".implode(',',$file_ids).")");
@@ -115 +115 @@
-  {    
-    // Single match, so get the details from the database and display them
-
+ml.name, ml.network_share, 
-      page_error( str('DATABASE_ERROR'));
-
@@ -123 +123 @@
-      page_header( $data[0]["TITLE"] );
-
+    // Is DVD image?
+    $is_dvd = in_array(file_ext($data[0]["FILENAME"]), media_exts_dvd());
+    
-    // Play now
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    // Resume playing
-
+&& !$is_dvd 
-      $menu->add_item( str('RESUME_PLAYING') , resume_file(MEDIA_TYPE_VIDEO,$data[0]["FILE_ID"]), true);
-        
-    // Add to your current playlist
-
+ && !$is_dvd
-      $menu->add_item( str('ADD_PLAYLIST') ,'add_playlist.php?sql='.rawurlencode("select distinct $select_fields from $sql_table $predicate order by title, filename"),true);
-
@@ -141 +156 @@
-    if ($data[0]["DETAILS_AVAILABLE"] == 'Y')
-      $menu->add_item( str('VIDEO_INFO'), 'video_info.php?movie='.$data[0]["FILE_ID"],true);
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-  // display the information that is common to all movies, and provide links to refine the search
-  // further.