Merge pull request #480 from MrPetovan/task/4092-move-auth-to-src

Move auth to src

communityhome/communityhome.php

@@ -7,6 +7,7 @@
  */
 
 use Friendica\Core\Config;
+use Friendica\Module\Login;
 
 require_once('mod/community.php');
 
@@ -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'),

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);

dav/friendica/main.php

@@ -1,4 +1,6 @@
 <?php
+
+use Friendica\Module\Login;
 use Friendica\Util\Emailer;
 
 require_once('include/security.php');
@@ -148,7 +150,7 @@ function dav_content()
 {
 	$a = get_app();
 	if (!isset($a->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;

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) {

startpage/startpage.php

@@ -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);
 	}
 	return;
 }

statusnet/statusnet.php

@@ -241,7 +241,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
@@ -269,7 +269,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
@@ -287,7 +287,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

twitter/twitter.php

@@ -225,7 +225,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