most of the new upload system, barely tested and not finished...

2 files changed, 147 insertions, 84 deletions

diff --git a/templates/show_upload.inc b/templates/show_upload.inc
index 2fbef3e6..8cc7e8f4 100644
--- a/templates/show_upload.inc
+++ b/templates/show_upload.inc
@@ -1,84 +1,78 @@
-<?php

-/*      

-

- Copyright (c) 2001 - 2005 Ampache.org

- All rights reserved.

-

- *Created by Lamar*

-

- This program is free software; you can redistribute it and/or

- modify it under the terms of the GNU General Public License

- as published by the Free Software Foundation; either version 2

- of the License, or (at your option) any later version.

-

- This program is distributed in the hope that it will be useful,

- but WITHOUT ANY WARRANTY; without even the implied warranty of

- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- GNU General Public License for more details.

-        

- You should have received a copy of the GNU General Public License

- along with this program; if not, write to the Free Software

- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-                

-*/   

-?>

-<center>

-  <h3>

-      <?php echo _("Please Ensure All Files Are Tagged Correctly"); ?>!<br />

-  </h3>

-  <p>

-      <?php echo _("Ampache relies on id3 tags to sort data.  If your file is not tagged it may be deleted."); ?>

-  </p>

-

-<form action="<?php echo conf('web_path'); ?>/upload.php?" method="post" name="upload_form" enctype="multipart/form-data" id="upload_form">

-  <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo _("max_upload_size"); ?>" />

-  <table class="tabledata" cellspacing="0" cellpadding="0" border="0" width="90%" align="center">

-     <tr align="center">

-          <td>

-               <input size="40" type="file" name="ul_path1" id="ul_path1" />

-          </td>

-     </tr>  

-     <tr align="center">

-          <td>

-               <input size="40" type="file" name="ul_path2" id="ul_path2" />

-          </td>

-     </tr>  

-     <tr align="center">

-          <td>

-               <input size="40" type="file" name="ul_path3" id="ul_path3" />

-          </td>

-     </tr>  

-     <tr align="center">

-          <td>

-               <input size="40" type="file" name="ul_path4" id="ul_path4" />

-          </td>

-     </tr>  

-     <tr align="center">

-          <td>	

-		<input type="hidden" name="action" value="upload_now" />

-               <input type="submit" value="<?php echo _("Upload"); ?>" />

-          </td>

-     </tr>  

-  </table>

-</form>

-

-<table align="center" border = "0">

-  <tr>

-   <td>

-   Acceptable formats include:

-   <ul>

-     <li>.mp3</li>

-     <li>.ogg</li>

-     <li>.wma</li>

-     <li>.flac</li>

-   </ul>

-   </td>

-  </tr>

-</table>

-<!-- 

-<p> 

-  <?php echo _("Minimum Accepted Bitrate is"); ?> <?php echo $site->prefs['upload_bitrate'] ?> kbps

-</p>

--->

-</center>

-

+<?php
+/*      
+
+ Copyright (c) 2001 - 2005 Ampache.org
+ All rights reserved.
+
+ *Created by Lamar*
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+        
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+                
+*/   
+?>
+
+<form action="<?php echo conf('web_path'); ?>/upload.php?" method="post" name="upload_form" enctype="multipart/form-data" id="upload_form">
+<table class="text-box" cellspacing="0" cellpadding="0" border="0">
+<tr>
+	<td>
+		<h3><?php echo _("Uploading Music to Ampache"); ?><br></h3>
+		<p>
+		<b><?php echo _("The following Audio file formats are supported"); ?></b>
+		<ul>
+			<li>OGG</li>
+			<li>Mp3</li>
+			<li>Mpc</li>
+			<li>Flac</li>
+			<li>WMA</li>
+			<li>Mp4/M4a/AAC</li>
+		</ul>
+		</p>
+		<?php $GLOBALS['error']->print_error('general'); ?>
+	</td>
+</tr>
+<tr>
+	<td>
+               <input size=40 type="file" name="ul_path1" id="ul_path1">
+	       <?php $GLOBALS['error']->print_error('ul_path1'); ?>
+        </td>
+</tr>  
+<tr>
+	<td>
+               <input size=40 type="file" name="ul_path2" id="ul_path2">
+		<?php $GLOBALS['error']->print_error('ul_path2'); ?>
+        </td>
+</tr>  
+<tr>
+        <td>
+	        <input size=40 type="file" name="ul_path3" id="ul_path3">
+		<?php $GLOBALS['error']->print_error('ul_path3'); ?>
+	</td>
+</tr>  
+<tr>
+        <td>
+	        <input size=40 type="file" name="ul_path4" id="ul_path4">
+		<?php $GLOBALS['error']->print_error('ul_path3'); ?>
+        </td>
+</tr>  
+<tr>
+        <td>	
+		<input type="hidden" name="action" value="upload">
+  		<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo _("max_upload_size"); ?>" />
+               	<input type="submit" value="<?php echo _("Upload"); ?>">
+          </td>
+</tr>  
+</table>
+</form>
+
diff --git a/templates/show_uploads.inc b/templates/show_uploads.inc
new file mode 100644
index 00000000..04d43dd3
--- /dev/null
+++ b/templates/show_uploads.inc
@@ -0,0 +1,69 @@
+<?php
+/*      
+
+ Copyright (c) 2001 - 2005 Ampache.org
+ All rights reserved.
+
+ *Created by Rosensama*
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+        
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+                
+*/   
+
+/* Get the current Quarantined Uploads */
+$uploads = get_uploads(); 
+
+if (count($uploads)) { 
+?>
+<table class="tabledata" cellspacing="0" cellpadding="0" border="1" align="center">
+<tr class="table-header">
+	<td><?php echo _('Action'); ?></td>
+	<td><?php echo _('Status'); ?></td>
+	<td><?php echo _('Song'); ?></td>
+	<td><?php echo _('Artist'); ?></td>
+	<td><?php echo _('Album'); ?></td>
+	<td><?php echo _('Genre'); ?></td>
+	<td><?php echo _('Time'); ?></td>
+	<td><?php echo _('Bitrate'); ?></td>
+	<td><?php echo _('Size'); ?></td>
+	<td><?php echo _('Filename'); ?></td>
+	<td><?php echo _('User'); ?></td>
+	<td><?php echo _('Date'); ?></td>
+</tr>
+<?php foreach ($uploads as $upload) { ?>
+<tr class="<?php echo flip_class(); ?>">
+	<?php if($GLOBALS['user']->has_access(100)) { ?>
+	<td>
+		<a href="<?php echo conf('web_path'); ?>/upload.php?action=add&id=<?php echo $upload['id']; ?>"><?php echo _('Add'); ?></a>&nbsp;|&nbsp;
+		<a href="<?php echo conf('web_path'); ?>/upload.php?action=delete&id=<?php echo $upload['id']; ?>"><?php echo _('Delete'); ?></a>
+	</td>
+	<?php } else { ?>
+	<td>N/A</td>
+	<?php } ?>
+	<td><?php echo ucfirst($upload['action']); ?></td>
+	<td><?php echo $upload['title']; ?></td>
+	<td><?php echo $upload['artist']; ?></td>
+	<td><?php echo $upload['album']; ?></td>
+	<td><?php echo $upload['time']; ?></td>
+	<td><?php echo $upload['genre']; ?></td>
+	<td><?php echo intval($upload['bitrate']/1000); ?> - <?php echo $upload['mode']; ?></td>
+	<td><?php echo sprintf("%.2f",($upload['size']/1048576)); ?>MB</td>
+	<td><?php echo $upload['file']; ?></td>
+	<td><?php echo $upload['user']; ?></td>
+	<td><?php echo date('m/d/Y H:i:s',$upload['addition_time']); ?></td>
+</tr>
+<?php } ?>
+</table>
+<?php } // if count uploads ?>