Merge conflict (fixed manually)

Author: dgets

ddoc2.js

@@ -488,6 +488,7 @@ docIface = {
                                               //roomData.fileIO.roomRecFilename,
                                               area);
           }*/
+
           try {
               roomData.fileIO.snagRoomInfoBlob();
           } catch (e) {
@@ -508,7 +509,7 @@ docIface = {
 	}
 
 	//save user setting defaults
-	docIface.util.preUserSettings = user.settings;	
+	this.preUserSettings = user.settings;
 	this.turnOffSynchronetDefaults();
 	if (userSettings.confined) {
 		bbs.log_str(user.alias + " is entering dDOC shell and " +
@@ -530,9 +531,15 @@ docIface = {
 	user.settings |= USER_PAUSE;
 
 	//save bbs defaults
-	docIface.util.preSubBoard = bbs.cursub;
-	docIface.util.preMsgGroup = bbs.curgrp;
-	docIface.util.preFileDir = bbs.curdir;
+        if (userSettings.debug.misc) {
+            console.putmsg(yellow + "Saving settings for later restoration:\n" +
+              "preSubBoard (user.cursub):\t" + green + user.cursub + yellow +
+              "\npreMsgGroup (user.curgrp):\t" + green + user.curgrp + yellow +
+              "\npreFileDir (user.curdir):\t" + green + user.curdir + "\n");
+        }
+	this.preSubBoard = user.cursub;
+	this.preMsgGroup = user.curgrp;
+	this.preFileDir = user.curdir;
 
 	//snag user zapped rooms list
 	try {
@@ -583,19 +590,19 @@ docIface = {
 	bbs.log_key("L");
 
 	if (userSettings.debug.flow_control) {
-	  console.putmsg(red + "\nRestoring bbs.* properties:\n" + 
-	    " bbs.cursub: " + docIface.util.preSubBoard + "\n" + 
-	    " bbs.curgrp: " + docIface.util.preMsgGroup + "\n" + 
-	    " bbs.curdir: " + docIface.util.preFileDir + "\n");
+	  console.putmsg(red + "\nRestoring user.* properties:\n" +
+	    " user.cursub: " + this.preSubBoard + "\n" +
+	    " user.curgrp: " + this.preMsgGroup + "\n" +
+	    " user.curdir: " + this.preFileDir + "\n");
 	  console.putmsg(red + "\nRestoring user.settings . . .\n");
 	}
 
 	//restore initial settings prior to exit
-	bbs.cursub = docIface.util.preSubBoard;
-	user.cursub = bbs.cursub_code;
-	bbs.curgrp = docIface.util.preMsgGroup;
-	bbs.curdir = docIface.util.preFileDir;
-	user.settings = docIface.util.preUserSettings;
+	user.cursub = this.preSubBoard;
+	//user.cursub = bbs.cursub_code;
+	user.curgrp = this.preMsgGroup;
+	user.curdir = this.preFileDir;
+	user.settings = this.preUserSettings;
 
 	//disable H exemption in case they go back to usual shell so that
 	//we can handle events, etc
@@ -839,6 +846,11 @@ if (!debugOnly) {
                       }
                   }
                   break;
+                case 'p':       //profile a user
+                  console.putmsg(green + high_intensity +
+                      "User to profile -> ");
+                  userRecords.userDataUI.profileUser(console.getstr());
+                  break;
 		default:
 		  console.putmsg(excuse);
 		  break;

load/dperroom.js

@@ -171,9 +171,12 @@ roomData = {
 	 *	set, otherwise amusing nethack message)
 	 */
     displayRoomInfo : function() {
-	this.displayRoomInfoHdr();
+	/* this.displayRoomInfoHdr();
 
-	roomSettings[bbs.cursub_code] = roomData.fileIO.snagRoomInfoBlob();
+	roomSettings[bbs.cursub_code] = roomData.fileIO.snagRoomInfoBlob(); */
+
+        roomData.fileIO.snagRoomInfoBlob();
+        this.displayRoomInfoHdr();
 
 	if (roomSettings[bbs.cursub_code].info.length == 0) {
 	  //or should we be looking for null here?

load/dperuser.js

@@ -256,6 +256,36 @@ userRecords = {
 	//terminology now)
 
 	//	  ----++++****====userDataUI methods====****++++----
+        profileUser : function (uname) {
+            var profileeSettings = { };
+            var unum, uObj;
+
+            if ((unum = system.matchuser(uname)) == 0) {
+                console.putmsg(yellow + high_intensity + "User " + green +
+                  uname + " was not found!\n");
+                throw new dDocException("profileUser() Exception",
+                    "Unable to locate " + uname, 1);
+            }
+
+            profileeSettings = userRecords.userDataIO.loadSettings(unum);
+            uObj = new User(unum);
+
+            console.putmsg(cyan + high_intensity + uObj.alias + "\n" +
+                yellow + high_intensity + uObj.address + "\n" +
+                uObj.location + "\n");
+
+            if (profileeSettings == null) { //that is the error condition, no?
+                console.putmsg(yellow + high_intensity + "User has not set up" +
+                    " profile information yet\n\n");
+            } else {
+                console.putmsg(high_intensity + green + "Doing: " + cyan +
+                    profileeSettings.doing + "\n\n");
+                for each (var infoLine in profileeSettings.info) {
+                    console.putmsg(green + high_intensity + infoLine + "\n");
+                }
+                console.putmsg("\n");
+            }
+        },
 	/*
 	 * summary:
 	 *	obtains a new list of lines of text to utilize as the