mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-06-02 08:55:18 +02:00
Code Issues Releases Wiki Activity

Administrators (user_handler) - Use Common Lan Phrases where possible

Browse Source 
Replace ADMSLANs with ADLAN or common phrased in lan_admin.php
Replace HTML with BB_CODE
Improved hover help prompts.
This commit is contained in:
MikeyGMT 2015-07-02 03:54:52 +01:00
parent 68fcc01906
commit 586c5307e3
3 changed files with 74 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
e107_handlers/user_handler.php
View File

@ -1259,63 +1259,63 @@ class e_userperms
$this->core_perms = array(
// In the same order as admin navigation!
// In the same order as admin navigation! Plus same labels.
// Settings
"C" => array(ADMSLAN_64,E_16_CACHE, E_32_CACHE), // Clear the system cache
"F" => array(ADMSLAN_31,E_16_EMOTE, E_32_EMOTE), // Emoticons
"G" => array(ADMSLAN_32,E_16_FRONT, E_32_FRONT), // Front-Page Configuration
"L" => array(ADMSLAN_76,E_16_LANGUAGE, E_32_LANGUAGE), // Language Packs
"T" => array(ADMSLAN_34,E_16_META, E_32_META), // Meta tags
"C" => array(ADLAN_74,E_16_CACHE, E_32_CACHE), // Clear the system cache
"F" => array(ADLAN_58,E_16_EMOTE, E_32_EMOTE), // Emoticons
"G" => array(ADLAN_60,E_16_FRONT, E_32_FRONT), // Front-Page Configuration
"L" => array(ADLAN_132,E_16_LANGUAGE, E_32_LANGUAGE), // Language Packs
"T" => array(ADLAN_66,E_16_META, E_32_META), // Meta tags
"1" => array(ADMSLAN_19,E_16_PREFS, E_32_PREFS), // Alter Site Preferences
"X" => array(ADMSLAN_66,E_16_SEARCH, E_32_SEARCH), // Search
"I" => array(ADMSLAN_40,E_16_LINKS, E_32_LINKS), // Post SiteLinks
"1" => array(LAN_PREFS,E_16_PREFS, E_32_PREFS), // Alter Site Preferences
"X" => array(LAN_SEARCH,E_16_SEARCH, E_32_SEARCH), // Search
"I" => array(ADLAN_138,E_16_LINKS, E_32_LINKS), // Post SiteLinks
"8" => array(ADMSLAN_27,E_16_LINKS, E_32_LINKS), // Oversee SiteLink Categories
"K" => array(ADMSLAN_43,E_16_EURL, E_32_EURL), // Configure URLs
"K" => array(ADLAN_159,E_16_EURL, E_32_EURL), // Configure URLs
// Users
"3" => array(ADMSLAN_21,E_16_ADMIN, E_32_ADMIN), // Modify Admin perms
"3" => array(ADLAN_8,E_16_ADMIN, E_32_ADMIN), // Modify Admin perms
"4" => array(LAN_USER_MANAGEALL,E_16_USER, E_32_USER), // Manage all user access and settings etc
"U0" => array(ADMSLAN_22,E_16_USER, E_32_USER), // moderate users/bans but not userclasses or extended fields,
"U0" => array(ADLAN_34,E_16_USER, E_32_USER), // moderate users/bans but not userclasses or extended fields,
"U1" => array(LAN_USER_QUICKADD,E_16_USER, E_32_USER), // "User: Quick Add User",
"U2" => array(LAN_USER_OPTIONS,E_16_USER, E_32_USER), // Manage only user-options
"U3" => array(LAN_USER_RANKS,E_16_USER, E_32_USER), // Manage only user-ranks
"W" => array(ADMSLAN_65,E_16_MAIL, E_32_MAIL), // Configure mail settings and mailout
"W" => array(ADLAN_136,E_16_MAIL, E_32_MAIL), // Configure mail settings and mailout
// Content
"5" => array(ADMSLAN_23,E_16_CUST, E_32_CUST), // create/edit custom PAGES
"J" => array(ADMSLAN_41,E_16_CUST, E_32_CUST), // create/edit custom MENUS
"5" => array(ADLAN_42,E_16_CUST, E_32_CUST), // create/edit custom PAGES
"J" => array(ADLAN_42,E_16_CUST, E_32_CUST), // create/edit custom MENUS
"H" => array(ADMSLAN_39,E_16_NEWS, E_32_NEWS), // Post News - All Areas except settings.
"H0" => array(ADMSLAN_39." (".LAN_CREATE.")",E_16_NEWS, E_32_NEWS), // Create News Items
"H1" => array(ADMSLAN_39." (".LAN_EDIT.")",E_16_NEWS, E_32_NEWS), // Edit News Items
"H2" => array(ADMSLAN_39." (".LAN_DELETE.")",E_16_NEWS, E_32_NEWS), // Delete News Items
"H3" => array(ADMSLAN_39." (".LAN_CATEGORY." - ".LAN_CREATE.")",E_16_NEWS, E_32_NEWS), // Create News Category
"H4" => array(ADMSLAN_39." (".LAN_CATEGORY." - ".LAN_EDIT.")",E_16_NEWS, E_32_NEWS), // Edit News Category
"H5" => array(ADMSLAN_39." (".LAN_CATEGORY." - ".LAN_DELETE.")",E_16_NEWS, E_32_NEWS), // Delete News Category
"H" => array(ADLAN_0,E_16_NEWS, E_32_NEWS), // Post News - All Areas except settings.
"H0" => array(ADLAN_0." (".LAN_CREATE.")",E_16_NEWS, E_32_NEWS), // Create News Items
"H1" => array(ADLAN_0." (".LAN_EDIT.")",E_16_NEWS, E_32_NEWS), // Edit News Items
"H2" => array(ADLAN_0." (".LAN_DELETE.")",E_16_NEWS, E_32_NEWS), // Delete News Items
"H3" => array(ADLAN_0." (".LAN_CATEGORY." - ".LAN_CREATE.")",E_16_NEWS, E_32_NEWS), // Create News Category
"H4" => array(ADLAN_0." (".LAN_CATEGORY." - ".LAN_EDIT.")",E_16_NEWS, E_32_NEWS), // Edit News Category
"H5" => array(ADLAN_0." (".LAN_CATEGORY." - ".LAN_DELETE.")",E_16_NEWS, E_32_NEWS), // Delete News Category
"N" => array(ADMSLAN_47,E_16_NEWS, E_32_NEWS), // Moderate submitted news
"V" => array(ADMSLAN_35,E_16_UPLOADS, E_32_UPLOADS), // Configure public file uploads
"M" => array(ADMSLAN_46,E_16_WELCOME, E_32_WELCOME), // Welcome Messages
"N" => array(ADLAN_0." (".LAN_SUBMITTED.")",E_16_NEWS, E_32_NEWS), // Moderate submitted news
"V" => array(ADLAN_31,E_16_UPLOADS, E_32_UPLOADS), // Configure public file uploads
"M" => array(ADLAN_28,E_16_WELCOME, E_32_WELCOME), // Welcome Messages
// Tools
"Y" => array(ADMSLAN_67,E_16_INSPECT, E_32_INSPECT), // File inspector
"9" => array(ADMSLAN_28, E_16_MAINTAIN, E_32_MAINTAIN), // Take Down site for Maintenance
"O" => array(ADMSLAN_68,E_16_NOTIFY, E_32_NOTIFY), // Notify
"U" => array(ADMSLAN_45,E_16_CRON, E_32_CRON), // Schedule Tasks
"S" => array(ADMSLAN_33,E_16_ADMINLOG, E_32_ADMINLOG), // System Logging
"Y" => array(ADLAN_147,E_16_INSPECT, E_32_INSPECT), // File inspector
"9" => array(ADLAN_40, E_16_MAINTAIN, E_32_MAINTAIN), // Take Down site for Maintenance
"O" => array(ADLAN_149,E_16_NOTIFY, E_32_NOTIFY), // Notify
"U" => array(ADLAN_157,E_16_CRON, E_32_CRON), // Schedule Tasks
"S" => array(ADLAN_155,E_16_ADMINLOG, E_32_ADMINLOG), // System Logging
// Manage
"B" => array(ADMSLAN_37,E_16_COMMENT, E_32_COMMENT), // Moderate Comments
"6" => array(ADMSLAN_25,E_16_FILE, E_32_FILE), // File-Manager - Upload /manage files -
"A" => array(ADMSLAN_36,E_16_IMAGES, E_32_IMAGES), // Media-Manager All Areas.
"A1"=> array(ADMSLAN_36,E_16_IMAGES, E_32_IMAGES), // Media-Manager (Media Add/Import)
"A2"=> array(ADMSLAN_36,E_16_IMAGES, E_32_IMAGES), // Media-Manager (Media-Categories)
"B" => array(LAN_COMMENTMAN,E_16_COMMENT, E_32_COMMENT), // Moderate Comments
"6" => array(LAN_MEDIAMANAGER,E_16_FILE, E_32_FILE), // File-Manager - Upload /manage files -
"A" => array(LAN_MEDIAMANAGER." (".LAN_ALL.")",E_16_IMAGES, E_32_IMAGES), // Media-Manager All Areas.
"A1"=> array(LAN_MEDIAMANAGER." (".LAN_CREATE."/".LAN_IMPORT.")",E_16_IMAGES, E_32_IMAGES), // Media-Manager (Media Add/Import)
"A2"=> array(LAN_MEDIAMANAGER." (".LAN_CATEGORIES.")",E_16_IMAGES, E_32_IMAGES), // Media-Manager (Media-Categories)
"2" => array(ADMSLAN_20,E_16_MENUS, E_32_MENUS), // Alter Menus
"2" => array(ADLAN_6,E_16_MENUS, E_32_MENUS), // Alter Menus
// "D"=> ADMSLAN_29, // Manage Banners (deprecated - now a plugin)
@ -1360,7 +1360,7 @@ class e_userperms
asort($this->plugin_perms);
$this->plugin_perms = array("Z"=> array('0'=>ADMSLAN_62)) + $this->plugin_perms;
$this->plugin_perms = array("Z"=> array('0'=>ADLAN_98)) + $this->plugin_perms;
if(e107::getConfig()->getPref('multilanguage'))
{

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

@ -48,7 +48,7 @@ define("ADLAN_39", "Create/edit user classes");
define("ADLAN_40", "Maintenance");
define("ADLAN_41", "Take site down for maintenance");
define("ADLAN_42", "Pages/Menus");
define("ADLAN_43", "Create custom menu items");
define("ADLAN_43", "Create menu items");
define("ADLAN_44", "Database");
define("ADLAN_45", "Database utilities");
// define("ADLAN_46", "Logout");
@ -99,7 +99,7 @@ define("ADLAN_95", "Plugin Management");
//define("ADLAN_96", "None");
//define("ADLAN_97", "Click here for FAQ");
define("ADLAN_98", "Plugin Manager");
define("ADLAN_99", "Install/upgrade etc. plugins");
define("ADLAN_99", "Click here to install, maintain and configure plugins which provide additional features on your site.");
// define("ADLAN_100", "Theme Layout"); // required
//define("ADLAN_101", "Template Creator");
define("ADLAN_102", "It has been more than 30 days since you changed the main administrator password - ");
@ -152,7 +152,7 @@ define("ADLAN_138", "Site Links");
define("ADLAN_139", "Add/edit/delete links");
define("ADLAN_140", "Theme Manager");
define("ADLAN_141", "Install / set themes etc");
define("ADLAN_141", "Click here to install and configure themes, which control the appearance of your site.");
// define("ADLAN_142", "Search");
define("ADLAN_143", "Search Configuration");
@ -208,8 +208,12 @@ define("ADLAN_LAT_8", "There are unmoderated administrator messages");
define("ADLAN_LAT_9", "Comments pending");
//LAN_WARNING define("ADLAN_ERR_1", "Warning!");
//define("ADLAN_ERR_2", "There are files on your server that are known to be exploitable. These must be removed <b>immediately</b>. The files are related to the older 0.6xx branch of e107. Please delete the following directories and all their contents:");
define("ADLAN_ERR_3", "There are one or more files in your public upload directories that are not in your allowed upload filetypes list. These may have been placed here by an attacker and if so should be removed <b>immediately</b>. You should <b>not</b> open these files as this may execute any malicious code the file might contain; e.g. do not open them with your browser.<br /><br />If you recognise these files as being legitimate, it is likely that the filetype is no longer in the allowed filetypes list for some reason, and you will need to re-add it (see admin => uploads). You should not allow the upload of .html, .txt, etc as an attacker may upload a file of this type which includes malicious javascript. You should also, of course, not allow the upload of .php files or any other type of executable script.<br /><br />Below is the list of files that could potentially be malicious:");
//define("ADLAN_ERR_2", "There are files on your server that are known to be exploitable. These must be removed [b]immediately[/b]. The files are related to the older 0.6xx branch of e107. Please delete the following directories and all their contents:");
define("ADLAN_ERR_3", "There are one or more files in your public upload directories that are not in your allowed upload filetypes list. These may have been placed here by an attacker and if so should be removed [b]immediately[/b]. You should [b]not[/b] open these files as this may execute any malicious code the file might contain; e.g. do not open them with your browser.
If you recognise these files as being legitimate, it is likely that the filetype is no longer in the allowed filetypes list for some reason, and you will need to re-add it (see admin => uploads). You should not allow the upload of .html, .txt, etc as an attacker may upload a file of this type which includes malicious javascript. You should also, of course, not allow the upload of .php files or any other type of executable script.
Below is the list of files that could potentially be malicious:");
//define("ADLAN_ERR_4", "Deprecated plugin file(s) found");
//define("ADLAN_ERR_5", "The following files need to be renamed to");
//define("ADLAN_ERR_6", "Then, click here to re-scan your plugin folders.");
@ -242,6 +246,8 @@ define("LAN_NEVER", "Never");
define("LAN_PRUNE", "Prune");
define("LAN_RESET","Reset");
define("LAN_CLEAR","Clear");
define("LAN_ALL","All");
define("LAN_IMPORT","Import");
// define("LAN_OK","OK"); // defined in e107_languages/English/English.php
// define("LAN_PRESET","Preset");
@ -272,6 +278,7 @@ define("LAN_INACTIVE","Inactive");
define("LAN_ACTIVE","Active");
define("LAN_ACCEPT","Accept");
define("LAN_PENDING","Pending");
define("LAN_SUBMITTED","Submitted");
define("LAN_BAN","Ban");
define("LAN_RATING", "Rating");

50
e107_languages/English/admin/lan_administrator.php
View File

@ -19,35 +19,35 @@ define("ADMSLAN_13", "Existing Administrators");
define("ADMSLAN_16", "Admin Name");
// define("ADMSLAN_17", "Admin Password");
define("ADMSLAN_18", "Permissions");
define("ADMSLAN_19", "Alter site preferences");
define("ADMSLAN_20", "Alter Menus");
//define("ADMSLAN_19", "Alter site preferences");//LAN_PREFS
//define("ADMSLAN_20", "Alter Menus");//ADLAN_6
define("ADMSLAN_21", "Modify administrator permissions");
define("ADMSLAN_22", "Moderate users/bans etc");
define("ADMSLAN_23", "Create/edit custom pages");
//define("ADMSLAN_22", "Moderate users/bans etc");//ADLAN_34
//define("ADMSLAN_23", "Create/edit custom pages"); //ADLAN_42
define("ADMSLAN_24", "Manage download categories");
define("ADMSLAN_25", "Upload /manage files");
define("ADMSLAN_26", "Oversee news categories");
define("ADMSLAN_27", "Oversee link categories");
define("ADMSLAN_28", "Take site down for maintenance");
//define("ADMSLAN_28", "Take site down for maintenance");//ADLAN_40
define("ADMSLAN_29", "Manage banners");
define("ADMSLAN_30", "Configure news feed headlines");
define("ADMSLAN_31", "Configure emoticons");
define("ADMSLAN_32", "Configure front page content");
define("ADMSLAN_33", "Configure system logging");
define("ADMSLAN_34", "Configure meta tags");
define("ADMSLAN_35", "Configure public file uploads");
define("ADMSLAN_36", "Media-Manager and image settings");
define("ADMSLAN_37", "Moderate comments");
// define("ADMSLAN_38", "Moderate/configure chatbox");
define("ADMSLAN_39", "Post news");
define("ADMSLAN_40", "Manage Sitelinks");
//define("ADMSLAN_31", "Configure emoticons");//ADLAN_58
//define("ADMSLAN_32", "Configure front page content");//ADLAN_60
//define("ADMSLAN_33", "Configure system logging");//ADLAN_155
//define("ADMSLAN_34", "Configure meta tags");//ADLAN_66
//define("ADMSLAN_35", "Configure public file uploads");//ADLAN_31
//define("ADMSLAN_36", "Media-Manager and image settings");//LAN_MEDIAMANAGER
//define("ADMSLAN_37", "Moderate comments");//LAN_COMMENTMAN
//define("ADMSLAN_38", "Moderate/configure chatbox");
//define("ADMSLAN_39", "Post news");//ADLAN_0
//define("ADMSLAN_40", "Manage Sitelinks");//ADLAN_138
define("ADMSLAN_41", "Create/edit custom menus");
define("ADMSLAN_42", "Post reviews"); // - NOW PLUGIN
define("ADMSLAN_43", "Configure URLs");
//define("ADMSLAN_43", "Configure URLs");//ADLAN_159
define("ADMSLAN_44", "Post downloads");
define("ADMSLAN_45", "Schedule Tasks");
define("ADMSLAN_46", "Welcome message");
define("ADMSLAN_47", "Moderate submitted news");
//define("ADMSLAN_45", "Schedule Tasks");//ADLAN_157
//define("ADMSLAN_46", "Welcome message");//ADLAN_28
//define("ADMSLAN_47", "Moderate submitted news");//LAN_SUBMITTED
//define("ADMSLAN_49", "Check All"); - global admin lan
//define("ADMSLAN_51", "Uncheck All"); - global admin lan
@ -65,11 +65,11 @@ define("ADMSLAN_61", "Administrator deleted");
define("ADMSLAN_62", "Plugin Manager");
define("ADMSLAN_64", "Clear the system cache");
define("ADMSLAN_65", "Configure mail settings and mailout");
define("ADMSLAN_66", "Configure Search");
define("ADMSLAN_67", "Scan with file inspector");
define("ADMSLAN_68", "Configure email notification");
//define("ADMSLAN_64", "Clear the system cache");//ADLAN_74
//define("ADMSLAN_65", "Configure mail settings and mailout");//ADLAN_136
//define("ADMSLAN_66", "Configure Search");//LAN_SEARCH
//define("ADMSLAN_67", "Scan with file inspector");//ADLAN_147
//define("ADMSLAN_68", "Configure email notification");//ADLAN_149
// define("ADMSLAN_69", "is already an administrator and must be edited.");
// 0.8
@ -81,7 +81,7 @@ define("ADMSLAN_73", "Admin ID: --ID-- name: --NAME--");
define("ADMSLAN_74", "General");
// define("ADMSLAN_75", "");
define("ADMSLAN_76", "Manage language-packs");
//define("ADMSLAN_76", "Manage language-packs");//ADLAN_132
//define("ADMSLAN_2", "Site Administrator [name] updated in database."); // LAN_UPDATED
?>