API tools faq
paste
Guest User

Mythweb Diffs

a guest
May 15th, 2013
84
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 24.47 KB | None | 0 0
raw download clone embed print report
  1. 1c1
  2. < <?php
  3. ---
  4. > /<?php
  5. 17a18,20
  6. > t('This time');
  7. > t('This day and time');
  8. > t('This channel');
  9. 291c291,298
  10. < <?php echo count($All_Videos).' videos'; ?>
  11. ---
  12. > <?php
  13. > $video_count = count($All_Videos);
  14. > if( $video_count ) {
  15. > echo tn('$1 video', '$1 videos', $video_count);
  16. > } else {
  17. > echo t('No videos');
  18. > }
  19. > ?>
  20. 17c17
  21. < header('Location: tv/detail/'.urlencode($chanid).'/'.urlencode($starttime));
  22. ---
  23. > header('Location: '.root_url.'tv/detail/'.urlencode($chanid).'/'.urlencode($starttime));
  24. 21c21
  25. < $Page_Previous_Location = 'tv/detail/'.urlencode($chanid).'/'.urlencode($starttime);
  26. ---
  27. > $Page_Previous_Location = root_url.'tv/detail/'.urlencode($chanid).'/'.urlencode($starttime);
  28. 74,75c74,75
  29. < // Get the length (26 == recendts; 25 == recstartts)
  30. < $length = $record[26] - $record[25];
  31. ---
  32. > // Get the length (267== recendts; 26 == recstartts)
  33. > $length = $record[27] - $record[26];
  34. 80c80
  35. < $Total_Used = gmp_strval(gmp_add($Total_Used, $record[11]));
  36. ---
  37. > $Total_Used = gmp_strval(gmp_add($Total_Used, $record[12]));
  38. 84c84
  39. < $Total_Used += $record[11];
  40. ---
  41. > $Total_Used += $record[12];
  42. 88c88
  43. < $Groups[$record[28]]++;
  44. ---
  45. > $Groups[$record[29]]++;
  46. 90c90
  47. < if (($_REQUEST['recgroup'] && $_REQUEST['recgroup'] == $record[28]) || (!$_REQUEST['recgroup'] && $record[28] != 'LiveTV' && $record[28] != 'Deleted'))
  48. ---
  49. > if (($_REQUEST['recgroup'] && $_REQUEST['recgroup'] == $record[29]) || (!$_REQUEST['recgroup'] && $record[29] != 'LiveTV' && $record[29] != 'Deleted'))
  50. 98c98
  51. < if ($_REQUEST['recgroup'] && $_REQUEST['recgroup'] != $record[28])
  52. ---
  53. > if ($_REQUEST['recgroup'] && $_REQUEST['recgroup'] != $record[29])
  54. 101c101
  55. < if (empty($_REQUEST['recgroup']) && ($record[28] == 'LiveTV' || $record[28] == 'Deleted'))
  56. ---
  57. > if (empty($_REQUEST['recgroup']) && ($record[29] == 'LiveTV' || $record[29] == 'Deleted'))
  58. 55d54
  59. < var $record_channel = false;
  60. 107d105
  61. < case 3: $this->record_channel = true; break;
  62. 118d115
  63. < || $this->record_channel
  64. 19,28c19
  65. < public $title;
  66. < public $subtitle;
  67. < public $description;
  68. < public $category;
  69. < public $chanid;
  70. < public $channum;
  71. < public $callsign;
  72. < public $channame;
  73. < public $filename;
  74. < public $filesize;
  75. ---
  76. > // everything above this line is serialized
  77. 30,31d20
  78. < public $starttime;
  79. < public $endtime;
  80. 34,66d22
  81. < public $findid;
  82. < public $hostname;
  83. < public $sourceid;
  84. < public $cardid;
  85. < public $inputid;
  86. < public $recpriority = null;
  87. < public $recstatus;
  88. < public $recordid;
  89. <
  90. < public $rectype;
  91. < public $dupin;
  92. < public $dupmethod;
  93. < public $recstartts;
  94. < public $recendts;
  95. < public $progflags;
  96. < public $recgroup;
  97. < public $outputfilters;
  98. < public $seriesid;
  99. < public $programid;
  100. <
  101. < public $lastmodified;
  102. < public $stars;
  103. < public $airdate;
  104. < public $playgroup = 'Default';
  105. < public $recpriority2 = null;
  106. <
  107. < public $parentid;
  108. < public $storagegroup = 'Default';
  109. < public $audioproperties = 0;
  110. < public $videoproperties = 0;
  111. < public $subtitletype = 0;
  112. < public $year = 0;
  113. < // everything above this line is serialized
  114. 82,83d37
  115. < public $parttotal = 1;
  116. < public $partnumber = 1;
  117. 132,172c86,129
  118. < $this->category = $data[5];
  119. < $this->chanid = $data[6]; # mysql chanid
  120. < $this->channum = $data[7];
  121. < $this->callsign = $data[8];
  122. < $this->channame = $data[9];
  123. < $this->filename = $data[10];
  124. < $this->filesize = $data[11];
  125. < $this->starttime = $data[12]; # show start-time
  126. < $this->endtime = $data[13]; # show end-time
  127. < $this->findid = $data[14];
  128. < $this->hostname = $data[15];
  129. < $this->sourceid = $data[16];
  130. < $this->cardid = $data[17];
  131. < $this->inputid = $data[18];
  132. < $this->recpriority = $data[19];
  133. < $this->recstatus = $data[20];
  134. < $this->recordid = $data[21];
  135. <
  136. < $this->rectype = $data[22];
  137. < $this->dupin = $data[23];
  138. < $this->dupmethod = $data[24];
  139. < $this->recstartts = $data[25]; # ACTUAL start time (also maps to recorded.starttime)
  140. < $this->recendts = $data[26]; # ACTUAL end time
  141. < $this->progflags = $data[27];
  142. < $this->recgroup = $data[28];
  143. < $this->outputfilters = $data[29];
  144. < $this->seriesid = $data[30];
  145. < $this->programid = $data[31];
  146. < $this->inetref = $data[32];
  147. <
  148. < $this->lastmodified = $data[33];
  149. < $this->stars = $data[34];
  150. < $this->airdate = $data[35];
  151. < $this->playgroup = $data[36];
  152. < $this->recpriority2 = $data[37];
  153. < $this->parentid = $data[38];
  154. < $this->storagegroup = $data[39];
  155. < $this->audioproperties = $data[40];
  156. < $this->videoproperties = $data[41];
  157. < $this->subtitletype = $data[42];
  158. < $this->year = $data[43];
  159. ---
  160. > $this->syndicatedepisodenumber = $data[5];
  161. > $this->category = $data[6];
  162. > $this->chanid = $data[7]; # mysql chanid
  163. > $this->channum = $data[8];
  164. > $this->callsign = $data[9];
  165. > $this->channame = $data[10];
  166. > $this->filename = $data[11];
  167. > $this->filesize = $data[12];
  168. > $this->starttime = $data[13]; # show start-time
  169. > $this->endtime = $data[14]; # show end-time
  170. > $this->findid = $data[15];
  171. > $this->hostname = $data[16];
  172. > $this->sourceid = $data[17];
  173. > $this->cardid = $data[18];
  174. > $this->inputid = $data[19];
  175. > $this->recpriority = $data[20];
  176. > $this->recstatus = $data[21];
  177. > $this->recordid = $data[22];
  178. >
  179. > $this->rectype = $data[23];
  180. > $this->dupin = $data[24];
  181. > $this->dupmethod = $data[25];
  182. > $this->recstartts = $data[26]; # ACTUAL start time (also maps to recorded.starttime)
  183. > $this->recendts = $data[27]; # ACTUAL end time
  184. > $this->progflags = $data[28];
  185. > $this->recgroup = $data[29];
  186. > $this->outputfilters = $data[30];
  187. > $this->seriesid = $data[31];
  188. > $this->programid = $data[32];
  189. > $this->inetref = $data[33];
  190. >
  191. > $this->lastmodified = $data[34];
  192. > $this->stars = $data[35];
  193. > $this->airdate = $data[36];
  194. > $this->playgroup = $data[37];
  195. > $this->recpriority2 = $data[38];
  196. > $this->parentid = $data[39];
  197. > $this->storagegroup = $data[40];
  198. > $this->audioproperties = $data[41];
  199. > $this->videoproperties = $data[42];
  200. > $this->subtitletype = $data[43];
  201. > $this->year = $data[44];
  202. > $this->partnumber = $data[45];
  203. > $this->parttotal = $data[46];
  204. 305,315d261
  205. < if (!isset($this->syndicatedepisodenumber)) {
  206. < // Get some data from SQL that the backend doesn't provide
  207. < $query = 'SELECT partnumber, parttotal, syndicatedepisodenumber FROM program'
  208. < .' WHERE chanid='.escape($this->chanid)
  209. < .' AND starttime=FROM_UNIXTIME('.escape($this->starttime).')';
  210. < $result = mysql_query($query)
  211. < or trigger_error('SQL Error: '.mysql_error(), FATAL);
  212. < list($this->partnumber, $this->parttotal, $this->syndicatedepisodenumber) = mysql_fetch_row($result);
  213. < mysql_free_result($result);
  214. < }
  215. <
  216. 400,441c346,390
  217. < $this->category , // 05 category
  218. < $this->chanid , // 06 chanid
  219. < $this->channum , // 07 chanstr
  220. < $this->callsign , // 08 chansign
  221. < $this->channame , // 09 channame
  222. < $this->filename , // 10 pathname
  223. < $this->filesize , // 11 filesize
  224. <
  225. < $this->starttime , // 12 startts
  226. < $this->endtime , // 13 endts
  227. < $this->findid , // 14 findid
  228. < $this->hostname , // 15 hostname
  229. < $this->sourceid , // 16 sourceid
  230. < $this->cardid , // 17 cardid
  231. < $this->inputid , // 18 inputid
  232. < $this->recpriority , // 19 recpriority
  233. < $this->recstatus , // 20 recstatus
  234. < $this->recordid , // 21 recordid
  235. <
  236. < $this->rectype , // 22 rectype
  237. < $this->dupin , // 23 dupin
  238. < $this->dupmethod , // 24 dupmethod
  239. < $this->recstartts , // 25 recstartts
  240. < $this->recendts , // 26 recendts
  241. < $this->progflags , // 27 programflags
  242. < $this->recgroup , // 28 recgroup
  243. < $this->outputfilters , // 29 chanOutputFilters
  244. < $this->seriesid , // 30 seriesid
  245. < $this->programid , // 31 programid
  246. < $this->inetref , // 32 inetref
  247. <
  248. < $this->lastmodified , // 33 lastmodified
  249. < $this->stars , // 34 stars
  250. < $this->airdate , // 35 originalAirDate
  251. < $this->playgroup , // 36 playgroup
  252. < $this->recpriority2 , // 37 recpriority2
  253. < $this->parentid , // 38 parentid
  254. < $this->storagegroup , // 39 storagegroup
  255. < $this->audioproperties, // 40 audioprop
  256. < $this->videoproperties, // 41 videoprop
  257. < $this->subtitletype, // 42 subtitletype
  258. < $this->year, // 43 year
  259. ---
  260. > $this->syndicatedepisodenumber, // 05 syndicatedepisode
  261. > $this->category , // 06 category
  262. > $this->chanid , // 07 chanid
  263. > $this->channum , // 08 chanstr
  264. > $this->callsign , // 09 chansign
  265. > $this->channame , // 10 channame
  266. > $this->filename , // 11 pathname
  267. > $this->filesize , // 12 filesize
  268. >
  269. > $this->starttime , // 13 startts
  270. > $this->endtime , // 14 endts
  271. > $this->findid , // 15 findid
  272. > $this->hostname , // 16 hostname
  273. > $this->sourceid , // 17 sourceid
  274. > $this->cardid , // 18 cardid
  275. > $this->inputid , // 19 inputid
  276. > $this->recpriority , // 20 recpriority
  277. > $this->recstatus , // 21 recstatus
  278. > $this->recordid , // 22 recordid
  279. >
  280. > $this->rectype , // 23 rectype
  281. > $this->dupin , // 24 dupin
  282. > $this->dupmethod , // 25 dupmethod
  283. > $this->recstartts , // 26 recstartts
  284. > $this->recendts , // 27 recendts
  285. > $this->progflags , // 28 programflags
  286. > $this->recgroup , // 29 recgroup
  287. > $this->outputfilters , // 30 chanOutputFilters
  288. > $this->seriesid , // 31 seriesid
  289. > $this->programid , // 32 programid
  290. > $this->inetref , // 33 inetref
  291. >
  292. > $this->lastmodified , // 34 lastmodified
  293. > $this->stars , // 35 stars
  294. > $this->airdate , // 36 originalAirDate
  295. > $this->playgroup , // 37 playgroup
  296. > $this->recpriority2 , // 38 recpriority2
  297. > $this->parentid , // 39 parentid
  298. > $this->storagegroup , // 40 storagegroup
  299. > $this->audioproperties, // 41 audioprop
  300. > $this->videoproperties, // 42 videoprop
  301. > $this->subtitletype , // 43 subtitletype
  302. > $this->year , // 44 year
  303. > $this->partnumber , // 45 partnumber
  304. > $this->parttotal , // 46 parttotal
  305. 548d496
  306. < case rectype_channel: $str .= t('rectype-long: channel', $_SESSION["prefer_channum"] ? $this->channel->channum : $this->channel->callsign); break;
  307. 554,555d501
  308. < case rectype_finddaily: $str .= t('rectype-long: finddaily'); break;
  309. < case rectype_findweekly: $str .= t('rectype-long: findweekly'); break;
  310. 635c581
  311. < $sh = $db->query('SELECT *
  312. ---
  313. > $sh = $db->query("SELECT *
  314. 637c583,587
  315. < WHERE title=? AND subtitle=? AND description=? AND future = 0',
  316. ---
  317. > WHERE title = ? AND
  318. > ((programid = '' AND subtitle = ?
  319. > AND description = ?) OR
  320. > (programid <> '' AND programid = ?) OR
  321. > (findid <> 0 AND findid = ?))",
  322. 640c590,592
  323. < $this->description);
  324. ---
  325. > $this->description,
  326. > $this->programid,
  327. > $this->findid);
  328. 154c154
  329. < if ($program[20] == 6)
  330. ---
  331. > if ($program[21] == 6)
  332. 157c157
  333. < self::$scheduledRecordings[$program[8]][$program[12]][] =& new Program($program);
  334. ---
  335. > self::$scheduledRecordings[$program[9]][$program[13]][] =& new Program($program);
  336. 440,443d439
  337. < case rectype_channel:
  338. < $channel =& Channel::find($this->chanid);
  339. < $str .= t('rectype-long: channel', $_SESSION["prefer_channum"] ? $channel->channum : $channel->callsign);
  340. < break;
  341. 449,450d444
  342. < case rectype_finddaily: $str .= t('rectype-long: finddaily'); break;
  343. < case rectype_findweekly: $str .= t('rectype-long: findweekly'); break;
  344. 47,48c47,48
  345. < case rectype_finddaily:
  346. < case rectype_findweekly:
  347. ---
  348. > case rectype_daily:
  349. > case rectype_weekly:
  350. 18d17
  351. < define('rectype_channel', 3);
  352. 24,25d22
  353. < define('rectype_finddaily', 9);
  354. < define('rectype_findweekly', 10);
  355. 47d43
  356. < rectype_channel => t('rectype: channel'),
  357. 53,54d48
  358. < rectype_finddaily => t('rectype: finddaily'),
  359. < rectype_findweekly => t('rectype: findweekly'),
  360. 175d174
  361. < case rectype_channel: $type = rectype_channel; break;
  362. 179,180d177
  363. < case rectype_finddaily: $type = rectype_finddaily; break;
  364. < case rectype_findweekly: $type = rectype_findweekly; break;
  365. 300c300
  366. < file.subtitle = '<?php echo str_replace("\n", '', nl2br(addslashes($show->subtitle))) ?>';
  367. ---
  368. > file.subtitle = '<?php echo addslashes($show->subtitle) ?>';
  369. 138,143c138,143
  370. < <li><input type="radio" class="radio" name="record" value="<?php echo rectype_finddaily ?>" id="rectype_finddaily"<?php
  371. < if ($schedule->type == rectype_finddaily) echo ' CHECKED' ?>>
  372. < <label for="rectype_finddaily"><?php echo t('rectype-long: finddaily') ?></label></li>
  373. < <li><input type="radio" class="radio" name="record" value="<?php echo rectype_findweekly ?>" id="rectype_findweekly"<?php
  374. < if($schedule->type == rectype_findweekly) echo ' CHECKED' ?>>
  375. < <label for="rectype_findweekly"><?php echo t('rectype-long: findweekly') ?></label></li>
  376. ---
  377. > <li><input type="radio" class="radio" name="record" value="<?php echo rectype_daily ?>" id="rectype_daily"<?php
  378. > if ($schedule->type == rectype_daily) echo ' CHECKED' ?>>
  379. > <label for="rectype_daily"><?php echo t('rectype-long: finddaily') ?></label></li>
  380. > <li><input type="radio" class="radio" name="record" value="<?php echo rectype_weekly ?>" id="rectype_weekly"<?php
  381. > if($schedule->type == rectype_weekly) echo ' CHECKED' ?>>
  382. > <label for="rectype_weekly"><?php echo t('rectype-long: findweekly') ?></label></li>
  383. 582,587d581
  384. < <li><input type="radio" class="radio" name="record" value="<?php echo rectype_daily ?>" id="record_daily"<?php
  385. < echo $schedule->type == rectype_daily ? ' CHECKED' : '' ?> />
  386. < <label for="record_daily"><?php echo t('rectype-long: daily') ?></label></li>
  387. < <li><input type="radio" class="radio" name="record" value="<?php echo rectype_weekly ?>" id="record_weekly"<?php
  388. < echo $schedule->type == rectype_weekly ? ' CHECKED' : '' ?> />
  389. < <label for="record_weekly"><?php echo t('rectype-long: weekly') ?></label></li>
  390. 591,599d584
  391. < <li><input type="radio" class="radio" name="record" value="<?php echo rectype_finddaily ?>" id="record_finddaily"<?php
  392. < echo $schedule->type == rectype_finddaily ? ' CHECKED' : '' ?> />
  393. < <label for="record_finddaily"><?php echo t('rectype-long: finddaily') ?></label></li>
  394. < <li><input type="radio" class="radio" name="record" value="<?php echo rectype_findweekly ?>" id="record_findweekly"<?php
  395. < echo $schedule->type == rectype_findweekly ? ' CHECKED' : '' ?> />
  396. < <label for="record_findweekly"><?php echo t('rectype-long: findweekly') ?></label></li>
  397. < <li><input type="radio" class="radio" name="record" value="<?php echo rectype_channel ?>" id="record_channel"<?php
  398. < echo $schedule->type == rectype_channel ? ' CHECKED' : '' ?> />
  399. < <label for="record_channel"><?php echo t('rectype-long: channel', $channel->callsign) ?></label></li>
  400. 76,79d75
  401. < <input type="radio" class="radio" name="record" value="<?php echo rectype_daily ?>" id="record_daily"<?php echo $schedule->type == rectype_daily ? ' CHECKED' : '' ?>></input>
  402. < <a>Record every day</a> at this time<br />
  403. < <input type="radio" class="radio" name="record" value="<?php echo rectype_weekly ?>" id="record_weekly"<?php echo $schedule->type == rectype_weekly ? ' CHECKED' : '' ?>></input>
  404. < <a>Record every week</a> at this time<br />
  405. 82,87d77
  406. < <input type="radio" class="radio" name="record" value="<?php echo rectype_finddaily ?>" id="record_finddaily"<?php echo $schedule->type == rectype_finddaily ? ' CHECKED' : '' ?>></input>
  407. < <a>Find one episode every day</a><br />
  408. < <input type="radio" class="radio" name="record" value="<?php echo rectype_findweekly ?>" id="record_findweekly"<?php echo $schedule->type == rectype_findweekly ? ' CHECKED' : '' ?>></input>
  409. < <a>Find one episode every week</a><br />
  410. < <input type="radio" class="radio" name="record" value="<?php echo rectype_channel ?>" id="record_channel"<?php echo $schedule->type == rectype_channel ? ' CHECKED' : '' ?>></input>
  411. < <a>Always record on this channel</a><br />
  412. 66,71c66,71
  413. < <li><input type="radio" class="radio" name="record" value="<?php echo rectype_finddaily ?>" id="rectype_finddaily"<?php
  414. < if ($schedule->type == rectype_finddaily) echo ' CHECKED' ?> />
  415. < <label for="rectype_finddaily"><?php echo t('rectype-long: finddaily') ?></label></li>
  416. < <li><input type="radio" class="radio" name="record" value="<?php echo rectype_findweekly ?>" id="rectype_findweekly"<?php
  417. < if($schedule->type == rectype_findweekly) echo ' CHECKED' ?> />
  418. < <label for="rectype_findweekly"><?php echo t('rectype-long: findweekly') ?></label></li>
  419. ---
  420. > <li><input type="radio" class="radio" name="record" value="<?php echo rectype_daily ?>" id="rectype_daily"<?php
  421. > if ($schedule->type == rectype_daily) echo ' CHECKED' ?> />
  422. > <label for="rectype_daily"><?php echo t('rectype-long: finddaily') ?></label></li>
  423. > <li><input type="radio" class="radio" name="record" value="<?php echo rectype_weekly ?>" id="rectype_weekly"<?php
  424. > if($schedule->type == rectype_weekly) echo ' CHECKED' ?> />
  425. > <label for="rectype_weekly"><?php echo t('rectype-long: findweekly') ?></label></li>
  426. 304,309d303
  427. < <li><input type="radio" class="radio" name="record" value="<?php echo rectype_daily ?>" id="record_daily"<?php
  428. < echo $schedule->type == rectype_daily ? ' CHECKED' : '' ?> />
  429. < <label for="record_daily"><?php echo t('rectype-long: daily') ?></label></li>
  430. < <li><input type="radio" class="radio" name="record" value="<?php echo rectype_weekly ?>" id="record_weekly"<?php
  431. < echo $schedule->type == rectype_weekly ? ' CHECKED' : '' ?> />
  432. < <label for="record_weekly"><?php echo t('rectype-long: weekly') ?></label></li>
  433. 313,321d306
  434. < <li><input type="radio" class="radio" name="record" value="<?php echo rectype_finddaily ?>" id="record_finddaily"<?php
  435. < echo $schedule->type == rectype_finddaily ? ' CHECKED' : '' ?> />
  436. < <label for="record_finddaily"><?php echo t('rectype-long: finddaily') ?></label></li>
  437. < <li><input type="radio" class="radio" name="record" value="<?php echo rectype_findweekly ?>" id="record_findweekly"<?php
  438. < echo $schedule->type == rectype_findweekly ? ' CHECKED' : '' ?> />
  439. < <label for="record_findweekly"><?php echo t('rectype-long: findweekly') ?></label></li>
  440. < <li><input type="radio" class="radio" name="record" value="<?php echo rectype_channel ?>" id="record_channel"<?php
  441. < echo $schedule->type == rectype_channel ? ' CHECKED' : '' ?> />
  442. < <label for="record_channel"><?php echo t('rectype-long: channel', $channel->callsign) ?></label></li>
Advertisement
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!