clean up
Dieser Commit ist enthalten in:
Ursprung
a7bab04278
Commit
d2ccd7c3a9
|
@ -1,4 +1,5 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* Project:
|
||||
* Contenido Content Management System
|
||||
|
@ -42,7 +43,6 @@
|
|||
* @link http://www.contenido.org
|
||||
* @since file available since contenido release <= 4.6
|
||||
*/
|
||||
|
||||
if (!defined("CON_FRAMEWORK")) {
|
||||
define("CON_FRAMEWORK", true);
|
||||
}
|
||||
|
@ -59,8 +59,7 @@ cInclude("includes", "functions.con2.php");
|
|||
cInclude("includes", "functions.api.php");
|
||||
cInclude("includes", "functions.pathresolver.php");
|
||||
|
||||
if ($cfg["use_pseudocron"] == true)
|
||||
{
|
||||
if ($cfg["use_pseudocron"] == true) {
|
||||
/* Include cronjob-Emulator */
|
||||
$oldpwd = getcwd();
|
||||
chdir($cfg["path"]["contenido"] . $cfg["path"]["cronjobs"]);
|
||||
|
@ -73,14 +72,11 @@ if ($cfg["use_pseudocron"] == true)
|
|||
* PHPLIB application development toolkit
|
||||
* @see http://sourceforge.net/projects/phplib
|
||||
*/
|
||||
if ($contenido)
|
||||
{
|
||||
if ($contenido) {
|
||||
//Backend
|
||||
page_open(array('sess' => 'Contenido_Session', 'auth' => 'Contenido_Challenge_Crypt_Auth', 'perm' => 'Contenido_Perm'));
|
||||
i18nInit($cfg["path"]["contenido"] . $cfg["path"]["locale"], $belang);
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
//Frontend
|
||||
page_open(array('sess' => 'Contenido_Frontend_Session', 'auth' => 'Contenido_Frontend_Challenge_Crypt_Auth', 'perm' => 'Contenido_Perm'));
|
||||
}
|
||||
|
@ -106,8 +102,7 @@ $sess->register("errsite_idcat");
|
|||
$sess->register("errsite_idart");
|
||||
$sess->register("encoding");
|
||||
|
||||
if ($cfgClient["set"] != "set")
|
||||
{
|
||||
if ($cfgClient["set"] != "set") {
|
||||
rereadClients();
|
||||
}
|
||||
|
||||
|
@ -127,8 +122,7 @@ if ($_GET['action'] == 'get_compressed') {
|
|||
// Call hook after plugins are loaded, added by Murat Purc, 2008-09-07
|
||||
CEC_Hook::execute('Contenido.Frontend.AfterLoadPlugins');
|
||||
|
||||
if (!isset($encoding) || !is_array($encoding) || count($encoding) == 0)
|
||||
{
|
||||
if (!isset($encoding) || !is_array($encoding) || count($encoding) == 0) {
|
||||
// get encodings of all languages
|
||||
$encoding = array();
|
||||
$sql = "SELECT idlang, encoding FROM " . $cfg["tab"]["lang"];
|
||||
|
@ -175,11 +169,12 @@ if (!isset($lang)) {
|
|||
}
|
||||
}
|
||||
|
||||
if (!$sess->is_registered("lang") ) $sess->register("lang");
|
||||
if (!$sess->is_registered("client") ) $sess->register("client");
|
||||
if (!$sess->is_registered("lang"))
|
||||
$sess->register("lang");
|
||||
if (!$sess->is_registered("client"))
|
||||
$sess->register("client");
|
||||
|
||||
if (isset ($username))
|
||||
{
|
||||
if (isset($username)) {
|
||||
$auth->login_if(true);
|
||||
}
|
||||
|
||||
|
@ -192,8 +187,7 @@ header("Content-Type: text/html; charset={$encoding[$lang]}");
|
|||
* if http global logout is set e.g. front_content.php?logout=true
|
||||
* log out the current user.
|
||||
*/
|
||||
if (isset ($logout))
|
||||
{
|
||||
if (isset($logout)) {
|
||||
$auth->logout(true);
|
||||
$auth->unauth(true);
|
||||
$auth->auth["uname"] = "nobody";
|
||||
|
@ -202,8 +196,7 @@ if (isset ($logout))
|
|||
/*
|
||||
* local configuration
|
||||
*/
|
||||
if (file_exists("config.local.php"))
|
||||
{
|
||||
if (file_exists("config.local.php")) {
|
||||
@ include ("config.local.php");
|
||||
}
|
||||
|
||||
|
@ -211,25 +204,19 @@ if (file_exists("config.local.php"))
|
|||
* If the path variable was passed, try to resolve it to a Category Id
|
||||
* e.g. front_content.php?path=/company/products/
|
||||
*/
|
||||
if (isset($path) && strlen($path) > 1)
|
||||
{
|
||||
if (isset($path) && strlen($path) > 1) {
|
||||
/* Which resolve method is configured? */
|
||||
if ($cfg["urlpathresolve"] == true)
|
||||
{
|
||||
if ($cfg["urlpathresolve"] == true) {
|
||||
|
||||
$iLangCheck = 0;
|
||||
$idcat = prResolvePathViaURLNames($path, $iLangCheck);
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$iLangCheck = 0;
|
||||
|
||||
$idcat = prResolvePathViaCategoryNames($path, $iLangCheck);
|
||||
if (($lang != $iLangCheck) && ((int) $iLangCheck != 0)) {
|
||||
$lang = $iLangCheck;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -246,14 +233,12 @@ $errsite = 'Location: ' . Contenido_Url::getInstance()->buildRedirect($aParams);
|
|||
* Note: These variables can be set via http globals e.g. front_content.php?idcat=41&idart=34&idcatart=35&idartlang=42
|
||||
* If not the values will be computed.
|
||||
*/
|
||||
if ($idart && !$idcat && !$idcatart)
|
||||
{
|
||||
if ($idart && !$idcat && !$idcatart) {
|
||||
/* Try to fetch the first idcat */
|
||||
$sql = "SELECT idcat FROM " . $cfg["tab"]["cat_art"] . " WHERE idart = '" . Contenido_Security::toInteger($idart) . "'";
|
||||
$db->query($sql);
|
||||
|
||||
if ($db->next_record())
|
||||
{
|
||||
if ($db->next_record()) {
|
||||
$idcat = $db->f("idcat");
|
||||
}
|
||||
}
|
||||
|
@ -261,16 +246,12 @@ if ($idart && !$idcat && !$idcatart)
|
|||
unset($code);
|
||||
unset($markscript);
|
||||
|
||||
if (!$idcatart)
|
||||
{
|
||||
if (!$idart)
|
||||
{
|
||||
if (!$idcat)
|
||||
{
|
||||
if (!$idcatart) {
|
||||
if (!$idart) {
|
||||
if (!$idcat) {
|
||||
# Note: In earlier Contenido versions the information if an article is startarticle of a category has been stored
|
||||
# in relation con_cat_art.
|
||||
if ($cfg["is_start_compatible"] == true)
|
||||
{
|
||||
if ($cfg["is_start_compatible"] == true) {
|
||||
$sql = "SELECT
|
||||
idart,
|
||||
B.idcat
|
||||
|
@ -285,9 +266,7 @@ if (!$idcatart)
|
|||
idclient='" . Contenido_Security::toInteger($client) . "'
|
||||
ORDER BY
|
||||
idtree ASC";
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
# Note: Now the information if an article is startarticle of a category is stored in relation con_cat_lang.
|
||||
$sql = "SELECT
|
||||
A.idart,
|
||||
|
@ -330,25 +309,19 @@ if (!$idcatart)
|
|||
}
|
||||
} else {
|
||||
$idart = -1;
|
||||
if ($cfg["is_start_compatible"] == true)
|
||||
{
|
||||
if ($cfg["is_start_compatible"] == true) {
|
||||
$sql = "SELECT idart FROM " . $cfg["tab"]["cat_art"] . " WHERE idcat='" . Contenido_Security::toInteger($idcat) . "' AND is_start='1'";
|
||||
$db->query($sql);
|
||||
|
||||
if ($db->next_record())
|
||||
{
|
||||
if ($db->next_record()) {
|
||||
$idart = $db->f("idart");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$sql = "SELECT startidartlang FROM " . $cfg["tab"]["cat_lang"] . " WHERE idcat='" . Contenido_Security::toInteger($idcat) . "' AND idlang='" . Contenido_Security::toInteger($lang) . "'";
|
||||
$db->query($sql);
|
||||
|
||||
if ($db->next_record())
|
||||
{
|
||||
if ($db->f("startidartlang") != 0)
|
||||
{
|
||||
if ($db->next_record()) {
|
||||
if ($db->f("startidartlang") != 0) {
|
||||
$sql = "SELECT idart FROM " . $cfg["tab"]["art_lang"] . " WHERE idartlang='" . Contenido_Security::toInteger($db->f("startidartlang")) . "'";
|
||||
$db->query($sql);
|
||||
$db->next_record();
|
||||
|
@ -357,25 +330,17 @@ if (!$idcatart)
|
|||
}
|
||||
}
|
||||
|
||||
if ($idart != -1)
|
||||
{
|
||||
}
|
||||
else
|
||||
{
|
||||
if ($idart != -1) {
|
||||
|
||||
} else {
|
||||
// error message in backend
|
||||
if ($contenido)
|
||||
{
|
||||
if ($contenido) {
|
||||
cInclude("includes", "functions.i18n.php");
|
||||
die(i18n("No start article for this category"));
|
||||
}
|
||||
else
|
||||
{
|
||||
if ($error == 1)
|
||||
{
|
||||
} else {
|
||||
if ($error == 1) {
|
||||
echo "Fatal error: Could not display error page. Error to display was: 'No start article in this category'";
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
header($errsite);
|
||||
exit;
|
||||
}
|
||||
|
@ -383,9 +348,7 @@ if (!$idcatart)
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$sql = "SELECT idcat, idart FROM " . $cfg["tab"]["cat_art"] . " WHERE idcatart='" . Contenido_Security::toInteger($idcatart) . "'";
|
||||
|
||||
$db->query($sql);
|
||||
|
@ -396,8 +359,7 @@ else
|
|||
}
|
||||
|
||||
/* Get idcatart */
|
||||
if (0 != $idart && 0 != $idcat)
|
||||
{
|
||||
if (0 != $idart && 0 != $idcat) {
|
||||
$sql = "SELECT idcatart FROM " . $cfg["tab"]["cat_art"] . " WHERE idart = '" . Contenido_Security::toInteger($idart) . "' AND idcat = '" . Contenido_Security::toInteger($idcat) . "'";
|
||||
|
||||
$db->query($sql);
|
||||
|
@ -408,8 +370,7 @@ if (0 != $idart && 0 != $idcat)
|
|||
|
||||
$idartlang = getArtLang($idart, $lang);
|
||||
|
||||
if ($idartlang === false)
|
||||
{
|
||||
if ($idartlang === false) {
|
||||
header($errsite);
|
||||
exit;
|
||||
}
|
||||
|
@ -427,8 +388,6 @@ if ($cfg["cache"]["disable"] != '1') {
|
|||
$oCacheHandler->start($iStartTime); // $iStartTime ist optional und ist die startzeit des scriptes, z. b. am anfang von fron_content.php
|
||||
}
|
||||
// END: concache
|
||||
|
||||
|
||||
##############################################
|
||||
# BACKEND / FRONTEND EDITING
|
||||
##############################################
|
||||
|
@ -443,21 +402,18 @@ if ($cfg["cache"]["disable"] != '1') {
|
|||
* The reason is to avoid cross-site scripting errors in the backend, if the backend domain differs from
|
||||
* the frontend domain.
|
||||
*/
|
||||
if ($contenido)
|
||||
{
|
||||
if ($contenido) {
|
||||
$perm->load_permissions();
|
||||
|
||||
/* Change mode edit / view */
|
||||
if (isset ($changeview))
|
||||
{
|
||||
if (isset($changeview)) {
|
||||
$sess->register("view");
|
||||
$view = $changeview;
|
||||
}
|
||||
|
||||
$col = new InUseCollection;
|
||||
|
||||
if ($overrideid != "" && $overridetype != "")
|
||||
{
|
||||
if ($overrideid != "" && $overridetype != "") {
|
||||
$col->removeItemMarks($overridetype, $overrideid);
|
||||
}
|
||||
/* Remove all own marks */
|
||||
|
@ -468,8 +424,7 @@ if ($contenido)
|
|||
|
||||
$sHtmlInUse = '';
|
||||
$sHtmlInUseMessage = '';
|
||||
if ($inUse == true)
|
||||
{
|
||||
if ($inUse == true) {
|
||||
$disabled = 'disabled="disabled"';
|
||||
$sHtmlInUseCss = '<link rel="stylesheet" type="text/css" href="' . $cfg['path']['contenido_fullhtml'] . 'styles/inuse.css" />';
|
||||
$sHtmlInUseMessage = $message;
|
||||
|
@ -479,8 +434,7 @@ if ($contenido)
|
|||
$db->query($sql);
|
||||
$db->next_record();
|
||||
$locked = $db->f("locked");
|
||||
if ($locked == 1)
|
||||
{
|
||||
if ($locked == 1) {
|
||||
$inUse = true;
|
||||
$disabled = 'disabled="disabled"';
|
||||
}
|
||||
|
@ -491,13 +445,11 @@ if ($contenido)
|
|||
'Contenido.Frontend.AllowEdit', $lang, $idcat, $idart, $auth->auth['uid']
|
||||
);
|
||||
|
||||
if ($perm->have_perm_area_action_item("con_editcontent", "con_editart", $idcat) && $inUse == false && $allow == true)
|
||||
{
|
||||
if ($perm->have_perm_area_action_item("con_editcontent", "con_editart", $idcat) && $inUse == false && $allow == true) {
|
||||
/* Create buttons for editing */
|
||||
$edit_preview = '<table cellspacing="0" cellpadding="4" border="0">';
|
||||
|
||||
if ($view == "edit")
|
||||
{
|
||||
if ($view == "edit") {
|
||||
$edit_preview = '<tr>
|
||||
<td width="18">
|
||||
<a title="Preview" style="font-family: Verdana; font-size: 10px; color: #000000; text-decoration: none" href="' . $sess->url("front_content.php?changeview=prev&idcat=$idcat&idart=$idart") . '"><img src="' . $cfg["path"]["contenido_fullhtml"] . $cfg["path"]["images"] . 'but_preview.gif" alt="Preview" title="Preview" border="0"></a>
|
||||
|
@ -506,9 +458,7 @@ if ($contenido)
|
|||
<a title="Preview" style="font-family: Verdana; font-size: 10px; color: #000000; text-decoration: none" href="' . $sess->url("front_content.php?changeview=prev&idcat=$idcat&idart=$idart") . '">Preview</a>
|
||||
</td>
|
||||
</tr>';
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$edit_preview = '<tr>
|
||||
<td width="18">
|
||||
<a title="Preview" style="font-family: Verdana; font-size: 10px; color: #000000; text-decoration: none" href="' . $sess->url("front_content.php?changeview=edit&idcat=$idcat&idart=$idart") . '"><img src="' . $cfg["path"]["contenido_fullhtml"] . $cfg["path"]["images"] . 'but_edit.gif" alt="Preview" title="Preview" border="0"></a>
|
||||
|
@ -520,14 +470,11 @@ if ($contenido)
|
|||
}
|
||||
|
||||
/* Display articles */
|
||||
if ($cfg["is_start_compatible"] == true)
|
||||
{
|
||||
if ($cfg["is_start_compatible"] == true) {
|
||||
$sql = "SELECT idart, is_start FROM " . $cfg["tab"]["cat_art"] . " WHERE idcat='" . Contenido_Security::toInteger($idcat) . "' ORDER BY idart";
|
||||
|
||||
$db->query($sql);
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$sql = "SELECT idart FROM " . $cfg["tab"]["cat_art"] . " WHERE idcat='" . Contenido_Security::toInteger($idcat) . "' ORDER BY idart";
|
||||
|
||||
$db->query($sql);
|
||||
|
@ -537,21 +484,15 @@ if ($contenido)
|
|||
|
||||
$edit_preview .= '<tr><td colspan="2"><table cellspacing="0" cellpadding="2" border="0"></tr><td style="font-family: verdana; font-size:10; color:#000000; text-decoration:none">Articles in category:<br>';
|
||||
|
||||
while ($db->next_record() && ($db->affected_rows() != 1))
|
||||
{
|
||||
while ($db->next_record() && ($db->affected_rows() != 1)) {
|
||||
|
||||
$class = "font-family:'Verdana'; font-size:10; color:#000000; text-decoration: underline; font-weight:normal";
|
||||
if (!isset ($idart))
|
||||
{
|
||||
if (isStartArticle(getArtLang($idart, $lang), $idcat, $lang))
|
||||
{
|
||||
if (!isset($idart)) {
|
||||
if (isStartArticle(getArtLang($idart, $lang), $idcat, $lang)) {
|
||||
$class = "font-family: verdana; font-size:10; color:#000000; text-decoration: underline ;font-weight:bold";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if ($idart == $db->f("idart"))
|
||||
{
|
||||
} else {
|
||||
if ($idart == $db->f("idart")) {
|
||||
$class = "font-family: verdana; font-size:10; color:#000000; text-decoration: underline; font-weight:bold";
|
||||
}
|
||||
}
|
||||
|
@ -561,29 +502,23 @@ if ($contenido)
|
|||
}
|
||||
|
||||
$edit_preview .= '</td></tr></table></td></tr></table>';
|
||||
|
||||
}
|
||||
|
||||
} // end if $contenido
|
||||
|
||||
|
||||
/* If mode is 'edit' and user has permission to edit articles in the current category */
|
||||
if ($inUse == false && $allow == true && $view == "edit" && ($perm->have_perm_area_action_item("con_editcontent", "con_editart", $idcat)))
|
||||
{
|
||||
if ($inUse == false && $allow == true && $view == "edit" && ($perm->have_perm_area_action_item("con_editcontent", "con_editart", $idcat))) {
|
||||
cInclude("includes", "functions.tpl.php");
|
||||
cInclude("includes", "functions.con.php");
|
||||
include ($cfg["path"]["contenido"] . $cfg["path"]["includes"] . "include.con_editcontent.php");
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
|
||||
##############################################
|
||||
# FRONTEND VIEW
|
||||
##############################################
|
||||
|
||||
/* Mark submenuitem 'Preview' in the Contenido Backend (Area: Contenido --> Articles --> Preview) */
|
||||
if ($contenido)
|
||||
{
|
||||
if ($contenido) {
|
||||
$markscript = markSubMenuItem(4, true);
|
||||
}
|
||||
|
||||
|
@ -610,8 +545,7 @@ else
|
|||
$sql = "SELECT code FROM " . $cfg["tab"]["code"] . " WHERE idcatart = '" . Contenido_Security::toInteger($idcatart) . "' AND idlang = '" . Contenido_Security::toInteger($lang) . "'";
|
||||
$db->query($sql);
|
||||
|
||||
if ($db->num_rows() == 0)
|
||||
{
|
||||
if ($db->num_rows() == 0) {
|
||||
/* Include here for performance reasons */
|
||||
cInclude("includes", "functions.tpl.php");
|
||||
|
||||
|
@ -621,22 +555,15 @@ else
|
|||
$db->query($sql);
|
||||
}
|
||||
|
||||
if ($db->next_record())
|
||||
{
|
||||
if ($db->next_record()) {
|
||||
$code = stripslashes($db->f("code"));
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
if ($contenido)
|
||||
$code = "echo \"No code available.\";";
|
||||
else
|
||||
{
|
||||
if ($error == 1)
|
||||
{
|
||||
else {
|
||||
if ($error == 1) {
|
||||
echo "Fatal error: Could not display error page. Error to display was: 'No code available'";
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
header($errsite);
|
||||
exit;
|
||||
}
|
||||
|
@ -680,33 +607,26 @@ else
|
|||
##############################################
|
||||
# protected categories
|
||||
##############################################
|
||||
if ($public == 0)
|
||||
{
|
||||
if ($auth->auth["uid"] == "nobody")
|
||||
{
|
||||
if ($public == 0) {
|
||||
if ($auth->auth["uid"] == "nobody") {
|
||||
$sql = "SELECT user_id, value FROM " . $cfg["tab"]["user_prop"] . " WHERE type='frontend' and name='allowed_ip'";
|
||||
$db->query($sql);
|
||||
|
||||
while ($db->next_record())
|
||||
{
|
||||
while ($db->next_record()) {
|
||||
$user_id = $db->f("user_id");
|
||||
|
||||
$range = urldecode($db->f("value"));
|
||||
$slash = strpos($range, "/");
|
||||
|
||||
if ($slash == false)
|
||||
{
|
||||
if ($slash == false) {
|
||||
$netmask = "255.255.255.255";
|
||||
$network = $range;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$network = substr($range, 0, $slash);
|
||||
$netmask = substr($range, $slash + 1, strlen($range) - $slash - 1);
|
||||
}
|
||||
|
||||
if (IP_match($network, $netmask, $_SERVER["REMOTE_ADDR"]))
|
||||
{
|
||||
if (IP_match($network, $netmask, $_SERVER["REMOTE_ADDR"])) {
|
||||
$sql = "SELECT idright
|
||||
FROM " . $cfg["tab"]["rights"] . " AS A,
|
||||
" . $cfg["tab"]["actions"] . " AS B,
|
||||
|
@ -717,15 +637,13 @@ else
|
|||
$db2 = new DB_Contenido;
|
||||
$db2->query($sql);
|
||||
|
||||
if ($db2->num_rows() > 0)
|
||||
{
|
||||
if ($db2->num_rows() > 0) {
|
||||
$auth->auth["uid"] = $user_id;
|
||||
$validated = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
if ($validated != 1)
|
||||
{
|
||||
if ($validated != 1) {
|
||||
// CEC to check category access
|
||||
CEC_Hook::setBreakCondition(true, false); // break at "true", default value "false"
|
||||
$allow = CEC_Hook::executeWhileBreakCondition(
|
||||
|
@ -733,9 +651,7 @@ else
|
|||
);
|
||||
$auth->login_if(!$allow);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
// CEC to check category access
|
||||
CEC_Hook::setBreakCondition(true, false); // break at "true", default value "false"
|
||||
$allow = CEC_Hook::executeWhileBreakCondition(
|
||||
|
@ -750,8 +666,7 @@ else
|
|||
$allow = true;
|
||||
}
|
||||
|
||||
if (!$allow)
|
||||
{
|
||||
if (!$allow) {
|
||||
header($errsite);
|
||||
exit;
|
||||
}
|
||||
|
@ -767,24 +682,18 @@ else
|
|||
/*
|
||||
* Check if an article is start article of the category
|
||||
*/
|
||||
if ($cfg["is_start_compatible"] == true)
|
||||
{
|
||||
if ($cfg["is_start_compatible"] == true) {
|
||||
$sql = "SELECT is_start FROM " . $cfg["tab"]["cat_art"] . " WHERE idcatart='" . Contenido_Security::toInteger($idcatart) . "'";
|
||||
$db->query($sql);
|
||||
$db->next_record();
|
||||
$isstart = $db->f("is_start");
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$sql = "SELECT startidartlang FROM " . $cfg["tab"]["cat_lang"] . " WHERE idcat='" . Contenido_Security::toInteger($idcat) . "' AND idlang = '" . Contenido_Security::toInteger($lang) . "'";
|
||||
$db->query($sql);
|
||||
$db->next_record();
|
||||
if ($db->f("idartlang") == $idartlang)
|
||||
{
|
||||
if ($db->f("idartlang") == $idartlang) {
|
||||
$isstart = 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$isstart = 0;
|
||||
}
|
||||
}
|
||||
|
@ -796,13 +705,10 @@ else
|
|||
$db->query($sql);
|
||||
$db->next_record();
|
||||
|
||||
if (($db->f("timemgmt") == "1") && ($isstart != 1))
|
||||
{
|
||||
if (($db->f("timemgmt") == "1") && ($isstart != 1)) {
|
||||
$sql = "SELECT online, redirect, redirect_url FROM " . $cfg["tab"]["art_lang"] . " WHERE idart='" . Contenido_Security::toInteger($idart) . "' AND idlang = '" . Contenido_Security::toInteger($lang) . "'
|
||||
AND NOW() > datestart AND NOW() < dateend";
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$sql = "SELECT online, redirect, redirect_url FROM " . $cfg["tab"]["art_lang"] . " WHERE idart='" . Contenido_Security::toInteger($idart) . "' AND idlang = '" . Contenido_Security::toInteger($lang) . "'";
|
||||
}
|
||||
|
||||
|
@ -820,8 +726,7 @@ else
|
|||
/*
|
||||
* generate base url
|
||||
*/
|
||||
if ($insert_base == "true")
|
||||
{
|
||||
if ($insert_base == "true") {
|
||||
$is_XHTML = getEffectiveSetting('generator', 'xhtml', "false");
|
||||
|
||||
$str_base_uri = $cfgClient[$client]["path"]["htmlpath"];
|
||||
|
@ -841,10 +746,8 @@ else
|
|||
/*
|
||||
* Handle online (offline) articles
|
||||
*/
|
||||
if ($online)
|
||||
{
|
||||
if ($redirect == '1' && $redirect_url != '')
|
||||
{
|
||||
if ($online) {
|
||||
if ($redirect == '1' && $redirect_url != '') {
|
||||
page_close();
|
||||
/*
|
||||
* Redirect to the URL defined in article properties
|
||||
|
@ -860,11 +763,8 @@ else
|
|||
}
|
||||
header("Location: $redirect_url");
|
||||
exit;
|
||||
}
|
||||
else
|
||||
{
|
||||
if ($cfg["debug"]["codeoutput"])
|
||||
{
|
||||
} else {
|
||||
if ($cfg["debug"]["codeoutput"]) {
|
||||
echo "<textarea>" . clHtmlSpecialChars($code) . "</textarea>";
|
||||
}
|
||||
|
||||
|
@ -893,24 +793,15 @@ else
|
|||
// print output
|
||||
echo $htmlCode;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
# if user is in the backend display offline articles
|
||||
if ($contenido)
|
||||
{
|
||||
if ($contenido) {
|
||||
eval("?>\n" . $code . "\n<?php\n");
|
||||
}
|
||||
else
|
||||
{
|
||||
if ($error == 1)
|
||||
{
|
||||
} else {
|
||||
if ($error == 1) {
|
||||
echo "Fatal error: Could not display error page. Error to display was: 'No contenido session variable set. Probable error cause: Start article in this category is not set on-line.'";
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
header($errsite);
|
||||
exit;
|
||||
}
|
||||
|
@ -934,13 +825,11 @@ if ($cfg["cache"]["disable"] != '1') {
|
|||
/*
|
||||
* configuration settings after the site is displayed.
|
||||
*/
|
||||
if (file_exists("config.after.php"))
|
||||
{
|
||||
if (file_exists("config.after.php")) {
|
||||
@ include ("config.after.php");
|
||||
}
|
||||
|
||||
if (isset ($savedlang))
|
||||
{
|
||||
if (isset($savedlang)) {
|
||||
$lang = $savedlang;
|
||||
}
|
||||
|
||||
|
|
Laden…
In neuem Issue referenzieren