ConLite
/
ConLite
1
0
Fork 0
Code Issues 22 Pull-Requests Projekte 2 Releases 2 Wiki Aktivität

latest updates

Dieser Commit ist enthalten in:
Oldperl 2018-05-16 17:52:30 +00:00
Ursprung 4177970dd4
Commit df3eb1c3cc
5 geänderte Dateien mit 148 neuen und 117 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

14
cms/templates/cl_uuid_form.tpl Normale Datei
Datei anzeigen

@ -0,0 +1,14 @@
<form method="post" action="">
<fieldset>
<legend>{$legend}</legend>
<p>{$description}</p>
<label for="pluginfoldername">Plugin Folder Name:</label>
<input id="pluginfoldername" type="text" name="pluginfoldername" />
<label for="plugincopyright">Plugin Copyright:</label>
<input id="plugincopyright" type="text" name="plugincopyright" />
<input type="submit" />
{if $uuid_generated}
<p>Generated UUID is: <strong style="padding: 4px;background-color: #66ffff;">{$uuid_generated}</strong></p>
{/if}
</fieldset>
</form>

37
conlite/includes/functions.general.php
Datei anzeigen

@ -737,6 +737,7 @@ function rereadClients() {
} }
$sql = "SELECT $sql = "SELECT
name,
idclient, idclient,
frontendpath, frontendpath,
htmlpath, htmlpath,
@ -752,14 +753,14 @@ function rereadClients() {
} }
while ($db->next_record()) { while ($db->next_record()) {
$cfgClient["set"] = "set"; $cfgClient["set"] = "set";
$cfgClient[$db->f("idclient")]["path"]["frontend"] = $db->f("frontendpath"); $cfgClient[$db->f("idclient")]["name"] = $db->f("name");
$cfgClient[$db->f("idclient")]["path"]["htmlpath"] = $db->f("htmlpath");
$errsite_idcat[$db->f("idclient")] = $db->f("errsite_cat");
$errsite_idart[$db->f("idclient")] = $db->f("errsite_art");
$cfgClient[$db->f("idclient")]["errsite"]["idcat"] = $db->f("errsite_cat");
$cfgClient[$db->f("idclient")]["errsite"]["idart"] = $db->f("errsite_art");
$cfgClient[$db->f("idclient")]["images"] = $db->f("htmlpath") . "images/"; $cfgClient[$db->f("idclient")]["images"] = $db->f("htmlpath") . "images/";
$cfgClient[$db->f("idclient")]["upload"] = "upload/"; $cfgClient[$db->f("idclient")]["upload"] = "upload/";
$cfgClient[$db->f("idclient")]["path"]["frontend"] = $db->f("frontendpath");
$cfgClient[$db->f("idclient")]["path"]["htmlpath"] = $db->f("htmlpath");
$cfgClient[$db->f("idclient")]["htmlpath"]["frontend"] = $cfgClient[$db->f("idclient")]["path"]["htmlpath"]; $cfgClient[$db->f("idclient")]["htmlpath"]["frontend"] = $cfgClient[$db->f("idclient")]["path"]["htmlpath"];
$cfgClient[$db->f("idclient")]["upl"]["path"] = $cfgClient[$db->f("idclient")]["path"]["frontend"] . "upload/"; $cfgClient[$db->f("idclient")]["upl"]["path"] = $cfgClient[$db->f("idclient")]["path"]["frontend"] . "upload/";
$cfgClient[$db->f("idclient")]["upl"]["htmlpath"] = $cfgClient[$db->f("idclient")]["htmlpath"]["frontend"] . "upload/"; $cfgClient[$db->f("idclient")]["upl"]["htmlpath"] = $cfgClient[$db->f("idclient")]["htmlpath"]["frontend"] . "upload/";
@ -767,6 +768,30 @@ function rereadClients() {
$cfgClient[$db->f("idclient")]["css"]["path"] = $cfgClient[$db->f("idclient")]["path"]["frontend"] . "css/"; $cfgClient[$db->f("idclient")]["css"]["path"] = $cfgClient[$db->f("idclient")]["path"]["frontend"] . "css/";
$cfgClient[$db->f("idclient")]["js"]["path"] = $cfgClient[$db->f("idclient")]["path"]["frontend"] . "js/"; $cfgClient[$db->f("idclient")]["js"]["path"] = $cfgClient[$db->f("idclient")]["path"]["frontend"] . "js/";
$cfgClient[$db->f("idclient")]["tpl"]["path"] = $cfgClient[$db->f("idclient")]["path"]["frontend"] . "templates/"; $cfgClient[$db->f("idclient")]["tpl"]["path"] = $cfgClient[$db->f("idclient")]["path"]["frontend"] . "templates/";
// added new path variables since v2.0.2
$cfgClient[$db->f("idclient")]["cache"]["path"] = $cfgClient[$db->f("idclient")]["path"]["frontend"] . "cache/";
$cfgClient[$db->f("idclient")]["cache"]["frontendpath"] = "cache/";
$cfgClient[$db->f("idclient")]["code"]["path"] = $cfgClient[$db->f("idclient")]["path"]["frontend"] . "cache/code/";
$cfgClient[$db->f("idclient")]["code"]["frontendpath"] = "cache/code/";
$cfgClient[$db->f("idclient")]["xml"]["path"] = $cfgClient[$db->f("idclient")]["path"]["frontend"] . "xml/";
$cfgClient[$db->f("idclient")]["xml"]["frontendpath"] = "xml/";
$cfgClient[$db->f("idclient")]["template"]["path"] = $cfgClient[$db->f("idclient")]["path"]["frontend"] . "templates/";
$cfgClient[$db->f("idclient")]["template"]["frontendpath"] = "templates/";
$cfgClient[$db->f("idclient")]["data"]["path"] = $cfgClient[$db->f("idclient")]["path"]["frontend"] . "data/";
$cfgClient[$db->f("idclient")]["module"]["path"] = $cfgClient[$db->f("idclient")]["path"]["frontend"] . "data/modules/";
$cfgClient[$db->f("idclient")]["module"]["frontendpath"] = "data/modules/";
$cfgClient[$db->f("idclient")]["config"]["path"] = $cfgClient[$db->f("idclient")]["path"]["frontend"] . "data/config/production/";
$cfgClient[$db->f("idclient")]["config"]["frontendpath"] = "data/config/";
$cfgClient[$db->f("idclient")]["layout"]["path"] = $cfgClient[$db->f("idclient")]["path"]["frontend"] . "data/layouts/";
$cfgClient[$db->f("idclient")]["layout"]["frontendpath"] = "data/layouts/";
$cfgClient[$db->f("idclient")]["log"]["path"] = $cfgClient[$db->f("idclient")]["path"]["frontend"] . "data/logs/";
$cfgClient[$db->f("idclient")]["log"]["frontendpath"] = "data/logs/";
$cfgClient[$db->f("idclient")]["version"]["path"] = $cfgClient[$db->f("idclient")]["path"]["frontend"] . "data/version/";
$cfgClient[$db->f("idclient")]["version"]["frontendpath"] = "data/version/";
$errsite_idcat[$db->f("idclient")] = $db->f("errsite_cat");
$errsite_idart[$db->f("idclient")] = $db->f("errsite_art");
} }
} }
@ -1965,7 +1990,7 @@ function checkMySQLConnectivity() {
$res = NULL; $res = NULL;
} }
} else { } else {
if(function_exists("mysql_connect")) { if (function_exists("mysql_connect")) {
$res = mysql_connect($contenido_host, $contenido_user, $contenido_password); $res = mysql_connect($contenido_host, $contenido_user, $contenido_password);
} else { } else {
$res = NULL; $res = NULL;

96
conlite/includes/include.default_subnav.php
Datei anzeigen

@ -1,4 +1,5 @@
<?php <?php
/** /**
* Project: * Project:
* Contenido Content Management System * Contenido Content Management System
@ -26,8 +27,7 @@
* }} * }}
* *
*/ */
if (!defined('CON_FRAMEWORK'))
if(!defined('CON_FRAMEWORK'))
die('Illegal call'); die('Illegal call');
@ -44,7 +44,7 @@ $sDebugMsg = '';
/* /*
* Ben<EFBFBD>tigt alle m<EFBFBD>glichen vom Frame <EFBFBD>bergenene GET-Parameter-Names * Ben<EFBFBD>tigt alle m<EFBFBD>glichen vom Frame <EFBFBD>bergenene GET-Parameter-Names
*/ */
$aBasicParams = array( 'area', 'frame', 'contenido', 'appendparameters' ); $aBasicParams = array('area', 'frame', 'contenido', 'appendparameters');
/* /*
* Flag to check is file is loading from Main-Frame * Flag to check is file is loading from Main-Frame
@ -61,34 +61,29 @@ $area = Contenido_Security::escapeDB($area, $db);
* and * and
* Value: are integer or strlen=32 (for md5) * Value: are integer or strlen=32 (for md5)
*/ */
$sUrlParams = ''; # URL-Parameter as string "&..." + "&..." $sUrlParams = ''; # URL-Parameter as string "&..." + "&..."
$iCountBasicVal = 0; # Count of basic Parameter in URL $iCountBasicVal = 0; # Count of basic Parameter in URL
foreach( $_GET as $sTempKey => $sTempValue ) foreach ($_GET as $sTempKey => $sTempValue) {
{ if (in_array($sTempKey, $aBasicParams)) {
if( in_array($sTempKey, $aBasicParams) )
{
/* Basic parameters attached */ /* Basic parameters attached */
$iCountBasicVal++; $iCountBasicVal++;
} } else if (( substr($sTempKey, 0, 2) == 'id' || substr($sTempKey, -2, 2) == 'id' )
else if( ( substr($sTempKey,0,2)=='id' || substr($sTempKey, -2, 2)=='id' ) && ( (int) $sTempValue == $sTempValue // check integer
&& ( (int)$sTempValue==$sTempValue // check integer
|| preg_match("/^[0-9a-f]{32}$/", $sTempValue) ) // check md5 || preg_match("/^[0-9a-f]{32}$/", $sTempValue) ) // check md5
) ) {
{
/* complement the selected data */ /* complement the selected data */
$sUrlParams.= '&'.$sTempKey.'='.$sTempValue; $sUrlParams .= '&' . $sTempKey . '=' . $sTempValue;
}
} }
}
/* /*
* is loading from main.php * is loading from main.php
* dann ist die Anzahl aller g<EFBFBD>ltigen Variablen mit den in GET identisch * dann ist die Anzahl aller g<EFBFBD>ltigen Variablen mit den in GET identisch
*/ */
if( $iCountBasicVal == count($_GET) ) if ($iCountBasicVal == count($_GET)) {
{
$bVirgin = true; $bVirgin = true;
} }
/* /*
* Area-Url-Params * Area-Url-Params
@ -103,24 +98,24 @@ $area = Contenido_Security::escapeDB($area, $db);
break; break;
default: echo ""; default: echo "";
} }
*/ */
/* Debug */ /* Debug */
$sDebugMsg.= 'Url-Params: '.$sUrlParams."\n"; $sDebugMsg .= 'Url-Params: ' . $sUrlParams . "\n";
/* /*
* Select NavSubItems from DB * Select NavSubItems from DB
*/ */
$nav = new Contenido_Navigation; $nav = new Contenido_Navigation;
$sql = "SELECT $sql = "SELECT
navsub.location AS location, navsub.location AS location,
area.name AS name, area.name AS name,
area.menuless AS menuless area.menuless AS menuless
FROM FROM
".$cfg["tab"]["area"]." AS area, " . $cfg["tab"]["area"] . " AS area,
".$cfg["tab"]["nav_sub"]." AS navsub " . $cfg["tab"]["nav_sub"] . " AS navsub
WHERE WHERE
area.idarea = navsub.idarea area.idarea = navsub.idarea
AND AND
@ -130,78 +125,75 @@ $area = Contenido_Security::escapeDB($area, $db);
AND AND
area.online = 1 area.online = 1
AND ( AND (
area.parent_id = '".$area."' area.parent_id = '" . $area . "'
OR OR
area.name = '".$area."' area.name = '" . $area . "'
) )
ORDER BY ORDER BY
area.parent_id ASC, area.parent_id ASC,
navsub.idnavs ASC"; navsub.idnavs ASC";
/* Debug */ /* Debug */
$sDebugMsg.= '<!-- SQL-Select: '."\n".$sql."\n".' -->'."\n"; $sDebugMsg .= '<!-- SQL-Select: ' . "\n" . $sql . "\n" . ' -->' . "\n";
$db->query($sql); $db->query($sql);
while($db->next_record()) { while ($db->next_record()) {
/* Name */ /* Name */
$sArea = $db->f("name"); $sArea = $db->f("name");
/* Set translation path */ /* Set translation path */
$sCaption = $nav->getName( $db->f("location") ); $sCaption = $nav->getName($db->f("location"));
/* for Main-Area*/ /* for Main-Area */
if( $sArea == $area ) { if ($sArea == $area) {
/* Menueless */ /* Menueless */
$bMenuless = $db->f("menuless") ? true : false; $bMenuless = $db->f("menuless") ? true : false;
if( $bVirgin && !$bMenuless && $db->f("name") == $area ) if ($bVirgin && !$bMenuless && $db->f("name") == $area) {
{
// ist loading fron Main, Main-Area and Menuless -> stop this "while" // ist loading fron Main, Main-Area and Menuless -> stop this "while"
break; break;
} }
} }
/* Link */ /* Link */
$sLink = $sess->url("main.php?area=".$sArea."&frame=4".(isset($appendparameters)?'&appendparameters='.$appendparameters:'')."&contenido=".$sess->id.$sUrlParams); $sLink = $sess->url("main.php?area=" . $sArea . "&frame=4" . (isset($appendparameters) ? '&appendparameters=' . $appendparameters : '') . "&contenido=" . $sess->id . $sUrlParams);
/* Class */ /* Class */
if($sArea == $area) if ($sArea == $area)
$sClass = ' current'; $sClass = ' current';
else else
$sClass = ''; $sClass = '';
/* fill template */ /* fill template */
$tpl->set("d", "ID", 'c_'.$tpl->dyn_cnt ); $tpl->set("d", "ID", 'c_' . $tpl->dyn_cnt);
$tpl->set("d", "CLASS", 'item '.$sArea ); $tpl->set("d", "CLASS", 'item ' . $sArea);
$tpl->set("d", "CAPTION", '<a class="white'.$sClass.'" onclick="'.setHelpContext($sArea).'sub.clicked(this)" target="right_bottom" href="'.$sLink.'">'.$sCaption.'</a>'); $tpl->set("d", "CAPTION", '<a class="white' . $sClass . '" onclick="' . setHelpContext($sArea) . 'sub.clicked(this)" target="right_bottom" href="' . $sLink . '">' . $sCaption . '</a>');
$tpl->next(); $tpl->next();
} }
if( !$bVirgin || (isset($bMenuless) && $bMenuless)) if (!$bVirgin || (isset($bMenuless) && $bMenuless)) {
{ $tpl->set('s', 'CLASS', (isset($bMenuless) && $bMenuless) ? 'menuless' : '');
$tpl->set('s', 'CLASS', (isset($bMenuless) && $bMenuless)?'menuless' : '');
$tpl->set('s', 'SESSID', $sess->id); $tpl->set('s', 'SESSID', $sess->id);
$sTpl = $tpl->generate( $cfg["path"]["templates"] . $cfg['templates']['default_subnav'], true ); $sTpl = $tpl->generate($cfg["path"]["templates"] . $cfg['templates']['default_subnav'], true);
if($bDebug === true) { if ($bDebug === true) {
$aExectime["fullend"] = getmicrotime(); $aExectime["fullend"] = getmicrotime();
$sExectime = ($aExectime["fullend"] - $aExectime["fullstart"]); $sExectime = ($aExectime["fullend"] - $aExectime["fullstart"]);
$sDebugMsg.= 'sExectime: '.substr($sExectime,0,7)." sec"."\n"; $sDebugMsg .= 'sExectime: ' . substr($sExectime, 0, 7) . " sec" . "\n";
$sTpl = str_replace( '</body>', '<div style="position:absolute; right:15px; width: 200px; top:0px; height: 32px; overflow: scroll; background:#fff; color:#000; border:1px dotted #f00; padding:2px;">'.nl2br( $sDebugMsg ).'</div>'.'</body>', $sTpl ); $sTpl = str_replace('</body>', '<div style="position:absolute; right:15px; width: 200px; top:0px; height: 32px; overflow: scroll; background:#fff; color:#000; border:1px dotted #f00; padding:2px;">' . nl2br($sDebugMsg) . '</div>' . '</body>', $sTpl);
} }
echo $sTpl; echo $sTpl;
} else { } else {
/* /*
* Is loading from main.php * Is loading from main.php
*/ */
$tpl->reset(); $tpl->reset();
$tpl->generate( $cfg["path"]["templates"] . $cfg['templates']['right_top_blank'] ); $tpl->generate($cfg["path"]["templates"] . $cfg['templates']['right_top_blank']);
} }
?> ?>

2
conlite/includes/startup.php
Datei anzeigen

@ -71,7 +71,7 @@ if (!defined('CL_ENVIRONMENT')) {
*/ */
if (!defined('CL_VERSION')) { if (!defined('CL_VERSION')) {
define('CL_VERSION', '2.0.1'); define('CL_VERSION', '2.0.2');
} }

2
conlite/plugins/smarty/cl_plugin.xml
Datei anzeigen

@ -12,7 +12,7 @@
<version>1.0.2</version> <version>1.0.2</version>
<license>GNU Lesser General Public License</license> <license>GNU Lesser General Public License</license>
</general> </general>
<requirements php="5.6"> <requirements php="5.4">
<conlite minversion="2.0.2" /> <conlite minversion="2.0.2" />
</requirements> </requirements>
<conlite /> <conlite />