telyn / c2ephp

agents/PRAY/CREABlock.php

Spacing +2 added lines, -2 removed lines

@@ -16,8 +16,8 @@
      * @param $content This block's content.
      * @param $flags Any flags this block may have
      */
-    public function CREABlock($prayfile,$name,$content,$flags) {
-        parent::CreaturesArchiveBlock($prayfile,$name,$content,$flags,PRAY_BLOCK_CREA);
+    public function CREABlock($prayfile, $name, $content, $flags) {
+        parent::CreaturesArchiveBlock($prayfile, $name, $content, $flags, PRAY_BLOCK_CREA);
     }
     /// @cond INTERNAL_DOCS
     

agents/PRAY/PrayBlock.php

Spacing +45 added lines, -45 removed lines

@@ -24,31 +24,31 @@ 
  */
 //@{
 /** Value: 'AGNT' */
-define('PRAY_BLOCK_AGNT','AGNT'); 
+define('PRAY_BLOCK_AGNT', 'AGNT'); 
 /** Value: 'CREA' */
-define('PRAY_BLOCK_CREA','CREA');
+define('PRAY_BLOCK_CREA', 'CREA');
 /** Value: 'DFAM' */
-define('PRAY_BLOCK_DFAM','DFAM');
+define('PRAY_BLOCK_DFAM', 'DFAM');
 /** Value: 'DSAG' */
-define('PRAY_BLOCK_DSAG','DSAG');
+define('PRAY_BLOCK_DSAG', 'DSAG');
 /** Value: 'DSEX' */
-define('PRAY_BLOCK_DSEX','DSEX');
+define('PRAY_BLOCK_DSEX', 'DSEX');
 /** Value: 'EGG' */
-define('PRAY_BLOCK_EGGS' ,'EGGS' );
+define('PRAY_BLOCK_EGGS', 'EGGS');
 /** Value: 'EXPC' */
-define('PRAY_BLOCK_EXPC','EXPC');
+define('PRAY_BLOCK_EXPC', 'EXPC');
 /** Value: 'FILE' */
-define('PRAY_BLOCK_FILE','FILE');
+define('PRAY_BLOCK_FILE', 'FILE');
 /** Value: 'GENE' */
-define('PRAY_BLOCK_GENE','GENE');
+define('PRAY_BLOCK_GENE', 'GENE');
 /** Value: 'GLST' */
-define('PRAY_BLOCK_GLST','GLST');
+define('PRAY_BLOCK_GLST', 'GLST');
 /** Value: 'LIVE' */
-define('PRAY_BLOCK_LIVE','LIVE');
+define('PRAY_BLOCK_LIVE', 'LIVE');
 /** Value: 'PHOT' */
-define('PRAY_BLOCK_PHOT','PHOT');
+define('PRAY_BLOCK_PHOT', 'PHOT');
 /** Value: 'SFAM' */
-define('PRAY_BLOCK_SFAM','SFAM');
+define('PRAY_BLOCK_SFAM', 'SFAM');
 //@}
 
 /** @name Flags
@@ -57,7 +57,7 @@ 
 ///@{
 /** Value: 1*/
 ///Whether or not the block is zLib compressed.
-define('PRAY_FLAG_ZLIB_COMPRESSED',1);
+define('PRAY_FLAG_ZLIB_COMPRESSED', 1);
 ///@}
 
 /// @brief Abstract class to represent PRAY blocks
@@ -83,11 +83,11 @@ 
      *    @param $flags     A 1-byte integer containing the flags this PrayBlock has set
      *    @param $type     The type of the PrayBlock as a PRAY_BLOCK_* constant. Must be a four-character string.  
      */
-    public function PrayBlock($prayfile,$name,$content,$flags,$type) {
-        if(strlen($type) != 4) {
+    public function PrayBlock($prayfile, $name, $content, $flags, $type) {
+        if (strlen($type) != 4) {
             throw new Exception('Invalid PRAY block type: '.$type);
         }
-        if($prayfile instanceof PRAYFile) {
+        if ($prayfile instanceof PRAYFile) {
             $this->prayfile = $prayfile;
             $this->decompiled = false;
         } else {
@@ -105,18 +105,18 @@ 
      * @param $length length of the data that will be written to the block
      * @param $uncompressedlength length of the data when uncompressed, etc.
      */
-    protected function EncodeBlockHeader($length,$uncompressedlength=false) {
+    protected function EncodeBlockHeader($length, $uncompressedlength = false) {
         $compiled = $this->GetType();
-        $compiled .= substr($this->GetName(),0,128);
-        $len = 128 - strlen($this->GetName());
+        $compiled .= substr($this->GetName(), 0, 128);
+        $len = 128-strlen($this->GetName());
         
-        for($i=0;$i<$len;$i++) {
+        for ($i = 0; $i < $len; $i++) {
             $compiled .= pack('x');
         }
-        if($uncompressedlength === false) {
+        if ($uncompressedlength === false) {
             $uncompressedlength = $length;
         }
-        $compiled .= pack('VVV',$length,$uncompressedlength,$this->flags);
+        $compiled .= pack('VVV', $length, $uncompressedlength, $this->flags);
         return $compiled;
     }
     /// @endcond
@@ -130,7 +130,7 @@ 
      * @return the data, having been transformed.
      */
     protected function PerformFlagOperations($data) {
-        if($this->IsFlagSet(PRAY_FLAG_ZLIB_COMPRESSED)) {
+        if ($this->IsFlagSet(PRAY_FLAG_ZLIB_COMPRESSED)) {
             $data = gzcompress($data);
         }
         return $data;
@@ -151,11 +151,11 @@ 
      * return the PRAY block's binary data.
      */
     public function GetData() {
-        if($this->decompiled) {
+        if ($this->decompiled) {
             throw new Exception('Can\'t get data on a decompiled PRAYBlock. It must be compiled first');
             return;
         }
-        if($this->IsFlagSet(PRAY_FLAG_ZLIB_COMPRESSED)) {
+        if ($this->IsFlagSet(PRAY_FLAG_ZLIB_COMPRESSED)) {
             $this->content = gzuncompress($this->content);
             $this->SetFlagsOff(PRAY_FLAG_ZLIB_COMPRESSED);
         }
@@ -233,7 +233,7 @@ 
      * Call this function at the beginning of every function that returns data in superclasses so that data decoding is automatic.
      */
     protected function EnsureDecompiled() {
-        if($this->decompiled) {
+        if ($this->decompiled) {
             return;
         } else {
             $this->DecompileBlockData();
@@ -251,18 +251,18 @@ 
      * This function is mainly intended for use by PRAYFiles. 
      */
     public function Compile() {
-        if($this->decompiled) { 
+        if ($this->decompiled) { 
             $data = $this->CompileBlockData();
             $uclength = strlen($data);
             $data = $this->PerformFlagOperations($data);
-            $compiled = $this->EncodeBlockHeader(strlen($data),$uclength);
+            $compiled = $this->EncodeBlockHeader(strlen($data), $uclength);
             $compiled .= $data;
             $this->content = $data;
             $this->decompiled = false;
             return $compiled; 
         } else {
             $data = $this->PerformFlagOperations($this->content);
-            $compiled  = $this->EncodeBlockHeader(strlen($this->content),strlen($data));
+            $compiled  = $this->EncodeBlockHeader(strlen($this->content), strlen($data));
             $compiled .= $this->content;
             return $compiled;
         }
@@ -293,50 +293,50 @@ 
      *   @param $flags       The flags given to this PRAYBlock as an integer.
      *   return An object that is an instance of a subclass of PrayBlock.
      */
-    public static function MakePrayBlock($blocktype,PRAYFile $prayfile,$name,$content,$flags) {
-        switch($blocktype) {
+    public static function MakePrayBlock($blocktype, PRAYFile $prayfile, $name, $content, $flags) {
+        switch ($blocktype) {
             //agents
         case PRAY_BLOCK_AGNT:
-            return new AGNTBlock($prayfile,$name,$content,$flags);
+            return new AGNTBlock($prayfile, $name, $content, $flags);
         case PRAY_BLOCK_DSAG:
-            return new DSAGBlock($prayfile,$name,$content,$flags);
+            return new DSAGBlock($prayfile, $name, $content, $flags);
         case PRAY_BLOCK_LIVE:
-            return new LIVEBlock($prayfile,$name,$content,$flags); //sea monkeys agent files.
+            return new LIVEBlock($prayfile, $name, $content, $flags); //sea monkeys agent files.
 
             //egg
         case PRAY_BLOCK_EGGS:
-            return new EGGSBlock($prayfile,$name,$content,$flags);
+            return new EGGSBlock($prayfile, $name, $content, $flags);
 
             //starter families
         case PRAY_BLOCK_DFAM:
-            return new DFAMBlock($prayfile,$name,$content,$flags);
+            return new DFAMBlock($prayfile, $name, $content, $flags);
         case PRAY_BLOCK_SFAM:
-            return new SFAMBlock($prayfile,$name,$content,$flags);
+            return new SFAMBlock($prayfile, $name, $content, $flags);
 
             //exported creatures
         case PRAY_BLOCK_EXPC:
-            return new EXPCBlock($prayfile,$name,$content,$flags);
+            return new EXPCBlock($prayfile, $name, $content, $flags);
         case PRAY_BLOCK_DSEX:
-            return new DSEXBlock($prayfile,$name,$content,$flags);
+            return new DSEXBlock($prayfile, $name, $content, $flags);
 
         case PRAY_BLOCK_CREA:
-            return new CREABlock($prayfile,$name,$content,$flags);
+            return new CREABlock($prayfile, $name, $content, $flags);
 
             //creature photos
         case PRAY_BLOCK_PHOT:
-            return new PHOTBlock($prayfile,$name,$content,$flags);
+            return new PHOTBlock($prayfile, $name, $content, $flags);
 
             //creature history
         case PRAY_BLOCK_GLST:
-            return new GLSTBlock($prayfile,$name,$content,$flags);
+            return new GLSTBlock($prayfile, $name, $content, $flags);
 
             //creature genetics
         case PRAY_BLOCK_GENE:
-            return new GENEBlock($prayfile,$name,$content,$flags);
+            return new GENEBlock($prayfile, $name, $content, $flags);
 
             //files
         case PRAY_BLOCK_FILE:
-            return new FILEBlock($prayfile,$name,$content,$flags);
+            return new FILEBlock($prayfile, $name, $content, $flags);
 
         default:
             return null;

agents/PRAY/EGGSBlock.php

Spacing +2 added lines, -2 removed lines

@@ -19,8 +19,8 @@
      * @param $flags Any flags this block may have. I think this is a
      * single byte. Check http://www.creatureswiki.net/wiki/PRAY
      */
-     public function EGGSBlock($prayfile,$name,$content,$flags) {
-        parent::TagBlock($prayfile,$name,$content,$flags,PRAY_BLOCK_EGGS);
+     public function EGGSBlock($prayfile, $name, $content, $flags) {
+        parent::TagBlock($prayfile, $name, $content, $flags, PRAY_BLOCK_EGGS);
 
     }
 

agents/PRAY/LIVEBlock.php

Spacing +2 added lines, -2 removed lines

@@ -20,8 +20,8 @@
      * @param $flags The block's flags. See PrayBlock.
      */
 
-	public function LIVEBlock($prayfile,$name,$content,$flags) {
-		parent::TagBlock($prayfile,$name,$content,$flags,PRAY_BLOCK_LIVE);
+	public function LIVEBlock($prayfile, $name, $content, $flags) {
+		parent::TagBlock($prayfile, $name, $content, $flags, PRAY_BLOCK_LIVE);
 
 	}
 }

agents/PRAY/PrayDependency.php

Spacing +9 added lines, -9 removed lines

@@ -20,21 +20,21 @@ 
  */
 ///@{
 /// Value: 1
-define('PRAY_DEPENDENCY_SOUND',1);
+define('PRAY_DEPENDENCY_SOUND', 1);
 /// Value: 2
-define('PRAY_DEPENDENCY_IMAGE',2);
+define('PRAY_DEPENDENCY_IMAGE', 2);
 /// Value: 3
-define('PRAY_DEPENDENCY_GENE',3);
+define('PRAY_DEPENDENCY_GENE', 3);
 /// Value: 4
-define('PRAY_DEPENDENCY_BODYDATA',4);
+define('PRAY_DEPENDENCY_BODYDATA', 4);
 /// Value: 5
-define('PRAY_DEPENDENCY_OVERLAY',5);
+define('PRAY_DEPENDENCY_OVERLAY', 5);
 /// Value: 6
-define('PRAY_DEPENDENCY_BACKGROUND',6);
+define('PRAY_DEPENDENCY_BACKGROUND', 6);
 /// Value: 7
-define('PRAY_DEPENDENCY_CATALOGUE',7);
+define('PRAY_DEPENDENCY_CATALOGUE', 7);
 /// Value: 10
-define('PRAY_DEPENDENCY_CREATURE',10);
+define('PRAY_DEPENDENCY_CREATURE', 10);
 //@}
 
 /// @brief Dependency class used in various PrayBlocks.
@@ -54,7 +54,7 @@ 
      * @param $category One of the PRAY_DEPENDENCY_* constants
      * @param $filename The name of the file this dependency relates to.
      */
-	public function PrayDependency($category,$filename) {
+	public function PrayDependency($category, $filename) {
 		$this->category = $category;
 		$this->filename = $filename;
 	}

agents/PRAY/EXPCBlock.php

Spacing +2 added lines, -2 removed lines

@@ -36,8 +36,8 @@
      * @param $content The binary data of this block. May be null.
      * @param $flags The block's flags
      */
-    public function EXPCBlock($prayfile,$name,$content,$flags) {
-        parent::TagBlock($prayfile,$name,$content,$flags,PRAY_BLOCK_EXPC);
+    public function EXPCBlock($prayfile, $name, $content, $flags) {
+        parent::TagBlock($prayfile, $name, $content, $flags, PRAY_BLOCK_EXPC);
     }
 
     /// @brief Gets the age of the creature

agents/PRAY/BinaryBlock.php

Spacing +2 added lines, -2 removed lines

@@ -22,8 +22,8 @@
      * @param $name The block's name.
      * @param $content The content of the block as a binary string.
      */
-	public function BinaryBlock($type,$name,$content) {
-		parent::PrayBlock(null,$name,'',0,$type);
+	public function BinaryBlock($type, $name, $content) {
+		parent::PrayBlock(null, $name, '', 0, $type);
 		$this->binarydata = $content;
     }
     /// @brief Compile the BinaryBlock

agents/PRAY/CreaturesArchiveBlock.php

Spacing +6 added lines, -6 removed lines

@@ -17,10 +17,10 @@ 
      * @param $flags the flags of this block
      * @param $type This block's type as one of the PRAY_BLOCK_* constants
      */
-    public function CreaturesArchiveBlock(&$prayfile,$name,$content,$flags,$type) {
-        parent::PrayBlock($prayfile,$name,$content,$flags,$type);
-        if($prayfile instanceof PRAYFile) {
-            if(!$this->DeArchive()) {
+    public function CreaturesArchiveBlock(&$prayfile, $name, $content, $flags, $type) {
+        parent::PrayBlock($prayfile, $name, $content, $flags, $type);
+        if ($prayfile instanceof PRAYFile) {
+            if (!$this->DeArchive()) {
                 throw new Exception('De-Archiving failed, block probably wasn\'t a CreaturesArchive type');
             }
         }
@@ -30,9 +30,9 @@ 
     /// DeArchives this block
     private function DeArchive() {
         $content = $this->GetData();
-        if($content{0} == 'C') {
+        if ($content{0} == 'C') {
             $content = DeArchive($content);

-            if($content !== false) {

+            if ($content !== false) {

                 $this->SetData($content);
                 return true;

             }

agents/PRAY/GLSTBlock.php

Spacing +31 added lines, -31 removed lines

@@ -10,11 +10,11 @@ 
 ///@{
 
 /** Value: 0 */
-define('GLST_FORMAT_UNKNOWN',0);
+define('GLST_FORMAT_UNKNOWN', 0);
 /** Value: 1 */
-define('GLST_FORMAT_C3',1);
+define('GLST_FORMAT_C3', 1);
 /** Value: 2 */
-define('GLST_FORMAT_DS',2);
+define('GLST_FORMAT_DS', 2);
 //@}
 
 /// @brief PRAY Block for Creature History Data.
@@ -38,11 +38,11 @@ 
      * @param $content The binary data of this file block.
      * @param $flags The block's flags. See PrayBlock.
      */
-    public function GLSTBlock($object,$name,$content,$flags) {
-        parent::CreaturesArchiveBlock($object,$name,$content,$flags,PRAY_BLOCK_GLST);
-        if($object instanceof PRAYFile) {
+    public function GLSTBlock($object, $name, $content, $flags) {
+        parent::CreaturesArchiveBlock($object, $name, $content, $flags, PRAY_BLOCK_GLST);
+        if ($object instanceof PRAYFile) {
             //Do nothing! Decoding is automated later now :)
-        } else if($object instanceof CreatureHistory) {
+        } else if ($object instanceof CreatureHistory) {
             $this->history = $object;
         } else {
             throw new Exception('Couldn\'t create a GLST block. :(');
@@ -52,11 +52,11 @@ 
     /// @brief Tries to work out which game this GLSTBlock is from
     private function GuessFormat() {
         //if I don't know
-        if($this->format == GLST_FORMAT_UNKNOWN) {
+        if ($this->format == GLST_FORMAT_UNKNOWN) {
             //ask $prayfile if it exists. (look for DSEX, otherwise C3)
-            if($this->prayfile != null) {
+            if ($this->prayfile != null) {
                 //prayfile should know
-                if(sizeof($this->prayfile->GetBlocks(PRAY_BLOCK_DSEX)) > 0) {
+                if (sizeof($this->prayfile->GetBlocks(PRAY_BLOCK_DSEX)) > 0) {
                     $format = GLST_FORMAT_DS;
                 } else {
                     $format = GLST_FORMAT_C3;
@@ -91,10 +91,10 @@ 
      */
     public function GetPHOTBlockName(CreatureHistoryEvent $event) {
         $photoname = $event->GetPhotoGraph();
-        if(empty($photoname)) {
+        if (empty($photoname)) {
             return null;
         }
-        if($this->format == GLST_FORMAT_DS) {
+        if ($this->format == GLST_FORMAT_DS) {
             return $photoname.'.DSEX.photo';
         } else {
             return $photoname.'.photo';
@@ -109,7 +109,7 @@ 
      * and handle errors.
      */
     public function GetPhotoBlock(CreatureHistoryEvent $event) {
-        if($this->GetPrayFile() instanceof PRAYFile) {
+        if ($this->GetPrayFile() instanceof PRAYFile) {
             return $block = $this->GetPrayFile()->GetBlockByName($this->GetPHOTBlockName());
         } else {
             throw new Exception("This GLSTBlock is not connected to a PRAYFile.");
@@ -123,10 +123,10 @@ 
     protected function DecompileBlockData() {   
         $reader = new StringReader($this->GetData());
         $firstchar = $reader->Read(1);
-        if($firstchar == chr(0x27)) { //apostrophe thing
+        if ($firstchar == chr(0x27)) { //apostrophe thing
             //ds
             $this->format = GLST_FORMAT_DS;
-        } else if($firstchar == chr(0x0C)) { //control character
+        } else if ($firstchar == chr(0x0C)) { //control character
             //c3
             $this->format = GLST_FORMAT_C3;
         } else {
@@ -135,7 +135,7 @@ 
         //the first four bytes including $firstchar are probably one integer used to identify the game used.
         //We read the first one above and now we're skipping the next three.
         $reader->Skip(3); // 3 nulls.
-        if($reader->ReadInt(4)!=1) { //Always 1, don't know why.
+        if ($reader->ReadInt(4) != 1) { //Always 1, don't know why.
             throw new Exception('Either the GLST Block is corrupt or I don\'t understand what the 2nd set of 4 bytes mean.');
             return false;
         }
@@ -147,11 +147,11 @@ 
         $species        = $reader->ReadInt(4);
         $eventslength   = $reader->ReadInt(4);
 
-        $this->history = new CreatureHistory($moniker,$name,$gender,$genus,$species);
-        if(!isset($eventslength)) {
+        $this->history = new CreatureHistory($moniker, $name, $gender, $genus, $species);
+        if (!isset($eventslength)) {
             return false;
         }
-        for($i=0;$i<$eventslength;$i++) {
+        for ($i = 0; $i < $eventslength; $i++) {
             $this->DecodeEvent($reader);
         }
 
@@ -159,13 +159,13 @@ 
         $mutations = $reader->ReadInt(4);
         $crossovers = $reader->ReadInt(4);
 
-        $this->history->SetMutationsAndCrossovers($mutations,$crossovers);
+        $this->history->SetMutationsAndCrossovers($mutations, $crossovers);
 
-        if($this->format == GLST_FORMAT_DS) {
+        if ($this->format == GLST_FORMAT_DS) {
             $unknown1 = $reader->ReadInt(4);
-            $warpveteran = (($reader->ReadInt(4)==1)?1:0);
+            $warpveteran = (($reader->ReadInt(4) == 1) ? 1 : 0);
             $unknown2 = $reader->Read($reader->ReadInt(4));
-            $this->history->SetDSUnknowns($unknown1,$unknown2);
+            $this->history->SetDSUnknowns($unknown1, $unknown2);
             $this->history->SetWarpVeteran($warpveteran);
         }
     }
@@ -175,7 +175,7 @@ 
     private function DecodeEvent($reader) {
         $eventNumber = $reader->ReadInt(4);
         //echo 'Event '.$eventNumber."\n";
-        if($eventNumber < 18) {
+        if ($eventNumber < 18) {
             $eventnumber    = $eventNumber;
             $worldtime      = $reader->ReadInt(4);
             $creatureage    = $reader->ReadInt(4);
@@ -187,14 +187,14 @@ 
             $photograph     = $reader->Read($reader->ReadInt(4));
             $worldname      = $reader->Read($reader->ReadInt(4));
             $worldUID       = $reader->Read($reader->ReadInt(4));
-            $event = new CreatureHistoryEvent($eventnumber,$worldtime,$creatureage,
-                $timestamp,$lifestage,$moniker,$moniker2,$usertext,$photograph,
-                $worldname,$worldUID);
-            if($this->format == GLST_FORMAT_DS) {
+            $event = new CreatureHistoryEvent($eventnumber, $worldtime, $creatureage,
+                $timestamp, $lifestage, $moniker, $moniker2, $usertext, $photograph,
+                $worldname, $worldUID);
+            if ($this->format == GLST_FORMAT_DS) {
                 $DSUser     = $reader->Read($reader->ReadInt(4));
                 $unknown1   = $reader->ReadInt(4);
                 $unknown2   = $reader->ReadInt(4);
-                $event->AddDSInfo($DSUser,$unknown1,$unknown2);
+                $event->AddDSInfo($DSUser, $unknown1, $unknown2);
             }
             $this->history->AddEvent($event);
             return true;
@@ -208,9 +208,9 @@ 
      * @param $format One of the GLST_FORMAT_* constants
      * @return The compiled block data for Compile()
      */
-    protected function CompileBlockData($format=GLST_FORMAT_UNKNOWN) {
+    protected function CompileBlockData($format = GLST_FORMAT_UNKNOWN) {
         //if you don't know
-        if($format == GLST_FORMAT_UNKNOWN) {
+        if ($format == GLST_FORMAT_UNKNOWN) {
             $format = $this->GuessFormat();
         }   
         $compiled = Archive($this->history->Compile($format));