Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
z-push
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Björn Fischer
z-push
Commits
c1be658c
Commit
c1be658c
authored
Nov 18, 2015
by
Sebastian Kummer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ZP-770 Fix typos.
Released under the Affero GNU General Public License (AGPL) version 3.
parent
a8e1eb29
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
zpushadmin.php
src/lib/utils/zpushadmin.php
+4
-4
webservicedevice.php
src/lib/webservice/webservicedevice.php
+6
-6
No files found.
src/lib/utils/zpushadmin.php
View file @
c1be658c
...
...
@@ -517,7 +517,7 @@ class ZPushAdmin {
* @param string $devid device id the folder should be added to.
* @param string $add_store the store where this folder is located, e.g. "SYSTEM" (for public folder) or a username.
* @param string $add_folderid the folder id of the additional folder.
* @param string $add_name the name of the addtional folder (has to be unique for all folders on the device).
* @param string $add_name the name of the add
i
tional folder (has to be unique for all folders on the device).
* @param string $add_type AS foldertype of SYNC_FOLDER_TYPE_USER_*
*
* @access public
...
...
@@ -529,7 +529,7 @@ class ZPushAdmin {
try
{
// set device data
$device
->
SetData
(
ZPush
::
GetStateMachine
()
->
GetState
(
$devid
,
IStateMachine
::
DEVICEDATA
),
false
);
// get the last
est
hierarchy counter
// get the last hierarchy counter
$spa
=
ZPush
::
GetStateMachine
()
->
GetState
(
$devid
,
IStateMachine
::
FOLDERDATA
,
$device
->
GetFolderUUID
());
list
(
$uuid
,
$counter
)
=
StateManager
::
ParseStateKey
(
$spa
->
GetSyncKey
());
// instantiate hierarchycache
...
...
@@ -560,7 +560,7 @@ class ZPushAdmin {
* @param string $user user of the device.
* @param string $devid device id of where the folder should be updated.
* @param string $add_folderid the folder id of the additional folder.
* @param string $add_name the name of the addtional folder (has to be unique for all folders on the device).
* @param string $add_name the name of the add
i
tional folder (has to be unique for all folders on the device).
*
* @access public
* @return boolean
...
...
@@ -571,7 +571,7 @@ class ZPushAdmin {
try
{
// set device data
$device
->
SetData
(
ZPush
::
GetStateMachine
()
->
GetState
(
$devid
,
IStateMachine
::
DEVICEDATA
),
false
);
// get the last
est
hierarchy counter
// get the last hierarchy counter
$spa
=
ZPush
::
GetStateMachine
()
->
GetState
(
$devid
,
IStateMachine
::
FOLDERDATA
,
$device
->
GetFolderUUID
());
list
(
$uuid
,
$counter
)
=
StateManager
::
ParseStateKey
(
$spa
->
GetSyncKey
());
// instantiate hierarchycache
...
...
src/lib/webservice/webservicedevice.php
View file @
c1be658c
...
...
@@ -159,7 +159,7 @@ class WebserviceDevice {
/**
* Returns a list of all additional folders of the given device and the Request::GetGETUser().
*
* @param string $devi
d
device id that should be listed.
* @param string $devi
ceId
device id that should be listed.
*
* @access public
* @return array
...
...
@@ -177,10 +177,10 @@ class WebserviceDevice {
/**
* Adds an additional folder to the given device and the Request::GetGETUser().
*
* @param string $devi
d
device id the folder should be added to.
* @param string $devi
ceId
device id the folder should be added to.
* @param string $add_store the store where this folder is located, e.g. "SYSTEM" (for public folder) or an username/email address.
* @param string $add_folderid the folder id of the additional folder.
* @param string $add_name the name of the addtional folder (has to be unique for all folders on the device).
* @param string $add_name the name of the add
i
tional folder (has to be unique for all folders on the device).
* @param string $add_type AS foldertype of SYNC_FOLDER_TYPE_USER_*
*
* @access public
...
...
@@ -206,9 +206,9 @@ class WebserviceDevice {
/**
* Updates the name of an additional folder to the given device and the Request::GetGETUser().
*
* @param string $devi
d
device id of where the folder should be updated.
* @param string $devi
ceId
device id of where the folder should be updated.
* @param string $add_folderid the folder id of the additional folder.
* @param string $add_name the name of the addtional folder (has to be unique for all folders on the device).
* @param string $add_name the name of the add
i
tional folder (has to be unique for all folders on the device).
*
* @access public
* @return boolean
...
...
@@ -232,7 +232,7 @@ class WebserviceDevice {
/**
* Removes an additional folder from the given device and the Request::GetGETUser().
*
* @param string $devi
d
device id of where the folder should be removed.
* @param string $devi
ceId
device id of where the folder should be removed.
* @param string $add_folderid the folder id of the additional folder.
*
* @access public
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment