jeff/timeline
1
0
Fork 0
mirror of https://github.com/sorenpeter/timeline.git synced 2025-12-16 11:27:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #38 from eapl-gemugami/37-header-link-not-redirecting-to-home-page

Browse source 
feat(header): add base_url to logo link
This commit is contained in:
sørenpeter 2024-12-21 16:12:32 +01:00 committed by GitHub
commit eb34813e5e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 20 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
partials/base.php
View file

@ -1,5 +1,6 @@
<?php <?php
# Shows the timeline for a user # Shows the timeline for a user
declare (strict_types = 1); declare (strict_types = 1);
# Parameters # Parameters
@ -15,7 +16,6 @@ declare (strict_types = 1);
# If page is higher than N, shows nothing # If page is higher than N, shows nothing
# #
# hash(string) = # hash(string) =
#
require_once('libs/session.php'); require_once('libs/session.php');
require_once('libs/twtxt.php'); require_once('libs/twtxt.php');
@ -36,13 +36,12 @@ if (isset($config['site_title'])) {
} }
// HACKED by sp@darch.dk // HACKED by sp@darch.dk
if(!empty($_GET['list'])) { if(!empty($_GET['list'])) {
$url = $baseURL.$_GET['list']; $url = $baseURL.$_GET['list'];
//$url = "https://darch.dk/".$_GET['list']; }
} else {
else { $url = $config['public_txt_url'];
$url = $config['public_txt_url']; }
}
/* /*
if(isset($_GET['selectList'])){ if(isset($_GET['selectList'])){
@ -93,12 +92,10 @@ if (!empty($_GET['url'])) { // Show profile for some user
*/ */
if (!empty($twtsURL)) { if (!empty($twtsURL)) {
$parsedTwtxtFile = getTwtsFromTwtxtString($twtsURL); $parsedTwtxtFile = getTwtsFromTwtxtString($twtsURL);
if (!is_null($parsedTwtxtFile)) { if (!is_null($parsedTwtxtFile)) {
$parsedTwtxtFiles[$parsedTwtxtFile->mainURL] = $parsedTwtxtFile; $parsedTwtxtFiles[$parsedTwtxtFile->mainURL] = $parsedTwtxtFile;
} }
} else { // Show timeline for the URL } else { // Show timeline for the URL
$parsedTwtxtFiles = []; $parsedTwtxtFiles = [];
foreach ($fileLines as $currentLine) { foreach ($fileLines as $currentLine) {

14
partials/header.php
View file

@ -3,7 +3,6 @@
$profile = getTwtsFromTwtxtString($config['public_txt_url']); $profile = getTwtsFromTwtxtString($config['public_txt_url']);
?> ?>
<!doctype html> <!doctype html>
<html> <html>
<head> <head>
@ -12,7 +11,6 @@ $profile = getTwtsFromTwtxtString($config['public_txt_url']);
<link rel="icon" type="image/x-icon" href="<?= $baseURL ?>/media/logo.png"> <link rel="icon" type="image/x-icon" href="<?= $baseURL ?>/media/logo.png">
<?php if( isset($_SESSION['password'])) { ?> <?php if( isset($_SESSION['password'])) { ?>
<script src="<?= $baseURL ?>/libs/tiny-mde.min.js"></script> <script src="<?= $baseURL ?>/libs/tiny-mde.min.js"></script>
<!-- <link rel="stylesheet" type="text/css" href="<?= $baseURL ?>/libs/tiny-mde.min.css" /> -->
<link rel="stylesheet" type="text/css" href="<?= $baseURL ?>/libs/tiny-mde.css" /> <link rel="stylesheet" type="text/css" href="<?= $baseURL ?>/libs/tiny-mde.css" />
<?php } ?> <?php } ?>
<link rel="stylesheet" type="text/css" href="<?= $baseURL ?>/libs/simple.css"> <link rel="stylesheet" type="text/css" href="<?= $baseURL ?>/libs/simple.css">
@ -26,23 +24,25 @@ $profile = getTwtsFromTwtxtString($config['public_txt_url']);
<header> <header>
<p> <p>
<a href="/"> <a href="<?= $baseURL ?>">
<img class="logo" src="<?= $baseURL ?>/media/logo.png"> <img class="logo" src="<?= $baseURL ?>/media/logo.png">
<?= $config['site_title']; ?> <?= $config['site_title']; ?>
</a> </a>
<!-- <a href="/"> <!--
<a href="/">
<img class="logo" src="<?= $profile->avatar ?>" alt="" loading="lazy"> <img class="logo" src="<?= $profile->avatar ?>" alt="" loading="lazy">
<?= parse_url($profile->mainURL, PHP_URL_HOST); ?> <?= parse_url($profile->mainURL, PHP_URL_HOST); ?>
</a> </a>
<a href="/"> <a href="/">
<img class="logo" src="<?= $profile->avatar ?>" alt="" loading="lazy"> <img class="logo" src="<?= $profile->avatar ?>" alt="" loading="lazy">
<?= $profile->nick ?>@<?= parse_url($profile->mainURL, PHP_URL_HOST); ?> <?= $profile->nick ?>@<?= parse_url($profile->mainURL, PHP_URL_HOST); ?>
</a> --> </a>
-->
</p> </p>
<nav> <nav>
<ul class="secondary"> <ul class="secondary">
<?php //if ($validSession) { // TODO: Make login seqcure ?> <?php //if ($validSession) { // TODO: Make login secure ?>
<?php if( isset($_SESSION['password'])) { /* <?php if( isset($_SESSION['password'])) { /*
if($_SESSION['password']=="$password") {*/ // Hacky login ?> if($_SESSION['password']=="$password") {*/ // Hacky login ?>
<li><a href="<?= $baseURL ?>/refresh?url=<?= $url ?>"><i class="fa fa-refresh"></i><span>Refresh</span></a></li> <li><a href="<?= $baseURL ?>/refresh?url=<?= $url ?>"><i class="fa fa-refresh"></i><span>Refresh</span></a></li>