Mambo > Projects > Mambo CMS > SVN

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

-revision 251, Sun Feb 12 17:25:32 2006 UTC
+revision 252, Sun Feb 12 19:37:34 2006 UTC
 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 210
+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);
-         /**/
+         dump(array($gettext, $this));*/
      }
      function handleGlobals () {
-Line 2382
+Line 2390
  $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 2416
+Line 2434
      $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 2442
+Line 2466
      // 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 2451
+Line 2476
          require_once($configuration->rootPath().'/administrator/includes/admin.php');
          require_once( $configuration->rootPath() . '/includes/cmtclasses.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 2464
+Line 2491
              $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 2484
+Line 2513
      $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 2517
+Line 2553
      require_once( $configuration->rootPath() . '/includes/gacl_api.class.php' );
      $acl = new gacl_api();
      /** Get the component handler */
      require_once( $configuration->rootPath() . '/includes/cmtclasses.php' );
      $c_handler =& mosComponentHandler::getInstance();
-Line 2526
+Line 2563
          $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 {

 Legend:



Removed from v.251
 


changed lines


 
Added in v.252
 Legend:



Removed from v.251
 


changed lines


 
Added in v.252
-Removed from v.251
+Added in v.252

	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