? patch
? includes/core.inc
Index: update.php
===================================================================
RCS file: /cvs/drupal/drupal/update.php,v
retrieving revision 1.144
diff -u -i -r1.144 update.php
--- update.php	13 Jan 2005 19:24:27 -0000	1.144
+++ update.php	14 Jan 2005 19:42:13 -0000
@@ -204,18 +204,27 @@
   print update_page_footer();
 }
 
-if (isset($_GET["op"])) {
-  include_once "includes/bootstrap.inc";
+if (php_sapi_name() == 'cli') {
+  update_page();
+}
+else if (isset($_GET["op"])) {
+  include_once "includes/core.inc";
   include_once "includes/common.inc";
 
   // Access check:
-  if (($access_check == 0) || ($user->uid == 1)) {
+  if ($access_check == 0) {
     update_page();
   }
   else {
-    print update_page_header("Access denied");
-    print "Access denied.  You are not authorized to access to this page.  Please log in as the user with user ID #1. If you cannot log-in, you will have to edit <code>update.php</code> to by-pass this access check; in that case, open <code>update.php</code> in a text editor and follow the instructions at the top.";
-    print update_page_footer();
+    include_once "includes/bootstrap.inc";
+    if ($user->uid == 1) {
+      update_page();
+    }
+    else {
+      print update_page_header("Access denied");
+      print "Access denied.  You are not authorized to access to this page.  Please log in as the user with user ID #1. If you cannot log-in, you will have to edit <code>update.php</code> to by-pass this access check; in that case, open <code>update.php</code> in a text editor and follow the instructions at the top.";
+      print update_page_footer();
+    }
   }
 }
 else {
Index: includes/bootstrap.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v
retrieving revision 1.38
diff -u -i -r1.38 bootstrap.inc
--- includes/bootstrap.inc	9 Jan 2005 09:22:38 -0000	1.38
+++ includes/bootstrap.inc	14 Jan 2005 19:42:13 -0000
@@ -6,302 +6,6 @@
  * Functions that need to be loaded on every Drupal request.
  */
 
-define('CACHE_PERMANENT', 0);
-define('CACHE_TEMPORARY', -1);
-
-define('WATCHDOG_NOTICE', 0);
-define('WATCHDOG_WARNING', 1);
-define('WATCHDOG_ERROR', 2);
-
-
-/**
- * Locate the appropriate configuration file.
- *
- * Try finding a matching configuration directory by stripping the
- * website's hostname from left to right and pathname from right to
- * left.  The first configuration file found will be used, the
- * remaining will ignored.  If no configuration file is found,
- * return a default value '$confdir/default'.
- *
- * Example for a ficticious site installed at
- * http://www.drupal.org/mysite/test/ the 'settings.php' is
- * searched in the following directories:
- *
- *  1. $confdir/www.drupal.org.mysite.test
- *  2. $confdir/drupal.org.mysite.test
- *  3. $confdir/org.mysite.test
- *
- *  4. $confdir/www.drupal.org.mysite
- *  5. $confdir/drupal.org.mysite
- *  6. $confdir/org.mysite
- *
- *  7. $confdir/www.drupal.org
- *  8. $confdir/drupal.org
- *  9. $confdir/org
- *
- * 10. $confdir/default
- */
-function conf_init() {
-  static $conf = '';
-
-  if ($conf) {
-    return $conf;
-  }
-
-  $confdir = 'sites';
-  $uri = explode('/', $_SERVER['PHP_SELF']);
-  $server = explode('.', $_SERVER['HTTP_HOST']);
-  for ($i = count($uri) - 1; $i > 0; $i--) {
-    for ($j = count($server); $j > 0; $j--) {
-      $dir = implode('.', array_slice($server, -$j)) . implode('.', array_slice($uri, 0, $i));
-      if (file_exists("$confdir/$dir/settings.php")) {
-        $conf = "$confdir/$dir";
-        return $conf;
-      }
-    }
-  }
-  $conf = "$confdir/default";
-  return $conf;
-}
-
-/**
- * Returns and optionally sets the filename for a system item (module,
- * theme, etc.).  The filename, whether provided, cached, or retrieved
- * from the database, is only returned if the file exists.
- *
- * @param $type
- *   The type of the item (i.e. theme, theme_engine, module).
- * @param $name
- *   The name of the item for which the filename is requested.
- * @param $filename
- *   The filename of the item if it is to be set explicitly rather
- *   than by consulting the database.
- *
- * @return
- *   The filename of the requested item.
- */
-function drupal_get_filename($type, $name, $filename = NULL) {
-  static $files = array();
-
-  if (!$files[$type]) {
-    $files[$type] = array();
-  }
-
-  if ($filename && file_exists($filename)) {
-    $files[$type][$name] = $filename;
-  }
-  elseif ($files[$type][$name]) {
-    // nothing
-  }
-  elseif (($file = db_result(db_query("SELECT filename FROM {system} WHERE name = '%s' AND type = '%s'", $name, $type))) && file_exists($file)) {
-    $files[$type][$name] = $file;
-  }
-  else {
-    $config = conf_init();
-    $dir = (($type == 'theme_engine') ? 'themes/engines' : "${type}s");
-    $file = "$name.$type";
-
-    foreach (array("$config/$dir/$file", "$config/$dir/$name/$file", "$dir/$file", "$dir/$name/$file") as $file) {
-      if (file_exists($file)) {
-        $files[$type][$name] = $file;
-        break;
-      }
-    }
-  }
-
-  return $files[$type][$name];
-}
-
-/**
- * Load the persistent variable table.
- *
- * The variable table is composed of values that have been saved in the table
- * with variable_set() as well as those explicitly specified in the configuration
- * file.
- */
-function variable_init($conf = array()) {
-  // NOTE: caching the variables improves performance with 20% when serving cached pages.
-  if ($cached = cache_get('variables')) {
-    $variables = unserialize($cached->data);
-  }
-  else {
-    $result = db_query('SELECT * FROM {variable}');
-    while ($variable = db_fetch_object($result)) {
-      $variables[$variable->name] = unserialize($variable->value);
-    }
-    cache_set('variables', serialize($variables));
-  }
-
-  foreach ($conf as $name => $value) {
-    $variables[$name] = $value;
-  }
-
-  return $variables;
-}
-
-/**
- * Return a persistent variable.
- *
- * @param $name
- *   The name of the variable to return.
- * @param $default
- *   The default value to use if this variable has never been set.
- * @return
- *   The value of the variable.
- */
-function variable_get($name, $default) {
-  global $conf;
-
-  return isset($conf[$name]) ? $conf[$name] : $default;
-}
-
-/**
- * Set a persistent variable.
- *
- * @param $name
- *   The name of the variable to set.
- * @param $value
- *   The value to set. This can be any PHP data type; these functions take care
- *   of serialization as necessary.
- */
-function variable_set($name, $value) {
-  global $conf;
-
-  db_query("DELETE FROM {variable} WHERE name = '%s'", $name);
-  db_query("INSERT INTO {variable} (name, value) VALUES ('%s', '%s')", $name, serialize($value));
-  cache_clear_all('variables');
-
-  $conf[$name] = $value;
-}
-
-/**
- * Unset a persistent variable.
- *
- * @param $name
- *   The name of the variable to undefine.
- */
-function variable_del($name) {
-  global $conf;
-
-  db_query("DELETE FROM {variable} WHERE name = '%s'", $name);
-  cache_clear_all('variables');
-
-  unset($conf[$name]);
-}
-
-/**
- * Return data from the persistent cache.
- *
- * @param $key
- *   The cache ID of the data to retrieve.
- */
-function cache_get($key) {
-  $cache = db_fetch_object(db_query("SELECT data, created, headers FROM {cache} WHERE cid = '%s'", $key));
-  if (isset($cache->data)) {
-    $cache->data = db_decode_blob($cache->data);
-    return $cache;
-  }
-  return 0;
-}
-
-/**
- * Store data in the persistent cache.
- *
- * @param $cid
- *   The cache ID of the data to store.
- * @param $data
- *   The data to store in the cache. Complex data types must be serialized first.
- * @param $expire
- *   One of the following values:
- *   - CACHE_PERMANENT: Indicates that the item should never be removed unless
- *     explicitly told to using cache_clear_all() with a cache ID.
- *   - CACHE_TEMPORARY: Indicates that the item should be removed at the next
- *     general cache wipe.
- *   - A Unix timestamp: Indicates that the item should be kept at least until
- *     the given time, after which it behaves like CACHE_TEMPORARY.
- * @param $headers
- *   A string containing HTTP header information for cached pages.
- */
-function cache_set($cid, $data, $expire = CACHE_PERMANENT, $headers = NULL) {
-  $data = db_encode_blob($data);
-
-  db_query("UPDATE {cache} SET data = '%s', created = %d, expire = %d, headers = '%s' WHERE cid = '%s'", $data, time(), $expire, $headers, $cid);
-  if (!db_affected_rows()) {
-    @db_query("INSERT INTO {cache} (cid, data, created, expire, headers) VALUES ('%s', '%s', %d, %d, '%s')", $cid, $data, time(), $expire, $headers);
-  }
-}
-
-/**
- * Expire data from the cache.
- *
- * @param $cid
- *   If set, the cache ID to delete. Otherwise, all cache entries that can expire
- *   are deleted.
- *
- * @param $wildcard
- *   If set to true, the $cid is treated as a substring to match rather than a
- *   complete ID.
- */
-function cache_clear_all($cid = NULL, $wildcard = false) {
-  if (empty($cid)) {
-    db_query("DELETE FROM {cache} WHERE expire != %d AND expire < %d", CACHE_PERMANENT, time());
-  }
-  else {
-    if ($wildcard) {
-      db_query("DELETE FROM {cache} WHERE cid LIKE '%%%s%%'", $cid);
-    }
-    else {
-      db_query("DELETE FROM {cache} WHERE cid = '%s'", $cid);
-    }
-  }
-}
-
-/**
- * Store the current page in the cache.
- */
-function page_set_cache() {
-  global $user, $base_url;
-
-  if (!$user->uid && $_SERVER['REQUEST_METHOD'] == 'GET') {
-    // This will fail in some cases, see page_get_cache() for the explanation.
-    if ($data = ob_get_contents()) {
-      if (function_exists('gzencode')) {
-        if (version_compare(phpversion(), '4.2', '>=')) {
-          $data = gzencode($data, 9, FORCE_GZIP);
-        }
-        else {
-          $data = gzencode($data, FORCE_GZIP);
-        }
-      }
-      cache_set($base_url . request_uri(), $data, CACHE_TEMPORARY, drupal_get_headers());
-    }
-  }
-}
-
-/**
- * Retrieve the current page from the cache.
- *
- * Note, we do not serve cached pages when status messages are waiting (from
- * a redirected form submission which was completed).
- * Because the output handler is not activated, the resulting page will not
- * get cached either.
- */
-function page_get_cache() {
-  global $user, $base_url;
-
-  $cache = NULL;
-
-  if (!$user->uid && $_SERVER['REQUEST_METHOD'] == 'GET' && count(drupal_set_message()) == 0) {
-    $cache = cache_get($base_url . request_uri());
-
-    if (empty($cache)) {
-      ob_start();
-    }
-  }
-
-  return $cache;
-}
-
 /**
  * Call all init or exit hooks without including all modules.
  *
@@ -316,162 +20,6 @@
 }
 
 /**
- * Includes a file with the provided type and name.  This prevents
- * including a theme, engine, module, etc., more than once.
- *
- * @param $type
- *   The type of item to load (i.e. theme, theme_engine, module).
- * @param $name
- *   The name of the item to load.
- *
- * @return
- *   TRUE if the item is loaded or has already been loaded.
- */
-function drupal_load($type, $name) {
-  // print $name. '<br />';
-  static $files = array();
-
-  if ($files[$type][$name]) {
-    return TRUE;
-  }
-
-  $filename = drupal_get_filename($type, $name);
-
-  if ($filename) {
-    include_once($filename);
-    $files[$type][$name] = TRUE;
-
-    return TRUE;
-  }
-
-  return FALSE;
-}
-
-/**
- * Return an array mapping path aliases to their internal Drupal paths.
- */
-function drupal_get_path_map($action = '') {
-  static $map = NULL;
-
-  if ($action == 'rebuild') {
-    $map = NULL;
-  }
-
-  if (is_null($map)) {
-    $map = array();  // Make $map non-null in case no aliases are defined.
-    $result = db_query('SELECT * FROM {url_alias}');
-    while ($data = db_fetch_object($result)) {
-      $map[$data->dst] = $data->src;
-    }
-  }
-
-  return $map;
-}
-
-/**
- * Given an internal Drupal path, return the alias set by the administrator.
- */
-function drupal_get_path_alias($path) {
-  if (($map = drupal_get_path_map()) && ($newpath = array_search($path, $map))) {
-    return $newpath;
-  }
-  elseif (function_exists('conf_url_rewrite')) {
-    return conf_url_rewrite($path, 'outgoing');
-  }
-  else {
-    // No alias found. Return the normal path.
-    return $path;
-  }
-}
-
-/**
- * Get the title of the current page, for display on the page and in the title bar.
- */
-function drupal_get_title() {
-  $title = drupal_set_title();
-
-  if (!isset($title)) {
-    // during a bootstrap, menu.inc is not included and thus we cannot provide a title
-    if (function_exists('menu_get_active_title')) {
-      $title = menu_get_active_title();
-    }
-  }
-
-  return $title;
-}
-
-/**
- * Set the title of the current page, for display on the page and in the title bar.
- */
-function drupal_set_title($title = NULL) {
-  static $stored_title;
-
-  if (isset($title)) {
-    $stored_title = $title;
-  }
-  return $stored_title;
-}
-
-/**
- * Set HTTP headers in preparation for a page response.
- */
-function drupal_page_header() {
-  if (variable_get('dev_timer', 0)) {
-    timer_start();
-  }
-
-  if (variable_get('cache', 0)) {
-    if ($cache = page_get_cache()) {
-      bootstrap_invoke_all('init');
-      // Set default values:
-      $date = gmdate('D, d M Y H:i:s', $cache->created) .' GMT';
-      $etag = '"'. md5($date) .'"';
-
-      // Check http headers:
-      $modified_since = isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) ? $_SERVER['HTTP_IF_MODIFIED_SINCE'] == $date : NULL;
-      if (!empty($_SERVER['HTTP_IF_MODIFIED_SINCE']) && ($timestamp = strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE'])) != -1) {
-        $modified_since = $cache->created <= $timestamp;
-      }
-      else {
-        $modified_since = NULL;
-      }
-      $none_match = !empty($_SERVER['HTTP_IF_NONE_MATCH']) ? $_SERVER['HTTP_IF_NONE_MATCH'] == $etag : NULL;
-
-      // The type checking here is very important, be careful when changing entries.
-      if (($modified_since !== NULL || $none_match !== NULL) && $modified_since !== false && $none_match !== false) {
-        header('HTTP/1.0 304 Not Modified');
-        exit();
-      }
-
-      // Send appropriate response:
-      header("Last-Modified: $date");
-      header("ETag: $etag");
-
-      // Determine if the browser accepts gzipped data.
-      if (@strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') === false && function_exists('gzencode')) {
-        // Strip the gzip header and run uncompress.
-        $cache->data = gzinflate(substr(substr($cache->data, 10), 0, -8));
-      }
-      elseif (function_exists('gzencode')) {
-        header('Content-Encoding: gzip');
-      }
-
-      // Send the original request's headers.  We send them one after
-      // another so PHP's header() function can deal with duplicate
-      // headers.
-      $headers = explode("\n", $cache->headers);
-      foreach ($headers as $header) {
-        header($header);
-      }
-
-      print $cache->data;
-      bootstrap_invoke_all('exit');
-      exit();
-    }
-  }
-}
-
-/**
  * Define the critical hooks that force modules to always be loaded.
  */
 function bootstrap_hooks() {
@@ -479,91 +27,6 @@
 }
 
 /**
- * Unserializes and appends elements from a serialized string.
- *
- * @param $obj
- *   The object to which the elements are appended.
- * @param $field
- *   The attribute of $obj whose value should be unserialized.
- */
-function drupal_unpack($obj, $field = 'data') {
-  if ($obj->$field && $data = unserialize($obj->$field)) {
-    foreach ($data as $key => $value) {
-      if (!isset($obj->$key)) {
-        $obj->$key = $value;
-      }
-    }
-  }
-  return $obj;
-}
-
-/**
- * Return the URI of the referring page.
- */
-function referer_uri() {
-  if (isset($_SERVER['HTTP_REFERER'])) {
-    return check_url($_SERVER['HTTP_REFERER']);
-  }
-}
-
-/**
- * Return a component of the current Drupal path.
- *
- * When viewing a page at the path "admin/node/configure", for example, arg(0)
- * would return "admin", arg(1) would return "node", and arg(2) would return
- * "configure".
- *
- * Avoid use of this function where possible, as resulting code is hard to read.
- * Instead, attempt to use named arguments in menu callback functions. See the
- * explanation in menu.inc for how to construct callbacks that take arguments.
- */
-function arg($index) {
-  static $arguments, $q;
-
-  if (empty($arguments) || $q != $_GET['q']) {
-    $arguments = explode('/', $_GET['q']);
-  }
-
-  if (array_key_exists($index, $arguments)) {
-    return $arguments[$index];
-  }
-}
-
-/**
- * Prepare user input for use in a URI.
- *
- * We replace ( and ) with their entity equivalents to prevent XSS attacks.
- */
-function check_url($uri) {
-  $uri = htmlspecialchars($uri, ENT_QUOTES);
-
-  $uri = strtr($uri, array('(' => '&040;', ')' => '&041;'));
-
-  return $uri;
-}
-
-/**
- * Since request_uri() is only available on Apache, we generate an
- * equivalent using other environment vars.
- */
-function request_uri() {
-
-  if (isset($_SERVER['REQUEST_URI'])) {
-    $uri = $_SERVER['REQUEST_URI'];
-  }
-  else {
-    if (isset($_SERVER['argv'])) {
-      $uri = $_SERVER['PHP_SELF'] .'?'. $_SERVER['argv'][0];
-    }
-    else {
-      $uri = $_SERVER['PHP_SELF'] .'?'. $_SERVER['QUERY_STRING'];
-    }
-  }
-
-  return check_url($uri);
-}
-
-/**
  * Begin a global timer, for benchmarking of page execution time.
  */
 function timer_start() {
@@ -572,66 +35,6 @@
   $timer = (float)$usec + (float)$sec;
 }
 
-/**
- * Log a system message.
- *
- * @param $type
- *   The category to which this message belongs.
- * @param $message
- *   The message to store in the log.
- * @param $severity
- *   The severity of the message. One of the following values:
- *   - WATCHDOG_NOTICE
- *   - WATCHDOG_WARNING
- *   - WATCHDOG_ERROR
- * @param $link
- *   A link to associate with the message.
- */
-function watchdog($type, $message, $severity = WATCHDOG_NOTICE, $link = NULL) {
-  global $user;
-  db_query("INSERT INTO {watchdog} (uid, type, message, severity, link, location, hostname, timestamp) VALUES (%d, '%s', '%s', %d, '%s', '%s', '%s', %d)", $user->uid, $type, $message, $severity, $link, request_uri(), $_SERVER['REMOTE_ADDR'], time());
-}
-
-/**
- * Set a message for the user to see.
- *
- * The message is stored in the session so that it can persist through a redirect.
- *
- * If called with no arguments, this function returns all set messages without
- * clearing them.
- */
-function drupal_set_message($message = NULL, $type = 'status') {
-  if (isset($message)) {
-    if (!isset($_SESSION['messages'])) {
-      $_SESSION['messages'] = array();
-    }
-
-    if (!isset($_SESSION['messages'][$type])) {
-      $_SESSION['messages'][$type] = array();
-    }
-
-    $_SESSION['messages'][$type][] = $message;
-  }
-
-  return $_SESSION['messages'];
-}
-
-/**
- * Return all messages that have been set.
- *
- * As a side effect, this function clears the message queue.
- */
-function drupal_get_messages() {
-  $messages = drupal_set_message();
-  $_SESSION['messages'] = array();
-
-  return $messages;
-}
-
-unset($conf);
-$config = conf_init();
-
-include_once "$config/settings.php";
 include_once 'includes/database.inc';
 include_once 'includes/session.inc';
 include_once 'includes/module.inc';
