Changeset 3336712

Timestamp:

07/30/2025 02:59:16 PM (7 months ago)

Author:

cameron434

Message:

Update trunk 1.1.3

Location:

dialbunny/trunk

Files:

• app.php (modified) (4 diffs)
• dialbunny.php (modified) (1 diff)
• lib/controllers/dashboard.php (modified) (1 diff)
• lib/controllers/webcalling.php (modified) (4 diffs)
• lib/views/dashboard/ai_assistant.php (added)

dialbunny/trunk/app.php

@@ -73 +73 @@
                 </div>
                                 <div class="menu-item show menu-accordion">
-                  <a class="menu-link" href="<?php echo esc_url(wp_nonce_url($dialbunnyDashboardUrl.'&dashboardpage=voiceassistant', 'DialBunny', 'user_nonce')); ?>">
+                  <a class="menu-link" href="<?php echo esc_url(wp_nonce_url($dialbunnyDashboardUrl.'&dashboardpage=aiassistant', 'DialBunny', 'user_nonce')); ?>">
                     <span class="menu-link">
                         <span class="menu-bullet">
@@ -167 +167 @@
                     echo 'Inbound Calls';
                                     break;
-                                    case 'voiceassistant':
+                                    case 'aiassistant':
                     echo 'AI Assistant';
                                     break;
@@ -231 +231 @@
                 include(plugin_dir_path(__FILE__) . 'lib/views/dashboard/inbound.php');
                 break;
-                                case 'voiceassistant':
-                include(plugin_dir_path(__FILE__) . 'lib/views/dashboard/voice_assistant.php');
-                break;
-                                case 'messagesassistant':
-                include(plugin_dir_path(__FILE__) . 'lib/views/dashboard/messages_assistant.php');
+                                case 'aiassistant':
+                include(plugin_dir_path(__FILE__) . 'lib/views/dashboard/ai_assistant.php');
                 break;
                                 case 'calendar':
@@ -395 +392 @@
                         </div>
                                         <div class="menu-item show menu-accordion">
-                          <a class="menu-link text-dark" href="<?php echo esc_url(wp_nonce_url($dialbunnyDashboardUrl.'&dashboardpage=voiceassistant', 'DialBunny', 'user_nonce')); ?>">
+                          <a class="menu-link text-dark" href="<?php echo esc_url(wp_nonce_url($dialbunnyDashboardUrl.'&dashboardpage=aiassistant', 'DialBunny', 'user_nonce')); ?>">
                             <span class="menu-link">
                                 <span class="menu-bullet">

dialbunny/trunk/dialbunny.php

@@ -4 +4 @@
  Plugin URI: https://dialbunny.com/
  Description: Easily manage inbound and outbound phone calls and text messages
- Version: 1.1.2
+ Version: 1.1.3
  Author:DialBunny
  Author URI: https://dialbunny.com

dialbunny/trunk/lib/controllers/dashboard.php

@@ -110 +110 @@
     if (isset($_POST['busy'])) { $rawdata['ai_busy'] = sanitize_textarea_field(wp_unslash($_POST['busy'])); } else { $rawdata['ai_busy'] = 0; }
     if (isset($_POST['timetable'])) { $rawdata['ai_timetable'] = sanitize_textarea_field(wp_unslash($_POST['timetable'])); } else { $rawdata['ai_timetable'] = 0; }
-    if (isset($_POST['id'])) { $rawdata['id'] = sanitize_textarea_field(wp_unslash($_POST['id'])); } else { $rawdata['id'] = 0; }
-    if (isset($_POST['greeting'])) { $rawdata['greeting'] = sanitize_textarea_field(wp_unslash($_POST['greeting'])); } else { $rawdata['greeting'] = 0; }
-    if (isset($_POST['voice'])) { $rawdata['voice'] = sanitize_textarea_field(wp_unslash($_POST['voice'])); } else { $rawdata['voice'] = 0; }
+    if (isset($_POST['twilio_sid'])) { $rawdata['twilio_sid'] = sanitize_textarea_field(wp_unslash(str_replace(' ', '', $_POST['twilio_sid']))); } else { $rawdata['twilio_sid'] = ''; }
+    if (isset($_POST['vapi_sip'])) { $rawdata['vapi_sip'] = sanitize_textarea_field(wp_unslash(str_replace(' ', '', $_POST['vapi_sip']))); } else { $rawdata['vapi_sip'] = ''; }
+    if (isset($_POST['radio'])) { $rawdata['voice_company'] = sanitize_textarea_field(wp_unslash($_POST['radio'])); } else { $rawdata['voice_company'] = 'twilio'; }
+    if (!empty($_POST['greeting'])) { $rawdata['greeting'] = sanitize_textarea_field(wp_unslash($_POST['greeting'])); } else { $rawdata['greeting'] = 'Hi! Ask me anything!'; }
+    if (!empty($_POST['voice'])) { $rawdata['voice'] = sanitize_textarea_field(wp_unslash($_POST['voice'])); } else { $rawdata['voice'] = 'en-US-Journey-O'; }
+    if (isset($_POST['messages'])) { $rawdata['ai_messages'] = sanitize_textarea_field(wp_unslash($_POST['messages'])); } else { $rawdata['ai_messages'] = 0; }
     $json_data = wp_json_encode($rawdata);
     $data['voice_assistant'] = $json_data;

dialbunny/trunk/lib/controllers/webcalling.php

@@ -24 +24 @@
       // Direct database query used below – $wpdb->prepare() is always used to prevent SQL injection.
       $result = $wpdb->get_row($wpdb->prepare("SELECT web_token FROM {$wpdb->prefix}dialbunny_phone_details WHERE user = %d AND token_created >= (NOW() - INTERVAL 15 MINUTE) LIMIT 1",$user_id)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+      // AND token_created >= (NOW() - INTERVAL 15 MINUTE)
 
       if (isset($opened_item[0]->web_token)) {
@@ -262 +263 @@
         $response->say($sayText);
         // AI assistant response
-        if ($voiceAssistantData['ai_timetable'] == 1 && isset($voiceAssistantData['id']) && isset($voiceAssistantData['greeting']) && isset($voiceAssistantData['voice']))
-        {
-          $connect = $response->connect();
-          $connect->assistant([
-              'id' => $voiceAssistantData['id'],
-              'welcomeGreeting' => $voiceAssistantData['greeting'],
-              'voice' => $voiceAssistantData['voice'],
-          ]);
+        if ($voiceAssistantData['ai_timetable'] == 1)
+        {
+          if ($voiceAssistantData['voice_company'] === 'twilio') {
+            if (empty($voiceAssistantData['twilio_sid'])) { $response->say("No valid Twilio SID key was saved. Goodbye."); echo $response; exit; }
+            $connect = $response->connect();
+            $connect->assistant([
+                'id' => $voiceAssistantData['twilio_sid'],
+                'welcomeGreeting' => $voiceAssistantData['greeting'],
+                'voice' => $voiceAssistantData['voice'],
+            ]);
+          }
+          elseif ($voiceAssistantData['voice_company'] === 'vapi')
+          {
+            if (empty($voiceAssistantData['vapi_sip'])) { $response->say("No valid Vapi SIP key was saved. Goodbye."); echo $response; exit; }
+            $response->dial()->sip($voiceAssistantData['vapi_sip']);
+          }
         }
         // Twilio expects raw XML, Twilio will fail to parse this response if escaped
@@ -291 +300 @@
 
         // AI assistant response
-        if ($voiceAssistantData['ai_initiated'] == 1 && isset($voiceAssistantData['id']) && isset($voiceAssistantData['greeting']) && isset($voiceAssistantData['voice']))
-        {
-          $connect = $response->connect();
-          $connect->assistant([
-              'id' => $voiceAssistantData['id'],
-              'welcomeGreeting' => $voiceAssistantData['greeting'],
-              'voice' => $voiceAssistantData['voice'],
-          ]);
+        if ($voiceAssistantData['ai_initiated'] == 1)
+        {
+          if ($voiceAssistantData['voice_company'] === 'twilio') {
+            if (empty($voiceAssistantData['twilio_sid'])) { $response->say("No valid Twilio SID key was saved. Goodbye."); echo $response; exit; }
+            $connect = $response->connect();
+            $connect->assistant([
+                'id' => $voiceAssistantData['twilio_sid'],
+                'welcomeGreeting' => $voiceAssistantData['greeting'],
+                'voice' => $voiceAssistantData['voice'],
+            ]);
+          }
+          elseif ($voiceAssistantData['voice_company'] === 'vapi')
+          {
+            if (empty($voiceAssistantData['vapi_sip'])) { $response->say("No valid Vapi SIP key was saved. Goodbye."); echo $response; exit; }
+            $response->dial()->sip($voiceAssistantData['vapi_sip']);
+          }
         }
 
@@ -315 +332 @@
 
         // AI assistant response
-        if ($voiceAssistantData['ai_busy'] == 1 && isset($voiceAssistantData['id']) && isset($voiceAssistantData['greeting']) && isset($voiceAssistantData['voice']))
-        {
-          $connect = $response->connect();
-          $connect->assistant([
-              'id' => $voiceAssistantData['id'],
-              'welcomeGreeting' => $voiceAssistantData['greeting'],
-              'voice' => $voiceAssistantData['voice'],
-          ]);
+        if ($voiceAssistantData['ai_busy'] == 1)
+        {
+          if ($voiceAssistantData['voice_company'] === 'twilio') {
+            if (empty($voiceAssistantData['twilio_sid'])) { $response->say("No valid Twilio SID key was saved. Goodbye."); echo $response; exit; }
+            $connect = $response->connect();
+            $connect->assistant([
+                'id' => $voiceAssistantData['twilio_sid'],
+                'welcomeGreeting' => $voiceAssistantData['greeting'],
+                'voice' => $voiceAssistantData['voice'],
+            ]);
+          }
+          elseif ($voiceAssistantData['voice_company'] === 'vapi')
+          {
+            if (empty($voiceAssistantData['vapi_sip'])) { $response->say("No valid Vapi SIP key was saved. Goodbye."); echo $response; exit; }
+            $response->dial()->sip($voiceAssistantData['vapi_sip']);
+          }
         }