Changeset 169

Timestamp:

09/07/10 12:16:04 (21 months ago)

Author:

gnum

Message:

Fixes #112, all done, non-required course_wiki is set empty in case  http:// only is provided

Location:

trunk

Files:

• actions/add_assignment.php (modified) (1 diff)
• actions/add_educourse.php (modified) (2 diffs)
• actions/join_educourse.php (modified) (1 diff)
• api.php (modified) (1 diff)
• languages/en.php (modified) (2 diffs)
• languages/et.php (modified) (2 diffs)
• views/default/edufeedr/forms/edit_assignment.php (modified) (1 diff)
• views/default/edufeedr/forms/edit_educourse.php (modified) (1 diff)
• views/default/edufeedr/forms/join_educourse.php (modified) (1 diff)

trunk/actions/add_assignment.php

@@ -20 +20 @@
 
                 // Make sure all required data is provided
-                if (empty($blog_post_url) || empty($deadline)) {
+                if (empty($blog_post_url) || empty($deadline) || (trim($blog_post_url) == 'http://')) {
                         /*translation:Please fill all required fields.*/
                         register_error(elgg_echo('edufeedr:error:blank:fields'));

trunk/actions/add_educourse.php

@@ -26 +26 @@
 
     // Make sure all required data is provided
-    if (empty($title) || empty($description) || empty($course_tag) || empty($course_blog) || empty($signup_deadline) || empty($course_starting_date) || empty($course_ending_date)) {
+    if (empty($title) || empty($description) || empty($course_tag) || empty($course_blog) || empty($signup_deadline) || empty($course_starting_date) || empty($course_ending_date) || (trim($course_blog) == 'http://')) {
         /*translation:Please fill all required fields.*/
         register_error(elgg_echo('edufeedr:error:blank:fields'));
@@ -51 +51 @@
         $educourse->course_tag = $course_tag;
         $educourse->course_blog = $course_blog;
+        // As course wiki is not a required field we should strip the default prefill value from it
+        $course_wiki = edufeedrDealWithUrlPlaceholder($course_wiki);
         $educourse->course_wiki = $course_wiki;
         $educourse->signup_deadline = edufeedrDateIntoTimestamp($signup_deadline);

trunk/actions/join_educourse.php

@@ -35 +35 @@
 
                 // Make sure all required data is provided
-                if (empty($firstname) || empty($lastname) || empty($email) || empty($blog)) {
+                if (empty($firstname) || empty($lastname) || empty($email) || empty($blog) || (trim($blog) == 'http://')) {
                         /*translation:Please fill all required fields.*/
                         register_error(elgg_echo('edufeedr:error:blank:fields'));

trunk/api.php

@@ -390 +390 @@
                 return false;
         }
+
+        // Returns empty string in case only a placeholder is provided
+        function edufeedrDealWithUrlPlaceholder($url) {
+                if (trim($url) == 'http://') {
+                        return '';
+                }
+                return $url;
+        }
 ?>

trunk/languages/en.php

@@ -219 +219 @@
         File: /edufeedr/actions/remove_assignment.php
         File: /edufeedr/actions/remove_participant.php
-        Lines: 334, 52, 78, 96, 55, 97, 79, 74, 24, 26
+        Lines: 334, 52, 80, 98, 55, 97, 79, 74, 24, 26
         Text: Error occured, object could not be sent to EduSuckr.
         _missing_translation_
@@ -345 +345 @@
         /* 
         File: /edufeedr/actions/add_educourse.php
-        Lines: 100
+        Lines: 102
         Text: Course added
         _missing_translation_

trunk/languages/et.php

@@ -219 +219 @@
         File: /edufeedr/actions/remove_assignment.php
         File: /edufeedr/actions/remove_participant.php
-        Lines: 334, 52, 78, 96, 55, 97, 79, 74, 24, 26
+        Lines: 334, 52, 80, 98, 55, 97, 79, 74, 24, 26
         Text: Error occured, object could not be sent to EduSuckr.
         _missing_translation_
@@ -345 +345 @@
         /* 
         File: /edufeedr/actions/add_educourse.php
-        Lines: 100
+        Lines: 102
         Text: Course added
         _missing_translation_

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

@@ -12 +12 @@
             $action = 'edufeedr/add_assignment';
                     $title = '';
-                    $blog_post_url = '';
+                    $blog_post_url = 'http://';
                     $deadline = '';
                 }

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

@@ -18 +18 @@
         $description = '';
         $course_tag = '';
-        $course_blog = '';
-        $course_wiki = '';
+        $course_blog = 'http://'; // prefill for URL
+        $course_wiki = 'http://'; // prefill for URL
         $signup_deadline = '';
         $course_starting_date = '';

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

@@ -16 +16 @@
                     $lastname = '';
                     $email = '';
-                    $blog = '';
+                    $blog = 'http://';
                     $blogger = '';
                 }