From 2d614b67005e3f0757a0eeff4c893efb41969858 Mon Sep 17 00:00:00 2001 From: Hans Meine Date: Tue, 16 Oct 2012 13:33:53 +0200 Subject: [PATCH 1/3] remove lots of duplicated code in diabook config handling --- view/theme/diabook/theme.php | 410 +++++++++++++---------------------- 1 file changed, 152 insertions(+), 258 deletions(-) diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 53048df6c..1110226ce 100644 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -4,14 +4,27 @@ * Name: Diabook * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu * Version: (Version: 1.027) - * Author: + * Author: */ $a = get_app(); +function get_diabook_config($key, $default = false) { + if (local_user()) { + $result = get_pconfig(local_user(), "diabook", $key); + if ($result !== false) + return $result; + } + + $result = get_config("diabook", $key); + if ($result !== false) + return $result; + + return $default; +} function diabook_init(&$a) { - + //print diabook-version for debugging $diabook_version = "Diabook (Version: 1.027)"; $a->page['htmlhead'] .= sprintf('', $diabook_version); @@ -24,65 +37,16 @@ load_config("diabook"); load_pconfig(local_user(), "diabook"); //get statuses of boxes at right-hand-column -$close_pages = false; -$site_close_pages = get_config("diabook", "close_pages" ); -if (local_user()) {$close_pages = get_pconfig(local_user(), "diabook", "close_pages");} -if ($close_pages===false) $close_pages=$site_close_pages; -if ($close_pages===false) $close_pages="1"; - -$close_profiles = false; -$site_close_profiles = get_config("diabook", "close_profiles" ); -if (local_user()) {$close_profiles = get_pconfig(local_user(), "diabook", "close_profiles");} -if ($close_profiles===false) $close_profiles=$site_close_profiles; -if ($close_profiles===false) $close_profiles="0"; - -$close_helpers = false; -$site_close_helpers = get_config("diabook", "close_helpers" ); -if (local_user()) {$close_helpers = get_pconfig(local_user(), "diabook", "close_helpers");} -if ($close_helpers===false) $close_helpers=$site_close_helpers; -if ($close_helpers===false) $close_helpers="0"; - -$close_services = false; -$site_close_services = get_config("diabook", "close_services" ); -if (local_user()) {$close_services = get_pconfig(local_user(), "diabook", "close_services");} -if ($close_services===false) $close_services=$site_close_services; -if ($close_services===false) $close_services="0"; - -$close_friends = false; -$site_close_friends = get_config("diabook", "close_friends" ); -if (local_user()) {$close_friends = get_pconfig(local_user(), "diabook", "close_friends");} -if ($close_friends===false) $close_friends=$site_close_friends; -if ($close_friends===false) $close_friends="0"; - -$close_lastusers = false; -$site_close_lastusers = get_config("diabook", "close_lastusers" ); -if (local_user()) {$close_lastusers = get_pconfig(local_user(), "diabook", "close_lastusers");} -if ($close_lastusers===false) $close_lastusers=$site_close_lastusers; -if ($close_lastusers===false) $close_lastusers="0"; - -$close_lastphotos = false; -$site_close_lastphotos = get_config("diabook", "close_lastphotos" ); -if (local_user()) {$close_lastphotos = get_pconfig(local_user(), "diabook", "close_lastphotos");} -if ($close_lastphotos===false) $close_lastphotos=$site_close_lastphotos; -if ($close_lastphotos===false) $close_lastphotos="0"; - -$close_lastlikes = false; -$site_close_lastlikes = get_config("diabook", "close_lastlikes" ); -if (local_user()) {$close_lastlikes = get_pconfig(local_user(), "diabook", "close_lastlikes");} -if ($close_lastlikes===false) $close_lastlikes=$site_close_lastlikes; -if ($close_lastlikes===false) $close_lastlikes="0"; - -$close_twitter = false; -$site_close_twitter = get_config("diabook", "close_twitter" ); -if (local_user()) {$close_twitter = get_pconfig(local_user(), "diabook", "close_twitter");} -if ($close_twitter===false) $close_twitter=$site_close_twitter; -if ($close_twitter===false) $close_twitter="1"; - -$close_mapquery = false; -$site_close_mapquery = get_config("diabook", "close_mapquery" ); -if (local_user()) {$close_mapquery = get_pconfig(local_user(), "diabook", "close_mapquery");} -if ($close_mapquery===false) $close_mapquery=$site_close_mapquery; -if ($close_mapquery===false) $close_mapquery="1"; +$close_pages = get_diabook_config( "close_pages", 1 ); +$close_profiles = get_diabook_config( "close_profiles", 0 ); +$close_helpers = get_diabook_config( "close_helpers", 0 ); +$close_services = get_diabook_config( "close_services", 0 ); +$close_friends = get_diabook_config( "close_friends", 0 ); +$close_lastusers = get_diabook_config( "close_lastusers", 0 ); +$close_lastphotos = get_diabook_config( "close_lastphotos", 0 ); +$close_lastlikes = get_diabook_config( "close_lastlikes", 0 ); +$close_twitter = get_diabook_config( "close_twitter", 1 ); +$close_mapquery = get_diabook_config( "close_mapquery", 1 ); //get resolution (wide/normal) $resolution=false; @@ -96,11 +60,7 @@ if ($resolution=="wide") { $a->page['htmlhead'] .= ''; } //get colour-scheme -$color = false; -$site_color = get_config("diabook", "color" ); -if (local_user()) {$color = get_pconfig(local_user(), "diabook", "color");} -if ($color===false) $color=$site_color; -if ($color===false) $color="diabook"; +$color = get_diabook_config( "color", "diabook" ); if ($color=="diabook") $color_path = "/"; if ($color=="aerith") $color_path = "/diabook-aerith/"; @@ -110,23 +70,23 @@ if ($color=="pink") $color_path = "/diabook-pink/"; if ($color=="green") $color_path = "/diabook-green/"; if ($color=="dark") $color_path = "/diabook-dark/"; - + //build personal menue at lefthand-col (id="profile_side") and boxes at right-hand-col at networkpages if ($a->argv[0] === "network" && local_user()){ // USER MENU if(local_user()) { - + $r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid'])); - + $userinfo = array( 'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"), 'name' => $a->user['username'], - ); + ); $ps = array('usermenu'=>array()); $ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations')); $ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page')); - $ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts')); + $ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts')); $ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos')); $ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events')); $ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos')); @@ -141,7 +101,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; )).$a->page['aside']; } - + $ccCookie = $close_pages + $close_mapquery + $close_profiles + $close_helpers + $close_services + $close_friends + $close_twitter + $close_lastusers + $close_lastphotos + $close_lastlikes; //if all boxes closed, dont build right-hand-col and dont use special css if($ccCookie != "10") { @@ -161,14 +121,14 @@ if ($color=="dark") $color_path = "/diabook-dark/"; if($ccCookie != "10") { // COMMUNITY diabook_community_info(); - + // CUSTOM CSS if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-profile.css";} if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-profile-wide.css";} - + } } - + //write js-scripts to the head-section: //load jquery.cookie.js $cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.cookie.js"; @@ -182,7 +142,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; $a->page['htmlhead'] .= sprintf('', $jqueryuiJS); $jqueryuicssJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/jquery-ui-1.8.20.custom.css"; $a->page['htmlhead'] .= sprintf('', $jqueryuicssJS); - } + } //load jquery.twitter.search.js if($close_twitter != "1") { $twitterJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.twitter.search.js"; @@ -205,42 +165,30 @@ if ($color=="dark") $color_path = "/diabook-dark/"; $mqlayermanagerJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.mapquery.mqLayerManager.js"; $a->page['htmlhead'] .= sprintf('', $mqlayermanagerJS); } - + $a->page['htmlhead'] .= ' '; - + //check if mapquerybox is active and print if($close_mapquery != "1") { - $ELZoom=false; - $ELPosX=false; - $ELPosy=false; - $site_ELZoom = get_config("diabook", "ELZoom" ); - $site_ELPosX = get_config("diabook", "ELPosX" ); - $site_ELPosY = get_config("diabook", "ELPosY" ); - $ELZoom = get_pconfig(local_user(), "diabook", "ELZoom"); - $ELPosX = get_pconfig(local_user(), "diabook", "ELPosX"); - $ELPosY = get_pconfig(local_user(), "diabook", "ELPosY"); - if ($ELZoom===false) $ELZoom=$site_ELZoom; - if ($ELPosX===false) $ELPosX=$site_ELPosX; - if ($ELPosY===false) $ELPosY=$site_ELPosY; - if ($ELZoom===false) $ELZoom="0"; - if ($ELPosX===false) $ELPosX="0"; - if ($ELPosY===false) $ELPosY="0"; + $ELZoom = get_diabook_config( "ELZoom", 0 ); + $ELPosX = get_diabook_config( "ELPosX", 0); + $ELPosY = get_diabook_config( "ELPosY", 0); $a->page['htmlhead'] .= ' ';} - + //check if community_home-plugin is activated and change css.. we need this, that the submit-wrapper doesn't overlay the login-panel if communityhome-plugin is active $nametocheck = "communityhome"; $r = q("select id from addon where name = '%s' and installed = 1", dbesc($nametocheck)); if(count($r) == "1" && $a->argv[0] === "home" ) { - + $a->page['htmlhead'] .= ' '; + '; } //comment-edit-wrapper on photo_view... we need this to workaround a global bug in photoview, where the comment-box is between the last comment the the comment before the last if ($a->argv[0].$a->argv[2] === "photos"."image"){ @@ -332,14 +276,14 @@ if ($color=="dark") $color_path = "/diabook-dark/"; } //restore (only) the order right hand col at settingspage if($a->argv[0] === "settings" && local_user()) { - $a->page['htmlhead'] .= ' + $a->page['htmlhead'] .= ' ';} - + if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ $a->page['htmlhead'] .= ' '; - + if($ccCookie != "10") { $a->page['htmlhead'] .= ' ';} } //end js scripts // custom css if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('', $cssFile); - + //footer $tpl = get_markup_template('footer.tpl'); $a->page['footer'] .= replace_macros($tpl, array()); - + // js_diabook_footer(); } @@ -423,73 +367,23 @@ if ($color=="dark") $color_path = "/diabook-dark/"; function diabook_community_info() { $a = get_app(); - - $close_pages = false; - $site_close_pages = get_config("diabook", "close_pages" ); - if (local_user()) {$close_pages = get_pconfig(local_user(), "diabook", "close_pages");} - if ($close_pages===false) $close_pages=$site_close_pages; - if ($close_pages===false) $close_pages="1"; - - $close_profiles = false; - $site_close_profiles = get_config("diabook", "close_profiles" ); - if (local_user()) {$close_profiles = get_pconfig(local_user(), "diabook", "close_profiles");} - if ($close_profiles===false) $close_profiles=$site_close_profiles; - if ($close_profiles===false) $close_profiles="0"; - - $close_helpers = false; - $site_close_helpers = get_config("diabook", "close_helpers" ); - if (local_user()) {$close_helpers = get_pconfig(local_user(), "diabook", "close_helpers");} - if ($close_helpers===false) $close_helpers=$site_close_helpers; - if ($close_helpers===false) $close_helpers="0"; - - $close_services = false; - $site_close_services = get_config("diabook", "close_services" ); - if (local_user()) {$close_services = get_pconfig(local_user(), "diabook", "close_services");} - if ($close_services===false) $close_services=$site_close_services; - if ($close_services===false) $close_services="0"; - - $close_friends = false; - $site_close_friends = get_config("diabook", "close_friends" ); - if (local_user()) {$close_friends = get_pconfig(local_user(), "diabook", "close_friends");} - if ($close_friends===false) $close_friends=$site_close_friends; - if ($close_friends===false) $close_friends="0"; - - $close_lastusers = false; - $site_close_lastusers = get_config("diabook", "close_lastusers" ); - if (local_user()) {$close_lastusers = get_pconfig(local_user(), "diabook", "close_lastusers");} - if ($close_lastusers===false) $close_lastusers=$site_close_lastusers; - if ($close_lastusers===false) $close_lastusers="0"; - - $close_lastphotos = false; - $site_close_lastphotos = get_config("diabook", "close_lastphotos" ); - if (local_user()) {$close_lastphotos = get_pconfig(local_user(), "diabook", "close_lastphotos");} - if ($close_lastphotos===false) $close_lastphotos=$site_close_lastphotos; - if ($close_lastphotos===false) $close_lastphotos="0"; - - $close_lastlikes = false; - $site_close_lastlikes = get_config("diabook", "close_lastlikes" ); - if (local_user()) {$close_lastlikes = get_pconfig(local_user(), "diabook", "close_lastlikes");} - if ($close_lastlikes===false) $close_lastlikes=$site_close_lastlikes; - if ($close_lastlikes===false) $close_lastlikes="0"; - - $close_twitter = false; - $site_close_twitter = get_config("diabook", "close_twitter" ); - if (local_user()) {$close_twitter = get_pconfig(local_user(), "diabook", "close_twitter");} - if ($close_twitter===false) $close_twitter=$site_close_twitter; - if ($close_twitter===false) $close_twitter="1"; - - $close_mapquery = false; - $site_close_mapquery = get_config("diabook", "close_mapquery" ); - if (local_user()) {$close_mapquery = get_pconfig(local_user(), "diabook", "close_mapquery");} - if ($close_mapquery===false) $close_mapquery=$site_close_mapquery; - if ($close_mapquery===false) $close_mapquery="1"; - + + $close_pages = get_diabook_config( "close_pages", 1 ); + $close_profiles = get_diabook_config( "close_profiles", 0 ); + $close_helpers = get_diabook_config( "close_helpers", 0 ); + $close_services = get_diabook_config( "close_services", 0 ); + $close_friends = get_diabook_config( "close_friends", 0 ); + $close_lastusers = get_diabook_config( "close_lastusers", 0 ); + $close_lastphotos = get_diabook_config( "close_lastphotos", 0 ); + $close_lastlikes = get_diabook_config( "close_lastlikes", 0 ); + $close_twitter = get_diabook_config( "close_twitter", 1 ); + $close_mapquery = get_diabook_config( "close_mapquery", 1 ); // comunity_profiles if($close_profiles != "1") { $aside['$comunity_profiles_title'] = t('Community Profiles'); $aside['$comunity_profiles_items'] = array(); - $r = q("select gcontact.* from gcontact left join glink on glink.gcid = gcontact.id + $r = q("select gcontact.* from gcontact left join glink on glink.gcid = gcontact.id where glink.cid = 0 and glink.uid = 0 order by rand() limit 9"); $tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl'); if(count($r)) { @@ -505,7 +399,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; $aside['$comunity_profiles_items'][] = $entry; } }} - + // last 12 users if($close_lastusers != "1") { $aside['$lastusers_title'] = t('Last users'); @@ -515,7 +409,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; $order = " ORDER BY `register_date` DESC "; $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname` - FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` + FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ", 0, 9 @@ -534,15 +428,15 @@ if ($color=="dark") $color_path = "/diabook-dark/"; $aside['$lastusers_items'][] = $entry; } }} - + // last 10 liked items if($close_lastlikes != "1") { $aside['$like_title'] = t('Last likes'); $aside['$like_items'] = array(); - $r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM - (SELECT `parent-uri`, `created`, `author-name` AS `liker`,`author-link` AS `liker-link` + $r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM + (SELECT `parent-uri`, `created`, `author-name` AS `liker`,`author-link` AS `liker-link` FROM `item` WHERE `verb`='http://activitystrea.ms/schema/1.0/like' GROUP BY `parent-uri` ORDER BY `created` DESC) AS T1 - INNER JOIN `item` ON `item`.`uri`=`T1`.`parent-uri` + INNER JOIN `item` ON `item`.`uri`=`T1`.`parent-uri` WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%' GROUP BY `uri` ORDER BY `T1`.`created` DESC @@ -553,7 +447,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; foreach ($r as $rr) { $author = '' . $rr['liker'] . ''; $objauthor = '' . $rr['author-name'] . ''; - + //var_dump($rr['verb'],$rr['object-type']); killme(); switch($rr['verb']){ case 'http://activitystrea.ms/schema/1.0/post': @@ -577,19 +471,19 @@ if ($color=="dark") $color_path = "/diabook-dark/"; $plink = '' . $post_type . ''; $aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink); - + }} - + // last 12 photos if($close_lastphotos != "1") { $aside['$photos_title'] = t('Last photos'); $aside['$photos_items'] = array(); - $r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM - (SELECT `resource-id`, MAX(`scale`) as maxscale FROM `photo` + $r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM + (SELECT `resource-id`, MAX(`scale`) as maxscale FROM `photo` WHERE `profile`=0 AND `contact-id`=0 AND `album` NOT IN ('Contact Photos', '%s', 'Profile Photos', '%s') AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`='' GROUP BY `resource-id`) AS `t1` INNER JOIN `photo` ON `photo`.`resource-id`=`t1`.`resource-id` AND `photo`.`scale` = `t1`.`maxscale`, - `user` + `user` WHERE `user`.`uid` = `photo`.`uid` AND `user`.`blockwall`=0 AND `user`.`hidewall`=0 @@ -603,7 +497,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; foreach($r as $rr) { $photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id']; $photo_url = $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] .'.jpg'; - + $entry = replace_macros($tpl,array( '$id' => $rr['id'], '$profile-link' => $photo_page, @@ -614,7 +508,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; $aside['$photos_items'][] = $entry; } }} - + //right_aside FIND FRIENDS if($close_friends != "1") { if(local_user()) { @@ -625,17 +519,17 @@ if ($color=="dark") $color_path = "/diabook-dark/"; $nv['match'] = Array('match', t('Similar Interests'), "", ""); $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); $nv['invite'] = Array('invite', t('Invite Friends'), "", ""); - + $nv['search'] = '
'; - + $aside['$nv'] = $nv; }} - + //Community_Pages at right_aside if($close_pages != "1") { if(local_user()) { @@ -657,7 +551,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; foreach($contacts as $contact) { $pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']); }; - + $contacts = $pageD; @@ -667,10 +561,10 @@ if ($color=="dark") $color_path = "/diabook-dark/"; } $page .= ''; //if (sizeof($contacts) > 0) - $aside['$page'] = $page; + $aside['$page'] = $page; }} - //END Community Page - + //END Community Page + //mapquery if($close_mapquery != "1") { @@ -681,17 +575,17 @@ if ($color=="dark") $color_path = "/diabook-dark/"; $ELPosX = get_pconfig(local_user(), 'diabook', 'ELPosX' ); $ELPosY = get_pconfig(local_user(), 'diabook', 'ELPosY' ); $aside['$ELZoom'] = array('diabook_ELZoom', t('Set zoomfactor for Earth Layers'), $ELZoom, '', $ELZoom); - $aside['$ELPosX'] = array('diabook_ELPosX', t('Set longitude (X) for Earth Layers'), $ELPosX, '', $ELPosX); - $aside['$ELPosY'] = array('diabook_ELPosY', t('Set latitude (Y) for Earth Layers'), $ELPosY, '', $ELPosY); - if (isset($_POST['diabook-settings-map-sub']) && $_POST['diabook-settings-map-sub']!=''){ + $aside['$ELPosX'] = array('diabook_ELPosX', t('Set longitude (X) for Earth Layers'), $ELPosX, '', $ELPosX); + $aside['$ELPosY'] = array('diabook_ELPosY', t('Set latitude (Y) for Earth Layers'), $ELPosY, '', $ELPosY); + if (isset($_POST['diabook-settings-map-sub']) && $_POST['diabook-settings-map-sub']!=''){ set_pconfig(local_user(), 'diabook', 'ELZoom', $_POST['diabook_ELZoom']); - set_pconfig(local_user(), 'diabook', 'ELPosX', $_POST['diabook_ELPosX']); - set_pconfig(local_user(), 'diabook', 'ELPosY', $_POST['diabook_ELPosY']); + set_pconfig(local_user(), 'diabook', 'ELPosX', $_POST['diabook_ELPosX']); + set_pconfig(local_user(), 'diabook', 'ELPosY', $_POST['diabook_ELPosY']); header("Location: network"); } } //end mapquery - + //helpers if($close_helpers != "1") { $helpers = array(); @@ -713,10 +607,10 @@ if ($color=="dark") $color_path = "/diabook-dark/"; $aside['$twitter'] = $twitter; $TSearchTerm = get_pconfig(local_user(), 'diabook', 'TSearchTerm' ); $aside['$TSearchTerm'] = array('diabook_TSearchTerm', t('Set twitter search term'), $TSearchTerm, '', $TSearchTerm); - $baseurl = $a->get_baseurl($ssl_state); + $baseurl = $a->get_baseurl($ssl_state); $aside['$baseurl'] = $baseurl; - if (isset($_POST['diabook-settings-sub']) && $_POST['diabook-settings-sub']!=''){ - set_pconfig(local_user(), 'diabook', 'TSearchTerm', $_POST['diabook_TSearchTerm']); + if (isset($_POST['diabook-settings-sub']) && $_POST['diabook-settings-sub']!=''){ + set_pconfig(local_user(), 'diabook', 'TSearchTerm', $_POST['diabook_TSearchTerm']); header("Location: network"); } } @@ -744,20 +638,20 @@ if ($color=="dark") $color_path = "/diabook-dark/"; $close_lastlikesC = array('1'=>t("don't show"), '0'=>t("show"),); $boxsettings['title'] = Array("", t('Show/hide boxes at right-hand column:'), "", ""); $aside['$boxsettings'] = $boxsettings; - $aside['$close_pages'] = array('diabook_close_pages', t('Community Pages'), $close_pages, '', $close_pagesC); - $aside['$close_mapquery'] = array('diabook_close_mapquery', t('Earth Layers'), $close_mapquery, '', $close_mapqueryC); - $aside['$close_profiles'] = array('diabook_close_profiles', t('Community Profiles'), $close_profiles, '', $close_profilesC); + $aside['$close_pages'] = array('diabook_close_pages', t('Community Pages'), $close_pages, '', $close_pagesC); + $aside['$close_mapquery'] = array('diabook_close_mapquery', t('Earth Layers'), $close_mapquery, '', $close_mapqueryC); + $aside['$close_profiles'] = array('diabook_close_profiles', t('Community Profiles'), $close_profiles, '', $close_profilesC); $aside['$close_helpers'] = array('diabook_close_helpers', t('Help or @NewHere ?'), $close_helpers, '', $close_helpersC); - $aside['$close_services'] = array('diabook_close_services', t('Connect Services'), $close_services, '', $close_servicesC); - $aside['$close_friends'] = array('diabook_close_friends', t('Find Friends'), $close_friends, '', $close_friendsC); - $aside['$close_twitter'] = array('diabook_close_twitter', t('Last Tweets'), $close_twitter, '', $close_twitterC); - $aside['$close_lastusers'] = array('diabook_close_lastusers', t('Last users'), $close_lastusers, '', $close_lastusersC); - $aside['$close_lastphotos'] = array('diabook_close_lastphotos', t('Last photos'), $close_lastphotos, '', $close_lastphotosC); - $aside['$close_lastlikes'] = array('diabook_close_lastlikes', t('Last likes'), $close_lastlikes, '', $close_lastlikesC); + $aside['$close_services'] = array('diabook_close_services', t('Connect Services'), $close_services, '', $close_servicesC); + $aside['$close_friends'] = array('diabook_close_friends', t('Find Friends'), $close_friends, '', $close_friendsC); + $aside['$close_twitter'] = array('diabook_close_twitter', t('Last Tweets'), $close_twitter, '', $close_twitterC); + $aside['$close_lastusers'] = array('diabook_close_lastusers', t('Last users'), $close_lastusers, '', $close_lastusersC); + $aside['$close_lastphotos'] = array('diabook_close_lastphotos', t('Last photos'), $close_lastphotos, '', $close_lastphotosC); + $aside['$close_lastlikes'] = array('diabook_close_lastlikes', t('Last likes'), $close_lastlikes, '', $close_lastlikesC); $aside['$sub'] = t('Submit'); - $baseurl = $a->get_baseurl($ssl_state); + $baseurl = $a->get_baseurl($ssl_state); $aside['$baseurl'] = $baseurl; - if (isset($_POST['diabook-settings-box-sub']) && $_POST['diabook-settings-box-sub']!=''){ + if (isset($_POST['diabook-settings-box-sub']) && $_POST['diabook-settings-box-sub']!=''){ set_pconfig(local_user(), 'diabook', 'close_pages', $_POST['diabook_close_pages']); set_pconfig(local_user(), 'diabook', 'close_mapquery', $_POST['diabook_close_mapquery']); set_pconfig(local_user(), 'diabook', 'close_profiles', $_POST['diabook_close_profiles']); @@ -767,18 +661,18 @@ if ($color=="dark") $color_path = "/diabook-dark/"; set_pconfig(local_user(), 'diabook', 'close_twitter', $_POST['diabook_close_twitter']); set_pconfig(local_user(), 'diabook', 'close_lastusers', $_POST['diabook_close_lastusers']); set_pconfig(local_user(), 'diabook', 'close_lastphotos', $_POST['diabook_close_lastphotos']); - set_pconfig(local_user(), 'diabook', 'close_lastlikes', $_POST['diabook_close_lastlikes']); + set_pconfig(local_user(), 'diabook', 'close_lastlikes', $_POST['diabook_close_lastlikes']); } } $close = t('Settings'); $aside['$close'] = $close; //get_baseurl - $url = $a->get_baseurl($ssl_state); + $url = $a->get_baseurl($ssl_state); $aside['$url'] = $url; //print right_aside $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl'); $a->page['right_aside'] = replace_macros($tpl, $aside); - + } function js_diabook_footer() { @@ -791,4 +685,4 @@ if ($color=="dark") $color_path = "/diabook-dark/"; $a->page['footer'] = $a->page['footer'].replace_macros($tpl, $bottom); } - + From d0775be2e28db6a0418e0065f501f1665a05724c Mon Sep 17 00:00:00 2001 From: Hans Meine Date: Tue, 16 Oct 2012 13:42:18 +0200 Subject: [PATCH 2/3] diabook boxes: use a common hide/show form entry definition --- view/theme/diabook/config.php | 128 ++++++++++++---------------------- view/theme/diabook/theme.php | 31 +++----- 2 files changed, 56 insertions(+), 103 deletions(-) diff --git a/view/theme/diabook/config.php b/view/theme/diabook/config.php index cc7da1b00..88c073a44 100644 --- a/view/theme/diabook/config.php +++ b/view/theme/diabook/config.php @@ -7,8 +7,8 @@ function theme_content(&$a){ if(!local_user()) - return; - + return; + $font_size = get_pconfig(local_user(), 'diabook', 'font_size' ); $line_height = get_pconfig(local_user(), 'diabook', 'line_height' ); $resolution = get_pconfig(local_user(), 'diabook', 'resolution' ); @@ -27,24 +27,24 @@ function theme_content(&$a){ $close_lastusers = get_pconfig(local_user(), 'diabook', 'close_lastusers' ); $close_lastphotos = get_pconfig(local_user(), 'diabook', 'close_lastphotos' ); $close_lastlikes = get_pconfig(local_user(), 'diabook', 'close_lastlikes' ); - - + + return diabook_form($a,$font_size, $line_height, $resolution, $color, $TSearchTerm, $ELZoom, $ELPosX, $ELPosY, $close_pages, $close_mapquery, $close_profiles, $close_helpers, $close_services, $close_friends, $close_twitter, $close_lastusers, $close_lastphotos, $close_lastlikes); } function theme_post(&$a){ if(! local_user()) return; - + if (isset($_POST['diabook-settings-submit'])){ set_pconfig(local_user(), 'diabook', 'font_size', $_POST['diabook_font_size']); set_pconfig(local_user(), 'diabook', 'line_height', $_POST['diabook_line_height']); set_pconfig(local_user(), 'diabook', 'resolution', $_POST['diabook_resolution']); - set_pconfig(local_user(), 'diabook', 'color', $_POST['diabook_color']); - set_pconfig(local_user(), 'diabook', 'TSearchTerm', $_POST['diabook_TSearchTerm']); - set_pconfig(local_user(), 'diabook', 'ELZoom', $_POST['diabook_ELZoom']); - set_pconfig(local_user(), 'diabook', 'ELPosX', $_POST['diabook_ELPosX']); - set_pconfig(local_user(), 'diabook', 'ELPosY', $_POST['diabook_ELPosY']); + set_pconfig(local_user(), 'diabook', 'color', $_POST['diabook_color']); + set_pconfig(local_user(), 'diabook', 'TSearchTerm', $_POST['diabook_TSearchTerm']); + set_pconfig(local_user(), 'diabook', 'ELZoom', $_POST['diabook_ELZoom']); + set_pconfig(local_user(), 'diabook', 'ELPosX', $_POST['diabook_ELPosX']); + set_pconfig(local_user(), 'diabook', 'ELPosY', $_POST['diabook_ELPosY']); set_pconfig(local_user(), 'diabook', 'ELPosY', $_POST['diabook_ELPosY']); set_pconfig(local_user(), 'diabook', 'close_pages', $_POST['diabook_close_pages']); set_pconfig(local_user(), 'diabook', 'close_mapquery', $_POST['diabook_close_mapquery']); @@ -56,7 +56,7 @@ function theme_post(&$a){ set_pconfig(local_user(), 'diabook', 'close_lastusers', $_POST['diabook_close_lastusers']); set_pconfig(local_user(), 'diabook', 'close_lastphotos', $_POST['diabook_close_lastphotos']); set_pconfig(local_user(), 'diabook', 'close_lastlikes', $_POST['diabook_close_lastlikes']); - + } } @@ -65,8 +65,8 @@ function theme_admin(&$a){ $font_size = get_config('diabook', 'font_size' ); $line_height = get_config('diabook', 'line_height' ); $resolution = get_config('diabook', 'resolution' ); - $color = get_config('diabook', 'color' ); - $TSearchTerm = get_config('diabook', 'TSearchTerm' ); + $color = get_config('diabook', 'color' ); + $TSearchTerm = get_config('diabook', 'TSearchTerm' ); $ELZoom = get_config('diabook', 'ELZoom' ); $ELPosX = get_config('diabook', 'ELPosX' ); $ELPosY = get_config('diabook', 'ELPosY' ); @@ -80,7 +80,7 @@ function theme_admin(&$a){ $close_lastusers = get_config('diabook', 'close_lastusers' ); $close_lastphotos = get_config('diabook', 'close_lastphotos' ); $close_lastlikes = get_config('diabook', 'close_lastlikes' ); - + return diabook_form($a,$font_size, $line_height, $resolution, $color, $TSearchTerm, $ELZoom, $ELPosX, $ELPosY, $close_pages, $close_mapquery, $close_profiles, $close_helpers, $close_services, $close_friends, $close_twitter, $close_lastusers, $close_lastphotos, $close_lastlikes); } @@ -103,7 +103,7 @@ function theme_admin_post(&$a){ set_config('diabook', 'close_lastusers', $_POST['diabook_close_lastusers']); set_config('diabook', 'close_lastphotos', $_POST['diabook_close_lastphotos']); set_config('diabook', 'close_lastlikes', $_POST['diabook_close_lastlikes']); - + } } @@ -112,79 +112,41 @@ function diabook_form(&$a, $font_size, $line_height, $resolution, $color, $TSear $line_heights = array( "1.3"=>"1.3", "---"=>"---", - "1.6"=>"1.6", - "1.5"=>"1.5", + "1.6"=>"1.6", + "1.5"=>"1.5", "1.4"=>"1.4", "1.2"=>"1.2", "1.1"=>"1.1", ); - + $font_sizes = array( '14'=>'14', "---"=>"---", - "16"=>"16", + "16"=>"16", "15"=>"15", '13.5'=>'13.5', - '13'=>'13', + '13'=>'13', '12.5'=>'12.5', '12'=>'12', ); $resolutions = array( 'normal'=>'normal', - 'wide'=>'wide', + 'wide'=>'wide', ); $colors = array( 'diabook'=>'diabook', - 'aerith'=>'aerith', - 'blue'=>'blue', + 'aerith'=>'aerith', + 'blue'=>'blue', 'green'=>'green', - 'pink'=>'pink', + 'pink'=>'pink', 'red'=>'red', - 'dark'=>'dark', + 'dark'=>'dark', ); - $close_pagesC = array( - '0'=>'show', - '1'=>'hide', - ); - $close_mapqueryC = array( - '0'=>'show', - '1'=>'hide', - ); - $close_profilesC = array( - '0'=>'show', - '1'=>'hide', - ); - $close_helpersC = array( - '0'=>'show', - '1'=>'hide', - ); - $close_servicesC = array( - '0'=>'show', - '1'=>'hide', - ); - $close_friendsC = array( - '0'=>'show', - '1'=>'hide', - ); - $close_twitterC = array( - '0'=>'show', - '1'=>'hide', - ); - $close_lastusersC = array( - '0'=>'show', - '1'=>'hide', - ); - $close_lastphotosC = array( - '0'=>'show', - '1'=>'hide', - ); - $close_lastlikesC = array( - '0'=>'show', - '1'=>'hide', - ); - - - + + $close_or_not = array('1'=>t("don't show"), '0'=>t("show"),); + + + $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" ); $o .= replace_macros($t, array( '$submit' => t('Submit'), @@ -193,21 +155,21 @@ function diabook_form(&$a, $font_size, $line_height, $resolution, $color, $TSear '$font_size' => array('diabook_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes), '$line_height' => array('diabook_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights), '$resolution' => array('diabook_resolution', t('Set resolution for middle column'), $resolution, '', $resolutions), - '$color' => array('diabook_color', t('Set color scheme'), $color, '', $colors), - '$TSearchTerm' => array('diabook_TSearchTerm', t('Set twitter search term'), $TSearchTerm, '', $TSearchTerm), - '$ELZoom' => array('diabook_ELZoom', t('Set zoomfactor for Earth Layer'), $ELZoom, '', $ELZoom), - '$ELPosX' => array('diabook_ELPosX', t('Set longitude (X) for Earth Layers'), $ELPosX, '', $ELPosX), - '$ELPosY' => array('diabook_ELPosY', t('Set latitude (Y) for Earth Layers'), $ELPosY, '', $ELPosY), - '$close_pages' => array('diabook_close_pages', t('Community Pages'), $close_pages, '', $close_pagesC), - '$close_mapquery' => array('diabook_close_mapquery', t('Earth Layers'), $close_mapquery, '', $close_mapqueryC), - '$close_profiles' => array('diabook_close_profiles', t('Community Profiles'), $close_profiles, '', $close_profilesC), - '$close_helpers' => array('diabook_close_helpers', t('Help or @NewHere ?'), $close_helpers, '', $close_helpersC), - '$close_services' => array('diabook_close_services', t('Connect Services'), $close_services, '', $close_servicesC), - '$close_friends' => array('diabook_close_friends', t('Find Friends'), $close_friends, '', $close_friendsC), - '$close_twitter' => array('diabook_close_twitter', t('Last tweets'), $close_twitter, '', $close_twitterC), - '$close_lastusers' => array('diabook_close_lastusers', t('Last users'), $close_lastusers, '', $close_lastusersC), - '$close_lastphotos' => array('diabook_close_lastphotos', t('Last photos'), $close_lastphotos, '', $close_lastphotosC), - '$close_lastlikes' => array('diabook_close_lastlikes', t('Last likes'), $close_lastlikes, '', $close_lastlikesC), + '$color' => array('diabook_color', t('Set color scheme'), $color, '', $colors), + '$TSearchTerm' => array('diabook_TSearchTerm', t('Set twitter search term'), $TSearchTerm, '', $TSearchTerm), + '$ELZoom' => array('diabook_ELZoom', t('Set zoomfactor for Earth Layer'), $ELZoom, '', $ELZoom), + '$ELPosX' => array('diabook_ELPosX', t('Set longitude (X) for Earth Layers'), $ELPosX, '', $ELPosX), + '$ELPosY' => array('diabook_ELPosY', t('Set latitude (Y) for Earth Layers'), $ELPosY, '', $ELPosY), + '$close_pages' => array('diabook_close_pages', t('Community Pages'), $close_pages, '', $close_or_not), + '$close_mapquery' => array('diabook_close_mapquery', t('Earth Layers'), $close_mapquery, '', $close_or_not), + '$close_profiles' => array('diabook_close_profiles', t('Community Profiles'), $close_profiles, '', $close_or_not), + '$close_helpers' => array('diabook_close_helpers', t('Help or @NewHere ?'), $close_helpers, '', $close_or_not), + '$close_services' => array('diabook_close_services', t('Connect Services'), $close_services, '', $close_or_not), + '$close_friends' => array('diabook_close_friends', t('Find Friends'), $close_friends, '', $close_or_not), + '$close_twitter' => array('diabook_close_twitter', t('Last tweets'), $close_twitter, '', $close_or_not), + '$close_lastusers' => array('diabook_close_lastusers', t('Last users'), $close_lastusers, '', $close_or_not), + '$close_lastphotos' => array('diabook_close_lastphotos', t('Last photos'), $close_lastphotos, '', $close_or_not), + '$close_lastlikes' => array('diabook_close_lastlikes', t('Last likes'), $close_lastlikes, '', $close_or_not), )); return $o; } diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 1110226ce..c85031ccc 100644 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -626,28 +626,19 @@ if ($color=="dark") $color_path = "/diabook-dark/"; $close_lastusers = get_pconfig(local_user(), 'diabook', 'close_lastusers' ); $close_lastphotos = get_pconfig(local_user(), 'diabook', 'close_lastphotos' ); $close_lastlikes = get_pconfig(local_user(), 'diabook', 'close_lastlikes' ); - $close_pagesC = array('1'=>t("don't show"), '0'=>t("show"),); - $close_mapqueryC = array('1'=>t("don't show"), '0'=>t("show"),); - $close_profilesC = array('1'=>t("don't show"), '0'=>t("show"),); - $close_helpersC = array('1'=>t("don't show"), '0'=>t("show"),); - $close_servicesC = array('1'=>t("don't show"), '0'=>t("show"),); - $close_friendsC = array('1'=>t("don't show"), '0'=>t("show"),); - $close_twitterC = array('1'=>t("don't show"), '0'=>t("show"),); - $close_lastusersC = array('1'=>t("don't show"), '0'=>t("show"),); - $close_lastphotosC = array('1'=>t("don't show"), '0'=>t("show"),); - $close_lastlikesC = array('1'=>t("don't show"), '0'=>t("show"),); + $close_or_not = array('1'=>t("don't show"), '0'=>t("show"),); $boxsettings['title'] = Array("", t('Show/hide boxes at right-hand column:'), "", ""); $aside['$boxsettings'] = $boxsettings; - $aside['$close_pages'] = array('diabook_close_pages', t('Community Pages'), $close_pages, '', $close_pagesC); - $aside['$close_mapquery'] = array('diabook_close_mapquery', t('Earth Layers'), $close_mapquery, '', $close_mapqueryC); - $aside['$close_profiles'] = array('diabook_close_profiles', t('Community Profiles'), $close_profiles, '', $close_profilesC); - $aside['$close_helpers'] = array('diabook_close_helpers', t('Help or @NewHere ?'), $close_helpers, '', $close_helpersC); - $aside['$close_services'] = array('diabook_close_services', t('Connect Services'), $close_services, '', $close_servicesC); - $aside['$close_friends'] = array('diabook_close_friends', t('Find Friends'), $close_friends, '', $close_friendsC); - $aside['$close_twitter'] = array('diabook_close_twitter', t('Last Tweets'), $close_twitter, '', $close_twitterC); - $aside['$close_lastusers'] = array('diabook_close_lastusers', t('Last users'), $close_lastusers, '', $close_lastusersC); - $aside['$close_lastphotos'] = array('diabook_close_lastphotos', t('Last photos'), $close_lastphotos, '', $close_lastphotosC); - $aside['$close_lastlikes'] = array('diabook_close_lastlikes', t('Last likes'), $close_lastlikes, '', $close_lastlikesC); + $aside['$close_pages'] = array('diabook_close_pages', t('Community Pages'), $close_pages, '', $close_or_not); + $aside['$close_mapquery'] = array('diabook_close_mapquery', t('Earth Layers'), $close_mapquery, '', $close_or_not); + $aside['$close_profiles'] = array('diabook_close_profiles', t('Community Profiles'), $close_profiles, '', $close_or_not); + $aside['$close_helpers'] = array('diabook_close_helpers', t('Help or @NewHere ?'), $close_helpers, '', $close_or_not); + $aside['$close_services'] = array('diabook_close_services', t('Connect Services'), $close_services, '', $close_or_not); + $aside['$close_friends'] = array('diabook_close_friends', t('Find Friends'), $close_friends, '', $close_or_not); + $aside['$close_twitter'] = array('diabook_close_twitter', t('Last Tweets'), $close_twitter, '', $close_or_not); + $aside['$close_lastusers'] = array('diabook_close_lastusers', t('Last users'), $close_lastusers, '', $close_or_not); + $aside['$close_lastphotos'] = array('diabook_close_lastphotos', t('Last photos'), $close_lastphotos, '', $close_or_not); + $aside['$close_lastlikes'] = array('diabook_close_lastlikes', t('Last likes'), $close_lastlikes, '', $close_or_not); $aside['$sub'] = t('Submit'); $baseurl = $a->get_baseurl($ssl_state); $aside['$baseurl'] = $baseurl; From ba503b9927ea7b11f96c6b157dcecaf6df89122f Mon Sep 17 00:00:00 2001 From: Hans Meine Date: Tue, 16 Oct 2012 13:44:27 +0200 Subject: [PATCH 3/3] diabook: use proper defaults in popup sidebar config --- view/theme/diabook/theme.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index c85031ccc..c993751b1 100644 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -616,16 +616,16 @@ if ($color=="dark") $color_path = "/diabook-dark/"; } //end twitter if($ccCookie != "10") { - $close_pages = get_pconfig(local_user(), 'diabook', 'close_pages' ); - $close_mapquery = get_pconfig(local_user(), 'diabook', 'close_mapquery' ); - $close_profiles = get_pconfig(local_user(), 'diabook', 'close_profiles' ); - $close_helpers = get_pconfig(local_user(), 'diabook', 'close_helpers' ); - $close_services = get_pconfig(local_user(), 'diabook', 'close_services' ); - $close_friends = get_pconfig(local_user(), 'diabook', 'close_friends' ); - $close_twitter = get_pconfig(local_user(), 'diabook', 'close_twitter' ); - $close_lastusers = get_pconfig(local_user(), 'diabook', 'close_lastusers' ); - $close_lastphotos = get_pconfig(local_user(), 'diabook', 'close_lastphotos' ); - $close_lastlikes = get_pconfig(local_user(), 'diabook', 'close_lastlikes' ); + $close_pages = get_diabook_config( "close_pages", 1 ); + $close_profiles = get_diabook_config( "close_profiles", 0 ); + $close_helpers = get_diabook_config( "close_helpers", 0 ); + $close_services = get_diabook_config( "close_services", 0 ); + $close_friends = get_diabook_config( "close_friends", 0 ); + $close_lastusers = get_diabook_config( "close_lastusers", 0 ); + $close_lastphotos = get_diabook_config( "close_lastphotos", 0 ); + $close_lastlikes = get_diabook_config( "close_lastlikes", 0 ); + $close_twitter = get_diabook_config( "close_twitter", 1 ); + $close_mapquery = get_diabook_config( "close_mapquery", 1 ); $close_or_not = array('1'=>t("don't show"), '0'=>t("show"),); $boxsettings['title'] = Array("", t('Show/hide boxes at right-hand column:'), "", ""); $aside['$boxsettings'] = $boxsettings;