X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fmain.inc;h=b0878fb5004450b941b39fe611ad9fa81b2ef3d9;hb=9dab04be9d81766f1878d3688ee73d0bcf29f5d2;hp=23a3822791510cafa5e012b86798a727a2f091cf;hpb=76addbf42e148553411cf37bf1284d2cf6082b84;p=fa-stable.git diff --git a/includes/main.inc b/includes/main.inc index 23a38227..b0878fb5 100644 --- a/includes/main.inc +++ b/includes/main.inc @@ -61,7 +61,7 @@ function flush_dir($path, $wipe = false) { $dir = opendir($path); while(false !== ($fname = readdir($dir))) { - if($fname=='.' || $fname=='..' || (!$wipe && $fname=='index.php')) continue; + if($fname=='.' || $fname=='..' || $fname=='CVS' || (!$wipe && $fname=='index.php')) continue; if(is_dir($path.'/'.$fname)) { flush_dir($path.'/'.$fname, $wipe); if ($wipe) @rmdir($path.'/'.$fname); @@ -259,37 +259,5 @@ function js_compress($sJS) } return $sJS; } -//----------------------------------------------------------------------------- -// Inserts $elements into $array at position $index. -// $elements is list of any objects -// -function array_insert(&$array, $index, $elements) -{ - if (!is_array($elements)) $elements = array($elements); - - $head = array_splice($array, 0, $index); - $array = array_merge($head, $elements, $array); -} - -function array_remove(&$array, $index, $len=1) -{ - array_splice($array, $index, $len); -} - -function array_substitute(&$array, $index, $len, $elements) -{ - array_splice($array, $index, $len); - array_insert($array, $index, $elements); -} - -function array_append(&$array, $elements) -{ - foreach($elements as $key => $el) { - if(is_int($key)) - $array[] = $el; - else - $array[$key] = $el; - } -} ?> \ No newline at end of file