diff --git a/backend/editor/.config/editor_config.php b/backend/editor/.config/editor_config.php index 65fcb37..7a8d1d3 100644 --- a/backend/editor/.config/editor_config.php +++ b/backend/editor/.config/editor_config.php @@ -21,9 +21,10 @@ elseif (ENVIRONMENT === 'production') $editor['webserviceUrl'] = HOST_URL . str_replace(PATH_ROOT, '', dirname(__DIR__)) . '/remote_data.php'; $editor['imageTypes'] = array('image/png', 'image/jpeg', 'image/gif'); -$editor['imageDimension']['small'] = array('width' => 480, 'height' => 360, 'quality' => 95); -$editor['imageDimension']['keyVisual'] = array('width' => 1368, 'height' => 342, 'quality' => 95); -$editor['imageDimension']['orig'] = array('width' => 2560, 'height' => 2560, 'quality' => 99); +$editor['imageDimension']['image'] = array('width' => 480, 'height' => null, 'standardImage' => HTML_IMG . 'standard_upload.jpg', 'quality' => 95); +$editor['imageDimension']['keyVisual'] = array('width' => 1368, 'height' => 342, 'standardImage' => HTML_IMG . 'standard_upload.jpg', 'quality' => 95, ); +$editor['imageDimension']['thumb'] = array('width' => 152, 'quality' => 90); +$editor['imageDimension']['orig'] = array('width' => 2560, 'height' => 2560, 'quality' => 97); $editor['contentElements'] = array('subline', 'text', 'textimage'); $editor['backendPrefix'] = PATH_PREFIX . '/' . str_replace(PATH_ROOT, '', dirname(__DIR__)); diff --git a/backend/editor/index.php b/backend/editor/index.php index be709fb..001f5c4 100644 --- a/backend/editor/index.php +++ b/backend/editor/index.php @@ -9,6 +9,8 @@ session_start(); $_SESSION['lang'] = 'de'; +$_SESSION['userID'] = 1; +$_SESSION['isLoggedIn'] = true; $siteID = (!isset($_GET['siteID']) || empty($_GET['siteID'])) ? '1' : $_GET['siteID']; $pathRoot = dirname(dirname(__DIR__)) . '/'; diff --git a/backend/editor/webservice/requestData.php b/backend/editor/webservice/requestData.php index 4bcda1c..5326af1 100644 --- a/backend/editor/webservice/requestData.php +++ b/backend/editor/webservice/requestData.php @@ -7,5 +7,21 @@ * @copyright CS medien- & kommunikationssysteme (http://www.steinle-computer.de) */ +if (!isset($_POST['token']) || !is_string($_POST['token']) || empty($_POST['token'])) +{ + die(); +} + +session_start($_POST['token']); +if (!isset($_SESSION['userID']) || !is_numeric($_SESSION['userID']) || $_SESSION['userID'] < 1) +{ + die(); +} + +if (!isset($_SESSION['isLoggedIn']) || $_SESSION['isLoggedIn'] !== true) +{ + die(); +} + file_put_contents(__DIR__ . '/request.log', var_export($_POST, true) . "\n\n", FILE_APPEND); echo json_encode(1); \ No newline at end of file diff --git a/css/ahd.css b/css/ahd.css index a2dcbac..b5c3680 100644 --- a/css/ahd.css +++ b/css/ahd.css @@ -68,7 +68,7 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { margin-top: 12px; width: 149px; height: 25px; - background-image: url('../images/subaru/subaru_logo.png'); + background-image: url('../images/subaru_logo.png'); } .daihatsu_logo { @@ -76,7 +76,7 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { height: 25px; margin-left: 15px; margin-top: 12px; - background-image: url('../images/daihatsu/daihatsu_logo.png'); + background-image: url('../images/daihatsu_logo.png'); } } @@ -106,7 +106,7 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { margin-top: 12px; width: 48px; height: 25px; - background-image: url('../images/subaru/subaru_logo.png'); + background-image: url('../images/subaru_logo.png'); } .daihatsu_logo { @@ -114,7 +114,7 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { height: 25px; margin-left: 15px; margin-top: 12px; - background-image: url('../images/daihatsu/daihatsu_logo.png'); + background-image: url('../images/daihatsu_logo.png'); } } diff --git a/css/ahd.min.css b/css/ahd.min.css index 7dcb21e..21cfe3a 100644 --- a/css/ahd.min.css +++ b/css/ahd.min.css @@ -1 +1 @@ -body{padding:50px 0;font-family:Verdana,Arial,sans-serif;text-align:justify}li.dropdown-submenu{position:relative}li.dropdown-submenu:hover>ul.dropdown-menu{display:block}li.dropdown:hover>ul.dropdown-menu{display:block}ul.dropdown-menu.pull-left{margin-top:-6px;border-top-left-radius:0;border-bottom-left-radius:0;border-left:0;top:0;left:100%}h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-weight:bold}#footer h3{text-decoration:underline}#footer:hover .navbar-brand{height:auto}#footer .navbar-brand{margin-left:0}#footer .navbar-brand p{font-size:14px}.container-fluid{max-width:1600px}.container-fluid .img-responsive{margin:0 auto}.caret.rotate-left{transform:rotate(270deg)}.navbar-fixed-top .pull-right img{margin-top:15px;margin-left:30px}@media screen and (min-width:768px){.subaru_logo{margin-top:12px;width:149px;height:25px;background-image:url('../images/subaru/subaru_logo.png')}.daihatsu_logo{width:150px;height:25px;margin-left:15px;margin-top:12px;background-image:url('../images/daihatsu/daihatsu_logo.png')}}@media(max-width:767px){#main-navbar{position:absolute;left:80px}.navbar-collapse.in{overflow-y:visible}#main-navbar a.dropdown-toggle{display:block}#main-navbar ul.dropdown-menu{float:left}.container>.navbar-header{margin:0}.subaru_logo{margin-top:12px;width:48px;height:25px;background-image:url('../images/subaru/subaru_logo.png')}.daihatsu_logo{width:42px;height:25px;margin-left:15px;margin-top:12px;background-image:url('../images/daihatsu/daihatsu_logo.png')}}@media(max-width:642px){#footer .ahd{display:none}} \ No newline at end of file +body{padding:50px 0;font-family:Verdana,Arial,sans-serif;text-align:justify}li.dropdown-submenu{position:relative}li.dropdown-submenu:hover>ul.dropdown-menu{display:block}li.dropdown:hover>ul.dropdown-menu{display:block}ul.dropdown-menu.pull-left{margin-top:-6px;border-top-left-radius:0;border-bottom-left-radius:0;border-left:0;top:0;left:100%}h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-weight:bold}#footer h3{text-decoration:underline}#footer:hover .navbar-brand{height:auto}#footer .navbar-brand{margin-left:0}#footer .navbar-brand p{font-size:14px}.container-fluid{max-width:1600px}.container-fluid .img-responsive{margin:0 auto}.caret.rotate-left{transform:rotate(270deg)}.navbar-fixed-top .pull-right img{margin-top:15px;margin-left:30px}@media screen and (min-width:768px){.subaru_logo{margin-top:12px;width:149px;height:25px;background-image:url('../images/subaru/subaru_logo.png')}.daihatsu_logo{width:150px;height:25px;margin-left:15px;margin-top:12px;background-image:url('../images/daihatsu_logo.png')}}@media(max-width:767px){#main-navbar{position:absolute;left:80px} .navbar-collapse.in{overflow-y:visible} #main-navbar a.dropdown-toggle{display:block} #main-navbar ul.dropdown-menu{float:left} .container>.navbar-header{margin:0} .subaru_logo{margin-top:12px;width:48px;height:25px;background-image:url('../images/subaru/subaru_logo.png')} .daihatsu_logo{width:42px;height:25px;margin-left:15px;margin-top:12px;background-image:url('../images/daihatsu_logo.png')}}@media(max-width:642px){#footer .ahd{display:none}} \ No newline at end of file diff --git a/images/daihatsu_logo.png b/images/daihatsu_logo.png new file mode 100644 index 0000000..d85d203 Binary files /dev/null and b/images/daihatsu_logo.png differ diff --git a/images/standard_upload.jpg b/images/standard_upload.jpg new file mode 100644 index 0000000..c6f6c37 Binary files /dev/null and b/images/standard_upload.jpg differ diff --git a/images/subaru_logo.png b/images/subaru_logo.png new file mode 100644 index 0000000..75832a5 Binary files /dev/null and b/images/subaru_logo.png differ diff --git a/rendering/View/NavigationView.php b/rendering/View/NavigationView.php index f169b9b..814efb6 100644 --- a/rendering/View/NavigationView.php +++ b/rendering/View/NavigationView.php @@ -101,8 +101,7 @@ class NavigationView if ($depth === 0) { - $editableHtml = ($this->isEditable) ? ' data-editor="navigation" data-id="' . end($this->navigationPath) . '" data-element="navigation_' . end($this->navigationPath) . '"' : ''; - //$this->navigationHtml .= '