Merge pull request #102 in ZP/z-push from feature/ZP-785-cleanup-release-branch to release/2.2

* commit '598c1e3a':
  ZP-785 Fix mixed EOL.

src/lib/request/ping.php

@@ -181,7 +181,7 @@ class Ping extends RequestProcessor {
                     $pingstatus = SYNC_PINGSTATUS_FOLDERHIERSYNCREQUIRED;
                     self::$deviceManager->AnnounceProcessStatus(false, $pingstatus);
                     break;
-                case SyncCollections::OBSOLETE_CONNECTION:
+                case SyncCollections::OBSOLETE_CONNECTION:
                     $foundchanges = false;
                     break;
                 case SyncCollections::HIERARCHY_CHANGED:

src/lib/webservice/webservice.php

@@ -72,18 +72,18 @@ class Webservice {
             $this->server->setClass("WebserviceDevice");
         }
 
-        // the webservice command is handled by its class
-        if ($commandCode == ZPush::COMMAND_WEBSERVICE_USERS) {
+        // the webservice command is handled by its class
+        if ($commandCode == ZPush::COMMAND_WEBSERVICE_USERS) {
             if (!defined("ALLOW_WEBSERVICE_USERS_ACCESS") || ALLOW_WEBSERVICE_USERS_ACCESS !== true)
                 throw new HTTPReturnCodeException(sprintf("Access to the WebserviceUsers service is disabled in configuration. Enable setting ALLOW_WEBSERVICE_USERS_ACCESS.", Request::GetAuthUser()), 403);
 
             ZLog::Write(LOGLEVEL_DEBUG, sprintf("Webservice::HandleWebservice('%s'): executing WebserviceUsers service", $commandCode));
 
-            if(ZPush::GetBackend()->Setup("SYSTEM", true) == false)
+            if(ZPush::GetBackend()->Setup("SYSTEM", true) == false)
                 throw new AuthenticationRequiredException(sprintf("User '%s' has no admin privileges", Request::GetAuthUser()));
-
-            include_once('webserviceusers.php');
-            $this->server->setClass("WebserviceUsers");
+
+            include_once('webserviceusers.php');
+            $this->server->setClass("WebserviceUsers");
         }
 
         $this->server->handle();

src/lib/webservice/webserviceusers.php

@@ -45,15 +45,15 @@ include ('lib/utils/zpushadmin.php');
 
 class WebserviceUsers {
 
-    /**
-     * Returns a list of all known devices
-     *
-     * @access public
-     * @return array
-     */
-    public function ListDevices() {
-        return ZPushAdmin::ListDevices(false);
-    }
+    /**
+     * Returns a list of all known devices
+     *
+     * @access public
+     * @return array
+     */
+    public function ListDevices() {
+        return ZPushAdmin::ListDevices(false);
+    }
 
     /**
      * Returns a list of all known devices of the users
@@ -74,29 +74,29 @@ class WebserviceUsers {
         return $output;
     }
 
-    /**
-     * Returns a list of all known devices with users and when they synchronized for the first time
-     *
-     * @access public
-     * @return array
-     */
-    public function ListDevicesDetails() {
-        $devices = ZPushAdmin::ListDevices(false);
-        $output = array();
-
-        ZLog::Write(LOGLEVEL_INFO, sprintf("WebserviceUsers::ListLastSync(): found %d devices", count($devices)));
-        ZPush::GetTopCollector()->AnnounceInformation(sprintf("Retrieved details of %d devices and getting users", count($devices)), true);
+    /**
+     * Returns a list of all known devices with users and when they synchronized for the first time
+     *
+     * @access public
+     * @return array
+     */
+    public function ListDevicesDetails() {
+        $devices = ZPushAdmin::ListDevices(false);
+        $output = array();
+
+        ZLog::Write(LOGLEVEL_INFO, sprintf("WebserviceUsers::ListLastSync(): found %d devices", count($devices)));
+        ZPush::GetTopCollector()->AnnounceInformation(sprintf("Retrieved details of %d devices and getting users", count($devices)), true);
 
         foreach ($devices as $deviceId) {
-            $output[$deviceId] = array();
+            $output[$deviceId] = array();
             $users = ZPushAdmin::ListUsers($deviceId);
-            foreach ($users as $user) {
+            foreach ($users as $user) {
                 $output[$deviceId][$user] = ZPushAdmin::GetDeviceDetails($deviceId, $user);
             }
         }
-
-
-        return $output;
+
+
+        return $output;
     }
 }
 ?>
\ No newline at end of file

tools/dev/printwbxml.php

-<?php
-/***********************************************
- * File      :   printwbxml.php
- * Project   :   Z-Push
- * Descr     :   decodes and prints wbxml as base64 to stdout
- *
- * Created   :   18.05.2015
- *
- * Copyright 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,
- * as published by the Free Software Foundation with the following additional
- * term according to sec. 7:
- *
- * According to sec. 7 of the GNU Affero General Public License, version 3,
- * the terms of the AGPL are supplemented with the following terms:
- *
- * "Zarafa" is a registered trademark of Zarafa B.V.
- * "Z-Push" is a registered trademark of Zarafa Deutschland GmbH
- * The licensing of the Program under the AGPL does not imply a trademark license.
- * Therefore any rights, title and interest in our trademarks remain entirely with us.
- *
- * However, if you propagate an unmodified version of the Program you are
- * allowed to use the term "Z-Push" to indicate that you distribute the Program.
- * Furthermore you may use our trademarks where it is necessary to indicate
- * the intended purpose of a product or service provided you use it in accordance
- * with honest practices in industrial or commercial matters.
- * If you want to propagate modified versions of the Program under the name "Z-Push",
- * you may only do so if you have a written permission by Zarafa Deutschland GmbH
- * (to acquire a permission please contact Zarafa at trademark@zarafa.com).
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Consult LICENSE file for details
- ************************************************/
-
-if (count($argv) < 2) {
-    die("\tUsage: printwbmxl.php WBXML-INPUT-HERE\n\n");
-}
-$wbxml64 = $argv[1];
-
-// include the stuff we need
-include_once('../../src/lib/utils/stringstreamwrapper.php');
-include_once('../../src/lib/wbxml/wbxmldefs.php');
-include_once('../../src/lib/wbxml/wbxmldecoder.php');
-include_once('../../src/lib/wbxml/wbxmlencoder.php');
-
-// minimal definitions & log to stdout overwrite
-define('WBXML_DEBUG', true);
-define("LOGLEVEL_WBXML", "wbxml");
-define("LOGLEVEL_DEBUG", "debug");
-class ZLog {
-    static public function Write($level, $msg, $truncate = false) {
-        // we only care about the wbxml
-        if ($level == "wbxml") {
-            if (substr($msg,0,1) == "I") {
-                echo substr($msg,1) . "\n";
-            }
-            else {
-                echo $msg . "\n";
-            }
-        }
-    }
-}
-
-// setup
-$wxbml = StringStreamWrapper::Open($wbxml64);
-$base64filter = stream_filter_append($wxbml, 'convert.base64-decode');
-$decoder = new WBXMLDecoder($wxbml);
-if (! $decoder->IsWBXML()) {
-    die("input is not WBXML as base64\n\n");
-}
-
-echo "\n";
-// read everything and log it
-$decoder->readRemainingData();
-echo "\n";
+<?php
+/***********************************************
+ * File      :   printwbxml.php
+ * Project   :   Z-Push
+ * Descr     :   decodes and prints wbxml as base64 to stdout
+ *
+ * Created   :   18.05.2015
+ *
+ * Copyright 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,
+ * as published by the Free Software Foundation with the following additional
+ * term according to sec. 7:
+ *
+ * According to sec. 7 of the GNU Affero General Public License, version 3,
+ * the terms of the AGPL are supplemented with the following terms:
+ *
+ * "Zarafa" is a registered trademark of Zarafa B.V.
+ * "Z-Push" is a registered trademark of Zarafa Deutschland GmbH
+ * The licensing of the Program under the AGPL does not imply a trademark license.
+ * Therefore any rights, title and interest in our trademarks remain entirely with us.
+ *
+ * However, if you propagate an unmodified version of the Program you are
+ * allowed to use the term "Z-Push" to indicate that you distribute the Program.
+ * Furthermore you may use our trademarks where it is necessary to indicate
+ * the intended purpose of a product or service provided you use it in accordance
+ * with honest practices in industrial or commercial matters.
+ * If you want to propagate modified versions of the Program under the name "Z-Push",
+ * you may only do so if you have a written permission by Zarafa Deutschland GmbH
+ * (to acquire a permission please contact Zarafa at trademark@zarafa.com).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Consult LICENSE file for details
+ ************************************************/
+
+if (count($argv) < 2) {
+    die("\tUsage: printwbmxl.php WBXML-INPUT-HERE\n\n");
+}
+$wbxml64 = $argv[1];
+
+// include the stuff we need
+include_once('../../src/lib/utils/stringstreamwrapper.php');
+include_once('../../src/lib/wbxml/wbxmldefs.php');
+include_once('../../src/lib/wbxml/wbxmldecoder.php');
+include_once('../../src/lib/wbxml/wbxmlencoder.php');
+
+// minimal definitions & log to stdout overwrite
+define('WBXML_DEBUG', true);
+define("LOGLEVEL_WBXML", "wbxml");
+define("LOGLEVEL_DEBUG", "debug");
+class ZLog {
+    static public function Write($level, $msg, $truncate = false) {
+        // we only care about the wbxml
+        if ($level == "wbxml") {
+            if (substr($msg,0,1) == "I") {
+                echo substr($msg,1) . "\n";
+            }
+            else {
+                echo $msg . "\n";
+            }
+        }
+    }
+}
+
+// setup
+$wxbml = StringStreamWrapper::Open($wbxml64);
+$base64filter = stream_filter_append($wxbml, 'convert.base64-decode');
+$decoder = new WBXMLDecoder($wxbml);
+if (! $decoder->IsWBXML()) {
+    die("input is not WBXML as base64\n\n");
+}
+
+echo "\n";
+// read everything and log it
+$decoder->readRemainingData();
+echo "\n";