From 575a285951f7fa0908177c873d00fe8879dd0ba2 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 31 Dec 2017 21:04:02 -0500 Subject: [PATCH] Use Login module - Simplify goaway calls --- communityhome/communityhome.php | 23 ++++++++++++----------- dav/friendica/layout.fnk.php | 6 +++--- dav/friendica/main.php | 8 +++++--- impressum/impressum.php | 2 +- startpage/startpage.php | 9 +++------ statusnet/statusnet.php | 6 +++--- twitter/twitter.php | 2 +- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/communityhome/communityhome.php b/communityhome/communityhome.php index c16b4ead6..288bf7a85 100644 --- a/communityhome/communityhome.php +++ b/communityhome/communityhome.php @@ -7,6 +7,7 @@ */ use Friendica\Core\Config; +use Friendica\Module\Login; require_once('mod/community.php'); @@ -43,7 +44,7 @@ function communityhome_plugin_admin(&$a, &$o) { foreach($opts as $k=>$v) { $ctx['fields'][] = ['communityhome_'.$k, $v, Config::get('communityhome', $k)]; } - $o = replace_macros($tpl, $ctx); + $o = replace_macros($tpl, $ctx); } function communityhome_plugin_admin_post(&$a,&$b) { @@ -69,7 +70,7 @@ function communityhome_home(&$a, &$o){ // login form $aside['$login_title'] = t('Login'); - $aside['$login_form'] = login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true); + $aside['$login_form'] = Login::form($a->query_string, $a->config['register_policy'] == REGISTER_CLOSED ? false : true); } else { $aside = array( //'$tab_1' => t('Login'), @@ -87,7 +88,7 @@ function communityhome_home(&$a, &$o){ $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, 12 @@ -115,8 +116,8 @@ function communityhome_home(&$a, &$o){ (SELECT COUNT(*) as `contacts`, `uid` FROM `contact` WHERE `self`=0 GROUP BY `uid`) AS `con`, (SELECT COUNT(*) as `items`, `uid` FROM `item` WHERE `item`.`changed` > DATE(NOW() - INTERVAL 1 MONTH) AND `item`.`wall` = 1 GROUP BY `uid`) AS `ite`, ( - SELECT `contacts`,`items`,`ite`.`uid` FROM `con` RIGHT OUTER JOIN `ite` ON `con`.`uid`=`ite`.`uid` - UNION ALL + SELECT `contacts`,`items`,`ite`.`uid` FROM `con` RIGHT OUTER JOIN `ite` ON `con`.`uid`=`ite`.`uid` + UNION ALL SELECT `contacts`,`items`,`con`.`uid` FROM `con` LEFT OUTER JOIN `ite` ON `con`.`uid`=`ite`.`uid` ) AS `uni`, `user`, `profile` WHERE `uni`.`uid`=`user`.`uid` @@ -145,12 +146,12 @@ function communityhome_home(&$a, &$o){ if (Config::get('communityhome','showlastphotos')){ $aside['$photos_title'] = t('Latest 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 @@ -185,10 +186,10 @@ function communityhome_home(&$a, &$o){ if (Config::get('communityhome','showlastlike')){ $aside['$like_title'] = t('Latest 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 diff --git a/dav/friendica/layout.fnk.php b/dav/friendica/layout.fnk.php index 3b76fca78..6e49aa92b 100644 --- a/dav/friendica/layout.fnk.php +++ b/dav/friendica/layout.fnk.php @@ -80,7 +80,7 @@ function wdcal_import_user_ics($calendar_id) { $server = dav_create_server(true, true, false); $calendar = dav_get_current_user_calendar_by_id($server, $calendar_id, DAV_ACL_WRITE); - if (!$calendar) goaway($a->get_baseurl() . "/dav/wdcal/"); + if (!$calendar) goaway('dav/wdcal/'); if (isset($_REQUEST["save"])) { check_form_security_token_redirectOnErr('/dav/settings/', 'icsimport'); @@ -308,12 +308,12 @@ function wdcal_getDetailPage($calendar_id, $calendarobject_id) $calbackend = wdcal_calendar_factory_by_id($calendar_id); $redirect = $calbackend->getItemDetailRedirect($calendar_id, $calendarobject_id); - if ($redirect !== null) goaway($a->get_baseurl() . $redirect); + if ($redirect !== null) goaway($redirect); $details = $obj; } catch (Exception $e) { info(t("Error") . ": " . $e); - goaway($a->get_baseurl() . "/dav/wdcal/"); + goaway('dav/wdcal/'); } return print_r($details, true); diff --git a/dav/friendica/main.php b/dav/friendica/main.php index 006dce957..f0af57c91 100644 --- a/dav/friendica/main.php +++ b/dav/friendica/main.php @@ -1,4 +1,6 @@ user["uid"]) || $a->user["uid"] == 0) { - return login(); + return Login::form(); } $x = ""; @@ -164,7 +166,7 @@ function dav_content() $ret = wdcal_postEditPage("new", "", $a->user["uid"], $a->timezone, $a->get_baseurl() . "/dav/wdcal/"); if ($ret["ok"]) notice($ret["msg"]); else info($ret["msg"]); - goaway($a->get_baseurl() . "/dav/wdcal/"); + goaway('dav/wdcal/'); } $o .= wdcal_getNewPage(); return $o; @@ -182,7 +184,7 @@ function dav_content() $ret = wdcal_postEditPage($a->argv[3], $a->user["uid"], $a->timezone, $a->get_baseurl() . "/dav/wdcal/"); if ($ret["ok"]) notice($ret["msg"]); else info($ret["msg"]); - goaway($a->get_baseurl() . "/dav/wdcal/"); + goaway('dav/wdcal/'); } $o .= wdcal_getEditPage($calendar_id, $a->argv[3]); return $o; diff --git a/impressum/impressum.php b/impressum/impressum.php index 867b6b9d2..204e51b1e 100644 --- a/impressum/impressum.php +++ b/impressum/impressum.php @@ -28,7 +28,7 @@ function impressum_module() { } function impressum_content() { $a = get_app(); - goaway($a->get_baseurl().'/friendica/'); + goaway('friendica/'); } function obfuscate_email ($s) { diff --git a/startpage/startpage.php b/startpage/startpage.php index c43245766..b0ee04cb7 100644 --- a/startpage/startpage.php +++ b/startpage/startpage.php @@ -4,7 +4,7 @@ * Description: Set a preferred page to load on login from home page * Version: 1.0 * Author: Mike Macgirvin - * + * */ use Friendica\Core\PConfig; @@ -30,10 +30,7 @@ function startpage_home_init($a, $b) { $page = PConfig::get(local_user(),'startpage','startpage'); if(strlen($page)) { - $slash = ((strpos($page,'/') === 0) ? true : false); - if(stristr($page,'://')) - goaway($page); - goaway($a->get_baseurl() . (($slash) ? '' : '/') . $page); + goaway($page); } return; } @@ -57,7 +54,7 @@ function startpage_settings_post($a,$post) { /** * - * Called from the Plugin Setting form. + * Called from the Plugin Setting form. * Add our own settings info to the page. * */ diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index 4b36859c1..05eeeb269 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -240,7 +240,7 @@ function statusnet_settings_post(App $a, $post) } } } - goaway($a->get_baseurl() . '/settings/connectors'); + goaway('settings/connectors'); } else { if (isset($_POST['statusnet-consumersecret'])) { // check if we can reach the API of the GNU Social server @@ -268,7 +268,7 @@ function statusnet_settings_post(App $a, $post) notice(t('We could not contact the GNU Social API with the Path you entered.') . EOL); } } - goaway($a->get_baseurl() . '/settings/connectors'); + goaway('settings/connectors'); } else { if (isset($_POST['statusnet-pin'])) { // if the user supplied us with a PIN from GNU Social, let the magic of OAuth happen @@ -286,7 +286,7 @@ function statusnet_settings_post(App $a, $post) PConfig::set(local_user(), 'statusnet', 'post', 1); PConfig::set(local_user(), 'statusnet', 'post_taglinks', 1); // reload the Addon Settings page, if we don't do it see Bug #42 - goaway($a->get_baseurl() . '/settings/connectors'); + goaway('settings/connectors'); } else { // if no PIN is supplied in the POST variables, the user has changed the setting // to post a dent for every new __public__ posting to the wall diff --git a/twitter/twitter.php b/twitter/twitter.php index 01fa7471a..5782c4b50 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -224,7 +224,7 @@ function twitter_settings_post(App $a, $post) PConfig::set(local_user(), 'twitter', 'oauthsecret', $token['oauth_token_secret']); PConfig::set(local_user(), 'twitter', 'post', 1); // reload the Addon Settings page, if we don't do it see Bug #42 - goaway($a->get_baseurl() . '/settings/connectors'); + goaway('settings/connectors'); } else { // if no PIN is supplied in the POST variables, the user has changed the setting // to post a tweet for every new __public__ posting to the wall