[puntoengine] r75 committed - * Fixed some PluginManager errors...

0 views

Skip to first unread message

punto...@googlecode.com

unread,

Jul 13, 2011, 8:01:51 AM7/13/11

to punto...@googlegroups.com

Revision: 75
Author: jba...@gmail.com
Date: Wed Jul 13 05:01:31 2011
Log: * Fixed some PluginManager errors
* Fixed Forbiden 403 problems in some Windows apache server
* Chage .htaccess generation on install to new file loads
* Added test mime types and some permited directories without engine
intervention
http://code.google.com/p/puntoengine/source/detail?r=75

Modified:
/trunk/puntoengine/core/Kernel.php
/trunk/puntoengine/core/http/HttpServlet.php
/trunk/puntoengine/core/plugin/PluginManager.php
/trunk/puntoengine/install.php

=======================================
--- /trunk/puntoengine/core/Kernel.php Wed Jul 13 01:28:26 2011
+++ /trunk/puntoengine/core/Kernel.php Wed Jul 13 05:01:31 2011
@@ -9,6 +9,7 @@
Kernel::import('core.exceptions');
Kernel::import('core.http');
Kernel::import('core.xml');
+Kernel::import('core.plugin');
Kernel::import('servlets');
Kernel::import('servlets.pepadmin');

@@ -106,6 +107,21 @@

$servletNameTemp = explode('?', $servletName);
$servletName = $servletNameTemp[0];
+
+ if(is_file(Kernel::getPath().$servletName) && (substr($servletName, 1,
6) == 'design' || substr($servletName, 1, 6) == 'images' ||
substr($servletName, 1, 2) == 'js' || substr($servletName, 1, 3) == 'xml' |
| substr($servletName, 1, 14) == 'core/resources')) {
+ $extension = substr($servletName, -3, 3);
+
+ switch($extension) {
+ case 'css': $header = 'text/css'; break;
+ case '.js': $header = 'text/javascript'; break;
+ default: $header = 'text/plain';
+ }
+
+ header('Content-Type: '.$header);
+
+ echo file_get_contents(Kernel::getPath().$servletName);
+ return;
+ }

try {
$servlet = Kernel::getServlet($servletName);
@@ -126,6 +142,17 @@
$servlet->init($request, HttpMethods::GET);
}
}//process
+
+
+ public static function getMime($extension) {
+ switch($extension) {
+ case 'css': $mime = 'text/css'; break;
+ case '.js': $mime = 'text/javascript'; break;
+ default: $mime = 'text/plain';
+ }
+
+ return $mime;
+ }

/**
=======================================
--- /trunk/puntoengine/core/http/HttpServlet.php Wed Jun 22 00:55:12 2011
+++ /trunk/puntoengine/core/http/HttpServlet.php Wed Jul 13 05:01:31 2011
@@ -359,7 +359,7 @@
$html .= '<head profile="http://gmpg.org/xfn/11">'."\n";
$html .= '<meta http-equiv="Content-Type" content="text/html;
charset=UTF-8" />'."\n";
$html .= '<title>Core exception</title>'."\n";
- $html .= '<link
href="'.Kernel::getVirtualPath().'core/resources/css/exception.css"
class="theme" rel="stylesheet" media="all" />'."\n";
+ $html .= '<link
href="'.Kernel::getVirtualPath().'/core/resources/css/exception.css"
class="theme" rel="stylesheet" media="all" />'."\n";
$html .= '</style>'."\n";
$html .= '</head>'."\n";
$html .= '<body>'."\n";
=======================================
--- /trunk/puntoengine/core/plugin/PluginManager.php Wed Jun 15 07:45:58
2011
+++ /trunk/puntoengine/core/plugin/PluginManager.php Wed Jul 13 05:01:31
2011
@@ -49,11 +49,11 @@
* @since 0.3
*/
public static function instance() {
- if(HookManager::$instance == null) {
- HookManager::$instance = new HookManager();
+ if(self::$instance == null) {
+ self::$instance = new PluginManager();
}

- return HookManager::$instanace;
+ return self::$instance;
}//instance

@@ -82,7 +82,11 @@
}
}

- return $data['results'];
+ if(isset($data['results'])) {
+ return $data['results'];
+ } else {
+ return null;
+ }
}//executeHook
}//HookManager
?>
=======================================
--- /trunk/puntoengine/install.php Fri Jun 17 02:40:52 2011
+++ /trunk/puntoengine/install.php Wed Jul 13 05:01:31 2011
@@ -23,15 +23,15 @@
RewriteBase '.$path.'

#Can\'t access to config files
- RewriteRule .*config/.*.xml.* engine.php [L]
+ #RewriteRule .*config/.*.xml.* engine.php [L]

#Can\'t access to php files
- RewriteRule .*\.php engine.php [L]
+ #RewriteRule .*\.php engine.php [L]

#If file exist, the request go to the file
- RewriteCond %{REQUEST_FILENAME} -f [OR]
- RewriteCond %{REQUEST_FILENAME} -d
- RewriteRule . %{REQUEST_FILENAME} [L]
+ #RewriteCond %{REQUEST_FILENAME} -f [OR]
+ #RewriteCond %{REQUEST_FILENAME} -d
+ #RewriteRule . %{REQUEST_FILENAME} [L]