Changeset 159

Timestamp:

09/02/10 16:29:03 (17 months ago)

Author:

gnum

Message:

Fixes #105, also fixed one css bug

Location:

trunk

Files:

• actions/join_educourse.php (modified) (1 diff)
• views/default/edufeedr/css.php (modified) (3 diffs)
• views/default/edufeedr/educourse_assignments.php (modified) (1 diff)
• views/default/edufeedr/forms/join_educourse.php (modified) (3 diffs)

trunk/actions/join_educourse.php

@@ -20 +20 @@
                 $_SESSION['join_email'] = $email;
                 $_SESSION['join_blog'] = $blog;
+
+        //Captcha stuff
+                if (is_plugin_enabled('captcha')) {
+                        if (!isloggedin()) {
+                $captcha_token = get_input('captcha_token');
+                $captcha_input = get_input('captcha_input');
+
+                if (!(($captcha_token) && (captcha_verify_captcha($captcha_input, $captcha_token)))) {
+                    register_error(elgg_echo("captcha:captchafail"));
+                                forward('pg/edufeedr/join/' . $guid);
+                }
+                        }
+                }
 
                 // Make sure all required data is provided

trunk/views/default/edufeedr/css.php

@@ -70 +70 @@
         background: #eee;
         padding: 5px;
-    width: 730px;
 }
 
@@ -189 +188 @@
         padding-right: 1px;
     width: 24px;
-    height: 16px;
+    heighs: 16px;
 }
 
@@ -297 +296 @@
     margin-top: 5px;
 }
+
+.edufeedr_similar_width {
+    width: 730px;
+}

trunk/views/default/edufeedr/educourse_assignments.php

@@ -7 +7 @@
                 $body = '<div class="educourse">';
 
-                $body .= '<h3>' . $vars['entity']->title . '</h3>';
+                $body .= '<h3 class="edufeedr_similar_width">' . $vars['entity']->title . '</h3>';
                 if ($vars['entity']->canEdit() && edufeedrCanEditEducourse($vars['entity'])) {
                         $body .= '<div class="edufeedr_educourse_assignment_controls edufeedr_action_header">';

trunk/views/default/edufeedr/forms/join_educourse.php

@@ -49 +49 @@
                 $blog_label = elgg_echo('edufeedr:label:blog');
                 $blog_input = elgg_view('input/url', array('internalname' => 'join_blog', 'value' => $blog));
-                
+                $blogger_part = "";
                 if (!strcmp($action,'edufeedr/edit_participant')) {
+                        $blogger_part .= '<p>';
                     /*translation:Blogger (if any)*/
-                    $blogger_label = elgg_echo('edufeedr:label:blogger');
-                    $blogger_input = elgg_view('input/url', array('internalname' => 'join_blogger', 'value' => $blogger));
+                    $blogger_part .= '<label>' . elgg_echo('edufeedr:label:blogger') . '</label><br />';
+                        $blogger_part .= elgg_view('input/url', array('internalname' => 'join_blogger', 'value' => $blogger));
+                        $blogger_part .= '</p>';
                 }
 
@@ -69 +71 @@
                         $entity_hidden .= elgg_view('input/hidden', array('internalname' => 'participant_id', 'value' => $vars['participant_id']));
                 $field_required = elgg_view('input/edufeedr_required');
+                // Captcha
+                $captcha_input = "";
+                if (!isloggedin() && is_plugin_enabled('captcha')) {
+                        $captcha_input .= elgg_view('input/captcha');
+                }
 
                 $form_body = <<<EOT
@@ -90 +97 @@
             $blog_input
                 </p>
-                <p>
-            <label>$blogger_label</label><br />
-            $blogger_input
-                </p>
+            $blogger_part
+            $captcha_input
                 <p>
                         $entity_hidden