From 3ce5fa581f18d6af273f0fbe9b15fe04beace6fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 17 Nov 2006 08:49:22 +0000 Subject: [PATCH] Check before commit! --- ChangeLog | 34 ++++++ Documentation.html | 8 +- README | 2 +- config.sample.inc.php | 120 ++++++++++----------- error.php | 3 +- lang/dutch-iso-8859-1.inc.php | 2 +- lang/dutch-iso-8859-15.inc.php | 2 +- lang/dutch-utf-8.inc.php | 2 +- lang/japanese-sjis.inc.php | 8 +- libraries/Config.class.php | 2 +- libraries/common.lib.php | 2 - libraries/database_interface.lib.php | 1 - libraries/display_tbl.lib.php | 3 + libraries/fpdf/font/FreeSans.ctg.z | Bin 4503 -> 4503 bytes libraries/fpdf/font/FreeSans.z | Bin 131363 -> 131363 bytes libraries/fpdf/font/FreeSansBold.ctg.z | Bin 2193 -> 2193 bytes libraries/fpdf/font/FreeSansBold.z | Bin 46047 -> 46047 bytes libraries/import/csv.php | 4 +- libraries/session.inc.php | 1 - libraries/tbl_properties.inc.php | 4 +- scripts/create-release.sh | 140 +++++++------------------ sql.php | 3 + tbl_properties_operations.php | 8 +- translators.html | 4 +- 24 files changed, 165 insertions(+), 188 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6248aae4e..6806bf195 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,40 @@ phpMyAdmin - ChangeLog $Id$ $Source$ +2006-11-17 Michal Čihař + * sql.php, libraries/display_tbl.lib.php: Force pos to be integer to avoid + XSS. + +2006-11-09 Marc Delisle + ### 2.9.1 released from MAINT_2_9_1 + +2006-11-03 Michal Čihař + * config.sample.inc.php: Make it use CRLF to make Windows users happy. + +2006-11-02 Michal Čihař + * Documentation.html: Mention problems with Hardened-PHP. + * lang/dutch: Fix typo, thanks to Thijs Kinkhorst - kink. + +2006-11-01 Marc Delisle + ### 2.9.1-rc2 released from QA_2_9 + +2006-10-27 Marc Delisle + * libraries/fpdf/font: replace broken binary files + +2006-10-26 Marc Delisle + * error.php, libraries/common.lib.php, /database_interface.lib.php, + /session.inc.php: force utf-8 charset to avoid XSS with crafted URL + and utf-7 in charset; error messages won't display correctly + if the chosen lang is not utf-8 + +2006-10-26 Michal Čihař + * libraries/import/csv.php: Fix wrong import when ;; is at buffer boundary + (bug #1584836). + * tbl_properties_operations.php: Fix duplicate ID for checkbox (bug + #1584770). + * libraries/tbl_properties.inc.php: Check form only when saving table + fields (bug #1566222). + 2006-10-25 Michal Čihař * libraries/export/csv.php: Fix cvs/csv typo (bug #1583509). diff --git a/Documentation.html b/Documentation.html index 7108d872e..39f28e07d 100644 --- a/Documentation.html +++ b/Documentation.html @@ -11,7 +11,7 @@ - phpMyAdmin 2.9.1-dev - Documentation + phpMyAdmin 2.9.2-dev - Documentation @@ -33,7 +33,7 @@
  • Glossary
    • -

    phpMyAdmin 2.9.1-dev Documentation

    +

    phpMyAdmin 2.9.2-dev Documentation

    • phpMyAdmin homepage
      • @@ -2826,6 +2826,10 @@ RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization},L]
    • In the php.ini directive arg_separator.input, a value of ";" will cause this error. Replace it with "&;".
      • +
    • If you are using Hardened-PHP, + you might want to increase + request limits. +

    Known limitations

    diff --git a/README b/README index eb005fb6c..836c836a8 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 2.9.1-dev + Version 2.9.2-dev ----------------- http://www.phpmyadmin.net/ diff --git a/config.sample.inc.php b/config.sample.inc.php index 2237d2521..08ecf4e9a 100644 --- a/config.sample.inc.php +++ b/config.sample.inc.php @@ -1,60 +1,60 @@ -. - */ - -/* - * This is needed for cookie based authentication to encrypt password in - * cookie - */ -$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */ - -/* - * Servers configuration - */ -$i = 0; - -/* - * First server - */ -$i++; -/* Authentication type */ -$cfg['Servers'][$i]['auth_type'] = 'cookie'; -/* Server parameters */ -$cfg['Servers'][$i]['host'] = 'localhost'; -$cfg['Servers'][$i]['connect_type'] = 'tcp'; -$cfg['Servers'][$i]['compress'] = false; -/* Select mysqli if your server has it */ -$cfg['Servers'][$i]['extension'] = 'mysql'; -/* User for advanced features */ -$cfg['Servers'][$i]['controluser'] = 'pmausr'; -$cfg['Servers'][$i]['controlpass'] = 'pmapass'; -/* Advanced phpMyAdmin features */ -$cfg['Servers'][$i]['pmadb'] = 'phpmyadmin'; -$cfg['Servers'][$i]['bookmarktable'] = 'pma_bookmark'; -$cfg['Servers'][$i]['relation'] = 'pma_relation'; -$cfg['Servers'][$i]['table_info'] = 'pma_table_info'; -$cfg['Servers'][$i]['table_coords'] = 'pma_table_coords'; -$cfg['Servers'][$i]['pdf_pages'] = 'pma_pdf_pages'; -$cfg['Servers'][$i]['column_info'] = 'pma_column_info'; -$cfg['Servers'][$i]['history'] = 'pma_history'; - -/* - * End of servers configuration - */ - -/* - * Directories for saving/loading files from server - */ -$cfg['UploadDir'] = ''; -$cfg['SaveDir'] = ''; - -?> +. + */ + +/* + * This is needed for cookie based authentication to encrypt password in + * cookie + */ +$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */ + +/* + * Servers configuration + */ +$i = 0; + +/* + * First server + */ +$i++; +/* Authentication type */ +$cfg['Servers'][$i]['auth_type'] = 'cookie'; +/* Server parameters */ +$cfg['Servers'][$i]['host'] = 'localhost'; +$cfg['Servers'][$i]['connect_type'] = 'tcp'; +$cfg['Servers'][$i]['compress'] = false; +/* Select mysqli if your server has it */ +$cfg['Servers'][$i]['extension'] = 'mysql'; +/* User for advanced features */ +$cfg['Servers'][$i]['controluser'] = 'pmausr'; +$cfg['Servers'][$i]['controlpass'] = 'pmapass'; +/* Advanced phpMyAdmin features */ +$cfg['Servers'][$i]['pmadb'] = 'phpmyadmin'; +$cfg['Servers'][$i]['bookmarktable'] = 'pma_bookmark'; +$cfg['Servers'][$i]['relation'] = 'pma_relation'; +$cfg['Servers'][$i]['table_info'] = 'pma_table_info'; +$cfg['Servers'][$i]['table_coords'] = 'pma_table_coords'; +$cfg['Servers'][$i]['pdf_pages'] = 'pma_pdf_pages'; +$cfg['Servers'][$i]['column_info'] = 'pma_column_info'; +$cfg['Servers'][$i]['history'] = 'pma_history'; + +/* + * End of servers configuration + */ + +/* + * Directories for saving/loading files from server + */ +$cfg['UploadDir'] = ''; +$cfg['SaveDir'] = ''; + +?> diff --git a/error.php b/error.php index fc8cbfa16..a4f18fd0e 100644 --- a/error.php +++ b/error.php @@ -14,7 +14,8 @@ require_once('./libraries/sanitizing.lib.php'); /* Get variables */ $lang = isset( $_REQUEST['lang'] ) ? htmlspecialchars($_REQUEST['lang']) : 'en'; $dir = isset( $_REQUEST['dir'] ) ? htmlspecialchars($_REQUEST['dir']) : 'ltr'; -$charset = isset( $_REQUEST['charset'] ) ? htmlspecialchars($_REQUEST['charset']) : 'utf-8'; +// force utf-8 to avoid XSS with crafted URL and utf-7 in charset parameter +$charset = 'utf-8'; $type = isset( $_REQUEST['type'] ) ? htmlspecialchars($_REQUEST['type']) : 'error'; header('Content-Type: text/html; charset=' . $charset); diff --git a/lang/dutch-iso-8859-1.inc.php b/lang/dutch-iso-8859-1.inc.php index ef9d0c059..10908cacc 100644 --- a/lang/dutch-iso-8859-1.inc.php +++ b/lang/dutch-iso-8859-1.inc.php @@ -346,7 +346,7 @@ $strLogin = 'Inloggen'; $strLogout = 'Uitloggen'; $strLogPassword = 'Wachtwoord:'; $strLogServer = 'Server'; -$strLogUsername = 'Gebruikers naam:'; +$strLogUsername = 'Gebruikersnaam:'; $strMaximumSize = 'Maximale grootte: %s%s'; $strMbExtensionMissing = 'De mbstring PHP extensie werd niet gevonden en u lijkt een multibyte charset te gebruiken. Zonder de mbstring extensie kan phpMyAdmin strings niet correct splitsen wat tot onverwachte resultaten kan leiden.'; diff --git a/lang/dutch-iso-8859-15.inc.php b/lang/dutch-iso-8859-15.inc.php index 838ca3b8f..5cc195826 100644 --- a/lang/dutch-iso-8859-15.inc.php +++ b/lang/dutch-iso-8859-15.inc.php @@ -346,7 +346,7 @@ $strLogin = 'Inloggen'; $strLogout = 'Uitloggen'; $strLogPassword = 'Wachtwoord:'; $strLogServer = 'Server'; -$strLogUsername = 'Gebruikers naam:'; +$strLogUsername = 'Gebruikersnaam:'; $strMaximumSize = 'Maximale grootte: %s%s'; $strMbExtensionMissing = 'De mbstring PHP extensie werd niet gevonden en u lijkt een multibyte charset te gebruiken. Zonder de mbstring extensie kan phpMyAdmin strings niet correct splitsen wat tot onverwachte resultaten kan leiden.'; diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php index f01f2cebc..fee3152d6 100644 --- a/lang/dutch-utf-8.inc.php +++ b/lang/dutch-utf-8.inc.php @@ -347,7 +347,7 @@ $strLogin = 'Inloggen'; $strLogout = 'Uitloggen'; $strLogPassword = 'Wachtwoord:'; $strLogServer = 'Server'; -$strLogUsername = 'Gebruikers naam:'; +$strLogUsername = 'Gebruikersnaam:'; $strMaximumSize = 'Maximale grootte: %s%s'; $strMbExtensionMissing = 'De mbstring PHP extensie werd niet gevonden en u lijkt een multibyte charset te gebruiken. Zonder de mbstring extensie kan phpMyAdmin strings niet correct splitsen wat tot onverwachte resultaten kan leiden.'; diff --git a/lang/japanese-sjis.inc.php b/lang/japanese-sjis.inc.php index 21a1df6aa..c23678540 100644 --- a/lang/japanese-sjis.inc.php +++ b/lang/japanese-sjis.inc.php @@ -142,7 +142,7 @@ $strCheckPrivs = ' $strCheckPrivsLong = 'f[^x[X "%s" ̓`FbNB'; $strCheckTable = 'e[u`FbN'; $strChoosePage = 'ҏWy[WIĂB'; -$strColComFeat = 'Rg\@\'; +$strColComFeat = 'Rg\@\\'; $strCollation = 'ƍ'; $strColumnNames = '(J)'; $strColumnPrivileges = 'Jw̓'; @@ -174,7 +174,7 @@ $strCreateIndexTopic = ' $strCreateNewDatabase = 'VKf[^x[X쐬'; $strCreateNewTable = 'f[^x[Xu%sɃe[uVK쐬'; $strCreatePage = 'VKy[W쐬'; -$strCreatePdfFeat = 'PDF 쐬@\'; +$strCreatePdfFeat = 'PDF 쐬@\\'; $strCreateUserDatabase = '[Upf[^x[X'; $strCreateUserDatabaseName = '̃f[^x[X쐬ĂׂĂ̓^܂'; $strCreateUserDatabaseNone = 'Ȃ'; @@ -239,7 +239,7 @@ $strDictionary = ' $strDirtyPages = 'ȃy[W'; $strDisabled = ''; $strDisableForeignChecks = 'OL[̌𖳌ɂ'; -$strDisplayFeat = 'e[u\@\'; +$strDisplayFeat = 'e[u\@\\'; $strDisplayOrder = '\:'; $strDisplayPDF = 'PDF XL[}̕\'; $strDoAQuery = '"QUERY"s (ChJ[h: "%")'; @@ -317,7 +317,7 @@ $strFunction = ' $strFunctions = '֐'; $strGenBy = '‹'; -$strGeneralRelationFeat = '[V@\'; +$strGeneralRelationFeat = '[V@\\'; $strGenerate = ''; $strGeneratePassword = 'pX[h𐶐'; $strGenTime = '쐬̎'; diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 5d3c8694a..26f5b4704 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -80,7 +80,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '2.9.1-dev'); + $this->set('PMA_VERSION', '2.9.2-dev'); /** * @deprecated */ diff --git a/libraries/common.lib.php b/libraries/common.lib.php index b522cfaff..7d3462787 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2971,7 +2971,6 @@ if (empty($_SESSION['PMA_Config'])) { if (!function_exists('preg_replace')) { header('Location: error.php' . '?lang=' . urlencode($available_languages[$lang][2]) - . '&charset=' . urlencode($charset) . '&dir=' . urlencode($text_dir) . '&type=' . urlencode($strError) . '&error=' . urlencode( @@ -3180,7 +3179,6 @@ if (! defined('PMA_MINIMUM_COMMON')) { if (!file_exists('./libraries/auth/' . $cfg['Server']['auth_type'] . '.auth.lib.php')) { header('Location: error.php' . '?lang=' . urlencode($available_languages[$lang][2]) - . '&charset=' . urlencode($charset) . '&dir=' . urlencode($text_dir) . '&type=' . urlencode($strError) . '&error=' . urlencode( diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index fcf74dc71..0dcae5c1b 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -56,7 +56,6 @@ if ( ! PMA_DBI_checkAndLoadMysqlExtension( $GLOBALS['cfg']['Server']['extension' // if alternativ fails too ... header( 'Location: error.php' . '?lang=' . urlencode( $available_languages[$lang][2] ) - . '&charset=' . urlencode( $charset ) . '&dir=' . urlencode( $text_dir ) . '&type=' . urlencode( $strError ) . '&error=' . urlencode( diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index d1f828877..ee32564f1 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -13,6 +13,9 @@ require_once './libraries/Table.class.php'; */ if (!isset($pos)) { $pos = 0; +} else { + /* We need this to be a integer */ + $pos = (int)$pos; } /** diff --git a/libraries/fpdf/font/FreeSans.ctg.z b/libraries/fpdf/font/FreeSans.ctg.z index 164785c1fb65078ea1292b41e1825e82994e6ce2..7f541a631f2a0a6a743bfa1205f53b929b790639 100644 GIT binary patch delta 87 zcmbQPJY9K1HzOnO<{n0VMn>MrbC?!0@@{ruW@l#Po$SHp!pJ+hm+dqo@8(GMV<2S; roVF}tyeZ7L70g!frZwLdFk8Z#>U`V4Yz^<^V%}Cp-pxOG=P?5S1)>=d delta 87 zcmbQPJY9K1HzOn0<{n0VMnm!pJqbm+dqo*XBs}V<2S; roVF}tTq(@A70gy}r8VCcFk8Zv>U`V4Yz^1sV%}CpuFXGr=P?5S|C1Q) diff --git a/libraries/fpdf/font/FreeSans.z b/libraries/fpdf/font/FreeSans.z index 579bfdd2728a522978e4b8620b1355808b456288..a8e8e634b051aef9ba585e97c7be2b2adf2f9830 100644 GIT binary patch delta 4050 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 delta 4050 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 delta 81 zcmbOzI8jizV$R#!r2?T>#n?XN*S@}RHfn(WP@$jG%hmt`{}BiCj{wgM&q4C@>a diff --git a/libraries/fpdf/font/FreeSansBold.z b/libraries/fpdf/font/FreeSansBold.z index 1c7073a3074878b2aef2b0c340ca380079282535..5499c1794f11032e9d757442358c7a0151e86835 100644 GIT binary patch delta 916 zcmccroaz2^rU|-?yc6|&8F@F>FtRZ6POf7KVdUL>nWc+~gLk=;wI#-p!|Zw=gmC zZf+3p0BJla7{JK8SxQKciII1*r^rn<-n3~#{=AblMBg&7K>NyE(+8738m5-YXb+ zCpY`tXXKrn>>I<#yZL}G$k~%O`)_09-JBKhA7pV>a16+l;~|EOyqkZ9tN^)bQCJ%b zBkyL-=sh4eJ&XOy$h-MY+!qk%Vq!ES?_}L1S&*la)`PVEP6kEX)0Fj$ypyM$A4i RbGYeU_1Has-b&BiH5%o*+g>uFa=;w=gks zZEg_o0BJla7{JK2SxQKciIHovr^rn7K>NwK>G2738m5-YXcn zCO7-sXXKik>>I<#wfTTA$k~%O`)_09+ME^eA7pV>a16+l;~|EOT$_J}tN^)bQCJ%b zBiCll=sh4eJ&XOy$hG-S+!qk%Vq!ES*JRx!S&*la)`PVEP6kEX)0Fj$T$87!x-oK1 zzLT2D$hFxijTPh!kIdDKT${gS%7aW6$-V^A@;s-Pk!y2lE+fbV<@vAJ7`Zkll@)@d zu9O=ya!ux_00q5$g%e1qsS?E5SqTnS-WmgtL3Xt@Aj5YzBr$SrmTS}k8RXe)2~ytN zlF!IB`EyGVDDql!K|)vBCNpwv&S?J*;v{q`@pEM>Fl8?kzP8ZbQG881*W`(v<HT zS9GZ{a!sD!wVRP^a&)&OBiH28ZjeuIcY~9SY%eIiZBFaE2(sE@(l$A4i RbG -
    +
    - + ' ); ?> diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 1879339f1..a14cf830c 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -68,61 +68,39 @@ # - added release todo list # -cvsserver=${cvsserver:-phpmyadmin.cvs.sourceforge.net} KITS="all-languages-utf-8-only all-languages english" COMPRESSIONS="zip-7z tbz tgz 7z" -# third param is the user; when creating a release we don't want -# to suffer from the delay between anonymous cvs and developer cvs - if [ $# = 0 ] then - echo "Usage: create-release.sh version from_branch devname" + echo "Usages:" + echo " create-release.sh [from_branch]" + echo " create-release.sh snapshot [sf]" echo " (no spaces allowed!)" echo "" - echo "Example: create-release.sh 2.9.0-rc1 QA_2_9 lem9" + echo "Examples:" + echo " create-release.sh 2.9.0-rc1 branches/QA_2_9" + echo " create-release.sh 2.9.0 tags/RELEASE_2_9_0" exit 65 fi -if [ "$1" = "snapshot" ] -then - branch='' -elif [ "$#" -ge 2 ] -then - branch="-r $2" -fi +branch='trunk' -user="anonymous" -if [ "$#" -eq 3 ] -then - user=$3 -fi - - -if [ $1 = "snapshot" ] -then - mode="snapshot" - date_snapshot=`date +%Y%m%d-%H%M%S` -fi - -# Set target name -if [ "$mode" != "snapshot" ] -then - target=$1 +if [ "$1" = "snapshot" ] ; then + mode="snapshot" + date_snapshot=`date +%Y%m%d-%H%M%S` + target=$date_snapshot else - target=$date_snapshot -fi - - -if [ "$mode" != "snapshot" ] -then - - cat <set( 'PMA_VERSION', '2.7.1-dev' ); " + " \$this->set( 'PMA_VERSION', '$1' ); " - in Documentation.html the 2 lines " phpMyAdmin $1 - Documentation " "

    phpMyAdmin $1 Documentation

    " @@ -136,76 +114,40 @@ Please ensure you have: Continue (y/n)? END - printf "\a" - read do_release + read do_release - if [ "$do_release" != 'y' ]; then - exit - fi + if [ "$do_release" != 'y' ]; then + exit + fi fi -if [ "$mode" = "snapshot" -a "$2" != "local" ] ; then -# Goto project dir +if [ "$mode" = "snapshot" -a "$2" = "sf" ] ; then + # Goto project dir cd /home/groups/p/ph/phpmyadmin/htdocs -## Move old cvs dir -#if [ -e cvs ]; -#then -# mv cvs cvs-`date +%s` -#fi - -# Keep one previous version of the cvs directory - if [ -e cvs-prev ]; - then - rm -rf cvs-prev + # Keep one previous version of the cvs directory + if [ -e svn-prev ] ; then + rm -rf svn-prev fi - mv cvs cvs-prev + mv svn svn-prev fi -# Do CVS checkout -mkdir cvs -cd cvs +# Do SVNcheckout +mkdir -p ./svn +cd svn -if [ "$mode" != "snapshot" ] ; then - if grep -Fq ':pserver:anonymous@phpmyadmin.cvs.sourceforge.net:2401/cvsroot/phpmyadmin' ~/.cvspass ; then - echo "You seem to be already logged into phpMyAdmin CVS, skipping that" - else - if [ $user = "anonymous" ] ; then - echo "Press [ENTER]!" - cvs -q -d:pserver:anonymous@$cvsserver:/cvsroot/phpmyadmin login - if [ $? -ne 0 ] ; then - echo "CVS login failed, bailing out" - exit 1 - fi - fi - fi -fi +echo "Exporting repository from subversion" -if [ $user = "anonymous" ] ; then - cvs -q -z3 -d:pserver:anonymous@$cvsserver:/cvsroot/phpmyadmin co -P $branch phpMyAdmin -else - cvs -q -z3 -d:ext:$user@$cvsserver:/cvsroot/phpmyadmin co -P $branch phpMyAdmin -fi +svn export -q https://svn.sourceforge.net/svnroot/phpmyadmin/$branch/phpMyAdmin if [ $? -ne 0 ] ; then - echo "CVS checkout failed, bailing out" + echo "Subversion checkout failed, bailing out" exit 2 fi # Cleanup release dir LC_ALL=C date -u > phpMyAdmin/RELEASE-DATE-${target} -# Olivier asked to keep those in the cvs release, to allow testers to use -# cvs update on it -if [ "$mode" != "snapshot" ] -then - find phpMyAdmin \( -name .cvsignore -o -name CVS \) -print0 | xargs -0 rm -rf -fi - -find phpMyAdmin -type d -print0 | xargs -0 chmod 755 -find phpMyAdmin -type f -print0 | xargs -0 chmod 644 -find phpMyAdmin \( -name '*.sh' -o -name '*.pl' \) -print0 | xargs -0 chmod 755 - # Building Documentation.txt LC_ALL=C w3m -dump phpMyAdmin/Documentation.html > phpMyAdmin/Documentation.txt @@ -296,8 +238,8 @@ cat <set( 'PMA_VERSION', '2.7.1-dev' ); " - in Documentation.html the 2 lines @@ -339,12 +281,6 @@ END fi -if [ "$mode" = "snapshot" -a "$2" != "local" ] ; then - cd .. - find cvs -type d -print0 | xargs -0 chmod 775 - find cvs -type f -print0 | xargs -0 chmod 664 -fi - # Removed due to not needed thanks to clever scripting by Robbat2 # 9. update the demo subdirectory: # - in htdocs, cvs update phpMyAdmin diff --git a/sql.php b/sql.php index 0de583e50..4522a0414 100644 --- a/sql.php +++ b/sql.php @@ -110,6 +110,9 @@ if (isset($find_real_end) && $find_real_end) { */ elseif (!isset($pos)) { $pos = 0; +} else { + /* We need this to be a integer */ + $pos = (int)$pos; } /** diff --git a/tbl_properties_operations.php b/tbl_properties_operations.php index 40ea86096..b13806248 100644 --- a/tbl_properties_operations.php +++ b/tbl_properties_operations.php @@ -201,8 +201,8 @@ value="" />
    // starting with MySQL 5.0.24, SHOW CREATE TABLE includes the AUTO_INCREMENT // next value but users can decide if they want it or not for the operation ?> - -
    + +
    @@ -370,8 +370,8 @@ foreach ($dblist as $each_db) {
    - -
    + +
    - phpMyAdmin 2.9.1-dev - Official translators + phpMyAdmin 2.9.2-dev - Official translators @@ -31,7 +31,7 @@
  • Glossary
    • -

    phpMyAdmin 2.9.1-dev official translators list

    +

    phpMyAdmin 2.9.2-dev official translators list

    Here is the list of the "official translators" of phpMyAdmin.