X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=page%2Fpage.php;h=21a83e16d48126d96e061d40136b0c55f3e357c1;hb=6728d714cbdb1552ccb2684dbc123a5dd3cda5a8;hp=c79b6bea4ae8f8f121400a339c41d109e16f7f6c;hpb=4c2a40ece8731ab4f4a1232c356b83b67e0259d6;p=friendica-addons.git

diff --git a/page/page.php b/page/page.php
index c79b6bea..21a83e16 100755
--- a/page/page.php
+++ b/page/page.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Name: Page
- * Description: Shows list of subscribed community pages/forums on network sidebar
+ * Description: This addon is now deprecated.  Administrators should switch to forumlist instead.  Developers should also add any functionality to forumlist instead of here.
  * Version: 1.0
  * Author: Mike Macgirvin <mike@macgirvin.com>
  * based on pages plugin by
@@ -13,6 +13,7 @@ function page_install() {
 	register_hook('network_mod_init', 'addon/page/page.php', 'page_network_mod_init');
 	register_hook('plugin_settings', 'addon/page/page.php', 'page_plugin_settings');
 	register_hook('plugin_settings_post', 'addon/page/page.php', 'page_plugin_settings_post');
+	register_hook('profile_advanced', 'addon/page/page.php', 'page_profile_advanced');
 
 }
 
@@ -20,22 +21,25 @@ function page_uninstall() {
 	unregister_hook('network_mod_init', 'addon/page/page.php', 'page_network_mod_init');
 	unregister_hook('plugin_settings', 'addon/page/page.php', 'page_plugin_settings');
 	unregister_hook('plugin_settings_post', 'addon/page/page.php', 'page_plugin_settings_post');
+	unregister_hook('profile_advanced', 'addon/page/page.php', 'page_profile_advanced');
 
 	// remove only - obsolete
 	unregister_hook('page_end', 'addon/page/page.php', 'page_page_end');
 }
 
 
-function page_getpage($uid,$randomise = false) {
+function page_getpage($uid,$showhidden = true,$randomise = false) {
 
 
 	$pagelist = array();
 
-	$random = (($randomise) ? ' order by rand() ' : ' order by name asc ');
+	$order = (($showhidden) ? '' : " and hidden = 0 ");
+	$order .= (($randomise) ? ' order by rand() ' : ' order by name asc ');
 
-	$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
+	$contacts = q("SELECT `id`, `url`, `name`, `micro` FROM `contact`
 			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
-			order by name asc ",
+			and blocked = 0 and hidden = 0 and pending = 0 and archive = 0
+			$order ",
 			intval($uid)
 	);
 
@@ -65,7 +69,7 @@ function page_page_end($a,&$b) {
 	$more = false;
 
 	foreach($contacts as $contact) {
-		$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" title="' . $contact['url'] . '" class="label" target="external-link">'.
+		$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" title="' . $contact['url'] . '" class="label sparkle" target="external-link">'.
 				$contact["name"]."</a></li>";
 		$total_shown ++;
 		if($total_shown == 6) {
@@ -93,13 +97,13 @@ function page_network_mod_init($a,$b) {
 		$show_total = 6;
 	$randomise = intval(get_pconfig(local_user(),'page','randomise'));
 
-	$contacts = page_getpage($a->user['uid'],$randomise);
+	$contacts = page_getpage($a->user['uid'],true,$randomise);
 
 	$total_shown = 0;
 	$more = false;
 
 	foreach($contacts as $contact) {
-		$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" title="' . $contact['url'] . '" class="label" target="external-link">'.
+		$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" title="' . $contact['url'] . '" class="label sparkle" target="external-link">'.
 				$contact["name"]."</a></li>";
 		$total_shown ++;
 		if(($show_total) && ($total_shown == $show_total)) {
@@ -115,12 +119,49 @@ function page_network_mod_init($a,$b) {
 		$a->page['aside'] = $page . $a->page['aside'];
 }
 
+
+function page_profile_advanced($a,&$b) {
+
+	$profile = intval(get_pconfig($a->profile['profile_uid'],'page','show_on_profile'));
+	if(! $profile)
+		return;
+
+	$page = '<div id="page-profile">
+			<div class="title">'.t("Forums:").'</div>
+			<div id="profile-page-list">';
+
+	// place holder in case somebody wants configurability
+	$show_total = 9999;
+
+	$randomise = true;
+
+	$contacts = page_getpage($a->user['uid'],false,$randomise);
+
+	$total_shown = 0;
+	$more = false;
+
+	foreach($contacts as $contact) {
+		$page .= micropro($contact,false,'page-profile-advanced');
+		$total_shown ++;
+		if($total_shown == $show_total)
+			break;
+	}
+	$page .= '</div></div><div class="clear"></div>';
+
+	if(count($contacts) > 0)
+		$b .= $page;
+
+}
+
+
+
 function page_plugin_settings_post($a,$post) {
 	if(! local_user() || (! x($_POST,'page-settings-submit')))
 		return;
 
 	set_pconfig(local_user(),'page','max_pages',intval($_POST['page_max_pages']));
 	set_pconfig(local_user(),'page','randomise',intval($_POST['page_random']));
+	set_pconfig(local_user(),'page','show_on_profile',intval($_POST['page_profile']));
 
 	info( t('Page settings updated.') . EOL);
 }
@@ -144,6 +185,9 @@ function page_plugin_settings(&$a,&$s) {
 	$randomise = intval(get_pconfig(local_user(),'page','randomise'));
 	$randomise_checked = (($randomise) ? ' checked="checked" ' : '');
 
+	$profile = intval(get_pconfig(local_user(),'page','show_on_profile'));
+	$profile_checked = (($profile) ? ' checked="checked" ' : '');
+	
 	
 	/* Add some HTML to the existing form */
 
@@ -156,6 +200,9 @@ function page_plugin_settings(&$a,&$s) {
 	$s .= '<label id="page-random-label" for="page-random">' . t('Randomise Page/Forum list') . '</label>';
 	$s .= '<input id="page-random" type="checkbox" name="page_random" value="1" ' . $randomise_checked . '/>';
 	$s .= '<div class="clear"></div>';
+	$s .= '<label id="page-profile-label" for="page-profile">' . t('Show pages/forums on profile page') . '</label>';
+	$s .= '<input id="page-profile" type="checkbox" name="page_profile" value="1" ' . $profile_checked . '/>';
+	$s .= '<div class="clear"></div>';
 
 	$s .= '</div>';