mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 11:50:30 +02:00
Code Issues Releases Wiki Activity

Merge pull request #2575 from yesszus/patch-1

Browse Source 
Update Admin Notify
This commit is contained in:
Cameron
2017-04-23 16:58:13 -07:00
committed by GitHub
parent 24bfacdd4e c94a1ac109
commit 3e41efb8c1
6 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
e107_admin/notify.php
View File

@@ -144,7 +144,7 @@ class plugin_notify_admin_ui extends e_admin_ui
$data = e107::callMethod($val."_notify", 'config');
$config_category = str_replace("_menu","",ucfirst($val))." Events";
$config_category = str_replace("_menu","",ucfirst($val))." ".LAN_NOTIFY_01;
foreach($data as $v)
{
@@ -313,7 +313,7 @@ class plugin_notify_admin_ui extends e_admin_ui
$tp = e107::getParser();
$frm = e107::getForm();
$uc = e107::getUserClass();
$uc->fixed_classes['email'] = 'Email Address =>';
$uc->fixed_classes['email'] = NM_LAN_3;
$uc->text_class_link['email'] = 'email';
@@ -593,7 +593,7 @@ class notify_config
$data = e107::callMethod($val."_notify", 'config');
$config_category = str_replace("_menu","",ucfirst($val))." Events";
$config_category = str_replace("_menu","",ucfirst($val))." ".LAN_NOTIFY_01;
foreach($data as $v)
{
@@ -893,7 +893,7 @@ class notify_config
$tp = e107::getParser();
$frm = e107::getForm();
$uc = e107::getUserClass();
$uc->fixed_classes['email'] = 'Email Address =>';
$uc->fixed_classes['email'] = NM_LAN_3;
$uc->text_class_link['email'] = 'email';

2
e107_admin/users.php
View File

@@ -283,7 +283,7 @@ class users_admin_ui extends e_admin_ui
'user_login' => array('title' => LAN_USER_03, 'tab'=>0, 'type' => 'text', 'inline'=>true, 'data'=>'str', 'width' => 'auto'), // Real name (no real vetting)
'user_customtitle' => array('title' => LAN_USER_04, 'tab'=>0, 'type' => 'text', 'inline'=>true, 'data'=>'str', 'width' => 'auto'), // No real vetting
'user_password' => array('title' => LAN_PASSWORD, 'tab'=>0, 'type' => 'method', 'data'=>'safestr', 'width' => 'auto'), //TODO add md5 option to form handler?
'user_sess' => array('title' => USRLAN_175, 'tab'=>0, 'noedit'=>true, 'type' => 'text', 'width' => 'auto'), // Photo
'user_sess' => array('title' => LAN_SESSION, 'tab'=>0, 'noedit'=>true, 'type' => 'text', 'width' => 'auto'), // Photo
'user_image' => array('title' => LAN_USER_07, 'tab'=>0, 'type' => 'dropdown', 'data'=>'str', 'width' => 'auto'), // Avatar
'user_email' => array('title' => LAN_EMAIL, 'tab'=>0, 'type' => 'text', 'inline'=>true, 'data'=>'str', 'width' => 'auto', 'writeParms'=>array('size'=>'xxlarge')),
'user_hideemail' => array('title' => LAN_USER_10, 'tab'=>0, 'type' => 'boolean', 'data'=>'int', 'width' => 'auto', 'thclass'=>'center', 'class'=>'center', 'filter'=>true, 'batch'=>true, 'readParms'=>'trueonly=1'),

20
e107_handlers/event_class.php
View File

@@ -81,19 +81,19 @@ class e107_event
'user_signup_activated' => NU_LAN_3,
'login' => NU_LAN_4,
'logout' => NU_LAN_5,
'user_xup_login' => 'User social login',
'user_xup_signup' => 'User social signup',
'user_xup_login' => NU_LAN_6,
'user_xup_signup' => NU_LAN_7,
'user_ban_flood' => NS_LAN_2,
'user_ban_failed_login' => 'IP banned for multiple failed login attempts',
'user_profile_display' => "User views profile",
'user_profile_edit' => "User edits profile"
'user_ban_failed_login' => NS_LAN_3,
'user_profile_display' => NU_LAN_8,
'user_profile_edit' => NU_LAN_9
),
'administrators' => array(
'admin_password_update' => "Administrator updates their password",
'admin_user_created' => 'Administrator creates a new user',
'admin_user_activated' => "Administrator activates a new user"
'admin_password_update' => NA_LAN_1,
'admin_user_created' => NA_LAN_2,
'admin_user_activated' => NA_LAN_3
),
@@ -102,7 +102,7 @@ class e107_event
'admin_news_created' => NN_LAN_3,
'admin_news_updated' => NN_LAN_4,
'admin_news_deleted' => NN_LAN_5,
'admin_news_notify' => "News notification triggered", // TODO LAN
'admin_news_notify' => NN_LAN_6,
'user_news_submit' => NN_LAN_2,
),
@@ -348,4 +348,4 @@ class e107_event
}
}
?>
?>

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

@@ -290,6 +290,7 @@ define("LAN_NOTWRITABLE"," is not writable, you need to CHMOD 777 the file or fo
define("LAN_NOTREADABLE", "Not Readable");
define("LAN_MISSING", "Missing");
define("LAN_UNUSED", "Unused");
define("LAN_SESSION", "Session");
define("LAN_TOOLTIP", "Tooltip");
define("LAN_TIME","Time");

11
e107_languages/English/admin/lan_notify.php
View File

@@ -6,6 +6,10 @@
*
*/
define("NA_LAN_1", "Administrator updates their password");
define("NA_LAN_2", "Administrator creates a new user");
define("NA_LAN_3", "Administrator activates a new user");
define("NT_LAN_1", "Notify");
define("NT_LAN_2", "Receive email notification on");
//define("NT_LAN_3", "Off");
@@ -18,18 +22,25 @@ define("NU_LAN_2", "User signup");
define("NU_LAN_3", "User account verification");
define("NU_LAN_4", "User login");
define("NU_LAN_5", "User logout");
define("NU_LAN_6", "User social login");
define("NU_LAN_7", "User social signup");
define("NU_LAN_8", "User views profile");
define("NU_LAN_9", "User edits profile");
define("NS_LAN_1", "Security Events");
define("NS_LAN_2", "IP banned for flooding site");
define("NS_LAN_3", "IP banned for multiple failed login attempts");
define("NN_LAN_1", "News Events");
define("NN_LAN_2", "News item submitted by user");
define("NN_LAN_3", "News item posted by admin");
define("NN_LAN_4", "News item edited by admin");
define("NN_LAN_5", "News item deleted by admin");
define("NN_LAN_6", "News notification triggered");
define("NM_LAN_1", "Mail Events");
define("NM_LAN_2", "Bulk email run complete");
define("NM_LAN_3", "Email Address =>");
define("NF_LAN_1", "File Events");
define("NF_LAN_2", "File uploaded by user");

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

@@ -176,7 +176,7 @@ define("USRLAN_171", "Random password");
define("USRLAN_172", "User account has been created with the following:");
// define("USRLAN_173", "Login name set");
// define("USRLAN_174", "User name --NAME-- created");
define("USRLAN_175", "Session");
// define("USRLAN_175", "Session"); // Moved to lan_admin.php
define("USRLAN_179", "User banned: ");
define("USRLAN_180", "IP address of {IP} appears on whitelist; IP not banned.");