Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  updated page plugin
  "page" addon - higher performance version of "pages" addon
  update pkg

* master:

diff --git a/page.tgz b/page.tgz
new file mode 100644 (file)
index 0000000..ade28eb
Binary files /dev/null and b/page.tgz differ

diff --git a/page/page.php b/page/page.php
new file mode 100755 (executable)
index 0000000..584ac55
--- /dev/null
+++ b/page/page.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Name: Page
+ * Description: Shows lists of community pages (improved performance over 'pages)
+ * Version: 1.0
+ * Author: Mike Macgirvin <mike@macgirvin.com>
+ * based on pages plugin by
+ * Author: Michael Vogel <ike@piratenpartei.de>
+ *
+ */
+
+function page_install() {
+       register_hook('page_end', 'addon/page/page.php', 'page_page_end');
+}
+
+function page_uninstall() {
+       unregister_hook('page_end', 'addon/page/page.php', 'page_page_end');
+}
+
+
+function page_getpage($uid) {
+
+
+       $pagelist = array();
+
+       $contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
+                       WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d",
+                       intval($uid)
+       );
+
+       $page = array();
+
+       // Look if the profile is a community page
+       foreach($contacts as $contact) {
+               $page[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']);
+       }
+       return($page);
+}
+
+function page_page_end($a,&$b) {
+       // Only move on if if it's the "network" module and there is a logged on user
+       if (($a->module != "network") OR ($a->user['uid'] == 0))
+               return;
+
+       $page = '<div id="page-sidebar" class="widget">
+                       <div class="title tool">
+                       <h3>'.t("Community Pages").'</h3></div>
+                       <div id="sidebar-page-list"><ul>';
+
+       $contacts = page_getpage($a->user['uid']);
+
+       foreach($contacts as $contact) {
+               $page .= '<li style="list-style-type: none;" class="tool"><img height="16" width="16" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" class="label" target="external-link">'.
+                               $contact["name"]."</a></li>";
+       }
+       $page .= "</ul></div></div>";
+       if (sizeof($contacts) > 0)
+               $a->page['aside'] = $page . $a->page['aside'];
+}
+?>

diff --git a/smiley_pack.tgz b/smiley_pack.tgz
index be092b08cbd5ce213c3609a9f35ed160cda3e713..2352811992b1596b3dc4910df280c7a5afe140a0 100644 (file)
Binary files a/smiley_pack.tgz and b/smiley_pack.tgz differ