diff options
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/lang/en/lang.php | 6 | ||||
| -rw-r--r-- | inc/media.php | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index 88fbadbd2..58a7d56ed 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -129,7 +129,7 @@ $lang['js']['hidedetails'] = 'Hide Details'; $lang['mediausage'] = 'Use the following syntax to reference this file:'; $lang['mediaview'] = 'View original file'; $lang['mediaroot'] = 'root'; -$lang['mediaupload'] = 'Upload a file to the current namespace here. To create subnamespaces, prepend them to your "Upload as" filename separated by colons.'; +$lang['mediaupload'] = 'Upload a file to the current namespace here. To create subnamespaces, prepend them to your "Upload as" filename separated by colons. Files also can be selected by drag and drop.'; $lang['mediaextchange'] = 'Filextension changed from .%s to .%s!'; $lang['js']['mediatitle'] = 'Link settings'; @@ -354,8 +354,8 @@ $lang['js']['media_diff_both'] = 'Side by Side'; $lang['js']['media_diff_opacity'] = 'Overlay'; $lang['js']['media_diff_portions'] = 'Slider'; -$lang['js']['media_select'] = 'Select files...'; -$lang['js']['media_upload_btn'] = 'Start uploading'; +$lang['js']['media_select'] = 'Select files…'; +$lang['js']['media_upload_btn'] = 'Upload'; $lang['js']['media_drop'] = 'Drop files here to upload'; $lang['js']['media_cancel'] = 'remove'; $lang['js']['media_overwrt'] = 'Overwrite existing files'; diff --git a/inc/media.php b/inc/media.php index abd817767..8ef075f17 100644 --- a/inc/media.php +++ b/inc/media.php @@ -248,6 +248,8 @@ function media_delete($id,$auth){ * @return mixed false on error, id of the new file on success */ function media_upload_xhr($ns,$auth){ + if(!checkSecurityToken()) return false; + $id = $_GET['qqfile']; list($ext,$mime,$dl) = mimetype($id); $input = fopen("php://input", "r"); @@ -685,7 +687,7 @@ function media_tab_files_options($ns, $sort){ global $lang; echo '<div class="background-container">'; - echo $ns; + echo $ns ? $ns : '['.$lang['mediaroot'].']'; echo '<div id="mediamanager__tabs_list">'; @@ -753,7 +755,7 @@ function media_tab_upload($ns,$auth=null,$jump='') { if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*"); echo '<div class="background-container">'; - echo sprintf($lang['media_upload'], $ns); + echo sprintf($lang['media_upload'], $ns ? $ns : '['.$lang['mediaroot'].']'); echo '</div>'; echo '<div class="scroll-container">'; @@ -775,7 +777,7 @@ function media_tab_search($ns,$auth=null) { if (!$query) $query = ''; echo '<div class="background-container">'; - echo sprintf($lang['media_search'], $ns); + echo sprintf($lang['media_search'], $ns ? $ns : '['.$lang['mediaroot'].']'); echo'</div>'; echo '<div class="scroll-container">'; |