Login & automatic membership system #109

mfaalk · 2018-04-04T18:11:03Z

This PR will add a login form to the website and create a self going membership system where your users pay through selly. No membership = no IV.
The moment after they pay they will instantly receives an account that's active for 31 days.(or more if they pay for more than one quantity).
The next time they pay they will keep their login credentials and 31 days will be added to their existing expire date.

If it's a new user the user will receive an email with login credentials and expire date.
If it's an existing user the user will receive an email with the new expire date. The credentials is the same as before.

When their expire date is due they can no longer see IV on the map.

Two database tables has to be created for this to work.

CREATE TABLE `users` (
  `id` bigint(20) NOT NULL,
  `user` varchar(250) NOT NULL,
  `password` varchar(250) DEFAULT NULL,
  `temp_password` varchar(250) DEFAULT NULL,
  `expire_timestamp` int(11) NOT NULL,
  `session_id` varchar(100) DEFAULT NULL,
  `login_system` varchar(40) NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

ALTER TABLE `users`
  ADD PRIMARY KEY (`id`);

ALTER TABLE `users` MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT;

CREATE TABLE `payments` (
  `id` int(11) NOT NULL,
  `selly_id` varchar(100) NOT NULL,
  `product_id` int(30) NOT NULL,
  `email` varchar(250) NOT NULL,
  `value` int(11) NOT NULL,
  `quantity` int(11) NOT NULL,
  `timestamp` int(11) NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

ALTER TABLE `payments`
  ADD PRIMARY KEY (`id`);

ALTER TABLE `payments`
  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
COMMIT;

Selly settings:

[WIP] Roadmap 1

Merge latest develop changes into master

hammydown4325

Overall not bad at all. Pretty well put together so i am impressed. Look through all my comments i left throughout as this is a purely code based review and not functionality at this point.

Remember security is important so never store passwords even if they are hashed in txt files.

Lots of translation updates and small type conversion. Remember we use camel case for variables.

The PR will never get get merged unless you fix styleci and travis errors though so keep that in mind. I know it can be a pain but following the guidelines is a good thing.

hammydown4325 · 2018-04-14T02:36:30Z

config/default.php

+                                                                    // Composer is also needed. Type "composer install" to install the dependencies.
+                                                                    // Enter client_id, client_secret and callback uri from your discord bot to DiscordAuth.php
+                                                                    // https://discordapp.com/developers/applications/me
+$discord_bot_client_id = 0;


Convert to Camel Case Like $discordBotClientID = 0;

hammydown4325 · 2018-04-14T02:36:54Z

config/default.php

+                                                                    // https://discordapp.com/developers/applications/me
+$discord_bot_client_id = 0;
+$discord_bot_client_secret = "";
+$discord_bot_redirect_uri = "https://example.com/discord-callback.php";


Convert to Camel Case Like $discordBotRedirectURI= "https://example.com/discord-callback.php";

hammydown4325 · 2018-04-14T02:37:12Z

config/default.php

+                                                                    // Enter client_id, client_secret and callback uri from your discord bot to DiscordAuth.php
+                                                                    // https://discordapp.com/developers/applications/me
+$discord_bot_client_id = 0;
+$discord_bot_client_secret = "";


Convert to Camel Case Like $discordBotClientSecret = '';

hammydown4325 · 2018-04-14T02:39:09Z

discord-callback.php

+            "login_system" => 'discord'
+        ]);
+
+        if ($count == 0) {


=== to prevent type conversion

hammydown4325 · 2018-04-14T02:41:43Z

pre-index.php

+
+                $_SESSION['user']->expire_timestamp = $info['expire_timestamp'];
+
+                if (!empty($_SESSION['user']->updatePwd) && $_SESSION['user']->updatePwd == 1) {


=== to prevent type conversion.

hammydown4325 · 2018-04-14T03:53:31Z

user.php

+            $message .= i8ln('New password:') . " {$randomPwd}<br><br>";
+
+            if ($discordUrl) {
+                $message .= i8ln('For support, ask your questions in the ') . "<a href='{$discordUrl}'>discord guild</a>!<br><br>";


discord guild needs to be translatable.

hammydown4325 · 2018-04-14T03:53:48Z

user.php

+            if ($discordUrl) {
+                $message .= i8ln('For support, ask your questions in the ') . "<a href='{$discordUrl}'>discord guild</a>!<br><br>";
+            }
+            $message .= i8ln('Best Regards') . "<br>Admin";


Admin needs to be translatable.

hammydown4325 · 2018-04-14T03:54:24Z

user.php

+            }
+
+            $subject = "[{$title}] - Password Reset";
+            $headers = "From: no-reply@{$_SERVER['SERVER_NAME']}" . "\r\n" .


Needs to be configurable in config for From and Reply to as some people use a different domain.

hammydown4325 · 2018-04-14T03:56:31Z

user.php

+    <?php
+    } elseif (!empty($_SESSION['user']->updatePwd)) {
+        ?>
+        <p><h2><?php echo "[<a href='.'>{$title}</a>] - "; echo i8ln('Change your password.'); ?></h2></p>


Concatenate the echos into 1 with . Also remove the
tags.

hammydown4325 · 2018-04-14T04:05:05Z

utils.php

+            "login_system" => 'native'
+        ]);
+
+        $logMsg = "INSERT INTO users (id, user, temp_password, expire_timestamp, login_system) VALUES ('{$getId}', '{$user}', '{$hashedPwd}', '{$new_expire_timestamp}', 'native'); -- " . date('Y-m-d H:i:s') . "\r\n";


Remove Hashed password and replace with ******

Glennmen and others added 4 commits February 19, 2018 09:29

Merge pull request #35 from Glennmen/develop

5ea1852

[WIP] Roadmap 1

Merge pull request #107 from Glennmen/develop

d448786

Merge latest develop changes into master

Merge branch 'develop' of https://github.com/Glennmen/PMSF

7cfb9ce

[add]from PR 108

f0ace57

mfaalk mentioned this pull request Apr 4, 2018

Login & automatic membership system #108

Closed

mfaalk and others added 15 commits April 4, 2018 20:53

[add]disable IV etc for non logged on & non donators

df239e9

[fix]admin page correction

035ec03

fixes

c495506

minor text fixes

8ec19b4

[add]store cookie and destroy previous sessions

8e81175

[remove]checklogin.php

3a92b28

[fix]extend the cookie if it's still valid

c4a7681

minor text fix

f061e6c

[Discord Login]First draft

913680b

[Discord Login]indents...

1875ad5

[Discord Login]Move settings to config files

b265cb9

[fix]config changes and minor text fixes

72f6a22

[fix]id in db

c4e9b5d

minor text fixes

16db706

minor text fixes

3b85b21

hammydown4325 suggested changes Apr 14, 2018

View reviewed changes

mfaalk added 9 commits April 16, 2018 17:24

[fix]comments from iroken

4575ff5

oooops... indents

64644c4

variables

e3508aa

map.js camel case

de27df2

styleci

23d8d79

styleci

3969099

styleci

65ad092

styleci

0a197f5

multiple fixes

0f5cfe9

mfaalk added 13 commits April 17, 2018 09:49

small fixes

d802d11

oops

7dffd88

styleci

9cca1ae

styleci

136a464

[add]allow visitors to create accounts and more...

6354947

small changes

e5566a5

styleci

60eb6b0

small updates

8806128

styleci

e032150

rename session_id column to lower case

788191c

rename session_id column to lower case

d55c76b

Make sure the payment is sent from selly and not a fake request :-)

1a4d418

styleci

9fb544e

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Login & automatic membership system #109

Login & automatic membership system #109

mfaalk commented Apr 4, 2018 •

edited

Loading

hammydown4325 left a comment

hammydown4325 Apr 14, 2018

hammydown4325 Apr 14, 2018

hammydown4325 Apr 14, 2018

hammydown4325 Apr 14, 2018

hammydown4325 Apr 14, 2018

hammydown4325 Apr 14, 2018

hammydown4325 Apr 14, 2018

hammydown4325 Apr 14, 2018

hammydown4325 Apr 14, 2018

hammydown4325 Apr 14, 2018


		$_SESSION['user']->expire_timestamp = $info['expire_timestamp'];

		if (!empty($_SESSION['user']->updatePwd) && $_SESSION['user']->updatePwd == 1) {

Login & automatic membership system #109

Are you sure you want to change the base?

Login & automatic membership system #109

Conversation

mfaalk commented Apr 4, 2018 • edited Loading

hammydown4325 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mfaalk commented Apr 4, 2018 •

edited

Loading