Mambo > Projects > Mambo CMS > SVN

Diff of /mambo/branches/4.6/includes/core.classes.php

-revision 611, Sun Jul 23 17:59:26 2006 UTC
+revision 739, Thu Sep 28 21:21:24 2006 UTC
 Line 316
          $f = @fopen($this->rootPath.'/configuration.php','rb');
          if ($f) {
              while ($f AND !feof($f)) {
-                 $line = fgets($f, 256);
+                 $line = fgets($f);
                  $altered = str_replace('$', '$this->', $line);
                  if ($altered != $line) $code .= $altered;
              }
 Line 357
          }
          else $port = '';
          $afterscheme = '://'.$servername.$port.$this->subdirectory;
-         $this->mosConfig_live_site = $this->mosConfig_secure_site = $scheme.$afterscheme;
+         //$this->mosConfig_live_site = $this->mosConfig_secure_site = $scheme.$afterscheme;
          $this->mosConfig_unsecure_site = 'http'.$afterscheme;
          $this->mosConfig_absolute_path = $this->rootPath;
          preg_match_all('/\$this\-\>([A-Za-z_][A-Za-z0-9_]*)/', $code, $matches);
 Line 456
              foreach ( $superglobals as $superglobal ) {
                  foreach ( $superglobal as $key => $value) {
                      unset( $GLOBALS[$key]);
+                     unset( $GLOBALS[$key]);
                  }
              }
          }
-Line 563
+Line 564
          require_once($this->rootPath().'/includes/authenticator.php');
          $authenticator =& mamboAuthenticator::getInstance();
          $loggedin = $authenticator->loginUser();
-         if ($loggedin) $this->logMessage(_LOGIN_SUCCESS);
+         if ($loggedin) $this->logMessage('_LOGIN_SUCCESS');
          else mamboCore::redirect('index.php');
      }
-Line 575
+Line 576
          require_once($this->rootPath().'/includes/authenticator.php');
          $authenticator =& mamboAuthenticator::getInstance();
          $authenticator->logoutUser();
-         $this->logMessage(_LOGOUT_SUCCESS);
+         $this->logMessage('_LOGOUT_SUCCESS');
      }
      /**
-Line 803
+Line 804
          * Make a pathway string for display
          */
      function makePathway () {
-         $last = count($this->_names) - 1;
-         if ($last == 0) return '';
          $mainframe =& mosMainFrame::getInstance();
+         $customs = $mainframe->getCustomPathWay();
+         $last = count($this->_names) - 1;
+         if ($last == 0 AND count($customs == 0)) return '';
          $result = "<span class='pathway'>";
          $config =& mamboCore::getMamboCore();
          $rootpath = $config->rootPath();
-Line 817
+Line 819
              else $img = '&gt;';
          }
          foreach ($this->_names as $i=>$name) {
-             if ($i === $last) $result .= "$name</span>";
+             if ($i === $last AND count($customs) == 0) $result .= "$name</span>";
              else {
                  $sefurl = sefRelToAbs($this->_urls[$i]);
                  $result .= "<a href='$sefurl' class='pathway'>$name</a>";
                  $result .= "&nbsp;$img&nbsp;";
              }
          }
-         $customs = $mainframe->getCustomPathWay();
          foreach ($customs as $custom) $result .= $custom;
-         $result .= '</span>';
+         if (count($customs)) $result .= '</span>';
          return $result;
      }
-Line 2030
+Line 2031
           * @return boolean True is satisfactory
           */
      function check() {
+         Global $mosConfig_absolute_path;
+         include $mosConfig_absolute_path . ('/language/english.php');
          $this->_error = '';
          if ($this->name == '') $this->_error = _REGWARN_NAME;
          elseif ($this->username == '') $this->_error = _REGWARN_UNAME;
-Line 2333
+Line 2336
          * @param string The default value for the variable if not found
          */
      function getUserStateFromRequest( $var_name, $req_name, $var_default=null ) {
+                 if (is_array($this->_userstate)) {
          if (isset($_REQUEST[$req_name])) $this->setUserState($var_name, $_REQUEST[$req_name]);
-         elseif (isset($var_default) AND !isset($this->userstate[$var_name])) $this->setUserState($var_name, $var_default);
+                         else if (isset($var_default) AND !isset($this->_userstate[$var_name])) $this->setUserState($var_name, $var_default);
-         return $this->getUserState($var_name);
+                         return $this->_userstate[$var_name];
+                 } else {
+                         return null;
+                 }
      }
      /**
          * Initialises the user session
-Line 2568
+Line 2575
                  <?php
      }
+     /**
+         * retained for backward compatability
+         */
+         function getBlogSectionCount() {
+                 require_once(mamboCore::get('mosConfig_absolute_path').'/components/com_content/content.class.php');
+                 $handler =& new contentHandler();
+                 return $handler->getBlogSectionCount();
+         }
+         function getBlogCategoryCount() {
+                 require_once(mamboCore::get('mosConfig_absolute_path').'/components/com_content/content.class.php');
+                 $handler =& new contentHandler();
+                 return $handler->getBlogCategoryCount();
+         }
+         function getGlobalBlogSectionCount() {
+                 require_once(mamboCore::get('mosConfig_absolute_path').'/components/com_content/content.class.php');
+                 $handler =& new contentHandler();
+                 return $handler->getGlobalBlogSectionCount();
+         }
+         function getStaticContentCount() {
+                 require_once(mamboCore::get('mosConfig_absolute_path').'/components/com_content/content.class.php');
+                 $handler =& new contentHandler();
+                 return $handler->getStaticContentCount();
+         }
+         function getContentItemLinkCount() {
+                 require_once(mamboCore::get('mosConfig_absolute_path').'/components/com_content/content.class.php');
+                 $handler =& new contentHandler();
+                 return $handler->getContentItemLinkCount();
+         }
+         /**
+         * retained for backward compatability
+         */
  }
  /**

 Legend:



Removed from v.611
 


changed lines


 
Added in v.739
 Legend:



Removed from v.611
 


changed lines


 
Added in v.739
-Removed from v.611
+Added in v.739

	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/core.classes.php