Merge pull request #142 from dgets/roominfo-tidying

Roominfo tidying; added timestamps & fixed extra line in text blobs

Author: dgets

load/dexpress.js

@@ -86,8 +86,6 @@ wholist = {
    * NOTE: This needs to be less of a monolith
    */
   list_long : function(ul) {
-	var timeon;
-
 	//time to do this the right way
 	bbs.log_key("w");
 

load/dperroom.js

@@ -81,6 +81,38 @@ roomData = {
 	  console.putmsg(green + high_intensity + "\nStaying the same for " +
 		"now . . .\n");
 	}
+    },
+        /*
+         * summary:
+         *      If the current user is the sysop/cosysop, allows editing of the
+         *      room's info to set a moderator
+         */
+    changeRoomModerator : function() {
+        var newMod = new String();
+
+        if (user.security.level >= 80) {
+            //go ahead and set the moderator for this room/sub
+            console.putmsg(yellow + high_intensity + "Changing moderator for " +
+              user.cursub + "\nNew Moderator: " + green);
+            newMod = console.getstr("New Moderator: ", 40); //max user alias len
+
+            while (system.matchuser(newMod) == 0) {
+                console.putmsg(yellow + newMod + " not found.\n");
+                newMod = console.getstr("New Moderator: ", 40);
+            }
+
+            roomSettings[bbs.cursub_code].moderator = newMod;
+        } else {
+            //add some error logging here at some point, as well; this could be
+            //a security concern at some point
+            console.putmsg(red + high_intensity + "Your security level is not" +
+              " high enough to change room moderator.\nMust we log this?\n");
+            throw new dDocException("changeRoomModerator() Exception",
+              "Not high enough security to change room moderator", 1);
+        }
+        
+        roomData.fileIO.saveRoomInfo();
+
     },
 	/*
 	 * summary:
@@ -90,6 +122,28 @@ roomData = {
     changeRoomInfo : function() {
 	  var infoTxt = new Array();
 
+          if (roomSettings[bbs.cursub_code].moderator != user.alias) {
+              try {
+                  this.changeRoomModerator();
+              } catch (e) {
+                  if (userSettings.debug.misc) {
+                      console.putmsg(yellow + "Unable to change room mod!\n" +
+                        "Msg: " + red + high_intensity + e.message + "\n");
+                  }
+
+                  throw new dDocException("changeRoomInfo() Exception",
+                    "Exception in changeRoomModerator()", 1);
+                  //that should keep anyone from getting beyond here that
+                  //shouldn't be
+              }
+          }
+
+          var nao = new Date();
+          roomSettings[bbs.cursub_code].infoCreationDate =
+              nao.getDate() + nao.toUTCString();
+          
+          this.displayRoomInfoHdr();
+
 	  if ((infoTxt = poast.getTextBlob(this.maxInfoLines)) != null) {
 		//save the new room info
 		/* try {
@@ -101,10 +155,12 @@ roomData = {
 		    "\n");
 		}*/
                 roomSettings[bbs.cursub_code].info = infoTxt;
-                roomSettings[bbs.cursub_code].moderator = user.alias;
+                //this will be set in a separate method handling moderators
+                //roomSettings[bbs.cursub_code].moderator = user.alias;
                 //of course this will have to be replaced with better code to
                 //make sure the person is authorized, sysop modification of it,
                 //etc etc etc (re: above)
+
                 //roomSettings[bbs.cursub_code].infoCreationDate =
                 roomData.fileIO.saveRoomInfo();
           }
@@ -117,12 +173,7 @@ roomData = {
     displayRoomInfo : function() {
 	this.displayRoomInfoHdr();
 
-	try {
-	  roomSettings[bbs.cursub_code] = snagRoomInfoBlob();
-	} catch (e) {
-	  console.putmsg("Unable to snagRoomInfoBlob(): " + e.name +
-              "\nMsg: " + e.message + "\n");
-	}
+	roomSettings[bbs.cursub_code] = roomData.fileIO.snagRoomInfoBlob();
 
 	if (roomSettings[bbs.cursub_code].info.length == 0) {
 	  //or should we be looking for null here?

load/dpoast.js

@@ -138,6 +138,9 @@ poast = {
 		      "\nlength: " + mTxt.length + "\nBeing returned\n");
 		  }
 
+                  //this is an ugly hack fix, but whatever; it's quick and
+                  //works for now (issue #136 on github)
+                  mTxt.pop();
                   return mTxt;
                   break;
                 /* case 'X':