Add proper 'type' handling for applying nocem.

Rocksolid_Light/rslight/nocem.conf

@@ -0,0 +1,8 @@
+# You must add the public key for
+# each issuer listed to the directory
+# set in gpg.conf
+# Set GNUPGHOME to this directory
+# when adding the key using gpg
+
+i2pn2-nocem@i2pn2.org:spam
+nocem@eternal-september.org:spam,misplaced_binary

Rocksolid_Light/rslight/scripts/nocem.php

@@ -35,6 +35,13 @@ foreach ($messages as $message) {
     if (! is_file($nocem_file)) {
         continue;
     }
+    if (check_nocem_config($nocem_file) == true) {
+        file_put_contents($logfile, "\n" . format_log_date() . " " . $config_name . " Good Issuer and Type for: " . $message, FILE_APPEND);
+    } else {
+        file_put_contents($logfile, "\n" . format_log_date() . " " . $config_name . " Bad Issuer or Type for: " . $message, FILE_APPEND);
+        rename($nocem_file, $nocem_path . "failed/" . $message);
+        continue;
+    }
     $signed_text = file_get_contents($nocem_file);
     if (verify_gpg_signature($res, $signed_text) == 1) {
         file_put_contents($logfile, "\n" . format_log_date() . " " . $config_name . " Good signature in: " . $message, FILE_APPEND);
@@ -64,11 +71,11 @@ foreach ($messages as $message) {
         }
         if (($nocem_line[0] == '<') && $start == 1) {
             $found = preg_split("/\ |\,/", $nocem_line);
-//            $found = explode(' ', $nocem_line);
+            // $found = explode(' ', $nocem_line);
             $i = 0;
             foreach ($found as $group_item) {
                 if ($i == 0) {
-                    $i++;
+                    $i ++;
                     continue;
                 }
                 file_put_contents($logfile, "\n" . format_log_date() . " " . $config_name . " TRYING: " . $found[0] . " IN: " . $group_item, FILE_APPEND);
@@ -83,5 +90,50 @@ foreach ($messages as $message) {
     prune_dir_by_days($nocem_path . "failed/", 30);
 }
 unlink($lockfile);
-exit();
-?>
+
+function check_nocem_config($nocem_file)
+{
+    global $config_dir;
+    $nocem_config = $config_dir . '/nocem.conf';
+    $name_ok = false;
+    $type_ok = false;
+    $ncmhead = '@@BEGIN NCM HEADERS';
+    $nocem_list = file($nocem_file, FILE_IGNORE_NEW_LINES);
+    $headers = 0;
+    foreach ($nocem_list as $nocem_line) {
+        if (stripos($nocem_line, $ncmhead) == 0){
+            $headers = 1;
+        }
+        if ($headers != 1) {
+            continue;
+        }
+        if (stripos($nocem_line, "Issuer: ") === 0) {
+            $issuer = explode(': ', $nocem_line);
+            $issuer = $issuer[1];
+        }
+        if (stripos($nocem_line, "Type: ") === 0) {
+            $type = explode(': ', $nocem_line);
+            $type = $type[1];
+        }
+    }
+    $config_val = get_config_file_value($nocem_config, $issuer);
+    if ($config_val === false) {
+        return false;
+    } else {
+        $name_ok = true;
+    }
+    $all_types = explode(',', $config_val);
+    foreach ($all_types as $one_type) {
+        if (trim($type) == trim($one_type)) {
+            echo $issuer . ':'.$type . " Good Type \n";
+            $type_ok = true;
+        } else {
+            echo $issuer . ':'.$type . ' : ' . $one_type . " Bad Type \n";
+        }
+    }
+    if ($type_ok && $name_ok) {
+        return true;
+    } else {
+        return false;
+    }
+}

Rocksolid_Light/tools/nocem/nocemlist.inc.php

@@ -30,6 +30,10 @@ $nntpserver = "news.example.com";
 $nntpuser = "nntpusername";
 $nntppassword = "nntppassword";
 
+// They 'type' for your nocem (spam, abuse, etc.)
+// Comma separated
+$type = "spam";
+
 // Your gpg signing key:
 $signing_key = "XXXX XXXX XXXX XXXX XXXX  XXXX XXXX XXXX XXXX XXXX";
 // URL to view/download key:

Rocksolid_Light/tools/nocem/nocemlist.php

@@ -62,7 +62,7 @@ if(isset($followup_to)) {
 }
 fwrite($header_file, "From: $from\n");
 fwrite($header_file, "Newsgroups: $spamgroup\n");
-fwrite($header_file, "Subject: @@NCM NoCeM notice $thishash spam/hide ($count $article)\n");
+fwrite($header_file, "Subject: @@NCM NoCeM notice $thishash $type ($count $article)\n");
 fwrite($header_file, "Content-Type: text/plain; charset=utf-8; format=flowed\n");
 fwrite($header_file, "Content-Transfer-Encoding: 8bit\n");
 fwrite($header_file, "Organization: $organization\n");
@@ -85,7 +85,7 @@ fwrite($nocem_file, "For information contact $contact.\n\n");
 fwrite($nocem_file, "@@BEGIN NCM HEADERS\n");
 fwrite($nocem_file, "Version: 0.93\n");
 fwrite($nocem_file, "Issuer: $from_email\n");
-fwrite($nocem_file, "Type: spam\n");
+fwrite($nocem_file, "Type: $type\n");
 fwrite($nocem_file, "Action: hide\n");
 fwrite($nocem_file, "Count: ".$count."\n");
 fwrite($nocem_file, "Notice-ID: ".$thishash."\n");