Projects / CakeBOOK

diff --git a/vendors/shells/templates/views/index.ctp b/vendors/shells/templates/views/index.ctp index 0978160..f510e41 100755 --- a/vendors/shells/templates/views/index.ctp +++ b/vendors/shells/templates/views/index.ctp @@ -1,5 +1,4 @@ -<?php /* SVN FILE: $Id: index.ctp 600 2008-08-07 17:55:23Z AD7six $ */ -echo '<?php /* SVN FILE: $Id' . '$ */ ?>' . "\r\n"; +<?php $singularHumanName = Inflector::Humanize( Inflector::Underscore($singularHumanName)); $pluralHumanName = Inflector::Humanize( Inflector::Underscore($pluralHumanName)); $namedString = implode ('\', \'', $fields); diff --git a/views/attachments/admin_import.ctp b/views/attachments/admin_import.ctp index a5ef347..f643dd9 100755 --- a/views/attachments/admin_import.ctp +++ b/views/attachments/admin_import.ctp @@ -1,4 +1,4 @@ -<?php /* SVN FILE: $Id: admin_import.ctp 600 2008-08-07 17:55:23Z AD7six $ */ +<?php echo $form->create(null, array('type' => 'file', 'url' => '/' . $this->params['url']['url'])); echo $form->inputs(array( 'legend' => 'Import files from another install, or restore to a previous backup', diff --git a/views/attachments/xml/admin_export.ctp b/views/attachments/xml/admin_export.ctp index fbbb4cc..4639a59 100644 --- a/views/attachments/xml/admin_export.ctp +++ b/views/attachments/xml/admin_export.ctp @@ -1,4 +1,4 @@ -<?php /* SVN FILE: $Id: admin_export.ctp 600 2008-08-07 17:55:23Z AD7six $ */ +<?php $uuid = String::uuid(); $from = array_pop(explode('-', $uuid)); $content = $xml->serialize(array('meta' => array('from' => $from, 'on' => date('Y-m-d H:i'))), array('format' => 'tags')); diff --git a/views/changes/rss/index.ctp b/views/changes/rss/index.ctp index ddca8da..714e982 100755 --- a/views/changes/rss/index.ctp +++ b/views/changes/rss/index.ctp @@ -1,4 +1,4 @@ -<?php /* SVN FILE: $Id: index.ctp 638 2008-09-01 23:24:26Z AD7six $ */ +<?php transformRSS (null, $html); echo $rss->items($data, 'transformRSS'); diff --git a/views/comments/rss/index.ctp b/views/comments/rss/index.ctp index 7828cf7..9cd2dcd 100755 --- a/views/comments/rss/index.ctp +++ b/views/comments/rss/index.ctp @@ -1,4 +1,4 @@ -<?php /* SVN FILE: $Id: index.ctp 600 2008-08-07 17:55:23Z AD7six $ */ +<?php transformRSS (null, $html, $this); echo $rss->items($data, 'transformRSS'); diff --git a/views/comments/rss/recent.ctp b/views/comments/rss/recent.ctp index 25caa1d..b974396 100755 --- a/views/comments/rss/recent.ctp +++ b/views/comments/rss/recent.ctp @@ -1,4 +1,4 @@ -<?php /* SVN FILE: $Id: recent.ctp 600 2008-08-07 17:55:23Z AD7six $ */ +<?php transformRSS (null, $html, $this); echo $rss->items($data, 'transformRSS'); diff --git a/views/elements/comment.ctp b/views/elements/comment.ctp index 5987896..4439205 100755 --- a/views/elements/comment.ctp +++ b/views/elements/comment.ctp @@ -1,4 +1,4 @@ -<?php /* SVN FILE: $Id: comment.ctp 673 2008-10-06 14:05:17Z AD7six $ */ +<?php if (1==2 && $data['user_id']==$data['Revision']['user_id']) { $class = " highlight"; } else { diff --git a/views/elements/comment_form.ctp b/views/elements/comment_form.ctp index 9d287ea..307e7d1 100644 --- a/views/elements/comment_form.ctp +++ b/views/elements/comment_form.ctp @@ -1,4 +1,4 @@ -<?php /* SVN FILE: $Id: comment_form.ctp 661 2008-09-10 14:53:56Z AD7six $ */ +<?php if (!isset($auth['User']['id'])) { echo '<div class="comment"><p class="commenttitle"><em>'; echo $html->link(__('Login to add a comment', true), array('controller' => 'comments', 'action' => 'add')); diff --git a/views/elements/crumbs/nodes.ctp b/views/elements/crumbs/nodes.ctp index 0d23a02..f49194d 100644 --- a/views/elements/crumbs/nodes.ctp +++ b/views/elements/crumbs/nodes.ctp @@ -1,4 +1,4 @@ -<?php /* SVN FILE: $Id: nodes.ctp 600 2008-08-07 17:55:23Z AD7six $ */ +<?php if (isset($crumbPath) && count($crumbPath) > 1) { //$html->addCrumb('Collection Index',array('action'=>'index')); if (isset($this->params['admin']) && $this->params['admin']) { diff --git a/views/elements/crumbs/toc.ctp b/views/elements/crumbs/toc.ctp index 3658ef6..6e7547f 100644 --- a/views/elements/crumbs/toc.ctp +++ b/views/elements/crumbs/toc.ctp @@ -1,4 +1,4 @@ -<?php /* SVN FILE: $Id: toc.ctp 600 2008-08-07 17:55:23Z AD7six $ */ +<?php if (isset($crumbPath)&&($crumbPath)) { //$html->addCrumb('Collection Index',array('action'=>'index')); foreach($crumbPath as $linkInfo) { diff --git a/views/elements/menu/generic.ctp b/views/elements/menu/generic.ctp index 7d3bcff..1415e11 100644 --- a/views/elements/menu/generic.ctp +++ b/views/elements/menu/generic.ctp @@ -1,4 +1,4 @@ -<?php /* SVN FILE: $Id: generic.ctp 683 2008-10-25 23:05:10Z AD7six $ */ +<?php if (!isset($session)) { return; } diff --git a/views/elements/node_options.ctp b/views/elements/node_options.ctp index d68e4fa..017025f 100644 --- a/views/elements/node_options.ctp +++ b/views/elements/node_options.ctp @@ -1,4 +1,4 @@ -<?php /* SVN FILE: $Id: node_options.ctp 705 2008-11-19 12:15:50Z AD7six $ */ +<?php if (isset($this->params['admin'])) { return; } diff --git a/views/elements/preview.ctp b/views/elements/preview.ctp index 26b73f3..931357a 100644 --- a/views/elements/preview.ctp +++ b/views/elements/preview.ctp @@ -1,4 +1,4 @@ -<?php /* SVN FILE: $Id: preview.ctp 600 2008-08-07 17:55:23Z AD7six $ */ +<?php if (isset($highlight)) { $highlight->auto = false; } diff --git a/views/elements/side_menu.ctp b/views/elements/side_menu.ctp index 37fb178..438c759 100644 --- a/views/elements/side_menu.ctp +++ b/views/elements/side_menu.ctp @@ -1,4 +1,4 @@ -<?php /* SVN FILE: $Id: side_menu.ctp 672 2008-10-06 14:03:23Z AD7six $ */ +<?php if ($this->name == 'Users') { echo $this->element('login_hint'); } diff --git a/views/elements/toc/admin_item.ctp b/views/elements/toc/admin_item.ctp index e11620c..aed2c72 100644 --- a/views/elements/toc/admin_item.ctp +++ b/views/elements/toc/admin_item.ctp @@ -1,4 +1,4 @@ -<?php /* SVN FILE: $Id: admin_item.ctp 600 2008-08-07 17:55:23Z AD7six $ */ +<?php extract($data); extract($Revision); extract($Node); diff --git a/views/elements/toc/public_item.ctp b/views/elements/toc/public_item.ctp index 764e5b7..5655d8a 100644 --- a/views/elements/toc/public_item.ctp +++ b/views/elements/toc/public_item.ctp @@ -1,4 +1,4 @@ -<?php /* SVN FILE: $Id: public_item.ctp 616 2008-08-20 17:13:45Z AD7six $ */ +<?php $params = array(); extract($data); if (!isset($pathIds) && isset ($currentPath)) { diff --git a/views/nodes/admin_import.ctp b/views/nodes/admin_import.ctp index c51bd59..d626935 100644 --- a/views/nodes/admin_import.ctp +++ b/views/nodes/admin_import.ctp @@ -1,4 +1,4 @@ -<?php /* SVN FILE: $Id: admin_import.ctp 600 2008-08-07 17:55:23Z AD7six $ */ +<?php echo $form->create(null, array('type' => 'file', 'url' => '/' . $this->params['url']['url'])); echo $form->inputs(array( 'legend' => 'Import contents from another install, or restore to a previous backup', diff --git a/views/nodes/admin_merge.ctp b/views/nodes/admin_merge.ctp index f37dc76..b7051d4 100644 --- a/views/nodes/admin_merge.ctp +++ b/views/nodes/admin_merge.ctp @@ -1,4 +1,4 @@ -<?php /* SVN FILE: $Id: admin_merge.ctp 600 2008-08-07 17:55:23Z AD7six $ */ +<?php if (isset($preview)) : ?> <div id='preview' class="nodes view"> diff --git a/views/nodes/admin_move.ctp b/views/nodes/admin_move.ctp index b367bf7..71e3356 100644 --- a/views/nodes/admin_move.ctp +++ b/views/nodes/admin_move.ctp @@ -1,4 +1,4 @@ -<?php /* SVN FILE: $Id: admin_move.ctp 600 2008-08-07 17:55:23Z AD7six $ */ +<?php echo $form->create('Node', array('url' => '/' . $this->params['url']['url'])); echo $form->inputs(array( 'id' => array('options' => $nodes, 'label' => 'Move this', 'value' => $data['Node']['id']), diff --git a/views/nodes/rss/view_all.ctp b/views/nodes/rss/view_all.ctp index 0b54fe5..e66ea53 100644 --- a/views/nodes/rss/view_all.ctp +++ b/views/nodes/rss/view_all.ctp @@ -1,4 +1,4 @@ -<?php /* SVN FILE: $Id: view_all.ctp 604 2008-08-11 14:46:35Z AD7six $ */ +<?php transformRSS (null, $html); echo $rss->items($data, 'transformRSS'); diff --git a/views/nodes/view_all.ctp b/views/nodes/view_all.ctp index 6ae60af..ac2fc68 100644 --- a/views/nodes/view_all.ctp +++ b/views/nodes/view_all.ctp @@ -1,4 +1,4 @@ -<?php /* SVN FILE: $Id: view_all.ctp 706 2008-11-19 12:16:42Z AD7six $ */ +<?php if ($this->params['isAjax']) { echo $this->element('crumbs'); diff --git a/views/nodes/xml/view_all.ctp b/views/nodes/xml/view_all.ctp index aa60323..0657f08 100644 --- a/views/nodes/xml/view_all.ctp +++ b/views/nodes/xml/view_all.ctp @@ -1,4 +1,4 @@ -<?php /* SVN FILE: $Id: view_all.ctp 607 2008-08-19 15:36:49Z AD7six $ */ +<?php $uuid = String::uuid(); $key = array_pop(explode('-', $uuid)); $content = $xml->serialize(array('meta' => array( diff --git a/views/revisions/results.ctp b/views/revisions/results.ctp index f4e55fe..606e3ac 100644 --- a/views/revisions/results.ctp +++ b/views/revisions/results.ctp @@ -1,4 +1,4 @@ -<?php /* SVN FILE: $Id: results.ctp 673 2008-10-06 14:05:17Z AD7six $ */ +<?php //echo $this->element('search_form'); echo '<div class="searchresults">'; if(!empty($results)){