From ac85670529f12f85c87ddabd9f23203cfdb15dd1 Mon Sep 17 00:00:00 2001 From: Ryan Mahoney Date: Wed, 2 Nov 2016 12:59:19 -0400 Subject: [PATCH] remove hard-coded verions --- available/Authenticate.php | 25 ------------------------- available/BlurbsByTag.php | 29 ----------------------------- available/CollectionStats.php | 4 ---- available/CollectionTags.php | 34 ---------------------------------- available/FormRedirect.php | 15 --------------- available/PostToDB.php | 16 ---------------- available/TweetsFetch.php | 7 ------- available/UserBecomeMember.php | 10 ---------- available/UserCreate.php | 33 --------------------------------- available/UserIdToPost.php | 12 ------------ available/UserLogin.php | 33 --------------------------------- available/topics.yml | 8 -------- composer.json | 3 +-- 13 files changed, 1 insertion(+), 228 deletions(-) delete mode 100644 available/Authenticate.php delete mode 100644 available/BlurbsByTag.php delete mode 100644 available/CollectionStats.php delete mode 100644 available/CollectionTags.php delete mode 100644 available/FormRedirect.php delete mode 100644 available/PostToDB.php delete mode 100644 available/TweetsFetch.php delete mode 100644 available/UserBecomeMember.php delete mode 100644 available/UserCreate.php delete mode 100644 available/UserIdToPost.php delete mode 100644 available/UserLogin.php diff --git a/available/Authenticate.php b/available/Authenticate.php deleted file mode 100644 index 80051de..0000000 --- a/available/Authenticate.php +++ /dev/null @@ -1,25 +0,0 @@ -{$context['formMarker']}; - if ($document === false || empty($document)) { - throw new \Exception('Document not found in post'); - } - if (!isset($document['route'])) { - $post->errorFieldSet($context['formMarker'], 'Missing url.'); - - return; - } - $try = $authentication->login($document['email'], $document['password']); - if ($try === false) { - $post->errorFieldSet($context['formMarker'], 'Credentials do not match. Please check your email or password and try again.'); - - return; - } - $post->statusSaved(); -}; diff --git a/available/BlurbsByTag.php b/available/BlurbsByTag.php deleted file mode 100644 index 1d67a6a..0000000 --- a/available/BlurbsByTag.php +++ /dev/null @@ -1,29 +0,0 @@ -mapReduce($map, $reduce, [ - 'mapreduce' => 'blurbs', - 'out' => 'blurbs_by_tag' - ]); -}; diff --git a/available/CollectionStats.php b/available/CollectionStats.php deleted file mode 100644 index c9afa79..0000000 --- a/available/CollectionStats.php +++ /dev/null @@ -1,4 +0,0 @@ -statsSet($context['dbURI']); -}; diff --git a/available/CollectionTags.php b/available/CollectionTags.php deleted file mode 100644 index 070d0cf..0000000 --- a/available/CollectionTags.php +++ /dev/null @@ -1,34 +0,0 @@ -mapReduce($map, $reduce, [ - 'mapreduce' => $context['collection'], - 'out' => $context['collection'].'_tags' - ]); - } catch (\Exception $e) { - $result = false; - } - - return $result; -}; diff --git a/available/FormRedirect.php b/available/FormRedirect.php deleted file mode 100644 index 7c2c673..0000000 --- a/available/FormRedirect.php +++ /dev/null @@ -1,15 +0,0 @@ -stored($context['formMarker']); - if ($myForm === false) { - return; - } - $myForm->after = 'redirect'; - $myForm->redirect = $_SESSION['acl_redirect']; -}; diff --git a/available/PostToDB.php b/available/PostToDB.php deleted file mode 100644 index f229678..0000000 --- a/available/PostToDB.php +++ /dev/null @@ -1,16 +0,0 @@ -{$context['formMarker']}; - if ($document === false || empty($document)) { - throw new \Exception('Document not found in post'); - } - $documentObject = $db->document($context['dbURI'], $document); - $documentObject->upsert(); - $post->statusSaved(); -}; diff --git a/available/TweetsFetch.php b/available/TweetsFetch.php deleted file mode 100644 index 4bfac4d..0000000 --- a/available/TweetsFetch.php +++ /dev/null @@ -1,7 +0,0 @@ -externalFetch($context['value'], $context['expire'], $context['type'], true); - if (is_array($tweets) && count($tweets) > 0) { - $twitter->save($context['type'], $context['value'], $tweets); - } -}; diff --git a/available/UserBecomeMember.php b/available/UserBecomeMember.php deleted file mode 100644 index 3725bac..0000000 --- a/available/UserBecomeMember.php +++ /dev/null @@ -1,10 +0,0 @@ -userJoinOrExtend($post->membership['user_id'], $post->membership['membership_id']); - } catch (\Exception $e) { - $this->post->errorFieldSet($context['formMarker'], 'Error becoming member: '.$e->getMessage()); - - return false; - } -}; diff --git a/available/UserCreate.php b/available/UserCreate.php deleted file mode 100644 index ba1aa99..0000000 --- a/available/UserCreate.php +++ /dev/null @@ -1,33 +0,0 @@ -{$context['formMarker']}; - if ($document === false || empty($document)) { - throw new \Exception('Document not found in post'); - } - if (!isset($document['email'])) { - $post->errorFieldSet($context['formMarker'], 'Email missing'); - - return; - } - $found = $person->findByEmail($document['email']); - if ($found !== false) { - $post->errorFieldSet($context['formMarker'], 'An Account already exists for this address.'); - - return; - } - $created = $person->create($document); - if ($created !== true) { - $post->errorFieldSet($context['formMarker'], $created); - - return; - } - $person->groupJoin('registered'); - $person->activityAdd('register', 'Created and account.'); - $post->statusSaved(); -}; diff --git a/available/UserIdToPost.php b/available/UserIdToPost.php deleted file mode 100644 index a15cf60..0000000 --- a/available/UserIdToPost.php +++ /dev/null @@ -1,12 +0,0 @@ -set($keys, $_SESSION['user']['_id']); -}; diff --git a/available/UserLogin.php b/available/UserLogin.php deleted file mode 100644 index f8e7d02..0000000 --- a/available/UserLogin.php +++ /dev/null @@ -1,33 +0,0 @@ -{$context['formMarker']}; - if ($document === false || empty($document)) { - throw new \Exception('Document not found in post'); - } - if (!isset($document['email']) || empty($document['email'])) { - $post->errorFieldSet($context['formMarker'], 'Email missing'); - - return; - } - if (!isset($document['password']) || empty($document['password'])) { - $post->errorFieldSet($context['formMarker'], 'Password missing'); - - return; - } - $found = $authentication->login($document['email'], $document['password']); - if ($found === false) { - $post->errorFieldSet($context['formMarker'], 'Incorrect login credentials.'); - if (filter_var($document['email'], FILTER_VALIDATE_EMAIL) === false) { - $post->errorFieldSet($context['formMarker'], 'Bad email address?'); - } - - return; - } - $post->statusSaved(); -}; diff --git a/available/topics.yml b/available/topics.yml index 3cf248a..ec8c0c8 100644 --- a/available/topics.yml +++ b/available/topics.yml @@ -1,9 +1 @@ topics: - CollectionTags: - - collectionController@tagsCollection - BlurbsByTag: - - blurbsController@cache - TweetsFetch: - - twitterController@fetch - CollectionStats: - - collectionController@stats diff --git a/composer.json b/composer.json index a9cdb8b..da919a1 100644 --- a/composer.json +++ b/composer.json @@ -32,6 +32,5 @@ "psr-4": { "Opine\\PubSub\\": "src/" } - }, - "version": "2.0.10" + } }