Document some require/includes as phpdoc otherwise takes random block before to document it.

This commit is contained in:
Michal Čihař
2008-11-24 10:02:56 +00:00
parent 9561f56875
commit 37315b0c79
6 changed files with 55 additions and 25 deletions

View File

@@ -184,7 +184,9 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) {
} }
if (! $_error && $move) { if (! $_error && $move) {
// cleanup pmadb stuff for this db /**
* cleanup pmadb stuff for this db
*/
require_once './libraries/relation_cleanup.lib.php'; require_once './libraries/relation_cleanup.lib.php';
PMA_relationsCleanupDatabase($db); PMA_relationsCleanupDatabase($db);

View File

@@ -280,6 +280,9 @@ if ($import_file != 'none' && !$error) {
break; break;
case 'application/zip': case 'application/zip':
if ($cfg['ZipDump'] && @function_exists('zip_open')) { if ($cfg['ZipDump'] && @function_exists('zip_open')) {
/**
* Load interface for zip extension.
*/
include_once './libraries/zip_extension.lib.php'; include_once './libraries/zip_extension.lib.php';
$result = PMA_getZipContents($import_file); $result = PMA_getZipContents($import_file);
if (! empty($result['error'])) { if (! empty($result['error'])) {

View File

@@ -30,7 +30,9 @@ if ($GLOBALS['PMA_allow_mbstr']) {
mb_internal_encoding($GLOBALS['charset']); mb_internal_encoding($GLOBALS['charset']);
} }
// This is for handling input better /**
* Load proper code for handling input.
*/
if (defined('PMA_MULTIBYTE_ENCODING') || $GLOBALS['PMA_allow_mbstr']) { if (defined('PMA_MULTIBYTE_ENCODING') || $GLOBALS['PMA_allow_mbstr']) {
$GLOBALS['PMA_strpos'] = 'mb_strpos'; $GLOBALS['PMA_strpos'] = 'mb_strpos';
$GLOBALS['PMA_substr'] = 'mb_substr'; $GLOBALS['PMA_substr'] = 'mb_substr';
@@ -47,6 +49,9 @@ if (defined('PMA_MULTIBYTE_ENCODING') || $GLOBALS['PMA_allow_mbstr']) {
require './libraries/string_native.lib.php'; require './libraries/string_native.lib.php';
} }
/**
* Load ctype handler.
*/
if (@extension_loaded('ctype')) { if (@extension_loaded('ctype')) {
require './libraries/string_type_ctype.lib.php'; require './libraries/string_type_ctype.lib.php';
} else { } else {

View File

@@ -310,8 +310,14 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) {
} }
$active_page = $goto; $active_page = $goto;
$message = PMA_Message::rawError($error); $message = PMA_Message::rawError($error);
/**
* Go to target path.
*/
require './' . PMA_securePath($goto); require './' . PMA_securePath($goto);
} else { } else {
/**
* HTML header.
*/
require_once './libraries/header.inc.php'; require_once './libraries/header.inc.php';
$full_err_url = (preg_match('@^(db|tbl)_@', $err_url)) $full_err_url = (preg_match('@^(db|tbl)_@', $err_url))
? $err_url . '&show_query=1&sql_query=' . urlencode($sql_query) ? $err_url . '&show_query=1&sql_query=' . urlencode($sql_query)
@@ -445,6 +451,9 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) {
// garvin: if a table or database gets dropped, check column comments. // garvin: if a table or database gets dropped, check column comments.
if (isset($purge) && $purge == '1') { if (isset($purge) && $purge == '1') {
/**
* Cleanup relations.
*/
require_once './libraries/relation_cleanup.lib.php'; require_once './libraries/relation_cleanup.lib.php';
if (strlen($table) && strlen($db)) { if (strlen($table) && strlen($db)) {

View File

@@ -103,7 +103,9 @@ if (isset($_REQUEST['do_save_data'])) {
$message->addParam($table); $message->addParam($table);
$btnDrop = 'Fake'; $btnDrop = 'Fake';
// garvin: If comments were sent, enable relation stuff /**
* If comments were sent, enable relation stuff
*/
require_once './libraries/relation.lib.php'; require_once './libraries/relation.lib.php';
require_once './libraries/transformations.lib.php'; require_once './libraries/transformations.lib.php';
@@ -194,6 +196,9 @@ if ($abort == false) {
$analyzed_sql = PMA_SQP_analyze(PMA_SQP_parse($show_create_table)); $analyzed_sql = PMA_SQP_analyze(PMA_SQP_parse($show_create_table));
} }
/**
* Form for changing properties.
*/
require './libraries/tbl_properties.inc.php'; require './libraries/tbl_properties.inc.php';
} }

View File

@@ -397,7 +397,13 @@ $GLOBALS['js_include'][] = 'functions.js';
$GLOBALS['js_include'][] = 'mootools.js'; $GLOBALS['js_include'][] = 'mootools.js';
$active_page = $goto_include; $active_page = $goto_include;
/**
* Load header.
*/
require_once './libraries/header.inc.php'; require_once './libraries/header.inc.php';
/**
* Load target page.
*/
require './' . PMA_securePath($goto_include); require './' . PMA_securePath($goto_include);
exit; exit;
?> ?>