Skip to content

Commit

Permalink
Issue #1606946 by Albert Volkman, udaksh, bunthorne: Fix up API docs …
Browse files Browse the repository at this point in the history
…for top-level PHP files
  • Loading branch information
jhodgdon-drp committed Nov 29, 2012
1 parent fd2936b commit bcacd22
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 24 deletions.
35 changes: 18 additions & 17 deletions authorize.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,34 @@
* @file
* Administrative script for running authorized file operations.
*
* Using this script, the site owner (the user actually owning the files on
* the webserver) can authorize certain file-related operations to proceed
* with elevated privileges, for example to deploy and upgrade modules or
* themes. Users should not visit this page directly, but instead use an
* administrative user interface which knows how to redirect the user to this
* script as part of a multistep process. This script actually performs the
* selected operations without loading all of Drupal, to be able to more
* gracefully recover from errors. Access to the script is controlled by a
* global killswitch in settings.php ('allow_authorize_operations') and via
* the 'administer software updates' permission.
* Using this script, the site owner (the user actually owning the files on the
* webserver) can authorize certain file-related operations to proceed with
* elevated privileges, for example to deploy and upgrade modules or themes.
* Users should not visit this page directly, but instead use an administrative
* user interface which knows how to redirect the user to this script as part of
* a multistep process. This script actually performs the selected operations
* without loading all of Drupal, to be able to more gracefully recover from
* errors. Access to the script is controlled by a global killswitch in
* settings.php ('allow_authorize_operations') and via the 'administer software
* updates' permission.
*
* There are helper functions for setting up an operation to run via this
* system in modules/system/system.module. For more information, see:
* @link authorize Authorized operation helper functions @endlink
*/

/**
* Root directory of Drupal installation.
* Defines the root directory of the Drupal installation.
*/
define('DRUPAL_ROOT', getcwd());

/**
* Global flag to identify update.php and authorize.php runs, and so
* avoid various unwanted operations, such as hook_init() and
* hook_exit() invokes, css/js preprocessing and translation, and
* solve some theming issues. This flag is checked on several places
* in Drupal code (not just authorize.php).
* Global flag to identify update.php and authorize.php runs.
*
* Identifies update.php and authorize.php runs, avoiding unwanted operations
* such as hook_init() and hook_exit() invokes, css/js preprocessing and
* translation, and solves some theming issues. The flag is checked in other
* places in Drupal code (not just authorize.php).
*/
define('MAINTENANCE_MODE', 'update');

Expand All @@ -51,7 +52,7 @@ function authorize_access_denied_page() {
* have access to the 'administer software updates' permission.
*
* @return
* TRUE if the current user can run authorize.php, otherwise FALSE.
* TRUE if the current user can run authorize.php, and FALSE if not.
*/
function authorize_access_allowed() {
return variable_get('allow_authorize_operations', TRUE) && user_access('administer software updates');
Expand Down
8 changes: 6 additions & 2 deletions install.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,16 @@
*/

/**
* Root directory of Drupal installation.
* Defines the root directory of the Drupal installation.
*/
define('DRUPAL_ROOT', getcwd());

/**
* Global flag to indicate that site is in installation mode.
* Global flag to indicate the site is in installation mode.
*
* The constant is defined using define() instead of const so that PHP
* versions prior to 5.3 can display proper PHP requirements instead of causing
* a fatal error.
*/
define('MAINTENANCE_MODE', 'install');

Expand Down
36 changes: 31 additions & 5 deletions update.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/**
* Root directory of Drupal installation.
* Defines the root directory of the Drupal installation.
*/
define('DRUPAL_ROOT', getcwd());

Expand All @@ -27,6 +27,9 @@
*/
define('MAINTENANCE_MODE', 'update');

/**
* Renders form with a list of available database updates.
*/
function update_selection_page() {
drupal_set_title('Drupal database update');
$elements = drupal_get_form('update_script_selection_form');
Expand All @@ -37,6 +40,9 @@ function update_selection_page() {
return $output;
}

/**
* Form constructor for the list of available database module updates.
*/
function update_script_selection_form($form, &$form_state) {
$count = 0;
$incompatible_count = 0;
Expand Down Expand Up @@ -141,6 +147,9 @@ function update_script_selection_form($form, &$form_state) {
return $form;
}

/**
* Provides links to the homepage and administration pages.
*/
function update_helpful_links() {
// NOTE: we can't use l() here because the URL would point to
// 'update.php?q=admin'.
Expand All @@ -151,6 +160,9 @@ function update_helpful_links() {
return $links;
}

/**
* Displays results of the update script with any accompanying errors.
*/
function update_results_page() {
drupal_set_title('Drupal database update');
$links = update_helpful_links();
Expand Down Expand Up @@ -231,6 +243,15 @@ function update_results_page() {
return $output;
}

/**
* Provides an overview of the Drupal database update.
*
* This page provides cautionary suggestions that should happen before
* proceeding with the update to ensure data integrity.
*
* @return
* Rendered HTML form.
*/
function update_info_page() {
// Change query-strings on css/js files to enforce reload for all users.
_drupal_flush_css_js();
Expand All @@ -256,6 +277,12 @@ function update_info_page() {
return $output;
}

/**
* Renders a 403 access denied page for update.php.
*
* @return
* Rendered HTML warning with 403 status.
*/
function update_access_denied_page() {
drupal_add_http_header('Status', '403 Forbidden');
watchdog('access denied', 'update.php', NULL, WATCHDOG_WARNING);
Expand Down Expand Up @@ -294,7 +321,7 @@ function update_access_allowed() {
}

/**
* Add the update task list to the current page.
* Adds the update task list to the current page.
*/
function update_task_list($active = NULL) {
// Default list of tasks.
Expand All @@ -310,8 +337,7 @@ function update_task_list($active = NULL) {
}

/**
* Returns (and optionally stores) extra requirements that only apply during
* particular parts of the update.php process.
* Returns and stores extra requirements that apply during the update process.
*/
function update_extra_requirements($requirements = NULL) {
static $extra_requirements = array();
Expand All @@ -322,7 +348,7 @@ function update_extra_requirements($requirements = NULL) {
}

/**
* Check update requirements and report any errors or (optionally) warnings.
* Checks update requirements and reports errors and (optionally) warnings.
*
* @param $skip_warnings
* (optional) If set to TRUE, requirement warnings will be ignored, and a
Expand Down

0 comments on commit bcacd22

Please sign in to comment.