Merge pull request #3 from iKnowITWorks/master

For WebRTC feature from #7666 issue tracker

Author: mmixx

goSettings/goCheckWebrtc.php

@@ -20,11 +20,22 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+        $user_id = $goDB->escape($_REQUEST['user_id']);
+        
         $goDB->where('setting', 'GO_agent_use_wss');
         $rslt = $goDB->getOne('settings', 'value');
 
         if($rslt){
-                $apiresults = array("result" => $rslt['value']);
+                $webrtc = $rslt['value'];
+                if ($webrtc > 0 && (!empty($user_id) && !is_null($user_id))) {
+                        $goDB->where('userid', $user_id);
+                        $rsltu = $goDB->getOne('users', 'enable_webrtc');
+                        if ($rsltu['enable_webrtc'] > -1) {
+                                $webrtc = $rsltu['enable_webrtc'];
+                        }
+                }
+                
+                $apiresults = array("result" => $webrtc);
         } else {
                 $apiresults = array("result" => "Faile to get Result.");
         }

goUsers/goEditUser.php

@@ -48,6 +48,7 @@
     $agentonly_callbacks 								= $astDB->escape($_REQUEST['agentonly_callbacks']);
     $agent_lead_search_override 						= $astDB->escape($_REQUEST['agent_lead_search_override']);
     $avatar 											= $astDB->escape($_REQUEST['avatar']);
+    $enable_webrtc 										= $astDB->escape($_REQUEST['enable_webrtc']);
     $location 											= $astDB->escape($_REQUEST['location_id']);
 
     // Default Values
@@ -184,7 +185,8 @@
 				"avatar" 									=> $avatar, 
 				"user_group" 								=> $user_group, 
 				"role" 										=> $user_level, 
-				"status" 									=> $goactive
+				"status" 									=> $goactive,
+                "enable_webrtc"                             => $enable_webrtc
 			);
 
 			$insertUserGoArray 							= array(
@@ -312,18 +314,18 @@
 
 						$update_array 					= array_merge($update_array, array(
 							"pass_hash" 					=> $pass_hash, 
-							"pass" 							=> "", 
-							"phone_pass" 					=> ""
+							"pass" 							=> ((int)$enable_webrtc == 0) ? $pass : "", 
+							"phone_pass" 					=> ((int)$enable_webrtc == 0) ? $phone_pass : ""
 							)
 						);
 
-						$goDB->where("setting", "GO_agent_domain");
-						$fetch_value 					= $astDB->getOne("settings", "value");
+						$goDB->where("setting", "GO_agent_wss_sip");
+						$fetch_value 					= $goDB->getOne("settings", "value");
 
 						$value 							= $fetch_value["value"];						
 						$realm 							= (!is_null ($value) || $value !== '') ? $value : 'goautodial.com';						
-						$ha1 							= md5 ("{$phone_login}:{$realm}:{$phone_pass}");
-						$ha1b 							= md5 ("{$phone_login}@{$realm}:{$realm}:{$phone_pass}");
+						$ha1 							= md5 ("{$phone_login}:{$realm}:{$pass}");
+						$ha1b 							= md5 ("{$phone_login}@{$realm}:{$realm}:{$pass}");
 
 						$subscriber_array 				= array(
 							"password" 						=> "", 
@@ -376,6 +378,10 @@
 					$astDB->update("phones", $phones_array);
 
 					$log_id 							= log_action($goDB, 'MODIFY', $log_user, $log_ip, "Modified Phone: $phone_login", $log_group, $astDB->getLastQuery());
+                    
+                    if ($protocol != "EXTERNAL") { 
+                        $rebuild 							= rebuildconfQuery($astDB); 
+                    }
 				}
 
 				$astDB->where("user", $user);
@@ -403,7 +409,7 @@
 				$goDB->where("carrier_id", $user_group);
 				$goDB->update('justgovoip_sippy_info', $justgovoip_array);	
 
-				$log_id 								= log_action($goDB, 'MODIFY', $log_user, $log_ip, "Modified Phone: $phone_pass", $log_group, $goDB->getLastQuery());
+				$log_id 								= log_action($goDB, 'MODIFY', $log_user, $log_ip, "Modified Phone: $phone_login", $log_group, $goDB->getLastQuery());
 
 				if ($queryUpdateUser) {
 					$apiresults 						= array(