From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 9 Jan 2007 04:33:06 +0000 (+0000)
Subject: Avoid error caused by missing asterisk server
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ad31c1a59f8ed83ed5d80b1c06dd47df67af7491;p=gosa.git

Avoid error caused by missing asterisk server


git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@5483 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/plugins/gofon/macro/class_gofonMacro.inc b/plugins/gofon/macro/class_gofonMacro.inc
index abfd539bd..6f464c9d2 100755
--- a/plugins/gofon/macro/class_gofonMacro.inc
+++ b/plugins/gofon/macro/class_gofonMacro.inc
@@ -77,6 +77,7 @@ class macro extends plugin
     $a_SETUP= array();
     if(array_key_exists('config',$_SESSION) &&
        array_key_exists('SERVERS',$_SESSION['config']->data) &&
+       count($_SESSION['config']->data['SERVERS']['FON']) && 
        array_key_exists('FON',$_SESSION['config']->data['SERVERS'])) {
 
       /* Set available server */
@@ -165,6 +166,10 @@ class macro extends plugin
     }else{
       $smarty->assign("disable_cn","  ");
     }
+
+    /* Ensure that macro content is displayed correctly encoded */
+    $smarty->assign("goFonMacroContent",htmlentities(utf8_decode ($this->goFonMacroContent)));
+
     /* Show main page */
     return($smarty->fetch (get_template_path('generic.tpl', TRUE)));
   }
@@ -363,6 +368,10 @@ class macro extends plugin
     /* Call common method to give check the hook */
     $message= plugin::check();
 
+    if(!count($this->goFonHomeServers)){
+      $message[] = _("There must be at least one server with an asterisk database to save this phone macro.");
+    }
+
     /* Check if insert/replace is possible and all servers are available */
     $str = $this->add_to_database(false);
     if($str){
@@ -421,9 +430,13 @@ class macro extends plugin
     }
 
     /* Try to remove from database */
-    $str = $this->remove_from_database(true);
-    if($str){ 
-      print_red($str);
+    if(count($this->goFonHomeServers)){
+      $str = $this->remove_from_database(true);
+      if($str){ 
+        print_red($str);
+      }
+    }else{
+      print_red(_("Could not remove the macro entry from asterisk databases. Please check your asterisk database configurations and remove this entry from database manually, if necessary."));
     }
 
     /* Remove phone macro */