Commit 598c1e3a authored by Etienne CHAMPETIER's avatar Etienne CHAMPETIER

ZP-785 Fix mixed EOL.

Released under the Affero GNU General Public License (AGPL) version 3.

find -name '*.php' -print0 | xargs -0 -n1 dos2unix
parent 9febcc77
...@@ -181,7 +181,7 @@ class Ping extends RequestProcessor { ...@@ -181,7 +181,7 @@ class Ping extends RequestProcessor {
$pingstatus = SYNC_PINGSTATUS_FOLDERHIERSYNCREQUIRED; $pingstatus = SYNC_PINGSTATUS_FOLDERHIERSYNCREQUIRED;
self::$deviceManager->AnnounceProcessStatus(false, $pingstatus); self::$deviceManager->AnnounceProcessStatus(false, $pingstatus);
break; break;
case SyncCollections::OBSOLETE_CONNECTION: case SyncCollections::OBSOLETE_CONNECTION:
$foundchanges = false; $foundchanges = false;
break; break;
case SyncCollections::HIERARCHY_CHANGED: case SyncCollections::HIERARCHY_CHANGED:
......
...@@ -72,18 +72,18 @@ class Webservice { ...@@ -72,18 +72,18 @@ class Webservice {
$this->server->setClass("WebserviceDevice"); $this->server->setClass("WebserviceDevice");
} }
// the webservice command is handled by its class // the webservice command is handled by its class
if ($commandCode == ZPush::COMMAND_WEBSERVICE_USERS) { if ($commandCode == ZPush::COMMAND_WEBSERVICE_USERS) {
if (!defined("ALLOW_WEBSERVICE_USERS_ACCESS") || ALLOW_WEBSERVICE_USERS_ACCESS !== true) 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); 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)); 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())); throw new AuthenticationRequiredException(sprintf("User '%s' has no admin privileges", Request::GetAuthUser()));
include_once('webserviceusers.php'); include_once('webserviceusers.php');
$this->server->setClass("WebserviceUsers"); $this->server->setClass("WebserviceUsers");
} }
$this->server->handle(); $this->server->handle();
......
...@@ -45,15 +45,15 @@ include ('lib/utils/zpushadmin.php'); ...@@ -45,15 +45,15 @@ include ('lib/utils/zpushadmin.php');
class WebserviceUsers { class WebserviceUsers {
/** /**
* Returns a list of all known devices * Returns a list of all known devices
* *
* @access public * @access public
* @return array * @return array
*/ */
public function ListDevices() { public function ListDevices() {
return ZPushAdmin::ListDevices(false); return ZPushAdmin::ListDevices(false);
} }
/** /**
* Returns a list of all known devices of the users * Returns a list of all known devices of the users
...@@ -74,29 +74,29 @@ class WebserviceUsers { ...@@ -74,29 +74,29 @@ class WebserviceUsers {
return $output; return $output;
} }
/** /**
* Returns a list of all known devices with users and when they synchronized for the first time * Returns a list of all known devices with users and when they synchronized for the first time
* *
* @access public * @access public
* @return array * @return array
*/ */
public function ListDevicesDetails() { public function ListDevicesDetails() {
$devices = ZPushAdmin::ListDevices(false); $devices = ZPushAdmin::ListDevices(false);
$output = array(); $output = array();
ZLog::Write(LOGLEVEL_INFO, sprintf("WebserviceUsers::ListLastSync(): found %d devices", count($devices))); 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); ZPush::GetTopCollector()->AnnounceInformation(sprintf("Retrieved details of %d devices and getting users", count($devices)), true);
foreach ($devices as $deviceId) { foreach ($devices as $deviceId) {
$output[$deviceId] = array(); $output[$deviceId] = array();
$users = ZPushAdmin::ListUsers($deviceId); $users = ZPushAdmin::ListUsers($deviceId);
foreach ($users as $user) { foreach ($users as $user) {
$output[$deviceId][$user] = ZPushAdmin::GetDeviceDetails($deviceId, $user); $output[$deviceId][$user] = ZPushAdmin::GetDeviceDetails($deviceId, $user);
} }
} }
return $output; return $output;
} }
} }
?> ?>
\ No newline at end of file
<?php <?php
/*********************************************** /***********************************************
* File : printwbxml.php * File : printwbxml.php
* Project : Z-Push * Project : Z-Push
* Descr : decodes and prints wbxml as base64 to stdout * Descr : decodes and prints wbxml as base64 to stdout
* *
* Created : 18.05.2015 * Created : 18.05.2015
* *
* Copyright 2015 Zarafa Deutschland GmbH * Copyright 2015 Zarafa Deutschland GmbH
* *
* This program is free software: you can redistribute it and/or modify * 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, * it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation with the following additional * as published by the Free Software Foundation with the following additional
* term according to sec. 7: * term according to sec. 7:
* *
* According to sec. 7 of the GNU Affero General Public License, version 3, * According to sec. 7 of the GNU Affero General Public License, version 3,
* the terms of the AGPL are supplemented with the following terms: * the terms of the AGPL are supplemented with the following terms:
* *
* "Zarafa" is a registered trademark of Zarafa B.V. * "Zarafa" is a registered trademark of Zarafa B.V.
* "Z-Push" is a registered trademark of Zarafa Deutschland GmbH * "Z-Push" is a registered trademark of Zarafa Deutschland GmbH
* The licensing of the Program under the AGPL does not imply a trademark license. * 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. * 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 * 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. * 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 * 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 * the intended purpose of a product or service provided you use it in accordance
* with honest practices in industrial or commercial matters. * with honest practices in industrial or commercial matters.
* If you want to propagate modified versions of the Program under the name "Z-Push", * 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 * 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). * (to acquire a permission please contact Zarafa at trademark@zarafa.com).
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details. * GNU Affero General Public License for more details.
* *
* You should have received a copy of the GNU Affero General Public License * 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/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
* Consult LICENSE file for details * Consult LICENSE file for details
************************************************/ ************************************************/
if (count($argv) < 2) { if (count($argv) < 2) {
die("\tUsage: printwbmxl.php WBXML-INPUT-HERE\n\n"); die("\tUsage: printwbmxl.php WBXML-INPUT-HERE\n\n");
} }
$wbxml64 = $argv[1]; $wbxml64 = $argv[1];
// include the stuff we need // include the stuff we need
include_once('../../src/lib/utils/stringstreamwrapper.php'); include_once('../../src/lib/utils/stringstreamwrapper.php');
include_once('../../src/lib/wbxml/wbxmldefs.php'); include_once('../../src/lib/wbxml/wbxmldefs.php');
include_once('../../src/lib/wbxml/wbxmldecoder.php'); include_once('../../src/lib/wbxml/wbxmldecoder.php');
include_once('../../src/lib/wbxml/wbxmlencoder.php'); include_once('../../src/lib/wbxml/wbxmlencoder.php');
// minimal definitions & log to stdout overwrite // minimal definitions & log to stdout overwrite
define('WBXML_DEBUG', true); define('WBXML_DEBUG', true);
define("LOGLEVEL_WBXML", "wbxml"); define("LOGLEVEL_WBXML", "wbxml");
define("LOGLEVEL_DEBUG", "debug"); define("LOGLEVEL_DEBUG", "debug");
class ZLog { class ZLog {
static public function Write($level, $msg, $truncate = false) { static public function Write($level, $msg, $truncate = false) {
// we only care about the wbxml // we only care about the wbxml
if ($level == "wbxml") { if ($level == "wbxml") {
if (substr($msg,0,1) == "I") { if (substr($msg,0,1) == "I") {
echo substr($msg,1) . "\n"; echo substr($msg,1) . "\n";
} }
else { else {
echo $msg . "\n"; echo $msg . "\n";
} }
} }
} }
} }
// setup // setup
$wxbml = StringStreamWrapper::Open($wbxml64); $wxbml = StringStreamWrapper::Open($wbxml64);
$base64filter = stream_filter_append($wxbml, 'convert.base64-decode'); $base64filter = stream_filter_append($wxbml, 'convert.base64-decode');
$decoder = new WBXMLDecoder($wxbml); $decoder = new WBXMLDecoder($wxbml);
if (! $decoder->IsWBXML()) { if (! $decoder->IsWBXML()) {
die("input is not WBXML as base64\n\n"); die("input is not WBXML as base64\n\n");
} }
echo "\n"; echo "\n";
// read everything and log it // read everything and log it
$decoder->readRemainingData(); $decoder->readRemainingData();
echo "\n"; echo "\n";
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment