WordPress.org
Get WordPress

Plugin Directory

Changeset 844441


Ignore:
Timestamp:
01/24/2014 11:08:44 AM (12 years ago)
Author:
aueda
Message:

media-file-manager_test_140124

Location:
media-file-manager
Files:
68 added
6 edited

Legend:

Unmodified
Added
Removed

  • media-file-manager/trunk/media-relocator.js

    r843768 r844441  
    2222    pane_right.opposite = pane_left;
    2323
    24     adjust_layout();
     24    //adjust_layout();
    2525
    2626    pane_left.setdir("/");
    … …  
    5959    });
    6060
    61 
     61    jQuery(window).resize(function() {
     62        //jQuery('#debug').html(jQuery('#wpbody').height());
     63        adjust_layout();
     64    });
     65
     66   
     67    adjust_layout();
    6268});
    6369
    … …  
    197203        if (dir[i].isthumb) continue;
    198204        this.dir_disp_list[disp_num] = i;
    199         html = html+'<div style="vertical-align:middle;display:block;height:55px;clear:both; background-color:#fff;position:relative;">';
     205        html = html+'<div style="vertical-align:middle;display:block;height:55px;clear:both; position:relative;">';
    200206        if (this.flg_chkbox) {
    201207            html = html + '<div style="float:left;"><input type="checkbox" id="'+this.get_chkid(disp_num)+'"></div>';
    … …  
    611617    var height_mrl_box = jQuery('.mrl_box1').height();
    612618
    613     var pane_w = (width_all - width_center)/2-1;
     619    var position = jQuery('#wpbody').offset();
     620    height_all = jQuery(window).height() - position.top - 100;
     621
     622
     623
     624    var pane_w = (width_all - width_center)/2-16;
    614625    jQuery('.mrl_wrapper_pane').width(pane_w);
    615626    jQuery('.mrl_path').width(pane_w);
    616627    jQuery('.mrl_pane').width(pane_w);
    617628    jQuery('.mrl_pane').height(height_all - height_mrl_box);   
    618     jQuery('.mrl_filename').width(pane_w-200);
     629    jQuery('.mrl_filename').width(pane_w-32);
    619630}
    620631

  • media-file-manager/trunk/media-relocator.php

    r843768 r844441  
    44Plugin URI: http://tempspace.net/plugins/?page_id=111
    55Description: You can make sub-directories in the upload directory, and move files into them. At the same time, this plugin modifies the URLs/path names in the database. Also an alternative file-selector is added in the editing post/page screen, so you can pick up media files from the subfolders easily.
    6 Version: 1.2.1
     6Version: 1.3.0_test_140123
    77Author: Atsushi Ueda
    88Author URI: http://tempspace.net/plugins/
    … …  
    1616define("MLOC_DEBUG", 0);
    1717
    18 //function dbg2($str){$fp=fopen("log.txt","a");fwrite($fp,$str . "\n");fclose($fp);}
     18function dbg2($str){}//$fp=fopen("log.txt","a");fwrite($fp,$str . "\n");fclose($fp);}
    1919
    2020include 'set_document_root.php';
    … …  
    577577{
    578578    $wu = wp_upload_dir();
    579 
    580579    $wp_content_dir = str_replace("\\","/", $wu['basedir']);
    581580    $wp_content_dir = str_replace("//","/", $wp_content_dir);
    … …  
    676675        }
    677676        update_option('mediafilemanager_accepted_roles', $roles_val);
     677
     678        $roles_val = "";
     679        for ($i=0; $i<count($roles); $i++) {
     680            if (!empty($_POST['roles_sel_'.$roles[$i]])) {
     681                if ($roles_val != "") $roles_val .= ",";
     682                $roles_val .= $roles[$i];
     683            }
     684        }
     685        update_option('mediafilemanager_accepted_roles_selector', $roles_val);
    678686    }
    679687
    … …  
    686694        wp_nonce_field('update-options');
    687695        $accepted_roles = get_option("mediafilemanager_accepted_roles", "administrator");
     696        $accepted_roles_selector = get_option("mediafilemanager_accepted_roles_selector", "administrator,editor,author,contributor,subscriber");
    688697        ?>
    689698        <table class="form-table">
    690699        <tr>
    691         <th>This plugin can be used by </th>
     700        <th>File Manager can be used by </th>
    692701        <td style="text-align: left;">
    693702<?php
    … …  
    704713        }
    705714
    706         echo '<input type="checkbox" name="roles_'.$key.'" id="roles_'.$key.'" '.$ck.'>'.$key.'</input><br>';
     715        echo '<input type="checkbox" name="roles_'.$key.'" id="roles_'.$key.'" '.$ck.'>'.$key.'</input><br>'."\n";
    707716    }
    708717?>
    … …  
    710719        </td>
    711720        </tr>
     721        <th>File Selector can bu used by </th>
     722        <td style="text-align: left;">
     723<?php
     724    $accepted = explode(",", $accepted_roles_selector);
     725    for($i=0; $i<count($roles); $i++) {
     726        $key = $roles[$i];
     727
     728        $ck = "";
     729        for ($j=0; $j<count($accepted); $j++) {
     730            if ($key == $accepted[$j]) {
     731                $ck = "checked";
     732                break;
     733            }
     734        }
     735
     736        echo '<input type="checkbox" name="roles_sel_'.$key.'" id="roles_sel_'.$key.'" '.$ck.'>'.$key.'</input><br>'."\n";
     737    }
     738?>
     739
     740        </td>
     741        </tr>
     742       
     743        <tr>
     744        <td>
    712745
    713746        </table>

  • media-file-manager/trunk/media-selector.php

    r843768 r844441  
    338338    public function onMediaButtons()
    339339    {
     340        $cur_roles0 = get_option('mediafilemanager_accepted_roles_selector', 'administrator,editor,author,contributor,subscriber');
     341        $cur_roles = explode(',', $cur_roles0);
     342        if (!check_user_role($cur_roles)) return;
     343
    340344        global $post_ID, $temp_ID;
    341345
    … …  
    389393}
    390394
     395
     396
    391397// create an instance of plugin
    392 if( 1 )
     398if (1)
    393399{
    394400    $MrlMediaSelector = new MrlMediaSelector();
    … …  
    424430    }
    425431}
     432//add_action( 'admin_init', 'MrlMediaButtonInit' );
     433
     434function check_user_role($roles,$user_id=NULL) {
     435    // Get user by ID, else get current user
     436    if ($user_id)
     437        $user = get_userdata($user_id);
     438    else
     439        $user = wp_get_current_user();
     440 
     441    // No user found, return
     442    if (empty($user))
     443        return FALSE;
     444 
     445    // Append administrator to roles, if necessary
     446    if (!in_array('administrator',$roles))
     447        $roles[] = 'administrator';
     448 
     449    // Loop through user roles
     450    //echo "<pre>";print_r($roles);echo "</pre>";
     451    foreach ($user->roles as $role) {
     452    //echo $role;
     453        // Does user have role
     454        if (in_array($role,$roles)) {
     455            return TRUE;
     456        }
     457    }
     458 //echo "<br>false<br>";
     459    // User not in roles
     460    return FALSE;
     461}
    426462?>

  • media-file-manager/trunk/readme.txt

    r843768 r844441  
    44Tags: media,file,manager,explorer,relocate,folder,folders,files,rename,make directory,directories,organize,organizer,select,selector,database
    55Requires at least: 3.6.0
    6 Tested up to: 3.7.1
     6Tested up to: 3.8.1
    77Stable tag: 1.2.1
    88
    … …  
    5656== Changelog ==
    5757
     58= 1.3.0 =
     59* Added a permission setting for file selector feature.
     60* Improved behaviour when windows is resized.
     61* Corrected background color for WP3.8.
     62
    5863= 1.2.1 =
    5964* Fixed some errors.

  • media-file-manager/trunk/style.css

    r843768 r844441  
    88#mrl_wrapper_all {
    99    position:relative;
    10     width:800px;
     10    //width:800px;
     11    width:auto;
    1112    height:655px;
    1213    bborder: solid 1px #0ff;
    … …  
    1920    background-color:#ddd;
    2021    border: 1px solid #888;
     22    font-size: 14px;
     23    padding: 0px;
    2124}
    2225
Note: See TracChangeset for help on using the changeset viewer.