Changeset 1438

Timestamp:

12/10/07 07:59:43 (10 months ago)

Author:

misja

Message:

Misja Hoebe <misja@curverider.co.uk> Merge r1431, r1434, r1435, r1436, r1437 in 0.9 branch

Files:

• releases/0.9/mod/blog/lib.php (modified) (3 diffs)
• releases/0.9/mod/blog/widget_css (copied) (copied from devel/mod/blog/widget_css)
• releases/0.9/mod/friend/lib.php (modified) (1 diff)
• releases/0.9/mod/invite/forgotten_password.php (modified) (1 diff)
• releases/0.9/mod/invite/lib.php (modified) (2 diffs)
• releases/0.9/mod/invite/lib/content_invite.php (copied) (copied from devel/mod/invite/lib/content_invite.php)
• releases/0.9/mod/invite/lib/invite_actions.php (modified) (2 diffs)

releases/0.9/mod/blog/lib.php

@@ -316 +316 @@
-  $blog_posts= widget_get_data("blog_posts", $widget->ident);
-
+  $style .= "<style type=\"text/css\">";
+  $style .= str_replace('{{url}}', $CFG->wwwroot, file_get_contents($CFG->dirroot . "mod/blog/widget_css"));
+  $style .= "</style>";
+  
-  $body= "";
-
+
+
+
+
-  if (empty ($blog_id)) {
-    global $page_owner;
@@ -326 +333 @@
-  }
-
+  $body .='<div class="weblog-post">';
-  $where= run("users:access_level_sql_where", $_SESSION['userid']);
-  $posts= get_records_sql("select * from " . $CFG->prefix . "weblog_posts where ($where) and weblog = $blog_id order by posted desc limit $blog_posts");
@@ -331 +339 @@
-  if (is_array($posts) && !empty ($posts)) {
-    foreach ($posts as $post) {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-  }

releases/0.9/mod/friend/lib.php

@@ -44 +44 @@
-                                       'html' => a_href( "{$CFG->wwwroot}{$friends_username}/friends/requests",
-                                                          __gettext("Friendship requests")));
-
-               if ($CFG->publicinvite == true && ($CFG->maxusers == 0 || (count_users('person') < $CFG->maxusers))) {
-                    $PAGE->menu_sub[] = array( 'name' => 'friend:invite',
-                                               'html' => a_href( "{$CFG->wwwroot}invite/",
-                                                                  __gettext("Invite a friend")));
-                }
-
-            }

releases/0.9/mod/invite/forgotten_password.php

@@ -16 +16 @@
-        $body = run("invite:password:request");
-        
-, null, ' '
+
-
-?>

releases/0.9/mod/invite/lib.php

@@ -8 +8 @@
- */
-
- function invite_pagesetup(){
-    require_once (dirname(__FILE__)."/lib/invite_config.php");
- }
-
- function invite_init(){
-  global $CFG, $function;
-  // Actions
+      $function['invite:init'][] = $CFG->dirroot . "mod/invite/lib/invite_config.php";
-      $function['invite:init'][] = $CFG->dirroot . "mod/invite/lib/invite_actions.php";
-
-  // Introductory text
-content/invite/
+mod/invite/lib/content_
-
-  // Allow user to invite a friend
@@ -39 +36 @@
-
- }
+
+function invite_pagesetup() {
+    global $PAGE;
+
+    if (defined('context') && context == 'network') {
+        if (!maxusers_limit()) {
+            $PAGE->menu_sub[] = array( 'name' => 'invite:friend',
+                                       'html' => a_href(get_url(null, 'invite::invite'),
+                                                        __gettext("Invite a friend")));
+        }
+    }
+}
+
+function invite_url($object_id, $object_type) {
+    $url = null;
+
+    switch ($object_type) {
+        case 'invite::':
+        case 'invite::invite':
+            global $CFG;
+            $url = $CFG->wwwroot . 'mod/invite/';
+            break;
+    }
+
+    return $url;
+}
-?>

releases/0.9/mod/invite/lib/invite_actions.php

@@ -2 +2 @@
-global $USER;
-global $CFG;
-
-// Ensure that config options are available
-require_once (dirname(__FILE__)."/invite_config.php");
-
-// Kill all old invitations
@@ -89 +86 @@
-                 break;
-             }
+             if (empty($name)) {
+                $messages[] = __gettext('Error! You must provide a name.');
+                break;
+             }
-             if (empty($over13)) {
-                 $messages[] = __gettext("You must indicate that you are at least 13 years old to join.");