Merge pull request #57 in ZP/z-push from...

Merge pull request #57 in ZP/z-push from bugfix/ZP-704-z-push-top-screen-size-calculation-fails-under-OS-X to develop

* commit '27454aad':
  ZP-704 Fixed white space.
  ZP-704 z-push-top screen-size calculation fails under OS X. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit ba460f57)

src/z-push-top.php

@@ -671,7 +671,7 @@ class ZPushTop {
     /**
      * Pads and trims string
      *
-     * @param string    $string     to be trimmed/padded
+     * @param string    $str        to be trimmed/padded
      * @param int       $size       characters to be considered
      * @param boolean   $cutmiddle  (optional) indicates where to long information should
      *                              be trimmed of, false means at the end
@@ -698,8 +698,9 @@ class ZPushTop {
      * @return array        'width' and 'height' as keys
      */
     private function scrGetSize() {
-        preg_match_all("/rows.([0-9]+);.columns.([0-9]+);/", strtolower(exec('stty -a | fgrep columns')), $output);
-        if(sizeof($output) == 3)
+		$tty = strtolower(exec('stty -a | fgrep columns'));
+        if (preg_match_all("/rows.([0-9]+);.columns.([0-9]+);/", $tty, $output) ||
+			preg_match_all("/([0-9]+).rows;.([0-9]+).columns;/", $tty, $output))
             return array('width' => $output[2][0], 'height' => $output[1][0]);
 
         return array('width' => 80, 'height' => 24);
@@ -771,4 +772,4 @@ class ZPushTop {
 
 }
 
-?>
+?>
\ No newline at end of file