Permalink
Browse files

Remove duplicate template.

Also remove double creating the home.ctp file.

Fixes #2842
  • Loading branch information...
1 parent 49f8e73 commit b57489f3f1d08f600e947c0e535c32bcd2d7f956 @markstory markstory committed May 3, 2012
Showing with 0 additions and 133 deletions.
  1. +0 −20 lib/Cake/Console/Command/Task/ProjectTask.php
  2. +0 −113 lib/Cake/Console/Templates/default/views/home.ctp
@@ -70,12 +70,6 @@ public function execute() {
$success = true;
if ($this->bake($project)) {
$path = Folder::slashTerm($project);
- if ($this->createHome($path)) {
- $this->out(__d('cake_console', ' * Welcome page created'));
- } else {
- $this->err(__d('cake_console', 'The Welcome page was <error>NOT</error> created'));
- $success = false;
- }
if ($this->securitySalt($path) === true) {
$this->out(__d('cake_console', ' * Random hash key created for \'Security.salt\''));
@@ -221,20 +215,6 @@ public function bake($path, $skel = null, $skip = array('empty')) {
}
/**
- * Writes a file with a default home page to the project.
- *
- * @param string $dir Path to project
- * @return boolean Success
- */
- public function createHome($dir) {
- $app = basename($dir);
- $path = $dir . 'View' . DS . 'Pages' . DS;
- $source = CAKE . 'Console' . DS . 'Templates' . DS . 'default' . DS . 'views' . DS . 'home.ctp';
- include $source;
- return $this->createFile($path . 'home.ctp', $output);
- }
-
-/**
* Generates the correct path to the CakePHP libs that are generating the project
* and points app/console/cake.php to the right place
*
@@ -1,113 +0,0 @@
-<?php
-$output = "
-<iframe src=\"http://cakephp.org/bake-banner\" width=\"830\" height=\"160\" style=\"overflow:hidden; border:none;\">
- <p>For updates and important announcements, visit http://cakefest.org</p>
-</iframe>\n";
-$output .= "<h2>Sweet, \"" . Inflector::humanize($app) . "\" got Baked by CakePHP!</h2>\n";
-$output .="
-<?php
-App::uses('Debugger', 'Utility');
-if (Configure::read('debug') > 0):
- Debugger::checkSecurityKeys();
-endif;
-?>
-<p>
-<?php
- if (version_compare(PHP_VERSION, '5.2.8', '>=')):
- echo '<span class=\"notice success\">';
- echo __d('cake_dev', 'Your version of PHP is 5.2.8 or higher.');
- echo '</span>';
- else:
- echo '<span class=\"notice\">';
- echo __d('cake_dev', 'Your version of PHP is too low. You need PHP 5.2.8 or higher to use CakePHP.');
- echo '</span>';
- endif;
-?>
-</p>
-<p>
-<?php
- if (is_writable(TMP)):
- echo '<span class=\"notice success\">';
- echo __d('cake_dev', 'Your tmp directory is writable.');
- echo '</span>';
- else:
- echo '<span class=\"notice\">';
- echo __d('cake_dev', 'Your tmp directory is NOT writable.');
- echo '</span>';
- endif;
-?>
-</p>
-<p>
-<?php
- \$settings = Cache::settings('_cake_core_');
- if (!empty(\$settings)):
- echo '<span class=\"notice success\">';
- echo __d('cake_dev', 'The %s is being used for core caching. To change the config edit APP/Config/core.php ', '<em>'. \$settings['engine'] . 'Engine</em>');
- echo '</span>';
- else:
- echo '<span class=\"notice\">';
- echo __d('cake_dev', 'Your cache is NOT working. Please check the settings in APP/Config/core.php');
- echo '</span>';
- endif;
-?>
-</p>
-<p>
-<?php
- \$filePresent = null;
- if (file_exists(APP . 'Config' . DS . 'database.php')):
- echo '<span class=\"notice success\">';
- echo __d('cake_dev', 'Your database configuration file is present.');
- \$filePresent = true;
- echo '</span>';
- else:
- echo '<span class=\"notice\">';
- echo __d('cake_dev', 'Your database configuration file is NOT present.');
- echo '<br/>';
- echo __d('cake_dev', 'Rename APP/Config/database.php.default to APP/Config/database.php');
- echo '</span>';
- endif;
-?>
-</p>
-<?php
-if (isset(\$filePresent)):
- App::uses('ConnectionManager', 'Model');
- try {
- \$connected = ConnectionManager::getDataSource('default');
- } catch (Exception \$e) {
- \$connected = false;
- }
-?>
-<p>
- <?php
- if (\$connected && \$connected->isConnected()):
- echo '<span class=\"notice success\">';
- echo __d('cake_dev', 'Cake is able to connect to the database.');
- echo '</span>';
- else:
- echo '<span class=\"notice\">';
- echo __d('cake_dev', 'Cake is NOT able to connect to the database.');
- echo '</span>';
- endif;
- ?>
-</p>
-<?php endif;?>
-<?php
- App::uses('Validation', 'Utility');
- if (!Validation::alphaNumeric('cakephp')) {
- echo '<p><span class=\"notice\">';
- __d('cake_dev', 'PCRE has not been compiled with Unicode support.');
- echo '<br/>';
- __d('cake_dev', 'Recompile PCRE with Unicode support by adding <code>--enable-unicode-properties</code> when configuring');
- echo '</span></p>';
- }
-?>\n";
-$output .= "<h3><?php echo __d('cake_dev', 'Editing this Page'); ?></h3>\n";
-$output .= "<p>\n";
-$output .= "<?php\n";
-$output .= "\techo __d('cake_dev', 'To change the content of this page, edit: %s\n";
-$output .= "\t\tTo change its layout, edit: %s\n";
-$output .= "\t\tYou can also add some CSS styles for your pages at: %s',\n";
-$output .= "\t\tAPP . 'View' . DS . 'Pages' . DS . 'home.ctp.<br />', APP . 'View' . DS . 'Layouts' . DS . 'default.ctp.<br />', APP . 'webroot' . DS . 'css');\n";
-$output .= "?>\n";
-$output .= "</p>\n";
-?>

0 comments on commit b57489f

Please sign in to comment.