diff --git a/Rocksolid_Light/rocksolid/lib/post.inc.php b/Rocksolid_Light/rocksolid/lib/post.inc.php
index d90a627..ab86785 100644
--- a/Rocksolid_Light/rocksolid/lib/post.inc.php
+++ b/Rocksolid_Light/rocksolid/lib/post.inc.php
@@ -416,7 +416,7 @@ function check_rate_limit($name, $set = 0, $gettime = 0)
*/
function message_post($subject, $from, $newsgroups, $ref, $body, $encryptthis = null, $encryptto = null, $authname = null, $fromname, $followupto = null, $do_attach = null)
{
- global $server, $port, $send_poster_host, $text_error, $CONFIG;
+ global $server, $port, $send_poster_host, $text_error, $CONFIG, $OVERRIDES;
global $www_charset, $config_dir, $spooldir;
global $msgid_generate, $msgid_fqdn, $rslight_version;
@@ -497,21 +497,24 @@ function message_post($subject, $from, $newsgroups, $ref, $body, $encryptthis =
}
}
}
-
// Check for custom name/email from user configuration
- $user_config = unserialize(file_get_contents($config_dir . '/userconfig/' . $authname . '.config'));
- if(trim($user_config['display_name']) == '') {
- unset($user_config['display_name']);
- }
- if(trim($user_config['display_email']) == '') {
- unset($user_config['display_email']);
- }
- if (isset($user_config['display_name']) && isset($user_config['display_email'])) {
- fputs($ns, 'From: ' . $user_config['display_name'] .' <' .$user_config['display_email'] . ">\r\n");
+ if ($OVERRIDES['disable_change_name'] != true) {
+ $user_config = unserialize(file_get_contents($config_dir . '/userconfig/' . $authname . '.config'));
+ if (trim($user_config['display_name']) == '') {
+ unset($user_config['display_name']);
+ }
+ if (trim($user_config['display_email']) == '') {
+ unset($user_config['display_email']);
+ }
+ if (isset($user_config['display_name']) && isset($user_config['display_email'])) {
+ fputs($ns, 'From: ' . $user_config['display_name'] . ' <' . $user_config['display_email'] . ">\r\n");
+ } else {
+ fputs($ns, 'From: ' . $from . "\r\n");
+ }
} else {
fputs($ns, 'From: ' . $from . "\r\n");
}
-
+
if ($followupto !== null) {
fputs($ns, 'Followup-To: ' . $followupto . "\r\n");
}
diff --git a/Rocksolid_Light/rocksolid/post.php b/Rocksolid_Light/rocksolid/post.php
index bca023e..48f2b78 100644
--- a/Rocksolid_Light/rocksolid/post.php
+++ b/Rocksolid_Light/rocksolid/post.php
@@ -408,16 +408,19 @@ if ($show == 1) {
echo '';
}
- $user_config = unserialize(file_get_contents($config_dir . '/userconfig/' . strtolower($name) . '.config'));
- if (isset($user_config['display_name']) && trim($user_config['display_name']) != '') {
- if (isset($user_config['display_email']) && trim($user_config['display_email']) != '') {
- echo '
';
- echo 'From: | ';
- $showemail = '<' . $user_config['display_email'] . '>';
- echo '';
- echo '';
-// echo $user_config['display_name'] . ' ' . htmlspecialchars($showemail);
- echo ' |
';
+ // Check for custom name/email from user configuration
+ if ($OVERRIDES['disable_change_name'] != true) {
+ $user_config = unserialize(file_get_contents($config_dir . '/userconfig/' . strtolower($name) . '.config'));
+ if (isset($user_config['display_name']) && trim($user_config['display_name']) != '') {
+ if (isset($user_config['display_email']) && trim($user_config['display_email']) != '') {
+ echo '';
+ echo 'From: | ';
+ $showemail = '<' . $user_config['display_email'] . '>';
+ echo '';
+ echo '';
+ // echo $user_config['display_name'] . ' ' . htmlspecialchars($showemail);
+ echo ' |
';
+ }
}
}
echo '';
diff --git a/Rocksolid_Light/spoolnews/user.php b/Rocksolid_Light/spoolnews/user.php
index 1b084cc..85c346c 100644
--- a/Rocksolid_Light/spoolnews/user.php
+++ b/Rocksolid_Light/spoolnews/user.php
@@ -204,8 +204,10 @@ if ($_POST['command'] != 'Configuration' && $_POST['command'] != 'SaveConfig') {
}
// Apply Config
if (isset($_POST['command']) && $_POST['command'] == 'SaveConfig') {
- $user_config['display_name'] = $_POST['display_name'];
- $user_config['display_email'] = $_POST['display_email'];
+ if ($OVERRIDES['disable_change_name'] != true) {
+ $user_config['display_name'] = $_POST['display_name'];
+ $user_config['display_email'] = $_POST['display_email'];
+ }
$user_config['signature'] = $_POST['signature'];
$user_config['xface'] = $_POST['xface'];
$user_config['timezone'] = $_POST['timezone'];
@@ -247,16 +249,18 @@ if (is_dir($themedir)) {
}
// Get settings for name and email
-if (isset($user_config['display_name'])) {
- $display_name = $user_config['display_name'];
-} else {
- $display_name = $_POST['username'];
-}
-if (isset($user_config['display_email'])) {
- $display_email = $user_config['display_email'];
-} else {
- if (($display_email = get_user_config($_POST['username'], 'email')) == false) {
- $display_email = $_POST['username'] . '@' . $CONFIG['email_tail'];
+if ($OVERRIDES['disable_change_name'] != true) {
+ if (isset($user_config['display_name'])) {
+ $display_name = $user_config['display_name'];
+ } else {
+ $display_name = $_POST['username'];
+ }
+ if (isset($user_config['display_email'])) {
+ $display_email = $user_config['display_email'];
+ } else {
+ if (($display_email = get_user_config($_POST['username'], 'email')) == false) {
+ $display_email = $_POST['username'] . '@' . $CONFIG['email_tail'];
+ }
}
}
sort($themes);
@@ -267,14 +271,16 @@ if (isset($_POST['command']) && $_POST['command'] == 'Configuration') {
echo 'Settings for ' . $_POST['username'] . ': |
';
echo '