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 6248aae4ef..6806bf195c 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 7108d872eb..39f28e07d6 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 eb005fb6c6..836c836a87 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 2237d25210..08ecf4e9a3 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 fc8cbfa16e..a4f18fd0e4 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 ef9d0c0595..10908cacc2 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 838ca3b8f8..5cc1958269 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 f01f2cebc1..fee3152d65 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 21a1df6aac..c23678540a 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 5d3c8694a1..26f5b4704e 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 b522cfafff..7d34627874 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 fcf74dc711..0dcae5c1bb 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 d1f8288778..ee32564f1b 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<{n0VAT@ao(_$dUftj5d$njuv0g}CJr-4F|?8iXL6gX{J#CTJf jZ!4Is;7x13Env2UH`V#Jf!P|~$;G^_KoviE=P?5S1)>=d delta 87 zcmbQPJY9K1HzOn0<{n0VAT@ao(_$dUftj5d$njuv0g}CJr-4F|?8iXL6gX{J#JEzJ jZ!4Is;7V)0Env2UE7ke7f!P|a$;G^_KoviE=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 zcmY*cc{r8p7C*}tqF2!|I~j`NG*E_089H4qQHPsE<3@=LAyXX@;uKAG`a)Fd5M5DQ zzDANJs&gcyl1M4#W|jtZ*V^~F&wcJczu#WNyViQ&Z@ugL_Q?dflL>OALK$FUZN9JWuhG$CVu7ef1FYd=r&e z(sR`T>-iNStu_wZZOkh0;5KwhF;=hmw%DO2E_O-cQzkar^odqY4v4`JIRRTKl5*g3 z()k6YAr1yjL6t^uIF=;Z8%kaGJ=C4*bB|D_4Qz^vN1-cf8mO}AcG5jbC!5z=P8|Dj zZj(cpe8KH~OguH_C1^2EgS7Q|zyI>)1*k}Gb4jl3Ezw*bIiuJ2EE7-J{)Y07i*=&? zc*M1kWVZ7brTm=Kh(g^ieZbPigUR$X#WBC%pb8i4d5dU}YK16F?KNe3t9*_wuNAb0 z$}Q?GIeN>ZGut8k+NHghG-E?H+IhcYJBIqZ_nb&*RY>{Q>^i@4CQe9OO-Wwt@4={l z9q^aZX0ckT4F*5vCQn-|TQtq)U|;+b-vx_yd{*(_#l*`+YiP^oGj1cs9BxK**-o(Tm{ z!_r!F((C(e0z#Qsz4%x1_CI?BQL2Q-N_fdk^v)|OA%ojFC&Zj{*!LoZ^A?DU&f^^x z#YujbpKrq7d&P9ebj$G8iYm*zaIxlv*;J)Vxdl-YUq}Zs^YSee1~11@+~BJl5gV_r zLY3(?1yU`ns6~{kJb;*4iPek$s@w%S?DQW~pXon|;tejmS_dOLhub1#X9pHLH-`Su z>tw~m;Z;Xy+v9E)P>`})bXMKBs79mPC5+`1Zn>rRIo4vspav7YzP$+b)9(C?xcrVO zV)C6YhzWPIFvL$a%Vkjrt6Pl7*L^@${zC)m;`p~Pk;x0%yvV1`0C9I)B(U^$JN&t*9Zy#*Zr3AgA~FwD@hB>eY_H=v<0!CvMu?QogXeC8a46 zUk{&f@QbQGT}J%vGrm2-?29?*gz7&n=p4_c(5=?Xdh{MV$aI%mV-d`_i`t;A%|2W`d2e^RC~Hoi>)~N{ zkCPRF{kD)`bR%>#<9oHCl(uwY65wHSt91ZxD<{$ceN0uZ1E(nEDm~z-@QG7kCpl*r zzzEVlL-0lIfFZbHD{=P5fG-ekgE8z!?T|6F)7r<=VIuMS84yWpy=MV76W2ToE+M6x zz*!_aQ#@G4N1B2s`P9vZS-{HYz#wR_XPG->Q)1UxuN{_|H0k4z(wBp_F6xbmjAP~y zi;Ggt(G5A?61Gqoee2;OvD+igG>>8K4vBdOQ|jtYK>E$$P=U^`GB z$40siXRh-J_Opp&e7YS(VFPpW_TYyUW)Cxvj@!d=TxRD0Q55^q-+?YV_hJd?A%QdO zKyAD;WYTGAE`x34mGLXslHBA5Tc{ETclZUxRCnCuc&5gylumviof`2dBh`WNH7mf6 zoJ>6dhY=U-DS0eLUf2zcTkZvT|M~r10GO6PxCXlz)fd+SzB_s2brO+xT@Om6_7P&6 zF@Cx?HXn-PeIW&j^TlV%_yrr_F=>DF14pE_ey{oW1A=G9E!4%Z;*MngJIgf@y8;Y%A@SZBKji5`#=|@Vmf+(OjKDRPj@}Om7V4pV2 zbieB0C-0Phz;UQD^{aM)>5?wrrpLJ!r_>pDE(Wfnf7mwY8OO960=m=hc}MQ4U|i64 z_zBabBGG9U#zHa$Hi?7vNC)Gv-53`hPmha#77sV6#N!E|NHvutfd*1d64)S(-324c zOi!~Q{KTnWOmcl5noRHTTZ8SLj7@>798*A!R=Mqlp6P5y$Tnf^vsa2IU+Ml>X3s*@ z8kt3@MZV?bz1yC9DJ@<4p(1dgbLko11VgNG4;)fvy#s^1(vBbM8ouj(bxQbBi;+`7 zNRcDbB+sH?K`ca6+b+2Q5*T|GkJAEbg?4c$*|#wi~FTU_*y15i(k z4by?X);WVik{gtL2!zrsubP!-;D|uG6bCQxb8zPiUB-1D0e^J;H4`rs>ht%MxdxYQ{Kv+vPs} zH1afv@zEz>A*ir@#b>W2{;|wqUY16uY&5K%6J5>t+B`_5o>-9&`V*L|((YN4{EeEl zYeZTKeT@4(AM&t{p9^3s&SGwp)aDq*<)6lT!?=Od;D%&h2ssnkytHK1i3RJjHrkoY zwKyL)l)$**LiiQ!4n=qvjMF@WZN>PIGyfSfuEh{fM^t|ngP_@<6jmbbD1~=O{^uYA zjo;5fC!JGg8H^{V;S2wXSWdT=yIl^G(fF<$=Fq+;U4l(WDVLyX4D%c}%6ON{U_d#- zuYfsu6kY>Yq%RWUT`FK51ud?Gm(pyZH{(Uu!Ijdzz5)Ajk`zST0dk1E3r0xC??MrN zb@I+NI9O2LRtqlUm{qX(;izw6MGq|)_ox<+nQ=<@BzyRJk0vswb00L3=HDk9AAKK= zQVNy7KtQbV5Y=e*sD~`1{(8x4r|}UilR>M&Q=tEH{DBUiop@;e;(|>ZmWC}0sr}rEm)Q^`Gjf#VC0qN!-;0G`_FbLL2vxi_Y zQq+)SikA(+4U&cdKUH|WkB}#=%1%|w)C&b#j$S2GG(rrDJ~Boz0s* delta 4050 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 diff --git a/libraries/fpdf/font/FreeSansBold.ctg.z b/libraries/fpdf/font/FreeSansBold.ctg.z index 93e09b99ba73aff0c7aa4a5e2d37a6ba3629e331..f8d288a0e30f2fb1d3462b369a455c4944dd5afb 100644 GIT binary patch delta 81 zcmbOzI8jizV$R#!r2?T>#n?XN*S@}RH#n?XN*S@}RH2jGusH6;lO} e{LJ(cNZw`61(Mz@ii}*Fb6GYs0x3nd0ww?q>l_dO diff --git a/libraries/fpdf/font/FreeSansBold.z b/libraries/fpdf/font/FreeSansBold.z index 1c7073a3074878b2aef2b0c340ca380079282535..5499c1794f11032e9d757442358c7a0151e86835 100644 GIT binary patch delta 916 zcmW-gdo0yq7{~WJ?((jPbE3J+Vy^2lQn}`KGM2NJ>+0Z)gONI6BX{DYrQc+=Nypi8 zL{t4rGivG|!>pu~Qm21nl-5cpGkqWbeBOPZ@AEwG^SeF^-7$D=hLor04qbD`XbV>rBITeDw&Ie&AoC~Suol6w?j&9!}EcX1O*rvOh_EdYs z8n9U=y!UuWZPi|hwCH`bR8ZqL0wMM1O(66EH^9=sHH3-|iK$0pP$Xr)I?_w6%0nU` zUWBwzsVwXz=oa1v4u!kI_!4eQ#=nSch>T<3NW@1S1}{gYf(ubf7_#U(I@brO4y-w@ z2Q%Ve3&U|VHZR2EUIk^sCT*-tOr_X}%pc;fOa~!!o~*}X2_7j!G}Bz#ABfrXWfGHT zQb2FHJwj4>AC<0W(8GPr>;qe~BEi|LEZAWRBN`(*rw3v=$B{Z)=f0+r`MhQbRX#@( z6c;QSW07AtOV*p>eV}OxU43v#7=@}!Neq;3T`Mc|qee%|%c%Kar5wVc%99$!)C5v` zO>F`AyS4}+MP2?@(|R5vyJ3~Y=|-3BEZ0ettJyiN2@aL?HZZ=WaSl#NlRMbaGzg}s zZ9$cqPV!N`_1V}r)AuGQu1wO_0oPU_eED8OBR0;v;c?o=Xo{Yj!?1{wa)fgRNv5feUjtkERXnsZ=mr>8ah@uWR+wc!4SvTJ6;r**|;v5xVV zI+0Z)gONI6BX{DYrQc+=Nypi8 zL{t4rGivG|!>pu~Qm21nl-5cpGkqWbeBOPZ@AEwG^SS6iU&3w4_!p54k#X!BiTJ3);N_@Pa3M+wLl#{}=lUSkfi=hV zU`8BlVK|P)=7o6NtDsESq>Yt{sT3QL`9u7b=^%v8ll6Ek!6RjeW|~X;12LPvOk(m( z3g|7jM@TB~qtf*ZdbqEdePC-=BsiOu1v^Y(L}Ntf^gt}T>Is}C*-qfm7ziGk9sYqcozqee%|%c%Kar5wVc%99$!)C5v` zO>F`AyS4}+MP2?@(|R5vyJ3~Y=|-3BEZ0ettJyiN2@aL?HZZ=WaSl#NlRMbaGzg}s zZ9$cqPV!N`_1V}r)AuGQu1wO_0oPU_eED8OBR0;v;c?o=Xo{Yj!?1{wa)fgRNv5feUjtkERXnsZ=mr>8ah@uWR+wc!4SvTJ6;r**|;v5xVV zI -
    +
    - + ' ); ?> diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 1879339f19..a14cf830c8 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 0de583e50e..4522a04148 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 40ea860966..b13806248d 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.