jimeh/dlist
1
0
Fork 0
mirror of https://github.com/jimeh/dlist.git synced 2026-02-19 07:56:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

updates, edits and shit...

Browse Source 
- changed configuration system, so at the point init.php runs only settings needed by init.php are set, the rest are loaded later if init.php doesn't redirect to an index file...

git-svn-id: file:///Users/jimeh/Desktop/dlist/trunk@8 a5845835-ea0f-0410-a762-dd0bfe9bfde8
This commit is contained in:
jim
2006-03-31 11:15:36 +00:00
parent 49ccc270a1
commit 4f57bf92ce
9 changed files with 85 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libs/config.lib.php
View File

@@ -16,6 +16,7 @@ class config {
if ( !empty($input) ) $this->parse($input);
}
// Main function
function parse ($input, $overwrite=true) {
if ( is_array($input) ) {
$this->parse_array($input, $overwrite);
@@ -28,6 +29,7 @@ class config {
}
}
// Parse settings from an array
function parse_array ($input, $overwrite=true) {
if ( is_array($input) ) {
foreach( $input as $key => $value ) {
@@ -44,7 +46,9 @@ class config {
return true;
} else return false;
}
// Parse settings from a defined array inside a php file,
// $var is the name of the variable inside the php to parse.
function parse_php_file ($file, $var='config', $overwrite=true) {
if ( is_readable($file) ) {
include($file);
@@ -53,9 +57,10 @@ class config {
} else return false;
}
function parse_ini_file ($file, $overwrite=true) {
// Parse settings from an ini file.
function parse_ini_file ($file, $overwrite=true, $parse_sections=true) {
if ( is_readable($file) ) {
$this->parse_array(parse_ini_file($file, true), $overwrite);
$this->parse_array(parse_ini_file($file, $parse_sections), $overwrite);
}
}

11
libs/exechandler.lib.php
View File

@@ -23,7 +23,7 @@ class execHandler {
var $cache_data = '.data.cache.php';
var $cache_details = '.details.cache.php';
var $cache_time = '.time.cache.php';
var $update_frequency = 0;
var $update_frequency = 10;
var $php_opentag = "<?php\n";
var $php_closetag = "\n?>";
@@ -32,6 +32,7 @@ class execHandler {
var $default_stages = array(
'init' => 10,
'query' => 20,
'main' => 50,
'render' => 80,
'term' => 90,
@@ -421,9 +422,10 @@ class execHandler {
// Compiling
function clean_up_code ($string, $comments=true, $emptylines=true) {
function clean_up_code ($string, $comments=true, $emptylines=true, $indents=false) {
if ( $comments ) $string = $this->remove_comments($string);
if ( $emptylines ) $string = $this->remove_empty_lines($string);
if ( $indents ) $string = $this->remove_indents($string);
return trim($string);
}
@@ -438,6 +440,11 @@ class execHandler {
$string = preg_replace("/\n+/m", "\n", $string);
return $string;
}
function remove_indents ($string) {
$string = preg_replace("/\n\s+(.*)/", "\n$1", $string);
return $string;
}
// Cache