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

Merge pull request #8068 from wakeup/fix-share.php-string-extraction 

Make lib/** share.php strings extractable for translation
This commit is contained in:
Thomas Müller 2014-04-23 09:58:10 +02:00
parent 09f72204ee 6e857de6b7
commit dcc48f9b46
1 changed files with 89 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

152
lib/private/share/share.php
View File

@ -426,6 +426,7 @@ class Share extends \OC\Share\Constants {
public static function shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions, $itemSourceName = null) { public static function shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions, $itemSourceName = null) {
$uidOwner = \OC_User::getUser(); $uidOwner = \OC_User::getUser();
$sharingPolicy = \OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global'); $sharingPolicy = \OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global');
$l = \OC_L10N::get('lib');
if (is_null($itemSourceName)) { if (is_null($itemSourceName)) {
$itemSourceName = $itemSource; $itemSourceName = $itemSource;
@ -444,22 +445,25 @@ class Share extends \OC\Share\Constants {
// Verify share type and sharing conditions are met // Verify share type and sharing conditions are met
if ($shareType === self::SHARE_TYPE_USER) { if ($shareType === self::SHARE_TYPE_USER) {
if ($shareWith == $uidOwner) { if ($shareWith == $uidOwner) {
$message = 'Sharing '.$itemSourceName.' failed, because the user '.$shareWith.' is the item owner'; $message = 'Sharing %s failed, because the user %s is the item owner';
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR); $message_t = $l->t('Sharing %s failed, because the user %s is the item owner', array($itemSourceName, $shareWith));
throw new \Exception($message); \OC_Log::write('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OC_Log::ERROR);
throw new \Exception($message_t);
} }
if (!\OC_User::userExists($shareWith)) { if (!\OC_User::userExists($shareWith)) {
$message = 'Sharing '.$itemSourceName.' failed, because the user '.$shareWith.' does not exist'; $message = 'Sharing %s failed, because the user %s does not exist';
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR); $message_t = $l->t('Sharing %s failed, because the user %s does not exist', array($itemSourceName, $shareWith));
throw new \Exception($message); \OC_Log::write('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OC_Log::ERROR);
throw new \Exception($message_t);
} }
if ($sharingPolicy == 'groups_only') { if ($sharingPolicy == 'groups_only') {
$inGroup = array_intersect(\OC_Group::getUserGroups($uidOwner), \OC_Group::getUserGroups($shareWith)); $inGroup = array_intersect(\OC_Group::getUserGroups($uidOwner), \OC_Group::getUserGroups($shareWith));
if (empty($inGroup)) { if (empty($inGroup)) {
$message = 'Sharing '.$itemSourceName.' failed, because the user ' $message = 'Sharing %s failed, because the user '
.$shareWith.' is not a member of any groups that '.$uidOwner.' is a member of'; .'%s is not a member of any groups that %s is a member of';
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR); $message_t = $l->t('Sharing %s failed, because the user %s is not a member of any groups that %s is a member of', array($itemSourceName, $shareWith, $uidOwner));
throw new \Exception($message); \OC_Log::write('OCP\Share', sprintf($message, $itemSourceName, $shareWith, $uidOwner), \OC_Log::ERROR);
throw new \Exception($message_t);
} }
} }
// Check if the item source is already shared with the user, either from the same owner or a different user // Check if the item source is already shared with the user, either from the same owner or a different user
@ -469,22 +473,25 @@ class Share extends \OC\Share\Constants {
// owner and is not a user share, this use case is for increasing // owner and is not a user share, this use case is for increasing
// permissions for a specific user // permissions for a specific user
if ($checkExists['uid_owner'] != $uidOwner || $checkExists['share_type'] == $shareType) { if ($checkExists['uid_owner'] != $uidOwner || $checkExists['share_type'] == $shareType) {
$message = 'Sharing '.$itemSourceName.' failed, because this item is already shared with '.$shareWith; $message = 'Sharing %s failed, because this item is already shared with %s';
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR); $message_t = $l->t('Sharing %s failed, because this item is already shared with %s', array($itemSourceName, $shareWith));
throw new \Exception($message); \OC_Log::write('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OC_Log::ERROR);
throw new \Exception($message_t);
} }
} }
} else if ($shareType === self::SHARE_TYPE_GROUP) { } else if ($shareType === self::SHARE_TYPE_GROUP) {
if (!\OC_Group::groupExists($shareWith)) { if (!\OC_Group::groupExists($shareWith)) {
$message = 'Sharing '.$itemSourceName.' failed, because the group '.$shareWith.' does not exist'; $message = 'Sharing %s failed, because the group %s does not exist';
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR); $message_t = $l->t('Sharing %s failed, because the group %s does not exist', array($itemSourceName, $shareWith));
throw new \Exception($message); \OC_Log::write('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OC_Log::ERROR);
throw new \Exception($message_t);
} }
if ($sharingPolicy == 'groups_only' && !\OC_Group::inGroup($uidOwner, $shareWith)) { if ($sharingPolicy == 'groups_only' && !\OC_Group::inGroup($uidOwner, $shareWith)) {
$message = 'Sharing '.$itemSourceName.' failed, because ' $message = 'Sharing %s failed, because '
.$uidOwner.' is not a member of the group '.$shareWith; .'%s is not a member of the group %s';
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR); $message_t = $l->t('Sharing %s failed, because %s is not a member of the group %s', array($itemSourceName, $uidOwner, $shareWith));
throw new \Exception($message); \OC_Log::write('OCP\Share', sprintf($message, $itemSourceName, $uidOwner, $shareWith), \OC_Log::ERROR);
throw new \Exception($message_t);
} }
// Check if the item source is already shared with the group, either from the same owner or a different user // Check if the item source is already shared with the group, either from the same owner or a different user
// The check for each user in the group is done inside the put() function // The check for each user in the group is done inside the put() function
@ -494,9 +501,10 @@ class Share extends \OC\Share\Constants {
// owner and is not a group share, this use case is for increasing // owner and is not a group share, this use case is for increasing
// permissions for a specific user // permissions for a specific user
if ($checkExists['uid_owner'] != $uidOwner || $checkExists['share_type'] == $shareType) { if ($checkExists['uid_owner'] != $uidOwner || $checkExists['share_type'] == $shareType) {
$message = 'Sharing '.$itemSourceName.' failed, because this item is already shared with '.$shareWith; $message = 'Sharing %s failed, because this item is already shared with %s';
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR); $message_t = $l->t('Sharing %s failed, because this item is already shared with %s', array($itemSourceName, $shareWith));
throw new \Exception($message); \OC_Log::write('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OC_Log::ERROR);
throw new \Exception($message_t);
} }
} }
// Convert share with into an array with the keys group and users // Convert share with into an array with the keys group and users
@ -543,15 +551,17 @@ class Share extends \OC\Share\Constants {
return false; return false;
} }
} }
$message = 'Sharing '.$itemSourceName.' failed, because sharing with links is not allowed'; $message = 'Sharing %s failed, because sharing with links is not allowed';
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR); $message_t = $l->t('Sharing %s failed, because sharing with links is not allowed', array($itemSourceName));
throw new \Exception($message); \OC_Log::write('OCP\Share', sprintf($message, $itemSourceName), \OC_Log::ERROR);
throw new \Exception($message_t);
return false; return false;
} else { } else {
// Future share types need to include their own conditions // Future share types need to include their own conditions
$message = 'Share type '.$shareType.' is not valid for '.$itemSource; $message = 'Share type %s is not valid for %s';
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR); $message_t = $l->t('Share type %s is not valid for %s', array($shareType, $itemSource));
throw new \Exception($message); \OC_Log::write('OCP\Share', sprintf($message, $shareType, $itemSource), \OC_Log::ERROR);
throw new \Exception($message_t);
} }
// Put the item into the database // Put the item into the database
return self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, null, null, $itemSourceName); return self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, null, null, $itemSourceName);
@ -675,6 +685,7 @@ class Share extends \OC\Share\Constants {
* @return Returns true on success or false on failure * @return Returns true on success or false on failure
*/ */
public static function setPermissions($itemType, $itemSource, $shareType, $shareWith, $permissions) { public static function setPermissions($itemType, $itemSource, $shareType, $shareWith, $permissions) {
$l = \OC_L10N::get('lib');
if ($item = self::getItems($itemType, $itemSource, $shareType, $shareWith, if ($item = self::getItems($itemType, $itemSource, $shareType, $shareWith,
\OC_User::getUser(), self::FORMAT_NONE, null, 1, false)) { \OC_User::getUser(), self::FORMAT_NONE, null, 1, false)) {
// Check if this item is a reshare and verify that the permissions // Check if this item is a reshare and verify that the permissions
@ -683,10 +694,11 @@ class Share extends \OC\Share\Constants {
$query = \OC_DB::prepare('SELECT `permissions` FROM `*PREFIX*share` WHERE `id` = ?', 1); $query = \OC_DB::prepare('SELECT `permissions` FROM `*PREFIX*share` WHERE `id` = ?', 1);
$result = $query->execute(array($item['parent']))->fetchRow(); $result = $query->execute(array($item['parent']))->fetchRow();
if (~(int)$result['permissions'] & $permissions) { if (~(int)$result['permissions'] & $permissions) {
$message = 'Setting permissions for '.$itemSource.' failed,' $message = 'Setting permissions for %s failed,'
.' because the permissions exceed permissions granted to '.\OC_User::getUser(); .' because the permissions exceed permissions granted to %s';
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR); $message_t = $l->t('Setting permissions for %s failed, because the permissions exceed permissions granted to %s', array($itemSource, \OC_User::getUser()));
throw new \Exception($message); \OC_Log::write('OCP\Share', sprintf($message, $itemSource, \OC_User::getUser()), \OC_Log::ERROR);
throw new \Exception($message_t);
} }
} }
$query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `permissions` = ? WHERE `id` = ?'); $query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `permissions` = ? WHERE `id` = ?');
@ -744,9 +756,11 @@ class Share extends \OC\Share\Constants {
} }
return true; return true;
} }
$message = 'Setting permissions for '.$itemSource.' failed, because the item was not found'; $message = 'Setting permissions for %s failed, because the item was not found';
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR); $message_t = $l->t('Setting permissions for %s failed, because the item was not found', array($itemSource));
throw new \Exception($message);
\OC_Log::write('OCP\Share', sprintf($message, $itemSource), \OC_Log::ERROR);
throw new \Exception($message_t);
} }
/** /**
@ -828,6 +842,7 @@ class Share extends \OC\Share\Constants {
* @return \OCP\Share_Backend * @return \OCP\Share_Backend
*/ */
public static function getBackend($itemType) { public static function getBackend($itemType) {
$l = \OC_L10N::get('lib');
if (isset(self::$backends[$itemType])) { if (isset(self::$backends[$itemType])) {
return self::$backends[$itemType]; return self::$backends[$itemType];
} else if (isset(self::$backendTypes[$itemType]['class'])) { } else if (isset(self::$backendTypes[$itemType]['class'])) {
@ -835,20 +850,23 @@ class Share extends \OC\Share\Constants {
if (class_exists($class)) { if (class_exists($class)) {
self::$backends[$itemType] = new $class; self::$backends[$itemType] = new $class;
if (!(self::$backends[$itemType] instanceof \OCP\Share_Backend)) { if (!(self::$backends[$itemType] instanceof \OCP\Share_Backend)) {
$message = 'Sharing backend '.$class.' must implement the interface OCP\Share_Backend'; $message = 'Sharing backend %s must implement the interface OCP\Share_Backend';
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR); $message_t = $l->t('Sharing backend %s must implement the interface OCP\Share_Backend', array($class));
throw new \Exception($message); \OC_Log::write('OCP\Share', sprintf($message, $class), \OC_Log::ERROR);
throw new \Exception($message_t);
} }
return self::$backends[$itemType]; return self::$backends[$itemType];
} else { } else {
$message = 'Sharing backend '.$class.' not found'; $message = 'Sharing backend %s not found';
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR); $message_t = $l->t('Sharing backend %s not found', array($class));
throw new \Exception($message); \OC_Log::write('OCP\Share', sprintf($message, $class), \OC_Log::ERROR);
throw new \Exception($message_t);
} }
} }
$message = 'Sharing backend for '.$itemType.' not found'; $message = 'Sharing backend for %s not found';
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR); $message_t = $l->t('Sharing backend for %s not found', array($itemType));
throw new \Exception($message); \OC_Log::write('OCP\Share', sprintf($message, $itemType), \OC_Log::ERROR);
throw new \Exception($message_t);
} }
/** /**
@ -1256,23 +1274,26 @@ class Share extends \OC\Share\Constants {
private static function put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, private static function put($itemType, $itemSource, $shareType, $shareWith, $uidOwner,
$permissions, $parentFolder = null, $token = null, $itemSourceName = null) { $permissions, $parentFolder = null, $token = null, $itemSourceName = null) {
$backend = self::getBackend($itemType); $backend = self::getBackend($itemType);
$l = \OC_L10N::get('lib');
// Check if this is a reshare // Check if this is a reshare
if ($checkReshare = self::getItemSharedWithBySource($itemType, $itemSource, self::FORMAT_NONE, null, true)) { if ($checkReshare = self::getItemSharedWithBySource($itemType, $itemSource, self::FORMAT_NONE, null, true)) {
// Check if attempting to share back to owner // Check if attempting to share back to owner
if ($checkReshare['uid_owner'] == $shareWith && $shareType == self::SHARE_TYPE_USER) { if ($checkReshare['uid_owner'] == $shareWith && $shareType == self::SHARE_TYPE_USER) {
$message = 'Sharing '.$itemSourceName.' failed, because the user '.$shareWith.' is the original sharer'; $message = 'Sharing %s failed, because the user %s is the original sharer';
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR); $message_t = $l->t('Sharing %s failed, because the user %s is the original sharer', array($itemSourceName, $shareWith));
throw new \Exception($message);
\OC_Log::write('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OC_Log::ERROR);
throw new \Exception($message_t);
} }
// Check if share permissions is granted // Check if share permissions is granted
if (self::isResharingAllowed() && (int)$checkReshare['permissions'] & \OCP\PERMISSION_SHARE) { if (self::isResharingAllowed() && (int)$checkReshare['permissions'] & \OCP\PERMISSION_SHARE) {
if (~(int)$checkReshare['permissions'] & $permissions) { if (~(int)$checkReshare['permissions'] & $permissions) {
$message = 'Sharing '.$itemSourceName $message = 'Sharing %s failed, because the permissions exceed permissions granted to %s';
.' failed, because the permissions exceed permissions granted to '.$uidOwner; $message_t = $l->t('Sharing %s failed, because the permissions exceed permissions granted to %s', array($itemSourceName, $uidOwner));
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
throw new \Exception($message); \OC_Log::write('OCP\Share', sprintf($message, $itemSourceName, $uidOwner), \OC_Log::ERROR);
throw new \Exception($message_t);
} else { } else {
// TODO Don't check if inside folder // TODO Don't check if inside folder
$parent = $checkReshare['id']; $parent = $checkReshare['id'];
@ -1283,19 +1304,22 @@ class Share extends \OC\Share\Constants {
$filePath = $checkReshare['file_target']; $filePath = $checkReshare['file_target'];
} }
} else { } else {
$message = 'Sharing '.$itemSourceName.' failed, because resharing is not allowed'; $message = 'Sharing %s failed, because resharing is not allowed';
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR); $message_t = $l->t('Sharing %s failed, because resharing is not allowed', array($itemSourceName));
throw new \Exception($message);
\OC_Log::write('OCP\Share', sprintf($message, $itemSourceName), \OC_Log::ERROR);
throw new \Exception($message_t);
} }
} else { } else {
$parent = null; $parent = null;
$suggestedItemTarget = null; $suggestedItemTarget = null;
$suggestedFileTarget = null; $suggestedFileTarget = null;
if (!$backend->isValidSource($itemSource, $uidOwner)) { if (!$backend->isValidSource($itemSource, $uidOwner)) {
$message = 'Sharing '.$itemSource.' failed, because the sharing backend for ' $message = 'Sharing %s failed, because the sharing backend for '
.$itemType.' could not find its source'; .'%s could not find its source';
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR); $message_t = $l->t('Sharing %s failed, because the sharing backend for %s could not find its source', array($itemSource, $itemType));
throw new \Exception($message); \OC_Log::write('OCP\Share', sprintf($message, $itemSource, $itemType), \OC_Log::ERROR);
throw new \Exception($message_t);
} }
if ($backend instanceof \OCP\Share_Backend_File_Dependent) { if ($backend instanceof \OCP\Share_Backend_File_Dependent) {
$filePath = $backend->getFilePath($itemSource, $uidOwner); $filePath = $backend->getFilePath($itemSource, $uidOwner);
@ -1306,9 +1330,11 @@ class Share extends \OC\Share\Constants {
$fileSource = $meta['fileid']; $fileSource = $meta['fileid'];
} }
if ($fileSource == -1) { if ($fileSource == -1) {
$message = 'Sharing '.$itemSource.' failed, because the file could not be found in the file cache'; $message = 'Sharing %s failed, because the file could not be found in the file cache';
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR); $message_t = $l->t('Sharing %s failed, because the file could not be found in the file cache', array($itemSource));
throw new \Exception($message);
\OC_Log::write('OCP\Share', sprintf($message, $itemSource), \OC_Log::ERROR);
throw new \Exception($message_t);
} }
} else { } else {
$filePath = null; $filePath = null;