[Gforge-commits] gforge/www/docman index.php, 1.13, 1.14 new.php, 1.14, 1.15

[tperdue]

Update of /cvsroot/gforge/gforge/www/docman
In directory db.perdue.net:/home/tperdue/share/dev.gforge.org/www/docman

Modified Files:
        index.php new.php 
Log Message:
Adding URL support to docman - URL can be used to reference offsite file rather 
than uploading file

Index: index.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/docman/index.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- index.php   21 Oct 2003 11:35:55 -0000      1.13
+++ index.php   5 May 2004 22:28:02 -0000       1.14
@@ -72,7 +72,7 @@
                        print "\n\n<li><strong>". $d_arr[$i]->getDocGroupName() 
."</strong></li><li style=\"list-style: none\"><ul>";
                        $last_group=$d_arr[$i]->getDocGroupID();
                }
-               print "\n<li><a 
href=\"view.php/$group_id/".$d_arr[$i]->getID()."/".$d_arr[$i]->getFileName()."\">".
+               print "\n<li><a href=\"".(( $d_arr[$i]->isURL() ) ? 
$d_arr[$i]->getFileName() : 
"view.php/$group_id/".$d_arr[$i]->getID()."/".$d_arr[$i]->getFileName() )."\">".
                        $d_arr[$i]->getName()." [ ".$d_arr[$i]->getFileName()." 
]</a>".
                        "\n<br 
/><em>".$Language->getText('docman','description').":</em> 
".$d_arr[$i]->getDescription()."</li>\n";
        }

Index: new.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/docman/new.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- new.php     12 Feb 2003 14:24:39 -0000      1.14
+++ new.php     5 May 2004 22:28:02 -0000       1.15
@@ -26,8 +26,10 @@
        exit_no_group();
 }
 $g =& group_get_object($group_id);
-if (!$g || !is_object($g) || $g->isError()) {
-       exit_no_group();
+if (!$g || !is_object($g)) {
+       exit_error('Error','Could Not Get Group');
+} elseif ($g->isError()) {
+       exit_error('Error',$g->getErrorMessage());
 }
 
 if ($submit){
@@ -37,17 +39,10 @@
                
exit_error($Language->getText('general','error'),$Language->getText('docman_new','no_valid_group'));
        }
 
-       if (!$title || !$description) {
-               exit_missing_param();
-       }
-
-       if (!$uploaded_data) {
+       if (!$title || !$description || (!$uploaded_data && !$file_url)) {
                exit_missing_param();
        }
 
-       if (!is_uploaded_file($uploaded_data)) {
-               
exit_error($Language->getText('general','error'),$Language->getText('general','invalid_filename'));
-       }
        $d = new Document($g);
        if (!$d || !is_object($d)) {
                
exit_error($Language->getText('general','error'),$Language->getText('docman_new','error_blank_document'));
@@ -55,7 +50,17 @@
                
exit_error($Language->getText('general','error'),$d->getErrorMessage());
        }
 
-       $data = addslashes(fread(fopen($uploaded_data, 'r'), 
filesize($uploaded_data)));
+       if ($uploaded_data) {
+               if (!is_uploaded_file($uploaded_data)) {
+                       
exit_error($Language->getText('general','error'),$Language->getText('general','invalid_filename'));
+               }
+               $data = addslashes(fread(fopen($uploaded_data, 'r'), 
filesize($uploaded_data)));
+               $file_url='';
+       } elseif ($file_url) {
+               $data = '';
+               $uploaded_data_name=$file_url;
+               $uploaded_data_type='URL';
+       }
        if 
(!$d->create($uploaded_data_name,$uploaded_data_type,$data,$doc_group,$title,$language_id,$description))
 {
                
exit_error($Language->getText('general','error'),$d->getErrorMessage());
        } else {
@@ -91,7 +96,10 @@
        <tr>
                <td>
                <strong>        <?php echo 
$Language->getText('docman_new','upload_file') ?> :</strong><?php echo 
utils_requiredField(); ?><br />
-               <input type="file" name="uploaded_data" size="30" />
+               <input type="file" name="uploaded_data" size="30" /><br /><br />
+               <strong>        <?php echo 
$Language->getText('docman_new','upload_url') ?> :</strong><?php echo 
utils_requiredField(); ?><br />
+               <input type="text" name="file_url" size="50" />
+               </td>
                </td>
        </tr>