Created
November 16, 2012 14:45
-
-
Save azhurb/4087852 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Index: server/lib/stb.class.php | |
| IDEA additional info: | |
| Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
| <+>UTF-8 | |
| =================================================================== | |
| --- server/lib/stb.class.php (revision 3348) | |
| +++ server/lib/stb.class.php (revision ) | |
| @@ -300,6 +300,7 @@ | |
| $profile['web_proxy_exclude_list'] = Config::exist('stb_http_proxy_exclude_list') ? Config::get('stb_http_proxy_exclude_list') : ''; | |
| $profile['update_url'] = self::getImageUpdateUrl(empty($_REQUEST['stb_type']) ? 'mag250' : $_REQUEST['stb_type']); | |
| $profile['tv_archive_days'] = Config::exist('tv_archive_parts_number') ? Config::get('tv_archive_parts_number') / 24 : 0; | |
| + $profile['tv_archive_hours'] = Config::getSafe('tv_archive_parts_number', 0); | |
| $profile['playback_limit'] = Config::get('enable_playback_limit') ? $profile['playback_limit'] : 0; | |
| $profile['demo_video_url'] = Config::getSafe('demo_video_url', ''); | |
| $profile['tv_quality_filter'] = Config::get('enable_tv_quality_filter'); | |
| \ No newline at end of file | |
| Index: c/time_shift.js | |
| IDEA additional info: | |
| Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
| <+>UTF-8 | |
| =================================================================== | |
| --- c/time_shift.js (revision 3358) | |
| +++ c/time_shift.js (revision ) | |
| @@ -366,9 +366,9 @@ | |
| can_reduce_day : function(){ | |
| _debug('time_shift.can_reduce_day'); | |
| - _debug('stb.user.tv_archive_days', stb.user.tv_archive_days); | |
| + _debug('stb.user.tv_archive_hours', stb.user.tv_archive_hours); | |
| - var seconds = stb.user.tv_archive_days * 86400; | |
| + var seconds = stb.user.tv_archive_hours * 3600; | |
| var from_date = new Date(); | |
| from_date.setSeconds(from_date.getSeconds() - seconds); | |
| @@ -384,9 +384,9 @@ | |
| in_archive : function(position){ | |
| _debug('time_shift.in_archive', position); | |
| - _debug('stb.user.tv_archive_days', stb.user.tv_archive_days); | |
| + _debug('stb.user.tv_archive_hours', stb.user.tv_archive_hours); | |
| - var seconds = stb.user.tv_archive_days * 86400; | |
| + var seconds = stb.user.tv_archive_hours * 3600; | |
| var from_date = new Date(); | |
| from_date.setSeconds(from_date.getSeconds() - seconds); | |
| @@ -410,9 +410,9 @@ | |
| get_first_piece_position : function(){ | |
| _debug('time_shift.get_first_piece_position'); | |
| - _debug('stb.user.tv_archive_days', stb.user.tv_archive_days); | |
| + _debug('stb.user.tv_archive_hours', stb.user.tv_archive_hours); | |
| - var seconds = stb.user.tv_archive_days * 86400; | |
| + var seconds = stb.user.tv_archive_hours * 3600; | |
| var from_date = new Date(); | |
| from_date.setSeconds(from_date.getSeconds() - seconds); | |
| \ No newline at end of file |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment