Build 5

Mobile support fix.
iflylabs · Jul 2, 2014 · 1ccca7f · 1ccca7f
1 parent d0d7310
commit 1ccca7f
Show file tree

Hide file tree

Showing 7 changed files with 257 additions and 4 deletions.
diff --git a/helper.php b/helper.php
@@ -544,13 +544,14 @@ public function default_path(){
 
         $defaultPath = 'base/media-panel';
         $path = mb_strtolower(OW::getRouter()->getUri());
-        $var = explode("/", $path);;
+        $var = explode("/", $path);
+        if(!empty($var[1])){
         $path = $var[0]."/".$var[1];
         $page_match = $this->iflychat_match_path($path, $defaultPath);
 
-
         return $page_match;
-
+        }
+        else return null;
     }
 
 

diff --git a/mobile/classes/event_handler.php b/mobile/classes/event_handler.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * @package iFlyChat
+ * @version 1.0.0
+ * @copyright Copyright (C) 2014 iFlyChat. All rights reserved.
+ * @license GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ * @author iFlyChat Team
+ * @link https://iflychat.com
+ */
+class IFLYCHAT_MCLASS_EventHandler
+{
+
+
+    private static $classInstance;
+
+
+    public static function getInstance()
+    {
+        if ( self::$classInstance === null )
+        {
+            self::$classInstance = new self();
+        }
+
+        return self::$classInstance;
+    }
+
+    public function genericInit()
+    {
+        OW::getEventManager()->bind(OW_EventManager::ON_FINALIZE, array($this, 'onPluginInit'));
+       // OW::getEventManager()->bind('admin.add_auth_labels', array($this, 'onCollectAuthLabels'));
+
+
+    }
+
+    public function init()
+    {
+        $this->genericInit();
+    }
+
+    public function onPluginInit()
+    {
+
+        $im_toolbar = new IFLYCHAT_MCMP_Toolbar();
+        OW::getDocument()->appendBody($im_toolbar->render());
+    }
+
+
+//    public function onCollectAuthLabels( BASE_CLASS_EventCollector $event )
+//    {
+//        $language = OW::getLanguage();
+//        $event->add(
+//            array(
+//                'iflychat' => array(
+//                    'label' => $language->text('iflychat', 'auth_group_label'),
+//                    'actions' => array(
+//                        'add_chat' => $language->text('iflychat', 'auth_action_label_chat'),
+//                        'mod' => $language->text('iflychat', 'auth_action_label_admin')
+//                    )
+//                )
+//            )
+//        );
+//
+//    }
+
+
+}
diff --git a/mobile/components/toolbar.php b/mobile/components/toolbar.php
@@ -0,0 +1,159 @@
+<?php
+/**
+ * @package iFlyChat
+ * @version 1.0.0
+ * @copyright Copyright (C) 2014 iFlyChat. All rights reserved.
+ * @license GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ * @author iFlyChat Team
+ * @link https://iflychat.com
+ */
+require_once(OW_DIR_PLUGIN.'iflychat'.DS.'helper.php');
+define('IFLYCHAT_URL', '.iflychat.com');
+
+
+class IFLYCHAT_MCMP_Toolbar extends OW_MobileComponent {
+
+    public function render()
+    {
+
+        $obj = new iflychatHelper;
+
+
+        $variable_get = $obj->params('iflychat_ext_d_i');
+
+
+        define('IFLYCHAT_EXTERNAL_HOST', 'http://api'.$variable_get.'.iflychat.com');
+        define('IFLYCHAT_EXTERNAL_PORT', '80');
+        define('IFLYCHAT_EXTERNAL_A_HOST', 'https://api'.$variable_get.'.iflychat.com');
+        define('IFLYCHAT_EXTERNAL_A_PORT', '443');
+
+
+
+        if($obj->params('iflychat_theme') == 1) {
+            $iflychat_theme = 'light';
+        }
+        else {
+            $iflychat_theme = 'dark';
+        }
+
+        $language = OW::getLanguage();
+
+        $iflychat_settings = array(
+
+            //  'username' => ($user->id)?$user->name:'default', //$a_name
+            // 'uid' =>  $user->id,    //($user->id)?$user->id:'0-'._drupalchat_get_sid(),
+            'current_timestamp' => time(),
+            'polling_method' => '', //$polling_method
+            'pollUrl' => '',
+            'sendUrl' => '',
+            'statusUrl' => '',
+            'status' => '',
+            'goOnline' => $language->text('iflychat','MOD_GO_ONLINE'),
+            'goIdle' => $language->text('iflychat','MOD_GO_IDLE'),
+            'newMessage' => $language->text('iflychat','MOD_NEW_CHAT_MESSAGE'),
+            'images' => OW::getPluginManager()->getPlugin('iflychat')->getStaticUrl() . 'themes/' . $iflychat_theme . '/images/',
+            'sound' => OW::getPluginManager()->getPlugin('iflychat')->getStaticUrl() . 'swf/sound.swf',
+            'soundFile' => OW::getPluginManager()->getPlugin('iflychat')->getStaticUrl() . 'wav/notification.mp3',
+            'noUsers' => '',
+            'smileyURL' => OW::getPluginManager()->getPlugin('iflychat')->getStaticUrl() . 'smileys/very_emotional_emoticons-png/png-32x32/',
+            'addUrl' => '',
+            'notificationSound' => $obj->params('iflychat_notification_sound'),
+            'exurl' => OW::getRouter()->getBaseUrl().'iflychat/iflychat/auth',
+            'mobileWebUrl' => OW::getRouter()->getBaseUrl().'iflychat/iflychat/mobileauth',
+            'soffurl' => '',
+            'chat_type' => $obj->params('iflychat_show_admin_list'),
+            'guestPrefix' => $obj->params('iflychat_anon_prefix'),
+            'changeurl' => '',
+            'allowSmileys' => $obj->params('iflychat_enable_smileys'),
+            'admin' => $obj->iflychat_check_chat_admin()?'1':'0'
+
+        );
+        if($obj->iflychat_check_chat_admin()) {
+
+            $iflychat_settings['arole'] = $obj->roleArray();;
+
+
+        }
+
+
+
+        $iflychat_settings['iup'] = $obj->params('iflychat_user_picture');
+        if($obj->params('iflychat_user_picture') ==1) {
+            $iflychat_settings['default_up'] = OW::getPluginManager()->getPlugin('iflychat')->getStaticUrl() . 'themes/' . $iflychat_theme . '/images/default_avatar.png';
+            $iflychat_settings['default_cr'] = OW::getPluginManager()->getPlugin('iflychat')->getStaticUrl() . 'themes/' . $iflychat_theme . '/images/default_room.png';
+            $iflychat_settings['default_team'] = OW::getPluginManager()->getPlugin('iflychat')->getStaticUrl() . 'themes/' . $iflychat_theme . '/images/default_team.png';
+        }
+
+        if($obj->isSSL()) {
+            $iflychat_settings['external_host'] = IFLYCHAT_EXTERNAL_A_HOST;
+            $iflychat_settings['external_port'] = IFLYCHAT_EXTERNAL_A_PORT;
+            $iflychat_settings['external_a_host'] = IFLYCHAT_EXTERNAL_A_HOST;
+            $iflychat_settings['external_a_port'] = IFLYCHAT_EXTERNAL_A_PORT;
+        }
+        else {
+            $iflychat_settings['external_host'] = IFLYCHAT_EXTERNAL_HOST;
+            $iflychat_settings['external_port'] = IFLYCHAT_EXTERNAL_PORT;
+            $iflychat_settings['external_a_host'] = IFLYCHAT_EXTERNAL_HOST;
+            $iflychat_settings['external_a_port'] = IFLYCHAT_EXTERNAL_PORT;
+        }
+
+
+
+        $iflychat_settings['text_currently_offline'] = $language->text('iflychat','MOD_USER_CURRENTLY_OFFLINE');
+        $iflychat_settings['text_is_typing'] = $language->text('iflychat','MOD_USER_IS_TYPING');
+        $iflychat_settings['text_close'] = $language->text('iflychat','MOD_CLOSE');
+        $iflychat_settings['text_minimize'] = $language->text('iflychat','MOD_MINIMIZE');
+        $iflychat_settings['text_mute'] = $language->text('iflychat','MOD_CLICK_TO_MUTE');
+        $iflychat_settings['text_unmute'] = $language->text('iflychat','MOD_CLICK_TO_UNMUTE');
+        $iflychat_settings['text_available'] = $language->text('iflychat','MOD_AVAILABLE');
+        $iflychat_settings['text_idle'] = $language->text('iflychat','MOD_IDLE');
+        $iflychat_settings['text_busy'] = $language->text('iflychat','MOD_BUSY');
+        $iflychat_settings['text_offline'] = $language->text('iflychat','MOD_OFFLINE');
+        $iflychat_settings['text_lmm'] = $language->text('iflychat','MOD_LOAD_MORE_MESSAGES');
+        $iflychat_settings['text_nmm'] = $language->text('iflychat','MOD_NO_MORE_MESSAGES');
+        $iflychat_settings['text_clear_room'] = $language->text('iflychat','MOD_CLEAR_ALL_MESSAGES');
+        $iflychat_settings['msg_p'] = $language->text('iflychat','MOD_TYPE_AND_PRESS_ENTER');
+
+        if($obj->iflychat_check_chat_admin()) {
+            $iflychat_settings['text_ban'] = $language->text('iflychat','MOD_BAN');//__('Ban', 'iflychat');
+            $iflychat_settings['text_ban_ip'] = $language->text('iflychat','MOD_BAN_IP');//__('Ban IP', 'iflychat');
+            $iflychat_settings['text_kick'] = $language->text('iflychat','MOD_KICK');//__('Kick', 'iflychat');
+            $iflychat_settings['text_ban_window_title'] = $language->text('iflychat','MOD_BANNED_USERS');//__('Banned Users', 'iflychat');
+            $iflychat_settings['text_ban_window_default'] = $language->text('iflychat','MOD_NO_BAN');//__('No users have been banned currently.', 'iflychat');
+            $iflychat_settings['text_ban_window_loading'] = $language->text('iflychat','MOD_LOADING');//__('Loading banned user list...', 'iflychat');
+            $iflychat_settings['text_manage_rooms'] = $language->text('iflychat','MOD_MANAGE_ROOMS');//__('Manage Rooms', 'iflychat');
+            $iflychat_settings['text_unban'] = $language->text('iflychat','MOD_UNBAN');//__('Unban', 'iflychat');
+            $iflychat_settings['text_unban_ip'] = $language->text('iflychat','MOD_UNBAN_IP');//__('Unban IP', 'iflychat');
+        }
+        if(($obj->params('iflychat_show_admin_list') == 1)) {
+            $iflychat_settings['text_support_chat_init_label'] = $obj->params('iflychat_support_chat_init_label');
+            $iflychat_settings['text_support_chat_box_header'] = $obj->params('iflychat_support_chat_box_header');
+            $iflychat_settings['text_support_chat_box_company_name'] = $obj->params('iflychat_support_chat_box_company_name');
+            $iflychat_settings['text_support_chat_box_company_tagline'] = $obj->params('iflychat_support_chat_box_company_tagline');
+            $iflychat_settings['text_support_chat_auto_greet_enable'] = $obj->params('iflychat_support_chat_auto_greet_enable');
+            $iflychat_settings['text_support_chat_auto_greet_message'] = $obj->params('iflychat_support_chat_auto_greet_message');
+            $iflychat_settings['text_support_chat_auto_greet_time'] = $obj->params('iflychat_support_chat_auto_greet_time');
+            $iflychat_settings['text_support_chat_offline_message_label'] = $obj->params('iflychat_support_chat_offline_message_label');
+            $iflychat_settings['text_support_chat_offline_message_contact'] = $obj->params('iflychat_support_chat_offline_message_contact');
+            $iflychat_settings['text_support_chat_offline_message_send_button'] = $obj->params('iflychat_support_chat_offline_message_send_button');
+            $iflychat_settings['text_support_chat_offline_message_desc'] = $obj->params('iflychat_support_chat_offline_message_desc');
+            $iflychat_settings['text_support_chat_init_label_off'] = $obj->params('iflychat_support_chat_init_label_off');
+        }
+        $iflychat_settings['open_chatlist_default'] = ($obj->params('iflychat_minimize_chat_user_list')==2)?'1':'2';
+
+
+        $iflychat_settings['useStopWordList'] = $obj->params('iflychat_use_stop_word_list');
+        $iflychat_settings['blockHL'] = $obj->params('iflychat_stop_links');
+        $iflychat_settings['allowAnonHL'] = $obj->params('iflychat_allow_anon_links');
+        $iflychat_settings['renderImageInline'] = ($obj->params('iflychat_allow_render_images')=='1')?'1':'2';
+        $iflychat_settings['searchBar'] = ($obj->params('iflychat_enable_search_bar')=='1')?'1':'2';
+        $iflychat_settings['text_search_bar'] = $language->text('iflychat','MOD_TYPE_HERE_TO_SEARCH');
+
+        if($obj->iflychat_path_check()){
+            OW::getDocument()->addScript(OW::getPluginManager()->getPlugin('iflychat')->getStaticJsUrl() . 'iflychat.js');
+            OW::getDocument()->addScriptDeclarationBeforeIncludes("Drupal={};Drupal.settings={};Drupal.settings.drupalchat=" . json_encode($iflychat_settings).";\n ");
+            OW::getDocument()->addScriptDeclarationBeforeIncludes('window.my_var_handle ="' . OW::getPluginManager()->getPlugin('iflychat')->getStaticUrl() . '"');
+            return parent::render();
+        }
+    }
+}
diff --git a/mobile/init.php b/mobile/init.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * @package iFlyChat
+ * @version 1.0.0
+ * @copyright Copyright (C) 2014 iFlyChat. All rights reserved.
+ * @license GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ * @author iFlyChat Team
+ * @link https://iflychat.com
+ */
+IFLYCHAT_MCLASS_EventHandler::getInstance()->init();
diff --git a/mobile/views/components/toolbar.html b/mobile/views/components/toolbar.html
diff --git a/plugin.xml b/plugin.xml
@@ -8,7 +8,7 @@
     <authorEmail>support@iflylabs.com</authorEmail>
 	<authorUrl>https://iflychat.com</authorUrl>
 	<developerKey>8c9a3ad5afd04feaf91851fdd2d30086</developerKey>
-    <build>4</build>
+    <build>5</build>
     <copyright>(C) 2009 Oxwall Foundation. All rights reserved.</copyright>
     <license>GNU General Public License version 2 or later; see LICENSE.txt</license>
     <licenseUrl>http://www.opensource.org/licenses/bsd-license.php</licenseUrl>

diff --git a/update/5/update.php b/update/5/update.php
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * @package iFlyChat
+ * @version 1.0.0
+ * @copyright Copyright (C) 2014 iFlyChat. All rights reserved.
+ * @license GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ * @author iFlyChat Team
+ * @link https://iflychat.com
+ */
+
+
+
+//Clearing cache
+OW_ViewRenderer::getInstance()->clearCompiledTpl();
+OW::getCacheManager()->clean(array(),OW_CacheManager::CLEAN_ALL);