extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-23 07:09:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

"- making csv_spilt and escape_date methods public static (to use them in other classes)

Browse Source 
- fixed not working calls to remove_dir_content"
This commit is contained in:
Ralf Becker 2009-09-14 17:48:58 +00:00
parent a8c9eebf52
commit 868c89e606
1 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
phpgwapi/inc/class.db_backup.inc.php
View File

@ -357,7 +357,7 @@ class db_backup
// we may have to clean up old backup - left overs // we may have to clean up old backup - left overs
if (is_dir($dir.'/database_backup')) if (is_dir($dir.'/database_backup'))
{ {
remove_dir_content($dir.'/database_backup/'); self::remove_dir_content($dir.'/database_backup/');
rmdir($dir.'/database_backup'); rmdir($dir.'/database_backup');
} }
@ -372,7 +372,7 @@ class db_backup
{ {
return "Cant open '$filename' for reading<br>"; return "Cant open '$filename' for reading<br>";
} }
$this->remove_dir_content($dir); // removes the files-dir self::remove_dir_content($dir); // removes the files-dir
$zip->extractTo($dir); $zip->extractTo($dir);
$_f = $f; $_f = $f;
$list = $this->get_file_list($dir.'/database_backup/'); $list = $this->get_file_list($dir.'/database_backup/');
@ -425,7 +425,7 @@ class db_backup
$this->schemas = unserialize(trim(substr($line,8))); $this->schemas = unserialize(trim(substr($line,8)));
foreach($this->schemas as $table_name => $schema) foreach($this->schemas as $table_name => $schema)
{ {
echo "<pre>$table_name => ".$this->write_array($schema,1)."</pre>\n"; echo "<pre>$table_name => ".self::write_array($schema,1)."</pre>\n";
$this->schema_proc->CreateTable($table_name,$schema); $this->schema_proc->CreateTable($table_name,$schema);
} }
// make the schemas availible for the db-class // make the schemas availible for the db-class
@ -436,7 +436,7 @@ class db_backup
{ {
$table = substr($line,7); $table = substr($line,7);
$cols = $this->csv_split($line=fgets($f)); ++$n; $cols = self::csv_split($line=fgets($f)); ++$n;
if (feof($f)) break; if (feof($f)) break;
continue; continue;
@ -459,7 +459,7 @@ class db_backup
if ($table) // do we already reached the data part if ($table) // do we already reached the data part
{ {
$import = true; $import = true;
$data = $this->csv_split($line,$cols); $data = self::csv_split($line,$cols);
if ($table == 'egw_async' && in_array('##last-check-run##',$data)) { if ($table == 'egw_async' && in_array('##last-check-run##',$data)) {
echo '<p>'.lang("Line %1: '%2'<br><b>csv data does contain ##last-check-run## of table %3 ==> ignored</b>",$n,$line,$table)."</p>\n"; echo '<p>'.lang("Line %1: '%2'<br><b>csv data does contain ##last-check-run## of table %3 ==> ignored</b>",$n,$line,$table)."</p>\n";
echo 'data=<pre>'.print_r($data,true)."</pre>\n"; echo 'data=<pre>'.print_r($data,true)."</pre>\n";
@ -525,13 +525,13 @@ class db_backup
* *
* @param strin $dir * @param strin $dir
*/ */
function remove_dir_content($dir) private static function remove_dir_content($dir)
{ {
$list = scandir($dir); $list = scandir($dir);
while($file = $list[0]) while($file = $list[0])
{ {
if(is_dir($file) && $file != '.' && $file != '..') if(is_dir($file) && $file != '.' && $file != '..')
$this->remove_dir_content($dir.'/'.$file); self::remove_dir_content($dir.'/'.$file);
if(is_file($file) && $file != '.' && $file != '..') if(is_file($file) && $file != '.' && $file != '..')
unlink($dir.'/'.$file); unlink($dir.'/'.$file);
array_shift($list); array_shift($list);
@ -541,8 +541,12 @@ class db_backup
/** /**
* Split one line of a csv file into an array and does all unescaping * Split one line of a csv file into an array and does all unescaping
*
* @param string $line line to split
* @param array $keys=null keys to use or null to use numeric ones
* @return array
*/ */
private function csv_split($line,$keys=False) public static function csv_split($line,$keys=null)
{ {
$fields = explode(',',trim($line)); $fields = explode(',',trim($line));
@ -582,7 +586,7 @@ class db_backup
/** /**
* escape data for csv * escape data for csv
*/ */
private function escape_data(&$data,$col,$defs) public static function escape_data(&$data,$col,$defs)
{ {
if (is_null($data)) if (is_null($data))
{ {
@ -621,7 +625,7 @@ class db_backup
// we may have to clean up old backup - left overs // we may have to clean up old backup - left overs
if (is_dir($dir.'/database_backup')) if (is_dir($dir.'/database_backup'))
{ {
remove_dir_content($dir.'/database_backup/'); self::remove_dir_content($dir.'/database_backup/');
rmdir($dir.'/database_backup'); rmdir($dir.'/database_backup');
} }
@ -784,7 +788,7 @@ class db_backup
} }
} }
$def = "\t\$phpgw_baseline = "; $def = "\t\$phpgw_baseline = ";
$def .= $this->write_array($this->schemas,1); $def .= self::write_array($this->schemas,1);
$def .= ";\n"; $def .= ";\n";
if ($f) if ($f)
@ -807,7 +811,7 @@ class db_backup
* *
* copied from etemplate/inc/class.db_tools.inc.php * copied from etemplate/inc/class.db_tools.inc.php
*/ */
private function write_array($arr,$depth,$parent='') private static function write_array($arr,$depth,$parent='')
{ {
if (in_array($parent,array('pk','fk','ix','uc'))) if (in_array($parent,array('pk','fk','ix','uc')))
{ {
@ -833,7 +837,7 @@ class db_backup
} }
if (is_array($val)) if (is_array($val))
{ {
$def .= $this->write_array($val,$parent == 'fd' ? 0 : $depth,$key); $def .= self::write_array($val,$parent == 'fd' ? 0 : $depth,$key);
} }
else else
{ {