Controllers/api/v1/comments.php

@@ -347,15 +347,22 @@ class comments implements Interfaces\Api
 
  $comment = $manager->getByLuid($pages[0]);
 
- if ($comment && $comment->canEdit()) {
+ if (!$comment) {
+ return Factory::response([
+ 'status' => 'error',
+ 'message' => 'Comment not found',
+ ]);
+ }
+
+ if ($comment->canEdit()) {
  $manager->delete($comment);
  return Factory::response([]);
  }
  //check if owner of activity trying to remove
  $entity = Entities\Factory::build($comment->getEntityGuid());
- 
+
  if ($entity->owner_guid == Core\Session::getLoggedInUserGuid()) {
- $manager->delete($comment, [ 'force' => true ]);
+ $manager->delete($comment, ['force' => true]);
  return Factory::response([]);
  }
 

Controllers/api/v2/blockchain/wallet.php

@@ -25,6 +25,8 @@ class wallet implements Interfaces\Api
  */
  public function get($pages)
  {
+ Factory::isLoggedIn();
+
  /** @var abstractCacher $cache */
  $cache = Di::_()->get('Cache');
 

Controllers/api/v2/payments/stripe/transactions.php

@@ -28,7 +28,14 @@ class transactions implements Interfaces\Api
  'message' => 'There was an error returning the usd account',
  ]);
  }
- 
+
+ if (!$account) {
+ return Factory::response([
+ 'status' => 'error',
+ 'message' => 'Stripe account not found',
+ ]);
+ }
+
  $transactionsManger = new Stripe\Transactions\Manager();
  $transactions = $transactionsManger->getByAccount($account);
 

Core/Blogs/Events.php

@@ -5,6 +5,7 @@ namespace Minds\Core\Blogs;
 use Minds\Core\Di\Di;
 use Minds\Core\Events\Event;
 use Minds\Core\Events\EventsDispatcher;
+use Minds\Core\Session;
 
 class Events
 {
@@ -37,5 +38,29 @@ class Events
  $manager = Di::_()->get('Blogs\Manager');
  $event->setResponse($manager->update($blog));
  });
+
+ $this->eventsDispatcher->register('export:extender', 'blog', function (Event $event) {
+ $params = $event->getParameters();
+ /** @var Core\Blogs\Blog $blog */
+ $blog = $params['entity'];
+ $export = $event->response() ?: [];
+ $currentUser = Session::getLoggedInUserGuid();
+
+ $dirty = false;
+
+ if ($blog->isPaywall() && $blog->owner_guid != $currentUser) {
+ $export['description'] = '';
+ $export['body'] = '';
+ $dirty = true;
+ }
+
+ if ($dirty) {
+ return $event->setResponse($export);
+ }
+
+ if (!$currentUser) {
+ return;
+ }
+ });
  }
 }

lib/users.php

@@ -950,14 +950,14 @@ function validate_password($password) {
 		$CONFIG->min_password_length = 6;
 	}
 
-	if (strlen($password) < $CONFIG->min_password_length) {
-		$msg = "Passwords should be at least " . $CONFIG->min_password_length . " characters long";
-		throw new RegistrationException($msg);
-	}
-
 	//Check for a uppercase character, numeric character,special character 
-	if (!preg_match('/[A-Z]/', $password) || !preg_match('/\d/', $password) || !preg_match('/[^a-zA-Z\d]/', $password) || preg_match("/\\s/", $password)) {
-		$msg = "Password must have more than 8 characters. Including uppercase, numbers, special characters (ie. !,#,@), and cannot have spaces.";
+	if (strlen($password) < $CONFIG->min_password_length 
+		|| !preg_match('/[A-Z]/', $password) 
+		|| !preg_match('/\d/', $password) 
+		|| !preg_match('/[^a-zA-Z\d]/', $password) 
+		|| preg_match("/\\s/", $password)
+	) {
+		$msg = "Password must have 8 characters or more. Including uppercase, numbers, special characters (ie. !,#,@), and cannot have spaces.";
 		throw new RegistrationException($msg);
 	}