Merge branch 'master' of tsia/halcyon into master
This commit is contained in:
commit
084e63952e
|
@ -1,7 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
namespace HalcyonSuite\HalcyonForMastodon;
|
namespace HalcyonSuite\HalcyonForMastodon;
|
||||||
require_once('mastodon-api/mastodon.php');
|
require_once('mastodon-api/mastodon.php');
|
||||||
use Exception;
|
|
||||||
class Mastodon extends \Mastodon_api {
|
class Mastodon extends \Mastodon_api {
|
||||||
function __construct(){
|
function __construct(){
|
||||||
$appSettings = parse_ini_file('../config.ini',true);
|
$appSettings = parse_ini_file('../config.ini',true);
|
||||||
|
|
|
@ -13,7 +13,6 @@ location.href = '/logout';
|
||||||
<?php
|
<?php
|
||||||
require_once('../authorize/mastodon.php');
|
require_once('../authorize/mastodon.php');
|
||||||
use HalcyonSuite\HalcyonForMastodon\Mastodon;
|
use HalcyonSuite\HalcyonForMastodon\Mastodon;
|
||||||
use Exception;
|
|
||||||
$api = new Mastodon();
|
$api = new Mastodon();
|
||||||
if ($_GET['code']) {
|
if ($_GET['code']) {
|
||||||
$domain = htmlspecialchars((string)filter_input(INPUT_GET, 'host'), ENT_QUOTES);
|
$domain = htmlspecialchars((string)filter_input(INPUT_GET, 'host'), ENT_QUOTES);
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
require_once('../authorize/mastodon.php');
|
require_once('../authorize/mastodon.php');
|
||||||
use HalcyonSuite\HalcyonForMastodon\Mastodon;
|
use HalcyonSuite\HalcyonForMastodon\Mastodon;
|
||||||
use Exception;
|
|
||||||
if (isset($_POST['acct'])) {
|
if (isset($_POST['acct'])) {
|
||||||
$domain = explode("@", mb_strtolower(htmlspecialchars((string)filter_input(INPUT_POST, 'acct'), ENT_QUOTES)))[2];
|
$domain = explode("@", mb_strtolower(htmlspecialchars((string)filter_input(INPUT_POST, 'acct'), ENT_QUOTES)))[2];
|
||||||
$URL= 'https://'.$domain;
|
$URL= 'https://'.$domain;
|
||||||
|
|
Loading…
Reference in New Issue