Changeset 1974791

Timestamp:

11/15/2018 10:51:17 AM (7 years ago)

Author:

darklrd

Message:

Always open App dashboard over SSL

Location:

iflychat/trunk

Files:

• iflychat.php (modified) (7 diffs)
• readme.txt (modified) (4 diffs)

iflychat/trunk/iflychat.php

@@ -2 +2 @@
 /**
  * @package iflychat
- * @version 4.4
+ * @version 4.5
  */
 /*
@@ -9 +9 @@
 Description: One on one chat, Multiple chatrooms, Embedded chatrooms
 Author: iFlyChat Team
-Version: 4.4
+Version: 4.5
 Author URI: https://iflychat.com/
 */
@@ -60 +60 @@
 }
 
-define('IFLYCHAT_PLUGIN_VERSION', 'WP-4.4');
+define('IFLYCHAT_PLUGIN_VERSION', 'WP-4.5');
 if (!defined('IFLYCHAT_DEBUG')) {
   define('IFLYCHAT_DEBUG',          false);
@@ -511 +511 @@
         <?php
         if ($active_tab == 'plugin_settings') {
-          $result = _iflychat_get_auth();
+            // $result = null;
+            // if(!iflychat_chatcamp_check()) {
+            $result = _iflychat_get_auth();
+            
+            
           if(gettype($result) == 'array'){
 
@@ -649 +653 @@
     <?php
   } else {
-    $iflychat_host = DRUPALCHAT_EXTERNAL_A_HOST;
-    $host = explode("/", $iflychat_host);
-    $host_name = $host[2];
-    if (isset($_SESSION['token']) && !empty($_SESSION['token'])) {
-      $token = $_SESSION['token'];
-    } else {
-      $token = _iflychat_get_auth()->key;
-    }
-    $dashboardUrl = "//cdn.iflychat.com/apps/dashboard/#/settings/app?sessid=" . $token . "&hostName=" . $host_name . "&hostPort=" . DRUPALCHAT_EXTERNAL_A_PORT;
+    $dashboardUrl = "https://dashboard.chatcamp.io";
+    if(!iflychat_chatcamp_check()) {
+        $iflychat_host = DRUPALCHAT_EXTERNAL_A_HOST;
+        $host = explode("/", $iflychat_host);
+        $host_name = $host[2];
+        if (isset($_SESSION['token']) && !empty($_SESSION['token'])) {
+        $token = $_SESSION['token'];
+        } else {
+        $token = _iflychat_get_auth()->key;
+        }   
+        $dashboardUrl = "https://cdn.iflychat.com/apps/dashboard/#/settings/app?sessid=" . $token . "&hostName=" . $host_name . "&hostPort=" . DRUPALCHAT_EXTERNAL_A_PORT;
+    }
     ?>
     <br/>
@@ -737 +744 @@
 function iflychat_validate_fields(){
     $app_id = iflychat_get_option('iflychat_app_id');
-    if(strlen($app_id) == 36 && $app_id[14] == '4'){
+    if(iflychat_chatcamp_check() || (strlen($app_id) == 36 && $app_id[14] == '4')){
         return true;
         //$errors->add( 'iflychat_app_id_error', __( '<strong>ERROR</strong>: Invalid APP ID.' ) );
@@ -1197 +1204 @@
     // return true;
     if(!empty(iflychat_get_option('iflychat_app_id'))) {
-        if(strpos(iflychat_get_option('iflychat_app_id'), '-') === false && strlen(iflychat_get_option('iflychat_app_id')) > 10) {
+        if(strpos(iflychat_get_option('iflychat_app_id'), '-') === false && strlen(iflychat_get_option('iflychat_app_id')) == 19) {
             return true;
         }

iflychat/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 3.0
 Tested up to: 4.9
-Stable tag: 4.4
+Stable tag: 4.5
 Tags: buddypress, chat, chat room, community, embed chat, friends, group chat, html5 chat, one to one chat, live chat, popup chat, mobile chat, multisite, wordpress chat, wp chat, ultimate member
 License: GPLv2 or later
@@ -138 +138 @@
 == Changelog ==
 
+= 4.5 =
+
+15/11/2018: Always open App dashboard over SSL.
+
 = 4.4 =
 
@@ -425 +429 @@
 == Upgrade Notice ==
 
+= 4.5 =
+After updating, go to iFlyChat Settings page and click on Update button.
+
 = 4.4 =
 After updating, go to iFlyChat Settings page and click on Update button.
@@ -449 +456 @@
 After updating, go to iFlyChat Settings page and click on Update button.
 
-= 4.2.1 =
-After updating, go to iFlyChat Settings page and click on Update button.
-
+