Changeset 6584

Timestamp:

09/06/08 22:37:04 (5 years ago)

Author:

p_lindheimer

Message:

re #3166 and re #2461 the remove the linefeed that the xml parser inserts before and after an ampersand in menuitems and catagories so that translations can have a better chance of matching

Files:

• freepbx/branches/2.5/amp_conf/htdocs/admin/functions.inc.php (modified) (3 diffs)

freepbx/branches/2.5/amp_conf/htdocs/admin/functions.inc.php

@@ -3182 +3182 @@
-    if (isset($xmlarray['module'])) {
-      // add a couple fields first
-$xmlarray['module']['name']
+str_replace("\n&\n","&",$xmlarray['module']['name'])
-      if (isset($xmlarray['module']['menuitems'])) {
-        
-        foreach ($xmlarray['module']['menuitems'] as $item=>$displayname) {
+          $displayname = str_replace("\n&\n","&",$displayname);
+          $xmlarray['module']['menuitems'][$item] = $displayname;
-          $path = '/module/menuitems/'.$item;
-          
-          // find category
-          if (isset($parser->attributes[$path]['category'])) {
-$parser->attributes[$path]['category']
+str_replace("\n&\n","&",$parser->attributes[$path]['category'])
-          } else if (isset($xmlarray['module']['category'])) {
-$xmlarray['module']['category']
+str_replace("\n&\n","&",$xmlarray['module']['category'])
-          } else {
-            $category = 'Basic';
@@ -3245 +3247 @@
-        }
-      }
-      
-      return $xmlarray['module'];
-    }
@@ -3538 +3539 @@
-    $notifications->delete('freepbx', 'modules_broken');
-  }
+}
+
+/** Log a debug message to a debug file
+ * @param  string   debug message to be printed
+ * @param  string   optional mode, default 'a'
+ * @param  string   optinal filename, default /tmp/freepbx_debug.log
+ */
+function freepbx_debug($string, $option='a', $filename='/tmp/freepbx_debug.log') {
+  $fh = fopen($filename,$option);
+  fwrite($fh,$string."\n");
+  fclose($fh);
-}
-