mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-04-22 13:41:52 +02:00
Code Issues Releases Wiki Activity

Merge pull request from yesszus/patch-2

Browse Source 
Update admin
This commit is contained in:
Cameron 2018-07-24 09:51:09 -07:00 committed by GitHub
commit 6fc2b340be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 9 deletions
e107_admin
admin.phptheme.php
e107_languages/English/admin
lan_admin.php

21
e107_admin/admin.php

@ -454,13 +454,17 @@ TMPO;
if($numDays < 3) // installed in the past 3 days.
{
echo e107::getMessage()->setTitle('Need Help?',E_MESSAGE_INFO)->addInfo("<p>Connect with our community for <a href='http://e107help.org' rel='external'>free support</a> with any e107 issues you may encounter. </p>")->render();
$srch = array('[',']');
$repl = array("<a href='http://e107help.org' rel='external'>","</a>");
echo e107::getMessage()->setTitle(ADLAN_190,E_MESSAGE_INFO)->addInfo("<p>".e107::getParser()->lanVars(e107::getParser()->toHTML(ADLAN_192, true), (str_replace($srch,$repl)))."</p>")->render();
}
elseif($pref < $v2ReleaseDate && !file_exists($upgradeAlertFlag)) // installed prior to v2 release.
{
$message = "Connect with our community for <a href='http://e107help.org' rel='external'>free support</a> with any upgrading issues you may encounter.";
$message .= "<div class='text-right'><a class='btn btn-xs btn-primary ' href='admin.php?dismiss=upgrade'>Don't show again</a></div>"; //todo do it with class=e-ajax and data-dismiss='alert'
echo e107::getMessage()->setTitle('Upgrading?',E_MESSAGE_INFO)->addInfo($message)->render();
$srch = array('[',']');
$repl = array("<a href='http://e107help.org' rel='external'>","</a>");
$message = e107::getParser()->lanVars(e107::getParser()->toHTML(ADLAN_191, true), (str_replace($srch,$repl)));
$message .= "<div class='text-right'><a class='btn btn-xs btn-primary ' href='admin.php?dismiss=upgrade'>".LAN_DONT_SHOW_AGAIN."</a></div>"; //todo do it with class=e-ajax and data-dismiss='alert'
echo e107::getMessage()->setTitle(LAN_UPGRADING',E_MESSAGE_INFO)->addInfo($message)->render();
}
e107::getMessage()->setTitle(null,E_MESSAGE_INFO);
@ -476,12 +480,14 @@ TMPO;
if(deftrue('e_MEDIA') && is_dir(e_MEDIA) && !is_writable(e_MEDIA))
{
$mes->addWarning("The folder ".e_MEDIA." is not writable. Please correct before proceeding.");
$message = str_replace("[x]", e_MEDIA, ADLAN_193);
$mes->addWarning($message);
}
if(deftrue('e_SYSTEM') && is_dir(e_SYSTEM) && !is_writable(e_SYSTEM))
{
$mes->addWarning("The folder ".e_SYSTEM." is not writable. Please correct before proceeding.");
$message = str_replace("[x]", e_SYSTEM, ADLAN_193);
$mes->addWarning($message);
}
$files = e107::getFile()->scandir(e_IMAGE."avatars",'jpg,gif,png,jpeg');
@ -489,7 +495,8 @@ TMPO;
if(is_dir(e_IMAGE."avatars") && !is_writable(e_IMAGE."avatars") && !empty($files))
{
$mes->addWarning("Legacy avatars folder detected. Please make sure ".e_IMAGE."avatars/ is writable. Please correct before proceeding.");
$message = str_replace("[x]", e_IMAGE, ADLAN_194);
$mes->addWarning($message);
}
}

4
e107_admin/theme.php

@ -327,7 +327,7 @@ class theme_admin_ui extends e_admin_ui
{
$name = e107::getPref('sitetheme');
e107::getMedia()->import('_common_image', e_THEME.$name, '', 'min-size=10000');
e107::getMessage()->addInfo('Developer/Debug Mode: Scanning theme images folder for new media to import. ');
e107::getMessage()->addInfo('Developer/Debug Mode: Scanning theme images folder for new media to import.');
}
$message = e107::getMessage()->render();
@ -1658,4 +1658,4 @@ function headerjs() // needed for the checkboxes - how can we remove the need to
return e107::getAdminUI()->getHeader();
}
*/
?>
?>

7
e107_languages/English/admin/lan_admin.php

@ -201,6 +201,11 @@ define("ADLAN_186", "The following old files can be safely deleted from your sys
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_190", "Need Help?");
define("ADLAN_191", "Connect with our community for [free support] with any upgrading 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_194", "Legacy avatars folder detected. Please make sure [x]avatars/ is writable. Please correct before proceeding.");
// define("ADLAN_CL_1", "Settings");
define("ADLAN_CL_2", "Users");
@ -537,6 +542,8 @@ define("LAN_LOCK", "Lock");
define("LAN_SYSTEM_USER", "System user");
define("LAN_ENGINE", "Engine");
define("LAN_SOURCE", "Source");
define("LAN_UPGRADING", "Upgrading?");
define("LAN_DONT_SHOW_AGAIN", "Don't show again");
define("LAN_ERROR_CONNECTION","Unable to connect for updates. Please check firewall and/or internet connection.");