Fixed reflow and R/O problems

golded3/gecmfd.cpp

@@ -344,6 +344,8 @@ void CmfMsgs(GMsg* msg) {
   AL.SetActiveAreaId(destarea);
   Area* AAdest = AA;
 
+  AA->RandomizeData();
+
   // Is it readonly?
   if(AA->attr().r_o()) {
     GMenuReadonly MenuReadonly;

golded3/geprot.h

@@ -433,10 +433,10 @@ inline bool issoftcr(char c) {
 
 inline char *spanspaces(const char *str) {
   if(CFG->switches.get(dispsoftcr))
-    while(isspace(*str))
+    while(isspace(*str) and (*str != CR))
       str++;
   else
-    while(isspace(*str) or (*str == SOFTCR))
+    while((isspace(*str)  and (*str != CR)) or (*str == SOFTCR))
       str++;
   return (char *)str;
 }

golded3/gerand.cpp

@@ -421,11 +421,15 @@ void Area::RandomizeData(int mode) {
   }
 
   std::vector<MailList>::iterator z;
-  for(z = CFG->mailinglist.begin(); z != CFG->mailinglist.end(); z++)
+  for(z = CFG->mailinglist.begin(); z != CFG->mailinglist.end(); z++) {
     if(strieql(echoid(), z->echoid)) {
       strcpy(adat->whoto, *z->contribution ? z->contribution : z->sender);
       break;
     }
+  }
+
+  if(adat->attributes.r_o())
+    area->attr().r_o1();
 }
 
 

golded3/getpls.cpp

@@ -865,6 +865,13 @@ void ChangeMsg() {
 
   if(AA->Msgn.Count()) {
 
+    if(AA->attr().r_o()) {
+      GMenuReadonly MenuReadonly;
+      reader_keyok = not MenuReadonly.Run();
+      if(reader_keyok)
+        return;
+    }
+
     reader_keyok = YES;
 
     if(AA->attr().hex()) {