issue #909

gistfile1.diff

Index: D:/projects/stalker_portal/stalker_portal/c/tv_archive.js
===================================================================
--- D:/projects/stalker_portal/stalker_portal/c/tv_archive.js	(revision 3107)
+++ D:/projects/stalker_portal/stalker_portal/c/tv_archive.js	(revision 3108)
@@ -142,7 +142,7 @@
         },
 
         get_filename_by_date : function(date){
-            _debug('tv_archive.get_filename_by_date', date);
+            _debug('tv_archive.get_filename_by_date', date.toString());
 
             _debug('stb.player.cur_tv_item', stb.player.cur_tv_item);
 
Index: D:/projects/stalker_portal/stalker_portal/db/delta/22-refresh_token.sql
===================================================================
--- D:/projects/stalker_portal/stalker_portal/db/delta/22-refresh_token.sql	(revision 3107)
+++ D:/projects/stalker_portal/stalker_portal/db/delta/22-refresh_token.sql	(revision 3108)
@@ -44,6 +44,4 @@
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 ALTER TABLE `users` ADD `tariff_plan_id` int not null default 0;
-
-ALTER TABLE `itv` ADD `correct_time` int not null default 0;
 --//@UNDO
\ No newline at end of file
Index: D:/projects/stalker_portal/stalker_portal/server/lib/restrequest.class.php
===================================================================
--- D:/projects/stalker_portal/stalker_portal/server/lib/restrequest.class.php	(revision 3107)
+++ D:/projects/stalker_portal/stalker_portal/server/lib/restrequest.class.php	(revision 3108)
@@ -68,7 +68,7 @@
     }
 
     public function getAccept(){
-        return $_SERVER['HTTP_ACCEPT'];
+        return empty($_SERVER['HTTP_ACCEPT']) ? 'application/json' : $_SERVER['HTTP_ACCEPT'];
     }
 
     public static function useMacIdentifiers(){
Index: D:/projects/stalker_portal/stalker_portal/server/lib/epg.class.php
===================================================================
--- D:/projects/stalker_portal/stalker_portal/server/lib/epg.class.php	(revision 3107)
+++ D:/projects/stalker_portal/stalker_portal/server/lib/epg.class.php	(revision 3108)
@@ -533,8 +533,8 @@
                         $epg[$i]['start_timestamp'] < $archived_recs[$epg[$i]['ch_id']]['stop_timestamp']){
     
                         $epg[$i]['mark_archive'] = 1;
-                        $epg[$i]['position']  = date("i", $epg[$i]['start_timestamp']) * 60;
-                        $epg[$i]['media_len'] = $epg[$i]['stop_timestamp'] - $epg[$i]['start_timestamp'];
+                        //$epg[$i]['position']  = date("i", $epg[$i]['start_timestamp']) * 60;
+                        //$epg[$i]['media_len'] = $epg[$i]['stop_timestamp'] - $epg[$i]['start_timestamp'];
                     }else{
                         $epg[$i]['mark_archive'] = 0;
                     }
@@ -838,8 +838,8 @@
                     ($archived_recs[$program[$i]['ch_id']]['wowza_archive'] && $program[$i]['start_timestamp'] < (time() - date("i")*60-date("s"))) ){
                     
                     $program[$i]['mark_archive'] = 1;
-                    $program[$i]['position']  = date("i", $program[$i]['start_timestamp']) * 60;
-                    $program[$i]['media_len'] = $program[$i]['stop_timestamp'] - $program[$i]['start_timestamp'];
+                    //$program[$i]['position']  = date("i", $program[$i]['start_timestamp']) * 60;
+                    //$program[$i]['media_len'] = $program[$i]['stop_timestamp'] - $program[$i]['start_timestamp'];
                 }else{
                     $program[$i]['mark_archive'] = 0;
                 }