summaryrefslogtreecommitdiffstats
path: root/lib/archive
diff options
context:
space:
mode:
Diffstat (limited to 'lib/archive')
-rw-r--r--lib/archive/tar.php154
-rw-r--r--lib/archive/zip.php82
2 files changed, 118 insertions, 118 deletions
diff --git a/lib/archive/tar.php b/lib/archive/tar.php
index f6efd6d0ecc..639d2392b63 100644
--- a/lib/archive/tar.php
+++ b/lib/archive/tar.php
@@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
-require_once '3rdparty/Archive/Tar.php';
+require_once 'Archive/Tar.php';
class OC_Archive_TAR extends OC_Archive{
const PLAIN=0;
@@ -14,17 +14,17 @@ class OC_Archive_TAR extends OC_Archive{
const BZIP=2;
private $fileList;
-
+
/**
* @var Archive_Tar tar
*/
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)]);
+ $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,'.')){
- $extension=substr($file,strrpos($file,'.'));
- switch($extension){
+ static public function getTarType($file) {
+ if(strpos($file, '.')) {
+ $extension=substr($file, strrpos($file, '.'));
+ switch($extension) {
case 'gz':
case 'tgz':
return self::GZIP;
@@ -55,23 +55,23 @@ 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);
+ $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);
}
}
- $result=$this->tar->addModify(array($tmpBase.$path),'',$tmpBase);
+ $result=$this->tar->addModify(array($tmpBase.$path), '', $tmpBase);
rmdir($tmpBase.$path);
$this->fileList=false;
return $result;
@@ -82,17 +82,17 @@ 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();
- $result=$this->tar->_addfile($source,$header,$dummy,$dummy,$path);
+ $result=$this->tar->_addfile($source, $header, $dummy, $dummy, $path);
}else{
- $result=$this->tar->addString($path,$source);
+ $result=$this->tar->addString($path, $source);
}
$this->fileList=false;
return $result;
@@ -104,36 +104,36 @@ 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);
- rename($tmp.$source,$tmp.$dest);
+ rename($tmp.$source, $tmp.$dest);
$this->tar=null;
unlink($this->path);
- $types=array(null,'gz','bz');
- $this->tar=new Archive_Tar($this->path,$types[self::getTarType($this->path)]);
- $this->tar->createModify(array($tmp),'',$tmp.'/');
+ $types=array(null, 'gz', 'bz');
+ $this->tar=new Archive_Tar($this->path, $types[self::getTarType($this->path)]);
+ $this->tar->createModify(array($tmp), '', $tmp.'/');
$this->fileList=false;
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;
}
}
return null;
}
-
+
/**
* get the uncompressed size of a file in the 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]=='/'){
- $file=substr($file,1);
+ foreach($files as $file) {
+ if($file[0]=='/') {
+ $file=substr($file, 1);
}
- if(substr($file,0,$pathLength)==$path and $file!=$path){
- $result=substr($file,$pathLength);
- if($pos=strpos($result,'/')){
- $result=substr($result,0,$pos+1);
+ if(substr($file, 0, $pathLength)==$path and $file!=$path) {
+ $result=substr($file, $pathLength);
+ 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,18 +202,18 @@ 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)){
- $success=$this->tar->extractList(array('/'.$path),$tmp);
+ if($this->fileExists('/'.$path)) {
+ $success=$this->tar->extractList(array('/'.$path), $tmp);
}else{
- $success=$this->tar->extractList(array($path),$tmp);
+ $success=$this->tar->extractList(array($path), $tmp);
}
- if($success){
- rename($tmp.$path,$dest);
+ if($success) {
+ rename($tmp.$path, $dest);
}
OCP\Files::rmdirr($tmp);
return $success;
@@ -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,36 +232,36 @@ 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;
}
}
-
+
/**
* remove a file or folder from the 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;
@@ -272,7 +272,7 @@ class OC_Archive_TAR extends OC_Archive{
$this->tar=null;
unlink($this->path);
$this->reopen();
- $this->tar->createModify(array($tmp),'',$tmp);
+ $this->tar->createModify(array($tmp), '', $tmp);
return true;
}
/**
@@ -281,24 +281,24 @@ class OC_Archive_TAR extends OC_Archive{
* @param string mode
* @return resource
*/
- function getStream($path,$mode){
- if(strrpos($path,'.')!==false){
- $ext=substr($path,strrpos($path,'.'));
+ function getStream($path,$mode) {
+ if(strrpos($path, '.')!==false) {
+ $ext=substr($path, strrpos($path, '.'));
}else{
$ext='';
}
$tmpFile=OCP\Files::tmpFile($ext);
- if($this->fileExists($path)){
- $this->extractFile($path,$tmpFile);
- }elseif($mode=='r' or $mode=='rb'){
+ if($this->fileExists($path)) {
+ $this->extractFile($path, $tmpFile);
+ }elseif($mode=='r' or $mode=='rb') {
return false;
}
- if($mode=='r' or $mode=='rb'){
- return fopen($tmpFile,$mode);
+ if($mode=='r' or $mode=='rb') {
+ return fopen($tmpFile, $mode);
}else{
OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this,'writeBack');
self::$tempFiles[$tmpFile]=$path;
- return fopen('close://'.$tmpFile,$mode);
+ return fopen('close://'.$tmpFile, $mode);
}
}
@@ -306,9 +306,9 @@ class OC_Archive_TAR extends OC_Archive{
/**
* write back temporary files
*/
- function writeBack($tmpFile){
- if(isset(self::$tempFiles[$tmpFile])){
- $this->addFile(self::$tempFiles[$tmpFile],$tmpFile);
+ function writeBack($tmpFile) {
+ if(isset(self::$tempFiles[$tmpFile])) {
+ $this->addFile(self::$tempFiles[$tmpFile], $tmpFile);
unlink($tmpFile);
}
}
@@ -316,12 +316,12 @@ 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;
}
$types=array(null,'gz','bz');
- $this->tar=new Archive_Tar($this->path,$types[self::getTarType($this->path)]);
+ $this->tar=new Archive_Tar($this->path, $types[self::getTarType($this->path)]);
}
}
diff --git a/lib/archive/zip.php b/lib/archive/zip.php
index c1a5c35738b..a2b07f1a35d 100644
--- a/lib/archive/zip.php
+++ b/lib/archive/zip.php
@@ -12,13 +12,13 @@ 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);
+ 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)){
- $result=$this->zip->addFile($source,$path);
+ 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);
+ $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,17 +53,17 @@ 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);
+ $this->zip->renameName($source, $dest);
}
/**
* get the uncompressed size of a file in the 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,14 +80,14 @@ 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){
- $folderContent[]=substr($file,$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,9 +119,9 @@ 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);
+ file_put_contents($dest, $fp);
}
/**
* extract the archive
@@ -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,22 +158,22 @@ 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){
- $ext=substr($path,strrpos($path,'.'));
+ 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)){
- $this->extractFile($path,$tmpFile);
+ if($this->fileExists($path)) {
+ $this->extractFile($path, $tmpFile);
}
self::$tempFiles[$tmpFile]=$path;
- return fopen('close://'.$tmpFile,$mode);
+ return fopen('close://'.$tmpFile, $mode);
}
}
@@ -181,16 +181,16 @@ class OC_Archive_ZIP extends OC_Archive{
/**
* write back temporary files
*/
- function writeBack($tmpFile){
- if(isset(self::$tempFiles[$tmpFile])){
- $this->addFile(self::$tempFiles[$tmpFile],$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]=='/'){
- return substr($path,1);
+ 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 2025-02-24 09:24:29 +0000