Large diffs are not rendered by default.

@@ -0,0 +1,33 @@
<?php
/**
* @package Molajo
* @subpackage Entry point
* @copyright Copyright (C) 2012 Amy Stephen. All rights reserved.
* @license GNU General Public License Version 2, or later http://www.gnu.org/licenses/gpl.html
*/
defined('MOLAJO') or die;

class ArticlesController extends MolajoControllerDisplay
{
}
class ArticlesControllerUpdate extends MolajoControllerUpdate
{
}
class ArticlesControllerUpdatelist extends MolajoControllerUpdatelist
{
}
class ArticlesTableArticle extends MolajoTableContent
{
}
class ArticlesModelDisplay extends MolajoModelDisplay
{
}
class ArticlesModelEdit extends MolajoModelEdit
{
}
class ArticlesMolajoACL extends MolajoACL
{
}
class ArticlesHelper
{
}
@@ -0,0 +1,65 @@
; Molajo Project
; Copyright (C) 2012 Amy Stephen. All rights reserved.
; License GNU General Public License version 2 or later http://www.gnu.org/licenses/gpl.html
; Note : All ini files need to be saved as UTF-8
; Double quotes in the values have to be formatted as "_QQ_"

COMPONENT_ARTICLES_NAME="Articles"
COMPONENT_ARTICLES_DESCRIPTION="Articles component"
; admin menu
ARTICLES_MENU="Articles"
ARTICLES_SUBMENU_ARTICLES="Articles"
ARTICLES_SUBMENU_CATEGORIES="Categories"
ARTICLES_CONFIGURATION="Articles Configuration"
ARTICLES_DEFAULT_PAGE_TITLE="Articles"
MOLAJO_SUBMENU_ARTICLES="Articles"
MOLAJO_SUBMENU_CATEGORIES="Categories"
MOLAJO_SUBMENU_FEATURED="Categories"
MOLAJO_SUBMENU_STICKIED="Categories"
MOLAJO_CONFIGURATION="Articles Configuration"
ARTICLES_DEFAULT_PAGE_TITLE="Articles"
; category
MOLAJO_CATEGORIES_TITLE="Category Manager: Articles"
MOLAJO_ARTICLES="Articles"
ARTICLES_ARTICLES="Articles"
; helpers/submenu.php
MOLAJO_SUBMENU_CATEGORIES="Categories"
MOLAJO_SUBMENU_FEATURED=Featured"
MOLAJO_SUBMENU_ARTICLES="Articles"
MOLAJO_SUBMENU_STICKIED="Stickied Articles"
MOLAJO_SUBMENU_UNPUBLISHED="Unpublished Articles"
; config.xml
MOLAJO_CONFIGURATION="Article Component Options"
; config.xml Manager List Tab
FIELDSET_CONFIG_ADMINISTRATOR_LABEL="Articles Manager"
MANAGER_LIST_LABEL="Manager List Options"
MANAGER_LIST_DESC="Select display options for the Toolbar Title, Toolbar Buttons, Submenu Options, Search Filters, and Manager Grid Columns."
; config.xml Manager List Tab - Title Display
MOLAJO_TITLE_DISPLAY_OPTIONS_LABEL="Toolbar Title Display"
MOLAJO_TITLE_DISPLAY_OPTIONS_DESC="Enable or disable the display of the Toolbar Manager Title."
MOLAJO_TITLE_LABEL="Display Title"
MOLAJO_TITLE_DESC="Show or hide the Article Manager Title in the upper left corner."
MOLAJO_TITLE_IMAGE_LABEL="Display Title Image"
MOLAJO_TITLE_IMAGE_DESC="Show or hide the Article Manager Title Image in the upper left corner."
; config.xml Manager List Tab - Submenu Option
MANAGER_SUBMENU_CATEGORY="Category"
MANAGER_SUBMENU_VERSIONS="Versions"
MANAGER_SUBMENU_DEFAULT="Articles"
MANAGER_SUBMENU_FEATURED="Featured Articles"
MANAGER_SUBMENU_STICKIED="Stickied Articles"
MANAGER_SUBMENU_UNPUBLISHED="Unpublished Articles"
; config.xml Manager Editor Tab
FIELDSET_CONFIG_EDITOR_LABEL="Articles Editor"
; config.xml Manager Edit Tab - Toolbar Buttons
MANAGER_EDITOR_BUTTON_BAR_NEW_OPTIONS_LABEL="New Article Toolbar Buttons"
; edit
MANAGER_EDITOR_BUTTON_BAR_EDIT_OPTIONS_LABEL="Edit Article Toolbar Buttons"
; views/article/layouts
MOLAJO_MANAGER_ARTICLE="Article Manager: Article"
; views/articles addToolbar
MOLAJO_MANAGER_ARTICLES="Article Manager: Articles"
CATEGORIES_CATEGORIES_TITLE="Categories Articles"
; views/articles/layouts/default.php
MOLAJO_NEW_ARTICLE="New Content"
MOLAJO_NO_ITEM_SELECTED="No content selected"
ARTICLES_EDIT_ARTICLE="Edit Article"
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<extension type="component" version="1.0" method="upgrade">
<name>COMPONENT_ARTICLES_NAME</name>
<author>Amy Stephen</author>
<create_date>January 2012</create_date>
<copyright>Copyright (C) 2012 Amy Stephen. All rights reserved.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
<author_email>collaborate@molajo.org</author_email>
<author_url>http://molajo.org</author_url>
<version>1.0</version>
<description>COMPONENT_ARTICLES_DESCRIPTION</description>
<files>
<filename>access.xml</filename>
<filename>articles.php</filename>
<filename>config.xml</filename>
<folder>language</folder>
<folder>sql</folder>
</files>
</extension>
@@ -0,0 +1,2 @@
/* primary component table */;
/* in installation sql */
@@ -0,0 +1,3 @@
DROP TABLE IF EXISTS `#__articles`;
DELETE FROM `#__assets` WHERE `name` LIKE 'articles%';
DELETE FROM `#__configuration` WHERE `component_option` = 'articles';
@@ -10,10 +10,10 @@
class CommentsController extends MolajoControllerDisplay
{
}
class CommentsControllerEdit extends MolajoControllerEdit
class CommentsControllerUpdate extends MolajoControllerUpdate
{
}
class CommentsControllerMultiple extends MolajoControllerUpdatelist
class CommentsControllerUpdatelist extends MolajoControllerUpdatelist
{
}
class CommentsTableComment extends MolajoTableContent
@@ -69,7 +69,11 @@ class MolajoDocument
public function __construct($request = array())
{
$this->request = $request;

/**
echo '<pre>';
var_dump($this->request);
echo '</pre>';
*/
$formatXML = MOLAJO_EXTENSIONS_CORE . '/core/renderers/sequence.xml';
if (JFile::exists($formatXML)) {
} else {
@@ -99,12 +103,6 @@ protected function _render()
'parameters' => $this->request->get('template_parameters')
);

// $this->parameters = array();
// $this->parameters = $this->request->get;
// $this->parameters = json_encode($this->request->get);
//echo 'Parameters'.'<pre>';var_dump(json_encode($this->parameters));echo '</pre>';
// die;
// die;
/** Template Parameters */
$this->parameters = new JRegistry;
$this->parameters->loadArray($parameters);
@@ -113,12 +111,10 @@ protected function _render()
// MolajoController::getApplication()->triggerEvent('onBeforeRender');

/** Load Media */
// MolajoTemplateHelper::loadFavicon();
// MolajoTemplateHelper::loadLanguage();
// $this->_loadMedia();

/** process template include, and then all rendered output, for <include statements */
$body = $this->_renderLoop($this->request->get('template_include'));
$body = $this->_renderLoop();

/** set response body */
MolajoController::getApplication()->setBody($body);
@@ -145,7 +141,7 @@ protected function _renderLoop()
{
/** include the template and page */
ob_start();
require $this->request->get('template_include');
require $this->request->get('template_path');
$this->_template = ob_get_contents();
ob_end_clean();

@@ -276,7 +272,7 @@ protected function _renderTemplate()
$replace[] = "<include:" . $rendererArray['replace'] . "/>";

/** 7. load the renderer class and send in requestArray */
$class = 'Molajo' . ucfirst($rendererName) . 'Renderer';
$class = 'Molajo' . 'Renderer'.ucfirst($rendererName);
if (class_exists($class)) {
$rendererClass = new $class ($rendererName, $this->request);
} else {
@@ -238,6 +238,8 @@ public static function getInstanceTitle($extension_instance_id)
}

/**
* NOT USED
*
* getOptions
*
* Construct the Request Array for the MVC
@@ -252,7 +254,7 @@ public static function getOptions(JObject $request)
$request->set('component_table', '');

/** Configuration model */
$configModel = new MolajoModelConfiguration ($request->get('option'));
$configModel = new MolajoModelConfiguration ($request->get('mvc_option'));

/** Task */
if ($request->get('task', '') == '') {
@@ -333,7 +335,7 @@ public static function getOptions(JObject $request)
if ($model == 'dummy') {
$request->set('model', 'MolajoModel');
} else {
$request->set('model', ucfirst($request->get('option')) . 'Model' . ucfirst($model));
$request->set('model', ucfirst($request->get('mvc_option')) . 'Model' . ucfirst($model));
}

if ($request->get('controller') == 'display') {
@@ -17,7 +17,7 @@
*/
$fileHelper->requireClassFile(MOLAJO_EXTENSIONS_CORE . '/core/request.php', 'MolajoRequest');
$fileHelper->requireClassFile(MOLAJO_EXTENSIONS_CORE . '/core/document.php', 'MolajoDocument');
$fileHelper->requireClassFile(MOLAJO_EXTENSIONS_CORE . '/core/renderer.php', 'MolajoRenderer');
$fileHelper->requireClassFile(MOLAJO_EXTENSIONS_CORE . '/core/renderers/renderer.php', 'MolajoRenderer');

/**
* Helpers
@@ -40,7 +40,10 @@
*/
$files = JFolder::files(MOLAJO_EXTENSIONS_CORE . '/core/renderers', '\.php$', false, false);
foreach ($files as $file) {
$fileHelper->requireClassFile(MOLAJO_EXTENSIONS_CORE . '/core/renderers/' . $file, 'Molajo' . ucfirst(substr($file, 0, strpos($file, '.'))) . 'Renderer');
if ($file == 'renderer.php') {
} else {
$fileHelper->requireClassFile(MOLAJO_EXTENSIONS_CORE . '/core/renderers/' . $file, 'MolajoRenderer' . ucfirst(substr($file, 0, strpos($file, '.'))));
}
}


@@ -39,11 +39,11 @@ abstract class JSessionStorage extends MolajoSessionStorage
{
}

abstract class JModuleHelper extends MolajoModuleRenderer
abstract class JModuleHelper extends MolajoRendererModule
{
}

class JComponentHelper extends MolajoComponentRenderer
class JComponentHelper extends MolajoRendererComponent
{
}

@@ -211,4 +211,4 @@ class JUpdater extends MolajoUpdater
//class JUpdaterCollection extends MolajoUpdaterCollection {}
//class JUpdaterExtension extends MolajoUpdaterExtension {}


@@ -643,7 +643,7 @@ INSERT INTO `molajo_content`
`checked_out_datetime`, `checked_out_by`, `custom_fields`, `language`, `translation_of_id`)
SELECT 102, 102, 'Content', '', 'content', 101, 101, 1, 12, 1,
`id`, 2000,
CONCAT ('{"extension_instance_id":"7","section":"content","id":"","category_id":"","template_id":"","page_id":"","page_css_id":"","page_css_class":"","view_id":"33","view_css_id":"","view_css_class":"","wrap_id":"75","wrap_css_id":"","wrap_css_class":"","cache":"1","cache_time":"900"}'),
CONCAT ('{"extension_instance_id":"7","section":"content","id":"","category_id":"","template_id":"","page_id":"","page_css_id":"","page_css_class":"","view_id":"19","view_css_id":"","view_css_class":"","wrap_id":"67","wrap_css_id":"","wrap_css_class":"","cache":"1","cache_time":"900"}'),
'{"metadata_title":"Content", "metadata_description":"Dashboard", "metadata_keywords":"dashboard", "metadata_robots":"follow, index", "metadata_author":"Author Name", "metadata_content_rights":"CC"}',
'', '', 1, 0, 0,
1, '2011-11-11 11:11:11', '0000-00-00 00:00:00',
@@ -14,7 +14,7 @@
* @subpackage Renderer
* @since 1.0
*/
class MolajoComponentRenderer extends MolajoRenderer
class MolajoRendererComponent extends MolajoRenderer
{
/**
* import
@@ -27,47 +27,47 @@ protected function _import()
$fileHelper = new MolajoFileHelper();

/** Controllers */
if (file_exists($this->_request->get('extension_path') . '/controller.php')) {
$fileHelper->requireClassFile($this->_request->get('extension_path') . '/controller.php', ucfirst($this->_request->get('option')) . 'Controller');
if (file_exists($this->_request->get('mvc_extension_path') . '/controller.php')) {
$fileHelper->requireClassFile($this->_request->get('mvc_extension_path') . '/controller.php', ucfirst($this->_request->get('mvc_option')) . 'Controller');
}
$files = JFolder::files($this->_request->get('extension_path') . '/controllers', '\.php$', false, false);
$files = JFolder::files($this->_request->get('mvc_extension_path') . '/controllers', '\.php$', false, false);
if ($files) {
foreach ($files as $file) {
$fileHelper->requireClassFile($this->_request->get('extension_path') . '/controllers/' . $file, ucfirst($this->_request->get('option')) . 'Controller' . ucfirst(substr($file, 0, strpos($file, '.'))));
$fileHelper->requireClassFile($this->_request->get('mvc_extension_path') . '/controllers/' . $file, ucfirst($this->_request->get('mvc_option')) . 'Controller' . ucfirst(substr($file, 0, strpos($file, '.'))));
}
}
/** Helpers */
$files = JFolder::files($this->_request->get('extension_path') . '/helpers', '\.php$', false, false);
$files = JFolder::files($this->_request->get('mvc_extension_path') . '/helpers', '\.php$', false, false);
if ($files) {
foreach ($files as $file) {
$fileHelper->requireClassFile($this->_request->get('extension_path') . '/helpers/' . $file, ucfirst($this->_request->get('option')) . ucfirst(substr($file, 0, strpos($file, '.'))));
$fileHelper->requireClassFile($this->_request->get('mvc_extension_path') . '/helpers/' . $file, ucfirst($this->_request->get('mvc_option')) . ucfirst(substr($file, 0, strpos($file, '.'))));
}
}

/** Models */
$files = JFolder::files($this->_request->get('extension_path') . '/models', '\.php$', false, false);
$files = JFolder::files($this->_request->get('mvc_extension_path') . '/models', '\.php$', false, false);
if ($files) {
foreach ($files as $file) {
$fileHelper->requireClassFile($this->_request->get('extension_path') . '/models/' . $file, ucfirst($this->_request->get('option')) . 'Model' . ucfirst(substr($file, 0, strpos($file, '.'))));
$fileHelper->requireClassFile($this->_request->get('mvc_extension_path') . '/models/' . $file, ucfirst($this->_request->get('mvc_option')) . 'Model' . ucfirst(substr($file, 0, strpos($file, '.'))));
}
}

/** Tables */
$files = JFolder::files($this->_request->get('extension_path') . '/tables', '\.php$', false, false);
$files = JFolder::files($this->_request->get('mvc_extension_path') . '/tables', '\.php$', false, false);
if ($files) {
foreach ($files as $file) {
$fileHelper->requireClassFile($this->_request->get('extension_path') . '/tables/' . $file, ucfirst($this->_request->get('option')) . 'Table' . ucfirst(substr($file, 0, strpos($file, '.'))));
$fileHelper->requireClassFile($this->_request->get('mvc_extension_path') . '/tables/' . $file, ucfirst($this->_request->get('mvc_option')) . 'Table' . ucfirst(substr($file, 0, strpos($file, '.'))));
}
}

/** Views */
$folders = JFolder::folders($this->_request->get('extension_path') . '/views', false, false);
$folders = JFolder::folders($this->_request->get('mvc_extension_path') . '/views', false, false);
if ($folders) {
foreach ($folders as $folder) {
$files = JFolder::files($this->_request->get('extension_path') . '/views/' . $folder, false, false);
$files = JFolder::files($this->_request->get('mvc_extension_path') . '/views/' . $folder, false, false);
if ($files) {
foreach ($files as $file) {
$fileHelper->requireClassFile($this->_request->get('extension_path') . '/views/' . $folder . '/' . $file, ucfirst($this->_request->get('option')) . 'View' . ucfirst($folder));
$fileHelper->requireClassFile($this->_request->get('mvc_extension_path') . '/views/' . $folder . '/' . $file, ucfirst($this->_request->get('mvc_option')) . 'View' . ucfirst($folder));
}
}
}
@@ -85,19 +85,19 @@ protected function _import()
protected function _loadMedia()
{
/** Primary Category */
$this->_loadMediaPlus('/category' . $this->_request->get('primary_category'),
$this->_loadMediaPlus('/category' . $this->_request->get('mvc_category_id'),
MolajoController::getApplication()->get('media_priority_primary_category', 700));

/** Menu Item */
$this->_loadMediaPlus('/menuitem' . $this->_request->get('menu_item'),
$this->_loadMediaPlus('/menuitem' . $this->_request->get('menu_item_id'),
MolajoController::getApplication()->get('media_priority_menu_item', 800));

/** Source */
$this->_loadMediaPlus('/source' . $this->_request->get('source_id'),
$this->_loadMediaPlus('/source' . $this->_request->get('mvc_id'),
MolajoController::getApplication()->get('media_priority_source_data', 900));

/** Component */
$this->_loadMediaPlus('/component' . $this->_request->get('option'),
$this->_loadMediaPlus('/component' . $this->_request->get('mvc_option'),
MolajoController::getApplication()->get('media_priority_source_data', 900));
}

@@ -14,7 +14,7 @@
* @subpackage Renderer
* @since 1.0
*/
class MolajoDeferRenderer
class MolajoRendererDefer extends MolajoRenderer
{
/**
* Name
@@ -112,7 +112,7 @@ protected function _setRequest()
$this->_request->set('view_type', 'extensions');
$viewHelper = new MolajoViewHelper($this->_request->get('view'),
$this->_request->get('view_type'),
$this->_request->get('option'),
$this->_request->get('mvc_option'),
$this->_request->get('extension_type'),
' ',
$this->_request->get('template_name')
@@ -123,7 +123,7 @@ protected function _setRequest()
/** Wrap Path */
$wrapHelper = new MolajoViewHelper($this->_request->get('wrap'),
'wraps',
$this->_request->get('option'),
$this->_request->get('mvc_option'),
$this->_request->get('extension_type'),
' ',
$this->_request->get('template_name')
@@ -14,7 +14,7 @@
* @subpackage Renderer
* @since 1.0
*/
class MolajoHeadRenderer
class MolajoRendererHead extends MolajoRenderer
{
/**
* Name
@@ -112,7 +112,7 @@ protected function _setRequest()
$this->_request->set('view_type', 'extensions');
$viewHelper = new MolajoViewHelper($this->_request->get('view'),
$this->_request->get('view_type'),
$this->_request->get('option'),
$this->_request->get('mvc_option'),
$this->_request->get('extension_type'),
' ',
$this->_request->get('template_name')
@@ -123,7 +123,7 @@ protected function _setRequest()
/** Wrap Path */
$wrapHelper = new MolajoViewHelper($this->_request->get('wrap'),
'wraps',
$this->_request->get('option'),
$this->_request->get('mvc_option'),
$this->_request->get('extension_type'),
' ',
$this->_request->get('template_name')
@@ -14,7 +14,7 @@
* @subpackage Renderer
* @since 1.0
*/
class MolajoMenuRenderer
class MolajoRendererMenu extends MolajoRenderer
{
/**
* Name
@@ -112,7 +112,7 @@ protected function _setRequest()
$this->_request->set('view_type', 'extensions');
$viewHelper = new MolajoViewHelper($this->_request->get('view'),
$this->_request->get('view_type'),
$this->_request->get('option'),
$this->_request->get('mvc_option'),
$this->_request->get('extension_type'),
' ',
$this->_request->get('template_name')
@@ -123,7 +123,7 @@ protected function _setRequest()
/** Wrap Path */
$wrapHelper = new MolajoViewHelper($this->_request->get('wrap'),
'wraps',
$this->_request->get('option'),
$this->_request->get('mvc_option'),
$this->_request->get('extension_type'),
' ',
$this->_request->get('template_name')
@@ -14,124 +14,19 @@
* @subpackage Renderer
* @since 1.0
*/
class MolajoMessageRenderer
class MolajoRendererMessage extends MolajoRenderer
{
/**
* Name
*
* @var string
* @since 1.0
*/
protected $_name = null;

/**
* Request
*
* @var object
* @since 1.0
*/
protected $_request;

/**
* Attributes
*
* Extracted in Document Class from Template/Page
* <include:message statement attr1=x attr2=y attrN="and-so-on" />
*
* @var array
* @since 1.0
*/
protected $_attributes = array();

/**
* __construct
*
* Class constructor.
*
* @param null $name
* @param array $request
* @since 1.0
*/
public function __construct($name = null, JObject $request)
{
$this->_name = $name;
$this->_request = $request;
}

/**
* render
*
* Render the message.
*
* @param $attributes
* @return mixed
*/
public function render($attributes)
{
/** from template rendering */
$this->_attributes = $attributes;

/** retrieve parameters */
$this->_setParameters();

/** Instantiate Controller */
$controller = new MolajoControllerDisplay ($this->_request);
return $controller->Display();
}

/**
* _setRequest
* _setParameters
*
* From <include:message attr=1 attr=2 etc />
*/
protected function _setRequest()
protected function _setParameters()
{
$this->_request->set('view', MolajoController::getApplication()->get('message_view_id', 'messages'));
$this->_request->set('wrap', MolajoController::getApplication()->get('message_wrap_id', 'div'));

foreach ($this->_attributes as $name => $value) {

if ($name == 'wrap') {
$this->_request->set('wrap', $value);

} else if ($name == 'view') {
$this->_request->set('view', $value);

} else if ($name == 'id' || $name == 'wrap_id') {
$this->_request->set('wrap_id', $value);

} else if ($name == 'class' || $name == 'wrap_class') {
$this->_request->set('wrap_class', $value);
}
}
parent::_setParameters();

/** Model */
$this->_request->set('model', 'MolajoModelMessages');

/** View Path */
$this->_request->set('view_type', 'extensions');

$viewHelper = new MolajoViewHelper($this->_request->get('view'),
$this->_request->get('view_type'),
$this->_request->get('option'),
$this->_request->get('extension_type'),
' ',
$this->_request->get('template_name')
);
$this->_request->set('view_path', $viewHelper->view_path);
$this->_request->set('view_path_url', $viewHelper->view_path_url);

/** Wrap Path */
$wrapHelper = new MolajoViewHelper($this->_request->get('wrap'),
'wraps',
$this->_request->get('option'),
$this->_request->get('extension_type'),
' ',
$this->_request->get('template_name')
);
$this->_request->set('wrap_path', $wrapHelper->view_path);
$this->_request->set('wrap_path_url', $wrapHelper->view_path_url);

$this->_request->set('extension_suppress_no_results', true);
$this->_request->set('mvc_model', 'MolajoModelMessages');
}
}
@@ -14,49 +14,8 @@
* @subpackage Renderer
* @since 1.0
*/
class MolajoModuleRenderer
class MolajoRendererModule extends MolajoRenderer
{
/**
* Name
*
* @var string
* @since 1.0
*/
protected $_name = null;

/**
* Request Object
*
* @var object
* @since 1.0
*/
protected $_request;

/**
* Attributes
* Extracted in Document Class from Template/Page
* <include:module statement attr1=x attr2=y attrN="and-so-on" />
*
* @var array
* @since 1.0
*/
protected $_attributes = array();

/**
* __construct
*
* Class constructor.
*
* @param string $name
* @param object $request
* @since 1.0
*/
public function __construct($name = null, JObject $request)
{
$this->_name = $name;
$this->_request = $request;
}

/**
* render
*
@@ -68,6 +27,9 @@ public function __construct($name = null, JObject $request)
*/
public function render($attributes)
{
echo '<pre>';
var_dump($this->_request);
echo '</pre>';
/** <include:module [name=xyz|position=xyz] attr1=x attr2=y attrN="and-so-on" /> */
$this->_attributes = $attributes;
$renderedOutput = '';
@@ -76,7 +38,7 @@ public function render($attributes)

foreach ($this->_attributes as $name => $value) {
if ($name == 'name' || $name == 'title') {
$this->_request->set('extension_title', $value);
$this->_request->set('mvc_extension_instance_name', $value);
break;

} else if ($name == 'position') {
@@ -106,12 +68,12 @@ public function render($attributes)
/** For Position, wrap after all Modules are rendered */
if ($position == '') {
} else {
$holdWrap = $this->_request->get('wrap');
$this->_request->set('wrap', 'none');
$holdWrap = $this->_request->get('mvc_wrap');
$this->_request->set('mvc_wrap', 'none');
}
$viewHelper = new MolajoViewHelper($this->_request->get('wrap'),
'wraps',
$this->_request->get('option'),
$this->_request->get('mvc_option'),
$this->_request->get('extension_type'),
' ',
$this->_request->get('template_name'));
@@ -120,7 +82,7 @@ public function render($attributes)

/** Instantiate Controller */
$this->_request->set('task', 'display');
$controllerName = $this->_request->get('controller') . 'ControllerModule';
$controllerName = $this->_request->get('mvc_controller') . 'ControllerModule';
$controller = new MolajoControllerDisplay ($this->_request);

/** Execute Task */
@@ -136,7 +98,7 @@ public function render($attributes)
$this->_request->set('wrap', $holdWrap);
$viewHelper = new MolajoViewHelper($this->_request->get('wrap'),
'wraps',
$this->_request->get('option'),
$this->_request->get('mvc_option'),
$this->_request->get('extension_type'),
' ',
$this->_request->get('template_name'));
@@ -217,7 +179,7 @@ private function _setRequest($module)

$viewHelper = new MolajoViewHelper($this->_request->get('view'),
$this->_request->get('view_type'),
$this->_request->get('option'),
$this->_request->get('mvc_option'),
$this->_request->get('extension_type'),
' ',
$this->_request->get('template_name')
@@ -237,12 +199,12 @@ protected function _import()
$fileHelper = new MolajoFileHelper();

/** Controller */
if (file_exists($this->_request->get('extension_path') . '/controller.php')) {
$fileHelper->requireClassFile($this->_request->get('extension_path') . '/controller.php', ucfirst($this->_request->get('extension_name')) . 'ControllerModule');
if (file_exists($this->_request->get('mvc_extension_path') . '/controller.php')) {
$fileHelper->requireClassFile($this->_request->get('mvc_extension_path') . '/controller.php', ucfirst($this->_request->get('extension_name')) . 'ControllerModule');
}
/** Model */
if (file_exists($this->_request->get('extension_path') . '/model.php')) {
$fileHelper->requireClassFile($this->_request->get('extension_path') . '/model.php', ucfirst($this->_request->get('extension_name')) . 'ModelModule');
if (file_exists($this->_request->get('mvc_extension_path') . '/model.php')) {
$fileHelper->requireClassFile($this->_request->get('mvc_extension_path') . '/model.php', ucfirst($this->_request->get('extension_name')) . 'ModelModule');
}
}

@@ -257,7 +219,7 @@ protected function _import()
protected function _loadLanguage()
{
MolajoController::getApplication()->getLanguage()->load(
$this->_request->get('extension_path'),
$this->_request->get('mvc_extension_path'),
MolajoController::getApplication()->getLanguage()->getDefault(), false, false);
}

@@ -272,7 +234,7 @@ protected function _loadLanguage()
protected function _loadMedia()
{
/** Module */
$this->_loadMediaPlus('/module' . $this->_request->get('option'),
$this->_loadMediaPlus('/module' . $this->_request->get('mvc_option'),
MolajoController::getApplication()->get('$media_priority_module', 400));
}

@@ -90,15 +90,15 @@ public function render($attributes)
$this->_loadMedia();

/** instantiate controller */
$controllerClass = ucfirst($this->_request->get('extension_title')) . 'Controller';
if (ucfirst($this->_request->get('controller')) == 'Display') {
$controllerClass = ucfirst($this->_request->get('mvc_extension_instance_name')) . 'Controller';
if (ucfirst($this->_request->get('mvc_controller')) == 'Display') {
} else {
$controllerClass .= $this->_request->get('controller');
$controllerClass .= $this->_request->get('mvc_controller');
}
$controller = new $controllerClass ($this->_request);

/** execute task: display, edit, or add */
$task = (string)$this->_request->get('task');
$task = (string)$this->_request->get('mvc_task');
return $controller->$task();
}

@@ -123,15 +123,27 @@ protected function _setParameters()
} else if ($name == 'view') {
$this->_request->set('view', $value);

} else if ($name == 'id' || $name == 'wrap_id') {
$this->_request->set('wrap_id', $value);
} else if ($name == 'view_css_id' || $name == 'view_id') {
$this->_request->set('view_css_id', $value);

} else if ($name == 'class' || $name == 'wrap_class') {
$this->_request->set('wrap_class', $value);
} else if ($name == 'view_css_class' || $name == 'view_class') {
$this->_request->set('view_css_class', $value);

} else if ($name == 'wrap') {
$this->_request->set('wrap', $value);

} else if ($name == 'wrap_css_id' || $name == 'wrap_id') {
$this->_request->set('wrap_css_id', $value);

} else if ($name == 'wrap_css_class' || $name == 'wrap_class') {
$this->_request->set('wrap_css_class', $value);
}
// $this->_request->set('other_parameters') = $other_parameters;
}

return;

//NOT USED
$this->_request = MolajoExtensionHelper::getOptions($this->_request);
if ($this->_request->get('results') === false) {
echo 'failed getOptions';
@@ -148,26 +160,30 @@ protected function _setParameters()
*/
protected function _setPaths()
{
/** View Path */
$this->_request->set('view_type', 'extensions');
$viewHelper = new MolajoViewHelper($this->_request->get('view'),

$this->_request->set('view_name',
MolajoExtensionHelper::getInstanceTitle($this->_request->get('view_id')));

$viewHelper = new MolajoViewHelper($this->_request->get('view_name'),
$this->_request->get('view_type'),
$this->_request->get('option'),
$this->_request->get('extension_title'),
$this->_request->get('extension_type'),
' ',
$this->_request->get('template_name')
);
$this->_request->get('template_name'));
$this->_request->set('view_path', $viewHelper->view_path);
$this->_request->set('view_path_url', $viewHelper->view_path_url);

/** Wrap Path */
$wrapHelper = new MolajoViewHelper($this->_request->get('wrap'),
$this->_request->set('wrap_name',
MolajoExtensionHelper::getInstanceTitle($this->_request->get('wrap_id')));

$wrapHelper = new MolajoViewHelper($this->_request->get('wrap_name'),
'wraps',
$this->_request->get('option'),
$this->_request->get('extension_title'),
$this->_request->get('extension_type'),
' ',
$this->_request->get('template_name')
);
$this->_request->get('template_name'));
$this->_request->set('wrap_path', $wrapHelper->view_path);
$this->_request->set('wrap_path_url', $wrapHelper->view_path_url);
}
@@ -195,7 +211,7 @@ protected function _import()
protected function _loadLanguage()
{
MolajoController::getApplication()->getLanguage()->load
($this->_request->get('extension_path'),
($this->_request->get('mvc_extension_path'),
MolajoController::getApplication()->getLanguage()->getDefault(), false, false);
}

@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<sequence>
<renderer>request:component</renderer>
<renderer>menu</renderer>
<renderer>component</renderer>
<renderer>module</renderer>
<renderer>message</renderer>
<renderer>head</renderer>
<renderer>defer</renderer>
</sequence>
</sequence>
BIN +0 Bytes (100%) molajo.sql.zip
Binary file not shown.