Merge branch 'develop' of git.unl.edu:iim/PlanetRed into develop

plugins/cas_auth_unl/start.php

@@ -81,8 +81,8 @@
     }
 
     function cas_auth_unl_getemail_page_handler($page) {
-        if (!isloggedin()) {
-            page_draw(elgg_echo('Your Email'), elgg_view("account/forms/getemail")); 
+        if (!elgg_get_logged_in_user_entity()) {
+            echo elgg_view_page(elgg_echo('Your Email'), elgg_view("account/forms/getemail")); 
         } else {
             forward();
         }

plugins/cas_auth_unl/views/default/account/forms/getemail.php

@@ -17,7 +17,7 @@ $theiremail = get_input('e');
 <div class="three_col left">
     <p>We just want to make sure we have your correct e-mail and then we'll log you in.</p>
     <?php 
-    $form_body = "<p><label>" . elgg_echo('email') . "<br />" . elgg_view('input/text' , array('internalname' => 'email', 'class' => "general-textarea", 'value' => $theiremail)) . "</label><br />";
+    $form_body = "<p><label>" . elgg_echo('email') . "<br />" . elgg_view('input/text' , array('name' => 'email', 'class' => "general-textarea", 'value' => $theiremail)) . "</label><br />";
     $form_body .= elgg_view('input/submit', array('value' => elgg_echo('Complete Registration and Login!'))) ."</p>";
     
     $ts = time();