Changeset 19875 for extensions/File_Uploader/admin

Timestamp:

Jan 6, 2013, 1:53:17 AM (12 years ago)

Author:

julien1311

Message:

[file_uploader] lots of bug fixes

Location:

extensions/File_Uploader/admin

Files:

• admin_upload.php (modified) (11 diffs)
• admin_upload.tpl (modified) (1 diff)

extensions/File_Uploader/admin/admin_upload.php

@@ -3 +3 @@
 
 include_once(PHPWG_ROOT_PATH . 'include/functions.inc.php');
+include_once(PHPWG_ROOT_PATH . 'admin/include/functions_upload.inc.php');
 
 global $template, $conf, $user, $page;
@@ -15 +16 @@
                         $file_uploader_errors['file'] = $file_uploader_upload_file['errors'];
         } else {
-                $file_uploader_errors['file']['no_file'] = 'Specify a file to upload';
+                $file_uploader_errors['file']['no_file'] = l10n('Specify a file to upload');
         }
         
@@ -37 +38 @@
 
 function file_uploader_upload_file($file_uploader_file) {
-        include_once(dirname(__FILE__).'/install/config_default.inc.php');
+        require(FILE_UPLOADER_PATH.'install/config_default.inc.php');
+        require_once(FILE_UPLOADER_PATH.'install/functions.inc.php');
         
         global $conf;
@@ -43 +45 @@
         
         $file_uploader_file_tmp = $file_uploader_file['tmp_name'];
+        $file_uploader_file_title = substr($file_uploader_file['name'], 0, strrpos($file_uploader_file['name'], '.'));
         $file_uploader_file_name = preg_replace('/[^a-zA-Z0-9s.]/', '_', $file_uploader_file['name']);
         $file_uploader_file_name_wo_extension = substr($file_uploader_file_name, 0, strrpos($file_uploader_file_name, '.'));
@@ -58 +61 @@
         $return = array();
         
+        $return['title'] = $file_uploader_file_title;
         $return['name_wo_extension'] = $file_uploader_file_name_wo_extension;
         $return['extension'] = $file_uploader_file_extension;
@@ -64 +68 @@
         $return['size'] = $file_uploader_file_size;
         $return['overwrite'] = false;
+        
+        //Check if the folder file_uploader exists
+        file_uploader_folder($file_uploader_galleries_folder, $file_uploader_galleries_dir, $file_uploader_galleries_folder_name);
         
         //If the directory does not exist, we create it
@@ -74 +81 @@
                         $category_rank = pwg_db_fetch_assoc(pwg_query('SELECT MAX(rank) FROM '.CATEGORIES_TABLE.';'));
                         $category_rank = $category_rank['MAX(rank)'] + 1;
-                        $file_uploader_physical_category_id = pwg_db_fetch_assoc(pwg_query('SELECT id FROM '.CATEGORIES_TABLE.' WHERE name = "'.$file_uploader_galleries_folder.'";'));
-                        pwg_query('INSERT INTO '.CATEGORIES_TABLE.' (id, name, dir, rank, status, visible, uppercats, global_rank, site_id) VALUES ('.$next_id.', "'.$file_uploader_file_category.'", "'.$file_uploader_file_category.'", '.$category_rank.', "private", "'.boolean_to_string($conf['newcat_default_visible']).'", "'.$file_uploader_physical_category_id.'", '.$category_rank.', 1);');
+                        $file_uploader_physical_category = pwg_db_fetch_assoc(pwg_query('SELECT id FROM '.CATEGORIES_TABLE.' WHERE dir = "'.$file_uploader_galleries_folder.'";'));
+                        $insert = array(
+                                'id' => $next_id,
+                                'name' => $file_uploader_file_category,
+                                'id_uppercat' => $file_uploader_physical_category['id'],
+                                'comment' => 'Created by the File Uploader plugin',
+                                'dir' => $file_uploader_file_category,
+                                'rank' => $category_rank,
+                                'status' => 'private',
+                                'visible' => boolean_to_string($conf['newcat_default_visible']),
+                                'uppercats' => $next_id.','.$file_uploader_physical_category['id'],
+                                'global_rank' => $category_rank,
+                                'site_id' => '1',
+                        );
+                        single_insert(CATEGORIES_TABLE, $insert);
                 }
         
@@ -117 +137 @@
 
 function file_uploader_upload_thumbnail($file_uploader_thumbnail, $file_uploader_file_name_wo_extension, $file_uploader_file_extension, $file_uploader_file_folder) {
-        include_once(dirname(__FILE__).'/install/config_default.inc.php');
+        require(FILE_UPLOADER_PATH.'install/config_default.inc.php');
         
         $file_uploader_thumbnail_tmp = $file_uploader_thumbnail['tmp_name'];
@@ -179 +199 @@
         $insert = array(
                 'file' => substr(strrchr($file_path, '/'), 1),
-                'name' => pwg_db_real_escape_string($file_uploader_file_properties['title']),
+                'name' => ($file_uploader_file_properties['title'] != '') ? pwg_db_real_escape_string($file_uploader_file_properties['title']) : $file_uploader_file['title'],
                 'comment' => pwg_db_real_escape_string($file_uploader_file_properties['description']),
                 'date_available' => $dbnow,
@@ -199 +219 @@
         }
         
+        if (!is_array($image_id))
+                $image_id = array($image_id);
+        
         if(isset($file_uploader_file_properties['category']) and count($file_uploader_file_properties['category']) > 0) {
                 associate_images_to_categories(
-                        array($image_id),
+                        $image_id,
                         array($file_uploader_file_properties['category'], $physical_category_id['id'])
                 );
         }
         
-        @fill_caddie(array($image_id));
+        @fill_caddie($image_id);
 }
 
@@ -214 +237 @@
 display_select_cat_wrapper($query, array(), 'category_parent_options');
 
+//Add parameters to template
+$upload_max_filesize = min(get_ini_size('upload_max_filesize'), get_ini_size('post_max_size'));
+if ($upload_max_filesize == get_ini_size('upload_max_filesize')) {
+        $upload_max_filesize = get_ini_size('upload_max_filesize', true);
+} else {
+        $upload_max_filesize = get_ini_size('post_max_filesize', true);
+}
+$upload_max_filesize_display = round($upload_max_filesize/1024, 0, PHP_ROUND_HALF_DOWN);
+
+$template->assign(
+    array(
+                'upload_max_filesize' => $upload_max_filesize,
+                'upload_max_filesize_display' => $upload_max_filesize_display,
+    )
+);
+
 $template->set_filenames(array('plugin_admin_content' => dirname(__FILE__) . '/admin_upload.tpl')); 
 $template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');

extensions/File_Uploader/admin/admin_upload.tpl

@@ -15 +15 @@
                                 <input name="file_uploader_file" type="file" value=""{if isset($file_uploader_errors.file)} class="file_uploader_error"{/if}>
                                 {foreach from=$file_uploader_errors.file item=error_description}<span class="file_uploader_error_description" title="{$error_description}">!</span>{/foreach}
+                                <input type="hidden" name="MAX_FILE_SIZE" value="{$upload_max_filesize}">
+                        </p>
+                        <p class="file_uploader_center">
+                                {'file_uploader_upload_max_filesize'|@translate} {$upload_max_filesize_display} Kio.
                         </p>
                 </fieldset>