whitespace

[civicrm-core.git] / distmaker / utils / joomlaxml.php

diff --git a/distmaker/utils/joomlaxml.php b/distmaker/utils/joomlaxml.php
index 647f984f5a3df8c0cd85ef5deb77a5dbdd0e2314..679ba3e376ea6b8a66de1b54fdb62bf5209228f3 100644 (file)
--- a/distmaker/utils/joomlaxml.php
+++ b/distmaker/utils/joomlaxml.php
@@ -72,7 +72,7 @@ function generateJoomlaConfig($version) {
 
   $output = $targetDir . '/civicrm.xml';
   $fd = fopen($output, "w");
-  fputs($fd, $xml);
+  fwrite($fd, $xml);
   fclose($fd);
 
   require_once 'CRM/Core/Config.php';
@@ -80,14 +80,14 @@ function generateJoomlaConfig($version) {
 
   require_once 'CRM/Core/Permission.php';
   require_once 'CRM/Utils/String.php';
-  $permissions = CRM_Core_Permission::getCorePermissions();
+  $permissions = CRM_Core_Permission::getCorePermissions(TRUE);
 
   $crmFolderDir = $sourceCheckoutDir . DIRECTORY_SEPARATOR . 'CRM';
 
   require_once 'CRM/Core/Component.php';
   $components = CRM_Core_Component::getComponentsFromFile($crmFolderDir);
   foreach ($components as $comp) {
-    $perm = $comp->getPermissions();
+    $perm = $comp->getPermissions(FALSE, TRUE);
     if ($perm) {
       $info = $comp->getInfo();
       foreach ($perm as $p) {
@@ -97,16 +97,21 @@ function generateJoomlaConfig($version) {
   }
 
   $perms_array = array();
-  foreach ($permissions as $perm => $title) {
+  foreach ($permissions as $perm => $attr) {
+    // give an empty string as default description
+    $attr[] = '';
+
     //order matters here, but we deal with that later
-    $perms_array[CRM_Utils_String::munge(strtolower($perm))] = $title;
+    $perms_array[CRM_Utils_String::munge(strtolower($perm))] = array(
+      'title' => array_shift($attr),
+      'description' => array_shift($attr),
+    );
   }
   $smarty->assign('permissions', $perms_array);
 
   $output = $targetDir . '/admin/access.xml';
   $xml    = $smarty->fetch('access.tpl');
   $fd     = fopen($output, "w");
-  fputs($fd, $xml);
+  fwrite($fd, $xml);
   fclose($fd);
 }
-