svj/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code-Formatierungen und Anpassungen an neue Editoren

Browse Source
This commit is contained in:
Christian Steinle
2016-09-27 12:33:02 +00:00
parent 85494a976d
commit 60115d95a1
8 changed files with 839 additions and 1017 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.config/config_global.php
View File

@@ -74,6 +74,7 @@ define('PATH_CNF', PATH_ROOT . '.config/');
define('PATH_FNC', PATH_ROOT . '.functions/');
define('PATH_INC', PATH_ROOT . '.includes/');
define('PATH_LANG', PATH_ROOT . '.lang/');
define('WEBSERVICE_MED', PATH_ROOT . 'media/');
/**

133
.functions/fnc_portal.php
View File

@@ -17,17 +17,8 @@ function fnc_getNavigationArray($prefix, $onlyActive = true, $navPositions = arr
? ' WHERE ' . $str_filter
: '';
$navi = $db->query
(
'SELECT
*
FROM
' . $prefix . '_' . TBL_NAVI .
$str_filter . '
ORDER BY
' . $prefix . '_navStart ASC ,
' . $prefix . '_navSort ASC;'
);
$navi = $db->query('SELECT * FROM ' . $prefix . '_' . TBL_NAVI . $str_filter . ' ORDER BY ' . $prefix . '_navStart ASC , ' . $prefix . '_navSort ASC;');
while ($dat_navi = $navi->fetch_assoc())
{
if (!empty($namesFromConfig))
@@ -43,6 +34,7 @@ function fnc_getNavigationArray($prefix, $onlyActive = true, $navPositions = arr
function fnc_getSingleNavigationArrays($prefix, $navArray, $params, $pathWay)
{
$i = 0;
$return = array();
foreach ($params['navLevel'] as $key => $depth)
{
@@ -129,15 +121,7 @@ function fnc_createPathHome($prefix, $navActive)
{
global $db;
$navi = $db->query
(
'SELECT
*
FROM
' . $prefix . '_' . TBL_NAVI . '
WHERE
' . $prefix . '_navId = "' . $navActive . '";'
);
$navi = $db->query('SELECT * FROM ' . $prefix . '_' . TBL_NAVI . ' WHERE ' . $prefix . '_navId = "' . $navActive . '";');
$arr_navi = $navi->fetch_assoc();
if ($arr_navi[$prefix . '_navStart'] !== '0' && !is_null($arr_navi))
{
@@ -156,15 +140,7 @@ function fnc_getNavType($prefix, $navActive)
{
global $db;
$navi = $db->query
(
'SELECT
*
FROM
' . $prefix . '_' . TBL_NAVI . '
WHERE
' . $prefix . '_navId = "' . $navActive . '";'
);
$navi = $db->query('SELECT * FROM ' . $prefix . '_' . TBL_NAVI . ' WHERE ' . $prefix . '_navId = "' . $navActive . '";');
$navPoint = $navi->fetch_assoc();
if ($navPoint[$prefix . '_specialSite'] === 'Y')
@@ -182,15 +158,7 @@ function fnc_getUsernameById($userId)
global $db;
$return = '';
$user = $db->query
(
'SELECT
*
FROM
' . TBL_USER . '
WHERE
userId = "' . $userId . '";'
);
$user = $db->query('SELECT * FROM ' . TBL_USER . ' WHERE userId = "' . $userId . '";');
if ($user->num_rows > 0)
{
$dat_user = $user->fetch_assoc();
@@ -231,16 +199,7 @@ function fnc_generateUniqueUsername($lastName, $firstName)
global $db;
$username = mb_strtolower(substr($firstName, 0, 1), 'UTF-8') . mb_strtolower($lastName, 'UTF-8');
$count = $db->query
(
'SELECT
*
FROM
' . TBL_USER . '
WHERE
userUsername = "' . $username . '" OR
userUsername LIKE "' . $username . '_%";'
);
$count = $db->query('SELECT * FROM ' . TBL_USER . ' WHERE userUsername = "' . $username . '" OR userUsername LIKE "' . $username . '_%";');
if ($count->num_rows !== 0)
{
@@ -253,15 +212,7 @@ function fnc_generateUniqueUsername($lastName, $firstName)
function fnc_writeLog($entry, $params, $userId)
{
global $db;
$db->query
(
'INSERT INTO
' . TBL_LOG . '
( logEntry , logParams , logUser )
VALUES
( "' . $entry . '" , "' . implode('::', $params) . '" , "' . $userId . '" );'
);
$db->query('INSERT INTO ' . TBL_LOG . '(logEntry, logParams, logUser) VALUES ("' . $entry . '", "' . implode('::', $params) . '", "' . $userId . '");');
}
function fnc_readLog($entry, $params)
@@ -283,28 +234,10 @@ function fnc_sendEmailToUser($mailId, $userId, $sessionUserId)
global $vC;
global $lang;
$result = $db->query
(
'SELECT
*
FROM
' . TBL_USER . '
WHERE
userId = "' . $userId . '"
LIMIT 1;'
);
$result = $db->query('SELECT * FROM ' . TBL_USER . ' WHERE userId = "' . $userId . '" LIMIT 1;');
$recipient = $result->fetch_assoc();
$result = $db->query
(
'SELECT
*
FROM
' . TBL_USER . '
WHERE
userId = "' . $sessionUserId . '"
LIMIT 1;'
);
$result = $db->query('SELECT * FROM ' . TBL_USER . ' WHERE userId = "' . $sessionUserId . '" LIMIT 1;');
$sender = $result->fetch_assoc();
$mailSubj = $lang['mail']['subj'][$mailId];
@@ -368,28 +301,11 @@ function fnc_checkUniqueEmailAddress($emailAddress, $userId = '')
if ($userId !== '')
{
$count = $db->query
(
'SELECT
*
FROM
' . TBL_USER . '
WHERE
userId != "' . $userId . '" AND
userEmail = "' . $emailAddress . '";'
);
$count = $db->query('SELECT * FROM ' . TBL_USER . ' WHERE userId != "' . $userId . '" AND userEmail = "' . $emailAddress . '";');
}
else
{
$count = $db->query
(
'SELECT
*
FROM
' . TBL_USER . '
WHERE
userEmail = "' . $emailAddress . '";'
);
$count = $db->query('SELECT * FROM ' . TBL_USER . ' WHERE userEmail = "' . $emailAddress . '";');
}
if ($count->num_rows === 0)
{
@@ -423,32 +339,11 @@ function fnc_getSiteContents($contentParts, $prefix)
if ($table === 'textimage')
{
$tmp_content = $db->query
(
'SELECT
* , ' . $prefix . '_' . TBL_TEXTIMAGE . '.id AS text_image_id
FROM
' . $prefix . '_' . TBL_TEXTIMAGE . ',
' . $prefix . '_' . TBL_TEXT . ',
' . $prefix . '_' . TBL_IMAGE . '
WHERE
' . $prefix . '_' . TBL_TEXTIMAGE . '.content_text_id = ' . $prefix . '_' . TBL_TEXT . '.id AND
' . $prefix . '_' . TBL_TEXTIMAGE . '.content_image_id = ' . $prefix . '_' . TBL_IMAGE . '.id and
' . $prefix . '_' . TBL_TEXTIMAGE . '.id = ' . $id . '
LIMIT 1;'
);
$tmp_content = $db->query('SELECT * , ' . $prefix . '_' . TBL_TEXTIMAGE . '.id AS text_image_id FROM ' . $prefix . '_' . TBL_TEXTIMAGE . ', ' . $prefix . '_' . TBL_TEXT . ', ' . $prefix . '_' . TBL_IMAGE . ' WHERE ' . $prefix . '_' . TBL_TEXTIMAGE . '.content_text_id = ' . $prefix . '_' . TBL_TEXT . '.id AND ' . $prefix . '_' . TBL_TEXTIMAGE . '.content_image_id = ' . $prefix . '_' . TBL_IMAGE . '.id AND ' . $prefix . '_' . TBL_TEXTIMAGE . '.id = ' . $id . ' LIMIT 1;');
}
else
{
$tmp_content = $db->query
(
'SELECT
*
FROM
' . $prefix . '_content_' . $table . '
WHERE
id = ' . $id . ';'
);
$tmp_content = $db->query('SELECT * FROM ' . $prefix . '_content_' . $table . ' WHERE id = ' . $id . ';');
}
if ($tmp_content->num_rows === 0)

53
administrator/css/svjf_editor.css
View File

@@ -122,6 +122,21 @@
cursor: pointer;
}
.min {
display: inline-block;
float: right;
width: 24px;
text-align: center;
}
.rightBox {
float: right;
}
.rightBox h1 {
margin-top: 11px;
}
.submitButton:not(:first-of-type) {
float: left;
}
@@ -290,30 +305,36 @@ li.navclose ul {
background-color: #ffffff;
}
#imgHolder {
#editor_form .ui-icon {
background-image: url('../../css/images/ui-icons_e3000b_256x240.png');
}
#imagePlaceholder {
padding: 0;
position: relative;
left: 22px;
margin-bottom: 48px;
margin-bottom: 55px;
}
#imgImage {
#editImage {
position: absolute;
z-index: 10;
}
#imgBlende {
#imageCover {
position: absolute;
z-index: 100;
z-index: 20;
}
#imgPreview {
#imagePreview {
position: absolute;
left: 0;
top: 0;
cursor: move;
z-index: 30;
}
#blendeTop, #blendeLeft, #blendeRight, #blendeBottom {
#coverTop, #coverRight, #coverBottom, #coverLeft {
position: absolute;
background-color: rgba(255, 255, 255, .7);
}
@@ -435,6 +456,13 @@ input.subline {
color: #ffffff;
font-weight: bold;
padding: 0 11px;
}
#element_title > .min {
cursor: pointer;
}
#boxtitle {
cursor: move;
}
@@ -481,7 +509,7 @@ input.subline {
background-color: #ffffff;
}
#content .sort_handle, #rist_editor .sort_handle {
#content .sort_handle, #editor_form .sort_handle {
background-color: #ffffff;
position: absolute;
right: 0;
@@ -492,7 +520,7 @@ input.subline {
cursor: move;
}
#content .del_handle, #rist_editor .del_handle {
#content .del_handle, #editor_form .del_handle {
background-color: #ffffff;
position: absolute;
right: 24px;
@@ -503,7 +531,11 @@ input.subline {
cursor: pointer;
}
#newSort_box li {
#newSort_box {
float: left;
}
#newSort_box li, .navSort li {
position: relative;
list-style-type: none;
}
@@ -519,6 +551,7 @@ input.subline {
#imgThumbs img {
display: block;
float: none;
position: relative;
}
#wait {

4
administrator/popups/logfiles/index.php
View File

@@ -2,8 +2,8 @@
session_start();
define('PATH_ROOT', '../../../');
include_once(PATH_ROOT . '.config/config_global.php');
$pathRoot = dirname(dirname(dirname(__DIR__))) . '/';
include_once($pathRoot . '.config/config_global.php');
require_once(PATH_CLS . 'rendering/viewClass.php');
/* Funktionen und Aktionen einbinden */

5
administrator/popups/usermanagement/index.php
View File

@@ -2,9 +2,8 @@
session_start();
define('PATH_ROOT', '../../../');
include_once(PATH_ROOT . '.config/config_global.php');
$pathRoot = dirname(dirname(dirname(__DIR__))) . '/';
include_once($pathRoot . '.config/config_global.php');
require_once(PATH_CLS . 'rendering/viewClass.php');
/* Funktionen und Aktionen einbinden */

171
administrator/webservices/remote_data.php
View File

@@ -4,22 +4,7 @@ header('Access-Control-Allow-Origin: *');
// unset( $_POST[ 'uploadFile' ] );
// die ( );
if (!isset ($_POST['request']))
{
die('Wrong parameters');
}
if (!isset ($_POST['userId']))
{
die('Wrong parameters');
}
if (($_POST['request'] === 'getData' || $_POST['request'] === 'updateData' || $_POST['request'] === 'insertData' || $_POST['request'] === 'deleteData') && !isset ($_POST['dataSet']))
{
die('Wrong parameters');
}
if (($_POST['request'] === 'getData' || $_POST['request'] === 'updateData' || $_POST['request'] === 'insertData' || $_POST['request'] === 'deleteData') && !isset ($_POST['prefix']))
if (!isset($_POST['request']) || !isset($_POST['userId']) || !isset($_POST['dataSet']) || !isset($_POST['prefix']))
{
die('Wrong parameters');
}
@@ -63,7 +48,6 @@ if ($_POST['request'] === 'getData')
while ($fetch_data = $result->fetch_assoc())
{
$fetch_data[$_POST['prefix'] . '_navEditable'] = 'false';
$fetch_data[$_POST['prefix'] . '_navName'] = $fetch_data[$_POST['prefix'] . '_navName'];
if ($rights['rightsType'] === 'ALL' || ($rights['rightsType'] === 'DEF' && (in_array($_POST['prefix'] . '_' . $fetch_data[$_POST['prefix'] . '_navId'], $arr_rights) || in_array($_POST['prefix'] . '_' . $fetch_data[$_POST['prefix'] . '_navStart'], $arr_rights))))
{
@@ -99,7 +83,6 @@ if ($_POST['request'] === 'getData')
echo json_encode($data, JSON_UNESCAPED_UNICODE);
}
else if ($_POST['request'] === 'updateData')
{
$error = false;
@@ -151,6 +134,7 @@ else if ($_POST['request'] === 'updateData')
{
$columns = $db->query('SHOW COLUMNS FROM ' . $_POST['prefix'] . '_' . $table . ';');
$fieldNames = array();
while ($column = $columns->fetch_assoc())
{
$fieldNames[] = $column['Field'];
@@ -164,13 +148,12 @@ else if ($_POST['request'] === 'updateData')
}
}
/* Behandlung Keyvisual und Content-Image */
if ($table === 'content_image')
{
if (!is_dir(PATH_MED . $_POST['prefix'] . '/' . $_POST['navId']))
if (!is_dir(WEBSERVICE_MED . $_POST['prefix'] . '/' . $_POST['navId']))
{
mkdir(PATH_MED . $_POST['prefix'] . '/' . $_POST['navId'], 0755);
mkdir(WEBSERVICE_MED . $_POST['prefix'] . '/' . $_POST['navId'], 0755);
}
if (isset ($_POST['uploadFile']) && !empty ($_POST['uploadFile']))
@@ -180,7 +163,7 @@ else if ($_POST['request'] === 'updateData')
if (!isset ($_POST['formAction']) || (isset ($_POST['formAction']) && $_POST['formAction'] !== 'appendImage'))
{
$file_path = PATH_MED . $_POST['prefix'] . '/' . $_POST['navId'] . '/' . $old_data['imgName'];
$file_path = WEBSERVICE_MED . $_POST['prefix'] . '/' . $_POST['navId'] . '/' . $old_data['imgName'];
/* Alte Bilddaten löschen */
unlink($file_path . '.' . $old_data['imgExtension']);
@@ -205,8 +188,8 @@ else if ($_POST['request'] === 'updateData')
$file_name_temp = substr($file_name, 0, strrpos($file_name, '.')) . '_temp' . substr($file_name, strrpos($file_name, '.'));
$file_name_orig = substr($file_name, 0, strrpos($file_name, '.')) . '_orig' . substr($file_name, strrpos($file_name, '.'));
file_put_contents(PATH_MED . $_POST['prefix'] . '/' . $_POST['navId'] . '/' . $file_name_temp, $decodedData);
fnc_checkOrigResize(PATH_MED . $_POST['prefix'] . '/' . $_POST['navId'] . '/', $file_name_orig, $file_name_temp, $extension, ${$_POST['prefix']}['dimOrig']);
file_put_contents(WEBSERVICE_MED . $_POST['prefix'] . '/' . $_POST['navId'] . '/' . $file_name_temp, $decodedData);
fnc_checkOrigResize(WEBSERVICE_MED . $_POST['prefix'] . '/' . $_POST['navId'] . '/', $file_name_orig, $file_name_temp, $extension, ${$_POST['prefix']}['dimOrig']);
if (isset ($_POST['formAction']) && $_POST['formAction'] === 'appendImage')
{
@@ -223,13 +206,7 @@ else if ($_POST['request'] === 'updateData')
}
}
$new = $db->query
(
'INSERT INTO
' . $_POST['prefix'] . '_' . $table . '
SET
' . implode(' , ', $data)
);
$new = $db->query('INSERT INTO ' . $_POST['prefix'] . '_' . $table . ' SET ' . implode(' , ', $data));
$new_id = $db->insert_id;
unset ($data);
@@ -264,7 +241,7 @@ else if ($_POST['request'] === 'updateData')
$extension = $img_data['imgExtension'];
$old_name = $img_data['imgName'] . '.' . $extension;
$old_name_orig = substr($old_name, 0, strrpos($old_name, '.')) . '_orig' . substr($old_name, strrpos($old_name, '.'));
$old_name_thmb = substr($old_name, 0, strrpos($old_name, '.')) . '_thumb' . substr($old_name, strrpos($old_name, '.'));
$old_name_thumb = substr($old_name, 0, strrpos($old_name, '.')) . '_thumb' . substr($old_name, strrpos($old_name, '.'));
$img_name = $_POST['imgName'];
$img_name = explode('_', $img_name);
@@ -281,17 +258,17 @@ else if ($_POST['request'] === 'updateData')
{
$file_name = fnc_buildUniqueFileName($_POST['prefix'], $_POST['navId'], $img_name, $extension);
$file_name_orig = substr($file_name, 0, strrpos($file_name, '.')) . '_orig' . substr($file_name, strrpos($file_name, '.'));
$file_name_thmb = substr($file_name, 0, strrpos($file_name, '.')) . '_thumb' . substr($file_name, strrpos($file_name, '.'));
$file_name_thumb = substr($file_name, 0, strrpos($file_name, '.')) . '_thumb' . substr($file_name, strrpos($file_name, '.'));
rename(PATH_MED . $_POST['prefix'] . '/' . $_POST['navId'] . '/' . $old_name_thmb, PATH_MED . $_POST['prefix'] . '/' . $_POST['navId'] . '/' . $file_name_thmb);
rename(PATH_MED . $_POST['prefix'] . '/' . $_POST['navId'] . '/' . $old_name_orig, PATH_MED . $_POST['prefix'] . '/' . $_POST['navId'] . '/' . $file_name_orig);
rename(PATH_MED . $_POST['prefix'] . '/' . $_POST['navId'] . '/' . $old_name, PATH_MED . $_POST['prefix'] . '/' . $_POST['navId'] . '/' . $file_name);
rename(WEBSERVICE_MED . $_POST['prefix'] . '/' . $_POST['navId'] . '/' . $old_name_thumb, WEBSERVICE_MED . $_POST['prefix'] . '/' . $_POST['navId'] . '/' . $file_name_thumb);
rename(WEBSERVICE_MED . $_POST['prefix'] . '/' . $_POST['navId'] . '/' . $old_name_orig, WEBSERVICE_MED . $_POST['prefix'] . '/' . $_POST['navId'] . '/' . $file_name_orig);
rename(WEBSERVICE_MED . $_POST['prefix'] . '/' . $_POST['navId'] . '/' . $old_name, WEBSERVICE_MED . $_POST['prefix'] . '/' . $_POST['navId'] . '/' . $file_name);
}
else
{
$file_name = $old_name;
$file_name_orig = $old_name_orig;
$file_name_thmb = $old_name_thmb;
$file_name_thumb = $old_name_thumb;
}
}
}
@@ -305,7 +282,7 @@ else if ($_POST['request'] === 'updateData')
{
${$_POST['prefix']}['dim' . strtoupper(substr($dataSet, 0, 1)) . substr($dataSet, 1, strrpos($dataSet, '_') - 1)]['height'] = ${$_POST['prefix']}['dim' . strtoupper(substr($dataSet, 0, 1)) . substr($dataSet, 1, strrpos($dataSet, '_') - 1)]['width'] * $_POST['previewHeight'] / $_POST['previewWidth'];
}
$img_created = fnc_buildImage(PATH_MED . $_POST['prefix'] . '/' . $_POST['navId'] . '/', $file_name_orig, $extension, ${$_POST['prefix']}['dim' . strtoupper(substr($dataSet, 0, 1)) . substr($dataSet, 1, strrpos($dataSet, '_') - 1)], $_POST);
$img_created = fnc_buildImage(WEBSERVICE_MED . $_POST['prefix'] . '/' . $_POST['navId'] . '/', $file_name_orig, $extension, ${$_POST['prefix']}['dim' . strtoupper(substr($dataSet, 0, 1)) . substr($dataSet, 1, strrpos($dataSet, '_') - 1)], $_POST);
/* Thumbnail aus generiertem Bild erzeugen */
if (!is_null(${$_POST['prefix']}[substr($dataSet, 0, strrpos($dataSet, '_')) . 'Thumb']))
@@ -314,7 +291,7 @@ else if ($_POST['request'] === 'updateData')
{
${$_POST['prefix']}[substr($dataSet, 0, strrpos($dataSet, '_')) . 'Thumb']['height'] = ${$_POST['prefix']}[substr($dataSet, 0, strrpos($dataSet, '_')) . 'Thumb']['width'] * $_POST['previewHeight'] / $_POST['previewWidth'];
}
$thumb = fnc_buildThumbnail(PATH_MED . $_POST['prefix'] . '/' . $_POST['navId'] . '/', $file_name, $extension, ${$_POST['prefix']}[substr($dataSet, 0, strrpos($dataSet, '_')) . 'Thumb']);
$thumb = fnc_buildThumbnail(WEBSERVICE_MED . $_POST['prefix'] . '/' . $_POST['navId'] . '/', $file_name, $extension, ${$_POST['prefix']}[substr($dataSet, 0, strrpos($dataSet, '_')) . 'Thumb']);
}
/* Werte für Datenbank aktualisieren */
@@ -371,7 +348,6 @@ else if ($_POST['request'] === 'updateData')
}
else if ($_POST['request'] === 'insertData')
{
$error = false;
if ($table === 'navi')
{
@@ -496,7 +472,7 @@ else if ($_POST['request'] === 'insertData')
else
{
$columns = $db->query('SHOW COLUMNS FROM ' . $_POST['prefix'] . '_' . $table . ';');
$fieldNames = array();
while ($column = $columns->fetch_assoc())
{
$fieldNames[] = $column['Field'];
@@ -512,9 +488,9 @@ else if ($_POST['request'] === 'insertData')
if ($table === 'content_image')
{
if (!is_dir(PATH_MED . $_POST['prefix'] . '/' . $_POST['navId']))
if (!is_dir(WEBSERVICE_MED . $_POST['prefix'] . '/' . $_POST['navId']))
{
mkdir(PATH_MED . $_POST['prefix'] . '/' . $_POST['navId'], 0755);
mkdir(WEBSERVICE_MED . $_POST['prefix'] . '/' . $_POST['navId'], 0755);
}
/* Bilddaten auslesen */
@@ -532,15 +508,15 @@ else if ($_POST['request'] === 'insertData')
/* Originales Bild speichern */
$file_name_orig = substr($file_name, 0, strrpos($file_name, '.')) . '_orig' . substr($file_name, strrpos($file_name, '.'));
file_put_contents(PATH_MED . $_POST['prefix'] . '/' . $_POST['navId'] . '/' . $file_name_orig, $decodedData);
file_put_contents(WEBSERVICE_MED . $_POST['prefix'] . '/' . $_POST['navId'] . '/' . $file_name_orig, $decodedData);
/* Bilddaten aus Editor generieren */
$img_created = fnc_buildImage(PATH_MED . $_POST['prefix'] . '/' . $_POST['navId'] . '/', $file_name_orig, $extension, ${$_POST['prefix']}['dim' . strtoupper(substr($_POST['dataSet'], 0, 1)) . substr($_POST['dataSet'], 1)], $_POST);
$img_created = fnc_buildImage(WEBSERVICE_MED . $_POST['prefix'] . '/' . $_POST['navId'] . '/', $file_name_orig, $extension, ${$_POST['prefix']}['dim' . strtoupper(substr($_POST['dataSet'], 0, 1)) . substr($_POST['dataSet'], 1)], $_POST);
/* Thumbnail aus generiertem Bild erzeugen */
if (!is_null(${$_POST['prefix']}[$_POST['dataSet'] . 'Thumb']))
{
$thumb = fnc_buildThumbnail(PATH_MED . $_POST['prefix'] . '/' . $_POST['navId'] . '/', $file_name, $extension, ${$_POST['prefix']}[$_POST['dataSet'] . 'Thumb']);
$thumb = fnc_buildThumbnail(WEBSERVICE_MED . $_POST['prefix'] . '/' . $_POST['navId'] . '/', $file_name, $extension, ${$_POST['prefix']}[$_POST['dataSet'] . 'Thumb']);
}
/* Werte für Datenbank aktualisieren */
@@ -556,9 +532,9 @@ else if ($_POST['request'] === 'insertData')
else if ($table === 'content_textimage')
{
if (!is_dir(PATH_MED . $_POST['prefix'] . '/' . $_POST['navId']))
if (!is_dir(WEBSERVICE_MED . $_POST['prefix'] . '/' . $_POST['navId']))
{
mkdir(PATH_MED . $_POST['prefix'] . '/' . $_POST['navId'], 0755);
mkdir(WEBSERVICE_MED . $_POST['prefix'] . '/' . $_POST['navId'], 0755);
}
/* Bildnamen und Erweiterung generieren */
@@ -567,13 +543,13 @@ else if ($_POST['request'] === 'insertData')
/* Originales Bild speichern */
$file_name_orig = substr($file_name, 0, strrpos($file_name, '.')) . '_orig' . substr($file_name, strrpos($file_name, '.'));
copy(PATH_MED . $_POST['prefix'] . '/sample_image.jpg', PATH_MED . $_POST['prefix'] . '/' . $_POST['navId'] . '/' . $file_name_orig);
copy(PATH_MED . $_POST['prefix'] . '/sample_image.jpg', PATH_MED . $_POST['prefix'] . '/' . $_POST['navId'] . '/' . $file_name);
copy(WEBSERVICE_MED . $_POST['prefix'] . '/sample_image.jpg', WEBSERVICE_MED . $_POST['prefix'] . '/' . $_POST['navId'] . '/' . $file_name_orig);
copy(WEBSERVICE_MED . $_POST['prefix'] . '/sample_image.jpg', WEBSERVICE_MED . $_POST['prefix'] . '/' . $_POST['navId'] . '/' . $file_name);
/* Thumbnail aus generiertem Bild erzeugen */
if (!is_null(${$_POST['prefix']}['imageThumb']))
{
$thumb = fnc_buildThumbnail(PATH_MED . $_POST['prefix'] . '/' . $_POST['navId'] . '/', $file_name, $extension, ${$_POST['prefix']}['imageThumb']);
$thumb = fnc_buildThumbnail(WEBSERVICE_MED . $_POST['prefix'] . '/' . $_POST['navId'] . '/', $file_name, $extension, ${$_POST['prefix']}['imageThumb']);
}
if (!$thumb)
@@ -585,22 +561,10 @@ else if ($_POST['request'] === 'insertData')
$img_name = $db->real_escape_string(str_replace('.' . $extension, '', $file_name));
$img_title = $db->real_escape_string('Sample Image');
$image = $db->query
(
'INSERT INTO
' . $_POST['prefix'] . '_' . TBL_IMAGE . '
( imgName , imgExtension , imgOrigname , imgTitle , previewWidth , previewHeight )
VALUES
( "' . $img_name . '" , "' . $img_extension . '" , "' . $img_name . '.' . $img_extension . '" , "' . $img_title . '" , "' . ${$_POST['prefix']}['dimImage']['width'] . '" , "' . ${$_POST['prefix']}['dimImage']['width'] * 4 / 3 . '" );'
);
$image = $db->query('INSERT INTO ' . $_POST['prefix'] . '_' . TBL_IMAGE . ' (imgName, imgExtension, imgOrigname, imgTitle, previewWidth, previewHeight) VALUES ("' . $img_name . '", "' . $img_extension . '", "' . $img_name . '.' . $img_extension . '", "' . $img_title . '", "' . ${$_POST['prefix']}['dimImage']['width'] . '", "' . ${$_POST['prefix']}['dimImage']['width'] * 4 / 3 . '");');
$image_id = $db->insert_id;
$text = $db->query
(
'INSERT INTO
' . $_POST['prefix'] . '_' . TBL_TEXT . '
VALUES ( NULL , "' . $_POST['content'] . '" );'
);
$text = $db->query('INSERT INTO ' . $_POST['prefix'] . '_' . TBL_TEXT . ' VALUES (NULL, "' . $_POST['content'] . '" );');
$text_id = $db->insert_id;
$data['content_text_id'] = $text_id;
@@ -625,16 +589,7 @@ else if ($_POST['request'] === 'insertData')
if ($_POST['dataSet'] === 'keyvisual')
{
$insert = $db->insert_id;
$update = $db->query
(
'UPDATE
' . $_POST['prefix'] . '_' . TBL_NAVI . '
SET
' . $_POST['prefix'] . '_keyvisual = "' . $insert . '"
WHERE
' . $_POST['prefix'] . '_navId = "' . $_POST['navId'] . '"
LIMIT 1;'
);
$update = $db->query('UPDATE ' . $_POST['prefix'] . '_' . TBL_NAVI . ' SET ' . $_POST['prefix'] . '_keyvisual = "' . $insert . '" WHERE ' . $_POST['prefix'] . '_navId = "' . $_POST['navId'] . '" LIMIT 1;');
if ($update)
{
@@ -648,7 +603,7 @@ else if ($_POST['request'] === 'insertData')
elseif ($table === 'content_text' || $table === 'content_subline' || $table === 'content_textimage')
{
$insert = $db->insert_id;
$siteContents = json_decode($_POST['order']);
$siteContents = $_POST['order'];
foreach ($siteContents as $key => $value)
{
@@ -656,20 +611,11 @@ else if ($_POST['request'] === 'insertData')
$siteContents[$key] = str_replace('content_', '', $value);
if (!is_numeric(end($content)))
{
$siteContents[$key] .= '_' . $insert;
$siteContents[$key] .= $insert;
}
}
$update = $db->query
(
'UPDATE
' . $_POST['prefix'] . '_' . TBL_CONTENT . '
SET
siteContents = "' . implode(';', $siteContents) . '"
WHERE
siteId = "' . $_POST['navId'] . '"
LIMIT 1;'
);
$update = $db->query('UPDATE ' . $_POST['prefix'] . '_' . TBL_CONTENT . ' SET siteContents = "' . implode(';', $siteContents) . '" WHERE siteId = "' . $_POST['navId'] . '" LIMIT 1;');
if ($update)
{
@@ -684,32 +630,16 @@ else if ($_POST['request'] === 'insertData')
}
elseif (isset ($_POST['formAction']) && $_POST['formAction'] === 'appendContent')
{
/**
* TODO: Eventuell unnötig
*/
$newId = $table . '_' . $db->insert_id;
$mainSet = explode('_', $_POST['mainContent']);
$oldContent = $db->query
(
'SELECT
*
FROM
' . $_POST['prefix'] . '_' . $mainSet[0] . '
WHERE
id = "' . $mainSet[1] . '";'
);
$oldContent = $db->query('SELECT * FROM ' . $_POST['prefix'] . '_' . $mainSet[0] . ' WHERE id = "' . $mainSet[1] . '";');
$content = $oldContent->fetch_assoc();
$siteContent = ($content['siteContents'] === '')
? $newId
: $content['siteContents'] . ';' . $newId;
$update = $db->query
(
'UPDATE
' . $_POST['prefix'] . '_' . $mainSet[0] . '
SET
siteContents = "' . $siteContent . '"
WHERE
id = "' . $mainSet[1] . '"
LIMIT 1;'
);
$siteContent = ($content['siteContents'] === '') ? $newId : $content['siteContents'] . ';' . $newId;
$update = $db->query('UPDATE ' . $_POST['prefix'] . '_' . $mainSet[0] . ' SET siteContents = "' . $siteContent . '" WHERE id = "' . $mainSet[1] . '" LIMIT 1;');
if ($update)
{
json_encode($update);
@@ -751,33 +681,16 @@ else if ($_POST['request'] === 'deleteData')
if ($result && strpos($table, 'content_') !== false)
{
$content_part = str_replace('content_', '', $_POST['dataSet']);
$content_data = $db->query
(
'SELECT
*
FROM
' . $_POST['prefix'] . '_' . TBL_CONTENT . '
WHERE
siteId = "' . $_POST['navId'] . '";'
);
$content_data = $db->query('SELECT * FROM ' . $_POST['prefix'] . '_' . TBL_CONTENT . ' WHERE siteId = "' . $_POST['navId'] . '";');
$content = $content_data->fetch_assoc();
$siteContents = explode(';', $content['siteContents']);
$content_key = array_keys($siteContents, $content_part);
if (!empty ($content_key))
if (!empty($content_key))
{
unset ($siteContents[$content_key[0]]);
$db->query
(
'UPDATE
' . $_POST['prefix'] . '_' . TBL_CONTENT . '
SET
siteContents = "' . implode(';', $siteContents) . '"
WHERE
id = "' . $content['id'] . '"
LIMIT 1;'
) || $error = true;
$db->query('UPDATE ' . $_POST['prefix'] . '_' . TBL_CONTENT . ' SET siteContents = "' . implode(';', $siteContents) . '" WHERE id = "' . $content['id'] . '" LIMIT 1;') || $error = true;
}
}

1255
css/svjf_l1.css
View File

File diff suppressed because it is too large Load Diff

234
js/common.js
View File

@@ -1,128 +1,114 @@
var start = false;
var slideWidth = 3;
var animationTime = 40;
var start = false;
var slideWidth = 3;
var animationTime = 40;
$( function( ) {
$( document ).tooltip(
{
tooltipClass: 'custom-tooltip'
} );
} );
$(function () {
$(document).tooltip(
{
tooltipClass: 'custom-tooltip'
});
});
$( document ).ready( function( )
{
/* Subnavigation: Fix für überbreite Navigation */
var outerWidth = $( '#navi_sub' ).innerWidth( );
var width = 0;
var mainElem = $( 'ul' , '#navi_sub' );
$(document).ready(function () {
/* Subnavigation: Fix für überbreite Navigation */
var outerWidth = $('#navi_sub').innerWidth();
var width = 0;
var mainElem = $('ul', '#navi_sub');
$( 'li' , mainElem ).each( function( key , elem )
{
width += $( elem ).innerWidth( ) + 1;
} );
if ( width > outerWidth )
{
mainElem.innerWidth ( width );
$( '<div class="sliderLeft grid_3col"><div class="sliderLeft_inner grid_1col"/></div>' ).insertBefore ( mainElem );
$( '<div class="sliderRight grid_3col"><div class="sliderRight_inner grid_1col"/></div>' ).insertBefore ( mainElem );
mainElem.css( { 'margin-left' : $( '.sliderLeft' , '#navi_sub' ).innerWidth( ) , 'margin-right' : $( '.sliderRight' , '#navi_sub' ).innerWidth( ) } );
}
$( 'body' ).on( 'mouseenter' , '.sliderRight_inner' , function( )
{
start = true;
fnc_startAnimation ( $( '#navi_sub' ) , mainElem , 'left' );
} );
$( 'body' ).on( 'mouseleave' , '.sliderRight' , function( )
{
start = false;
} );
$( 'body' ).on( 'mouseenter' , '.sliderLeft_inner' , function( )
{
start = true;
fnc_startAnimation ( $( '#navi_sub' ) , mainElem , 'right' );
} );
$( 'body' ).on( 'mouseleave' , '.sliderLeft' , function( )
{
start = false;
} );
if( typeof(editorData) === 'undefined' && $( '#galeryslider' ).length !== 0 )
{
$('.keyvisual' ).css({cursor: 'pointer'});
$( '.keyvisual' ).on( 'click' , 'img' , function ()
{
$('#galeryslider').show();
} );
}
/* Scroll - Event für Navigationselemente: Position fixed */
var display = false;
var sub_outer = $( '#navi_sub_outer' ).clone( );
var last_outer = $( '#navi_last_outer' ).clone( );
sub_outer.css( { 'position' : 'fixed' , 'top' : parseInt( $( '#navi_main_outer' ).css( 'height' ) ) , 'z-index' : 3 , 'display' : 'none' } );
last_outer.css( { 'position' : 'fixed' , 'top' : parseInt( $( '#navi_main_outer' ).css( 'height' ) ) + parseInt( $( '#navi_sub_outer' ).css( 'height' ) ) , 'z-index' : 3 , 'display' : 'none' } );
sub_outer.appendTo( 'body' );
last_outer.appendTo( 'body' );
$( window ).on( 'scroll' , function( )
{
var offsetBody = $( window ).scrollTop( ) + parseInt( $( '#navi_main_outer' ).css( 'height' ) );
var offsetNavi = ( $( '#navi_sub_outer' ).position( ) )
? $( '#navi_sub_outer' ).position( ).top
: 0;
if ( display === false && offsetBody >= offsetNavi )
{
display = true;
sub_outer.show( );
last_outer.show( );
}
else if ( display === true && offsetBody <= offsetNavi )
{
display = false;
sub_outer.hide( );
last_outer.hide( );
}
} );
} );
$('li', mainElem).each(function (key, elem) {
width += $(elem).innerWidth() + 1;
});
function fnc_startAnimation ( outerElem , innerElem , direction )
{
if ( start === true )
{
outerElemWidth = outerElem.innerWidth( );
innerElemWidth = innerElem.innerWidth( ) + parseFloat( innerElem.css( 'margin-left' ) ) + parseFloat( innerElem.css( 'margin-right' ) );
if ( direction === 'left' )
{
if ( outerElemWidth < innerElemWidth )
{
innerElem.css( { 'margin-left' : parseFloat( innerElem.css( 'margin-left' ) ) - slideWidth } );
setTimeout( function( )
{
fnc_startAnimation ( outerElem , innerElem , direction );
} , animationTime );
}
else
{
start = false;
}
}
if ( direction === 'right' )
{
maxWidth = innerElem.innerWidth( ) + $( '.sliderLeft' , outerElem ).innerWidth( ) + $( '.sliderRight' , outerElem ).innerWidth( );
if ( maxWidth > innerElemWidth )
{
innerElem.css( { 'margin-left' : parseFloat( innerElem.css( 'margin-left' ) ) + slideWidth } );
setTimeout( function( )
{
fnc_startAnimation ( outerElem , innerElem , direction );
} , animationTime );
}
else
{
start = false;
}
}
}
}
if (width > outerWidth) {
mainElem.innerWidth(width);
$('<div class="sliderLeft grid_3col"><div class="sliderLeft_inner grid_1col"/></div>').insertBefore(mainElem);
$('<div class="sliderRight grid_3col"><div class="sliderRight_inner grid_1col"/></div>').insertBefore(mainElem);
mainElem.css({
'margin-left': $('.sliderLeft', '#navi_sub').innerWidth(),
'margin-right': $('.sliderRight', '#navi_sub').innerWidth()
});
}
$('body').on('mouseenter', '.sliderRight_inner', function () {
start = true;
fnc_startAnimation($('#navi_sub'), mainElem, 'left');
});
$('body').on('mouseleave', '.sliderRight', function () {
start = false;
});
$('body').on('mouseenter', '.sliderLeft_inner', function () {
start = true;
fnc_startAnimation($('#navi_sub'), mainElem, 'right');
});
$('body').on('mouseleave', '.sliderLeft', function () {
start = false;
});
if (typeof(editor) === 'undefined' && $('#galeryslider').length !== 0) {
$('.keyvisual').css({cursor: 'pointer'});
$('.keyvisual').on('click', 'img', function () {
$('#galeryslider').show();
});
}
/* Scroll - Event für Navigationselemente: Position fixed */
var display = false;
var sub_outer = $('#navi_sub_outer').clone();
var last_outer = $('#navi_last_outer').clone();
sub_outer.css({'position': 'fixed', 'top': parseInt($('#navi_main_outer').css('height')), 'z-index': 3, 'display': 'none'});
last_outer.css({
'position': 'fixed',
'top': parseInt($('#navi_main_outer').css('height')) + parseInt($('#navi_sub_outer').css('height')),
'z-index': 3,
'display': 'none'
});
sub_outer.appendTo('body');
last_outer.appendTo('body');
$(window).on('scroll', function () {
var offsetBody = $(window).scrollTop() + parseInt($('#navi_main_outer').css('height'));
var offsetNavi = ( $('#navi_sub_outer').position() )
? $('#navi_sub_outer').position().top
: 0;
if (display === false && offsetBody >= offsetNavi) {
display = true;
sub_outer.show();
last_outer.show();
}
else if (display === true && offsetBody <= offsetNavi) {
display = false;
sub_outer.hide();
last_outer.hide();
}
});
});
function fnc_startAnimation(outerElem, innerElem, direction) {
if (start === true) {
outerElemWidth = outerElem.innerWidth();
innerElemWidth = innerElem.innerWidth() + parseFloat(innerElem.css('margin-left')) + parseFloat(innerElem.css('margin-right'));
if (direction === 'left') {
if (outerElemWidth < innerElemWidth) {
innerElem.css({'margin-left': parseFloat(innerElem.css('margin-left')) - slideWidth});
setTimeout(function () {
fnc_startAnimation(outerElem, innerElem, direction);
}, animationTime);
}
else {
start = false;
}
}
if (direction === 'right') {
maxWidth = innerElem.innerWidth() + $('.sliderLeft', outerElem).innerWidth() + $('.sliderRight', outerElem).innerWidth();
if (maxWidth > innerElemWidth) {
innerElem.css({'margin-left': parseFloat(innerElem.css('margin-left')) + slideWidth});
setTimeout(function () {
fnc_startAnimation(outerElem, innerElem, direction);
}, animationTime);
}
else {
start = false;
}
}
}
}