# HG changeset patch
# User Dan
# Date 1226272890 18000
# Node ID 919bcdde5f2a5d5426ca17a559382ca91c5a584e
# Parent  48d33e93264ab6824a2e78eaa45da56b63019854
Fixed exception handling from session->fetch_page_acl() in ACL trace server side

diff -r 48d33e93264a -r 919bcdde5f2a includes/pageutils.php
--- a/includes/pageutils.php	Sun Nov 09 14:45:07 2008 -0500
+++ b/includes/pageutils.php	Sun Nov 09 18:21:30 2008 -0500
@@ -2030,48 +2030,58 @@
           break;
         case 'trace':
           list($targetpid, $targetns) = RenderMan::strToPageID($parms['page']);
-          $perms = $session->fetch_page_acl_user($parms['user'], $targetpid, $targetns);
-          $perm_table = array(
-              AUTH_ALLOW => 'acl_lbl_field_allow',
-              AUTH_WIKIMODE => 'acl_lbl_field_wikimode',
-              AUTH_DISALLOW => 'acl_lbl_field_disallow',
-              AUTH_DENY => 'acl_lbl_field_deny'
+          try
+          {
+            $perms = $session->fetch_page_acl_user($parms['user'], $targetpid, $targetns);
+            $perm_table = array(
+                AUTH_ALLOW => 'acl_lbl_field_allow',
+                AUTH_WIKIMODE => 'acl_lbl_field_wikimode',
+                AUTH_DISALLOW => 'acl_lbl_field_disallow',
+                AUTH_DENY => 'acl_lbl_field_deny'
+              );
+            
+            $return = array(
+              'mode' => 'trace',
+              'perms' => array()
             );
-          
-          $return = array(
-            'mode' => 'trace',
-            'perms' => array()
-          );
-          
-          foreach ( $perms->perm_resolve_table as $perm_type => $lookup_data )
-          {
-            if ( !$session->check_acl_scope($perm_type, $targetns) )
-              continue;
             
-            $src_l10n = $lang->get($session->acl_inherit_lang_table[$lookup_data['src']], $lookup_data);
-            $divclass = preg_replace('/^acl_inherit_/', '', $session->acl_inherit_lang_table[$lookup_data['src']]);
-            $perm_string = $lang->get($perm_table[$perms->perms[$perm_type]]);
-            $perm_name = $lang->get($session->acl_descs[$perm_type]);
+            foreach ( $perms->perm_resolve_table as $perm_type => $lookup_data )
+            {
+              if ( !$session->check_acl_scope($perm_type, $targetns) )
+                continue;
+              
+              $src_l10n = $lang->get($session->acl_inherit_lang_table[$lookup_data['src']], $lookup_data);
+              $divclass = preg_replace('/^acl_inherit_/', '', $session->acl_inherit_lang_table[$lookup_data['src']]);
+              $perm_string = $lang->get($perm_table[$perms->perms[$perm_type]]);
+              $perm_name = $lang->get($session->acl_descs[$perm_type]);
+              
+              $return['perms'][$perm_type] = array(
+                  'divclass' => "acl_inherit acl_$divclass",
+                  'perm_type' => $perm_type,
+                  'perm_name' => $perm_name,
+                  'perm_value' => $perm_string,
+                  'perm_src' => $src_l10n,
+                  'rule_id' => intval($lookup_data['rule_id'])
+                );
+            }
             
-            $return['perms'][$perm_type] = array(
-                'divclass' => "acl_inherit acl_$divclass",
-                'perm_type' => $perm_type,
-                'perm_name' => $perm_name,
-                'perm_value' => $perm_string,
-                'perm_src' => $src_l10n,
-                'rule_id' => intval($lookup_data['rule_id'])
-              );
+            // group rules if possible
+            $return['groups'] = array();
+            foreach ( $return['perms'] as $rule )
+            {
+              if ( !isset($return['groups'][$rule['rule_id']]) )
+              {
+                $return['groups'][$rule['rule_id']] = array();
+              }
+              $return['groups'][$rule['rule_id']][] = $rule['perm_type'];
+            }
           }
-          
-          // group rules if possible
-          $return['groups'] = array();
-          foreach ( $return['perms'] as $rule )
+          catch ( Exception $e )
           {
-            if ( !isset($return['groups'][$rule['rule_id']]) )
-            {
-              $return['groups'][$rule['rule_id']] = array();
-            }
-            $return['groups'][$rule['rule_id']][] = $rule['perm_type'];
+            $return = array(
+                'mode' => 'error',
+                'error' => $e->getMessage()
+              );
           }
           
           break;