Skip to content

Fix pico_editor when Pico installed within non-empty base_url #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sarxos wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix pico_editor when Pico installed within non-empty base_url #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 26 additions & 5 deletions pico_editor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ public function before_render(&$twig_vars, &$twig)
if(isset($_POST['password'])){
if(sha1($_POST['password']) == $this->password){
$_SESSION['pico_logged_in'] = true;
$_SESSION['pico_config'] = $twig_vars['config'];
} else {
$twig_vars['login_error'] = 'Invalid password.';
echo $twig_editor->render('login.html', $twig_vars); // Render login.html
Expand All @@ -78,7 +79,27 @@ public function before_render(&$twig_vars, &$twig)
exit; // Don't continue to render template
}
}


/**
* Returns real file name to be edited.
*
* @param string $file_url the file URL to be edited
* @return string
*/
private static function get_real_filename($file_url) {

$file_components = parse_url($file_url); // inner
$base_components = parse_url($_SESSION['pico_config']['base_url']);
$file_path = rtrim($file_components['path'], '/');
$base_path = rtrim($base_components['path'], '/');

if (empty($file_path) || $file_path === $base_path) {
return 'index';
} else {
return basename(strip_tags($file_path));
}
}

private function do_new()
{
if(!isset($_SESSION['pico_logged_in']) || !$_SESSION['pico_logged_in']) die(json_encode(array('error' => 'Error: Unathorized')));
Expand Down Expand Up @@ -111,7 +132,7 @@ private function do_open()
{
if(!isset($_SESSION['pico_logged_in']) || !$_SESSION['pico_logged_in']) die(json_encode(array('error' => 'Error: Unathorized')));
$file_url = isset($_POST['file']) && $_POST['file'] ? $_POST['file'] : '';
$file = basename(strip_tags($file_url));
$file = self::get_real_filename($file_url);
if(!$file) die('Error: Invalid file');

$file .= CONTENT_EXT;
Expand All @@ -123,7 +144,7 @@ private function do_save()
{
if(!isset($_SESSION['pico_logged_in']) || !$_SESSION['pico_logged_in']) die(json_encode(array('error' => 'Error: Unathorized')));
$file_url = isset($_POST['file']) && $_POST['file'] ? $_POST['file'] : '';
$file = basename(strip_tags($file_url));
$file = self::get_real_filename($file_url);
if(!$file) die('Error: Invalid file');
$content = isset($_POST['content']) && $_POST['content'] ? $_POST['content'] : '';
if(!$content) die('Error: Invalid content');
Expand All @@ -137,7 +158,7 @@ private function do_delete()
{
if(!isset($_SESSION['pico_logged_in']) || !$_SESSION['pico_logged_in']) die(json_encode(array('error' => 'Error: Unathorized')));
$file_url = isset($_POST['file']) && $_POST['file'] ? $_POST['file'] : '';
$file = basename(strip_tags($file_url));
$file = self::get_real_filename($file_url);
if(!$file) die('Error: Invalid file');

$file .= CONTENT_EXT;
Expand Down Expand Up @@ -171,4 +192,4 @@ private function slugify($text)

}

?>
?>