codysnider / tt-rss

lib/phpqrcode/qrmask.php

Spacing +61 added lines, -61 removed lines

@@ -44,10 +44,10 @@ 
         public function writeFormatInformation($width, &$frame, $mask, $level)

         {

             $blacks = 0;

-            $format =  QRspec::getFormatInfo($mask, $level);

+            $format = QRspec::getFormatInfo($mask, $level);

 

-            for($i=0; $i<8; $i++) {

-                if($format & 1) {

+            for ($i = 0; $i < 8; $i++) {

+                if ($format & 1) {

                     $blacks += 2;

                     $v = 0x85;

                 } else {

@@ -55,7 +55,7 @@ 
                 }

                 

                 $frame[8][$width - 1 - $i] = chr($v);

-                if($i < 6) {

+                if ($i < 6) {

                     $frame[$i][8] = chr($v);

                 } else {

                     $frame[$i + 1][8] = chr($v);

@@ -63,8 +63,8 @@ 
                 $format = $format >> 1;

             }

             

-            for($i=0; $i<7; $i++) {

-                if($format & 1) {

+            for ($i = 0; $i < 7; $i++) {

+                if ($format & 1) {

                     $blacks += 2;

                     $v = 0x85;

                 } else {

@@ -72,7 +72,7 @@ 
                 }

                 

                 $frame[$width - 7 + $i][8] = chr($v);

-                if($i == 0) {

+                if ($i == 0) {

                     $frame[8][7] = chr($v);

                 } else {

                     $frame[8][6 - $i] = chr($v);

@@ -85,27 +85,27 @@ 
         }

         

         //----------------------------------------------------------------------

-        public function mask0($x, $y) { return ($x+$y)&1;                       }

-        public function mask1($x, $y) { return ($y&1);                          }

-        public function mask2($x, $y) { return ($x%3);                          }

-        public function mask3($x, $y) { return ($x+$y)%3;                       }

-        public function mask4($x, $y) { return (((int)($y/2))+((int)($x/3)))&1; }

-        public function mask5($x, $y) { return (($x*$y)&1)+($x*$y)%3;           }

-        public function mask6($x, $y) { return ((($x*$y)&1)+($x*$y)%3)&1;       }

-        public function mask7($x, $y) { return ((($x*$y)%3)+(($x+$y)&1))&1;     }

+        public function mask0($x, $y) { return ($x + $y) & 1; }

+        public function mask1($x, $y) { return ($y & 1); }

+        public function mask2($x, $y) { return ($x % 3); }

+        public function mask3($x, $y) { return ($x + $y) % 3; }

+        public function mask4($x, $y) { return (((int) ($y / 2)) + ((int) ($x / 3))) & 1; }

+        public function mask5($x, $y) { return (($x * $y) & 1) + ($x * $y) % 3; }

+        public function mask6($x, $y) { return ((($x * $y) & 1) + ($x * $y) % 3) & 1; }

+        public function mask7($x, $y) { return ((($x * $y) % 3) + (($x + $y) & 1)) & 1; }

         

         //----------------------------------------------------------------------

         private function generateMaskNo($maskNo, $width, $frame)

         {

             $bitMask = array_fill(0, $width, array_fill(0, $width, 0));

             

-            for($y=0; $y<$width; $y++) {

-                for($x=0; $x<$width; $x++) {

-                    if(ord($frame[$y][$x]) & 0x80) {

+            for ($y = 0; $y < $width; $y++) {

+                for ($x = 0; $x < $width; $x++) {

+                    if (ord($frame[$y][$x]) & 0x80) {

                         $bitMask[$y][$x] = 0;

                     } else {

                         $maskFunc = call_user_func(array($this, 'mask'.$maskNo), $x, $y);

-                        $bitMask[$y][$x] = ($maskFunc == 0)?1:0;

+                        $bitMask[$y][$x] = ($maskFunc == 0) ? 1 : 0;

                     }

                     

                 }

@@ -163,12 +163,12 @@ 
                 

             $d = $s;

 

-            for($y=0; $y<$width; $y++) {

-                for($x=0; $x<$width; $x++) {

-                    if($bitMask[$y][$x] == 1) {

-                        $d[$y][$x] = chr(ord($s[$y][$x]) ^ (int)$bitMask[$y][$x]);

+            for ($y = 0; $y < $width; $y++) {

+                for ($x = 0; $x < $width; $x++) {

+                    if ($bitMask[$y][$x] == 1) {

+                        $d[$y][$x] = chr(ord($s[$y][$x]) ^ (int) $bitMask[$y][$x]);

                     }

-                    $b += (int)(ord($d[$y][$x]) & 1);

+                    $b += (int) (ord($d[$y][$x]) & 1);

                 }

             }

 

@@ -190,21 +190,21 @@ 
         {

             $demerit = 0;

 

-            for($i=0; $i<$length; $i++) {

+            for ($i = 0; $i < $length; $i++) {

                 

-                if($this->runLength[$i] >= 5) {

+                if ($this->runLength[$i] >= 5) {

                     $demerit += (N1 + ($this->runLength[$i] - 5));

                 }

-                if($i & 1) {

-                    if(($i >= 3) && ($i < ($length-2)) && ($this->runLength[$i] % 3 == 0)) {

-                        $fact = (int)($this->runLength[$i] / 3);

-                        if(($this->runLength[$i-2] == $fact) &&

-                           ($this->runLength[$i-1] == $fact) &&

-                           ($this->runLength[$i+1] == $fact) &&

-                           ($this->runLength[$i+2] == $fact)) {

-                            if(($this->runLength[$i-3] < 0) || ($this->runLength[$i-3] >= (4 * $fact))) {

+                if ($i & 1) {

+                    if (($i >= 3) && ($i < ($length - 2)) && ($this->runLength[$i] % 3 == 0)) {

+                        $fact = (int) ($this->runLength[$i] / 3);

+                        if (($this->runLength[$i - 2] == $fact) &&

+                           ($this->runLength[$i - 1] == $fact) &&

+                           ($this->runLength[$i + 1] == $fact) &&

+                           ($this->runLength[$i + 2] == $fact)) {

+                            if (($this->runLength[$i - 3] < 0) || ($this->runLength[$i - 3] >= (4 * $fact))) {

                                 $demerit += N3;

-                            } else if((($i+3) >= $length) || ($this->runLength[$i+3] >= (4 * $fact))) {

+                            } else if ((($i + 3) >= $length) || ($this->runLength[$i + 3] >= (4 * $fact))) {

                                 $demerit += N3;

                             }

                         }

@@ -220,30 +220,30 @@ 
             $head = 0;

             $demerit = 0;

 

-            for($y=0; $y<$width; $y++) {

+            for ($y = 0; $y < $width; $y++) {

                 $head = 0;

                 $this->runLength[0] = 1;

                 

                 $frameY = $frame[$y];

                 

-                if ($y>0)

-                    $frameYM = $frame[$y-1];

+                if ($y > 0)

+                    $frameYM = $frame[$y - 1];

                 

-                for($x=0; $x<$width; $x++) {

-                    if(($x > 0) && ($y > 0)) {

-                        $b22 = ord($frameY[$x]) & ord($frameY[$x-1]) & ord($frameYM[$x]) & ord($frameYM[$x-1]);

-                        $w22 = ord($frameY[$x]) | ord($frameY[$x-1]) | ord($frameYM[$x]) | ord($frameYM[$x-1]);

+                for ($x = 0; $x < $width; $x++) {

+                    if (($x > 0) && ($y > 0)) {

+                        $b22 = ord($frameY[$x]) & ord($frameY[$x - 1]) & ord($frameYM[$x]) & ord($frameYM[$x - 1]);

+                        $w22 = ord($frameY[$x]) | ord($frameY[$x - 1]) | ord($frameYM[$x]) | ord($frameYM[$x - 1]);

                         

-                        if(($b22 | ($w22 ^ 1))&1) {                                                                     

+                        if (($b22 | ($w22 ^ 1)) & 1) {                                                                     

                             $demerit += N2;

                         }

                     }

-                    if(($x == 0) && (ord($frameY[$x]) & 1)) {

+                    if (($x == 0) && (ord($frameY[$x]) & 1)) {

                         $this->runLength[0] = -1;

                         $head = 1;

                         $this->runLength[$head] = 1;

-                    } else if($x > 0) {

-                        if((ord($frameY[$x]) ^ ord($frameY[$x-1])) & 1) {

+                    } else if ($x > 0) {

+                        if ((ord($frameY[$x]) ^ ord($frameY[$x - 1])) & 1) {

                             $head++;

                             $this->runLength[$head] = 1;

                         } else {

@@ -252,20 +252,20 @@ 
                     }

                 }

     

-                $demerit += $this->calcN1N3($head+1);

+                $demerit += $this->calcN1N3($head + 1);

             }

 

-            for($x=0; $x<$width; $x++) {

+            for ($x = 0; $x < $width; $x++) {

                 $head = 0;

                 $this->runLength[0] = 1;

                 

-                for($y=0; $y<$width; $y++) {

-                    if($y == 0 && (ord($frame[$y][$x]) & 1)) {

+                for ($y = 0; $y < $width; $y++) {

+                    if ($y == 0 && (ord($frame[$y][$x]) & 1)) {

                         $this->runLength[0] = -1;

                         $head = 1;

                         $this->runLength[$head] = 1;

-                    } else if($y > 0) {

-                        if((ord($frame[$y][$x]) ^ ord($frame[$y-1][$x])) & 1) {

+                    } else if ($y > 0) {

+                        if ((ord($frame[$y][$x]) ^ ord($frame[$y - 1][$x])) & 1) {

                             $head++;

                             $this->runLength[$head] = 1;

                         } else {

@@ -274,7 +274,7 @@ 
                     }

                 }

             

-                $demerit += $this->calcN1N3($head+1);

+                $demerit += $this->calcN1N3($head + 1);

             }

 

             return $demerit;

@@ -288,13 +288,13 @@ 
             $bestMaskNum = 0;

             $bestMask = array();

             

-            $checked_masks = array(0,1,2,3,4,5,6,7);

+            $checked_masks = array(0, 1, 2, 3, 4, 5, 6, 7);

             

             if (QR_FIND_FROM_RANDOM !== false) {

             

-                $howManuOut = 8-(QR_FIND_FROM_RANDOM % 9);

-                for ($i = 0; $i <  $howManuOut; $i++) {

-                    $remPos = rand (0, count($checked_masks)-1);

+                $howManuOut = 8 - (QR_FIND_FROM_RANDOM % 9);

+                for ($i = 0; $i < $howManuOut; $i++) {

+                    $remPos = rand(0, count($checked_masks) - 1);

                     unset($checked_masks[$remPos]);

                     $checked_masks = array_values($checked_masks);

                 }

@@ -303,18 +303,18 @@ 
             

             $bestMask = $frame;

              

-            foreach($checked_masks as $i) {

+            foreach ($checked_masks as $i) {

                 $mask = array_fill(0, $width, str_repeat("\0", $width));

 

                 $demerit = 0;

                 $blacks = 0;

                 $blacks  = $this->makeMaskNo($i, $width, $frame, $mask);

                 $blacks += $this->writeFormatInformation($width, $mask, $i, $level);

-                $blacks  = (int)(100 * $blacks / ($width * $width));

-                $demerit = (int)((int)(abs($blacks - 50) / 5) * N4);

+                $blacks  = (int) (100 * $blacks / ($width * $width));

+                $demerit = (int) ((int) (abs($blacks - 50) / 5) * N4);

                 $demerit += $this->evaluateSymbol($width, $mask);

                 

-                if($demerit < $minDemerit) {

+                if ($demerit < $minDemerit) {

                     $minDemerit = $demerit;

                     $bestMask = $mask;

                     $bestMaskNum = $i;

Braces +15 added lines, -10 removed lines

@@ -119,8 +119,9 @@ 
         {

             $codeArr = array();

             

-            foreach ($bitFrame as $line)

-                $codeArr[] = join('', $line);

+            foreach ($bitFrame as $line) {
+                            $codeArr[] = join('', $line);
+            }
                 

             return gzcompress(join("\n", $codeArr), 9);

         }

@@ -131,8 +132,9 @@ 
             $codeArr = array();

             

             $codeLines = explode("\n", gzuncompress($code));

-            foreach ($codeLines as $line)

-                $codeArr[] = str_split($line);

+            foreach ($codeLines as $line) {
+                            $codeArr[] = str_split($line);
+            }
             

             return $codeArr;

         }

@@ -150,16 +152,18 @@ 
                     $bitMask = self::unserial(file_get_contents($fileName));

                 } else {

                     $bitMask = $this->generateMaskNo($maskNo, $width, $s);

-                    if (!file_exists(QR_CACHE_DIR.'mask_'.$maskNo))

-                        mkdir(QR_CACHE_DIR.'mask_'.$maskNo);

+                    if (!file_exists(QR_CACHE_DIR.'mask_'.$maskNo)) {
+                                            mkdir(QR_CACHE_DIR.'mask_'.$maskNo);
+                    }
                     file_put_contents($fileName, self::serial($bitMask));

                 }

             } else {

                 $bitMask = $this->generateMaskNo($maskNo, $width, $s);

             }

 

-            if ($maskGenOnly)

-                return;

+            if ($maskGenOnly) {
+                            return;
+            }
                 

             $d = $s;

 

@@ -226,8 +230,9 @@ 
                 

                 $frameY = $frame[$y];

                 

-                if ($y>0)

-                    $frameYM = $frame[$y-1];

+                if ($y>0) {
+                                    $frameYM = $frame[$y-1];
+                }
                 

                 for($x=0; $x<$width; $x++) {

                     if(($x > 0) && ($y > 0)) {

Indentation +8 added lines, -8 removed lines

@@ -25,17 +25,17 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

  */

  

-	define('N1', 3);

-	define('N2', 3);

-	define('N3', 40);

-	define('N4', 10);

+    define('N1', 3);

+    define('N2', 3);

+    define('N3', 40);

+    define('N4', 10);

 

-	class QRmask {

+    class QRmask {

 	

-		public $runLength = array();

+        public $runLength = array();

 		

-		//----------------------------------------------------------------------

-		public function __construct() 

+        //----------------------------------------------------------------------

+        public function __construct() 

         {

             $this->runLength = array_fill(0, QRSPEC_WIDTH_MAX + 1, 0);

         }

lib/phpqrcode/qrconfig.php

Spacing +7 added lines, -7 removed lines

@@ -5,13 +5,13 @@
  * Config file, feel free to modify

  */

      

-    define('QR_CACHEABLE', true);                                                               // use cache - more disk reads but less CPU power, masks and format templates are stored there

-    define('QR_CACHE_DIR', dirname(__FILE__).DIRECTORY_SEPARATOR.'cache'.DIRECTORY_SEPARATOR);  // used when QR_CACHEABLE === true

-    define('QR_LOG_DIR', dirname(__FILE__).DIRECTORY_SEPARATOR);                                // default error logs dir   

+    define('QR_CACHEABLE', true); // use cache - more disk reads but less CPU power, masks and format templates are stored there

+    define('QR_CACHE_DIR', dirname(__FILE__).DIRECTORY_SEPARATOR.'cache'.DIRECTORY_SEPARATOR); // used when QR_CACHEABLE === true

+    define('QR_LOG_DIR', dirname(__FILE__).DIRECTORY_SEPARATOR); // default error logs dir   

     

-    define('QR_FIND_BEST_MASK', true);                                                          // if true, estimates best mask (spec. default, but extremally slow; set to false to significant performance boost but (propably) worst quality code

-    define('QR_FIND_FROM_RANDOM', false);                                                       // if false, checks all masks available, otherwise value tells count of masks need to be checked, mask id are got randomly

-    define('QR_DEFAULT_MASK', 2);                                                               // when QR_FIND_BEST_MASK === false

+    define('QR_FIND_BEST_MASK', true); // if true, estimates best mask (spec. default, but extremally slow; set to false to significant performance boost but (propably) worst quality code

+    define('QR_FIND_FROM_RANDOM', false); // if false, checks all masks available, otherwise value tells count of masks need to be checked, mask id are got randomly

+    define('QR_DEFAULT_MASK', 2); // when QR_FIND_BEST_MASK === false

                                                   

-    define('QR_PNG_MAXIMUM_SIZE',  1024);                                                       // maximum allowed png image width (in pixels), tune to make sure GD and PHP can handle such big images

+    define('QR_PNG_MAXIMUM_SIZE', 1024); // maximum allowed png image width (in pixels), tune to make sure GD and PHP can handle such big images

                                                   
\ No newline at end of file

Indentation +1 added lines, -1 removed lines

@@ -14,4 +14,4 @@
     define('QR_DEFAULT_MASK', 2);                                                               // when QR_FIND_BEST_MASK === false

                                                   

     define('QR_PNG_MAXIMUM_SIZE',  1024);                                                       // maximum allowed png image width (in pixels), tune to make sure GD and PHP can handle such big images

-                                                  
\ No newline at end of file
+                                                    
\ No newline at end of file

lib/phpqrcode/index.php

Spacing +9 added lines, -9 removed lines

@@ -42,12 +42,12 @@ 
     //processing form input

     //remember to sanitize user input in real-life solution !!!

     $errorCorrectionLevel = 'L';

-    if (isset($_REQUEST['level']) && in_array($_REQUEST['level'], array('L','M','Q','H')))

+    if (isset($_REQUEST['level']) && in_array($_REQUEST['level'], array('L', 'M', 'Q', 'H')))

         $errorCorrectionLevel = $_REQUEST['level'];    

 

     $matrixPointSize = 4;

     if (isset($_REQUEST['size']))

-        $matrixPointSize = min(max((int)$_REQUEST['size'], 1), 10);

+        $matrixPointSize = min(max((int) $_REQUEST['size'], 1), 10);

 

 
     if (isset($_REQUEST['data'])) { 

@@ -73,17 +73,17 @@ 
     

     //config form

     echo '<form action="index.php" method="post">

-        Data:&nbsp;<input name="data" value="'.(isset($_REQUEST['data'])?htmlspecialchars($_REQUEST['data']):'PHP QR Code :)').'" />&nbsp;

+        Data:&nbsp;<input name="data" value="'.(isset($_REQUEST['data']) ?htmlspecialchars($_REQUEST['data']) : 'PHP QR Code :)').'" />&nbsp;

         ECC:&nbsp;<select name="level">

-            <option value="L"'.(($errorCorrectionLevel=='L')?' selected':'').'>L - smallest</option>

-            <option value="M"'.(($errorCorrectionLevel=='M')?' selected':'').'>M</option>

-            <option value="Q"'.(($errorCorrectionLevel=='Q')?' selected':'').'>Q</option>

-            <option value="H"'.(($errorCorrectionLevel=='H')?' selected':'').'>H - best</option>

+            <option value="L"'.(($errorCorrectionLevel == 'L') ? ' selected' : '').'>L - smallest</option>

+            <option value="M"'.(($errorCorrectionLevel == 'M') ? ' selected' : '').'>M</option>

+            <option value="Q"'.(($errorCorrectionLevel == 'Q') ? ' selected' : '').'>Q</option>

+            <option value="H"'.(($errorCorrectionLevel == 'H') ? ' selected' : '').'>H - best</option>

         </select>&nbsp;

         Size:&nbsp;<select name="size">';

         

-    for($i=1;$i<=10;$i++)

-        echo '<option value="'.$i.'"'.(($matrixPointSize==$i)?' selected':'').'>'.$i.'</option>';

+    for ($i = 1; $i <= 10; $i++)

+        echo '<option value="'.$i.'"'.(($matrixPointSize == $i) ? ' selected' : '').'>'.$i.'</option>';

         

     echo '</select>&nbsp;

         <input type="submit" value="GENERATE"></form><hr/>';

Braces +15 added lines, -10 removed lines

@@ -33,8 +33,9 @@ 
     include "qrlib.php";    

     

     //ofcourse we need rights to create temp dir

-    if (!file_exists($PNG_TEMP_DIR))

-        mkdir($PNG_TEMP_DIR);
+    if (!file_exists($PNG_TEMP_DIR)) {
+            mkdir($PNG_TEMP_DIR);
+    }
     

     

     $filename = $PNG_TEMP_DIR.'test.png';

@@ -42,19 +43,22 @@ 
     //processing form input

     //remember to sanitize user input in real-life solution !!!

     $errorCorrectionLevel = 'L';

-    if (isset($_REQUEST['level']) && in_array($_REQUEST['level'], array('L','M','Q','H')))

-        $errorCorrectionLevel = $_REQUEST['level'];    

+    if (isset($_REQUEST['level']) && in_array($_REQUEST['level'], array('L','M','Q','H'))) {
+            $errorCorrectionLevel = $_REQUEST['level'];
+    }
 

     $matrixPointSize = 4;

-    if (isset($_REQUEST['size']))

-        $matrixPointSize = min(max((int)$_REQUEST['size'], 1), 10);

+    if (isset($_REQUEST['size'])) {
+            $matrixPointSize = min(max((int)$_REQUEST['size'], 1), 10);
+    }
 

 
     if (isset($_REQUEST['data'])) { 

     

         //it's very important!

-        if (trim($_REQUEST['data']) == '')

-            die('data cannot be empty! <a href="?">back</a>');

+        if (trim($_REQUEST['data']) == '') {
+                    die('data cannot be empty! <a href="?">back</a>');
+        }
             
         // user data

         $filename = $PNG_TEMP_DIR.'test'.md5($_REQUEST['data'].'|'.$errorCorrectionLevel.'|'.$matrixPointSize).'.png';
@@ -82,8 +86,9 @@ 
         </select>&nbsp;

         Size:&nbsp;<select name="size">';

         

-    for($i=1;$i<=10;$i++)

-        echo '<option value="'.$i.'"'.(($matrixPointSize==$i)?' selected':'').'>'.$i.'</option>';

+    for($i=1;$i<=10;$i++) {
+            echo '<option value="'.$i.'"'.(($matrixPointSize==$i)?' selected':'').'>'.$i.'</option>';
+    }
         

     echo '</select>&nbsp;

         <input type="submit" value="GENERATE"></form><hr/>';

lib/phpqrcode/qrtools.php

Spacing +12 added lines, -12 removed lines

@@ -30,8 +30,8 @@ 
             $len = count($frame);

             foreach ($frame as &$frameLine) {

                 

-                for($i=0; $i<$len; $i++) {

-                    $frameLine[$i] = (ord($frameLine[$i])&1)?'1':'0';

+                for ($i = 0; $i < $len; $i++) {

+                    $frameLine[$i] = (ord($frameLine[$i]) & 1) ? '1' : '0';

                 }

             }

             

@@ -61,8 +61,8 @@ 
                 

             foreach ($qrTab as $line) {

                 $arrAdd = array();

-                foreach(str_split($line) as $char)

-                    $arrAdd[] = ($char=='1')?1:0;

+                foreach (str_split($line) as $char)

+                    $arrAdd[] = ($char == '1') ? 1 : 0;

                 $barcode_array['bcode'][] = $arrAdd;

             }

                     

@@ -81,7 +81,7 @@ 
 			QRtools::markTime('before_build_cache');

 			

 			$mask = new QRmask();

-            for ($a=1; $a <= QRSPEC_VERSION_MAX; $a++) {

+            for ($a = 1; $a <= QRSPEC_VERSION_MAX; $a++) {

                 $frame = QRspec::newFrame($a);

                 if (QR_IMAGE) {

                     $fileName = QR_CACHE_DIR.'frame_'.$a.'.png';

@@ -90,7 +90,7 @@ 
 				

 				$width = count($frame);

 				$bitMask = array_fill(0, $width, array_fill(0, $width, 0));

-				for ($maskNo=0; $maskNo<8; $maskNo++)

+				for ($maskNo = 0; $maskNo < 8; $maskNo++)

 					$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);

             }

 			

@@ -115,8 +115,8 @@ 
         public static function dumpMask($frame) 

         {

             $width = count($frame);

-            for($y=0;$y<$width;$y++) {

-                for($x=0;$x<$width;$x++) {

+            for ($y = 0; $y < $width; $y++) {

+                for ($x = 0; $x < $width; $x++) {

                     echo ord($frame[$y][$x]).',';

                 }

             }

@@ -126,7 +126,7 @@ 
         public static function markTime($markerId)

         {

             list($usec, $sec) = explode(" ", microtime());

-            $time = ((float)$usec + (float)$sec);

+            $time = ((float) $usec + (float) $sec);

             

             if (!isset($GLOBALS['qr_time_bench']))

                 $GLOBALS['qr_time_bench'] = array();

@@ -147,9 +147,9 @@ 
                     <thead><tr style="border-bottom:1px solid silver"><td colspan="2" style="text-align:center">BENCHMARK</td></tr></thead>

                     <tbody>';

 

-            foreach($GLOBALS['qr_time_bench'] as $markerId=>$thisTime) {

+            foreach ($GLOBALS['qr_time_bench'] as $markerId=>$thisTime) {

                 if ($p > 0) {

-                    echo '<tr><th style="text-align:right">till '.$markerId.': </th><td>'.number_format($thisTime-$lastTime, 6).'s</td></tr>';

+                    echo '<tr><th style="text-align:right">till '.$markerId.': </th><td>'.number_format($thisTime - $lastTime, 6).'s</td></tr>';

                 } else {

                     $startTime = $thisTime;

                 }

@@ -159,7 +159,7 @@ 
             }

             

             echo '</tbody><tfoot>

-                <tr style="border-top:2px solid black"><th style="text-align:right">TOTAL: </th><td>'.number_format($lastTime-$startTime, 6).'s</td></tr>

+                <tr style="border-top:2px solid black"><th style="text-align:right">TOTAL: </th><td>'.number_format($lastTime - $startTime, 6).'s</td></tr>

             </tfoot>

             </table>';

         }

Braces +12 added lines, -8 removed lines

@@ -43,8 +43,9 @@ 
         {

             $barcode_array = array();

             

-            if (!is_array($mode))

-                $mode = explode(',', $mode);

+            if (!is_array($mode)) {
+                            $mode = explode(',', $mode);
+            }
                 

             $eccLevel = 'L';

                 

@@ -61,8 +62,9 @@ 
                 

             foreach ($qrTab as $line) {

                 $arrAdd = array();

-                foreach(str_split($line) as $char)

-                    $arrAdd[] = ($char=='1')?1:0;

+                foreach(str_split($line) as $char) {
+                                    $arrAdd[] = ($char=='1')?1:0;
+                }
                 $barcode_array['bcode'][] = $arrAdd;

             }

                     

@@ -90,8 +92,9 @@ 
 				

 				$width = count($frame);

 				$bitMask = array_fill(0, $width, array_fill(0, $width, 0));

-				for ($maskNo=0; $maskNo<8; $maskNo++)

-					$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);

+				for ($maskNo=0; $maskNo<8; $maskNo++) {
+									$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);
+				}
             }

 			

 			QRtools::markTime('after_build_cache');

@@ -128,8 +131,9 @@ 
             list($usec, $sec) = explode(" ", microtime());

             $time = ((float)$usec + (float)$sec);

             

-            if (!isset($GLOBALS['qr_time_bench']))

-                $GLOBALS['qr_time_bench'] = array();

+            if (!isset($GLOBALS['qr_time_bench'])) {
+                            $GLOBALS['qr_time_bench'] = array();
+            }
             

             $GLOBALS['qr_time_bench'][$markerId] = $time;

         }

Indentation +7 added lines, -7 removed lines

@@ -78,9 +78,9 @@ 
         //----------------------------------------------------------------------

         public static function buildCache()

         {

-			QRtools::markTime('before_build_cache');

+            QRtools::markTime('before_build_cache');

 			

-			$mask = new QRmask();

+            $mask = new QRmask();

             for ($a=1; $a <= QRSPEC_VERSION_MAX; $a++) {

                 $frame = QRspec::newFrame($a);

                 if (QR_IMAGE) {

@@ -88,13 +88,13 @@ 
                     QRimage::png(self::binarize($frame), $fileName, 1, 0);

                 }

 				

-				$width = count($frame);

-				$bitMask = array_fill(0, $width, array_fill(0, $width, 0));

-				for ($maskNo=0; $maskNo<8; $maskNo++)

-					$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);

+                $width = count($frame);

+                $bitMask = array_fill(0, $width, array_fill(0, $width, 0));

+                for ($maskNo=0; $maskNo<8; $maskNo++)

+                    $mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);

             }

 			

-			QRtools::markTime('after_build_cache');

+            QRtools::markTime('after_build_cache');

         }

 

         //----------------------------------------------------------------------

lib/phpqrcode/qrimage.php

Spacing +12 added lines, -12 removed lines

@@ -27,7 +27,7 @@ 
     class QRimage {

     

         //----------------------------------------------------------------------

-        public static function png($frame, $filename = false, $pixelPerPoint = 4, $outerFrame = 4,$saveandprint=FALSE) 

+        public static function png($frame, $filename = false, $pixelPerPoint = 4, $outerFrame = 4, $saveandprint = FALSE) 

         {

             $image = self::image($frame, $pixelPerPoint, $outerFrame);

             

@@ -35,11 +35,11 @@ 
                 Header("Content-type: image/png");

                 ImagePng($image);

             } else {

-                if($saveandprint===TRUE){

+                if ($saveandprint === TRUE) {

                     ImagePng($image, $filename);

                     header("Content-type: image/png");

                     ImagePng($image);

-                }else{

+                } else {

                     ImagePng($image, $filename);

                 }

             }

@@ -68,25 +68,25 @@ 
             $h = count($frame);

             $w = strlen($frame[0]);

             

-            $imgW = $w + 2*$outerFrame;

-            $imgH = $h + 2*$outerFrame;

+            $imgW = $w + 2 * $outerFrame;

+            $imgH = $h + 2 * $outerFrame;

             

-            $base_image =ImageCreate($imgW, $imgH);

+            $base_image = ImageCreate($imgW, $imgH);

             

-            $col[0] = ImageColorAllocate($base_image,255,255,255);

-            $col[1] = ImageColorAllocate($base_image,0,0,0);

+            $col[0] = ImageColorAllocate($base_image, 255, 255, 255);

+            $col[1] = ImageColorAllocate($base_image, 0, 0, 0);

 

             imagefill($base_image, 0, 0, $col[0]);

 

-            for($y=0; $y<$h; $y++) {

-                for($x=0; $x<$w; $x++) {

+            for ($y = 0; $y < $h; $y++) {

+                for ($x = 0; $x < $w; $x++) {

                     if ($frame[$y][$x] == '1') {

-                        ImageSetPixel($base_image,$x+$outerFrame,$y+$outerFrame,$col[1]); 

+                        ImageSetPixel($base_image, $x + $outerFrame, $y + $outerFrame, $col[1]); 

                     }

                 }

             }

             

-            $target_image =ImageCreate($imgW * $pixelPerPoint, $imgH * $pixelPerPoint);

+            $target_image = ImageCreate($imgW * $pixelPerPoint, $imgH * $pixelPerPoint);

             ImageCopyResized($target_image, $base_image, 0, 0, 0, 0, $imgW * $pixelPerPoint, $imgH * $pixelPerPoint, $imgW, $imgH);

             ImageDestroy($base_image);

             

Braces +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
                     ImagePng($image, $filename);

                     header("Content-type: image/png");

                     ImagePng($image);

-                }else{

+                } else{

                     ImagePng($image, $filename);

                 }

             }

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
     class QRimage {

     

         //----------------------------------------------------------------------

-        public static function png($frame, $filename = false, $pixelPerPoint = 4, $outerFrame = 4,$saveandprint=FALSE) 

+        public static function png($frame, $filename = false, $pixelPerPoint = 4, $outerFrame = 4,$saveandprint=false) 

         {

             $image = self::image($frame, $pixelPerPoint, $outerFrame);

             

@@ -35,7 +35,7 @@ 
                 Header("Content-type: image/png");

                 ImagePng($image);

             } else {

-                if($saveandprint===TRUE){

+                if($saveandprint===true){

                     ImagePng($image, $filename);

                     header("Content-type: image/png");

                     ImagePng($image);

lib/accept-to-gettext.php

Spacing +51 added lines, -53 removed lines

@@ -69,17 +69,17 @@ 
 
 /* not really important, this one; perhaps I could've put it inline with
  * the rest. */
-function find_match($curlscore,$curcscore,$curgtlang,$langval,$charval,
+function find_match($curlscore, $curcscore, $curgtlang, $langval, $charval,
                     $gtlang)
 {
-  if($curlscore < $langval) {
-    $curlscore=$langval;
-    $curcscore=$charval;
-    $curgtlang=$gtlang;
+  if ($curlscore < $langval) {
+    $curlscore = $langval;
+    $curcscore = $charval;
+    $curgtlang = $gtlang;
   } else if ($curlscore == $langval) {
-    if($curcscore < $charval) {
-      $curcscore=$charval;
-      $curgtlang=$gtlang;
+    if ($curcscore < $charval) {
+      $curcscore = $charval;
+      $curgtlang = $gtlang;
     }
   }
   return array($curlscore, $curcscore, $curgtlang);
@@ -87,22 +87,20 @@ 
 
 function al2gt($gettextlangs, $mime) {
   /* default to "everything is acceptable", as RFC2616 specifies */
-  $acceptLang=(($_SERVER["HTTP_ACCEPT_LANGUAGE"] == '') ? '*' :
-      $_SERVER["HTTP_ACCEPT_LANGUAGE"]);
-  $acceptChar=(($_SERVER["HTTP_ACCEPT_CHARSET"] == '') ? '*' :
-      $_SERVER["HTTP_ACCEPT_CHARSET"]);
-  $alparts=@preg_split("/,/",$acceptLang);
-  $acparts=@preg_split("/,/",$acceptChar);
+  $acceptLang = (($_SERVER["HTTP_ACCEPT_LANGUAGE"] == '') ? '*' : $_SERVER["HTTP_ACCEPT_LANGUAGE"]);
+  $acceptChar = (($_SERVER["HTTP_ACCEPT_CHARSET"] == '') ? '*' : $_SERVER["HTTP_ACCEPT_CHARSET"]);
+  $alparts = @preg_split("/,/", $acceptLang);
+  $acparts = @preg_split("/,/", $acceptChar);
   
   /* Parse the contents of the Accept-Language header.*/
-  foreach($alparts as $part) {
-    $part=trim($part);
-    if(preg_match("/;/", $part)) {
-      $lang=@preg_split("/;/",$part);
-      $score=@preg_split("/=/",$lang[1]);
-      $alscores[$lang[0]]=$score[1];
+  foreach ($alparts as $part) {
+    $part = trim($part);
+    if (preg_match("/;/", $part)) {
+      $lang = @preg_split("/;/", $part);
+      $score = @preg_split("/=/", $lang[1]);
+      $alscores[$lang[0]] = $score[1];
     } else {
-      $alscores[$part]=1;
+      $alscores[$part] = 1;
     }
   }
 
@@ -116,20 +114,20 @@ 
    * Making it 2 for the time being, so that we
    * can distinguish between "not specified" and "specified as 1" later
    * on. */
-  $acscores["ISO-8859-1"]=2;
+  $acscores["ISO-8859-1"] = 2;
 
-  foreach($acparts as $part) {
-    $part=trim($part);
-    if(preg_match("/;/", $part)) {
-      $cs=@preg_split("/;/",$part);
-      $score=@preg_split("/=/",$cs[1]);
-      $acscores[strtoupper($cs[0])]=$score[1];
+  foreach ($acparts as $part) {
+    $part = trim($part);
+    if (preg_match("/;/", $part)) {
+      $cs = @preg_split("/;/", $part);
+      $score = @preg_split("/=/", $cs[1]);
+      $acscores[strtoupper($cs[0])] = $score[1];
     } else {
-      $acscores[strtoupper($part)]=1;
+      $acscores[strtoupper($part)] = 1;
     }
   }
-  if($acscores["ISO-8859-1"]==2) {
-    $acscores["ISO-8859-1"]=(isset($acscores["*"])?$acscores["*"]:1);
+  if ($acscores["ISO-8859-1"] == 2) {
+    $acscores["ISO-8859-1"] = (isset($acscores["*"]) ? $acscores["*"] : 1);
   }
 
   /* 
@@ -137,18 +135,18 @@ 
    * with the highest score, excluding the ones with a charset the user
    * did not include.
    */
-  $curlscore=0;
-  $curcscore=0;
-  $curgtlang=NULL;
-  foreach($gettextlangs as $gtlang) {
+  $curlscore = 0;
+  $curcscore = 0;
+  $curgtlang = NULL;
+  foreach ($gettextlangs as $gtlang) {
 
-    $tmp1=preg_replace("/\_/","-",$gtlang);
-    $tmp2=@preg_split("/\./",$tmp1);
-    $allang=strtolower($tmp2[0]);
-    $gtcs=strtoupper($tmp2[1]);
-    $noct=@preg_split("/-/",$allang);
+    $tmp1 = preg_replace("/\_/", "-", $gtlang);
+    $tmp2 = @preg_split("/\./", $tmp1);
+    $allang = strtolower($tmp2[0]);
+    $gtcs = strtoupper($tmp2[1]);
+    $noct = @preg_split("/-/", $allang);
 
-    $testvals=array(
+    $testvals = array(
          array(@$alscores[$allang], @$acscores[$gtcs]),
      array(@$alscores[$noct[0]], @$acscores[$gtcs]),
      array(@$alscores[$allang], @$acscores["*"]),
@@ -156,15 +154,15 @@ 
      array(@$alscores["*"], @$acscores[$gtcs]),
      array(@$alscores["*"], @$acscores["*"]));
 
-    $found=FALSE;
-    foreach($testvals as $tval) {
-      if(!$found && isset($tval[0]) && isset($tval[1])) {
-        $arr=find_match($curlscore, $curcscore, $curgtlang, $tval[0],
+    $found = FALSE;
+    foreach ($testvals as $tval) {
+      if (!$found && isset($tval[0]) && isset($tval[1])) {
+        $arr = find_match($curlscore, $curcscore, $curgtlang, $tval[0],
               $tval[1], $gtlang);
-        $curlscore=$arr[0];
-        $curcscore=$arr[1];
-        $curgtlang=$arr[2];
-    $found=TRUE;
+        $curlscore = $arr[0];
+        $curcscore = $arr[1];
+        $curgtlang = $arr[2];
+    $found = TRUE;
       }
     }
   }
@@ -172,10 +170,10 @@ 
   /* We must re-parse the gettext-string now, since we may have found it
    * through a "*" qualifier.*/
   
-  $gtparts=@preg_split("/\./",$curgtlang);
-  $tmp=strtolower($gtparts[0]);
-  $lang=preg_replace("/\_/", "-", $tmp);
-  $charset=$gtparts[1];
+  $gtparts = @preg_split("/\./", $curgtlang);
+  $tmp = strtolower($gtparts[0]);
+  $lang = preg_replace("/\_/", "-", $tmp);
+  $charset = $gtparts[1];
 
   header("Content-Language: $lang");
   header("Content-Type: $mime; charset=$charset");

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -139,7 +139,7 @@ 
    */
   $curlscore=0;
   $curcscore=0;
-  $curgtlang=NULL;
+  $curgtlang=null;
   foreach($gettextlangs as $gtlang) {
 
     $tmp1=preg_replace("/\_/","-",$gtlang);
@@ -156,7 +156,7 @@ 
      array(@$alscores["*"], @$acscores[$gtcs]),
      array(@$alscores["*"], @$acscores["*"]));
 
-    $found=FALSE;
+    $found=false;
     foreach($testvals as $tval) {
       if(!$found && isset($tval[0]) && isset($tval[1])) {
         $arr=find_match($curlscore, $curcscore, $curgtlang, $tval[0],
@@ -164,7 +164,7 @@ 
         $curlscore=$arr[0];
         $curcscore=$arr[1];
         $curgtlang=$arr[2];
-    $found=TRUE;
+    $found=true;
       }
     }
   }

Indentation +52 added lines, -52 removed lines

@@ -72,43 +72,43 @@ 
 function find_match($curlscore,$curcscore,$curgtlang,$langval,$charval,
                     $gtlang)
 {
-  if($curlscore < $langval) {
+    if($curlscore < $langval) {
     $curlscore=$langval;
     $curcscore=$charval;
     $curgtlang=$gtlang;
-  } else if ($curlscore == $langval) {
+    } else if ($curlscore == $langval) {
     if($curcscore < $charval) {
-      $curcscore=$charval;
-      $curgtlang=$gtlang;
+        $curcscore=$charval;
+        $curgtlang=$gtlang;
     }
-  }
-  return array($curlscore, $curcscore, $curgtlang);
+    }
+    return array($curlscore, $curcscore, $curgtlang);
 }
 
 function al2gt($gettextlangs, $mime) {
-  /* default to "everything is acceptable", as RFC2616 specifies */
-  $acceptLang=(($_SERVER["HTTP_ACCEPT_LANGUAGE"] == '') ? '*' :
+    /* default to "everything is acceptable", as RFC2616 specifies */
+    $acceptLang=(($_SERVER["HTTP_ACCEPT_LANGUAGE"] == '') ? '*' :
       $_SERVER["HTTP_ACCEPT_LANGUAGE"]);
-  $acceptChar=(($_SERVER["HTTP_ACCEPT_CHARSET"] == '') ? '*' :
+    $acceptChar=(($_SERVER["HTTP_ACCEPT_CHARSET"] == '') ? '*' :
       $_SERVER["HTTP_ACCEPT_CHARSET"]);
-  $alparts=@preg_split("/,/",$acceptLang);
-  $acparts=@preg_split("/,/",$acceptChar);
+    $alparts=@preg_split("/,/",$acceptLang);
+    $acparts=@preg_split("/,/",$acceptChar);
   
-  /* Parse the contents of the Accept-Language header.*/
-  foreach($alparts as $part) {
+    /* Parse the contents of the Accept-Language header.*/
+    foreach($alparts as $part) {
     $part=trim($part);
     if(preg_match("/;/", $part)) {
-      $lang=@preg_split("/;/",$part);
-      $score=@preg_split("/=/",$lang[1]);
-      $alscores[$lang[0]]=$score[1];
+        $lang=@preg_split("/;/",$part);
+        $score=@preg_split("/=/",$lang[1]);
+        $alscores[$lang[0]]=$score[1];
     } else {
-      $alscores[$part]=1;
+        $alscores[$part]=1;
+    }
     }
-  }
 
-  /* Do the same for the Accept-Charset header. */
+    /* Do the same for the Accept-Charset header. */
 
-  /* RFC2616: ``If no "*" is present in an Accept-Charset field, then
+    /* RFC2616: ``If no "*" is present in an Accept-Charset field, then
    * all character sets not explicitly mentioned get a quality value of
    * 0, except for ISO-8859-1, which gets a quality value of 1 if not
    * explicitly mentioned.''
@@ -116,31 +116,31 @@ 
    * Making it 2 for the time being, so that we
    * can distinguish between "not specified" and "specified as 1" later
    * on. */
-  $acscores["ISO-8859-1"]=2;
+    $acscores["ISO-8859-1"]=2;
 
-  foreach($acparts as $part) {
+    foreach($acparts as $part) {
     $part=trim($part);
     if(preg_match("/;/", $part)) {
-      $cs=@preg_split("/;/",$part);
-      $score=@preg_split("/=/",$cs[1]);
-      $acscores[strtoupper($cs[0])]=$score[1];
+        $cs=@preg_split("/;/",$part);
+        $score=@preg_split("/=/",$cs[1]);
+        $acscores[strtoupper($cs[0])]=$score[1];
     } else {
-      $acscores[strtoupper($part)]=1;
+        $acscores[strtoupper($part)]=1;
+    }
     }
-  }
-  if($acscores["ISO-8859-1"]==2) {
+    if($acscores["ISO-8859-1"]==2) {
     $acscores["ISO-8859-1"]=(isset($acscores["*"])?$acscores["*"]:1);
-  }
+    }
 
-  /* 
+    /* 
    * Loop through the available languages/encodings, and pick the one
    * with the highest score, excluding the ones with a charset the user
    * did not include.
    */
-  $curlscore=0;
-  $curcscore=0;
-  $curgtlang=NULL;
-  foreach($gettextlangs as $gtlang) {
+    $curlscore=0;
+    $curcscore=0;
+    $curgtlang=NULL;
+    foreach($gettextlangs as $gtlang) {
 
     $tmp1=preg_replace("/\_/","-",$gtlang);
     $tmp2=@preg_split("/\./",$tmp1);
@@ -149,38 +149,38 @@ 
     $noct=@preg_split("/-/",$allang);
 
     $testvals=array(
-         array(@$alscores[$allang], @$acscores[$gtcs]),
-     array(@$alscores[$noct[0]], @$acscores[$gtcs]),
-     array(@$alscores[$allang], @$acscores["*"]),
-     array(@$alscores[$noct[0]], @$acscores["*"]),
-     array(@$alscores["*"], @$acscores[$gtcs]),
-     array(@$alscores["*"], @$acscores["*"]));
+            array(@$alscores[$allang], @$acscores[$gtcs]),
+        array(@$alscores[$noct[0]], @$acscores[$gtcs]),
+        array(@$alscores[$allang], @$acscores["*"]),
+        array(@$alscores[$noct[0]], @$acscores["*"]),
+        array(@$alscores["*"], @$acscores[$gtcs]),
+        array(@$alscores["*"], @$acscores["*"]));
 
     $found=FALSE;
     foreach($testvals as $tval) {
-      if(!$found && isset($tval[0]) && isset($tval[1])) {
+        if(!$found && isset($tval[0]) && isset($tval[1])) {
         $arr=find_match($curlscore, $curcscore, $curgtlang, $tval[0],
-              $tval[1], $gtlang);
+                $tval[1], $gtlang);
         $curlscore=$arr[0];
         $curcscore=$arr[1];
         $curgtlang=$arr[2];
     $found=TRUE;
-      }
+        }
+    }
     }
-  }
 
-  /* We must re-parse the gettext-string now, since we may have found it
+    /* We must re-parse the gettext-string now, since we may have found it
    * through a "*" qualifier.*/
   
-  $gtparts=@preg_split("/\./",$curgtlang);
-  $tmp=strtolower($gtparts[0]);
-  $lang=preg_replace("/\_/", "-", $tmp);
-  $charset=$gtparts[1];
+    $gtparts=@preg_split("/\./",$curgtlang);
+    $tmp=strtolower($gtparts[0]);
+    $lang=preg_replace("/\_/", "-", $tmp);
+    $charset=$gtparts[1];
 
-  header("Content-Language: $lang");
-  header("Content-Type: $mime; charset=$charset");
+    header("Content-Language: $lang");
+    header("Content-Type: $mime; charset=$charset");
 
-  return $curgtlang;
+    return $curgtlang;
 }
 
 ?>

lib/gettext/gettext.inc

Spacing +10 added lines, -10 removed lines

@@ -35,7 +35,7 @@ 
 // LC_MESSAGES is not available if php-gettext is not loaded
 // while the other constants are already available from session extension.
 if (!defined('LC_MESSAGES')) {
-  define('LC_MESSAGES',	5);
+  define('LC_MESSAGES', 5);
 }
 
 require('streams.php');
@@ -77,7 +77,7 @@ 
     if (preg_match("/^(?P<lang>[a-z]{2,3})"              // language code
                    ."(?:_(?P<country>[A-Z]{2}))?"           // country code
                    ."(?:\.(?P<charset>[-A-Za-z0-9_]+))?"    // charset
-                   ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/",  // @ modifier
+                   ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/", // @ modifier
                    $locale, $matches)) {
 
       if (isset($matches["lang"])) $lang = $matches["lang"];
@@ -113,7 +113,7 @@ 
 /**
  * Utility function to get a StreamReader for the given text domain.
  */
-function _get_reader($domain=null, $category=5, $enable_cache=true) {
+function _get_reader($domain = null, $category = 5, $enable_cache = true) {
     global $text_domains, $default_domain, $LC_CATEGORIES;
     if (!isset($domain)) $domain = $default_domain;
     if (!isset($text_domains[$domain]->l10n)) {
@@ -121,12 +121,12 @@ 
         $locale = _setlocale(LC_MESSAGES, 0);
         $bound_path = isset($text_domains[$domain]->path) ?
           $text_domains[$domain]->path : './';
-        $subpath = $LC_CATEGORIES[$category] ."/$domain.mo";
+        $subpath = $LC_CATEGORIES[$category]."/$domain.mo";
 
         $locale_names = get_list_of_locales($locale);
         $input = null;
         foreach ($locale_names as $locale) {
-          $full_path = $bound_path . $locale . "/" . $subpath;
+          $full_path = $bound_path.$locale."/".$subpath;
           if (file_exists($full_path)) {
             $input = new FileReader($full_path);
             break;
@@ -154,7 +154,7 @@ 
 /**
  * Checks if the current locale is supported on this system.
  */
-function _check_locale_and_function($function=false) {
+function _check_locale_and_function($function = false) {
     global $EMULATEGETTEXT;
     if ($function and !function_exists($function))
         return false;
@@ -164,10 +164,10 @@ 
 /**
  * Get the codeset for the given domain.
  */
-function _get_codeset($domain=null) {
+function _get_codeset($domain = null) {
     global $text_domains, $default_domain, $LC_CATEGORIES;
     if (!isset($domain)) $domain = $default_domain;
-    return (isset($text_domains[$domain]->codeset))? $text_domains[$domain]->codeset : ini_get('mbstring.internal_encoding');
+    return (isset($text_domains[$domain]->codeset)) ? $text_domains[$domain]->codeset : ini_get('mbstring.internal_encoding');
 }
 
 /**
@@ -241,10 +241,10 @@ 
     global $text_domains;
     // ensure $path ends with a slash ('/' should work for both, but lets still play nice)
     if (substr(php_uname(), 0, 7) == "Windows") {
-      if ($path[strlen($path)-1] != '\\' and $path[strlen($path)-1] != '/')
+      if ($path[strlen($path) - 1] != '\\' and $path[strlen($path) - 1] != '/')
         $path .= '\\';
     } else {
-      if ($path[strlen($path)-1] != '/')
+      if ($path[strlen($path) - 1] != '/')
         $path .= '/';
     }
     if (!array_key_exists($domain, $text_domains)) {

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -69,10 +69,10 @@
    * sr_CS.UTF-8@latin, sr_CS@latin, sr@latin, sr_CS.UTF-8, sr_CS, sr.
    */
   $locale_names = array();
-  $lang = NULL;
-  $country = NULL;
-  $charset = NULL;
-  $modifier = NULL;
+  $lang = null;
+  $country = null;
+  $charset = null;
+  $modifier = null;
   if ($locale) {
     if (preg_match("/^(?P<lang>[a-z]{2,3})"              // language code
                    ."(?:_(?P<country>[A-Z]{2}))?"           // country code

Indentation +77 added lines, -77 removed lines

@@ -35,7 +35,7 @@ 
 // LC_MESSAGES is not available if php-gettext is not loaded
 // while the other constants are already available from session extension.
 if (!defined('LC_MESSAGES')) {
-  define('LC_MESSAGES',	5);
+    define('LC_MESSAGES',	5);
 }
 
 require('streams.php');
@@ -53,9 +53,9 @@ 
 
 /* Class to hold a single domain included in $text_domains. */
 class domain {
-  var $l10n;
-  var $path;
-  var $codeset;
+    var $l10n;
+    var $path;
+    var $codeset;
 }
 
 // Utility functions
@@ -64,50 +64,50 @@ 
  * Return a list of locales to try for any POSIX-style locale specification.
  */
 function get_list_of_locales($locale) {
-  /* Figure out all possible locale names and start with the most
+    /* Figure out all possible locale names and start with the most
    * specific ones.  I.e. for sr_CS.UTF-8@latin, look through all of
    * sr_CS.UTF-8@latin, sr_CS@latin, sr@latin, sr_CS.UTF-8, sr_CS, sr.
    */
-  $locale_names = array();
-  $lang = NULL;
-  $country = NULL;
-  $charset = NULL;
-  $modifier = NULL;
-  if ($locale) {
+    $locale_names = array();
+    $lang = NULL;
+    $country = NULL;
+    $charset = NULL;
+    $modifier = NULL;
+    if ($locale) {
     if (preg_match("/^(?P<lang>[a-z]{2,3})"              // language code
-                   ."(?:_(?P<country>[A-Z]{2}))?"           // country code
-                   ."(?:\.(?P<charset>[-A-Za-z0-9_]+))?"    // charset
-                   ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/",  // @ modifier
-                   $locale, $matches)) {
+                    ."(?:_(?P<country>[A-Z]{2}))?"           // country code
+                    ."(?:\.(?P<charset>[-A-Za-z0-9_]+))?"    // charset
+                    ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/",  // @ modifier
+                    $locale, $matches)) {
 
-      if (isset($matches["lang"])) $lang = $matches["lang"];
-      if (isset($matches["country"])) $country = $matches["country"];
-      if (isset($matches["charset"])) $charset = $matches["charset"];
-      if (isset($matches["modifier"])) $modifier = $matches["modifier"];
+        if (isset($matches["lang"])) $lang = $matches["lang"];
+        if (isset($matches["country"])) $country = $matches["country"];
+        if (isset($matches["charset"])) $charset = $matches["charset"];
+        if (isset($matches["modifier"])) $modifier = $matches["modifier"];
 
-      if ($modifier) {
+        if ($modifier) {
         if ($country) {
-          if ($charset)
+            if ($charset)
             array_push($locale_names, "${lang}_$country.$charset@$modifier");
-          array_push($locale_names, "${lang}_$country@$modifier");
+            array_push($locale_names, "${lang}_$country@$modifier");
         } elseif ($charset)
             array_push($locale_names, "${lang}.$charset@$modifier");
         array_push($locale_names, "$lang@$modifier");
-      }
-      if ($country) {
+        }
+        if ($country) {
         if ($charset)
-          array_push($locale_names, "${lang}_$country.$charset");
+            array_push($locale_names, "${lang}_$country.$charset");
         array_push($locale_names, "${lang}_$country");
-      } elseif ($charset)
-          array_push($locale_names, "${lang}.$charset");
-      array_push($locale_names, $lang);
+        } elseif ($charset)
+            array_push($locale_names, "${lang}.$charset");
+        array_push($locale_names, $lang);
     }
 
     // If the locale name doesn't match POSIX style, just include it as-is.
     if (!in_array($locale, $locale_names))
-      array_push($locale_names, $locale);
-  }
-  return $locale_names;
+        array_push($locale_names, $locale);
+    }
+    return $locale_names;
 }
 
 /**
@@ -126,19 +126,19 @@ 
         $locale_names = get_list_of_locales($locale);
         $input = null;
         foreach ($locale_names as $locale) {
-          $full_path = $bound_path . $locale . "/" . $subpath;
-          if (file_exists($full_path)) {
+            $full_path = $bound_path . $locale . "/" . $subpath;
+            if (file_exists($full_path)) {
             $input = new FileReader($full_path);
             break;
-          }
+            }
         }
 
         if (!array_key_exists($domain, $text_domains)) {
-          // Initialize an empty domain object.
-          $text_domains[$domain] = new domain();
+            // Initialize an empty domain object.
+            $text_domains[$domain] = new domain();
         }
         $text_domains[$domain]->l10n = new gettext_reader($input,
-                                                          $enable_cache);
+                                                            $enable_cache);
     }
     return $text_domains[$domain]->l10n;
 }
@@ -174,13 +174,13 @@ 
  * Convert the given string to the encoding set by bind_textdomain_codeset.
  */
 function _encode($text) {
-  $target_encoding = _get_codeset();
-  if (function_exists("mb_detect_encoding")) {
+    $target_encoding = _get_codeset();
+    if (function_exists("mb_detect_encoding")) {
     $source_encoding = mb_detect_encoding($text);
     if ($source_encoding != $target_encoding)
-      $text = mb_convert_encoding($text, $target_encoding, $source_encoding);
-  }
-  return $text;
+        $text = mb_convert_encoding($text, $target_encoding, $source_encoding);
+    }
+    return $text;
 }
 
 
@@ -190,9 +190,9 @@ 
  * Returns passed in $locale, or environment variable $LANG if $locale == ''.
  */
 function _get_default_locale($locale) {
-  if ($locale == '') // emulate variable support
+    if ($locale == '') // emulate variable support
     return getenv('LANG');
-  else
+    else
     return $locale;
 }
 
@@ -210,20 +210,20 @@ 
             return _setlocale($category, $CURRENTLOCALE);
     } else {
         if (function_exists('setlocale')) {
-          $ret = setlocale($category, $locale);
-          if (($locale == '' and !$ret) or // failed setting it by env
+            $ret = setlocale($category, $locale);
+            if (($locale == '' and !$ret) or // failed setting it by env
               ($locale != '' and $ret != $locale)) { // failed setting it
             // Failed setting it according to environment.
             $CURRENTLOCALE = _get_default_locale($locale);
             $EMULATEGETTEXT = 1;
-          } else {
+            } else {
             $CURRENTLOCALE = $ret;
             $EMULATEGETTEXT = 0;
-          }
+            }
         } else {
-          // No function setlocale(), emulate it all.
-          $CURRENTLOCALE = _get_default_locale($locale);
-          $EMULATEGETTEXT = 1;
+            // No function setlocale(), emulate it all.
+            $CURRENTLOCALE = _get_default_locale($locale);
+            $EMULATEGETTEXT = 1;
         }
         // Allow locale to be changed on the go for one translation domain.
         global $text_domains, $default_domain;
@@ -241,15 +241,15 @@ 
     global $text_domains;
     // ensure $path ends with a slash ('/' should work for both, but lets still play nice)
     if (substr(php_uname(), 0, 7) == "Windows") {
-      if ($path[strlen($path)-1] != '\\' and $path[strlen($path)-1] != '/')
+        if ($path[strlen($path)-1] != '\\' and $path[strlen($path)-1] != '/')
         $path .= '\\';
     } else {
-      if ($path[strlen($path)-1] != '/')
+        if ($path[strlen($path)-1] != '/')
         $path .= '/';
     }
     if (!array_key_exists($domain, $text_domains)) {
-      // Initialize an empty domain object.
-      $text_domains[$domain] = new domain();
+        // Initialize an empty domain object.
+        $text_domains[$domain] = new domain();
     }
     $text_domains[$domain]->path = $path;
 }
@@ -426,29 +426,29 @@ 
 }
 function T_dcngettext($domain, $singular, $plural, $number, $category) {
     if (_check_locale_and_function())
-      return dcngettext($domain, $singular, $plural, $number, $category);
+        return dcngettext($domain, $singular, $plural, $number, $category);
     else return _dcngettext($domain, $singular, $plural, $number, $category);
 }
 
 function T_pgettext($context, $msgid) {
-  if (_check_locale_and_function('pgettext'))
-      return pgettext($context, $msgid);
-  else
-      return _pgettext($context, $msgid);
+    if (_check_locale_and_function('pgettext'))
+        return pgettext($context, $msgid);
+    else
+        return _pgettext($context, $msgid);
 }
 
 function T_dpgettext($domain, $context, $msgid) {
-  if (_check_locale_and_function('dpgettext'))
-      return dpgettext($domain, $context, $msgid);
-  else
-      return _dpgettext($domain, $context, $msgid);
+    if (_check_locale_and_function('dpgettext'))
+        return dpgettext($domain, $context, $msgid);
+    else
+        return _dpgettext($domain, $context, $msgid);
 }
 
 function T_dcpgettext($domain, $context, $msgid, $category) {
-  if (_check_locale_and_function('dcpgettext'))
-      return dcpgettext($domain, $context, $msgid, $category);
-  else
-      return _dcpgettext($domain, $context, $msgid, $category);
+    if (_check_locale_and_function('dcpgettext'))
+        return dcpgettext($domain, $context, $msgid, $category);
+    else
+        return _dcpgettext($domain, $context, $msgid, $category);
 }
 
 function T_npgettext($context, $singular, $plural, $number) {
@@ -459,17 +459,17 @@ 
 }
 
 function T_dnpgettext($domain, $context, $singular, $plural, $number) {
-  if (_check_locale_and_function('dnpgettext'))
-      return dnpgettext($domain, $context, $singular, $plural, $number);
-  else
-      return _dnpgettext($domain, $context, $singular, $plural, $number);
+    if (_check_locale_and_function('dnpgettext'))
+        return dnpgettext($domain, $context, $singular, $plural, $number);
+    else
+        return _dnpgettext($domain, $context, $singular, $plural, $number);
 }
 
 function T_dcnpgettext($domain, $context, $singular, $plural,
-                       $number, $category) {
+                        $number, $category) {
     if (_check_locale_and_function('dcnpgettext'))
         return dcnpgettext($domain, $context, $singular,
-                           $plural, $number, $category);
+                            $plural, $number, $category);
     else
         return _dcnpgettext($domain, $context, $singular,
                             $plural, $number, $category);
@@ -526,9 +526,9 @@ 
         return _dcpgettext($domain, $context, $msgid, $category);
     }
     function dcnpgettext($domain, $context, $singular, $plural,
-                         $number, $category) {
-      return _dcnpgettext($domain, $context, $singular, $plural,
-                          $number, $category);
+                            $number, $category) {
+        return _dcnpgettext($domain, $context, $singular, $plural,
+                            $number, $category);
     }
 }
 

Braces +149 added lines, -95 removed lines

@@ -80,32 +80,45 @@ 
                    ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/",  // @ modifier
                    $locale, $matches)) {
 
-      if (isset($matches["lang"])) $lang = $matches["lang"];
-      if (isset($matches["country"])) $country = $matches["country"];
-      if (isset($matches["charset"])) $charset = $matches["charset"];
-      if (isset($matches["modifier"])) $modifier = $matches["modifier"];
+      if (isset($matches["lang"])) {
+          $lang = $matches["lang"];
+      }
+      if (isset($matches["country"])) {
+          $country = $matches["country"];
+      }
+      if (isset($matches["charset"])) {
+          $charset = $matches["charset"];
+      }
+      if (isset($matches["modifier"])) {
+          $modifier = $matches["modifier"];
+      }
 
       if ($modifier) {
         if ($country) {
-          if ($charset)
-            array_push($locale_names, "${lang}_$country.$charset@$modifier");
+          if ($charset) {
+                      array_push($locale_names, "${lang}_$country.$charset@$modifier");
+          }
           array_push($locale_names, "${lang}_$country@$modifier");
-        } elseif ($charset)
-            array_push($locale_names, "${lang}.$charset@$modifier");
+        } elseif ($charset) {
+                    array_push($locale_names, "${lang}.$charset@$modifier");
+        }
         array_push($locale_names, "$lang@$modifier");
       }
       if ($country) {
-        if ($charset)
-          array_push($locale_names, "${lang}_$country.$charset");
+        if ($charset) {
+                  array_push($locale_names, "${lang}_$country.$charset");
+        }
         array_push($locale_names, "${lang}_$country");
-      } elseif ($charset)
-          array_push($locale_names, "${lang}.$charset");
+      } elseif ($charset) {
+                array_push($locale_names, "${lang}.$charset");
+      }
       array_push($locale_names, $lang);
     }
 
     // If the locale name doesn't match POSIX style, just include it as-is.
-    if (!in_array($locale, $locale_names))
-      array_push($locale_names, $locale);
+    if (!in_array($locale, $locale_names)) {
+          array_push($locale_names, $locale);
+    }
   }
   return $locale_names;
 }
@@ -115,7 +128,9 @@ 
  */
 function _get_reader($domain=null, $category=5, $enable_cache=true) {
     global $text_domains, $default_domain, $LC_CATEGORIES;
-    if (!isset($domain)) $domain = $default_domain;
+    if (!isset($domain)) {
+        $domain = $default_domain;
+    }
     if (!isset($text_domains[$domain]->l10n)) {
         // get the current locale
         $locale = _setlocale(LC_MESSAGES, 0);
@@ -156,8 +171,9 @@ 
  */
 function _check_locale_and_function($function=false) {
     global $EMULATEGETTEXT;
-    if ($function and !function_exists($function))
-        return false;
+    if ($function and !function_exists($function)) {
+            return false;
+    }
     return !$EMULATEGETTEXT;
 }
 
@@ -166,7 +182,9 @@ 
  */
 function _get_codeset($domain=null) {
     global $text_domains, $default_domain, $LC_CATEGORIES;
-    if (!isset($domain)) $domain = $default_domain;
+    if (!isset($domain)) {
+        $domain = $default_domain;
+    }
     return (isset($text_domains[$domain]->codeset))? $text_domains[$domain]->codeset : ini_get('mbstring.internal_encoding');
 }
 
@@ -177,8 +195,9 @@ 
   $target_encoding = _get_codeset();
   if (function_exists("mb_detect_encoding")) {
     $source_encoding = mb_detect_encoding($text);
-    if ($source_encoding != $target_encoding)
-      $text = mb_convert_encoding($text, $target_encoding, $source_encoding);
+    if ($source_encoding != $target_encoding) {
+          $text = mb_convert_encoding($text, $target_encoding, $source_encoding);
+    }
   }
   return $text;
 }
@@ -190,11 +209,13 @@ 
  * Returns passed in $locale, or environment variable $LANG if $locale == ''.
  */
 function _get_default_locale($locale) {
-  if ($locale == '') // emulate variable support
+  if ($locale == '') {
+      // emulate variable support
     return getenv('LANG');
-  else
-    return $locale;
-}
+  } else {
+      return $locale;
+  }
+  }
 
 /**
  * Sets a requested locale, if needed emulates it.
@@ -202,12 +223,13 @@ 
 function _setlocale($category, $locale) {
     global $CURRENTLOCALE, $EMULATEGETTEXT;
     if ($locale === 0) { // use === to differentiate between string "0"
-        if ($CURRENTLOCALE != '')
-            return $CURRENTLOCALE;
-        else
-            // obey LANG variable, maybe extend to support all of LC_* vars
+        if ($CURRENTLOCALE != '') {
+                    return $CURRENTLOCALE;
+        } else {
+                    // obey LANG variable, maybe extend to support all of LC_* vars
             // even if we tried to read locale without setting it first
             return _setlocale($category, $CURRENTLOCALE);
+        }
     } else {
         if (function_exists('setlocale')) {
           $ret = setlocale($category, $locale);
@@ -241,11 +263,13 @@ 
     global $text_domains;
     // ensure $path ends with a slash ('/' should work for both, but lets still play nice)
     if (substr(php_uname(), 0, 7) == "Windows") {
-      if ($path[strlen($path)-1] != '\\' and $path[strlen($path)-1] != '/')
-        $path .= '\\';
+      if ($path[strlen($path)-1] != '\\' and $path[strlen($path)-1] != '/') {
+              $path .= '\\';
+      }
     } else {
-      if ($path[strlen($path)-1] != '/')
-        $path .= '/';
+      if ($path[strlen($path)-1] != '/') {
+              $path .= '/';
+      }
     }
     if (!array_key_exists($domain, $text_domains)) {
       // Initialize an empty domain object.
@@ -384,96 +408,126 @@ 
 }
 
 function T_bindtextdomain($domain, $path) {
-    if (_check_locale_and_function()) return bindtextdomain($domain, $path);
-    else return _bindtextdomain($domain, $path);
-}
+    if (_check_locale_and_function()) {
+        return bindtextdomain($domain, $path);
+    } else {
+        return _bindtextdomain($domain, $path);
+    }
+    }
 function T_bind_textdomain_codeset($domain, $codeset) {
     // bind_textdomain_codeset is available only in PHP 4.2.0+
-    if (_check_locale_and_function('bind_textdomain_codeset'))
-        return bind_textdomain_codeset($domain, $codeset);
-    else return _bind_textdomain_codeset($domain, $codeset);
-}
+    if (_check_locale_and_function('bind_textdomain_codeset')) {
+            return bind_textdomain_codeset($domain, $codeset);
+    } else {
+        return _bind_textdomain_codeset($domain, $codeset);
+    }
+    }
 function T_textdomain($domain) {
-    if (_check_locale_and_function()) return textdomain($domain);
-    else return _textdomain($domain);
-}
+    if (_check_locale_and_function()) {
+        return textdomain($domain);
+    } else {
+        return _textdomain($domain);
+    }
+    }
 function T_gettext($msgid) {
-    if (_check_locale_and_function()) return gettext($msgid);
-    else return _gettext($msgid);
-}
+    if (_check_locale_and_function()) {
+        return gettext($msgid);
+    } else {
+        return _gettext($msgid);
+    }
+    }
 function T_($msgid) {
-    if (_check_locale_and_function()) return _($msgid);
+    if (_check_locale_and_function()) {
+        return _($msgid);
+    }
     return __($msgid);
 }
 function T_ngettext($singular, $plural, $number) {
-    if (_check_locale_and_function())
-        return ngettext($singular, $plural, $number);
-    else return _ngettext($singular, $plural, $number);
-}
+    if (_check_locale_and_function()) {
+            return ngettext($singular, $plural, $number);
+    } else {
+        return _ngettext($singular, $plural, $number);
+    }
+    }
 function T_dgettext($domain, $msgid) {
-    if (_check_locale_and_function()) return dgettext($domain, $msgid);
-    else return _dgettext($domain, $msgid);
-}
+    if (_check_locale_and_function()) {
+        return dgettext($domain, $msgid);
+    } else {
+        return _dgettext($domain, $msgid);
+    }
+    }
 function T_dngettext($domain, $singular, $plural, $number) {
-    if (_check_locale_and_function())
-        return dngettext($domain, $singular, $plural, $number);
-    else return _dngettext($domain, $singular, $plural, $number);
-}
+    if (_check_locale_and_function()) {
+            return dngettext($domain, $singular, $plural, $number);
+    } else {
+        return _dngettext($domain, $singular, $plural, $number);
+    }
+    }
 function T_dcgettext($domain, $msgid, $category) {
-    if (_check_locale_and_function())
-        return dcgettext($domain, $msgid, $category);
-    else return _dcgettext($domain, $msgid, $category);
-}
+    if (_check_locale_and_function()) {
+            return dcgettext($domain, $msgid, $category);
+    } else {
+        return _dcgettext($domain, $msgid, $category);
+    }
+    }
 function T_dcngettext($domain, $singular, $plural, $number, $category) {
-    if (_check_locale_and_function())
-      return dcngettext($domain, $singular, $plural, $number, $category);
-    else return _dcngettext($domain, $singular, $plural, $number, $category);
-}
+    if (_check_locale_and_function()) {
+          return dcngettext($domain, $singular, $plural, $number, $category);
+    } else {
+        return _dcngettext($domain, $singular, $plural, $number, $category);
+    }
+    }
 
 function T_pgettext($context, $msgid) {
-  if (_check_locale_and_function('pgettext'))
-      return pgettext($context, $msgid);
-  else
-      return _pgettext($context, $msgid);
-}
+  if (_check_locale_and_function('pgettext')) {
+        return pgettext($context, $msgid);
+  } else {
+        return _pgettext($context, $msgid);
+  }
+  }
 
 function T_dpgettext($domain, $context, $msgid) {
-  if (_check_locale_and_function('dpgettext'))
-      return dpgettext($domain, $context, $msgid);
-  else
-      return _dpgettext($domain, $context, $msgid);
-}
+  if (_check_locale_and_function('dpgettext')) {
+        return dpgettext($domain, $context, $msgid);
+  } else {
+        return _dpgettext($domain, $context, $msgid);
+  }
+  }
 
 function T_dcpgettext($domain, $context, $msgid, $category) {
-  if (_check_locale_and_function('dcpgettext'))
-      return dcpgettext($domain, $context, $msgid, $category);
-  else
-      return _dcpgettext($domain, $context, $msgid, $category);
-}
+  if (_check_locale_and_function('dcpgettext')) {
+        return dcpgettext($domain, $context, $msgid, $category);
+  } else {
+        return _dcpgettext($domain, $context, $msgid, $category);
+  }
+  }
 
 function T_npgettext($context, $singular, $plural, $number) {
-    if (_check_locale_and_function('npgettext'))
-        return npgettext($context, $singular, $plural, $number);
-    else
-        return _npgettext($context, $singular, $plural, $number);
-}
+    if (_check_locale_and_function('npgettext')) {
+            return npgettext($context, $singular, $plural, $number);
+    } else {
+            return _npgettext($context, $singular, $plural, $number);
+    }
+    }
 
 function T_dnpgettext($domain, $context, $singular, $plural, $number) {
-  if (_check_locale_and_function('dnpgettext'))
-      return dnpgettext($domain, $context, $singular, $plural, $number);
-  else
-      return _dnpgettext($domain, $context, $singular, $plural, $number);
-}
+  if (_check_locale_and_function('dnpgettext')) {
+        return dnpgettext($domain, $context, $singular, $plural, $number);
+  } else {
+        return _dnpgettext($domain, $context, $singular, $plural, $number);
+  }
+  }
 
 function T_dcnpgettext($domain, $context, $singular, $plural,
                        $number, $category) {
-    if (_check_locale_and_function('dcnpgettext'))
-        return dcnpgettext($domain, $context, $singular,
+    if (_check_locale_and_function('dcnpgettext')) {
+            return dcnpgettext($domain, $context, $singular,
                            $plural, $number, $category);
-    else
-        return _dcnpgettext($domain, $context, $singular,
+    } else {
+            return _dcnpgettext($domain, $context, $singular,
                             $plural, $number, $category);
-}
+    }
+    }
 
 
 

lib/gettext/streams.php

Spacing +7 added lines, -7 removed lines

@@ -49,7 +49,7 @@ 
   var $_pos;
   var $_str;
 
-  function StringReader($str='') {
+  function StringReader($str = '') {
     $this->_str = $str;
     $this->_pos = 0;
   }
@@ -57,7 +57,7 @@ 
   function read($bytes) {
     $data = substr($this->_str, $this->_pos, $bytes);
     $this->_pos += $bytes;
-    if (strlen($this->_str)<$this->_pos)
+    if (strlen($this->_str) < $this->_pos)
       $this->_pos = strlen($this->_str);
 
     return $data;
@@ -65,7 +65,7 @@ 
 
   function seekto($pos) {
     $this->_pos = $pos;
-    if (strlen($this->_str)<$this->_pos)
+    if (strlen($this->_str) < $this->_pos)
       $this->_pos = strlen($this->_str);
     return $this->_pos;
   }
@@ -89,9 +89,9 @@ 
   function FileReader($filename) {
     if (file_exists($filename)) {
 
-      $this->_length=filesize($filename);
+      $this->_length = filesize($filename);
       $this->_pos = 0;
-      $this->_fd = fopen($filename,'rb');
+      $this->_fd = fopen($filename, 'rb');
       if (!$this->_fd) {
         $this->error = 3; // Cannot read file, probably permissions
         return false;
@@ -146,8 +146,8 @@ 
   function CachedFileReader($filename) {
     if (file_exists($filename)) {
 
-      $length=filesize($filename);
-      $fd = fopen($filename,'rb');
+      $length = filesize($filename);
+      $fd = fopen($filename, 'rb');
 
       if (!$fd) {
         $this->error = 3; // Cannot read file, probably permissions

Indentation +68 added lines, -68 removed lines

@@ -21,146 +21,146 @@
 */
 
 
-  // Simple class to wrap file streams, string streams, etc.
-  // seek is essential, and it should be byte stream
+    // Simple class to wrap file streams, string streams, etc.
+    // seek is essential, and it should be byte stream
 class StreamReader {
-  // should return a string [FIXME: perhaps return array of bytes?]
-  function read($bytes) {
+    // should return a string [FIXME: perhaps return array of bytes?]
+    function read($bytes) {
     return false;
-  }
+    }
 
-  // should return new position
-  function seekto($position) {
+    // should return new position
+    function seekto($position) {
     return false;
-  }
+    }
 
-  // returns current position
-  function currentpos() {
+    // returns current position
+    function currentpos() {
     return false;
-  }
+    }
 
-  // returns length of entire stream (limit for seekto()s)
-  function length() {
+    // returns length of entire stream (limit for seekto()s)
+    function length() {
     return false;
-  }
+    }
 };
 
 class StringReader {
-  var $_pos;
-  var $_str;
+    var $_pos;
+    var $_str;
 
-  function StringReader($str='') {
+    function StringReader($str='') {
     $this->_str = $str;
     $this->_pos = 0;
-  }
+    }
 
-  function read($bytes) {
+    function read($bytes) {
     $data = substr($this->_str, $this->_pos, $bytes);
     $this->_pos += $bytes;
     if (strlen($this->_str)<$this->_pos)
-      $this->_pos = strlen($this->_str);
+        $this->_pos = strlen($this->_str);
 
     return $data;
-  }
+    }
 
-  function seekto($pos) {
+    function seekto($pos) {
     $this->_pos = $pos;
     if (strlen($this->_str)<$this->_pos)
-      $this->_pos = strlen($this->_str);
+        $this->_pos = strlen($this->_str);
     return $this->_pos;
-  }
+    }
 
-  function currentpos() {
+    function currentpos() {
     return $this->_pos;
-  }
+    }
 
-  function length() {
+    function length() {
     return strlen($this->_str);
-  }
+    }
 
 };
 
 
 class FileReader {
-  var $_pos;
-  var $_fd;
-  var $_length;
+    var $_pos;
+    var $_fd;
+    var $_length;
 
-  function FileReader($filename) {
+    function FileReader($filename) {
     if (file_exists($filename)) {
 
-      $this->_length=filesize($filename);
-      $this->_pos = 0;
-      $this->_fd = fopen($filename,'rb');
-      if (!$this->_fd) {
+        $this->_length=filesize($filename);
+        $this->_pos = 0;
+        $this->_fd = fopen($filename,'rb');
+        if (!$this->_fd) {
         $this->error = 3; // Cannot read file, probably permissions
         return false;
-      }
+        }
     } else {
-      $this->error = 2; // File doesn't exist
-      return false;
+        $this->error = 2; // File doesn't exist
+        return false;
+    }
     }
-  }
 
-  function read($bytes) {
+    function read($bytes) {
     if ($bytes) {
-      fseek($this->_fd, $this->_pos);
+        fseek($this->_fd, $this->_pos);
 
-      // PHP 5.1.1 does not read more than 8192 bytes in one fread()
-      // the discussions at PHP Bugs suggest it's the intended behaviour
-      $data = '';
-      while ($bytes > 0) {
+        // PHP 5.1.1 does not read more than 8192 bytes in one fread()
+        // the discussions at PHP Bugs suggest it's the intended behaviour
+        $data = '';
+        while ($bytes > 0) {
         $chunk  = fread($this->_fd, $bytes);
         $data  .= $chunk;
         $bytes -= strlen($chunk);
-      }
-      $this->_pos = ftell($this->_fd);
+        }
+        $this->_pos = ftell($this->_fd);
 
-      return $data;
+        return $data;
     } else return '';
-  }
+    }
 
-  function seekto($pos) {
+    function seekto($pos) {
     fseek($this->_fd, $pos);
     $this->_pos = ftell($this->_fd);
     return $this->_pos;
-  }
+    }
 
-  function currentpos() {
+    function currentpos() {
     return $this->_pos;
-  }
+    }
 
-  function length() {
+    function length() {
     return $this->_length;
-  }
+    }
 
-  function close() {
+    function close() {
     fclose($this->_fd);
-  }
+    }
 
 };
 
 // Preloads entire file in memory first, then creates a StringReader
 // over it (it assumes knowledge of StringReader internals)
 class CachedFileReader extends StringReader {
-  function CachedFileReader($filename) {
+    function CachedFileReader($filename) {
     if (file_exists($filename)) {
 
-      $length=filesize($filename);
-      $fd = fopen($filename,'rb');
+        $length=filesize($filename);
+        $fd = fopen($filename,'rb');
 
-      if (!$fd) {
+        if (!$fd) {
         $this->error = 3; // Cannot read file, probably permissions
         return false;
-      }
-      $this->_str = fread($fd, $length);
-      fclose($fd);
+        }
+        $this->_str = fread($fd, $length);
+        fclose($fd);
 
     } else {
-      $this->error = 2; // File doesn't exist
-      return false;
+        $this->error = 2; // File doesn't exist
+        return false;
+    }
     }
-  }
 };
 
 

Braces +9 added lines, -5 removed lines

@@ -57,16 +57,18 @@ 
   function read($bytes) {
     $data = substr($this->_str, $this->_pos, $bytes);
     $this->_pos += $bytes;
-    if (strlen($this->_str)<$this->_pos)
-      $this->_pos = strlen($this->_str);
+    if (strlen($this->_str)<$this->_pos) {
+          $this->_pos = strlen($this->_str);
+    }
 
     return $data;
   }
 
   function seekto($pos) {
     $this->_pos = $pos;
-    if (strlen($this->_str)<$this->_pos)
-      $this->_pos = strlen($this->_str);
+    if (strlen($this->_str)<$this->_pos) {
+          $this->_pos = strlen($this->_str);
+    }
     return $this->_pos;
   }
 
@@ -117,7 +119,9 @@ 
       $this->_pos = ftell($this->_fd);
 
       return $data;
-    } else return '';
+    } else {
+        return '';
+    }
   }
 
   function seekto($pos) {

lib/gettext/gettext.php

Spacing +27 added lines, -27 removed lines

@@ -38,17 +38,17 @@ 
    var $error = 0; // public variable that holds error code (0 if no error)
 
    //private:
-  var $BYTEORDER = 0;        // 0: low endian, 1: big endian
+  var $BYTEORDER = 0; // 0: low endian, 1: big endian
   var $STREAM = NULL;
   var $short_circuit = false;
   var $enable_cache = false;
-  var $originals = NULL;      // offset of original table
-  var $translations = NULL;    // offset of translation table
-  var $pluralheader = NULL;    // cache header field for plural forms
-  var $total = 0;          // total string count
-  var $table_originals = NULL;  // table for original strings (offsets)
-  var $table_translations = NULL;  // table for translated strings (offsets)
-  var $cache_translations = NULL;  // original -> translation mapping
+  var $originals = NULL; // offset of original table
+  var $translations = NULL; // offset of translation table
+  var $pluralheader = NULL; // cache header field for plural forms
+  var $total = 0; // total string count
+  var $table_originals = NULL; // table for original strings (offsets)
+  var $table_translations = NULL; // table for translated strings (offsets)
+  var $cache_translations = NULL; // original -> translation mapping
 
 
   /* Methods */
@@ -63,11 +63,11 @@ 
   function readint() {
       if ($this->BYTEORDER == 0) {
         // low endian
-        $input=unpack('V', $this->STREAM->read(4));
+        $input = unpack('V', $this->STREAM->read(4));
         return array_shift($input);
       } else {
         // big endian
-        $input=unpack('N', $this->STREAM->read(4));
+        $input = unpack('N', $this->STREAM->read(4));
         return array_shift($input);
       }
     }
@@ -100,7 +100,7 @@ 
    */
   function __construct($Reader, $enable_cache = true) {
     // If there isn't a StreamReader, turn on short circuit mode.
-    if (! $Reader || isset($Reader->error) ) {
+    if (!$Reader || isset($Reader->error)) {
       $this->short_circuit = true;
       return;
     }
@@ -154,7 +154,7 @@ 
     }
 
     if ($this->enable_cache) {
-      $this->cache_translations = array ();
+      $this->cache_translations = array();
       /* read all strings in the cache */
       for ($i = 0; $i < $this->total; $i++) {
         $this->STREAM->seekto($this->table_originals[$i * 2 + 2]);
@@ -176,11 +176,11 @@ 
   function get_original_string($num) {
     $length = $this->table_originals[$num * 2 + 1];
     $offset = $this->table_originals[$num * 2 + 2];
-    if (! $length)
+    if (!$length)
       return '';
     $this->STREAM->seekto($offset);
     $data = $this->STREAM->read($length);
-    return (string)$data;
+    return (string) $data;
   }
 
   /**
@@ -193,11 +193,11 @@ 
   function get_translation_string($num) {
     $length = $this->table_translations[$num * 2 + 1];
     $offset = $this->table_translations[$num * 2 + 2];
-    if (! $length)
+    if (!$length)
       return '';
     $this->STREAM->seekto($offset);
     $data = $this->STREAM->read($length);
-    return (string)$data;
+    return (string) $data;
   }
 
   /**
@@ -227,7 +227,7 @@ 
       return $this->find_string($string, $end, $start);
     } else {
       // Divide table in two parts
-      $half = (int)(($start + $end) / 2);
+      $half = (int) (($start + $end) / 2);
       $cmp = strcmp($string, $this->get_original_string($half));
       if ($cmp == 0)
         // string is exactly in the middle => return it
@@ -294,7 +294,7 @@ 
         $res .= ') : (';
         break;
       case ';':
-        $res .= str_repeat( ')', $p) . ';';
+        $res .= str_repeat(')', $p).';';
         $p = 0;
         break;
       default:
@@ -330,7 +330,7 @@ 
     $this->load_tables();
 
     // cache header field for plural forms
-    if (! is_string($this->pluralheader)) {
+    if (!is_string($this->pluralheader)) {
       if ($this->enable_cache) {
         $header = $this->cache_translations[""];
       } else {
@@ -352,12 +352,12 @@ 
   function select_string($n) {
     if (!is_int($n)) {
       throw new InvalidArgumentException(
-        "Select_string only accepts integers: " . $n);
+        "Select_string only accepts integers: ".$n);
     }
     $string = $this->get_plural_forms();
-    $string = str_replace('nplurals',"\$total",$string);
-    $string = str_replace("n",$n,$string);
-    $string = str_replace('plural',"\$plural",$string);
+    $string = str_replace('nplurals', "\$total", $string);
+    $string = str_replace("n", $n, $string);
+    $string = str_replace('plural', "\$plural", $string);
 
     $total = 0;
     $plural = 0;
@@ -388,11 +388,11 @@ 
     $select = $this->select_string($number);
 
     // this should contains all strings separated by NULLs
-    $key = $single . chr(0) . $plural;
+    $key = $single.chr(0).$plural;
 
 
     if ($this->enable_cache) {
-      if (! array_key_exists($key, $this->cache_translations)) {
+      if (!array_key_exists($key, $this->cache_translations)) {
         return ($number != 1) ? $plural : $single;
       } else {
         $result = $this->cache_translations[$key];
@@ -412,7 +412,7 @@ 
   }
 
   function pgettext($context, $msgid) {
-    $key = $context . chr(4) . $msgid;
+    $key = $context.chr(4).$msgid;
     $ret = $this->translate($key);
     if (strpos($ret, "\004") !== FALSE) {
       return $msgid;
@@ -422,7 +422,7 @@ 
   }
 
   function npgettext($context, $singular, $plural, $number) {
-    $key = $context . chr(4) . $singular;
+    $key = $context.chr(4).$singular;
     $ret = $this->ngettext($key, $plural, $number);
     if (strpos($ret, "\004") !== FALSE) {
       return $singular;

Upper-Lower-Casing +9 added lines, -9 removed lines

@@ -39,16 +39,16 @@ 
 
    //private:
   var $BYTEORDER = 0;        // 0: low endian, 1: big endian
-  var $STREAM = NULL;
+  var $STREAM = null;
   var $short_circuit = false;
   var $enable_cache = false;
-  var $originals = NULL;      // offset of original table
-  var $translations = NULL;    // offset of translation table
-  var $pluralheader = NULL;    // cache header field for plural forms
+  var $originals = null;      // offset of original table
+  var $translations = null;    // offset of translation table
+  var $pluralheader = null;    // cache header field for plural forms
   var $total = 0;          // total string count
-  var $table_originals = NULL;  // table for original strings (offsets)
-  var $table_translations = NULL;  // table for translated strings (offsets)
-  var $cache_translations = NULL;  // original -> translation mapping
+  var $table_originals = null;  // table for original strings (offsets)
+  var $table_translations = null;  // table for translated strings (offsets)
+  var $cache_translations = null;  // original -> translation mapping
 
 
   /* Methods */
@@ -414,7 +414,7 @@ 
   function pgettext($context, $msgid) {
     $key = $context . chr(4) . $msgid;
     $ret = $this->translate($key);
-    if (strpos($ret, "\004") !== FALSE) {
+    if (strpos($ret, "\004") !== false) {
       return $msgid;
     } else {
       return $ret;
@@ -424,7 +424,7 @@ 
   function npgettext($context, $singular, $plural, $number) {
     $key = $context . chr(4) . $singular;
     $ret = $this->ngettext($key, $plural, $number);
-    if (strpos($ret, "\004") !== FALSE) {
+    if (strpos($ret, "\004") !== false) {
       return $singular;
     } else {
       return $ret;

Indentation +225 added lines, -225 removed lines

@@ -34,75 +34,75 @@ 
  * that you don't want to keep in memory)
  */
 class gettext_reader {
-  //public:
-   var $error = 0; // public variable that holds error code (0 if no error)
-
-   //private:
-  var $BYTEORDER = 0;        // 0: low endian, 1: big endian
-  var $STREAM = NULL;
-  var $short_circuit = false;
-  var $enable_cache = false;
-  var $originals = NULL;      // offset of original table
-  var $translations = NULL;    // offset of translation table
-  var $pluralheader = NULL;    // cache header field for plural forms
-  var $total = 0;          // total string count
-  var $table_originals = NULL;  // table for original strings (offsets)
-  var $table_translations = NULL;  // table for translated strings (offsets)
-  var $cache_translations = NULL;  // original -> translation mapping
-
-
-  /* Methods */
-
-
-  /**
-   * Reads a 32bit Integer from the Stream
-   *
-   * @access private
-   * @return Integer from the Stream
-   */
-  function readint() {
-      if ($this->BYTEORDER == 0) {
+    //public:
+    var $error = 0; // public variable that holds error code (0 if no error)
+
+    //private:
+    var $BYTEORDER = 0;        // 0: low endian, 1: big endian
+    var $STREAM = NULL;
+    var $short_circuit = false;
+    var $enable_cache = false;
+    var $originals = NULL;      // offset of original table
+    var $translations = NULL;    // offset of translation table
+    var $pluralheader = NULL;    // cache header field for plural forms
+    var $total = 0;          // total string count
+    var $table_originals = NULL;  // table for original strings (offsets)
+    var $table_translations = NULL;  // table for translated strings (offsets)
+    var $cache_translations = NULL;  // original -> translation mapping
+
+
+    /* Methods */
+
+
+    /**
+     * Reads a 32bit Integer from the Stream
+     *
+     * @access private
+     * @return Integer from the Stream
+     */
+    function readint() {
+        if ($this->BYTEORDER == 0) {
         // low endian
         $input=unpack('V', $this->STREAM->read(4));
         return array_shift($input);
-      } else {
+        } else {
         // big endian
         $input=unpack('N', $this->STREAM->read(4));
         return array_shift($input);
-      }
+        }
     }
 
-  function read($bytes) {
+    function read($bytes) {
     return $this->STREAM->read($bytes);
-  }
-
-  /**
-   * Reads an array of Integers from the Stream
-   *
-   * @param int count How many elements should be read
-   * @return Array of Integers
-   */
-  function readintarray($count) {
+    }
+
+    /**
+     * Reads an array of Integers from the Stream
+     *
+     * @param int count How many elements should be read
+     * @return Array of Integers
+     */
+    function readintarray($count) {
     if ($this->BYTEORDER == 0) {
         // low endian
         return unpack('V'.$count, $this->STREAM->read(4 * $count));
-      } else {
+        } else {
         // big endian
         return unpack('N'.$count, $this->STREAM->read(4 * $count));
-      }
-  }
-
-  /**
-   * Constructor
-   *
-   * @param object Reader the StreamReader object
-   * @param boolean enable_cache Enable or disable caching of strings (default on)
-   */
-  function __construct($Reader, $enable_cache = true) {
+        }
+    }
+
+    /**
+     * Constructor
+     *
+     * @param object Reader the StreamReader object
+     * @param boolean enable_cache Enable or disable caching of strings (default on)
+     */
+    function __construct($Reader, $enable_cache = true) {
     // If there isn't a StreamReader, turn on short circuit mode.
     if (! $Reader || isset($Reader->error) ) {
-      $this->short_circuit = true;
-      return;
+        $this->short_circuit = true;
+        return;
     }
 
     // Caching can be turned off
@@ -114,12 +114,12 @@ 
     $this->STREAM = $Reader;
     $magic = $this->read(4);
     if ($magic == $MAGIC1) {
-      $this->BYTEORDER = 1;
+        $this->BYTEORDER = 1;
     } elseif ($magic == $MAGIC2) {
-      $this->BYTEORDER = 0;
+        $this->BYTEORDER = 0;
     } else {
-      $this->error = 1; // not MO file
-      return false;
+        $this->error = 1; // not MO file
+        return false;
     }
 
     // FIXME: Do we care about revision? We should.
@@ -128,154 +128,154 @@ 
     $this->total = $this->readint();
     $this->originals = $this->readint();
     $this->translations = $this->readint();
-  }
-
-  /**
-   * Loads the translation tables from the MO file into the cache
-   * If caching is enabled, also loads all strings into a cache
-   * to speed up translation lookups
-   *
-   * @access private
-   */
-  function load_tables() {
+    }
+
+    /**
+     * Loads the translation tables from the MO file into the cache
+     * If caching is enabled, also loads all strings into a cache
+     * to speed up translation lookups
+     *
+     * @access private
+     */
+    function load_tables() {
     if (is_array($this->cache_translations) &&
       is_array($this->table_originals) &&
       is_array($this->table_translations))
-      return;
+        return;
 
     /* get original and translations tables */
     if (!is_array($this->table_originals)) {
-      $this->STREAM->seekto($this->originals);
-      $this->table_originals = $this->readintarray($this->total * 2);
+        $this->STREAM->seekto($this->originals);
+        $this->table_originals = $this->readintarray($this->total * 2);
     }
     if (!is_array($this->table_translations)) {
-      $this->STREAM->seekto($this->translations);
-      $this->table_translations = $this->readintarray($this->total * 2);
+        $this->STREAM->seekto($this->translations);
+        $this->table_translations = $this->readintarray($this->total * 2);
     }
 
     if ($this->enable_cache) {
-      $this->cache_translations = array ();
-      /* read all strings in the cache */
-      for ($i = 0; $i < $this->total; $i++) {
+        $this->cache_translations = array ();
+        /* read all strings in the cache */
+        for ($i = 0; $i < $this->total; $i++) {
         $this->STREAM->seekto($this->table_originals[$i * 2 + 2]);
         $original = $this->STREAM->read($this->table_originals[$i * 2 + 1]);
         $this->STREAM->seekto($this->table_translations[$i * 2 + 2]);
         $translation = $this->STREAM->read($this->table_translations[$i * 2 + 1]);
         $this->cache_translations[$original] = $translation;
-      }
+        }
+    }
     }
-  }
-
-  /**
-   * Returns a string from the "originals" table
-   *
-   * @access private
-   * @param int num Offset number of original string
-   * @return string Requested string if found, otherwise ''
-   */
-  function get_original_string($num) {
+
+    /**
+     * Returns a string from the "originals" table
+     *
+     * @access private
+     * @param int num Offset number of original string
+     * @return string Requested string if found, otherwise ''
+     */
+    function get_original_string($num) {
     $length = $this->table_originals[$num * 2 + 1];
     $offset = $this->table_originals[$num * 2 + 2];
     if (! $length)
-      return '';
+        return '';
     $this->STREAM->seekto($offset);
     $data = $this->STREAM->read($length);
     return (string)$data;
-  }
-
-  /**
-   * Returns a string from the "translations" table
-   *
-   * @access private
-   * @param int num Offset number of original string
-   * @return string Requested string if found, otherwise ''
-   */
-  function get_translation_string($num) {
+    }
+
+    /**
+     * Returns a string from the "translations" table
+     *
+     * @access private
+     * @param int num Offset number of original string
+     * @return string Requested string if found, otherwise ''
+     */
+    function get_translation_string($num) {
     $length = $this->table_translations[$num * 2 + 1];
     $offset = $this->table_translations[$num * 2 + 2];
     if (! $length)
-      return '';
+        return '';
     $this->STREAM->seekto($offset);
     $data = $this->STREAM->read($length);
     return (string)$data;
-  }
-
-  /**
-   * Binary search for string
-   *
-   * @access private
-   * @param string string
-   * @param int start (internally used in recursive function)
-   * @param int end (internally used in recursive function)
-   * @return int string number (offset in originals table)
-   */
-  function find_string($string, $start = -1, $end = -1) {
+    }
+
+    /**
+     * Binary search for string
+     *
+     * @access private
+     * @param string string
+     * @param int start (internally used in recursive function)
+     * @param int end (internally used in recursive function)
+     * @return int string number (offset in originals table)
+     */
+    function find_string($string, $start = -1, $end = -1) {
     if (($start == -1) or ($end == -1)) {
-      // find_string is called with only one parameter, set start end end
-      $start = 0;
-      $end = $this->total;
+        // find_string is called with only one parameter, set start end end
+        $start = 0;
+        $end = $this->total;
     }
     if (abs($start - $end) <= 1) {
-      // We're done, now we either found the string, or it doesn't exist
-      $txt = $this->get_original_string($start);
-      if ($string == $txt)
+        // We're done, now we either found the string, or it doesn't exist
+        $txt = $this->get_original_string($start);
+        if ($string == $txt)
         return $start;
-      else
+        else
         return -1;
     } else if ($start > $end) {
-      // start > end -> turn around and start over
-      return $this->find_string($string, $end, $start);
+        // start > end -> turn around and start over
+        return $this->find_string($string, $end, $start);
     } else {
-      // Divide table in two parts
-      $half = (int)(($start + $end) / 2);
-      $cmp = strcmp($string, $this->get_original_string($half));
-      if ($cmp == 0)
+        // Divide table in two parts
+        $half = (int)(($start + $end) / 2);
+        $cmp = strcmp($string, $this->get_original_string($half));
+        if ($cmp == 0)
         // string is exactly in the middle => return it
         return $half;
-      else if ($cmp < 0)
+        else if ($cmp < 0)
         // The string is in the upper half
         return $this->find_string($string, $start, $half);
-      else
+        else
         // The string is in the lower half
         return $this->find_string($string, $half, $end);
     }
-  }
-
-  /**
-   * Translates a string
-   *
-   * @access public
-   * @param string string to be translated
-   * @return string translated string (or original, if not found)
-   */
-  function translate($string) {
+    }
+
+    /**
+     * Translates a string
+     *
+     * @access public
+     * @param string string to be translated
+     * @return string translated string (or original, if not found)
+     */
+    function translate($string) {
     if ($this->short_circuit)
-      return $string;
+        return $string;
     $this->load_tables();
 
     if ($this->enable_cache) {
-      // Caching enabled, get translated string from cache
-      if (array_key_exists($string, $this->cache_translations))
+        // Caching enabled, get translated string from cache
+        if (array_key_exists($string, $this->cache_translations))
         return $this->cache_translations[$string];
-      else
+        else
         return $string;
     } else {
-      // Caching not enabled, try to find string
-      $num = $this->find_string($string);
-      if ($num == -1)
+        // Caching not enabled, try to find string
+        $num = $this->find_string($string);
+        if ($num == -1)
         return $string;
-      else
+        else
         return $this->get_translation_string($num);
     }
-  }
-
-  /**
-   * Sanitize plural form expression for use in PHP eval call.
-   *
-   * @access private
-   * @return string sanitized plural form expression
-   */
-  function sanitize_plural_expression($expr) {
+    }
+
+    /**
+     * Sanitize plural form expression for use in PHP eval call.
+     *
+     * @access private
+     * @return string sanitized plural form expression
+     */
+    function sanitize_plural_expression($expr) {
     // Get rid of disallowed characters.
     $expr = preg_replace('@[^a-zA-Z0-9_:;\(\)\?\|\&=!<>+*/\%-]@', '', $expr);
 
@@ -284,74 +284,74 @@ 
     $res = '';
     $p = 0;
     for ($i = 0; $i < strlen($expr); $i++) {
-      $ch = $expr[$i];
-      switch ($ch) {
-      case '?':
+        $ch = $expr[$i];
+        switch ($ch) {
+        case '?':
         $res .= ' ? (';
         $p++;
         break;
-      case ':':
+        case ':':
         $res .= ') : (';
         break;
-      case ';':
+        case ';':
         $res .= str_repeat( ')', $p) . ';';
         $p = 0;
         break;
-      default:
+        default:
         $res .= $ch;
-      }
+        }
     }
     return $res;
-  }
-
-  /**
-   * Parse full PO header and extract only plural forms line.
-   *
-   * @access private
-   * @return string verbatim plural form header field
-   */
-  function extract_plural_forms_header_from_po_header($header) {
+    }
+
+    /**
+     * Parse full PO header and extract only plural forms line.
+     *
+     * @access private
+     * @return string verbatim plural form header field
+     */
+    function extract_plural_forms_header_from_po_header($header) {
     if (preg_match("/(^|\n)plural-forms: ([^\n]*)\n/i", $header, $regs))
-      $expr = $regs[2];
+        $expr = $regs[2];
     else
-      $expr = "nplurals=2; plural=n == 1 ? 0 : 1;";
+        $expr = "nplurals=2; plural=n == 1 ? 0 : 1;";
     return $expr;
-  }
-
-  /**
-   * Get possible plural forms from MO header
-   *
-   * @access private
-   * @return string plural form header
-   */
-  function get_plural_forms() {
+    }
+
+    /**
+     * Get possible plural forms from MO header
+     *
+     * @access private
+     * @return string plural form header
+     */
+    function get_plural_forms() {
     // lets assume message number 0 is header
     // this is true, right?
     $this->load_tables();
 
     // cache header field for plural forms
     if (! is_string($this->pluralheader)) {
-      if ($this->enable_cache) {
+        if ($this->enable_cache) {
         $header = $this->cache_translations[""];
-      } else {
+        } else {
         $header = $this->get_translation_string(0);
-      }
-      $expr = $this->extract_plural_forms_header_from_po_header($header);
-      $this->pluralheader = $this->sanitize_plural_expression($expr);
+        }
+        $expr = $this->extract_plural_forms_header_from_po_header($header);
+        $this->pluralheader = $this->sanitize_plural_expression($expr);
     }
     return $this->pluralheader;
-  }
-
-  /**
-   * Detects which plural form to take
-   *
-   * @access private
-   * @param n count
-   * @return int array index of the right plural form
-   */
-  function select_string($n) {
+    }
+
+    /**
+     * Detects which plural form to take
+     *
+     * @access private
+     * @param n count
+     * @return int array index of the right plural form
+     */
+    function select_string($n) {
     if (!is_int($n)) {
-      throw new InvalidArgumentException(
+        throw new InvalidArgumentException(
         "Select_string only accepts integers: " . $n);
     }
     $string = $this->get_plural_forms();
@@ -365,22 +365,22 @@ 
     eval("$string");
     if ($plural >= $total) $plural = $total - 1;
     return $plural;
-  }
-
-  /**
-   * Plural version of gettext
-   *
-   * @access public
-   * @param string single
-   * @param string plural
-   * @param string number
-   * @return translated plural form
-   */
-  function ngettext($single, $plural, $number) {
+    }
+
+    /**
+     * Plural version of gettext
+     *
+     * @access public
+     * @param string single
+     * @param string plural
+     * @param string number
+     * @return translated plural form
+     */
+    function ngettext($single, $plural, $number) {
     if ($this->short_circuit) {
-      if ($number != 1)
+        if ($number != 1)
         return $plural;
-      else
+        else
         return $single;
     }
 
@@ -392,45 +392,45 @@ 
 
 
     if ($this->enable_cache) {
-      if (! array_key_exists($key, $this->cache_translations)) {
+        if (! array_key_exists($key, $this->cache_translations)) {
         return ($number != 1) ? $plural : $single;
-      } else {
+        } else {
         $result = $this->cache_translations[$key];
         $list = explode(chr(0), $result);
         return $list[$select];
-      }
+        }
     } else {
-      $num = $this->find_string($key);
-      if ($num == -1) {
+        $num = $this->find_string($key);
+        if ($num == -1) {
         return ($number != 1) ? $plural : $single;
-      } else {
+        } else {
         $result = $this->get_translation_string($num);
         $list = explode(chr(0), $result);
         return $list[$select];
-      }
+        }
+    }
     }
-  }
 
-  function pgettext($context, $msgid) {
+    function pgettext($context, $msgid) {
     $key = $context . chr(4) . $msgid;
     $ret = $this->translate($key);
     if (strpos($ret, "\004") !== FALSE) {
-      return $msgid;
+        return $msgid;
     } else {
-      return $ret;
+        return $ret;
+    }
     }
-  }
 
-  function npgettext($context, $singular, $plural, $number) {
+    function npgettext($context, $singular, $plural, $number) {
     $key = $context . chr(4) . $singular;
     $ret = $this->ngettext($key, $plural, $number);
     if (strpos($ret, "\004") !== FALSE) {
-      return $singular;
+        return $singular;
     } else {
-      return $ret;
+        return $ret;
     }
 
-  }
+    }
 }
 
 ?>

Braces +47 added lines, -35 removed lines

@@ -140,8 +140,9 @@ 
   function load_tables() {
     if (is_array($this->cache_translations) &&
       is_array($this->table_originals) &&
-      is_array($this->table_translations))
-      return;
+      is_array($this->table_translations)) {
+          return;
+    }
 
     /* get original and translations tables */
     if (!is_array($this->table_originals)) {
@@ -176,8 +177,9 @@ 
   function get_original_string($num) {
     $length = $this->table_originals[$num * 2 + 1];
     $offset = $this->table_originals[$num * 2 + 2];
-    if (! $length)
-      return '';
+    if (! $length) {
+          return '';
+    }
     $this->STREAM->seekto($offset);
     $data = $this->STREAM->read($length);
     return (string)$data;
@@ -193,8 +195,9 @@ 
   function get_translation_string($num) {
     $length = $this->table_translations[$num * 2 + 1];
     $offset = $this->table_translations[$num * 2 + 2];
-    if (! $length)
-      return '';
+    if (! $length) {
+          return '';
+    }
     $this->STREAM->seekto($offset);
     $data = $this->STREAM->read($length);
     return (string)$data;
@@ -218,10 +221,11 @@ 
     if (abs($start - $end) <= 1) {
       // We're done, now we either found the string, or it doesn't exist
       $txt = $this->get_original_string($start);
-      if ($string == $txt)
-        return $start;
-      else
-        return -1;
+      if ($string == $txt) {
+              return $start;
+      } else {
+              return -1;
+      }
     } else if ($start > $end) {
       // start > end -> turn around and start over
       return $this->find_string($string, $end, $start);
@@ -229,15 +233,16 @@ 
       // Divide table in two parts
       $half = (int)(($start + $end) / 2);
       $cmp = strcmp($string, $this->get_original_string($half));
-      if ($cmp == 0)
-        // string is exactly in the middle => return it
+      if ($cmp == 0) {
+              // string is exactly in the middle => return it
         return $half;
-      else if ($cmp < 0)
-        // The string is in the upper half
+      } else if ($cmp < 0) {
+              // The string is in the upper half
         return $this->find_string($string, $start, $half);
-      else
-        // The string is in the lower half
+      } else {
+              // The string is in the lower half
         return $this->find_string($string, $half, $end);
+      }
     }
   }
 
@@ -249,23 +254,26 @@ 
    * @return string translated string (or original, if not found)
    */
   function translate($string) {
-    if ($this->short_circuit)
-      return $string;
+    if ($this->short_circuit) {
+          return $string;
+    }
     $this->load_tables();
 
     if ($this->enable_cache) {
       // Caching enabled, get translated string from cache
-      if (array_key_exists($string, $this->cache_translations))
-        return $this->cache_translations[$string];
-      else
-        return $string;
+      if (array_key_exists($string, $this->cache_translations)) {
+              return $this->cache_translations[$string];
+      } else {
+              return $string;
+      }
     } else {
       // Caching not enabled, try to find string
       $num = $this->find_string($string);
-      if ($num == -1)
-        return $string;
-      else
-        return $this->get_translation_string($num);
+      if ($num == -1) {
+              return $string;
+      } else {
+              return $this->get_translation_string($num);
+      }
     }
   }
 
@@ -311,10 +319,11 @@ 
    * @return string verbatim plural form header field
    */
   function extract_plural_forms_header_from_po_header($header) {
-    if (preg_match("/(^|\n)plural-forms: ([^\n]*)\n/i", $header, $regs))
-      $expr = $regs[2];
-    else
-      $expr = "nplurals=2; plural=n == 1 ? 0 : 1;";
+    if (preg_match("/(^|\n)plural-forms: ([^\n]*)\n/i", $header, $regs)) {
+          $expr = $regs[2];
+    } else {
+          $expr = "nplurals=2; plural=n == 1 ? 0 : 1;";
+    }
     return $expr;
   }
 
@@ -363,7 +372,9 @@ 
     $plural = 0;
 
     eval("$string");
-    if ($plural >= $total) $plural = $total - 1;
+    if ($plural >= $total) {
+        $plural = $total - 1;
+    }
     return $plural;
   }
 
@@ -378,10 +389,11 @@ 
    */
   function ngettext($single, $plural, $number) {
     if ($this->short_circuit) {
-      if ($number != 1)
-        return $plural;
-      else
-        return $single;
+      if ($number != 1) {
+              return $plural;
+      } else {
+              return $single;
+      }
     }
 
     // find out the appropriate form