------------------------------------------------------------
revno: 1001
committer: Jon Phillips <j...@rejon.org>
branch nick: public
timestamp: Fri 2012-01-06 19:46:59 +0800
message:
removed the z-aiki.in file used from the old build setup, and commented some
in the code for clarity
removed:
configs/z-aiki.in
modified:
bootstrap.php
configs/htaccess.inc
--
lp:aikiframework
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk
Your team Aiki Framework Developers is subscribed to branch lp:aikiframework.
To unsubscribe from this branch go to
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk/+edit-subscription
=== modified file 'bootstrap.php'
--- bootstrap.php 2012-01-06 10:12:36 +0000
+++ bootstrap.php 2012-01-06 11:46:59 +0000
@@ -63,8 +63,13 @@
$noheaders = true;
}
-/** The existence of aiki-defs.php indicates an Automake installation.
- * @see aiki-defs.inc */
+/**
+ * Set the configuration option defaults.
+ *
+ * @see configs/config.php
+ * @TODO The assumption here is that config.php overrides all defaults! Is that
+ * correct?
+ */
if (!file_exists("$AIKI_ROOT_DIR/config.php")) {
/** @see config.php */
require_once("$AIKI_ROOT_DIR/configs/config.php");
=== modified file 'configs/htaccess.inc'
--- configs/htaccess.inc 2011-11-08 13:42:45 +0000
+++ configs/htaccess.inc 2012-01-06 11:46:59 +0000
@@ -1,3 +1,8 @@
+# NOTE: You may see performance benefits if you install this in
+# your apache configuration file in the section that looks like this:
+# <Directory /some/path>...</Directory>
+# if you are using that setup.
+
Options +FollowSymLinks
RewriteEngine on
RewriteBase @AIKI_REWRITE_BASE@/
=== removed file 'configs/z-aiki.in'
--- configs/z-aiki.in 2011-11-08 13:42:45 +0000
+++ configs/z-aiki.in 1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-# @PACKAGE@ - web framework written in php
-
-# Copyright (c) 2010-2011 Aiki Lab Pte Ltd
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Written by Bassel Safadi, Steven Garcia
-
-Alias @AIKI_REWRITE_BASE@ @PKG_DATA_DIR@
-
-# The following directories require access over HTTP
-<Directory @PKG_DATA_DIR@/>
- Order Allow,Deny
- Allow from All
- Deny from None
- AllowOverride All
- Options +FollowSymLinks
- RewriteEngine on
- RewriteBase @AIKI_REWRITE_BASE@/
- RewriteRule ^image/(.*)px/(.*)/(.*) assets/apps/image_viewer.php?id=$3&size=$1&mode=$2
- RewriteRule ^image/(.*)px/(.*) assets/apps/image_viewer.php?id=$2&size=$1
- RewriteRule ^image/(.*) assets/apps/image_viewer.php?id=$1
- RewriteCond %{REQUEST_FILENAME} !-d
- RewriteCond %{REQUEST_FILENAME} !-f
- RewriteCond %{SCRIPT_FILENAME} !-d
- RewriteCond %{SCRIPT_FILENAME} !-f
- RewriteRule ^(.*)$ index.php?pretty=$1 [L,QSA]
- <IfModule mod_suphp.c>
- suPHP_AddHandler php5-script
- suPHP_Engine @SUPHP_ENGINE@
- # Directory php.ini is in
- suPHP_ConfigPath /etc
- </IfModule>
-</Directory>
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : aikiframework-devel@lists.launchpad.net
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
