COmanage Developers List

Author: benno
Date: 2013-01-29 12:24:11 -0500 (Tue, 29 Jan 2013)
New Revision: 431

Added:
   registry/trunk/app/Console/Command/AppShell.php
   registry/trunk/app/View/Helper/AppHelper.php
   registry/trunk/app/View/Layouts/error.ctp
Modified:
   registry/trunk/app/Config/bootstrap.php
   registry/trunk/app/Config/core.php
   registry/trunk/app/Controller/AppController.php
   registry/trunk/app/Controller/CoGroupsController.php
   registry/trunk/app/Controller/CoNsfDemographicsController.php
   registry/trunk/app/Controller/UsersController.php
   registry/trunk/app/Model/Behavior/ProvisionerBehavior.php
   registry/trunk/app/Model/CmpEnrollmentConfiguration.php
   registry/trunk/app/Model/CoIdentifierAssignment.php
   registry/trunk/app/Model/CoInvite.php
   registry/trunk/app/Model/CoPerson.php
   registry/trunk/app/Model/CoPetition.php
   registry/trunk/app/Model/Cou.php
   registry/trunk/app/View/Layouts/Emails/html/basic.ctp
   registry/trunk/app/View/Layouts/Emails/text/basic.ctp
   registry/trunk/app/View/Layouts/default.ctp
   registry/trunk/app/View/Layouts/js/rest.ctp
   registry/trunk/app/View/Layouts/json/default.ctp
   registry/trunk/app/View/Layouts/xml/default.ctp
Log:
Changes for Cake 2.3 (CO-369)

Modified: registry/trunk/app/Config/bootstrap.php
===================================================================
--- registry/trunk/app/Config/bootstrap.php     2013-01-29 01:57:15 UTC (rev 
430)
+++ registry/trunk/app/Config/bootstrap.php     2013-01-29 17:24:11 UTC (rev 
431)
@@ -77,3 +77,40 @@
 include APP."Lib/util.php";
 
 CakePlugin::loadAll();
+
+
+/**
+ * You can attach event listeners to the request lifecyle as Dispatcher 
Filter . By Default CakePHP bundles two filters:
+ *
+ * - AssetDispatcher filter will serve your asset files (css, images, js, 
etc) from your themes and plugins
+ * - CacheDispatcher filter will read the Cache.check configure variable and 
try to serve cached content generated from controllers
+ *
+ * Feel free to remove or add filters as you see fit for your application. A 
few examples:
+ *
+ * Configure::write('Dispatcher.filters', array(
+ *             'MyCacheFilter', //  will use MyCacheFilter class from the 
Routing/Filter package in your app.
+ *             'MyPlugin.MyFilter', // will use MyFilter class from the 
Routing/Filter package in MyPlugin plugin.
+ *             array('callable' => $aFunction, 'on' => 'before', 'priority' 
=> 9), // A valid PHP callback type to be called on beforeDispatch
+ *             array('callable' => $anotherMethod, 'on' => 'after'), // A 
valid PHP callback type to be called on afterDispatch
+ *
+ * ));
+ */
+Configure::write('Dispatcher.filters', array(
+       'AssetDispatcher',
+       'CacheDispatcher'
+));
+
+/**
+ * Configures default file logging options
+ */
+App::uses('CakeLog', 'Log');
+CakeLog::config('debug', array(
+       'engine' => 'FileLog',
+       'types' => array('notice', 'info', 'debug'),
+       'file' => 'debug',
+));
+CakeLog::config('error', array(
+       'engine' => 'FileLog',
+       'types' => array('warning', 'error', 'critical', 'alert', 
'emergency'),
+       'file' => 'error',
+));

Modified: registry/trunk/app/Config/core.php
===================================================================
--- registry/trunk/app/Config/core.php  2013-01-29 01:57:15 UTC (rev 430)
+++ registry/trunk/app/Config/core.php  2013-01-29 17:24:11 UTC (rev 431)
@@ -133,7 +133,7 @@
  * Defines the default error type when using the log() function. Used for
  * differentiating error logging and debugging. Currently PHP supports 
LOG_DEBUG.
  */
-       define('LOG_ERROR', 2);
+       define('LOG_ERROR', LOG_ERR);
 
 /**
  * Session configuration.

Modified: registry/trunk/app/Controller/AppController.php
===================================================================
--- registry/trunk/app/Controller/AppController.php     2013-01-29 01:57:15 
UTC (rev 430)
+++ registry/trunk/app/Controller/AppController.php     2013-01-29 17:24:11 
UTC (rev 431)
@@ -126,6 +126,10 @@
     // XXX CO-351 may take care of this.
     _bootstrap_plugin_txt();
     
+    // XXX CO-351 Placeholder
+    $this->Session->write('Config.language', 'eng');
+    Configure::write('Config.language', 
$this->Session->read('Config.language'));
+    
     // Tell the Auth module to call the controller's isAuthorized() function.
     $this->Auth->authorize = array('Controller');
     
@@ -231,7 +235,7 @@
       // Allow the front page to render without authentication. If there is 
an
       // authenticated user, we want Auth to run to set up authorizations.
       
-      $this->Auth->allow('*');
+      $this->Auth->allow();
     }
   }
 

Modified: registry/trunk/app/Controller/CoGroupsController.php
===================================================================
--- registry/trunk/app/Controller/CoGroupsController.php        2013-01-29 
01:57:15 UTC (rev 430)
+++ registry/trunk/app/Controller/CoGroupsController.php        2013-01-29 
17:24:11 UTC (rev 431)
@@ -337,7 +337,7 @@
       );
       $g = $this->CoGroup->find('first', $params);
       
-      if($g && isset($g['CoGroup']['open']) && $g['CoGroup']['open']) {
+      if(!empty($g) && isset($g['CoGroup']['open']) && 
$g['CoGroup']['open']) {
         $p['view'] = true;
       }
     }

Modified: registry/trunk/app/Controller/CoNsfDemographicsController.php
===================================================================
--- registry/trunk/app/Controller/CoNsfDemographicsController.php       
2013-01-29 01:57:15 UTC (rev 430)
+++ registry/trunk/app/Controller/CoNsfDemographicsController.php       
2013-01-29 17:24:11 UTC (rev 431)
@@ -147,7 +147,10 @@
       )
     );
     $row = $this->CoNsfDemographic->find('first', $args);
-    $rowId = $row['CoNsfDemographic']['id'];
+    
+    if(!empty($row['CoNsfDemographic']['id'])) {
+      $rowId = $row['CoNsfDemographic']['id'];
+    }
 
     // If a row for a CoPerson Id already exists when trying to add a new 
row, throw error
     if(!empty($rowId) && ($this->action == 'add'))

Modified: registry/trunk/app/Controller/UsersController.php
===================================================================
--- registry/trunk/app/Controller/UsersController.php   2013-01-29 01:57:15 
UTC (rev 430)
+++ registry/trunk/app/Controller/UsersController.php   2013-01-29 17:24:11 
UTC (rev 431)
@@ -146,15 +146,17 @@
                     )
                   );
                 $result = $this->CoGroup->find('first', $params);
-                $group = $result['CoGroup']; 
-                $this->log("group = " . print_r($group, true));
-
-                $cos[ $l['CoPerson']['Co']['name'] ]['groups'][ 
$group['name'] ] = array(
-                  'co_group_id' => $m['CoGroupMember']['co_group_id'],
-                  'name' => $group['name'],
-                  'member' => $m['CoGroupMember']['member'],
-                  'owner' => $m['CoGroupMember']['owner']
-                  );
+                
+                if(!empty($result)) {
+                  $group = $result['CoGroup'];
+                  
+                  $cos[ $l['CoPerson']['Co']['name'] ]['groups'][ 
$group['name'] ] = array(
+                    'co_group_id' => $m['CoGroupMember']['co_group_id'],
+                    'name' => $group['name'],
+                    'member' => $m['CoGroupMember']['member'],
+                    'owner' => $m['CoGroupMember']['owner']
+                    );
+                }
               }
             }
           }
@@ -170,7 +172,7 @@
             $this->Session->write('Auth.User.name', 
$orgIdentities[0]['Name']);
           }
           
-          $this->redirect($this->Auth->redirect());
+          $this->redirect($this->Auth->redirectUrl());
         } else {
           // This is an API user. We don't do anything special at the moment.
         }

Modified: registry/trunk/app/Model/Behavior/ProvisionerBehavior.php
===================================================================
--- registry/trunk/app/Model/Behavior/ProvisionerBehavior.php   2013-01-29 
01:57:15 UTC (rev 430)
+++ registry/trunk/app/Model/Behavior/ProvisionerBehavior.php   2013-01-29 
17:24:11 UTC (rev 431)
@@ -31,7 +31,7 @@
    * @return boolean true on success, false on failure
    */
   
-  public function afterDelete($model) {
+  public function afterDelete(Model $model) {
     return true;
   }
   
@@ -44,7 +44,7 @@
    * @return boolean true on success, false on failure
    */
   
-  public function afterSave($Model, $created) {
+  public function afterSave(Model $model, $created) {
 //    debug($Model);
     
     return true;

Modified: registry/trunk/app/Model/CmpEnrollmentConfiguration.php
===================================================================
--- registry/trunk/app/Model/CmpEnrollmentConfiguration.php     2013-01-29 
01:57:15 UTC (rev 430)
+++ registry/trunk/app/Model/CmpEnrollmentConfiguration.php     2013-01-29 
17:24:11 UTC (rev 431)
@@ -2,7 +2,7 @@
 /**
  * COmanage Registry CMP Enrollment Configuration Model
  *
- * Copyright (C) 2011-12 University Corporation for Advanced Internet 
Development, Inc.
+ * Copyright (C) 2011-13 University Corporation for Advanced Internet 
Development, Inc.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may 
not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,7 +14,7 @@
  * KIND, either express or implied. See the License for the specific 
language governing
  * permissions and limitations under the License.
  *
- * @copyright     Copyright (C) 2011-12 University Corporation for Advanced 
Internet Development, Inc.
+ * @copyright     Copyright (C) 2011-13 University Corporation for Advanced 
Internet Development, Inc.
  * @link          http://www.internet2.edu/comanage COmanage Project
  * @package       registry
  * @since         COmanage Registry v0.3
@@ -216,7 +216,11 @@
                            'fields' =>
                            
array('CmpEnrollmentConfiguration.attrs_from_coef')));
     
-    return($r['CmpEnrollmentConfiguration']['attrs_from_coef']);
+    if(isset($r['CmpEnrollmentConfiguration']['attrs_from_coef'])) {
+      return $r['CmpEnrollmentConfiguration']['attrs_from_coef'];
+    }
+    
+    return false;
   }
   
   /**
@@ -238,6 +242,10 @@
                            'fields' =>
                            
array('CmpEnrollmentConfiguration.pool_org_identities')));
     
-    return($r['CmpEnrollmentConfiguration']['pool_org_identities']);
+    if(isset($r['CmpEnrollmentConfiguration']['pool_org_identities'])) {
+      return $r['CmpEnrollmentConfiguration']['pool_org_identities'];
+    }
+    
+    return false;
   }
 }
\ No newline at end of file

Modified: registry/trunk/app/Model/CoIdentifierAssignment.php
===================================================================
--- registry/trunk/app/Model/CoIdentifierAssignment.php 2013-01-29 01:57:15 
UTC (rev 430)
+++ registry/trunk/app/Model/CoIdentifierAssignment.php 2013-01-29 17:24:11 
UTC (rev 431)
@@ -2,7 +2,7 @@
 /**
  * COmanage Registry CO Identifier Assignment Model
  *
- * Copyright (C) 2012 University Corporation for Advanced Internet 
Development, Inc.
+ * Copyright (C) 2012-13 University Corporation for Advanced Internet 
Development, Inc.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may 
not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,7 +14,7 @@
  * KIND, either express or implied. See the License for the specific 
language governing
  * permissions and limitations under the License.
  *
- * @copyright     Copyright (C) 2012 University Corporation for Advanced 
Internet Development, Inc.
+ * @copyright     Copyright (C) 2012-13 University Corporation for Advanced 
Internet Development, Inc.
  * @link          http://www.internet2.edu/comanage COmanage Project
  * @package       registry
  * @since         COmanage Registry v0.6
@@ -155,7 +155,7 @@
     
     $coPerson = $this->Co->CoPerson->find('first', $args);
     
-    if(!$coPerson) {
+    if(empty($coPerson)) {
       $dbc->rollback();
       throw new InvalidArgumentException(_txt('er.notfound',
                                          array(_txt('ct.co_people.1'),

Modified: registry/trunk/app/Model/CoInvite.php
===================================================================
--- registry/trunk/app/Model/CoInvite.php       2013-01-29 01:57:15 UTC (rev 
430)
+++ registry/trunk/app/Model/CoInvite.php       2013-01-29 17:24:11 UTC (rev 
431)
@@ -2,7 +2,7 @@
 /**
  * COmanage Registry CO Invite Model
  *
- * Copyright (C) 2010-12 University Corporation for Advanced Internet 
Development, Inc.
+ * Copyright (C) 2010-13 University Corporation for Advanced Internet 
Development, Inc.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may 
not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,7 +14,7 @@
  * KIND, either express or implied. See the License for the specific 
language governing
  * permissions and limitations under the License.
  *
- * @copyright     Copyright (C) 2011-12 University Corporation for Advanced 
Internet Development, Inc.
+ * @copyright     Copyright (C) 2011-13 University Corporation for Advanced 
Internet Development, Inc.
  * @link          http://www.internet2.edu/comanage COmanage Project
  * @package       registry
  * @since         COmanage Registry v0.1
@@ -87,7 +87,7 @@
     
     $invite = $this->find('first', $args);
     
-    if($invite) {
+    if(!empty($invite)) {
       // Check invite validity
       
       if(time() < strtotime($invite['CoInvite']['expires'])) {

Modified: registry/trunk/app/Model/CoPerson.php
===================================================================
--- registry/trunk/app/Model/CoPerson.php       2013-01-29 01:57:15 UTC (rev 
430)
+++ registry/trunk/app/Model/CoPerson.php       2013-01-29 17:24:11 UTC (rev 
431)
@@ -306,10 +306,11 @@
     
     $link = $this->find('first', $args);
     
-    if($link)
-      return(true);
+    if(!empty($link)) {
+      return true;
+    }
     
-    return(false);
+    return false;
   }
 
   /**

Modified: registry/trunk/app/Model/CoPetition.php
===================================================================
--- registry/trunk/app/Model/CoPetition.php     2013-01-29 01:57:15 UTC (rev 
430)
+++ registry/trunk/app/Model/CoPetition.php     2013-01-29 17:24:11 UTC (rev 
431)
@@ -2,7 +2,7 @@
 /**
  * COmanage Registry CO Petition Model
  *
- * Copyright (C) 2011-12 University Corporation for Advanced Internet 
Development, Inc.
+ * Copyright (C) 2011-13 University Corporation for Advanced Internet 
Development, Inc.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may 
not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,7 +14,7 @@
  * KIND, either express or implied. See the License for the specific 
language governing
  * permissions and limitations under the License.
  *
- * @copyright     Copyright (C) 2011-12 University Corporation for Advanced 
Internet Development, Inc.
+ * @copyright     Copyright (C) 2011-13 University Corporation for Advanced 
Internet Development, Inc.
  * @link          http://www.internet2.edu/comanage COmanage Project
  * @package       registry
  * @since         COmanage Registry v0.3
@@ -981,7 +981,7 @@
     
     $enrollmentFlow = $this->CoEnrollmentFlow->find('first', $args);
     
-    if(!$enrollmentFlow) {
+    if(empty($enrollmentFlow)) {
       throw new InvalidArgumentException(_txt('er.notfound',
                                               
array('ct.co_enrollment_flows.1', 
$args['conditions']['CoEnrollmentFlow.id'])));
     }
@@ -1227,7 +1227,7 @@
     
     $enrollmentFlow = $this->CoEnrollmentFlow->find('first', $args);
     
-    if(!$enrollmentFlow) {
+    if(empty($enrollmentFlow)) {
       throw new InvalidArgumentException(_txt('er.notfound',
                                               
array('ct.co_enrollment_flows.1', 
$args['conditions']['CoEnrollmentFlow.id'])));
     }

Modified: registry/trunk/app/Model/Cou.php
===================================================================
--- registry/trunk/app/Model/Cou.php    2013-01-29 01:57:15 UTC (rev 430)
+++ registry/trunk/app/Model/Cou.php    2013-01-29 17:24:11 UTC (rev 431)
@@ -2,7 +2,7 @@
 /**
  * COmanage Registry COU Model
  *
- * Copyright (C) 2010-12 University Corporation for Advanced Internet 
Development, Inc.
+ * Copyright (C) 2010-13 University Corporation for Advanced Internet 
Development, Inc.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may 
not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,7 +14,7 @@
  * KIND, either express or implied. See the License for the specific 
language governing
  * permissions and limitations under the License.
  *
- * @copyright     Copyright (C) 2010-12 University Corporation for Advanced 
Internet Development, Inc.
+ * @copyright     Copyright (C) 2010-13 University Corporation for Advanced 
Internet Development, Inc.
  * @link          http://www.internet2.edu/comanage COmanage Project
  * @package       registry
  * @since         COmanage Registry v0.2
@@ -218,11 +218,18 @@
     // Query for COU in this CO
     $conditions = array("Cou.id" => $couId);
 
-    $dataOfCou = $this->find('first', array('conditions'=>$conditions)); 
-    $coOfCou = $dataOfCou['Co']['id'];
-    $currentCou = $this->data['Cou']['co_id'];
-
-    return($coOfCou == $currentCou ? true : false);
+    $dataOfCou = $this->find('first', array('conditions'=>$conditions));
+    
+    if(!empty($dataOfCou)) {
+      $coOfCou = $dataOfCou['Co']['id'];
+      $currentCou = $this->data['Cou']['co_id'];
+      
+      if($coOfCou == $currentCou) {
+        return true;
+      }
+    }
+    
+    return false;
   }
 
   /**

Modified: registry/trunk/app/View/Layouts/Emails/html/basic.ctp
===================================================================
--- registry/trunk/app/View/Layouts/Emails/html/basic.ctp       2013-01-29 
01:57:15 UTC (rev 430)
+++ registry/trunk/app/View/Layouts/Emails/html/basic.ctp       2013-01-29 
17:24:11 UTC (rev 431)
@@ -2,7 +2,7 @@
 /**
  * COmanage Registry basic email layout
  *
- * Copyright (C) 2012 University Corporation for Advanced Internet 
Development, Inc.
+ * Copyright (C) 2012-13 University Corporation for Advanced Internet 
Development, Inc.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may 
not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,7 +14,7 @@
  * KIND, either express or implied. See the License for the specific 
language governing
  * permissions and limitations under the License.
  *
- * @copyright     Copyright (C) 2012 University Corporation for Advanced 
Internet Development, Inc.
+ * @copyright     Copyright (C) 2012-13 University Corporation for Advanced 
Internet Development, Inc.
  * @link          http://www.internet2.edu/comanage COmanage Project
  * @package       registry
  * @since         COmanage Registry v0.6
@@ -23,7 +23,7 @@
  */
 
 
-  print $content_for_layout;
+  print $this->fetch('content');
 
   print '<br><br>';
 

Modified: registry/trunk/app/View/Layouts/Emails/text/basic.ctp
===================================================================
--- registry/trunk/app/View/Layouts/Emails/text/basic.ctp       2013-01-29 
01:57:15 UTC (rev 430)
+++ registry/trunk/app/View/Layouts/Emails/text/basic.ctp       2013-01-29 
17:24:11 UTC (rev 431)
@@ -2,7 +2,7 @@
 /**
  * COmanage Registry basic email layout
  *
- * Copyright (C) 2012 University Corporation for Advanced Internet 
Development, Inc.
+ * Copyright (C) 2012-13 University Corporation for Advanced Internet 
Development, Inc.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may 
not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,7 +14,7 @@
  * KIND, either express or implied. See the License for the specific 
language governing
  * permissions and limitations under the License.
  *
- * @copyright     Copyright (C) 2012 University Corporation for Advanced 
Internet Development, Inc.
+ * @copyright     Copyright (C) 2012-13 University Corporation for Advanced 
Internet Development, Inc.
  * @link          http://www.internet2.edu/comanage COmanage Project
  * @package       registry
  * @since         COmanage Registry v0.6
@@ -22,7 +22,7 @@
  * @version       $Id$
  */
 
-  print $content_for_layout;
+  print $this->fetch('content');
 
   print '
   ';

Modified: registry/trunk/app/View/Layouts/default.ctp
===================================================================
--- registry/trunk/app/View/Layouts/default.ctp 2013-01-29 01:57:15 UTC (rev 
430)
+++ registry/trunk/app/View/Layouts/default.ctp 2013-01-29 17:24:11 UTC (rev 
431)
@@ -2,7 +2,7 @@
 /**
  * COmanage Registry Default Layout
  *
- * Copyright (C) 2011-12 University Corporation for Advanced Internet 
Development, Inc.
+ * Copyright (C) 2011-13 University Corporation for Advanced Internet 
Development, Inc.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may 
not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,7 +14,7 @@
  * KIND, either express or implied. See the License for the specific 
language governing
  * permissions and limitations under the License.
  *
- * @copyright     Copyright (C) 2011-12 University Corporation for Advanced 
Internet Development, Inc.
+ * @copyright     Copyright (C) 2011-13 University Corporation for Advanced 
Internet Development, Inc.
  * @link          http://www.internet2.edu/comanage COmanage Project
  * @package       registry
  * @since         COmanage Registry v0.1
@@ -316,7 +316,11 @@
     </script>
     
     <!-- Include external files and scripts -->
-    <?php print $scripts_for_layout ?>
+    <?php
+      print $this->fetch('meta');
+      print $this->fetch('css');
+      print $this->fetch('script');
+    ?>
   </head>
 
   <body onload="js_onload_call_hooks()">
@@ -398,7 +402,7 @@
 
         <?php print_r($this->Session->error()); ?>
         <!-- Display view content -->
-        <?php print $content_for_layout ?>
+        <?php print $this->fetch('content'); ?>
       </div>
     </div>
     <?php if(Configure::read('debug') > 0) print $this->element('sql_dump'); 
?>

Modified: registry/trunk/app/View/Layouts/js/rest.ctp
===================================================================
--- registry/trunk/app/View/Layouts/js/rest.ctp 2013-01-29 01:57:15 UTC (rev 
430)
+++ registry/trunk/app/View/Layouts/js/rest.ctp 2013-01-29 17:24:11 UTC (rev 
431)
@@ -2,7 +2,7 @@
 /**
  * COmanage Registry REST Layout
  *
- * Copyright (C) 2012 University Corporation for Advanced Internet 
Development, Inc.
+ * Copyright (C) 2012-13 University Corporation for Advanced Internet 
Development, Inc.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may 
not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,7 +14,7 @@
  * KIND, either express or implied. See the License for the specific 
language governing
  * permissions and limitations under the License.
  *
- * @copyright     Copyright (C) 2011 University Corporation for Advanced 
Internet Development, Inc.
+ * @copyright     Copyright (C) 2012-13 University Corporation for Advanced 
Internet Development, Inc.
  * @link          http://www.internet2.edu/comanage COmanage Project
  * @package       registry
  * @since         COmanage Registry v0.1
@@ -22,4 +22,4 @@
  * @version       $Id$
  */
 
-print $content_for_layout;
+print $this->fetch('content');

Modified: registry/trunk/app/View/Layouts/json/default.ctp
===================================================================
--- registry/trunk/app/View/Layouts/json/default.ctp    2013-01-29 01:57:15 
UTC (rev 430)
+++ registry/trunk/app/View/Layouts/json/default.ctp    2013-01-29 17:24:11 
UTC (rev 431)
@@ -2,7 +2,7 @@
 /**
  * COmanage Registry JSON Layout
  *
- * Copyright (C) 2012 University Corporation for Advanced Internet 
Development, Inc.
+ * Copyright (C) 2012-13 University Corporation for Advanced Internet 
Development, Inc.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may 
not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,7 +14,7 @@
  * KIND, either express or implied. See the License for the specific 
language governing
  * permissions and limitations under the License.
  *
- * @copyright     Copyright (C) 2011 University Corporation for Advanced 
Internet Development, Inc.
+ * @copyright     Copyright (C) 2012-13 University Corporation for Advanced 
Internet Development, Inc.
  * @link          http://www.internet2.edu/comanage COmanage Project
  * @package       registry
  * @since         COmanage Registry v0.4
@@ -39,4 +39,4 @@
   print json_encode($a) . "\n";
 }
 
-print $content_for_layout;
+print $this->fetch('content');

Modified: registry/trunk/app/View/Layouts/xml/default.ctp
===================================================================
--- registry/trunk/app/View/Layouts/xml/default.ctp     2013-01-29 01:57:15 
UTC (rev 430)
+++ registry/trunk/app/View/Layouts/xml/default.ctp     2013-01-29 17:24:11 
UTC (rev 431)
@@ -2,7 +2,7 @@
 /**
  * COmanage Registry XML Layout
  *
- * Copyright (C) 2012 University Corporation for Advanced Internet 
Development, Inc.
+ * Copyright (C) 2012-13 University Corporation for Advanced Internet 
Development, Inc.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may 
not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,7 +14,7 @@
  * KIND, either express or implied. See the License for the specific 
language governing
  * permissions and limitations under the License.
  *
- * @copyright     Copyright (C) 2011 University Corporation for Advanced 
Internet Development, Inc.
+ * @copyright     Copyright (C) 2012-13 University Corporation for Advanced 
Internet Development, Inc.
  * @link          http://www.internet2.edu/comanage COmanage Project
  * @package       registry
  * @since         COmanage Registry v0.4
@@ -49,4 +49,4 @@
   print $xobj->asXML();
 }
 
-print $content_for_layout;
+print $this->fetch('content');