Mambo > Projects > Mambo CMS > SVN

Diff of /mambo/branches/4.6/includes/cmtclasses.php

-revision 457, Tue Apr 11 02:04:51 2006 UTC
+revision 458, Tue Apr 11 14:36:50 2006 UTC
 Line 98
  class mosComponentManager {
          var $plugin_name = '';
          var $magic_quotes_value = 0;
+         var $plugin_version = '';
+         var $option = '';
+         function mosComponentManager ($component_name, $version) {
+                 $this->text_name = $component_name;
+                 $this->plugin_name = strtolower(str_replace(' ', '', $component_name));
+                 $this->plugin_version = $version;
+                 $this->option = mamboCore::get('option');
+                 $this->noMagicQuotes();
+                 $cname = 'com_'.$this->plugin_name;
+                 $mosConfig_absolute_path = mamboCore::get('mosConfig_absolute_path');
+                 if(file_exists($mosConfig_absolute_path."/components/$cname/language/".mamboCore::get('mosConfig_lang').'.php')) require_once($mosConfig_absolute_path."/components/$cname/language/".mamboCore::get('mosConfig_lang').'.php');
+                 else if (file_exists($mosConfig_absolute_path."/components/$cname/language/english.php")) require_once($mosConfig_absolute_path."/components/$cname/language/english.php");
+         }
          function noMagicQuotes () {
                  // Is magic quotes on?
-Line 135
+Line 150
  * @package Mambo
  */
  class mosComponentUserManager extends mosComponentManager {
-         var $option = '';
-         function mosComponentUserManager ($component, $control_name, $alternatives, $default, $title) {
+         function mosComponentUserManager ($component_name, $control_name, $alternatives, $default, $title, $version) {
-                 $this->plugin_name = strtolower(str_replace(' ', '', $component));
+                 mosComponentManager::mosComponentManager($component_name, $version);
-                 $this->option = mamboCore::get('option');
-                 $this->noMagicQuotes();
                  $mainframe =& mosMainFrame::getInstance();
                  $mainframe->SetPageTitle($title);
                  $func = mosGetParam ($_REQUEST, $control_name, $default);
-Line 176
+Line 188
          var $order = 0;
          var $currid = 0;
-         function mosComponentAdminManager ($plugin_name) {
+         function mosComponentAdminManager ($component_name, $version) {
-                 $this->plugin_name = strtolower(str_replace(' ', '', $plugin_name));
+                 mosComponentManager::mosComponentManager($component_name, $version);
-                 $this->noMagicQuotes();
+                 $this->act = mosGetParam ($_REQUEST, 'act', $this->plugin_name);
-                 if ($this->act = mosGetParam ($_REQUEST, 'act', $this->plugin_name));
+                 $this->task = mosGetParam($_REQUEST, 'task', 'list');
-                 if ($this->task = mosGetParam($_REQUEST, 'task', 'list'));
-                 else $this->task = 'list';
                  $mainframe = mosMainFrame::getInstance();
                  $default_limit  = $mainframe->getUserStateFromRequest( "viewlistlimit", 'limit', 20 );
                  $this->limit = intval( mosGetParam( $_REQUEST, 'limit', $default_limit ) );
-Line 231
+Line 241
          var $admin = '';
          var $user = '';
          var $pageNav = '';
+         var $rootPath = '';
+         var $language = '';
          function mosComponentAdminControllers ($admin) {
                  $this->admin = $admin;
                  $this->user = mamboCore::get('currentUser');
+                 $this->rootPath = mamboCore::get('mosConfig_absolute_path');
+                 $this->language = mamboCore::get('mosConfig_lang');
          }
          function makePageNav (&$admin, $total) {
-Line 304
+Line 318
  class mosModuleHandler {
          var $_db = null;
          var $_modules = null;
+         var $_unpublished = null;
+         var $_isAdmin = null;
          function mosModuleHandler () {
                  $this->_db =& mamboDatabase::getInstance();
-Line 320
+Line 336
          * @return array
          */
          function initModules($isAdmin=false) {
-                 if (!isset($this->_modules)) {
+                 if (!isset($this->_modules) OR $isAdmin != $this->_isAdmin) {
+                         $this->_isAdmin = $isAdmin;
                          if ($isAdmin) {
-                                 $query = "SELECT id, title, module, position, content, showtitle, params"
+                                 $query = "SELECT id, title, module, position, content, showtitle, params, published"
                                  . "\n FROM #__modules AS m"
                                  . "\n WHERE m.published = '1'"
                                  . "\n AND (m.client_id = 1)"
-Line 331
+Line 348
                          else {
                                  $my = mamboCore::get('currentUser');
                                  $Itemid = mamboCore::get('Itemid');
-                                 $query = "SELECT id, title, module, position, content, showtitle, params"
+                                 $query = "SELECT id, title, module, position, content, showtitle, params, published"
                                  ."\nFROM #__modules AS m, #__modules_menu AS mm"
-                                 . "\nWHERE m.published='1' AND m.access <= '$my->gid' AND m.client_id='0'"
+                                 . "\nWHERE m.access <= '$my->gid' AND m.client_id='0'"
                                  . "\nAND mm.moduleid=m.id"
                                  . "\nAND (mm.menuid = '$Itemid' OR mm.menuid = '0')"
                                  . "\nORDER BY ordering";
-Line 341
+Line 358
                          $this->_db->setQuery( $query );
                          $modules = $this->_db->loadObjectList();
                          foreach ($modules as $module) {
-                                 $this->_modules[$module->position][] = $module;
+                                 if ($module->published == 1) $this->_modules[$module->position][] = $module;
+                                 else $this->_unpublished[] = $module;
                          }
                  }
          }
-Line 356
+Line 374
          /**
          * @param string Name of module required
          */
-         function &getByName( $name, $isAdmin=false ) {
+         function &getByName( $name, $isAdmin=false, $unpublished=false ) {
                  $this->initModules($isAdmin);
                  $modules = array();
                  foreach ($this->_modules as $position) {
                          foreach ($position as $module) if ($module->module == $name) $modules[] = $module;
                  }
+                 if ($unpublished AND $this->_unpublished) foreach ($this->_unpublished as $module) if ($module->module == $name) $modules[] = $module;
                  return $modules;
          }

 Legend:



Removed from v.457
 


changed lines


 
Added in v.458
 Legend:



Removed from v.457
 


changed lines


 
Added in v.458
-Removed from v.457
+Added in v.458

	ViewVC Help
Powered by ViewVC 1.0.0

Web Hosting provided by Network Redux.

MyGforge Home

Mambo CMS

Diff of /mambo/branches/4.6/includes/cmtclasses.php