mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 22:27:34 +02:00
Code Issues Releases Wiki Activity

Merge pull request #3315 from yesszus/patch-2

Browse Source 
Update media_class.php
This commit is contained in:
Cameron
2018-07-25 10:32:09 -07:00
committed by GitHub
parent edf18fb00f a403f49560
commit 74f19820b0
6 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/image.php
View File

@@ -1390,7 +1390,7 @@ class media_admin_ui extends e_admin_ui
if($this->getQuery('video') == 1 || $this->getQuery('bbcode') == 'video') if($this->getQuery('video') == 1 || $this->getQuery('bbcode') == 'video')
{ {
$text .= "<li class='{$youtubeActive}'><a data-toggle='tab' href='#core-media-youtube'>Youtube</a></li>\n"; $text .= "<li class='{$youtubeActive}'><a data-toggle='tab' href='#core-media-youtube'>Youtube</a></li>\n";
$text .= "<li class='{$videoActive}'><a data-toggle='tab' href='#core-media-video'>Videos</a></li>\n"; $text .= "<li class='{$videoActive}'><a data-toggle='tab' href='#core-media-video'>".IMALAN_163."</a></li>\n";
} }

4
e107_handlers/cron_class.php
View File

@@ -233,7 +233,7 @@ class _system_cron
if(empty($file)) if(empty($file))
{ {
e107::getLog()->addError('Database Backup Failed:'.basename($file))->save('BACKUP'); e107::getLog()->addError(LAN_CRON_55.SEP.basename($file))->save('BACKUP');
return; return;
} }
@@ -242,7 +242,7 @@ class _system_cron
if(file_exists($zipFile)) if(file_exists($zipFile))
{ {
e107::getLog()->addSuccess('Database Backup Complete: '.basename($zipFile))->save('BACKUP'); e107::getLog()->addSuccess(LAN_CRON_56.SEP.basename($zipFile))->save('BACKUP');
if(is_file($file)) if(is_file($file))
{ {

2
e107_handlers/file_class.php
View File

@@ -1506,7 +1506,7 @@ class e_file
$time = date("YmdHi"); $time = date("YmdHi");
if(rename($destpath.$dir, e_BACKUP.$dir."_".$time)) if(rename($destpath.$dir, e_BACKUP.$dir."_".$time))
{ {
$mes->addSuccess("Old folder moved to backup directory"); $mes->addSuccess(ADLAN_195);
} }
} }
} }

6
e107_handlers/media_class.php
View File

@@ -1359,7 +1359,7 @@ class e_media
$text .= "<div class='col-md-4 text-right'>". $text .= "<div class='col-md-4 text-right'>".
$this->browserCarouselItemSelector($data). $this->browserCarouselItemSelector($data).
"<button class='btn btn-xs btn-primary' style='margin-top:7px'>Select</button></a></div> "<button class='btn btn-xs btn-primary' style='margin-top:7px'>".LAN_SELECT."</button></a></div>
</div>\n\n"; </div>\n\n";
break; break;
@@ -1382,7 +1382,7 @@ class e_media
$text .= "<div class='col-md-4 text-right'>". $text .= "<div class='col-md-4 text-right'>".
$this->browserCarouselItemSelector($data). $this->browserCarouselItemSelector($data).
"<button class='btn btn-xs btn-primary' style='margin-top:7px'>Select</button></a></div> "<button class='btn btn-xs btn-primary' style='margin-top:7px'>".LAN_SELECT."</button></a></div>
</div>"; </div>";
@@ -1620,7 +1620,7 @@ class e_media
} }
else else
{ {
$text .= "<div class='alert alert-info alert-block text-center'>No Results Found.</div>"; $text .= "<div class='alert alert-info alert-block text-center'>".LAN_NO_RESULTS_FOUND."</div>";
} }
$text .= ($c != 0) ? "</div>\n<!-- End Slide -->\n" : ""; $text .= ($c != 0) ? "</div>\n<!-- End Slide -->\n" : "";

2
e107_languages/English/admin/lan_admin.php
View File

@@ -206,6 +206,7 @@ define("ADLAN_191", "Connect with our community for [free support] with any upgr
define("ADLAN_192", "Connect with our community for [free support] with any e107 issues you may encounter."); define("ADLAN_192", "Connect with our community for [free support] with any e107 issues you may encounter.");
define("ADLAN_193", "The folder [x] is not writable. Please correct before proceeding."); define("ADLAN_193", "The folder [x] is not writable. Please correct before proceeding.");
define("ADLAN_194", "Legacy avatars folder detected. Please make sure [x]avatars/ is writable. Please correct before proceeding."); define("ADLAN_194", "Legacy avatars folder detected. Please make sure [x]avatars/ is writable. Please correct before proceeding.");
define("ADLAN_195", "Old folder moved to backup directory");
// define("ADLAN_CL_1", "Settings"); // define("ADLAN_CL_1", "Settings");
define("ADLAN_CL_2", "Users"); define("ADLAN_CL_2", "Users");
@@ -560,3 +561,4 @@ define("LAN_UI_FILTER_NEXT_YEAR", "Next Year");
define("LAN_UI_FILTER_IS_EMPTY", "Is Empty"); define("LAN_UI_FILTER_IS_EMPTY", "Is Empty");
define("LAN_RECALCULATE_COMMENT_COUNT", "Recalculate comment count"); define("LAN_RECALCULATE_COMMENT_COUNT", "Recalculate comment count");
define("LAN_SUCC_RECALCULATE_COMMENT_COUNT", "Comment count successfully recalculated!"); define("LAN_SUCC_RECALCULATE_COMMENT_COUNT", "Comment count successfully recalculated!");
define("LAN_NO_RESULTS_FOUND", "No Results Found.");

2
e107_languages/English/admin/lan_cron.php
View File

@@ -87,6 +87,8 @@ define("LAN_CRON_51", "Hour(s):");
define("LAN_CRON_52", "Day(s):"); define("LAN_CRON_52", "Day(s):");
define("LAN_CRON_53", "Month(s):"); define("LAN_CRON_53", "Month(s):");
define("LAN_CRON_54", "Weekday(s):"); define("LAN_CRON_54", "Weekday(s):");
define("LAN_CRON_55", "Database Backup Failed");
define("LAN_CRON_56", "Database Backup Complete");
define("LAN_CRON_60", "Go to cPanel"); define("LAN_CRON_60", "Go to cPanel");
define("LAN_CRON_61", "Generate new cron password"); define("LAN_CRON_61", "Generate new cron password");