Changeset 33 for trunk

Timestamp:

21.07.2005 12:58:13 (3 years ago)

Author:

m

Message:

Whitespace operations

Files:

• trunk/File/Bittorrent/MakeTorrent.php (modified) (13 diffs)

trunk/File/Bittorrent/MakeTorrent.php

@@ -33 +33 @@
  * @category File
  */
- 
+
 /**
  * Include required classes
@@ -48 +48 @@
  * @author Justin Jones <j.nagash@gmail.com>
  * @author Markus Tacker <m@tacker.org>
- * @version $Id$
  * @package File_Bittorrent
  * @category File
@@ -94 +93 @@
      */
     var $_created_by = 'File_Bittorrent_MakeTorrent $Rev$. http://pear.php.net/package/File_Bittorrent';
-    
+
     /**
      * @var string The .torrent suggested name (file/dir)
@@ -124 +123 @@
      */
     var $_data_gap = false;
-    
+
     /**
     * @var resource file pointer
@@ -167 +166 @@
     {
         if (!is_array($announce_list)) {
-            PEAR::raiseError(__CLASS__ . '::'. __FUNCTION__ . '() - No array given.');
-            return false;
+            PEAR::raiseError(__CLASS__ . '::'. __FUNCTION__ . '() - No array given.');
+            return false;
         }
         $this->_announce_list = $announce_list;
@@ -221 +220 @@
     {
         if ($piece_length < 32 or $piece_length > 4096) {
-            PEAR::raiseError(__CLASS__ . '::'. __FUNCTION__ . '() - Invalid piece lenth: "' . $piece_length . '"');
-            return false;
+            PEAR::raiseError(__CLASS__ . '::'. __FUNCTION__ . '() - Invalid piece lenth: "' . $piece_length . '"');
+            return false;
         }
         $this->_piece_length = $piece_length * 1024;
@@ -239 +238 @@
         if ($this->_is_file) {
             if (!$info = $this->_addFile($this->_path)) {
-                return false;
+                return false;
             }
             if (!$metainfo = $this->_encodeTorrent($info)) {
-                return false;
-            }            
+                return false;
+            }
         } else if ($this->_is_dir) {
             if (!$diradd_ok = $this->_addDir($this->_path)) {
-                return false;
+                return false;
             }
             $metainfo = $this->_encodeTorrent();
@@ -275 +274 @@
             $bencdata['info']['files'] = $this->_files;
         } else {
-            PEAR::raiseError(__CLASS__ . '::'. __FUNCTION__ . '() - Use ' .  __CLASS__ . '::setPath() to define a file or directory.');
+            PEAR::raiseError(__CLASS__ . '::'. __FUNCTION__ . '() - Use ' .  __CLASS__ . '::setPath() to define a file or directory.');
             return false;
         }
@@ -297 +296 @@
      * @param string path to the file
      * @return mixed false on failure or file metainfo data
-     * @access private
-     */
+     * @access private
+     */
     function _addFile($file)
     {
-        if (!$this->_openFile($file)) return false;
-        
+        if (!$this->_openFile($file)) return false;
+
         $filelength = 0;
         $md5sum = md5_file($file);
@@ -406 +405 @@
             if ($dh = opendir($current_dir)) {
                 while ( ($file = readdir($dh)) !== false ) {
-                    if ($file{0} =='.') continue;
+                    if ($file{0} =='.') continue;
                     $current_file = $current_dir . '/' . $file;
                     if (is_file($current_file)) {
@@ -428 +427 @@
      */
     function _filesize($file)
-    {
+    {
         $size = @filesize($file);
         if ($size == 0) {
-            if (PHP_OS != 'Linux') return false; 
+            if (PHP_OS != 'Linux') return false;
             $size = exec('du -b ' . escapeshellarg($file));
         }
@@ -446 +445 @@
      */
     function _openFile($file)
-    {
+    {
         $fsize = $this->_filesize($file);
         if ($fsize <= 2*1024*1024*1024) {
-            if (!$this->_fp = fopen($file, 'r')) {
-                PEAR::raiseError(__CLASS__ . '::'. __FUNCTION__ . '() - Failed to open "' . $file . '"');
-                return false;
-            }
+            if (!$this->_fp = fopen($file, 'r')) {
+                PEAR::raiseError(__CLASS__ . '::'. __FUNCTION__ . '() - Failed to open "' . $file . '"');
+                return false;
+            }
             $this->_fopen = true;
         } else {
-            if (PHP_OS != 'Linux') {
-                PEAR::raiseError(__CLASS__ . '::'. __FUNCTION__ . '() - File size is greater than 2GB. This is only supported under Linux.');
-                return false;
-            }
+            if (PHP_OS != 'Linux') {
+                PEAR::raiseError(__CLASS__ . '::'. __FUNCTION__ . '() - File size is greater than 2GB. This is only supported under Linux.');
+                return false;
+            }
             $this->_fp = popen('cat ' . escapeshellarg($file), 'r');
             $this->_fopen = false;
@@ -472 +471 @@
     function _closeFile()
     {
-        if ($this->_fopen) {
-            fclose($this->_fp);
-        } else {
+        if ($this->_fopen) {
+            fclose($this->_fp);
+        } else {
             pclose($this->_fp);
         }