- Merge with edhelas

app/widgets/Chat/Chat.php

@@ -436,10 +436,12 @@ class Chat extends WidgetCommon
         $md = new \Modl\MessageDAO();
         $messages = $md->getContact(echapJid($jid), 0, 30);
 
-        $messages = array_reverse($messages);
+        if(is_array($messages)) {
+            $messages = array_reverse($messages);
 
-        foreach($messages as $message) {
-            $this->prepareMessage($message);
+            foreach($messages as $message) {
+                $this->prepareMessage($message);
+            }
         }
 
         $view = $this->tpl();

app/widgets/Chat/_chat_header_room.tpl

@@ -37,7 +37,7 @@
         <li onclick="Rooms_ajaxList('{$room}')">
             <span>{$c->__('chatroom.members')}</span>
         </li>
-        {if="$presence->mucrole == 'moderator'"}
+        {if="$presence != null && $presence->mucrole == 'moderator'"}
             <li onclick="Rooms_ajaxRemoveConfirm('{$room}')">
                 <span>{$c->__('button.delete')}</span>
             </li>

app/widgets/Group/Group.php

@@ -24,8 +24,9 @@ class Group extends WidgetCommon
         $this->registerEvent('pubsub_getitem_handle', 'onItems', 'groups');
         $this->registerEvent('pubsub_getitems_handle', 'onItems', 'groups');
         $this->registerEvent('pubsub_getitemsid_handle', 'onItems', 'groups');
-
         $this->registerEvent('pubsub_getitems_error', 'onItemsError', 'groups');
+        $this->registerEvent('pubsub_getitemsid_error', 'onItemsError', 'groups');
+
         $this->registerEvent('pubsub_subscribe_handle', 'onSubscribed');
         $this->registerEvent('pubsub_unsubscribe_handle', 'onUnsubscribed');
         $this->registerEvent('pubsub_getaffiliations_handle', 'onAffiliations');
@@ -63,8 +64,10 @@ class Group extends WidgetCommon
 
     function onItemsError($packet)
     {
-        $arr = $packet->content;
+        list($server, $node) = array_values($packet->content);
         Notification::append(false, $this->__('group.empty'));
+
+        $this->ajaxDelete($server, $node, true);
         // Display an error message
         RPC::call('Group.clearLoad');
     }
@@ -172,13 +175,14 @@ class Group extends WidgetCommon
     }
 
 
-    function ajaxDelete($server, $node)
+    function ajaxDelete($server, $node, $clean = false)
     {
         if(!$this->validateServerNode($server, $node)) return;
 
         $view = $this->tpl();
         $view->assign('server', $server);
         $view->assign('node', $node);
+        $view->assign('clean', $clean);
 
         Dialog::fill($view->draw('_group_delete', true));
     }

app/widgets/Group/_group_delete.tpl

@@ -1,9 +1,13 @@
 <section>
     <h3>{$c->__('group.delete_title')}</h3>
     <br />
-    <h4 class="gray">{$c->__('group.delete_text')}</h4>
+    {if="$clean"}
+        <h4 class="gray">{$c->__('group.delete_clean_text')}</h4>
+    {else}
+        <h4 class="gray">{$c->__('group.delete_text')}</h4>
+    {/if}
     <br />
-    <h4 class="gray">{$node}</h4>
+    <h4 class="gray">{$server}/{$node}</h4>
 </section>
 <div class="no_bar">
     <a onclick="Dialog.clear()" class="button flat">

app/widgets/Group/locales.ini

@@ -12,6 +12,7 @@ group.empty              = 'Something bad happened to this group'
 group.config_saved       = 'Group configuration saved'
 group.delete_title       = 'Delete the group'
 group.delete_text        = 'You are going to delete the following group. Please confirm your action.'
+group.delete_clean_text  = "It seems that this group doesn't exists anymore. Do you want to remove it from your subscriptions?"
 
 group.configuration      = 'Configuration'
 group.subscriptions      = 'Subscriptions'

app/widgets/Groups/Groups.php

@@ -15,6 +15,7 @@ class Groups extends WidgetCommon
         $this->registerEvent('pubsub_discoitems_error', 'onDiscoError');
         $this->registerEvent('pubsub_create_handle', 'onCreate');
         $this->registerEvent('pubsub_delete_handle', 'onDelete');
+        $this->registerEvent('pubsub_delete_error', 'onDeleteError');
         $this->addjs('groups.js');
     }
 
@@ -40,6 +41,17 @@ class Groups extends WidgetCommon
         $this->displayServer($server);
     }
 
+    function onDeleteError($packet)
+    {
+        Notification::append(null, $this->__('groups.deleted'));
+
+        $m = new Rooms;
+        $m->setBookmark();
+
+        list($server, $node) = array_values($packet->content);
+        $this->ajaxSubscriptions();
+    }
+
     function onDiscoError($packet)
     {
         // Display a nice error