Commits vergleichen

..

Keine gemeinsamen Commits. "95444fed6a1e1ea93cfd819e370d3a856a39cc5e" und "92181aba97afba1b359c49fa83e2ede78b2575eb" haben vollständig unterschiedliche Historien.

2 geänderte Dateien mit 21 neuen und 12 gelöschten Zeilen

Datei anzeigen

@ -2,15 +2,18 @@
/**
*
* @package ConLite\Includes\Plugin\Config
* @package Includes
* @subpackage Plugins
* @version $Rev$
* @since 2.0
* @author Ortwin Pinke <o.pinke@conlite.org>
* @copyright (c) 2015, conlite.org
* @license http://www.gnu.de/documents/gpl.en.html GPL v3 (english version)
* @license http://www.gnu.de/documents/gpl.de.html GPL v3 (deutsche Version)
* @link http://www.conlite.org ConLite.org
*
* $Id$:
*/
defined('CON_FRAMEWORK') || die('Illegal call: Missing framework initialization - request aborted.');
$bDebug = FALSE;

Datei anzeigen

@ -7,9 +7,12 @@
* adapted and recoded for ConLite by Ortwin Pinke
*
* @package PluginManager
* @version $Rev: 41 $
* @author Ortwin Pinke <ortwin.pinke@conlite.org>
* @author Frederic Schneider
* @copyright ConLite.org
* @copyright (c) 2008-2015, ConLite.org
*
* $Id: include.right_bottom.php 41 2018-05-20 21:55:49Z oldperl $
*/
if (!defined('CON_FRAMEWORK')) {
die('Illegal call');
@ -18,9 +21,8 @@ if (!defined('CON_FRAMEWORK')) {
/* @var $perm Contenido_Perm */
/* @var $auth Contenido_Challenge_Crypt_Auth */
$Notification = new Contenido_Notification();
$aMessages = [];
$oNoti = new Contenido_Notification();
$aMessages = array();
$oPage = new cPage();
$oPage->sendNoCacheHeaders();
$oPage->setHtml5();
@ -32,16 +34,15 @@ $oPage->addJsFile("plugins/pluginmanager/scripts/pluginmanager.js");
// give permission only to sysadmin
/* @var $perm Contenido_Perm */
if (!$perm->isSysadmin()) {
$oPage->setContent($Notification->returnNotification(Contenido_Notification::LEVEL_ERROR, i18n("Permission denied!")));
$oPage->setContent($oNoti->returnNotification(Contenido_Notification::LEVEL_ERROR, i18n("Permission denied!")));
$oPage->render();
die();
}
// check disable plugin var
if ($cfg['debug']['disable_plugins'] === true) {
$oPage->setContent($Notification->returnNotification(Contenido_Notification::LEVEL_WARNING, i18n('Currently the plugin system is disabled via configuration', "pluginmanager")));
$oPage->setContent($oNoti->returnNotification(Contenido_Notification::LEVEL_WARNING, i18n('Currently the plugin system is disabled via configuration', "pluginmanager")));
$oPage->render();
die();
}
$oPimPluginCollection = new pimPluginCollection();
@ -155,11 +156,14 @@ if (is_dir($cfg['path']['plugins'])) {
$aMessages[] = "error:".sprintf(i18n('Invalid Xml document for %s. Please contact the plugin author.', 'pluginmanager'),$sPiCfg);
continue;
}
//echo "<pre>";
//print_r($oPluginHandler->getCfgXmlObject());
$aNeededTplVar['writeable'] = ($bPiPathWritable)?i18n("Everything looks fine.", "pluginmanager"):'<span style="color:red;">'
.i18n("Pluginfolder not writable!", "pluginmanager").'</span>';
$aInfoGeneral = array_merge($aNeededTplVar, $oPluginHandler->getPiGeneralArray());
//echo "<pre>";
//print_r($aInfoGeneral);
// initalization new template class
$oView2 = new pimView();
$oView2->setVariable($iPiExCount, "PLUGIN_NUMBER");
@ -200,6 +204,7 @@ $oView->setVariable($iNumInstalledPlugins, 'INSTALLED_PLUGINS');
$oView->setVariable($sPlugins, 'PLUGINS');
$oView->setVariable($pluginsExtracted, 'PLUGINS_EXTRACTED');
//print_r($aMessages);
// show overview page
$oView->setTemplate('pi_manager_overview.html');
$sMessages = "";
@ -212,4 +217,5 @@ if(count($aMessages) > 0 ) {
}
//$oView->getRendered();
$oPage->setContent(array($oView->getRendered(1), $sMessages));
$oPage->render();
$oPage->render();
?>