mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-18 05:09:05 +01:00
Code Issues Releases Wiki Activity

Merge pull request #1986 from yesszus/patch-8

Browse Source 
Issue #6 Update e107_admin/image.php
This commit is contained in:
Cameron 2016-11-05 14:10:10 -07:00 committed by GitHub
commit 0156dd58f7
2 changed files with 17 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
e107_admin/image.php
View File

@ -692,10 +692,10 @@ class media_admin_ui extends e_admin_ui
// protected $defaultOrder = 'desc';
protected $listOrder = 'm.media_id desc'; // show newest images first.
public $deleteConfirmScreen = true;
public $deleteConfirmMessage = 'You are about to delete [x] records and <strong>ALL CORRESPONDING FILES</strong>! Please confirm to continue!';
public $deleteConfirmMessage = IMALAN_129;
protected $preftabs = array('General',"Watermark", "Youtube");
protected $preftabs = array(IMALAN_78,IMALAN_89, "Youtube");
protected $fields = array(
'checkboxes' => array('title'=> '', 'type' => null, 'data'=> null, 'width' =>'5%', 'forced'=> TRUE, 'thclass'=>'center', 'class'=>'center'),
@ -1313,10 +1313,10 @@ class media_admin_ui extends e_admin_ui
$text .= "<div style='text-align:right;padding:5px'>
<button type='submit' class='btn btn-success submit e-dialog-save' data-bbcode='".$options['bbcode']."' data-target='".$this->getQuery('tagid')."' name='save_image' value='Save it' >
<span>Save</span>
<span>".LAN_SAVE."</span>
</button>
<button type='submit' class=' btn btn-default submit e-dialog-close' name='cancel_image' value='Cancel' >
<span>Cancel</span>
<span>".LAN_CANCEL."</span>
</button>
</div>";
@ -1568,12 +1568,10 @@ class media_admin_ui extends e_admin_ui
}
else // empty key.
{
$items = "<div class='alert alert-info'><p>Youtube search requires a (free) YouTube v3 api key.<br />
This key is not required unless you wish to perform a keyword, playlist or channel search.<br />
Entering a Youtube video URL directly into the box above will still work without having an api key. <br />
<a style='color:black' target='_blank' href='".e_ADMIN."image.php?mode=main&action=prefs#/tab2'>Click here for more information and to enter your api key</a>.
</p>
</div>";
$link = '<a style="color:black" target="_blank" href="'.e_ADMIN.'image.php?mode=main&action=prefs#/tab2">'.IMALAN_177.'</a>';
$items = "<div class='alert alert-info'><p>".e107::getParser()->lanVars(e107::getParser()->toHTML(IMALAN_174, true), array('x'=>$link))."</p></div>";
}
}
@ -1603,7 +1601,7 @@ class media_admin_ui extends e_admin_ui
}
// return print_a($data,true);
$parms = array('width' => 200, 'height'=>113, 'type'=>'image', 'bbcode'=>'video', 'tagid'=> $this->getQuery('tagid'), 'action'=>'youtube','searchPlaceholder'=>'Search Youtube. Paste any YouTube URL here for a specific video/playlist/channel' );
$parms = array('width' => 200, 'height'=>113, 'type'=>'image', 'bbcode'=>'video', 'tagid'=> $this->getQuery('tagid'), 'action'=>'youtube','searchPlaceholder'=>IMALAN_175 );
$text = e107::getMedia()->browserCarousel($items, $parms);
if(E107_DEBUG_LEVEL > 0 && !empty($feed))
@ -1659,7 +1657,7 @@ class media_admin_ui extends e_admin_ui
if(!$fl->getRemoteFile($_POST['upload_url'], $fileName, 'import'))
{
$mes->addError("There was a problem grabbing the file");
$mes->addError(IMALAN_176);
}
elseif($import == true)
{
@ -2445,8 +2443,8 @@ class media_admin_ui extends e_admin_ui
// <td>".$frm->textarea('batch_import_diz['.$c.']', ($_POST['batch_import_diz'][$c] ? $_POST['batch_import_diz'][$c] : $default['description']))."</td>
$this->cats['_avatars_public'] = "Avatars Folder (user selectable)";
$this->cats['_avatars_private'] = "Avatars Folder (private)";
$this->cats['_avatars_public'] = IMALAN_178;
$this->cats['_avatars_private'] = IMALAN_179;
if(!isset($_POST['batch_category']) && substr($lastMime,0,5)=='image')
{

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

@ -5,21 +5,17 @@
* Admin Language File
*
*/
// Menu
define("LAN_IMA_M_01", "Media Library");
define("LAN_IMA_M_02", "Media Upload/Import");
define("LAN_IMA_M_03", "Media Categories");
define("LAN_IMA_M_04", "Create Category");
define("LAN_IMA_M_05", "Avatars");
// Errors / Info / Notices
define("LAN_IMA_001", "Modification is not permitted.");
define("LAN_IMA_002", "Not enough memory available to rotate");
define("LAN_IMA_003", "Rotated");
define("LAN_IMA_004", "Resizing");
// Options
define("LAN_IMA_O_001", "News Images");
define("LAN_IMA_O_002", "News [img] bbcode");
@ -27,9 +23,7 @@ define("LAN_IMA_O_003", "Page [img] bbcode");
define("LAN_IMA_O_004", "Featurebox Images");
define("LAN_IMA_O_005", "Featurebox [img] bbcode");
define("LAN_IMA_O_006", "[img] bbcode");
// Work in progress (Moc)
define("IMALAN_1", "Enable image display");
define("IMALAN_2", "Display images, this will apply sitewide (comments, chatbox etc) to images posted using the [img] bbcode");
define("IMALAN_3", "Resize method");
@ -56,7 +50,6 @@ define("IMALAN_23", "Avatars");
define("IMALAN_24", "Photograph");
define("IMALAN_25", "Click here to delete all unused images");
define("IMALAN_26", "image(s) deleted");
define("IMALAN_28", "deleted");
define("IMALAN_29", "No images");
// define("IMALAN_30", "Everyone (public)");
@ -65,7 +58,6 @@ define("IMALAN_29", "No images");
// define("IMALAN_33", "Admin only");
//define("IMALAN_34", "Enable PNG Fix");
//define("IMALAN_35", "Fixes transparent PNG-24's with alpha transparency in IE 5 / 6 (Applies Sitewide)");
define("IMALAN_36", "Validate avatar size and access");
define("IMALAN_37", "Avatar Validation");
define("IMALAN_38", "Maximum allowable width");
@ -82,31 +74,23 @@ define("IMALAN_48", "Total external avatars");
define("IMALAN_49", "Users with avatars");
define("IMALAN_50", "Total");
define("IMALAN_51", "Avatar for ");
define("IMALAN_52", "Path to ImageMagick appears to be incorrect");
define("IMALAN_53", "Path to ImageMagick appears to be correct, but convert file may not be valid");
define("IMALAN_54", "GD version installed:");
define('IMALAN_55', "Not installed");
//v0.8
//uploaded avatar list
define('IMALAN_56', "Click to select");
define('IMALAN_57', "Image too big - click to enlarge");
//avatar check
// define('IMALAN_61', "Options");
define('IMALAN_62', "Reason");
define('IMALAN_65', "Nothing found");
define('IMALAN_66', "Filename");
define('IMALAN_68', "Close");
define('IMALAN_69', "Folder");
define('IMALAN_70', "Non-system folder is found!");
// define("IMALAN_72", "Icons");
define('IMALAN_73', "Thumbnail Quality");
define('IMALAN_74', "Set this as low as possible before quality loss is apparent. Max. 100");
define('IMALAN_75', "Avatar Width");
@ -198,7 +182,7 @@ define('IMALAN_160', "Margin-Top");
define('IMALAN_161', "Margin-Bottom");
define('IMALAN_162', "Displaying [x] - [y] of [z] images.");
define('IMALAN_163', "Video");
define('IMALAN_164', ""); // Unused
define('IMALAN_164', "Deleted Icons from Media-Manager");
define('IMALAN_165', "No images");
define('IMALAN_166', "Upload images or files");
define('IMALAN_167', "No file");
@ -208,7 +192,8 @@ define('IMALAN_170', "Choose this avatar");
define('IMALAN_171', "Admin-Only Notice: The folder");
define('IMALAN_172', "is empty. Upload some default avatars images to this folder for users to choose avatars from.");
define('IMALAN_173', "No media owner found.");
define('IMALAN_174', "Youtube search requires a (free) YouTube v3 api key.[br]This key is not required unless you wish to perform a keyword, playlist or channel search.[br]Entering a Youtube video URL directly into the box above will still work without having an api key.[br][x]");
define('IMALAN_175', "Search Youtube. Paste any YouTube URL here for a specific video/playlist/channel");
define('IMALAN_176', "There was a problem grabbing the file");
define('IMALAN_177', "Click here for more information and to enter your api key");
?>