Mambo > Projects > Mambo CMS > SVN

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

-revision 418, Tue Mar 21 18:11:00 2006 UTC
+revision 419, Tue Mar 21 18:12:17 2006 UTC
 Line 136
          }
          fclose($f);
          eval($code);
-         $subdir = dirname($_SERVER['PHP_SELF']);
+                 if (isset($_SERVER['DOCUMENT_ROOT']) AND strlen($_SERVER['DOCUMENT_ROOT'])) $docroot = $_SERVER['DOCUMENT_ROOT'];
-         if ($adminside) $subdir = substr($subdir, 0, strrpos($subdir, '/'));
+                 else {
-         if (strlen($subdir) == 1) $subdir = '';
+                         // Find information about where execution started
-         $this->subdirectory = str_replace('\\', '/', $subdir);
+                         $origin = array_pop(debug_backtrace());
+                         // Find the PHP script at the start, with a fix for Windows slashes
+                         $absolutepath = str_replace('\\', '/', $origin['file']);
+                         $localpath = $_SERVER['PHP_SELF'];
+                         $docroot = substr($absolutepath,0,strpos($absolutepath,$localpath));
+                 }
+                 $mamboroot = str_replace('\\', '/', dirname(__FILE__));
+                 $this->subdirectory = substr($mamboroot, strlen($docroot));
          $scheme = isset($_SERVER['HTTP_SCHEME']) ? $_SERVER['HTTP_SCHEME'] : ((isset($_SERVER['HTTPS']) AND strtolower($_SERVER['HTTPS'] != 'off')) ? 'https' : 'http');
          if (isset($_SERVER['HTTP_HOST'])) {
              $withport = explode(':', $_SERVER['HTTP_HOST']);
-Line 1009
+Line 1016
          return $result;
      }
+     function &getMenuTypes () {
+                 $types = array();
+                 foreach ($this->_menus as $menu) {
+                         if (!in_array($menu->menutype, $types)) $types[] = $menu->menutype;
+                 }
+                 return $types;
+         }
      function getIDByTypeLink ($type, $link) {
          foreach ($this->_menus as $menu) {
              if ($menu->published == 1 AND ($type == '*' OR $menu->type == $type) AND $menu->link == $link) return $menu->id;
-Line 1526
+Line 1541
      var $sendEmail=null;
      /** @var int The group id number */
      var $gid=null;
+     /** @var int Group number from ACL */
+     var $grp=null;
      /** @var datetime */
      var $registerDate=null;
      /** @var datetime */
-Line 1544
+Line 1561
      }
      /**
+          * Return true if this user is an administrator, false otherwise
+          */
+     function isAdmin() {
+         return ( strtolower( $this->usertype ) == 'superadministrator' || strtolower( $this->usertype ) == 'super administrator' || $this->grp == 16 ) ? true : false;
+     }
+     /**
           * Fill a user object with information from the current session
           */
      function getSessionData() {
-Line 1553
+Line 1577
          $this->usertype = $session->usertype;
          $this->gid = intval( $session->gid );
      }
+     function getSession () {
+                 $this->id = mosGetParam( $_SESSION, 'session_user_id', 0 );
+                 $this->username = mosGetParam( $_SESSION, 'session_username', '' );
+                 $this->usertype = mosGetParam( $_SESSION, 'session_usertype', '' );
+                 $this->gid = mosGetParam( $_SESSION, 'session_gid', 0 );
+                 $this->grp = mosGetParam( $_SESSION, 'session_grp', 0);
+     }
      /**
           * Validation and filtering
           * @return boolean True is satisfactory
-Line 2142
+Line 2174
  class mosSession extends mosDBTable {
      /** @var int Primary key */
      var $session_id=null;
-     /** @var string */
+     /** @var time */
      var $time=null;
-     /** @var string */
+     /** @var int User ID */
      var $userid=0;
      /** @var string */
      var $usertype=null;
      /** @var string */
      var $username='';
-     /** @var time */
+     /** @var int User group ID */
      var $gid=0;
      /** @var int */
      var $guest=1;
-Line 2166
+Line 2198
          $this->time = time();
      }
+     function validate ($user) {
+                 // check against db record of session
+                 $session_id = mosGetParam( $_SESSION, 'session_id', '' );
+                 $logintime = mosGetParam( $_SESSION, 'session_logintime', '' );
+                 if ($session_id == md5( $user->id.$user->username.$user->usertype.$logintime )) {
+                         $current_time = time();
+                         $database = mamboDatabase::getInstance();
+                         $database->setQuery ("UPDATE #__session"
+                         . "\nSET time='$current_time'"
+                         . "\nWHERE session_id='$session_id'"
+                         . " AND username = '" . $database->getEscaped( $user->username ) . "'"
+                         . " AND userid = " . intval( $user->id )
+                         );
+                         if (!$result = $database->query()) echo $database->stderr();
+                         elseif ($database->getAffectedRows() == 1) return true;
+                 }
+                 return false;
+         }
      function &getCurrent () {
          static $currentSession;
          if (!is_object($currentSession)) {
-Line 2403
+Line 2454
      }
  }
  require($configuration->rootPath().'/includes/version.php');
  $_VERSION =& new version();
-Line 2491
+Line 2543
          $_SESSION['simple_editing'] = mosGetParam($_POST, 'simple_editing', $admin_mode);
          // Include admin side functions, check that we have a valid admin side session
          require_once($configuration->rootPath().'/administrator/includes/admin.php');
-         $my = checkAdminSession($database);
+                 // restore some session variables
+                 $my = new mosUser();
+                 $my->getSession();
+                 if (mosSession::validate($my)) mosSession::purge();
+                 else $my = null;
      }
      // We can now create the mainframe object
      $mainframe =& new mosMainFrame($database, $option, '..', true);
-Line 2524
+Line 2580
          else {
              if (!isset($popup)) {
                  $pop = mosGetParam($_REQUEST, 'pop', '');
-                 if ($pop) require_once($configuration->rootPath()."/administrator/popups/$pop");
+                 if ($pop) require($configuration->rootPath()."/administrator/popups/$pop");
-                 else require_once($configuration->rootPath()."/administrator/popups/index3pop.php");
+                 else require($configuration->rootPath()."/administrator/popups/index3pop.php");
                  $configuration->doGzip();
              }
          }
-Line 2556
+Line 2612
      elseif ($option == 'logout') $configuration->handleLogout();
      $session =& mosSession::getCurrent();
-     $my =& new mosUser($database);
+     $my =& new mosUser();
      $my->getSessionData();
      mamboCore::set('currentUser',$my);
      $configuration->offlineCheck($my, $database);
-Line 2652
+Line 2708
      $configuration->doGzip();
  }
  // displays queries performed for page
- if ($configuration->get('mosConfig_debug')) $database->displayLogged();
+ if ($configuration->get('mosConfig_debug') AND $adminside != 3) $database->displayLogged();
  ?>

 Legend:



Removed from v.418
 


changed lines


 
Added in v.419
 Legend:



Removed from v.418
 


changed lines


 
Added in v.419
-Removed from v.418
+Added in v.419

	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