0ct0pu5/yellow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Better location handling (icecream remix)

Browse source
This commit is contained in:
markseu 2014-05-17 21:46:23 +02:00
parent 9ce484a947
commit edad970a0a
2 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
system/core/core-markdownextra.php
View file

@ -5,7 +5,7 @@
// Markdown extra core plugin
class YellowMarkdownExtra
{
const Version = "0.2.9";
const Version = "0.2.10";
var $yellow; //access to API
// Initialise plugin
@ -38,12 +38,15 @@ class YellowMarkdownExtraParser extends MarkdownExtraParser
// Transform page text
function transformPage($page, $text)
{
$location = $this->yellow->toolbox->getDirectoryLocation($page->getLocation());
$text = preg_replace("/@pageRead/i", $page->get("pageRead"), $text);
$text = preg_replace("/@pageEdit/i", $page->get("pageEdit"), $text);
$text = preg_replace("/@pageError/i", $page->get("pageError"), $text);
return preg_replace("/<a(.*?)href=\"(?!javascript:)([^\/\"]+)\"(.*?)>/i",
"<a$1href=\"$location$2\"$3>", $this->transform($text));
$callback = function($matches) use ($page)
{
$matches[2] = $page->yellow->toolbox->normaliseLocation($matches[2], $page->base, $page->location);
return "<a$matches[1]href=\"$matches[2]\"$matches[3]>";
};
return preg_replace_callback("/<a(.*?)href=\"([^\"]+)\"(.*?)>/i", $callback, $this->transform($text));
}
// Return unique id attribute

29
system/core/core.php
View file

@ -5,7 +5,7 @@
// Yellow main class
class Yellow
{
const Version = "0.2.19";
const Version = "0.2.20";
var $page; //current page
var $pages; //pages from file system
var $config; //configuration
@ -175,11 +175,7 @@ class Yellow
if($statusCode==200 && $this->getRequestHandler()=="core" && $this->page->isExisting("redirect"))
{
$statusCode = 301;
$location = $this->page->get("redirect");
if(preg_match("/^[^\/]+$/", $location))
{
$location = $this->toolbox->getDirectoryLocation($this->page->getLocation()).$location;
}
$location = $this->toolbox->normaliseLocation($this->page->get("redirect"), $this->page->base, $this->page->location);
$locationHeader = $this->toolbox->getLocationHeader($this->page->serverScheme, $this->page->serverName, "", $location);
$this->page->clean($statusCode, $locationHeader);
$this->page->setHeader("Last-Modified", $this->page->getModified(true));
@ -230,7 +226,7 @@ class Yellow
$serverScheme = empty($serverScheme) ? $this->config->get("serverScheme") : $serverScheme;
$serverName = empty($serverName) ? $this->config->get("serverName") : $serverName;
$base = empty($base) ? $this->config->get("serverBase") : $base;
$location = $this->toolbox->getLocationNormalised();
$location = $this->toolbox->getLocationClean();
$location = substru($location, strlenu($base));
$fileName = $this->toolbox->findFileFromLocation($location,
$this->config->get("contentDir"), $this->config->get("contentHomeDir"),
@ -1229,7 +1225,7 @@ class YellowToolbox
}
// Return location from current HTTP request, remove unwanted path tokens
function getLocationNormalised()
function getLocationClean()
{
$string = $this->getLocation();
$location = ($string[0]=='/') ? '' : '/';
@ -1535,6 +1531,23 @@ class YellowToolbox
return preg_replace("/[^\pL\d\-\_\.]/u", "-", $text);
}
// Normalise location, make absolute page location
function normaliseLocation($location, $pageBase, $pageLocation)
{
if(!preg_match("/^\w+:/", $location))
{
if(preg_match("/^[^\/]+$/", $location))
{
$location = $this->getDirectoryLocation($pageBase.$pageLocation).$location;
}
else if(!preg_match("#^$pageBase#", $location))
{
$location = $pageBase.$location;
}
}
return $location;
}
// Normalise location arguments
function normaliseArgs($text, $appendSlash = true, $filterStrict = true)
{