latest updates

cms/templates/cl_uuid_form.tpl

@@ -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>

conlite/includes/functions.general.php

@@ -737,6 +737,7 @@ function rereadClients() {
     }
 
     $sql = "SELECT
+        name,
         idclient,
         frontendpath,
         htmlpath,
@@ -752,14 +753,14 @@ function rereadClients() {
     }
     while ($db->next_record()) {
         $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")]["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")]["upl"]["path"] = $cfgClient[$db->f("idclient")]["path"]["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")]["js"]["path"] = $cfgClient[$db->f("idclient")]["path"]["frontend"] . "js/";
         $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");
     }
 }
 

conlite/includes/include.default_subnav.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Project: 
  * Contenido Content Management System
@@ -26,7 +27,6 @@
  * }}
  * 
  */
-
 if (!defined('CON_FRAMEWORK'))
     die('Illegal call');
 
@@ -64,18 +64,14 @@ $area = Contenido_Security::escapeDB($area, $db);
 $sUrlParams = ''; # URL-Parameter as string "&..." + "&..."
 $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 */
         $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
             || preg_match("/^[0-9a-f]{32}$/", $sTempValue) ) // check md5
-			  	 ) 
+    ) {
-		{
         /* complement the selected data */
         $sUrlParams .= '&' . $sTempKey . '=' . $sTempValue;
     }
@@ -85,8 +81,7 @@ $area = Contenido_Security::escapeDB($area, $db);
  * is loading from main.php
  * dann ist die Anzahl aller g<EFBFBD>ltigen Variablen mit den in GET identisch
  */
-	if( $iCountBasicVal == count($_GET) )
+if ($iCountBasicVal == count($_GET)) {
-	{
     $bVirgin = true;
 }
 
@@ -156,8 +151,7 @@ $area = Contenido_Security::escapeDB($area, $db);
         /* Menueless */
         $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"
             break;
         }
@@ -179,8 +173,7 @@ $area = Contenido_Security::escapeDB($area, $db);
     $tpl->next();
 }
 
-	if( !$bVirgin || (isset($bMenuless) && $bMenuless))
+if (!$bVirgin || (isset($bMenuless) && $bMenuless)) {
-	{
     $tpl->set('s', 'CLASS', (isset($bMenuless) && $bMenuless) ? 'menuless' : '');
     $tpl->set('s', 'SESSID', $sess->id);
 
@@ -203,5 +196,4 @@ $area = Contenido_Security::escapeDB($area, $db);
     $tpl->reset();
     $tpl->generate($cfg["path"]["templates"] . $cfg['templates']['right_top_blank']);
 }
-
 ?>

conlite/includes/startup.php

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

conlite/plugins/smarty/cl_plugin.xml

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