Changeset 3406310

Timestamp:

11/30/2025 08:54:43 PM (3 months ago)

Author:

cameron434

Message:

update trunk 1.1.6

Location:

dialbunny/trunk

Files:

• app.php (modified) (4 diffs)
• dialbunny.php (modified) (12 diffs)
• lib/components/countries.php (added)
• lib/config/initiate_tables.php (modified) (1 diff)
• lib/controllers/admin.php (modified) (1 diff)
• lib/controllers/dashboard.php (modified) (9 diffs)
• lib/controllers/webcalling.php (modified) (1 diff)
• lib/views/admin/add.php (modified) (1 diff)
• lib/views/admin/header.php (modified) (2 diffs)
• lib/views/admin/license.php (modified) (3 diffs)
• lib/views/admin/released.php (modified) (4 diffs)
• lib/views/admin/setup.php (modified) (6 diffs)
• lib/views/dashboard/addresses.php (added)
• lib/views/dashboard/ai_assistant.php (modified) (11 diffs)
• lib/views/dashboard/calendar.php (modified) (16 diffs)
• lib/views/dashboard/choose.php (modified) (13 diffs)
• lib/views/dashboard/contacts/contacts.php (modified) (4 diffs)
• lib/views/dashboard/contacts/default.php (modified) (9 diffs)
• lib/views/dashboard/inbound.php (modified) (8 diffs)
• lib/views/dashboard/index.php (modified) (7 diffs)
• lib/views/dashboard/messages/default.php (modified) (7 diffs)
• lib/views/dashboard/messages/messages.php (modified) (4 diffs)
• lib/views/dashboard/messages/view.php (modified) (3 diffs)
• lib/views/dashboard/profile.php (added)
• lib/views/dashboard/recents.php (modified) (4 diffs)
• lib/views/dashboard/released.php (modified) (3 diffs)
• readme.txt (modified) (1 diff)

dialbunny/trunk/app.php

@@ -132 +132 @@
                                 </div>
                                 <div class="ms-2">
-                                    <a href="<?php echo esc_url(wp_nonce_url($dialbunnyDashboardUrl, 'DialBunny', 'user_nonce')); ?>" class="text-gray-800 text-hover-primary fs-6 fw-bold lh-1"><?php echo esc_html($current_user->display_name); ?></a>
+                                    <a href="<?php echo esc_url(wp_nonce_url($dialbunnyDashboardUrl, 'DialBunny', 'user_nonce')) ?>&dashboardpage=profile" class="text-gray-800 text-hover-primary fs-6 fw-bold lh-1"><?php echo esc_html($current_user->display_name); ?></a>
                                     <span style="max-width: 170px;" class="text-muted fw-semibold d-block fs-7 lh-1 text-truncate"><?php echo esc_html($current_user->user_email); ?></span>
                                 </div>
@@ -185 +185 @@
                     echo 'Recent Phone Calls';
                                     break;
+                                    case 'profile':
+                    echo 'Settings → Profile';
+                                    break;
 
                     default:
@@ -202 +205 @@
                             </div>
                             <div class="d-flex align-items-center flex-shrink-0 mb-0 mb-lg-0">
+                                <a href="<?php echo esc_url(wp_nonce_url($dialbunnyDashboardUrl, 'DialBunny', 'user_nonce')) ?>&dashboardpage=profile" class="btn btn-icon btn-color-gray-700 btn-active-color-primary btn-outline w-40px h-40px position-relative ms-3 ms-lg-4 p-2">
+                                    <span class="fas fa-gear fa-xl"></span>
+                                </a>    
                                 <a href="<?php echo esc_url(admin_url()); ?>" class="btn btn-icon btn-color-gray-700 btn-active-color-primary btn-outline w-40px h-40px position-relative ms-3 ms-lg-4 p-2">
                                     <svg x="0px" y="0px" width="100" height="100" viewBox="0 0 26 26">
@@ -212 +218 @@
               <?php
                             // Direct database query used below – Safely gets data from the database using $wpdb->prepare(), which handles proper escaping and prevents SQL injection.
-                        $licenseKey = $wpdb->get_results($wpdb->prepare("SELECT license_key FROM {$wpdb->prefix}dialbunny_api_keys WHERE id = %s LIMIT 1",'ACWJB59')); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
-                            if (strlen($licenseKey[0]->license_key) != 27 && stripos($licenseKey[0]->license_key, 'd') == false) { echo '<div class="content d-flex flex-column flex-column-fluid"><div class="container-xxl">' . wp_kses_post(dialbunny_main_danger("No Active License Key!", "Phone calls and text messages will be limited until you add a license key.")) . '</div></div>'; }
+                        $dialbunny_licenseKey = $wpdb->get_results($wpdb->prepare("SELECT license_key FROM {$wpdb->prefix}dialbunny_api_keys WHERE id = %s LIMIT 1",'ACWJB59')); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+                            if (strlen($dialbunny_licenseKey[0]->license_key) != 27 && stripos($dialbunny_licenseKey[0]->license_key, 'd') == false) { echo '<div class="content d-flex flex-column flex-column-fluid"><div class="container-xxl">' . wp_kses_post(dialbunny_main_danger("No Active License Key!", "Phone calls and text messages will be limited until you add a license key.")) . '</div></div>'; }
               switch ($page)
               {
-                                case 'keypad':
+                case 'keypad':
                 include(plugin_dir_path(__FILE__) . 'lib/views/dashboard/keypad.php');
                 break;
-                                case 'howitworks':
+                case 'howitworks':
                 include(plugin_dir_path(__FILE__) . 'lib/views/dashboard/howitworks.php');
                 break;
-                                case 'choose':
+                case 'choose':
                 if (get_option('dialbunny_user_can_request_number') == true || current_user_can('administrator')) { include(plugin_dir_path(__FILE__) . 'lib/views/dashboard/choose.php'); }
                 break;
-                                case 'released':
+                case 'released':
                 include(plugin_dir_path(__FILE__) . 'lib/views/dashboard/released.php');
                 break;
-                                case 'inbound':
+                case 'inbound':
                 include(plugin_dir_path(__FILE__) . 'lib/views/dashboard/inbound.php');
                 break;
-                                case 'aiassistant':
+                case 'aiassistant':
                 include(plugin_dir_path(__FILE__) . 'lib/views/dashboard/ai_assistant.php');
                 break;
-                                case 'calendar':
+                case 'calendar':
                 include(plugin_dir_path(__FILE__) . 'lib/views/dashboard/calendar.php');
                 break;
-                                case 'messages':
+                case 'messages':
                 include(plugin_dir_path(__FILE__) . 'lib/views/dashboard/messages/messages.php');
                 break;
-                                case 'contacts':
+                case 'contacts':
                 include(plugin_dir_path(__FILE__) . 'lib/views/dashboard/contacts/contacts.php');
                 break;
-                                case 'recents':
+                case 'recents':
                 include(plugin_dir_path(__FILE__) . 'lib/views/dashboard/recents.php');
+                break;
+                case 'profile':
+                include(plugin_dir_path(__FILE__) . 'lib/views/dashboard/profile.php');
                 break;
 

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.5
+ Version: 1.1.6
  Author:DialBunny
  Author URI: https://dialbunny.com
@@ -40 +40 @@
    {
      // Change styling for DialBunny plugin dashboard
-     add_action('admin_enqueue_scripts', array($this,'load_custom_blank_page_styles'), 1);
+     add_action('admin_enqueue_scripts', array($this,'dialbunny_load_custom_blank_page_styles'), 999);
 
      // Only apply the Bootstrap "light" theme on the DialBunny dashboard page
@@ -92 +92 @@
    }
 
-   function load_custom_blank_page_styles($hook)
+   function dialbunny_load_custom_blank_page_styles($hook)
    {
      // This only applies to DialBunny dashboard for a clean interface
      if ($hook == 'toplevel_page_dialbunny_dashboard')
      {
+       // Dequeue Latepoint styles in the DialBunny dashboard when the plugin is active
+       wp_dequeue_style( 'latepoint-admin' );
+       wp_deregister_style( 'latepoint-admin' );
+       wp_dequeue_style( 'latepoint-blocks' );
+       wp_deregister_style( 'latepoint-blocks' );
+       wp_dequeue_style( 'wp-components' );
+       wp_deregister_style( 'wp-components' );
        // Dequeue
        wp_dequeue_style( 'dashicons' );
@@ -143 +150 @@
          include(plugin_dir_path(__FILE__) . 'lib/components/alerts.php' );
          include(plugin_dir_path(__FILE__) . 'lib/components/countrycode.php' );
+         include(plugin_dir_path(__FILE__) . 'lib/components/countries.php' );
          include(plugin_dir_path(__FILE__) . 'lib/components/timezone.php' );
          include(plugin_dir_path(__FILE__) . 'lib/components/formatnumber.php' );
@@ -159 +167 @@
         'manage_options',
         'dialbunny_setup',
-        function () { include(plugin_dir_path(__FILE__) . 'lib/views/admin/header.php' ); include(plugin_dir_path(__FILE__) . 'lib/views/admin/setup.php' ); },
+        function () { $current_page = 'setup'; include(plugin_dir_path(__FILE__) . 'lib/views/admin/header.php' ); include(plugin_dir_path(__FILE__) . 'lib/views/admin/setup.php' ); },
          null
        );
@@ -168 +176 @@
         'manage_options',
         'dialbunny_additional',
-        function () {  include(plugin_dir_path(__FILE__) . 'lib/views/admin/header.php' ); include(plugin_dir_path(__FILE__) . 'lib/views/admin/additional.php' ); },
+        function () { $current_page = 'additional'; include(plugin_dir_path(__FILE__) . 'lib/views/admin/header.php' ); include(plugin_dir_path(__FILE__) . 'lib/views/admin/additional.php' ); },
          null
        );
@@ -177 +185 @@
         'manage_options',
         'dialbunny_availability',
-        function () {  include(plugin_dir_path(__FILE__) . 'lib/views/admin/header.php' ); include(plugin_dir_path(__FILE__) . 'lib/views/admin/availability.php' ); },
+        function () { $current_page = 'availability'; include(plugin_dir_path(__FILE__) . 'lib/views/admin/header.php' ); include(plugin_dir_path(__FILE__) . 'lib/views/admin/availability.php' ); },
          null
        );
@@ -186 +194 @@
         'manage_options',
         'dialbunny_license',
-        function () {  include(plugin_dir_path(__FILE__) . 'lib/views/admin/header.php' ); include(plugin_dir_path(__FILE__) . 'lib/views/admin/license.php' ); },
+        function () { $current_page = 'license'; include(plugin_dir_path(__FILE__) . 'lib/views/admin/header.php' ); include(plugin_dir_path(__FILE__) . 'lib/views/admin/license.php' ); },
          null
        );
@@ -195 +203 @@
         'manage_options',
         'dialbunny_info',
-        function () {  include(plugin_dir_path(__FILE__) . 'lib/views/admin/header.php' ); include(plugin_dir_path(__FILE__) . 'lib/views/admin/info.php' ); },
+        function () { $current_page = 'info'; include(plugin_dir_path(__FILE__) . 'lib/views/admin/header.php' ); include(plugin_dir_path(__FILE__) . 'lib/views/admin/info.php' ); },
          null
        );
@@ -204 +212 @@
         'manage_options',
         'dialbunny_add',
-        function () {  include(plugin_dir_path(__FILE__) . 'lib/views/admin/header.php' ); include(plugin_dir_path(__FILE__) . 'lib/components/countrycode.php' ); include(plugin_dir_path(__FILE__) . 'lib/views/admin/add.php' ); },
+        function () { $current_page = 'add'; include(plugin_dir_path(__FILE__) . 'lib/views/admin/header.php' ); include(plugin_dir_path(__FILE__) . 'lib/components/countrycode.php' ); include(plugin_dir_path(__FILE__) . 'lib/views/admin/add.php' ); },
          null
        );
@@ -213 +221 @@
         'manage_options',
         'dialbunny_remove',
-        function () {  include(plugin_dir_path(__FILE__) . 'lib/views/admin/header.php' ); include(plugin_dir_path(__FILE__) . 'lib/components/countrycode.php' ); include(plugin_dir_path(__FILE__) . 'lib/views/admin/remove.php' ); },
+        function () { $current_page = 'remove'; include(plugin_dir_path(__FILE__) . 'lib/views/admin/header.php' ); include(plugin_dir_path(__FILE__) . 'lib/components/countrycode.php' ); include(plugin_dir_path(__FILE__) . 'lib/views/admin/remove.php' ); },
          null
        );
@@ -222 +230 @@
         'manage_options',
         'dialbunny_released',
-        function () {  include(plugin_dir_path(__FILE__) . 'lib/views/admin/header.php' ); include(plugin_dir_path(__FILE__) . 'lib/components/countrycode.php' ); include(plugin_dir_path(__FILE__) . 'lib/views/admin/released.php' ); },
+        function () { $current_page = 'released'; include(plugin_dir_path(__FILE__) . 'lib/views/admin/header.php' ); include(plugin_dir_path(__FILE__) . 'lib/components/countrycode.php' ); include(plugin_dir_path(__FILE__) . 'lib/views/admin/released.php' ); },
          null
        );

dialbunny/trunk/lib/config/initiate_tables.php

@@ -140 +140 @@
     require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
     dbDelta($sql);
+
+    // Create Addresses table
+    $charset_collate = $wpdb->get_charset_collate();
+    $table_prefix = $wpdb->prefix;
+
+    $sql = "CREATE TABLE " . $table_prefix."dialbunny_addresses" . " (
+      id varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL UNIQUE,
+      user varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
+      twilio_address_sid varchar(255) COLLATE utf8mb4_unicode_ci,
+      friendly_name varchar(255) COLLATE utf8mb4_unicode_ci,
+      country varchar(255) COLLATE utf8mb4_unicode_ci,
+      customer varchar(255) COLLATE utf8mb4_unicode_ci,
+      line1 varchar(255) COLLATE utf8mb4_unicode_ci,
+      line2 varchar(255) COLLATE utf8mb4_unicode_ci,
+      city varchar(255) COLLATE utf8mb4_unicode_ci,
+      state varchar(255) COLLATE utf8mb4_unicode_ci,
+      zip varchar(255) COLLATE utf8mb4_unicode_ci,
+      validated varchar(255) COLLATE utf8mb4_unicode_ci,
+      emergency varchar(255) COLLATE utf8mb4_unicode_ci,
+      created_at timestamp NULL DEFAULT NULL,
+      updated_at timestamp NULL DEFAULT NULL
+    ) $charset_collate;";
+
+    require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
+    dbDelta($sql);
   }
 }

dialbunny/trunk/lib/controllers/admin.php

@@ -123 +123 @@
     if ( !isset($_POST['user_nonce']) || !wp_verify_nonce(sanitize_text_field(wp_unslash($_POST['user_nonce'])), 'DialBunny') ) { return; }
     if ( !current_user_can('administrator') ) { return; }
-    if (!isset($_POST['idValue']) && !isset($_POST['phone']) && !isset($_POST['phone'])) { return; }
+    if ( !isset($_POST['idValue']) && !isset($_POST['phone'])) { return; }
 
     global $wpdb;
-    $id = sanitize_text_field(wp_unslash($_POST['idValue'])); if ( ! preg_match('/^[a-f0-9]+\.[0-9]+$/', $input) ) { echo esc_html('Error removing released phone number. Invalid ID.'); exit; }
-    $phone = sanitize_text_field(wp_unslash($_POST['phone'])); if (! preg_match('/^\+?[0-9]{1,15}$/', $phone)) { echo esc_html('Error removing released phone number. Invalid Phone Number.'); exit; }
+    $id = sanitize_text_field(wp_unslash($_POST['idValue']));
+    $phone = sanitize_text_field(wp_unslash($_POST['phone']));
 
     $table = $wpdb->prefix . 'dialbunny_released_numbers';
     // Direct database query used below – Safely deletes data from the database using $wpdb->delete(), which handles proper escaping and prevents SQL injection.
-    $deleted = $wpdb->delete($table, array('id' => $id), array('%d')); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+    $deleted = $wpdb->delete($table, array('id' => $id), array('%s')); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
 
     echo $deleted ? esc_html("$phone removed successfully!") : esc_html__("Failed to remove released number!", 'dialbunny');

dialbunny/trunk/lib/controllers/dashboard.php

@@ -151 +151 @@
     $contains    = sanitize_text_field(wp_unslash($_POST['contains'] ?? ''));
     $type        = sanitize_text_field(wp_unslash($_POST['type'] ?? ''));
-    $user_nonce = sanitize_text_field(wp_unslash($_POST['user_nonce']));
+    $requirements= sanitize_text_field(wp_unslash($_POST['addressrequirements'] ?? ''));
+    $beta        = sanitize_text_field(wp_unslash($_POST['beta'] ?? ''));
+    $user_nonce  = sanitize_text_field(wp_unslash($_POST['user_nonce']));
 
     // Build redirect URL safely
@@ -161 +163 @@
         'contains'    => $contains,
         'type'        => $type,
-        'user_nonce'    => $user_nonce, // carry it forward
+        'requirements'=> $requirements,
+        'beta'        => $beta,
+        'user_nonce'  => $user_nonce, // carry it forward
     ], admin_url('admin.php'));
 
@@ -173 +177 @@
     if ( !isset($_POST['user_nonce']) || !wp_verify_nonce(sanitize_text_field(wp_unslash($_POST['user_nonce'])), 'DialBunny') ) { return; }
     global $wpdb;
+    $user_id = get_current_user_id();
     $number_raw = sanitize_text_field(wp_unslash($_POST['number'] ?? ''));
     $country_code = '';
@@ -179 +184 @@
     // Define known country codes and lengths
     $country_codes = [
-      '+358' => 4, // Finland
-      '+353' => 4, // Ireland
-      '+31'  => 3, // Netherlands
-      '+47'  => 3, // Norway
-      '+46'  => 3, // Sweden
-      '+45'  => 3, // Denmark
-      '+44'  => 3, // UK
-      '+1'   => 2, // USA & Canada
+      '+1'    => 2,   // United States, Canada, NANP countries
+      '+7'    => 2,   // Russia, Kazakhstan
+      '+20'   => 3,   // Egypt
+      '+27'   => 3,   // South Africa
+      '+30'   => 3,   // Greece
+      '+31'   => 3,   // Netherlands
+      '+32'   => 3,   // Belgium
+      '+33'   => 3,   // France
+      '+34'   => 3,   // Spain
+      '+36'   => 3,   // Hungary
+      '+39'   => 3,   // Italy
+      '+40'   => 3,   // Romania
+      '+41'   => 3,   // Switzerland
+      '+43'   => 3,   // Austria
+      '+44'   => 3,   // United Kingdom
+      '+45'   => 3,   // Denmark
+      '+46'   => 3,   // Sweden
+      '+47'   => 3,   // Norway
+      '+48'   => 3,   // Poland
+      '+49'   => 3,   // Germany
+      '+51'   => 3,   // Peru
+      '+52'   => 3,   // Mexico
+      '+53'   => 3,   // Cuba
+      '+54'   => 3,   // Argentina
+      '+55'   => 3,   // Brazil
+      '+56'   => 3,   // Chile
+      '+57'   => 3,   // Colombia
+      '+58'   => 3,   // Venezuela
+      '+60'   => 3,   // Malaysia
+      '+61'   => 3,   // Australia
+      '+62'   => 3,   // Indonesia
+      '+63'   => 3,   // Philippines
+      '+64'   => 3,   // New Zealand
+      '+65'   => 3,   // Singapore
+      '+66'   => 3,   // Thailand
+      '+81'   => 3,   // Japan
+      '+82'   => 3,   // South Korea
+      '+84'   => 3,   // Vietnam
+      '+86'   => 3,   // China
+      '+90'   => 3,   // Turkey
+      '+91'   => 3,   // India
+      '+92'   => 3,   // Pakistan
+      '+93'   => 3,   // Afghanistan
+      '+94'   => 3,   // Sri Lanka
+      '+95'   => 3,   // Myanmar
+      '+98'   => 3,   // Iran'
+      '+211'  => 4,   // South Sudan
+      '+212'  => 4,   // Morocco
+      '+213'  => 4,   // Algeria
+      '+216'  => 4,   // Tunisia
+      '+218'  => 4,   // Libya
+      '+220'  => 4,   // Gambia
+      '+221'  => 4,   // Senegal
+      '+222'  => 4,   // Mauritania
+      '+223'  => 4,   // Mali
+      '+224'  => 4,   // Guinea
+      '+225'  => 4,   // Côte d'Ivoire
+      '+226'  => 4,   // Burkina Faso
+      '+227'  => 4,   // Niger
+      '+228'  => 4,   // Togo
+      '+229'  => 4,   // Benin
+      '+230'  => 4,   // Mauritius
+      '+231'  => 4,   // Liberia
+      '+232'  => 4,   // Sierra Leone
+      '+233'  => 4,   // Ghana
+      '+234'  => 4,   // Nigeria
+      '+235'  => 4,   // Chad
+      '+236'  => 4,   // Central African Republic
+      '+237'  => 4,   // Cameroon
+      '+238'  => 4,   // Cape Verde
+      '+239'  => 4,   // São Tomé & Príncipe
+      '+240'  => 4,   // Equatorial Guinea
+      '+241'  => 4,   // Gabon
+      '+242'  => 4,   // Congo (Brazzaville)
+      '+243'  => 4,   // Congo (Kinshasa)
+      '+244'  => 4,   // Angola
+      '+245'  => 4,   // Guinea-Bissau
+      '+246'  => 4,   // British Indian Ocean Territory
+      '+248'  => 4,   // Seychelles
+      '+249'  => 4,   // Sudan
+      '+250'  => 4,   // Rwanda
+      '+251'  => 4,   // Ethiopia
+      '+252'  => 4,   // Somalia
+      '+253'  => 4,   // Djibouti
+      '+254'  => 4,   // Kenya
+      '+255'  => 4,   // Tanzania
+      '+256'  => 4,   // Uganda
+      '+257'  => 4,   // Burundi
+      '+258'  => 4,   // Mozambique
+      '+260'  => 4,   // Zambia
+      '+261'  => 4,   // Madagascar
+      '+262'  => 4,   // Réunion / Mayotte
+      '+263'  => 4,   // Zimbabwe
+      '+264'  => 4,   // Namibia
+      '+265'  => 4,   // Malawi
+      '+266'  => 4,   // Lesotho
+      '+267'  => 4,   // Botswana
+      '+268'  => 4,   // Eswatini
+      '+269'  => 4,   // Comoros
+      '+290'  => 4,   // Saint Helena
+      '+291'  => 4,   // Eritrea
+      '+297'  => 4,   // Aruba
+      '+298'  => 4,   // Faroe Islands
+      '+299'  => 4,   // Greenland
+      '+1242' => 5,   // Bahamas
+      '+1246' => 5,   // Barbados
+      '+1264' => 5,   // Anguilla
+      '+1268' => 5,   // Antigua & Barbuda
+      '+1284' => 5,   // British Virgin Islands
+      '+1340' => 5,   // U.S. Virgin Islands
+      '+1345' => 5,   // Cayman Islands
+      '+1441' => 5,   // Bermuda
+      '+1473' => 5,   // Grenada
+      '+1649' => 5,   // Turks & Caicos
+      '+1664' => 5,   // Montserrat
+      '+1670' => 5,   // Northern Mariana Islands
+      '+1671' => 5,   // Guam
+      '+1684' => 5,   // American Samoa
+      '+1758' => 5,   // Saint Lucia
+      '+1767' => 5,   // Dominica
+      '+1784' => 5,   // Saint Vincent & the Grenadines
+      '+1809' => 5,   // Dominican Republic
+      '+1829' => 5,   // Dominican Republic (overlay)
+      '+1849' => 5,   // Dominican Republic (overlay)
+      '+1868' => 5,   // Trinidad & Tobago
+      '+1869' => 5,   // Saint Kitts & Nevis
+      '+1876' => 5,   // Jamaica
     ];
 
@@ -211 +335 @@
       $keys = new DialBunnyKeysClass();
       $client = new Client($keys->TWILIO_SID(), $keys->TWILIO_TOKEN());
+      $incoming_phone_number;
 
       // Request and purchase the phone number from TWILIO
-      $incoming_phone_number = $client->incomingPhoneNumbers->create([
+      if (isset($_POST['addressidentity']) && sanitize_text_field(wp_unslash($_POST['addressidentity'])) == 'none') 
+      {
+        $incoming_phone_number = $client->incomingPhoneNumbers->create([
         "friendlyName" => wp_get_current_user()->user_login,
         "emergencyStatus" => "Inactive",
@@ -221 +348 @@
         "voiceMethod" => "POST",
         "phoneNumber" => $country_code . $phone_number,
-      ]);
-
-      if ($incoming_phone_number->status === "in-use") {
+        ]);
+      }
+      else 
+      {
+        $incoming_phone_number = $client->incomingPhoneNumbers->create([
+        "friendlyName" => wp_get_current_user()->user_login,
+        "emergencyStatus" => "Inactive",
+        "voiceApplicationSid" => $keys->TwiML_App_SID(),
+        "smsApplicationSid" => $keys->TwiML_App_SID(),
+        "smsMethod" => "POST",
+        "voiceMethod" => "POST",
+        "phoneNumber" => $country_code . $phone_number,
+        "addressSid" => sanitize_text_field(wp_unslash($_POST['addressidentity'] ?? '')),
+        "bundleSid" => sanitize_text_field(wp_unslash($_POST['bundleidentity'] ?? '')),
+        ]);
+      }
+      if ($incoming_phone_number) {
         $table = $wpdb->prefix . 'dialbunny_phone_details';
         // Direct database query used below – $wpdb->prepare() is always used to prevent SQL injection.
-        $existing = $wpdb->get_var($wpdb->prepare("SELECT id FROM {$wpdb->prefix}dialbunny_phone_details WHERE user = %d LIMIT 1", $user_id)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+        $existing = $wpdb->get_row($wpdb->prepare("SELECT id,managed_number_code,managed_number FROM {$wpdb->prefix}dialbunny_phone_details WHERE user = %d LIMIT 1", $user_id)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
 
         $now = current_time('mysql', 1);
@@ -246 +387 @@
         } else {
           // Direct database query used below – Safely updates data into the database using $wpdb->update(), which handles proper escaping and prevents SQL injection.
-          $wpdb->update($table, $data, ['user' => $user_id]); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+          // Move released number to the released table
+          $released_table = $wpdb->prefix . 'dialbunny_released_numbers';
+          $current_details = [
+            'id' => uniqid(),
+            'user' => $user_id,
+            'countrycode' => $existing->managed_number_code,
+            'phone' => $existing->managed_number,
+            'created_at' => current_time('mysql', 1),
+            'updated_at' => current_time('mysql', 1),
+          ];
+          $wpdb->insert($released_table, $current_details); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+          // Update the user's managed number to mark it as released
+          $updated = $wpdb->update($table, $data, [ // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+            'managed_number' => $existing->managed_number,
+            'managed_number_code' => $existing->managed_number_code,
+            'user' => $user_id,
+          ]);
         }
 
@@ -255 +412 @@
       }
     } catch (Exception $e) {
-      wp_safe_redirect(admin_url('admin.php?page=dialbunny_dashboard&dashboardpage=choose&error=twilio&user_nonce='.sanitize_text_field(wp_unslash($_POST['user_nonce']))));
+      wp_safe_redirect(admin_url('admin.php?page=dialbunny_dashboard&dashboardpage=choose&addressrequired&user_nonce='.sanitize_text_field(wp_unslash($_POST['user_nonce']))));
     }
     exit;
@@ -587 +744 @@
   }
 
+  // Create an address for phone numbers
+  /*function create_address()
+  {
+    if ( !isset($_POST['user_nonce']) || !wp_verify_nonce(sanitize_text_field(wp_unslash($_POST['user_nonce'])), 'DialBunny') ) { return; }
+    global $wpdb;
+    $keys = new DialBunnyKeysClass();
+    $client = new Client($keys->TWILIO_SID(), $keys->TWILIO_TOKEN());
+    $dialbunny_address;
+    //create address with twilio
+    $dialbunny_address = $client->addresses->create(
+        sanitize_text_field(wp_unslash( $_POST['customer'] )), // CustomerName
+        sanitize_text_field(wp_unslash( $_POST['line1'] )), // Street
+        sanitize_text_field(wp_unslash( $_POST['city'] )), // City
+        sanitize_text_field(wp_unslash( $_POST['state'] )), // Region
+        sanitize_text_field(wp_unslash( $_POST['zip'] )), // PostalCode
+        sanitize_text_field(wp_unslash( $_POST['countrycode'] )), // IsoCountry
+        ["streetSecondary" => sanitize_text_field(wp_unslash( $_POST['line2'] )),"friendlyName" => sanitize_text_field(wp_unslash( $_POST['friendly'] ))]
+    );
+    if ($dialbunny_address) 
+    {
+    // Sanitize all inputs for insertion into local database
+    $data = [
+        'id'                 => uniqid(),
+        'user'               => get_current_user_id(),
+        'twilio_address_sid'=>$dialbunny_address->sid,
+        'customer'           => sanitize_text_field(wp_unslash( $_POST['customer'] ?? '' )),
+        'friendly_name'      => sanitize_text_field(wp_unslash( $_POST['friendly'] ?? '' )),
+        'line1'              => sanitize_text_field(wp_unslash( $_POST['line1'] ?? '' )),
+        'line2'              => sanitize_text_field(wp_unslash( $_POST['line2'] ?? '' )),
+        'city'               => sanitize_text_field(wp_unslash( $_POST['city'] ?? '' )),
+        'state'              => sanitize_text_field(wp_unslash( $_POST['state'] ?? '' )),
+        'zip'                => sanitize_text_field(wp_unslash( $_POST['zip'] ?? '' )),
+        'country'            => sanitize_text_field(wp_unslash( $_POST['countrycode'] ?? 'US' )),
+        'created_at'         => current_time('mysql', 1),
+        'updated_at'         => current_time('mysql', 1)
+    ];
+    // Basic validation
+    $required = ['customer', 'friendly_name', 'line1', 'city', 'state', 'zip'];
+    foreach ( $required as $field ) {
+        if ( empty($field) ) {
+            wp_safe_redirect(admin_url('admin.php?page=dialbunny_dashboard&dashboardpage=addresses&error1&user_nonce='.sanitize_text_field(wp_unslash($_POST['user_nonce']))));
+            return;
+        }
+    }
+    // Insert into DB
+    $inserted = $wpdb->insert( $wpdb->prefix.'dialbunny_addresses', $data ); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+
+    if ( $inserted ) {
+        wp_safe_redirect(admin_url('admin.php?page=dialbunny_dashboard&dashboardpage=addresses&user_nonce='.sanitize_text_field(wp_unslash($_POST['user_nonce']))));
+    } else {
+        wp_safe_redirect(admin_url('admin.php?page=dialbunny_dashboard&dashboardpage=addresses&error1&user_nonce='.sanitize_text_field(wp_unslash($_POST['user_nonce']))));
+    }      
+    }
+    else { wp_safe_redirect(admin_url('admin.php?page=dialbunny_dashboard&dashboardpage=addresses&error1&user_nonce='.sanitize_text_field(wp_unslash($_POST['user_nonce'])))); }
+  }*/
+  
+  // Update address
+  /*function update_address() 
+  {
+    if ( !isset($_POST['user_nonce']) || !wp_verify_nonce(sanitize_text_field(wp_unslash($_POST['user_nonce'])), 'DialBunny') ) { return; }
+    if ( !isset($_POST['addressidentity'])) { return; }
+    global $wpdb;
+    $keys = new DialBunnyKeysClass();
+    $client = new Client($keys->TWILIO_SID(), $keys->TWILIO_TOKEN());
+    $dialbunny_address;
+    // Update Twilio address on twilios end
+    $dialbunny_address = $client->addresses(sanitize_text_field( $_POST['twilio_address_sid']))->update([
+        'customerName'   => sanitize_text_field(wp_unslash( $_POST['customer'] )),
+        'friendlyName'   => sanitize_text_field(wp_unslash( $_POST['friendly'] )),
+        'street'         => sanitize_text_field(wp_unslash( $_POST['line1'] )),
+        'streetSecondary'=> sanitize_text_field(wp_unslash( $_POST['line2'] )),
+        'city'           => sanitize_text_field(wp_unslash( $_POST['city'] )),
+        'region'         => sanitize_text_field(wp_unslash( $_POST['state'] )),
+        'postalCode'     => sanitize_text_field(wp_unslash( $_POST['zip'] )),
+        'isoCountry'     => strtoupper( sanitize_text_field(wp_unslash( $_POST['countrycode'] )) ),
+    ]);
+    if ($dialbunny_address) 
+    {
+    // Sanitize all inputs
+    $data = [
+        'customer'       => sanitize_text_field(wp_unslash( $_POST['customer'] ?? '' )),
+        'friendly_name'  => sanitize_text_field(wp_unslash( $_POST['friendly'] ?? '' )),
+        'line1'          => sanitize_text_field(wp_unslash( $_POST['line1'] ?? '' )),
+        'line2'          => sanitize_text_field(wp_unslash( $_POST['line2'] ?? '' )),
+        'city'           => sanitize_text_field(wp_unslash( $_POST['city'] ?? '' )),
+        'state'          => sanitize_text_field(wp_unslash( $_POST['state'] ?? '' )),
+        'zip'            => sanitize_text_field(wp_unslash( $_POST['zip'] ?? '' )),
+        'updated_at'     => current_time('mysql', 1)
+    ];
+    // Basic validation
+    $required = ['customer', 'friendly_name', 'line1', 'city', 'state', 'zip'];
+    foreach ( $required as $field ) {
+        if ( empty($field) ) {
+            wp_safe_redirect(admin_url('admin.php?page=dialbunny_dashboard&dashboardpage=addresses&error2&addressidentity='.sanitize_text_field( $_POST['addressidentity']).'user_nonce='.sanitize_text_field(wp_unslash($_POST['user_nonce']))));
+            return;
+        }
+    }
+    // update row
+    $updated = $wpdb->update( $wpdb->prefix.'dialbunny_addresses', $data, ['user' => get_current_user_id(),'id' => sanitize_text_field($_POST['addressidentity'])] ); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+
+    if ( $updated ) {
+        wp_safe_redirect(admin_url('admin.php?page=dialbunny_dashboard&dashboardpage=addresses&addressidentity='.sanitize_text_field( $_POST['addressidentity']).'&user_nonce='.sanitize_text_field(wp_unslash($_POST['user_nonce']))));
+    } else {
+        wp_safe_redirect(admin_url('admin.php?page=dialbunny_dashboard&dashboardpage=addresses&error2&addressidentity='.sanitize_text_field( $_POST['addressidentity']).'&user_nonce='.sanitize_text_field(wp_unslash($_POST['user_nonce']))));
+    }
+    }
+    else { wp_safe_redirect(admin_url('admin.php?page=dialbunny_dashboard&dashboardpage=addresses&error2&addressidentity='.sanitize_text_field( $_POST['addressidentity']).'&user_nonce='.sanitize_text_field(wp_unslash($_POST['user_nonce'])))); }
+  }*/
+
+  // Delete address forever
+  /*function remove_address()
+  {
+    if ( !isset($_POST['user_nonce']) || !wp_verify_nonce(sanitize_text_field(wp_unslash($_POST['user_nonce'])), 'DialBunny') ) { return; }
+    if ( !isset($_POST['addressidentity'])) { return; }
+    global $wpdb;
+    $keys = new DialBunnyKeysClass();
+    $client = new Client($keys->TWILIO_SID(), $keys->TWILIO_TOKEN());
+    $dialbunny_address;
+    // delete twilio address on twitios end
+    $dialbunny_address = $client->addresses(sanitize_text_field(wp_unslash( $_POST['twilio_address_sid'])))->delete();
+    if ($dialbunny_address) 
+    {
+      // delete row
+    $deleted = $wpdb->delete( $wpdb->prefix.'dialbunny_addresses', ['user' => get_current_user_id(),'id' => sanitize_text_field(wp_unslash($_POST['addressidentity']))]); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+
+    if ( $deleted ) {
+        wp_safe_redirect(admin_url('admin.php?page=dialbunny_dashboard&dashboardpage=addresses&user_nonce='.sanitize_text_field(wp_unslash($_POST['user_nonce']))));
+    } else {
+        wp_safe_redirect(admin_url('admin.php?page=dialbunny_dashboard&dashboardpage=addresses&error3&addressidentity='.sanitize_text_field(wp_unslash( $_POST['addressidentity'])).'&user_nonce='.sanitize_text_field(wp_unslash($_POST['user_nonce']))));
+    }
+    }
+    else { wp_safe_redirect(admin_url('admin.php?page=dialbunny_dashboard&dashboardpage=addresses&error3&addressidentity='.sanitize_text_field(wp_unslash( $_POST['addressidentity'])).'&user_nonce='.sanitize_text_field(wp_unslash($_POST['user_nonce'])))); }
+  }*/
 }
  ?>

dialbunny/trunk/lib/controllers/webcalling.php

@@ -78 +78 @@
     if (isset($_POST['BrowserOutgoing']) && $_POST['BrowserOutgoing'] === 'true')
     {
-      if (!isset($_POST['To'])) { exit; }
+      if (!isset($_POST['To_number'])) { exit; }
+      if (!isset($_POST['To_code'])) { exit; }
       $response = new VoiceResponse();
       $user_id = filter_input(INPUT_POST, 'User', FILTER_VALIDATE_INT); if ($user_id === false || $user_id === null) { exit; }

dialbunny/trunk/lib/views/admin/add.php

@@ -10 +10 @@
     <div class="dialbunny-card">
         <h2 class="dialbunny-title">Manually Adding Phone Numbers</h2>
-        <p class="dialbunny-description">Follow these steps to manually add a phone number to a user’s account:</p>
+        <p class="dialbunny-description">Follow these steps to manually add a phone number to a user's account:</p>
         <ol class="dialbunny-list">
             <li>Go to your Twilio account.</li>

dialbunny/trunk/lib/views/admin/header.php

@@ -1 +1 @@
 <?php if ( ! defined( 'ABSPATH' ) ) exit; ?>
-<?php
-
-// Define the page slug (adjust to your plugin's admin page slug)
-$page_slug = 'dialbunny_';
-
-// Define current page
-$current_page = isset($_GET['page']) ? wp_unslash(sanitize_text_field($_GET['page'])) : '';
-
-// Base URL for tabs
-$base_url = admin_url('admin.php?page=' . $page_slug);
-?>
 
 <div class="wrap modern-admin-header">
@@ -16 +5 @@
         <h1 class="header-title">DialBunny Admin Settings</h1>
         <div class="header-actions">
-            <a href="<?php echo esc_url($base_url . "dashboard"); ?>" class="button button-primary">Dashboard</a>
-            <a href="<?php echo esc_url($base_url . "setup"); ?>" class="button button-secondary">Settings</a>
+            <a href="<?php echo esc_url(admin_url('admin.php?page=' . 'dialbunny_') . "dashboard"); ?>" class="button button-primary">Dashboard</a>
+            <a href="<?php echo esc_url(admin_url('admin.php?page=' . 'dialbunny_') . "setup"); ?>" class="button button-secondary">Settings</a>
         </div>
     </div>
     <div class="tab-container">
         <div class="tab-nav">
-            <a href="<?php echo esc_url($base_url . "setup"); ?>" 
-               class="tab-button <?php echo $current_page === $page_slug.'setup' ? 'active' : ''; ?><?php echo $current_page === $page_slug.'additional' ? 'active' : ''; ?>">Setup</a>
-            <a href="<?php echo esc_url($base_url . "info"); ?>" 
-               class="tab-button <?php echo $current_page === $page_slug.'info' ? 'active' : ''; ?><?php echo $current_page === $page_slug.'availability' ? 'active' : ''; ?>">Info</a>
-            <a href="<?php echo esc_url($base_url . "add"); ?>" 
-               class="tab-button <?php echo $current_page === $page_slug.'add' ? 'active' : ''; ?>">Add</a>
-            <a href="<?php echo esc_url($base_url . "remove"); ?>" 
-               class="tab-button <?php echo $current_page === $page_slug.'remove' ? 'active' : ''; ?>">Remove</a>
-            <a href="<?php echo esc_url($base_url . "released"); ?>" 
-               class="tab-button <?php echo $current_page === $page_slug.'released' ? 'active' : ''; ?>">Released</a>
-            <a href="<?php echo esc_url($base_url . "license"); ?>" 
-               class="tab-button <?php echo $current_page === $page_slug.'license' ? 'active' : ''; ?>">License</a>
+            <a href="<?php echo esc_url(admin_url('admin.php?page=' . 'dialbunny_') . "setup"); ?>" 
+               class="tab-button <?php echo $current_page === 'setup' ? 'active' : ''; ?><?php echo $current_page === 'additional' ? 'active' : ''; ?>">Setup</a>
+            <a href="<?php echo esc_url(admin_url('admin.php?page=' . 'dialbunny_') . "info"); ?>" 
+               class="tab-button <?php echo $current_page === 'info' ? 'active' : ''; ?><?php echo $current_page === 'availability' ? 'active' : ''; ?>">Info</a>
+            <a href="<?php echo esc_url(admin_url('admin.php?page=' . 'dialbunny_') . "add"); ?>" 
+               class="tab-button <?php echo $current_page === 'add' ? 'active' : ''; ?>">Add</a>
+            <a href="<?php echo esc_url(admin_url('admin.php?page=' . 'dialbunny_') . "remove"); ?>" 
+               class="tab-button <?php echo $current_page === 'remove' ? 'active' : ''; ?>">Remove</a>
+            <a href="<?php echo esc_url(admin_url('admin.php?page=' . 'dialbunny_') . "released"); ?>" 
+               class="tab-button <?php echo $current_page === 'released' ? 'active' : ''; ?>">Released</a>
+            <a href="<?php echo esc_url(admin_url('admin.php?page=' . 'dialbunny_') . "license"); ?>" 
+               class="tab-button <?php echo $current_page === 'license' ? 'active' : ''; ?>">License</a>
         </div>
     </div>
 
     <?php // Sub-tab menu for specific tabs (setup and additional settings)
-    if ($current_page == $page_slug.'setup' || $current_page == $page_slug.'additional') : ?>
+    if ($current_page == 'setup' || $current_page == 'additional') : ?>
         <div class="subtab-container">
             <div class="subtab-nav">
-                <a href="<?php echo esc_url($base_url . "setup"); ?>" 
-                   class="subtab-button <?php echo $current_page === $page_slug.'setup' ? 'active' : ''; ?>">API Keys</a>
-                <a href="<?php echo esc_url($base_url . "additional"); ?>" 
-                   class="subtab-button <?php echo $current_page === $page_slug.'additional' ? 'active' : ''; ?>">Additional Settings</a>
+                <a href="<?php echo esc_url(admin_url('admin.php?page=' . 'dialbunny_') . "setup"); ?>" 
+                   class="subtab-button <?php echo $current_page === 'setup' ? 'active' : ''; ?>">API Keys</a>
+                <a href="<?php echo esc_url(admin_url('admin.php?page=' . 'dialbunny_') . "additional"); ?>" 
+                   class="subtab-button <?php echo $current_page === 'additional' ? 'active' : ''; ?>">Additional Settings</a>
             </div>
         </div>
     <?php endif; ?>
     <?php // Sub-tab menu for specific tabs (Information)
-    if ($current_page == $page_slug.'info' || $current_page == $page_slug.'availability') : ?>
+    if ($current_page == 'info' || $current_page == 'availability') : ?>
         <div class="subtab-container">
             <div class="subtab-nav">
-                <a href="<?php echo esc_url($base_url . "info"); ?>" 
-                   class="subtab-button <?php echo $current_page === $page_slug.'info' ? 'active' : ''; ?>">Information</a>
-                <a href="<?php echo esc_url($base_url . "availability"); ?>"
-                   class="subtab-button <?php echo $current_page === $page_slug.'availability' ? 'active' : ''; ?>">Number Availability</a>
+                <a href="<?php echo esc_url(admin_url('admin.php?page=' . 'dialbunny_') . "info"); ?>" 
+                   class="subtab-button <?php echo $current_page === 'info' ? 'active' : ''; ?>">Information</a>
+                <a href="<?php echo esc_url(admin_url('admin.php?page=' . 'dialbunny_') . "availability"); ?>"
+                   class="subtab-button <?php echo $current_page === 'availability' ? 'active' : ''; ?>">Number Availability</a>
             </div>
         </div>

dialbunny/trunk/lib/views/admin/license.php

@@ -3 +3 @@
 global $wpdb;
 // Direct database query used below – Safely gets data from the database using $wpdb->prepare()
-$keys = $wpdb->get_results($wpdb->prepare("SELECT license_key FROM {$wpdb->prefix}dialbunny_api_keys WHERE id = %s LIMIT 1", 'ACWJB59')); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+$dialbunny_keys = $wpdb->get_results($wpdb->prepare("SELECT license_key FROM {$wpdb->prefix}dialbunny_api_keys WHERE id = %s LIMIT 1", 'ACWJB59')); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
 ?>
 
@@ -9 +9 @@
     <?php
     // Display notice based on license key validation
-    if (isset($keys[0]->license_key) && strlen($keys[0]->license_key) == 27 && stripos($keys[0]->license_key, 'd') !== false) {
+    if (isset($dialbunny_keys[0]->license_key) && strlen($dialbunny_keys[0]->license_key) == 27 && stripos($dialbunny_keys[0]->license_key, 'd') !== false) {
         echo '<div class="dialbunny-notice dialbunny-notice-success"><p><strong>License Key is Active!</strong> Your license code is active!</p><button class="dialbunny-notice-dismiss">Dismiss</button></div>';
     } else {
@@ -30 +30 @@
                 <label for="license_key" class="dialbunny-label">License Key</label>
                 <input required type="text" name="license_key" id="license_key" placeholder="Enter your license key" 
-                       value="<?php if (isset($keys[0]->license_key)) { echo esc_html($keys[0]->license_key); } ?>" 
+                       value="<?php if (isset($dialbunny_keys[0]->license_key)) { echo esc_html($dialbunny_keys[0]->license_key); } ?>" 
                        class="dialbunny-input">
             </div>

dialbunny/trunk/lib/views/admin/released.php

@@ -2 +2 @@
 <?php
 global $wpdb;
-$table = $wpdb->prefix . 'dialbunny_released_numbers';
-$records = $wpdb->get_results("SELECT id, countrycode, phone FROM {$table} LIMIT 50"); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+$dialbunny_table = $wpdb->prefix . 'dialbunny_released_numbers';
+$dialbunny_records = $wpdb->get_results("SELECT id, countrycode, phone FROM {$dialbunny_table} LIMIT 50"); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
 ?>
 
@@ -27 +27 @@
     <div class="dialbunny-card">
         <h2 class="dialbunny-title">Released Numbers</h2>
-        <?php if (!empty($records)) : ?>
+        <?php if (!empty($dialbunny_records)) : ?>
             <div class="dialbunny-table-container">
                 <table class="dialbunny-table">
@@ -37 +37 @@
                     </thead>
                     <tbody>
-                        <?php foreach ($records as $record) : 
-                            $id = intval($record->id);
-                            $countrycode = esc_html($record->countrycode);
-                            $phone = esc_html($record->phone);
-                            $fullNumber = $countrycode . $phone;
+                        <?php foreach ($dialbunny_records as $dialbunny_record) : 
+                            $id = $dialbunny_record->id;
+                            $dialbunny_countrycode = esc_html($dialbunny_record->countrycode);
+                            $dialbunny_phone = esc_html($dialbunny_record->phone);
+                            $dialbunny_fullNumber = $dialbunny_countrycode . $dialbunny_phone;
                         ?>
                             <tr>
-                                <td><?php echo esc_html($fullNumber); ?></td>
+                                <td><?php echo esc_html($dialbunny_fullNumber); ?></td>
                                 <td>
                                     <form action="<?php echo esc_url(admin_url('admin-post.php')); ?>" method="post" class="dialbunny-form-inline">
@@ -50 +50 @@
                                         <input type="hidden" name="action" value="dialbunny_remove_released">
                                         <input type="hidden" name="idValue" value="<?php echo esc_attr($id); ?>">
-                                        <input type="hidden" name="phone" value="<?php echo esc_attr($fullNumber); ?>">
+                                        <input type="hidden" name="phone" value="<?php echo esc_attr($dialbunny_fullNumber); ?>">
                                         <button type="submit" class="dialbunny-button dialbunny-button-delete">Remove Permanently</button>
                                     </form>

dialbunny/trunk/lib/views/admin/setup.php

@@ -2 +2 @@
 <?php
 global $wpdb;
-$table = $wpdb->prefix . 'dialbunny_api_keys';
-$keys = $wpdb->get_results($wpdb->prepare("SELECT * FROM {$table} WHERE id = %s LIMIT 1", 'ACWJB59')); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
-$decrypt = new DialBunnyKeysClass();
+$dialbunny_table = $wpdb->prefix . 'dialbunny_api_keys';
+$dialbunny_keys = $wpdb->get_results($wpdb->prepare("SELECT * FROM {$dialbunny_table} WHERE id = %s LIMIT 1", 'ACWJB59')); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+$dialbunny_decrypt = new DialBunnyKeysClass();
 ?>
 
@@ -26 +26 @@
                 <label for="twilio_sid" class="dialbunny-label">Twilio SID</label>
                 <input required type="password" name="TWILIO_SID" id="twilio_sid" 
-                       value="<?php if (isset($keys[0]->twilio_sid)) { echo esc_html($decrypt->decrypt_data($keys[0]->twilio_sid)); } ?>" 
+                       value="<?php if (isset($dialbunny_keys[0]->twilio_sid)) { echo esc_html($dialbunny_decrypt->decrypt_data($dialbunny_keys[0]->twilio_sid)); } ?>" 
                        placeholder="Enter Twilio SID" class="dialbunny-input">
             </div>
@@ -32 +32 @@
                 <label for="twilio_token" class="dialbunny-label">Twilio Auth Token</label>
                 <input required type="password" name="TWILIO_TOKEN" id="twilio_token" 
-                       value="<?php if (isset($keys[0]->twilio_token)) { echo esc_html($decrypt->decrypt_data($keys[0]->twilio_token)); } ?>" 
+                       value="<?php if (isset($dialbunny_keys[0]->twilio_token)) { echo esc_html($dialbunny_decrypt->decrypt_data($dialbunny_keys[0]->twilio_token)); } ?>" 
                        placeholder="Enter Twilio Auth Token" class="dialbunny-input">
             </div>
@@ -49 +49 @@
                 <label for="twiml_app_sid" class="dialbunny-label">TwiML App SID</label>
                 <input type="password" name="TwiML_App_SID" id="twiml_app_sid" 
-                       value="<?php if (isset($keys[0]->TwiML_App_SID)) { echo esc_html($decrypt->decrypt_data($keys[0]->TwiML_App_SID)); } ?>" 
+                       value="<?php if (isset($dialbunny_keys[0]->TwiML_App_SID)) { echo esc_html($dialbunny_decrypt->decrypt_data($dialbunny_keys[0]->TwiML_App_SID)); } ?>" 
                        placeholder="Enter TwiML App SID" class="dialbunny-input">
             </div>
@@ -61 +61 @@
                 <label for="api_key" class="dialbunny-label">API SID Key</label>
                 <input type="password" name="API_KEY" id="api_key" 
-                       value="<?php if (isset($keys[0]->API_KEY)) { echo esc_html($decrypt->decrypt_data($keys[0]->API_KEY)); } ?>" 
+                       value="<?php if (isset($dialbunny_keys[0]->API_KEY)) { echo esc_html($dialbunny_decrypt->decrypt_data($dialbunny_keys[0]->API_KEY)); } ?>" 
                        placeholder="Enter API SID Key" class="dialbunny-input">
             </div>
@@ -67 +67 @@
                 <label for="api_secret" class="dialbunny-label">API Secret</label>
                 <input type="password" name="API_SECRET" id="api_secret" 
-                       value="<?php if (isset($keys[0]->API_SECRET)) { echo esc_html($decrypt->decrypt_data($keys[0]->API_SECRET)); } ?>" 
+                       value="<?php if (isset($dialbunny_keys[0]->API_SECRET)) { echo esc_html($dialbunny_decrypt->decrypt_data($dialbunny_keys[0]->API_SECRET)); } ?>" 
                        placeholder="Enter API Secret" class="dialbunny-input">
             </div>

dialbunny/trunk/lib/views/dashboard/ai_assistant.php

@@ -4 +4 @@
   <div class="container-xxl" id="content_container">
     <?php
-    $table = $wpdb->prefix . 'dialbunny_phone_details';
+    $dialbunny_table = $wpdb->prefix . 'dialbunny_phone_details';
     // Direct database query used below – $wpdb->prepare() is always used to prevent SQL injection.
-    $saveData = $wpdb->get_results($wpdb->prepare("SELECT voice_assistant FROM {$wpdb->prefix}dialbunny_phone_details WHERE user = %d LIMIT 1", wp_get_current_user()->ID)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
-    $decodedData = json_decode($saveData[0]->voice_assistant, true);
+    $dialbunny_saveData = $wpdb->get_results($wpdb->prepare("SELECT voice_assistant FROM {$wpdb->prefix}dialbunny_phone_details WHERE user = %d LIMIT 1", wp_get_current_user()->ID)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+    $dialbunny_decodedData = json_decode($dialbunny_saveData[0]->voice_assistant, true);
     ?>
     <?php if (isset($_GET['updated'])) { echo wp_kses_post(dialbunny_main_success("Saved Successfuly", "You have successfully updated your AI assistant settings.")); }  ?>
@@ -109 +109 @@
                                                    <label class="col-12 col-form-label fw-semibold fs-6">SID:</label>
                                                    <div class="col-12">
-                                                      <input type="text" maxlength="250" name="twilio_sid" class="form-control form-control-lg form-control-solid" placeholder="Twilio Assistant SID" value="<?php if (isset($decodedData['twilio_sid'])) { echo esc_html($decodedData['twilio_sid']); } ?>" />
+                                                      <input type="text" maxlength="250" name="twilio_sid" class="form-control form-control-lg form-control-solid" placeholder="Twilio Assistant SID" value="<?php if (isset($dialbunny_decodedData['twilio_sid'])) { echo esc_html($dialbunny_decodedData['twilio_sid']); } ?>" />
                                                    </div>
                                                 </div>
@@ -135 +135 @@
                                                    <label class="col-12 col-form-label fw-semibold fs-6">Inbound SIP Url:</label>
                                                    <div class="col-12">
-                                                      <input type="text" maxlength="250" name="vapi_sip" class="form-control form-control-lg form-control-solid" placeholder="Vapi Assistant SIP Url" value="<?php if (isset($decodedData['vapi_sip'])) { echo esc_html($decodedData['vapi_sip']); } ?>" />
+                                                      <input type="text" maxlength="250" name="vapi_sip" class="form-control form-control-lg form-control-solid" placeholder="Vapi Assistant SIP Url" value="<?php if (isset($dialbunny_decodedData['vapi_sip'])) { echo esc_html($dialbunny_decodedData['vapi_sip']); } ?>" />
                                                    </div>
                                                 </div>
@@ -199 +199 @@
                                               <div class="mb-10 cursor-pointer">
                                                   <div class="form-check cursor-pointer">
-                                                                                    <input class="form-check-input cursor-pointer" type="radio" value="twilio" id="flexCheckDefault1" name="radio" <?php if (isset($decodedData['voice_company']) && $decodedData['voice_company'] == 'twilio') { echo 'checked="checked"'; } ?>>
+                                                                                    <input class="form-check-input cursor-pointer" type="radio" value="twilio" id="flexCheckDefault1" name="radio" <?php if (isset($dialbunny_decodedData['voice_company']) && $dialbunny_decodedData['voice_company'] == 'twilio') { echo 'checked="checked"'; } ?>>
                                                       <label class="fs-5 text-gray-900 fw-semibold cursor-pointer" for="flexCheckDefault1">Twilio</label>
                                                   </div>
@@ -205 +205 @@
                                               <div class="cursor-pointer">
                                                   <div class="form-check cursor-pointer">
-                                                                                    <input class="form-check-input cursor-pointer" type="radio" value="vapi" id="flexCheckDefault2" name="radio" <?php if (isset($decodedData['voice_company']) && $decodedData['voice_company'] == 'vapi') { echo 'checked="checked"'; } ?>>
+                                                                                    <input class="form-check-input cursor-pointer" type="radio" value="vapi" id="flexCheckDefault2" name="radio" <?php if (isset($dialbunny_decodedData['voice_company']) && $dialbunny_decodedData['voice_company'] == 'vapi') { echo 'checked="checked"'; } ?>>
                                                       <label class="fs-5 text-gray-900 fw-semibold cursor-pointer" for="flexCheckDefault2">Vapi</label>
                                                   </div>
@@ -236 +236 @@
                                                                             <div class="col-sm-6">
                                               <div class="form-check form-switch form-check-custom form-check-solid me-10">
-                                                <input role="button" class="form-check-input h-20px w-30px hover::primary" type="checkbox" onclick="dialbunny_changeCheckboxValue(this)" <?php if (isset($decodedData['ai_initiated']) && $decodedData['ai_initiated'] == "1") { echo 'checked="checked" value="1"'; } else { echo 'value="0"'; } ?> name="initiated"/>
+                                                <input role="button" class="form-check-input h-20px w-30px hover::primary" type="checkbox" onclick="dialbunny_changeCheckboxValue(this)" <?php if (isset($dialbunny_decodedData['ai_initiated']) && $dialbunny_decodedData['ai_initiated'] == "1") { echo 'checked="checked" value="1"'; } else { echo 'value="0"'; } ?> name="initiated"/>
                                               </div>
                                                                             </div>
@@ -248 +248 @@
                                                                             <div class="col-sm-6">
                                               <div class="form-check form-switch form-check-custom form-check-solid me-10">
-                                                <input role="button" class="form-check-input h-20px w-30px" type="checkbox" onclick="dialbunny_changeCheckboxValue(this)" <?php if (isset($decodedData['ai_busy']) && $decodedData['ai_busy'] == "1") { echo 'checked="checked" value="1"'; } else { echo 'value="0"'; } ?> name="busy" />
+                                                <input role="button" class="form-check-input h-20px w-30px" type="checkbox" onclick="dialbunny_changeCheckboxValue(this)" <?php if (isset($dialbunny_decodedData['ai_busy']) && $dialbunny_decodedData['ai_busy'] == "1") { echo 'checked="checked" value="1"'; } else { echo 'value="0"'; } ?> name="busy" />
                                               </div>
                                                                             </div>
@@ -260 +260 @@
                                                                             <div class="col-sm-6">
                                               <div class="form-check form-switch form-check-custom form-check-solid me-10">
-                                                <input role="button" class="form-check-input h-20px w-30px" type="checkbox" onclick="dialbunny_changeCheckboxValue(this)" <?php if (isset($decodedData['ai_timetable']) && $decodedData['ai_timetable'] == "1") { echo 'checked="checked" value="1"'; } else { echo 'value="0"'; } ?> name="timetable"/>
+                                                <input role="button" class="form-check-input h-20px w-30px" type="checkbox" onclick="dialbunny_changeCheckboxValue(this)" <?php if (isset($dialbunny_decodedData['ai_timetable']) && $dialbunny_decodedData['ai_timetable'] == "1") { echo 'checked="checked" value="1"'; } else { echo 'value="0"'; } ?> name="timetable"/>
                                               </div>
                                                                             </div>
@@ -287 +287 @@
                                               <label class="col-12 col-form-label fw-semibold fs-6">Greeting Message:</label>
                                               <div class="col-12">
-                                                <input id="phoneNumber" type="text" maxlength="250" name="greeting" class="form-control form-control-lg form-control-solid" placeholder="Hi! Ask me anything!" value="<?php if (!empty($decodedData['greeting'])) { echo esc_html($decodedData['greeting']); } else { echo 'Hi! Ask me anything!'; } ?>" />
+                                                <input id="phoneNumber" type="text" maxlength="250" name="greeting" class="form-control form-control-lg form-control-solid" placeholder="Hi! Ask me anything!" value="<?php if (!empty($dialbunny_decodedData['greeting'])) { echo esc_html($dialbunny_decodedData['greeting']); } else { echo 'Hi! Ask me anything!'; } ?>" />
                                               </div>
                                           </div>
@@ -293 +293 @@
                                               <label class="col-12 col-form-label fw-semibold fs-6">Voice:</label>
                                               <div class="col-12">
-                                                <input id="phoneNumber" type="text" maxlength="25" name="voice" class="form-control form-control-lg form-control-solid" placeholder="en-US-Journey-O" value="<?php if (!empty($decodedData['voice'])) { echo esc_html($decodedData['voice']); } else { echo 'en-US-Journey-O'; } ?>" />
+                                                <input id="phoneNumber" type="text" maxlength="25" name="voice" class="form-control form-control-lg form-control-solid" placeholder="en-US-Journey-O" value="<?php if (!empty($dialbunny_decodedData['voice'])) { echo esc_html($dialbunny_decodedData['voice']); } else { echo 'en-US-Journey-O'; } ?>" />
                                               </div>
                                           </div>
@@ -364 +364 @@
                                                                             <div class="col-sm-6">
                                               <div class="form-check form-switch form-check-custom form-check-solid me-10">
-                                                <input role="button" class="form-check-input h-20px w-30px hover::primary" type="checkbox" onclick="dialbunny_changeCheckboxValue(this)" <?php if (isset($decodedData['ai_messages']) && $decodedData['ai_messages'] == "1") { echo 'checked="checked" value="1"'; } else { echo 'value="0"'; } ?> name="messages"/>
+                                                <input role="button" class="form-check-input h-20px w-30px hover::primary" type="checkbox" onclick="dialbunny_changeCheckboxValue(this)" <?php if (isset($dialbunny_decodedData['ai_messages']) && $dialbunny_decodedData['ai_messages'] == "1") { echo 'checked="checked" value="1"'; } else { echo 'value="0"'; } ?> name="messages"/>
                                               </div>
                                                                             </div>

dialbunny/trunk/lib/views/dashboard/calendar.php

@@ -62 +62 @@
 
     <?php
-    $table = $wpdb->prefix . 'dialbunny_phone_details';
-    $user_id = get_current_user_id();
+    $dialbunny_table = $wpdb->prefix . 'dialbunny_phone_details';
+    $dialbunny_user_id = get_current_user_id();
     // Direct database query used below – $wpdb->prepare() is always used to prevent SQL injection.
-    $saveData = $wpdb->get_results($wpdb->prepare("SELECT * FROM {$wpdb->prefix}dialbunny_phone_details WHERE user = %d LIMIT 1", $user_id)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
-    $json_data;
-    if (isset($saveData[0]->business_hours)) { $json_data = json_decode($saveData[0]->business_hours); }
+    $dialbunny_saveData = $wpdb->get_results($wpdb->prepare("SELECT * FROM {$wpdb->prefix}dialbunny_phone_details WHERE user = %d LIMIT 1", $dialbunny_user_id)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+    $dialbunny_json_data;
+    if (isset($dialbunny_saveData[0]->business_hours)) { $dialbunny_json_data = json_decode($dialbunny_saveData[0]->business_hours); }
     ?>
     <?php if (isset($_GET['updated'])) { echo wp_kses_post(dialbunny_main_success("Saved Successfuly", "You have successfully updated your timetable settings.")); }  ?>
@@ -90 +90 @@
                     <div class="row mb-6">
                       <label class="col-lg-3 col-form-label fw-semibold fs-6">Sunday </label> <?php
-                      if (isset($json_data->sunday_status) && $json_data->sunday_status == 1)
+                      if (isset($dialbunny_json_data->sunday_status) && $dialbunny_json_data->sunday_status == 1)
                       {
                         echo '<div class="col-lg-1 col-form-label"><button id="sunday" type="button" onclick="changeStatus(this.id);" class="badge badge-success border-0">Open</button></div>';
                         echo '<input id="sunday_status" type="hidden" name="sunday_status" value="1"></input>';
                       }
-                      else if (isset($json_data->sunday_status) && $json_data->sunday_status == 0)
+                      else if (isset($dialbunny_json_data->sunday_status) && $dialbunny_json_data->sunday_status == 0)
                       {
                         echo '<div class="col-lg-1 col-form-label"><button id="sunday" type="button" onclick="changeStatus(this.id);" class="badge badge-danger border-0">Closed</button></div>';
@@ -108 +108 @@
                         <div class="row">
                           <div class="col-lg-6 fv-row">
-                            <input id="sunday1" <?php if (isset($json_data->sunday_status) && $json_data->sunday_status == 0) { echo 'readonly'; } ?> type="time" name="sunday1" class="form-control form-control-lg form-control-solid mb-3 mb-lg-0" placeholder="Start Time" value="<?php if (isset($json_data->sunday1)) { echo esc_html($json_data->sunday1); } ?>" />
-                          </div>
-                          <div class="col-lg-6 fv-row">
-                            <input id="sunday2" <?php if (isset($json_data->sunday_status) && $json_data->sunday_status == 0) { echo 'readonly'; } ?> type="time" name="sunday2" class="form-control form-control-lg form-control-solid" placeholder="End Time" value="<?php if (isset($json_data->sunday2)) { echo esc_html($json_data->sunday2); } ?>" />
+                            <input id="sunday1" <?php if (isset($dialbunny_json_data->sunday_status) && $dialbunny_json_data->sunday_status == 0) { echo 'readonly'; } ?> type="time" name="sunday1" class="form-control form-control-lg form-control-solid mb-3 mb-lg-0" placeholder="Start Time" value="<?php if (isset($dialbunny_json_data->sunday1)) { echo esc_html($dialbunny_json_data->sunday1); } ?>" />
+                          </div>
+                          <div class="col-lg-6 fv-row">
+                            <input id="sunday2" <?php if (isset($dialbunny_json_data->sunday_status) && $dialbunny_json_data->sunday_status == 0) { echo 'readonly'; } ?> type="time" name="sunday2" class="form-control form-control-lg form-control-solid" placeholder="End Time" value="<?php if (isset($dialbunny_json_data->sunday2)) { echo esc_html($dialbunny_json_data->sunday2); } ?>" />
                           </div>
                         </div>
@@ -119 +119 @@
                     <div class="row mb-6">
                       <label class="col-lg-3 col-form-label fw-semibold fs-6">Monday</label> <?php
-                      if (isset($json_data->monday_status) && $json_data->monday_status == 1)
+                      if (isset($dialbunny_json_data->monday_status) && $dialbunny_json_data->monday_status == 1)
                       {
                         echo '<div class="col-lg-1 col-form-label"><button id="monday" type="button" onclick="changeStatus(this.id);" class="badge badge-success border-0">Open</button></div>';
                         echo '<input id="monday_status" type="hidden" name="monday_status" value="1"></input>';
                       }
-                      else if (isset($json_data->monday_status) && $json_data->monday_status == 0)
+                      else if (isset($dialbunny_json_data->monday_status) && $dialbunny_json_data->monday_status == 0)
                       {
                         echo '<div class="col-lg-1 col-form-label"><button id="monday" type="button" onclick="changeStatus(this.id);" class="badge badge-danger border-0">Closed</button></div>';
@@ -137 +137 @@
                         <div class="row">
                           <div class="col-lg-6 fv-row">
-                            <input id="monday1" <?php if (isset($json_data->monday_status) && $json_data->monday_status == 0) { echo 'readonly'; } ?> type="time" name="monday1" class="form-control form-control-lg form-control-solid mb-3 mb-lg-0" placeholder="Start Time" value="<?php if (isset($json_data->monday1)) { echo esc_html($json_data->monday1); } ?>" />
-                          </div>
-                          <div class="col-lg-6 fv-row">
-                            <input id="monday2" <?php if (isset($json_data->monday_status) && $json_data->monday_status == 0) { echo 'readonly'; } ?> type="time" name="monday2" class="form-control form-control-lg form-control-solid" placeholder="End Time" value="<?php if (isset($json_data->monday2)) { echo esc_html($json_data->monday2); } ?>" />
+                            <input id="monday1" <?php if (isset($dialbunny_json_data->monday_status) && $dialbunny_json_data->monday_status == 0) { echo 'readonly'; } ?> type="time" name="monday1" class="form-control form-control-lg form-control-solid mb-3 mb-lg-0" placeholder="Start Time" value="<?php if (isset($dialbunny_json_data->monday1)) { echo esc_html($dialbunny_json_data->monday1); } ?>" />
+                          </div>
+                          <div class="col-lg-6 fv-row">
+                            <input id="monday2" <?php if (isset($dialbunny_json_data->monday_status) && $dialbunny_json_data->monday_status == 0) { echo 'readonly'; } ?> type="time" name="monday2" class="form-control form-control-lg form-control-solid" placeholder="End Time" value="<?php if (isset($dialbunny_json_data->monday2)) { echo esc_html($dialbunny_json_data->monday2); } ?>" />
                           </div>
                         </div>
@@ -147 +147 @@
                     <div class="row mb-6">
                       <label class="col-lg-3 col-form-label fw-semibold fs-6">Tuesday</label> <?php
-                      if (isset($json_data->tuesday_status) && $json_data->tuesday_status == 1)
+                      if (isset($dialbunny_json_data->tuesday_status) && $dialbunny_json_data->tuesday_status == 1)
                       {
                         echo '<div class="col-lg-1 col-form-label"><button id="tuesday" type="button" onclick="changeStatus(this.id);" class="badge badge-success border-0">Open</button></div>';
                         echo '<input id="tuesday_status" type="hidden" name="tuesday_status" value="1"></input>';
                       }
-                      else if (isset($json_data->tuesday_status) && $json_data->tuesday_status == 0)
+                      else if (isset($dialbunny_json_data->tuesday_status) && $dialbunny_json_data->tuesday_status == 0)
                       {
                         echo '<div class="col-lg-1 col-form-label"><button id="tuesday" type="button" onclick="changeStatus(this.id);" class="badge badge-danger border-0">Closed</button></div>';
@@ -165 +165 @@
                         <div class="row">
                           <div class="col-lg-6 fv-row">
-                            <input id="tuesday1" <?php if (isset($json_data->tuesday_status) && $json_data->tuesday_status == 0) { echo 'readonly'; } ?> type="time" name="tuesday1" class="form-control form-control-lg form-control-solid mb-3 mb-lg-0" placeholder="Start Time" value="<?php if (isset($json_data->tuesday1)) { echo esc_html($json_data->tuesday1); } ?>" />
-                          </div>
-                          <div class="col-lg-6 fv-row">
-                            <input id="tuesday2" <?php if (isset($json_data->tuesday_status) && $json_data->tuesday_status == 0) { echo 'readonly'; } ?> type="time" name="tuesday2" class="form-control form-control-lg form-control-solid" placeholder="End Time" value="<?php if (isset($json_data->tuesday2)) { echo esc_html($json_data->tuesday2); } ?>" />
+                            <input id="tuesday1" <?php if (isset($dialbunny_json_data->tuesday_status) && $dialbunny_json_data->tuesday_status == 0) { echo 'readonly'; } ?> type="time" name="tuesday1" class="form-control form-control-lg form-control-solid mb-3 mb-lg-0" placeholder="Start Time" value="<?php if (isset($dialbunny_json_data->tuesday1)) { echo esc_html($dialbunny_json_data->tuesday1); } ?>" />
+                          </div>
+                          <div class="col-lg-6 fv-row">
+                            <input id="tuesday2" <?php if (isset($dialbunny_json_data->tuesday_status) && $dialbunny_json_data->tuesday_status == 0) { echo 'readonly'; } ?> type="time" name="tuesday2" class="form-control form-control-lg form-control-solid" placeholder="End Time" value="<?php if (isset($dialbunny_json_data->tuesday2)) { echo esc_html($dialbunny_json_data->tuesday2); } ?>" />
                           </div>
                         </div>
@@ -175 +175 @@
                     <div class="row mb-6">
                       <label class="col-lg-3 col-form-label fw-semibold fs-6">Wednesday</label> <?php
-                      if (isset($json_data->wednesday_status) && $json_data->wednesday_status == 1)
+                      if (isset($dialbunny_json_data->wednesday_status) && $dialbunny_json_data->wednesday_status == 1)
                       {
                         echo '<div class="col-lg-1 col-form-label"><button id="wednesday" type="button" onclick="changeStatus(this.id);" class="badge badge-success border-0">Open</button></div>';
                         echo '<input id="wednesday_status" type="hidden" name="wednesday_status" value="1"></input>';
                       }
-                      else if (isset($json_data->wednesday_status) && $json_data->wednesday_status == 0)
+                      else if (isset($dialbunny_json_data->wednesday_status) && $dialbunny_json_data->wednesday_status == 0)
                       {
                         echo '<div class="col-lg-1 col-form-label"><button id="wednesday" type="button" onclick="changeStatus(this.id);" class="badge badge-danger border-0">Closed</button></div>';
@@ -193 +193 @@
                         <div class="row">
                           <div class="col-lg-6 fv-row">
-                            <input id="wednesday1" <?php if (isset($json_data->wednesday_status) && $json_data->wednesday_status == 0) { echo 'readonly'; } ?> type="time" name="wednesday1" class="form-control form-control-lg form-control-solid mb-3 mb-lg-0" placeholder="Start Time" value="<?php if (isset($json_data->wednesday1)) { echo esc_html($json_data->wednesday1); } ?>" />
-                          </div>
-                          <div class="col-lg-6 fv-row">
-                            <input id="wednesday2" <?php if (isset($json_data->wednesday_status) && $json_data->wednesday_status == 0) { echo 'readonly'; } ?> type="time" name="wednesday2" class="form-control form-control-lg form-control-solid" placeholder="End Time" value="<?php if (isset($json_data->wednesday2)) { echo esc_html($json_data->wednesday2); } ?>" />
+                            <input id="wednesday1" <?php if (isset($dialbunny_json_data->wednesday_status) && $dialbunny_json_data->wednesday_status == 0) { echo 'readonly'; } ?> type="time" name="wednesday1" class="form-control form-control-lg form-control-solid mb-3 mb-lg-0" placeholder="Start Time" value="<?php if (isset($dialbunny_json_data->wednesday1)) { echo esc_html($dialbunny_json_data->wednesday1); } ?>" />
+                          </div>
+                          <div class="col-lg-6 fv-row">
+                            <input id="wednesday2" <?php if (isset($dialbunny_json_data->wednesday_status) && $dialbunny_json_data->wednesday_status == 0) { echo 'readonly'; } ?> type="time" name="wednesday2" class="form-control form-control-lg form-control-solid" placeholder="End Time" value="<?php if (isset($dialbunny_json_data->wednesday2)) { echo esc_html($dialbunny_json_data->wednesday2); } ?>" />
                           </div>
                         </div>
@@ -203 +203 @@
                     <div class="row mb-6">
                       <label class="col-lg-3 col-form-label fw-semibold fs-6">Thursday</label> <?php
-                      if (isset($json_data->thursday_status) && $json_data->thursday_status == 1)
+                      if (isset($dialbunny_json_data->thursday_status) && $dialbunny_json_data->thursday_status == 1)
                       {
                         echo '<div class="col-lg-1 col-form-label"><button id="thursday" type="button" onclick="changeStatus(this.id);" class="badge badge-success border-0">Open</button></div>';
                         echo '<input id="thursday_status" type="hidden" name="thursday_status" value="1"></input>';
                       }
-                      else if (isset($json_data->thursday_status) && $json_data->thursday_status == 0)
+                      else if (isset($dialbunny_json_data->thursday_status) && $dialbunny_json_data->thursday_status == 0)
                       {
                         echo '<div class="col-lg-1 col-form-label"><button id="thursday" type="button" onclick="changeStatus(this.id);" class="badge badge-danger border-0">Closed</button></div>';
@@ -221 +221 @@
                         <div class="row">
                           <div class="col-lg-6 fv-row">
-                            <input id="thursday1" <?php if (isset($json_data->thursday_status) && $json_data->thursday_status == 0) { echo 'readonly'; } ?> type="time" name="thursday1" class="form-control form-control-lg form-control-solid mb-3 mb-lg-0" placeholder="Start Time" value="<?php if (isset($json_data->thursday1)) { echo esc_html($json_data->thursday1); } ?>" />
-                          </div>
-                          <div class="col-lg-6 fv-row">
-                            <input id="thursday2" <?php if (isset($json_data->thursday_status) && $json_data->thursday_status == 0) { echo 'readonly'; } ?> type="time" name="thursday2" class="form-control form-control-lg form-control-solid" placeholder="End Time" value="<?php if (isset($json_data->thursday2)) { echo esc_html($json_data->thursday2); } ?>" />
+                            <input id="thursday1" <?php if (isset($dialbunny_json_data->thursday_status) && $dialbunny_json_data->thursday_status == 0) { echo 'readonly'; } ?> type="time" name="thursday1" class="form-control form-control-lg form-control-solid mb-3 mb-lg-0" placeholder="Start Time" value="<?php if (isset($dialbunny_json_data->thursday1)) { echo esc_html($dialbunny_json_data->thursday1); } ?>" />
+                          </div>
+                          <div class="col-lg-6 fv-row">
+                            <input id="thursday2" <?php if (isset($dialbunny_json_data->thursday_status) && $dialbunny_json_data->thursday_status == 0) { echo 'readonly'; } ?> type="time" name="thursday2" class="form-control form-control-lg form-control-solid" placeholder="End Time" value="<?php if (isset($dialbunny_json_data->thursday2)) { echo esc_html($dialbunny_json_data->thursday2); } ?>" />
                           </div>
                         </div>
@@ -231 +231 @@
                     <div class="row mb-6">
                       <label class="col-lg-3 col-form-label fw-semibold fs-6">Friday</label> <?php
-                      if (isset($json_data->friday_status) && $json_data->friday_status == 1)
+                      if (isset($dialbunny_json_data->friday_status) && $dialbunny_json_data->friday_status == 1)
                       {
                         echo '<div class="col-lg-1 col-form-label"><button id="friday" type="button" onclick="changeStatus(this.id);" class="badge badge-success border-0">Open</button></div>';
                         echo '<input id="friday_status" type="hidden" name="friday_status" value="1"></input>';
                       }
-                      else if (isset($json_data->friday_status) && $json_data->friday_status == 0)
+                      else if (isset($dialbunny_json_data->friday_status) && $dialbunny_json_data->friday_status == 0)
                       {
                         echo '<div class="col-lg-1 col-form-label"><button id="friday" type="button" onclick="changeStatus(this.id);" class="badge badge-danger border-0">Closed</button></div>';
@@ -249 +249 @@
                         <div class="row">
                           <div class="col-lg-6 fv-row">
-                            <input id="friday1" <?php if (isset($json_data->friday_status) && $json_data->friday_status == 0) { echo 'readonly'; } ?> type="time" name="friday1" class="form-control form-control-lg form-control-solid mb-3 mb-lg-0" placeholder="Start Time" value="<?php if (isset($json_data->friday1)) { echo esc_html($json_data->friday1); } ?>" />
-                          </div>
-                          <div class="col-lg-6 fv-row">
-                            <input id="friday2" <?php if (isset($json_data->friday_status) && $json_data->friday_status == 0) { echo 'readonly'; } ?> type="time" name="friday2" class="form-control form-control-lg form-control-solid" placeholder="End Time" value="<?php if (isset($json_data->friday2)) { echo esc_html($json_data->friday2); } ?>" />
+                            <input id="friday1" <?php if (isset($dialbunny_json_data->friday_status) && $dialbunny_json_data->friday_status == 0) { echo 'readonly'; } ?> type="time" name="friday1" class="form-control form-control-lg form-control-solid mb-3 mb-lg-0" placeholder="Start Time" value="<?php if (isset($dialbunny_json_data->friday1)) { echo esc_html($dialbunny_json_data->friday1); } ?>" />
+                          </div>
+                          <div class="col-lg-6 fv-row">
+                            <input id="friday2" <?php if (isset($dialbunny_json_data->friday_status) && $dialbunny_json_data->friday_status == 0) { echo 'readonly'; } ?> type="time" name="friday2" class="form-control form-control-lg form-control-solid" placeholder="End Time" value="<?php if (isset($dialbunny_json_data->friday2)) { echo esc_html($dialbunny_json_data->friday2); } ?>" />
                           </div>
                         </div>
@@ -260 +260 @@
                     <div class="row">
                       <label class="col-lg-3 col-form-label fw-semibold fs-6">Saturday</label> <?php
-                      if (isset($json_data->saturday_status) && $json_data->saturday_status == 1)
+                      if (isset($dialbunny_json_data->saturday_status) && $dialbunny_json_data->saturday_status == 1)
                       {
                         echo '<div class="col-lg-1 col-form-label"><button id="saturday" type="button" onclick="changeStatus(this.id);" class="badge badge-success border-0">Open</button></div>';
                         echo '<input id="saturday_status" type="hidden" name="saturday_status" value="1"></input>';
                       }
-                      else if (isset($json_data->saturday_status) && $json_data->saturday_status == 0)
+                      else if (isset($dialbunny_json_data->saturday_status) && $dialbunny_json_data->saturday_status == 0)
                       {
                         echo '<div class="col-lg-1 col-form-label"><button id="saturday" type="button" onclick="changeStatus(this.id);" class="badge badge-danger border-0">Closed</button></div>';
@@ -278 +278 @@
                         <div class="row">
                           <div class="col-lg-6 fv-row">
-                            <input id="saturday1" <?php if (isset($json_data->saturday_status) && $json_data->saturday_status == 0) { echo 'readonly'; } ?> type="time" name="saturday1" class="form-control form-control-lg form-control-solid mb-3 mb-lg-0" placeholder="Start Time" value="<?php if (isset($json_data->saturday1)) { echo esc_html($json_data->saturday1); } ?>" />
-                          </div>
-                          <div class="col-lg-6 fv-row">
-                            <input id="saturday2" <?php if (isset($json_data->saturday_status) && $json_data->saturday_status == 0) { echo 'readonly'; } ?> type="time" name="saturday2" class="form-control form-control-lg form-control-solid" placeholder="End Time" value="<?php if (isset($json_data->saturday2)) { echo esc_html($json_data->saturday2); } ?>" />
+                            <input id="saturday1" <?php if (isset($dialbunny_json_data->saturday_status) && $dialbunny_json_data->saturday_status == 0) { echo 'readonly'; } ?> type="time" name="saturday1" class="form-control form-control-lg form-control-solid mb-3 mb-lg-0" placeholder="Start Time" value="<?php if (isset($dialbunny_json_data->saturday1)) { echo esc_html($dialbunny_json_data->saturday1); } ?>" />
+                          </div>
+                          <div class="col-lg-6 fv-row">
+                            <input id="saturday2" <?php if (isset($dialbunny_json_data->saturday_status) && $dialbunny_json_data->saturday_status == 0) { echo 'readonly'; } ?> type="time" name="saturday2" class="form-control form-control-lg form-control-solid" placeholder="End Time" value="<?php if (isset($dialbunny_json_data->saturday2)) { echo esc_html($dialbunny_json_data->saturday2); } ?>" />
                           </div>
                         </div>
@@ -309 +309 @@
                             <?php
                             // Escaped inside the dialbunny_timezone() function
-                            if (isset($saveData[0]->timezone)) { echo dialbunny_timezone($saveData[0]->timezone, 'timezone'); } else { echo dialbunny_timezone('none', 'timezone'); } // phpcs:ignore WordPress.Security.EscapeOutput ?>
+                            if (isset($dialbunny_saveData[0]->timezone)) { echo dialbunny_timezone($dialbunny_saveData[0]->timezone, 'timezone'); } else { echo dialbunny_timezone('none', 'timezone'); } // phpcs:ignore WordPress.Security.EscapeOutput ?>
                           </div>
                         </div>

dialbunny/trunk/lib/views/dashboard/choose.php

@@ -1 +1 @@
 <?php if ( ! defined( 'ABSPATH' ) ) exit; ?>
-<?php if ( !isset($_GET['user_nonce']) || !wp_verify_nonce(sanitize_text_field(wp_unslash($_GET['user_nonce'])), 'DialBunny') ) { echo 'Sorry, we couldn’t verify your request due to a security check failure.'; return; } ?>
+<?php if ( !isset($_GET['user_nonce']) || !wp_verify_nonce(sanitize_text_field(wp_unslash($_GET['user_nonce'])), 'DialBunny') ) { echo 'Sorry, we couldn\'t verify your request due to a security check failure.'; return; } ?>
 <div class="content d-flex flex-column flex-column-fluid" id="content">
   <div class="container-xxl" id="content_container">
     <?php
     use Twilio\Rest\Client;
-    $keys = new DialBunnyKeysClass();
-    $sid = $keys->TWILIO_SID();
-    $token = $keys->TWILIO_TOKEN();
-    $client = null;
-    $data = [];
-    $errorMessage = false;
-    if (!empty($sid) && !empty($token)) {
-        $client = new Client($sid, $token);
+    $dialbunny_keys = new DialBunnyKeysClass();
+    $dialbunny_sid = $dialbunny_keys->TWILIO_SID();
+    $dialbunny_token = $dialbunny_keys->TWILIO_TOKEN();
+    $dialbunny_client = null;
+    $dialbunny_data = [];
+    $dialbunny_errorMessage = false;
+    $dialbunny_address_items = $wpdb->get_results($wpdb->prepare("SELECT * FROM {$wpdb->prefix}dialbunny_addresses WHERE user = %d limit 50", wp_get_current_user()->ID)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+    if (!empty($dialbunny_sid) && !empty($dialbunny_token)) {
+        $dialbunny_client = new Client($dialbunny_sid, $dialbunny_token);
     }
-    $searchData = [
-        //'excludeAllAddressRequired' => false,
-        //'smsEnabled' => true,
-        'voiceEnabled' => true,
-    ];
+    // Address Requirements Filter
+    $dialbunny_searchData = [];
+    if ( isset( $_GET['requirements'] ) ) {
+    $req = sanitize_text_field( wp_unslash( $_GET['requirements'] ) );
+    switch ( $req ) {
+        case 'none':
+            // Only show numbers that require NO address at all
+            $dialbunny_searchData['excludeAllAddressRequired'] = true;
+            $dialbunny_searchData['excludeLocalAddressRequired'] = false;
+            $dialbunny_searchData['excludeForeignAddressRequired'] = false;
+            break;
+
+        case 'local':
+            // Hide numbers that require a LOCAL address (most restrictive)
+            $dialbunny_searchData['excludeLocalAddressRequired'] = true;
+            break;
+
+        case 'foreign':
+            // Hide numbers that require a FOREIGN address
+            $dialbunny_searchData['excludeForeignAddressRequired'] = true;
+            break;
+
+        case 'any':
+        default:
+            break;
+    }
+}
+if ( isset( $_GET['beta'] ) && sanitize_text_field( wp_unslash( $_GET['beta'] ) ) === 'none' ) {
+    $dialbunny_searchData['beta'] = false; // Exclude beta numbers
+}
     if (!empty($_GET['areacode'])) {
-        $searchData['areaCode'] = sanitize_text_field(wp_unslash($_GET['areacode']));
+        $dialbunny_searchData['areaCode'] = sanitize_text_field(wp_unslash($_GET['areacode']));
     }
 
     if (!empty($_GET['contains'])) {
-        $searchData['contains'] = sanitize_text_field(wp_unslash($_GET['contains']));
+        $dialbunny_searchData['contains'] = sanitize_text_field(wp_unslash($_GET['contains']));
     }
-    if (!empty($_GET['countrycode']) && !empty($_GET['type']) && $client) {
-        $countryCode = sanitize_text_field(wp_unslash($_GET['countrycode']));
+    if (!empty($_GET['countrycode']) && !empty($_GET['type']) && $dialbunny_client) {
+        $dialbunny_countryCode = sanitize_text_field(wp_unslash($_GET['countrycode']));
         $type = sanitize_text_field(wp_unslash($_GET['type']));
-
         try {
             switch ($type) {
+              case 'all':
+                    $dialbunny_local_data = $dialbunny_client->availablePhoneNumbers($dialbunny_countryCode)->local->read($dialbunny_searchData, 5);
+                    $dialbunny_tollFree_data = $dialbunny_client->availablePhoneNumbers($dialbunny_countryCode)->tollFree->read($dialbunny_searchData, 5);
+                    $dialbunny_mobile_data = $dialbunny_client->availablePhoneNumbers($dialbunny_countryCode)->mobile->read($dialbunny_searchData, 5);
+                    break;
                 case 'local':
-                    $data = $client->availablePhoneNumbers($countryCode)->local->read($searchData, 15);
+                    $dialbunny_local_data = $dialbunny_client->availablePhoneNumbers($dialbunny_countryCode)->local->read($dialbunny_searchData, 15);
                     break;
                 case 'TollFree':
-                    $data = $client->availablePhoneNumbers($countryCode)->tollFree->read($searchData, 15);
+                    $dialbunny_tollFree_data = $dialbunny_client->availablePhoneNumbers($dialbunny_countryCode)->tollFree->read($dialbunny_searchData, 15);
                     break;
                 case 'mobile':
-                    $data = $client->availablePhoneNumbers($countryCode)->mobile->read($searchData, 15);
+                    $dialbunny_mobile_data = $dialbunny_client->availablePhoneNumbers($dialbunny_countryCode)->mobile->read($dialbunny_searchData, 15);
                     break;
             }
         } catch (Exception $e) {
-            $errorMessage = true;
+            $dialbunny_errorMessage = true;
         }
     }
     ?>
+    <?php if (isset($_GET['addressrequired'])) { echo wp_kses_post(dialbunny_main_danger("Address & Bundle Required", "A valid address and bundle is required to get the requested phone number. Go to Twilio and create a local address and bundle and then add the SID's when requesting the phone number again.")); }  ?>
     <?php if (isset($_GET['erroraddingnumber'])) { echo wp_kses_post(dialbunny_main_danger("Phone Number Could Not Be Added", "An error has occurred and we could not process your request.")); }  ?>
-    <?php if (!isset($client)) { echo wp_kses_post(dialbunny_main_danger("Twilio API Keys Not Setup", "Missing or incorrect twilio api credentials.")); }  ?>
+    <?php if (!isset($dialbunny_client)) { echo wp_kses_post(dialbunny_main_danger("Twilio API Keys Not Setup", "Missing or incorrect twilio api credentials.")); }  ?>
     <form action="<?php echo esc_url( admin_url('admin-post.php') ); ?>" method="post" class="form">
       <?php wp_nonce_field( 'DialBunny', 'user_nonce' ); ?>
@@ -56 +87 @@
           <div class="d-flex align-items-center">
             <div class="position-relative w-md-400px me-2">
-              <select name="countrycode" aria-label="Select a Country Code" data-placeholder="Select A Country Code" class="form-select form-select-solid form-select-lg fw-semibold mb-0 mb-lg-0">
-                <option data-countryCode="CA" <?php if (isset($_GET['countrycode']) && sanitize_text_field(wp_unslash($_GET['countrycode'])) == 'CA') { echo 'selected'; } ?> value="CA">Canada</option>
-                <option data-countryCode="US" <?php if ( isset($_GET['countrycode']) && sanitize_text_field(wp_unslash($_GET['countrycode'])) == 'US' ) { echo 'selected'; } ?> value="US" <?php if (!isset($_GET['countrycode'])) { echo 'selected'; } ?>>United States </option>
+              <select name="countrycode" data-placeholder="Select A Country Code" class="form-select form-select-solid form-select-lg fw-semibold mb-0 mb-lg-0">
+                <?php
+                $dialbunny_selected_country = isset($_GET['countrycode']) ? sanitize_text_field(wp_unslash($_GET['countrycode'])) : 'US';
+                foreach ($dialbunny_countries_list as $dialbunny_code => $dialbunny_label) {
+                    $dialbunny_selected = selected($dialbunny_selected_country, $dialbunny_code, false);
+                    echo '<option value="' . esc_attr($dialbunny_code) . '" ' . esc_html($dialbunny_selected) . '>' . esc_html($dialbunny_label) . '</option>';
+                }
+                ?>
               </select>
             </div>
             <div class="d-flex align-items-center">
-              <button type="submit" class="btn btn-primary me-5">Search</button>
+              <button type="submit" onclick="this.innerHTML='<span class=&quot;spinner-border spinner-border-sm&quot;></span> Searching...'; this.disabled=true; this.form.submit();" class="btn btn-primary me-5">Search</button>
             </div>
           </div>
@@ -68 +104 @@
             <div class="separator separator-dashed mt-9 mb-6"></div>
             <div class="row g-8" data-select2-id="select2-data-123-mnoi">
-              <div class="col-lg-4">
+              <div class="col-lg-3">
                 <label class="fs-6 form-label fw-bold text-gray-900">
                   <span class="">Area Code</span>
@@ -77 +113 @@
                   </span>
                 </label>
-                <input type="number" value="<?php if (isset($_GET['areacode'])) { echo esc_html(sanitize_text_field(wp_unslash($_GET['areacode']))); } ?>" class="form-control form-control form-control-solid" name="areacode">
-              </div>
-              <div class="col-lg-4">
+                <input type="number" value="<?php if (isset($_GET['areacode'])) { echo esc_html(sanitize_text_field(wp_unslash($_GET['areacode']))); } ?>" class="form-control form-control form-control-solid" name="areacode" placeholder="Area Code">
+              </div>
+              <div class="col-lg-3">
                 <label class="fs-6 form-label fw-bold text-gray-900">
                   <span class="">Contains</span>
@@ -88 +124 @@
                   </span>
                 </label>
-                <input type="text" value="<?php if (isset($_GET['contains'])) { echo esc_html(sanitize_text_field(wp_unslash($_GET['contains']))); } ?>" class="form-control form-control form-control-solid" name="contains">
-              </div>
-              <div class="col-lg-4">
+                <input type="text" value="<?php if (isset($_GET['contains'])) { echo esc_html(sanitize_text_field(wp_unslash($_GET['contains']))); } ?>" class="form-control form-control form-control-solid" name="contains" placeholder="Contains">
+              </div>
+              <div class="col-lg-6">
                 <label class="fs-6 form-label fw-bold text-gray-900">
                   <span class="">Type</span>
@@ -101 +137 @@
                 <div class="nav-group nav-group-fluid">
                   <label>
-                    <input type="radio" class="btn-check" name="type" value="local" <?php if (!isset($_GET['type']) || isset($_GET['type']) && sanitize_text_field(wp_unslash($_GET['type'])) == 'local' ) { echo 'checked="checked"'; } ?>>
+                    <input type="radio" class="btn-check" name="type" value="all" <?php if (!isset($_GET['type']) || isset($_GET['type']) && sanitize_text_field(wp_unslash($_GET['type'])) == 'all' ) { echo 'checked="checked"'; } ?>>
+                    <span class="btn btn-sm btn-color-muted btn-active btn-active-primary fw-bold px-4">All</span>
+                  </label>
+                  <label>
+                    <input type="radio" class="btn-check" name="type" value="local" <?php if (isset($_GET['type']) && sanitize_text_field(wp_unslash($_GET['type'])) == 'local' ) { echo 'checked="checked"'; } ?>>
                     <span class="btn btn-sm btn-color-muted btn-active btn-active-primary fw-bold px-4">Local</span>
                   </label>
@@ -115 +155 @@
               </div>
             </div>
+            <div class="row g-8 mt-3">
+              <div class="col-lg-3">
+                <label class="fs-6 form-label fw-bold text-gray-900">
+                  <span class="">Requirements</span>
+                  <span class="ms-1" data-bs-toggle="tooltip" title="Some local authorities require you to provide an address before purchasing a phone number.">
+                    <i class="fs-6">
+                      <span class="fas fa-info-circle"></span>
+                    </i>
+                  </span>
+                </label>
+                <select name="addressrequirements" aria-label="Select" data-placeholder="Select" class="form-select form-select-solid form-select-lg fw-semibold mb-0 mb-lg-0">
+                  <option name="addressrequirements" value="any" <?php if (!isset($_GET['requirements']) || isset($_GET['requirements']) && sanitize_text_field(wp_unslash($_GET['requirements'])) == 'any' ) { echo 'selected'; } ?>>Any</option>
+                  <option name="addressrequirements" value="none" <?php if (isset($_GET['requirements']) && sanitize_text_field(wp_unslash($_GET['requirements'])) == 'none' ) { echo 'selected'; } ?>>None</option>
+                  <option name="addressrequirements" value="local" <?php if (isset($_GET['requirements']) && sanitize_text_field(wp_unslash($_GET['requirements'])) == 'local' ) { echo 'selected'; } ?>>Exclude Local Address Requirements</option>
+                  <option name="addressrequirements" value="foreign" <?php if (isset($_GET['requirements']) && sanitize_text_field(wp_unslash($_GET['requirements'])) == 'foreign' ) { echo 'selected'; } ?>>Exclude Foreign Address Requirements</option>
+                </select>
+              </div>
+              <div class="col-lg-3">
+                <label class="fs-6 form-label fw-bold text-gray-900">
+                  <span class="">Beta Numbers</span>
+                  <span class="ms-1" data-bs-toggle="tooltip" title="These are newly released phone numbers on Twilios platform.">
+                    <i class="fs-6">
+                      <span class="fas fa-info-circle"></span>
+                    </i>
+                  </span>
+                </label>
+                <select name="beta" aria-label="Select" data-placeholder="Select" class="form-select form-select-solid form-select-lg fw-semibold mb-0 mb-lg-0">
+                  <option name="beta" value="any" <?php if (!isset($_GET['beta']) || isset($_GET['beta']) && sanitize_text_field(wp_unslash($_GET['beta'])) == 'any' ) { echo 'selected'; } ?>>Any</option>
+                  <option name="beta" value="none" <?php if (isset($_GET['beta']) && sanitize_text_field(wp_unslash($_GET['beta'])) == 'none' ) { echo 'selected'; } ?>>Exclude Beta Numbers</option>
+                </select>
+              </div>
+              <div class="col-lg-6">
+                <label class="fs-6 form-label fw-bold text-gray-900">
+                  <span class="">Capabilities</span>
+                  <span class="ms-1" data-bs-toggle="tooltip" title="These are the capabilities of searchable phone numbers.">
+                    <i class="fs-6">
+                      <span class="fas fa-info-circle"></span>
+                    </i>
+                  </span>
+                </label>
+                <div class="nav-group nav-group-fluid p-4">
+                      <input class="form-check-input" type="checkbox" checked><label class="form-check-label px-3" for="drop-remove">Voice</label></input>
+                      <input class="form-check-input" type="checkbox" checked><label class="form-check-label px-3" for="drop-remove">SMS</label></input>
+                      <input class="form-check-input" type="checkbox" checked><label class="form-check-label px-3" for="drop-remove">MMS</label></input>
+                </div>
+              </div>
+            </div>
           </div>
         </div>
@@ -127 +214 @@
 
           <div class="table-responsive"> <?php
-                if (isset($_GET['countrycode']) && !empty($data))
+                if (isset($_GET['countrycode']) && (!empty($dialbunny_local_data) || !empty($dialbunny_tollFree_data) || !empty($dialbunny_mobile_data)))
                 {
                   echo '<table class="table table-hover table-rounded table-striped border border-gray-300 border-dashed gy-7 gs-7">';
@@ -135 +222 @@
                     echo '<th>Capabilities</th>';
                     echo '<th>Type</th>';
-                    echo '<th>Address Requirements</th>';
+                    echo '<th>Local Regulatory Requirements</th>';
                     echo '<th></th>';
                   echo '</tr>';
                   echo '</thead>';
                   echo '<tbody>';
-                  foreach ($data as $record)
+                  foreach ($dialbunny_local_data as $dialbunny_record)
                   {
                     echo '<tr class="align-middle">';
-                      echo '<td class="col-3">' . esc_html($record->friendlyName) . '<br>' . esc_html($record->locality) . ' ' . esc_html($record->region) . '</td>';
+                      echo '<td class="col-3">' . esc_html($dialbunny_record->friendlyName) . '<br>' . esc_html($dialbunny_record->locality) . ' ' . esc_html($dialbunny_record->region) . '</td>';
 
                       echo '<td class="col-2">';
-                      if ($record->capabilities->sms == 1) { echo '<span class="badge badge-success">SMS</span><br>'; } else { echo '<span class="badge badge-danger">SMS</span><br>'; }
-                      if ($record->capabilities->voice == 1) { echo '<span class="badge badge-success">VOICE</span>'; } else { echo '<span class="badge badge-danger">VOICE</span>'; }
-                      echo '</td>';
-                      if (sanitize_text_field(wp_unslash($_GET['type'])) == 'local') { echo '<td class="col-2">local</td>'; }
-                      else if (sanitize_text_field(wp_unslash($_GET['type'])) == 'TollFree') { echo '<td class="col-2">TollFree</td>'; }
-                      else if (sanitize_text_field(wp_unslash($_GET['type'])) == 'mobile') { echo '<td class="col-2">mobile</td>'; }
-                      echo '<td class="col-2"><span class="badge badge-dark">'. esc_html($record->addressRequirements) .'</span></td>';
-                      echo '<td class="col-2"><button type="button" onclick="document.getElementById(\'requestedNumber\').value = \'' . esc_html($record->phoneNumber) . '\'; document.getElementById(\'requestedNumberUI\').innerHTML = \'' . esc_html($record->phoneNumber) . '\';" class="btn border btn-sm btn-active-light-primary" data-bs-toggle="modal" data-bs-target="#modal_1">Get Number</button></td>';
+                      if ($dialbunny_record->capabilities->sms == 1) { echo '<span class="badge badge-success">SMS</span><br>'; } else { echo '<span class="badge badge-danger">SMS</span><br>'; }
+                      if ($dialbunny_record->capabilities->mms == 1) { echo '<span class="badge badge-success">MMS</span><br>'; } else { echo '<span class="badge badge-danger">MMS</span><br>'; }
+                      if ($dialbunny_record->capabilities->voice == 1) { echo '<span class="badge badge-success">VOICE</span>'; } else { echo '<span class="badge badge-danger">VOICE</span>'; }
+                      echo '</td>';
+                      echo '<td class="col-2">Local<br>';
+                      if ($dialbunny_record->beta == 1) { echo '<span class="badge badge-danger">Beta</span>'; }
+                      echo '</td>';
+                      echo '<td class="col-2"><span class="badge badge-dark">'. esc_html($dialbunny_record->addressRequirements) .'</span></td>';
+                      echo '<td class="col-2"><button type="button" onclick="document.getElementById(\'requestedNumber\').value = \'' . esc_html($dialbunny_record->phoneNumber) . '\'; document.getElementById(\'requestedNumberUI\').innerHTML = \'' . esc_html($dialbunny_record->phoneNumber) . '\';" class="btn border btn-sm btn-active-light-primary" data-bs-toggle="modal" data-bs-target="#modal_1">Get Number</button></td>';
+                    echo '</tr>';
+                  }
+                  foreach ($dialbunny_tollFree_data as $dialbunny_record)
+                  {
+                    echo '<tr class="align-middle">';
+                      echo '<td class="col-3">' . esc_html($dialbunny_record->friendlyName) . '<br>' . esc_html($dialbunny_record->locality) . ' ' . esc_html($dialbunny_record->region) . '</td>';
+
+                      echo '<td class="col-2">';
+                      if ($dialbunny_record->capabilities->sms == 1) { echo '<span class="badge badge-success">SMS</span><br>'; } else { echo '<span class="badge badge-danger">SMS</span><br>'; }
+                      if ($dialbunny_record->capabilities->mms == 1) { echo '<span class="badge badge-success">MMS</span><br>'; } else { echo '<span class="badge badge-danger">MMS</span><br>'; }
+                      if ($dialbunny_record->capabilities->voice == 1) { echo '<span class="badge badge-success">VOICE</span>'; } else { echo '<span class="badge badge-danger">VOICE</span>'; }
+                      echo '</td>';
+                      echo '<td class="col-2">Toll-Free<br>';
+                      if ($dialbunny_record->beta == 1) { echo '<span class="badge badge-danger">Beta</span>'; }
+                      echo '</td>';
+                      echo '<td class="col-2"><span class="badge badge-dark">'. esc_html($dialbunny_record->addressRequirements) .'</span></td>';
+                      echo '<td class="col-2"><button type="button" onclick="document.getElementById(\'requestedNumber\').value = \'' . esc_html($dialbunny_record->phoneNumber) . '\'; document.getElementById(\'requestedNumberUI\').innerHTML = \'' . esc_html($dialbunny_record->phoneNumber) . '\';" class="btn border btn-sm btn-active-light-primary" data-bs-toggle="modal" data-bs-target="#modal_1">Get Number</button></td>';
+                    echo '</tr>';
+                  }
+                  foreach ($dialbunny_mobile_data as $dialbunny_record)
+                  {
+                    echo '<tr class="align-middle">';
+                      echo '<td class="col-3">' . esc_html($dialbunny_record->friendlyName) . '<br>' . esc_html($dialbunny_record->locality) . ' ' . esc_html($dialbunny_record->region) . '</td>';
+
+                      echo '<td class="col-2">';
+                      if ($dialbunny_record->capabilities->sms == 1) { echo '<span class="badge badge-success">SMS</span><br>'; } else { echo '<span class="badge badge-danger">SMS</span><br>'; }
+                      if ($dialbunny_record->capabilities->mms == 1) { echo '<span class="badge badge-success">MMS</span><br>'; } else { echo '<span class="badge badge-danger">MMS</span><br>'; }
+                      if ($dialbunny_record->capabilities->voice == 1) { echo '<span class="badge badge-success">VOICE</span>'; } else { echo '<span class="badge badge-danger">VOICE</span>'; }
+                      echo '</td>';
+                      echo '<td class="col-2">Mobile<br>';
+                      if ($dialbunny_record->beta == 1) { echo '<span class="badge badge-danger">Beta</span>'; }
+                      echo '</td>';
+                      echo '<td class="col-2"><span class="badge badge-dark">'. esc_html($dialbunny_record->addressRequirements) .'</span></td>';
+                      echo '<td class="col-2"><button type="button" onclick="document.getElementById(\'requestedNumber\').value = \'' . esc_html($dialbunny_record->phoneNumber) . '\'; document.getElementById(\'requestedNumberUI\').innerHTML = \'' . esc_html($dialbunny_record->phoneNumber) . '\';" class="btn border btn-sm btn-active-light-primary" data-bs-toggle="modal" data-bs-target="#modal_1">Get Number</button></td>';
                     echo '</tr>';
                   }
@@ -159 +281 @@
                   echo '</table>';
                 }
-                else if (isset($_GET['countrycode']) && empty($data))
+                else if (isset($_GET['countrycode']))
                 {
                   echo '<div class="card border border-gray-300 border-dashed rounded p-6">
@@ -171 +293 @@
                                             </div>';
                 }
-                else if (!isset($_GET['countrycode']) && empty($data))
+                else if (!isset($_GET['countrycode']))
                 {
                   echo '<div class="card border border-gray-300 border-dashed rounded p-6">
@@ -189 +311 @@
   </div>
 </div>
-<div class="modal fade" tabindex="-1" id="modal_1">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header pb-0 border-0 justify-content-end">
-        <div class="btn btn-sm btn-icon btn-active-color-primary" data-bs-dismiss="modal">
-          <i class="fs-1">
-            <span class="fas fa-times"></span>
-          </i>
-        </div>
-      </div>
-      <div class="modal-body">
-        <div class="mb-13">
-          <h1 id="requestedNumberUI" class="mb-3">Get Number</h1>
-          <div class="text-muted fw-semibold fs-5">To get started, just click on "Get Number".</div>
-        </div>
-        <div class="stepper stepper-pills stepper-column d-flex flex-column flex-xl-row flex-row-fluid first" id="modal_create_app_stepper">
-          <div class="d-flex justify-content-center justify-content-xl-start flex-row-auto w-100 w-xl-300px">
-            <div class="stepper-nav ps-lg-10">
-              <div class="stepper-item pending">
-                <div class="stepper-wrapper">
-                  <div class="stepper-icon w-40px h-40px">
-                    <i class="stepper-check fs-2"></i>
-                    <span class="stepper-number">1</span>
-                  </div>
-                  <div class="stepper-label">
-                    <h3 class="stepper-title">Enjoy Your Number</h3>
-                    <div class="stepper-desc">After requesting a number, it will be added to your account allowing you to start making calls almost immediately.</div>
+
+<form action="<?php echo esc_url( admin_url('admin-post.php') ); ?>" method="post" class="form">
+<input type="hidden" name="action" value="dialbunny_request_number"></input>
+<?php wp_nonce_field( 'DialBunny', 'user_nonce' ); ?>
+  <div class="modal fade" tabindex="-1" id="modal_1">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header pb-0 border-0 justify-content-end">
+          <div class="btn btn-sm btn-icon btn-active-color-primary" data-bs-dismiss="modal">
+            <i class="fs-1">
+              <span class="fas fa-times"></span>
+            </i>
+          </div>
+        </div>
+        <div class="modal-body">
+          <div class="mb-13">
+            <h1 id="requestedNumberUI" class="mb-3">Get Number</h1>
+            <div class="text-muted fw-semibold fs-5">To get started, just click on "Get Number".</div>
+          </div>
+
+          <div class="stepper stepper-pills stepper-column d-flex flex-column flex-xl-row flex-row-fluid first mb-8">
+            <div class="d-flex justify-content-center justify-content-xl-start flex-row-auto w-100 w-xl-300px">
+              <div class="stepper-nav ps-lg-10">
+                <div class="stepper-item pending">
+                  <div class="stepper-wrapper">
+                    <div class="stepper-icon w-40px h-40px">
+                      <i class="stepper-check fs-2"></i>
+                      <span class="stepper-number">1</span>
+                    </div>
+                    <div class="stepper-label">
+                      <h3 class="stepper-title">Associated Costs</h3>
+                      <div class="stepper-desc">Twilio charges fees for each phone number which can vary depending on the country of origin. It should also be noted that your Twilio account should be funded before requesting a number.</div>
+                    </div>
                   </div>
                 </div>
@@ -221 +349 @@
             </div>
           </div>
-        </div>
-      </div>
-      <div class="modal-footer">
-              <button type="button" class="btn btn-light" data-bs-dismiss="modal">Close</button>
-              <form action="<?php echo esc_url( admin_url('admin-post.php') ); ?>" method="post" class="form">
-              <input type="hidden" name="action" value="dialbunny_request_number"></input>
-          <?php wp_nonce_field( 'DialBunny', 'user_nonce' ); ?>
-          <input type="hidden" name="number" id="requestedNumber"></input>
-          <input type="hidden" name="location" id="requestedLocation"></input>
-          <input type="hidden" name="type" id="requestedType"></input>
-          <button type='submit' class='btn btn-primary'>Get Number</button>
-        </form>
+          <div class="stepper stepper-pills stepper-column d-flex flex-column flex-xl-row flex-row-fluid first mb-8">
+            <div class="d-flex justify-content-center justify-content-xl-start flex-row-auto w-100 w-xl-300px">
+              <div class="stepper-nav ps-lg-10">
+                <div class="stepper-item pending">
+                  <div class="stepper-wrapper">
+                    <div class="stepper-icon w-40px h-40px">
+                      <i class="stepper-check fs-2"></i>
+                      <span class="stepper-number">2</span>
+                    </div>
+                    <div class="stepper-label">
+                      <h3 class="stepper-title">Regulatory Requirements</h3>
+                      <div class="stepper-desc" id="addressRequirementText">Some phone numbers have local regulatory requirements. If the phone number you chose has these requirements then add your Twilio Bundle and Address SID below. You can find and create <a target="_blank" href="https://console.twilio.com/us1/develop/phone-numbers/regulatory-compliance/addresses">addresses here</a> and <a target="_blank" href="https://console.twilio.com/us1/develop/phone-numbers/regulatory-compliance/bundles">bundles here</a></div>
+                      <input type="text" value="" class="form-control form-control form-control-solid mt-4" name="addressidentity" placeholder="Twilio Address SID">
+                      <input type="text" value="" class="form-control form-control form-control-solid mt-4" name="bundleidentity" placeholder="Twilio Bundle SID">
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="stepper stepper-pills stepper-column d-flex flex-column flex-xl-row flex-row-fluid first mb-8">
+            <div class="d-flex justify-content-center justify-content-xl-start flex-row-auto w-100 w-xl-300px">
+              <div class="stepper-nav ps-lg-10">
+                <div class="stepper-item pending">
+                  <div class="stepper-wrapper">
+                    <div class="stepper-icon w-40px h-40px">
+                      <i class="stepper-check fs-2"></i>
+                      <span class="stepper-number">3</span>
+                    </div>
+                    <div class="stepper-label">
+                      <h3 class="stepper-title">Enjoy Your Number</h3>
+                      <div class="stepper-desc">After requesting a number, it will be added to your account allowing you to start making calls almost immediately.</div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+
+        </div>
+        <div class="modal-footer">
+            <button type="button" class="btn btn-light" data-bs-dismiss="modal">Close</button>
+            <input type="hidden" name="number" id="requestedNumber"></input>
+            <input type="hidden" name="location" id="requestedLocation"></input>
+            <input type="hidden" name="type" id="requestedType"></input>
+            <button type='submit' class='btn btn-primary'>Get Number</button>
+        </div>
       </div>
     </div>
   </div>
-</div>
+</form>

dialbunny/trunk/lib/views/dashboard/contacts/contacts.php

@@ -1 +1 @@
 <?php if ( ! defined( 'ABSPATH' ) ) exit; ?>
-<?php if ( !isset($_GET['user_nonce']) || !wp_verify_nonce(sanitize_text_field(wp_unslash($_GET['user_nonce'])), 'DialBunny') ) { echo 'Sorry, we couldn’t verify your request due to a security check failure.'; return; } ?>
+<?php if ( !isset($_GET['user_nonce']) || !wp_verify_nonce(sanitize_text_field(wp_unslash($_GET['user_nonce'])), 'DialBunny') ) { echo 'Sorry, we couldn\'t verify your request due to a security check failure.'; return; } ?>
 <div class="content d-flex flex-column flex-column-fluid" id="content">
     <div class="container-xxl" id="content_container">
 
       <?php
-      $user_id = get_current_user_id();
-      $table = $wpdb->prefix . 'dialbunny_contacts';
+      $dialbunny_user_id = get_current_user_id();
+      $dialbunny_table = $wpdb->prefix . 'dialbunny_contacts';
       // Direct database query used below – $wpdb->prepare() is always used to prevent SQL injection.
-      $numberOfContacts = $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM {$wpdb->prefix}dialbunny_contacts WHERE user = %d", $user_id)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+      $dialbunny_numberOfContacts = $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM {$wpdb->prefix}dialbunny_contacts WHERE user = %d", $dialbunny_user_id)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
       // Direct database query used below – $wpdb->prepare() is always used to prevent SQL injection.
-      $numberOfBlocked = $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM {$wpdb->prefix}dialbunny_contacts WHERE user = %d AND blocked = 1", $user_id)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+      $dialbunny_numberOfBlocked = $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM {$wpdb->prefix}dialbunny_contacts WHERE user = %d AND blocked = 1", $dialbunny_user_id)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
       // Defaults
-      if ($numberOfContacts === null) { $numberOfContacts = 0; }
-      if ($numberOfBlocked === null) { $numberOfBlocked = 0; }
+      if ($dialbunny_numberOfContacts === null) { $dialbunny_numberOfContacts = 0; }
+      if ($dialbunny_numberOfBlocked === null) { $dialbunny_numberOfBlocked = 0; }
       // Pagination
-      $resultsPage = 1;
-      $limit = '12';
-      $limit_offset = 0;
-      $limit_count = 12;
+      $dialbunny_resultsPage = 1;
+      $dialbunny_limit = '12';
+      $dialbunny_limit_offset = 0;
+      $dialbunny_limit_count = 12;
       // Handle pagination
       if (isset($_GET['resultsPage']) && is_numeric($_GET['resultsPage']) && intval($_GET['resultsPage']) > 1) {
-          $resultsPage = intval($_GET['resultsPage']);
-          $limit_offset = ($resultsPage - 1) * $limit_count;
+          $dialbunny_resultsPage = intval($_GET['resultsPage']);
+          $dialbunny_limit_offset = ($dialbunny_resultsPage - 1) * $dialbunny_limit_count;
       }
       ?>
@@ -54 +54 @@
                             <span class="fas fa-user"></span>
                           </i>
-                                                    <div class="fs-4 fw-bold"><?php echo esc_html($numberOfContacts); ?></div>
+                                                    <div class="fs-4 fw-bold"><?php echo esc_html($dialbunny_numberOfContacts); ?></div>
                                                 </div>
-                                                <div class="fw-semibold fs-6 text-gray-400"><?php if (strlen($numberOfContacts) < 2) { echo 'Contact'; } else { echo 'Contacts'; } ?></div>
+                                                <div class="fw-semibold fs-6 text-gray-400"><?php if (strlen($dialbunny_numberOfContacts) < 2) { echo 'Contact'; } else { echo 'Contacts'; } ?></div>
                                             </div>
                                             <div class="border border-gray-300 border-dashed rounded min-w-125px py-3 px-4 me-6 mb-3">
@@ -63 +63 @@
                             <span class="fas fa-user"></span>
                           </i>
-                                                    <div class="fs-4 fw-bold counted"><?php echo esc_html($numberOfBlocked); ?></div>
+                                                    <div class="fs-4 fw-bold counted"><?php echo esc_html($dialbunny_numberOfBlocked); ?></div>
                                                 </div>
                                                 <div class="fw-semibold fs-6 text-gray-400">Blocked</div>
@@ -97 +97 @@
             include('new.php');
         } else {
-            $user_id = (int) wp_get_current_user()->ID;
-            $table = $wpdb->prefix . 'dialbunny_contacts';
+            $dialbunny_user_id = (int) wp_get_current_user()->ID;
+            $dialbunny_table = $wpdb->prefix . 'dialbunny_contacts';
             // Direct database query used below – $wpdb->prepare() is always used to prevent SQL injection.
-            $opened_item = $wpdb->get_results($wpdb->prepare("SELECT * FROM {$wpdb->prefix}dialbunny_contacts WHERE id = %s AND user = %d LIMIT 1", $contact, $user_id)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+            $opened_item = $wpdb->get_results($wpdb->prepare("SELECT * FROM {$wpdb->prefix}dialbunny_contacts WHERE id = %s AND user = %d LIMIT 1", $contact, $dialbunny_user_id)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
             if (!empty($opened_item)) {
                 include('view.php');

dialbunny/trunk/lib/views/dashboard/contacts/default.php

@@ -50 +50 @@
                 <tbody class="fs-6">
                   <?php
-                    $table = $wpdb->prefix . 'dialbunny_contacts';
-                    $user_id = get_current_user_id();
+                    $dialbunny_table = $wpdb->prefix . 'dialbunny_contacts';
+                    $dialbunny_user_id = get_current_user_id();
                     $search = isset($_GET['search']) ? '%' . $wpdb->esc_like(sanitize_text_field(wp_unslash($_GET['search']))) . '%' : '';
 
@@ -57 +57 @@
                     if (strlen($search) > 2) {
                         // Direct database query used below – $wpdb->prepare() is always used to prevent SQL injection.
-                        $opened_item = $wpdb->get_results($wpdb->prepare("SELECT * FROM {$wpdb->prefix}dialbunny_contacts WHERE user = %d AND name LIKE %s LIMIT 25",$user_id,$search)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+                        $dialbunny_opened_item = $wpdb->get_results($wpdb->prepare("SELECT * FROM {$wpdb->prefix}dialbunny_contacts WHERE user = %d AND name LIKE %s LIMIT 25",$dialbunny_user_id,$search)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
                     } else {
                       // Direct database query used below – $wpdb->prepare() is always used to prevent SQL injection.
-                      $opened_item = $wpdb->get_results($wpdb->prepare("SELECT * FROM {$wpdb->prefix}dialbunny_contacts WHERE user = %d LIMIT %d, %d",$user_id,$limit_offset,$limit_count)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+                      $dialbunny_opened_item = $wpdb->get_results($wpdb->prepare("SELECT * FROM {$wpdb->prefix}dialbunny_contacts WHERE user = %d LIMIT %d, %d",$dialbunny_user_id,$dialbunny_limit_offset,$dialbunny_limit_count)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
                     }
                   ?>
-                  <?php if (!empty($opened_item)): ?>
-                  <?php foreach ($opened_item as $item): ?>
+                  <?php if (!empty($dialbunny_opened_item)): ?>
+                  <?php foreach ($dialbunny_opened_item as $dialbunny_item): ?>
                     <?php
-                      $bgicon = 'light-primary';
-                      $texticon = 'primary';
-                      switch ((int) $item->icon) {
-                        case 2: $bgicon = 'light-success'; $texticon = 'success'; break;
-                        case 3: $bgicon = 'light-info'; $texticon = 'info'; break;
-                        case 4: $bgicon = 'light-danger'; $texticon = 'danger'; break;
-                        case 5: $bgicon = 'light-warning'; $texticon = 'warning'; break;
-                        case 6: $bgicon = 'secondary'; $texticon = 'dark'; break;
+                      $dialbunny_bgicon = 'light-primary';
+                      $dialbunny_texticon = 'primary';
+                      switch ((int) $dialbunny_item->icon) {
+                        case 2: $dialbunny_bgicon = 'light-success'; $dialbunny_texticon = 'success'; break;
+                        case 3: $dialbunny_bgicon = 'light-info'; $dialbunny_texticon = 'info'; break;
+                        case 4: $dialbunny_bgicon = 'light-danger'; $dialbunny_texticon = 'danger'; break;
+                        case 5: $dialbunny_bgicon = 'light-warning'; $dialbunny_texticon = 'warning'; break;
+                        case 6: $dialbunny_bgicon = 'secondary'; $dialbunny_texticon = 'dark'; break;
                       }
 
-                      $contactUrl = esc_url(add_query_arg([
+                      $dialbunny_contactUrl = esc_url(add_query_arg([
                         'dashboardpage' => 'contacts',
-                        'contact' => $item->id,
+                        'contact' => $dialbunny_item->id,
                         'user_nonce'    => sanitize_text_field(wp_unslash($_GET['user_nonce']))
                       ], $dialbunnyDashboardUrl));
@@ -86 +86 @@
                         <div class="d-flex align-items-center">
                           <div class="symbol symbol-40px symbol-circle me-5">
-                            <span class="symbol-label bg-<?php echo esc_attr($bgicon); ?> text-<?php echo esc_attr($texticon); ?> fs-6 fw-bolder">
-                              <?php echo esc_html(ucfirst(substr($item->name, 0, 1))); ?>
+                            <span class="symbol-label bg-<?php echo esc_attr($dialbunny_bgicon); ?> text-<?php echo esc_attr($dialbunny_texticon); ?> fs-6 fw-bolder">
+                              <?php echo esc_html(ucfirst(substr($dialbunny_item->name, 0, 1))); ?>
                             </span>
                           </div>
                           <div class="d-flex flex-column justify-content-center">
-                            <a href="<?php echo esc_url($contactUrl); ?>" class="mb-1 text-gray-800 text-hover-primary">
-                              <?php echo esc_html($item->name); ?>
+                            <a href="<?php echo esc_url($dialbunny_contactUrl); ?>" class="mb-1 text-gray-800 text-hover-primary">
+                              <?php echo esc_html($dialbunny_item->name); ?>
                             </a>
-                            <div class="fw-semibold fs-6 text-gray-400"><?php echo esc_html(dialbunny_formatNumber($item->phone)); ?></div>
+                            <div class="fw-semibold fs-6 text-gray-400"><?php echo esc_html(dialbunny_formatNumber($dialbunny_item->phone)); ?></div>
                           </div>
                         </div>
                       </td>
-                      <td><?php echo esc_html($item->company); ?></td>
+                      <td><?php echo esc_html($dialbunny_item->company); ?></td>
                       <td>
-                        <?php if ($item->blocked == 1): ?>
+                        <?php if ($dialbunny_item->blocked == 1): ?>
                           <span class="badge badge-light-danger fw-bold px-4 py-3">Blocked</span>
-                        <?php elseif (!empty($item->status)): ?>
-                          <span class="badge badge-light-<?php echo esc_attr($item->statuscolor ?? 'primary'); ?> fw-bold px-4 py-3">
-                            <?php echo esc_html($item->status); ?>
+                        <?php elseif (!empty($dialbunny_item->status)): ?>
+                          <span class="badge badge-light-<?php echo esc_attr($dialbunny_item->statuscolor ?? 'primary'); ?> fw-bold px-4 py-3">
+                            <?php echo esc_html($dialbunny_item->status); ?>
                           </span>
                         <?php else: ?>
@@ -111 +111 @@
                       </td>
                       <td class="text-end">
-                        <a href="<?php echo esc_url($contactUrl); ?>" class="btn btn-light btn-sm">View</a>
+                        <a href="<?php echo esc_url($dialbunny_contactUrl); ?>" class="btn btn-light btn-sm">View</a>
                       </td>
                     </tr>
@@ -137 +137 @@
       <div class="separator mb-6"></div>
       <div class="d-flex align-items-center justify-content-center justify-content-md-end">
-        <?php if ($resultsPage > 1 && strlen($search) <= 2): ?>
+        <?php if ($dialbunny_resultsPage > 1 && strlen($search) <= 2): ?>
         <?php
-          $prevUrl = esc_url(add_query_arg([
+          $dialbunny_prevUrl = esc_url(add_query_arg([
             'dashboardpage' => 'contacts',
-            'resultsPage'   => $resultsPage - 1,
+            'resultsPage'   => $dialbunny_resultsPage - 1,
             'list'          => '',
             'user_nonce'    => sanitize_text_field(wp_unslash($_GET['user_nonce']))
           ], $dialbunnyDashboardUrl));
         ?>
-        <a href="<?php echo esc_url($prevUrl); ?>" class="btn btn-light btn-sm me-3">
+        <a href="<?php echo esc_url($dialbunny_prevUrl); ?>" class="btn btn-light btn-sm me-3">
           <span class="menu-bullet">
             <span class="fa fa-arrow-left"></span>
@@ -153 +153 @@
       <?php endif; ?>
 
-      <span class="btn btn-bg-primary btn-sm me-3 text-white"><?php echo esc_html($resultsPage); ?></span>
-
-      <?php if (isset($opened_item) && ($resultsPage * 12) < $numberOfContacts && strlen($search) <= 2): ?>
+      <span class="btn btn-bg-primary btn-sm me-3 text-white"><?php echo esc_html($dialbunny_resultsPage); ?></span>
+
+      <?php if (isset($dialbunny_opened_item) && ($dialbunny_resultsPage * 12) < $numberOfContacts && strlen($search) <= 2): ?>
         <?php
-          $nextUrl = add_query_arg([
+          $dialbunny_nextUrl = add_query_arg([
             'dashboardpage' => 'contacts',
-            'resultsPage'   => $resultsPage + 1,
+            'resultsPage'   => $dialbunny_resultsPage + 1,
             'list'          => '',
             'user_nonce'    => sanitize_text_field(wp_unslash($_GET['user_nonce']))
           ], $dialbunnyDashboardUrl);
         ?>
-        <a href="<?php echo esc_url($nextUrl); ?>" class="btn btn-light btn-sm me-3">
+        <a href="<?php echo esc_url($dialbunny_nextUrl); ?>" class="btn btn-light btn-sm me-3">
           <span class="menu-bullet">
             <span class="fa fa-arrow-right"></span>
@@ -177 +177 @@
       <div class="row g-6 g-xl-9">
         <?php
-          if (!empty($opened_item)) {
-              foreach ($opened_item as $item) {
-                  $bgicon = "light-primary";
-                  $texticon = "primary";
-
-                  switch ($item->icon) {
-                      case 2: $bgicon = "light-success"; $texticon = "success"; break;
-                      case 3: $bgicon = "light-info"; $texticon = "info"; break;
-                      case 4: $bgicon = "light-danger"; $texticon = "danger"; break;
-                      case 5: $bgicon = "light-warning"; $texticon = "warning"; break;
-                      case 6: $bgicon = "secondary"; $texticon = "dark"; break;
+          if (!empty($dialbunny_opened_item)) {
+              foreach ($dialbunny_opened_item as $dialbunny_item) {
+                  $dialbunny_bgicon = "light-primary";
+                  $dialbunny_texticon = "primary";
+
+                  switch ($dialbunny_item->icon) {
+                      case 2: $dialbunny_bgicon = "light-success"; $dialbunny_texticon = "success"; break;
+                      case 3: $dialbunny_bgicon = "light-info"; $dialbunny_texticon = "info"; break;
+                      case 4: $dialbunny_bgicon = "light-danger"; $dialbunny_texticon = "danger"; break;
+                      case 5: $dialbunny_bgicon = "light-warning"; $dialbunny_texticon = "warning"; break;
+                      case 6: $dialbunny_bgicon = "secondary"; $dialbunny_texticon = "dark"; break;
                   }
 
                   echo '<div class="col-md-6 col-xxl-4"><div class="card"><div class="card-body d-flex flex-center flex-column pt-12 p-9">';
-                  echo '<div class="symbol symbol-65px symbol-circle mb-5"><span class="symbol-label fs-2x fw-semibold text-' . esc_attr($texticon) . ' bg-' . esc_attr($bgicon) . '">' . esc_html(ucfirst(substr($item->name, 0, 1))) . '</span></div>';
-                  echo '<a href="' . esc_url(wp_nonce_url($dialbunnyDashboardUrl.'&dashboardpage=contacts&contact='.$item->id, 'DialBunny', 'user_nonce')) . '" class="fs-4 text-gray-800 text-hover-primary fw-bold mb-0">' . esc_html($item->name) . '</a>';
-                  echo '<div class="fw-semibold text-gray-400 mb-6">' . esc_html(dialbunny_formatNumber($item->phone)) . '</div>';
-
-                  if ($item->blocked == 1) {
+                  echo '<div class="symbol symbol-65px symbol-circle mb-5"><span class="symbol-label fs-2x fw-semibold text-' . esc_attr($dialbunny_texticon) . ' bg-' . esc_attr($dialbunny_bgicon) . '">' . esc_html(ucfirst(substr($dialbunny_item->name, 0, 1))) . '</span></div>';
+                  echo '<a href="' . esc_url(wp_nonce_url($dialbunnyDashboardUrl.'&dashboardpage=contacts&contact='.$dialbunny_item->id, 'DialBunny', 'user_nonce')) . '" class="fs-4 text-gray-800 text-hover-primary fw-bold mb-0">' . esc_html($dialbunny_item->name) . '</a>';
+                  echo '<div class="fw-semibold text-gray-400 mb-6">' . esc_html(dialbunny_formatNumber($dialbunny_item->phone)) . '</div>';
+
+                  if ($dialbunny_item->blocked == 1) {
                       echo '<span class="badge badge-light-danger fw-bold px-4 py-3">Blocked</span>';
-                  } elseif (!empty($item->status)) {
-                      $status_color = !empty($item->statuscolor) ? esc_attr($item->statuscolor) : 'primary';
-                      echo '<span class="badge badge-light-' . esc_html($status_color) . ' fw-bold px-4 py-3">' . esc_html($item->status) . '</span>';
+                  } elseif (!empty($dialbunny_item->status)) {
+                      $dialbunny_status_color = !empty($dialbunny_item->statuscolor) ? esc_attr($dialbunny_item->statuscolor) : 'primary';
+                      echo '<span class="badge badge-light-' . esc_html($dialbunny_status_color) . ' fw-bold px-4 py-3">' . esc_html($dialbunny_item->status) . '</span>';
                   } else {
                       echo '<span class="badge badge-light-success fw-bold px-4 py-3">Normal</span>';
@@ -214 +214 @@
       </div>
         <div class="d-flex align-items-center justify-content-center justify-content-md-end pt-10">
-          <?php if ($resultsPage > 1 && strlen($search) <= 2): ?>
+          <?php if ($dialbunny_resultsPage > 1 && strlen($search) <= 2): ?>
             <a href="<?php echo esc_url(add_query_arg([
                 'dashboardpage' => 'contacts',
-                'resultsPage' => $resultsPage - 1,
+                'resultsPage' => $dialbunny_resultsPage - 1,
                 'block' => '',
                 'user_nonce'    => sanitize_text_field(wp_unslash($_GET['user_nonce']))
@@ -226 +226 @@
             </a>
           <?php endif; ?>
-          <span class="btn btn-bg-primary btn-sm me-3 text-white"><?php echo esc_html($resultsPage); ?></span>
-          <?php if (isset($opened_item) && ($resultsPage * 12) < $numberOfContacts && strlen($search) <= 2): ?>
+          <span class="btn btn-bg-primary btn-sm me-3 text-white"><?php echo esc_html($dialbunny_resultsPage); ?></span>
+          <?php if (isset($dialbunny_opened_item) && ($dialbunny_resultsPage * 12) < $numberOfContacts && strlen($search) <= 2): ?>
             <a href="<?php echo esc_url(add_query_arg([
                 'dashboardpage' => 'contacts',
-                'resultsPage' => $resultsPage + 1,
+                'resultsPage' => $dialbunny_resultsPage + 1,
                 'block' => '',
                 'user_nonce'    => sanitize_text_field(wp_unslash($_GET['user_nonce']))

dialbunny/trunk/lib/views/dashboard/inbound.php

@@ -4 +4 @@
   <div class="container-xxl" id="content_container">
     <?php
-    $table = $wpdb->prefix . 'dialbunny_phone_details';
+    $dialbunny_table = $wpdb->prefix . 'dialbunny_phone_details';
     // Direct database query used below – $wpdb->prepare() is always used to prevent SQL injection.
-    $saveData = $wpdb->get_results($wpdb->prepare("SELECT * FROM {$wpdb->prefix}dialbunny_phone_details WHERE user = %d LIMIT 1", wp_get_current_user()->ID)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+    $dialbunny_saveData = $wpdb->get_results($wpdb->prepare("SELECT * FROM {$wpdb->prefix}dialbunny_phone_details WHERE user = %d LIMIT 1", wp_get_current_user()->ID)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
     ?>
     <?php if (isset($_GET['updated'])) { echo wp_kses_post(dialbunny_main_success("Saved Successfuly", "You have successfully updated your inbound call settings.")); }  ?>
@@ -35 +35 @@
                           <div class="col-lg-4 fv-row">
                             <?php
-                            $mainNumber1 = explode("-", $saveData[0]->call1 ?? null);
-                            if (isset($saveData[0]->call1))
+                            $dialbunny_mainNumber1 = explode("-", $dialbunny_saveData[0]->call1 ?? null);
+                            if (isset($dialbunny_saveData[0]->call1))
                             {
                               // Escaped inside the dialbunny_country_code() function
-                              echo dialbunny_country_code($mainNumber1[0], "countrycode1"); // phpcs:ignore WordPress.Security.EscapeOutput
+                              echo dialbunny_country_code($dialbunny_mainNumber1[0], "countrycode1"); // phpcs:ignore WordPress.Security.EscapeOutput
                             }
                             else { echo dialbunny_country_code("none", "countrycode1"); } // phpcs:ignore WordPress.Security.EscapeOutput  ?>
                           </div>
                           <div class="col-lg-8 fv-row">
-                            <input id="phoneNumber" type="number" maxlength="16" name="call1" class="form-control form-control-lg form-control-solid" placeholder="Phone Number" value="<?php if (isset($saveData[0]->call1)) { echo esc_html($mainNumber1[1]); } ?>" />
+                            <input id="phoneNumber" type="number" maxlength="16" name="call1" class="form-control form-control-lg form-control-solid" placeholder="Phone Number" value="<?php if (isset($dialbunny_saveData[0]->call1)) { echo esc_html($dialbunny_mainNumber1[1]); } ?>" />
                           </div>
                           <?php
-                          if (isset($saveData[0]->call1) && strlen($mainNumber1[1]) > 3 && $saveData[0]->call1_verified == 0) {
+                          if (isset($dialbunny_saveData[0]->call1) && strlen($dialbunny_mainNumber1[1]) > 3 && $dialbunny_saveData[0]->call1_verified == 0) {
                             echo '
                                                         <div class="fv-row mt-6">
@@ -73 +73 @@
                           <div class="col-lg-4 fv-row">
                             <?php
-                            $mainNumber2 = explode("-", $saveData[0]->call2 ?? null);
-                            if (isset($saveData[0]->call2))
+                            $dialbunny_mainNumber2 = explode("-", $dialbunny_saveData[0]->call2 ?? null);
+                            if (isset($dialbunny_saveData[0]->call2))
                             {
                               // Escaped inside the dialbunny_country_code() function
-                              echo dialbunny_country_code($mainNumber2[0], "countrycode2"); // phpcs:ignore WordPress.Security.EscapeOutput
+                              echo dialbunny_country_code($dialbunny_mainNumber2[0], "countrycode2"); // phpcs:ignore WordPress.Security.EscapeOutput
                             }
                             else { echo dialbunny_country_code("none", "countrycode2"); } // phpcs:ignore WordPress.Security.EscapeOutput  ?>
                           </div>
                           <div class="col-lg-8 fv-row">
-                            <input id="phoneNumber2" type="number" maxlength="16" name="call2" class="form-control form-control-lg form-control-solid" placeholder="Phone Number" value="<?php if (isset($saveData[0]->call2)) { echo esc_html($mainNumber2[1]); } ?>" />
+                            <input id="phoneNumber2" type="number" maxlength="16" name="call2" class="form-control form-control-lg form-control-solid" placeholder="Phone Number" value="<?php if (isset($dialbunny_saveData[0]->call2)) { echo esc_html($dialbunny_mainNumber2[1]); } ?>" />
                           </div> <?php
-                          if (isset($saveData[0]->call2) && strlen($mainNumber2[1]) > 3 && $saveData[0]->call2_verified == 0) {
+                          if (isset($dialbunny_saveData[0]->call2) && strlen($dialbunny_mainNumber2[1]) > 3 && $dialbunny_saveData[0]->call2_verified == 0) {
                             echo '
                                                             <div class="fv-row mt-6">
@@ -110 +110 @@
                           <div class="col-lg-4 fv-row">
                             <?php
-                            $mainNumber3 = explode("-", $saveData[0]->call3 ?? null);
-                            if (isset($saveData[0]->call3))
+                            $dialbunny_mainNumber3 = explode("-", $dialbunny_saveData[0]->call3 ?? null);
+                            if (isset($dialbunny_saveData[0]->call3))
                             {
                               // Escaped inside the dialbunny_country_code() function
-                              echo dialbunny_country_code($mainNumber3[0], "countrycode3"); // phpcs:ignore WordPress.Security.EscapeOutput
+                              echo dialbunny_country_code($dialbunny_mainNumber3[0], "countrycode3"); // phpcs:ignore WordPress.Security.EscapeOutput
                             }
                             else { echo dialbunny_country_code("none", "countrycode3"); } // phpcs:ignore WordPress.Security.EscapeOutput  ?>
                           </div>
                           <div class="col-lg-8 fv-row">
-                            <input id="phoneNumber3" type="number" maxlength="16" name="call3" class="form-control form-control-lg form-control-solid" placeholder="Phone Number" value="<?php if (isset($saveData[0]->call3)) { echo esc_html($mainNumber3[1]); } ?>" />
+                            <input id="phoneNumber3" type="number" maxlength="16" name="call3" class="form-control form-control-lg form-control-solid" placeholder="Phone Number" value="<?php if (isset($dialbunny_saveData[0]->call3)) { echo esc_html($dialbunny_mainNumber3[1]); } ?>" />
                           </div> <?php
-                          if (isset($saveData[0]->call3) && strlen($mainNumber3[1]) > 10 && $saveData[0]->call3_verified == 0) {
+                          if (isset($dialbunny_saveData[0]->call3) && strlen($dialbunny_mainNumber3[1]) > 10 && $dialbunny_saveData[0]->call3_verified == 0) {
                             echo '
                                                                 <div class="fv-row mt-6">
@@ -198 +198 @@
                         <div class="row mb-6">
                           <div class="col-lg-12 fv-row">
-                            <textarea type="textarea" maxlength="500" rows="6" name="welcome" class="form-control form-control-lg form-control-solid" placeholder="Please hold while we transfer you to the next available representative."><?php if (isset($saveData[0]->welcome) && $saveData[0]->welcome != null) { echo esc_html($saveData[0]->welcome); } ?></textarea>
+                            <textarea type="textarea" maxlength="500" rows="6" name="welcome" class="form-control form-control-lg form-control-solid" placeholder="Please hold while we transfer you to the next available representative."><?php if (isset($dialbunny_saveData[0]->welcome) && $dialbunny_saveData[0]->welcome != null) { echo esc_html($dialbunny_saveData[0]->welcome); } ?></textarea>
                           </div>
                         </div>
@@ -229 +229 @@
                         <div class="row">
                           <div class="col-lg-12 fv-row">
-                            <textarea type="textarea" maxlength="500" rows="6" name="busy" class="form-control form-control-lg form-control-solid" placeholder="Sorry there are currently no available representatives."><?php if (isset($saveData[0]->busy) && $saveData[0]->busy != null) { echo esc_html($saveData[0]->busy); } ?></textarea>
+                            <textarea type="textarea" maxlength="500" rows="6" name="busy" class="form-control form-control-lg form-control-solid" placeholder="Sorry there are currently no available representatives."><?php if (isset($dialbunny_saveData[0]->busy) && $dialbunny_saveData[0]->busy != null) { echo esc_html($dialbunny_saveData[0]->busy); } ?></textarea>
                           </div>
                         </div>
@@ -260 +260 @@
                         <div class="row">
                           <div class="col-lg-12 fv-row">
-                            <textarea type="textarea" maxlength="500" rows="6" name="outside_hours_message" class="form-control form-control-lg form-control-solid" placeholder="Sorry you are calling outside of business hours, we are available between nine A.M and five P.M, monday to friday."><?php if (isset($saveData[0]->outside_hours_message) && $saveData[0]->outside_hours_message != null) { echo esc_html($saveData[0]->outside_hours_message); } ?></textarea>
+                            <textarea type="textarea" maxlength="500" rows="6" name="outside_hours_message" class="form-control form-control-lg form-control-solid" placeholder="Sorry you are calling outside of business hours, we are available between nine A.M and five P.M, monday to friday."><?php if (isset($dialbunny_saveData[0]->outside_hours_message) && $dialbunny_saveData[0]->outside_hours_message != null) { echo esc_html($dialbunny_saveData[0]->outside_hours_message); } ?></textarea>
                           </div>
                         </div>
@@ -292 +292 @@
           <h1 class="d-flex justify-content-center align-items-center mb-6">Call the number below</h1>
           <h3 class="d-flex justify-content-center align-items-center mb-6">
-            <?php if (isset($saveData[0]->managed_number) && isset($saveData[0]->managed_number_code) && strlen(trim($saveData[0]->managed_number)) > 3)
-                  { echo esc_html($saveData[0]->managed_number_code . ' ' . dialbunny_formatNumber($saveData[0]->managed_number)); }
+            <?php if (isset($dialbunny_saveData[0]->managed_number) && isset($dialbunny_saveData[0]->managed_number_code) && strlen(trim($dialbunny_saveData[0]->managed_number)) > 3)
+                  { echo esc_html($dialbunny_saveData[0]->managed_number_code . ' ' . dialbunny_formatNumber($dialbunny_saveData[0]->managed_number)); }
                   else { echo 'You don\'t have a number setup yet'; }
                   ?> </h3>

dialbunny/trunk/lib/views/dashboard/index.php

@@ -3 +3 @@
   <div class="container-xxl" id="content_container">
     <?php
-    $table = $wpdb->prefix . 'dialbunny_phone_details';
+    $dialbunny_table = $wpdb->prefix . 'dialbunny_phone_details';
     // Direct database query used below – $wpdb->prepare() is always used to prevent SQL injection.
-    $saveData = $wpdb->get_results($wpdb->prepare("SELECT * FROM {$wpdb->prefix}dialbunny_phone_details WHERE user = %d LIMIT 1", wp_get_current_user()->ID)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+    $dialbunny_saveData = $wpdb->get_results($wpdb->prepare("SELECT * FROM {$wpdb->prefix}dialbunny_phone_details WHERE user = %d LIMIT 1", wp_get_current_user()->ID)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
     $dialbunny_recents = $wpdb->prefix . 'dialbunny_recents';
-    $recent_day = 0;
-    $recent_7day = 0;
-    $recent_30day = 0;
-    if (isset($saveData[0]->managed_number)) {
+    $dialbunny_recent_day = 0;
+    $dialbunny_recent_7day = 0;
+    $dialbunny_recent_30day = 0;
+    if (isset($dialbunny_saveData[0]->managed_number)) {
       // Direct database query used below – $wpdb->prepare() is always used to prevent SQL injection.
-      $recent_day = $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM {$wpdb->prefix}dialbunny_recents WHERE created_at >= DATE_SUB(NOW(), INTERVAL 1 DAY) AND (to_number = %s OR from_number = %s)",$saveData[0]->managed_number,$saveData[0]->managed_number)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
-      $recent_7day = $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM {$wpdb->prefix}dialbunny_recents WHERE created_at >= DATE_SUB(NOW(), INTERVAL 7 DAY) AND (to_number = %s OR from_number = %s)",$saveData[0]->managed_number,$saveData[0]->managed_number)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
-      $recent_30day = $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM {$wpdb->prefix}dialbunny_recents WHERE created_at >= DATE_SUB(NOW(), INTERVAL 30 DAY) AND (to_number = %s OR from_number = %s)",$saveData[0]->managed_number,$saveData[0]->managed_number)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+      $dialbunny_recent_day = $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM {$wpdb->prefix}dialbunny_recents WHERE created_at >= DATE_SUB(NOW(), INTERVAL 1 DAY) AND (to_number = %s OR from_number = %s)",$dialbunny_saveData[0]->managed_number,$dialbunny_saveData[0]->managed_number)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+      $dialbunny_recent_7day = $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM {$wpdb->prefix}dialbunny_recents WHERE created_at >= DATE_SUB(NOW(), INTERVAL 7 DAY) AND (to_number = %s OR from_number = %s)",$dialbunny_saveData[0]->managed_number,$dialbunny_saveData[0]->managed_number)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+      $dialbunny_recent_30day = $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM {$wpdb->prefix}dialbunny_recents WHERE created_at >= DATE_SUB(NOW(), INTERVAL 30 DAY) AND (to_number = %s OR from_number = %s)",$dialbunny_saveData[0]->managed_number,$dialbunny_saveData[0]->managed_number)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
     }
-    $json_data = null;
-    if (isset($saveData[0]->business_hours)) {
-        $json_data = json_decode($saveData[0]->business_hours);
+    $dialbunny_json_data = null;
+    if (isset($dialbunny_saveData[0]->business_hours)) {
+        $dialbunny_json_data = json_decode($dialbunny_saveData[0]->business_hours);
     }
 ?>
@@ -39 +39 @@
               <div class="d-flex flex-stack">
                 <div class="m-0">
-                  <span class="text-gray-800 fw-bold d-block fs-2hx lh-1 ls-n2"> <?php echo number_format($recent_day); ?> </span>
+                  <span class="text-gray-800 fw-bold d-block fs-2hx lh-1 ls-n2"> <?php echo number_format($dialbunny_recent_day); ?> </span>
                   <span class="text-gray-500 fw-semibold fs-6">Calls <br>Last 24 Hours </span>
                 </div>
@@ -46 +46 @@
               <div class="d-flex flex-stack">
                 <div class="m-0">
-                  <span class="text-gray-800 fw-bold d-block fs-2hx lh-1 ls-n2"> <?php echo number_format($recent_7day); ?> </span>
+                  <span class="text-gray-800 fw-bold d-block fs-2hx lh-1 ls-n2"> <?php echo number_format($dialbunny_recent_7day); ?> </span>
                   <span class="text-gray-500 fw-semibold fs-6">Calls <br>Last 7 Days </span>
                 </div>
@@ -53 +53 @@
               <div class="d-flex flex-stack">
                 <div class="m-0">
-                  <span class="text-gray-800 fw-bold d-block fs-2hx lh-1 ls-n2"> <?php echo number_format($recent_30day); ?> </span>
+                  <span class="text-gray-800 fw-bold d-block fs-2hx lh-1 ls-n2"> <?php echo number_format($dialbunny_recent_30day); ?> </span>
                   <span class="text-gray-500 fw-semibold fs-6">Calls <br>Last 30 Days </span>
                 </div>
@@ -87 +87 @@
             <h3 class="card-title">Your Number</h3>
             <div class="card-toolbar">
-              <?php if (isset($saveData[0]->managed_number) && isset($saveData[0]->managed_number_code) && strlen((string)$saveData[0]->managed_number) > 3) { echo '<button type="button" class="btn btn-sm btn-danger" data-bs-toggle="modal" data-bs-target="#release_managed_number">Release</button>'; } ?>
+              <?php if (isset($dialbunny_saveData[0]->managed_number) && isset($dialbunny_saveData[0]->managed_number_code) && strlen((string)$dialbunny_saveData[0]->managed_number) > 3) { echo '<button type="button" class="btn btn-sm btn-danger" data-bs-toggle="modal" data-bs-target="#release_managed_number">Release</button>'; } ?>
             </div>
           </div>
@@ -93 +93 @@
             <div class="d-flex flex-column flex-grow-1 py-2 py-lg-13 me-2">
               <p class="fw-bold text-gray-900 fs-1 mb-2">
-                <?php if (isset($saveData[0]->managed_number) && isset($saveData[0]->managed_number_code) && strlen((string)$saveData[0]->managed_number) > 3)
+                <?php if (isset($dialbunny_saveData[0]->managed_number) && isset($dialbunny_saveData[0]->managed_number_code) && strlen((string)$dialbunny_saveData[0]->managed_number) > 3)
                 {
-                  echo esc_html($saveData[0]->managed_number_code) . ' ' . esc_html(dialbunny_formatNumber($saveData[0]->managed_number));
+                  echo esc_html($dialbunny_saveData[0]->managed_number_code) . ' ' . esc_html(dialbunny_formatNumber($dialbunny_saveData[0]->managed_number));
                 }
                 else { echo 'You don\'t have a number setup yet'; }
@@ -181 +181 @@
           <input type="hidden" name="action" value="dialbunny_release_managed_number_user"></input>
           <?php
-          if (isset($saveData[0]->managed_number) && isset($saveData[0]->managed_number_code))
+          if (isset($dialbunny_saveData[0]->managed_number) && isset($dialbunny_saveData[0]->managed_number_code))
           {
-            echo '<input type="hidden" name="countrycode" value="'. esc_html($saveData[0]->managed_number_code) .'"></input>';
-            echo '<input type="hidden" name="phone" value="'. esc_html($saveData[0]->managed_number) .'"></input>';
-            echo '<input type="hidden" name="sid" value="'. esc_html($saveData[0]->managed_number) .'"></input>';
+            echo '<input type="hidden" name="countrycode" value="'. esc_html($dialbunny_saveData[0]->managed_number_code) .'"></input>';
+            echo '<input type="hidden" name="phone" value="'. esc_html($dialbunny_saveData[0]->managed_number) .'"></input>';
+            echo '<input type="hidden" name="sid" value="'. esc_html($dialbunny_saveData[0]->managed_number) .'"></input>';
           }
           ?>

dialbunny/trunk/lib/views/dashboard/messages/default.php

@@ -51 +51 @@
                 <?php
                 // Check to see if user wants to search or not - Requires mysql 8.0 or higher
-                $user_id = get_current_user_id();
-                $managed_number = $phone_details[0]->managed_number;
+                $dialbunny_user_id = get_current_user_id();
+                $dialbunny_managed_number = $phone_details[0]->managed_number;
                 $search = isset($_GET['search']) ? '%' . $wpdb->esc_like(sanitize_text_field(wp_unslash($_GET['search']))) . '%' : '';
                 if (strlen($search) > 2) {
                   // Direct database query used below – $wpdb->prepare() is always used to prevent SQL injection.
-                  $opened_item = $wpdb->get_results($wpdb->prepare("SELECT *, ROW_NUMBER() OVER (PARTITION BY from_number, to_number ORDER BY created_at DESC) AS rn FROM {$wpdb->prefix}dialbunny_messages WHERE user = %d AND (from_number = %s OR to_number = %s) AND message LIKE %s LIMIT 25", $user_id, $managed_number, $managed_number, $search)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+                  $dialbunny_opened_item = $wpdb->get_results($wpdb->prepare("SELECT *, ROW_NUMBER() OVER (PARTITION BY from_number, to_number ORDER BY created_at DESC) AS rn FROM {$wpdb->prefix}dialbunny_messages WHERE user = %d AND (from_number = %s OR to_number = %s) AND message LIKE %s LIMIT 25", $dialbunny_user_id, $dialbunny_managed_number, $dialbunny_managed_number, $search)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
                 } else {
                   // Direct database query used below – $wpdb->prepare() is always used to prevent SQL injection.
-                  $opened_item = $wpdb->get_results( $wpdb->prepare("SELECT * FROM (SELECT *, ROW_NUMBER() OVER (PARTITION BY LEAST(from_number, to_number), GREATEST(from_number, to_number) ORDER BY created_at DESC) AS rn FROM {$wpdb->prefix}dialbunny_messages WHERE user = %d AND (from_number = %s OR to_number = %s)) AS ranked_messages WHERE rn = 1 ORDER BY created_at DESC LIMIT %d,%d", $user_id, $managed_number,$managed_number,$limit_offset,$limit_count)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+                  $dialbunny_opened_item = $wpdb->get_results( $wpdb->prepare("SELECT * FROM (SELECT *, ROW_NUMBER() OVER (PARTITION BY LEAST(from_number, to_number), GREATEST(from_number, to_number) ORDER BY created_at DESC) AS rn FROM {$wpdb->prefix}dialbunny_messages WHERE user = %d AND (from_number = %s OR to_number = %s)) AS ranked_messages WHERE rn = 1 ORDER BY created_at DESC LIMIT %d,%d", $dialbunny_user_id, $dialbunny_managed_number,$dialbunny_managed_number,$dialbunny_limit_offset,$dialbunny_limit_count)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
                 }
                   // check to see if the user has a managed number
                   if (isset($phone_details[0]->managed_number) && isset($phone_details[0]->managed_number_code))
                   {
-                    foreach ($opened_item as $item)
+                    foreach ($dialbunny_opened_item as $dialbunny_item)
                     {
                       // Check to see if contact exists
-                      $phoneNumberCountryCode;
-                      $phoneNumber;
-                      if ($phone_details[0]->managed_number_code == $item->from_countrycode && $phone_details[0]->managed_number == $item->from_number) { $phoneNumberCountryCode = $item->to_countrycode; $phoneNumber = $item->to_number; }
-                      else { $phoneNumberCountryCode = $item->from_countrycode; $phoneNumber = $item->from_number; }
+                      $dialbunny_phoneNumberCountryCode;
+                      $dialbunny_phoneNumber;
+                      if ($phone_details[0]->managed_number_code == $dialbunny_item->from_countrycode && $phone_details[0]->managed_number == $dialbunny_item->from_number) { $dialbunny_phoneNumberCountryCode = $dialbunny_item->to_countrycode; $dialbunny_phoneNumber = $dialbunny_item->to_number; }
+                      else { $dialbunny_phoneNumberCountryCode = $dialbunny_item->from_countrycode; $dialbunny_phoneNumber = $dialbunny_item->from_number; }
                       // Direct database query used below – $wpdb->prepare() is always used to prevent SQL injection.
-                      $contact = $wpdb->get_results($wpdb->prepare("SELECT * FROM {$wpdb->prefix}dialbunny_contacts WHERE user = %d AND countrycode = %s AND phone = %s LIMIT 1",wp_get_current_user()->ID,$phoneNumberCountryCode,$phoneNumber)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
-                      if ($contact == null)
+                      $dialbunny_contact = $wpdb->get_results($wpdb->prepare("SELECT * FROM {$wpdb->prefix}dialbunny_contacts WHERE user = %d AND countrycode = %s AND phone = %s LIMIT 1",wp_get_current_user()->ID,$dialbunny_phoneNumberCountryCode,$dialbunny_phoneNumber)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+                      if ($dialbunny_contact == null)
                       {
-                        $displayName = dialbunny_formatNumber($phoneNumber);
-                        if ($item->from_number == $phone_details[0]->managed_number && strlen($search) > 2) { $displayName = 'You'; }
+                        $dialbunny_displayName = dialbunny_formatNumber($dialbunny_phoneNumber);
+                        if ($dialbunny_item->from_number == $phone_details[0]->managed_number && strlen($search) > 2) { $dialbunny_displayName = 'You'; }
                         echo '<tr>';
                         echo '<td><div class="d-flex align-items-center">';
@@ -82 +82 @@
                         echo      '<span class="symbol-label bg-secondary text-secondary fs-6 fw-bolder"></span>';
                         echo    '</div>';
-                        echo '<div class="d-flex flex-column justify-content-center"><a href="'.esc_url(wp_nonce_url($dialbunnyDashboardUrl.'&dashboardpage=messages&phone='.esc_html($phoneNumber).'&countrycode='.esc_html($phoneNumberCountryCode), 'DialBunny', 'user_nonce')).'" class="mb-1 text-gray-800 text-hover-primary">'.esc_html($displayName).'</a><div class="fw-semibold fs-6 text-gray-400">Not in contacts</div></div></div></td>';
-                        echo '<td>'.esc_html(mb_strimwidth($item->message, 0, 25, "...")).'</td>';
-                        if ($item->reading == 0) { echo '<td><span class="badge badge-light-primary fw-bold px-4 py-3">Unread</span></td>'; }
+                        echo '<div class="d-flex flex-column justify-content-center"><a href="'.esc_url(wp_nonce_url($dialbunnyDashboardUrl.'&dashboardpage=messages&phone='.esc_html($dialbunny_phoneNumber).'&countrycode='.esc_html($dialbunny_phoneNumberCountryCode), 'DialBunny', 'user_nonce')).'" class="mb-1 text-gray-800 text-hover-primary">'.esc_html($dialbunny_displayName).'</a><div class="fw-semibold fs-6 text-gray-400">Not in contacts</div></div></div></td>';
+                        echo '<td>'.esc_html(mb_strimwidth($dialbunny_item->message, 0, 25, "...")).'</td>';
+                        if ($dialbunny_item->reading == 0) { echo '<td><span class="badge badge-light-primary fw-bold px-4 py-3">Unread</span></td>'; }
                         else { echo '<td><span class="badge badge-light-success fw-bold px-4 py-3">Read</span></td>'; }
-                        echo '<td class="text-end"><a href="'.esc_url(wp_nonce_url($dialbunnyDashboardUrl.'&dashboardpage=messages&phone='.esc_html($phoneNumber).'&countrycode='.esc_html($phoneNumberCountryCode), 'DialBunny', 'user_nonce')).'" class="btn btn-light btn-sm">View</a></td>';
+                        echo '<td class="text-end"><a href="'.esc_url(wp_nonce_url($dialbunnyDashboardUrl.'&dashboardpage=messages&phone='.esc_html($dialbunny_phoneNumber).'&countrycode='.esc_html($dialbunny_phoneNumberCountryCode), 'DialBunny', 'user_nonce')).'" class="btn btn-light btn-sm">View</a></td>';
                         echo '</tr>';
                       }
                       else
                       {
-                        $displayName = $contact[0]->name;
-                        if ($item->from_number == $phone_details[0]->managed_number && strlen($search) > 2) { $displayName = 'You'; }
-                        $bgicon = "light-primary";
-                        $texticon = "primary";
-                        if ($contact[0]->icon == 2) { $bgicon = "light-success"; $texticon = "success"; }
-                        if ($contact[0]->icon == 3) { $bgicon = "light-info"; $texticon = "info"; }
-                        if ($contact[0]->icon == 4) { $bgicon = "light-danger"; $texticon = "danger"; }
-                        if ($contact[0]->icon == 5) { $bgicon = "light-warning"; $texticon = "warning"; }
-                        if ($contact[0]->icon == 6) { $bgicon = "secondary"; $texticon = "dark"; }
+                        $dialbunny_displayName = $dialbunny_contact[0]->name;
+                        if ($dialbunny_item->from_number == $phone_details[0]->managed_number && strlen($search) > 2) { $dialbunny_displayName = 'You'; }
+                        $dialbunny_bgicon = "light-primary";
+                        $dialbunny_texticon = "primary";
+                        if ($dialbunny_contact[0]->icon == 2) { $dialbunny_bgicon = "light-success"; $dialbunny_texticon = "success"; }
+                        if ($dialbunny_contact[0]->icon == 3) { $dialbunny_bgicon = "light-info"; $dialbunny_texticon = "info"; }
+                        if ($dialbunny_contact[0]->icon == 4) { $dialbunny_bgicon = "light-danger"; $dialbunny_texticon = "danger"; }
+                        if ($dialbunny_contact[0]->icon == 5) { $dialbunny_bgicon = "light-warning"; $dialbunny_texticon = "warning"; }
+                        if ($dialbunny_contact[0]->icon == 6) { $dialbunny_bgicon = "secondary"; $dialbunny_texticon = "dark"; }
                         echo '<tr>';
                         echo '<td><div class="d-flex align-items-center">';
                         echo    '<div class="symbol symbol-40px symbol-circle me-5">';
-                        echo      '<span class="symbol-label bg-'.esc_html($bgicon).' text-'.esc_html($texticon).' fs-6 fw-bolder">'.esc_html(ucfirst(substr($contact[0]->name, 0, 1))).'</span>';
+                        echo      '<span class="symbol-label bg-'.esc_html($dialbunny_bgicon).' text-'.esc_html($dialbunny_texticon).' fs-6 fw-bolder">'.esc_html(ucfirst(substr($dialbunny_contact[0]->name, 0, 1))).'</span>';
                         echo    '</div>';
-                        echo '<div class="d-flex flex-column justify-content-center"><a href="'.esc_url(wp_nonce_url($dialbunnyDashboardUrl.'&dashboardpage=messages&phone='.esc_html($phoneNumber).'&countrycode='.esc_html($phoneNumberCountryCode), 'DialBunny', 'user_nonce')).'" class="mb-1 text-gray-800 text-hover-primary">'.esc_html($displayName).'</a><div class="fw-semibold fs-6 text-gray-400">'.esc_html(dialbunny_formatNumber($phoneNumber)).'</div></div></div></td>';
-                        echo '<td>'.esc_html(mb_strimwidth($item->message, 0, 25, "...")).'</td>';
-                        if ($item->reading == 0) { echo '<td><span class="badge badge-light-primary fw-bold px-4 py-3">Unread</span></td>'; }
+                        echo '<div class="d-flex flex-column justify-content-center"><a href="'.esc_url(wp_nonce_url($dialbunnyDashboardUrl.'&dashboardpage=messages&phone='.esc_html($dialbunny_phoneNumber).'&countrycode='.esc_html($dialbunny_phoneNumberCountryCode), 'DialBunny', 'user_nonce')).'" class="mb-1 text-gray-800 text-hover-primary">'.esc_html($dialbunny_displayName).'</a><div class="fw-semibold fs-6 text-gray-400">'.esc_html(dialbunny_formatNumber($dialbunny_phoneNumber)).'</div></div></div></td>';
+                        echo '<td>'.esc_html(mb_strimwidth($dialbunny_item->message, 0, 25, "...")).'</td>';
+                        if ($dialbunny_item->reading == 0) { echo '<td><span class="badge badge-light-primary fw-bold px-4 py-3">Unread</span></td>'; }
                         else { echo '<td><span class="badge badge-light-success fw-bold px-4 py-3">Read</span></td>'; }
-                        echo '<td class="text-end"><a href="'.esc_url(wp_nonce_url($dialbunnyDashboardUrl.'&dashboardpage=messages&phone='.esc_html($phoneNumber).'&countrycode='.esc_html($phoneNumberCountryCode), 'DialBunny', 'user_nonce')).'" class="btn btn-light btn-sm">View</a></td>';
+                        echo '<td class="text-end"><a href="'.esc_url(wp_nonce_url($dialbunnyDashboardUrl.'&dashboardpage=messages&phone='.esc_html($dialbunny_phoneNumber).'&countrycode='.esc_html($dialbunny_phoneNumberCountryCode), 'DialBunny', 'user_nonce')).'" class="btn btn-light btn-sm">View</a></td>';
                         echo '</tr>';
                       }
                     }
-                    if ($opened_item == null)
+                    if ($dialbunny_opened_item == null)
                     {
                       echo '<tr>';
@@ -140 +140 @@
       <div class="separator mb-6"></div>
       <div class="d-flex align-items-center justify-content-center justify-content-md-end">
-        <?php if ($resultsPage > 1 && strlen($search) <= 2)
-        {
-          echo '<a href="' . esc_url(wp_nonce_url($dialbunnyDashboardUrl . '&dashboardpage=messages&resultsPage=' . esc_html($resultsPage - 1), 'DialBunny', 'user_nonce')) .'&list" class="btn btn-light btn-sm me-3">';
+        <?php if ($dialbunny_resultsPage > 1 && strlen($search) <= 2)
+        {
+          echo '<a href="' . esc_url(wp_nonce_url($dialbunnyDashboardUrl . '&dashboardpage=messages&resultsPage=' . esc_html($dialbunny_resultsPage - 1), 'DialBunny', 'user_nonce')) .'&list" class="btn btn-light btn-sm me-3">';
           echo '<span class="menu-bullet">';
           echo '<span class="fa fa-arrow-left"></span>';
@@ -149 +149 @@
         }
         ?>
-        <span class="btn btn-bg-primary btn-sm me-3 text-white"><?php echo esc_html($resultsPage); ?></span>
-        <?php if (isset($opened_item) && ($resultsPage * 12) < $numberOfMessages && strlen($search) <= 2)
-        {
-          echo '<a href="' . esc_url(wp_nonce_url($dialbunnyDashboardUrl . '&dashboardpage=messages&resultsPage=' . esc_html($resultsPage + 1), 'DialBunny', 'user_nonce')) .'&list" class="btn btn-light btn-sm me-3">';
+        <span class="btn btn-bg-primary btn-sm me-3 text-white"><?php echo esc_html($dialbunny_resultsPage); ?></span>
+        <?php if (isset($dialbunny_opened_item) && ($dialbunny_resultsPage * 12) < $numberOfMessages && strlen($search) <= 2)
+        {
+          echo '<a href="' . esc_url(wp_nonce_url($dialbunnyDashboardUrl . '&dashboardpage=messages&resultsPage=' . esc_html($dialbunny_resultsPage + 1), 'DialBunny', 'user_nonce')) .'&list" class="btn btn-light btn-sm me-3">';
           echo '<span class="menu-bullet">';
           echo '<span class="fa fa-arrow-right"></span>';
@@ -170 +170 @@
       {
           // Foreach message
-          foreach ($opened_item as $item)
+          foreach ($dialbunny_opened_item as $dialbunny_item)
           {
             // Check to see if contact exists and make sure the from number does not equal the managed number
-            $phoneNumberCountryCode;
-            $phoneNumber;
-            if ($phone_details[0]->managed_number_code == $item->from_countrycode && $phone_details[0]->managed_number == $item->from_number) { $phoneNumberCountryCode = $item->to_countrycode; $phoneNumber = $item->to_number; }
-            else { $phoneNumberCountryCode = $item->from_countrycode; $phoneNumber = $item->from_number; }
+            $dialbunny_phoneNumberCountryCode;
+            $dialbunny_phoneNumber;
+            if ($phone_details[0]->managed_number_code == $dialbunny_item->from_countrycode && $phone_details[0]->managed_number == $dialbunny_item->from_number) { $dialbunny_phoneNumberCountryCode = $dialbunny_item->to_countrycode; $dialbunny_phoneNumber = $dialbunny_item->to_number; }
+            else { $dialbunny_phoneNumberCountryCode = $dialbunny_item->from_countrycode; $dialbunny_phoneNumber = $dialbunny_item->from_number; }
             // Direct database query used below – $wpdb->prepare() is always used to prevent SQL injection.
-            $contact = $wpdb->get_results($wpdb->prepare("SELECT * FROM {$wpdb->prefix}dialbunny_contacts WHERE user = %d AND countrycode = %s AND phone = %s LIMIT 1",wp_get_current_user()->ID,$phoneNumberCountryCode,$phoneNumber)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
-            if ($contact == null)
+            $dialbunny_contact = $wpdb->get_results($wpdb->prepare("SELECT * FROM {$wpdb->prefix}dialbunny_contacts WHERE user = %d AND countrycode = %s AND phone = %s LIMIT 1",wp_get_current_user()->ID,$dialbunny_phoneNumberCountryCode,$dialbunny_phoneNumber)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+            if ($dialbunny_contact == null)
             {
-              $displayName = dialbunny_formatNumber($phoneNumber);
-              if ($item->from_number == $phone_details[0]->managed_number && strlen($search) > 2) { $displayName = 'You'; }
+              $dialbunny_displayName = dialbunny_formatNumber($dialbunny_phoneNumber);
+              if ($dialbunny_item->from_number == $phone_details[0]->managed_number && strlen($search) > 2) { $dialbunny_displayName = 'You'; }
               echo '<div class="col-md-6 col-xxl-4"><div class="card"><div class="card-body d-flex flex-center flex-column pt-12 p-9">';
               echo '<div class="symbol symbol-65px symbol-circle mb-5"><span class="symbol-label fs-2x fw-semibold text-secondary bg-secondary"></span></div>';
-              echo '<a href="'.esc_url(wp_nonce_url($dialbunnyDashboardUrl.'&dashboardpage=messages&phone='.esc_html($phoneNumber).'&countrycode='.esc_html($phoneNumberCountryCode), 'DialBunny', 'user_nonce')).'" class="fs-4 text-gray-800 text-hover-primary fw-bold mb-0">'.esc_html($displayName).'</a><div class="fw-semibold text-gray-400 mb-6">Not in contacts</div>';
-              if ($item->reading == 0) { echo '<span class="badge badge-light-primary fw-bold px-4 py-3 mb-2">Unread</span>'; }
+              echo '<a href="'.esc_url(wp_nonce_url($dialbunnyDashboardUrl.'&dashboardpage=messages&phone='.esc_html($dialbunny_phoneNumber).'&countrycode='.esc_html($dialbunny_phoneNumberCountryCode), 'DialBunny', 'user_nonce')).'" class="fs-4 text-gray-800 text-hover-primary fw-bold mb-0">'.esc_html($dialbunny_displayName).'</a><div class="fw-semibold text-gray-400 mb-6">Not in contacts</div>';
+              if ($dialbunny_item->reading == 0) { echo '<span class="badge badge-light-primary fw-bold px-4 py-3 mb-2">Unread</span>'; }
               else { echo '<span class="badge badge-light-success fw-bold px-4 py-3 mb-2">Read</span>'; }
-              echo '<div class="p-5 badge badge-light-secondary text-gray-900 fw-semibold mw-lg-400px text-start" data-element="message-text">'.esc_html(mb_strimwidth($item->message, 0, 25, "...")).'</div>';
+              echo '<div class="p-5 badge badge-light-secondary text-gray-900 fw-semibold mw-lg-400px text-start" data-element="message-text">'.esc_html(mb_strimwidth($dialbunny_item->message, 0, 25, "...")).'</div>';
               echo '</div></div></div>';
             }
             else
             {
-              $displayName = $contact[0]->name;
-              if ($item->from_number == $phone_details[0]->managed_number && strlen($search) > 2) { $displayName = 'You'; }
-              $bgicon = "light-primary";
-              $texticon = "primary";
-              if ($contact[0]->icon == 2) { $bgicon = "light-success"; $texticon = "success"; }
-              if ($contact[0]->icon == 3) { $bgicon = "light-info"; $texticon = "info"; }
-              if ($contact[0]->icon == 4) { $bgicon = "light-danger"; $texticon = "danger"; }
-              if ($contact[0]->icon == 5) { $bgicon = "light-warning"; $texticon = "warning"; }
-              if ($contact[0]->icon == 6) { $bgicon = "secondary"; $texticon = "dark"; }
+              $dialbunny_displayName = $dialbunny_contact[0]->name;
+              if ($dialbunny_item->from_number == $phone_details[0]->managed_number && strlen($search) > 2) { $dialbunny_displayName = 'You'; }
+              $dialbunny_bgicon = "light-primary";
+              $dialbunny_texticon = "primary";
+              if ($dialbunny_contact[0]->icon == 2) { $dialbunny_bgicon = "light-success"; $dialbunny_texticon = "success"; }
+              if ($dialbunny_contact[0]->icon == 3) { $dialbunny_bgicon = "light-info"; $dialbunny_texticon = "info"; }
+              if ($dialbunny_contact[0]->icon == 4) { $dialbunny_bgicon = "light-danger"; $dialbunny_texticon = "danger"; }
+              if ($dialbunny_contact[0]->icon == 5) { $dialbunny_bgicon = "light-warning"; $dialbunny_texticon = "warning"; }
+              if ($dialbunny_contact[0]->icon == 6) { $dialbunny_bgicon = "secondary"; $dialbunny_texticon = "dark"; }
               echo '<div class="col-md-6 col-xxl-4"><div class="card"><div class="card-body d-flex flex-center flex-column pt-12 p-9">';
-              echo '<div class="symbol symbol-65px symbol-circle mb-5"><span class="symbol-label fs-2x fw-semibold text-'.esc_html($texticon).' bg-'.esc_html($bgicon).'">'.esc_html(ucfirst(substr($contact[0]->name, 0, 1))).'</span></div>';
-              echo '<a href="'.esc_url(wp_nonce_url($dialbunnyDashboardUrl.'&dashboardpage=messages&phone='.esc_html($phoneNumber).'&countrycode='.esc_html($phoneNumberCountryCode), 'DialBunny', 'user_nonce')).'" class="fs-4 text-gray-800 text-hover-primary fw-bold mb-0">'.esc_html($displayName).'</a><div class="fw-semibold text-gray-400 mb-6">'.esc_html(dialbunny_formatNumber($phoneNumber)).'</div>';
-              if ($item->reading == 0) { echo '<span class="badge badge-light-primary fw-bold px-4 py-3 mb-2">Unread</span>'; }
+              echo '<div class="symbol symbol-65px symbol-circle mb-5"><span class="symbol-label fs-2x fw-semibold text-'.esc_html($dialbunny_texticon).' bg-'.esc_html($dialbunny_bgicon).'">'.esc_html(ucfirst(substr($dialbunny_contact[0]->name, 0, 1))).'</span></div>';
+              echo '<a href="'.esc_url(wp_nonce_url($dialbunnyDashboardUrl.'&dashboardpage=messages&phone='.esc_html($dialbunny_phoneNumber).'&countrycode='.esc_html($dialbunny_phoneNumberCountryCode), 'DialBunny', 'user_nonce')).'" class="fs-4 text-gray-800 text-hover-primary fw-bold mb-0">'.esc_html($dialbunny_displayName).'</a><div class="fw-semibold text-gray-400 mb-6">'.esc_html(dialbunny_formatNumber($dialbunny_phoneNumber)).'</div>';
+              if ($dialbunny_item->reading == 0) { echo '<span class="badge badge-light-primary fw-bold px-4 py-3 mb-2">Unread</span>'; }
               else { echo '<span class="badge badge-light-success fw-bold px-4 py-3 mb-2">Read</span>'; }
-              echo '<div class="p-5 badge badge-light-secondary text-gray-900 fw-semibold mw-lg-400px text-start" data-element="message-text">'.esc_html(mb_strimwidth($item->message, 0, 25, "...")).'</div>';
+              echo '<div class="p-5 badge badge-light-secondary text-gray-900 fw-semibold mw-lg-400px text-start" data-element="message-text">'.esc_html(mb_strimwidth($dialbunny_item->message, 0, 25, "...")).'</div>';
               echo '</div></div></div>';
             }
           }
-          if ($opened_item == null)
+          if ($dialbunny_opened_item == null)
           {
             echo '<div class="col-md-6 col-xxl-4"><div class="card"><div class="card-body d-flex flex-center flex-column pt-12 p-9">';
@@ -227 +227 @@
     </div>
       <div class="d-flex align-items-center justify-content-center justify-content-md-end pt-10">
-        <?php if ($resultsPage > 1 && strlen($search) <= 2)
-        {
-          echo '<a href="' . esc_url(wp_nonce_url($dialbunnyDashboardUrl . '&dashboardpage=messages&resultsPage=' . esc_html($resultsPage - 1), 'DialBunny', 'user_nonce')) .'&block" class="btn btn-secondary btn-sm me-3">';
+        <?php if ($dialbunny_resultsPage > 1 && strlen($search) <= 2)
+        {
+          echo '<a href="' . esc_url(wp_nonce_url($dialbunnyDashboardUrl . '&dashboardpage=messages&resultsPage=' . esc_html($dialbunny_resultsPage - 1), 'DialBunny', 'user_nonce')) .'&block" class="btn btn-secondary btn-sm me-3">';
           echo '<span class="menu-bullet">';
           echo '<span class="fa fa-arrow-left"></span>';
@@ -236 +236 @@
         }
         ?>
-        <span class="btn btn-bg-primary btn-sm me-3 text-white"><?php echo esc_html($resultsPage); ?></span>
-        <?php if (isset($opened_item) && ($resultsPage * 12) < $numberOfMessages && strlen($search) <= 2)
-        {
-          echo '<a href="' . esc_url(wp_nonce_url($dialbunnyDashboardUrl . '&dashboardpage=messages&resultsPage=' . esc_html($resultsPage + 1), 'DialBunny', 'user_nonce')) .'&block" class="btn btn-secondary btn-sm me-3">';
+        <span class="btn btn-bg-primary btn-sm me-3 text-white"><?php echo esc_html($dialbunny_resultsPage); ?></span>
+        <?php if (isset($dialbunny_opened_item) && ($dialbunny_resultsPage * 12) < $numberOfMessages && strlen($search) <= 2)
+        {
+          echo '<a href="' . esc_url(wp_nonce_url($dialbunnyDashboardUrl . '&dashboardpage=messages&resultsPage=' . esc_html($dialbunny_resultsPage + 1), 'DialBunny', 'user_nonce')) .'&block" class="btn btn-secondary btn-sm me-3">';
           echo '<span class="menu-bullet">';
           echo '<span class="fa fa-arrow-right"></span>';

dialbunny/trunk/lib/views/dashboard/messages/messages.php

@@ -4 +4 @@
     <div class="container-xxl" id="content_container">
       <?php
-      $details   = $wpdb->prefix . 'dialbunny_phone_details';
-      $messages  = $wpdb->prefix . 'dialbunny_messages';
-      $contacts  = $wpdb->prefix . 'dialbunny_contacts';
-      $current_user_id = wp_get_current_user()->ID;
+      $dialbunny_details   = $wpdb->prefix . 'dialbunny_phone_details';
+      $dialbunny_messages  = $wpdb->prefix . 'dialbunny_messages';
+      $dialbunny_contacts  = $wpdb->prefix . 'dialbunny_contacts';
+      $dialbunny_current_user_id = wp_get_current_user()->ID;
       // Direct database query used below – $wpdb->prepare() is always used to prevent SQL injection.
-      $phone_details = $wpdb->get_results($wpdb->prepare("SELECT * FROM {$wpdb->prefix}dialbunny_phone_details WHERE user = %d LIMIT 1", $current_user_id)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
-      $numberOfMessages = 0;
-      $numberOfUnread = 0;
-      if (!empty($phone_details[0]->managed_number)) {
-          $managed_number = $phone_details[0]->managed_number;
+      $dialbunny_phone_details = $wpdb->get_results($wpdb->prepare("SELECT * FROM {$wpdb->prefix}dialbunny_phone_details WHERE user = %d LIMIT 1", $dialbunny_current_user_id)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+      $dialbunny_numberOfMessages = 0;
+      $dialbunny_numberOfUnread = 0;
+      if (!empty($dialbunny_phone_details[0]->managed_number)) {
+          $dialbunny_managed_number = $dialbunny_phone_details[0]->managed_number;
           // Direct database query used below – $wpdb->prepare() is always used to prevent SQL injection.
-          $numberOfMessages = $wpdb->get_var($wpdb->prepare("SELECT COUNT(DISTINCT LEAST(from_number, to_number), GREATEST(from_number, to_number)) FROM {$wpdb->prefix}dialbunny_messages WHERE user = %d AND (from_number = %s OR to_number = %s)",$current_user_id,$managed_number,$managed_number)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+          $dialbunny_numberOfMessages = $wpdb->get_var($wpdb->prepare("SELECT COUNT(DISTINCT LEAST(from_number, to_number), GREATEST(from_number, to_number)) FROM {$wpdb->prefix}dialbunny_messages WHERE user = %d AND (from_number = %s OR to_number = %s)",$dialbunny_current_user_id,$dialbunny_managed_number,$dialbunny_managed_number)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
           // Direct database query used below – $wpdb->prepare() is always used to prevent SQL injection.
-          $numberOfUnread = $wpdb->get_var($wpdb->prepare("SELECT COUNT(DISTINCT LEAST(from_number, to_number), GREATEST(from_number, to_number)) FROM {$wpdb->prefix}dialbunny_messages WHERE user = %d AND (from_number = %s OR to_number = %s) AND reading = '0'",$current_user_id,$managed_number,$managed_number)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+          $dialbunny_numberOfUnread = $wpdb->get_var($wpdb->prepare("SELECT COUNT(DISTINCT LEAST(from_number, to_number), GREATEST(from_number, to_number)) FROM {$wpdb->prefix}dialbunny_messages WHERE user = %d AND (from_number = %s OR to_number = %s) AND reading = '0'",$dialbunny_current_user_id,$dialbunny_managed_number,$dialbunny_managed_number)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
       }
-      $resultsPage = 1;
-      $limit = '12';
-      $limit_offset = 0;
-      $limit_count = 12;
+      $dialbunny_resultsPage = 1;
+      $dialbunny_limit = '12';
+      $dialbunny_limit_offset = 0;
+      $dialbunny_limit_count = 12;
       // Handle pagination
       if (isset($_GET['resultsPage']) && is_numeric($_GET['resultsPage']) && intval($_GET['resultsPage']) > 1) {
-          $resultsPage = intval($_GET['resultsPage']);
-          $limit_offset = ($resultsPage - 1) * $limit_count;
+          $dialbunny_resultsPage = intval($_GET['resultsPage']);
+          $dialbunny_limit_offset = ($dialbunny_resultsPage - 1) * $dialbunny_limit_count;
       }
       ?>
@@ -59 +59 @@
                             <span class="fas fa-comments"></span>
                           </i>
-                                                    <div class="fs-4 fw-bold"><?php echo esc_html($numberOfMessages); ?></div>
+                                                    <div class="fs-4 fw-bold"><?php echo esc_html($dialbunny_numberOfMessages); ?></div>
                                                 </div>
-                                                <div class="fw-semibold fs-6 text-gray-400"><?php if ($numberOfMessages < 2) { echo 'Conversation'; } else { echo 'Conversations'; } ?></div>
+                                                <div class="fw-semibold fs-6 text-gray-400"><?php if ($dialbunny_numberOfMessages < 2) { echo 'Conversation'; } else { echo 'Conversations'; } ?></div>
                                             </div>
                                             <div class="border border-gray-300 border-dashed rounded min-w-125px py-3 px-4 me-6 mb-3">
@@ -68 +68 @@
                             <span class="fas fa-commenting"></span>
                           </i>
-                                                    <div class="fs-4 fw-bold counted"><?php echo esc_html($numberOfUnread); ?></div>
+                                                    <div class="fs-4 fw-bold counted"><?php echo esc_html($dialbunny_numberOfUnread); ?></div>
                                                 </div>
                                                 <div class="fw-semibold fs-6 text-gray-400">Unread</div>
@@ -97 +97 @@
         if (isset($_GET['phone']) && isset($_GET['countrycode']))
         {
-          $current_user_id = get_current_user_id();
-          $phone           = sanitize_text_field(wp_unslash($_GET['phone'] ?? ''));
-          $countrycode     = '+' . preg_replace('/[^0-9]/', '', sanitize_text_field(wp_unslash($_GET['countrycode'] ?? '')));
-          $managed_number  = $phone_details[0]->managed_number ?? '';
+          $dialbunny_current_user_id = get_current_user_id();
+          $dialbunny_phone           = sanitize_text_field(wp_unslash($_GET['phone'] ?? ''));
+          $dialbunny_countrycode     = '+' . preg_replace('/[^0-9]/', '', sanitize_text_field(wp_unslash($_GET['countrycode'] ?? '')));
+          $dialbunny_managed_number  = $dialbunny_phone_details[0]->managed_number ?? '';
           // Direct database query used below – $wpdb->prepare() is always used to prevent SQL injection.
-          $opened_item = $wpdb->get_results($wpdb->prepare("SELECT * FROM {$wpdb->prefix}dialbunny_messages WHERE user = %d AND (to_number = %s OR to_number = %s) AND (from_number = %s OR from_number = %s) ORDER BY created_at DESC LIMIT 40",$current_user_id,$phone,$managed_number,$managed_number,$phone)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+          $dialbunny_opened_item = $wpdb->get_results($wpdb->prepare("SELECT * FROM {$wpdb->prefix}dialbunny_messages WHERE user = %d AND (to_number = %s OR to_number = %s) AND (from_number = %s OR from_number = %s) ORDER BY created_at DESC LIMIT 40",$dialbunny_current_user_id,$dialbunny_phone,$dialbunny_managed_number,$dialbunny_managed_number,$dialbunny_phone)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
           // Direct database query used below – $wpdb->prepare() is always used to prevent SQL injection.
-          $contact = $wpdb->get_results($wpdb->prepare("SELECT * FROM {$wpdb->prefix}dialbunny_contacts WHERE user = %d AND countrycode = %s AND phone = %s LIMIT 1",$current_user_id,$countrycode,$phone)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
-          if ($opened_item != null) { include('view.php'); }
+          $dialbunny_contact = $wpdb->get_results($wpdb->prepare("SELECT * FROM {$wpdb->prefix}dialbunny_contacts WHERE user = %d AND countrycode = %s AND phone = %s LIMIT 1",$dialbunny_current_user_id,$dialbunny_countrycode,$dialbunny_phone)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+          if ($dialbunny_opened_item != null) { include('view.php'); }
           else { include('default.php'); }
         }

dialbunny/trunk/lib/views/dashboard/messages/view.php

@@ -30 +30 @@
     <div class="card-body pt-5">
       <div style="overflow: auto; display: flex; flex-direction: column-reverse;" class="scroll-y me-n5 pe-5 h-500px" style="max-height: 496px;">
-        <?php foreach ($opened_item as $item)
+        <?php foreach ($opened_item as $dialbunny_item)
             {
               // Set messages to read
-              $data = array();
-              $data['reading'] = 1;
+              $dialbunny_data = array();
+              $dialbunny_data['reading'] = 1;
               // Direct database query used below – $wpdb->prepare() is always used to prevent SQL injection.
-              $wpdb->update($messages,$data,array('user' => wp_get_current_user()->ID,'id' => sanitize_text_field($item->id)), null, array('%d', '%s')); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+              $wpdb->update($messages,$dialbunny_data,array('user' => wp_get_current_user()->ID,'id' => sanitize_text_field($dialbunny_item->id)), null, array('%d', '%s')); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
                             // check if it's the client or user talking
-                            if ($item->from_number == sanitize_text_field(wp_unslash($_GET['phone'])))
+                            if ($dialbunny_item->from_number == sanitize_text_field(wp_unslash($_GET['phone'])))
                             {
                                 // user
@@ -47 +47 @@
                   if ($contact != null) { echo '<a class="fs-5 fw-bold text-gray-900 me-1">'.esc_html($contact[0]->name).'</a>'; }
                 else { echo '<a class="fs-5 fw-bold text-gray-900 me-1">'.esc_html(dialbunny_formatNumber(sanitize_text_field(wp_unslash($_GET['phone'] ?? '')))).'</a>'; }
-                  echo '<span class="text-muted fs-7 mb-1">'.esc_html(dialbunny_timeElapsed($item->created_at)).'</span>';
+                  echo '<span class="text-muted fs-7 mb-1">'.esc_html(dialbunny_timeElapsed($dialbunny_item->created_at)).'</span>';
                   echo '</div>';
                   echo '</div>';
-                  echo '<div class="p-5 rounded bg-light-info text-gray-900 fw-semibold mw-lg-400px text-start" data-element="message-text">'.esc_html($item->message).'</div>';
+                  echo '<div class="p-5 rounded bg-light-info text-gray-900 fw-semibold mw-lg-400px text-start" data-element="message-text">'.esc_html($dialbunny_item->message).'</div>';
                   echo '</div>';
                   echo '</div>';
@@ -61 +61 @@
                                 echo '<div class="d-flex align-items-center mb-2">';
                                 echo '<div class="me-3">';
-                                echo '<span class="text-muted fs-7 mb-1">'.esc_html(dialbunny_timeElapsed($item->created_at)).'</span>';
-                                if (substr($item->id, -3) == 'you' && strlen($item->id) > 13) { echo '<a class="fs-5 fw-bold text-gray-900 ms-1">You</a>'; }
+                                echo '<span class="text-muted fs-7 mb-1">'.esc_html(dialbunny_timeElapsed($dialbunny_item->created_at)).'</span>';
+                                if (substr($dialbunny_item->id, -3) == 'you' && strlen($dialbunny_item->id) > 13) { echo '<a class="fs-5 fw-bold text-gray-900 ms-1">You</a>'; }
                                 else { echo '<a class="fs-5 fw-bold text-gray-900 ms-1">You</a>'; }
                                 echo '</div>';
                                 echo '</div>';
-                                echo '<div class="p-5 rounded bg-light-primary text-gray-900 fw-semibold mw-lg-400px text-end" data-element="message-text">'.esc_html($item->message).'</div>';
+                                echo '<div class="p-5 rounded bg-light-primary text-gray-900 fw-semibold mw-lg-400px text-end" data-element="message-text">'.esc_html($dialbunny_item->message).'</div>';
                                 echo '</div>';
                                 echo '</div>';

dialbunny/trunk/lib/views/dashboard/recents.php

@@ -4 +4 @@
   <div class="container-xxl" id="content_container">
     <?php
-    $user_id = wp_get_current_user()->ID;
     // Direct database query used below – $wpdb->prepare() is always used to prevent SQL injection.
-    $saveData = $wpdb->get_results($wpdb->prepare("SELECT * FROM {$wpdb->prefix}dialbunny_phone_details WHERE user = %d LIMIT 1", wp_get_current_user()->ID)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
-    $opened_details = $wpdb->get_results($wpdb->prepare("SELECT managed_number_code, managed_number FROM {$wpdb->prefix}dialbunny_phone_details WHERE user = %d LIMIT 1", $user_id)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
-    $table = $wpdb->prefix . 'dialbunny_recents';
-    $opened_item = array();
-    $recents_page = 1;
-    $limit = 10;
-    $offset = 0;
+    $dialbunny_saveData = $wpdb->get_results($wpdb->prepare("SELECT * FROM {$wpdb->prefix}dialbunny_phone_details WHERE user = %d LIMIT 1", wp_get_current_user()->ID)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+    $dialbunny_opened_details = $wpdb->get_results($wpdb->prepare("SELECT managed_number_code, managed_number FROM {$wpdb->prefix}dialbunny_phone_details WHERE user = %d LIMIT 1", wp_get_current_user()->ID)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+    $dialbunny_opened_item = array();
+    $dialbunny_recents_page = 1;
+    $dialbunny_limit = 10;
+    $dialbunny_offset = 0;
     if (isset($_GET['recentspage']) && is_numeric($_GET['recentspage']) && $_GET['recentspage'] > 1) {
-        $recents_page = (int) $_GET['recentspage'];
-        $offset = ($recents_page - 1) * $limit;
+        $dialbunny_recents_page = (int) $_GET['recentspage'];
+        $dialbunny_offset = ($dialbunny_recents_page - 1) * $dialbunny_limit;
     }
-    if (!empty($opened_details[0]->managed_number)) {
+    if (!empty($dialbunny_opened_details[0]->managed_number)) {
       // Direct database query used below – $wpdb->prepare() is always used to prevent SQL injection.
-      $opened_item = $wpdb->get_results($wpdb->prepare("SELECT * FROM {$wpdb->prefix}dialbunny_recents WHERE to_number = %s OR from_number = %s ORDER BY created_at DESC LIMIT %d OFFSET %d",$opened_details[0]->managed_number,$opened_details[0]->managed_number,$limit,$offset)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+      $dialbunny_opened_item = $wpdb->get_results($wpdb->prepare("SELECT * FROM {$wpdb->prefix}dialbunny_recents WHERE to_number = %s OR from_number = %s ORDER BY created_at DESC LIMIT %d OFFSET %d",$dialbunny_opened_details[0]->managed_number,$dialbunny_opened_details[0]->managed_number,$dialbunny_limit,$dialbunny_offset)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
     }
     ?>
@@ -27 +25 @@
           <h3 class="card-title">Recents</h3>
           <div class="card-toolbar">
-          <?php if ($recents_page > 1)
+          <?php if ($dialbunny_recents_page > 1)
           {
-            echo '<a href="' . esc_url(admin_url('admin.php?page=dialbunny_dashboard')) . '&dashboardpage=recents&user_nonce='.esc_attr(sanitize_text_field(wp_unslash($_GET['user_nonce']))).'&recentspage=' . esc_html($recents_page - 1) .'" class="btn btn-light btn-sm me-3">';
+            echo '<a href="' . esc_url(admin_url('admin.php?page=dialbunny_dashboard')) . '&dashboardpage=recents&user_nonce='.esc_attr(sanitize_text_field(wp_unslash($_GET['user_nonce']))).'&recentspage=' . esc_html($dialbunny_recents_page - 1) .'" class="btn btn-light btn-sm me-3">';
                         echo '<span class="menu-bullet">';
                         echo '<span class="fa fa-arrow-left"></span>';
@@ -36 +34 @@
           }
           ?>
-          <span class="btn btn-bg-primary btn-sm me-3 text-white"><?php echo esc_html($recents_page); ?></span>
-          <?php if (isset($opened_item) && count($opened_item) == 10)
+          <span class="btn btn-bg-primary btn-sm me-3 text-white"><?php echo esc_html($dialbunny_recents_page); ?></span>
+          <?php if (isset($dialbunny_opened_item) && count($dialbunny_opened_item) == 10)
           {
-                        echo '<a href="' . esc_url(admin_url('admin.php?page=dialbunny_dashboard')) . '&dashboardpage=recents&user_nonce='.esc_attr(sanitize_text_field(wp_unslash($_GET['user_nonce']))).'&recentspage=' . esc_html($recents_page + 1) .'" class="btn btn-light btn-sm me-3">';
+                        echo '<a href="' . esc_url(admin_url('admin.php?page=dialbunny_dashboard')) . '&dashboardpage=recents&user_nonce='.esc_attr(sanitize_text_field(wp_unslash($_GET['user_nonce']))).'&recentspage=' . esc_html($dialbunny_recents_page + 1) .'" class="btn btn-light btn-sm me-3">';
                         echo '<span class="menu-bullet">';
                         echo '<span class="fa fa-arrow-right"></span>';
@@ -50 +48 @@
         <div class="card-body">
           <div class="table-responsive"> <?php
-            if (isset($opened_item) && $opened_item != null)
+            if (isset($dialbunny_opened_item) && $dialbunny_opened_item != null)
             {
               echo '<table class="table table-hover table-rounded table-striped border border-gray-300 border-dashed gy-7 gs-7">';
               echo '<tbody>';
-              foreach ($opened_item as $record)
+              foreach ($dialbunny_opened_item as $dialbunny_record)
               {
-                $table_contacts = $wpdb->prefix . 'dialbunny_contacts';
                 echo '<tr class="align-middle">';
                 // if recent number is outbound or inbound
-                if($record->to_countrycode.$record->to_number == $saveData[0]->managed_number_code.$saveData[0]->managed_number)
+                if($dialbunny_record->to_countrycode.$dialbunny_record->to_number == $dialbunny_saveData[0]->managed_number_code.$dialbunny_saveData[0]->managed_number)
                 {
                   // Direct database query used below – $wpdb->prepare() is always used to prevent SQL injection.
-                  $opened_contact = $wpdb->get_results($wpdb->prepare("SELECT name,id FROM {$wpdb->prefix}dialbunny_contacts WHERE user = %d AND countrycode = %s AND phone = %s LIMIT 1", $user_id, $record->from_countrycode, $record->from_number)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
-                  echo '<td class="col-6">' . esc_html( !empty($opened_contact[0]->name) ? $opened_contact[0]->name : $record->from_countrycode.' '.dialbunny_formatNumber($record->from_number) ) . '<br><span class="phone-inbound"></span><span class="px-3">' . esc_html(dialbunny_timeElapsed($record->created_at)) . '</span></td>';
-                  if ($opened_contact == null) { echo '<td class="col-6"><div class="d-flex justify-content-end"><a href="' . esc_url(admin_url('admin.php?page=dialbunny_dashboard')) . '&dashboardpage=contacts&contact=new&newnumbercountrycode='. esc_html($record->from_countrycode) .'&user_nonce='.esc_attr(sanitize_text_field(wp_unslash($_GET['user_nonce']))).'&newnumber='. esc_html($record->from_number) .'"  class="btn border btn-sm btn-active-light-primary">Create Contact</a></div></td>'; }
-                  else { echo '<td class="col-6"><div class="d-flex justify-content-end"><a href="' . esc_url(admin_url('admin.php?page=dialbunny_dashboard')) . '&dashboardpage=contacts&user_nonce='.esc_attr(sanitize_text_field(wp_unslash($_GET['user_nonce']))).'&contact='. esc_html($opened_contact[0]->id) .'"  class="btn border btn-sm btn-active-light-primary">View Contact</a></div></td>'; }
+                  $dialbunny_opened_contact = $wpdb->get_results($wpdb->prepare("SELECT name,id FROM {$wpdb->prefix}dialbunny_contacts WHERE user = %d AND countrycode = %s AND phone = %s LIMIT 1", wp_get_current_user()->ID, $dialbunny_record->from_countrycode, $dialbunny_record->from_number)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+                  echo '<td class="col-6">' . esc_html( !empty($dialbunny_opened_contact[0]->name) ? $dialbunny_opened_contact[0]->name : $dialbunny_record->from_countrycode.' '.dialbunny_formatNumber($dialbunny_record->from_number) ) . '<br><span class="phone-inbound"></span><span class="px-3">' . esc_html(dialbunny_timeElapsed($dialbunny_record->created_at)) . '</span></td>';
+                  if ($dialbunny_opened_contact == null) { echo '<td class="col-6"><div class="d-flex justify-content-end"><a href="' . esc_url(admin_url('admin.php?page=dialbunny_dashboard')) . '&dashboardpage=contacts&contact=new&newnumbercountrycode='. esc_html($dialbunny_record->from_countrycode) .'&user_nonce='.esc_attr(sanitize_text_field(wp_unslash($_GET['user_nonce']))).'&newnumber='. esc_html($dialbunny_record->from_number) .'"  class="btn border btn-sm btn-active-light-primary">Create Contact</a></div></td>'; }
+                  else { echo '<td class="col-6"><div class="d-flex justify-content-end"><a href="' . esc_url(admin_url('admin.php?page=dialbunny_dashboard')) . '&dashboardpage=contacts&user_nonce='.esc_attr(sanitize_text_field(wp_unslash($_GET['user_nonce']))).'&contact='. esc_html($dialbunny_opened_contact[0]->id) .'"  class="btn border btn-sm btn-active-light-primary">View Contact</a></div></td>'; }
                 }
                 else
                 {
                   // Direct database query used below – $wpdb->prepare() is always used to prevent SQL injection.
-                  $opened_contact = $wpdb->get_results($wpdb->prepare("SELECT name,id FROM {$wpdb->prefix}dialbunny_contacts WHERE user = %d AND countrycode = %s AND phone = %s LIMIT 1", $user_id, $record->to_countrycode, $record->to_number)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
-                  echo '<td class="col-6">' . esc_html( !empty($opened_contact[0]->name) ? $opened_contact[0]->name : $record->to_countrycode.' '.dialbunny_formatNumber($record->to_number) ) . '<br><span class="phone-outbound"></span><span class="px-3">' . esc_html(dialbunny_timeElapsed($record->created_at)) . '</span></td>';
-                  if ($opened_contact == null) { echo '<td class="col-6"><div class="d-flex justify-content-end"><a href="' . esc_url(admin_url('admin.php?page=dialbunny_dashboard')) . '&dashboardpage=contacts&contact=new&newnumbercountrycode='. esc_html($record->from_countrycode) .'&user_nonce='.esc_attr(sanitize_text_field(wp_unslash($_GET['user_nonce']))).'&newnumber='. esc_html($record->to_number) .'"  class="btn border btn-sm btn-active-light-primary">Create Contact</a></div></td>'; }
-                  else { echo '<td class="col-6"><div class="d-flex justify-content-end"><a href="' . esc_url(admin_url('admin.php?page=dialbunny_dashboard')) . '&dashboardpage=contacts&user_nonce='.esc_attr(sanitize_text_field(wp_unslash($_GET['user_nonce']))).'&contact='. esc_html($opened_contact[0]->id) .'"  class="btn border btn-sm btn-active-light-primary">View Contact</a></div></td>'; }
+                  $dialbunny_opened_contact = $wpdb->get_results($wpdb->prepare("SELECT name,id FROM {$wpdb->prefix}dialbunny_contacts WHERE user = %d AND countrycode = %s AND phone = %s LIMIT 1", wp_get_current_user()->ID, $dialbunny_record->to_countrycode, $dialbunny_record->to_number)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+                  echo '<td class="col-6">' . esc_html( !empty($dialbunny_opened_contact[0]->name) ? $dialbunny_opened_contact[0]->name : $dialbunny_record->to_countrycode.' '.dialbunny_formatNumber($dialbunny_record->to_number) ) . '<br><span class="phone-outbound"></span><span class="px-3">' . esc_html(dialbunny_timeElapsed($dialbunny_record->created_at)) . '</span></td>';
+                  if ($dialbunny_opened_contact == null) { echo '<td class="col-6"><div class="d-flex justify-content-end"><a href="' . esc_url(admin_url('admin.php?page=dialbunny_dashboard')) . '&dashboardpage=contacts&contact=new&newnumbercountrycode='. esc_html($dialbunny_record->from_countrycode) .'&user_nonce='.esc_attr(sanitize_text_field(wp_unslash($_GET['user_nonce']))).'&newnumber='. esc_html($dialbunny_record->to_number) .'"  class="btn border btn-sm btn-active-light-primary">Create Contact</a></div></td>'; }
+                  else { echo '<td class="col-6"><div class="d-flex justify-content-end"><a href="' . esc_url(admin_url('admin.php?page=dialbunny_dashboard')) . '&dashboardpage=contacts&user_nonce='.esc_attr(sanitize_text_field(wp_unslash($_GET['user_nonce']))).'&contact='. esc_html($dialbunny_opened_contact[0]->id) .'"  class="btn border btn-sm btn-active-light-primary">View Contact</a></div></td>'; }
                 }
                 echo '</tr>';

dialbunny/trunk/lib/views/dashboard/released.php

@@ -4 +4 @@
   <div class="container-xxl" id="content_container">
     <?php
-    $table = $wpdb->prefix . 'dialbunny_released_numbers';
-    $current_user_id = wp_get_current_user()->ID;
     // Direct database query used below – $wpdb->prepare() is always used to prevent SQL injection.
-    $opened_item = $wpdb->get_results($wpdb->prepare("SELECT * FROM {$wpdb->prefix}dialbunny_released_numbers WHERE user = %d LIMIT 50", $current_user_id)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+    $dialbunny_opened_item = $wpdb->get_results($wpdb->prepare("SELECT * FROM {$wpdb->prefix}dialbunny_released_numbers WHERE user = %d LIMIT 50", wp_get_current_user()->ID)); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
     ?>
 <?php if (isset($_GET['erroraddingnumber'])) { echo wp_kses_post(dialbunny_main_danger("Phone Number Could Not Be Added", "An error has occurred and we could not process your request.")); }  ?>
@@ -30 +28 @@
         <div class="card-body">
           <div class="table-responsive"> <?php
-            if ($opened_item != null)
+            if ($dialbunny_opened_item != null)
             {
               echo '<table class="table table-hover table-rounded table-striped border border-gray-300 border-dashed gy-7 gs-7">';
@@ -42 +40 @@
               echo '</thead>';
               echo '<tbody>';
-              foreach ($opened_item as $record)
+              foreach ($dialbunny_opened_item as $dialbunny_record)
               {
                 echo '<tr class="align-middle">';
-                  echo '<td class="col-3">' . esc_html(dialbunny_formatNumber($record->phone)) . '</td>';
-                  echo '<td class="col-2">' . esc_html(dialbunny_timeElapsed($record->created_at)) . '</td>';
+                  echo '<td class="col-3">' . esc_html(dialbunny_formatNumber($dialbunny_record->phone)) . '</td>';
+                  echo '<td class="col-2">' . esc_html(dialbunny_timeElapsed($dialbunny_record->created_at)) . '</td>';
                   echo '<td class="col-2"><span class="badge badge-success">None</span></td>';
-                  echo '<td class="col-2"><button type="submit" onclick="document.getElementById(\'requestedNumber\').value = \'' . esc_html($record->phone) . '\'; document.getElementById(\'countrycode\').value = \'' . esc_html($record->countrycode) . '\'; document.getElementById(\'requestedNumberUI\').innerHTML = \'' . esc_html($record->countrycode) . ' ' . esc_html($record->phone) . '\';" class="btn border btn-sm btn-active-light-primary" data-bs-toggle="modal" data-bs-target="#modal_1">Re-Request</button></td>';
+                  echo '<td class="col-2"><button type="submit" onclick="document.getElementById(\'requestedNumber\').value = \'' . esc_html($dialbunny_record->phone) . '\'; document.getElementById(\'countrycode\').value = \'' . esc_html($dialbunny_record->countrycode) . '\'; document.getElementById(\'requestedNumberUI\').innerHTML = \'' . esc_html($dialbunny_record->countrycode) . ' ' . esc_html($dialbunny_record->phone) . '\';" class="btn border btn-sm btn-active-light-primary" data-bs-toggle="modal" data-bs-target="#modal_1">Re-Request</button></td>';
                 echo '</tr>';
               }

dialbunny/trunk/readme.txt

@@ -3 +3 @@
 Requires at least: 6.2
 Tested up to: 6.8
-Stable tag: 1.1.5
+Stable tag: 1.1.6
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html