summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorNaglfar <naglfar@tilde.institute>2021-01-11 00:08:30 +0100
committerNaglfar <naglfar@tilde.institute>2021-01-11 00:08:30 +0100
commit90d668f5fe7b112af74234ee59b026bc7bc07274 (patch)
tree3fa432b2a36ddcaeba8ccfacbe398c2a7d966315
parent4bf22916122e11046cf77a7dfc8868802c0ffb28 (diff)
downloadMightyWVMS-90d668f5fe7b112af74234ee59b026bc7bc07274.tar.gz
Change from array key to value
-rw-r--r--divs/content-wrapper.php2
-rw-r--r--divs/sidebar.php10
-rw-r--r--php/rd-procedures.php6
-rw-r--r--php/wd-procedures.php2
4 files changed, 10 insertions, 10 deletions
diff --git a/divs/content-wrapper.php b/divs/content-wrapper.php
index 9596b4d..8c4d27a 100644
--- a/divs/content-wrapper.php
+++ b/divs/content-wrapper.php
@@ -1,5 +1,5 @@
 <video controls>
-	<source src="video/<?php echo $vindex[$vid] ?>.ogv" type="video/ogg">html5 browser not found.
+	<source src="video/<?php echo $vid ?>.ogv" type="video/ogg">html5 browser not found.
 </video> 
 
 <div id="video-data"><?php echo $vdata[2].'<br>'.$cindex[$vdata[3]] ?></div>
diff --git a/divs/sidebar.php b/divs/sidebar.php
index 9a32ce0..38fa099 100644
--- a/divs/sidebar.php
+++ b/divs/sidebar.php
@@ -1,13 +1,13 @@
 <div id="sidebar-related">Related videos</div>
 <?php
-for($i=0; $i < $wsdata[2]; $i++)
-  if($i != $vid)
+foreach($vindex as $i => $value)
+  if($value != $vid && $i < $wsdata[2])
   {
-    $rdata = file($dpath.$wsdata[3].'/'.$i, FILE_IGNORE_NEW_LINES);
+    $rdata = file($dpath.$wsdata[3].'/toc/'.$value, FILE_IGNORE_NEW_LINES);
 		
-    printf("<div class='sidebar-thumb'><img alt='' src='thumbnails/%s.png'/></div>\n", $vindex[$i]);
+    printf("<div class='sidebar-thumb'><img alt='' src='thumbnails/%s.png'/></div>\n", $value);
     printf("<div class='sidebar-data'>\n");
-    printf("<a href='%s' title='%s - %s'>%s</a><br>\n%s<br>\nDuration: %s\n", $vindex[$i], $rdata[2], $cindex[$rdata[3]], $rdata[2], $cindex[$rdata[3]], $rdata[4]);
+    printf("<a href='%s' title='%s - %s'>%s</a><br>\n%s<br>\nDuration: %s\n", $value, $rdata[2], $cindex[$rdata[3]], $rdata[2], $cindex[$rdata[3]], $rdata[4]);
     printf("</div>\n");
   }
 ?>
diff --git a/php/rd-procedures.php b/php/rd-procedures.php
index c4b40ac..496287d 100644
--- a/php/rd-procedures.php
+++ b/php/rd-procedures.php
@@ -1,5 +1,5 @@
 <?php
-$vindex = file($dpath.$wsdata[3].'/'.$toc, FILE_IGNORE_NEW_LINES); 
+$vindex = file($dpath.$wsdata[3].'/toc.mvms', FILE_IGNORE_NEW_LINES); 
 
 /* 1 parse the URL */
 $vdata = explode('/', $_SERVER['REQUEST_URI']);
@@ -8,8 +8,8 @@ $vdata = explode('/', $_SERVER['REQUEST_URI']);
 if(!empty($vdata[1]))
   foreach($vindex as $i => $value)
     if($vdata[1] == $value)
-      $vid = $i;
+      $vid = $value;
 
-$vdata = file($dpath.$wsdata[3].'/'.$vid, FILE_IGNORE_NEW_LINES);
+$vdata = file($dpath.$wsdata[3].'/toc/'.$vid, FILE_IGNORE_NEW_LINES);
 $cindex = file($dpath.$wsdata[3].'/'.$channel, FILE_IGNORE_NEW_LINES);
 ?>
diff --git a/php/wd-procedures.php b/php/wd-procedures.php
index aa2c563..ab344b6 100644
--- a/php/wd-procedures.php
+++ b/php/wd-procedures.php
@@ -1,6 +1,6 @@
 <?php
 $vdata[0]+=1;
-file_put_contents($dpath.$wsdata[3].'/'.$vid, implode(PHP_EOL, $vdata));
+file_put_contents($dpath.$wsdata[3].'/toc/'.$vid, implode(PHP_EOL, $vdata));
 
 $vdata[1] = date('M j, Y', $vdata[1]);
 $vdata[] = file_get_contents($dpath.$wsdata[3].'/'.$cpath.$vid);