5 source/Molajo/Extension/Module/PageHeader/manifest.xml
View file
@@ -10,6 +10,9 @@
<version>1.0</version>
<description>MODULE_PAGE_HEADER_DESCRIPTION</description>
<config>
<include name="ModuleParameters"/>
<include model="ModuleModel"/>
<parameters>
<include parameters="ModuleParameters"/>
</parameters>
</config>
</extension>
12 source/Molajo/Extension/Theme/Bootstrap/View/Page/Default/index.php
View file
@@ -6,13 +6,11 @@
* @license GNU General Public License Version 2, or later http://www.gnu.org/licenses/gpl.html
* <include:module name=Mainmenu wrap=Nav />
* <include:module name=Sidebar template=Sidebar wrap=div/>
*<include:defer/>
* <include:message/>
* <include:head/>
*/
defined('MOLAJO') or die; ?>
<include:module name=Pageheader template=Pageheader wrap=Head/>
<include:message/>

<include:head/>

<include:module name=Pageheader/>
<include:request/>
<include:module name=Pagefooter template=Pagefooter wrap=Footer/>
<include:defer/>
<include:module name=Pagefooter/>
1 source/Molajo/Extension/View/Template/PageHeader/View/Custom.php
View file
@@ -8,4 +8,5 @@
* @license GNU General Public License Version 2, or later http://www.gnu.org/licenses/gpl.html
*/
defined('MOLAJO') or die; ?>
in here.
<h1><?php echo Services::Registry()->get('Configuration', 'site_title', 'Molajo'); ?></h1>
2 source/Molajo/Extension/View/Template/PageHeader/manifest.xml
View file
@@ -10,7 +10,5 @@
<version>1.0</version>
<description>VIEW_TEMPLATE_PAGE_HEADER_DESCRIPTION</description>
<config>
<field name="parameters" registry="TemplateViewParameters">
</field>
</config>
</extension>
3 source/Molajo/MVC/Controller/DisplayController.php
View file
@@ -125,7 +125,8 @@ public function display()
$this->view_path_url = Services::Registry()->get('Parameters', 'template_view_path_url');

$renderedOutput = $this->renderView(Services::Registry()->get('Parameters', 'template_view_title'));

echo '<br /><br /><br /><br />';
echo $renderedOutput;
/** Mustache */
if (Services::Registry()->get('Parameters', 'mustache', 1) == 1) {
$renderedOutput = $this->processRenderedOutput($renderedOutput);
6 source/Molajo/MVC/Controller/EntryController.php
View file
@@ -123,11 +123,7 @@ public function connect($table = '', $type = null)
$this->model->set('id_name', Services::Registry()->get($this->table_registry_name, 'id_name'));

/** 4. Set DB Properties */
if (strtolower($type) == 'module') {
$dbo = 'JDatabase';
} else {
$dbo = Services::Registry()->get($this->table_registry_name, 'data_source');
}
$dbo = Services::Registry()->get($this->table_registry_name, 'data_source');

$this->model->set('db', Services::$dbo()->get('db'));
$this->model->set('query', Services::$dbo()->getQuery());
104 source/Molajo/Service/Services/Configuration/ConfigurationService.php
View file
@@ -359,27 +359,38 @@ public static function processModuleTable($file, $type = 'Module', $path_and_fil
return $registryName;
}

Services::Registry()->set($registryName, 'model_name', $file);
Services::Registry()->set($registryName, 'table_name', '#__extension_instances');
Services::Registry()->set($registryName, 'primary_key', 'id');
Services::Registry()->set($registryName, 'primary_prefix', 'a');
Services::Registry()->set($registryName, 'name_key', 'title');
Services::Registry()->set($registryName, 'get_customfields', true);
Services::Registry()->set($registryName, 'get_item_children', false);
Services::Registry()->set($registryName, 'use_special_joins', false);
Services::Registry()->set($registryName, 'check_view_level_access', false);
Services::Registry()->set($registryName, 'data_source', 'JDatabase');
/** Model */
if (isset($xml->config->include['model'])) {

$include = (string)$xml->config->include['model'];

if ($xml_string == '') {
$xml_string = file_get_contents($path_and_file);
}

$replace_this = '<include model="' . $include . '"/>';

$xml_string = ConfigurationService::replaceIncludeStatement(
$include, $file, $replace_this, $xml_string
);

$xml = simplexml_load_string($xml_string);
}

/** Set Model Properties */
ConfigurationService::setModelRegistry($registryName, $xml->config->model);
Services::Registry()->set($registryName, 'model_name', $registryName);

/** Parameters - Include Code */
if (isset($xml->config->include['name'])) {
if (isset($xml->config->parameters->include['parameters'])) {

$include = (string)$xml->config->include['name'];
$include = (string)$xml->config->parameters->include['parameters'];

if ($xml_string == '') {
$xml_string = file_get_contents($path_and_file);
}

$replace_this = '<include name="' . $include . '"/>';
$replace_this = '<include parameters="' . $include . '"/>';

$xml_string = ConfigurationService::replaceIncludeStatement(
$include, $file, $replace_this, $xml_string
@@ -394,7 +405,7 @@ public static function processModuleTable($file, $type = 'Module', $path_and_fil

/** Retrieve Field Attributes for each field */
$fieldArray = array();
foreach ($xml->config->field as $key1 => $value1) {
foreach ($xml->config->parameters->field as $key1 => $value1) {

$attributes = get_object_vars($value1);
$fieldAttributes = ($attributes["@attributes"]);
@@ -406,7 +417,6 @@ public static function processModuleTable($file, $type = 'Module', $path_and_fil
} else {
echo 'Field attribute not known ' . $key2 . ':' . $value2 . ' for ' . $file . '<br />';
}

$fieldAttributesArray[$key2] = $value2;
}

@@ -415,37 +425,13 @@ public static function processModuleTable($file, $type = 'Module', $path_and_fil

Services::Registry()->set($registryName, 'Parameters', $fieldArray);

Services::Registry()->set($registryName, 'CustomFieldGroups', array('Parameters'));

return $registryName;
}

/**
* processTableFile extracts XML configuration data for Tables/Models and populates Registry
* Returns the name of the registry
*
* @static
* @param $file
* @param string $type
* @param $path_and_file
* @param $xml
*
* @return string
* @since 1.0
* @throws \RuntimeException
*/
public static function processTableFile($file, $type = 'Table', $path_and_file, $xml)
public static function setModelRegistry($registryName, $xml)
{
/** Table only: Process Include Code */
$xml_string = '';

$registryName = ucfirst(strtolower($file)) . $type;

//echo 'In processTableFile creating Registry: ' . $registryName . ' for file: ' . $path_and_file . '<br />';

$exists = Services::Registry()->exists($registryName);
if ($exists === true) {
return $registryName;
}

Services::Registry()->set($registryName, 'model_name', (string)$xml['name']);
Services::Registry()->set($registryName, 'table_name', (string)$xml['table']);

@@ -501,6 +487,40 @@ public static function processTableFile($file, $type = 'Table', $path_and_file,
}
Services::Registry()->set($registryName, 'data_source', $value, 'JDatabase');

return;
}

/**
* processTableFile extracts XML configuration data for Tables/Models and populates Registry
* Returns the name of the registry
*
* @static
* @param $file
* @param string $type
* @param $path_and_file
* @param $xml
*
* @return string
* @since 1.0
* @throws \RuntimeException
*/
public static function processTableFile($file, $type = 'Table', $path_and_file, $xml)
{
/** Table only: Process Include Code */
$xml_string = '';

$registryName = ucfirst(strtolower($file)) . $type;

//echo 'In processTableFile creating Registry: ' . $registryName . ' for file: ' . $path_and_file . '<br />';

$exists = Services::Registry()->exists($registryName);
if ($exists === true) {
return $registryName;
}

/** Set Model Properties */
ConfigurationService::setModelRegistry($registryName, $xml);

/** Body - No registry */

$include = '';
6 source/Molajo/Service/Services/Language/LanguageService.php
View file
@@ -205,9 +205,9 @@ protected function load_core_files()
public function load($path)
{
$loaded = $this->loadLanguage($path, $this->language . '.ini');
if ($loaded === false) {
Services::Debug()->set('LanguageServices: cannot load file: '
. $path . '/' . $this->language . '.ini');
if ($loaded == false) {
// Services::Debug()->set('LanguageServices: cannot load file: '
echo 'cannot load language file ' . $path . '/' . $this->language . '.ini';
} else {
return true;
}