Code-Formatierungen und Anpassungen an neue Editoren
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user