aboutsummaryrefslogtreecommitdiffstats
path: root/lib/archive
diff options
context:
space:
mode:
Diffstat (limited to 'lib/archive')
-rw-r--r--lib/archive/tar.php100
-rw-r--r--lib/archive/zip.php58
2 files changed, 79 insertions, 79 deletions
diff --git a/lib/archive/tar.php b/lib/archive/tar.php
index 095362d0cd6..ebd581fc162 100644
--- a/lib/archive/tar.php
+++ b/lib/archive/tar.php
@@ -21,7 +21,7 @@ class OC_Archive_TAR extends OC_Archive{
private $tar=null;
private $path;
- function __construct($source){
+ function __construct($source) {
$types=array(null,'gz','bz');
$this->path=$source;
$this->tar=new Archive_Tar($source,$types[self::getTarType($source)]);
@@ -32,10 +32,10 @@ class OC_Archive_TAR extends OC_Archive{
* @param string file
* @return str
*/
- static public function getTarType($file){
- if(strpos($file,'.')){
+ static public function getTarType($file) {
+ if(strpos($file,'.')) {
$extension=substr($file,strrpos($file,'.'));
- switch($extension){
+ switch($extension) {
case 'gz':
case 'tgz':
return self::GZIP;
@@ -55,19 +55,19 @@ class OC_Archive_TAR extends OC_Archive{
* @param string path
* @return bool
*/
- function addFolder($path){
+ function addFolder($path) {
$tmpBase=OC_Helper::tmpFolder();
- if(substr($path,-1,1)!='/'){
+ if(substr($path,-1,1)!='/') {
$path.='/';
}
- if($this->fileExists($path)){
+ if($this->fileExists($path)) {
return false;
}
$parts=explode('/',$path);
$folder=$tmpBase;
- foreach($parts as $part){
+ foreach($parts as $part) {
$folder.='/'.$part;
- if(!is_dir($folder)){
+ if(!is_dir($folder)) {
mkdir($folder);
}
}
@@ -82,11 +82,11 @@ class OC_Archive_TAR extends OC_Archive{
* @param string source either a local file or string data
* @return bool
*/
- function addFile($path,$source=''){
- if($this->fileExists($path)){
+ function addFile($path,$source='') {
+ if($this->fileExists($path)) {
$this->remove($path);
}
- if($source and $source[0]=='/' and file_exists($source)){
+ if($source and $source[0]=='/' and file_exists($source)) {
$header=array();
$dummy='';
$this->tar->_openAppend();
@@ -104,7 +104,7 @@ class OC_Archive_TAR extends OC_Archive{
* @param string dest
* @return bool
*/
- function rename($source,$dest){
+ function rename($source,$dest) {
//no proper way to delete, rename entire archive, rename file and remake archive
$tmp=OCP\Files::tmpFolder();
$this->tar->extract($tmp);
@@ -118,10 +118,10 @@ class OC_Archive_TAR extends OC_Archive{
return true;
}
- private function getHeader($file){
+ private function getHeader($file) {
$headers=$this->tar->listContent();
- foreach($headers as $header){
- if($file==$header['filename'] or $file.'/'==$header['filename'] or '/'.$file.'/'==$header['filename'] or '/'.$file==$header['filename']){
+ foreach($headers as $header) {
+ if($file==$header['filename'] or $file.'/'==$header['filename'] or '/'.$file.'/'==$header['filename'] or '/'.$file==$header['filename']) {
return $header;
}
}
@@ -133,7 +133,7 @@ class OC_Archive_TAR extends OC_Archive{
* @param string path
* @return int
*/
- function filesize($path){
+ function filesize($path) {
$stat=$this->getHeader($path);
return $stat['size'];
}
@@ -142,7 +142,7 @@ class OC_Archive_TAR extends OC_Archive{
* @param string path
* @return int
*/
- function mtime($path){
+ function mtime($path) {
$stat=$this->getHeader($path);
return $stat['mtime'];
}
@@ -152,20 +152,20 @@ class OC_Archive_TAR extends OC_Archive{
* @param path
* @return array
*/
- function getFolder($path){
+ function getFolder($path) {
$files=$this->getFiles();
$folderContent=array();
$pathLength=strlen($path);
- foreach($files as $file){
- if($file[0]=='/'){
+ foreach($files as $file) {
+ if($file[0]=='/') {
$file=substr($file,1);
}
- if(substr($file,0,$pathLength)==$path and $file!=$path){
+ if(substr($file,0,$pathLength)==$path and $file!=$path) {
$result=substr($file,$pathLength);
- if($pos=strpos($result,'/')){
+ if($pos=strpos($result,'/')) {
$result=substr($result,0,$pos+1);
}
- if(array_search($result,$folderContent)===false){
+ if(array_search($result,$folderContent)===false) {
$folderContent[]=$result;
}
}
@@ -176,13 +176,13 @@ class OC_Archive_TAR extends OC_Archive{
*get all files in the archive
* @return array
*/
- function getFiles(){
- if($this->fileList){
+ function getFiles() {
+ if($this->fileList) {
return $this->fileList;
}
$headers=$this->tar->listContent();
$files=array();
- foreach($headers as $header){
+ foreach($headers as $header) {
$files[]=$header['filename'];
}
$this->fileList=$files;
@@ -193,7 +193,7 @@ class OC_Archive_TAR extends OC_Archive{
* @param string path
* @return string
*/
- function getFile($path){
+ function getFile($path) {
return $this->tar->extractInString($path);
}
/**
@@ -202,17 +202,17 @@ class OC_Archive_TAR extends OC_Archive{
* @param string dest
* @return bool
*/
- function extractFile($path,$dest){
+ function extractFile($path,$dest) {
$tmp=OCP\Files::tmpFolder();
- if(!$this->fileExists($path)){
+ if(!$this->fileExists($path)) {
return false;
}
- if($this->fileExists('/'.$path)){
+ if($this->fileExists('/'.$path)) {
$success=$this->tar->extractList(array('/'.$path),$tmp);
}else{
$success=$this->tar->extractList(array($path),$tmp);
}
- if($success){
+ if($success) {
rename($tmp.$path,$dest);
}
OCP\Files::rmdirr($tmp);
@@ -224,7 +224,7 @@ class OC_Archive_TAR extends OC_Archive{
* @param string dest
* @return bool
*/
- function extract($dest){
+ function extract($dest) {
return $this->tar->extract($dest);
}
/**
@@ -232,23 +232,23 @@ class OC_Archive_TAR extends OC_Archive{
* @param string path
* @return bool
*/
- function fileExists($path){
+ function fileExists($path) {
$files=$this->getFiles();
- if((array_search($path,$files)!==false) or (array_search($path.'/',$files)!==false)){
+ if((array_search($path,$files)!==false) or (array_search($path.'/',$files)!==false)) {
return true;
}else{
$folderPath=$path;
- if(substr($folderPath,-1,1)!='/'){
+ if(substr($folderPath,-1,1)!='/') {
$folderPath.='/';
}
$pathLength=strlen($folderPath);
- foreach($files as $file){
- if(strlen($file)>$pathLength and substr($file,0,$pathLength)==$folderPath){
+ foreach($files as $file) {
+ if(strlen($file)>$pathLength and substr($file,0,$pathLength)==$folderPath) {
return true;
}
}
}
- if($path[0]!='/'){//not all programs agree on the use of a leading /
+ if($path[0]!='/') {//not all programs agree on the use of a leading /
return $this->fileExists('/'.$path);
}else{
return false;
@@ -260,8 +260,8 @@ class OC_Archive_TAR extends OC_Archive{
* @param string path
* @return bool
*/
- function remove($path){
- if(!$this->fileExists($path)){
+ function remove($path) {
+ if(!$this->fileExists($path)) {
return false;
}
$this->fileList=false;
@@ -281,19 +281,19 @@ class OC_Archive_TAR extends OC_Archive{
* @param string mode
* @return resource
*/
- function getStream($path,$mode){
- if(strrpos($path,'.')!==false){
+ function getStream($path,$mode) {
+ if(strrpos($path,'.')!==false) {
$ext=substr($path,strrpos($path,'.'));
}else{
$ext='';
}
$tmpFile=OCP\Files::tmpFile($ext);
- if($this->fileExists($path)){
+ if($this->fileExists($path)) {
$this->extractFile($path,$tmpFile);
- }elseif($mode=='r' or $mode=='rb'){
+ }elseif($mode=='r' or $mode=='rb') {
return false;
}
- if($mode=='r' or $mode=='rb'){
+ if($mode=='r' or $mode=='rb') {
return fopen($tmpFile,$mode);
}else{
OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this,'writeBack');
@@ -306,8 +306,8 @@ class OC_Archive_TAR extends OC_Archive{
/**
* write back temporary files
*/
- function writeBack($tmpFile){
- if(isset(self::$tempFiles[$tmpFile])){
+ function writeBack($tmpFile) {
+ if(isset(self::$tempFiles[$tmpFile])) {
$this->addFile(self::$tempFiles[$tmpFile],$tmpFile);
unlink($tmpFile);
}
@@ -316,8 +316,8 @@ class OC_Archive_TAR extends OC_Archive{
/**
* reopen the archive to ensure everything is written
*/
- private function reopen(){
- if($this->tar){
+ private function reopen() {
+ if($this->tar) {
$this->tar->_close();
$this->tar=null;
}
diff --git a/lib/archive/zip.php b/lib/archive/zip.php
index 396b1f6c054..45992ee3d89 100644
--- a/lib/archive/zip.php
+++ b/lib/archive/zip.php
@@ -13,10 +13,10 @@ class OC_Archive_ZIP extends OC_Archive{
private $zip=null;
private $path;
- function __construct($source){
+ function __construct($source) {
$this->path=$source;
$this->zip=new ZipArchive();
- if($this->zip->open($source,ZipArchive::CREATE)){
+ if($this->zip->open($source,ZipArchive::CREATE)) {
}else{
OCP\Util::writeLog('files_archive','Error while opening archive '.$source,OCP\Util::WARN);
}
@@ -26,7 +26,7 @@ class OC_Archive_ZIP extends OC_Archive{
* @param string path
* @return bool
*/
- function addFolder($path){
+ function addFolder($path) {
return $this->zip->addEmptyDir($path);
}
/**
@@ -35,13 +35,13 @@ class OC_Archive_ZIP extends OC_Archive{
* @param string source either a local file or string data
* @return bool
*/
- function addFile($path,$source=''){
- if($source and $source[0]=='/' and file_exists($source)){
+ function addFile($path,$source='') {
+ if($source and $source[0]=='/' and file_exists($source)) {
$result=$this->zip->addFile($source,$path);
}else{
$result=$this->zip->addFromString($path,$source);
}
- if($result){
+ if($result) {
$this->zip->close();//close and reopen to save the zip
$this->zip->open($this->path);
}
@@ -53,7 +53,7 @@ class OC_Archive_ZIP extends OC_Archive{
* @param string dest
* @return bool
*/
- function rename($source,$dest){
+ function rename($source,$dest) {
$source=$this->stripPath($source);
$dest=$this->stripPath($dest);
$this->zip->renameName($source,$dest);
@@ -63,7 +63,7 @@ class OC_Archive_ZIP extends OC_Archive{
* @param string path
* @return int
*/
- function filesize($path){
+ function filesize($path) {
$stat=$this->zip->statName($path);
return $stat['size'];
}
@@ -72,7 +72,7 @@ class OC_Archive_ZIP extends OC_Archive{
* @param string path
* @return int
*/
- function mtime($path){
+ function mtime($path) {
return filemtime($this->path);
}
/**
@@ -80,13 +80,13 @@ class OC_Archive_ZIP extends OC_Archive{
* @param path
* @return array
*/
- function getFolder($path){
+ function getFolder($path) {
$files=$this->getFiles();
$folderContent=array();
$pathLength=strlen($path);
- foreach($files as $file){
- if(substr($file,0,$pathLength)==$path and $file!=$path){
- if(strrpos(substr($file,0,-1),'/')<=$pathLength){
+ foreach($files as $file) {
+ if(substr($file,0,$pathLength)==$path and $file!=$path) {
+ if(strrpos(substr($file,0,-1),'/')<=$pathLength) {
$folderContent[]=substr($file,$pathLength);
}
}
@@ -97,10 +97,10 @@ class OC_Archive_ZIP extends OC_Archive{
*get all files in the archive
* @return array
*/
- function getFiles(){
+ function getFiles() {
$fileCount=$this->zip->numFiles;
$files=array();
- for($i=0;$i<$fileCount;$i++){
+ for($i=0;$i<$fileCount;$i++) {
$files[]=$this->zip->getNameIndex($i);
}
return $files;
@@ -110,7 +110,7 @@ class OC_Archive_ZIP extends OC_Archive{
* @param string path
* @return string
*/
- function getFile($path){
+ function getFile($path) {
return $this->zip->getFromName($path);
}
/**
@@ -119,7 +119,7 @@ class OC_Archive_ZIP extends OC_Archive{
* @param string dest
* @return bool
*/
- function extractFile($path,$dest){
+ function extractFile($path,$dest) {
$fp = $this->zip->getStream($path);
file_put_contents($dest,$fp);
}
@@ -129,7 +129,7 @@ class OC_Archive_ZIP extends OC_Archive{
* @param string dest
* @return bool
*/
- function extract($dest){
+ function extract($dest) {
return $this->zip->extractTo($dest);
}
/**
@@ -137,7 +137,7 @@ class OC_Archive_ZIP extends OC_Archive{
* @param string path
* @return bool
*/
- function fileExists($path){
+ function fileExists($path) {
return ($this->zip->locateName($path)!==false) or ($this->zip->locateName($path.'/')!==false);
}
/**
@@ -145,8 +145,8 @@ class OC_Archive_ZIP extends OC_Archive{
* @param string path
* @return bool
*/
- function remove($path){
- if($this->fileExists($path.'/')){
+ function remove($path) {
+ if($this->fileExists($path.'/')) {
return $this->zip->deleteName($path.'/');
}else{
return $this->zip->deleteName($path);
@@ -158,18 +158,18 @@ class OC_Archive_ZIP extends OC_Archive{
* @param string mode
* @return resource
*/
- function getStream($path,$mode){
- if($mode=='r' or $mode=='rb'){
+ function getStream($path,$mode) {
+ if($mode=='r' or $mode=='rb') {
return $this->zip->getStream($path);
}else{//since we cant directly get a writable stream, make a temp copy of the file and put it back in the archive when the stream is closed
- if(strrpos($path,'.')!==false){
+ if(strrpos($path,'.')!==false) {
$ext=substr($path,strrpos($path,'.'));
}else{
$ext='';
}
$tmpFile=OCP\Files::tmpFile($ext);
OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this,'writeBack');
- if($this->fileExists($path)){
+ if($this->fileExists($path)) {
$this->extractFile($path,$tmpFile);
}
self::$tempFiles[$tmpFile]=$path;
@@ -181,15 +181,15 @@ class OC_Archive_ZIP extends OC_Archive{
/**
* write back temporary files
*/
- function writeBack($tmpFile){
- if(isset(self::$tempFiles[$tmpFile])){
+ function writeBack($tmpFile) {
+ if(isset(self::$tempFiles[$tmpFile])) {
$this->addFile(self::$tempFiles[$tmpFile],$tmpFile);
unlink($tmpFile);
}
}
- private function stripPath($path){
- if(!$path || $path[0]=='/'){
+ private function stripPath($path) {
+ if(!$path || $path[0]=='/') {
return substr($path,1);
}else{
return $path;
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 03:31:03 +0000