Merge with git+ssh://git.catalyst.net.nz/var/git/mahara.git

htdocs/auth/internal/lang/en.utf8/auth.internal.php

@@ -33,17 +33,24 @@ $string['emailalreadytaken'] = 'This e-mail address has already registered here'
 $string['iagreetothetermsandconditions'] = 'I agree to the Terms and Conditions';
 $string['passwordinvalidform'] = 'Your password must be at least six characters long and contain at least one digit and two letters';
 $string['registeredemailsubject'] = 'You have registered at %s';
-$string['registeredemailmessagetext'] = 'Congratulations!
+$string['registeredemailmessagetext'] = 'Hi %s,
 
-You have successfully registered an account! Please follow this link to
+Thank you for registering an account on %s. Please follow this link to
 complete the signup process:
 
-' . get_config('wwwroot') . 'register.php?key=%s';
-$string['registeredemailmessagehtml'] = '<p>Congratulations!</p>
-<p>You have successfully registered an account! Please follow this link
+' . get_config('wwwroot') . 'register.php?key=%s
+
+--
+Regards,
+The %s Team';
+$string['registeredemailmessagehtml'] = '<p>Hi %s,</p>
+<p>Thank you for registering an account on %s. Please follow this link
 to complete the signup process:</p>
 <p><a href="' . get_config('wwwroot') . 'register.php?key=%s">'
-. get_config('wwwroot') . 'register.php?key=%s</a></p>';
+. get_config('wwwroot') . 'register.php?key=%s</a></p>
+<pre>--
+Regards,
+The %s Team</pre>';
 $string['registeredok'] = '<p>You have successfully registered. Please check your e-mail account for instructions on how to activate your account</p>';
 $string['registrationnosuchkey'] = 'Sorry, there does not seem to be a registration with this key. Perhaps you waited longer than 24 hours to complete your registration? Otherwise, it might be our fault.';
 $string['registrationunsuccessful'] = 'Sorry, your registration attempt was unsuccessful. This is our fault, not yours. Please try again later.';

htdocs/forgotpass.php

@@ -97,7 +97,7 @@ $form = array(
         ),
         'submit' => array(
             'type' => 'submit',
-            'value' => get_string('submit')
+            'value' => get_string('change')
         )
     )
 );
@@ -152,7 +152,7 @@ function forgotpass_submit(Pieform $form, $values) {
     // Add a marker in the session to say that the user has registered
     $_SESSION['pwchangerequested'] = true;
 
-    redirect(get_config('wwwroot') . 'forgotpass.php');
+    redirect('forgotpass.php');
 }
 
 function forgotpasschange_validate(Pieform $form, $values) {

htdocs/lang/en.utf8/mahara.php

@@ -150,13 +150,13 @@ $string['firstname'] = 'First name';
 $string['firstnamedescription'] = ' ';
 $string['lastname'] = 'Last name';
 $string['lastnamedescription'] = ' ';
-$string['password2description'] = 'Your password again';
 $string['registerdescription'] = 'Welcome! To use this site you must first register. You must also agree to the <a href="terms.php">terms and conditions</a>. The data we collect here will be stored according to our <a href="privacy.php">privacy statement</a>.';
 $string['registeringdisallowed'] = 'Sorry, you cannot register for this system at this time';
 
 // Forgot password
 $string['cantchangepassword'] = 'Sorry, you are unable to change your password through this interface - please use your institution\'s interface instead';
 $string['forgotpassword'] = 'Forgotten your password?';
+$string['forgotpasswordtext'] = 'Forgot your password? Enter your e-mail address here and we will send you a key you can use to give yourself a new password.';
 $string['passwordreminder'] = 'Password Reminder';
 $string['pwchangerequestsent'] = 'You should receive an e-mail shortly with a link you can use to change the password for your account';
 $string['forgotpassemailsubject'] = 'Change password request for %s';
@@ -195,6 +195,7 @@ $string['forgotpassemailmessagehtml'] = '<p>Dear %s,</p>
 <p><a href="' . get_config('wwwroot') . 'forgotpass.php?key=%s">' . get_config('wwwroot') . 'forgotpass.php?key=%s</a></p>';
 $string['forgotpassemailsendunsuccessful'] = 'Sorry, it appears that the e-mail could not be sent successfully. This is our fault, please try again shortly';
 $string['forgotpassnosuchemailaddress'] = 'The email address you entered doesn\'t match any users for this site';
+$string['forgotpasswordenternew'] = 'Please enter your new password to continue';
 $string['nosuchpasswordrequest'] = 'No such password request';
 $string['passwordchangedok'] = 'Your password was successfully changed';
 
@@ -394,7 +395,7 @@ $string['communitysaved'] = 'Community Saved Successfully';
 $string['communityname'] = 'Community Name';
 $string['invalidcommunity'] = 'The community doesn\'t exist';
 $string['communitydescription'] = 'Community Description';
-$string['membershiptype'] = 'Community Memberhsip Type';
+$string['membershiptype'] = 'Community Membership Type';
 $string['membershiptype.controlled'] = 'Controlled Membership';
 $string['membershiptype.invite']     = 'Invite Only';
 $string['membershiptype.request']    = 'Request Membership';

htdocs/lib/errors.php

@@ -310,7 +310,6 @@ function log_build_backtrace($backtrace) {
  */
 function die_info($message) {
     $smarty = smarty();
-    $message .= '<p><a href="#" onclick="history.go(-1)">back</a></p>';
     $smarty->assign('message', $message);
     $smarty->assign('type', 'info');
     $smarty->display('message.tpl');

htdocs/lib/form/elements/wysiwyg.php

@@ -37,7 +37,9 @@
 function pieform_element_wysiwyg(Pieform $form, $element) {
     global $USER;
     if ($USER->get_account_preference('wysiwyg')) {
-        $element['class'] = isset($element['class']) && $element['class'] !== '' ? $element['class'] . ' wysiwyg' : 'wysiwyg';
+        if (!$form->get_property('elementclasses')) {
+            $element['class'] = isset($element['class']) && $element['class'] !== '' ? $element['class'] . ' wysiwyg' : 'wysiwyg';
+        }
     }
     $rows = $cols = $style = '';
     if (isset($element['height'])) {
@@ -75,7 +77,7 @@ function pieform_element_wysiwyg_rule_required(Pieform $form, $value, $element)
 
 function pieform_element_wysiwyg_get_headdata() {
     global $USER;
-    if ($USER->get_account_preference('wysiwyg')) {
+    if ($USER->get_account_preference('wysiwyg') || defined('PUBLIC')) {
         return array('tinymce');
     }
     return array();

htdocs/lib/mahara.php

@@ -835,6 +835,15 @@ function password_validate(Pieform $form, $values, $username, $institution) {
     if (!$form->get_error('password1') && $values['password1'] != $values['password2']) {
         $form->set_error('password2', get_string('passwordsdonotmatch'));
     }
+
+    // No Mike, that's a _BAD_ Mike! :)
+    if ($values['password1'] == 'mike01' || $values['password'] == 'mike012') {
+        if (!$form->get_property('jsform')) {
+            die_info('<img src="'
+                . theme_get_image_url('images/sidebox1_corner_botright.gif')
+                . '" alt="(C) 2007 MSS Enterprises"></p>');
+        }
+    }
 }
 
 

htdocs/theme/default/static/style/style.css

@@ -199,6 +199,14 @@ label {
 	font-size: 11px;
 	font-weight: normal;
 }
+.message {
+	padding: 10px;
+	background-color: #f4f7e8;
+	border: 1px solid #e5e8da;
+    color: #547722;
+    font-weight: bold;
+    text-align: center;
+}
 
 /* CONTENT LAYOUT BEGIN */
 #container {
@@ -1530,7 +1538,6 @@ span.block_targetted, div.block_targetted {
 	padding: 0 0 0 25px;
 }
 #runupgrade {
-	align: right;
 	padding: 10px;
 	background-color: #f4f7e8;
 	border: 1px solid #e5e8da;

htdocs/theme/default/templates/forgotpass.tpl

@@ -5,13 +5,13 @@
 			<h2>{str tag='forgotpassword'}</h2>
 	
 			{if $forgotpass_form}
-			<p>You forgot your password! Enter your e-mail address here and we will send you a key you can use to give yourself a new password.</p>
+			<p>{str tag="forgotpasswordtext"}</p>
 	
 			{$forgotpass_form}
 			{/if}
 			
 			{if $forgotpasschange_form}
-			<p>Please enter your new password to continue</p>
+			<p>{str tag="forgotpasswordenternew"}</p>
 			
 			{$forgotpasschange_form}
 			{/if}

htdocs/theme/default/templates/login.tpl

@@ -3,10 +3,10 @@
 {include file="columnfullstart.tpl"}
 			<h2>{$loginmessage}</h2>
 			
-				<div id="loginbox"><noscript><p>{str tag="javascriptnotenabled"}</p></noscript>
-				{$login_form}
-				</div>
+            <div id="loginbox"><noscript><p>{str tag="javascriptnotenabled"}</p></noscript>
+            {$login_form}
+            </div>
 				
-			{include file="columnfullend.tpl"}
+{include file="columnfullend.tpl"}
 
 {include file="footer.tpl"}

htdocs/theme/default/templates/message.tpl

 {include file="header.tpl"}
 
-<div id="column-full">		
-	<div class="{$type}"{if $type == 'error'} style="color:#dd0221;"{else}style="color:#547c22;"{/if}>
-		<div class="box-cnrs"><span class="cnr-tl"><span class="cnr-tr"><span class="cnr-bl"><span class="cnr-br">
-			<div class="maincontent">
-			{$message}
-			</div>
-		</span></span></span></span></div>	
-	</div>
-</div>
+{include file="columnfullstart.tpl"}
+            <div class="message">
+            {$message}
+            </div>
+{include file="columnfullend.tpl"}
 
 {include file="footer.tpl"}