mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-08-06 14:16:46 +02:00
Code Issues Releases Wiki Activity

resolved conflict using iusvar version in system

Browse Source
This commit is contained in:
trendschau
2020-07-05 09:15:48 +02:00
parent 74ecf7457e 62b3a07d6b
commit ddd33fb2b7
10 changed files with 72 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
system/Controllers/ArticleApiController.php
View File

@@ -22,7 +22,7 @@ class ArticleApiController extends ContentController
{
# get params from call
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
# validate input only if raw mode
if($this->params['raw'])
@@ -98,7 +98,7 @@ class ArticleApiController extends ContentController
{
# get params from call
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
# set structure
if(!$this->setStructure($draft = true)){ return $response->withJson($this->errors, 404); }
@@ -176,7 +176,7 @@ class ArticleApiController extends ContentController
{
# get params from call
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
# set structure
if(!$this->setStructure($draft = true)){ return $response->withJson($this->errors, 404); }
@@ -215,7 +215,7 @@ class ArticleApiController extends ContentController
{
# get params from call
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
# set url to base path initially
$url = $this->uri->getBaseUrl() . '/tm/content/' . $this->settings['editor'];
@@ -274,7 +274,7 @@ class ArticleApiController extends ContentController
{
# get params from call
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
# validate input
if(!$this->validateEditorInput()){ return $response->withJson($this->errors,422); }
@@ -318,7 +318,7 @@ class ArticleApiController extends ContentController
{
# get params from call
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
# url is only needed, if an active page is moved to another folder, so user has to be redirected to the new url
$url = false;
@@ -425,7 +425,7 @@ class ArticleApiController extends ContentController
{
# get params from call
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
# url is only needed, if an active page is moved
$url = false;
@@ -492,7 +492,7 @@ class ArticleApiController extends ContentController
{
# get params from call
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
# url is only needed, if an active page is moved
$url = false;
@@ -607,7 +607,7 @@ class ArticleApiController extends ContentController
{
# get params from call
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
# url is only needed, if an active page is moved
$url = false;
@@ -708,7 +708,7 @@ class ArticleApiController extends ContentController
{
# get params from call
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
# set structure
if(!$this->setStructure($draft = true, $cache = false)){ return $response->withJson(array('data' => false, 'errors' => $this->errors, 'url' => $url), 404); }
@@ -729,7 +729,7 @@ class ArticleApiController extends ContentController
{
/* get params from call */
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
# set structure
if(!$this->setStructure($draft = true)){ return $response->withJson(array('data' => false, 'errors' => $this->errors), 404); }
@@ -776,7 +776,7 @@ class ArticleApiController extends ContentController
{
/* get params from call */
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
# set structure
if(!$this->setStructure($draft = true)){ return $response->withJson(array('data' => false, 'errors' => $this->errors), 404); }

26
system/Controllers/BlockApiController.php
View File

@@ -19,7 +19,7 @@ class BlockApiController extends ContentController
{
/* get params from call */
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
/* validate input */
if(!$this->validateBlockInput()){ return $response->withJson($this->errors,422); }
@@ -199,7 +199,7 @@ class BlockApiController extends ContentController
{
/* get params from call */
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
/* validate input */
if(!$this->validateBlockInput()){ return $response->withJson($this->errors,422); }
@@ -338,7 +338,7 @@ class BlockApiController extends ContentController
{
# get params from call
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
# validate input
# if(!$this->validateBlockInput()){ return $response->withJson($this->errors,422); }
@@ -430,7 +430,7 @@ class BlockApiController extends ContentController
{
/* get params from call */
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
$errors = false;
# set structure
@@ -514,7 +514,7 @@ class BlockApiController extends ContentController
{
# get params from call
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
$imageProcessor = new ProcessImage($this->settings['images']);
if(!$imageProcessor->checkFolders('images'))
@@ -531,7 +531,7 @@ class BlockApiController extends ContentController
{
# get params from call
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
$fileProcessor = new ProcessFile();
if(!$fileProcessor->checkFolders())
@@ -548,7 +548,7 @@ class BlockApiController extends ContentController
{
# get params from call
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
$this->setStructure($draft = true, $cache = false);
@@ -573,7 +573,7 @@ class BlockApiController extends ContentController
{
# get params from call
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
$this->setStructure($draft = true, $cache = false);
@@ -597,7 +597,7 @@ class BlockApiController extends ContentController
{
# get params from call
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
# do this shit in the model ...
$imagename = explode('.', $this->params['name']);
@@ -623,7 +623,7 @@ class BlockApiController extends ContentController
{
# get params from call
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
$finfo = finfo_open( FILEINFO_MIME_TYPE );
$mtype = finfo_file( $finfo, $this->params['file'] );
@@ -688,7 +688,7 @@ class BlockApiController extends ContentController
{
# get params from call
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
if(!isset($this->params['name']))
{
@@ -710,7 +710,7 @@ class BlockApiController extends ContentController
{
# get params from call
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
if(!isset($this->params['name']))
{
@@ -732,7 +732,7 @@ class BlockApiController extends ContentController
{
/* get params from call */
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
$class = false;
$imageUrl = $this->params['markdown'];

4
system/Controllers/ContentBackendController.php
View File

@@ -21,7 +21,7 @@ class ContentBackendController extends ContentController
public function showContent(Request $request, Response $response, $args)
{
# get params from call
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
$this->params = isset($args['params']) ? ['url' => $this->uri->getBasePath() . '/' . $args['params']] : ['url' => $this->uri->getBasePath()];
# set structure
@@ -89,7 +89,7 @@ class ContentBackendController extends ContentController
public function showBlox(Request $request, Response $response, $args)
{
# get params from call
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
$this->params = isset($args['params']) ? ['url' => $this->uri->getBasePath() . '/' . $args['params']] : ['url' => $this->uri->getBasePath()];
# set structure

18
system/Controllers/MediaApiController.php
View File

@@ -15,7 +15,7 @@ class MediaApiController extends ContentController
{
# get params from call
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
$imageProcessor = new ProcessImage($this->settings['images']);
if(!$imageProcessor->checkFolders('images'))
@@ -32,7 +32,7 @@ class MediaApiController extends ContentController
{
# get params from call
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
$fileProcessor = new ProcessFile();
if(!$fileProcessor->checkFolders())
@@ -49,7 +49,7 @@ class MediaApiController extends ContentController
{
# get params from call
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
$this->setStructure($draft = true, $cache = false);
@@ -73,7 +73,7 @@ class MediaApiController extends ContentController
{
# get params from call
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
$this->setStructure($draft = true, $cache = false);
@@ -97,7 +97,7 @@ class MediaApiController extends ContentController
{
# get params from call
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
$imageProcessor = new ProcessImage($this->settings['images']);
@@ -123,7 +123,7 @@ class MediaApiController extends ContentController
{
# get params from call
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
# make sure only allowed filetypes are uploaded
$finfo = finfo_open( FILEINFO_MIME_TYPE );
@@ -205,7 +205,7 @@ class MediaApiController extends ContentController
{
# get params from call
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
if(!isset($this->params['name']))
{
@@ -230,7 +230,7 @@ class MediaApiController extends ContentController
{
# get params from call
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
if(!isset($this->params['name']))
{
@@ -251,7 +251,7 @@ class MediaApiController extends ContentController
{
/* get params from call */
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
$class = false;
$imageUrl = $this->params['markdown'];

4
system/Controllers/MetaApiController.php
View File

@@ -67,7 +67,7 @@ class MetaApiController extends ContentController
{
/* get params from call */
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
# set structure
if(!$this->setStructure($draft = true)){ return $response->withJson($this->errors, 404); }
@@ -132,7 +132,7 @@ class MetaApiController extends ContentController
{
# get params from call
$this->params = $request->getParams();
$this->uri = $request->getUri();
$this->uri = $request->getUri()->withUserInfo('');
$tab = isset($this->params['tab']) ? $this->params['tab'] : false;
$metaInput = isset($this->params['data']) ? $this->params['data'] : false ;

2
system/Controllers/PageController.php
View File

@@ -33,7 +33,7 @@ class PageController extends Controller
$settings = $this->c->get('settings');
$pathToContent = $settings['rootPath'] . $settings['contentFolder'];
$cache = new WriteCache();
$uri = $request->getUri();
$uri = $request->getUri()->withUserInfo('');
$base_url = $uri->getBaseUrl();
$this->pathToContent = $pathToContent;

32
system/Controllers/SettingsController.php
View File

@@ -35,15 +35,16 @@ class SettingsController extends Controller
if($request->isPost())
{
$referer = $request->getHeader('HTTP_REFERER');
$uri = $request->getUri();
$uri = $request->getUri()->withUserInfo('');
$base_url = $uri->getBaseUrl();
# security, users should not be able to fake post with settings from other typemill pages.
/* security, users should not be able to fake post with settings from other typemill pages.
if(!isset($referer[0]) OR $referer[0] !== $base_url . '/tm/settings' )
{
$this->c->flash->addMessage('error', 'illegal referer');
return $response->withRedirect($this->c->router->pathFor('settings.show'));
}
*/
$settings = \Typemill\Settings::getUserSettings();
$defaultSettings = \Typemill\Settings::getDefaultSettings();
@@ -312,15 +313,16 @@ class SettingsController extends Controller
if($request->isPost())
{
$referer = $request->getHeader('HTTP_REFERER');
$uri = $request->getUri();
$uri = $request->getUri()->withUserInfo('');
$base_url = $uri->getBaseUrl();
# users should not be able to fake post with settings from other typemill pages.
/* users should not be able to fake post with settings from other typemill pages.
if(!isset($referer[0]) OR $referer[0] !== $base_url . '/tm/themes' )
{
$this->c->flash->addMessage('error', 'illegal referer');
return $response->withRedirect($this->c->router->pathFor('themes.show'));
}
*/
$userSettings = \Typemill\Settings::getUserSettings();
$params = $request->getParams();
@@ -409,16 +411,17 @@ class SettingsController extends Controller
if($request->isPost())
{
$referer = $request->getHeader('HTTP_REFERER');
$uri = $request->getUri();
$uri = $request->getUri()->withUserInfo('');
$base_url = $uri->getBaseUrl();
# security, users should not be able to fake post with settings from other typemill pages.
/* security, users should not be able to fake post with settings from other typemill pages.
if(!isset($referer[0]) OR $referer[0] !== $base_url . '/tm/plugins' )
{
$this->c->flash->addMessage('error', 'illegal referer');
return $response->withRedirect($this->c->router->pathFor('plugins.show'));
}
*/
$userSettings = \Typemill\Settings::getUserSettings();
$pluginSettings = array();
$userInput = $request->getParams();
@@ -754,15 +757,16 @@ class SettingsController extends Controller
if($request->isPost())
{
$referer = $request->getHeader('HTTP_REFERER');
$uri = $request->getUri();
$uri = $request->getUri()->withUserInfo('');
$base_url = $uri->getBaseUrl();
# security, users should not be able to fake post with settings from other typemill pages.
/* security, users should not be able to fake post with settings from other typemill pages.
if(!isset($referer[0]) OR $referer[0] !== $base_url . '/tm/user/new' )
{
$this->c->flash->addMessage('error', 'illegal referer');
return $response->withRedirect($this->c->router->pathFor('user.new'));
}
*/
$params = $request->getParams();
$user = new User();
@@ -796,15 +800,16 @@ class SettingsController extends Controller
if($request->isPost())
{
$referer = $request->getHeader('HTTP_REFERER');
$uri = $request->getUri();
$uri = $request->getUri()->withUserInfo('');
$base_url = $uri->getBaseUrl();
# security, users should not be able to fake post with settings from other typemill pages.
/* security, users should not be able to fake post with settings from other typemill pages.
if(!isset($referer[0]) OR strpos($referer[0], $base_url . '/tm/user/') === false )
{
$this->c->flash->addMessage('error', 'illegal referer');
return $response->withRedirect($this->c->router->pathFor('user.list'));
}
*/
$params = $request->getParams();
$userdata = $params['user'];
@@ -882,15 +887,16 @@ class SettingsController extends Controller
if($request->isPost())
{
$referer = $request->getHeader('HTTP_REFERER');
$uri = $request->getUri();
$uri = $request->getUri()->withUserInfo('');
$base_url = $uri->getBaseUrl();
# security, users should not be able to fake post with settings from other typemill pages.
/* security, users should not be able to fake post with settings from other typemill pages.
if(!isset($referer[0]) OR strpos($referer[0], $base_url . '/tm/user/') === false )
{
$this->c->flash->addMessage('error', 'illegal referer');
return $response->withRedirect($this->c->router->pathFor('user.list'));
}
*/
$params = $request->getParams();
$validate = new Validation();