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

Merge pull request #84 in ZP/z-push from bugfix/ZP-755-update-bugtracker-url-in-legal-information to develop

* commit 'f355fe0c':
  ZP-755 Update year.
  ZP-755 Update year.
  ZP-755 Updated URLs.

src/lib/core/zpush.php

@@ -6,7 +6,7 @@
 *
 * Created   :   12.04.2011
 *
-* Copyright 2007 - 2013 Zarafa Deutschland GmbH
+* Copyright 2007 - 2015 Zarafa Deutschland GmbH
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Affero General Public License, version 3,
@@ -636,7 +636,8 @@ class ZPush {
         More information about Z-Push can be found at:<br>
         <a href="http://z-push.org/">Z-Push homepage</a><br>
         <a href="http://z-push.org/download">Z-Push download page</a><br>
-        <a href="http://jira.zarafa.com/browse/ZP">Z-Push Bugtracker and Roadmap</a><br>
+        <a href="https://jira.z-hub.io/browse/ZP">Z-Push Bugtracker</a><br>
+        <a href="https://wiki.z-hub.io/display/ZP">Z-Push Wiki</a> and <a href="https://wiki.z-hub.io/display/ZP/Roadmap">Roadmap</a><br>
         <br>
         All modifications to this sourcecode must be published and returned to the community.<br>
         Please see <a href="http://www.gnu.org/licenses/agpl-3.0.html">AGPLv3 License</a> for details.<br>

src/z-push-top.php

@@ -9,7 +9,7 @@
 *
 * Created   :   07.09.2011
 *
-* Copyright 2007 - 2013 Zarafa Deutschland GmbH
+* Copyright 2007 - 2015 Zarafa Deutschland GmbH
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Affero General Public License, version 3,
@@ -719,9 +719,9 @@ class ZPushTop {
      * @return array        'width' and 'height' as keys
      */
     private function scrGetSize() {
-		$tty = strtolower(exec('stty -a | fgrep columns'));
+        $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))
+            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);