FS-8546 #resolve [Make original video demo back-compat with livearray-json-status]

html5/verto/js/src/jquery.verto.js

@@ -1075,6 +1075,27 @@
             console.error("Error: ", obj, args);
         };
 
+	/* back compat so jsonstatus can always be enabled */
+	function genRow(data) {
+	    if (typeof(data[4]) === "string" && data[4].indexOf("{") > -1) {
+		var tmp = $.parseJSON(data[4]);
+		data[4] = tmp.oldStatus;
+		data[5] = null;
+	    }
+	    return data;
+	}
+
+	function genArray(obj) {
+	    var data = obj.asArray();
+
+            for (var i in data) {
+		data[i] = genRow(data[i]);
+	    }
+
+	    return data;
+	}
+
+
         la.onChange = function(obj, args) {
             var index = 0;
             var iserr = 0;
@@ -1122,7 +1143,7 @@
                         return;
                     }
                     dt.fnClearTable();
-                    dt.fnAddData(obj.asArray());
+                    dt.fnAddData(genArray(obj));
                     dt.fnAdjustColumnSizing();
                     break;
                 case "add":
@@ -1133,9 +1154,9 @@
                     if (args.redraw > -1) {
                         // specific position, more costly
                         dt.fnClearTable();
-                        dt.fnAddData(obj.asArray());
+                        dt.fnAddData(genArray(obj));
                     } else {
-                        dt.fnAddData(args.data);
+                        dt.fnAddData(genRow(args.data));
                     }
                     dt.fnAdjustColumnSizing();
                     break;
@@ -1144,7 +1165,7 @@
                         return;
                     }
                     //console.debug(args, index);
-                    dt.fnUpdate(args.data, index);
+                    dt.fnUpdate(genRow(args.data), index);
                     dt.fnAdjustColumnSizing();
                     break;
                 case "del":
@@ -1157,7 +1178,7 @@
                 case "reorder":
                     // specific position, more costly
                     dt.fnClearTable();
-                    dt.fnAddData(obj.asArray());
+                    dt.fnAddData(genArray(obj));
                     break;
                 case "hide":
                     jq.hide();

src/mod/applications/mod_conference/conference_member.c

@@ -156,6 +156,35 @@ void conference_member_update_status_field(conference_member_t *member)
 	
 	switch_live_array_lock(member->conference->la);
 
+	if (!conference_utils_member_test_flag(member, MFLAG_CAN_SPEAK)) {
+		str = "MUTE";
+	} else if (switch_channel_test_flag(member->channel, CF_HOLD)) {
+		str = "HOLD";
+	} else if (member == member->conference->floor_holder) {
+		if (conference_utils_member_test_flag(member, MFLAG_TALKING)) {
+			str = "TALKING (FLOOR)";
+		} else {
+			str = "FLOOR";
+		}
+	} else if (conference_utils_member_test_flag(member, MFLAG_TALKING)) {
+		str = "TALKING";
+	} else {
+		str = "ACTIVE";
+	}
+
+	if (switch_channel_test_flag(member->channel, CF_VIDEO)) {
+		if (!conference_utils_member_test_flag(member, MFLAG_CAN_BE_SEEN)) {
+			vstr = " VIDEO (BLIND)";
+		} else {
+			vstr = " VIDEO";
+			if (member && member->id == member->conference->video_floor_holder) {
+				vstr = " VIDEO (FLOOR)";
+			}
+		}
+	}
+
+	switch_snprintf(display, sizeof(display), "%s%s", str, vstr);
+
 	if (conference_utils_test_flag(member->conference, CFLAG_JSON_STATUS)) {
 		json = cJSON_CreateObject();
 		audio = cJSON_CreateObject();
@@ -198,43 +227,19 @@ void conference_member_update_status_field(conference_member_t *member)
 			cJSON_AddItemToObject(json, "video", cJSON_CreateFalse());
 		}
 
-		json_display = cJSON_PrintUnformatted(json);
-		cJSON_Delete(json);
-	} else {
-		if (!conference_utils_member_test_flag(member, MFLAG_CAN_SPEAK)) {
-			str = "MUTE";
-		} else if (switch_channel_test_flag(member->channel, CF_HOLD)) {
-			str = "HOLD";
-		} else if (member == member->conference->floor_holder) {
-			if (conference_utils_member_test_flag(member, MFLAG_TALKING)) {
-				str = "TALKING (FLOOR)";
-			} else {
-				str = "FLOOR";
-			}
-		} else if (conference_utils_member_test_flag(member, MFLAG_TALKING)) {
-			str = "TALKING";
-		} else {
-			str = "ACTIVE";
-		}
-
-		if (switch_channel_test_flag(member->channel, CF_VIDEO)) {
-			if (!conference_utils_member_test_flag(member, MFLAG_CAN_BE_SEEN)) {
-				vstr = " VIDEO (BLIND)";
-			} else {
-				vstr = " VIDEO";
-				if (member && member->id == member->conference->video_floor_holder) {
-					vstr = " VIDEO (FLOOR)";
-				}
-			}
+		if (conference_utils_test_flag(member->conference, CFLAG_JSON_STATUS)) {
+			cJSON_AddItemToObject(json, "oldStatus", cJSON_CreateString(display));
 		}
 
-		switch_snprintf(display, sizeof(display), "%s%s", str, vstr);
+		json_display = cJSON_PrintUnformatted(json);
+		cJSON_Delete(json);
 	}
 
+	switch_safe_free(member->status_field->valuestring);
+
 	if (json_display) {
 		member->status_field->valuestring = json_display;
 	} else {
-		free(member->status_field->valuestring);
 		member->status_field->valuestring = strdup(display);
 	}
 

src/mod/applications/mod_conference/mod_conference.c

@@ -1800,6 +1800,7 @@ SWITCH_STANDARD_APP(conference_function)
 			goto done;
 		}
 
+		conference->flags[CFLAG_JSON_STATUS] = 1;
 		conference_utils_set_cflags(cflags_str, conference->flags);
 
 		if (locked) {
@@ -1884,6 +1885,7 @@ SWITCH_STANDARD_APP(conference_function)
 				goto done;
 			}
 
+			conference->flags[CFLAG_JSON_STATUS] = 1;
 			conference_utils_set_cflags(cflags_str, conference->flags);
 
 			if (locked) {