Changeset 1119

Timestamp:

10/15/08 16:00:03 (3 months ago)

Author:

bibo

Message:

#715: error in checkTrustedModules function (patch by dubphil thanks)

Files:

• trunk/lib/jelix/core/jConfigCompiler.class.php (modified) (7 diffs)
• trunk/lib/jelix/CREDITS (modified) (1 diff)

trunk/lib/jelix/core/jConfigCompiler.class.php

@@ -4 +4 @@
-* @subpackage   core
-* @author       Jouanneau Laurent
-
+, Philippe Schelté
-* @copyright    2006-2008 Jouanneau laurent
-
+, 2008 Philippe Schelté
-* @link         http://www.jelix.org
-* @licence      GNU Lesser General Public Licence see LICENCE file or http://www.gnu.org/licenses/lgpl.html
@@ -82 +82 @@
-            jIniFile::write(get_object_vars($config), JELIX_APP_TEMP_PATH.str_replace('/','~',$configFile).'.resultini.php', ";<?php die('');?>\n");
-        }
- 
+
-        $filename=JELIX_APP_TEMP_PATH.str_replace('/','~',$configFile).'.conf.php';
-        if ($f = @fopen($filename, 'wb')) {
@@ -100 +100 @@
-     */
-    static protected function prepareConfig($config){
-
+
-        $config->isWindows = (DIRECTORY_SEPARATOR === '\\');
-        if(trim( $config->startAction) == '') {
@@ -114 +114 @@
-        if($config->checkTrustedModules){
-            $config->_trustedModules = explode(',',$config->trustedModules);
-
-
+_
+_
-        }else{
-            $config->_trustedModules = array_keys($config->_modulesPathList);
@@ -199 +199 @@
-            if(substr($p,-1) !='/')
-                $p.='/';
- 
+
-                $allBasePath[]=$p;
-            if ($handle = opendir($p)) {
@@ -219 +219 @@
-    static protected function _loadPluginsPathList(&$config){
-        $list = split(' *, *',$config->pluginsPath);
- 
+
-        foreach($list as $k=>$path){
-            if(trim($path) == '') continue;
@@ -234 +234 @@
-                    if ($f{0} != '.' && is_dir($p.$f)) {
-                        if($subdir = opendir($p.$f)){
- 
+
-                               $config->_allBasePath[]=$p.$f.'/';
-                            while (false !== ($subf = readdir($subdir))) {

trunk/lib/jelix/CREDITS

@@ -181 +181 @@
-Philippe Schelte (aka dubphil)
- - plugin tpl cycle (#149)
+ - error in checkTrustedModules function (#715)
-
-Warren Seine (aka SooW)