Changeset 293

Timestamp:

07/26/07 07:30:10 (1 year ago)

Author:

bermiferrer

Message:

Adding some changes for those who unpack the framework and point their browser to the framework folder.
This includes add .htaccess files with rules for preventing access to all directories but public.

Files:

• trunk/app/application_controller.php (modified) (1 diff)
• trunk/app/models/framework_setup.php (modified) (6 diffs)
• trunk/index.php (modified) (1 diff)
• trunk/lib/AkActionView/helpers/asset_tag_helper.php (modified) (1 diff)
• trunk/public/index.php (modified) (2 diffs)
• trunk/script/setup (modified) (2 diffs)
• trunk/test/unit/lib/AkActionView/helpers/_HelpersUnitTester.php (modified) (1 diff)

trunk/app/application_controller.php

@@ -16 +16 @@
-class ApplicationController extends AkActionController 
-{
+
-}
-

trunk/app/models/framework_setup.php

@@ -329 +329 @@
-%AK_FRAMEWORK_DIR
-
+%AK_ASSET_URL_PREFIX
+
-include_once(dirname(__FILE__).DIRECTORY_SEPARATOR.'boot.php');
-
@@ -360 +362 @@
-            $settings['%AK_FRAMEWORK_DIR'] = defined('AK_FRAMEWORK_DIR') ?
-            "defined('AK_FRAMEWORK_DIR') ? null : define('AK_FRAMEWORK_DIR', '".AK_FRAMEWORK_DIR."');" : '';
+
+
+            $asset_path = $this->_getAssetBasePath();
+            if(!empty($asset_path)){
+                $settings['%AK_ASSET_URL_PREFIX'] = "define('AK_ASSET_URL_PREFIX','/".trim($this->getUrlSuffix(),'/').'/'.$asset_path."');";
+            }else{
+                $settings['%AK_ASSET_URL_PREFIX'] = '';
+            }
+
-        }
-
@@ -409 +420 @@
-        $file_2_content = @Ak::file_get_contents($file_2);
-
-
-
+
+
+
+
+
+
-    }
-
@@ -435 +450 @@
-    {
-        $application_name = array_pop(explode('/',AK_SITE_URL_SUFFIX));
- 
+
-        return empty($application_name) ? 'my_app' : $application_name;
-    }
@@ -698 +713 @@
-        if($this->hasUrlSuffix()){
-            $url_suffix = trim($this->getUrlSuffix(),'/');
+            $asset_path = $this->_getAssetBasePath();
+            if(!empty($asset_path)){
+                $url_suffix = $asset_path.'/'.$url_suffix;
+            }
-            foreach ($this->stylesheets as $stylesheet) {
-                $filename = AK_PUBLIC_DIR.DS.'stylesheets'.DS.$stylesheet.'.css';
@@ -705 +724 @@
-        }
-
+    }
+
+    function _getAssetBasePath()
+    {
+        return file_exists(AK_BASE_DIR.DS.'index.php') ? 'public' : '';
-    }
-

trunk/index.php

@@ -15 +15 @@
- */
-
-
-
-
-
-
-
-
+
-
-?>

trunk/lib/AkActionView/helpers/asset_tag_helper.php

@@ -222 +222 @@
-        $source = $source[0] != '/' && !strstr($source,':') ? "/$dir/$source" : $source;
-        $source = !strstr($source,'.') ? "$source.$ext" : $source;
-'/'.ltrim(dirname(@$_SERVER['SCRIPT_NAME']).$source,'/\\')
+AK_ASSET_URL_PREFIX.$source
-        $source = strstr($source,':') ? $source : AK_ASSET_HOST.$source;
-        $source = substr($source,0,2) == '//' ? substr($source,1) : $source;
+        
-        return $source;
-    }

trunk/public/index.php

@@ -15 +15 @@
- */
-
-// defined('AK_FRAMEWORK_DIR') ? null : define('AK_FRAMEWORK_DIR', '/path/to/the/framewor
+defined('AK_FRAMEWORK_DIR') ? null : define('AK_FRAMEWORK_DIR', '/Volumes/Files/Projects/akelos_framework/trun
-
-/**
@@ -21 +21 @@
- */
-if(!defined('AK_CONFIG_INCLUDED')){
-
+dirname(__FILE__).DIRECTORY_SEPARATOR.
-        define('AK_ENVIRONMENT', 'setup');
-
+
+
+
+
-        exit;
-    }else{
-
+dirname(__FILE__).DIRECTORY_SEPARATOR.
-    }
-}

trunk/script/setup

@@ -94 +94 @@
-            }
-            $this->yield("\n    Could not create a symbolic link of ".$this->options['directory'].DS.'public'.' at '.$this->options['public_html']);
+
+        }else{
+            $this->_addRootLevelDispatcher();
+            $this->_addHtaccessDirectoryProtection();
-        }
-        return false;
@@ -111 +115 @@
-            }
-        }
+    }
+
+    function _addRootLevelDispatcher()
+    {
+        $this->_copyFile($this->options['source'].DS.'index.php');
+        $this->_copyFile($this->options['source'].DS.'.htaccess');
+    }
+
+    function _addHtaccessDirectoryProtection()
+    {
+        foreach($this->source_tree as $k=>$node){
+            $folder = array_shift(array_keys($node));
+            $path = $this->options['directory'].DS.$folder;
+            if(is_dir($path) && !file_exists($path.DS.'.htaccess') && $folder != 'public'){
+                file_put_contents($path.DS.'.htaccess', "order allow,deny\ndeny from all");
+            }
+        }
+
-    }
-

trunk/test/unit/lib/AkActionView/helpers/_HelpersUnitTester.php

@@ -28 +28 @@
-    function HelpersUnitTester()
-    {
-
-
+
-    }
-}