EGroupware / egroupware

api/src/Vfs/Sqlfs/Utils.php

Spacing +44 added lines, -45 removed lines

@@ -25,7 +25,7 @@ 
 	 *
 	 * @param boolean $debug true to echo a message for each copied file
 	 */
-	static function migrate_db2fs($debug=true)
+	static function migrate_db2fs($debug = true)
 	{
 		if (!is_object(self::$pdo))
 		{
@@ -38,16 +38,16 @@ 
 		$fs_id = $fs_name = $fs_size = $fs_content = null;
 		$n = 0;
 		$stmt = self::$pdo->prepare($query);
-		$stmt->bindColumn(1,$fs_id);
-		$stmt->bindColumn(2,$fs_name);
-		$stmt->bindColumn(3,$fs_size);
-		$stmt->bindColumn(4,$fs_content,\PDO::PARAM_LOB);
+		$stmt->bindColumn(1, $fs_id);
+		$stmt->bindColumn(2, $fs_name);
+		$stmt->bindColumn(3, $fs_size);
+		$stmt->bindColumn(4, $fs_content, \PDO::PARAM_LOB);
 		$stmt->bindValue(':offset', $n, \PDO::PARAM_INT);
 
 		while ($stmt->execute())	// && $stmt->rowCount() does not work for all dbs :(
 		{
 			$start = $n;
-			foreach($stmt as $row)
+			foreach ($stmt as $row)
 			{
 				// hack to work around a current php bug (http://bugs.php.net/bug.php?id=40913)
 				// PDOStatement::bindColumn(,,\PDO::PARAM_LOB) is not working for MySQL, content is returned as string :-(
@@ -56,7 +56,7 @@ 
 					$content = fopen('php://temp', 'wb');
 					fwrite($content, $fs_content);
 					fseek($content, 0, SEEK_SET);
-					$fs_content = '';	// can NOT unset it, at least in PHP 7 it looses bind to column!
+					$fs_content = ''; // can NOT unset it, at least in PHP 7 it looses bind to column!
 				}
 				else
 				{
@@ -67,15 +67,15 @@ 
 					throw new Api\Exception\AssertionFailed(__METHOD__."(): fs_id=$fs_id ($fs_name, $fs_size bytes) content is NO resource! ".array2string($content));
 				}
 				$filename = self::_fs_path($fs_id);
-				if (!file_exists($fs_dir=Vfs::dirname($filename)))
+				if (!file_exists($fs_dir = Vfs::dirname($filename)))
 				{
-					self::mkdir_recursive($fs_dir,0700,true);
+					self::mkdir_recursive($fs_dir, 0700, true);
 				}
-				if (!($dest = fopen($filename,'w')))
+				if (!($dest = fopen($filename, 'w')))
 				{
 					throw new Api\Exception\AssertionFailed(__METHOD__."(): fopen($filename,'w') failed!");
 				}
-				if (($bytes = stream_copy_to_stream($content,$dest)) != $fs_size)
+				if (($bytes = stream_copy_to_stream($content, $dest)) != $fs_size)
 				{
 					throw new Api\Exception\AssertionFailed(__METHOD__."(): fs_id=$fs_id ($fs_name) $bytes bytes copied != size of $fs_size bytes!");
 				}
@@ -85,11 +85,11 @@ 
 
 				++$n;
 			}
-			if (!$n || $n == $start) break;	// just in case nothing is found, statement will execute just fine
+			if (!$n || $n == $start) break; // just in case nothing is found, statement will execute just fine
 
 			$stmt->bindValue(':offset', $n, \PDO::PARAM_INT);
 		}
-		unset($row);	// not used, as we access bound variables
+		unset($row); // not used, as we access bound variables
 		unset($stmt);
 
 		if ($n)	// delete all content in DB, if there was some AND no error (exception thrown!)
@@ -107,14 +107,14 @@ 
 	 * @param boolean $check_only =true
 	 * @return array with messages / found problems
 	 */
-	public static function fsck($check_only=true)
+	public static function fsck($check_only = true)
 	{
 		if (!is_object(self::$pdo))
 		{
 			self::_pdo();
 		}
 		$msgs = array();
-		foreach(array(
+		foreach (array(
 			self::fsck_fix_required_nodes($check_only),
 			self::fsck_fix_multiple_active($check_only),
 			self::fsck_fix_unconnected($check_only),
@@ -140,7 +140,7 @@ 
 	 * @param boolean $check_only =true
 	 * @return array with messages / found problems
 	 */
-	private static function fsck_fix_required_nodes($check_only=true)
+	private static function fsck_fix_required_nodes($check_only = true)
 	{
 		static $dirs = array(
 			'/' => 1,
@@ -150,7 +150,7 @@ 
 		$stmt = $delete_stmt = null;
 		$msgs = array();
 		$sqlfs = new StreamWrapper();
-		foreach($dirs as $path => $id)
+		foreach ($dirs as $path => $id)
 		{
 			if (!($stat = $sqlfs->url_stat($path, STREAM_URL_STAT_LINK)) || $stat['ino'] != $id)
 			{
@@ -168,7 +168,7 @@ 
 					try {
 						$ok = $stmt->execute($data = array(
 							'fs_id' => $id,
-							'fs_name' => substr($path,1),
+							'fs_name' => substr($path, 1),
 							'fs_dir'  => $path == '/' ? 0 : $dirs['/'],
 							'fs_mode' => 05,
 							'fs_uid' => 0,
@@ -183,7 +183,7 @@ 
 					catch (\PDOException $e)
 					{
 						$ok = false;
-						unset($e);	// ignore exception
+						unset($e); // ignore exception
 					}
 					if (!$ok)	// can not insert it, try deleting it first
 					{
@@ -196,15 +196,14 @@ 
 						}
 						catch (\PDOException $e)
 						{
-							unset($e);	// ignore exception
+							unset($e); // ignore exception
 						}
 					}
-					$msgs[] = $ok ? lang('Required directory "%1" created.', $path) :
-						lang('Failed to create required directory "%1"!', $path);
+					$msgs[] = $ok ? lang('Required directory "%1" created.', $path) : lang('Failed to create required directory "%1"!', $path);
 				}
 			}
 			// check if directory is at least world readable and executable (r-x), we allow more but not less
-			elseif (($stat['mode'] & 05) != 05)
+			elseif (($stat['mode']&05) != 05)
 			{
 				if ($check_only)
 				{
@@ -244,20 +243,20 @@ 
 	 * @param boolean $check_only =true
 	 * @return array with messages / found problems
 	 */
-	private static function fsck_fix_no_content($check_only=true)
+	private static function fsck_fix_no_content($check_only = true)
 	{
 		$stmt = null;
 		$msgs = array();
-		foreach(self::$pdo->query('SELECT fs_id FROM '.self::TABLE.
+		foreach (self::$pdo->query('SELECT fs_id FROM '.self::TABLE.
 			" WHERE fs_mime!='httpd/unix-directory' AND fs_content IS NULL AND fs_link IS NULL") as $row)
 		{
-			if (!file_exists($phy_path=self::_fs_path($row['fs_id'])))
+			if (!file_exists($phy_path = self::_fs_path($row['fs_id'])))
 			{
 				$path = self::id2path($row['fs_id']);
 				if ($check_only)
 				{
 					$msgs[] = lang('File %1 has no content in physical filesystem %2!',
-						$path.' (#'.$row['fs_id'].')',$phy_path);
+						$path.' (#'.$row['fs_id'].')', $phy_path);
 				}
 				else
 				{
@@ -269,12 +268,12 @@ 
 					if ($stmt->execute(array('fs_id' => $row['fs_id'])) &&
 						$stmt_props->execute(array('fs_id' => $row['fs_id'])))
 					{
-						$msgs[] = lang('File %1 has no content in physical filesystem %2 --> file removed!',$path,$phy_path);
+						$msgs[] = lang('File %1 has no content in physical filesystem %2 --> file removed!', $path, $phy_path);
 					}
 					else
 					{
 						$msgs[] = lang('File %1 has no content in physical filesystem %2 --> failed to remove file!',
-							$path.' (#'.$row['fs_id'].')',$phy_path);
+							$path.' (#'.$row['fs_id'].')', $phy_path);
 					}
 				}
 			}
@@ -304,12 +303,12 @@ 
 	 * @param boolean $check_only =true
 	 * @return array with messages / found problems
 	 */
-	private static function fsck_fix_unconnected($check_only=true)
+	private static function fsck_fix_unconnected($check_only = true)
 	{
 		$lostnfound = null;
 		$msgs = array();
 		$sqlfs = new StreamWrapper();
-		foreach(self::$pdo->query('SELECT fs.* FROM '.self::TABLE.' fs'.
+		foreach (self::$pdo->query('SELECT fs.* FROM '.self::TABLE.' fs'.
 			' LEFT JOIN '.self::TABLE.' dir ON dir.fs_id=fs.fs_dir'.
 			' WHERE fs.fs_id > 1 AND dir.fs_id IS NULL') as $row)
 		{
@@ -328,14 +327,14 @@ 
 					Vfs::$is_root = true;
 					if (!$sqlfs->mkdir(self::LOST_N_FOUND, self::LOST_N_FOUND_MOD, 0) ||
 						!(!($admins = $GLOBALS['egw']->accounts->name2id(self::LOST_N_FOUND_GRP)) ||
-						   self::chgrp(self::LOST_N_FOUND, $admins) && self::chmod(self::LOST_N_FOUND,self::LOST_N_FOUND_MOD)) ||
+						   self::chgrp(self::LOST_N_FOUND, $admins) && self::chmod(self::LOST_N_FOUND, self::LOST_N_FOUND_MOD)) ||
 						!($lostnfound = $sqlfs->url_stat(self::LOST_N_FOUND, STREAM_URL_STAT_QUIET)))
 					{
-						$msgs[] = lang("Can't create directory %1 to connect found unconnected nodes to it!",self::LOST_N_FOUND);
+						$msgs[] = lang("Can't create directory %1 to connect found unconnected nodes to it!", self::LOST_N_FOUND);
 					}
 					else
 					{
-						$msgs[] = lang('Successful created new directory %1 for unconnected nods.',self::LOST_N_FOUND);
+						$msgs[] = lang('Successful created new directory %1 for unconnected nods.', self::LOST_N_FOUND);
 					}
 					Vfs::$is_root = false;
 					if (!$lostnfound) break;
@@ -360,7 +359,7 @@ 
 		}
 		if ($check_only && $msgs)
 		{
-			$msgs[] = lang('Unconnected nodes will be moved to %1.',self::LOST_N_FOUND);
+			$msgs[] = lang('Unconnected nodes will be moved to %1.', self::LOST_N_FOUND);
 		}
 		return $msgs;
 	}
@@ -373,20 +372,20 @@ 
 	 * @param boolean $check_only =true
 	 * @return array with messages / found problems
 	 */
-	private static function fsck_fix_multiple_active($check_only=true)
+	private static function fsck_fix_multiple_active($check_only = true)
 	{
 		$stmt = $inactivate_msg_added = null;
 		$msgs = array();
-		foreach(self::$pdo->query('SELECT fs_dir,fs_name,COUNT(*) FROM '.self::TABLE.
+		foreach (self::$pdo->query('SELECT fs_dir,fs_name,COUNT(*) FROM '.self::TABLE.
 			' WHERE fs_active='.self::_pdo_boolean(true)." OR fs_mime='httpd/unix-directory'".
-			' GROUP BY fs_dir,'.(self::$pdo_type == 'mysql' ? 'BINARY ' : '').'fs_name'.	// fs_name is casesensitive!
+			' GROUP BY fs_dir,'.(self::$pdo_type == 'mysql' ? 'BINARY ' : '').'fs_name'.// fs_name is casesensitive!
 			' HAVING COUNT(*) > 1') as $row)
 		{
 			if (!isset($stmt))
 			{
 				$stmt = self::$pdo->prepare('SELECT *,(SELECT COUNT(*) FROM '.self::TABLE.' sub WHERE sub.fs_dir=fs.fs_id) AS children'.
 					' FROM '.self::TABLE.' fs'.
-					' WHERE fs.fs_dir=:fs_dir AND (fs.fs_active='.self::_pdo_boolean(true)." OR fs_mime='httpd/unix-directory')" .
+					' WHERE fs.fs_dir=:fs_dir AND (fs.fs_active='.self::_pdo_boolean(true)." OR fs_mime='httpd/unix-directory')".
 					' AND fs.fs_name'.self::$case_sensitive_equal.':fs_name'.
 					" ORDER BY fs.fs_mime='httpd/unix-directory' DESC,fs.fs_active DESC,children DESC,fs.fs_modified DESC");
 				$inactivate_stmt = self::$pdo->prepare('UPDATE '.self::TABLE.
@@ -400,14 +399,14 @@ 
 				'fs_dir'  => $row['fs_dir'],
 				'fs_name' => $row['fs_name'],
 			));
-			foreach($stmt as $n => $entry)
+			foreach ($stmt as $n => $entry)
 			{
 				if ($entry['fs_mime'] == 'httpd/unix-directory')
 				{
 					// by sorting active directores first (fs.fs_active DESC), we make sure active one is kept
 					if (!$n)
 					{
-						$dir = $entry;	// directory to keep
+						$dir = $entry; // directory to keep
 						$msgs[] = lang('%1 directories %2 found!', $row[2], self::id2path($entry['fs_id']));
 						if ($check_only) break;
 					}
@@ -423,7 +422,7 @@ 
 							$dir['children'] += $children;
 						}
 						self::$pdo->query('DELETE FROM '.self::TABLE.' WHERE fs_id='.(int)$entry['fs_id']);
-						$msgs[] = lang('Removed (now) empty directory fs_id=%1',$entry['fs_id']);
+						$msgs[] = lang('Removed (now) empty directory fs_id=%1', $entry['fs_id']);
 					}
 				}
 				elseif (isset($dir))	// file and directory with same name exist!
@@ -439,9 +438,9 @@ 
 					}
 					else
 					{
-						$cnt = ucfirst(lang('none of %1', $row[2]-1));
+						$cnt = ucfirst(lang('none of %1', $row[2] - 1));
 					}
-					$msgs[] = lang('%1 active file(s) with same name as directory inactivated!',$cnt);
+					$msgs[] = lang('%1 active file(s) with same name as directory inactivated!', $cnt);
 					break;
 				}
 				else	// newest file --> set for all other fs_active=false
@@ -457,7 +456,7 @@ 
 					}
 					else
 					{
-						$cnt = lang('none of %1', $row[2]-1);
+						$cnt = lang('none of %1', $row[2] - 1);
 					}
 					$msgs[] = lang('More then one active file %1 found, inactivating %2 older revisions!',
 						self::id2path($entry['fs_id']), $cnt);

Braces +45 added lines, -11 removed lines

@@ -44,9 +44,12 @@ 
 		$stmt->bindColumn(4,$fs_content,\PDO::PARAM_LOB);
 		$stmt->bindValue(':offset', $n, \PDO::PARAM_INT);
 
-		while ($stmt->execute())	// && $stmt->rowCount() does not work for all dbs :(
+		while ($stmt->execute())
+		{
+			// && $stmt->rowCount() does not work for all dbs :(
 		{
 			$start = $n;
+		}
 			foreach($stmt as $row)
 			{
 				// hack to work around a current php bug (http://bugs.php.net/bug.php?id=40913)
@@ -79,22 +82,32 @@ 
 				{
 					throw new Api\Exception\AssertionFailed(__METHOD__."(): fs_id=$fs_id ($fs_name) $bytes bytes copied != size of $fs_size bytes!");
 				}
-				if ($debug) error_log("$fs_id: $fs_name: $bytes bytes copied to fs");
+				if ($debug)
+				{
+					error_log("$fs_id: $fs_name: $bytes bytes copied to fs");
+				}
 				fclose($dest);
 				fclose($content); unset($content);
 
 				++$n;
 			}
-			if (!$n || $n == $start) break;	// just in case nothing is found, statement will execute just fine
+			if (!$n || $n == $start)
+			{
+				break;
+			}
+			// just in case nothing is found, statement will execute just fine
 
 			$stmt->bindValue(':offset', $n, \PDO::PARAM_INT);
 		}
 		unset($row);	// not used, as we access bound variables
 		unset($stmt);
 
-		if ($n)	// delete all content in DB, if there was some AND no error (exception thrown!)
+		if ($n)
+		{
+			// delete all content in DB, if there was some AND no error (exception thrown!)
 		{
 			$query = 'UPDATE '.self::TABLE.' SET fs_content=NULL';
+		}
 			$stmt = self::$pdo->prepare($query);
 			$stmt->execute();
 		}
@@ -121,7 +134,10 @@ 
 			self::fsck_fix_no_content($check_only),
 		) as $check_msgs)
 		{
-			if ($check_msgs) $msgs = array_merge($msgs, $check_msgs);
+			if ($check_msgs)
+			{
+				$msgs = array_merge($msgs, $check_msgs);
+			}
 		}
 
 		foreach (Api\Hooks::process(array(
@@ -129,7 +145,10 @@ 
 			'check_only' => $check_only)
 		) as $app_msgs)
 		{
-			if ($app_msgs) $msgs = array_merge($msgs, $app_msgs);
+			if ($app_msgs)
+			{
+				$msgs = array_merge($msgs, $app_msgs);
+			}
 		}
 		return $msgs;
 	}
@@ -185,11 +204,14 @@ 
 						$ok = false;
 						unset($e);	// ignore exception
 					}
-					if (!$ok)	// can not insert it, try deleting it first
+					if (!$ok)
+					{
+						// can not insert it, try deleting it first
 					{
 						if (!isset($delete_stmt))
 						{
 							$delete_stmt = self::$pdo->prepare('DELETE FROM '.self::TABLE.' WHERE fs_id=:fs_id');
+					}
 						}
 						try {
 							$ok = $delete_stmt->execute(array('fs_id' => $id)) && $stmt->execute($data);
@@ -231,7 +253,10 @@ 
 		if (!$check_only && $msgs)
 		{
 			global $oProc;
-			if (!isset($oProc)) $oProc = new Api\Db\Schema();
+			if (!isset($oProc))
+			{
+				$oProc = new Api\Db\Schema();
+			}
 			// PostgreSQL seems to require to update the sequenz, after manually inserting id's
 			$oProc->UpdateSequence('egw_sqlfs', 'fs_id');
 		}
@@ -338,7 +363,10 @@ 
 						$msgs[] = lang('Successful created new directory %1 for unconnected nods.',self::LOST_N_FOUND);
 					}
 					Vfs::$is_root = false;
-					if (!$lostnfound) break;
+					if (!$lostnfound)
+					{
+						break;
+					}
 				}
 				$stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_dir=:fs_dir WHERE fs_id=:fs_id');
 			}
@@ -409,7 +437,10 @@ 
 					{
 						$dir = $entry;	// directory to keep
 						$msgs[] = lang('%1 directories %2 found!', $row[2], self::id2path($entry['fs_id']));
-						if ($check_only) break;
+						if ($check_only)
+						{
+							break;
+						}
 					}
 					else
 					{
@@ -426,7 +457,9 @@ 
 						$msgs[] = lang('Removed (now) empty directory fs_id=%1',$entry['fs_id']);
 					}
 				}
-				elseif (isset($dir))	// file and directory with same name exist!
+				elseif (isset($dir))
+				{
+					// file and directory with same name exist!
 				{
 					if (!$check_only)
 					{
@@ -435,6 +468,7 @@ 
 							'fs_name' => $row['fs_name'],
 							'fs_id'   => $dir['fs_id'],
 						));
+				}
 						$cnt = $inactivate_stmt->rowCount();
 					}
 					else