EGroupware / egroupware

phpgwapi/inc/class.db_backup.inc.php

Spacing +157 added lines, -157 removed lines

@@ -46,9 +46,9 @@ 
 	 * @var array
 	 */
 	var $exclude_tables = array(
-		'egw_sessions','egw_app_sessions','phpgw_sessions','phpgw_app_sessions',	// eGW's session-tables
-		'phpgw_anglemail',	// email's cache
-		'egw_felamimail_cache','egw_felamimail_folderstatus','phpgw_felamimail_cache','phpgw_felamimail_folderstatus',	// felamimail's cache
+		'egw_sessions', 'egw_app_sessions', 'phpgw_sessions', 'phpgw_app_sessions', // eGW's session-tables
+		'phpgw_anglemail', // email's cache
+		'egw_felamimail_cache', 'egw_felamimail_folderstatus', 'phpgw_felamimail_cache', 'phpgw_felamimail_folderstatus', // felamimail's cache
 		'egw_phpfreechat', // as of the fieldnames of the table a restore would fail within egroupware, and chatcontent is of no particular intrest
 	);
 	/**
@@ -80,7 +80,7 @@ 
 	 *
 	 * @var boolean
 	 */
-	var $backup_files = false ;
+	var $backup_files = false;
 	/**
 	 * Reference to schema_proc's egw_db object
 	 *
@@ -95,7 +95,7 @@ 
 	{
 		if (isset($GLOBALS['egw_setup']) && is_object($GLOBALS['egw_setup']) && !isset($GLOBALS['egw_setup']->db))
 		{
-			$GLOBALS['egw_setup']->loaddb();	// we run inside setup, but db object is not loaded
+			$GLOBALS['egw_setup']->loaddb(); // we run inside setup, but db object is not loaded
 		}
 		if (isset($GLOBALS['egw_setup']->oProc) && is_object($GLOBALS['egw_setup']->oProc))	// schema_proc already instanciated, use it
 		{
@@ -113,37 +113,37 @@ 
 		{
 			if ($GLOBALS['egw_setup']->config_table && $GLOBALS['egw_setup']->table_exist(array($GLOBALS['egw_setup']->config_table)))
 			{
-				$this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='backup_dir'",__LINE__,__FILE__);
+				$this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='backup_dir'", __LINE__, __FILE__);
 				$this->db->next_record();
 				if (!($this->backup_dir = $this->db->f(0)))
 				{
-					$this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='files_dir'",__LINE__,__FILE__);
+					$this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='files_dir'", __LINE__, __FILE__);
 					$this->db->next_record();
 					$this->backup_dir = $this->db->f(0).'/db_backup';
 				}
-				$this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='files_dir'",__LINE__,__FILE__);
+				$this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='files_dir'", __LINE__, __FILE__);
 				$this->db->next_record();
 				if (!($this->files_dir = $this->db->f(0)))
 				{
 					error_log(__METHOD__."->"."No files Directory set/found");
 				}
-				$this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='system_charset'",__LINE__,__FILE__);
+				$this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='system_charset'", __LINE__, __FILE__);
 				$this->db->next_record();
 				$this->charset = $this->db->f(0);
 				if (!$this->charset)
 				{
-					$this->db->query("SELECT content FROM {$GLOBALS['egw_setup']->lang_table} WHERE message_id='charset' AND app_name='common' AND lang!='en'",__LINE__,__FILE__);
+					$this->db->query("SELECT content FROM {$GLOBALS['egw_setup']->lang_table} WHERE message_id='charset' AND app_name='common' AND lang!='en'", __LINE__, __FILE__);
 					$this->db->next_record();
 					$this->charset = $this->db->f(0);
 				}
-				$this->db->select($GLOBALS['egw_setup']->applications_table,'app_version',array('app_name'=>'phpgwapi'),__LINE__,__FILE__);
+				$this->db->select($GLOBALS['egw_setup']->applications_table, 'app_version', array('app_name'=>'phpgwapi'), __LINE__, __FILE__);
 				$this->api_version = $this->db->next_record() ? $this->db->f(0) : false;
 				/* Backup settings */
-				$this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='backup_mincount'",__LINE__,__FILE__);
+				$this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='backup_mincount'", __LINE__, __FILE__);
 				$this->db->next_record();
 				$this->backup_mincount = $this->db->f(0);
 				// backup files too
-				$this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='backup_files'",__LINE__,__FILE__);
+				$this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='backup_files'", __LINE__, __FILE__);
 				$this->db->next_record();
 				$this->backup_files = (bool)$this->db->f(0);
 			}
@@ -177,7 +177,7 @@ 
 		{
 			mkdir($this->backup_dir);
 		}
-		switch($this->db->Type)
+		switch ($this->db->Type)
 		{
 			case 'sapdb':
 			case 'maxdb':
@@ -194,7 +194,7 @@ 
 	 * @param $reading =false opening for reading ('rb') or writing ('wb')
 	 * @return string/resource/zip error-msg of file-handle
 	 */
-	function fopen_backup($name=false,$reading=false)
+	function fopen_backup($name = false, $reading = false)
 	{
 		//echo "function fopen_backup($name,$reading)<br>";	// !
 		if (!$name)
@@ -203,27 +203,27 @@ 
 			if (!$this->backup_dir || !is_writable($this->backup_dir))
 			{
 				//echo '   -> !$this->backup_dir || !is_writable($this->backup_dir)<br>';	// !
-				return lang("backupdir '%1' is not writeable by the webserver",$this->backup_dir);
+				return lang("backupdir '%1' is not writeable by the webserver", $this->backup_dir);
 			}
 			$name = $this->backup_dir.'/db_backup-'.date('YmdHi');
 		}
 		else	// remove the extension, to use the correct wrapper based on the extension
 		{
 			//echo '-> else<br>';	// !
-			$name = preg_replace('/\.(bz2|gz)$/i','',$name);
+			$name = preg_replace('/\.(bz2|gz)$/i', '', $name);
 		}
 		$mode = $reading ? 'rb' : 'wb';
-		list( , $type) = explode('.', basename($name));
-		if($type == 'zip' && $reading && $this->backup_files)
+		list(, $type) = explode('.', basename($name));
+		if ($type == 'zip' && $reading && $this->backup_files)
 		{
 			//echo '-> $type == "zip" && $reading<br>';	// !
-			if(!class_exists('ZipArchive', false))
+			if (!class_exists('ZipArchive', false))
 			{
 				$this->backup_files = false;
 				//echo '   -> (new ZipArchive) == NULL<br>';	// !
 				return lang("Cant open %1, needs ZipArchive", $name)."<br>\n";
 			}
-			if(!($f = fopen($name, $mode)))
+			if (!($f = fopen($name, $mode)))
 			{
 				//echo '   -> !($f = fopen($name, $mode))<br>';	// !
 				$lang_mode = $reading ? lang("reading") : lang("writing");
@@ -231,10 +231,10 @@ 
 			}
 			return $f;
 		}
-		if(class_exists('ZipArchive', false) && !$reading && $this->backup_files)
+		if (class_exists('ZipArchive', false) && !$reading && $this->backup_files)
 		{
 			//echo '-> (new ZipArchive) != NULL && !$reading; '.$name.'<br>';	// !
-			if(!($f = fopen($name, $mode)))
+			if (!($f = fopen($name, $mode)))
 			{
 				//echo '   -> !($f = fopen($name, $mode))<br>';	// !
 				$lang_mode = $reading ? lang("reading") : lang("writing");
@@ -242,9 +242,9 @@ 
 			}
 			return $f;
 		}
-		if(!($f = fopen("compress.bzip2://$name.bz2", $mode)) &&
-	 		!($f = fopen("compress.zlib://$name.gz",$mode)) &&
- 		 	!($f = fopen($name,$mode))
+		if (!($f = fopen("compress.bzip2://$name.bz2", $mode)) &&
+	 		!($f = fopen("compress.zlib://$name.gz", $mode)) &&
+ 		 	!($f = fopen($name, $mode))
 		)
 		{
 			//echo '-> !($f = fopen("compress.bzip2://$name.bz2", $mode))<br>';	// !
@@ -271,13 +271,13 @@ 
 		/* Search the backup directory for matching files. */
 		$handle = @opendir($this->backup_dir);
 		$files = array();
-		while($handle && ($file = readdir($handle)))
+		while ($handle && ($file = readdir($handle)))
 		{
 			/* Filter for only the files with the regular name (un-renamed).
 			 * Leave special backup files (renamed) in place.
 			 * Note that this also excludes "." and "..".
 			 */
-			if (preg_match("/^db_backup-[0-9]{12}(\.bz2|\.gz|\.zip|)$/",$file))
+			if (preg_match("/^db_backup-[0-9]{12}(\.bz2|\.gz|\.zip|)$/", $file))
 			{
 				$files[filectime($this->backup_dir.'/'.$file)] = $file;
 			}
@@ -287,7 +287,7 @@ 
 		/* Sort the files by ctime. */
 		krsort($files);
 		$count = 0;
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
 			if ($count >= $this->backup_mincount)//
 			{
@@ -297,7 +297,7 @@ 
 					array_push($files_return, $file);
 				}
 			}
-			$count ++;
+			$count++;
 		}
 	}
 
@@ -307,13 +307,13 @@ 
 	 * @param int $minCount Minimum number of backups to keep.
 	 * @param boolean $backupFiles include files in backup or not, default dont change!
 	 */
-	function saveConfig($minCount,$backupFiles=null)
+	function saveConfig($minCount, $backupFiles = null)
 	{
-		config::save_value('backup_mincount',$this->backup_mincount=(int)$minCount,'phpgwapi');
+		config::save_value('backup_mincount', $this->backup_mincount = (int)$minCount, 'phpgwapi');
 
 		if (!is_null($backupFiles))
 		{
-			config::save_value('backup_files',$this->backup_files=(boolean)$backupFiles,'phpgwapi');
+			config::save_value('backup_files', $this->backup_files = (boolean)$backupFiles, 'phpgwapi');
 		}
 	}
 
@@ -336,7 +336,7 @@ 
 		'httpproxy_server_password',
 		'system_charset',
 		'usecookies',
-		'install_id',	// do not restore install_id, as that would give two systems with identical install_id
+		'install_id', // do not restore install_id, as that would give two systems with identical install_id
 	);
 
 	/**
@@ -350,20 +350,20 @@ 
 	 *
 	 * @returns An empty string or an error message in case of failure.
 	 */
-	function restore($f,$convert_to_system_charset=true,$filename='',$protect_system_config=true, $insert_n_rows=10)
+	function restore($f, $convert_to_system_charset = true, $filename = '', $protect_system_config = true, $insert_n_rows = 10)
 	{
 		@set_time_limit(0);
-		ini_set('auto_detect_line_endings',true);
+		ini_set('auto_detect_line_endings', true);
 
-		if (true) $convert_to_system_charset = true;	// enforce now utf-8 as system charset restores of old backups
+		if (true) $convert_to_system_charset = true; // enforce now utf-8 as system charset restores of old backups
 
 		if ($protect_system_config)
 		{
 			$system_config = array();
-			foreach($this->db->select(self::TABLE,'*',array(
+			foreach ($this->db->select(self::TABLE, '*', array(
 				'config_app' => 'phpgwapi',
 				'config_name' => self::$system_config,
-			),__LINE__,__FILE__) as $row)
+			), __LINE__, __FILE__) as $row)
 			{
 				$system_config[] = $row;
 			}
@@ -372,7 +372,7 @@ 
 		// as MySQL 5.7+ has sql_mode STRICT_(ALL|TRANS)_TABLES enabled by default,
 		// it will no longer restore '0000-00-00 00:00:00' in timestamps it created before,
 		// so switching strict-mode off temporary for the restore (we dont create these!)
-		if (substr($this->db->Type,0,5) == 'mysql')
+		if (substr($this->db->Type, 0, 5) == 'mysql')
 		{
 			$this->db->query("SET SESSION sql_mode=(SELECT REPLACE(REPLACE(@@sql_mode,'STRICT_ALL_TABLES',''),'STRICT_TRANS_TABLES',''))", __LINE__, __FILE__);
 		}
@@ -382,17 +382,17 @@ 
 		}
 
 		// drop all existing tables
-		foreach($this->adodb->MetaTables('TABLES') as $table)
+		foreach ($this->adodb->MetaTables('TABLES') as $table)
 		{
-			if ($this->system_tables && preg_match($this->system_tables,$table) ||
-				$this->egw_tables && !preg_match($this->egw_tables,$table))
+			if ($this->system_tables && preg_match($this->system_tables, $table) ||
+				$this->egw_tables && !preg_match($this->egw_tables, $table))
 			{
 				 continue;
 			}
 			$this->schema_proc->DropTable($table);
 		}
 		// it could be an old backup
-		list( , $type) = explode('.', basename($filename));
+		list(, $type) = explode('.', basename($filename));
 		$dir = $this->files_dir; // $GLOBALS['egw_info']['server']['files_dir'];
 		// we may have to clean up old backup - left overs
 		if (is_dir($dir.'/database_backup'))
@@ -405,20 +405,20 @@ 
 		$name = "";
 		$zip = NULL;
 		$_f = NULL;
-		if($type == 'zip')
+		if ($type == 'zip')
 	    {
 			// has already been verified to be available in fopen_backup
 			$zip = new ZipArchive;
-			if(($zip->open($filename)) !== TRUE)
+			if (($zip->open($filename)) !== TRUE)
 			{
 				return lang("Cant open '%1' for %2", $filename, lang("reading"))."<br>\n";
 			}
-			self::remove_dir_content($dir);  // removes the files-dir
+			self::remove_dir_content($dir); // removes the files-dir
 			$zip->extractTo($dir);
 			$_f = $f;
 			$list = $this->get_file_list($dir.'/database_backup/');
 			$name = $dir.'/database_backup/'.basename($list[0]);
-			if(!($f = fopen($name, 'rb')))
+			if (!($f = fopen($name, 'rb')))
 			{
 				return lang("Cant open '%1' for %2", $filename, lang("reading"))."<br>\n";
 			}
@@ -435,46 +435,46 @@ 
 		{
 			$this->db->insert(config::TABLE, array(
 				'config_value' => $this->schema_proc->system_charset,
-			),array(
+			), array(
 				'config_app' => 'phpgwapi',
 				'config_name' => 'system_charset',
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 		}
 		// restore protected system config
 		if ($protect_system_config)
 		{
-			foreach($system_config as $row)
+			foreach ($system_config as $row)
 			{
-				$this->db->insert(self::TABLE,array('config_value'=>$row['config_value']),array(
+				$this->db->insert(self::TABLE, array('config_value'=>$row['config_value']), array(
 					'config_name' => $row['config_name'],
 					'config_app'  => $row['config_app'],
-				),__LINE__,__FILE__);
+				), __LINE__, __FILE__);
 			}
 			// check and reset cookie configuration, if it does not match current enviroment
 			// if $_SERVER[HTTP_HOST] does not end with cookiedomain --> delete cookiedomain
-			if (($cookiedomain = $this->db->select(self::TABLE,'config_value',array(
+			if (($cookiedomain = $this->db->select(self::TABLE, 'config_value', array(
 					'config_app' => 'phpgwapi',
 					'config_name' => 'cookiedomain',
-				),__LINE__,__FILE__)->fetchColumn()) && isset($_SERVER['HTTP_HOST']) &&
-				(list($hostname) = explode(':',$_SERVER['HTTP_HOST'])) &&
-				substr($hostname,-strlen($cookiedomain) !== $cookiedomain))
+				), __LINE__, __FILE__)->fetchColumn()) && isset($_SERVER['HTTP_HOST']) &&
+				(list($hostname) = explode(':', $_SERVER['HTTP_HOST'])) &&
+				substr($hostname, -strlen($cookiedomain) !== $cookiedomain))
 			{
-				$this->db->delete(self::TABLE,array(
+				$this->db->delete(self::TABLE, array(
 					'config_app' => 'phpgwapi',
 					'config_name' => 'cookiedomain',
-				),__LINE__,__FILE__);
+				), __LINE__, __FILE__);
 			}
 			// if configured webserver_url does NOT start with cookiepath --> delete cookiepath
-			if (($cookiepath = $this->db->select(self::TABLE,'config_value',array(
+			if (($cookiepath = $this->db->select(self::TABLE, 'config_value', array(
 					'config_app' => 'phpgwapi',
 					'config_name' => 'cookiepath',
-				),__LINE__,__FILE__)->fetchColumn()) &&
-				substr(parse_url($system_config['webserver_url'], PHP_URL_PATH),0,strlen($cookiepath) !== $cookiepath))
+				), __LINE__, __FILE__)->fetchColumn()) &&
+				substr(parse_url($system_config['webserver_url'], PHP_URL_PATH), 0, strlen($cookiepath) !== $cookiepath))
 			{
-				$this->db->delete(self::TABLE,array(
+				$this->db->delete(self::TABLE, array(
 					'config_app' => 'phpgwapi',
 					'config_name' => 'cookiepath',
-				),__LINE__,__FILE__);
+				), __LINE__, __FILE__);
 			}
 		}
 		// restore original Halt_On_Error state (if changed)
@@ -483,13 +483,13 @@ 
 			$this->db->Halt_On_Error = $backup_db_halt_on_error;
 		}
 		// zip?
-		if($type == 'zip')
+		if ($type == 'zip')
 		{
 			fclose($f);
 			unlink($name);
 			rmdir($dir.'/database_backup');
 		}
-		if (substr($this->db->Type,0,5) != 'mysql')
+		if (substr($this->db->Type, 0, 5) != 'mysql')
 		{
 			if (!$this->db->transaction_commit())
 			{
@@ -524,26 +524,26 @@ 
 	 * @param int|string $insert_n_rows =10 how many rows to insert in one sql statement, or string with column-name used as unique key for insert
 	 * @returns int number of rows read from csv file
 	 */
-	function db_restore($f, $insert_n_rows=10)
+	function db_restore($f, $insert_n_rows = 10)
 	{
 		$convert_to_system_charset = true;
 		$table = False;
 		$n = 0;
 		$rows = array();
-		while(!feof($f))
+		while (!feof($f))
 		{
 			$line = trim(fgets($f)); ++$n;
 
 			if (empty($line)) continue;
 
-			if (substr($line,0,9) == 'version: ')
+			if (substr($line, 0, 9) == 'version: ')
 			{
-				$api_version = trim(substr($line,9));
+				$api_version = trim(substr($line, 9));
 				continue;
 			}
-			if (substr($line,0,9) == 'charset: ')
+			if (substr($line, 0, 9) == 'charset: ')
 			{
-				$charset = trim(substr($line,9));
+				$charset = trim(substr($line, 9));
 				// needed if mbstring.func_overload > 0, else eg. substr does not work with non ascii chars
 				$ini_default_charset = version_compare(PHP_VERSION, '5.6', '<') ? 'mbstring.internal_encoding' : 'default_charset';
 				@ini_set($ini_default_charset, $charset);
@@ -551,29 +551,29 @@ 
 				// check if we really need to convert the charset, as it's not perfect and can do some damage
 				if ($convert_to_system_charset && !strcasecmp($this->schema_proc->system_charset, $charset))
 				{
-					$convert_to_system_charset = false;	// no conversation necessary
+					$convert_to_system_charset = false; // no conversation necessary
 				}
 				// set the DB's client encoding (for mysql only if api_version >= 1.0.1.019)
 				if ((!$convert_to_system_charset || $this->db->capabilities['client_encoding']) &&
-					(substr($this->db->Type,0,5) != 'mysql' || !is_object($GLOBALS['egw_setup']) ||
-					$api_version && !$GLOBALS['egw_setup']->alessthanb($api_version,'1.0.1.019')))
+					(substr($this->db->Type, 0, 5) != 'mysql' || !is_object($GLOBALS['egw_setup']) ||
+					$api_version && !$GLOBALS['egw_setup']->alessthanb($api_version, '1.0.1.019')))
 				{
 					$this->db->Link_ID->SetCharSet($charset);
 					if (!$convert_to_system_charset)
 					{
-						$this->schema_proc->system_charset = $charset;	// so schema_proc uses it for the creation of the tables
+						$this->schema_proc->system_charset = $charset; // so schema_proc uses it for the creation of the tables
 					}
 				}
 				continue;
 			}
-			if (substr($line,0,8) == 'schema: ')
+			if (substr($line, 0, 8) == 'schema: ')
 			{
 				// create the tables in the backup set
-				$this->schemas = json_php_unserialize(trim(substr($line,8)));
-				foreach($this->schemas as $table_name => $schema)
+				$this->schemas = json_php_unserialize(trim(substr($line, 8)));
+				foreach ($this->schemas as $table_name => $schema)
 				{
 					// if column is longtext in current schema, convert text to longtext, in case user already updated column
-					foreach($schema['fd'] as $col => &$def)
+					foreach ($schema['fd'] as $col => &$def)
 					{
 						if ($def['type'] == 'text' && $this->db->get_column_attribute($col, $table_name, true, 'type') == 'longtext')
 						{
@@ -585,27 +585,27 @@ 
 				}
 				continue;
 			}
-			if (substr($line,0,7) == 'table: ')
+			if (substr($line, 0, 7) == 'table: ')
 			{
 				if ($rows)	// flush pending rows of last table
 				{
 					$this->insert_multiple($table, $rows, $this->schemas[$table]);
 				}
 				$rows = array();
-				$table = substr($line,7);
+				$table = substr($line, 7);
 				if (!isset($this->schemas[$table])) $this->schemas[$table] = $this->db->get_table_definitions(true, $table);
 				$auto_id = count($this->schemas[$table]['pk']) == 1 ? $this->schemas[$table]['pk'][0] : null;
 
-				$cols = self::csv_split($line=fgets($f)); ++$n;
+				$cols = self::csv_split($line = fgets($f)); ++$n;
 				$blobs = array();
-				foreach($this->schemas[$table]['fd'] as $col => $data)
+				foreach ($this->schemas[$table]['fd'] as $col => $data)
 				{
 					if ($data['type'] == 'blob') $blobs[] = $col;
 				}
 				// check if we have an old PostgreSQL backup useing 't'/'f' for bool values
 				// --> convert them to MySQL and our new PostgreSQL format of 1/0
 				$bools = array();
-				foreach($this->schemas[$table]['fd'] as $col => $def)
+				foreach ($this->schemas[$table]['fd'] as $col => $def)
 				{
 					if ($def['type'] === 'bool') $bools[] = $col;
 				}
@@ -629,15 +629,15 @@ 
 				$import = true;
 				$data = self::csv_split($line, $cols, $blobs, $bools);
 
-				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 'data=<pre>'.print_r($data,true)."</pre>\n";
 					$import = false;
 				}
-				if (in_array($table,$this->exclude_tables))
+				if (in_array($table, $this->exclude_tables))
 				{
-					echo '<p><b>'.lang("Table %1 is excluded from backup and restore. Data will not be restored.",$table)."</b></p>\n";
+					echo '<p><b>'.lang("Table %1 is excluded from backup and restore. Data will not be restored.", $table)."</b></p>\n";
 					$import = false; // dont restore data of excluded tables
 				}
 				if ($import)
@@ -646,7 +646,7 @@ 
 					{
 						if ($convert_to_system_charset && !$this->db->capabilities['client_encoding'])
 						{
-							$data = translation::convert($data,$charset);
+							$data = translation::convert($data, $charset);
 						}
 						if ($insert_n_rows > 1)
 						{
@@ -658,27 +658,27 @@ 
 							}
 						}
 						// update existing table using given unique key in $insert_n_rows (also removing auto-id/sequence)
-						elseif(!is_numeric($insert_n_rows))
+						elseif (!is_numeric($insert_n_rows))
 						{
 							$where = array($insert_n_rows => $data[$insert_n_rows]);
 							unset($data[$insert_n_rows]);
 							if ($auto_id) unset($data[$auto_id]);
-							$this->db->insert($table,$data,$where,__LINE__,__FILE__,false,false,$this->schemas[$table]);
+							$this->db->insert($table, $data, $where, __LINE__, __FILE__, false, false, $this->schemas[$table]);
 						}
 						else
 						{
 							try {
-								$this->db->insert($table,$data,False,__LINE__,__FILE__,false,false,$this->schemas[$table]);
+								$this->db->insert($table, $data, False, __LINE__, __FILE__, false, false, $this->schemas[$table]);
 							}
-							catch(egw_exception_db_invalid_sql $e) {
+							catch (egw_exception_db_invalid_sql $e) {
 								echo "<p>".$e->getMessage()."</p>\n";
 							}
 						}
 					}
 					else
 					{
-						echo '<p>'.lang("Line %1: '%2'<br><b>csv data does not match column-count of table %3 ==> ignored</b>",$n,$line,$table)."</p>\n";
-						echo 'data=<pre>'.print_r($data,true)."</pre>\n";
+						echo '<p>'.lang("Line %1: '%2'<br><b>csv data does not match column-count of table %3 ==> ignored</b>", $n, $line, $table)."</p>\n";
+						echo 'data=<pre>'.print_r($data, true)."</pre>\n";
 					}
 				}
 			}
@@ -688,14 +688,14 @@ 
 			$this->insert_multiple($table, $rows, $this->schemas[$table]);
 		}
 		// updated the sequences, if the DB uses them
-		foreach($this->schemas as $table => $schema)
+		foreach ($this->schemas as $table => $schema)
 		{
-			foreach($schema['fd'] as $column => $definition)
+			foreach ($schema['fd'] as $column => $definition)
 			{
 				if ($definition['type'] == 'auto')
 				{
-					$this->schema_proc->UpdateSequence($table,$column);
-					break;	// max. one per table
+					$this->schema_proc->UpdateSequence($table, $column);
+					break; // max. one per table
 				}
 			}
 		}
@@ -718,15 +718,15 @@ 
 		try {
 			$this->db->insert($table, $rows, False, __LINE__, __FILE__, false, false, $schema);
 		}
-		catch(egw_exception_db_invalid_sql $e)
+		catch (egw_exception_db_invalid_sql $e)
 		{
 			// try inserting them one by one, ignoring doublicates
-			foreach($rows as $data)
+			foreach ($rows as $data)
 			{
 				try {
 					$this->db->insert($table, $data, False, __LINE__, __FILE__, false, false, $schema);
 				}
-				catch(egw_exception_db_invalid_sql $e) {
+				catch (egw_exception_db_invalid_sql $e) {
 					echo "<p>".$e->getMessage()."</p>\n";
 				}
 			}
@@ -741,11 +741,11 @@ 
 	private static function remove_dir_content($dir)
 	{
 		$list = scandir($dir);
-		while($file = $list[0])
+		while ($file = $list[0])
 		{
-			if(is_dir($file) && $file != '.' && $file != '..')
+			if (is_dir($file) && $file != '.' && $file != '..')
 			    self::remove_dir_content($dir.'/'.$file);
-			if(is_file($file) && $file != '.' && $file != '..')
+			if (is_file($file) && $file != '.' && $file != '..')
 			    unlink($dir.'/'.$file);
 			array_shift($list);
 		}
@@ -770,7 +770,7 @@ 
 	 * @param array $bools =array() bool columns, values might be 't'/'f' for old PostgreSQL backups
 	 * @return array
 	 */
-	public static function csv_split($line, $keys=null, $blobs=array(), $bools=array())
+	public static function csv_split($line, $keys = null, $blobs = array(), $bools = array())
 	{
 		if (function_exists('str_getcsv'))	// php5.3+
 		{
@@ -783,9 +783,9 @@ 
 				'\\n'    => "\n",
 				'\\r'    => "\r")), ',', '"', '\0');
 			// replace NULL-token again with 'NULL', 'NULL' with null and BACKSLASH-token with a backslash
-			foreach($fields as &$field)
+			foreach ($fields as &$field)
 			{
-				switch($field)
+				switch ($field)
 				{
 					case self::NULL_TOKEN:
 						$field = 'NULL';
@@ -802,7 +802,7 @@ 
 			{
 				$fields = array_combine($keys, $fields);
 				// base64-decode blob columns, if they are base64 encoded
-				foreach($blobs as $key)
+				foreach ($blobs as $key)
 				{
 					if (!is_null($fields[$key]) && ($tmp = base64_decode($fields[$key], true)) !== false)
 					{
@@ -810,7 +810,7 @@ 
 					}
 				}
 				// decode bool columns, they might be 't'/'f' for old PostgreSQL backups
-				foreach($bools as $key)
+				foreach ($bools as $key)
 				{
 					$fields[$key] = egw_db::from_bool($fields[$key]);
 				}
@@ -818,11 +818,11 @@ 
 			return $fields;
 		}
 		// pre 5.3 implementation
-		$fields = explode(',',trim($line));
+		$fields = explode(',', trim($line));
 
 		$str_pending = False;
 		$n = 0;
-		foreach($fields as $field)
+		foreach ($fields as $field)
 		{
 			if ($str_pending !== False)
 			{
@@ -833,12 +833,12 @@ 
 
 			if ($field[0] == '"')
 			{
-				if (substr($field,-1) !== '"' || $field === '"' || !preg_match('/[^\\\\]+(\\\\\\\\)*"$/',$field))
+				if (substr($field, -1) !== '"' || $field === '"' || !preg_match('/[^\\\\]+(\\\\\\\\)*"$/', $field))
 				{
 					$str_pending = $field;
 					continue;
 				}
-				$arr[$key] = str_replace(self::BACKSLASH_TOKEN,'\\',str_replace(array('\\\\','\\n','\\r','\\"'),array(self::BACKSLASH_TOKEN,"\n","\r",'"'),substr($field,1,-1)));
+				$arr[$key] = str_replace(self::BACKSLASH_TOKEN, '\\', str_replace(array('\\\\', '\\n', '\\r', '\\"'), array(self::BACKSLASH_TOKEN, "\n", "\r", '"'), substr($field, 1, -1)));
 			}
 			elseif ($keys && strlen($field) > 26)
 			{
@@ -860,7 +860,7 @@ 
 	/**
 	 * escape data for csv
 	 */
-	public static function escape_data(&$data,$col,$defs)
+	public static function escape_data(&$data, $col, $defs)
 	{
 		if (is_null($data))
 		{
@@ -868,7 +868,7 @@ 
 		}
 		else
 		{
-			switch($defs[$col]['type'])
+			switch ($defs[$col]['type'])
 			{
 				case 'int':
 				case 'auto':
@@ -883,7 +883,7 @@ 
 					$data = (int)egw_db::from_bool($data);
 					break;
 				default:
-					$data = '"'.str_replace(array('\\',"\n","\r",'"'),array('\\\\','\\n','\\r','\\"'),$data).'"';
+					$data = '"'.str_replace(array('\\', "\n", "\r", '"'), array('\\\\', '\\n', '\\r', '\\"'), $data).'"';
 					break;
 			}
 		}
@@ -915,15 +915,15 @@ 
 		$name = $this->backup_dir.'/db_backup-'.date('YmdHi');
 		$filename = $name.'.zip';
 		$zippresent = false;
-		if(class_exists('ZipArchive') && $this->backup_files)
+		if (class_exists('ZipArchive') && $this->backup_files)
 		{
 			$zip = new ZipArchive;
-			if(is_object($zip))
+			if (is_object($zip))
 			{
 				$zippresent = true;
 				//echo '-> is_object($zip); '.$filename.'<br>';	// !
 				$res = $zip->open($filename, ZIPARCHIVE::CREATE);
-				if($res !== TRUE)
+				if ($res !== TRUE)
 				{
 					//echo '   -> !$res<br>';	// !
 					return lang("Cant open '%1' for %2", $filename, lang("writing"))."<br>\n";
@@ -931,19 +931,19 @@ 
 				$file_list = $this->get_file_list($dir);
 			}
 		}
-		fwrite($f,"EGroupware backup from ".date('Y-m-d H:i:s')."\n\n");
+		fwrite($f, "EGroupware backup from ".date('Y-m-d H:i:s')."\n\n");
 
-		fwrite($f,"version: $this->api_version\n\n");
+		fwrite($f, "version: $this->api_version\n\n");
 
-		fwrite($f,"charset: $this->charset\n\n");
+		fwrite($f, "charset: $this->charset\n\n");
 
-		$this->schema_backup($f);	// add the schema in a human readable form too
+		$this->schema_backup($f); // add the schema in a human readable form too
 
-		fwrite($f,"\nschema: ".json_encode($this->schemas)."\n");
+		fwrite($f, "\nschema: ".json_encode($this->schemas)."\n");
 
-		foreach($this->schemas as $table => $schema)
+		foreach ($this->schemas as $table => $schema)
 		{
-			if (in_array($table,$this->exclude_tables)) continue;	// dont backup
+			if (in_array($table, $this->exclude_tables)) continue; // dont backup
 
 			// do we have a primary key?
 			// --> use it to order and limit rows, to kope with rows being added during backup
@@ -955,26 +955,26 @@ 
 			do {
 				$num_rows = 0;
 				// querying only chunks for 10000 rows, to not run into memory limit on huge tables
-				foreach($this->db->select($table, '*',
+				foreach ($this->db->select($table, '*',
 					// limit by maximum primary key already received
 					empty($pk) || !$max ? false : $pk.' > '.$this->db->quote($max, $schema['fd'][$pk]['type']),
 					__LINE__, __FILE__,
-					empty($pk) ? false : 0,					// if no primary key, query all rows
-					empty($pk) ? '' : 'ORDER BY '.$this->db->name_quote($pk).' ASC',	// order by primary key
+					empty($pk) ? false : 0, // if no primary key, query all rows
+					empty($pk) ? '' : 'ORDER BY '.$this->db->name_quote($pk).' ASC', // order by primary key
 					false, self::ROW_CHUNK) as $row)
 				{
 					if (!empty($pk)) $max = $row[$pk];
-					if ($total === 0) fwrite($f,"\ntable: $table\n".implode(',',array_keys($row))."\n");
+					if ($total === 0) fwrite($f, "\ntable: $table\n".implode(',', array_keys($row))."\n");
 
-					array_walk($row,array('db_backup','escape_data'),$schema['fd']);
-					fwrite($f,implode(',',$row)."\n");
+					array_walk($row, array('db_backup', 'escape_data'), $schema['fd']);
+					fwrite($f, implode(',', $row)."\n");
 					++$total;
 					++$num_rows;
 				}
 			}
-			while(!empty($pk) && !($total % self::ROW_CHUNK) && $num_rows);
+			while (!empty($pk) && !($total % self::ROW_CHUNK) && $num_rows);
 		}
-		if(!$zippresent)  // save without files
+		if (!$zippresent)  // save without files
 		{
 			if ($this->backup_files)
 			{
@@ -989,16 +989,16 @@ 
 		//echo $name.'<br>';
 		$zip->addFile($name, 'database_backup/'.basename($name));
 		$count = 1;
-		foreach($file_list as $file)
+		foreach ($file_list as $file)
 		{
 			//echo substr($file,strlen($dir)+1).'<br>';
 			//echo $file.'<br>';
-			$zip->addFile($file,substr($file,strlen($dir)+1));//,substr($file);
-			if(($count++) == 100) { // the file descriptor limit
+			$zip->addFile($file, substr($file, strlen($dir) + 1)); //,substr($file);
+			if (($count++) == 100) { // the file descriptor limit
 				$zip->close();
-				if(($zip = new ZipArchive())) {
+				if (($zip = new ZipArchive())) {
 					$zip->open($filename);
-					$count =0;
+					$count = 0;
 				}
 			}
 		}
@@ -1021,17 +1021,17 @@ 
 	{
 		//chdir($f);
 		//echo "Processing $f <br>";
-		if ($path_name =='') $path_name = $f;
+		if ($path_name == '') $path_name = $f;
 		$tlist = scandir($f);
 		$list = array();
 		$i = $cnt;
-		while($file = $tlist[0]) // remove all '.' and '..' and transfer to $list
+		while ($file = $tlist[0]) // remove all '.' and '..' and transfer to $list
 		{
-			if($file == '.' || $file == '..')
+			if ($file == '.' || $file == '..')
 			{
 				array_shift($tlist);
 			}
-			elseif ($file == 'debug.txt' && stripos($f,'activesync')!==false)
+			elseif ($file == 'debug.txt' && stripos($f, 'activesync') !== false)
 			{
 				// skip activesync debug.txt on backupFiles
 				//error_log(__METHOD__.__LINE__.'->'.$f.'/'.$file);
@@ -1039,7 +1039,7 @@ 
 			}
 			else
 			{
-				if(is_dir($f.'/'.$file))
+				if (is_dir($f.'/'.$file))
 				{
 					$nlist = $this->get_file_list($f.'/'.$file, $i);
 					$list += $nlist;
@@ -1060,12 +1060,12 @@ 
 	 *
 	 * @param resource|boolean $f
 	 */
-	function schema_backup($f=False)
+	function schema_backup($f = False)
 	{
-		foreach($this->adodb->MetaTables('TABLES') as $table)
+		foreach ($this->adodb->MetaTables('TABLES') as $table)
 		{
-			if ($this->system_tables && preg_match($this->system_tables,$table) ||
-				$this->egw_tables && !preg_match($this->egw_tables,$table))
+			if ($this->system_tables && preg_match($this->system_tables, $table) ||
+				$this->egw_tables && !preg_match($this->egw_tables, $table))
 			{
 				continue;
 			}
@@ -1084,17 +1084,17 @@ 
 			}
 		}
 		$def = "\t\$phpgw_baseline = ";
-		$def .= self::write_array($this->schemas,1);
+		$def .= self::write_array($this->schemas, 1);
 		$def .= ";\n";
 
 		if ($f)
 		{
-			fwrite($f,$def);
+			fwrite($f, $def);
 		}
 		else
 		{
 			$def = "<?php\n\t/* EGroupware schema-backup from ".date('Y-m-d H:i:s')." */\n\n".$def;
-			html::content_header('schema-backup-'.date('YmdHi').'.inc.php','text/plain',bytes($def));
+			html::content_header('schema-backup-'.date('YmdHi').'.inc.php', 'text/plain', bytes($def));
 			echo $def;
 		}
 	}
@@ -1104,9 +1104,9 @@ 
 	 *
 	 * copied from etemplate/inc/class.db_tools.inc.php
 	 */
-	private static 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')))
 		{
 			$depth = 0;
 		}
@@ -1122,7 +1122,7 @@ 
 		$def = "array($tabs".($tabs ? "\t" : '');
 
 		$n = 0;
-		foreach($arr as $key => $val)
+		foreach ($arr as $key => $val)
 		{
 			if (!is_int($key))
 			{
@@ -1130,7 +1130,7 @@ 
 			}
 			if (is_array($val))
 			{
-				$def .= self::write_array($val,$parent == 'fd' ? 0 : $depth,$key);
+				$def .= self::write_array($val, $parent == 'fd' ? 0 : $depth, $key);
 			}
 			else
 			{
@@ -1143,7 +1143,7 @@ 
 					$def .= "'$val'";
 				}
 			}
-			if ($n < count($arr)-1)
+			if ($n < count($arr) - 1)
 			{
 				$def .= ",$tabs".($tabs ? "\t" : '');
 			}

Braces +123 added lines, -34 removed lines

@@ -97,23 +97,32 @@ 
 		{
 			$GLOBALS['egw_setup']->loaddb();	// we run inside setup, but db object is not loaded
 		}
-		if (isset($GLOBALS['egw_setup']->oProc) && is_object($GLOBALS['egw_setup']->oProc))	// schema_proc already instanciated, use it
+		if (isset($GLOBALS['egw_setup']->oProc) && is_object($GLOBALS['egw_setup']->oProc))
+		{
+			// schema_proc already instanciated, use it
 		{
 			$this->schema_proc = $GLOBALS['egw_setup']->oProc;
 		}
+		}
 		else
 		{
 			$this->schema_proc = new schema_proc();
 		}
 
 		$this->db = $this->schema_proc->m_odb;
-		if (!$this->db->Link_ID) $this->db->connect();
+		if (!$this->db->Link_ID)
+		{
+			$this->db->connect();
+		}
 		$this->adodb = $this->db->Link_ID;
-		if (isset($GLOBALS['egw_setup']) && is_object($GLOBALS['egw_setup']))		// called from setup
+		if (isset($GLOBALS['egw_setup']) && is_object($GLOBALS['egw_setup']))
+		{
+			// called from setup
 		{
 			if ($GLOBALS['egw_setup']->config_table && $GLOBALS['egw_setup']->table_exist(array($GLOBALS['egw_setup']->config_table)))
 			{
 				$this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='backup_dir'",__LINE__,__FILE__);
+		}
 				$this->db->next_record();
 				if (!($this->backup_dir = $this->db->f(0)))
 				{
@@ -147,7 +156,10 @@ 
 				$this->db->next_record();
 				$this->backup_files = (bool)$this->db->f(0);
 			}
-			if (!$this->charset) $this->charset = 'iso-8859-1';
+			if (!$this->charset)
+			{
+				$this->charset = 'iso-8859-1';
+			}
 		}
 		else	// called from eGW
 		{
@@ -245,8 +257,7 @@ 
 		if(!($f = fopen("compress.bzip2://$name.bz2", $mode)) &&
 	 		!($f = fopen("compress.zlib://$name.gz",$mode)) &&
  		 	!($f = fopen($name,$mode))
-		)
-		{
+		) {
 			//echo '-> !($f = fopen("compress.bzip2://$name.bz2", $mode))<br>';	// !
 			$lang_mode = $reading ? lang("reading") : lang("writing");
 			return lang("Cant open '%1' for %2", $name, $lang_mode)."<br>";
@@ -282,16 +293,22 @@ 
 				$files[filectime($this->backup_dir.'/'.$file)] = $file;
 			}
 		}
-		if ($handle) closedir($handle);
+		if ($handle)
+		{
+			closedir($handle);
+		}
 
 		/* Sort the files by ctime. */
 		krsort($files);
 		$count = 0;
 		foreach($files as $file)
 		{
-			if ($count >= $this->backup_mincount)//
+			if ($count >= $this->backup_mincount)
+			{
+				//
 			{
 				$ret = unlink($this->backup_dir.'/'.$file);
+			}
 				if (($ret) && (is_array($files_return)))
 				{
 					array_push($files_return, $file);
@@ -355,7 +372,11 @@ 
 		@set_time_limit(0);
 		ini_set('auto_detect_line_endings',true);
 
-		if (true) $convert_to_system_charset = true;	// enforce now utf-8 as system charset restores of old backups
+		if (true)
+		{
+			$convert_to_system_charset = true;
+		}
+		// enforce now utf-8 as system charset restores of old backups
 
 		if ($protect_system_config)
 		{
@@ -406,7 +427,7 @@ 
 		$zip = NULL;
 		$_f = NULL;
 		if($type == 'zip')
-	    {
+		{
 			// has already been verified to be available in fopen_backup
 			$zip = new ZipArchive;
 			if(($zip->open($filename)) !== TRUE)
@@ -431,7 +452,9 @@ 
 		}
 		$this->db_restore($f, $insert_n_rows);
 
-		if ($convert_to_system_charset)	// store the changed charset
+		if ($convert_to_system_charset)
+		{
+			// store the changed charset
 		{
 			$this->db->insert(config::TABLE, array(
 				'config_value' => $this->schema_proc->system_charset,
@@ -440,6 +463,7 @@ 
 				'config_name' => 'system_charset',
 			),__LINE__,__FILE__);
 		}
+		}
 		// restore protected system config
 		if ($protect_system_config)
 		{
@@ -534,7 +558,10 @@ 
 		{
 			$line = trim(fgets($f)); ++$n;
 
-			if (empty($line)) continue;
+			if (empty($line))
+			{
+				continue;
+			}
 
 			if (substr($line,0,9) == 'version: ')
 			{
@@ -587,31 +614,49 @@ 
 			}
 			if (substr($line,0,7) == 'table: ')
 			{
-				if ($rows)	// flush pending rows of last table
+				if ($rows)
+				{
+					// flush pending rows of last table
 				{
 					$this->insert_multiple($table, $rows, $this->schemas[$table]);
 				}
+				}
 				$rows = array();
 				$table = substr($line,7);
-				if (!isset($this->schemas[$table])) $this->schemas[$table] = $this->db->get_table_definitions(true, $table);
+				if (!isset($this->schemas[$table]))
+				{
+					$this->schemas[$table] = $this->db->get_table_definitions(true, $table);
+				}
 				$auto_id = count($this->schemas[$table]['pk']) == 1 ? $this->schemas[$table]['pk'][0] : null;
 
 				$cols = self::csv_split($line=fgets($f)); ++$n;
 				$blobs = array();
 				foreach($this->schemas[$table]['fd'] as $col => $data)
 				{
-					if ($data['type'] == 'blob') $blobs[] = $col;
+					if ($data['type'] == 'blob')
+					{
+						$blobs[] = $col;
+					}
 				}
 				// check if we have an old PostgreSQL backup useing 't'/'f' for bool values
 				// --> convert them to MySQL and our new PostgreSQL format of 1/0
 				$bools = array();
 				foreach($this->schemas[$table]['fd'] as $col => $def)
 				{
-					if ($def['type'] === 'bool') $bools[] = $col;
+					if ($def['type'] === 'bool')
+					{
+						$bools[] = $col;
+					}
+				}
+				if ($table == 'egw_cal_dates')
+				{
+					error_log(__METHOD__."() $table: bools=".array2string($bools).", schema[fd]=".array2string($this->schemas[$table]['fd']));
 				}
-				if ($table == 'egw_cal_dates') error_log(__METHOD__."() $table: bools=".array2string($bools).", schema[fd]=".array2string($this->schemas[$table]['fd']));
 
-				if (feof($f)) break;
+				if (feof($f))
+				{
+					break;
+				}
 				continue;
 			}
 			if ($convert_to_system_charset && !$this->db->capabilities['client_encoding'])
@@ -624,9 +669,12 @@ 
 					}
 				}
 			}
-			if ($table)	// do we already reached the data part
+			if ($table)
+			{
+				// do we already reached the data part
 			{
 				$import = true;
+			}
 				$data = self::csv_split($line, $cols, $blobs, $bools);
 
 				if ($table == 'egw_async' && in_array('##last-check-run##',$data))
@@ -662,7 +710,10 @@ 
 						{
 							$where = array($insert_n_rows => $data[$insert_n_rows]);
 							unset($data[$insert_n_rows]);
-							if ($auto_id) unset($data[$auto_id]);
+							if ($auto_id)
+							{
+								unset($data[$auto_id]);
+							}
 							$this->db->insert($table,$data,$where,__LINE__,__FILE__,false,false,$this->schemas[$table]);
 						}
 						else
@@ -683,10 +734,13 @@ 
 				}
 			}
 		}
-		if ($rows)	// flush pending rows
+		if ($rows)
+		{
+			// flush pending rows
 		{
 			$this->insert_multiple($table, $rows, $this->schemas[$table]);
 		}
+		}
 		// updated the sequences, if the DB uses them
 		foreach($this->schemas as $table => $schema)
 		{
@@ -744,9 +798,13 @@ 
 		while($file = $list[0])
 		{
 			if(is_dir($file) && $file != '.' && $file != '..')
-			    self::remove_dir_content($dir.'/'.$file);
+			{
+						    self::remove_dir_content($dir.'/'.$file);
+			}
 			if(is_file($file) && $file != '.' && $file != '..')
-			    unlink($dir.'/'.$file);
+			{
+						    unlink($dir.'/'.$file);
+			}
 			array_shift($list);
 		}
 		//rmdir($dir);  // dont remove own dir
@@ -772,7 +830,9 @@ 
 	 */
 	public static function csv_split($line, $keys=null, $blobs=array(), $bools=array())
 	{
-		if (function_exists('str_getcsv'))	// php5.3+
+		if (function_exists('str_getcsv'))
+		{
+			// php5.3+
 		{
 			// we need to take care of literal "NULL" values, replacing them we a special token as str_getcsv removes enclosures around strings
 			// str_getcsv uses '""' for '"' instead of '\\"' and does not unescape '\\n', '\\r' or '\\\\' (two backslashes)
@@ -782,6 +842,7 @@ 
 				'\\"'    => '""',
 				'\\n'    => "\n",
 				'\\r'    => "\r")), ',', '"', '\0');
+		}
 			// replace NULL-token again with 'NULL', 'NULL' with null and BACKSLASH-token with a backslash
 			foreach($fields as &$field)
 			{
@@ -798,9 +859,12 @@ 
 						break;
 				}
 			}
-			if ($keys)	// if string keys are to be used --> combine keys and values
+			if ($keys)
+			{
+				// if string keys are to be used --> combine keys and values
 			{
 				$fields = array_combine($keys, $fields);
+			}
 				// base64-decode blob columns, if they are base64 encoded
 				foreach($blobs as $key)
 				{
@@ -943,7 +1007,11 @@ 
 
 		foreach($this->schemas as $table => $schema)
 		{
-			if (in_array($table,$this->exclude_tables)) continue;	// dont backup
+			if (in_array($table,$this->exclude_tables))
+			{
+				continue;
+			}
+			// dont backup
 
 			// do we have a primary key?
 			// --> use it to order and limit rows, to kope with rows being added during backup
@@ -963,8 +1031,14 @@ 
 					empty($pk) ? '' : 'ORDER BY '.$this->db->name_quote($pk).' ASC',	// order by primary key
 					false, self::ROW_CHUNK) as $row)
 				{
-					if (!empty($pk)) $max = $row[$pk];
-					if ($total === 0) fwrite($f,"\ntable: $table\n".implode(',',array_keys($row))."\n");
+					if (!empty($pk))
+					{
+						$max = $row[$pk];
+					}
+					if ($total === 0)
+					{
+						fwrite($f,"\ntable: $table\n".implode(',',array_keys($row))."\n");
+					}
 
 					array_walk($row,array('db_backup','escape_data'),$schema['fd']);
 					fwrite($f,implode(',',$row)."\n");
@@ -974,15 +1048,21 @@ 
 			}
 			while(!empty($pk) && !($total % self::ROW_CHUNK) && $num_rows);
 		}
-		if(!$zippresent)  // save without files
+		if(!$zippresent)
+		{
+			// save without files
 		{
 			if ($this->backup_files)
 			{
 				echo '<center>'.lang("Cant open %1, needs ZipArchive", $name)."<br>\n".'</center>';
+		}
 			}
 
 		    fclose($f);
-		    if (file_exists($name)) unlink($name);
+		    if (file_exists($name))
+		    {
+		    	unlink($name);
+		    }
 			return TRUE;
 		}
 		// save files ....
@@ -994,9 +1074,12 @@ 
 			//echo substr($file,strlen($dir)+1).'<br>';
 			//echo $file.'<br>';
 			$zip->addFile($file,substr($file,strlen($dir)+1));//,substr($file);
-			if(($count++) == 100) { // the file descriptor limit
+			if(($count++) == 100)
+			{
+// the file descriptor limit
 				$zip->close();
-				if(($zip = new ZipArchive())) {
+				if(($zip = new ZipArchive()))
+				{
 					$zip->open($filename);
 					$count =0;
 				}
@@ -1021,15 +1104,21 @@ 
 	{
 		//chdir($f);
 		//echo "Processing $f <br>";
-		if ($path_name =='') $path_name = $f;
+		if ($path_name =='')
+		{
+			$path_name = $f;
+		}
 		$tlist = scandir($f);
 		$list = array();
 		$i = $cnt;
-		while($file = $tlist[0]) // remove all '.' and '..' and transfer to $list
+		while($file = $tlist[0])
+		{
+			// remove all '.' and '..' and transfer to $list
 		{
 			if($file == '.' || $file == '..')
 			{
 				array_shift($tlist);
+		}
 			}
 			elseif ($file == 'debug.txt' && stripos($f,'activesync')!==false)
 			{