[Openupload-svn-update] SF.net SVN: openupload:[327] trunk

[<ts...@us...>]

Revision: 327
          http://openupload.svn.sourceforge.net/openupload/?rev=327&view=rev
Author:   tsdogs
Date:     2009-06-16 16:44:57 +0000 (Tue, 16 Jun 2009)

Log Message:
-----------
new data structure

Modified Paths:
--------------
    trunk/lib/modules/default/files.inc.php
    trunk/templates/default/modules/admin/pluginoptionadd.tpl
    trunk/templates/default/modules/files/uploadForm.tpl

Added Paths:
-----------
    trunk/data/templates_c/

Removed Paths:
-------------
    trunk/templates_c/


Property changes on: trunk/data/templates_c
___________________________________________________________________
Added: svn:ignore
   + %%*

Added: svn:mergeinfo
   + 

Modified: trunk/lib/modules/default/files.inc.php
===================================================================
--- trunk/lib/modules/default/files.inc.php	2009-06-16 16:43:16 UTC (rev 326)
+++ trunk/lib/modules/default/files.inc.php	2009-06-16 16:44:57 UTC (rev 327)
@@ -1,5 +1,10 @@
 <?php
 
+
+function cgiupload_get_info($fid) {
+  return array();
+}
+
 class FilesModule extends OpenUploadModule {
 var $actions = array (
       "u" => array (
@@ -68,6 +73,7 @@
 
     unset($_SESSION['user']['u']);
     $_SESSION['user']['identifier']=randomName(40,40);
+    $this->tpl->assign('uploadscript',$_SERVER['PHP_SELF']);
     switch (app()->config['progress']) {
       case 'uploadprogress':
         $this->tpl->assign('identifiername','UPLOAD_IDENTIFIER');
@@ -75,6 +81,30 @@
       case 'apc':
         $this->tpl->assign('identifiername',ini_get('apc.rfc1867_name'));
         break;
+      case 'cgi':
+        $_SESSION['user']['identifier']=randomName(32,32);
+        $this->tpl->assign('uploadscript',app()->config['progress_cgi'].'?upload_id='.session_id());
+        /* update information on the file */
+$_CGI['temp_dir'] = '/tmp/';
+$_CGI['upload_id'] = $_SESSION['user']['identifier'];
+$_CGI['upload_dir'] = '/tmp/';
+$_CGI['path_to_link_file'] = '/tmp/'.session_id().'.link';
+$_CGI['embedded_upload_results'] = 0;
+$_CGI['redirect_method'] = 1;
+$_CGI['redirect_url'] = app()->config['WWW_SERVER'].app()->config['WWW_ROOT'].'/';
+$_CGI['cgi_upload_hook'] = 0;
+$_CGI['debug_upload'] = 0;
+$_CGI['delete_link_file'] = 0;
+$_CGI['purge_temp_dirs'] = 1;
+$_CGI['purge_temp_dirs_limit'] = 1;
+$_CGI['max_upload_size'] = $_SESSION['user']['max_upload_size'];
+$c = '';
+foreach ($_CGI as $k => $value) {
+  $c .= $k.'<=>'.$value."\n";
+}
+        file_put_contents('/tmp/'.session_id().'.link',$c);
+        $this->tpl->assign('identifiername','UPLOAD_IDENTIFIER');
+        break;
       default: 
         $this->tpl->assign('identifiername','UPLOAD_IDENTIFIER');
         break;
@@ -99,9 +129,10 @@
           $res = uploadprogress_get_info($_SESSION['user']['identifier']);
           if (isset($res['bytes_uploaded'])) {
             $progress['complete'] = $res['bytes_uploaded'];
-            if ($res['bytes_total']>0)
+            if ($res['bytes_total']>0) {
               $progress['total'] = $res['bytes_total'];
-            $progress['percentage'] = floor(($res['bytes_uploaded'] / $res['bytes_total'])*100);
+              $progress['percentage'] = floor(($res['bytes_uploaded'] / $res['bytes_total'])*100);
+            }
             $progress['files'] = $res['files_uploaded'];
           }
           break;
@@ -115,11 +146,23 @@
             $progress['files'] = 0;
           }
           break;
+        case 'cgixyz':
+          $res = cgiupload_get_info($_SESSION['user']['identifier']);
+          if (isset($res['bytes_uploaded'])) {
+            $progress['complete'] = $res['bytes_uploaded'];
+            if ($res['bytes_total']>0) {
+              $progress['total'] = $res['bytes_total'];
+              $progress['percentage'] = floor(($res['bytes_uploaded'] / $res['bytes_total'])*100);
+            }
+            $progress['files'] = $res['files_uploaded'];
+          }
+          break;
       }
       app()->tpl->assign('progress',$progress);
       app()->display('modules/files/uploadProgress');
       exit;
     }
+    echo 'user not allowed';
     exit;
   }
 
@@ -128,6 +171,12 @@
     global $_FILES;
     global $_SERVER;
 
+    switch (app()->config['progress']) {
+       case 'cgi':
+         /* populate the variables so that it will be available to the following code */
+         
+         break;
+    }
     if (isset($_FILES['upload'])) {
       if ($_FILES['upload']['error']>0) {
         switch ($_FILES['upload']['error']) { /* taken from here: http://it.php.net/manual/en/features.file-upload.errors.php */
@@ -182,7 +231,6 @@
     } else if (!isset($_SESSION['user']['u'][0])) {
       redirect();
     }
-    $result = app()->pluginAction('uploadOptions',$_SESSION['user']['u']);
     if (!$result) { /* some plugin blocked the upload */
       /* remove the files */
       unset($_SESSION['user']['u']);

Modified: trunk/templates/default/modules/admin/pluginoptionadd.tpl
===================================================================
--- trunk/templates/default/modules/admin/pluginoptionadd.tpl	2009-06-16 16:43:16 UTC (rev 326)
+++ trunk/templates/default/modules/admin/pluginoptionadd.tpl	2009-06-16 16:44:57 UTC (rev 327)
@@ -24,4 +24,4 @@
 {/foreach}
 <tr><td colspan="2" align=right><input type="submit" class="submit" value="{tr}Confirm{/tr}"></td></tr>
 </table>
-</form>
\ No newline at end of file
+</form>

Modified: trunk/templates/default/modules/files/uploadForm.tpl
===================================================================
--- trunk/templates/default/modules/files/uploadForm.tpl	2009-06-16 16:43:16 UTC (rev 326)
+++ trunk/templates/default/modules/files/uploadForm.tpl	2009-06-16 16:44:57 UTC (rev 327)
@@ -26,7 +26,7 @@
 </script>
 {/literal}<br />
 <div id="upload">
-<form method="post" enctype='multipart/form-data' action="{$script}" name="uploadform">
+<form method="post" enctype='multipart/form-data' action="{$uploadscript}" name="uploadform">
 <input type="hidden" name="action" value="{$action}">
 <input type="hidden" name="step" value="{$nextstep}">
 {if isset($user.max_upload_size)}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.