mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-17 21:11:18 +02:00
Code Issues Releases Wiki Activity

Issue #6: Remove and optimize (hardcoded) LANS

Browse Source
This commit is contained in:
Lóna Lore
2015-05-01 15:55:13 +02:00
parent f48ca466e9
commit 3db8afc8d9
2 changed files with 55 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
e107_admin/image.php
View File

@@ -1775,7 +1775,7 @@ class media_admin_ui extends e_admin_ui
if(!$typePath = $this->getPath($upload['type'])) if(!$typePath = $this->getPath($upload['type']))
{ {
$mes->addError("Couldn't generated path from upload data"); $mes->addError(IMALAN_107);
return FALSE; return FALSE;
} }
$mes->addDebug(print_a($upload,TRUE)); $mes->addDebug(print_a($upload,TRUE));
@@ -1786,7 +1786,10 @@ class media_admin_ui extends e_admin_ui
if(!rename($oldpath, e_MEDIA.$newpath)) if(!rename($oldpath, e_MEDIA.$newpath))
{ {
$mes->add("Couldn't move file from ".$oldpath." to ".$newpath, E_MESSAGE_ERROR); $srch = array('[x]','[y]');
$repl = array($oldpath,$newpath);
$text = str_replace($srch,$repl,IMALAN_108);
$mes->add($text, E_MESSAGE_ERROR);
return FALSE; return FALSE;
}; };
@@ -1817,7 +1820,7 @@ class media_admin_ui extends e_admin_ui
if(!($typePath = $this->getPath($img_data['media_type']))) if(!($typePath = $this->getPath($img_data['media_type'])))
{ {
$mes->addError("Couldn't get path ".$typePath); $mes->addError(IMALAN_109." ".$typePath);
return FALSE; return FALSE;
} }
@@ -1834,7 +1837,10 @@ class media_admin_ui extends e_admin_ui
if(!rename($oldpath, $newpath)) if(!rename($oldpath, $newpath))
{ {
$mes->add("Couldn't move file from ".$oldpath." to ".str_replace('../', '', $newpath), E_MESSAGE_ERROR); $srch = array('[x]','[y]');
$repl = array($oldpath,str_replace('../', '', $newpath));
$text = str_replace($srch,$repl,IMALAN_110);
$mes->add($text, E_MESSAGE_ERROR);
return FALSE; return FALSE;
} }
$img_data['media_url'] = $tp->createConstants($newpath, 'rel'); $img_data['media_url'] = $tp->createConstants($newpath, 'rel');
@@ -1890,7 +1896,8 @@ class media_admin_ui extends e_admin_ui
if(!vartrue($this->mimePaths[$pmime])) if(!vartrue($this->mimePaths[$pmime]))
{ {
$mes->add("Couldn't detect mime-type($mime). Upload failed.", E_MESSAGE_ERROR); $text = str_replace('[x]',$mime,IMALAN_111);
$mes->add($text, E_MESSAGE_ERROR);
return FALSE; return FALSE;
} }
@@ -1900,7 +1907,8 @@ class media_admin_ui extends e_admin_ui
{ {
if(!mkdir($dir, 0755)) if(!mkdir($dir, 0755))
{ {
$mes->add("Couldn't create folder ($dir).", E_MESSAGE_ERROR); $text = str_replace('[x]',$dir,IMALAN_112);
$mes->add($text, E_MESSAGE_ERROR);
return FALSE; return FALSE;
}; };
} }
@@ -1929,14 +1937,14 @@ class media_admin_ui extends e_admin_ui
if(!vartrue($_POST['batch_import_selected'])) if(!vartrue($_POST['batch_import_selected']))
{ {
$mes->add("Scanning for new media (images, videos, files) in folder: <b> ".e_IMPORT."</b>", E_MESSAGE_INFO); $mes->add(IMALAN_113." <b> ".e_IMPORT."</b>", E_MESSAGE_INFO);
} }
if(!count($files)) if(!count($files))
{ {
if(!vartrue($_POST['batch_import_selected'])) if(!vartrue($_POST['batch_import_selected']))
{ {
$mes->add("No media Found! Please upload some files.", E_MESSAGE_INFO); $mes->add(IMALAN_114, E_MESSAGE_INFO);
} }
$text = $this->uploadTab(); $text = $this->uploadTab();
@@ -1958,15 +1966,15 @@ class media_admin_ui extends e_admin_ui
<thead> <thead>
<tr> <tr>
<th class='center'>".e107::getForm()->checkbox_toggle('e-column-toggle', 'batch_selected')."</th> <th class='center'>".e107::getForm()->checkbox_toggle('e-column-toggle', 'batch_selected')."</th>
<th class='center' style='width:50px'>Preview</th> <th class='center' style='width:50px'>".IMALAN_121."</th>
<th class='center'>".LAN_FILE."</th> <th class='center'>".LAN_FILE."</th>
<th >Title (internal use)</th> <th>".IMALAN_115."</th>
<th >Caption (seen by public)</th> <th>".IMALAN_116."</th>
<th >Author</th> <th>".IMALAN_117."</th>
<th>Mime Type</th> <th>".IMALAN_118."</th>
<th>File Size</th> <th>".IMALAN_119."</th>
<th>".LAN_DATESTAMP."</th> <th>".LAN_DATESTAMP."</th>
<th class='center last'>Dimensions</th> <th class='center last'>".IMALAN_120."</th>
</tr> </tr>
</thead> </thead>
<tbody>"; <tbody>";
@@ -1981,7 +1989,8 @@ class media_admin_ui extends e_admin_ui
if($f['error']) if($f['error'])
{ {
$mes->addWarning($f['fname']." couldn't be renamed. Check file perms."); $text = str_replace('[x]', $f['fname'], IMALAN_122);
$mes->addWarning($text);
} }
$large = e107::getParser()->thumbUrl($f['path'].$f['fname'], 'w=800', true); $large = e107::getParser()->thumbUrl($f['path'].$f['fname'], 'w=800', true);
@@ -2017,7 +2026,7 @@ class media_admin_ui extends e_admin_ui
</tbody> </tbody>
</table> </table>
<div class='buttons-bar center'> <div class='buttons-bar center'>
Import into Category: ".$frm->selectbox('batch_category',$this->cats, $_POST['batch_category']); ".IMALAN_123." ".$frm->selectbox('batch_category',$this->cats, $_POST['batch_category']);
// $waterMarkPath = e_THEME.e107::getPref('sitetheme')."/images/watermark.png"; // Now performed site-wide dynamically. // $waterMarkPath = e_THEME.e107::getPref('sitetheme')."/images/watermark.png"; // Now performed site-wide dynamically.
@@ -2029,8 +2038,8 @@ class media_admin_ui extends e_admin_ui
$text .= " $text .= "
</div> </div>
<div class='buttons-bar center'> <div class='buttons-bar center'>
".$frm->admin_button('batch_import_selected', "Import Selected Files", 'import') ".$frm->admin_button('batch_import_selected', IMALAN_124, 'import')
.$frm->admin_button('batch_import_delete', "Delete Selected Files", 'delete'); .$frm->admin_button('batch_import_delete', IMALAN_125, 'delete');
$text .= " $text .= "
</div> </div>
</fieldset> </fieldset>
@@ -2140,7 +2149,7 @@ class media_admin_ui extends e_admin_ui
if(!count($_POST['batch_selected'])) if(!count($_POST['batch_selected']))
{ {
$mes->addError("Please check at least one file."); $mes->addError(IMALAN_126);
return; return;
} }
@@ -2181,7 +2190,7 @@ class media_admin_ui extends e_admin_ui
if(!$f['mime']) if(!$f['mime'])
{ {
$mes->add("Couldn't get file info from : ".$oldpath, E_MESSAGE_WARNING); $mes->add(IMALAN_127." ".$oldpath, E_MESSAGE_WARNING);
// $mes->add(print_a($f,true), E_MESSAGE_ERROR); // $mes->add(print_a($f,true), E_MESSAGE_ERROR);
$f['mime'] = "other/file"; $f['mime'] = "other/file";
} }
@@ -2225,7 +2234,7 @@ class media_admin_ui extends e_admin_ui
if($sql->db_Insert("core_media",$insert)) if($sql->db_Insert("core_media",$insert))
{ {
$mes->add("Importing Media: ".$f['fname'], E_MESSAGE_SUCCESS); $mes->add(IMALAN_128." ".$f['fname'], E_MESSAGE_SUCCESS);
$this->deleteFileXml($f['fname']); $this->deleteFileXml($f['fname']);
} }
else else

28
e107_languages/English/admin/lan_image.php
View File

@@ -141,9 +141,29 @@ define('IMALAN_103', 'Use Modest Branding');
define('IMALAN_104', 'Make the YouTube bbcode responsive'); define('IMALAN_104', 'Make the YouTube bbcode responsive');
define('IMALAN_105', 'Resize images during media import'); define('IMALAN_105', 'Resize images during media import');
define('IMALAN_106', 'Leave empty to disable'); define('IMALAN_106', 'Leave empty to disable');
define('IMALAN_107', 'Watermark'); define('IMALAN_107', 'Couldn\'t generated path from upload data');
define('IMALAN_108', 'Watermark'); define('IMALAN_108', 'Couldn\'t move file from [x] to [y]');
define('IMALAN_109', 'Watermark'); define('IMALAN_109', 'Couldn\'t get path');
define('IMALAN_110', 'Watermark'); define('IMALAN_110', 'Couldn\'t move file from [x] to [y]');
define('IMALAN_111', 'Couldn\'t detect mime-type([x]). Upload failed.');
define('IMALAN_112', 'Couldn\'t create folder ([x]).');
define('IMALAN_113', 'Scanning for new media (images, videos, files) in folder:');
define('IMALAN_114', 'No media Found! Please upload some files.');
define('IMALAN_115', 'Title (internal use)');
define('IMALAN_116', 'Caption (seen by public)');
define('IMALAN_117', 'Author');
define('IMALAN_118', 'Mime Type');
define('IMALAN_119', 'File Size');
define('IMALAN_120', 'Dimensions');
define('IMALAN_121', 'Preview');
define('IMALAN_122', '[x] couldn\'t be renamed. Check file perms.');
define('IMALAN_123', 'Import into Category:');
define('IMALAN_124', 'Import Selected Files');
define('IMALAN_125', 'Delete Selected Files');
define('IMALAN_126', 'Please check at least one file.');
define('IMALAN_127', 'Couldn\'t get file info from:');
define('IMALAN_128', 'Importing Media:');
define('IMALAN_129', 'Could');
define('IMALAN_130', 'Could');
?> ?>