http://www.atutor.ca/atutor/mantis/view.php?id=4473

1. create an author account
2. suggest user to login with admin or author account

diff --git a/docs/install/include/step3.php b/docs/install/include/step3.php
index 858ac6b..e1ac3fc 100644 (file)
--- a/docs/install/include/step3.php
+++ b/docs/install/include/step3.php
@@ -16,10 +16,21 @@ if(isset($_POST['submit']) && ($_POST['action'] == 'process')) {
        unset($errors);
 
        $_POST['admin_username'] = trim($_POST['admin_username']);
-       $_POST['admin_email']    = trim($_POST['admin_email']);
-       $_POST['site_name']      = trim($_POST['site_name']);
-       $_POST['email']          = trim($_POST['email']);
-
+       $_POST['admin_email'] = trim($_POST['admin_email']);
+       $_POST['site_name'] = trim($_POST['site_name']);
+       $_POST['email'] = trim($_POST['email']);
+       $_POST['account_username'] = trim($_POST['account_username']);
+       $_POST['account_email'] = trim($_POST['account_email']);
+       $_POST['account_fname'] = trim($_POST['account_fname']);
+       $_POST['account_lname'] = trim($_POST['account_lname']);
+       $_POST['account_organization'] = trim($_POST['account_organization']);
+       $_POST['account_phone'] = trim($_POST['account_phone']);
+       $_POST['account_address'] = trim($_POST['account_address']);
+       $_POST['account_city'] = trim($_POST['account_city']);
+       $_POST['account_province'] = trim($_POST['account_province']);
+       $_POST['account_country'] = trim($_POST['account_country']);
+       $_POST['account_postal_code'] = trim($_POST['account_postal_code']);
+       
        /* Super Administrator Account checking: */
        if ($_POST['admin_username'] == ''){
                $errors[] = 'Administrator username cannot be empty.';
@@ -48,16 +59,93 @@ if(isset($_POST['submit']) && ($_POST['action'] == 'process')) {
                $errors[] = 'Contact email is not valid.';
        }
 
+       /* Personal Account checking: */
+       if ($_POST['account_username'] == ''){
+               $errors[] = 'Personal Account Username cannot be empty.';
+       } else {
+               /* check for special characters */
+               if (!(preg_match("/^[a-zA-Z0-9_]([a-zA-Z0-9_])*$/i", $_POST['account_username']))){
+                       $errors[] = 'Personal Account Username is not valid.';
+               } else {
+                       if ($_POST['account_username'] == $_POST['admin_username']) {
+                               $errors[] = 'That Personal Account Username is already being used for the Administrator account, choose another.';
+                       }
+               }
+       }
+       if ($_POST['form_account_password_hidden'] == '') {
+               $errors[] = 'Personal Account Password cannot be empty.';
+       }
+       if ($_POST['account_email'] == '') {
+               $errors[] = 'Personal Account email cannot be empty.';
+       } else if (!preg_match("/^[a-z0-9\._-]+@+[a-z0-9\._-]+\.+[a-z]{2,6}$/i", $_POST['account_email'])) {
+               $errors[] = 'Invalid Personal Account email is not valid.';
+       }
+       if ($_POST['account_fname'] == '') {
+               $errors[] = 'Personal Account First Name cannot be empty.';
+       }
+       if ($_POST['account_lname'] == '') {
+               $errors[] = 'Personal Account Last Name cannot be empty.';
+       }
+       if ($_POST['account_organization'] == '') {
+               $errors[] = 'Personal Account Organization cannot be empty.';
+       }
+       if ($_POST['account_phone'] == '') {
+               $errors[] = 'Personal Account Phone cannot be empty.';
+       }
+       if ($_POST['account_address'] == '') {
+               $errors[] = 'Personal Account Address cannot be empty.';
+       }
+       if ($_POST['account_city'] == '') {
+               $errors[] = 'Personal Account City cannot be empty.';
+       }
+       if ($_POST['account_province'] == '') {
+               $errors[] = 'Personal Account Province cannot be empty.';
+       }
+       if ($_POST['account_country'] == '') {
+               $errors[] = 'Personal Account Country cannot be empty.';
+       }
+       if ($_POST['account_postal_code'] == '') {
+               $errors[] = 'Personal Account Postal Code cannot be empty.';
+       }
+       
        if (!isset($errors)) {
                $db = @mysql_connect($_POST['step2']['db_host'] . ':' . $_POST['step2']['db_port'], $_POST['step2']['db_login'], urldecode($_POST['step2']['db_password']));
                @mysql_select_db($_POST['step2']['db_name'], $db);
 
-               $status = 3; // for instructor account
-
-               $sql = "INSERT INTO ".$_POST['step2']['tb_prefix']."users (login, password, user_group_id, email, web_service_id, create_date)
-               VALUES ('$_POST[admin_username]', '$_POST[form_admin_password_hidden]', 1, '$_POST[admin_email]', '".substr(md5(uniqid(rand(), true)),0,32)."', NOW())";
+               // for admin account
+               $sql = "INSERT INTO ".$_POST['step2']['tb_prefix']."users 
+                       (login, password, user_group_id, email, web_service_id, create_date)
+                       VALUES ('".$addslashes($_POST[admin_username])."', 
+                               '".$_POST[form_admin_password_hidden]."', 
+                               1, 
+                               '".$addslashes($_POST[admin_email])."', 
+                               '".substr(md5(uniqid(rand(), true)),0,32)."', 
+                               NOW())";
                $result= mysql_query($sql, $db);
 
+               // for author account
+               $sql = "INSERT INTO ".$_POST['step2']['tb_prefix']."users
+               (login, password, user_group_id, first_name, last_name, email, is_author, organization, phone,
+               address, city, province, country, postal_code, web_service_id, status, create_date)
+               VALUES ('".$addslashes($_POST['account_username'])."',
+               '".$_POST['form_account_password_hidden']."',
+               2,
+               '".$addslashes($_POST['account_fname'])."',
+               '".$addslashes($_POST['account_lname'])."', 
+               '".$addslashes($_POST['account_email'])."',
+               1,
+               '".$addslashes($_POST['account_organization'])."',
+               '".$addslashes($_POST['account_phone'])."',
+               '".$addslashes($_POST['account_address'])."',
+               '".$addslashes($_POST['account_city'])."',
+               '".$addslashes($_POST['account_province'])."',
+               '".$addslashes($_POST['account_country'])."',
+               '".$addslashes($_POST['account_postal_code'])."',
+                      '".substr(md5(uniqid(rand(), true)),0,32)."', 
+               1, 
+               now())";
+               $result = mysql_query($sql ,$db);
+               
                $_POST['site_name'] = $addslashes($_POST['site_name']);
                $sql = "INSERT INTO ".$_POST['step2']['tb_prefix']."config (name, value) VALUES ('site_name', '$_POST[site_name]')";
                $result = mysql_query($sql ,$db);
@@ -71,7 +159,19 @@ if(isset($_POST['submit']) && ($_POST['action'] == 'process')) {
                unset($_POST['admin_email']);
                unset($_POST['email']);
                unset($_POST['site_name']);
-
+               unset($_POST['account_username']);
+               unset($_POST['form_account_password_hidden']);
+               unset($_POST['account_email']);
+               unset($_POST['account_fname']);
+               unset($_POST['account_lname']);
+               unset($_POST['account_organization']);
+               unset($_POST['account_phone']);
+               unset($_POST['account_address']);
+               unset($_POST['account_city']);
+               unset($_POST['account_province']);
+               unset($_POST['account_country']);
+               unset($_POST['account_postal_code']);
+                                                                                               
                unset($errors);
                unset($_POST['submit']);
                unset($action);
@@ -105,8 +205,15 @@ if (isset($_POST['step1']['old_version']) && $_POST['upgrade_action']) {
 <script type="text/javascript">
 function encrypt_password()
 {
-       document.form.form_admin_password_hidden.value = hex_sha1(document.form.admin_password.value);
-       document.form.admin_password.value = "";
+       if (document.form.admin_password.value != "") {
+               document.form.form_admin_password_hidden.value = hex_sha1(document.form.admin_password.value);
+               document.form.admin_password.value = "";
+       }
+       
+       if (document.form.account_password.value != "") {
+               document.form.form_account_password_hidden.value = hex_sha1(document.form.account_password.value);
+               document.form.account_password.value = "";
+       }
 }
 </script>
 
@@ -166,6 +273,65 @@ function encrypt_password()
                </tr>
                </table>
 
+       <br />
+
+               <table width="70%" class="tableborder" cellspacing="0" cellpadding="1" align="center">
+               <tr>
+                       <th colspan="2">Author Account</th>
+               </tr>
+               <tr>
+                       <td colspan="2" class="row1">You will need an author account to create lessons.</td>
+               </tr>
+               <tr>
+                       <td class="row1"><div class="required" title="Required Field">*</div><b><label for="account_username">Username:</label></b><br />
+                       May contain only letters, numbers, and underscores.</td>
+                       <td class="row1"><input type="text" name="account_username" id="account_username" maxlength="20" size="20" value="<?php if (!empty($_POST['account_username'])) { echo stripslashes(htmlspecialchars($_POST['account_username'])); } ?>" class="formfield" /></td>
+               </tr>
+               <tr>
+                       <td class="row1"><div class="required" title="Required Field">*</div><b><label for="account_password">Password:</label></b></td>
+                       <td class="row1"><input type="text" name="account_password" id="account_password" maxlength="15" size="15" class="formfield" /></td>
+               </tr>
+               <tr>
+                       <td class="row1"><div class="required" title="Required Field">*</div><b><label for="account_email">Email:</label></b></td>
+                       <td class="row1"><input type="text" name="account_email" id="account_email" size="40" maxlength="60" value="<?php if (!empty($_POST['account_email'])) { echo stripslashes(htmlspecialchars($_POST['account_email'])); } ?>" class="formfield" /></td>
+               </tr>
+               <tr>
+                       <td class="row1"><div class="required" title="Required Field">*</div><b><label for="account_fname">First Name:</label></b></td>
+                       <td class="row1"><input type="text" name="account_fname" id="account_fname" size="40" maxlength="60" value="<?php if (!empty($_POST['account_fname'])) { echo stripslashes(htmlspecialchars($_POST['account_fname'])); } ?>" class="formfield" /></td>
+               </tr>
+               <tr>
+                       <td class="row1"><div class="required" title="Required Field">*</div><b><label for="account_lname">Last Name:</label></b></td>
+                       <td class="row1"><input type="text" name="account_lname" id="account_lname" size="40" maxlength="60" value="<?php if (!empty($_POST['account_lname'])) { echo stripslashes(htmlspecialchars($_POST['account_lname'])); } ?>" class="formfield" /></td>
+               </tr>
+               <tr>
+                       <td class="row1"><div class="required" title="Required Field">*</div><b><label for="">Organization:</label></b></td>
+                       <td class="row1"><input type="text" name="account_organization" id="account_organization" size="40" maxlength="60" value="<?php if (!empty($_POST['account_organization'])) { echo stripslashes(htmlspecialchars($_POST['account_organization'])); } ?>" class="formfield" /></td>
+               </tr>
+               <tr>
+                       <td class="row1"><div class="required" title="Required Field">*</div><b><label for="">Phone:</label></b></td>
+                       <td class="row1"><input type="text" name="account_phone" id="account_phone" size="40" maxlength="60" value="<?php if (!empty($_POST['account_phone'])) { echo stripslashes(htmlspecialchars($_POST['account_phone'])); } ?>" class="formfield" /></td>
+               </tr>
+               <tr>
+                       <td class="row1"><div class="required" title="Required Field">*</div><b><label for="">Address:</label></b></td>
+                       <td class="row1"><input type="text" name="account_address" id="account_address" size="40" maxlength="60" value="<?php if (!empty($_POST['account_address'])) { echo stripslashes(htmlspecialchars($_POST['account_address'])); } ?>" class="formfield" /></td>
+               </tr>
+               <tr>
+                       <td class="row1"><div class="required" title="Required Field">*</div><b><label for="">City:</label></b></td>
+                       <td class="row1"><input type="text" name="account_city" id="account_city" size="40" maxlength="60" value="<?php if (!empty($_POST['account_city'])) { echo stripslashes(htmlspecialchars($_POST['account_city'])); } ?>" class="formfield" /></td>
+               </tr>
+               <tr>
+                       <td class="row1"><div class="required" title="Required Field">*</div><b><label for="">Province:</label></b></td>
+                       <td class="row1"><input type="text" name="account_province" id="account_province" size="40" maxlength="60" value="<?php if (!empty($_POST['account_province'])) { echo stripslashes(htmlspecialchars($_POST['account_province'])); } ?>" class="formfield" /></td>
+               </tr>
+               <tr>
+                       <td class="row1"><div class="required" title="Required Field">*</div><b><label for="">Country:</label></b></td>
+                       <td class="row1"><input type="text" name="account_country" id="account_country" size="40" maxlength="60" value="<?php if (!empty($_POST['account_country'])) { echo stripslashes(htmlspecialchars($_POST['account_country'])); } ?>" class="formfield" /></td>
+               </tr>
+               <tr>
+                       <td class="row1"><div class="required" title="Required Field">*</div><b><label for="">Postal Code:</label></b></td>
+                       <td class="row1"><input type="text" name="account_postal_code" id="account_postal_code" size="40" maxlength="60" value="<?php if (!empty($_POST['account_postal_code'])) { echo stripslashes(htmlspecialchars($_POST['account_postal_code'])); } ?>" class="formfield" /></td>
+               </tr>
+               </table>
        <br />
        <br />
        <div align="center"><input type="submit" class="button" value=" Next &raquo;" name="submit" onclick="return encrypt_password();" /></div>

diff --git a/docs/install/include/step7.php b/docs/install/include/step7.php
index 973d97e..b6ad785 100644 (file)
--- a/docs/install/include/step7.php
+++ b/docs/install/include/step7.php
@@ -18,7 +18,7 @@ print_progress($step);
 <p><strong>Congratulations on your installation of AContent <?php echo $new_version; ?><i>!</i></strong></p>
 
 <p>For security reasons once you have confirmed that AContent has installed correctly, you should delete the <kbd>install/</kbd> directory,
-and reset the permissions on the config.inc.php file to read only.</p>
+and reset the permissions on the config.inc.php file to read only. Use the administrator or author account created in the earlier step to login.</p>
 
 <br />