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
0c293af4
Commit
0c293af4
authored
Dec 19, 2016
by
Sebastian Kummer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ZP-907 Fixed typos from comments.
Released under the Affero GNU General Public License (AGPL) version 3.
parent
b6941e1f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
ping.php
src/lib/request/ping.php
+1
-1
utils.php
src/lib/utils/utils.php
+3
-1
No files found.
src/lib/request/ping.php
View file @
0c293af4
...
...
@@ -278,7 +278,7 @@ class Ping extends RequestProcessor {
private
function
isClassValid
(
$class
,
$spa
)
{
// ZP-907: Outlook might request a ping for such a folder, but we shouldn't answer it in any way
if
(
Request
::
IsOutlook
()
&&
self
::
$deviceManager
->
GetFolderTypeFromCacheById
(
$spa
->
GetFolderId
())
==
SYNC_FOLDER_TYPE_UNKNOWN
)
{
ZLog
::
Write
(
LOGLEVEL_DEBUG
,
sprintf
(
"HandlePing(): ignoring folder id '%s' as it's of type UNKNOWN "
,
$spa
->
GetFolderId
()));
ZLog
::
Write
(
LOGLEVEL_DEBUG
,
sprintf
(
"HandlePing()
->isClassValid()
: ignoring folder id '%s' as it's of type UNKNOWN "
,
$spa
->
GetFolderId
()));
return
false
;
}
if
(
$class
==
$spa
->
GetContentClass
()
||
...
...
src/lib/utils/utils.php
View file @
0c293af4
...
...
@@ -1169,11 +1169,12 @@ class Utils {
* Modifies a SyncFolder object, changing the type to SYNC_FOLDER_TYPE_UNKNOWN but saving the original type.
* It also appends a zero-width UTF-8 (U+200B) character to the name, which serves as marker.
*
* @access public
* @param SyncFolder $folder
* @return SyncFolder
*/
public
static
function
ChangeFolderToTypeUnknownForKoe
(
$folder
)
{
// append a
n
zero width UTF-8 space to the name
// append a zero width UTF-8 space to the name
$folder
->
displayname
.=
hex2bin
(
"e2808b"
);
$folder
->
TypeReal
=
$folder
->
type
;
$folder
->
type
=
SYNC_FOLDER_TYPE_UNKNOWN
;
...
...
@@ -1184,6 +1185,7 @@ class Utils {
/**
* Checks if the displayname of the folder contains the zero-width UTF-8 (U+200B) character marker.
*
* @access public
* @param SyncFolder $folder
* @return boolean
*/
...
...
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