diff --git a/class2.php b/class2.php
index aa0af984e..46d88caee 100644
--- a/class2.php
+++ b/class2.php
@@ -1549,6 +1549,7 @@ function init_session()
define('USEREMAIL', '');
define('USERCLASS_LIST', '');
define('USERCLASS', '');
+ define('USERJOINED', '');
return;
}
@@ -1580,12 +1581,14 @@ function init_session()
// we shouldn't use getValue() here, it's there for e.g. shortcodes, profile page render etc.
define('USERID', $user->getId());
define('USERNAME', $user->get('user_name'));
- // define('USERURL', $user->get('user_homepage', false)); OLD?
+ define('USERURL', $user->get('user_homepage', false)); //required for BC
define('USEREMAIL', $user->get('user_email'));
define('USER', true);
define('USERCLASS', $user->get('user_class'));
define('USERIMAGE', $user->get('user_image'));
define('USERPHOTO', $user->get('user_sess'));
+ define('USERJOINED', $user->get('user_join'));
+ define('USERVISITS', $user->get('user_visits'));
define('ADMIN', $user->isAdmin());
define('ADMINID', $user->getAdminId());
diff --git a/e107_admin/users.php b/e107_admin/users.php
index 721bf0087..5121adc49 100644
--- a/e107_admin/users.php
+++ b/e107_admin/users.php
@@ -995,8 +995,8 @@ class users_admin_ui extends e_admin_ui
- | Signatures may be entered by: |
- ". // TODO LAN
+ | ".USRLAN_194.": |
+ ".
e107::getForm()->uc_select('signature_access',$pref['signature_access'],"member,admin,main,classes,nobody")
." |
@@ -1006,7 +1006,7 @@ class users_admin_ui extends e_admin_ui
| ".USRLAN_190.": |
- ".USRLAN_192."
+ ".LANDT_04s."
".USRLAN_191."
|
diff --git a/e107_handlers/comment_class.php b/e107_handlers/comment_class.php
index 399396a17..8a542e47b 100644
--- a/e107_handlers/comment_class.php
+++ b/e107_handlers/comment_class.php
@@ -533,6 +533,17 @@ class comment
return "Update Failed"; // trigger ajax error message.
}
}
+
+
+ function moderateComment($var)
+ {
+ if ($var == e_UC_MEMBER) // different behavior to check_class();
+ {
+ return (USER == TRUE && ADMIN == FALSE) ? TRUE : FALSE;
+ }
+
+ return check_class($var);
+ }
@@ -650,7 +661,7 @@ class comment
'comment_author_email' => $tp->toDB($cuser_mail),
'comment_datestamp' => $_t,
'comment_comment' => $comment,
- 'comment_blocked' => (check_class($pref['comments_moderate']) ? 2 : 0),
+ 'comment_blocked' => ($this->moderateComment($pref['comments_moderate']) ? 2 : 0),
'comment_ip' => $ip,
'comment_type' => $tp->toDB($type, true),
'comment_lock' => 0 //Not locked by default
diff --git a/e107_handlers/db_debug_class.php b/e107_handlers/db_debug_class.php
index b21c1c9b5..12c75e8fd 100644
--- a/e107_handlers/db_debug_class.php
+++ b/e107_handlers/db_debug_class.php
@@ -494,6 +494,8 @@ class e107_db_debug {
$text .= "e_MENU: '".e_MENU."'
";
$text .= "THEME: '".THEME."'
";
$text .= "THEME_LAYOUT: '".THEME_LAYOUT."'
";
+
+
$text .= "
";
$text .= "e_LANGUAGE: '".e_LANGUAGE."'
";
@@ -505,6 +507,20 @@ class e107_db_debug {
$text .= "META_DESCRIPTION: '".META_DESCRIPTION."'
";
$text .= "
";
+ $text .= "USERID: '".USERID."'
";
+ $text .= "USERNAME: '".USERNAME."'
";
+ $text .= "USERURL: '".USERURL."'
";
+ $text .= "USEREMAIL: '".USEREMAIL."'
";
+ $text .= "USERCLASS: '".USERCLASS."'
";
+ $text .= "USERREALM: '".USERREALM."'
";
+ $text .= "USERVIEWED: '".USERVIEWED."'
";
+ $text .= "USERVISITS: '".USERVISITS."'
";
+ $text .= "USERIMAGE: '".USERIMAGE."'
";
+ $text .= "USERSESS: '".USERSESS."'
";
+ $text .= "USERJOINED: '".USERJOINED."'
";
+
+ $text .= "
";
+
$text .= "SQL Language: '".$sql->mySQLlanguage."'
";
$text .= "
";
$text .= "\$_SERVER['PHP_SELF']: '".$_SERVER['PHP_SELF']."'
";
diff --git a/e107_handlers/login.php b/e107_handlers/login.php
index a878c7a03..ec67138c2 100644
--- a/e107_handlers/login.php
+++ b/e107_handlers/login.php
@@ -258,7 +258,7 @@ class userlogin
return $cookieval;
}
- if (in_array(e_UC_NEWUSER,$class_list))
+ if (in_array(e_UC_NEWUSER,$class_list))//XXX Why not just add a check in check_class ?
{
if (time() > ($this->userData['user_join'] + (varset($pref['user_new_period'],0)*86400)))
{ // 'New user' probationary period expired - we can take them out of the class
diff --git a/e107_languages/English/admin/lan_prefs.php b/e107_languages/English/admin/lan_prefs.php
index b885bd485..4f65c4ddd 100644
--- a/e107_languages/English/admin/lan_prefs.php
+++ b/e107_languages/English/admin/lan_prefs.php
@@ -234,5 +234,7 @@ define('PRFLAN_218', 'If \'off\', puts users at increased risk of XSS exploits p
define('PRFLAN_219', 'Not allowed characters found in Cookie name (alphanumeric characters allowed only). Cookie name not saved.');
define('PRFLAN_220', 'HTML Abuse filter (experimental)');
define('PRFLAN_221', 'Blocks some unmatched tags for those allowed to post HTML');
+define('PRFLAN_222', 'Moderate Comments made by');
+define('PRFLAN_223', 'Comments will require manual approval by an admin prior to being visible to other users');
?>
\ No newline at end of file
diff --git a/e107_languages/English/admin/lan_users.php b/e107_languages/English/admin/lan_users.php
index 7c4737d40..043357078 100644
--- a/e107_languages/English/admin/lan_users.php
+++ b/e107_languages/English/admin/lan_users.php
@@ -196,9 +196,9 @@ define('USRLAN_189', 'Error sending email');
define('USRLAN_190', 'New user probationary period (days)');
define('USRLAN_191', '(admin can impose restrictions during this period in some areas)');
-define('USRLAN_192', 'days');
+define('USRLAN_192', ''); // was 'days' use value in lan_date.php instead.
define('USRLAN_193', 'Nothing changed - not saved');
-define('USRLAN_194', '');
+define('USRLAN_194', 'Signature may be modified by');
define('USRLAN_195', '');
//User Ranks phrases
diff --git a/e107_languages/English/lan_comment.php b/e107_languages/English/lan_comment.php
index 1b0406d67..1570dcb1b 100644
--- a/e107_languages/English/lan_comment.php
+++ b/e107_languages/English/lan_comment.php
@@ -55,6 +55,7 @@ define("COMLAN_327", 'Rating');
define("COMLAN_328", 'Comments are locked');
define("COMLAN_329", 'Unauthorized');
define("COMLAN_330", 'IP:');
+define("COMLAN_331", "Pending Approval");
define("COMLAN_TYPE_1", "news");
define("COMLAN_TYPE_2", "download");