Changeset 1490

Timestamp:

12/23/07 22:25:28 (7 months ago)

Author:

misja

Message:

Misja Hoebe <misja@curverider.co.uk> Merge r1476, r1477, r1478, r1479, r1480, r1481, r1482, r1483, r1484, r1485, r1486, r1487, r1488, r1489 into 0.9 branch

Files:

• releases/0.9/doc/INSTALL (modified) (1 diff)
• releases/0.9/doc/install.doc (modified) (previous)
• releases/0.9/doc/install.pdf (modified) (previous)
• releases/0.9/install.php (modified) (1 diff)
• releases/0.9/mod/blog/lib.php (modified) (1 diff)
• releases/0.9/mod/community/lib.php (modified) (1 diff)
• releases/0.9/mod/community/lib/community_member_add.php (modified) (3 diffs)
• releases/0.9/mod/contenttoolbar/contenttoolbar_video_wizard.php (modified) (1 diff)
• releases/0.9/mod/contenttoolbar/js/edit.js (modified) (1 diff)
• releases/0.9/mod/contenttoolbar/lib.php (modified) (2 diffs)
• releases/0.9/mod/contenttoolbar/templates/video_widget.html (modified) (1 diff)
• releases/0.9/mod/contenttoolbar/templates/video_wizard.html (modified) (1 diff)
• releases/0.9/mod/elggadmin/index.php (modified) (1 diff)
• releases/0.9/mod/elggadmin/lib/elggadmin.inc.php (modified) (3 diffs)
• releases/0.9/mod/invite/lib.php (modified) (2 diffs)
• releases/0.9/mod/invite/lib/invite_actions.php (modified) (1 diff)
• releases/0.9/mod/pages/index.php (modified) (2 diffs)
• releases/0.9/mod/pages/lib.php (modified) (2 diffs)
• releases/0.9/mod/pages/lib/pages.inc.php (modified) (6 diffs)
• releases/0.9/mod/users/lib.php (modified) (1 diff)

releases/0.9/doc/INSTALL

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

releases/0.9/install.php

@@ -541 +541 @@
-    require_once($CFG->dirroot.'lib/adodb/adodb.inc.php');
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    }
-

releases/0.9/mod/blog/lib.php

@@ -338 +338 @@
-
-  if (is_array($posts) && !empty ($posts)) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-  }
-  $body .= '</div>';

releases/0.9/mod/community/lib.php

@@ -142 +142 @@
-
-    // Add membership requests to the personal network page
-
+isloggedin() && 
-          $PAGE->menu_sub[] = array( 'name' => 'membership:invites',
-                                   'html' => a_href( "{$CFG->wwwroot}{$username}/communities/invitations",

releases/0.9/mod/community/lib/community_member_add.php

@@ -7 +7 @@
- * Created on May 7, 2007
- *
-és Ramírez Aragó
-ón Somos má
+ￜs Ramￜrez Aragￜ
+ￜn Somos mￜ
- */
- global $USER;
@@ -29 +29 @@
-          if (user_flag_get("emailnotifications", $owner->ident)) {
-            $message_body= sprintf(__gettext("%s has joined %s!\n\nTo visit this user's profile, click on the following link:\n\n\t" .
-"_communities/members.php?owner=" . $friend_id
+$friend->username . "/community/members"
-            $title= sprintf(__gettext("New %s member"), $friend->name);
-            notify_user($owner->ident, $title, $message_body);
@@ -38 +38 @@
-            if (user_flag_get("emailnotifications", $owner->ident)) {
-              $message_body= sprintf(__gettext("%s has applied to join %s!\n\nTo visit this user's profile, click on the following link:\n\n\t" .
-"_communities/members.php?owner=" . $friend_id
+$friend->username . "/community/members"
-              $title= sprintf(__gettext("New %s member request"), $friend->name);
-              notify_user($owner->ident, $title, $message_body);

releases/0.9/mod/contenttoolbar/contenttoolbar_video_wizard.php

@@ -26 +26 @@
-
-$explanation = __gettext("To embed videos from popular sites like Google Video and Youtube, obtain the embed HTML, paste it in the following form and configure your preferred size:");
-URL
+embed code
-$video_size_label = __gettext("Video size");
-$video_button_label = __gettext("Insert video");

releases/0.9/mod/contenttoolbar/js/edit.js

@@ -338 +338 @@
-
-/**
+ * Auto detect embed object size
+ * @author Rolando Espinoza La fuente <rho@prosoftpeople.com>
+ */
+function parseSize(text, wid, hid) {
+var embedpattern = /<(embed|object)[\w\s\"=;:.&\?\/-]*>.*<\/(embed|object)>/;
+var sizew = /width=\"(\d+)\"/;
+var sizeh = /height=\"(\d+)\"/;
+var embed = text.match(embedpattern);
+
+if(embed==null) return null;
+
+width = sizew.exec(embed[0]);
+height = sizeh.exec(embed[0]);
+
+if (width!=null) {document.getElementById(wid).value=width[1];}
+if (height!=null) {document.getElementById(hid).value=height[1];}
+
+}
+
+/**
- * Called by to insert a new video string
- * @param string edid input_field id

releases/0.9/mod/contenttoolbar/lib.php

@@ -49 +49 @@
-
-function contenttoolbar_widget_edit($widget) {
-
+
+
+
-
-  $video_url = widget_get_data("video_url",$widget->ident);
@@ -60 +62 @@
-  $body = "<h2>" . __gettext("Video widget") . "</h2>";
-  $explanation = __gettext("To embed videos from popular sites like Google Video and Youtube, obtain the embed HTML, paste it in the following form and configure your preferred size:");
-URL
+embed code
-  $video_size_label = __gettext("Video size");
-  $video_button_label = __gettext("Insert Video");

releases/0.9/mod/contenttoolbar/templates/video_widget.html

@@ -6 +6 @@
-                <tr>
-                        <td><label>{{video_url_label}}:</label></td>
-
+ onblur="parseSize(this.value,'video_width','video_height');" 
-                </tr>
-                <tr>

releases/0.9/mod/contenttoolbar/templates/video_wizard.html

@@ -16 +16 @@
-                <tr>
-                        <td><label>{{video_url_label}}:</label></td>
-
+ onblur="parseSize(this.value,'video_width','video_height');"
-                </tr>
-                <tr>

releases/0.9/mod/elggadmin/index.php

@@ -9 +9 @@
-
-define('context', 'elggadmin');
-'./../..
+dirname(dirname(dirname(__FILE__))) . '
-
-$request = elggadmin_parse_request();

releases/0.9/mod/elggadmin/lib/elggadmin.inc.php

@@ -442 +442 @@
-    require($CFG->dirroot . 'mod/elggadmin/lib/configdef.php');
-
-
+$CFG->dirroot
-    $defined = get_object_vars($current);
-    foreach ($defined as $name => $value) {
@@ -453 +453 @@
-}
-
-
+$dirroot
-    $CFG = new StdClass;
-'../../../
+$dirroot.'
-
-    return $CFG;
@@ -472 +472 @@
-    }
-
-$
+
-        $_attrs = array_merge($attrs, $_attrs);
-    }

releases/0.9/mod/invite/lib.php

@@ -5 +5 @@
- * Created on Apr 18, 2007
- *
-és Ramírez Aragó
+ￜs Ramￜrez Aragￜ
- */
-
@@ -40 +40 @@
-    global $PAGE;
-
-
+ && isloggedin()
-        if (!maxusers_limit()) {
-            $PAGE->menu_sub[] = array( 'name' => 'invite:friend',

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

@@ -52 +52 @@
-                              }
-                            } else {
-
-
+
-                            }
-                        } else {

releases/0.9/mod/pages/index.php

@@ -8 +8 @@
- */
-
+//FIXME: workaround for walledgarden
+if (isset($_GET['owner']) && $_GET['owner'] == -1) {
+    define('context', 'external');
+    define('pages_external', true);
+}
-
-include(dirname(dirname(dirname(__FILE__))) . '/includes.php');
@@ -14 +19 @@
-if (page_owner() > 0) {
-    define('context', 'pages');
-} else {
-    define('context', 'external');
-    define('pages_external', true);
-}
-

releases/0.9/mod/pages/lib.php

@@ -325 +325 @@
-    if (is_array($elements)) {
-        foreach ($elements as $e) {
+            //FIXME: fix parent
+            if ($e->ident == $e->parent) {
+                $e->parent = 0;
+            }
+
-            if ($e->parent == 0) {
-                if (!isset($menu[$e->weight])) {
@@ -354 +359 @@
-                $parent = $li[0];
-                $childs = isset($li[1]) ? $li[1] : null;
+
+                // workaround
+                if (!$parent) {
+                    // this never should happen
+                    trigger_error(__FUNCTION__.": invalid menu element", E_USER_NOTICE);
+                    continue;
+                }
-
-                // set owner

releases/0.9/mod/pages/lib/pages.inc.php

@@ -102 +102 @@
-                        $rs = true;
-                    } else {
+                        $oldparent = get_field('pages', 'parent', 'ident', $page->ident);
-                        $rs = update_record('pages', $page);
-                        if ($rs) {
-                            $messages[] = __gettext('Page updated successfully');
+
+                            // check parent menu changes
+                            // If it's top menu, update childs 
+                            if ($page->parent != $oldparent && $oldparent == 0) {
+                                // set childs' parent to 0 (top menu)
+                                execute_sql("UPDATE {$CFG->prefix}pages SET parent=0 WHERE parent={$page->ident} AND owner={$owner}", false);
+                            }
-                        } else {
-                            $messages[] = __gettext('Error updating the page. Please try again.');
@@ -137 +145 @@
-                pages_header_redirect(pages_url($owner, 'pages::'));
-            } else {
-
+, E_USER_NOTICE
-            }
-        }
@@ -157 +165 @@
-            $content = trim(optional_param('page-content'));
-        }
-        $content = html_entity_decode($content);
-        $name = trim(optional_param('page-name'));
-        $parent = optional_param('menu-parent', 0, PARAM_INT);
@@ -279 +286 @@
-    $page = get_record('pages', 'uri', $page_name, 'owner', $owner);
-
+    //FIXME: auto correct parent
+    if ($page->ident == $page->parent) {
+        $_page = new StdClass;
+        $_page->ident = $page->ident;
+        $_page->parent = 0;
+        update_record('pages', $_page);
+        unset($_page);
+    }
+
-    if (isset($page->ident) && permissions_check('pages::access', $page->ident) || permissions_check('pages::edit', $owner)) {
-        if (isset($page->content)) {
@@ -427 +443 @@
-        $input_content = pages_html_wrap('label', __gettext('Content:'), array('for' => 'page-content'));
-        $input_content .= pages_html_wrap(
-entities($page->content),
+specialchars($page->content, ENT_NOQUOTES, 'utf-8'), // prevent parsing html tags like <textarea>
-                        array(
-                            'id' => 'page-content',
@@ -471 +487 @@
-
-            if (isset($page->ident)) {
-
-
+
-            } else {
-                //$menu_parents = get_records_sql("SELECT ident,name FROM {$CFG->prefix}pages WHERE parent=?", array(0));
-                $menu_parents = get_records_select('pages', 'parent=? AND owner=?', array(0, $owner));
-            }

releases/0.9/mod/users/lib.php

@@ -33 +33 @@
-        // $function['display:log_on_pane'][] = dirname(__FILE__) . "/lib/current_user_info.php";
-        $function['display:log_on_pane'][] = dirname(__FILE__) . "/lib/function_number_of_users.php";
- 
-
+
+//
-
-        // Access level select