[phpshop commit] r63 - in trunk/phpshop2/app: . webroot

[codesite...@google.com]

Author: edikon
Date: Sun Feb 15 19:08:09 2009
New Revision: 63

Modified:
trunk/phpshop2/app/index.php
trunk/phpshop2/app/set_permissions.sh
trunk/phpshop2/app/webroot/index.php

Log:
added MIT copyright to index.php files in app and webroot

updated set_permissions.sh script to use correct path relative to app/
folder

Modified: trunk/phpshop2/app/index.php
==============================================================================
--- trunk/phpshop2/app/index.php (original)
+++ trunk/phpshop2/app/index.php Sun Feb 15 19:08:09 2009
@@ -1,12 +1,24 @@
<?php
+/* SVN FILE: $Id: index.php 7945 2008-12-19 02:16:01Z gwoo $ */
/**
- * phpShop
+ * PHP versions 4 and 5
*
- * @copyright Edikon Corporation, http://www.edikon.com
- * @license http://opensource.org/licenses/gpl-license.php GNU General
Public License V2
- * @package phpShop
- * @version $Id: index.php 336 2007-08-17 15:54:09Z pablo $
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2008, Cake Software Foundation, Inc.
(http://www.cakefoundation.org)
*
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright Copyright 2005-2008, Cake Software Foundation, Inc.
(http://www.cakefoundation.org)
+ * @link http://www.cakefoundation.org/projects/info/cakephp
CakePHP(tm) Project
+ * @package cake
+ * @subpackage cake.app
+ * @since CakePHP(tm) v 0.10.0.1076
+ * @version $Revision: 7945 $
+ * @modifiedby $LastChangedBy: gwoo $
+ * @lastmodified $Date: 2008-12-18 18:16:01 -0800 (Thu, 18 Dec 2008) $
+ * @license http://www.opensource.org/licenses/mit-license.php The
MIT License
*/
require 'webroot' . DIRECTORY_SEPARATOR . 'index.php';
?>

Modified: trunk/phpshop2/app/set_permissions.sh
==============================================================================
--- trunk/phpshop2/app/set_permissions.sh (original)
+++ trunk/phpshop2/app/set_permissions.sh Sun Feb 15 19:08:09 2009
@@ -1,6 +1,6 @@
#!/bin/sh
-chmod -R 777 tmp/
-chmod 777 webroot/img/categories/
-chmod 777 webroot/img/products/
-chmod 777 webroot/img/thumbnails/
-chmod 777 config/
+chmod -R 777 app/tmp/
+chmod 777 app/webroot/img/categories/
+chmod 777 app/webroot/img/products/
+chmod 777 app/webroot/img/thumbnails/
+chmod 777 app/config/

Modified: trunk/phpshop2/app/webroot/index.php
==============================================================================
--- trunk/phpshop2/app/webroot/index.php (original)
+++ trunk/phpshop2/app/webroot/index.php Sun Feb 15 19:08:09 2009
@@ -1,71 +1,93 @@
<?php
+/* SVN FILE: $Id: index.php 7945 2008-12-19 02:16:01Z gwoo $ */
/**
- * phpShop
+ * Short description for file.
*
- * @copyright Edikon Corporation, http://www.edikon.com
- * @license http://opensource.org/licenses/gpl-license.php GNU General
Public License V2
- * @package phpShop
- * @version $Id: index.php 356 2007-10-16 18:31:15Z pablo $
+ * Long description for file
*
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2008, Cake Software Foundation, Inc.
(http://www.cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright Copyright 2005-2008, Cake Software Foundation, Inc.
(http://www.cakefoundation.org)
+ * @link http://www.cakefoundation.org/projects/info/cakephp
CakePHP(tm) Project
+ * @package cake
+ * @subpackage cake.app.webroot
+ * @since CakePHP(tm) v 0.2.9
+ * @version $Revision: 7945 $
+ * @modifiedby $LastChangedBy: gwoo $
+ * @lastmodified $Date: 2008-12-18 18:16:01 -0800 (Thu, 18 Dec 2008) $
+ * @license http://www.opensource.org/licenses/mit-license.php The
MIT License
*/
/**
- * Do not change
+ * Use the DS to separate the directories in other defines
*/
if (!defined('DS')) {
- define('DS', DIRECTORY_SEPARATOR);
+ define('DS', DIRECTORY_SEPARATOR);
}
/**
* These defines should only be edited if you have cake installed in
* a directory layout other than the way it is distributed.
- * Each define has a commented line of code that explains what you would
change.
+ * When using custom settings be sure to use the DS and do not add a
trailing DS.
+ */
+
+/**
+ * The full path to the directory which holds "app", WITHOUT a trailing DS.
+ *
*/
if (!defined('ROOT')) {
- //define('ROOT', 'FULL PATH TO DIRECTORY WHERE APP DIRECTORY IS
LOCATED. DO NOT ADD A TRAILING DIRECTORY SEPARATOR');
- //You should also use the DS define to separate your directories
- define('ROOT', dirname(dirname(dirname(__FILE__))));
+ define('ROOT', dirname(dirname(dirname(__FILE__))));
}
+/**
+ * The actual directory name for the "app".
+ *
+ */
if (!defined('APP_DIR')) {
- //define('APP_DIR', 'DIRECTORY NAME OF APPLICATION');
- define('APP_DIR', basename(dirname(dirname(__FILE__))));
+ define('APP_DIR', basename(dirname(dirname(__FILE__))));
}
/**
- * This only needs to be changed if the cake installed libs are located
- * outside of the distributed directory structure.
+ * The absolute path to the "cake" directory, WITHOUT a trailing DS.
+ *
*/
if (!defined('CAKE_CORE_INCLUDE_PATH')) {
- //define ('CAKE_CORE_INCLUDE_PATH', 'FULL PATH TO DIRECTORY WHERE CAKE
CORE IS INSTALLED. DO NOT ADD A TRAILING DIRECTORY SEPARATOR');
- //You should also use the DS define to separate your directories
- define('CAKE_CORE_INCLUDE_PATH', ROOT);
- }
-///////////////////////////////
-//DO NOT EDIT BELOW THIS LINE//
-///////////////////////////////
+ define('CAKE_CORE_INCLUDE_PATH', ROOT);
+ }
+
+/**
+ * Editing below this line should NOT be necessary.
+ * Change at your own risk.
+ *
+ */
if (!defined('WEBROOT_DIR')) {
- define('WEBROOT_DIR', basename(dirname(__FILE__)));
+ define('WEBROOT_DIR', basename(dirname(__FILE__)));
}
if (!defined('WWW_ROOT')) {
- define('WWW_ROOT', dirname(__FILE__) . DS);
+ define('WWW_ROOT', dirname(__FILE__) . DS);
}
if (!defined('CORE_PATH')) {
- if (function_exists('ini_set')) {
- ini_set('include_path', CAKE_CORE_INCLUDE_PATH . PATH_SEPARATOR .
ROOT . DS . APP_DIR . DS . PATH_SEPARATOR . ini_get('include_path'));
- define('APP_PATH', null);
- define('CORE_PATH', null);
- } else {
- define('APP_PATH', ROOT . DS . APP_DIR . DS);
- define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
- }
+ if (function_exists('ini_set') && ini_set('include_path',
CAKE_CORE_INCLUDE_PATH . PATH_SEPARATOR . ROOT . DS . APP_DIR . DS .
PATH_SEPARATOR . ini_get('include_path'))) {
+ define('APP_PATH', null);
+ define('CORE_PATH', null);
+ } else {
+ define('APP_PATH', ROOT . DS . APP_DIR . DS);
+ define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
+ }
}
if (!include(CORE_PATH . 'cake' . DS . 'bootstrap.php')) {
- trigger_error("Can't find CakePHP core. Check the value of
CAKE_CORE_INCLUDE_PATH in app/webroot/index.php. It should point to the
directory containing your " . DS . "cake core directory and your " .
DS . "vendors root directory." , E_USER_ERROR);
+ trigger_error("CakePHP core could not be found. Check the value of
CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php. It should point to the
directory containing your " . DS . "cake core directory and your " .
DS . "vendors root directory.", E_USER_ERROR);
}
if (isset($_GET['url']) && $_GET['url'] === 'favicon.ico') {
+ return;
} else {
- $Dispatcher=new Dispatcher();
- $Dispatcher->dispatch($url);
+ $Dispatcher = new Dispatcher();
+ $Dispatcher->dispatch($url);
}
if (Configure::read() > 0) {
- echo "<!-- " . round(getMicrotime() - $TIME_START, 4) . "s -->";
+ echo "<!-- " . round(getMicrotime() - $TIME_START, 4) . "s -->";
}
-
?>