Changeset 138

Timestamp:

06/25/2006 05:02:48 PM (4 years ago)

Author:

NilsLindenberg

Message:

further 'fix' for #236

Location:

trunk

Files:

• actions/usersettings.php (modified) (6 diffs)
• setup/install.php (modified) (1 diff)
• wikka.php (modified) (1 diff)

trunk/actions/usersettings.php

@@ -48 +48 @@
 if (!defined('CHANGE_BUTTON_LABEL')) define('CHANGE_BUTTON_LABEL', "Change password");
 if (!defined('REGISTER_BUTTON_LABEL')) define('REGISTER_BUTTON_LABEL', "Register");
-if (!defined('REGISTER_CODE_LABEL')) define('REGISTER_CODE_LABEL', "Register Code:");
+if (!defined('INVITATION_CODE_LABEL')) define('INVITATION_CODE_LABEL', "<abbr title=\"Your should have recieved this phrase from your wiki-admin so you can register here.\">Invitation Code</abbr>:");
 if (!defined('QUICK_LINKS_HEADING')) define('QUICK_LINKS_HEADING', "Quick links");
 if (!defined('QUICK_LINKS')) define('QUICK_LINKS', "See a list of pages you own (MyPages) and pages you've edited (MyChanges).");
@@ -67 +67 @@
 if (!defined('ERROR_INVALID_REVISION_DISPLAY_LIMIT')) define('ERROR_INVALID_REVISION_DISPLAY_LIMIT', "The number of page revisions should not exceed %d.");
 if (!defined('ERROR_INVALID_RECENTCHANGES_DISPLAY_LIMIT')) define('ERROR_INVALID_RECENTCHANGES_DISPLAY_LIMIT', "The number of recently changed pages should not exceed %d.");
-if (!defined('ERROR_REGISTER_CODE_INCORRECT')) define ('ERROR_REGISTER_CODE_INCORRECT', "Sorry, the register-code you entered was not correct!");
+if (!defined('ERROR_INVITATION_CODE_INCORRECT')) define ('ERROR_INVITATION_CODE_INCORRECT', "This is a private wiki, only invited members can register an account! Please contact your wiki-admin for an invitation.");
 if (!defined('NO_REGISTRATION')) define('NO_REGISTRATION', "Registration on this wiki is not possible.");
 if (!defined('REGISTRATION_SUCCEEDED')) define('REGISTRATION_SUCCEEDED', "You have successfully registered!");
@@ -106 +106 @@
 $revisioncount_highlight = '';
 $changescount_highlight = '';
-$registercode_highlight = '';
+$invitation_code_highlight = '';
 
 //create URL
@@ -360 +360 @@
         if (isset($_POST['action']) && ($_POST['action'] == 'login'))
         {
-                print("hallo");
                 // if user name already exists, check password
                 if (isset($_POST['name']) && $existingUser = $this->LoadUser($_POST['name']))
@@ -437 +436 @@
                                         $password_confirm_highlight = INPUT_ERROR_STYLE;
                                         break;
-                                case ($register == '2' && $_POST['registercode'] !==  $this->GetConfigValue('registercode')):
-                                    $error = ERROR_REGISTER_CODE_INCORRECT;
-                        $registercode_highlight = INPUT_ERROR_STYLE;
+                                case ($register == '2' && $_POST['invitation_code'] !==  $this->GetConfigValue('invitation_code')):
+                                    $error = ERROR_INVITATION_CODE_INCORRECT;
+                        $invitation_code_highlight = INPUT_ERROR_STYLE;
                         break;
                                 default: //valid input, create user
@@ -551 +550 @@
 ?>
                <tr>
-                   <td align='right'><?php echo REGISTER_CODE_LABEL ?></td>
-                   <td><input <?php echo $registercode_highlight; ?> type='text' size='20' name='registercode' /></td>
+                   <td align='right'><?php echo INVITATION_CODE_LABEL ?></td>
+                   <td><input <?php echo $invitation_code_highlight; ?> type='text' size='20' name='invitation_code' /></td>
                </tr>
 <?php

trunk/setup/install.php

@@ -305 +305 @@
         test(sprintf(ADDING_CONFIG_ENTRY, 'allow_user_registration'), 1);
         $config["allow_user_registration"] = '1';
-        test(sprintf(ADDING_CONFIG_ENTRY, 'registercode'), 1);
-        $config["registercode"] = '';
+        test(sprintf(ADDING_CONFIG_ENTRY, 'invitation_code'), 1);
+        $config["invitation_code"] = '';
         test(sprintf(ADDING_CONFIG_ENTRY, 'enable_user_host_lookup'), 1);
         $config["enable_user_host_lookup"] = '1';       

trunk/wikka.php

@@ -135 +135 @@
         'require_edit_note'             => '0',         # edit note optional (0, default), edit note required (1) edit note disabled (2)
         'allow_user_registration'       => '1',         # user registration disabled (0), enabled (1) or only possible with register code (2)
-        'registercode'                  => '',          # used by 'allow_user_registration' => '2'
+        'invitation_code'                       => '',          # used by 'allow_user_registration' => '2'
         'enable_user_host_lookup'       => '1',         #lookup of unregistered users' hostname from IP address can be enabled (1, default) or disabled (0) if too slow
         'double_doublequote_html'       => 'safe',