From 3d9d30a889c5c291b0fddc9f24e81cb467e07a5a Mon Sep 17 00:00:00 2001
From: Knah Tsaeb <knah-tsaeb@knah-tsaeb.org>
Date: Thu, 1 Aug 2013 14:08:43 +0200
Subject: [PATCH] [add] count video in download queue

---
 inc/addVideo.php |  6 ------
 inc/admin.php    |  9 +++++++++
 inc/content.php  | 17 ++++++++---------
 inc/install.php  |  2 +-
 inc/topMenu.php  | 21 +++++++++++++--------
 index.php        | 21 +++++++++++++++++++--
 style.css        |  9 ++++-----
 7 files changed, 54 insertions(+), 31 deletions(-)
 delete mode 100644 inc/addVideo.php
 create mode 100644 inc/admin.php

diff --git a/inc/addVideo.php b/inc/addVideo.php
deleted file mode 100644
index a2d2c10..0000000
--- a/inc/addVideo.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-require 'inc/topMenu.php';
-
-
-n_print($CONFIG);
-?>
\ No newline at end of file
diff --git a/inc/admin.php b/inc/admin.php
new file mode 100644
index 0000000..ce6516a
--- /dev/null
+++ b/inc/admin.php
@@ -0,0 +1,9 @@
+<?php
+if ($_SESSION['log'] !== true) {
+  die ;
+}
+require 'inc/topMenu.php';
+if (!empty($ci['ac']) && $ci['ac'] === 'viewQueue' && $_SESSION['log'] === true) {
+  $getQueue = getQueue();
+  echo 'You have ',$getQueue,' video in download queue.';
+}
diff --git a/inc/content.php b/inc/content.php
index 6e23155..255b00b 100644
--- a/inc/content.php
+++ b/inc/content.php
@@ -11,7 +11,7 @@ if (!empty($ci['ac']) && $ci['ac'] === 'login') {
     <input type="hidden" name="op" value="2"/>
     <input type="hidden" name="ac" value="login"/>
     <input type="hidden" name="bc" value="'.$ci['bc'].'" />
-    <input type="hidden" name="token" value="', genToken(), '"/>
+    <input type="hidden" name="token" value="',  $token, '"/>
     <input type="submit" />
   </fieldset>
 </form>';
@@ -25,7 +25,7 @@ if (!empty($ci['ac']) && $ci['ac'] === 'newDir') {
     <input type="hidden" name="op" value="1"/>
     <input type="hidden" name="ac" value="newDir" />
     <input type="hidden" name="bc" value="'.$ci['bc'].'" />
-    <input type="hidden" name="token" value="', genToken(), '"/>
+    <input type="hidden" name="token" value="',  $token, '"/>
     <input type="submit"/>
   </fieldset>
 </form>';
@@ -41,7 +41,7 @@ if (!empty($ci['ac']) && $ci['ac'] === 'renDir') {
     <input type="hidden" name="op" value="1"/>
     <input type="hidden" name="ac" value="renDir" />
     <input type="hidden" name="bc" value="'.$ci['bc'].'" />
-    <input type="hidden" name="token" value="', genToken(), '"/>
+    <input type="hidden" name="token" value="',  $token, '"/>
     <input type="submit"/>
   </fieldset>
 </form>';
@@ -66,7 +66,7 @@ if (!empty($ci['ac']) && $ci['ac'] === 'addVideo') {
     <input type="hidden" name="op" value="1"/>
     <input type="hidden" name="ac" value="addVideo" />
     <input type="hidden" name="bc" value="'.$ci['bc'].'" />
-    <input type="hidden" name="token" value="',  genToken(), '"/>
+    <input type="hidden" name="token" value="',   $token, '"/>
     <input type="submit"/>
   </fieldset>
 </form>';
@@ -80,7 +80,7 @@ if (!empty($ci['ac']) && $ci['ac'] === 'addThumbnail') {
     <input type="hidden" name="op" value="1"/>
     <input type="hidden" name="ac" value="addThumbnail" />
     <input type="hidden" name="bc" value="'.$ci['bc'].'" />
-    <input type="hidden" name="token" value="',  genToken(), '"/>
+    <input type="hidden" name="token" value="',   $token, '"/>
     <input type="submit"/>
   </fieldset>
 </form>';
@@ -137,7 +137,7 @@ if (!empty($listCurrentFile) && $ci['ac'] !== 'view') {
   }
 }
 echo '</div>';
-if ($ci['ac'] === 'view' && !empty($listCurrentFile)) {
+if (!empty($ci['ac']) && $ci['ac'] === 'view' && !empty($listCurrentFile)) {
   $_SESSION['video'] = $videoInfo['hash'];
   if (!empty($videoInfo)) {
     if (empty($videoInfo['title'])) {
@@ -163,7 +163,6 @@ if ($ci['ac'] === 'view' && !empty($listCurrentFile)) {
     echo '</video>';
   }
   if ($_SESSION['log'] === true) {
-    $token = genToken();
     echo '<div id="toolbar">
           <a href="?ac=view&amp;op=3&amp;bc=', $ci['bc'], '&amp;file=', $ci['file'], '&amp;token=', $token, '"><img src="images/useThumbnail.svg" alt="Use this thumbnail for folder thumbnail" title="Use this thumbnail for folder thumbnail"/></a>
           <a href="?ac=view&amp;op=4&amp;bc=', $ci['bc'], '&amp;file=', $ci['file'], '&amp;token=', $token, '"><img src="images/delete.svg" alt="Delete this video" title="Delete this video"/></a>
@@ -188,7 +187,7 @@ if ($ci['ac'] === 'view' && !empty($listCurrentFile)) {
         </tr>
         <tr>
           <th>Url</th>
-          <td><a href="', htmlentities($videoInfo['url']), '">', $videoInfo['url'], '</a></td>
+          <td><a href="',  htmlentities($videoInfo['url']), '">', $videoInfo['url'], '</a></td>
         </tr>
         <tr>
           <th>Duration</th>
@@ -201,7 +200,7 @@ if ($ci['ac'] === 'view' && !empty($listCurrentFile)) {
           <th>Via</th>
           <td>';
   if (!empty($videoInfo['via'])) {
-    echo '<a href="', htmlentities($videoInfo['via']), '">', $videoInfo['via'], '</a>';
+    echo '<a href="',  htmlentities($videoInfo['via']), '">', $videoInfo['via'], '</a>';
   } else {
     echo '';
   }
diff --git a/inc/install.php b/inc/install.php
index 8b93427..15677ad 100644
--- a/inc/install.php
+++ b/inc/install.php
@@ -8,7 +8,7 @@
     <label>Password (verification)</label>
     <input type="password" name="passwordVerif" required/>
     <input type="hidden" name="install" value="install"/>
-    <input type="hidden" name="token" value="<?php echo genToken(); ?>"/>
+    <input type="hidden" name="token" value="<?php echo $token; ?>"/>
     <input type="submit" />
   </fieldset>
 </form>
\ No newline at end of file
diff --git a/inc/topMenu.php b/inc/topMenu.php
index 0a2bbe5..2c55800 100644
--- a/inc/topMenu.php
+++ b/inc/topMenu.php
@@ -1,15 +1,20 @@
 <h1 id="title"><a href="index.php">SoViGall <span>Share your videos ..... in webm</span></a></h1>
 
-<ul id="topMenu">
   <?php
   if ($_SESSION['log'] === true) {
     echo '
-  <li><a href="?ac=newDir&amp;bc=', $ci['bc'], '">New directory</a></li>
-  <li><a href="?ac=renDir&amp;bc=', $ci['bc'], '">Rename directory</a></li>
-  <li><a href="?ac=addVideo&amp;bc=', $ci['bc'], '">Add video</a></li>
-  <li><a href="?ac=addThumbnail&amp;bc=', $ci['bc'], '">Add thumbnail</a></li>';
+    <ul class="topMenu">
+      <li><a href="?ac=viewQueue&amp;token=',$token,'">Download queue</a></li>
+    </ul>
+    <ul class="topMenu">
+      <li><a href="?ac=newDir&amp;bc=', $ci['bc'], '">New directory</a></li>
+      <li><a href="?ac=renDir&amp;bc=', $ci['bc'], '">Rename directory</a></li>
+      <li><a href="?ac=addVideo&amp;bc=', $ci['bc'], '">Add video</a></li>
+      <li><a href="?ac=addThumbnail&amp;bc=', $ci['bc'], '">Add thumbnail</a></li>
+    </ul>';
   } else {
-    echo '<li><a href="?ac=login&amp;bc=', $ci['bc'], '">Login</a></li>';
+    echo '<ul class="topMenu">
+    <li><a href="?ac=login&amp;bc=', $ci['bc'], '">Login</a></li>
+    </ul>';
   }
-?>
-</ul>
\ No newline at end of file
+?>
\ No newline at end of file
diff --git a/index.php b/index.php
index b363e11..52812cc 100644
--- a/index.php
+++ b/index.php
@@ -161,9 +161,9 @@ function n_print($data, $name = '') {
 <fieldset style="border: 1px solid orange; padding: 5px;color:#1E1915; background-color: #fff;">';
   echo '
   <legend style="border:1px solid orange;padding: 1px;background-color:#eee;color:orange;">
-    ',      basename($aBackTrace[0]['file']), ' ligne => ', $aBackTrace[0]['line'], '
+    ',         basename($aBackTrace[0]['file']), ' ligne => ', $aBackTrace[0]['line'], '
   </legend>';
-  echo '<pre style="color:#1E1915;">',   htmlentities(print_r($data, 1)), '</pre>';
+  echo '<pre style="color:#1E1915;">',      htmlentities(print_r($data, 1)), '</pre>';
   echo '
 </fieldset>
 <br />';
@@ -251,6 +251,15 @@ function listCurrentDir($breadcrumb) {
   return glob("*", GLOB_ONLYDIR);
 }
 
+function getQueue() {
+  $allHash = glob("tmp/*.hash");
+  if ($allHash) {
+    return count($allHash);
+  } else {
+    return '0';
+  }
+}
+
 function makeBreadcrumb($bc, $fullListDir) {
   $bcToArray = str_split($bc, 8);
   $nbBc = count($bcToArray);
@@ -426,6 +435,13 @@ if (isset($ci['ac']) && !empty($ci['ac'])) {
     }
     $defineThumb = defineThumb($ci['bc'], $ci['file']);
   }
+  if ($ci['ac'] === 'viewQueue') {
+    verifToken($ci['token']);
+    if ($_SESSION['log'] !== true) {
+      die('Tinker say : Pew Pew Pew Pew Pew Pew Pew Pew Pew Pew Pew Pew');
+    }
+    $page = 'admin';
+  }
 }
 ?>
 <!doctype html>
@@ -437,6 +453,7 @@ if (isset($ci['ac']) && !empty($ci['ac'])) {
   </head>
   <body>
     <?php
+    $token = genToken();
     if (!isset($page) && empty($page)) {
       require 'inc/content.php';
     } else {
diff --git a/style.css b/style.css
index dafc90e..407c446 100644
--- a/style.css
+++ b/style.css
@@ -27,19 +27,18 @@ body {
   vertical-align: middle;
 }
 
-#topMenu {
-  margin: 0px;
+.topMenu {
+  margin: 0.5em 0;
   padding: 0px;
-  display: inline-block;
   border-radius: 0.2em;
 }
 
-#topMenu li {
+.topMenu li {
   display: inline-block;
   padding: 0.3em;
 }
 
-#topMenu a {
+.topMenu a {
   text-decoration: none;
   font-weight: bolder;
   margin: 0;