Mambo > Projects > Mambo CMS > SVN

Diff of /mambo/branches/4.6/index.php

-revision 243, Fri Feb 10 12:42:40 2006 UTC
+revision 270, Mon Feb 13 15:31:12 2006 UTC
 Line 68
          $this->Itemid = mosGetParam($_REQUEST, 'Itemid', 0);
          $this->getConfig();
          $this->fixLanguage();
-         $this->secure();
          @set_magic_quotes_runtime( 0 );
          if (@$this->mosConfig_error_reporting === 0) error_reporting(0);
          elseif (@$this->mosConfig_error_reporting > 0) error_reporting($this->mosConfig_error_reporting);
-Line 148
+Line 147
                          if (($scheme == 'http' AND $port == ':80') OR ($scheme == 'https' AND $port == ':443')) $port = '';
                  }
                  else $port = '';
-                 $this->mosConfig_live_site = $scheme.'://'.$servername.$port.$this->subdirectory;
+                 $afterscheme = '://'.$servername.$port.$this->subdirectory;
+                 $this->mosConfig_live_site = $this->mosConfig_secure_site = $scheme.$afterscheme;
+                 $this->mosConfig_unsecure_site = 'http'.$afterscheme;
  //              $this->mosConfig_live_site = 'http://'.$_SERVER['SERVER_NAME'].$this->subdirectory;
                  $this->mosConfig_absolute_path = $this->rootPath;
                  preg_match_all('/\$this\-\>([A-Za-z_][A-Za-z0-9_]*)/', $code, $matches);
-Line 191
+Line 192
                  if (file_exists($language_file)) require_once ($language_file);
                  ###################################
-         //set_error_handler('error_handler');
+         #set_error_handler('error_handler');
          $lang = $this->mosConfig_lang;
          $langfile = $this->rootPath.DIRECTORY_SEPARATOR.'language'.DIRECTORY_SEPARATOR.$lang.'.xml';
+         /*$this->language[$this->mosConfig_language] = array(
+         'locale' => 'pt, pt.utf-8',
+         'encoding' => 'utf-8',
+         'direction' => 'rtl',
+         'dateformat' => '%A, %d %B %Y',
+         'offset' => '+00:00'
+         );
+         */
          $p = xml_parser_create();
          xml_parser_set_option($p, XML_OPTION_CASE_FOLDING, 0);
          xml_parser_set_option($p, XML_OPTION_SKIP_WHITE, 1);
-Line 209
+Line 218
              }
          }
          if (!defined('_ISO')) DEFINE('_ISO','charset='.$this->language['encoding']);
          if (!defined('_DATE_FORMAT_LC')) DEFINE('_DATE_FORMAT_LC', $this->language['dateformat']); //Uses PHP's strftime Command Format
          if (!defined('_DATE_FORMAT_LC2')) DEFINE('_DATE_FORMAT_LC2', $this->language['dateformat']." %H:%M");
          //header('Content-Type: text/html; charset=utf-8');
-         $domain = $this->mosConfig_lang;
-         $textdomain = $this->rootPath.'/language';
          $gettext =& phpgettext();
          $gettext->debug = 0;
          $gettext->has_gettext = 0;
-         $gettext->setlocale($name);
+         $gettext->setlocale($this->mosConfig_lang, $this->mosConfig_locale);
-         setlocale(LC_ALL, $this->language['locale']);
+         /*dump($gettext->getlocale());
-         setlocale(LC_CTYPE, $this->language['encoding']);
+         $gettext->bindtextdomain('administrator', $lang_path);/*dump($gettext->getlocale());
-         $gettext->bindtextdomain($domain, $textdomain);
+         dump(setlocale(LC_CTYPE, ''));;
-         $gettext->bind_textdomain_codeset($domain, $this->language['encoding']);
-         $gettext->textdomain($domain);
-         /**/
-     }
-     function secure () {
+         dump(array($gettext, $this));*/
-         $this->mosConfig_unsecure_site = $this->mosConfig_live_site;
-         if ($_SERVER['SERVER_PORT'] == 443) {
-             if (!isset($this->mosConfig_secure_site)) $this->mosConfig_secure_site = str_replace('http://', 'https://', $this->mosConfig_live_site);
-             $this->mosConfig_live_site = $this->mosConfig_secure_site;
-         }
      }
      function handleGlobals () {
 Line 708
      }
      function createDirectory ($dir) {
+         if (file_exists($dir)) {
          if (is_dir($dir)) return true;
+                         else return false;
+                 }
                  list($upDirectory, $count) = $this->containingDirectory($dir);
-                 if ($count > 1 AND !is_dir($upDirectory)) if (!$this->createDirectory($upDirectory)) return false;
+                 if ($count > 1 AND !file_exists($upDirectory)) if (!$this->createDirectory($upDirectory)) return false;
+                 if (!is_dir($upDirectory)) return false;
                  $dirperms = mamboCore::get('mosConfig_dirperms');
                  if ($dirperms) {
                          $origmask = @umask(0);
                          $mode = octdec($dirperms);
                  }
-                 else $mode = 0777;
+                 else $mode = 0755;
          if (!@mkdir($dir, $mode )) $result = false;
          else {
                          $result = true;
-Line 1347
+Line 1351
          return $instance;
      }
      /**
+     * Register a class-type mambot, provided it has a perform method
+     * - can register for multiple events if desired
+     * @param object The mambot object
+     * @param mixed string or array of strings - the mambot events to be registered
+     * @param int the subscript for use in the main array of mambots
+     */
+     function _botRegister (&$botObject, &$selected, $i) {
+         $function = array(&$newbot, 'perform');
+         if (!is_callable($function)) return;
+         if (is_array($selected)) foreach ($selected as $select) $this->_botRegister($botObject, $select);
+         $this->_events[$selected][] = array ($function, $i);
+         $this->_registered[$i] = true;
+         }
+     /**
          * Loads all the bot files for a particular group
          * @param string The group name, relates to the sub-directory in the mambots directory
          */
-Line 1363
+Line 1382
                  require_once( $path );
                  if (!isset($this->_registered[$i])) {
                      $botclass = str_replace('.','_',$bot->element);
+                     if (class_exists($botclass)) {
                      $newbot = new $botclass();
-                     $function = array ($newbot, 'perform');
+                         if (is_callable(array(&$newbot, 'register'))) {
                      $selected = $newbot->register();
-                     if (is_array($selected)) foreach ($selected as $select) $this->_events[$select][] = array($function, $i);
+                                 $this->_botRegister($newbot, $selected, $i);
-                     else $this->_events[$selected][] = array ($function, $i);
+                             }
-                     $this->_registered[$i] = true;
+                         }
                  }
                  $total++;
              }
-Line 2316
+Line 2336
          return $result;
      }
      /**
+         * @param string The name of the control, or the default text area if a setup file is not found
+         * @return string HTML
+         */
+         function render( $name='params' ) {
+                 if (is_file($this->_path)) {
+                         $parser = new mosXMLParams ($this->_path, $this, $name);
+                         if (count($parser->html)) return implode("\n", $parser->html);
+                 }
+                 $raw = $this->_raw;
+                 return "<textarea name='$name' cols='40' rows='10' class='text_area'$raw</textarea>";
+         }
+     /**
          * special handling for textarea param
          */
      function textareaHandling( &$txt ) {
-Line 2361
+Line 2394
  $local_backup_path = $configuration->rootPath().'/administrator/backups';
  $media_path = $configuration->rootPath().'/media/';
  $image_path = $configuration->rootPath().'/images/stories';
+ $lang_path = $configuration->rootPath().'/language';
  $image_size = 100;
  $database =& mamboDatabase::getInstance();
  $database->debug(mamboCore::get('mosConfig_debug'));
+ //
+ $gettext =& phpgettext();
+ $gettext->bindtextdomain('common', $configuration->rootPath().'/language');
+ $gettext->textdomain('common');
+ //dump($gettext->textdomain(substr($option, 3)));
+ //$gettext->bindtextdomain('frontend',    $lang_path);
+ //$gettext->textdomain('frontend');
  if (!$adminside) {
      $sefcode = $configuration->rootPath().'/components/com_sef/sef.php';
      if (file_exists($sefcode)) require_once($sefcode);
-Line 2395
+Line 2438
      $acl = new gacl_api();
      // Handle special admin side options
      $option = strtolower(mosGetParam($_REQUEST,'option','com_admin'));
+     $domain = substr($option, 4);
+     $gettext->bindtextdomain('administrator', $lang_path);
+     $gettext->bindtextdomain($domain, $lang_path);
+     $admindomain = $gettext->textdomain();
+     $gettext->textdomain('administrator');
      // Login will, if it succeeds, start a new session and set $my
      if ($option == 'login') {
          require_once($configuration->rootPath().'/includes/authenticator.php');
-Line 2421
+Line 2470
      // We can now create the mainframe object
      $mainframe =& new mosMainFrame($database, $option, '..', true);
      // Provided $my is set, we have a valid admin side session and can include remaining code
      if ($my) {
          mamboCore::set('currentUser', $my);
          require_once( $configuration->rootPath().'/includes/mambo.php' );
-Line 2429
+Line 2479
          require_once( $configuration->rootPath().'/administrator/includes/mosAdminMenus.php');
          require_once($configuration->rootPath().'/administrator/includes/admin.php');
          require_once( $configuration->rootPath() . '/includes/cmtclasses.php' );
+             require_once( $configuration->rootPath() . '/components/com_content/content.class.php' );
          $_MAMBOTS =& mosMambotHandler::getInstance();
          // If no_html is set, we avoid starting the template, and go straight to the component
          if ($no_html) {
              if ($path = $mainframe->getPath( "admin" )) require $path;
-Line 2443
+Line 2496
              $configuration->doGzip();
          }
          else {
+             if (!$popup) {
              $pop = mosGetParam($_REQUEST, 'pop', '');
              if ($pop) require_once($configuration->rootPath()."/administrator/popups/$pop");
              else require_once($configuration->rootPath()."/administrator/popups/index3pop.php");
              $configuration->doGzip();
          }
      }
+     }
      // If $my was not set, the only possibility is to ask for an admin side login
      else {
          $configuration->initGzip();
-Line 2463
+Line 2518
      $configuration->handleGlobals();
      $Itemid = $configuration->get('Itemid');
+     // load frontend language file
+     $gettext->bindtextdomain(substr($option, 4), $configuration->rootPath().'/language');
+     $gettext->bindtextdomain('frontend', $configuration->rootPath().'/language');
+     $frontdomain = $gettext->textdomain();
+     $gettext->textdomain('frontend');
      $mainframe =& new mosMainFrame($database, $option, '.');
      if ($option == 'login') $configuration->handleLogin();
      elseif ($option == 'logout') $configuration->handleLogout();
-Line 2494
+Line 2556
      require_once( $configuration->rootPath().'/editor/editor.php' );
      require_once( $configuration->rootPath() . '/includes/gacl.class.php' );
      require_once( $configuration->rootPath() . '/includes/gacl_api.class.php' );
+     require_once( $configuration->rootPath() . '/components/com_content/content.class.php' );
      $acl = new gacl_api();
      /** Get the component handler */
      require_once( $configuration->rootPath() . '/includes/cmtclasses.php' );
      $c_handler =& mosComponentHandler::getInstance();
-Line 2505
+Line 2569
          $menuhandler =& mosMenuHandler::getInstance();
          $ret = $menuhandler->menuCheck($Itemid, $option, $task, $gid);
          $menuhandler->setPathway($Itemid);
-         if ($ret) require_once( $path );
+         if ($ret) {
+             $gettext->textdomain(substr($option, 4));   // get the component lang file
+             require_once( $path );
+             $gettext->textdomain($frontdomain);
+         }
          else mosNotAuth();
      }
      else {
-Line 2519
+Line 2587
      $configuration->initGzip();
      $configuration->standardHeaders();
-     if ($indextype == 1) {
+     if (mosGetParam($_GET, 'syndstyle', '') == 'yes') mosMainBody();
+     elseif ($indextype == 1) {
          // loads template file
          if ( !file_exists( 'templates/'. $cur_template .'/index.php' ) ) {
              echo '<font color=\"red\"><b>'.T_('Template File Not Found! Looking for template').'</b></font>'.$cur_template;

 Legend:



Removed from v.243
 


changed lines


 
Added in v.270
 Legend:



Removed from v.243
 


changed lines


 
Added in v.270
-Removed from v.243
+Added in v.270

	ViewVC Help
Powered by ViewVC 1.0.0

Web Hosting provided by Network Redux.

MyGforge Home

Mambo CMS

Diff of /mambo/branches/4.6/index.php