mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-04-14 09:32:17 +02:00
Code Issues Releases Wiki Activity

Merge pull request #2679 from yesszus/patch-1

Browse Source 
Issue #6 Update lan_image.php
This commit is contained in:
Cameron 2017-06-07 12:32:29 -07:00 committed by GitHub
commit f2348cddf4
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
e107_admin/admin.php
View File

@ -229,7 +229,8 @@ class admin_start
}
else
{
$mes->addWarning("Unable to create <b>".$dr."</b>. Please check your folder permissions.");
$message = e107::getParser()->lanVars(ADLAN_187,$dr,true);
$mes->addWarning($message);
}
}
}
@ -245,7 +246,8 @@ class admin_start
if(e107::getDate()->isValidTimezone($timezone) == false)
{
$mes->addWarning("Your timezone setting (".$timezone.") is invalid. It has been reset to UTC. To Modify, please go to Admin -> Preferences -> Date Display Options.", 'default', true);
$message = e107::getParser()->lanVars(ADLAN_188, $timezone);
$mes->addWarning($message, 'default', true);
e107::getConfig()->set('timezone','UTC')->save(false,true,false);
$this->refresh = true;
}
@ -522,7 +524,7 @@ TMPO;
if($inCompatText)
{
$text = "<ul>".$inCompatText."</ul>";
$mes->addWarning("The following plugins are not compatible with this version of e107 and should be uninstalled: ".$text."<a class='btn btn-default' href='".e_ADMIN."plugin.php'>uninstall</a>");
$mes->addWarning(ADLAN_189."&nbsp;".$text."<a class='btn btn-default' href='".e_ADMIN."plugin.php'>".LAN_UNINSTALL."</a>");
}
}

2
e107_admin/image.php
View File

@ -2545,7 +2545,7 @@ class media_admin_ui extends e_admin_ui
{
if(empty($f))
{
e107::getMessage()->addWarning("0 byte file found in: ".e_IMPORT."<br />Please remove before proceeding.");
e107::getMessage()->addWarning(IMALAN_180."&nbsp;".e_IMPORT."<br />".IMALAN_181);
////rename(e_IMPORT.$f['path'].$f['fname'],e_IMPOT.$f['path'].$f['fname']."-bad");
continue;
}

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

@ -198,6 +198,9 @@ define("ADLAN_171", "Install Site Stats Plugin");
define("ADLAN_185", "Toggle Sidebar");
define("ADLAN_186", "The following old files can be safely deleted from your system:");
define("ADLAN_187", "Unable to create [x]. Please check your folder permissions.");
define("ADLAN_188", "Your timezone setting [x] is invalid. It has been reset to UTC. To Modify, please go to Admin -> Preferences -> Date Display Options.");
define("ADLAN_189", "The following plugins are not compatible with this version of e107 and should be uninstalled: ");
// define("ADLAN_CL_1", "Settings");
define("ADLAN_CL_2", "Users");
@ -516,6 +519,7 @@ define("LAN_PERSONALIZE", "Personalize");
define("LAN_SETTINGS_NOT_SAVED_NO_CHANGES_MADE", "Settings not saved as no changes were made.");
define("LAN_DASHBOARD_LAYOUT", "Dashboard Layout");
define("LAN_UNAVAILABLE", "Unavailable");
define("LAN_UNINSTALL", "Uninstall");
define("LAN_NO_LABEL_PROVIDED", "No Label Provided");
define("LAN_NOT_FOUND", "Not Found!");
define("LAN_FIELD", "Field");

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

@ -199,5 +199,6 @@ define("IMALAN_177", "Click here for more information and to enter your api key"
define("IMALAN_178", "Avatars Folder (user selectable)");
define("IMALAN_179", "Avatars Folder (private)");
define('IMALAN_180', "0 byte file found in:");
define("IMALAN_181", "Please remove before proceeding.");