From 4d61a4d967ad4ffda5ef3df90fdbd6f5945ee8db Mon Sep 17 00:00:00 2001
From: Retro_Guy <retro.guy@rocksolidbbs.com>
Date: Mon, 21 Jun 2021 09:04:13 +0000
Subject: [PATCH] Highlight MAIL link if new mail. Change cookie path to / .
 Move some scripts to spoolnews/

---
 Rocksolid_Light/common/header.php             | 55 ++++++++++++++++++-
 Rocksolid_Light/rocksolid/index.php           |  2 +-
 Rocksolid_Light/rocksolid/newsportal.php      | 23 ++++++++
 Rocksolid_Light/rslight/links.conf            |  4 +-
 .../{rocksolid => spoolnews}/files.php        |  0
 Rocksolid_Light/spoolnews/head.inc            |  1 +
 .../{rocksolid => spoolnews}/mail.php         | 47 +++++-----------
 .../{rocksolid => spoolnews}/upload.php       |  0
 8 files changed, 96 insertions(+), 36 deletions(-)
 rename Rocksolid_Light/{rocksolid => spoolnews}/files.php (100%)
 create mode 120000 Rocksolid_Light/spoolnews/head.inc
 rename Rocksolid_Light/{rocksolid => spoolnews}/mail.php (93%)
 rename Rocksolid_Light/{rocksolid => spoolnews}/upload.php (100%)

diff --git a/Rocksolid_Light/common/header.php b/Rocksolid_Light/common/header.php
index 9c5e27c..ed8bbae 100644
--- a/Rocksolid_Light/common/header.php
+++ b/Rocksolid_Light/common/header.php
@@ -8,6 +8,7 @@ if (basename(getcwd()) == 'mods') {
 }
 
 include($rootdir.'common/config.inc.php');
+
 $CONFIG = include $config_file;
 ?>
    <script type="text/javascript">
@@ -49,6 +50,11 @@ if (file_exists($rootdir.'common/mods/images/rocksolidlight.png')) {
 		</td>
 		<td align="right">
 <?php
+		if(check_unread_mail() == true) {
+			$unread = true;
+		} else {
+			$unread = false;
+		}
 			foreach($linklist as $link) {
 				if($link[0] == '#') {
 					continue;
@@ -57,7 +63,13 @@ if (file_exists($rootdir.'common/mods/images/rocksolidlight.png')) {
 				if($linkitem[1] == '0') {
 					continue;
 				}
-				echo '<a href="'.trim($linkitem[1]).'">'.trim($linkitem[0]).'</a>&nbsp;&nbsp';
+				if($unread && (strpos($linkitem[1], 'spoolnews/mail.php') !== false)) {
+				  echo '<strong>';
+           			  echo '<a href="'.trim($linkitem[1]).'">'.trim(strtoupper($linkitem[0])).'</a>&nbsp;&nbsp';
+				  echo '</strong>';
+				} else {
+				  echo '<a href="'.trim($linkitem[1]).'">'.trim($linkitem[0]).'</a>&nbsp;&nbsp';
+				}
 			}
 ?>
 		</td>
@@ -132,5 +144,46 @@ foreach($menulist as $menu) {
     }
     echo '</tr></table>';
     echo '</p>';
+function check_unread_mail() {
+global $CONFIG, $spooldir;
+        if(isset($_COOKIE['mail_name'])) {
+          $name = strtolower($_COOKIE['mail_name']);
+          $database = $spooldir.'/mail.db3';
+          $dbh = head_mail_db_open($database);
+          $query = $dbh->prepare('SELECT * FROM messages where rcpt_to=:rcpt_to');
+          $query->execute(['rcpt_to' => $name]);
+          $newmail = false;
+          while (($row = $query->fetch()) !== false) {
+            if(($row['rcpt_viewed'] != 'true') && ($row['to_hide'] !='true')) {
+              $newmail = true;
+            }
+          }
+          $dbh = null;
+          return $newmail;
+        }
+}
+
+function head_mail_db_open($database, $table='messages') {
+  try {
+    $dbh = new PDO('sqlite:'.$database);
+  } catch (PDOExeption $e) {
+    echo 'Connection failed: '.$e->getMessage();
+    exit;
+  }
+  $dbh->exec("CREATE TABLE IF NOT EXISTS messages(
+     id INTEGER PRIMARY KEY,
+     msgid TEXT UNIQUE,
+     mail_from TEXT,
+     mail_viewed TEXT,
+     rcpt_to TEXT,
+     rcpt_viewed TEXT,
+     rcpt_target TEXT,
+     date TEXT,
+     subject TEXT,
+     message TEXT,
+     from_hide TEXT,
+     to_hide TEXT)");
+  return($dbh);
+}
 ?>
 </body></html>
diff --git a/Rocksolid_Light/rocksolid/index.php b/Rocksolid_Light/rocksolid/index.php
index f041343..27d201c 100644
--- a/Rocksolid_Light/rocksolid/index.php
+++ b/Rocksolid_Light/rocksolid/index.php
@@ -20,7 +20,7 @@ if (isset($frames_on) && $frames_on === true) {
 ?>
    <script type="text/javascript">
      if (navigator.cookieEnabled)
-       document.cookie = "tzo="+ (- new Date().getTimezoneOffset());
+       document.cookie = "tzo="+ (- new Date().getTimezoneOffset())+"; path=/";
    </script>
 <?php
 $title.=' - '.basename(getcwd());
diff --git a/Rocksolid_Light/rocksolid/newsportal.php b/Rocksolid_Light/rocksolid/newsportal.php
index 65e29f6..334f574 100644
--- a/Rocksolid_Light/rocksolid/newsportal.php
+++ b/Rocksolid_Light/rocksolid/newsportal.php
@@ -1316,6 +1316,29 @@ function get_search_snippet($body, $content_type='') {
    return $mysnippet;
 }
 
+function mail_db_open($database, $table='messages') {
+  try {
+    $dbh = new PDO('sqlite:'.$database);
+  } catch (PDOExeption $e) {
+    echo 'Connection failed: '.$e->getMessage();
+    exit;
+  }
+  $dbh->exec("CREATE TABLE IF NOT EXISTS messages(
+     id INTEGER PRIMARY KEY,
+     msgid TEXT UNIQUE,
+     mail_from TEXT,
+     mail_viewed TEXT,
+     rcpt_to TEXT,
+     rcpt_viewed TEXT,
+     rcpt_target TEXT,
+     date TEXT,
+     subject TEXT,
+     message TEXT,
+     from_hide TEXT,
+     to_hide TEXT)");
+  return($dbh);
+}
+
 function rslight_db_open($database, $table='overview') {
   try {
     $dbh = new PDO('sqlite:'.$database);
diff --git a/Rocksolid_Light/rslight/links.conf b/Rocksolid_Light/rslight/links.conf
index b393d40..c249033 100644
--- a/Rocksolid_Light/rslight/links.conf
+++ b/Rocksolid_Light/rslight/links.conf
@@ -1,7 +1,7 @@
 # These are the links at the top right of the site
 # display name:url
-mail:/rocksolid/mail.php
-files:/rocksolid/files.php
+mail:/spoolnews/mail.php
+files:/spoolnews/files.php
 register:/common/register.php
 nodelist:/common/nodelist.php
 faq:/common/faq.txt
diff --git a/Rocksolid_Light/rocksolid/files.php b/Rocksolid_Light/spoolnews/files.php
similarity index 100%
rename from Rocksolid_Light/rocksolid/files.php
rename to Rocksolid_Light/spoolnews/files.php
diff --git a/Rocksolid_Light/spoolnews/head.inc b/Rocksolid_Light/spoolnews/head.inc
new file mode 120000
index 0000000..bf8f5c9
--- /dev/null
+++ b/Rocksolid_Light/spoolnews/head.inc
@@ -0,0 +1 @@
+../rocksolid/head.inc
\ No newline at end of file
diff --git a/Rocksolid_Light/rocksolid/mail.php b/Rocksolid_Light/spoolnews/mail.php
similarity index 93%
rename from Rocksolid_Light/rocksolid/mail.php
rename to Rocksolid_Light/spoolnews/mail.php
index ae25cf8..b84e998 100644
--- a/Rocksolid_Light/rocksolid/mail.php
+++ b/Rocksolid_Light/spoolnews/mail.php
@@ -34,8 +34,9 @@ include "head.inc";
          var authcookie = "<?php echo $authkey; ?>";
          var savename = "<?php echo stripslashes($name); ?>";
 	 var auth_expire = "<?php echo $auth_expire; ?>";
-         document.cookie = "mail_auth="+authcookie+"; max-age="+auth_expire;
-         document.cookie = "mail_name="+savename;
+	 var name_expire = "7776000";
+         document.cookie = "mail_auth="+authcookie+"; max-age="+auth_expire+"; path=/";
+         document.cookie = "mail_name="+savename+"; max-age="+name_expire+"; path=/";
       </script>
 <?php
       $logged_in = true;
@@ -114,12 +115,15 @@ echo '</table>';
       if(($row['mail_from'] != $user) && ($row['rcpt_to'] != $user)) {
         continue;
       }
+      $istrue = 'true';
       if($row['mail_from'] == $user) {
-        $sql_update = $dbh->prepare('UPDATE messages SET from_hide=? WHERE id=?');
-      } elseif($row['rcpt_to'] == $user) {
-        $sql_update = $dbh->prepare('UPDATE messages SET to_hide=? WHERE id=?');
+        $sql_update = $dbh->prepare('UPDATE messages SET from_hide=:from_hide WHERE id=:row_id');
+	$sql_update->execute(array(':from_hide' => $istrue, ':row_id' => $row['id']));
+      } 
+      if($row['rcpt_to'] == $user) {
+        $sql_update = $dbh->prepare('UPDATE messages SET to_hide=:to_hide WHERE id=:row_id');
+	$sql_update->execute(array(':to_hide' => $istrue, ':row_id' => $row['id']));
       }
-      $sql_update->execute(array('true', $row['id']));
     }
     $dbh = null;
   }
@@ -162,10 +166,12 @@ echo '</table>';
       echo '</div>';
       if($row['mail_from'] == $user) {
         $sql_update = $dbh->prepare('UPDATE messages SET mail_viewed=? WHERE msgid=?');
-      } elseif($row['rcpt_to'] == $user) {
+	$sql_update->execute(array('true', $row['msgid']));
+      } 
+      if($row['rcpt_to'] == $user) {
         $sql_update = $dbh->prepare('UPDATE messages SET rcpt_viewed=? WHERE msgid=?');
+	$sql_update->execute(array('true', $row['msgid']));
       }
-      $sql_update->execute(array('true', $row['msgid']));
     }
     $dbh = null;
  
@@ -173,7 +179,7 @@ echo '</table>';
         if (isSet($_POST['sendMessage'])) {
                 if (isSet($_POST['to']) && $_POST['to'] != '' && isSet($_POST['from']) && $_POST['from'] != '' && isSet($_POST['message']) && $_POST['message'] != '') {
             if(($to = get_config_value('aliases.conf', strtolower($_POST['to']))) == false) {
-              $to = $_POST['to'];
+              $to = strtolower($_POST['to']);
             }
 	    $userlist = scandir($config_dir.'/users/');
 	    $found = 0;
@@ -297,27 +303,4 @@ echo '</table>';
     }
     echo '</tbody></table><br />';
     include "tail.inc";
-
-function mail_db_open($database, $table='messages') {
-  try {
-    $dbh = new PDO('sqlite:'.$database);
-  } catch (PDOExeption $e) {
-    echo 'Connection failed: '.$e->getMessage();
-    exit;
-  }
-  $dbh->exec("CREATE TABLE IF NOT EXISTS messages(
-     id INTEGER PRIMARY KEY,
-     msgid TEXT UNIQUE,
-     mail_from TEXT,
-     mail_viewed TEXT,
-     rcpt_to TEXT,
-     rcpt_viewed TEXT,
-     rcpt_target TEXT,
-     date TEXT,
-     subject TEXT,
-     message TEXT,
-     from_hide TEXT,
-     to_hide TEXT)");
-  return($dbh);
-}
 ?>
diff --git a/Rocksolid_Light/rocksolid/upload.php b/Rocksolid_Light/spoolnews/upload.php
similarity index 100%
rename from Rocksolid_Light/rocksolid/upload.php
rename to Rocksolid_Light/spoolnews/upload.php