Backporting FOAG changes into Neo devstream
This commit is contained in:
Andy Dixon
@@ -26,6 +26,4 @@ if (!isset($_SESSION['neoCMSSess'])) {
|
||||
|
||||
} else $sessname = $_SESSION['neoCMSSess'];
|
||||
|
||||
session_name($sessname);
|
||||
session_cache_expire(240); // 4 hours
|
||||
@session_start();
|
||||
+83
-84
@@ -12,7 +12,6 @@ if (isset($_SESSION['neoCMSSess']) && strstr($_SESSION['neoCMSSess'], 'neoCMSses
|
||||
$pageurl = $_SERVER['HTTP_REFERER']; //incoming page url
|
||||
|
||||
if (stristr($pageurl, $_SERVER['HTTP_HOST'])) {
|
||||
|
||||
$type = $_GET['type'];
|
||||
|
||||
if ($type == 'img') $files = 'bmp,gif,jpeg,jpg,png,svg,svgx,webp';
|
||||
@@ -34,91 +33,10 @@ if (isset($_SESSION['neoCMSSess']) && strstr($_SESSION['neoCMSSess'], 'neoCMSses
|
||||
|
||||
$pattern = trim($pattern, '|') . ')/i';
|
||||
|
||||
function findfiles($path, $pattern)
|
||||
{
|
||||
|
||||
global $matches, $pathdefault, $type;
|
||||
|
||||
$path = rtrim(str_replace("\\", "/", $path), '/') . '/';
|
||||
|
||||
$entries = array();
|
||||
$dir = dir($path);
|
||||
$neocmspath = "/\/" . $_SESSION['neoCMSPath'] . "\//";
|
||||
|
||||
while (false !== ($entry = $dir->read())) {
|
||||
|
||||
if (!preg_match($neocmspath, $path)) $entries[] = $entry;
|
||||
|
||||
}
|
||||
|
||||
$dir->close();
|
||||
|
||||
foreach ($entries as $entry) {
|
||||
|
||||
$fullname = $path . $entry;
|
||||
$pathname = str_replace('../..', '', $path);
|
||||
|
||||
$exFolders = preg_replace('/,\s*/', '/|', $_SESSION['neoCMSExFolders']);
|
||||
$exFolders = str_replace('-', '\-', $exFolders);
|
||||
$exFolders = str_replace('.', '\.', $exFolders);
|
||||
$exFolders = '/' . str_replace('/', '\/', $exFolders) . '\//';
|
||||
|
||||
if ($entry != '.' && $entry != '..' && is_dir($fullname) && is_readable($fullname) && (!preg_match($exFolders, $fullname) || $_SESSION['neoCMSExFolders'] == '')) findfiles($fullname, $pattern);
|
||||
elseif ($entry != '.' && $entry != '..' && is_file($fullname) && preg_match($pattern, $entry)) {
|
||||
|
||||
if (!in_array($pathname, $matches)) {
|
||||
|
||||
if (preg_match('/\.html|\.htm|\.php|\.cfm|\.phtml|\.shtml|\.asp/', $fullname)) {
|
||||
|
||||
$content = file_get_contents($fullname);
|
||||
|
||||
if (checkContent($content)) $matches[] = $fullname;
|
||||
|
||||
} else $matches[] = $fullname;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
function checkContent($content)
|
||||
{
|
||||
|
||||
global $type;
|
||||
|
||||
if (stristr($content, '<?php') || stristr($content, '<%')) {
|
||||
|
||||
if (((!stristr($content, '<?php') && !strstr($content, '<%')) || (preg_match('/>[^<]+</', $content) || (preg_match('/<html/', $content))) || $type == 'pages')) {
|
||||
if (strstr($content, 'neocms')) return true;
|
||||
else return false;
|
||||
} else return false;
|
||||
|
||||
} elseif (preg_match('/<html/', $content) || $type == 'pages') {
|
||||
if (strstr($content, 'neocms')) return true;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
function siteURL()
|
||||
{
|
||||
$purl = 'http';
|
||||
$req = explode('/' . $_SESSION['neoCMSPath'] . '/', $_SERVER["REQUEST_URI"]);
|
||||
$req = $req[0];
|
||||
|
||||
if ($_SERVER["HTTPS"] == "on") $purl .= "s";
|
||||
|
||||
$purl .= "://";
|
||||
|
||||
if ($_SERVER["SERVER_PORT"] != "80") $purl .= $_SERVER["SERVER_NAME"] . ":" . $_SERVER["SERVER_PORT"] . "$req/";
|
||||
else $purl .= $_SERVER["SERVER_NAME"] . "$req/";
|
||||
|
||||
return strtolower($purl);
|
||||
}
|
||||
|
||||
findfiles('../../', $pattern);
|
||||
$matches = findfiles('../../', $pattern);
|
||||
print_r($matches);
|
||||
sort($matches);
|
||||
|
||||
$includes = array_unique($includes);
|
||||
@@ -177,3 +95,84 @@ if (isset($_SESSION['neoCMSSess']) && strstr($_SESSION['neoCMSSess'], 'neoCMSses
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
function findfiles($path, $pattern)
|
||||
{
|
||||
$matches = [];
|
||||
$path = rtrim(str_replace("\\", "/", $path), '/') . '/';
|
||||
|
||||
$entries = array();
|
||||
$dir = dir($path);
|
||||
$neocmspath = "/\/" . $_SESSION['neoCMSPath'] . "\//";
|
||||
while (false !== ($entry = $dir->read())) {
|
||||
|
||||
if (!preg_match($neocmspath, $path)) $entries[] = $entry;
|
||||
|
||||
}
|
||||
|
||||
$dir->close();
|
||||
|
||||
foreach ($entries as $entry) {
|
||||
$fullname = $path . $entry;
|
||||
$pathname = str_replace('../..', '', $path);
|
||||
|
||||
$exFolders = preg_replace('/,\s*/', '/|', $_SESSION['neoCMSExFolders']);
|
||||
$exFolders = str_replace('-', '\-', $exFolders);
|
||||
$exFolders = str_replace('.', '\.', $exFolders);
|
||||
$exFolders = '/' . str_replace('/', '\/', $exFolders) . '\//';
|
||||
|
||||
if ($entry != '.' && $entry != '..' && is_dir($fullname) && is_readable($fullname) && (!preg_match($exFolders, $fullname) || $_SESSION['neoCMSExFolders'] == '')) findfiles($fullname, $pattern);
|
||||
elseif ($entry != '.' && $entry != '..' && is_file($fullname) && preg_match($pattern, $entry)) {
|
||||
|
||||
if (!in_array($pathname, $matches)) {
|
||||
if (preg_match('/\.html|\.htm|\.php|\.cfm|\.phtml|\.shtml|\.asp/', $fullname)) {
|
||||
|
||||
$content = file_get_contents($fullname);
|
||||
if (checkContent($content)) {
|
||||
$matches[] = $fullname;
|
||||
}
|
||||
|
||||
} else $matches[] = $fullname;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
return $matches;
|
||||
}
|
||||
|
||||
function checkContent($content)
|
||||
{
|
||||
|
||||
global $type;
|
||||
|
||||
if (stristr($content, '<?php') || stristr($content, '<%')) {
|
||||
|
||||
if (((!stristr($content, '<?php') && !strstr($content, '<%')) || (preg_match('/>[^<]+</', $content) || (preg_match('/<html/', $content))) || $type == 'pages')) {
|
||||
if (strstr($content, 'neocms')) return true;
|
||||
else return false;
|
||||
} else return false;
|
||||
|
||||
} elseif (preg_match('/<html/', $content) || $type == 'pages') {
|
||||
if (strstr($content, 'neocms')) return true;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
function siteURL()
|
||||
{
|
||||
$purl = 'http';
|
||||
$req = explode('/' . $_SESSION['neoCMSPath'] . '/', $_SERVER["REQUEST_URI"]);
|
||||
$req = $req[0];
|
||||
|
||||
if ($_SERVER["HTTPS"] == "on") $purl .= "s";
|
||||
|
||||
$purl .= "://";
|
||||
|
||||
if ($_SERVER["SERVER_PORT"] != "80") $purl .= $_SERVER["SERVER_NAME"] . ":" . $_SERVER["SERVER_PORT"] . "$req/";
|
||||
else $purl .= $_SERVER["SERVER_NAME"] . "$req/";
|
||||
|
||||
return strtolower($purl);
|
||||
}
|
||||
+1
-46
@@ -426,50 +426,7 @@ if (isset($_SESSION['neoCMSSess']) && strstr($_SESSION['neoCMSSess'], 'neoCMSses
|
||||
|
||||
if (@file_exists($fkey)) {
|
||||
|
||||
if ($ftpconn) {
|
||||
|
||||
$doc = tmpfile();
|
||||
if (!$doc) {
|
||||
$docp = tempnam(dirname(__FILE__) . '/../settings/tmp', 'Doc');
|
||||
chmod($docp, 0777);
|
||||
$doc = fopen($docp, 'w+');
|
||||
}
|
||||
$remotefile = '';
|
||||
|
||||
fwrite($doc, $fpost);
|
||||
rewind($doc);
|
||||
|
||||
$incs = flatten($includes);
|
||||
|
||||
if (strstr($fkey, $_SERVER['DOCUMENT_ROOT'])) {
|
||||
|
||||
$nfkey = explode($_SERVER['DOCUMENT_ROOT'], $fkey);
|
||||
$nfkey = $nfkey[1];
|
||||
|
||||
if (in_array($nfkey, $incs)) $remotefile = $ftpwd . $nfkey;
|
||||
else {
|
||||
$path = urldissect($_SERVER['SCRIPT_NAME'], false, 3);
|
||||
$fkey = explode('../../', $fkey, 2);
|
||||
|
||||
$remotefile = $ftpwd . $path . $fkey[1];
|
||||
}
|
||||
|
||||
} else {
|
||||
|
||||
$path = urldissect($_SERVER['SCRIPT_NAME'], false, 3);
|
||||
$fkey = explode('../../', $fkey, 2);
|
||||
|
||||
$remotefile = $ftpwd . $path . $fkey[1];
|
||||
|
||||
}
|
||||
|
||||
if (ftp_fput($ftpconn, $remotefile, $doc, FTP_BINARY)) echo "Uploaded: $remotefile!\n\n";
|
||||
else $message = '<strong>Error:</strong> neocms publish this page: <em>' . $remotefile . '</em>';
|
||||
|
||||
fclose($doc);
|
||||
if (isset($docp)) unlink($docp);
|
||||
|
||||
} elseif (is_writable($fkey)) {
|
||||
if (is_writable($fkey)) {
|
||||
|
||||
$doc = fopen($fkey, "w");
|
||||
fwrite($doc, $fpost);
|
||||
@@ -489,8 +446,6 @@ if (isset($_SESSION['neoCMSSess']) && strstr($_SESSION['neoCMSSess'], 'neoCMSses
|
||||
output();
|
||||
|
||||
} else output();
|
||||
|
||||
if ($ftpconn) ftp_close($ftpconn);
|
||||
}
|
||||
} else {
|
||||
$message = '<strong>Error:</strong> neocms is unable find your session.';
|
||||
|
||||
Reference in New Issue
Block a user