August 2011 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16257-gef80b78
by Michal Čihař 22 Aug '11

22 Aug '11

The branch, master has been updated via ef80b7899116b2bfdeeb5d5b5c48f0f3a731136c (commit) from 863d8f2e52373f404ba96fa79c406481277764b1 (commit) - Log ----------------------------------------------------------------- commit ef80b7899116b2bfdeeb5d5b5c48f0f3a731136c Author: Michal Čihař <michal(a)cihar.com> Date: Mon Aug 22 09:10:39 2011 +0200 Docblocks ----------------------------------------------------------------------- Summary of changes: libraries/core.lib.php | 5 +++-- libraries/js_escape.lib.php | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libraries/core.lib.php b/libraries/core.lib.php index d1348ed..3d561e6 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -722,8 +722,9 @@ function PMA_AddJSCode($str) /** * Adds JS code snippet for variable assignment to be displayed by header.inc.php. * - * @param string $key Name of value to set - * @param mixed $value Value to set, can be either string or array of strings + * @param string $key Name of value to set + * @param mixed $value Value to set, can be either string or array of strings + * @param bool $escape Whether to escape value or keep it as it is (for inclusion of js code) * */ function PMA_AddJSVar($key, $value, $escape = true) diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php index cb2dbd1..969b1bc 100644 --- a/libraries/js_escape.lib.php +++ b/libraries/js_escape.lib.php @@ -82,8 +82,9 @@ function PMA_formatJsVal($value) * Formats an javascript assignment with proper escaping of a value * and support for assigning array of strings. * - * @param string $key Name of value to set - * @param mixed $value Value to set, can be either string or array of strings + * @param string $key Name of value to set + * @param mixed $value Value to set, can be either string or array of strings + * @param bool $escape Whether to escape value or keep it as it is (for inclusion of js code) * * @return string Javascript code. */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16256-g863d8f2
by Michal Čihař 22 Aug '11

22 Aug '11

The branch, master has been updated via 863d8f2e52373f404ba96fa79c406481277764b1 (commit) from 26622d7fdae775bb8ef5e331fec9b2c963024e58 (commit) - Log ----------------------------------------------------------------- commit 863d8f2e52373f404ba96fa79c406481277764b1 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Aug 22 09:06:31 2011 +0200 Support for not escaped js code ----------------------------------------------------------------------- Summary of changes: libraries/core.lib.php | 4 ++-- libraries/js_escape.lib.php | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libraries/core.lib.php b/libraries/core.lib.php index 29d2f43..d1348ed 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -726,9 +726,9 @@ function PMA_AddJSCode($str) * @param mixed $value Value to set, can be either string or array of strings * */ -function PMA_AddJSVar($key, $value) +function PMA_AddJSVar($key, $value, $escape = true) { - PMA_AddJsCode(PMA_getJsValue($key, $value)); + PMA_AddJsCode(PMA_getJsValue($key, $value, $escape)); } ?> diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php index 87d8855..cb2dbd1 100644 --- a/libraries/js_escape.lib.php +++ b/libraries/js_escape.lib.php @@ -87,10 +87,12 @@ function PMA_formatJsVal($value) * * @return string Javascript code. */ -function PMA_getJsValue($key, $value) +function PMA_getJsValue($key, $value, $escape = true) { $result = $key . ' = '; - if (is_array($value)) { + if (!$escape) { + $result .= $value; + } elseif (is_array($value)) { $result .= '['; foreach ($value as $id => $val) { $result .= PMA_formatJsVal($value) . ","; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16255-g26622d7
by Michal Čihař 22 Aug '11

22 Aug '11

The branch, master has been updated via 26622d7fdae775bb8ef5e331fec9b2c963024e58 (commit) from adbdb71e60b788ac10d134a5e0a099d35ca91ff1 (commit) - Log ----------------------------------------------------------------- commit 26622d7fdae775bb8ef5e331fec9b2c963024e58 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Aug 22 09:04:54 2011 +0200 Pass this as javascript code ----------------------------------------------------------------------- Summary of changes: server_status.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/server_status.php b/server_status.php index 5490400..803b76c 100644 --- a/server_status.php +++ b/server_status.php @@ -683,7 +683,8 @@ PMA_AddJSVar( ); PMA_AddJSVar( 'server_time_diff', - 'new Date().getTime() - ' . (microtime(true) * 1000) + 'new Date().getTime() - ' . (microtime(true) * 1000), + false ); PMA_AddJSVar( 'server_os', hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16254-gadbdb71
by Madhura Jayaratne 22 Aug '11

22 Aug '11

The branch, master has been updated via adbdb71e60b788ac10d134a5e0a099d35ca91ff1 (commit) via ea30c016c85cb4a34b5c49109dd18a745447fb54 (commit) via c726d423fef601ed7b8222e46e3dbcfc698d0d5c (commit) via 05e78b2778830b29b3919fd742658d8d82851e7b (commit) from e82d3c7136425fbe51ed26f8bf95cf932740ddd8 (commit) - Log ----------------------------------------------------------------- commit adbdb71e60b788ac10d134a5e0a099d35ca91ff1 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Mon Aug 22 07:42:24 2011 +0530 Coding style improvements commit ea30c016c85cb4a34b5c49109dd18a745447fb54 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Mon Aug 22 07:30:29 2011 +0530 Opening braces should be on a new line commit c726d423fef601ed7b8222e46e3dbcfc698d0d5c Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Mon Aug 22 07:28:37 2011 +0530 Fix doc blocks commit 05e78b2778830b29b3919fd742658d8d82851e7b Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Mon Aug 22 06:46:39 2011 +0530 Proper coding style for multi line if statements ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 510 ++++++++++++++++++++++++++-------------------- 1 files changed, 284 insertions(+), 226 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index f232b98..4b286d3 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -76,7 +76,8 @@ function PMA_pow($base, $exp, $use_function = false) * @param string $icon name of icon file * @param string $alternate alternate text * @param boolean $force_text whether to force alternate text to be displayed - * @param boolean $noSprite If true, the image source will be not replaced with a CSS Sprite + * @param boolean $noSprite If true, the image source will be not replaced + * with a CSS Sprite * * @return html img tag */ @@ -153,13 +154,13 @@ function PMA_generateHiddenMaxFileSize($max_size) * Add slashes before "'" and "\" characters so a value containing them can * be used in a sql comparison. * - * @param string $a_string the string to slash - * @param bool $is_like whether the string will be used in a 'LIKE' clause - * (it then requires two more escaped sequences) or not - * @param bool $crlf whether to treat cr/lfs as escape-worthy entities - * (converts \n to \\n, \r to \\r) - * @param bool $php_code whether this function is used as part of the - * "Create PHP code" dialog + * @param string $a_string the string to slash + * @param bool $is_like whether the string will be used in a 'LIKE' clause + * (it then requires two more escaped sequences) or not + * @param bool $crlf whether to treat cr/lfs as escape-worthy entities + * (converts \n to \\n, \r to \\r) + * @param bool $php_code whether this function is used as part of the + * "Create PHP code" dialog * * @return string the slashed string * @@ -177,7 +178,7 @@ function PMA_sqlAddSlashes($a_string = '', $is_like = false, $crlf = false, $php $a_string = strtr( $a_string, array("\n" => '\n', "\r" => '\r', "\t" => '\t') - ); + ); } if ($php_code) { @@ -210,7 +211,7 @@ function PMA_escape_mysql_wildcards($name) * removes slashes before "_" and "%" characters * Note: This function does not unescape backslashes! * - * @param string $name the string to escape + * @param string $name the string to escape * * @return string the escaped string * @@ -245,15 +246,17 @@ function PMA_unQuote($quoted_string, $quote = null) foreach ($quotes as $quote) { if (substr($quoted_string, 0, 1) === $quote - && substr($quoted_string, -1, 1) === $quote) { - $unquoted_string = substr($quoted_string, 1, -1); - // replace escaped quotes - $unquoted_string = str_replace( + && substr($quoted_string, -1, 1) === $quote + ) { + $unquoted_string = substr($quoted_string, 1, -1); + // replace escaped quotes + $unquoted_string = str_replace( $quote . $quote, $quote, - $unquoted_string); - return $unquoted_string; - } + $unquoted_string + ); + return $unquoted_string; + } } return $quoted_string; @@ -262,7 +265,6 @@ function PMA_unQuote($quoted_string, $quote = null) /** * format sql strings * - * @todo move into PMA_Sql * @param mixed $parsed_sql pre-parsed SQL structure * @param string $unparsed_sql raw SQL string * @@ -272,7 +274,7 @@ function PMA_unQuote($quoted_string, $quote = null) * @global boolean whether the current statement is a multiple one or not * * @access public - * + * @todo move into PMA_Sql */ function PMA_formatSql($parsed_sql, $unparsed_sql = '') { @@ -419,7 +421,7 @@ function PMA_showMySQLDocu($chapter, $link, $big_icon = false, $anchor = '', $ju /** * Displays a link to the phpMyAdmin documentation * - * @param string $anchor anchor in documentation + * @param string $anchor anchor in documentation * * @return string the html link * @@ -437,7 +439,7 @@ function PMA_showDocu($anchor) /** * Displays a link to the PHP documentation * - * @param string $target anchor in documentation + * @param string $target anchor in documentation * * @return string the html link * @@ -457,9 +459,9 @@ function PMA_showPHPDocu($target) /** * returns HTML for a footnote marker and add the messsage to the footnotes * - * @param string $message the error message - * @param bool $bbcode - * @param string $type + * @param string $message the error message + * @param bool $bbcode + * @param string $type message types * * @return string html code for a footnote marker * @@ -500,11 +502,11 @@ function PMA_showHint($message, $bbcode = false, $type = 'notice') /** * Displays a MySQL error message in the right frame. * - * @param string $error_message the error message - * @param string $the_query the sql query that failed - * @param bool $is_modify_link whether to show a "modify" link or not - * @param string $back_url the "back" link url (full path is not required) - * @param bool $exit EXIT the page? + * @param string $error_message the error message + * @param string $the_query the sql query that failed + * @param bool $is_modify_link whether to show a "modify" link or not + * @param string $back_url the "back" link url (full path is not required) + * @param bool $exit EXIT the page? * * @global string the curent table * @global string the current db @@ -512,14 +514,14 @@ function PMA_showHint($message, $bbcode = false, $type = 'notice') * @access public */ function PMA_mysqlDie($error_message = '', $the_query = '', - $is_modify_link = true, $back_url = '', $exit = true) +$is_modify_link = true, $back_url = '', $exit = true) { global $table, $db; /** * start http output, display html headers */ - require_once './libraries/header.inc.php'; + include_once './libraries/header.inc.php'; $error_msg_output = ''; @@ -641,7 +643,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '', /** * display footer and exit */ - require './libraries/footer.inc.php'; + include './libraries/footer.inc.php'; } else { echo $error_msg_output; } @@ -650,10 +652,10 @@ function PMA_mysqlDie($error_message = '', $the_query = '', /** * returns array with tables of given db with extended information and grouped * - * @param string $db name of db - * @param string $tables name of tables - * @param integer $limit_offset list offset - * @param int|bool $limit_count max tables to return + * @param string $db name of db + * @param string $tables name of tables + * @param integer $limit_offset list offset + * @param int|bool $limit_count max tables to return * * @return array (recursive) grouped table list */ @@ -782,10 +784,10 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count = * * </code> * - * @param mixed $a_name the database, table or field name to "backquote" - * or array of it - * @param boolean $do_it a flag to bypass this function (used by dump - * functions) + * @param mixed $a_name the database, table or field name to "backquote" + * or array of it + * @param boolean $do_it a flag to bypass this function (used by dump + * functions) * * @return mixed the "backquoted" database, table or field name * @@ -829,9 +831,8 @@ function PMA_whichCrlf() // Win case if (PMA_USR_OS == 'Win') { $the_crlf = "\r\n"; - } - // Others - else { + } else { + // Others $the_crlf = "\n"; } @@ -880,10 +881,10 @@ if (typeof(window.parent) != 'undefined' * displays the message and the query * usually the message is the result of the query executed * - * @param string $message the message to display - * @param string $sql_query the query to display - * @param string $type the type (level) of the message - * @param boolean $is_view is this a message after a VIEW operation? + * @param string $message the message to display + * @param string $sql_query the query to display + * @param string $type the type (level) of the message + * @param boolean $is_view is this a message after a VIEW operation? * * @return string * @@ -1005,8 +1006,9 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view // Same as below (append LIMIT), append the remembered ORDER BY if ($GLOBALS['cfg']['RememberSorting'] - && isset($analyzed_display_query[0]['queryflags']['select_from']) - && isset($GLOBALS['sql_order_to_append'])) { + && isset($analyzed_display_query[0]['queryflags']['select_from']) + && isset($GLOBALS['sql_order_to_append']) + ) { $query_base = $analyzed_display_query[0]['section_before_limit'] . "\n" . $GLOBALS['sql_order_to_append'] . $analyzed_display_query[0]['section_after_limit']; @@ -1158,10 +1160,10 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view ) { $validate_params = $url_params; if (!empty($GLOBALS['validatequery'])) { - $validate_message = __('Skip Validate SQL') ; + $validate_message = __('Skip Validate SQL'); } else { $validate_params['validatequery'] = 1; - $validate_message = __('Validate SQL') ; + $validate_message = __('Validate SQL'); } $validate_link = 'import.php' . PMA_generate_common_url($validate_params); @@ -1271,7 +1273,8 @@ function PMA_profilingSupported() /** * Displays a form with the Profiling checkbox * - * @param string $sql_query + * @param string $sql_query sql query + * * @access public */ function PMA_profilingCheckbox($sql_query) @@ -1290,9 +1293,9 @@ function PMA_profilingCheckbox($sql_query) /** * Formats $value to byte view * - * @param double $value the value to format - * @param int $limes the sensitiveness - * @param int $comma the number of decimals to retain + * @param double $value the value to format + * @param int $limes the sensitiveness + * @param int $comma the number of decimals to retain * * @return array the formatted value and its unit * @@ -1346,7 +1349,7 @@ function PMA_formatByteDown($value, $limes = 6, $comma = 0) /** * Changes thousands and decimal separators to locale specific values. * - * @param $value + * @param string $value the value * * @return string */ @@ -1360,7 +1363,8 @@ function PMA_localizeNumber($value) /* l10n: Decimal separator */ __('.'), ), - $value); + $value + ); } /** @@ -1376,13 +1380,14 @@ function PMA_localizeNumber($value) * echo PMA_formatNumber(0.003, 3, 3); // 0.003 * echo PMA_formatNumber(0.00003, 3, 2); // 0.03 m * echo PMA_formatNumber(0, 6); // 0 - * * </code> - * @param double $value the value to format - * @param integer $digits_left number of digits left of the comma - * @param integer $digits_right number of digits right of the comma - * @param boolean $only_down do not reformat numbers below 1 - * @param boolean $noTrailingZero removes trailing zeros right of the comma (default: true) + * + * @param double $value the value to format + * @param integer $digits_left number of digits left of the comma + * @param integer $digits_right number of digits right of the comma + * @param boolean $only_down do not reformat numbers below 1 + * @param boolean $noTrailingZero removes trailing zeros right of the comma + * (default: true) * * @return string the formatted value and its unit * @@ -1390,7 +1395,9 @@ function PMA_localizeNumber($value) */ function PMA_formatNumber($value, $digits_left = 3, $digits_right = 0, $only_down = false, $noTrailingZero = true) { - if ($value==0) return '0'; + if ($value==0) { + return '0'; + } $originalValue = $value; //number_format is not multibyte safe, str_replace is safe @@ -1449,7 +1456,9 @@ function PMA_formatNumber($value, $digits_left = 3, $digits_right = 0, $only_dow $d-= floor(($digits_left - $cur_digits)/3); } - if ($d<0 && $only_down) $d=0; + if ($d<0 && $only_down) { + $d=0; + } $value = round($value / (PMA_pow(1000, $d, 'pow') / $dh)) /$dh; $unit = $units[$d]; @@ -1458,7 +1467,7 @@ function PMA_formatNumber($value, $digits_left = 3, $digits_right = 0, $only_dow if ($noTrailingZero) { $value = PMA_localizeNumber( preg_replace('/(?<=\d)(?=(\d{3})+(?!\d))/', ',', $value) - ); + ); } else { //number_format is not multibyte safe, str_replace is safe $value = PMA_localizeNumber(number_format($value, $digits_right)); @@ -1474,7 +1483,7 @@ function PMA_formatNumber($value, $digits_left = 3, $digits_right = 0, $only_dow /** * Returns the number of bytes when a formatted size is given * - * @param string $formatted_size the size expression (for example 8MB) + * @param string $formatted_size the size expression (for example 8MB) * * @return integer The numerical part of the expression (for example 8) */ @@ -1495,8 +1504,8 @@ function PMA_extractValueFromFormattedSize($formatted_size) /** * Writes localised date * - * @param string $timestamp the current timestamp - * @param string $format format + * @param string $timestamp the current timestamp + * @param string $format format * * @return string the formatted date * @@ -1565,8 +1574,8 @@ function PMA_localisedDate($timestamp = -1, $format = '') * returns a tab for tabbed navigation. * If the variables $link and $args ar left empty, an inactive tab is created * - * @param array $tab array with all options - * @param array $url_params + * @param array $tab array with all options + * @param array $url_params * * @return string html code for one tab, a link if valid otherwise a span * @@ -1593,7 +1602,8 @@ function PMA_generate_html_tab($tab, $url_params = array(), $base_dir='') // determine additionnal style-class if (empty($tab['class'])) { if (! empty($tab['active']) - || PMA_isValid($GLOBALS['active_page'], 'identical', $tab['link'])) { + || PMA_isValid($GLOBALS['active_page'], 'identical', $tab['link']) + ) { $tab['class'] = 'active'; } elseif (is_null($tab['active']) && empty($GLOBALS['active_page']) && basename($GLOBALS['PMA_PHP_SELF']) == $tab['link'] @@ -1630,19 +1640,21 @@ function PMA_generate_html_tab($tab, $url_params = array(), $base_dir='') // display icon, even if iconic is disabled but the link-text is missing if (($GLOBALS['cfg']['MainPageIconic'] || empty($tab['text'])) - && isset($tab['icon'])) { + && isset($tab['icon']) + ) { // avoid generating an alt tag, because it only illustrates // the text that follows and if browser does not display // images, the text is duplicated $image = '<img class="icon %1$s" src="' . $base_dir . 'themes/dot.gif"' .' width="16" height="16" alt="" />%2$s'; $tab['text'] = sprintf($image, htmlentities($tab['icon']), $tab['text']); - } - // check to not display an empty link-text - elseif (empty($tab['text'])) { + } elseif (empty($tab['text'])) { + // check to not display an empty link-text $tab['text'] = '?'; - trigger_error('empty linktext in function ' . __FUNCTION__ . '()', - E_USER_NOTICE); + trigger_error( + 'empty linktext in function ' . __FUNCTION__ . '()', + E_USER_NOTICE + ); } //Set the id for the tab, if set in the params @@ -1666,8 +1678,8 @@ function PMA_generate_html_tab($tab, $url_params = array(), $base_dir='') /** * returns html-code for a tab navigation * - * @param array $tabs one element per tab - * @param string $url_params + * @param array $tabs one element per tab + * @param string $url_params * * @return string html-code for tab-navigation */ @@ -1695,14 +1707,14 @@ function PMA_generate_html_tabs($tabs, $url_params, $base_dir='') * Displays a link, or a button if the link's URL is too large, to * accommodate some browsers' limitations * - * @param string $url the URL - * @param string $message the link message - * @param mixed $tag_params string: js confirmation - * array: additional tag params (f.e. style="") - * @param boolean $new_form we set this to false when we are already in - * a form, to avoid generating nested forms - * @param boolean $strip_img - * @param string $target + * @param string $url the URL + * @param string $message the link message + * @param mixed $tag_params string: js confirmation + * array: additional tag params (f.e. style="") + * @param boolean $new_form we set this to false when we are already in + * a form, to avoid generating nested forms + * @param boolean $strip_img whether to strip the image + * @param string $target target * * @return string the results to be echoed or saved in an array */ @@ -1752,9 +1764,9 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), if ($url_length <= $GLOBALS['cfg']['LinkLengthLimit']) { if ($suhosin_get_MaxValueLength = ini_get('suhosin.get.max_value_length')) { $query_parts = PMA_splitURLQuery($url); - foreach($query_parts as $query_pair) { + foreach ($query_parts as $query_pair) { list($eachvar, $eachval) = explode('=', $query_pair); - if(strlen($eachval) > $suhosin_get_MaxValueLength) { + if (strlen($eachval) > $suhosin_get_MaxValueLength) { $in_suhosin_limits = false; break; } @@ -1822,10 +1834,12 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), /** * Splits a URL string by parameter * - * @param string $url the URL + * @param string $url the URL + * * @return array the parameter/value pairs, for example [0] db=sakila */ -function PMA_splitURLQuery($url) { +function PMA_splitURLQuery($url) +{ // decode encoded url separators $separator = PMA_get_arg_separator(); // on most places separator is still hard coded ... @@ -1844,7 +1858,7 @@ function PMA_splitURLQuery($url) { /** * Returns a given timespan value in a readable format. * - * @param int $seconds the timespan + * @param int $seconds the timespan * * @return string the formatted value */ @@ -1872,11 +1886,11 @@ function PMA_timespanFormat($seconds) * Fulfills todo-item * http://sf.net/tracker/?func=detail&aid=544361&group_id=23067&atid=377411 * - * @todo add a multibyte safe function PMA_STR_split() - * @param string $string The string - * @param string $Separator The Separator (defaults to "<br />\n") + * @param string $string The string + * @param string $Separator The Separator (defaults to "<br />\n") * * @access public + * @todo add a multibyte safe function PMA_STR_split() * * @return string The flipped string */ @@ -1920,16 +1934,17 @@ function PMA_flipstring($string, $Separator = "<br />\n") * Not sure we could use a strMissingParameter message here, * would have to check if the error message file is always available * - * @todo use PMA_fatalError() if $die === true? - * @param array $params The names of the parameters needed by the calling script. - * @param bool $die Stop the execution? - * (Set this manually to false in the calling script - * until you know all needed parameters to check). - * @param bool $request Whether to include this list in checking for special params. + * @param array $params The names of the parameters needed by the calling script. + * @param bool $die Stop the execution? + * (Set this manually to false in the calling script + * until you know all needed parameters to check). + * @param bool $request Whether to include this list in checking for special params. + * * @global string path to current script * @global boolean flag whether any special variable was required * * @access public + * @todo use PMA_fatalError() if $die === true? */ function PMA_checkParameters($params, $die = true, $request = true) { @@ -1961,7 +1976,7 @@ function PMA_checkParameters($params, $die = true, $request = true) /** * display html meta tags */ - require_once './libraries/header_meta_style.inc.php'; + include_once './libraries/header_meta_style.inc.php'; echo '</head><body><p>' . $error_message . '</p></body></html>'; if ($die) { exit(); @@ -1972,17 +1987,17 @@ function PMA_checkParameters($params, $die = true, $request = true) /** * Function to generate unique condition for specified row. * - * @param resource $handle current query result - * @param integer $fields_cnt number of fields - * @param array $fields_meta meta information about fields - * @param array $row current row - * @param boolean $force_unique generate condition only on pk or unique + * @param resource $handle current query result + * @param integer $fields_cnt number of fields + * @param array $fields_meta meta information about fields + * @param array $row current row + * @param boolean $force_unique generate condition only on pk or unique * * @access public * * @return array the calculated condition and whether condition is unique */ -function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force_unique=false) +function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force_unique = false) { $primary_key = ''; $unique_key = ''; @@ -2123,12 +2138,12 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force /** * Generate a button or image tag * - * @param string $button_name name of button element - * @param string $button_class class of button element - * @param string $image_name name of image element - * @param string $text text to display - * @param string $image image to display - * @param string $value + * @param string $button_name name of button element + * @param string $button_class class of button element + * @param string $image_name name of image element + * @param string $text text to display + * @param string $image image to display + * @param string $value value * * @access public */ @@ -2167,17 +2182,18 @@ function PMA_buttonOrImage($button_name, $button_class, $image_name, $text, /** * Generate a pagination selector for browsing resultsets * - * @param int $rows Number of rows in the pagination set - * @param int $pageNow current page number - * @param int $nbTotalPage number of total pages - * @param int $showAll If the number of pages is lower than this - * variable, no pages will be omitted in pagination - * @param int $sliceStart How many rows at the beginning should always be shown? - * @param int $sliceEnd How many rows at the end should always be shown? - * @param int $percent Percentage of calculation page offsets to hop to a next page - * @param int $range Near the current page, how many pages should - * be considered "nearby" and displayed as well? - * @param string $prompt The prompt to display (sometimes empty) + * @param int $rows Number of rows in the pagination set + * @param int $pageNow current page number + * @param int $nbTotalPage number of total pages + * @param int $showAll If the number of pages is lower than this + * variable, no pages will be omitted in pagination + * @param int $sliceStart How many rows at the beginning should always be shown? + * @param int $sliceEnd How many rows at the end should always be shown? + * @param int $percent Percentage of calculation page offsets to hop to a + * next page + * @param int $range Near the current page, how many pages should + * be considered "nearby" and displayed as well? + * @param string $prompt The prompt to display (sometimes empty) * * @return string * @@ -2254,7 +2270,7 @@ function PMA_pageselector($rows, $pageNow = 1, $nbTotalPage = 1, } else { $selected = ''; } - $gotopage .= ' <option ' . $selected + $gotopage .= ' <option ' . $selected . ' value="' . (($i - 1) * $rows) . '">' . $i . '</option>' . "\n"; } @@ -2267,15 +2283,16 @@ function PMA_pageselector($rows, $pageNow = 1, $nbTotalPage = 1, /** * Generate navigation for a list * - * @todo use $pos from $_url_params - * @param int $count number of elements in the list - * @param int $pos current position in the list - * @param array $_url_params url parameters - * @param string $script script name for form target - * @param string $frame target frame - * @param int $max_count maximum number of elements to display from the list + * @param int $count number of elements in the list + * @param int $pos current position in the list + * @param array $_url_params url parameters + * @param string $script script name for form target + * @param string $frame target frame + * @param int $max_count maximum number of elements to display from the list * * @access public + * + * @todo use $pos from $_url_params */ function PMA_listNavigator($count, $pos, $_url_params, $script, $frame, $max_count) { @@ -2312,9 +2329,10 @@ function PMA_listNavigator($count, $pos, $_url_params, $script, $frame, $max_cou echo "\n", '<form action="./', basename($script), '" method="post" target="', $frame, '">', "\n"; echo PMA_generate_common_hidden_inputs($_url_params); echo PMA_pageselector( - $max_count, - floor(($pos + 1) / $max_count) + 1, - ceil($count / $max_count)); + $max_count, + floor(($pos + 1) / $max_count) + 1, + ceil($count / $max_count) + ); echo '</form>'; if ($pos + $max_count < $count) { @@ -2357,7 +2375,7 @@ function PMA_listNavigator($count, $pos, $_url_params, $script, $frame, $max_cou * * </code> * - * @param string $dir with wildcard for user + * @param string $dir with wildcard for user * * @return string per user directory */ @@ -2374,7 +2392,7 @@ function PMA_userDir($dir) /** * returns html code for db link to default db page * - * @param string $database + * @param string $database database * * @return string html link to default db page */ @@ -2398,10 +2416,10 @@ function PMA_getDbLink($database = null) * Displays a lightbulb hint explaining a known external bug * that affects a functionality * - * @param string $functionality localized message explaining the func. - * @param string $component 'mysql' (eventually, 'php') - * @param string $minimum_version of this component - * @param string $bugref bug reference for this component + * @param string $functionality localized message explaining the func. + * @param string $component 'mysql' (eventually, 'php') + * @param string $minimum_version of this component + * @param string $bugref bug reference for this component */ function PMA_externalBug($functionality, $component, $minimum_version, $bugref) { @@ -2417,6 +2435,8 @@ function PMA_externalBug($functionality, $component, $minimum_version, $bugref) * @param string $label label for checkbox * @param boolean $checked is it initially checked? * @param boolean $onclick should it submit the form on click? + * + * @return the HTML for the checkbox */ function PMA_display_html_checkbox($html_field_name, $label, $checked, $onclick) { @@ -2433,6 +2453,8 @@ function PMA_display_html_checkbox($html_field_name, $label, $checked, $onclick) * @param boolean $line_break whether to add an HTML line break after a choice * @param boolean $escape_label whether to use htmlspecialchars() on label * @param string $class enclose each choice with a div of this class + * + * @return the HTML for the tadio buttons */ function PMA_display_html_radio($html_field_name, $choices, $checked_choice = '', $line_break = true, $escape_label = true, $class='') { @@ -2460,11 +2482,12 @@ function PMA_display_html_radio($html_field_name, $choices, $checked_choice = '' /** * Generates and returns an HTML dropdown * - * @param string $select_name - * @param array $choices choices values - * @param string $active_choice the choice to select by default - * @param string $id id of the select element; can be different in case - * the dropdown is present more than once on the page + * @param string $select_name name for the select element + * @param array $choices choices values + * @param string $active_choice the choice to select by default + * @param string $id id of the select element; can be different in case + * the dropdown is present more than once on the page + * * @return string * * @todo support titles @@ -2489,8 +2512,8 @@ function PMA_generate_html_dropdown($select_name, $choices, $active_choice, $id) * controlling the slider; you have to generate the </div> yourself * after the sliding section. * - * @param string $id the id of the <div> on which to apply the effect - * @param string $message the message to show as a link + * @param string $id the id of the <div> on which to apply the effect + * @param string $message the message to show as a link */ function PMA_generate_slider_effect($id, $message) { @@ -2511,13 +2534,14 @@ function PMA_generate_slider_effect($id, $message) } /** - * Creates an AJAX sliding toggle button (or and equivalent form when AJAX is disabled) + * Creates an AJAX sliding toggle button + * (or and equivalent form when AJAX is disabled) * - * @param string $action The URL for the request to be executed - * @param string $select_name The name for the dropdown box - * @param array $options An array of options (see rte_footer.lib.php) - * @param string $callback A JS snippet to execute when the request is - * successfully processed + * @param string $action The URL for the request to be executed + * @param string $select_name The name for the dropdown box + * @param array $options An array of options (see rte_footer.lib.php) + * @param string $callback A JS snippet to execute when the request is + * successfully processed * * @return string HTML code for the toggle button */ @@ -2602,8 +2626,8 @@ function PMA_clearUserCache() /** * Verifies if something is cached in the session * - * @param string $var - * @param int|true $server + * @param string $var variable name + * @param int|true $server server * * @return boolean */ @@ -2618,8 +2642,8 @@ function PMA_cacheExists($var, $server = 0) /** * Gets cached information from the session * - * @param string $var - * @param int|true $server + * @param string $var varibale name + * @param int|true $server server * * @return mixed */ @@ -2638,9 +2662,9 @@ function PMA_cacheGet($var, $server = 0) /** * Caches information in the session * - * @param string $var - * @param mixed $val - * @param int|true $server + * @param string $var variable name + * @param mixed $val value + * @param int|true $server server * * @return mixed */ @@ -2655,8 +2679,8 @@ function PMA_cacheSet($var, $val = null, $server = 0) /** * Removes cached information from the session * - * @param string $var - * @param int|true $server + * @param string $var variable name + * @param int|true $server server */ function PMA_cacheUnset($var, $server = 0) { @@ -2671,7 +2695,7 @@ function PMA_cacheUnset($var, $server = 0) * in MySQL a BIT field can be from 1 to 64 bits so we need this * function because in PHP, decbin() supports only 32 bits * - * @param numeric $value coming from a BIT field + * @param numeric $value coming from a BIT field * @param integer $length * * @return string the printable value @@ -2689,7 +2713,7 @@ function PMA_printable_bit_value($value, $length) /** * Verifies whether the value contains a non-printable character * - * @param string $value + * @param string $value value * * @return boolean */ @@ -2702,7 +2726,7 @@ function PMA_contains_nonprintable_ascii($value) * Converts a BIT type default value * for example, b'010' becomes 010 * - * @param string $bit_default_value + * @param string $bit_default_value value * * @return string the converted value */ @@ -2714,7 +2738,7 @@ function PMA_convert_bit_default_value($bit_default_value) /** * Extracts the various parts from a field type spec * - * @param string $fieldspec + * @param string $fieldspec Field specification * * @return array associative array containing type, spec_in_brackets * and possibly enum_set_values (another array) @@ -2760,8 +2784,8 @@ function PMA_extractFieldSpec($fieldspec) $enum_set_values[] = $working; $in_string = false; - // Otherwise, this is a 'double quote', and can be added to the working string } elseif ($next == "'") { + // Otherwise, this is a 'double quote', and can be added to the working string $working .= "'"; // Skip the next char; we already know what it is $index++; @@ -2830,7 +2854,7 @@ function PMA_extractFieldSpec($fieldspec) /** * Verifies if this table's engine supports foreign keys * - * @param string $engine + * @param string $engine engine * * @return boolean */ @@ -2847,7 +2871,7 @@ function PMA_foreignkey_supported($engine) /** * Replaces some characters by a displayable equivalent * - * @param string $content + * @param string $content content * * @return string the content with characters replaced */ @@ -2864,11 +2888,13 @@ function PMA_replace_binary_contents($content) /** * Converts GIS data to Well Known Text format * - * @param $data GIS data - * @param $includeSRID Add SRID to the WKT + * @param binary $data GIS data + * @param bool $includeSRID Add SRID to the WKT + * * @return GIS data in Well Know Text format */ -function PMA_asWKT($data, $includeSRID = false) { +function PMA_asWKT($data, $includeSRID = false) +{ // Convert to WKT format $hex = bin2hex($data); $wktsql = "SELECT ASTEXT(x'" . $hex . "')"; @@ -2889,7 +2915,7 @@ function PMA_asWKT($data, $includeSRID = false) { /** * If the string starts with a \r\n pair (0x0d0a) add an extra \n * - * @param string $string + * @param string $string string * * @return string with the chars replaced */ @@ -2907,8 +2933,8 @@ function PMA_duplicateFirstNewline($string) * Get the action word corresponding to a script name * in order to display it as a title in navigation panel * - * @param string $target a valid value for $cfg['LeftDefaultTabTable'], $cfg['DefaultTabTable'] - * or $cfg['DefaultTabDatabase'] + * @param string $target a valid value for $cfg['LeftDefaultTabTable'], + * $cfg['DefaultTabTable'] or $cfg['DefaultTabDatabase'] * * @return array */ @@ -2934,9 +2960,10 @@ function PMA_getTitleForTarget($target) /** * Formats user string, expading @VARIABLES@, accepting strftime format string. * - * @param string $string Text where to do expansion. - * @param function $escape Function to call for escaping variable values. - * @param array $updates Array with overrides for default parameters (obtained from GLOBALS). + * @param string $string Text where to do expansion. + * @param function $escape Function to call for escaping variable values. + * @param array $updates Array with overrides for default parameters + * (obtained from GLOBALS). * * @return string */ @@ -3005,9 +3032,14 @@ function PMA_expandUserString($string, $escape = null, $updates = array()) * function that generates a json output for an ajax request and ends script * execution * - * @param PMA_Message|string $message message string containing the html of the message - * @param bool $success success whether the ajax request was successfull - * @param array $extra_data extra_data optional - any other data as part of the json request + * @param PMA_Message|string $message message string containing the + * html of the message + * @param bool $success success whether the ajax request + * was successfull + * @param array $extra_data extra data optional - + * any other data as part of the json request + * + * @return nothing */ function PMA_ajaxResponse($message, $success = true, $extra_data = array()) { @@ -3016,17 +3048,14 @@ function PMA_ajaxResponse($message, $success = true, $extra_data = array()) $response['success'] = true; if ($message instanceof PMA_Message) { $response['message'] = $message->getDisplay(); - } - else { + } else { $response['message'] = $message; } - } - else { + } else { $response['success'] = false; if ($message instanceof PMA_Message) { $response['error'] = $message->getDisplay(); - } - else { + } else { $response['error'] = $message; } } @@ -3052,9 +3081,11 @@ function PMA_ajaxResponse($message, $success = true, $extra_data = array()) } /** - * Display the form used to browse anywhere on the local server for the file to import + * Display the form used to browse anywhere on the local server for a file to import + * + * @param string $max_upload_size maximum upload size * - * @param $max_upload_size + * @return nothing */ function PMA_browseUploadFile($max_upload_size) { @@ -3070,8 +3101,10 @@ function PMA_browseUploadFile($max_upload_size) /** * Display the form used to select a file to import from the server upload directory * - * @param $import_list - * @param $uploaddir + * @param array $import_list array of import types + * @param string $uploaddir upload directory + * + * @return nothing */ function PMA_selectUploadFile($import_list, $uploaddir) { @@ -3133,8 +3166,8 @@ function PMA_buildActionTitles() * $cfg['ColumnTypes'] and either returns an array (useful for quickly checking * if a datatype is supported) or an HTML snippet that creates a drop-down list. * - * @param bool $html Whether to generate an html snippet or an array - * @param string $selected The value to mark as selected in HTML mode + * @param bool $html Whether to generate an html snippet or an array + * @param string $selected The value to mark as selected in HTML mode * * @return mixed An HTML snippet or an array of datatypes. * @@ -3197,13 +3230,21 @@ function PMA_getSupportedDatatypes($html = false, $selected = '') * * @return array list of datatypes */ - -function PMA_unsupportedDatatypes() { +function PMA_unsupportedDatatypes() +{ $no_support_types = array(); return $no_support_types; } -function PMA_getGISDatatypes($upper_case = false) { +/** + * Return GIS data types + * + * @param bool $upper_case whether to return values in upper case + * + * @return array GIS data types + */ +function PMA_getGISDatatypes($upper_case = false) +{ $gis_data_types = array('geometry', 'point', 'linestring', @@ -3226,8 +3267,11 @@ function PMA_getGISDatatypes($upper_case = false) { * Generates GIS data based on the string passed. * * @param string $gis_string GIS string + * + * @return GIS data enclosed in 'GeomFromText' function */ -function PMA_createGISData($gis_string) { +function PMA_createGISData($gis_string) +{ $gis_string = trim($gis_string); $geom_types = '(POINT|MULTIPOINT|LINESTRING|MULTILINESTRING|POLYGON|MULTIPOLYGON|GEOMETRYCOLLECTION)'; if (preg_match("/^'" . $geom_types . "$.*$',[0-9]*$/i", $gis_string)) { @@ -3253,8 +3297,8 @@ function PMA_createGISData($gis_string) { * @return array names and details of the functions that can be applied on * geometry data typess. */ -function PMA_getGISFunctions($geom_type = null, $binary = true, $display = false) { - +function PMA_getGISFunctions($geom_type = null, $binary = true, $display = false) +{ $funcs = array(); if ($display) { $funcs[] = array('display' => ' '); @@ -3352,9 +3396,9 @@ function PMA_getGISFunctions($geom_type = null, $binary = true, $display = false /** * Creates a dropdown box with MySQL functions for a particular column. * - * @param array $field Data about the column for which - * to generate the dropdown - * @param bool $insert_mode Whether the operation is 'insert' + * @param array $field Data about the column for which + * to generate the dropdown + * @param bool $insert_mode Whether the operation is 'insert' * * @global array $cfg PMA configuration * @global array $analyzed_sql Analyzed SQL query @@ -3458,12 +3502,11 @@ function PMA_getFunctionsForField($field, $insert_mode) * // 'CREATE ROUTINE' privilege or, if not, checks if the * // user has this privilege on database 'mydb'. * - * - * @param string $priv The privilege to check - * @param mixed $db null, to only check global privileges - * string, db name where to also check for privileges - * @param mixed $tbl null, to only check global privileges - * string, db name where to also check for privileges + * @param string $priv The privilege to check + * @param mixed $db null, to only check global privileges + * string, db name where to also check for privileges + * @param mixed $tbl null, to only check global privileges + * string, db name where to also check for privileges * * @return bool */ @@ -3485,21 +3528,31 @@ function PMA_currentUserHasPrivilege($priv, $db = null, $tbl = null) $query = "SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.`%s` " . "WHERE GRANTEE='%s' AND PRIVILEGE_TYPE='%s'"; // Check global privileges first. - if (PMA_DBI_fetch_value(sprintf($query, - 'USER_PRIVILEGES', - $username, - $priv))) { + if (PMA_DBI_fetch_value( + sprintf( + $query, + 'USER_PRIVILEGES', + $username, + $priv + ) + ) + ) { return true; } // If a database name was provided and user does not have the // required global privilege, try database-wise permissions. if ($db !== null) { $query .= " AND TABLE_SCHEMA='%s'"; - if (PMA_DBI_fetch_value(sprintf($query, - 'SCHEMA_PRIVILEGES', - $username, - $priv, - PMA_sqlAddSlashes($db)))) { + if (PMA_DBI_fetch_value( + sprintf( + $query, + 'SCHEMA_PRIVILEGES', + $username, + $priv, + PMA_sqlAddSlashes($db) + ) + ) + ) { return true; } } else { @@ -3511,12 +3564,17 @@ function PMA_currentUserHasPrivilege($priv, $db = null, $tbl = null) // find any valid privileges, try table-wise privileges. if ($tbl !== null) { $query .= " AND TABLE_NAME='%s'"; - if ($retval = PMA_DBI_fetch_value(sprintf($query, - 'TABLE_PRIVILEGES', - $username, - $priv, - PMA_sqlAddSlashes($db), - PMA_sqlAddSlashes($tbl)))) { + if ($retval = PMA_DBI_fetch_value( + sprintf( + $query, + 'TABLE_PRIVILEGES', + $username, + $priv, + PMA_sqlAddSlashes($db), + PMA_sqlAddSlashes($tbl) + ) + ) + ) { return true; } } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16250-ge82d3c7
by Dieter Adriaenssens 21 Aug '11

21 Aug '11

The branch, master has been updated via e82d3c7136425fbe51ed26f8bf95cf932740ddd8 (commit) via 0c6dbb530d4d1b594a72c1f99bf384a46d6f7c92 (commit) from 20a6232173e08810211412c8ed7cfe84b9561b82 (commit) - Log ----------------------------------------------------------------- commit e82d3c7136425fbe51ed26f8bf95cf932740ddd8 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Sun Aug 21 23:36:10 2011 +0200 require/include are statements not functions; no parentheses are required commit 0c6dbb530d4d1b594a72c1f99bf384a46d6f7c92 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Sun Aug 21 23:19:30 2011 +0200 coding style ----------------------------------------------------------------------- Summary of changes: index.php | 2 +- libraries/Advisor.class.php | 2 +- libraries/Config.class.php | 23 ++++++++++----------- libraries/PDF.class.php | 4 +- libraries/core.lib.php | 2 +- libraries/display_import_ajax.lib.php | 2 +- libraries/mult_submits.inc.php | 2 +- libraries/schema/User_Schema.class.php | 2 +- libraries/schema/Visio_Relation_Schema.class.php | 2 +- main.php | 2 +- schema_export.php | 4 +- server_status.php | 6 ++-- test/selenium/PmaSeleniumLoginTest.php | 2 +- test/selenium/PmaSeleniumPrivilegesTest.php | 2 +- test/selenium/PmaSeleniumXssTest.php | 2 +- 15 files changed, 29 insertions(+), 30 deletions(-) diff --git a/index.php b/index.php index 5e0fa36..9add876 100644 --- a/index.php +++ b/index.php @@ -69,7 +69,7 @@ $lang_iso_code = $GLOBALS['available_languages'][$GLOBALS['lang']][1]; // start output -include ('./libraries/header_http.inc.php'); +include './libraries/header_http.inc.php'; ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"> diff --git a/libraries/Advisor.class.php b/libraries/Advisor.class.php index b681155..12fdcad 100644 --- a/libraries/Advisor.class.php +++ b/libraries/Advisor.class.php @@ -22,7 +22,7 @@ class Advisor PMA_DBI_fetch_result('SHOW GLOBAL VARIABLES', 0, 1) ); // Add total memory to variables as well - require_once('libraries/sysinfo.lib.php'); + require_once 'libraries/sysinfo.lib.php'; $sysinfo = getSysInfo(); $memory = $sysinfo->memory(); $this->variables['system_memory'] = $memory['MemTotal']; diff --git a/libraries/Config.class.php b/libraries/Config.class.php index fe24009..7beb4cc 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -219,9 +219,10 @@ class PMA_Config } elseif (preg_match('@rv:1.9(.*)Gecko@', $HTTP_USER_AGENT)) { $this->set('PMA_USR_BROWSER_VER', '1.9'); $this->set('PMA_USR_BROWSER_AGENT', 'GECKO'); - } elseif (preg_match('@Mozilla/([0-9].[0-9]{1,2})@' - , $HTTP_USER_AGENT - , $log_version) + } elseif ( + preg_match('@Mozilla/([0-9].[0-9]{1,2})@', + $HTTP_USER_AGENT, + $log_version) ) { $this->set('PMA_USR_BROWSER_VER', $log_version[1]); $this->set('PMA_USR_BROWSER_AGENT', 'MOZILLA'); @@ -342,10 +343,7 @@ class PMA_Config } $this->set( 'PMA_PHP_INT_VERSION', - (int) sprintf('%d%02d%02d', - $match[1], - $match[2], - $match[3]) + (int) sprintf('%d%02d%02d', $match[1], $match[2], $match[3]) ); } else { $this->set('PMA_PHP_INT_VERSION', 0); @@ -495,7 +493,7 @@ class PMA_Config || $_SESSION['cache'][$cache_key]['config_mtime'] < $config_mtime ) { // load required libraries - require_once './libraries/user_preferences.lib.php'; + include_once './libraries/user_preferences.lib.php'; $prefs = PMA_load_userprefs(); $_SESSION['cache'][$cache_key]['userprefs'] = PMA_apply_userprefs($prefs['config_data']); @@ -668,6 +666,7 @@ class PMA_Config /** * set source + * * @param string $source * * @return nothing @@ -743,9 +742,9 @@ class PMA_Config /** * returns specific config setting * - * @param string $setting + * @param string $setting * - * @return mixed value + * @return mixed value */ function get($setting) { @@ -758,8 +757,8 @@ class PMA_Coettings($prefs['config_data']);;onfig_mtime[1];30.126]�� +r)� +�ϗl�`Зl�u�� +�ʳ +�� +��+`Зl��+Pŗl� ėl�k�� +6 ��!�!�ϗl�`Зl�xt�+PƗl�� +�� +�ϗl�`�� +/Зl��o3+u�� +`3+�d3+�i3+�ʳ +xt�+PƗl� ŗl�k�� +�!�!�ϗl�`Зl�H>�+0Ǘl�� +�� +�ϗl�`�� +/Зl� Зl�Зl�8�� +�p�`Зl�u�� +�ʳ +0Ǘl�Ɨl�k�� +GHIJKMNOP�ϗl�`Зl�H��+�ȗl�� +�� +�ϗl�0o3+u�� +��+�)c+`3+�d3+�i3+�ʳ +H��+�ȗl�Ǘl�k�� +8��+�ȗl�@Ǘl�k�� +(��+�ȗl�pǗl�k�� +��+�ȗl��Ǘl�k�� + �n3+u�� +�i3+ l��xc+e�� +�d3+@ȗl�yxc+e�� +`3+pȗl�Zxc+e�� +�$c+��+�)c+`3+؄�+�d3+�i3+�ʳ +8�� +�.+`Зl�p�b+ ʗl��ȗl�k�� +5678:<=>?@BD�ϗl�`Зl��++`Зl�u�� +�� +�ȗl��.+e�� +�� +�_@f�S Q��l�� +`Зl��++0˗l�ʗl�k�� +u]�� 4Q��U^Qʉ��u��*ēv�ϗl�`Зl�H>� +�4+�їl��+��+��1+/Зl�`їl�Зl��̗l��+u�� +؄�+�җl��+�їl�@͗l��+hЗl�nfig /** * sets configuration variable * - * @param string $setting configuration option - * @param string $value new value for configuration option + * @param string $setting configuration option + * @param string $value new value for configuration option * * @return nothing */ diff --git a/libraries/PDF.class.php b/libraries/PDF.class.php index 3f4f2f1..0be8997 100644 --- a/libraries/PDF.class.php +++ b/libraries/PDF.class.php @@ -77,9 +77,9 @@ class PMA_PDF extends TCPDF */ function Error($error_message = '') { - include('./libraries/header.inc.php'); + include './libraries/header.inc.php'; PMA_Message::error(__('Error while creating PDF:') . ' ' . $error_message)->display(); - include('./libraries/footer.inc.php'); + include './libraries/footer.inc.php'; } /** diff --git a/libraries/core.lib.php b/libraries/core.lib.php index a277f29..29d2f43 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -223,7 +223,7 @@ function PMA_fatalError($error_message, $message_args = null) $GLOBALS['PMA_Config']->removeCookie($GLOBALS['session_name']); } - require('./libraries/error.inc.php'); + require './libraries/error.inc.php'; if (!defined('TESTSUITE')) { exit; diff --git a/libraries/display_import_ajax.lib.php b/libraries/display_import_ajax.lib.php index f0c271d..3495a52 100644 --- a/libraries/display_import_ajax.lib.php +++ b/libraries/display_import_ajax.lib.php @@ -38,7 +38,7 @@ foreach ($plugins as $plugin) { if ($check()) { $_SESSION[$SESSION_KEY]["handler"] = $plugin; - include_once("import/upload/" . $plugin . ".php"); + include_once "import/upload/" . $plugin . ".php"; break; } } diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 3339aaf..6a16541 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -47,7 +47,7 @@ if (! empty($submit_mult) break; case 'export': unset($submit_mult); - require('db_export.php'); + require 'db_export.php'; exit; break; } // end switch diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index 41a2b9e..538ceed 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -585,7 +585,7 @@ class PMA_User_Schema PMA_DBI_select_db($db); - include("./libraries/schema/".ucfirst($export_type)."_Relation_Schema.class.php"); + include "./libraries/schema/".ucfirst($export_type)."_Relation_Schema.class.php"; $obj_schema = eval("new PMA_".ucfirst($export_type)."_Relation_Schema();"); } diff --git a/libraries/schema/Visio_Relation_Schema.class.php b/libraries/schema/Visio_Relation_Schema.class.php index cf7bab2..be5028d 100644 --- a/libraries/schema/Visio_Relation_Schema.class.php +++ b/libraries/schema/Visio_Relation_Schema.class.php @@ -5,7 +5,7 @@ * @package phpMyAdmin */ -include_once("Export_Relation_Schema.class.php"); +include_once "Export_Relation_Schema.class.php"; /** * This Class inherits the XMLwriter class and diff --git a/main.php b/main.php index fd4d448..2ba3267 100644 --- a/main.php +++ b/main.php @@ -354,7 +354,7 @@ if (!function_exists('mcrypt_encrypt') && !$GLOBALS['cfg']['McryptDisableWarning * The data file is created while creating release by ./scripts/remove-incomplete-mo */ if (file_exists('./libraries/language_stats.inc.php')) { - include('./libraries/language_stats.inc.php'); + include './libraries/language_stats.inc.php'; /* * This message is intentionally not translated, because we're * handling incomplete translations here and focus on english diff --git a/schema_export.php b/schema_export.php index 2abe91f..30384e8 100644 --- a/schema_export.php +++ b/schema_export.php @@ -21,7 +21,7 @@ $cfgRelation = PMA_getRelationsParam(); require_once './libraries/transformations.lib.php'; require_once './libraries/Index.class.php'; -include_once("./libraries/schema/Export_Relation_Schema.class.php"); +include_once "./libraries/schema/Export_Relation_Schema.class.php"; /** * get all the export options and verify @@ -38,5 +38,5 @@ $path = PMA_securePath(ucfirst($export_type)); if (!file_exists('./libraries/schema/' . $path . '_Relation_Schema.class.php')) { PMA_Export_Relation_Schema::dieSchema($_POST['chpage'],$export_type,__('File doesn\'t exist')); } -include("./libraries/schema/".$path."_Relation_Schema.class.php"); +include "./libraries/schema/".$path."_Relation_Schema.class.php"; $obj_schema = eval("new PMA_".$path."_Relation_Schema();"); diff --git a/server_status.php b/server_status.php index 1dd4852..5490400 100644 --- a/server_status.php +++ b/server_status.php @@ -123,7 +123,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { case 'cpu': if (!$sysinfo) { - require_once('libraries/sysinfo.lib.php'); + require_once 'libraries/sysinfo.lib.php'; $sysinfo = getSysInfo(); } if (!$cpuload) { @@ -140,7 +140,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { case 'memory': if (!$sysinfo) { - require_once('libraries/sysinfo.lib.php'); + require_once 'libraries/sysinfo.lib.php'; $sysinfo = getSysInfo(); } if (!$memory) { @@ -379,7 +379,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { } if (isset($_REQUEST['advisor'])) { - include('libraries/Advisor.class.php'); + include 'libraries/Advisor.class.php'; $advisor = new Advisor(); exit(json_encode($advisor->run())); } diff --git a/test/selenium/PmaSeleniumLoginTest.php b/test/selenium/PmaSeleniumLoginTest.php index 8f14fce..dc0fc80 100644 --- a/test/selenium/PmaSeleniumLoginTest.php +++ b/test/selenium/PmaSeleniumLoginTest.php @@ -7,7 +7,7 @@ * @group Selenium */ -require_once('PmaSeleniumTestCase.php'); +require_once 'PmaSeleniumTestCase.php'; class PmaSeleniumLoginTest extends PmaSeleniumTestCase diff --git a/test/selenium/PmaSeleniumPrivilegesTest.php b/test/selenium/PmaSeleniumPrivilegesTest.php index a325347..7eddf7a 100644 --- a/test/selenium/PmaSeleniumPrivilegesTest.php +++ b/test/selenium/PmaSeleniumPrivilegesTest.php @@ -7,7 +7,7 @@ * @group Selenium */ -require_once('PmaSeleniumTestCase.php'); +require_once 'PmaSeleniumTestCase.php'; class PmaSeleniumPrivilegesTest extends PmaSeleniumTestCase diff --git a/test/selenium/PmaSeleniumXssTest.php b/test/selenium/PmaSeleniumXssTest.php index 4f551a0..06f960e 100644 --- a/test/selenium/PmaSeleniumXssTest.php +++ b/test/selenium/PmaSeleniumXssTest.php @@ -7,7 +7,7 @@ * @group Selenium */ -require_once('PmaSeleniumTestCase.php'); +require_once 'PmaSeleniumTestCase.php'; class PmaSeleniumXSSTest extends PmaSeleniumTestCase { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16248-g20a6232
by Dieter Adriaenssens 21 Aug '11

21 Aug '11

The branch, master has been updated via 20a6232173e08810211412c8ed7cfe84b9561b82 (commit) via 2f1443c637a1799ff338a37957501448b5976053 (commit) via ded7b7065ccf124e8b48b87fc5569fddaa08df0f (commit) from d299752aabd2b909c7902c31b622ab6ff2a9949f (commit) - Log ----------------------------------------------------------------- commit 20a6232173e08810211412c8ed7cfe84b9561b82 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Sun Aug 21 22:57:23 2011 +0200 remove unused code commit 2f1443c637a1799ff338a37957501448b5976053 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Sun Aug 21 22:54:38 2011 +0200 fix typo commit ded7b7065ccf124e8b48b87fc5569fddaa08df0f Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Sun Aug 21 22:53:43 2011 +0200 coding style, wrapping long lines ----------------------------------------------------------------------- Summary of changes: libraries/Config.class.php | 363 ++++++++++++++++++++++++++++++-------------- 1 files changed, 249 insertions(+), 114 deletions(-) diff --git a/libraries/Config.class.php b/libraries/Config.class.php index f390856..fe24009 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -9,7 +9,7 @@ /** * Load vendor configuration. */ -require('./libraries/vendor_config.php'); +require './libraries/vendor_config.php'; /** * Configuration class @@ -75,7 +75,7 @@ class PMA_Config /** * constructor * - * @param string source to read config from + * @param string $source source to read config from */ function __construct($source = null) { @@ -93,6 +93,8 @@ class PMA_Config /** * sets system and application settings + * + * @return nothing */ function checkSystem() { @@ -118,6 +120,8 @@ class PMA_Config /** * whether to use gzip output compression or not + * + * @return nothing */ function checkOutputCompression() { @@ -130,8 +134,9 @@ class PMA_Config // disable output-buffering (if set to 'auto') for IE6, else enable it. if (strtolower($this->get('OBGzip')) == 'auto') { if ($this->get('PMA_USR_BROWSER_AGENT') == 'IE' - && $this->get('PMA_USR_BROWSER_VER') >= 6 - && $this->get('PMA_USR_BROWSER_VER') < 7) { + && $this->get('PMA_USR_BROWSER_VER') >= 6 + && $this->get('PMA_USR_BROWSER_VER') < 7 + ) { $this->set('OBGzip', false); } else { $this->set('OBGzip', true); @@ -142,7 +147,10 @@ class PMA_Config /** * Determines platform (OS), browser and version of the user * Based on a phpBuilder article: + * * @see http://www.phpbuilder.net/columns/tim20000821.php + * + * @return nothing */ function checkClient() { @@ -170,28 +178,51 @@ class PMA_Config // 2. browser and version // (must check everything else before Mozilla) - if (preg_match('@Opera(/| )([0-9].[0-9]{1,2})@', $HTTP_USER_AGENT, $log_version)) { + if (preg_match( + '@Opera(/| )([0-9].[0-9]{1,2})@', + $HTTP_USER_AGENT, + $log_version) + ) { $this->set('PMA_USR_BROWSER_VER', $log_version[2]); $this->set('PMA_USR_BROWSER_AGENT', 'OPERA'); - } elseif (preg_match('@MSIE ([0-9].[0-9]{1,2})@', $HTTP_USER_AGENT, $log_version)) { + } elseif (preg_match( + '@MSIE ([0-9].[0-9]{1,2})@', + $HTTP_USER_AGENT, + $log_version) + ) { $this->set('PMA_USR_BROWSER_VER', $log_version[1]); $this->set('PMA_USR_BROWSER_AGENT', 'IE'); - } elseif (preg_match('@OmniWeb/([0-9].[0-9]{1,2})@', $HTTP_USER_AGENT, $log_version)) { + } elseif (preg_match( + '@OmniWeb/([0-9].[0-9]{1,2})@', + $HTTP_USER_AGENT, + $log_version) + ) { $this->set('PMA_USR_BROWSER_VER', $log_version[1]); $this->set('PMA_USR_BROWSER_AGENT', 'OMNIWEB'); // Konqueror 2.2.2 says Konqueror/2.2.2 // Konqueror 3.0.3 says Konqueror/3 - } elseif (preg_match('@(Konqueror/)(.*)(;)@', $HTTP_USER_AGENT, $log_version)) { + } elseif (preg_match( + '@(Konqueror/)(.*)(;)@', + $HTTP_USER_AGENT, + $log_version) + ) { $this->set('PMA_USR_BROWSER_VER', $log_version[2]); $this->set('PMA_USR_BROWSER_AGENT', 'KONQUEROR'); - } elseif (preg_match('@Mozilla/([0-9].[0-9]{1,2})@', $HTTP_USER_AGENT, $log_version) - && preg_match('@Safari/([0-9]*)@', $HTTP_USER_AGENT, $log_version2)) { + } elseif (preg_match( + '@Mozilla/([0-9].[0-9]{1,2})@', + $HTTP_USER_AGENT, + $log_version) + && preg_match('@Safari/([0-9]*)@', $HTTP_USER_AGENT, $log_version2) + ) { $this->set('PMA_USR_BROWSER_VER', $log_version[1] . '.' . $log_version2[1]); $this->set('PMA_USR_BROWSER_AGENT', 'SAFARI'); } elseif (preg_match('@rv:1.9(.*)Gecko@', $HTTP_USER_AGENT)) { $this->set('PMA_USR_BROWSER_VER', '1.9'); $this->set('PMA_USR_BROWSER_AGENT', 'GECKO'); - } elseif (preg_match('@Mozilla/([0-9].[0-9]{1,2})@', $HTTP_USER_AGENT, $log_version)) { + } elseif (preg_match('@Mozilla/([0-9].[0-9]{1,2})@' + , $HTTP_USER_AGENT + , $log_version) + ) { $this->set('PMA_USR_BROWSER_VER', $log_version[1]); $this->set('PMA_USR_BROWSER_AGENT', 'MOZILLA'); } else { @@ -202,6 +233,8 @@ class PMA_Config /** * Whether GD2 is present + * + * @return nothing */ function checkGd2() { @@ -243,14 +276,17 @@ class PMA_Config /** * Whether the Web server php is running on is IIS + * + * @return nothing */ function checkWebServer() { if (PMA_getenv('SERVER_SOFTWARE') - // some versions return Microsoft-IIS, some Microsoft/IIS - // we could use a preg_match() but it's slower - && stristr(PMA_getenv('SERVER_SOFTWARE'), 'Microsoft') - && stristr(PMA_getenv('SERVER_SOFTWARE'), 'IIS')) { + // some versions return Microsoft-IIS, some Microsoft/IIS + // we could use a preg_match() but it's slower + && stristr(PMA_getenv('SERVER_SOFTWARE'), 'Microsoft') + && stristr(PMA_getenv('SERVER_SOFTWARE'), 'IIS') + ) { $this->set('PMA_IS_IIS', 1); } else { $this->set('PMA_IS_IIS', 0); @@ -259,6 +295,8 @@ class PMA_Config /** * Whether the os php is running on is windows or not + * + * @return nothing */ function checkWebServerOs() { @@ -278,14 +316,22 @@ class PMA_Config /** * detects PHP version + * + * @return nothing */ function checkPhpVersion() { $match = array(); - if (! preg_match('@([0-9]{1,2}).([0-9]{1,2}).([0-9]{1,2})@', - phpversion(), $match)) { - preg_match('@([0-9]{1,2}).([0-9]{1,2})@', - phpversion(), $match); + if (! preg_match( + '@([0-9]{1,2}).([0-9]{1,2}).([0-9]{1,2})@', + phpversion(), + $match) + ) { + preg_match( + '@([0-9]{1,2}).([0-9]{1,2})@', + phpversion(), + $match + ); } if (isset($match) && ! empty($match[1])) { if (! isset($match[2])) { @@ -294,8 +340,13 @@ class PMA_Config if (! isset($match[3])) { $match[3] = 0; } - $this->set('PMA_PHP_INT_VERSION', - (int) sprintf('%d%02d%02d', $match[1], $match[2], $match[3])); + $this->set( + 'PMA_PHP_INT_VERSION', + (int) sprintf('%d%02d%02d', + $match[1], + $match[2], + $match[3]) + ); } else { $this->set('PMA_PHP_INT_VERSION', 0); } @@ -333,7 +384,8 @@ class PMA_Config * loads configuration from $source, usally the config file * should be called on object creation * - * @param string $source config file + * @param string $source config file + * * @return bool */ function load($source = null) @@ -369,10 +421,26 @@ class PMA_Config * Backward compatibility code */ if (!empty($cfg['DefaultTabTable'])) { - $cfg['DefaultTabTable'] = str_replace('_properties', '', str_replace('tbl_properties.php', 'tbl_sql.php', $cfg['DefaultTabTable'])); + $cfg['DefaultTabTable'] = str_replace( + '_properties', + '', + str_replace( + 'tbl_properties.php', + 'tbl_sql.php', + $cfg['DefaultTabTable'] + ) + ); } if (!empty($cfg['DefaultTabDatabase'])) { - $cfg['DefaultTabDatabase'] = str_replace('_details', '', str_replace('db_details.php', 'db_sql.php', $cfg['DefaultTabDatabase'])); + $cfg['DefaultTabDatabase'] = str_replace( + '_details', + '', + str_replace( + 'db_details.php', + 'db_sql.php', + $cfg['DefaultTabDatabase'] + ) + ); } $this->settings = PMA_array_merge_recursive($this->settings, $cfg); @@ -424,16 +492,20 @@ class PMA_Config $config_mtime = max($this->default_source_mtime, $this->source_mtime); // cache user preferences, use database only when needed if (! isset($_SESSION['cache'][$cache_key]['userprefs']) - || $_SESSION['cache'][$cache_key]['config_mtime'] < $config_mtime) { + || $_SESSION['cache'][$cache_key]['config_mtime'] < $config_mtime + ) { // load required libraries require_once './libraries/user_preferences.lib.php'; $prefs = PMA_load_userprefs(); - $_SESSION['cache'][$cache_key]['userprefs'] = PMA_apply_userprefs($prefs['config_data']); + $_SESSION['cache'][$cache_key]['userprefs'] + = PMA_apply_userprefs($prefs['config_data']); $_SESSION['cache'][$cache_key]['userprefs_mtime'] = $prefs['mtime']; $_SESSION['cache'][$cache_key]['userprefs_type'] = $prefs['type']; $_SESSION['cache'][$cache_key]['config_mtime'] = $config_mtime; } - } else if ($server == 0 || ! isset($_SESSION['cache'][$cache_key]['userprefs'])) { + } elseif ($server == 0 + || ! isset($_SESSION['cache'][$cache_key]['userprefs']) + ) { $this->set('user_preferences', false); return; } @@ -458,30 +530,45 @@ class PMA_Config // save theme $tmanager = $_SESSION['PMA_Theme_Manager']; if ($tmanager->getThemeCookie() || isset($_REQUEST['set_theme'])) { - if ((! isset($config_data['ThemeDefault']) && $tmanager->theme->getId() != 'original') - || isset($config_data['ThemeDefault']) && $config_data['ThemeDefault'] != $tmanager->theme->getId()) { + if ((! isset($config_data['ThemeDefault']) + && $tmanager->theme->getId() != 'original') + || isset($config_data['ThemeDefault']) + && $config_data['ThemeDefault'] != $tmanager->theme->getId() + ) { // new theme was set in common.inc.php - $this->setUserValue(null, 'ThemeDefault', $tmanager->theme->getId(), 'original'); + $this->setUserValue( + null, + 'ThemeDefault', + $tmanager->theme->getId(), + 'original' + ); } } else { // no cookie - read default from settings if ($this->settings['ThemeDefault'] != $tmanager->theme->getId() - && $tmanager->checkTheme($this->settings['ThemeDefault'])) { + && $tmanager->checkTheme($this->settings['ThemeDefault']) + ) { $tmanager->setActiveTheme($this->settings['ThemeDefault']); $tmanager->setThemeCookie(); } } // save font size - if ((! isset($config_data['fontsize']) && $org_fontsize != '82%') - || isset($config_data['fontsize']) && $org_fontsize != $config_data['fontsize']) { + if ((! isset($config_data['fontsize']) + && $org_fontsize != '82%') + || isset($config_data['fontsize']) + && $org_fontsize != $config_data['fontsize'] + ) { $this->setUserValue(null, 'fontsize', $org_fontsize, '82%'); } // save language if (isset($_COOKIE['pma_lang']) || isset($_POST['lang'])) { - if ((! isset($config_data['lang']) && $GLOBALS['lang'] != 'en') - || isset($config_data['lang']) && $GLOBALS['lang'] != $config_data['lang']) { + if ((! isset($config_data['lang']) + && $GLOBALS['lang'] != 'en') + || isset($config_data['lang']) + && $GLOBALS['lang'] != $config_data['lang'] + ) { $this->setUserValue(null, 'lang', $GLOBALS['lang'], 'en'); } } else { @@ -492,16 +579,30 @@ class PMA_Config } // save connection collation - if (isset($_COOKIE['pma_collation_connection']) || isset($_POST['collation_connection'])) { - if ((! isset($config_data['collation_connection']) && $GLOBALS['collation_connection'] != 'utf8_general_ci') - || isset($config_data['collation_connection']) && $GLOBALS['collation_connection'] != $config_data['collation_connection']) { - $this->setUserValue(null, 'collation_connection', $GLOBALS['collation_connection'], 'utf8_general_ci'); + if (isset($_COOKIE['pma_collation_connection']) + || isset($_POST['collation_connection']) + ) { + if ((! isset($config_data['collation_connection']) + && $GLOBALS['collation_connection'] != 'utf8_general_ci') + || isset($config_data['collation_connection']) + && $GLOBALS['collation_connection'] != $config_data['collation_connection'] + ) { + $this->setUserValue( + null, + 'collation_connection', + $GLOBALS['collation_connection'], + 'utf8_general_ci' + ); } } else { // read collation from settings if (isset($config_data['collation_connection'])) { - $GLOBALS['collation_connection'] = $config_data['collation_connection']; - $this->setCookie('pma_collation_connection', $GLOBALS['collation_connection']); + $GLOBALS['collation_connection'] + = $config_data['collation_connection']; + $this->setCookie( + 'pma_collation_connection', + $GLOBALS['collation_connection'] + ); } } } @@ -516,13 +617,15 @@ class PMA_Config * @param string $cfg_path * @param mixed $new_cfg_value * @param mixed $default_value + * + * @return nothing */ function setUserValue($cookie_name, $cfg_path, $new_cfg_value, $default_value = null) { // use permanent user preferences if possible $prefs_type = $this->get('user_preferences'); if ($prefs_type) { - require_once './libraries/user_preferences.lib.php'; + include_once './libraries/user_preferences.lib.php'; if ($default_value === null) { $default_value = PMA_array_read($cfg_path, $this->default); } @@ -544,6 +647,7 @@ class PMA_Config * * @param string $cookie_name * @param mixed $cfg_value + * * @return mixed */ function getUserValue($cookie_name, $cfg_value) @@ -565,6 +669,8 @@ class PMA_Config /** * set source * @param string $source + * + * @return nothing */ function setSource($source) { @@ -573,6 +679,8 @@ class PMA_Config /** * checks if the config folder still exists and terminates app if true + * + * @return nothing */ function checkConfigFolder() { @@ -595,20 +703,16 @@ class PMA_Config } if (! file_exists($this->getSource())) { - // do not trigger error here - // https://sf.net/tracker/?func=detail&aid=1370269&group_id=23067&atid=377408 - /* - trigger_error( - 'phpMyAdmin-ERROR: unkown configuration source: ' . $source, - E_USER_WARNING); - */ $this->source_mtime = 0; return false; } if (! is_readable($this->getSource())) { $this->source_mtime = 0; - die('Existing configuration file (' . $this->getSource() . ') is not readable.'); + die( + 'Existing configuration file (' + . $this->getSource() . ') is not readable.' + ); } return true; @@ -617,6 +721,8 @@ class PMA_Config /** * verifies the permissions on config file (if asked by configuration) * (must be called after config.inc.php has been merged) + * + * @return nothing */ function checkPermissions() { @@ -636,7 +742,9 @@ class PMA_Config /** * returns specific config setting + * * @param string $setting + * * @return mixed value */ function get($setting) @@ -650,12 +758,16 @@ class PMA_Config /** * sets configuration variable * - * @param string $setting configuration option - * @param string $value new value for configuration option + * @param string $setting configuration option + * @param string $value new value for configuration option + * + * @return nothing */ function set($setting, $value) { - if (! isset($this->settings[$setting]) || $this->settings[$setting] != $value) { + if (! isset($this->settings[$setting]) + || $this->settings[$setting] != $value + ) { $this->settings[$setting] = $value; $this->set_mtime = time(); } @@ -663,6 +775,7 @@ class PMA_Config /** * returns source for current config + * * @return string config source */ function getSource() @@ -675,7 +788,9 @@ class PMA_Config * or the theme changes * must also check the pma_fontsize cookie in case there is no * config file - * @return int Summary of unix timestamps and fontsize, to be unique on theme parameters change + * + * @return int Summary of unix timestamps and fontsize, + * to be unique on theme parameters change */ function getThemeUniqueValue() { @@ -712,18 +827,6 @@ class PMA_Config if (strlen($pma_absolute_uri) < 5) { $url = array(); - // At first we try to parse REQUEST_URI, it might contain full URL - /** - * REQUEST_URI contains PATH_INFO too, this is not what we want - * script-php/pathinfo/ - if (PMA_getenv('REQUEST_URI')) { - $url = @parse_url(PMA_getenv('REQUEST_URI')); // produces E_WARNING if it cannot get parsed, e.g. '/foobar:/' - if ($url === false) { - $url = array('path' => $_SERVER['REQUEST_URI']); - } - } - */ - // If we don't have scheme, we didn't have full URL so we need to // dig deeper if (empty($url['scheme'])) { @@ -731,16 +834,19 @@ class PMA_Config if (PMA_getenv('HTTP_SCHEME')) { $url['scheme'] = PMA_getenv('HTTP_SCHEME'); } else { - $url['scheme'] = - PMA_getenv('HTTPS') && strtolower(PMA_getenv('HTTPS')) != 'off' + $url['scheme'] = PMA_getenv('HTTPS') + && strtolower(PMA_getenv('HTTPS')) != 'off' ? 'https' : 'http'; } // Host and port if (PMA_getenv('HTTP_HOST')) { - // Prepend the scheme before using parse_url() since this is not part of the RFC2616 Host request-header - $parsed_url = parse_url($url['scheme'] . '://' . PMA_getenv('HTTP_HOST')); + // Prepend the scheme before using parse_url() since this + // is not part of the RFC2616 Host request-header + $parsed_url = parse_url( + $url['scheme'] . '://' . PMA_getenv('HTTP_HOST') + ); if (!empty($parsed_url['host'])) { $url = $parsed_url; } else { @@ -760,17 +866,7 @@ class PMA_Config // And finally the path could be already set from REQUEST_URI if (empty($url['path'])) { - /** - * REQUEST_URI contains PATH_INFO too, this is not what we want - * script-php/pathinfo/ - if (PMA_getenv('PATH_INFO')) { - $path = parse_url(PMA_getenv('PATH_INFO')); - } else { - // PHP_SELF in CGI often points to cgi executable, so use it - // as last choice - */ - $path = parse_url($GLOBALS['PMA_PHP_SELF']); - //} + $path = parse_url($GLOBALS['PMA_PHP_SELF']); $url['path'] = $path['path']; } } @@ -789,8 +885,9 @@ class PMA_Config $pma_absolute_uri .= $url['host']; // Add port, if it not the default one if (! empty($url['port']) - && (($url['scheme'] == 'http' && $url['port'] != 80) - || ($url['scheme'] == 'https' && $url['port'] != 443))) { + && (($url['scheme'] == 'http' && $url['port'] != 80) + || ($url['scheme'] == 'https' && $url['port'] != 443)) + ) { $pma_absolute_uri .= ':' . $url['port']; } // And finally path, without script name, the 'a' is there not to @@ -814,7 +911,8 @@ class PMA_Config } } - // PHP's dirname function would have returned a dot when $path contains no slash + // PHP's dirname function would have returned a dot + // when $path contains no slash if ($path == '.') { $path = ''; } @@ -843,7 +941,8 @@ class PMA_Config // If URI doesn't start with http:// or https://, we will add // this. if (substr($pma_absolute_uri, 0, 7) != 'http://' - && substr($pma_absolute_uri, 0, 8) != 'https://') { + && substr($pma_absolute_uri, 0, 8) != 'https://' + ) { $pma_absolute_uri = ($is_https ? 'https' : 'http') . ':' . (substr($pma_absolute_uri, 0, 2) == '//' ? '' : '//') @@ -855,19 +954,25 @@ class PMA_Config /** * check selected collation_connection + * * @todo check validity of $_REQUEST['collation_connection'] + * + * @return nothing */ function checkCollationConnection() { if (! empty($_REQUEST['collation_connection'])) { - $this->set('collation_connection', - strip_tags($_REQUEST['collation_connection'])); + $this->set( + 'collation_connection', + strip_tags($_REQUEST['collation_connection']) + ); } } /** * checks for font size configuration, and sets font size as requested by user * + * @return nothing */ function checkFontsize() { @@ -895,8 +1000,8 @@ class PMA_Config /** * checks if upload is enabled * + * @return nothing */ - function checkUpload() { if (ini_get('file_uploads')) { @@ -916,6 +1021,8 @@ class PMA_Config * Used with permission from Moodle (http://moodle.org) by Martin Dougiamas * * this section generates $max_upload_size in bytes + * + * @return nothing */ function checkUploadSize() { @@ -924,8 +1031,10 @@ class PMA_Config } if ($postsize = ini_get('post_max_size')) { - $this->set('max_upload_size', - min(PMA_get_real_size($filesize), PMA_get_real_size($postsize))); + $this->set( + 'max_upload_size', + min(PMA_get_real_size($filesize), PMA_get_real_size($postsize)) + ); } else { $this->set('max_upload_size', PMA_get_real_size($filesize)); } @@ -933,6 +1042,8 @@ class PMA_Config /** * check for https + * + * @return nothing */ function checkIsHttps() { @@ -952,8 +1063,7 @@ class PMA_Config $url = parse_url($this->get('PmaAbsoluteUri')); - if (isset($url['scheme']) - && $url['scheme'] == 'https') { + if (isset($url['scheme']) && $url['scheme'] == 'https') { $is_https = true; } else { $is_https = false; @@ -978,7 +1088,8 @@ class PMA_Config // At first we try to parse REQUEST_URI, it might contain full URL, if (PMA_getenv('REQUEST_URI')) { - $url = @parse_url(PMA_getenv('REQUEST_URI')); // produces E_WARNING if it cannot get parsed, e.g. '/foobar:/' + // produces E_WARNING if it cannot get parsed, e.g. '/foobar:/' + $url = @parse_url(PMA_getenv('REQUEST_URI')); if ($url === false) { $url = array(); } @@ -998,8 +1109,7 @@ class PMA_Config } } - if (isset($url['scheme']) - && $url['scheme'] == 'https') { + if (isset($url['scheme']) && $url['scheme'] == 'https') { $is_https = true; } else { $is_https = false; @@ -1010,6 +1120,8 @@ class PMA_Config /** * detect correct cookie path + * + * @return nothing */ function checkCookiePath() { @@ -1036,6 +1148,8 @@ class PMA_Config /** * enables backward compatibility + * + * @return nothing */ function enableBc() { @@ -1071,6 +1185,8 @@ class PMA_Config /** * @todo finish + * + * @return nothing */ function save() { @@ -1080,8 +1196,9 @@ class PMA_Config * returns options for font size selection * * @static - * @param string $current_size current selected font size with unit - * @return array selectable font sizes + * @param string $current_size current selected font size with unit + * + * @return array selectable font sizes */ static protected function _getFontsizeOptions($current_size = '82%') { @@ -1127,7 +1244,8 @@ class PMA_Config $option_inc += $factor; $option_dec -= $factor; if (isset($factors[$key + 1]) - && $option_inc >= $value + $factors[$key + 1]) { + && $option_inc >= $value + $factors[$key + 1] + ) { break; } } @@ -1140,8 +1258,9 @@ class PMA_Config * returns html selectbox for font sizes * * @static - * @param string $current_size currently slected font size with unit - * @return string html selectbox + * @param string $current_size currently slected font size with unit + * + * @return string html selectbox */ static protected function _getFontsizeSelection() { @@ -1174,8 +1293,9 @@ class PMA_Config * return complete font size selection form * * @static - * @param string $current_size currently slected font size with unit - * @return string html selectbox + * @param string $current_size currently slected font size with unit + * + * @return string html selectbox */ static public function getFontsizeForm() { @@ -1192,25 +1312,33 @@ class PMA_Config /** * removes cookie * - * @param string $cookie name of cookie to remove - * @return boolean result of setcookie() + * @param string $cookie name of cookie to remove + * + * @return boolean result of setcookie() */ function removeCookie($cookie) { - return setcookie($cookie, '', time() - 3600, - $this->getCookiePath(), '', $this->isHttps()); + return setcookie( + $cookie, + '', + time() - 3600, + $this->getCookiePath(), + '', + $this->isHttps() + ); } /** * sets cookie if value is different from current cokkie value, * or removes if value is equal to default * - * @param string $cookie name of cookie to remove - * @param mixed $value new cookie value - * @param string $default default value - * @param int $validity validity of cookie in seconds (default is one month) - * @param bool $httponlt whether cookie is only for HTTP (and not for scripts) - * @return boolean result of setcookie() + * @param string $cookie name of cookie to remove + * @param mixed $value new cookie value + * @param string $default default value + * @param int $validity validity of cookie in seconds (default is one month) + * @param bool $httponly whether cookie is only for HTTP (and not for scripts) + * + * @return boolean result of setcookie() */ function setCookie($cookie, $value, $default = null, $validity = null, $httponly = true) { @@ -1239,8 +1367,15 @@ class PMA_Config } else { $v = time() + $validity; } - return setcookie($cookie, $value, $v, - $this->getCookiePath(), '', $this->isHttps(), $httponly); + return setcookie( + $cookie, + $value, + $v, + $this->getCookiePath(), + '', + $this->isHttps(), + $httponly + ); } // cookie has already $value as value hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16245-gd299752
by Madhura Jayaratne 21 Aug '11

21 Aug '11

The branch, master has been updated via d299752aabd2b909c7902c31b622ab6ff2a9949f (commit) via 4d77e9564093ce5d8cc073147642cd4f22d5e734 (commit) from 2a1a204bd607396e24f5ce741d4fa994377a5ddc (commit) - Log ----------------------------------------------------------------- commit d299752aabd2b909c7902c31b622ab6ff2a9949f Merge: 4d77e95 2a1a204 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Mon Aug 22 00:46:21 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 4d77e9564093ce5d8cc073147642cd4f22d5e734 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Mon Aug 22 00:44:51 2011 +0530 Coding style improvements for Svg_Relation_Schema ----------------------------------------------------------------------- Summary of changes: libraries/schema/Svg_Relation_Schema.class.php | 444 +++++++++++++++--------- 1 files changed, 277 insertions(+), 167 deletions(-) diff --git a/libraries/schema/Svg_Relation_Schema.class.php b/libraries/schema/Svg_Relation_Schema.class.php index b405b22..292a78c 100644 --- a/libraries/schema/Svg_Relation_Schema.class.php +++ b/libraries/schema/Svg_Relation_Schema.class.php @@ -5,7 +5,7 @@ * @package phpMyAdmin */ -include_once("Export_Relation_Schema.class.php"); +require_once 'Export_Relation_Schema.class.php'; /** * This Class inherits the XMLwriter class and @@ -14,7 +14,6 @@ include_once("Export_Relation_Schema.class.php"); * @access public * @see http://php.net/manual/en/book.xmlwriter.php */ - class PMA_SVG extends XMLWriter { public $title; @@ -44,15 +43,19 @@ class PMA_SVG extends XMLWriter * Create the XML document */ - $this->startDocument('1.0','UTF-8'); - $this->startDtd('svg','-//W3C//DTD SVG 1.1//EN','http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'); + $this->startDocument('1.0', 'UTF-8'); + $this->startDtd( + 'svg', '-//W3C//DTD SVG 1.1//EN', + 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' + ); $this->endDtd(); } /** * Set document title * - * @param string value sets the title text + * @param string $value sets the title text + * * @return void * @access public */ @@ -64,7 +67,8 @@ class PMA_SVG extends XMLWriter /** * Set document author * - * @param string value sets the author + * @param string $value sets the author + * * @return void * @access public */ @@ -76,7 +80,8 @@ class PMA_SVG extends XMLWriter /** * Set document font * - * @param string value sets the font e.g Arial, Sans-serif etc + * @param string $value sets the font e.g Arial, Sans-serif etc + * * @return void * @access public */ @@ -99,7 +104,8 @@ class PMA_SVG extends XMLWriter /** * Set document font size * - * @param string value sets the font size in pixels + * @param string $value sets the font size in pixels + * * @return void * @access public */ @@ -126,10 +132,12 @@ class PMA_SVG extends XMLWriter * which contains all the attributes and namespace that needed * to define the svg document * - * @param integer width total width of the Svg document - * @param integer height total height of the Svg document + * @param integer $width total width of the Svg document + * @param integer $height total height of the Svg document + * * @return void * @access public + * * @see XMLWriter::startElement(),XMLWriter::writeAttribute() */ function startSvgDoc($width,$height) @@ -161,6 +169,8 @@ class PMA_SVG extends XMLWriter * Svg document saved in .svg extension and can be * easily changeable by using any svg IDE * + * @param string $fileName file name + * * @return void * @access public * @see XMLWriter::startElement(),XMLWriter::writeAttribute() @@ -180,31 +190,32 @@ class PMA_SVG extends XMLWriter * and other elements who have x,y co-ordinates are drawn. * specify their width and height and can give styles too. * - * @param string name Svg element name - * @param integer x The x attribute defines the left position of the element - (e.g. x="0" places the element 0 pixels from the left of - the browser window) - * @param integer y The y attribute defines the top position of the element - (e.g. y="0" places the element 0 pixels from the top of - the browser window) - * @param integer width The width attribute defines the width the element - * @param integer height The height attribute defines the height the element - * @param string text The text attribute defines the text the element - * @param string styles The style attribute defines the style the element - styles can be defined like CSS styles + * @param string $name Svg element name + * @param integer $x The x attr defines the left position of the element + * (e.g. x="0" places the element 0 pixels from the left of the browser window) + * @param integer $y The y attribute defines the top position of the element + * (e.g. y="0" places the element 0 pixels from the top of the browser window) + * @param integer $width The width attribute defines the width the element + * @param integer $height The height attribute defines the height the element + * @param string $text The text attribute defines the text the element + * @param string $styles The style attribute defines the style the element + * styles can be defined like CSS styles + * * @return void * @access public - * @see XMLWriter::startElement(),XMLWriter::writeAttribute(),XMLWriter::text(),XMLWriter::endElement() + * + * @see XMLWriter::startElement(), XMLWriter::writeAttribute(), + * XMLWriter::text(), XMLWriter::endElement() */ - function printElement($name,$x,$y,$width = '',$height = '',$text = '',$styles = '') + function printElement($name, $x, $y, $width = '', $height = '', $text = '', $styles = '') { $this->startElement($name); - $this->writeAttribute('width',$width); - $this->writeAttribute('height',$height); + $this->writeAttribute('width', $width); + $this->writeAttribute('height', $height); $this->writeAttribute('x', $x); $this->writeAttribute('y', $y); $this->writeAttribute('style', $styles); - if(isset($text)){ + if (isset($text)) { $this->writeAttribute('font-family', $this->font); $this->writeAttribute('font-size', $this->fontSize); $this->text($text); @@ -219,22 +230,25 @@ class PMA_SVG extends XMLWriter * arrows are also drawn by specify its start and ending * co-ordinates * - * @param string name Svg element name i.e line - * @param integer x1 The x1 attribute defines the start of the line on the x-axis - * @param integer y1 The y1 attribute defines the start of the line on the y-axis - * @param integer x2 The x2 attribute defines the end of the line on the x-axis - * @param integer y2 The y2 attribute defines the end of the line on the y-axis - * @param string styles The style attribute defines the style the element - styles can be defined like CSS styles + * @param string $name Svg element name i.e line + * @param integer $x1 Defines the start of the line on the x-axis + * @param integer $y1 Defines the start of the line on the y-axis + * @param integer $x2 Defines the end of the line on the x-axis + * @param integer $y2 Defines the end of the line on the y-axis + * @param string $styles The style attribute defines the style the element + * styles can be defined like CSS styles + * * @return void * @access public - * @see XMLWriter::startElement(),XMLWriter::writeAttribute(),XMLWriter::endElement() + * + * @see XMLWriter::startElement(), XMLWriter::writeAttribute(), + * XMLWriter::endElement() */ function printElementLine($name,$x1,$y1,$x2,$y2,$styles) { $this->startElement($name); - $this->writeAttribute('x1',$x1); - $this->writeAttribute('y1',$y1); + $this->writeAttribute('x1', $x1); + $this->writeAttribute('y1', $y1); $this->writeAttribute('x2', $x2); $this->writeAttribute('y2', $y2); $this->writeAttribute('style', $styles); @@ -250,9 +264,10 @@ class PMA_SVG extends XMLWriter * * This is a bit hardcore method. I didn't found any other than this. * - * @param string text string that width will be calculated - * @param integer font name of the font like Arial,sans-serif etc - * @param integer fontSize size of font + * @param string $text string that width will be calculated + * @param integer $font name of the font like Arial,sans-serif etc + * @param integer $fontSize size of font + * * @return integer width of the text * @access public */ @@ -262,22 +277,22 @@ class PMA_SVG extends XMLWriter * Start by counting the width, giving each character a modifying value */ $count = 0; - $count = $count + ((strlen($text) - strlen(str_replace(array("i","j","l"),"",$text)))*0.23);//ijl - $count = $count + ((strlen($text) - strlen(str_replace(array("f"),"",$text)))*0.27);//f - $count = $count + ((strlen($text) - strlen(str_replace(array("t","I"),"",$text)))*0.28);//tI - $count = $count + ((strlen($text) - strlen(str_replace(array("r"),"",$text)))*0.34);//r - $count = $count + ((strlen($text) - strlen(str_replace(array("1"),"",$text)))*0.49);//1 - $count = $count + ((strlen($text) - strlen(str_replace(array("c","k","s","v","x","y","z","J"),"",$text)))*0.5);//cksvxyzJ - $count = $count + ((strlen($text) - strlen(str_replace(array("a","b","d","e","g","h","n","o","p","q","u","L","0","2","3","4","5","6","7","8","9"),"",$text)))*0.56);//abdeghnopquL023456789 - $count = $count + ((strlen($text) - strlen(str_replace(array("F","T","Z"),"",$text)))*0.61);//FTZ - $count = $count + ((strlen($text) - strlen(str_replace(array("A","B","E","K","P","S","V","X","Y"),"",$text)))*0.67);//ABEKPSVXY - $count = $count + ((strlen($text) - strlen(str_replace(array("w","C","D","H","N","R","U"),"",$text)))*0.73);//wCDHNRU - $count = $count + ((strlen($text) - strlen(str_replace(array("G","O","Q"),"",$text)))*0.78);//GOQ - $count = $count + ((strlen($text) - strlen(str_replace(array("m","M"),"",$text)))*0.84);//mM - $count = $count + ((strlen($text) - strlen(str_replace("W","",$text)))*.95);//W - $count = $count + ((strlen($text) - strlen(str_replace(" ","",$text)))*.28);//" " - $text = str_replace(" ","",$text);//remove the " "'s - $count = $count + (strlen(preg_replace("/[a-z0-9]/i","",$text))*0.3); //all other chrs + $count = $count + ((strlen($text) - strlen(str_replace(array("i", "j", "l"), "", $text))) * 0.23);//ijl + $count = $count + ((strlen($text) - strlen(str_replace(array("f"), "", $text))) * 0.27);//f + $count = $count + ((strlen($text) - strlen(str_replace(array("t", "I"), "", $text))) * 0.28);//tI + $count = $count + ((strlen($text) - strlen(str_replace(array("r"), "", $text))) * 0.34);//r + $count = $count + ((strlen($text) - strlen(str_replace(array("1"), "", $text))) * 0.49);//1 + $count = $count + ((strlen($text) - strlen(str_replace(array("c", "k", "s", "v", "x", "y", "z", "J"), "", $text))) * 0.5);//cksvxyzJ + $count = $count + ((strlen($text) - strlen(str_replace(array("a", "b", "d", "e", "g", "h", "n", "o", "p", "q", "u", "L", "0", "2", "3", "4", "5", "6", "7", "8", "9"), "", $text))) * 0.56);//abdeghnopquL023456789 + $count = $count + ((strlen($text) - strlen(str_replace(array("F", "T", "Z"), "", $text))) * 0.61);//FTZ + $count = $count + ((strlen($text) - strlen(str_replace(array("A", "B", "E", "K", "P", "S", "V", "X", "Y"), "", $text))) * 0.67);//ABEKPSVXY + $count = $count + ((strlen($text) - strlen(str_replace(array("w", "C", "D", "H", "N", "R", "U"), "", $text))) * 0.73);//wCDHNRU + $count = $count + ((strlen($text) - strlen(str_replace(array("G", "O", "Q"), "", $text))) * 0.78);//GOQ + $count = $count + ((strlen($text) - strlen(str_replace(array("m", "M"), "", $text))) * 0.84);//mM + $count = $count + ((strlen($text) - strlen(str_replace("W", "", $text))) * .95);//W + $count = $count + ((strlen($text) - strlen(str_replace(" ", "", $text))) * .28);//" " + $text = str_replace(" ", "", $text);//remove the " "'s + $count = $count + (strlen(preg_replace("/[a-z0-9]/i", "", $text)) * 0.3); //all other chrs $modifier = 1; $font = strtolower($font); @@ -287,7 +302,7 @@ class PMA_SVG extends XMLWriter */ case 'arial': case 'sans-serif': - break; + break; /* * .92 modifer for time, serif, brushscriptstd, and californian fb */ @@ -296,13 +311,13 @@ class PMA_SVG extends XMLWriter case 'brushscriptstd': case 'californian fb': $modifier = .92; - break; + break; /* * 1.23 modifier for broadway */ case 'broadway': $modifier = 1.23; - break; + break; } $textWidth = $count*$fontSize; return ceil($textWidth*$modifier); @@ -338,29 +353,39 @@ class Table_Stats /** * The "Table_Stats" constructor * - * @param string table_name The table name - * @param integer ff The font size - * @param integer samewidth The max. with among tables - * @param boolean show_keys Whether to display keys or not - * @param boolean show_info Whether to display table position or not + * @param string $tableName The table name + * @param string $font Font face + * @param integer $fontSize The font size + * @param integer $pageNumber Page number + * @param integer &$same_wide_width The max. with among tables + * @param boolean $showKeys Whether to display keys or not + * @param boolean $showInfo Whether to display table position or not + * * @global object The current SVG image document * @global integer The current page number (from the - * $cfg['Servers'][$i]['table_coords'] table) + * $cfg['Servers'][$i]['table_coords'] table) * @global array The relations settings * @global string The current db name + * * @access private + * * @see PMA_SVG, Table_Stats::Table_Stats_setWidth, - Table_Stats::Table_Stats_setHeight + * Table_Stats::Table_Stats_setHeight */ - function __construct($tableName, $font, $fontSize, $pageNumber, &$same_wide_width, $showKeys = false, $showInfo = false) + function __construct($tableName, $font, $fontSize, $pageNumber, + &$same_wide_width, $showKeys = false, $showInfo = false) { global $svg, $cfgRelation, $db; $this->_tableName = $tableName; $sql = 'DESCRIBE ' . PMA_backquote($tableName); $result = PMA_DBI_try_query($sql, null, PMA_DBI_QUERY_STORE); - if (!$result || !PMA_DBI_num_rows($result)) { - $svg->dieSchema($pageNumber,"SVG",sprintf(__('The %s table doesn\'t exist!'), $tableName)); + if (! $result || ! PMA_DBI_num_rows($result)) { + $svg->dieSchema( + $pageNumber, + "SVG", + sprintf(__('The %s table doesn\'t exist!'), $tableName) + ); } /* @@ -372,7 +397,10 @@ class Table_Stats $indexes = PMA_Index::getFromTable($this->_tableName, $db); $all_columns = array(); foreach ($indexes as $index) { - $all_columns = array_merge($all_columns, array_flip(array_keys($index->getColumns()))); + $all_columns = array_merge( + $all_columns, + array_flip(array_keys($index->getColumns())) + ); } $this->fields = array_keys($all_columns); } else { @@ -388,21 +416,29 @@ class Table_Stats // setWidth must me after setHeight, because title // can include table height which changes table width - $this->_setWidthTable($font,$fontSize); + $this->_setWidthTable($font, $fontSize); if ($same_wide_width < $this->width) { $same_wide_width = $this->width; } // x and y $sql = 'SELECT x, y FROM ' - . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) + . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' + . PMA_backquote($cfgRelation['table_coords']) . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' . ' AND table_name = \'' . PMA_sqlAddSlashes($tableName) . '\'' . ' AND pdf_page_number = ' . $pageNumber; $result = PMA_query_as_controluser($sql, false, PMA_DBI_QUERY_STORE); if (!$result || !PMA_DBI_num_rows($result)) { - $svg->dieSchema($pageNumber,"SVG",sprintf(__('Please configure the coordinates for table %s'), $tableName)); + $svg->dieSchema( + $pageNumber, + "SVG", + sprintf( + __('Please configure the coordinates for table %s'), + $tableName + ) + ); } list($this->x, $this->y) = PMA_DBI_fetch_row($result); $this->x = (double) $this->x; @@ -410,7 +446,11 @@ class Table_Stats // displayfield $this->displayfield = PMA_getDisplayField($db, $tableName); // index - $result = PMA_DBI_query('SHOW INDEX FROM ' . PMA_backquote($tableName) . ';', null, PMA_DBI_QUERY_STORE); + $result = PMA_DBI_query( + 'SHOW INDEX FROM ' . PMA_backquote($tableName) . ';', + null, + PMA_DBI_QUERY_STORE + ); if (PMA_DBI_num_rows($result) > 0) { while ($row = PMA_DBI_fetch_assoc($result)) { if ($row['Key_name'] == 'PRIMARY') { @@ -428,16 +468,23 @@ class Table_Stats */ private function _getTitle() { - return ($this->_showInfo ? sprintf('%.0f', $this->width) . 'x' . sprintf('%.0f', $this->heightCell) : '') . ' ' . $this->_tableName; + return ($this->_showInfo + ? sprintf('%.0f', $this->width) . 'x' . sprintf('%.0f', $this->heightCell) + : '' + ) . ' ' . $this->_tableName; } /** * Sets the width of the table * - * @param string font The font size - * @param integer fontSize The font size + * @param string $font The font size + * @param integer $fontSize The font size + * * @global object The current SVG image document + * + * @return nothing * @access private + * * @see PMA_SVG */ private function _setWidthTable($font,$fontSize) @@ -445,14 +492,18 @@ class Table_Stats global $svg; foreach ($this->fields as $field) { - $this->width = max($this->width, $svg->getStringWidth($field,$font,$fontSize)); + $this->width = max( + $this->width, + $svg->getStringWidth($field, $font, $fontSize) + ); } - $this->width += $svg->getStringWidth(' ',$font,$fontSize); + $this->width += $svg->getStringWidth(' ', $font, $fontSize); + /* * it is unknown what value must be added, because * table title is affected by the tabe width value */ - while ($this->width < $svg->getStringWidth($this->_getTitle(),$font,$fontSize)) { + while ($this->width < $svg->getStringWidth($this->_getTitle(), $font, $fontSize)) { $this->width += 7; } } @@ -460,6 +511,9 @@ class Table_Stats /** * Sets the height of the table * + * @param integer $fontSize font size + * + * @return nothing * @access private */ function _setHeightTable($fontSize) @@ -471,45 +525,46 @@ class Table_Stats /** * draw the table * - * @param boolean showColor Whether to display color + * @param boolean $showColor Whether to display color + * * @global object The current SVG image document + * * @access public + * @return nothing + * * @see PMA_SVG,PMA_SVG::printElement */ public function tableDraw($showColor) { global $svg; //echo $this->_tableName.'<br />'; - $svg->printElement('rect',$this->x,$this->y, - $this->width,$this->heightCell, - NULL,'fill:red;stroke:black;' - ); - $svg->printElement('text',$this->x + 5,$this->y+ 14, - $this->width,$this->heightCell, - $this->_getTitle(), - 'fill:none;stroke:black;' - ); + $svg->printElement( + 'rect', $this->x, $this->y, $this->width, + $this->heightCell, null, 'fill:red;stroke:black;' + ); + $svg->printElement( + 'text', $this->x + 5, $this->y+ 14, $this->width, $this->heightCell, + $this->_getTitle(), 'fill:none;stroke:black;' + ); foreach ($this->fields as $field) { - $this->currentCell += $this->heightCell; - $showColor = 'none'; - if ($showColor) { - if (in_array($field, $this->primary)) { - $showColor = '#0c0'; - } - if ($field == $this->displayfield) { - $showColor = 'none'; - } + $this->currentCell += $this->heightCell; + $showColor = 'none'; + if ($showColor) { + if (in_array($field, $this->primary)) { + $showColor = '#0c0'; + } + if ($field == $this->displayfield) { + $showColor = 'none'; } - $svg->printElement('rect', $this->x,$this->y + $this->currentCell, - $this->width, $this->heightCell, - NULL, - 'fill:'.$showColor.';stroke:black;' - ); - $svg->printElement('text', $this->x + 5, $this->y + 14 + $this->currentCell, - $this->width, $this->heightCell, - $field, - 'fill:none;stroke:black;' - ); + } + $svg->printElement( + 'rect', $this->x, $this->y + $this->currentCell, $this->width, + $this->heightCell, null, 'fill:'.$showColor.';stroke:black;' + ); + $svg->printElement( + 'text', $this->x + 5, $this->y + 14 + $this->currentCell, + $this->width, $this->heightCell, $field, 'fill:none;stroke:black;' + ); } } } @@ -540,10 +595,13 @@ class Relation_Stats /** * The "Relation_Stats" constructor * - * @param string master_table The master table name - * @param string master_field The relation field in the master table - * @param string foreign_table The foreign table name - * @param string foreigh_field The relation field in the foreign table + * @param string $master_table The master table name + * @param string $master_field The relation field in the master table + * @param string $foreign_table The foreign table name + * @param string $foreign_field The relation field in the foreign table + * + * @return nothing + * * @see Relation_Stats::_getXy */ function __construct($master_table, $master_field, $foreign_table, $foreign_field) @@ -594,8 +652,9 @@ class Relation_Stats /** * Gets arrows coordinates * - * @param string table The current table name - * @param string column The relation column name + * @param string $table The current table name + * @param string $column The relation column name + * * @return array Arrows coordinates * @access private */ @@ -603,16 +662,23 @@ class Relation_Stats { $pos = array_search($column, $table->fields); // x_left, x_right, y - return array($table->x, $table->x + $table->width, $table->y + ($pos + 1.5) * $table->heightCell); + return array( + $table->x, + $table->x + $table->width, + $table->y + ($pos + 1.5) * $table->heightCell + ); } /** - * draws relation links and arrows - * shows foreign key relations + * draws relation links and arrows shows foreign key relations * - * @param boolean changeColor Whether to use one color per relation or not - * @global object The current SVG image document + * @param boolean $changeColor Whether to use one color per relation or not + * + * @global object The current SVG image document + * + * @return nothing * @access public + * * @see PMA_SVG */ public function relationDraw($changeColor) @@ -635,38 +701,46 @@ class Relation_Stats $color = 'black'; } - $svg->printElementLine('line',$this->xSrc,$this->ySrc, - $this->xSrc + $this->srcDir * $this->wTick,$this->ySrc, - 'fill:'.$color.';stroke:black;stroke-width:2;' - ); - $svg->printElementLine('line',$this->xDest + $this->destDir * $this->wTick, $this->yDest, - $this->xDest, $this->yDest, - 'fill:'.$color.';stroke:black;stroke-width:2;' - ); - $svg->printElementLine('line',$this->xSrc + $this->srcDir * $this->wTick,$this->ySrc, + $svg->printElementLine( + 'line', $this->xSrc, $this->ySrc, + $this->xSrc + $this->srcDir * $this->wTick, $this->ySrc, + 'fill:' . $color . ';stroke:black;stroke-width:2;' + ); + $svg->printElementLine( + 'line', $this->xDest + $this->destDir * $this->wTick, + $this->yDest, $this->xDest, $this->yDest, + 'fill:' . $color . ';stroke:black;stroke-width:2;' + ); + $svg->printElementLine( + 'line', $this->xSrc + $this->srcDir * $this->wTick, $this->ySrc, $this->xDest + $this->destDir * $this->wTick, $this->yDest, - 'fill:'.$color.';stroke:'.$color.';stroke-width:1;' - ); + 'fill:' . $color . ';stroke:' . $color . ';stroke-width:1;' + ); $root2 = 2 * sqrt(2); - $svg->printElementLine('line',$this->xSrc + $this->srcDir * $this->wTick * 0.75, $this->ySrc, - $this->xSrc + $this->srcDir * (0.75 - 1 / $root2) * $this->wTick , - $this->ySrc + $this->wTick / $root2 , - 'fill:'.$color.';stroke:black;stroke-width:2;' - ); - $svg->printElementLine('line',$this->xSrc + $this->srcDir * $this->wTick * 0.75, $this->ySrc, - $this->xSrc + $this->srcDir * (0.75 - 1 / $root2) * $this->wTick , - $this->ySrc - $this->wTick / $root2 , - 'fill:'.$color.';stroke:black;stroke-width:2;' - ); - $svg->printElementLine('line',$this->xDest + $this->destDir * $this->wTick / 2 , $this->yDest , + $svg->printElementLine( + 'line', $this->xSrc + $this->srcDir * $this->wTick * 0.75, $this->ySrc, + $this->xSrc + $this->srcDir * (0.75 - 1 / $root2) * $this->wTick, + $this->ySrc + $this->wTick / $root2, + 'fill:' . $color . ';stroke:black;stroke-width:2;' + ); + $svg->printElementLine( + 'line', $this->xSrc + $this->srcDir * $this->wTick * 0.75, $this->ySrc, + $this->xSrc + $this->srcDir * (0.75 - 1 / $root2) * $this->wTick, + $this->ySrc - $this->wTick / $root2, + 'fill:' . $color . ';stroke:black;stroke-width:2;' + ); + $svg->printElementLine( + 'line', $this->xDest + $this->destDir * $this->wTick / 2, $this->yDest, $this->xDest + $this->destDir * (0.5 + 1 / $root2) * $this->wTick, - $this->yDest + $this->wTick / $root2 , - 'fill:'.$color.';stroke:black;stroke-width:2;'); - $svg->printElementLine('line',$this->xDest + $this->destDir * $this->wTick / 2 , - $this->yDest , $this->xDest + $this->destDir * (0.5 + 1 / $root2) * $this->wTick , - $this->yDest - $this->wTick / $root2 , - 'fill:'.$color.';stroke:black;stroke-width:2;' - ); + $this->yDest + $this->wTick / $root2, + 'fill:' . $color . ';stroke:black;stroke-width:2;' + ); + $svg->printElementLine( + 'line', $this->xDest + $this->destDir * $this->wTick / 2, $this->yDest, + $this->xDest + $this->destDir * (0.5 + 1 / $root2) * $this->wTick, + $this->yDest - $this->wTick / $root2, + 'fill:' . $color . ';stroke:black;stroke-width:2;' + ); } } /* @@ -724,22 +798,31 @@ class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema $this->setExportType($_POST['export_type']); $svg = new PMA_SVG(); - $svg->setTitle(sprintf(__('Schema of the %s database - Page %s'), $db, $this->pageNumber)); + $svg->setTitle( + sprintf( + __('Schema of the %s database - Page %s'), + $db, + $this->pageNumber + ) + ); $svg->SetAuthor('phpMyAdmin ' . PMA_VERSION); $svg->setFont('Arial'); $svg->setFontSize('16px'); - $svg->startSvgDoc('1000px','1000px'); - $alltables = $this->getAllTables($db,$this->pageNumber); + $svg->startSvgDoc('1000px', '1000px'); + $alltables = $this->getAllTables($db, $this->pageNumber); foreach ($alltables AS $table) { if (! isset($this->tables[$table])) { - $this->tables[$table] = new Table_Stats($table,$svg->getFont(),$svg->getFontSize(), $this->pageNumber, $this->_tablewidth, $this->showKeys, $this->tableDimension); + $this->tables[$table] = new Table_Stats( + $table, $svg->getFont(), $svg->getFontSize(), $this->pageNumber, + $this->_tablewidth, $this->showKeys, $this->tableDimension + ); } if ($this->sameWide) { $this->tables[$table]->width = $this->_tablewidth; } - $this->_setMinMax($this->tables[$table]); + $this->_setMinMax($this->tables[$table]); } $seen_a_relation = false; foreach ($alltables as $one_table) { @@ -753,7 +836,11 @@ class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema * to do a === false and this is not PHP3 compatible) */ if (in_array($rel['foreign_table'], $alltables)) { - $this->_addRelation($one_table,$svg->getFont(),$svg->getFontSize(), $master_field, $rel['foreign_table'], $rel['foreign_field'], $this->tableDimension); + $this->_addRelation( + $one_table, $svg->getFont(), $svg->getFontSize(), + $master_field, $rel['foreign_table'], + $rel['foreign_field'], $this->tableDimension + ); } } } @@ -771,7 +858,9 @@ class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema /** * Sets X and Y minimum and maximum for a table cell * - * @param string table The table name + * @param string $table The table name + * + * @return nothing * @access private */ private function _setMinMax($table) @@ -785,25 +874,40 @@ class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema /** * Defines relation objects * - * @param string masterTable The master table name - * @param string masterField The relation field in the master table - * @param string foreignTable The foreign table name - * @param string foreignField The relation field in the foreign table - * @param boolean showInfo Whether to display table position or not + * @param string $masterTable The master table name + * @param string $font The font face + * @param int $fontSize Font size + * @param string $masterField The relation field in the master table + * @param string $foreignTable The foreign table name + * @param string $foreignField The relation field in the foreign table + * @param boolean $showInfo Whether to display table position or not + * * @access private + * @return nothing + * * @see _setMinMax,Table_Stats::__construct(),Relation_Stats::__construct() */ - private function _addRelation($masterTable,$font,$fontSize, $masterField, $foreignTable, $foreignField, $showInfo) + private function _addRelation($masterTable,$font,$fontSize, $masterField, + $foreignTable, $foreignField, $showInfo) { if (! isset($this->tables[$masterTable])) { - $this->tables[$masterTable] = new Table_Stats($masterTable, $font, $fontSize, $this->pageNumber, $this->_tablewidth, false, $showInfo); + $this->tables[$masterTable] = new Table_Stats( + $masterTable, $font, $fontSize, $this->pageNumber, + $this->_tablewidth, false, $showInfo + ); $this->_setMinMax($this->tables[$masterTable]); } if (! isset($this->tables[$foreignTable])) { - $this->tables[$foreignTable] = new Table_Stats($foreignTable,$font,$fontSize,$this->pageNumber, $this->_tablewidth, false, $showInfo); + $this->tables[$foreignTable] = new Table_Stats( + $foreignTable, $font, $fontSize, $this->pageNumber, + $this->_tablewidth, false, $showInfo + ); $this->_setMinMax($this->tables[$foreignTable]); } - $this->_relations[] = new Relation_Stats($this->tables[$masterTable], $masterField, $this->tables[$foreignTable], $foreignField); + $this->_relations[] = new Relation_Stats( + $this->tables[$masterTable], $masterField, + $this->tables[$foreignTable], $foreignField + ); } /** @@ -811,8 +915,11 @@ class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema * connects master table's master field to * foreign table's forein field * - * @param boolean changeColor Whether to use one color per relation or not + * @param boolean $changeColor Whether to use one color per relation or not + * + * @return nothing * @access private + * * @see Relation_Stats::relationDraw() */ private function _drawRelations($changeColor) @@ -825,8 +932,11 @@ class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema /** * Draws tables * - * @param boolean changeColor Whether to show color for primary fields or not + * @param boolean $changeColor Whether to show color for primary fields or not + * + * @return nothing * @access private + * * @see Table_Stats::Table_Stats_tableDraw() */ private function _drawTables($changeColor) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16243-g2a1a204
by Piotr Przybylski 21 Aug '11

21 Aug '11

The branch, master has been updated via 2a1a204bd607396e24f5ce741d4fa994377a5ddc (commit) from 0eb8f28a0675cbac494629c9b117b096bb2169c0 (commit) - Log ----------------------------------------------------------------- commit 2a1a204bd607396e24f5ce741d4fa994377a5ddc Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Sun Aug 21 21:06:07 2011 +0200 Fix notice about undefined variable ----------------------------------------------------------------------- Summary of changes: pmd_general.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pmd_general.php b/pmd_general.php index cf8d842..1a7d3df 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -32,7 +32,7 @@ echo ' var db = "' . PMA_escapeJsString($db) . '"; var token = "' . PMA_escapeJsString($token) . '";'; echo "\n"; - if ($_REQUEST['query']) { + if (isset($_REQUEST['query'])) { echo ' $(document).ready(function() { $(".trigger").click(function() { @@ -103,7 +103,7 @@ echo $script_tabs . $script_contr . $script_display_field; ><img src="pmd/images/pdf.png" alt="key" width="20" height="20" title="<?php echo __('Import/Export coordinates for PDF schema'); ?>" /></a > - <?php if ($_REQUEST['query']) { + <?php if (isset($_REQUEST['query'])) { echo '<a href="#" onClick="build_query(\'SQL Query on Database\', 0)" onmousedown="return false;" class="M_butt" target="_self">'; echo '<img src="pmd/images/query_builder.png" alt="key" width="20" height="20" title="'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16242-g0eb8f28
by Marc Delisle 21 Aug '11

21 Aug '11

The branch, master has been updated via 0eb8f28a0675cbac494629c9b117b096bb2169c0 (commit) via 4f4ab7dc6951ad3537c9e3578cf0601effa4c688 (commit) from a62aa22ad5dfe90191f9186dcf3bd7c18c2a021a (commit) - Log ----------------------------------------------------------------- commit 0eb8f28a0675cbac494629c9b117b096bb2169c0 Merge: a62aa22 4f4ab7d Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Aug 21 07:32:39 2011 -0400 Merge commit '4f4ab7dc6951ad3537c9e3578cf0601effa4c688' commit 4f4ab7dc6951ad3537c9e3578cf0601effa4c688 Author: Ammar Yasir <ammaryasir.88(a)gmail.com> Date: Sun Aug 21 10:47:20 2011 +0530 Fixed: 'Browse foreign values' not working properly ----------------------------------------------------------------------- Summary of changes: libraries/tbl_select.lib.php | 4 ++-- tbl_zoom_select.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php index 755322e..07c5883 100644 --- a/libraries/tbl_select.lib.php +++ b/libraries/tbl_select.lib.php @@ -179,12 +179,12 @@ function PMA_getForeignFields_Values($foreigners, $foreignData, $field, $tbl_fie } elseif ($foreignData['foreign_link'] == true) { if(isset($fields[$i]) && is_string($fields[$i])){ - $str .= '<input type="text" id="fieldID_' . $i .'"name="fields[' . $i . '] " value="' . $fields[$i] . '"'; + $str .= '<input type="text" id="fieldID_' . $i .'"name="fields[' . $i . ']" value="' . $fields[$i] . '"'; 'id="field_' . md5($field) . '[' . $i .']" class="textfield"/>' ; } else{ - $str .= '<input type="text" id="fieldID_' . $i .'"name="fields[' . $i . '] "'; + $str .= '<input type="text" id="fieldID_' . $i .'"name="fields[' . $i . ']"'; 'id="field_' . md5($field) . '[' . $i .']" class="textfield" />' ; } diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php index 518121d..a565768 100644 --- a/tbl_zoom_select.php +++ b/tbl_zoom_select.php @@ -127,7 +127,7 @@ if(isset($inputs) && ($inputs[0] != 'pma_null' || $inputs[1] != 'pma_null')) */ ?> -<form method="post" action="tbl_zoom_select.php" name="zoomInputForm" id="zoom_search_form" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?>> +<form method="post" action="tbl_zoom_select.php" name="insertForm" id="zoom_search_form" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?>> <?php echo PMA_generate_common_hidden_inputs($db, $table); ?> <input type="hidden" name="goto" value="<?php echo $goto; ?>" /> <input type="hidden" name="back" value="tbl_zoom_select.php" /> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16240-ga62aa22
by Madhura Jayaratne 20 Aug '11

20 Aug '11

The branch, master has been updated via a62aa22ad5dfe90191f9186dcf3bd7c18c2a021a (commit) via c052a0203ba0850fa44205e65c5b1584dde0fb65 (commit) via efbbc52568efa883cfb2cc6c15bf9db3c6605085 (commit) via d5c3cbf42a1fcb9fc78c06e522088a690b1f8dd8 (commit) from b0ed51d8cdaa0ec42649f6258932889687890594 (commit) - Log ----------------------------------------------------------------- commit a62aa22ad5dfe90191f9186dcf3bd7c18c2a021a Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Aug 21 00:51:36 2011 +0530 Replace tab characters with spaces commit c052a0203ba0850fa44205e65c5b1584dde0fb65 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Aug 21 00:47:29 2011 +0530 More instances of coding style violations in Eps_Relation_Schema commit efbbc52568efa883cfb2cc6c15bf9db3c6605085 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Aug 21 00:45:47 2011 +0530 Coding style improvements for Pdf_Relation_Schema commit d5c3cbf42a1fcb9fc78c06e522088a690b1f8dd8 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Aug 20 23:38:22 2011 +0530 Style improvements for Export_Relation_Schema ----------------------------------------------------------------------- Summary of changes: js/tbl_zoom_plot.js | 638 ++++++++++---------- libraries/schema/Eps_Relation_Schema.class.php | 4 +- libraries/schema/Export_Relation_Schema.class.php | 86 ++- libraries/schema/Pdf_Relation_Schema.class.php | 518 +++++++++++++----- 4 files changed, 770 insertions(+), 476 deletions(-) diff --git a/js/tbl_zoom_plot.js b/js/tbl_zoom_plot.js index e773175..b8c4259 100644 --- a/js/tbl_zoom_plot.js +++ b/js/tbl_zoom_plot.js @@ -60,14 +60,14 @@ function isEmpty(obj) { **/ function getDate(val,type) { if(type.toString().search(/datetime/i) != -1 || type.toString().search(/timestamp/i) != -1) { - return Highcharts.dateFormat('%Y-%m-%e %H:%M:%S', val) - } + return Highcharts.dateFormat('%Y-%m-%e %H:%M:%S', val) + } else if(type.toString().search(/time/i) != -1) { return Highcharts.dateFormat('%H:%M:%S', val) - } + } else if (type.toString().search(/date/i) != -1) { return Highcharts.dateFormat('%Y-%m-%e', val) - } + } } /** @@ -77,14 +77,14 @@ function getDate(val,type) { **/ function getTimeStamp(val,type) { if(type.toString().search(/datetime/i) != -1 || type.toString().search(/timestamp/i) != -1) { - return getDateFromFormat(val,'yyyy-MM-dd HH:mm:ss', val) - } + return getDateFromFormat(val,'yyyy-MM-dd HH:mm:ss', val) + } else if(type.toString().search(/time/i) != -1) { - return getDateFromFormat('1970-01-01 ' + val,'yyyy-MM-dd HH:mm:ss') - } + return getDateFromFormat('1970-01-01 ' + val,'yyyy-MM-dd HH:mm:ss') + } else if (type.toString().search(/date/i) != -1) { - return getDateFromFormat(val,'yyyy-MM-dd') - } + return getDateFromFormat(val,'yyyy-MM-dd') + } } /** @@ -92,12 +92,12 @@ function getTimeStamp(val,type) { ** @param field: field type (as in database structure) **/ function getType(field) { - if(field.toString().search(/int/i) != -1 || field.toString().search(/decimal/i) != -1 || field.toString().search(/year/i) != -1) - return 'numeric'; - else if(field.toString().search(/time/i) != -1 || field.toString().search(/date/i) != -1) - return 'time'; - else - return 'text'; + if(field.toString().search(/int/i) != -1 || field.toString().search(/decimal/i) != -1 || field.toString().search(/year/i) != -1) + return 'numeric'; + else if(field.toString().search(/time/i) != -1 || field.toString().search(/date/i) != -1) + return 'time'; + else + return 'text'; } /** ** Converts a categorical array into numeric array @@ -140,29 +140,29 @@ function includePan(currentChart) { $('#querychart').mousemove(function(e) { if (mouseDown == 1) { if (e.pageX > lastX) { - var xExtremes = currentChart.xAxis[0].getExtremes(); + var xExtremes = currentChart.xAxis[0].getExtremes(); var diff = (e.pageX - lastX) * (xExtremes.max - xExtremes.min) / chartWidth; currentChart.xAxis[0].setExtremes(xExtremes.min - diff, xExtremes.max - diff); } else if (e.pageX < lastX) { - var xExtremes = currentChart.xAxis[0].getExtremes(); + var xExtremes = currentChart.xAxis[0].getExtremes(); var diff = (lastX - e.pageX) * (xExtremes.max - xExtremes.min) / chartWidth; - currentChart.xAxis[0].setExtremes(xExtremes.min + diff, xExtremes.max + diff); + currentChart.xAxis[0].setExtremes(xExtremes.min + diff, xExtremes.max + diff); } if (e.pageY > lastY) { - var yExtremes = currentChart.yAxis[0].getExtremes(); + var yExtremes = currentChart.yAxis[0].getExtremes(); var ydiff = 1.0 * (e.pageY - lastY) * (yExtremes.max - yExtremes.min) / chartHeight; - currentChart.yAxis[0].setExtremes(yExtremes.min + ydiff, yExtremes.max + ydiff); + currentChart.yAxis[0].setExtremes(yExtremes.min + ydiff, yExtremes.max + ydiff); } else if (e.pageY < lastY) { - var yExtremes = currentChart.yAxis[0].getExtremes(); + var yExtremes = currentChart.yAxis[0].getExtremes(); var ydiff = 1.0 * (lastY - e.pageY) * (yExtremes.max - yExtremes.min) / chartHeight; - currentChart.yAxis[0].setExtremes(yExtremes.min - ydiff, yExtremes.max - ydiff); + currentChart.yAxis[0].setExtremes(yExtremes.min - ydiff, yExtremes.max - ydiff); } } - lastX = e.pageX; - lastY = e.pageY; + lastX = e.pageX; + lastY = e.pageY; }); } @@ -216,8 +216,8 @@ $(document).ready(function() { **/ $('#inputFormSubmitId').click(function() { if ($('#tableid_0').get(0).selectedIndex == 0 || $('#tableid_1').get(0).selectedIndex == 0) - PMA_ajaxShowMessage(PMA_messages['strInputNull']); - else if (xLabel == yLabel) + PMA_ajaxShowMessage(PMA_messages['strInputNull']); + else if (xLabel == yLabel) PMA_ajaxShowMessage(PMA_messages['strSameInputs']); }); @@ -240,16 +240,16 @@ $(document).ready(function() { } else { $link.text(PMA_messages['strHideSearchCriteria']); } - // avoid default click action - return false; - }); + // avoid default click action + return false; + }); /** ** Set dialog properties for the data display form **/ $("#dataDisplay").dialog({ autoOpen: false, - title: 'Data point content', + title: 'Data point content', modal: false, //false otherwise other dialogues like timepicker may not function properly height: $('#dataDisplay').height() + 80, width: $('#dataDisplay').width() + 80 @@ -260,152 +260,152 @@ $(document).ready(function() { */ $("#submitForm").click(function(event) { - + //Prevent default submission of form event.preventDefault(); - - //Find changed values by comparing form values with selectedRow Object - var newValues = new Array();//Stores the values changed from original + + //Find changed values by comparing form values with selectedRow Object + var newValues = new Array();//Stores the values changed from original var it = 4; var xChange = false; var yChange = false; - for (key in selectedRow) { - if (key != 'where_clause'){ - var oldVal = selectedRow[key]; - var newVal = ($('#fields_null_id_' + it).attr('checked')) ? null : $('#fieldID_' + it).val(); - if (oldVal != newVal){ - selectedRow[key] = newVal; - newValues[key] = newVal; - if(key == xLabel) { - xChange = true; - data[currentData][xLabel] = newVal; - } - else if(key == yLabel) { - yChange = true; - data[currentData][yLabel] = newVal; - } - } - } - it++ - }//End data update + for (key in selectedRow) { + if (key != 'where_clause'){ + var oldVal = selectedRow[key]; + var newVal = ($('#fields_null_id_' + it).attr('checked')) ? null : $('#fieldID_' + it).val(); + if (oldVal != newVal){ + selectedRow[key] = newVal; + newValues[key] = newVal; + if(key == xLabel) { + xChange = true; + data[currentData][xLabel] = newVal; + } + else if(key == yLabel) { + yChange = true; + data[currentData][yLabel] = newVal; + } + } + } + it++ + }//End data update - //Update the chart series and replot + //Update the chart series and replot if (xChange || yChange) { - var newSeries = new Array(); - newSeries[0] = new Object(); + var newSeries = new Array(); + newSeries[0] = new Object(); newSeries[0].marker = { symbol: 'circle' }; - //Logic similar to plot generation, replot only if xAxis changes or yAxis changes. Code includes a lot of checks so as to replot only when necessary + //Logic similar to plot generation, replot only if xAxis changes or yAxis changes. Code includes a lot of checks so as to replot only when necessary if(xChange) { - xCord[currentData] = selectedRow[xLabel]; - if(xType == 'numeric') { - currentChart.series[0].data[currentData].update({ x : selectedRow[xLabel] }); - currentChart.xAxis[0].setExtremes(Array.min(xCord) - 6,Array.max(xCord) + 6); + xCord[currentData] = selectedRow[xLabel]; + if(xType == 'numeric') { + currentChart.series[0].data[currentData].update({ x : selectedRow[xLabel] }); + currentChart.xAxis[0].setExtremes(Array.min(xCord) - 6,Array.max(xCord) + 6); } - else if(xType == 'time') { - currentChart.series[0].data[currentData].update({ x : getTimeStamp(selectedRow[xLabel],$('#types_0').val())}); - } - else { - var tempX = getCord(xCord); - var tempY = getCord(yCord); - var i = 0; - newSeries[0].data = new Array(); - xCord = tempX[2]; - yCord = tempY[2]; - - $.each(data,function(key,value) { + else if(xType == 'time') { + currentChart.series[0].data[currentData].update({ x : getTimeStamp(selectedRow[xLabel],$('#types_0').val())}); + } + else { + var tempX = getCord(xCord); + var tempY = getCord(yCord); + var i = 0; + newSeries[0].data = new Array(); + xCord = tempX[2]; + yCord = tempY[2]; + + $.each(data,function(key,value) { if(yType != 'text') - newSeries[0].data.push({ name: value[dataLabel], x: tempX[0][i], y: value[yLabel], marker: {fillColor: colorCodes[i % 8]} , id: i } ); - else + newSeries[0].data.push({ name: value[dataLabel], x: tempX[0][i], y: value[yLabel], marker: {fillColor: colorCodes[i % 8]} , id: i } ); + else newSeries[0].data.push({ name: value[dataLabel], x: tempX[0][i], y: tempY[0][i], marker: {fillColor: colorCodes[i % 8]} , id: i } ); - i++; + i++; }); - currentSettings.xAxis.labels = { formatter : function() { - if(tempX[1][this.value] && tempX[1][this.value].length > 10) - return tempX[1][this.value].substring(0,10) - else - return tempX[1][this.value]; + currentSettings.xAxis.labels = { formatter : function() { + if(tempX[1][this.value] && tempX[1][this.value].length > 10) + return tempX[1][this.value].substring(0,10) + else + return tempX[1][this.value]; } } - currentSettings.series = newSeries; + currentSettings.series = newSeries; currentChart = PMA_createChart(currentSettings); - } + } - } + } if(yChange) { - yCord[currentData] = selectedRow[yLabel]; - if(yType == 'numeric') { - currentChart.series[0].data[currentData].update({ y : selectedRow[yLabel] }); - currentChart.yAxis[0].setExtremes(Array.min(yCord) - 6,Array.max(yCord) + 6); + yCord[currentData] = selectedRow[yLabel]; + if(yType == 'numeric') { + currentChart.series[0].data[currentData].update({ y : selectedRow[yLabel] }); + currentChart.yAxis[0].setExtremes(Array.min(yCord) - 6,Array.max(yCord) + 6); } - else if(yType =='time') { - currentChart.series[0].data[currentData].update({ y : getTimeStamp(selectedRow[yLabel],$('#types_1').val())}); - } - else { - var tempX = getCord(xCord); - var tempY = getCord(yCord); - var i = 0; - newSeries[0].data = new Array(); - xCord = tempX[2]; - yCord = tempY[2]; - - $.each(data,function(key,value) { - if(xType != 'text' ) + else if(yType =='time') { + currentChart.series[0].data[currentData].update({ y : getTimeStamp(selectedRow[yLabel],$('#types_1').val())}); + } + else { + var tempX = getCord(xCord); + var tempY = getCord(yCord); + var i = 0; + newSeries[0].data = new Array(); + xCord = tempX[2]; + yCord = tempY[2]; + + $.each(data,function(key,value) { + if(xType != 'text' ) newSeries[0].data.push({ name: value[dataLabel], x: value[xLabel], y: tempY[0][i], marker: {fillColor: colorCodes[i % 8]} , id: i } ); - else + else newSeries[0].data.push({ name: value[dataLabel], x: tempX[0][i], y: tempY[0][i], marker: {fillColor: colorCodes[i % 8]} , id: i } ); - i++; + i++; }); - currentSettings.yAxis.labels = { formatter : function() { - if(tempY[1][this.value] && tempY[1][this.value].length > 10) - return tempY[1][this.value].substring(0,10) - else - return tempY[1][this.value]; + currentSettings.yAxis.labels = { formatter : function() { + if(tempY[1][this.value] && tempY[1][this.value].length > 10) + return tempY[1][this.value].substring(0,10) + else + return tempY[1][this.value]; } } - currentSettings.series = newSeries; + currentSettings.series = newSeries; currentChart = PMA_createChart(currentSettings); - } - } - currentChart.series[0].data[currentData].select(); } - //End plot update + } + currentChart.series[0].data[currentData].select(); + } + //End plot update - //Generate SQL query for update - if (!isEmpty(newValues)) { + //Generate SQL query for update + if (!isEmpty(newValues)) { var sql_query = 'UPDATE `' + window.parent.table + '` SET '; - for (key in newValues) { - if(key != 'where_clause') { - sql_query += '`' + key + '`=' ; - var value = newValues[key]; - if(!isNumeric(value) && value != null) - sql_query += '\'' + value + '\' ,'; - else - sql_query += value + ' ,'; - } - } - sql_query = sql_query.substring(0, sql_query.length - 1); - sql_query += ' WHERE ' + PMA_urldecode(data[currentData]['where_clause']); - - //Post SQL query to sql.php - $.post('sql.php', { + for (key in newValues) { + if(key != 'where_clause') { + sql_query += '`' + key + '`=' ; + var value = newValues[key]; + if(!isNumeric(value) && value != null) + sql_query += '\'' + value + '\' ,'; + else + sql_query += value + ' ,'; + } + } + sql_query = sql_query.substring(0, sql_query.length - 1); + sql_query += ' WHERE ' + PMA_urldecode(data[currentData]['where_clause']); + + //Post SQL query to sql.php + $.post('sql.php', { 'token' : window.parent.token, 'db' : window.parent.db, 'ajax_request' : true, 'sql_query' : sql_query, - 'inline_edit' : false - }, function(data) { - if(data.success == true) { - $('#sqlqueryresults').html(data.sql_query); - $("#sqlqueryresults").trigger('appendAnchor'); - } - else - PMA_ajaxShowMessage(data.error); - })//End $.post - }//End database update - $("#dataDisplay").dialog("close"); + 'inline_edit' : false + }, function(data) { + if(data.success == true) { + $('#sqlqueryresults').html(data.sql_query); + $("#sqlqueryresults").trigger('appendAnchor'); + } + else + PMA_ajaxShowMessage(data.error); + })//End $.post + }//End database update + $("#dataDisplay").dialog("close"); });//End submit handler /* @@ -418,14 +418,14 @@ $(document).ready(function() { .hide(); $('#togglesearchformlink') .text(PMA_messages['strShowSearchCriteria']) - $('#togglesearchformdiv').show(); + $('#togglesearchformdiv').show(); var selectedRow; - var colorCodes = ['#FF0000','#00FFFF','#0000FF','#0000A0','#FF0080','#800080','#FFFF00','#00FF00','#FF00FF']; - var series = new Array(); - var xCord = new Array(); - var yCord = new Array(); - var tempX, tempY; - var it = 0; + var colorCodes = ['#FF0000','#00FFFF','#0000FF','#0000A0','#FF0080','#800080','#FFFF00','#00FF00','#FF00FF']; + var series = new Array(); + var xCord = new Array(); + var yCord = new Array(); + var tempX, tempY; + var it = 0; var xMax; // xAxis extreme max var xMin; // xAxis extreme min var yMax; // yAxis extreme max @@ -434,33 +434,33 @@ $(document).ready(function() { // Set the basic plot settings var currentSettings = { chart: { - renderTo: 'querychart', - type: 'scatter', - //zoomType: 'xy', - width:$('#resizer').width() -3, - height:$('#resizer').height()-20 - }, - credits: { + renderTo: 'querychart', + type: 'scatter', + //zoomType: 'xy', + width:$('#resizer').width() -3, + height:$('#resizer').height()-20 + }, + credits: { enabled: false }, - exporting: { enabled: false }, + exporting: { enabled: false }, label: { text: $('#dataLabel').val() }, - plotOptions: { - series: { - allowPointSelect: true, + plotOptions: { + series: { + allowPointSelect: true, cursor: 'pointer', - showInLegend: false, + showInLegend: false, dataLabels: { enabled: false, }, - point: { + point: { events: { click: function() { - var id = this.id; - var fid = 4; - currentData = id; - // Make AJAX request to tbl_zoom_select.php for getting the complete row info - var post_params = { + var id = this.id; + var fid = 4; + currentData = id; + // Make AJAX request to tbl_zoom_select.php for getting the complete row info + var post_params = { 'ajax_request' : true, 'get_data_row' : true, 'db' : window.parent.db, @@ -469,33 +469,33 @@ $(document).ready(function() { 'token' : window.parent.token, } $.post('tbl_zoom_select.php', post_params, function(data) { - // Row is contained in data.row_info, now fill the displayResultForm with row values - for ( key in data.row_info) { - if (data.row_info[key] == null) - $('#fields_null_id_' + fid).attr('checked', true); - else - $('#fieldID_' + fid).val(data.row_info[key]); - fid++; - } - selectedRow = new Object(); - selectedRow = data.row_info; + // Row is contained in data.row_info, now fill the displayResultForm with row values + for ( key in data.row_info) { + if (data.row_info[key] == null) + $('#fields_null_id_' + fid).attr('checked', true); + else + $('#fieldID_' + fid).val(data.row_info[key]); + fid++; + } + selectedRow = new Object(); + selectedRow = data.row_info; }); - $("#dataDisplay").dialog("open"); + $("#dataDisplay").dialog("open"); }, } - } - } - }, - tooltip: { - formatter: function() { - return this.point.name; - } - }, + } + } + }, + tooltip: { + formatter: function() { + return this.point.name; + } + }, title: { text: 'Query Results' }, - xAxis: { - title: { text: $('#tableid_0').val() }, - events: { + xAxis: { + title: { text: $('#tableid_0').val() }, + events: { setExtremes: function(e){ this.resetZoom.show(); } @@ -503,16 +503,16 @@ $(document).ready(function() { }, yAxis: { - min: null, - title: { text: $('#tableid_1').val() }, - endOnTick: false, + min: null, + title: { text: $('#tableid_1').val() }, + endOnTick: false, startOnTick: false, - events: { + events: { setExtremes: function(e){ this.resetZoom.show(); } } - }, + }, } $('#resizer').resizable({ @@ -525,159 +525,159 @@ $(document).ready(function() { } }); - // Classify types as either numeric,time,text - xType = getType(xType); - yType = getType(yType); + // Classify types as either numeric,time,text + xType = getType(xType); + yType = getType(yType); - //Set the axis type based on the field - currentSettings.xAxis.type = (xType == 'time') ? 'datetime' : 'linear'; - currentSettings.yAxis.type = (yType == 'time') ? 'datetime' : 'linear'; + //Set the axis type based on the field + currentSettings.xAxis.type = (xType == 'time') ? 'datetime' : 'linear'; + currentSettings.yAxis.type = (yType == 'time') ? 'datetime' : 'linear'; // Formulate series data for plot series[0] = new Object(); series[0].data = new Array(); - series[0].marker = { + series[0].marker = { symbol: 'circle' }; - if (xType != 'text' && yType != 'text') { - $.each(data,function(key,value) { - var xVal = (xType == 'numeric') ? value[xLabel] : getTimeStamp(value[xLabel],$('#types_0').val()); - var yVal = (yType == 'numeric') ? value[yLabel] : getTimeStamp(value[yLabel],$('#types_1').val()); + if (xType != 'text' && yType != 'text') { + $.each(data,function(key,value) { + var xVal = (xType == 'numeric') ? value[xLabel] : getTimeStamp(value[xLabel],$('#types_0').val()); + var yVal = (yType == 'numeric') ? value[yLabel] : getTimeStamp(value[yLabel],$('#types_1').val()); series[0].data.push({ name: value[dataLabel], x: xVal, y: yVal, marker: {fillColor: colorCodes[it % 8]} , id: it } ); - xCord.push(value[xLabel]); - yCord.push(value[yLabel]); - it++; + xCord.push(value[xLabel]); + yCord.push(value[yLabel]); + it++; }); - if(xType == 'numeric') { - currentSettings.xAxis.max = Array.max(xCord) + 6 - currentSettings.xAxis.min = Array.min(xCord) - 6 - } - else { - currentSettings.xAxis.labels = { formatter : function() { - return getDate(this.value, $('#types_0').val()); - }} + if(xType == 'numeric') { + currentSettings.xAxis.max = Array.max(xCord) + 6 + currentSettings.xAxis.min = Array.min(xCord) - 6 + } + else { + currentSettings.xAxis.labels = { formatter : function() { + return getDate(this.value, $('#types_0').val()); + }} } - if(yType == 'numeric') { - currentSettings.yAxis.max = Array.max(yCord) + 6 - currentSettings.yAxis.min = Array.min(yCord) - 6 - } - else { - currentSettings.yAxis.labels = { formatter : function() { - return getDate(this.value, $('#types_1').val()); - }} + if(yType == 'numeric') { + currentSettings.yAxis.max = Array.max(yCord) + 6 + currentSettings.yAxis.min = Array.min(yCord) - 6 + } + else { + currentSettings.yAxis.labels = { formatter : function() { + return getDate(this.value, $('#types_1').val()); + }} } } - - else if (xType =='text' && yType !='text') { - $.each(data,function(key,value) { - xCord.push(value[xLabel]); - yCord.push(value[yLabel]); - }); - - tempX = getCord(xCord); - $.each(data,function(key,value) { - var yVal = (yType == 'numeric') ? value[yLabel] : getTimeStamp(value[yLabel],$('#types_1').val()); + + else if (xType =='text' && yType !='text') { + $.each(data,function(key,value) { + xCord.push(value[xLabel]); + yCord.push(value[yLabel]); + }); + + tempX = getCord(xCord); + $.each(data,function(key,value) { + var yVal = (yType == 'numeric') ? value[yLabel] : getTimeStamp(value[yLabel],$('#types_1').val()); series[0].data.push({ name: value[dataLabel], x: tempX[0][it], y: yVal, marker: {fillColor: colorCodes[it % 8]} , id: it } ); - it++; + it++; }); - - currentSettings.xAxis.labels = { formatter : function() { - if(tempX[1][this.value] && tempX[1][this.value].length > 10) - return tempX[1][this.value].substring(0,10) - else - return tempX[1][this.value]; + + currentSettings.xAxis.labels = { formatter : function() { + if(tempX[1][this.value] && tempX[1][this.value].length > 10) + return tempX[1][this.value].substring(0,10) + else + return tempX[1][this.value]; } } - if(yType == 'numeric') { - currentSettings.yAxis.max = Array.max(yCord) + 6 - currentSettings.yAxis.min = Array.min(yCord) - 6 - } - else { - currentSettings.yAxis.labels = { formatter : function() { - return getDate(this.value, $('#types_1').val()); - }} + if(yType == 'numeric') { + currentSettings.yAxis.max = Array.max(yCord) + 6 + currentSettings.yAxis.min = Array.min(yCord) - 6 + } + else { + currentSettings.yAxis.labels = { formatter : function() { + return getDate(this.value, $('#types_1').val()); + }} } - xCord = tempX[2]; - } - - else if (xType !='text' && yType =='text') { - $.each(data,function(key,value) { - xCord.push(value[xLabel]); - yCord.push(value[yLabel]); - }); - tempY = getCord(yCord); - $.each(data,function(key,value) { - var xVal = (xType == 'numeric') ? value[xLabel] : getTimeStamp(value[xLabel],$('#types_0').val()); + xCord = tempX[2]; + } + + else if (xType !='text' && yType =='text') { + $.each(data,function(key,value) { + xCord.push(value[xLabel]); + yCord.push(value[yLabel]); + }); + tempY = getCord(yCord); + $.each(data,function(key,value) { + var xVal = (xType == 'numeric') ? value[xLabel] : getTimeStamp(value[xLabel],$('#types_0').val()); series[0].data.push({ name: value[dataLabel], y: tempY[0][it], x: xVal, marker: {fillColor: colorCodes[it % 8]} , id: it } ); - it++; + it++; }); - if(xType == 'numeric') { - currentSettings.xAxis.max = Array.max(xCord) + 6 - currentSettings.xAxis.min = Array.min(xCord) - 6 - } - else { - currentSettings.xAxis.labels = { formatter : function() { - return getDate(this.value, $('#types_0').val()); - }} + if(xType == 'numeric') { + currentSettings.xAxis.max = Array.max(xCord) + 6 + currentSettings.xAxis.min = Array.min(xCord) - 6 + } + else { + currentSettings.xAxis.labels = { formatter : function() { + return getDate(this.value, $('#types_0').val()); + }} } - currentSettings.yAxis.labels = { formatter : function() { - if(tempY[1][this.value] && tempY[1][this.value].length > 10) - return tempY[1][this.value].substring(0,10) - else - return tempY[1][this.value]; - } + currentSettings.yAxis.labels = { formatter : function() { + if(tempY[1][this.value] && tempY[1][this.value].length > 10) + return tempY[1][this.value].substring(0,10) + else + return tempY[1][this.value]; } - yCord = tempY[2]; - } - - else if (xType =='text' && yType =='text') { - $.each(data,function(key,value) { - xCord.push(value[xLabel]); - yCord.push(value[yLabel]); - }); - tempX = getCord(xCord); - tempY = getCord(yCord); - $.each(data,function(key,value) { + } + yCord = tempY[2]; + } + + else if (xType =='text' && yType =='text') { + $.each(data,function(key,value) { + xCord.push(value[xLabel]); + yCord.push(value[yLabel]); + }); + tempX = getCord(xCord); + tempY = getCord(yCord); + $.each(data,function(key,value) { series[0].data.push({ name: value[dataLabel], x: tempX[0][it], y: tempY[0][it], marker: {fillColor: colorCodes[it % 8]} , id: it } ); - it++; + it++; }); - currentSettings.xAxis.labels = { formatter : function() { - if(tempX[1][this.value] && tempX[1][this.value].length > 10) - return tempX[1][this.value].substring(0,10) - else - return tempX[1][this.value]; - } + currentSettings.xAxis.labels = { formatter : function() { + if(tempX[1][this.value] && tempX[1][this.value].length > 10) + return tempX[1][this.value].substring(0,10) + else + return tempX[1][this.value]; + } } - currentSettings.yAxis.labels = { formatter : function() { - if(tempY[1][this.value] && tempY[1][this.value].length > 10) - return tempY[1][this.value].substring(0,10) - else - return tempY[1][this.value]; - } - } - xCord = tempX[2]; - yCord = tempY[2]; - - } - - currentSettings.series = series; + currentSettings.yAxis.labels = { formatter : function() { + if(tempY[1][this.value] && tempY[1][this.value].length > 10) + return tempY[1][this.value].substring(0,10) + else + return tempY[1][this.value]; + } + } + xCord = tempX[2]; + yCord = tempY[2]; + + } + + currentSettings.series = series; currentChart = PMA_createChart(currentSettings); - xMin = currentChart.xAxis[0].getExtremes().min; - xMax = currentChart.xAxis[0].getExtremes().max; - yMin = currentChart.yAxis[0].getExtremes().min; - yMax = currentChart.yAxis[0].getExtremes().max; - includePan(currentChart); //Enable panning feature + xMin = currentChart.xAxis[0].getExtremes().min; + xMax = currentChart.xAxis[0].getExtremes().max; + yMin = currentChart.yAxis[0].getExtremes().min; + yMax = currentChart.yAxis[0].getExtremes().max; + includePan(currentChart); //Enable panning feature var setZoom = function() { - var newxm = xMin + (xMax - xMin) * (1 - zoomRatio) / 2; - var newxM = xMax - (xMax - xMin) * (1 - zoomRatio) / 2; - var newym = yMin + (yMax - yMin) * (1 - zoomRatio) / 2; - var newyM = yMax - (yMax - yMin) * (1 - zoomRatio) / 2; + var newxm = xMin + (xMax - xMin) * (1 - zoomRatio) / 2; + var newxM = xMax - (xMax - xMin) * (1 - zoomRatio) / 2; + var newym = yMin + (yMax - yMin) * (1 - zoomRatio) / 2; + var newyM = yMax - (yMax - yMin) * (1 - zoomRatio) / 2; currentChart.xAxis[0].setExtremes(newxm,newxM); currentChart.yAxis[0].setExtremes(newym,newyM); - }; - //Enable zoom feature - $("#querychart").mousewheel(function(objEvent, intDelta) { + }; + //Enable zoom feature + $("#querychart").mousewheel(function(objEvent, intDelta) { if (intDelta > 0) { if (zoomRatio > 0.1) { zoomRatio = zoomRatio - 0.1; @@ -703,6 +703,6 @@ $(document).ready(function() { currentChart.yAxis[0].setExtremes(null, null) this.style.display = 'none' }); - scrollToChart(); + scrollToChart(); } }); diff --git a/libraries/schema/Eps_Relation_Schema.class.php b/libraries/schema/Eps_Relation_Schema.class.php index be70889..ffb117e 100644 --- a/libraries/schema/Eps_Relation_Schema.class.php +++ b/libraries/schema/Eps_Relation_Schema.class.php @@ -111,13 +111,13 @@ class PMA_EPS * font can be set whenever needed in EPS * * @param string $value sets the font name e.g Arial - * @param integer $value sets the size of the font e.g 10 + * @param integer $size sets the size of the font e.g 10 * * @return void * * @access public */ - function setFont($value,$size) + function setFont($value, $size) { $this->font = $value; $this->fontSize = $size; diff --git a/libraries/schema/Export_Relation_Schema.class.php b/libraries/schema/Export_Relation_Schema.class.php index bfdb063..d9ce1ec 100644 --- a/libraries/schema/Export_Relation_Schema.class.php +++ b/libraries/schema/Export_Relation_Schema.class.php @@ -10,7 +10,6 @@ * It contains those methods which are common in them * it works like factory pattern */ - class PMA_Export_Relation_Schema { private $_pageTitle; @@ -27,8 +26,10 @@ class PMA_Export_Relation_Schema /** * Set Page Number * - * @param integer value Page Number of the document to be created + * @param integer $value Page Number of the document to be created + * * @return void + * * @access public */ public function setPageNumber($value) @@ -39,8 +40,10 @@ class PMA_Export_Relation_Schema /** * Set Show Grid * - * @param boolean value show grid of the document or not + * @param boolean $value show grid of the document or not + * * @return void + * * @access public */ public function setShowGrid($value) @@ -48,6 +51,13 @@ class PMA_Export_Relation_Schema $this->showGrid = (isset($value) && $value == 'on') ? 1 : 0; } + /** + * Sets showColor + * + * @param string $value 'on' to set the the variable + * + * @return nothing + */ public function setShowColor($value) { $this->showColor = (isset($value) && $value == 'on') ? 1 : 0; @@ -56,8 +66,10 @@ class PMA_Export_Relation_Schema /** * Set Table Dimension * - * @param boolean value show table co-ordinates or not + * @param boolean $value show table co-ordinates or not + * * @return void + * * @access public */ public function setTableDimension($value) @@ -68,8 +80,10 @@ class PMA_Export_Relation_Schema /** * Set same width of All Tables * - * @param boolean value set same width of all tables or not + * @param boolean $value set same width of all tables or not + * * @return void + * * @access public */ public function setAllTableSameWidth($value) @@ -80,8 +94,10 @@ class PMA_Export_Relation_Schema /** * Set Data Dictionary * - * @param boolean value show selected database data dictionary or not + * @param boolean $value show selected database data dictionary or not + * * @return void + * * @access public */ public function setWithDataDictionary($value) @@ -92,8 +108,10 @@ class PMA_Export_Relation_Schema /** * Set Show only keys * - * @param boolean value show only keys or not + * @param boolean $value show only keys or not + * * @return void + * * @access public */ public function setShowKeys($value) @@ -104,8 +122,10 @@ class PMA_Export_Relation_Schema /** * Set Orientation * - * @param string value Orientation will be portrait or landscape + * @param string $value Orientation will be portrait or landscape + * * @return void + * * @access public */ public function setOrientation($value) @@ -116,8 +136,10 @@ class PMA_Export_Relation_Schema /** * Set type of paper * - * @param string value paper type can be A4 etc + * @param string $value paper type can be A4 etc + * * @return void + * * @access public */ public function setPaper($value) @@ -128,8 +150,10 @@ class PMA_Export_Relation_Schema /** * Set title of the page * - * @param string value title of the page displayed at top of the document + * @param string $title title of the page displayed at top of the document + * * @return void + * * @access public */ public function setPageTitle($title) @@ -140,8 +164,10 @@ class PMA_Export_Relation_Schema /** * Set type of export relational schema * - * @param string value can be pdf,svg,dia,visio,eps etc + * @param string $value can be pdf,svg,dia,visio,eps etc + * * @return void + * * @access public */ public function setExportType($value) @@ -152,22 +178,26 @@ class PMA_Export_Relation_Schema /** * get all tables involved or included in page * - * @param string db name of the database - * @param integer pageNumber page number whose tables will be fetched in an array + * @param string $db name of the database + * @param integer $pageNumber page no. whose tables will be fetched in an array + * * @return Array an array of tables + * * @access public */ - public function getAllTables($db,$pageNumber) + public function getAllTables($db, $pageNumber) { global $cfgRelation; // Get All tables - $tab_sql = 'SELECT table_name FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) - . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' - . ' AND pdf_page_number = ' . $pageNumber; + $tab_sql = 'SELECT table_name FROM ' + . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' + . PMA_backquote($cfgRelation['table_coords']) + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND pdf_page_number = ' . $pageNumber; $tab_rs = PMA_query_as_controluser($tab_sql, null, PMA_DBI_QUERY_STORE); if (!$tab_rs || !PMA_DBI_num_rows($tab_rs) > 0) { - $this->dieSchema('',__('This page does not contain any tables!')); + $this->dieSchema('', __('This page does not contain any tables!')); } while ($curr_table = @PMA_DBI_fetch_assoc($tab_rs)) { $alltables[] = PMA_sqlAddSlashes($curr_table['table_name']); @@ -178,12 +208,15 @@ class PMA_Export_Relation_Schema /** * Displays an error message * - * @param integer pageNumber ID of the chosen page - * @param string type Schema Type - * @param string error_message the error mesage + * @param integer $pageNumber ID of the chosen page + * @param string $type Schema Type + * @param string $error_message The error mesage + * * @global array the PMA configuration array * @global string the current database name + * * @access public + * * @return void */ function dieSchema($pageNumber, $type = '', $error_message = '') @@ -191,18 +224,19 @@ class PMA_Export_Relation_Schema global $cfg; global $db; - require_once './libraries/header.inc.php'; - echo "<p><strong>" . __("SCHEMA ERROR: ") . $type ."</strong></p>" . "\n"; + include_once './libraries/header.inc.php'; + echo "<p><strong>" . __("SCHEMA ERROR: ") . $type . "</strong></p>" . "\n"; if (!empty($error_message)) { $error_message = htmlspecialchars($error_message); } echo '<p>' . "\n"; echo ' ' . $error_message . "\n"; echo '</p>' . "\n"; - echo '<a href="schema_edit.php?' . PMA_generate_common_url($db).'&do=selectpage&chpage='.$pageNumber.'&action_choose=0' - . '">' . __('Back') . '</a>'; + echo '<a href="schema_edit.php?' . PMA_generate_common_url($db) + . '&do=selectpage&chpage=' . $pageNumber . '&action_choose=0' + . '">' . __('Back') . '</a>'; echo "\n"; - require_once './libraries/footer.inc.php'; + include_once './libraries/footer.inc.php'; exit(); } } diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php index ed96efd..aa08a6a 100644 --- a/libraries/schema/Pdf_Relation_Schema.class.php +++ b/libraries/schema/Pdf_Relation_Schema.class.php @@ -5,8 +5,7 @@ * @package phpMyAdmin */ -include_once("Export_Relation_Schema.class.php"); - +require_once 'Export_Relation_Schema.class.php'; require_once './libraries/PDF.class.php'; /** @@ -32,6 +31,13 @@ class PMA_Schema_PDF extends PMA_PDF var $widths; private $_ff = PMA_PDF_FONT; + /** + * Sets the value for margins + * + * @param float $c_margin margin + * + * @return nothing + */ public function setCMargin($c_margin) { $this->cMargin = $c_margin; @@ -40,12 +46,15 @@ class PMA_Schema_PDF extends PMA_PDF /** * Sets the scaling factor, defines minimum coordinates and margins * - * @param float scale The scaling factor - * @param float _xMin The minimum X coordinate - * @param float _yMin The minimum Y coordinate - * @param float leftMargin The left margin - * @param float topMargin The top margin + * @param float $scale The scaling factor + * @param float $xMin The minimum X coordinate + * @param float $yMin The minimum Y coordinate + * @param float $leftMargin The left margin + * @param float $topMargin The top margin + * * @access public + * + * @return nothing */ function PMA_PDF_setScale($scale = 1, $xMin = 0, $yMin = 0, $leftMargin = -1, $topMargin = -1) { @@ -63,14 +72,19 @@ class PMA_Schema_PDF extends PMA_PDF /** * Outputs a scaled cell * - * @param float w The cell width - * @param float h The cell height - * @param string txt The text to output - * @param mixed border Whether to add borders or not - * @param integer ln Where to put the cursor once the output is done - * @param string align Align mode - * @param integer fill Whether to fill the cell with a color or not + * @param float $w The cell width + * @param float $h The cell height + * @param string $txt The text to output + * @param mixed $border Whether to add borders or not + * @param integer $ln Where to put the cursor once the output is done + * @param string $align Align mode + * @param integer $fill Whether to fill the cell with a color or not + * @param string $link Link + * * @access public + * + * @return nothing + * * @see TCPDF::Cell() */ function PMA_PDF_cellScale($w, $h = 0, $txt = '', $border = 0, $ln = 0, $align = '', $fill = 0, $link = '') @@ -83,11 +97,15 @@ class PMA_Schema_PDF extends PMA_PDF /** * Draws a scaled line * - * @param float x1 The horizontal position of the starting point - * @param float y1 The vertical position of the starting point - * @param float x2 The horizontal position of the ending point - * @param float y2 The vertical position of the ending point + * @param float $x1 The horizontal position of the starting point + * @param float $y1 The vertical position of the starting point + * @param float $x2 The horizontal position of the ending point + * @param float $y2 The vertical position of the ending point + * * @access public + * + * @return nothing + * * @see TCPDF::Line() */ function PMA_PDF_lineScale($x1, $y1, $x2, $y2) @@ -102,9 +120,13 @@ class PMA_Schema_PDF extends PMA_PDF /** * Sets x and y scaled positions * - * @param float x The x position - * @param float y The y position + * @param float $x The x position + * @param float $y The y position + * * @access public + * + * @return nothing + * * @see TCPDF::SetXY() */ function PMA_PDF_setXyScale($x, $y) @@ -117,8 +139,12 @@ class PMA_Schema_PDF extends PMA_PDF /** * Sets the X scaled positions * - * @param float x The x position + * @param float $x The x position + * * @access public + * + * @return nothing + * * @see TCPDF::SetX() */ function PMA_PDF_setXScale($x) @@ -130,8 +156,12 @@ class PMA_Schema_PDF extends PMA_PDF /** * Sets the scaled font size * - * @param float size The font size (in points) + * @param float $size The font size (in points) + * * @access public + * + * @return nothing + * * @see TCPDF::SetFontSize() */ function PMA_PDF_setFontSizeScale($size) @@ -145,7 +175,11 @@ class PMA_Schema_PDF extends PMA_PDF * Sets the scaled line width * * @param float $width The line width + * * @access public + * + * @return nothing + * * @see TCPDF::SetLineWidth() */ function PMA_PDF_setLineWidthScale($width) @@ -154,6 +188,13 @@ class PMA_Schema_PDF extends PMA_PDF $this->SetLineWidth($width); } + /** + * This method is used to render the page header. + * + * @return nothing + * + * @see TCPDF::Header() + */ function Header() { // We only show this if we find something in the new pdf_pages table @@ -161,9 +202,11 @@ class PMA_Schema_PDF extends PMA_PDF // This function must be named "Header" to work with the TCPDF library global $cfgRelation, $db, $pdf_page_number, $with_doc; if ($with_doc) { - $test_query = 'SELECT * FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages']) - . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' - . ' AND page_nr = \'' . $pdf_page_number . '\''; + $test_query = 'SELECT * FROM ' + . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' + . PMA_backquote($cfgRelation['pdf_pages']) + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND page_nr = \'' . $pdf_page_number . '\''; $test_rs = PMA_query_as_controluser($test_query); $pages = @PMA_DBI_fetch_assoc($test_rs); $this->SetFont($this->_ff, 'B', 14); @@ -175,6 +218,10 @@ class PMA_Schema_PDF extends PMA_PDF /** * This function must be named "Footer" to work with the TCPDF library + * + * @return nothing + * + * @see PMA_PDF::Footer() */ function Footer() { @@ -184,6 +231,13 @@ class PMA_Schema_PDF extends PMA_PDF } } + /** + * Sets widths + * + * @param array $w array of widths + * + * @return nothing + */ function SetWidths($w) { // column widths @@ -195,8 +249,9 @@ class PMA_Schema_PDF extends PMA_PDF // line height $nb = 0; $data_cnt = count($data); - for ($i = 0;$i < $data_cnt;$i++) - $nb = max($nb, $this->NbLines($this->widths[$i], $data[$i])); + for ($i = 0;$i < $data_cnt;$i++) { + $nb = max($nb, $this->NbLines($this->widths[$i], $data[$i])); + } $il = $this->FontSize; $h = ($il + 1) * $nb; // page break if necessary @@ -225,8 +280,9 @@ class PMA_Schema_PDF extends PMA_PDF /** * Compute number of lines used by a multicell of width w * - * @param int $w - * @param string $txt + * @param int $w width + * @param string $txt text + * * @return int */ function NbLines($w, $txt) @@ -309,18 +365,22 @@ class Table_Stats /** * The "Table_Stats" constructor * - * @param string table_name The table name - * @param integer fontSize The font size - * @param integer pageNumber The current page number (from the - * $cfg['Servers'][$i]['table_coords'] table) - * @param integer sameWideWidth The max. with among tables - * @param boolean showKeys Whether to display keys or not - * @param boolean showInfo Whether to display table position or not + * @param string $tableName The table name + * @param integer $fontSize The font size + * @param integer $pageNumber The current page number (from the + * $cfg['Servers'][$i]['table_coords'] table) + * @param integer &$sameWideWidth The max. with among tables + * @param boolean $showKeys Whether to display keys or not + * @param boolean $showInfo Whether to display table position or not + * * @global object The current PDF document * @global array The relations settings * @global string The current db name + * + * @return nothing + * * @see PMA_Schema_PDF, Table_Stats::Table_Stats_setWidth, - Table_Stats::Table_Stats_setHeight + * Table_Stats::Table_Stats_setHeight */ function __construct($tableName, $fontSize, $pageNumber, &$sameWideWidth, $showKeys = false, $showInfo = false) { @@ -329,7 +389,7 @@ class Table_Stats $this->_tableName = $tableName; $sql = 'DESCRIBE ' . PMA_backquote($tableName); $result = PMA_DBI_try_query($sql, null, PMA_DBI_QUERY_STORE); - if (!$result || !PMA_DBI_num_rows($result)) { + if (! $result || ! PMA_DBI_num_rows($result)) { $pdf->Error(sprintf(__('The %s table doesn\'t exist!'), $tableName)); } // load fields @@ -338,7 +398,10 @@ class Table_Stats $indexes = PMA_Index::getFromTable($this->_tableName, $db); $all_columns = array(); foreach ($indexes as $index) { - $all_columns = array_merge($all_columns, array_flip(array_keys($index->getColumns()))); + $all_columns = array_merge( + $all_columns, + array_flip(array_keys($index->getColumns())) + ); } $this->fields = array_keys($all_columns); } else { @@ -358,13 +421,19 @@ class Table_Stats $sameWideWidth = $this->width; } $sql = 'SELECT x, y FROM ' - . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) + . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' + . PMA_backquote($cfgRelation['table_coords']) . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' . ' AND table_name = \'' . PMA_sqlAddSlashes($tableName) . '\'' . ' AND pdf_page_number = ' . $pageNumber; $result = PMA_query_as_controluser($sql, false, PMA_DBI_QUERY_STORE); - if (!$result || !PMA_DBI_num_rows($result)) { - $pdf->Error(sprintf(__('Please configure the coordinates for table %s'), $tableName)); + if (! $result || ! PMA_DBI_num_rows($result)) { + $pdf->Error( + sprintf( + __('Please configure the coordinates for table %s'), + $tableName + ) + ); } list($this->x, $this->y) = PMA_DBI_fetch_row($result); $this->x = (double) $this->x; @@ -376,7 +445,10 @@ class Table_Stats /* * index */ - $result = PMA_DBI_query('SHOW INDEX FROM ' . PMA_backquote($tableName) . ';', null, PMA_DBI_QUERY_STORE); + $result = PMA_DBI_query( + 'SHOW INDEX FROM ' . PMA_backquote($tableName) . ';', + null, PMA_DBI_QUERY_STORE + ); if (PMA_DBI_num_rows($result) > 0) { while ($row = PMA_DBI_fetch_assoc($result)) { if ($row['Key_name'] == 'PRIMARY') { @@ -400,9 +472,14 @@ class Table_Stats /** * Sets the width of the table * - * @param integer fontSize The font size + * @param integer $fontSize The font size + * * @global object The current PDF document + * * @access private + * + * @return nothing + * * @see PMA_Schema_PDF */ private function _setWidth($fontSize) @@ -427,6 +504,8 @@ class Table_Stats /** * Sets the height of the table * + * @return nothing + * * @access private */ private function _setHeight() @@ -437,10 +516,16 @@ class Table_Stats /** * Do draw the table * - * @param integer fontSize The font size - * @param boolean setColor Whether to display color - * @global object The current PDF document + * @param integer $fontSize The font size + * @param boolean $withDoc + * @param boolean $setColor Whether to display color + * + * @global object The current PDF document + * * @access public + * + * @return nothing + * * @see PMA_Schema_PDF */ public function tableDraw($fontSize, $withDoc, $setColor = 0) @@ -459,7 +544,16 @@ class Table_Stats $pdf->PMA_links['doc'][$this->_tableName]['-'] = ''; } - $pdf->PMA_PDF_cellScale($this->width, $this->heightCell, $this->_getTitle(), 1, 1, 'C', $setColor, $pdf->PMA_links['doc'][$this->_tableName]['-']); + $pdf->PMA_PDF_cellScale( + $this->width, + $this->heightCell, + $this->_getTitle(), + 1, + 1, + 'C', + $setColor, + $pdf->PMA_links['doc'][$this->_tableName]['-'] + ); $pdf->PMA_PDF_setXScale($this->x); $pdf->SetFont($this->_ff, '', $fontSize); $pdf->SetTextColor(0); @@ -480,12 +574,23 @@ class Table_Stats $pdf->PMA_links['doc'][$this->_tableName][$field] = ''; } - $pdf->PMA_PDF_cellScale($this->width, $this->heightCell, ' ' . $field, 1, 1, 'L', $setColor, $pdf->PMA_links['doc'][$this->_tableName][$field]); + $pdf->PMA_PDF_cellScale( + $this->width, + $this->heightCell, + ' ' . $field, + 1, + 1, + 'L', + $setColor, + $pdf->PMA_links['doc'][$this->_tableName][$field] + ); $pdf->PMA_PDF_setXScale($this->x); $pdf->SetFillColor(255); } /*if ($pdf->PageNo() > 1) { - $pdf->PMA_PDF_die(__('The scale factor is too small to fit the schema on one page')); + $pdf->PMA_PDF_die( + __('The scale factor is too small to fit the schema on one page') + ); } */ } } @@ -499,7 +604,8 @@ class Table_Stats * in PDF document. * * @name Relation_Stats - * @see PMA_Schema_PDF::SetDrawColor,PMA_Schema_PDF::PMA_PDF_setLineWidthScale,PMA_Schema_PDF::PMA_PDF_lineScale + * @see PMA_Schema_PDF::SetDrawColor, PMA_Schema_PDF::PMA_PDF_setLineWidthScale, + * PMA_Schema_PDF::PMA_PDF_lineScale */ class Relation_Stats { @@ -515,10 +621,13 @@ class Relation_Stats /** * The "Relation_Stats" constructor * - * @param string master_table The master table name - * @param string master_field The relation field in the master table - * @param string foreign_table The foreign table name - * @param string foreigh_field The relation field in the foreign table + * @param string $master_table The master table name + * @param string $master_field The relation field in the master table + * @param string $foreign_table The foreign table name + * @param string $foreign_field The relation field in the foreign table + * + * @return nothing + * * @see Relation_Stats::_getXy */ function __construct($master_table, $master_field, $foreign_table, $foreign_field) @@ -569,9 +678,11 @@ class Relation_Stats /** * Gets arrows coordinates * - * @param string table The current table name - * @param string column The relation column name + * @param string $table The current table name + * @param string $column The relation column name + * * @return array Arrows coordinates + * * @access private */ private function _getXy($table, $column) @@ -582,13 +693,17 @@ class Relation_Stats } /** - * draws relation links and arrows - * shows foreign key relations + * draws relation links and arrows shows foreign key relations + * + * @param boolean $changeColor Whether to use one color per relation or not + * @param integer $i The id of the link to draw * - * @param boolean changeColor Whether to use one color per relation or not - * @param integer i The id of the link to draw * @global object The current PDF document + * * @access public + * + * @return nothing + * * @see PMA_Schema_PDF */ public function relationDraw($changeColor, $i) @@ -607,7 +722,7 @@ class Relation_Stats array(1, 1, 0), array(1, 0, 1), array(0, 1, 1) - ); + ); list ($a, $b, $c) = $case[$d]; $e = (1 - ($j - 1) / 6); $pdf->SetDrawColor($a * 255 * $e, $b * 255 * $e, $c * 255 * $e); @@ -615,19 +730,54 @@ class Relation_Stats $pdf->SetDrawColor(0); } $pdf->PMA_PDF_setLineWidthScale(0.2); - $pdf->PMA_PDF_lineScale($this->xSrc, $this->ySrc, $this->xSrc + $this->srcDir * $this->wTick, $this->ySrc); - $pdf->PMA_PDF_lineScale($this->xDest + $this->destDir * $this->wTick, $this->yDest, $this->xDest, $this->yDest); + $pdf->PMA_PDF_lineScale( + $this->xSrc, + $this->ySrc, + $this->xSrc + $this->srcDir * $this->wTick, + $this->ySrc + ); + $pdf->PMA_PDF_lineScale( + $this->xDest + $this->destDir * $this->wTick, + $this->yDest, + $this->xDest, + $this->yDest + ); $pdf->PMA_PDF_setLineWidthScale(0.1); - $pdf->PMA_PDF_lineScale($this->xSrc + $this->srcDir * $this->wTick, $this->ySrc, $this->xDest + $this->destDir * $this->wTick, $this->yDest); + $pdf->PMA_PDF_lineScale( + $this->xSrc + $this->srcDir * $this->wTick, + $this->ySrc, + $this->xDest + $this->destDir * $this->wTick, + $this->yDest + ); /* * Draws arrows -> */ $root2 = 2 * sqrt(2); - $pdf->PMA_PDF_lineScale($this->xSrc + $this->srcDir * $this->wTick * 0.75, $this->ySrc, $this->xSrc + $this->srcDir * (0.75 - 1 / $root2) * $this->wTick, $this->ySrc + $this->wTick / $root2); - $pdf->PMA_PDF_lineScale($this->xSrc + $this->srcDir * $this->wTick * 0.75, $this->ySrc, $this->xSrc + $this->srcDir * (0.75 - 1 / $root2) * $this->wTick, $this->ySrc - $this->wTick / $root2); - - $pdf->PMA_PDF_lineScale($this->xDest + $this->destDir * $this->wTick / 2, $this->yDest, $this->xDest + $this->destDir * (0.5 + 1 / $root2) * $this->wTick, $this->yDest + $this->wTick / $root2); - $pdf->PMA_PDF_lineScale($this->xDest + $this->destDir * $this->wTick / 2, $this->yDest, $this->xDest + $this->destDir * (0.5 + 1 / $root2) * $this->wTick, $this->yDest - $this->wTick / $root2); + $pdf->PMA_PDF_lineScale( + $this->xSrc + $this->srcDir * $this->wTick * 0.75, + $this->ySrc, + $this->xSrc + $this->srcDir * (0.75 - 1 / $root2) * $this->wTick, + $this->ySrc + $this->wTick / $root2 + ); + $pdf->PMA_PDF_lineScale( + $this->xSrc + $this->srcDir * $this->wTick * 0.75, + $this->ySrc, + $this->xSrc + $this->srcDir * (0.75 - 1 / $root2) * $this->wTick, + $this->ySrc - $this->wTick / $root2 + ); + + $pdf->PMA_PDF_lineScale( + $this->xDest + $this->destDir * $this->wTick / 2, + $this->yDest, + $this->xDest + $this->destDir * (0.5 + 1 / $root2) * $this->wTick, + $this->yDest + $this->wTick / $root2 + ); + $pdf->PMA_PDF_lineScale( + $this->xDest + $this->destDir * $this->wTick / 2, + $this->yDest, + $this->xDest + $this->destDir * (0.5 + 1 / $root2) * $this->wTick, + $this->yDest - $this->wTick / $root2 + ); $pdf->SetDrawColor(0); } } @@ -688,11 +838,17 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema // Initializes a new document $pdf = new PMA_Schema_PDF($this->orientation, 'mm', $this->paper); - $pdf->SetTitle(sprintf(__('Schema of the %s database - Page %s'), $GLOBALS['db'], $this->pageNumber)); + $pdf->SetTitle( + sprintf( + __('Schema of the %s database - Page %s'), + $GLOBALS['db'], + $this->pageNumber + ) + ); $pdf->setCMargin(0); $pdf->Open(); $pdf->SetAutoPageBreak('auto'); - $alltables = $this->getAllTables($db,$this->pageNumber); + $alltables = $this->getAllTables($db, $this->pageNumber); if ($this->withDoc) { $pdf->SetAutoPageBreak('auto', 15); @@ -707,7 +863,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema if ($this->withDoc) { $pdf->SetLink($pdf->PMA_links['RT']['-'], -1); $pdf->Bookmark(__('Relational schema')); - $pdf->SetAlias('{00}', $pdf->PageNo()) ; + $pdf->SetAlias('{00}', $pdf->PageNo()); $this->topMargin = 28; $this->bottomMargin = 28; } @@ -715,7 +871,13 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema /* snip */ foreach ($alltables as $table) { if (! isset($this->tables[$table])) { - $this->tables[$table] = new Table_Stats($table, $this->_ff, $this->pageNumber, $this->_tablewidth, $this->showKeys, $this->tableDimension); + $this->tables[$table] = new Table_Stats( + $table, $this->_ff, + $this->pageNumber, + $this->_tablewidth, + $this->showKeys, + $this->tableDimension + ); } if ($this->sameWide) { $this->tables[$table]->width = $this->_tablewidth; @@ -727,10 +889,17 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema $this->scale = ceil( max( ($this->_xMax - $this->_xMin) / ($pdf->getPageWidth() - $this->rightMargin - $this->leftMargin), - ($this->_yMax - $this->_yMin) / ($pdf->getPageHeight() - $this->topMargin - $this->bottomMargin)) - * 100) / 100; - - $pdf->PMA_PDF_setScale($this->scale, $this->_xMin, $this->_yMin, $this->leftMargin, $this->topMargin); + ($this->_yMax - $this->_yMin) / ($pdf->getPageHeight() - $this->topMargin - $this->bottomMargin) + ) * 100 + ) / 100; + + $pdf->PMA_PDF_setScale( + $this->scale, + $this->_xMin, + $this->_yMin, + $this->leftMargin, + $this->topMargin + ); // Builds and save the PDF document $pdf->PMA_PDF_setLineWidthScale(0.1); @@ -753,7 +922,13 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema // (do not use array_search() because we would have to // to do a === false and this is not PHP3 compatible) if (in_array($rel['foreign_table'], $alltables)) { - $this->_addRelation($one_table, $master_field, $rel['foreign_table'], $rel['foreign_field'], $this->tableDimension); + $this->_addRelation( + $one_table, + $master_field, + $rel['foreign_table'], + $rel['foreign_field'], + $this->tableDimension + ); } } // end while } // end if @@ -770,7 +945,10 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema /** * Sets X and Y minimum and maximum for a table cell * - * @param string table The table name of which sets XY co-ordinates + * @param string $table The table name of which sets XY co-ordinates + * + * @return nothing + * * @access private */ private function _setMinMax($table) @@ -784,32 +962,49 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema /** * Defines relation objects * - * @param string master_table The master table name - * @param string master_field The relation field in the master table - * @param string foreign_table The foreign table name - * @param string foreign_field The relation field in the foreign table - * @param boolean show_info Whether to display table position or not + * @param string $masterTable The master table name + * @param string $masterField The relation field in the master table + * @param string $foreignTable The foreign table name + * @param string $foreignField The relation field in the foreign table + * @param boolean $showInfo Whether to display table position or not + * * @access private + * + * @return nothing + * * @see _setMinMax */ private function _addRelation($masterTable, $masterField, $foreignTable, $foreignField, $showInfo) { if (! isset($this->tables[$masterTable])) { - $this->tables[$masterTable] = new Table_Stats($masterTable, $this->_ff, $this->pageNumber, $this->_tablewidth, false, $showInfo); + $this->tables[$masterTable] = new Table_Stats( + $masterTable, $this->_ff, $this->pageNumber, + $this->_tablewidth, false, $showInfo + ); $this->_setMinMax($this->tables[$masterTable]); } if (! isset($this->tables[$foreignTable])) { - $this->tables[$foreignTable] = new Table_Stats($foreignTable, $this->_ff, $this->pageNumber, $this->_tablewidth, false, $showInfo); + $this->tables[$foreignTable] = new Table_Stats( + $foreignTable, $this->_ff, $this->pageNumber, + $this->_tablewidth, false, $showInfo + ); $this->_setMinMax($this->tables[$foreignTable]); } - $this->relations[] = new Relation_Stats($this->tables[$masterTable], $masterField, $this->tables[$foreignTable], $foreignField); + $this->relations[] = new Relation_Stats( + $this->tables[$masterTable], $masterField, + $this->tables[$foreignTable], $foreignField + ); } /** * Draws the grid * * @global object the current PMA_Schema_PDF instance + * * @access private + * + * @return nothing + * * @see PMA_Schema_PDF */ private function _strokeGrid() @@ -831,19 +1026,35 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema $pdf->SetDrawColor(200, 200, 200); // Draws horizontal lines for ($l = 0; $l <= intval(($pdf->getPageHeight() - $topSpace - $bottomSpace) / $gridSize); $l++) { - $pdf->line(0, $l * $gridSize + $topSpace, $pdf->getPageWidth(), $l * $gridSize + $topSpace); + $pdf->line( + 0, $l * $gridSize + $topSpace, + $pdf->getPageWidth(), $l * $gridSize + $topSpace + ); // Avoid duplicates - if ($l > 0 && $l <= intval(($pdf->getPageHeight() - $topSpace - $bottomSpace - $labelHeight) / $gridSize)) { + if ($l > 0 + && $l <= intval(($pdf->getPageHeight() - $topSpace - $bottomSpace - $labelHeight) / $gridSize) + ) { $pdf->SetXY(0, $l * $gridSize + $topSpace); - $label = (string) sprintf('%.0f', ($l * $gridSize + $topSpace - $this->topMargin) * $this->scale + $this->_yMin); + $label = (string) sprintf( + '%.0f', + ($l * $gridSize + $topSpace - $this->topMargin) * $this->scale + $this->_yMin + ); $pdf->Cell($labelWidth, $labelHeight, ' ' . $label); } // end if } // end for // Draws vertical lines for ($j = 0; $j <= intval($pdf->getPageWidth() / $gridSize); $j++) { - $pdf->line($j * $gridSize, $topSpace, $j * $gridSize, $pdf->getPageHeight() - $bottomSpace); + $pdf->line( + $j * $gridSize, + $topSpace, + $j * $gridSize, + $pdf->getPageHeight() - $bottomSpace + ); $pdf->SetXY($j * $gridSize, $topSpace); - $label = (string) sprintf('%.0f', ($j * $gridSize - $this->leftMargin) * $this->scale + $this->_xMin); + $label = (string) sprintf( + '%.0f', + ($j * $gridSize - $this->leftMargin) * $this->scale + $this->_xMin + ); $pdf->Cell($labelWidth, $labelHeight, $label); } } @@ -851,8 +1062,12 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema /** * Draws relation arrows * - * @param boolean changeColor Whether to use one color per relation or not + * @param boolean $changeColor Whether to use one color per relation or not + * * @access private + * + * @return nothing + * * @see Relation_Stats::relationdraw() */ private function _drawRelations($changeColor) @@ -867,8 +1082,12 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema /** * Draws tables * - * @param boolean changeColor Whether to display table position or not + * @param boolean $changeColor Whether to display table position or not + * * @access private + * + * @return nothing + * * @see Table_Stats::tableDraw() */ private function _drawTables($changeColor = 0) @@ -882,11 +1101,16 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema * Ouputs the PDF document to a file * or sends the output to browser * + * @param integer $pageNumber page number + * * @global object The current PDF document * @global string The current database name * @global integer The current page number (from the - * $cfg['Servers'][$i]['table_coords'] table) + * $cfg['Servers'][$i]['table_coords'] table) * @access private + * + * @return nothing + * * @see PMA_Schema_PDF */ private function _showOutput($pageNumber) @@ -894,8 +1118,10 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema global $pdf, $db, $cfgRelation; // Get the name of this pdfpage to use as filename - $_name_sql = 'SELECT page_descr FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages']) - . ' WHERE page_nr = ' . $pageNumber; + $_name_sql = 'SELECT page_descr FROM ' + . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' + . PMA_backquote($cfgRelation['pdf_pages']) + . ' WHERE page_nr = ' . $pageNumber; $_name_rs = PMA_query_as_controluser($_name_sql); if ($_name_rs) { $_name_row = PMA_DBI_fetch_row($_name_rs); @@ -919,36 +1145,54 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema $pdf->PMA_links['doc'][$table]['-'] = $pdf->AddLink(); $pdf->SetX(10); // $pdf->Ln(1); - $pdf->Cell(0, 6, __('Page number:') . ' {' . sprintf("%02d", $i) . '}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$table]['-']); + $pdf->Cell( + 0, 6, __('Page number:') . ' {' . sprintf("%02d", $i) . '}', 0, 0, + 'R', 0, $pdf->PMA_links['doc'][$table]['-'] + ); $pdf->SetX(10); - $pdf->Cell(0, 6, $i . ' ' . $table, 0, 1, 'L', 0, $pdf->PMA_links['doc'][$table]['-']); + $pdf->Cell( + 0, 6, $i . ' ' . $table, 0, 1, + 'L', 0, $pdf->PMA_links['doc'][$table]['-'] + ); // $pdf->Ln(1); $fields = PMA_DBI_get_columns($GLOBALS['db'], $table); - foreach($fields as $row) { + foreach ($fields as $row) { $pdf->SetX(20); $field_name = $row['Field']; $pdf->PMA_links['doc'][$table][$field_name] = $pdf->AddLink(); - // $pdf->Cell(0, 6, $field_name,0,1,'L',0, $pdf->PMA_links['doc'][$table][$field_name]); + //$pdf->Cell( + // 0, 6, $field_name, 0, 1, + // 'L', 0, $pdf->PMA_links['doc'][$table][$field_name] + //); } $lasttable = $table; $i++; } $pdf->PMA_links['RT']['-'] = $pdf->AddLink(); $pdf->SetX(10); - $pdf->Cell(0, 6, __('Page number:') . ' {00}', 0, 0, 'R', 0, $pdf->PMA_links['RT']['-']); + $pdf->Cell( + 0, 6, __('Page number:') . ' {00}', 0, 0, + 'R', 0, $pdf->PMA_links['RT']['-'] + ); $pdf->SetX(10); - $pdf->Cell(0, 6, $i . ' ' . __('Relational schema'), 0, 1, 'L', 0, $pdf->PMA_links['RT']['-']); + $pdf->Cell( + 0, 6, $i . ' ' . __('Relational schema'), 0, 1, + 'L', 0, $pdf->PMA_links['RT']['-'] + ); $z = 0; foreach ($alltables as $table) { $z++; $pdf->SetAutoPageBreak(true, 15); $pdf->addpage($GLOBALS['orientation']); $pdf->Bookmark($table); - $pdf->SetAlias('{' . sprintf("%02d", $z) . '}', $pdf->PageNo()) ; + $pdf->SetAlias('{' . sprintf("%02d", $z) . '}', $pdf->PageNo()); $pdf->PMA_links['RT'][$table]['-'] = $pdf->AddLink(); $pdf->SetLink($pdf->PMA_links['doc'][$table]['-'], -1); $pdf->SetFont($this->_ff, 'B', 18); - $pdf->Cell(0, 8, $z . ' ' . $table, 1, 1, 'C', 0, $pdf->PMA_links['RT'][$table]['-']); + $pdf->Cell( + 0, 8, $z . ' ' . $table, 1, 1, + 'C', 0, $pdf->PMA_links['RT'][$table]['-'] + ); $pdf->SetFont($this->_ff, '', 8); $pdf->ln(); @@ -962,11 +1206,21 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema * Gets table informations */ $showtable = PMA_Table::sGetStatusInfo($db, $table); - $num_rows = (isset($showtable['Rows']) ? $showtable['Rows'] : 0); - $show_comment = (isset($showtable['Comment']) ? $showtable['Comment'] : ''); - $create_time = (isset($showtable['Create_time']) ? PMA_localisedDate(strtotime($showtable['Create_time'])) : ''); - $update_time = (isset($showtable['Update_time']) ? PMA_localisedDate(strtotime($showtable['Update_time'])) : ''); - $check_time = (isset($showtable['Check_time']) ? PMA_localisedDate(strtotime($showtable['Check_time'])) : ''); + $num_rows = isset($showtable['Rows']) + ? $showtable['Rows'] + : 0; + $show_comment = isset($showtable['Comment']) + ? $showtable['Comment'] + : ''; + $create_time = isset($showtable['Create_time']) + ? PMA_localisedDate(strtotime($showtable['Create_time'])) + : ''; + $update_time = isset($showtable['Update_time']) + ? PMA_localisedDate(strtotime($showtable['Update_time'])) + : ''; + $check_time = isset($showtable['Check_time']) + ? PMA_localisedDate(strtotime($showtable['Check_time'])) + : ''; /** * Gets table keys and retains them @@ -996,7 +1250,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema $indexes_info[$row['Key_name']]['Cardinality'] = $row['Cardinality']; } // I don't know what does following column mean.... - // $indexes_info[$row['Key_name']]['Packed'] = $row['Packed']; + // $indexes_info[$row['Key_name']]['Packed'] = $row['Packed']; $indexes_info[$row['Key_name']]['Comment'] = $row['Comment']; $indexes_data[$row['Key_name']][$row['Seq_in_index']]['Column_name'] = $row['Column_name']; @@ -1032,22 +1286,22 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema */ $break = false; - if (!empty($show_comment)) { + if (! empty($show_comment)) { $pdf->Cell(0, 3, __('Table comments') . ' : ' . $show_comment, 0, 1); $break = true; } - if (!empty($create_time)) { + if (! empty($create_time)) { $pdf->Cell(0, 3, __('Creation') . ': ' . $create_time, 0, 1); $break = true; } - if (!empty($update_time)) { + if (! empty($update_time)) { $pdf->Cell(0, 3, __('Last update') . ': ' . $update_time, 0, 1); $break = true; } - if (!empty($check_time)) { + if (! empty($check_time)) { $pdf->Cell(0, 3, __('Last check') . ': ' . $check_time, 0, 1); $break = true; } @@ -1095,8 +1349,8 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema foreach ($columns as $row) { $extracted_fieldspec = PMA_extractFieldSpec($row['Type']); - $type = $extracted_fieldspec['print_type']; - $attribute = $extracted_fieldspec['attribute']; + $type = $extracted_fieldspec['print_type']; + $attribute = $extracted_fieldspec['attribute']; if (! isset($row['Default'])) { if ($row['Null'] != '' && $row['Null'] != 'NO') { $row['Default'] = 'NULL'; @@ -1107,22 +1361,28 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema $pdf->PMA_links['RT'][$table][$field_name] = $pdf->AddLink(); $pdf->Bookmark($field_name, 1, -1); $pdf->SetLink($pdf->PMA_links['doc'][$table][$field_name], -1); - $pdf_row = array($field_name, + $pdf_row = array( + $field_name, $type, $attribute, ($row['Null'] == '' || $row['Null'] == 'NO') ? __('No') : __('Yes'), - ((isset($row['Default'])) ? $row['Default'] : ''), + (isset($row['Default']) ? $row['Default'] : ''), $row['Extra'], - ((isset($res_rel[$field_name])) ? $res_rel[$field_name]['foreign_table'] . ' -> ' . $res_rel[$field_name]['foreign_field'] : ''), - ((isset($comments[$field_name])) ? $comments[$field_name] : ''), - ((isset($mime_map) && isset($mime_map[$field_name])) ? str_replace('_', '/', $mime_map[$field_name]['mimetype']) : '') - ); + (isset($res_rel[$field_name]) + ? $res_rel[$field_name]['foreign_table'] . ' -> ' . $res_rel[$field_name]['foreign_field'] + : ''), + (isset($comments[$field_name]) + ? $comments[$field_name] + : ''), + (isset($mime_map) && isset($mime_map[$field_name]) + ? str_replace('_', '/', $mime_map[$field_name]['mimetype']) + : '') + ); $links[0] = $pdf->PMA_links['RT'][$table][$field_name]; - if (isset($res_rel[$field_name]['foreign_table']) AND - isset($res_rel[$field_name]['foreign_field']) AND - isset($pdf->PMA_links['doc'][$res_rel[$field_name]['foreign_table']][$res_rel[$field_name]['foreign_field']]) - ) - { + if (isset($res_rel[$field_name]['foreign_table']) + AND isset($res_rel[$field_name]['foreign_field']) + AND isset($pdf->PMA_links['doc'][$res_rel[$field_name]['foreign_table']][$res_rel[$field_name]['foreign_field']]) + ) { $links[6] = $pdf->PMA_links['doc'][$res_rel[$field_name]['foreign_table']][$res_rel[$field_name]['foreign_field']]; } else { unset($links[6]); hooks/post-receive -- phpMyAdmin

1 0