diff --git a/partials/base.php b/partials/base.php index bc3b6fe..e900007 100644 --- a/partials/base.php +++ b/partials/base.php @@ -1,77 +1,43 @@ mainURL] = $parsedTwtxtFile; - } + $parsedTwtxtFile = getTwtsFromTwtxtString($twtsURL); + if (!is_null($parsedTwtxtFile)) { + $parsedTwtxtFiles[$parsedTwtxtFile->mainURL] = $parsedTwtxtFile; + } } else { // Show timeline for the URL - $parsedTwtxtFiles = []; - foreach ($fileLines as $currentLine) { - if (str_starts_with($currentLine, '#')) { - if (!is_null(getDoubleParameter('follow', $currentLine))) { - $follow = getDoubleParameter('follow', $currentLine); - $twtFollowingList[] = $follow; + $parsedTwtxtFiles = []; + foreach ($fileLines as $currentLine) { + if (str_starts_with($currentLine, '#')) { + if (!is_null(getDoubleParameter('follow', $currentLine))) { + $follow = getDoubleParameter('follow', $currentLine); + $twtFollowingList[] = $follow; - // Read the parsed files if in Cache - $followURL = $follow[1]; - $parsedTwtxtFile = getTwtsFromTwtxtString($followURL); - if (!is_null($parsedTwtxtFile)) { - $parsedTwtxtFiles[$parsedTwtxtFile->mainURL] = $parsedTwtxtFile; - } - } - } - } + // Read the parsed files if in Cache + $followURL = $follow[1]; + $parsedTwtxtFile = getTwtsFromTwtxtString($followURL); + if (!is_null($parsedTwtxtFile)) { + $parsedTwtxtFiles[$parsedTwtxtFile->mainURL] = $parsedTwtxtFile; + } + } + } + } } $twts = []; # Combine all the followers twts foreach ($parsedTwtxtFiles as $currentTwtFile) { - if (!is_null($currentTwtFile)) { - $twts += $currentTwtFile->twts; - } + if (!is_null($currentTwtFile)) { + $twts += $currentTwtFile->twts; + } } if (!empty($_GET['hash'])) { - $hash = $_GET['hash']; - $twts = array_filter($twts, function($twt) use ($hash) { - return $twt->hash === $hash || $twt->replyToHash === $hash; - }); + $hash = $_GET['hash']; + $twts = array_filter($twts, function ($twt) use ($hash) { + return $twt->hash === $hash || $twt->replyToHash === $hash; + }); } - krsort($twts, SORT_NUMERIC); if (!empty($_GET['hash'])) { - $twts = array_reverse($twts, true); + $twts = array_reverse($twts, true); } $page = 1; if (!empty($_GET['page'])) { - $page = intval($_GET['page']); + $page = intval($_GET['page']); } -$startingTwt = (($page - 1) * TWTS_PER_PAGE); -$twts = array_slice($twts, $startingTwt, TWTS_PER_PAGE); +// If we should paginate our twts list +if (!empty($paginateTwts)) { + $startingTwt = (($page - 1) * TWTS_PER_PAGE); + $twts = array_slice($twts, $startingTwt, TWTS_PER_PAGE); +} $baseURL = str_replace("/index.php", "", $_SERVER['SCRIPT_NAME']); diff --git a/partials/profile.php b/partials/profile.php index 4a35c9a..ea5498a 100644 --- a/partials/profile.php +++ b/partials/profile.php @@ -2,35 +2,34 @@ // Get info about profile from URL as an objects if (!empty($_GET['profile'])) { - $url = $twtsURL; + $url = $twtsURL; } + $profile = getTwtsFromTwtxtString($url); - -$profileURL = $baseURL.'/?profile='.$profile->mainURL; - -?> +$profileURL = $baseURL . '/?profile=' . $profile->mainURL; +?>
- - + +
- - nick ?>@mainURL, PHP_URL_HOST); ?> + + nick?>@mainURL, PHP_URL_HOST);?> -

description ?>

+

description?>

- Posts | + Posts | - Gallery + Gallery - mainURL ?> + mainURL?> (How to follow) @@ -39,17 +38,3 @@ $profileURL = $baseURL.'/?profile='.$profile->mainURL;
- - \ No newline at end of file diff --git a/partials/timeline.php b/partials/timeline.php index 44d0d1b..62ce566 100644 --- a/partials/timeline.php +++ b/partials/timeline.php @@ -1,59 +1,51 @@ - + - -
- - - -
- - nick ?>@mainURL, PHP_URL_HOST); ?> - + +
+ + + +
+ + nick?>@mainURL, PHP_URL_HOST);?> + -
- content ?> +
+ content?> +
- -
+ + replyToHash) { + echo 'In reply to: #' . $twt->replyToHash . ''; + //echo 'Convesation'; + } - - replyToHash) { - echo 'In reply to: #'.$twt->replyToHash.''; - //echo 'Convesation'; - } + if ($twt->replyToHash && isset($_SESSION['password'])) { + echo ' | '; + } - if ($twt->replyToHash && isset($_SESSION['password'])) { - echo ' | '; - } + if (isset($_SESSION['password'])) { + echo 'Reply'; + } - if (isset($_SESSION['password'])) { - echo 'Reply'; - } - - ?> - - displayDate ?> - -
-
- - + + displayDate?> + +
+
+Comment via email'; - } + echo '
Comment via email
'; +} ?> \ No newline at end of file diff --git a/views/__profile.php b/views/__profile.php index 9bb3992..33911f5 100644 --- a/views/__profile.php +++ b/views/__profile.php @@ -30,13 +30,13 @@ if (!empty($_GET['url'])) { // Show twts for some user $parsedTwtxtFiles[$parsedTwtxtFile->mainURL] = $parsedTwtxtFile; } -} +} else { // Show timeline for the URL $twtsURL = $config['public_txt_url']; // $twtsURL = "https://lyse.isobeef.org/twtxt.txt"; // $profile = getTwtsFromTwtxtString($twtsURL); header("Location: ".$baseURL."/profile?url=".$twtsURL); - + /* if (filter_var($twtsURL, FILTER_VALIDATE_URL) === FALSE) { die('Not a valid URL'); @@ -59,7 +59,7 @@ foreach ($parsedTwtxtFiles as $currentTwtFile) { krsort($twts, SORT_NUMERIC); -?> +?>
@@ -75,13 +75,13 @@ krsort($twts, SORT_NUMERIC);

description ?>

- - twtxt.txt | + twtxt.txt | How to follow @@ -94,7 +94,7 @@ krsort($twts, SORT_NUMERIC); diff --git a/views/add_feed.php b/views/add_feed.php index 8e76f20..c0331ac 100644 --- a/views/add_feed.php +++ b/views/add_feed.php @@ -1,4 +1,5 @@ - Recent twts in reply to #

- + Following feeds - + diff --git a/views/gallery.php b/views/gallery.php index fe7ef9d..6958c7c 100644 --- a/views/gallery.php +++ b/views/gallery.php @@ -8,7 +8,7 @@ include_once 'partials/header.php'; -
-content); foreach ($img_array as $img) { //echo ''.$img[0].''; - // Workaround until cache issue is resolved + // Workaround until cache issue is resolved echo ''.$img[0].''; } } diff --git a/views/home.php b/views/home.php index abf6d9b..7456ea2 100644 --- a/views/home.php +++ b/views/home.php @@ -1,32 +1,39 @@ -mainURL] = $parsedTwtxtFile; include 'partials/profile.php'; } -} ?> - +} +?> @@ -34,4 +41,3 @@ if( isset($_SESSION['password'])) { - diff --git a/views/login.php b/views/login.php index 484f670..4b75b3a 100644 --- a/views/login.php +++ b/views/login.php @@ -5,11 +5,11 @@ $title = "Login - ".$title; include 'partials/header.php'; ?> - +
diff --git a/views/post.php b/views/post.php index 42c532c..2c9ef20 100644 --- a/views/post.php +++ b/views/post.php @@ -1,4 +1,5 @@ -
Nick