mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

coding-style fixes

This commit is contained in:
Bjoern Schiessle 2013-09-03 13:37:06 +02:00
parent 3ce4bf5ec7
commit fd7469db9e
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/ajax/share.php
View File

@ -129,7 +129,13 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
}
$url = \OCP\Util::linkToAbsolute('files', 'index.php', array("dir" => $foldername));
$text = $defaults->getShareNotificationText(\OCP\User::getDisplayName(), $filename, $itemType, $url, $expiration);
$text = $defaults->getShareNotificationText(
\OCP\User::getDisplayName(),
$filename,
$itemType,
$url,
$expiration
);
try {
OCP\Util::sendMail(
@ -153,7 +159,13 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
if (empty($noMail)) {
OCP\JSON::success();
} else {
OCP\JSON::error(array('data' => array('message' => $l->t("Couldn't send mail to following users: %s ", implode(', ', $noMail)))));
OCP\JSON::error(array(
'data' => array(
'message' => $l->t("Couldn't send mail to following users: %s ",
implode(', ', $noMail)
)
)
));
}
break;
case 'informRecipientsDisabled':

2
core/js/share.js
View File

@ -493,7 +493,7 @@ $(document).ready(function() {
$('input:[type=checkbox]', this).hide();
$('label', this).hide();
}
} else {
} else {
$('a.unshare', this).hide();
}
});

9
lib/defaults.php
View File

@ -72,9 +72,14 @@ class OC_Defaults {
return $this->theme->getShareNotificationText($sender, $itemName, $itemType, $link, $expiration);
} else {
if ($expiration) {
return $this->l->t("%s shared a %s called %s with you. The share will expire at %s. You can find the %s here: %s", array($sender, $itemType, $itemName, $expiration, $itemType, $link));
return $this->l->t("%s shared a %s called %s with you. " .
"The share will expire at %s. ".
"You can find the %s here: %s",
array($sender, $itemType, $itemName, $expiration, $itemType, $link));
} else {
return $this->l->t("%s shared a %s called %s with you. You can find the %s here: %s", array($sender, $itemType, $itemName, $itemType, $link));
return $this->l->t("%s shared a %s called %s with you. ".
"You can find the %s here: %s",
array($sender, $itemType, $itemName, $itemType, $link));
}
}
}