Merge pull request #1248 from owncloud/remove_ctrl_M_chars

Remove eol ^M chars.

1 files changed, 50 insertions, 50 deletions

diff --git a/lib/public/share.php b/lib/public/share.php
index faec4ce6bad..8dcf0c5cc99 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -54,8 +54,8 @@ class Share {
 	const FORMAT_STATUSES = -2;

 	const FORMAT_SOURCES = -3;

 

-	const TOKEN_LENGTH = 32; // see db_structure.xml
-
+	const TOKEN_LENGTH = 32; // see db_structure.xml

+

 	private static $shareTypeUserAndGroups = -1;

 	private static $shareTypeGroupUserUnique = 2;

 	private static $backends = array();

@@ -144,20 +144,20 @@ class Share {
 	}

 

 	/**

-	 * @brief Get the item shared by a token
-	 * @param string token
-	 * @return Item
-	 */
-	public static function getShareByToken($token) {
-		$query = \OC_DB::prepare('SELECT * FROM `*PREFIX*share` WHERE `token` = ?', 1);
-		$result = $query->execute(array($token));
-		if (\OC_DB::isError($result)) {
-			\OC_Log::write('OCP\Share', \OC_DB::getErrorMessage($result) . ', token=' . $token, \OC_Log::ERROR);
-		}
-		return $result->fetchRow();
-	}
-
-	/**
+	 * @brief Get the item shared by a token

+	 * @param string token

+	 * @return Item

+	 */

+	public static function getShareByToken($token) {

+		$query = \OC_DB::prepare('SELECT * FROM `*PREFIX*share` WHERE `token` = ?', 1);

+		$result = $query->execute(array($token));

+		if (\OC_DB::isError($result)) {

+			\OC_Log::write('OCP\Share', \OC_DB::getErrorMessage($result) . ', token=' . $token, \OC_Log::ERROR);

+		}

+		return $result->fetchRow();

+	}

+

+	/**

 	* @brief Get the shared items of item type owned by the current user

 	* @param string Item type

 	* @param int Format (optional) Format type must be defined by the backend

@@ -186,7 +186,7 @@ class Share {
 	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK

 	* @param string User or group the item is being shared with

 	* @param int CRUDS permissions

-	* @return bool|string Returns true on success or false on failure, Returns token on success for links
+	* @return bool|string Returns true on success or false on failure, Returns token on success for links

 	*/

 	public static function shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions) {

 		$uidOwner = \OC_User::getUser();

@@ -248,33 +248,33 @@ class Share {
 			$shareWith['users'] = array_diff(\OC_Group::usersInGroup($group), array($uidOwner));

 		} else if ($shareType === self::SHARE_TYPE_LINK) {

 			if (\OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes') == 'yes') {

-				// when updating a link share
+				// when updating a link share

 				if ($checkExists = self::getItems($itemType, $itemSource, self::SHARE_TYPE_LINK, null, $uidOwner, self::FORMAT_NONE, null, 1)) {

-					// remember old token
-					$oldToken = $checkExists['token'];
-					//delete the old share
-					self::delete($checkExists['id']);
+					// remember old token

+					$oldToken = $checkExists['token'];

+					//delete the old share

+					self::delete($checkExists['id']);

 				}

-				
+				

 				// Generate hash of password - same method as user passwords

 				if (isset($shareWith)) {

 					$forcePortable = (CRYPT_BLOWFISH != 1);

 					$hasher = new \PasswordHash(8, $forcePortable);

 					$shareWith = $hasher->HashPassword($shareWith.\OC_Config::getValue('passwordsalt', ''));

 				}

-				
-				// Generate token
-				if (isset($oldToken)) {
-					$token = $oldToken;
-				} else {
-					$token = \OC_Util::generate_random_bytes(self::TOKEN_LENGTH);
-				}
-				$result = self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, null, $token);
-				if ($result) {
-					return $token;
-				} else {
-					return false;
-				}
+				

+				// Generate token

+				if (isset($oldToken)) {

+					$token = $oldToken;

+				} else {

+					$token = \OC_Util::generate_random_bytes(self::TOKEN_LENGTH);

+				}

+				$result = self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, null, $token);

+				if ($result) {

+					return $token;

+				} else {

+					return false;

+				}

 			}

 			$message = 'Sharing '.$itemSource.' failed, because sharing with links is not allowed';

 			\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);

@@ -594,7 +594,7 @@ class Share {
 					$itemTypes = $collectionTypes;

 				}

 				$placeholders = join(',', array_fill(0, count($itemTypes), '?'));

-				$where .= ' WHERE `item_type` IN ('.$placeholders.'))';
+				$where .= ' WHERE `item_type` IN ('.$placeholders.'))';

 				$queryArgs = $itemTypes;

 			} else {

 				$where = ' WHERE `item_type` = ?';

@@ -671,7 +671,7 @@ class Share {
 			$queryArgs[] = $item;

 			if ($includeCollections && $collectionTypes) {

 				$placeholders = join(',', array_fill(0, count($collectionTypes), '?'));

-				$where .= ' OR `item_type` IN ('.$placeholders.'))';
+				$where .= ' OR `item_type` IN ('.$placeholders.'))';

 				$queryArgs = array_merge($queryArgs, $collectionTypes);

 			}

 		}

@@ -700,16 +700,16 @@ class Share {
 		} else {

 			if (isset($uidOwner)) {

 				if ($itemType == 'file' || $itemType == 'folder') {

-					$select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `file_source`, `path`, `permissions`, `stime`, `expiration`, `token`';
+					$select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `file_source`, `path`, `permissions`, `stime`, `expiration`, `token`';

 				} else {

-					$select = '`id`, `item_type`, `item_source`, `parent`, `share_type`, `share_with`, `permissions`, `stime`, `file_source`, `expiration`, `token`';
+					$select = '`id`, `item_type`, `item_source`, `parent`, `share_type`, `share_with`, `permissions`, `stime`, `file_source`, `expiration`, `token`';

 				}

 			} else {

 				if ($fileDependent) {

 					if (($itemType == 'file' || $itemType == 'folder') && $format == \OC_Share_Backend_File::FORMAT_FILE_APP || $format == \OC_Share_Backend_File::FORMAT_FILE_APP_ROOT) {

 						$select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `uid_owner`, `share_type`, `share_with`, `file_source`, `path`, `file_target`, `permissions`, `expiration`, `name`, `ctime`, `mtime`, `mimetype`, `size`, `encrypted`, `versioned`, `writable`';

 					} else {

-						$select = '`*PREFIX*share`.`id`, `item_type`, `item_source`, `item_target`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `uid_owner`, `file_source`, `path`, `file_target`, `permissions`, `stime`, `expiration`, `token`';
+						$select = '`*PREFIX*share`.`id`, `item_type`, `item_source`, `item_target`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `uid_owner`, `file_source`, `path`, `file_target`, `permissions`, `stime`, `expiration`, `token`';

 					}

 				} else {

 					$select = '*';

@@ -719,9 +719,9 @@ class Share {
 		$root = strlen($root);

 		$query = \OC_DB::prepare('SELECT '.$select.' FROM `*PREFIX*share` '.$where, $queryLimit);

 		$result = $query->execute($queryArgs);

-		if (\OC_DB::isError($result)) {
-			\OC_Log::write('OCP\Share', \OC_DB::getErrorMessage($result) . ', select=' . $select . ' where=' . $where, \OC_Log::ERROR);
-		}
+		if (\OC_DB::isError($result)) {

+			\OC_Log::write('OCP\Share', \OC_DB::getErrorMessage($result) . ', select=' . $select . ' where=' . $where, \OC_Log::ERROR);

+		}

 		$items = array();

 		$targets = array();

 		while ($row = $result->fetchRow()) {

@@ -885,7 +885,7 @@ class Share {
 	* @param bool|array Parent folder target (optional)

 	* @return bool Returns true on success or false on failure

 	*/

-	private static function put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, $parentFolder = null, $token = null) {
+	private static function put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, $parentFolder = null, $token = null) {

 		$backend = self::getBackend($itemType);

 		// Check if this is a reshare

 		if ($checkReshare = self::getItemSharedWithBySource($itemType, $itemSource, self::FORMAT_NONE, null, true)) {

@@ -942,7 +942,7 @@ class Share {
 				$fileSource = null;

 			}

 		}

-		$query = \OC_DB::prepare('INSERT INTO `*PREFIX*share` (`item_type`, `item_source`, `item_target`, `parent`, `share_type`, `share_with`, `uid_owner`, `permissions`, `stime`, `file_source`, `file_target`, `token`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)');
+		$query = \OC_DB::prepare('INSERT INTO `*PREFIX*share` (`item_type`, `item_source`, `item_target`, `parent`, `share_type`, `share_with`, `uid_owner`, `permissions`, `stime`, `file_source`, `file_target`, `token`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)');

 		// Share with a group

 		if ($shareType == self::SHARE_TYPE_GROUP) {

 			$groupItemTarget = self::generateTarget($itemType, $itemSource, $shareType, $shareWith['group'], $uidOwner, $suggestedItemTarget);

@@ -963,7 +963,7 @@ class Share {
 			} else {

 				$groupFileTarget = null;

 			}

-			$query->execute(array($itemType, $itemSource, $groupItemTarget, $parent, $shareType, $shareWith['group'], $uidOwner, $permissions, time(), $fileSource, $groupFileTarget, $token));
+			$query->execute(array($itemType, $itemSource, $groupItemTarget, $parent, $shareType, $shareWith['group'], $uidOwner, $permissions, time(), $fileSource, $groupFileTarget, $token));

 			// Save this id, any extra rows for this group share will need to reference it

 			$parent = \OC_DB::insertid('*PREFIX*share');

 			// Loop through all users of this group in case we need to add an extra row

@@ -988,8 +988,8 @@ class Share {
 				}

 				// Insert an extra row for the group share if the item or file target is unique for this user

 				if ($itemTarget != $groupItemTarget || (isset($fileSource) && $fileTarget != $groupFileTarget)) {

-					$query->execute(array($itemType, $itemSource, $itemTarget, $parent, self::$shareTypeGroupUserUnique, $uid, $uidOwner, $permissions, time(), $fileSource, $fileTarget, $token));
-					$id = \OC_DB::insertid('*PREFIX*share');
+					$query->execute(array($itemType, $itemSource, $itemTarget, $parent, self::$shareTypeGroupUserUnique, $uid, $uidOwner, $permissions, time(), $fileSource, $fileTarget, $token));

+					$id = \OC_DB::insertid('*PREFIX*share');

 				}

 			}

 			if ($parentFolder === true) {

@@ -1013,7 +1013,7 @@ class Share {
 			} else {

 				$fileTarget = null;

 			}

-			$query->execute(array($itemType, $itemSource, $itemTarget, $parent, $shareType, $shareWith, $uidOwner, $permissions, time(), $fileSource, $fileTarget, $token));
+			$query->execute(array($itemType, $itemSource, $itemTarget, $parent, $shareType, $shareWith, $uidOwner, $permissions, time(), $fileSource, $fileTarget, $token));

 			$id = \OC_DB::insertid('*PREFIX*share');

 			if ($parentFolder === true) {

 				$parentFolders['id'] = $id;