Commit f890776c authored by Sebastian Kummer's avatar Sebastian Kummer

ZP-1072 fixed typos and comments.

Released under the Affero GNU General Public License (AGPL) version 3.
parent 9d3c7109
...@@ -880,7 +880,7 @@ class ASDevice extends StateObject { ...@@ -880,7 +880,7 @@ class ASDevice extends StateObject {
return false; return false;
} }
// check if a folder with that Name is already in the list and that it's parent exists // check if a folder with that Name is already in the list and that its parent exists
$parentFound = false; $parentFound = false;
foreach ($this->additionalfolders as $k => $folder) { foreach ($this->additionalfolders as $k => $folder) {
// TODO: this parentid check should go into fixstates! // TODO: this parentid check should go into fixstates!
...@@ -895,7 +895,7 @@ class ASDevice extends StateObject { ...@@ -895,7 +895,7 @@ class ASDevice extends StateObject {
} }
} }
if ($parentid != '0' && !$parentFound) { if ($parentid != '0' && !$parentFound) {
ZLog::Write(LOGLEVEL_ERROR, sprintf("ASDevice->AddAdditionalFolder(): folder can not be added because the parent folder '%s' can not be found: '%s'", $parentid, $folderid)); ZLog::Write(LOGLEVEL_ERROR, sprintf("ASDevice->AddAdditionalFolder(): folder '%s' ('%s') can not be added because the parent folder '%s' can not be found'", $name, $folderid, $parentid));
return false; return false;
} }
...@@ -1068,7 +1068,7 @@ class ASDevice extends StateObject { ...@@ -1068,7 +1068,7 @@ class ASDevice extends StateObject {
if (!empty($toOrder)) { if (!empty($toOrder)) {
$s = ""; $s = "";
foreach($toOrder as $f) { foreach($toOrder as $f) {
$s .= sprintf("'%s'(%s) ", $f['name'], $f['folderid']); $s .= sprintf("'%s'('%s') ", $f['name'], $f['folderid']);
} }
ZLog::Write(LOGLEVEL_ERROR, "ASDevice->SetAdditionalFolderList(): cannot proceed as these folders have invalid parentids (not found): ". $s); ZLog::Write(LOGLEVEL_ERROR, "ASDevice->SetAdditionalFolderList(): cannot proceed as these folders have invalid parentids (not found): ". $s);
return false; return false;
......
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