diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/installer.php | 4 | ||||
| -rw-r--r-- | lib/private/share/share.php | 7 | ||||
| -rw-r--r-- | lib/public/share.php | 5 |
3 files changed, 7 insertions, 9 deletions
diff --git a/lib/private/installer.php b/lib/private/installer.php index c5a09349629..dc9a3558b75 100644 --- a/lib/private/installer.php +++ b/lib/private/installer.php @@ -532,10 +532,6 @@ class OC_Installer{ */ public static function checkCode($appname, $folder) { $blacklist=array( - 'exec(', - 'eval(', - // more evil pattern will go here later - // classes replaced by the public api 'OC_API::', 'OC_App::', diff --git a/lib/private/share/share.php b/lib/private/share/share.php index 646511fd64d..4bf6622c561 100644 --- a/lib/private/share/share.php +++ b/lib/private/share/share.php @@ -820,17 +820,18 @@ class Share extends \OC\Share\Constants { * @param string $itemType * @param string $itemSource * @param int $shareType SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK + * @param string $recipient with whom was the file shared * @param boolean $status */ - public static function setSendMailStatus($itemType, $itemSource, $shareType, $status) { + public static function setSendMailStatus($itemType, $itemSource, $shareType, $recipient, $status) { $status = $status ? 1 : 0; $query = \OC_DB::prepare( 'UPDATE `*PREFIX*share` SET `mail_send` = ? - WHERE `item_type` = ? AND `item_source` = ? AND `share_type` = ?'); + WHERE `item_type` = ? AND `item_source` = ? AND `share_type` = ? AND `share_with` = ?'); - $result = $query->execute(array($status, $itemType, $itemSource, $shareType)); + $result = $query->execute(array($status, $itemType, $itemSource, $shareType, $recipient)); if($result === false) { \OC_Log::write('OCP\Share', 'Couldn\'t set send mail status', \OC_Log::ERROR); diff --git a/lib/public/share.php b/lib/public/share.php index e6519dd3e3a..bb9c6ec5886 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -274,10 +274,11 @@ class Share extends \OC\Share\Constants { * @param string $itemType * @param string $itemSource * @param int $shareType SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK + * @param string $recipient with whom was the item shared * @param bool $status */ - public static function setSendMailStatus($itemType, $itemSource, $shareType, $status) { - return \OC\Share\Share::setSendMailStatus($itemType, $itemSource, $shareType, $status); + public static function setSendMailStatus($itemType, $itemSource, $shareType, $recipient, $status) { + return \OC\Share\Share::setSendMailStatus($itemType, $itemSource, $shareType, $recipient, $status); } /** |