Просмотр исходного кода

Added Registration for Users

CSS fixes and new registration form
causefx 9 лет назад
Родитель
Сommit
9e8cbb1cfe
11 измененных файлов с 179 добавлено и 18 удалено
  1. 2 2
      css/style.css
  2. 112 9
      index.php
  3. 5 1
      lang/de.ini
  4. 5 1
      lang/en.ini
  5. 5 1
      lang/es.ini
  6. 5 1
      lang/fr.ini
  7. 5 1
      lang/it.ini
  8. 5 1
      lang/nl.ini
  9. 27 0
      register.php
  10. 7 1
      settings.php
  11. 1 0
      user.php

+ 2 - 2
css/style.css

@@ -1558,11 +1558,11 @@ body {
 }
 
 .login .login-form {
-  padding: 30px 80px 120px;
+  padding: 30px 80px 30px;
 }
 
 .login form {
-  margin-bottom: 15px;
+  margin-bottom: 5px;
 }
 
 .login input:focus {

+ 112 - 9
index.php

@@ -11,17 +11,17 @@ $settingsicon = "No";
 $settingsActive = "";
 $action = "";
 $title = "Organizr";
-$topbar = "#eb6363"; 
-$topbartext = "#FFFFFF";
-$bottombar = "#eb6363";
-$sidebar = "#000000";
-$hoverbg = "#eb6363";
-$activetabBG = "#eb6363";
+$topbar = "#333333"; 
+$topbartext = "#66D9EF";
+$bottombar = "#333333";
+$sidebar = "#393939";
+$hoverbg = "#AD80FD";
+$activetabBG = "#F92671";
 $activetabicon = "#FFFFFF";
 $activetabtext = "#FFFFFF";
-$inactiveicon = "#FFFFFF";
-$inactivetext = "#FFFFFF";
-$loading = "#000000";
+$inactiveicon = "#66D9EF";
+$inactivetext = "#66D9EF";
+$loading = "#66D9EF";
 $hovertext = "#000000";
 $loadingIcon = "images/organizr.png";
 $baseURL = "";
@@ -1079,6 +1079,10 @@ endif;
                                     
                                     <button id="switchForgot" style="background:<?=$topbartext;?>;" class="btn btn-block btn-info text-uppercase waves"><text style="color:<?=$topbar;?>;"><?php echo $language->translate("FORGOT_PASSWORD");?></text></button>
                                     
+                                    <?php if(REGISTERPASSWORD != "") : ?>
+                                    <button id="switchCreateUser" style="background:<?=$hoverbg;?>;" class="btn btn-block btn-info text-uppercase waves"><text style="color:<?=$hovertext;?>;"><?php echo $language->translate("CREATE_USER");?></text></button>
+                                    <?php endif; ?>
+                                    
                                     <form style="display: none;" name="forgotPassword" id="forgotPassword" action="" method="POST" data-smk-icon="glyphicon-remove-sign">
                                         
                                         <h4 class="text-center"><?php echo $language->translate("FORGOT_PASSWORD");?></h4>
@@ -1094,6 +1098,60 @@ endif;
 
                                     </form> 
                                     
+                                    <?php if(REGISTERPASSWORD != "") : ?>
+                                    <div id="userPassForm" style="display: none;">
+                                        <form id="userCreateForm" action="register.php" method="POST">
+                                            <h4 class="text-center"><?php echo $language->translate("ENTER_PASSWORD_TO_REGISTER");?></h4>
+                                            
+                                            <center><h5 id="userCreateErrors" style="color: red"></h5></center>
+
+                                            <div class="form-group">
+
+                                                <input type="text" class="form-control material" name="registerPasswordValue" placeholder="<?php echo $language->translate("PASSWORD");?>" autocorrect="off" autocapitalize="off" value="" autofocus required>
+
+                                            </div>
+
+                                            <button style="background:<?=$topbar;?>;" type="submit" id="checkRegisterPass" class="btn btn-block btn-info text-uppercase waves" value="reset password"><text style="color:<?=$topbartext;?>;"><?php echo $language->translate("SUBMIT");?></text></button>
+                                        </form>
+                                    
+                                    </div>
+                                    
+                                    <form style="display: none;" name="createUser" id="registration" action="" method="POST" data-smk-icon="glyphicon-remove-sign">
+                                        
+                                        <h4 class="text-center"><?php echo $language->translate("CREATE_USER");?></h4>
+                                        
+                                        <input type="hidden" name="op" value="register"/>
+                                        <input type="hidden" name="sha1" value=""/>
+
+                                        <div class="form-group">
+
+                                            <input type="text" class="form-control material" name="username" autofocus placeholder="<?php echo $language->translate("USERNAME");?>" autocorrect="off" autocapitalize="off" minlength="3" maxlength="16" required>
+
+                                        </div>
+
+                                        <div class="form-group">
+
+                                            <input type="email" class="form-control material" name="email" placeholder="<?php echo $language->translate("EMAIL");?>">
+
+                                        </div>
+
+                                        <div class="form-group">
+
+                                            <input type="password" class="form-control material" name="password1" placeholder="<?php echo $language->translate("PASSWORD");?>" data-smk-strongPass="weak" required>
+
+                                        </div>
+
+                                        <div class="form-group">
+
+                                            <input type="password" class="form-control material" name="password2" placeholder="<?php echo $language->translate("PASSWORD_AGAIN");?>">
+
+                                        </div>
+
+                                        <button id="registerSubmit" type="submit" class="btn green-bg btn-block btn-warning text-uppercase waves waves-effect waves-float" value="Register"><?php echo $language->translate("REGISTER");?></button>
+
+                                    </form> 
+                                    <?php endif; ?>
+                                    
                                 </div>
                             
                             </div>
@@ -1274,9 +1332,19 @@ endif;
             $( "form[id^='login']" ).toggle();
             $( "form[id^='forgotPassword']" ).toggle();
             $("#switchForgot").toggle();
+            $("#switchCreateUser").toggle();
      
         });
             
+        $("#switchCreateUser").click(function(){
+
+            $( "form[id^='login']" ).toggle();
+            $("#userPassForm").toggle();
+            $("#switchForgot").toggle();
+            $("#switchCreateUser").toggle();
+     
+        });  
+            
         //Sign in
         $(".log-in").click(function(e){
             
@@ -1323,6 +1391,41 @@ endif;
 
         $(document).ready(function(){
             
+            $('#userCreateForm').submit(function(event) {
+
+                var formData = {
+                    'registerPasswordValue' : $('input[name=registerPasswordValue]').val()
+                };
+
+                $.ajax({
+                    type        : 'POST', 
+                    url         : 'register.php', 
+                    data        : formData,
+                    dataType    : 'json',
+                    encode      : true
+                })
+                 
+                    .done(function(data) {
+
+                        console.log(data); 
+                    
+                        if ( ! data.success) {
+
+                            $('#userCreateErrors').html('Wrong Password!'); // add the actual error message under our input
+
+                        } else {
+
+                            $("#userPassForm").toggle();
+                            $("#registration").toggle();     
+
+                        }
+
+                    });
+
+                event.preventDefault();
+                
+            });
+            
             defaultTab = $("li[class^='tab-item active']").attr("id");
            
             if (defaultTab){

+ 5 - 1
lang/de.ini

@@ -149,4 +149,8 @@ TRANSLATIONS_ABOUT = "Wir benötigen immer Hilfe bei der Übersetzung. Sollten S
 UPGRADE = "Upgrade"
 LOADING_COLOR = "Hintergrund Ladebildschirm"
 HOVER_TEXT = "Hover Text"
-COOKIE_PASSWORD = "Enter Cookie Password"
+COOKIE_PASSWORD = "Enter Cookie Password"
+CREATE_USER = "Create Account"
+ENTER_PASSWORD_TO_REGISTER = "Enter Password To Register"
+SUBMIT = "Submit"
+REGISTER_PASSWORD = "Registration Password"

+ 5 - 1
lang/en.ini

@@ -149,4 +149,8 @@ TRANSLATIONS_ABOUT = "We always need help with translations.  If you speak anoth
 UPGRADE = "Upgrade"
 LOADING_COLOR = "Loading Background"
 HOVER_TEXT = "Hover Text"
-COOKIE_PASSWORD = "Enter Cookie Password"
+COOKIE_PASSWORD = "Enter Cookie Password"
+CREATE_USER = "Create Account"
+ENTER_PASSWORD_TO_REGISTER = "Enter Password To Register"
+SUBMIT = "Submit"
+REGISTER_PASSWORD = "Registration Password"

+ 5 - 1
lang/es.ini

@@ -149,4 +149,8 @@ TRANSLATIONS_ABOUT = "We always need help with translations.  If you speak anoth
 UPGRADE = "Upgrade"
 LOADING_COLOR = "Loading Background"
 HOVER_TEXT = "Hover Text"
-COOKIE_PASSWORD = "Enter Cookie Password"
+COOKIE_PASSWORD = "Enter Cookie Password"
+CREATE_USER = "Create Account"
+ENTER_PASSWORD_TO_REGISTER = "Enter Password To Register"
+SUBMIT = "Submit"
+REGISTER_PASSWORD = "Registration Password"

+ 5 - 1
lang/fr.ini

@@ -149,4 +149,8 @@ TRANSLATIONS_ABOUT = "We always need help with translations.  If you speak anoth
 UPGRADE = "Upgrade"
 LOADING_COLOR = "Loading Background"
 HOVER_TEXT = "Hover Text"
-COOKIE_PASSWORD = "Enter Cookie Password"
+COOKIE_PASSWORD = "Enter Cookie Password"
+CREATE_USER = "Create Account"
+ENTER_PASSWORD_TO_REGISTER = "Enter Password To Register"
+SUBMIT = "Submit"
+REGISTER_PASSWORD = "Registration Password"

+ 5 - 1
lang/it.ini

@@ -149,4 +149,8 @@ TRANSLATIONS_ABOUT = "We always need help with translations.  If you speak anoth
 UPGRADE = "Upgrade"
 LOADING_COLOR = "Loading Background"
 HOVER_TEXT = "Hover Text"
-COOKIE_PASSWORD = "Enter Cookie Password"
+COOKIE_PASSWORD = "Enter Cookie Password"
+CREATE_USER = "Create Account"
+ENTER_PASSWORD_TO_REGISTER = "Enter Password To Register"
+SUBMIT = "Submit"
+REGISTER_PASSWORD = "Registration Password"

+ 5 - 1
lang/nl.ini

@@ -149,4 +149,8 @@ TRANSLATIONS_ABOUT = "We always need help with translations.  If you speak anoth
 UPGRADE = "Upgrade"
 LOADING_COLOR = "Loading Background"
 HOVER_TEXT = "Hover Text"
-COOKIE_PASSWORD = "Enter Cookie Password"
+COOKIE_PASSWORD = "Enter Cookie Password"
+CREATE_USER = "Create Account"
+ENTER_PASSWORD_TO_REGISTER = "Enter Password To Register"
+SUBMIT = "Submit"
+REGISTER_PASSWORD = "Registration Password"

+ 27 - 0
register.php

@@ -0,0 +1,27 @@
+<?php
+require_once("user.php");
+
+$errors         = array();
+$data           = array();
+
+    if (empty($_POST['registerPasswordValue']))
+        $errors['registerPasswordValue'] = 'Password is required.';
+    
+    if ($_POST['registerPasswordValue'] != REGISTERPASSWORD)
+        $errors['registerPasswordValue'] = 'Password does not match.';
+
+    if ( ! empty($errors)) {
+
+        $data['success'] = false;
+        $data['errors']  = $errors;
+        
+    } else {
+
+        $data['success'] = true;
+        $data['message'] = 'Success!';
+        
+    }
+
+    echo json_encode($data);
+
+?>

+ 7 - 1
settings.php

@@ -1155,6 +1155,12 @@ endif;
 
                                                     </div>
                                                     
+                                                    <div class="form-group">
+
+                                                        <input type="text" class="form-control material" name="registerPassword" placeholder="<?php echo $language->translate("REGISTER_PASSWORD");?>" value="<?php echo REGISTERPASSWORD;?>">
+
+                                                    </div>
+                                                    
                                                     <div class="form-group">
                                                         <?php  if(MULTIPLELOGIN == "true") : $multipleLogin = "checked"; else : $multipleLogin = ""; endif;?>
                                                         <input id="" class="switcher switcher-success" value="false" name="multipleLogin" type="hidden">
@@ -2392,7 +2398,7 @@ endif;
                 dataType: "json",
                 success: function(github) {
                    
-                    var currentVersion = "0.99992";
+                    var currentVersion = "0.99993";
                     var githubVersion = github.tag_name;
                     var githubDescription = github.body;
                     var githubName = github.name;

+ 1 - 0
user.php

@@ -15,6 +15,7 @@
     if(!empty($databaseConfig['loadingIcon'])) : define('LOADINGICON', $databaseConfig['loadingIcon']); else : define('LOADINGICON', ''); endif;
     if(!empty($databaseConfig['multipleLogin'])) : define('MULTIPLELOGIN', $databaseConfig['multipleLogin']); else : define('MULTIPLELOGIN', 'false'); endif;
     if(!empty($databaseConfig['cookiePassword'])) : define('COOKIEPASSWORD', $databaseConfig['cookiePassword']); else : define('COOKIEPASSWORD', ''); endif;
+    if(!empty($databaseConfig['registerPassword'])) : define('REGISTERPASSWORD', $databaseConfig['registerPassword']); else : define('REGISTERPASSWORD', ''); endif;
     define('FAIL_LOG', 'loginLog.json');
     date_default_timezone_set(TIMEZONE);