WordPress.org
Get WordPress

Plugin Directory

Changeset 660375


Ignore:
Timestamp:
01/28/2013 10:54:45 PM (13 years ago)
Author:
fabifott
Message:

WP-Filebase 0.2.9.34

  • Custom language files dir can be set with PHP constant WPFB_LANG_DIR in wp-config.php
  • Fixed quote escaping in template IF expressions
  • Fixed flash uploader behavior when uploading file updates
Location:
wp-filebase
Files:
274 added
11 edited

Legend:

Unmodified
Added
Removed

  • wp-filebase/trunk/classes/Admin.php

    r655439 r660375  
    476476       
    477477        $childs = $cat->GetChildCats(true);
    478         foreach($childs as $child) $child->SetReadPermissions($cur);
     478        foreach($childs as $child) {
     479            $child->Lock(true);
     480            $child->SetReadPermissions($cur);
     481            $child->Lock(false);
     482            $child->DBSave();
     483        }
    479484    }
    480485       
    … …  
    568573        $file_name = $upload ? str_replace('\\','',$data->file_upload['name']) : ((empty($file_src_path) && $update) ? $file->file_name : basename($file_src_path));       
    569574    }
     575   
     576    if($upload) $data->file_rename = null;
    570577       
    571578   

  • wp-filebase/trunk/classes/AdvUploader.php

    r655420 r660375  
    1 <?php class WPFB_AdvUploader {
     1<?php abstract class WPFB_AdvUploader {
    22   
    33    var $uploader;
    44    var $form_url;
     5    var $id;
     6    var $is_edit;
    57   
    6     static function GetAjaxAuthData($json=false)
     8    public static function Create($form_url, $is_edit=false)
     9    {
     10        $uploader_class = (version_compare(get_bloginfo('version'), '3.2.1') <= 0) ? 'SWFUpload' : 'PLUpload';
     11        wpfb_loadclass($uploader_class);
     12        $uploader_class = "WPFB_".$uploader_class;
     13
     14        return new $uploader_class($form_url, $is_edit);
     15    }
     16   
     17    function GetAjaxAuthData($json=false)
    718    {
    819        $frontend = !is_admin() && !defined('WPFB_EDITOR_PLUGIN');
    … …  
    1223            "_wpnonce" => wp_create_nonce(WPFB.'-async-upload'),
    1324            "frontend_upload" => $frontend,
    14             "file_add_now" => !$frontend
     25            "file_add_now" => (!$frontend && !$this->is_edit)
    1526        );
    1627        return $json ? trim(json_encode($dat),'{}') : $dat;
    1728    }
    1829   
    19     public function __construct($form_url)
     30    function WPFB_AdvUploader($form_url, $is_edit=false)
    2031    {
    21         $uploader_class = (version_compare(get_bloginfo('version'), '3.2.1') <= 0) ? 'SWFUpload' : 'PLUpload';
    22         wpfb_loadclass($uploader_class);
    23         $uploader_class = "WPFB_".$uploader_class;
    24         $this->uploader = new $uploader_class;
    2532        $this->form_url = $form_url;
     33        $this->id = uniqid();
     34        $this->is_edit = $is_edit;
    2635    }
    2736   
    2837    function PrintScripts($prefix='', $auto_submit=false)
    2938    {
    30         $this->uploader->Scripts($prefix);
     39        $this->Scripts($prefix);
    3140        ?>
    3241       
    … …  
    4958    if(jQuery('#file_flash_upload').val() != '0') {
    5059        jQuery.ajax({type: 'POST', async: true, url:"<?php echo esc_attr( WPFB_PLUGIN_URI.'wpfb-async-upload.php' ); ?>",
    51         data: {<?php echo WPFB_AdvUploader::GetAjaxAuthData(true) ?> , "delupload": jQuery('#file_flash_upload').val()},
     60        data: {<?php echo $this->GetAjaxAuthData(true) ?> , "delupload": jQuery('#file_flash_upload').val()},
    5261        success: (function(data){})
    5362        });

  • wp-filebase/trunk/classes/Core.php

    r655420 r660375  
    2626   
    2727    // load lang
    28     $lang_dir = basename(WPFB_PLUGIN_ROOT).'/languages';
     28    $lang_dir = defined('WPFB_LANG_DIR') ? ('../../'.WPFB_LANG_DIR) : basename(WPFB_PLUGIN_ROOT).'/languages';
    2929    load_plugin_textdomain(WPFB, 'wp-content/plugins/'.$lang_dir, $lang_dir);
    3030

  • wp-filebase/trunk/classes/Output.php

    r655420 r660375  
    440440                    $adv_uploader->Display($prefix);
    441441                } ?>
    442                 <small><?php printf(str_replace('%d%s','%s',__('Maximum upload file size: %d%s'/*def*/)), WPFB_Output::FormatFilesize(WPFB_Core::GetMaxUlSize())) ?></small>
     442                <small><?php printf(str_replace('%d%s','%s',__('Maximum upload file size: %d%s.'/*def*/)), WPFB_Output::FormatFilesize(WPFB_Core::GetMaxUlSize())) ?></small>
    443443               
    444444                <?php if(empty($auto_submit)) { ?><div style="float: right; text-align:right;"><input type="submit" class="button-primary" name="submit-btn" value="<?php _ex('Add New', 'file'); ?>" /></div>

  • wp-filebase/trunk/classes/PLUpload.php

    r639699 r660375  
    11<?php
    22
    3 class WPFB_PLUpload
    4 {
    5     var $id;
    6    
    7     function __construct()
    8     {
    9         $this->id = uniqid();
    10     }
    11    
     3class WPFB_PLUpload extends WPFB_AdvUploader
     4{   
    125    function Scripts($prefix)
    136    {
    … …  
    3528    }
    3629   
    37 function Display($form_url) {
     30function Display() {
    3831
    3932global $is_IE, $is_opera;
    … …  
    7164    'multipart' => true,
    7265    'urlstream_upload' => true,
    73     'multipart_params' => WPFB_AdvUploader::GetAjaxAuthData()
     66    'multipart_params' => $this->GetAjaxAuthData()
    7467);
    7568
    … …  
    8982<div id="drag-drop-area">
    9083    <div class="drag-drop-inside">
    91     <p class="drag-drop-info"><?php _e('Drop files here'); ?> - <?php _ex('or', 'Uploader: Drop files here - or - Select Files'); ?> - <span class="drag-drop-buttons"><input id="plupload-browse-button" type="button" value="<?php esc_attr_e('Select Files'); ?>" class="button" /></span></p>
     84    <p class="drag-drop-info"><?php _e('Drop files here - or -',WPFB); ?> <span class="drag-drop-buttons"><input id="plupload-browse-button" type="button" value="<?php esc_attr_e('Select Files'); ?>" class="button" /></span></p>
    9285    </div>
    9386</div>

  • wp-filebase/trunk/classes/SWFUpload.php

    r630203 r660375  
    11<?php
    22
    3 class WPFB_SWFUpload
     3class WPFB_SWFUpload extends WPFB_AdvUploader
    44{
    5     var $id;
    6    
    7     function __construct()
    8     {
    9         $this->id = uniqid();
    10     }
    11    
    125    function Scripts($prefix)
    136    {
    … …  
    3730    }
    3831   
    39     function Display($form_url) {
     32    function Display() {
    4033
    4134// #8545. wmode=transparent cannot be used with SWFUpload
    … …  
    6356            file_post_name: "async-upload",
    6457            file_types: "<?php echo apply_filters('upload_file_glob', '*.*'); ?>",
    65             post_params : { <?php echo WPFB_AdvUploader::GetAjaxAuthData(); ?> },
     58            post_params : { <?php echo $this->GetAjaxAuthData(); ?> },
    6659            file_size_limit : "<?php
    6760            require_once(ABSPATH . 'wp-admin/includes/template.php');

  • wp-filebase/trunk/classes/Setup.php

    r655439 r660375  
    546546    WPFB_Admin::SettingsUpdated($old_options, get_option(WPFB_OPT_NAME));
    547547    self::ProtectUploadPath();
    548     WPFB_Admin::FlushRewriteRules();
    549548   
    550549    WPFB_Admin::WPCacheRejectUri(WPFB_Core::GetOpt('download_base') . '/', $old_options['download_base'] . '/');
    … …  
    563562    if(!get_option('wpfb_install_time')) add_option('wpfb_install_time', (($ft=(int)mysql2date('U',$wpdb->get_var("SELECT file_mtime FROM $wpdb->wpfilebase_files ORDER BY file_mtime ASC LIMIT 1")))>0)?$ft:time(), null, 'no');
    564563   
     564   
     565    WPFB_Admin::FlushRewriteRules();
    565566}
    566567

  • wp-filebase/trunk/classes/TplLib.php

    r639699 r660375  
    6464    $exp = preg_replace('/([^\w])OR([^\w])/', '$1||$2', $exp);
    6565    $exp = preg_replace('/([^\w])NOT([^\w])/', '$1!$2', $exp);
     66   
     67    // unescape "
     68    $exp = stripslashes($exp);
     69   
    6670    return $exp;
    6771}

  • wp-filebase/trunk/lib/wpfb_form_file.php

    r655420 r660375  
    4646
    4747wpfb_loadclass('AdvUploader');
    48 $adv_uploader = new WPFB_AdvUploader($form_url);
     48$adv_uploader = WPFB_AdvUploader::Create($form_url, $update);
    4949
    5050

  • wp-filebase/trunk/readme.txt

    r655439 r660375  
    44Tags: filebase, filemanager, file, files, manager, upload, download, downloads, downloadmanager, images, pdf, widget, filelist, list, thumbnails, thumbnail, attachment, attachments, category, categories, media, template, ftp, http, mp3, id3
    55Requires at least: 3.1
    6 Tested up to: 3.5
    7 Stable tag: 0.2.9.33
     6Tested up to: 3.5.1
     7Stable tag: 0.2.9.34
    88
    99Adds a powerful download manager including file categories, downloads counter, widgets, sorted file lists and more to your WordPress blog.
    … …  
    113113
    114114== Changelog ==
     115
     116= 0.2.9.34 =
     117* Custom language files dir can be set with PHP constant WPFB_LANG_DIR in wp-config.php
     118* Fixed quote escaping in template IF expressions
     119* Fixed flash uploader behavior when uploading file updates
    115120
    116121= 0.2.9.33 =

  • wp-filebase/trunk/wp-filebase.php

    r655439 r660375  
    55Description: Adds a powerful downloads manager supporting file categories, download counter, widgets, sorted file lists and more to your WordPress blog.
    66Author: Fabian Schlieper
    7 Version: 0.2.9.33
     7Version: 0.2.9.34
    88Author URI: http://wpfilebase.com/
    99*/
    … …  
    1212{
    1313    define('WPFB', 'wpfb');
    14     define('WPFB_VERSION', '0.2.9.33');
     14    define('WPFB_VERSION', '0.2.9.34');
    1515    define('WPFB_PLUGIN_ROOT', str_replace('\\','/',dirname(__FILE__)).'/');
    1616    if(!defined('ABSPATH')) {
Note: See TracChangeset for help on using the changeset viewer.