diff options
| -rw-r--r-- | templates/upload_fisheye.tpl | 54 | ||||
| -rw-r--r-- | upload.php | 7 | ||||
| -rw-r--r-- | upload_inc.php | 12 |
3 files changed, 48 insertions, 25 deletions
diff --git a/templates/upload_fisheye.tpl b/templates/upload_fisheye.tpl index 32f3451..d2e708a 100644 --- a/templates/upload_fisheye.tpl +++ b/templates/upload_fisheye.tpl @@ -1,3 +1,13 @@ +{if $gBitSystem->isPackageActive( 'xupload' )} + {include file="bitpackage:xupload/upload_form_inc.tpl"} + {assign var=target value="upload"} + {assign var=id value="xuploadform"} + {assign var=action value="/xupload/cgi/upload.cgi?upload_id="} + {assign var=onsubmit value="return StartUpload();"} +{else} + {assign var=onsubmit value="javascript:disableSubmit('submit_button');"} +{/if} + {strip} <div class="admin fisheye"> <div class="header"> @@ -5,7 +15,7 @@ </div> <div class="body"> - {form enctype="multipart/form-data" legend="Upload Files" onsubmit="javascript:disableSubmit('submit_button');"} + {form enctype="multipart/form-data" legend="Upload Files" onsubmit=$onsubmit id=$id target=$target action=$action} {formfeedback note=$quotaMessage} {formfeedback warning="The maximum file size you can upload is `$uploadMax` Megabytes"} {formfeedback error=$errors} @@ -20,26 +30,30 @@ <input type="hidden" name="image_id" value="{$imageId}"/> <input type="hidden" name="MAX_FILE_SIZE" value="1000000000" /> - <div class="row"> - {formlabel label="Select File(s)"} - {forminput} - <input type="file" name="file0" id="fileupload" /> - {formhelp note="To upload more than one file, please click on choose repeatedly<br />(javascript has to be enabled for this to work)."} - {/forminput} - </div> + {if $gBitSystem->isPackageActive( 'xupload' )} + {include file="bitpackage:xupload/upload_body_inc.tpl"} + {else} + <div class="row"> + {formlabel label="Select File(s)"} + {forminput} + <input type="file" name="file0" id="fileupload" /> + {formhelp note="To upload more than one file, please click on choose repeatedly<br />(javascript has to be enabled for this to work)."} + {/forminput} + </div> - <div class="row"> - {formlabel label="Selected File(s)" for=""} - {forminput} - <div id="fileslist"></div> - <div class="clear"></div> - {formhelp note="These files will be uploaded when you hit the upload button below."} - <script type="text/javascript">/* <![CDATA[ Multi file upload */ - var multi_selector = new MultiSelector( document.getElementById( 'fileslist' ), 10 ); - multi_selector.addElement( document.getElementById( 'fileupload' ) ); - /* ]]> */</script> - {/forminput} - </div> + <div class="row"> + {formlabel label="Selected File(s)" for=""} + {forminput} + <div id="fileslist"></div> + <div class="clear"></div> + {formhelp note="These files will be uploaded when you hit the upload button below."} + <script type="text/javascript">/* <![CDATA[ Multi file upload */ + var multi_selector = new MultiSelector( document.getElementById( 'fileslist' ), 10 ); + multi_selector.addElement( document.getElementById( 'fileupload' ) ); + /* ]]> */</script> + {/forminput} + </div> + {/if} {if $gBitUser->hasPermission( 'p_fisheye_upload_nonimages' )} <div class="row"> @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_fisheye/upload.php,v 1.11 2006/04/11 13:04:24 squareing Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_fisheye/upload.php,v 1.12 2006/05/02 11:24:52 squareing Exp $ * @package fisheye * @subpackage functions */ @@ -28,6 +28,7 @@ if( !empty( $_REQUEST['save_image'] ) ) { $upImages = array(); $upArchives = array(); $upErrors = array(); + foreach( array_keys( $_FILES ) as $key ) { if( preg_match( '/(^image|pdf)/i', $_FILES[$key]['type'] ) ) { $upImages[$key] = $_FILES[$key]; @@ -102,7 +103,9 @@ $galleryList = $gFisheyeGallery->getList( $listHash ); $gBitSmarty->assign_by_ref( 'galleryList', $galleryList['data'] ); $gBitSmarty->assign( 'uploadMax', $uploadMax ); -$gBitSmarty->assign( 'loadMultiFile', TRUE ); +if( !$gBitSystem->isPackageActive( 'xupload' ) ) { + $gBitSmarty->assign( 'loadMultiFile', TRUE ); +} $gBitSystem->display( 'bitpackage:fisheye/upload_fisheye.tpl', 'Upload Images' ); ?> diff --git a/upload_inc.php b/upload_inc.php index 253eabe..f98622f 100644 --- a/upload_inc.php +++ b/upload_inc.php @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_fisheye/upload_inc.php,v 1.6 2006/04/11 13:04:24 squareing Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_fisheye/upload_inc.php,v 1.7 2006/05/02 11:24:52 squareing Exp $ * @package fisheye * @subpackage functions */ @@ -33,7 +33,10 @@ function fisheye_get_default_gallery_id( $pUserId, $pNewName ) { * fisheye_store_upload */ function fisheye_store_upload( &$pFileHash, $pOrder = 10 ) { - if( !empty( $pFileHash ) && ($pFileHash['size'] > 0) && is_uploaded_file( $pFileHash['tmp_name'] ) ) { + global $gBitSystem; + // when xupload is active, is_uploaded_file() doesn't work anymore since + // the file has been handled by xupload + if( !empty( $pFileHash ) && ( $pFileHash['size'] > 0 ) && ( $gBitSystem->isPackageActive( 'xupload' ) || is_uploaded_file( $pFileHash['tmp_name'] ) ) ) { // make a copy for each image we need to store $storeHash = $_REQUEST; $image = new FisheyeImage(); @@ -44,8 +47,11 @@ function fisheye_store_upload( &$pFileHash, $pOrder = 10 ) { if( !$image->store( $storeHash ) ) { array_merge( $upErrors, array_values( $image->mErrors ) ); } - $image->addToGalleries( $_REQUEST['galleryAdditions'], $pOrder ); + // if we're using xupload, we want to remove the temp files + if( $gBitSystem->isPackageActive( 'xupload' ) ) { + //@unlink( $pFileHash['tmp_name'] ); + } } } |