July 2011 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11690-gdc21803
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via dc218032df2896d173334304e8ff673709012ea6 (commit) via 09f9a2643727c59e6b193eb9ca403ad42debc338 (commit) via 076ec61952dead1cc534751c3ecc82e880a20145 (commit) from d8f6e7da389da4ff99435dea358b713af116f9e1 (commit) - Log ----------------------------------------------------------------- commit dc218032df2896d173334304e8ff673709012ea6 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 11:18:13 2011 +0200 Add excludes to phploc call as well commit 09f9a2643727c59e6b193eb9ca403ad42debc338 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 11:17:20 2011 +0200 Exclude php-gettext as well commit 076ec61952dead1cc534751c3ecc82e880a20145 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 11:16:46 2011 +0200 Exclude external libs for phpmd run ----------------------------------------------------------------------- Summary of changes: build.xml | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/build.xml b/build.xml index ad4dc40..9beb3aa 100644 --- a/build.xml +++ b/build.xml @@ -38,6 +38,7 @@ <arg line="${source_comma_sep} xml codesize,design,naming,unusedcode + --exclude test,build,PHPExcel,tcpdf,php-gettext --reportfile ${basedir}/build/logs/pmd.xml" /> </exec> </target> @@ -49,13 +50,20 @@ --exclude build --exclude libraries/PHPExcel --exclude libraries/tcpdf + --exclude libraries/php-gettext ${source}" /> </exec> </target> <target name="phploc" description="Generate phploc.csv"> <exec executable="phploc"> - <arg line="--log-csv ${basedir}/build/logs/phploc.csv ${source}" /> + <arg line="--log-csv ${basedir}/build/logs/phploc.csv + --exclude test + --exclude build + --exclude libraries/PHPExcel + --exclude libraries/tcpdf + --exclude libraries/php-gettext + ${source}" /> </exec> </target> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11687-gd8f6e7d
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via d8f6e7da389da4ff99435dea358b713af116f9e1 (commit) via bea5556023b4561c23e82f5005059c5fb7b1cde8 (commit) from 1ed584866b568dae5d47bed741682de7f8a4d320 (commit) - Log ----------------------------------------------------------------- commit d8f6e7da389da4ff99435dea358b713af116f9e1 Merge: 1ed584866b568dae5d47bed741682de7f8a4d320 bea5556023b4561c23e82f5005059c5fb7b1cde8 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 10:21:54 2011 +0200 Merge remote-tracking branch 'origin/QA_3_4' ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3_1-36-gbea5556
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, QA_3_4 has been updated via bea5556023b4561c23e82f5005059c5fb7b1cde8 (commit) from 36c0339eb00394d4c51ccbf82a20feae7b70fb18 (commit) - Log ----------------------------------------------------------------- commit bea5556023b4561c23e82f5005059c5fb7b1cde8 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 10:20:44 2011 +0200 Update translations from master ----------------------------------------------------------------------- Summary of changes: po/ar.po | 116 +++--- po/bg.po | 205 ++++++----- po/br.po | 375 ++++++++++-------- po/da.po | 1240 +++++++++++++++++++++++++++++++++++++---------------------- po/pt_BR.po | 101 +++-- po/sk.po | 61 +++- 6 files changed, 1271 insertions(+), 827 deletions(-) diff --git a/po/ar.po b/po/ar.po index 5754fce..17f9824 100644 --- a/po/ar.po +++ b/po/ar.po @@ -3075,42 +3075,42 @@ msgstr "" #: libraries/config/messages.inc.php:204 msgid "Changes tracking" -msgstr "" +msgstr "تعقب التغيرات" #: libraries/config/messages.inc.php:205 msgid "" "Tracking of changes made in database. Requires the phpMyAdmin configuration " "storage." -msgstr "" +msgstr "تعقب التغيرات الحاصلة على قاعدة البيانات." #: libraries/config/messages.inc.php:206 msgid "Customize export options" -msgstr "" +msgstr "تخصيص خيارات التصدير" #: libraries/config/messages.inc.php:208 msgid "Customize import defaults" -msgstr "" +msgstr "تخصيص خيارات الإستيراد" #: libraries/config/messages.inc.php:209 msgid "Customize navigation frame" -msgstr "" +msgstr "تخصيص اطار التصفح" #: libraries/config/messages.inc.php:210 msgid "Customize main frame" -msgstr "" +msgstr "تخصيص الإطار الرئيسي" #: libraries/config/messages.inc.php:211 libraries/config/messages.inc.php:216 #: setup/frames/menu.inc.php:17 msgid "SQL queries" -msgstr "" +msgstr "إستعلام SQL" #: libraries/config/messages.inc.php:213 msgid "SQL Query box" -msgstr "" +msgstr "صندوق إستعلام SQL" #: libraries/config/messages.inc.php:214 msgid "Customize links shown in SQL Query boxes" -msgstr "" +msgstr "تخصيص الروابط الموجودة في صندوق إستعلام SQL" #: libraries/config/messages.inc.php:217 #, fuzzy @@ -3134,19 +3134,19 @@ msgstr "" #: libraries/config/messages.inc.php:220 msgid "Startup" -msgstr "" +msgstr "بدء التشغيل" #: libraries/config/messages.inc.php:221 msgid "Customize startup page" -msgstr "" +msgstr "تخصيص صفحة بدء التشغيل" #: libraries/config/messages.inc.php:222 msgid "Tabs" -msgstr "" +msgstr "التبويبات" #: libraries/config/messages.inc.php:223 msgid "Choose how you want tabs to work" -msgstr "" +msgstr "إختر الطريقة التي تعمل بها التبويبات" #: libraries/config/messages.inc.php:224 #, fuzzy @@ -3162,7 +3162,7 @@ msgstr "استخدم حقل نص" #: libraries/config/messages.inc.php:226 libraries/export/texytext.php:17 msgid "Texy! text" -msgstr "" +msgstr "نص" #: libraries/config/messages.inc.php:228 #, fuzzy @@ -3172,31 +3172,35 @@ msgstr "تحذير" #: libraries/config/messages.inc.php:229 msgid "Disable some of the warnings shown by phpMyAdmin" -msgstr "" +msgstr "إلغاء عرض بعض التحذيرات في phpMyAdmin" #: libraries/config/messages.inc.php:230 msgid "" "Enable [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] compression for import " "and export operations" msgstr "" +"تفعيل ضغط [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] لعمليات التصدير " +"والإستيراد" #: libraries/config/messages.inc.php:231 msgid "GZip" -msgstr "" +msgstr "GZip" #: libraries/config/messages.inc.php:232 msgid "Extra parameters for iconv" -msgstr "" +msgstr "مدخلات إضافية لـ iconv" #: libraries/config/messages.inc.php:233 msgid "" "If enabled, phpMyAdmin continues computing multiple-statement queries even " "if one of the queries failed" msgstr "" +"إذا كان مفعل , فإن phpMyAdmin سوف تستمر في تنفيذ الإستعلامات المتعددة حتى " +"لو فشل بعضها" #: libraries/config/messages.inc.php:234 msgid "Ignore multiple statement errors" -msgstr "" +msgstr "تجاهل أخطاء الجمل المتعددة" #: libraries/config/messages.inc.php:235 msgid "" @@ -3207,12 +3211,12 @@ msgstr "" #: libraries/config/messages.inc.php:236 msgid "Partial import: allow interrupt" -msgstr "" +msgstr "الإستيراد الجزئي: السماح بالمقاطعة" #: libraries/config/messages.inc.php:241 libraries/config/messages.inc.php:248 #: libraries/import/csv.php:26 libraries/import/ldi.php:39 msgid "Do not abort on INSERT error" -msgstr "" +msgstr "لاتحبط عندما يكون الخطأ في جمل الإدخال INSERT" #: libraries/config/messages.inc.php:242 libraries/config/messages.inc.php:250 #: libraries/import/csv.php:25 libraries/import/ldi.php:38 @@ -3224,14 +3228,16 @@ msgid "" "Default format; be aware that this list depends on location (database, " "table) and only SQL is always available" msgstr "" +"الهيئة الإفتراضي ; كن مدرك بأن هذه القائمة تعتمد على مكان (قاعدة البيانات " +"والجدول)" #: libraries/config/messages.inc.php:245 msgid "Format of imported file" -msgstr "" +msgstr "هيئة الملفات المستوردة" #: libraries/config/messages.inc.php:249 libraries/import/ldi.php:45 msgid "Use LOCAL keyword" -msgstr "" +msgstr "إستعمل الجملة LOCAL" #: libraries/config/messages.inc.php:252 libraries/config/messages.inc.php:260 #: libraries/config/messages.inc.php:261 @@ -3242,23 +3248,23 @@ msgstr "ضع أسماء الحقول في السطر الأول" #: libraries/config/messages.inc.php:253 libraries/import/ods.php:27 msgid "Do not import empty rows" -msgstr "" +msgstr "لاتستورد صفوف فارغة" #: libraries/config/messages.inc.php:254 msgid "Import currencies ($5.00 to 5.00)" -msgstr "" +msgstr "عملات الإستيراد ($5.00 إلى 5.00)" #: libraries/config/messages.inc.php:255 msgid "Import percentages as proper decimals (12.00% to .12)" -msgstr "" +msgstr "النسبة المئوية للإستيراد كرقم عشري (12.00% إلى .12)" #: libraries/config/messages.inc.php:256 msgid "Number of queries to skip from start" -msgstr "" +msgstr "عدد الإستعلامات التي يتخطاها من البداية" #: libraries/config/messages.inc.php:257 msgid "Partial import: skip queries" -msgstr "" +msgstr "إستيراد جزئي: تخطي الإستعلامات" #: libraries/config/messages.inc.php:259 #, fuzzy @@ -3268,39 +3274,39 @@ msgstr "أضف قيمة AUTO_INCREMENT" #: libraries/config/messages.inc.php:262 msgid "Initial state for sliders" -msgstr "" +msgstr "الحالة الأولية" #: libraries/config/messages.inc.php:263 msgid "How many rows can be inserted at one time" -msgstr "" +msgstr "كم عدد الصفوف التي يمكن إدخالها مرة واحدة" #: libraries/config/messages.inc.php:264 msgid "Number of inserted rows" -msgstr "" +msgstr "عدد الصفوف المدخلة" #: libraries/config/messages.inc.php:265 msgid "Target for quick access icon" -msgstr "" +msgstr "الهدف لإيقونة الوصول السريع" #: libraries/config/messages.inc.php:266 msgid "Show logo in left frame" -msgstr "" +msgstr "عرض الشعار في الإطار الأيسر" #: libraries/config/messages.inc.php:267 msgid "Display logo" -msgstr "" +msgstr "عرض الشعار" #: libraries/config/messages.inc.php:268 msgid "Display server choice at the top of the left frame" -msgstr "" +msgstr "عرض إختيار الخادم في الجزء العلوي من الإطار الأيسر" #: libraries/config/messages.inc.php:269 msgid "Display servers selection" -msgstr "" +msgstr "عرض إختيار الخوادم" #: libraries/config/messages.inc.php:270 msgid "Minimum number of tables to display the table filter box" -msgstr "" +msgstr "اقل عدد جداول تعرض في صندوق تصفية الجداول" #: libraries/config/messages.inc.php:271 msgid "String that separates databases into different tree levels" @@ -3308,7 +3314,7 @@ msgstr "" #: libraries/config/messages.inc.php:272 msgid "Database tree separator" -msgstr "" +msgstr "فاصل شجرة قاعدة البيانات" #: libraries/config/messages.inc.php:273 msgid "" @@ -3318,19 +3324,19 @@ msgstr "" #: libraries/config/messages.inc.php:274 msgid "Display databases in a tree" -msgstr "" +msgstr "عرض قواعد البيانات في شجرة" #: libraries/config/messages.inc.php:275 msgid "Disable this if you want to see all databases at once" -msgstr "" +msgstr "تعطيل هذا إذا كنت تريد رؤية قواعد البيانات كلٌ على حدا" #: libraries/config/messages.inc.php:276 msgid "Use light version" -msgstr "" +msgstr "إستخدم نسخة light" #: libraries/config/messages.inc.php:277 msgid "Maximum table tree depth" -msgstr "" +msgstr "أقصى عمق لشجرة الجدول" #: libraries/config/messages.inc.php:278 msgid "String that separates tables into different tree levels" @@ -3338,33 +3344,35 @@ msgstr "" #: libraries/config/messages.inc.php:279 msgid "Table tree separator" -msgstr "" +msgstr "فاصل شجرة الجدول" #: libraries/config/messages.inc.php:280 msgid "URL where logo in the navigation frame will point to" -msgstr "" +msgstr "إعمل رابط للمكان الذي يشير اليه الشعار" #: libraries/config/messages.inc.php:281 msgid "Logo link URL" -msgstr "" +msgstr "رابط الشعار" #: libraries/config/messages.inc.php:282 msgid "" "Open the linked page in the main window ([kbd]main[/kbd]) or in a new one " "([kbd]new[/kbd])" msgstr "" +"فتح الصفحة المرتبطة في النافذة الرئيسية ([kbd]main[/kbd]) أو في نافذة جديدة " +"([kbd]new[/kbd])" #: libraries/config/messages.inc.php:283 msgid "Logo link target" -msgstr "" +msgstr "هدف رابط الشعار" #: libraries/config/messages.inc.php:284 msgid "Highlight server under the mouse cursor" -msgstr "" +msgstr "توضيح الخادم تحت مؤشر الفأرة" #: libraries/config/messages.inc.php:285 msgid "Enable highlighting" -msgstr "" +msgstr "تفعيل التوضيح (highlighting)" #: libraries/config/messages.inc.php:286 msgid "Use less graphically intense tabs" @@ -3381,7 +3389,7 @@ msgstr "" #: libraries/config/messages.inc.php:289 msgid "Limit column characters" -msgstr "" +msgstr "حد أحرف العمود" #: libraries/config/messages.inc.php:290 msgid "" @@ -3392,17 +3400,17 @@ msgstr "" #: libraries/config/messages.inc.php:291 msgid "Delete all cookies on logout" -msgstr "" +msgstr "حذف كل الكوكيز عند الخروج" #: libraries/config/messages.inc.php:292 msgid "" "Define whether the previous login should be recalled or not in cookie " "authentication mode" -msgstr "" +msgstr "تعريف ما إذا كان سوف يتذكر تسجيل الدخول الأخير من تحقق الكوكيز أم لا" #: libraries/config/messages.inc.php:293 msgid "Recall user name" -msgstr "" +msgstr "تذكر إسم المستخدم" #: libraries/config/messages.inc.php:294 msgid "" @@ -3418,15 +3426,15 @@ msgstr "" #: libraries/config/messages.inc.php:296 msgid "Define how long (in seconds) a login cookie is valid" -msgstr "" +msgstr "تحديد كم المدة التي يبقى فيها الكوكيز" #: libraries/config/messages.inc.php:297 msgid "Login cookie validity" -msgstr "" +msgstr "صلاحية دخول الكوكيز" #: libraries/config/messages.inc.php:298 msgid "Double size of textarea for LONGTEXT columns" -msgstr "" +msgstr "مضاعفة حجم مربع النص لأعمدة LONGTEXT" #: libraries/config/messages.inc.php:299 msgid "Bigger textarea for LONGTEXT" diff --git a/po/bg.po b/po/bg.po index c576981..3fde37c 100644 --- a/po/bg.po +++ b/po/bg.po @@ -2427,27 +2427,27 @@ msgstr "" #: libraries/config/messages.inc.php:48 msgid "Tab that is displayed when entering a database" -msgstr "" +msgstr "Показваният подпрозорец при отваряне на БД" #: libraries/config/messages.inc.php:49 msgid "Default database tab" -msgstr "" +msgstr "Подпрозорец по подразбиране за БД" #: libraries/config/messages.inc.php:50 msgid "Tab that is displayed when entering a server" -msgstr "" +msgstr "Показваният подпрозорец при отваряне на сървър" #: libraries/config/messages.inc.php:51 msgid "Default server tab" -msgstr "" +msgstr "Подпрозорец по подразбиране за сървъри" #: libraries/config/messages.inc.php:52 msgid "Tab that is displayed when entering a table" -msgstr "" +msgstr "Показваният подпрозорец при отваряне на таблица" #: libraries/config/messages.inc.php:53 msgid "Default table tab" -msgstr "" +msgstr "Подпрозорец по подразбиране за таблици" #: libraries/config/messages.inc.php:54 msgid "Show binary contents as HEX by default" @@ -2475,7 +2475,7 @@ msgstr "Показване на сървърите в списък" #: libraries/config/messages.inc.php:60 msgid "Edit SQL queries in popup window" -msgstr "" +msgstr "Редактиране на SQL заявки в отделен прозорец" #: libraries/config/messages.inc.php:61 msgid "Edit in window" @@ -2487,15 +2487,16 @@ msgstr "Показване на грешки" #: libraries/config/messages.inc.php:63 msgid "Gather errors" -msgstr "" +msgstr "Събиране на грешки" #: libraries/config/messages.inc.php:64 msgid "Show icons for warning, error and information messages" msgstr "" +"Показване на пиктограми при предупреждения, грешки и информативни съобщения" #: libraries/config/messages.inc.php:65 msgid "Iconic errors" -msgstr "" +msgstr "Пиктограми при грешките" #: libraries/config/messages.inc.php:66 msgid "" @@ -2593,7 +2594,7 @@ msgstr "Шаблон за име на таблица" #: libraries/export/latex.php:39 libraries/export/odt.php:31 #: libraries/export/sql.php:77 libraries/export/texytext.php:22 msgid "Dump table" -msgstr "" +msgstr "Схема на таблица" #: libraries/config/messages.inc.php:90 libraries/export/latex.php:31 msgid "Include table caption" @@ -3196,7 +3197,7 @@ msgstr "" #: libraries/config/messages.inc.php:285 msgid "Enable highlighting" -msgstr "" +msgstr "Включване на синтактично оцветяване" #: libraries/config/messages.inc.php:286 msgid "Use less graphically intense tabs" @@ -4413,7 +4414,7 @@ msgstr "Редове:" #: libraries/display_export.lib.php:157 msgid "Dump some row(s)" -msgstr "" +msgstr "Схема на няколко реда" #: libraries/display_export.lib.php:159 msgid "Number of rows:" @@ -4421,7 +4422,7 @@ msgstr "Брой редове:" #: libraries/display_export.lib.php:162 msgid "Row to begin at:" -msgstr "" +msgstr "Ред започва от:" #: libraries/display_export.lib.php:173 msgid "Dump all rows" @@ -4466,7 +4467,7 @@ msgstr "" #: libraries/display_export.lib.php:275 msgid "use this for future exports" -msgstr "" +msgstr "прилагане и към бъдещи експорти" #: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188 #: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:516 @@ -4497,7 +4498,7 @@ msgstr "bzip-нато" #: libraries/display_export.lib.php:328 msgid "View output as text" -msgstr "" +msgstr "Показване на изхода като текст" #: libraries/display_export.lib.php:333 libraries/display_import.lib.php:244 #: libraries/export/codegen.php:37 @@ -4506,7 +4507,7 @@ msgstr "Формат:" #: libraries/display_export.lib.php:338 msgid "Format-specific options:" -msgstr "" +msgstr "Формат-специфични настройки:" #: libraries/display_export.lib.php:339 msgid "" @@ -4556,13 +4557,15 @@ msgstr "Файл за импортиране:" #: libraries/display_import.lib.php:156 #, php-format msgid "File may be compressed (%s) or uncompressed." -msgstr "" +msgstr "Файлът може да е компресиран (%s) или некомпресиран" #: libraries/display_import.lib.php:158 msgid "" "A compressed file's name must end in <b>.[format].[compression]</b>. " "Example: <b>.sql.zip</b>" msgstr "" +"Компресираният файл трябва да завършва на <b>.[format].[compression]</b>. " +"Например: <b>.sql.zip</b>" #: libraries/display_import.lib.php:178 msgid "File uploads are not allowed on this server." @@ -4736,11 +4739,11 @@ msgstr "Информация за весията" #: libraries/engines/innodb.lib.php:22 msgid "Data home directory" -msgstr "" +msgstr "Папка с данни" #: libraries/engines/innodb.lib.php:23 msgid "The common part of the directory path for all InnoDB data files." -msgstr "" +msgstr "Общата част от пътя до папката с всички InnoDB файлове." #: libraries/engines/innodb.lib.php:26 msgid "Data files" @@ -4784,11 +4787,11 @@ msgstr "страници" #: libraries/engines/innodb.lib.php:180 msgid "Free pages" -msgstr "" +msgstr "Свободни страници" #: libraries/engines/innodb.lib.php:186 msgid "Dirty pages" -msgstr "" +msgstr "Мръсни страници" #: libraries/engines/innodb.lib.php:192 msgid "Pages containing data" @@ -4796,15 +4799,15 @@ msgstr "Страници съдържащи данни" #: libraries/engines/innodb.lib.php:198 msgid "Pages to be flushed" -msgstr "" +msgstr "Страници за изчистване" #: libraries/engines/innodb.lib.php:204 msgid "Busy pages" -msgstr "" +msgstr "Заети страници" #: libraries/engines/innodb.lib.php:213 msgid "Latched pages" -msgstr "" +msgstr "Заключени страници" #: libraries/engines/innodb.lib.php:224 msgid "Buffer Pool Activity" @@ -4812,27 +4815,27 @@ msgstr "" #: libraries/engines/innodb.lib.php:228 msgid "Read requests" -msgstr "" +msgstr "Заявки за четене" #: libraries/engines/innodb.lib.php:234 msgid "Write requests" -msgstr "" +msgstr "Заявки за запис" #: libraries/engines/innodb.lib.php:240 msgid "Read misses" -msgstr "" +msgstr "Пропуснати прочитания" #: libraries/engines/innodb.lib.php:246 msgid "Write waits" -msgstr "" +msgstr "Изчаквания за запис" #: libraries/engines/innodb.lib.php:252 msgid "Read misses in %" -msgstr "" +msgstr "Пропуснати прочитания в %" #: libraries/engines/innodb.lib.php:260 msgid "Write waits in %" -msgstr "" +msgstr "Изчаквания за запис в %" #: libraries/engines/myisam.lib.php:22 msgid "Data pointer size" @@ -4959,7 +4962,7 @@ msgstr "" #: libraries/engines/pbms.lib.php:60 msgid "Metadata Headers" -msgstr "" +msgstr "Заглавки на метаданните" #: libraries/engines/pbms.lib.php:61 msgid "" @@ -4988,7 +4991,7 @@ msgstr "" #: libraries/engines/pbxt.lib.php:22 msgid "Index cache size" -msgstr "" +msgstr "Размер на буфера за индекси" #: libraries/engines/pbxt.lib.php:23 msgid "" @@ -4998,7 +5001,7 @@ msgstr "" #: libraries/engines/pbxt.lib.php:27 msgid "Record cache size" -msgstr "" +msgstr "Размер на буфера за записи" #: libraries/engines/pbxt.lib.php:28 msgid "" @@ -5009,7 +5012,7 @@ msgstr "" #: libraries/engines/pbxt.lib.php:32 msgid "Log cache size" -msgstr "" +msgstr "Размер на буфера на дневника" #: libraries/engines/pbxt.lib.php:33 msgid "" @@ -5963,11 +5966,11 @@ msgstr "Схема на база данни %s - страница %s" #: libraries/schema/Export_Relation_Schema.class.php:174 msgid "This page does not contain any tables!" -msgstr "" +msgstr "Тази страница не съдържа таблици!" #: libraries/schema/Export_Relation_Schema.class.php:207 msgid "SCHEMA ERROR: " -msgstr "" +msgstr "ГРЕШКА В СХЕМАТА: " #: libraries/schema/Pdf_Relation_Schema.class.php:877 #: libraries/schema/Pdf_Relation_Schema.class.php:1116 @@ -6011,7 +6014,7 @@ msgstr "Вътрешни релации" #: libraries/schema/User_Schema.class.php:116 msgid "FOREIGN KEY" -msgstr "" +msgstr "FOREIGN KEY" #: libraries/schema/User_Schema.class.php:148 msgid "Please choose a page to edit" @@ -6055,7 +6058,7 @@ msgstr "Всички таблици да бъдат показвани с едн #: libraries/schema/User_Schema.class.php:389 msgid "Only show keys" -msgstr "" +msgstr "Само ключовете видими" #: libraries/schema/User_Schema.class.php:391 msgid "Landscape" @@ -6096,7 +6099,7 @@ msgstr "ltr" #: libraries/select_lang.lib.php:502 #, php-format msgid "Unknown language: %1$s." -msgstr "" +msgstr "Непознат език: %1$s." #: libraries/select_server.lib.php:38 libraries/select_server.lib.php:44 #, fuzzy @@ -6272,7 +6275,7 @@ msgstr "END RAW" #: libraries/sqlparser.lib.php:364 msgid "Automatically appended backtick to the end of query!" -msgstr "" +msgstr "Автоматично добавяне на апостроф в края на заявката!" #: libraries/sqlparser.lib.php:367 msgid "Unclosed quote" @@ -6298,12 +6301,12 @@ msgstr "" #: libraries/tbl_links.inc.php:106 libraries/tbl_links.inc.php:107 msgid "Table seems to be empty!" -msgstr "" +msgstr "Таблицата изглежда празна!" #: libraries/tbl_links.inc.php:115 #, php-format msgid "Tracking of %s.%s is activated." -msgstr "" +msgstr "Проследяването на %s.%s е активно." #: libraries/tbl_properties.inc.php:104 msgid "Length/Values" @@ -6363,11 +6366,11 @@ msgstr "" #: libraries/tbl_properties.inc.php:371 msgid "ENUM or SET data too long?" -msgstr "" +msgstr "Много ENUM или SET данни?" #: libraries/tbl_properties.inc.php:373 msgid "Get more editing space" -msgstr "" +msgstr "Още място за редакция" #: libraries/tbl_properties.inc.php:396 #, fuzzy @@ -6378,7 +6381,7 @@ msgstr "Няма" #: libraries/tbl_properties.inc.php:397 msgid "As defined:" -msgstr "" +msgstr "Дефиниран като:" #: libraries/tbl_properties.inc.php:516 tbl_structure.php:153 #: tbl_structure.php:157 tbl_structure.php:566 @@ -6524,10 +6527,12 @@ msgid "" "Converts an (IPv4) Internet network address into a string in Internet " "standard dotted format." msgstr "" +"Обръща (IPv4) Интернет мрежови адрес в низ в стандартен Интернет точков " +"формат." #: libraries/transformations/text_plain__sql.inc.php:9 msgid "Formats text as SQL query with syntax highlighting." -msgstr "" +msgstr "Форматира текст като SQL заявка със синтактично оцветяване." #: libraries/transformations/text_plain__substr.inc.php:9 msgid "" @@ -6572,6 +6577,8 @@ msgid "" "Your browser has phpMyAdmin configuration for this domain. Would you like to " "import it for current session?" msgstr "" +"Браузърът ви има настройки на phpMyAdmin за този домейн. Искате ли да бъдат " +"използвани за текущата сесия?" #: libraries/zip_extension.lib.php:25 msgid "No files found inside ZIP archive!" @@ -6635,7 +6642,7 @@ msgstr "Информация за PHP" #: main.php:213 msgid "Wiki" -msgstr "" +msgstr "Wiki" #: main.php:216 msgid "Official Homepage" @@ -6649,7 +6656,7 @@ msgstr "Атрибути" #: main.php:218 msgid "Get support" -msgstr "" +msgstr "Получаване на помощ" #: main.php:219 #, fuzzy @@ -6676,6 +6683,8 @@ msgid "" "option is incompatible with phpMyAdmin and might cause some data to be " "corrupted!" msgstr "" +"Имате включено mbstring.func_overload в настройките на PHP. Тази опция е " +"несъвместима с phpMyAdmin и може да причини повреда на данни!" #: main.php:259 msgid "" @@ -6738,6 +6747,8 @@ msgid "" "Server running with Suhosin. Please refer to %sdocumentation%s for possible " "issues." msgstr "" +"Сървърът е с кръпка Suhosin. Прочетете %sдокументацията%s за възможни " +"проблеми." #: navigation.php:187 server_databases.php:277 server_synchronize.php:1206 msgid "No databases" @@ -6745,7 +6756,7 @@ msgstr "Няма бази от данни" #: navigation.php:277 msgid "Filter" -msgstr "" +msgstr "Филтър" #: navigation.php:277 #, fuzzy @@ -6765,11 +6776,11 @@ msgstr "Моля изберете база от данни" #: pmd_general.php:74 msgid "Show/Hide left menu" -msgstr "" +msgstr "Скриване/Показване на лявото меню" #: pmd_general.php:78 msgid "Save position" -msgstr "" +msgstr "Запазване на позицията" #: pmd_general.php:81 server_synchronize.php:428 server_synchronize.php:871 #, fuzzy @@ -6778,15 +6789,15 @@ msgstr "Създай нова Страница" #: pmd_general.php:84 pmd_general.php:352 msgid "Create relation" -msgstr "" +msgstr "Създаване на отношение" #: pmd_general.php:90 msgid "Reload" -msgstr "" +msgstr "Презареждане" #: pmd_general.php:93 msgid "Help" -msgstr "" +msgstr "Помощ" #: pmd_general.php:97 msgid "Angular links" @@ -6838,7 +6849,7 @@ msgstr "Брой полета" #: pmd_general.php:418 msgid "Delete relation" -msgstr "" +msgstr "Изтриване на отношение" #: pmd_general.php:460 pmd_general.php:519 #, fuzzy @@ -6891,7 +6902,7 @@ msgstr "Опции на таблицата" #: pmd_help.php:26 msgid "To select relation, click :" -msgstr "" +msgstr "За избор на отношение, щракнете:" #: pmd_help.php:28 msgid "" @@ -7697,11 +7708,11 @@ msgstr "" #: server_replication.php:309 msgid "Synchronize databases with master" -msgstr "" +msgstr "Синхронизиране на БД с главен" #: server_replication.php:320 msgid "Control slave:" -msgstr "" +msgstr "Контролиране на подчинения:" #: server_replication.php:323 #, fuzzy @@ -7710,47 +7721,49 @@ msgstr "Пълнотекстово" #: server_replication.php:323 msgid "Full stop" -msgstr "" +msgstr "Пълно спиране" #: server_replication.php:324 msgid "Reset slave" -msgstr "" +msgstr "Нулиране на подчинения" #: server_replication.php:326 msgid "Start SQL Thread only" -msgstr "" +msgstr "Пускане само на SQL нишка" #: server_replication.php:328 msgid "Stop SQL Thread only" -msgstr "" +msgstr "Спиране само на SQL нишка" #: server_replication.php:331 msgid "Start IO Thread only" -msgstr "" +msgstr "Пускане само на В/И нишка" #: server_replication.php:333 msgid "Stop IO Thread only" -msgstr "" +msgstr "Спиране само на В/И нишка" #: server_replication.php:338 msgid "Error management:" -msgstr "" +msgstr "Обработка на грешки:" #: server_replication.php:340 msgid "Skipping errors might lead into unsynchronized master and slave!" msgstr "" +"Прескачане на грешки може да доведе до десинхронизация между главния и " +"подчинените сървъри!" #: server_replication.php:342 msgid "Skip current error" -msgstr "" +msgstr "Прескачане на текущата" #: server_replication.php:343 msgid "Skip next" -msgstr "" +msgstr "Прескачане на следващата" #: server_replication.php:346 msgid "errors." -msgstr "" +msgstr "грешки." #: server_replication.php:361 #, php-format @@ -8064,7 +8077,7 @@ msgstr "" #: server_status.php:106 msgid "The number of rows deleted from InnoDB tables." -msgstr "" +msgstr "Броят изтрити редове от InnoDB таблици." #: server_status.php:107 #, fuzzy @@ -8073,7 +8086,7 @@ msgstr "Брой заявки за вмъкване на ред в таблиц #: server_status.php:108 msgid "The number of rows read from InnoDB tables." -msgstr "" +msgstr "Броят прочетени редове от InnoDB таблици." #: server_status.php:109 #, fuzzy @@ -8155,7 +8168,7 @@ msgstr "" #: server_status.php:124 msgid "The amount of free memory for query cache." -msgstr "" +msgstr "Количеството свободна памет за буфер за заявки." #: server_status.php:125 #, fuzzy @@ -8164,7 +8177,7 @@ msgstr "Брой на сортираните редове." #: server_status.php:126 msgid "The number of queries added to the cache." -msgstr "" +msgstr "Броят заявки добавени към буфера." #: server_status.php:127 msgid "" @@ -8182,11 +8195,11 @@ msgstr "" #: server_status.php:129 msgid "The number of queries registered in the cache." -msgstr "" +msgstr "Броят заявки регистрирани в буфера." #: server_status.php:130 msgid "The total number of blocks in the query cache." -msgstr "" +msgstr "Общият брой блокове в буфера за заявки." #: server_status.php:131 msgctxt "$strShowStatusReset" @@ -8363,7 +8376,7 @@ msgstr "" #: server_status.php:415 msgid "Flush query cache" -msgstr "" +msgstr "Изчистване на буфера за заявки" #: server_status.php:420 msgid "Show processes" @@ -8497,79 +8510,79 @@ msgstr "" #: server_synchronize.php:263 msgid "Structure Synchronization" -msgstr "" +msgstr "Синхронизиране на структурата" #: server_synchronize.php:270 msgid "Data Synchronization" -msgstr "" +msgstr "Синхронизиране на данните" #: server_synchronize.php:399 server_synchronize.php:838 msgid "not present" -msgstr "" +msgstr "не съществува" #: server_synchronize.php:423 server_synchronize.php:866 msgid "Structure Difference" -msgstr "" +msgstr "Структурни различия" #: server_synchronize.php:424 server_synchronize.php:867 msgid "Data Difference" -msgstr "" +msgstr "Различия в данните" #: server_synchronize.php:429 server_synchronize.php:872 msgid "Add column(s)" -msgstr "" +msgstr "Добавяне на колона(и)" #: server_synchronize.php:430 server_synchronize.php:873 msgid "Remove column(s)" -msgstr "" +msgstr "Изтриване на колона(и)" #: server_synchronize.php:431 server_synchronize.php:874 msgid "Alter column(s)" -msgstr "" +msgstr "Промяна на колона(и)" #: server_synchronize.php:432 server_synchronize.php:875 msgid "Remove index(s)" -msgstr "" +msgstr "Изтриване на индекс(и)" #: server_synchronize.php:433 server_synchronize.php:876 msgid "Apply index(s)" -msgstr "" +msgstr "Добавяне на индекс(и)" #: server_synchronize.php:434 server_synchronize.php:877 msgid "Update row(s)" -msgstr "" +msgstr "Обновяване на ред(ове)" #: server_synchronize.php:435 server_synchronize.php:878 msgid "Insert row(s)" -msgstr "" +msgstr "Вмъкване на ред(ове)" #: server_synchronize.php:445 server_synchronize.php:889 msgid "Would you like to delete all the previous rows from target tables?" -msgstr "" +msgstr "Да бъде ли изтрито предишното съдържание на таблиците?" #: server_synchronize.php:448 server_synchronize.php:893 msgid "Apply Selected Changes" -msgstr "" +msgstr "Прилагане на избраните промените" #: server_synchronize.php:450 server_synchronize.php:895 msgid "Synchronize Databases" -msgstr "" +msgstr "Синхронизиране на БД" #: server_synchronize.php:463 msgid "Selected target tables have been synchronized with source tables." -msgstr "" +msgstr "Избраните целеви таблици бяха синхронизирани с изходните." #: server_synchronize.php:941 msgid "Target database has been synchronized with source database" -msgstr "" +msgstr "Целевата БД беше синхронизирана с изходната" #: server_synchronize.php:1002 msgid "The following queries have been executed:" -msgstr "" +msgstr "Следните заявки бяха изпълнени:" #: server_synchronize.php:1130 msgid "Enter manually" -msgstr "" +msgstr "Ръчно въвеждане" #: server_synchronize.php:1138 #, fuzzy @@ -8580,11 +8593,11 @@ msgstr "Максимален брой на едновременните коне #: server_synchronize.php:1167 #, php-format msgid "Configuration: %s" -msgstr "" +msgstr "Настройка: %s" #: server_synchronize.php:1182 msgid "Socket" -msgstr "" +msgstr "Сокет" #: server_synchronize.php:1228 msgid "" diff --git a/po/br.po b/po/br.po index 7d4b47b..a82256a 100644 --- a/po/br.po +++ b/po/br.po @@ -2322,50 +2322,59 @@ msgid "" "inside a frame, and is a potential [strong]security hole[/strong] allowing " "cross-frame scripting attacks" msgstr "" +"Gweredekaat kement-mañ a aotre ur bajenn zo en un domani disheñvel da " +"c'hervel phpMyAdmin e diabarzh ur framm, ar pezh a ya d'ober un [strong]" +"toull surentez[/strong] posupl evit tagadennoù skript etre frammoù" #: libraries/config/messages.inc.php:22 msgid "Allow third party framing" -msgstr "" +msgstr "Aotren ar frammoù a-berzh tud all" #: libraries/config/messages.inc.php:23 msgid "Show "Drop database" link to normal users" msgstr "" +"Diskouez al liamm evit "Skarzhañ un diaz roadennoù" d'an " +"implijerien voutin" #: libraries/config/messages.inc.php:24 msgid "" "Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] " "authentication" msgstr "" +"Ger-tremen implijet evit enrinegañ toupinoù pa vez gwiriekaet dre [kbd]cookie" +"[/kbd]" #: libraries/config/messages.inc.php:25 msgid "Blowfish secret" -msgstr "" +msgstr "Kevrin Blow fish" #: libraries/config/messages.inc.php:26 msgid "Highlight selected rows" -msgstr "" +msgstr "Lakaat al linennoù dibabet da skediñ" #: libraries/config/messages.inc.php:27 msgid "Row marker" -msgstr "" +msgstr "Merker linennoù" #: libraries/config/messages.inc.php:28 msgid "Highlight row pointed by the mouse cursor" -msgstr "" +msgstr "Lakaat al linenn a vuk al logodenn daveti da usskediñ" #: libraries/config/messages.inc.php:29 msgid "Highlight pointer" -msgstr "" +msgstr "Lakaat ar reti da usskediñ" #: libraries/config/messages.inc.php:30 msgid "" "Enable [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for " "import and export operations" msgstr "" +"Aotren ar gwaskañ [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] evit an " +"oberiadennoù enporzhiañ hag ezporzhiañ" #: libraries/config/messages.inc.php:31 msgid "Bzip2" -msgstr "" +msgstr "Bzip2" #: libraries/config/messages.inc.php:32 msgid "" @@ -2373,172 +2382,184 @@ msgid "" "columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/" "kbd] - allows newlines in columns" msgstr "" +"Spisaat peseurt doare kontrolloù kemmañ a zleer ober ganto evit ar bannoù " +"CHAR ha VARCHAR; [kbd]input[/kbd] - a dalvez da grennañ ar vent, [kbd]" +"textarea[/kbd] - a aotren lakaat linennoù nevez er bannoù" #: libraries/config/messages.inc.php:33 msgid "CHAR columns editing" -msgstr "" +msgstr "Kemmañ ar bannoù CHAR" #: libraries/config/messages.inc.php:34 msgid "Number of columns for CHAR/VARCHAR textareas" -msgstr "" +msgstr "Niver a vannoù evit an takadoù skrid CHAR/VARCHAR" #: libraries/config/messages.inc.php:35 msgid "CHAR textarea columns" -msgstr "" +msgstr "Bannoù evit an takadoù skrid CHAR" #: libraries/config/messages.inc.php:36 msgid "Number of rows for CHAR/VARCHAR textareas" -msgstr "" +msgstr "Niver a linennoù evit an takadoù skrid CHAR/VARCHAR" #: libraries/config/messages.inc.php:37 msgid "CHAR textarea rows" -msgstr "" +msgstr "Linennoù evit an takadoù skrid CHAR" #: libraries/config/messages.inc.php:38 msgid "Check config file permissions" -msgstr "" +msgstr "Gwiriañ aotreoù ar restr gefluniañ" #: libraries/config/messages.inc.php:39 msgid "" "Compress gzip/bzip2 exports on the fly without the need for much memory; if " "you encounter problems with created gzip/bzip2 files disable this feature" msgstr "" +"Gwaskañ a ra an ezporzhiadennoù gzip/bzip2 war ar prim hep sunañ nemeur a " +"vemor; Mar bez kudennoù gant ar restroù gzip/bzip2 krouet, diweredekait an " +"dibarzh." #: libraries/config/messages.inc.php:40 msgid "Compress on the fly" -msgstr "" +msgstr "Gwaskañ war ar prim" #: libraries/config/messages.inc.php:41 setup/frames/config.inc.php:25 #: setup/frames/index.inc.php:153 msgid "Configuration file" -msgstr "" +msgstr "Restr gefluniañ" #: libraries/config/messages.inc.php:42 msgid "" "Whether a warning ("Are your really sure...") should be displayed " "when you're about to lose data" msgstr "" +"Ur gemennadenn ("Ha sur oc'h...") a zlefe dont war wel pa vezer " +"war-nes koll roadennoù." #: libraries/config/messages.inc.php:43 msgid "Confirm DROP queries" -msgstr "" +msgstr "Kadarnaat ar rekedoù diverkañ DROP" #: libraries/config/messages.inc.php:44 msgid "Debug SQL" -msgstr "" +msgstr "Dizreinañ SQL" #: libraries/config/messages.inc.php:45 msgid "Default display direction" -msgstr "" +msgstr "Talvoud dre ziouer durc'hadur an diskwel" #: libraries/config/messages.inc.php:46 msgid "" "[kbd]horizontal[/kbd], [kbd]vertical[/kbd] or a number that indicates " "maximum number for which vertical model is used" msgstr "" +"[kbd]horizontal[/kbd], [kbd]vertical[/kbd] pe un niver a verk an talvoud " +"brasañ a vo implijet ar mod a-serzh evitañ" #: libraries/config/messages.inc.php:47 msgid "Display direction for altering/creating columns" -msgstr "" +msgstr "Durc'hadur an diskwel evit kemmañ/krouiñ bannoù" #: libraries/config/messages.inc.php:48 msgid "Tab that is displayed when entering a database" -msgstr "" +msgstr "Ivinell diskouezet pa'z eer tre en un diaz roadennoù" #: libraries/config/messages.inc.php:49 msgid "Default database tab" -msgstr "" +msgstr "Ivinell dre ziouer evit un diaz roadennoù" #: libraries/config/messages.inc.php:50 msgid "Tab that is displayed when entering a server" -msgstr "" +msgstr "Ivinell diskouezet pa'z eer tre en ur servijer" #: libraries/config/messages.inc.php:51 msgid "Default server tab" -msgstr "" +msgstr "Ivinell dre ziouer evit ar servijer" #: libraries/config/messages.inc.php:52 msgid "Tab that is displayed when entering a table" -msgstr "" +msgstr "Ivinell diskouezet pa'z eer tre en un daolenn" #: libraries/config/messages.inc.php:53 msgid "Default table tab" -msgstr "" +msgstr "Ivinell dre ziouer evit an taolennoù" #: libraries/config/messages.inc.php:54 msgid "Show binary contents as HEX by default" -msgstr "" +msgstr "Diskouez an endalc'had binarel en HEX (eizhdekvedennoù) dre ziouer" #: libraries/config/messages.inc.php:55 libraries/display_tbl.lib.php:590 msgid "Show binary contents as HEX" -msgstr "" +msgstr "Diskouez an endalc'had binarel en HEX (eizhdekvedennoù)" #: libraries/config/messages.inc.php:56 msgid "Show database listing as a list instead of a drop down" -msgstr "" +msgstr "Diskouez roll an diazoù roadennoù e-lec'h ul lañser desachañ" #: libraries/config/messages.inc.php:57 msgid "Display databases as a list" -msgstr "" +msgstr "Diskouez a ra an diazoù roadennoù e stumm ur roll" #: libraries/config/messages.inc.php:58 msgid "Show server listing as a list instead of a drop down" -msgstr "" +msgstr "Diskouez roll ar servijerioù e-lec'h ur roll desachañ" #: libraries/config/messages.inc.php:59 msgid "Display servers as a list" -msgstr "" +msgstr "Diskouez a ra ar servijerioù e stumm ur roll" #: libraries/config/messages.inc.php:60 msgid "Edit SQL queries in popup window" -msgstr "" +msgstr "Aozañ ar rekedoù SQL en ur prenestr difoupañ" #: libraries/config/messages.inc.php:61 msgid "Edit in window" -msgstr "" +msgstr "Aozañ en ur prenestr" #: libraries/config/messages.inc.php:62 msgid "Display errors" -msgstr "" +msgstr "Diskouez ar fazioù" #: libraries/config/messages.inc.php:63 msgid "Gather errors" -msgstr "" +msgstr "Dastum ar fazioù" #: libraries/config/messages.inc.php:64 msgid "Show icons for warning, error and information messages" -msgstr "" +msgstr "Diskouez an arlunioù evit ar c'hemennoù diwall, faziañ ha titouriñ" #: libraries/config/messages.inc.php:65 msgid "Iconic errors" -msgstr "" +msgstr "Arlunioù evit ar fazioù" #: libraries/config/messages.inc.php:66 msgid "" "Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no " "limit)" msgstr "" +"Niver a eilennoù lakaet evit seveniñ ar skriptoù ([kbd]0[/kbd] a dalvez hep " +"bevenn)" #: libraries/config/messages.inc.php:67 msgid "Maximum execution time" -msgstr "" +msgstr "Pad seveniñ hirañ" #: libraries/config/messages.inc.php:68 prefs_manage.php:299 msgid "Save as file" -msgstr "" +msgstr "Enrollañ evel restr" #: libraries/config/messages.inc.php:69 libraries/config/messages.inc.php:237 msgid "Character set of the file" -msgstr "" +msgstr "Strobad arouezennoù ar restr" #: libraries/config/messages.inc.php:70 libraries/config/messages.inc.php:86 #: tbl_printview.php:373 tbl_structure.php:831 msgid "Format" -msgstr "" +msgstr "Furmad" #: libraries/config/messages.inc.php:71 msgid "Compression" -msgstr "" +msgstr "Gwaskadur" #: libraries/config/messages.inc.php:72 libraries/config/messages.inc.php:79 #: libraries/config/messages.inc.php:87 libraries/config/messages.inc.php:91 @@ -2550,19 +2571,19 @@ msgstr "" #: libraries/export/odt.php:57 libraries/export/texytext.php:27 #: libraries/export/xls.php:24 libraries/export/xlsx.php:24 msgid "Put columns names in the first row" -msgstr "" +msgstr "Diskouez anvioù ar bannoù diouzhtu el linenn gentañ" #: libraries/config/messages.inc.php:73 libraries/config/messages.inc.php:239 #: libraries/config/messages.inc.php:246 libraries/import/csv.php:75 #: libraries/import/ldi.php:41 msgid "Columns enclosed by" -msgstr "" +msgstr "Bannoù gronnet gant" #: libraries/config/messages.inc.php:74 libraries/config/messages.inc.php:240 #: libraries/config/messages.inc.php:247 libraries/import/csv.php:80 #: libraries/import/ldi.php:42 msgid "Columns escaped by" -msgstr "" +msgstr "Arouezenn dec'hout" #: libraries/config/messages.inc.php:75 libraries/config/messages.inc.php:81 #: libraries/config/messages.inc.php:88 libraries/config/messages.inc.php:97 @@ -2570,38 +2591,38 @@ msgstr "" #: libraries/config/messages.inc.php:140 libraries/config/messages.inc.php:143 #: libraries/config/messages.inc.php:145 libraries/export/texytext.php:26 msgid "Replace NULL by" -msgstr "" +msgstr "Erlec'hiañ NULL gant" #: libraries/config/messages.inc.php:76 libraries/config/messages.inc.php:82 msgid "Remove CRLF characters within columns" -msgstr "" +msgstr "Tennañ an arouezennoù dibenn linenn e dibarzh ar bannoù" #: libraries/config/messages.inc.php:77 libraries/config/messages.inc.php:243 #: libraries/config/messages.inc.php:251 libraries/import/csv.php:62 #: libraries/import/ldi.php:40 msgid "Columns terminated by" -msgstr "" +msgstr "Bannoù a echu gant" #: libraries/config/messages.inc.php:78 libraries/config/messages.inc.php:238 #: libraries/import/csv.php:85 libraries/import/ldi.php:43 msgid "Lines terminated by" -msgstr "" +msgstr "Linennoù a echu gant" #: libraries/config/messages.inc.php:80 msgid "Excel edition" -msgstr "" +msgstr "Stumm Excel" #: libraries/config/messages.inc.php:83 msgid "Database name template" -msgstr "" +msgstr "Patrom anv diaz roadennoù" #: libraries/config/messages.inc.php:84 msgid "Server name template" -msgstr "" +msgstr "Patrom anv servijer" #: libraries/config/messages.inc.php:85 msgid "Table name template" -msgstr "" +msgstr "Patrom anv taolenn" #: libraries/config/messages.inc.php:89 libraries/config/messages.inc.php:102 #: libraries/config/messages.inc.php:111 libraries/config/messages.inc.php:135 @@ -2609,143 +2630,146 @@ msgstr "" #: libraries/export/latex.php:39 libraries/export/odt.php:31 #: libraries/export/sql.php:77 libraries/export/texytext.php:22 msgid "Dump table" -msgstr "" +msgstr "Ezporzhiañ an daolenn" #: libraries/config/messages.inc.php:90 libraries/export/latex.php:31 msgid "Include table caption" -msgstr "" +msgstr "Enklozañ an istitloù" #: libraries/config/messages.inc.php:93 libraries/config/messages.inc.php:99 #: libraries/export/latex.php:49 libraries/export/latex.php:73 msgid "Table caption" -msgstr "" +msgstr "Istitl eus an daolenn" #: libraries/config/messages.inc.php:94 libraries/config/messages.inc.php:100 msgid "Continued table caption" -msgstr "" +msgstr "Enklozañ an istitloù" #: libraries/config/messages.inc.php:95 libraries/config/messages.inc.php:101 #: libraries/export/latex.php:53 libraries/export/latex.php:77 msgid "Label key" -msgstr "" +msgstr "Alc'hwez an dikedenn" #: libraries/config/messages.inc.php:96 libraries/config/messages.inc.php:108 #: libraries/config/messages.inc.php:132 libraries/export/odt.php:325 #: libraries/tbl_properties.inc.php:141 msgid "MIME type" -msgstr "" +msgstr "Seurt MIME" #: libraries/config/messages.inc.php:98 libraries/config/messages.inc.php:110 #: libraries/config/messages.inc.php:134 tbl_relation.php:396 msgid "Relations" -msgstr "" +msgstr "Darempredoù" #: libraries/config/messages.inc.php:103 msgid "Export method" -msgstr "" +msgstr "Doare ezporzhiañ" #: libraries/config/messages.inc.php:112 libraries/config/messages.inc.php:114 msgid "Save on server" -msgstr "" +msgstr "Enrollañ war ar servijer" #: libraries/config/messages.inc.php:113 libraries/config/messages.inc.php:115 #: libraries/display_export.lib.php:195 libraries/display_export.lib.php:221 msgid "Overwrite existing file(s)" -msgstr "" +msgstr "Frikañ ar restroù zo c'hoazh" #: libraries/config/messages.inc.php:116 msgid "Remember file name template" -msgstr "" +msgstr "Derc'hel soñj eus patrom anv ar restr" #: libraries/config/messages.inc.php:118 msgid "Enclose table and column names with backquotes" -msgstr "" +msgstr "Lakaat krochedoù stouet a bep tu da anvioù an taolennoù hag ar bannoù" #: libraries/config/messages.inc.php:119 libraries/config/messages.inc.php:258 #: libraries/display_export.lib.php:353 msgid "SQL compatibility mode" -msgstr "" +msgstr "Mod kenglotañ gant SQL" #: libraries/config/messages.inc.php:120 libraries/config/messages.inc.php:130 msgid "Syntax to use when inserting data" -msgstr "" +msgstr "Ereadur d'ober gantañ pa vez ensoc'het roadennoù" #: libraries/config/messages.inc.php:121 msgid "Creation/Update/Check dates" -msgstr "" +msgstr "Deiziad krouiñ/hizivaat/gwiriañ" #: libraries/config/messages.inc.php:122 msgid "Use delayed inserts" -msgstr "" +msgstr "Ensoc'hadennoù gant dale" #: libraries/config/messages.inc.php:123 libraries/export/sql.php:53 msgid "Disable foreign key checks" -msgstr "" +msgstr "Diweredekaat ar gwiriañ alc'hwezioù estren" #: libraries/config/messages.inc.php:126 msgid "Use hexadecimal for BLOB" -msgstr "" +msgstr "Implijout an eizhdekvedennad evit BLOB" #: libraries/config/messages.inc.php:128 msgid "Use ignore inserts" -msgstr "" +msgstr "Arabat ensoc'hañ ul linenn a dalvez kement hag un alc'hwez nemetañ" #: libraries/config/messages.inc.php:131 libraries/export/sql.php:163 msgid "Maximal length of created query" -msgstr "" +msgstr "Ment vrasañ ar reked krouet" #: libraries/config/messages.inc.php:136 msgid "Export type" -msgstr "" +msgstr "Seurt ezporzhiadenn" #: libraries/config/messages.inc.php:137 libraries/export/sql.php:50 msgid "Enclose export in a transaction" -msgstr "" +msgstr "Enklozañ an ezporzhiadenn en un treuzgread" #: libraries/config/messages.inc.php:138 msgid "Export time in UTC" -msgstr "" +msgstr "Ezporzhiañ an eur er furmad UTC" #: libraries/config/messages.inc.php:146 msgid "Force secured connection while using phpMyAdmin" -msgstr "" +msgstr "Rediañ a ra kevreadennoù https etre ar servijer ha phpMyAdmin" #: libraries/config/messages.inc.php:147 msgid "Force SSL connection" -msgstr "" +msgstr "Rediañ ar c'hevreadennoù SSL" #: libraries/config/messages.inc.php:148 msgid "" "Sort order for items in a foreign-key dropdown box; [kbd]content[/kbd] is " "the referenced data, [kbd]id[/kbd] is the key value" msgstr "" +"Urzh renkañ evit an elfennoù en ur voest desachañ alc'hwezioù estren; [kbd]" +"content[/kbd] zo evit an roadenn a zaveer dezhi, [kbd]id[/kbd] zo evit " +"talvout an alc'hwez" #: libraries/config/messages.inc.php:149 msgid "Foreign key dropdown order" -msgstr "" +msgstr "Urzh dispakañ an alc'hwezioù estren" #: libraries/config/messages.inc.php:150 msgid "A dropdown will be used if fewer items are present" -msgstr "" +msgstr "Ul lañser desachañ a vo implijet ma vez nebeutoc'h a elfennoù" #: libraries/config/messages.inc.php:151 msgid "Foreign key limit" -msgstr "" +msgstr "Bevenn evit an alc'hwezioù estren" #: libraries/config/messages.inc.php:152 msgid "Browse mode" -msgstr "" +msgstr "Mod merdeiñ" #: libraries/config/messages.inc.php:153 msgid "Customize browse mode" -msgstr "" +msgstr "Personelaat ar mod merdeiñ" #: libraries/config/messages.inc.php:155 libraries/config/messages.inc.php:157 #: libraries/config/messages.inc.php:174 libraries/config/messages.inc.php:185 #: libraries/config/messages.inc.php:187 libraries/config/messages.inc.php:215 #: libraries/config/messages.inc.php:227 msgid "Customize default options" -msgstr "" +msgstr "Personelaat an dibarzhioù dre ziouer" #: libraries/config/messages.inc.php:156 libraries/config/setup.forms.php:232 #: libraries/config/setup.forms.php:311 @@ -2753,119 +2777,119 @@ msgstr "" #: libraries/config/user_preferences.forms.php:213 libraries/export/csv.php:16 #: libraries/import/csv.php:21 msgid "CSV" -msgstr "" +msgstr "CSV" #: libraries/config/messages.inc.php:158 msgid "Developer" -msgstr "" +msgstr "Diorroer" #: libraries/config/messages.inc.php:159 msgid "Settings for phpMyAdmin developers" -msgstr "" +msgstr "Arventennoù evit diorroerien phpMyAdmin" #: libraries/config/messages.inc.php:160 msgid "Edit mode" -msgstr "" +msgstr "Mod aozañ" #: libraries/config/messages.inc.php:161 msgid "Customize edit mode" -msgstr "" +msgstr "Personelaat ar mod aozañ" #: libraries/config/messages.inc.php:163 msgid "Export defaults" -msgstr "" +msgstr "Talvoudoù dre ziouer evit an ezporzhiañ" #: libraries/config/messages.inc.php:164 msgid "Customize default export options" -msgstr "" +msgstr "Personelaat an talvoudoù ezporzhiañ implijet dre ziouer" #: libraries/config/messages.inc.php:165 libraries/config/messages.inc.php:207 #: setup/frames/menu.inc.php:16 msgid "Features" -msgstr "" +msgstr "Dezverkoù" #: libraries/config/messages.inc.php:166 msgid "General" -msgstr "" +msgstr "Dre-vras" #: libraries/config/messages.inc.php:167 msgid "Set some commonly used options" -msgstr "" +msgstr "Termeniñ un nebeud dibarzhioù implijet ingal" #: libraries/config/messages.inc.php:168 libraries/db_links.inc.php:83 #: libraries/server_links.inc.php:73 libraries/tbl_links.inc.php:82 #: prefs_manage.php:231 setup/frames/menu.inc.php:20 msgid "Import" -msgstr "" +msgstr "Enporzhiañ" #: libraries/config/messages.inc.php:169 msgid "Import defaults" -msgstr "" +msgstr "Talvoudoù enporzhiañ dre ziouer" #: libraries/config/messages.inc.php:170 msgid "Customize default common import options" -msgstr "" +msgstr "Personelaat an talvoudoù implijet dre ziouer" #: libraries/config/messages.inc.php:171 msgid "Import / export" -msgstr "" +msgstr "Enporzhiañ / Ezporzhiañ" #: libraries/config/messages.inc.php:172 msgid "Set import and export directories and compression options" -msgstr "" +msgstr "Kefluniañ ar c'havlec'hioù enporzhiañ hag an dibarzhioù gwaskañ" #: libraries/config/messages.inc.php:173 libraries/export/latex.php:26 msgid "LaTeX" -msgstr "" +msgstr "LaTex" #: libraries/config/messages.inc.php:176 msgid "Databases display options" -msgstr "" +msgstr "Dibarzhioù diskwel an diazoù roadennoù" #: libraries/config/messages.inc.php:177 setup/frames/menu.inc.php:18 msgid "Navigation frame" -msgstr "" +msgstr "Taolenn verdeiñ" #: libraries/config/messages.inc.php:178 msgid "Customize appearance of the navigation frame" -msgstr "" +msgstr "Personelaat tres an daolenn verdeiñ" #: libraries/config/messages.inc.php:179 libraries/select_server.lib.php:42 #: setup/frames/index.inc.php:98 msgid "Servers" -msgstr "" +msgstr "Servijerioù" #: libraries/config/messages.inc.php:180 msgid "Servers display options" -msgstr "" +msgstr "Dibarzhioù diskwel ar servijerioù" #: libraries/config/messages.inc.php:182 msgid "Tables display options" -msgstr "" +msgstr "Dibarzhioù diskwel an taolennoù" #: libraries/config/messages.inc.php:183 setup/frames/menu.inc.php:19 msgid "Main frame" -msgstr "" +msgstr "Taolenn bennañ" #: libraries/config/messages.inc.php:184 msgid "Microsoft Office" -msgstr "" +msgstr "Microsoft Office" #: libraries/config/messages.inc.php:186 msgid "Open Document" -msgstr "" +msgstr "Testenn Open Document" #: libraries/config/messages.inc.php:188 msgid "Other core settings" -msgstr "" +msgstr "Arventennoù pouezus all" #: libraries/config/messages.inc.php:189 msgid "Settings that didn't fit enywhere else" -msgstr "" +msgstr "Arventennoù a bep seurt" #: libraries/config/messages.inc.php:190 msgid "Page titles" -msgstr "" +msgstr "Titloù pajennoù" #: libraries/config/messages.inc.php:191 msgid "" @@ -2873,57 +2897,64 @@ msgid "" "html#cfg_TitleTable]documentation[/a] for magic strings that can be used to " "get special values." msgstr "" +"Spisaat testenn barrenn ditl ar merdeer. En em zaveiñ d'an [a@Documentation." +"html#cfg_TitleTable]teuliadur[/a] evit an neudennadoù hud a c'haller ober " +"ganto." #: libraries/config/messages.inc.php:192 #: libraries/navigation_header.inc.php:83 #: libraries/navigation_header.inc.php:86 #: libraries/navigation_header.inc.php:89 msgid "Query window" -msgstr "" +msgstr "Prenestr klask" #: libraries/config/messages.inc.php:193 msgid "Customize query window options" -msgstr "" +msgstr "Personelaat dibarzhioù ar prenestr klask" #: libraries/config/messages.inc.php:194 msgid "Security" -msgstr "" +msgstr "Surentez" #: libraries/config/messages.inc.php:195 msgid "" "Please note that phpMyAdmin is just a user interface and its features do not " "limit MySQL" msgstr "" +"Notennit mat n'eo phpMyAdmin nemet un etrefas ha n'eo ket bevennet e mod " +"ebet MySQL gant an perzhioù anezhi" #: libraries/config/messages.inc.php:196 msgid "Basic settings" -msgstr "" +msgstr "Arventennoù diazez" #: libraries/config/messages.inc.php:197 msgid "Authentication" -msgstr "" +msgstr "Dilesadur" #: libraries/config/messages.inc.php:198 msgid "Authentication settings" -msgstr "" +msgstr "Arventennoù dilesañ" #: libraries/config/messages.inc.php:199 msgid "Server configuration" -msgstr "" +msgstr "Kefluniadur ar servijer" #: libraries/config/messages.inc.php:200 msgid "" "Advanced server configuration, do not change these options unless you know " "what they are for" msgstr "" +"Kefluniadur pishoc'h; bezit sur e ouzit ar pezh a rit a-raok mont da gemmañ " +"tra pe dra" #: libraries/config/messages.inc.php:201 msgid "Enter server connection parameters" -msgstr "" +msgstr "Merkañ arventennoù kevreañ ar servijer" #: libraries/config/messages.inc.php:202 msgid "Configuration storage" -msgstr "" +msgstr "Mirlec'h ar c'hefluniadurioù" #: libraries/config/messages.inc.php:203 msgid "" @@ -2931,53 +2962,58 @@ msgid "" "features, see [a(a)Documentation.html#linked-tables]phpMyAdmin configuration " "storage[/a] in documentation" msgstr "" +"Kefluniañ ar stokañ kefluniadurioùl phpMyAdmin evit gweredekaat perzhioù " +"ouzhpenn, gwelet [a(a)Documentation.html#linked-tables]phpMyAdmin " +"configuration storage[/a] en teuliadur" #: libraries/config/messages.inc.php:204 msgid "Changes tracking" -msgstr "" +msgstr "Heuliañ ar c'hemmoù" #: libraries/config/messages.inc.php:205 msgid "" "Tracking of changes made in database. Requires the phpMyAdmin configuration " "storage." msgstr "" +"Heuliañ ar c'hemmoù graet en diaz roadennoù. Rekis eo kaout ar stokañ " +"kefluniadurioù phpMyAdmin." #: libraries/config/messages.inc.php:206 msgid "Customize export options" -msgstr "" +msgstr "Personelaat an dibarzhioù ezporzhiañ" #: libraries/config/messages.inc.php:208 msgid "Customize import defaults" -msgstr "" +msgstr "Personelaat an arventennoù enporzhiañ dre ziouer" #: libraries/config/messages.inc.php:209 msgid "Customize navigation frame" -msgstr "" +msgstr "Personelaat ar framm merdeiñ" #: libraries/config/messages.inc.php:210 msgid "Customize main frame" -msgstr "" +msgstr "Personelaat ar framm pennañ" #: libraries/config/messages.inc.php:211 libraries/config/messages.inc.php:216 #: setup/frames/menu.inc.php:17 msgid "SQL queries" -msgstr "" +msgstr "Rekedoù SQL" #: libraries/config/messages.inc.php:213 msgid "SQL Query box" -msgstr "" +msgstr "Boest rekedoù SQL" #: libraries/config/messages.inc.php:214 msgid "Customize links shown in SQL Query boxes" -msgstr "" +msgstr "Personelaat al liammoù diskwelet er boestoù rekedoù SQL" #: libraries/config/messages.inc.php:217 msgid "SQL queries settings" -msgstr "" +msgstr "Arventennoù ar rekedoù SQL" #: libraries/config/messages.inc.php:218 msgid "SQL Validator" -msgstr "" +msgstr "Kadarnataer SQL" #: libraries/config/messages.inc.php:219 msgid "" @@ -2986,66 +3022,74 @@ msgid "" "strong].[br][em][a@http://sqlvalidator.mimer.com/]Mimer SQL Validator[/a], " "Copyright 2002 Upright Database Technology. All rights reserved.[/em]" msgstr "" +"Ma rit gant ar servij SQL Validator, notit mat e vez miret [strong]an " +"disklêriadurioù en un doare dizanv evit sevel stadegoù[/strong].[br][em]" +"[a@http://sqlvalidator.mimer.com/]Mimer SQL Validator[/a], Copyright 2002 " +"Upright Database Technology. All rights reserved.[/em]" #: libraries/config/messages.inc.php:220 msgid "Startup" -msgstr "" +msgstr "Pajenn deraouiñ" #: libraries/config/messages.inc.php:221 msgid "Customize startup page" -msgstr "" +msgstr "Personelaat ar bajenn deraouiñ" #: libraries/config/messages.inc.php:222 msgid "Tabs" -msgstr "" +msgstr "Ivinelloù" #: libraries/config/messages.inc.php:223 msgid "Choose how you want tabs to work" -msgstr "" +msgstr "Personelaat an ivinelloù" #: libraries/config/messages.inc.php:224 msgid "Text fields" -msgstr "" +msgstr "Maeziennoù testenn" #: libraries/config/messages.inc.php:225 msgid "Customize text input fields" -msgstr "" +msgstr "Personelaat ar maeziennoù ebarzhiñ testenn" #: libraries/config/messages.inc.php:226 libraries/export/texytext.php:17 msgid "Texy! text" -msgstr "" +msgstr "Testenn Texy!" #: libraries/config/messages.inc.php:228 msgid "Warnings" -msgstr "" +msgstr "Kemennoù diwall" #: libraries/config/messages.inc.php:229 msgid "Disable some of the warnings shown by phpMyAdmin" -msgstr "" +msgstr "Diweredekaat lod eus ar c'hemennoù diwall diskouezet gant phpMyAdmin" #: libraries/config/messages.inc.php:230 msgid "" "Enable [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] compression for import " "and export operations" msgstr "" +"Gweredekaat ar gwaskañ [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] evit an " +"oberiadennoù enporzhiañ hag ezporzhiañ" #: libraries/config/messages.inc.php:231 msgid "GZip" -msgstr "" +msgstr "GZip" #: libraries/config/messages.inc.php:232 msgid "Extra parameters for iconv" -msgstr "" +msgstr "Arventennoù ouzhpenn evit iconv" #: libraries/config/messages.inc.php:233 msgid "" "If enabled, phpMyAdmin continues computing multiple-statement queries even " "if one of the queries failed" msgstr "" +"Ma vez gweredekaet e kendalc'h phpMyAdmin da blediñ gant ar rekedoù " +"liesfrazennek ha pa vefe ur fazi gant unan anezho." #: libraries/config/messages.inc.php:234 msgid "Ignore multiple statement errors" -msgstr "" +msgstr "Na ober van ouzh ar fazioù er rekedoù liesfrazennek" #: libraries/config/messages.inc.php:235 msgid "" @@ -3053,91 +3097,96 @@ msgid "" "This might be good way to import large files, however it can break " "transactions." msgstr "" +"Aotren paouez gant an enporzhiañ m'emeur war-nes tizhout ar vevenn amzer. " +"Gallout a ra sikour da enporzhiañ restroù bras, ha pa c'hallfe terriñ " +"treuzgreadoù zo." #: libraries/config/messages.inc.php:236 msgid "Partial import: allow interrupt" -msgstr "" +msgstr "Enporzhiañ darnek : aotren paouez" #: libraries/config/messages.inc.php:241 libraries/config/messages.inc.php:248 #: libraries/import/csv.php:26 libraries/import/ldi.php:39 msgid "Do not abort on INSERT error" -msgstr "" +msgstr "Arabat paouez gant an enporzhiañ pa vez ur fazi gant INSERT" #: libraries/config/messages.inc.php:242 libraries/config/messages.inc.php:250 #: libraries/import/csv.php:25 libraries/import/ldi.php:38 msgid "Replace table data with file" -msgstr "" +msgstr "Erlec'hiañ roadennoù an daolenn gant re ar restr" #: libraries/config/messages.inc.php:244 msgid "" "Default format; be aware that this list depends on location (database, " "table) and only SQL is always available" msgstr "" +"Furmad dre ziouer; bezit emskiantek ez eo ar roll-mañ diouzh al lec'hiadur " +"(diaz roadennoù, taolenn) ha n'eus nemet SQL zo hegerz dalc'hmat" #: libraries/config/messages.inc.php:245 msgid "Format of imported file" -msgstr "" +msgstr "Furmad ar restr enporzhiañ" #: libraries/config/messages.inc.php:249 libraries/import/ldi.php:45 msgid "Use LOCAL keyword" -msgstr "" +msgstr "Ober gant ar ger-alc'hwez LOCAL" #: libraries/config/messages.inc.php:252 libraries/config/messages.inc.php:260 #: libraries/config/messages.inc.php:261 msgid "Column names in first row" -msgstr "" +msgstr "Anvioù bannoù el linenn gentañ" #: libraries/config/messages.inc.php:253 libraries/import/ods.php:27 msgid "Do not import empty rows" -msgstr "" +msgstr "Arabat enporzhiañ linennoù goullo" #: libraries/config/messages.inc.php:254 msgid "Import currencies ($5.00 to 5.00)" -msgstr "" +msgstr "Enporzhiañ moneizioù ($5.00 a zeu da vezañ 5.00)" #: libraries/config/messages.inc.php:255 msgid "Import percentages as proper decimals (12.00% to .12)" -msgstr "" +msgstr "Enporzhiañ an dregantadoù evel degelennoù (12.00% a zeu da vezañ .12)" #: libraries/config/messages.inc.php:256 msgid "Number of queries to skip from start" -msgstr "" +msgstr "Niver a rekedoù da lezel a-gostez adalek ar penn-kentañ" #: libraries/config/messages.inc.php:257 msgid "Partial import: skip queries" -msgstr "" +msgstr "Enporzhiañ darnek : lezel ar rekedoù a gostez" #: libraries/config/messages.inc.php:259 msgid "Do not use AUTO_INCREMENT for zero values" -msgstr "" +msgstr "Arabat ober gant AUTO_INCREMENT evit an talvoudoù par da mann" #: libraries/config/messages.inc.php:262 msgid "Initial state for sliders" -msgstr "" +msgstr "Talvoud dre ziouer evit an takadoù riklañ" #: libraries/config/messages.inc.php:263 msgid "How many rows can be inserted at one time" -msgstr "" +msgstr "An niver a linennoù a c'haller ober ganto war un dro" #: libraries/config/messages.inc.php:264 msgid "Number of inserted rows" -msgstr "" +msgstr "Niver a linennoù da ensoc'hañ" #: libraries/config/messages.inc.php:265 msgid "Target for quick access icon" -msgstr "" +msgstr "Bukadenn evit an arlun moned prim" #: libraries/config/messages.inc.php:266 msgid "Show logo in left frame" -msgstr "" +msgstr "Diskouez al logo er banell verdeiñ gleiz" #: libraries/config/messages.inc.php:267 msgid "Display logo" -msgstr "" +msgstr "Diskouez al logo" #: libraries/config/messages.inc.php:268 msgid "Display server choice at the top of the left frame" -msgstr "" +msgstr "Diskouez dibab ar servijerioù e laez ar banell gefluniañ" #: libraries/config/messages.inc.php:269 msgid "Display servers selection" @@ -5294,7 +5343,7 @@ msgstr "" #: libraries/export/sql.php:111 msgid "<code>CREATE TABLE</code> options:" -msgstr "" +msgstr "Dibarzhioù evit <code>CREATE TABLE</code> :" #: libraries/export/sql.php:123 msgid "" diff --git a/po/da.po b/po/da.po index f6ecc74..e83dbef 100644 --- a/po/da.po +++ b/po/da.po @@ -419,7 +419,7 @@ msgstr "skift til" #: db_qbe.php:186 msgid "visual builder" -msgstr "" +msgstr "visuel konstruktør" #: db_qbe.php:222 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:858 @@ -623,6 +623,7 @@ msgid "" "This view has at least this number of rows. Please refer to %sdocumentation" "%s." msgstr "" +"Viewet har som minimum dette antal rækker. Se venligst %sdokumentationen%s." #: db_structure.php:393 db_structure.php:407 libraries/header.inc.php:138 #: libraries/tbl_info.inc.php:60 tbl_structure.php:206 test/theme.php:73 @@ -813,7 +814,7 @@ msgstr "Output" #: enum_editor.php:68 msgid "Copy and paste the joined values into the \"Length/Values\" field" -msgstr "" +msgstr "Kopier og indsæt de sammensatte værdier i \"Længde/Værdier\"-feltet" #: export.php:73 msgid "Selected export type has to be saved in file!" @@ -984,12 +985,13 @@ msgstr "Denne operation kan tage lang tid. Fortsæt alligevel?" #: js/messages.php:40 msgid "You are about to DISABLE a BLOB Repository!" -msgstr "" +msgstr "Du er ved at DISABLE (deaktivere) en BLOB-beholder!" #: js/messages.php:41 #, php-format msgid "Are you sure you want to disable all BLOB references for database %s?" msgstr "" +"Er du sikker på at du vil deaktivere alle BLOB-referencer i databasen %s?" #: js/messages.php:44 msgid "Missing value in the form!" @@ -1066,7 +1068,7 @@ msgstr "Felj i udførsel af forespørgsel" #: js/messages.php:66 msgid "Dropping Column" -msgstr "" +msgstr "Sletter kolonne" #: js/messages.php:67 msgid "Adding Primary Key" @@ -1409,11 +1411,11 @@ msgstr "tir" #: js/messages.php:190 msgid "Wednesday" -msgstr "" +msgstr "onsdag" #: js/messages.php:191 msgid "Thursday" -msgstr "" +msgstr "torsdag" #: js/messages.php:192 #, fuzzy @@ -1423,7 +1425,7 @@ msgstr "fre" #: js/messages.php:193 msgid "Saturday" -msgstr "" +msgstr "lørdag" #. l10n: Short week day name #: js/messages.php:197 libraries/common.lib.php:1594 @@ -1833,7 +1835,7 @@ msgstr "Godkendelse af hardware mislykkedes" #: libraries/auth/swekey/swekey.auth.lib.php:166 msgid "No valid authentication key plugged" -msgstr "" +msgstr "Ingen gyldig autorisations-nøgle indkoblet" #: libraries/auth/swekey/swekey.auth.lib.php:202 msgid "Authenticating..." @@ -2269,7 +2271,7 @@ msgstr "struktur" #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 msgid "data" -msgstr "" +msgstr "data" #: libraries/config.values.php:97 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 @@ -2490,7 +2492,7 @@ msgstr "" #: libraries/config/messages.inc.php:31 msgid "Bzip2" -msgstr "" +msgstr "Bzip2" #: libraries/config/messages.inc.php:32 msgid "" @@ -3018,7 +3020,7 @@ msgstr "Hovedramme" #: libraries/config/messages.inc.php:184 msgid "Microsoft Office" -msgstr "" +msgstr "Microsoft Office" #: libraries/config/messages.inc.php:186 #, fuzzy @@ -3110,45 +3112,50 @@ msgid "" "features, see [a(a)Documentation.html#linked-tables]phpMyAdmin configuration " "storage[/a] in documentation" msgstr "" +"Konfigurer phpMyAdmin configuration storage for at få adgang til flere " +"funktioner. Se dokumentationen for [a(a)Documentation.html#linked-tables]" +"phpMyAdmin configuration storage[/a]" #: libraries/config/messages.inc.php:204 msgid "Changes tracking" -msgstr "" +msgstr "Ændrer sporing" #: libraries/config/messages.inc.php:205 msgid "" "Tracking of changes made in database. Requires the phpMyAdmin configuration " "storage." msgstr "" +"Sporing af ændringer i databasen er udført. phpMyAdmin configuration storage " +"er krævet." #: libraries/config/messages.inc.php:206 msgid "Customize export options" -msgstr "" +msgstr "Tilpas eksport-indstillinger" #: libraries/config/messages.inc.php:208 msgid "Customize import defaults" -msgstr "" +msgstr "Tilpas import-indstillinger" #: libraries/config/messages.inc.php:209 msgid "Customize navigation frame" -msgstr "" +msgstr "Tilpas navigations-rammen" #: libraries/config/messages.inc.php:210 msgid "Customize main frame" -msgstr "" +msgstr "Tilpas hoved-rammen" #: libraries/config/messages.inc.php:211 libraries/config/messages.inc.php:216 #: setup/frames/menu.inc.php:17 msgid "SQL queries" -msgstr "" +msgstr "SQL-forespørgsler" #: libraries/config/messages.inc.php:213 msgid "SQL Query box" -msgstr "" +msgstr "SQL Query-boks" #: libraries/config/messages.inc.php:214 msgid "Customize links shown in SQL Query boxes" -msgstr "" +msgstr "Tilpas links vist i SQL Query-boksen" #: libraries/config/messages.inc.php:217 #, fuzzy @@ -3169,22 +3176,26 @@ msgid "" "strong].[br][em][a@http://sqlvalidator.mimer.com/]Mimer SQL Validator[/a], " "Copyright 2002 Upright Database Technology. All rights reserved.[/em]" msgstr "" +"Hvis du ønsker at bruge servicen SQL Validator, skal du huske på, at [strong]" +"alle SQL forespørgsler lagres anonymt til statistiske formål[/strong].[br]" +"[em][a@http://sqlvalidator.mimer.com/]Mimer SQL Validator[/a], Copyright " +"2002 Upright Database Technology. All rights reserved.[/em]" #: libraries/config/messages.inc.php:220 msgid "Startup" -msgstr "" +msgstr "Opstart" #: libraries/config/messages.inc.php:221 msgid "Customize startup page" -msgstr "" +msgstr "Tilpas opstartside" #: libraries/config/messages.inc.php:222 msgid "Tabs" -msgstr "" +msgstr "Faner" #: libraries/config/messages.inc.php:223 msgid "Choose how you want tabs to work" -msgstr "" +msgstr "Vælg hvordan du ønsker at fanerne skal fungere" #: libraries/config/messages.inc.php:224 #, fuzzy @@ -3200,39 +3211,43 @@ msgstr "Brug tekstfelt" #: libraries/config/messages.inc.php:226 libraries/export/texytext.php:17 msgid "Texy! text" -msgstr "" +msgstr "Texy! tekst" #: libraries/config/messages.inc.php:228 msgid "Warnings" -msgstr "" +msgstr "Advarsler" #: libraries/config/messages.inc.php:229 msgid "Disable some of the warnings shown by phpMyAdmin" -msgstr "" +msgstr "Deaktiver nogle af advarslerne, som phpMyAdmin viser" #: libraries/config/messages.inc.php:230 msgid "" "Enable [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] compression for import " "and export operations" msgstr "" +"Aktiver [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] komprimering for " +"import og eksport-funktionerne" #: libraries/config/messages.inc.php:231 msgid "GZip" -msgstr "" +msgstr "GZip" #: libraries/config/messages.inc.php:232 msgid "Extra parameters for iconv" -msgstr "" +msgstr "Yderligere parametre til iconv" #: libraries/config/messages.inc.php:233 msgid "" "If enabled, phpMyAdmin continues computing multiple-statement queries even " "if one of the queries failed" msgstr "" +"Hvis aktiveret, vil phpMyAdmin fortsætte med at udføre efterfølgende SQL-" +"forespørgsler selvom et eller flere af dem fejler" #: libraries/config/messages.inc.php:234 msgid "Ignore multiple statement errors" -msgstr "" +msgstr "Ignorer flere efterfølgende fejl i udtryk" #: libraries/config/messages.inc.php:235 msgid "" @@ -3240,15 +3255,18 @@ msgid "" "This might be good way to import large files, however it can break " "transactions." msgstr "" +"Tillad afbrydelse af import hvis script opdager at timeout-tiden snart " +"udløber. Dette kan være godt ved store import-filer, men kan afbryde " +"transaktioner." #: libraries/config/messages.inc.php:236 msgid "Partial import: allow interrupt" -msgstr "" +msgstr "Delvis import: tillad afbrydelse" #: libraries/config/messages.inc.php:241 libraries/config/messages.inc.php:248 #: libraries/import/csv.php:26 libraries/import/ldi.php:39 msgid "Do not abort on INSERT error" -msgstr "" +msgstr "Afbryd ikke ved fejl i INSERT" #: libraries/config/messages.inc.php:242 libraries/config/messages.inc.php:250 #: libraries/import/csv.php:25 libraries/import/ldi.php:38 @@ -3260,6 +3278,8 @@ msgid "" "Default format; be aware that this list depends on location (database, " "table) and only SQL is always available" msgstr "" +"Standard format, vær opmærksom på, at denne liste afhænger af sted (databae, " +"tabel) og kun SQL er altid tilgængelig" #: libraries/config/messages.inc.php:245 msgid "Format of imported file" @@ -3278,15 +3298,15 @@ msgstr "Indsæt feltnavne i første række" #: libraries/config/messages.inc.php:253 libraries/import/ods.php:27 msgid "Do not import empty rows" -msgstr "" +msgstr "Importer ikke tomme rækker" #: libraries/config/messages.inc.php:254 msgid "Import currencies ($5.00 to 5.00)" -msgstr "" +msgstr "Importer valutaer ($5.00 til 5.00)" #: libraries/config/messages.inc.php:255 msgid "Import percentages as proper decimals (12.00% to .12)" -msgstr "" +msgstr "Importer procenter med korrekte decimaler (12.00% bliver til .12)" #: libraries/config/messages.inc.php:256 #, fuzzy @@ -3296,7 +3316,7 @@ msgstr "Antal poster (queries) der skal springes over fra start" #: libraries/config/messages.inc.php:257 msgid "Partial import: skip queries" -msgstr "" +msgstr "Delvis import: spring over forespørgsler" #: libraries/config/messages.inc.php:259 #, fuzzy @@ -3306,35 +3326,35 @@ msgstr "Tilføj AUTO_INCREMENT værdi" #: libraries/config/messages.inc.php:262 msgid "Initial state for sliders" -msgstr "" +msgstr "Skydernes udgangspunkt" #: libraries/config/messages.inc.php:263 msgid "How many rows can be inserted at one time" -msgstr "" +msgstr "Hvor mange rækker kan der indsættes på een gang" #: libraries/config/messages.inc.php:264 msgid "Number of inserted rows" -msgstr "" +msgstr "Antal indsatte rækker" #: libraries/config/messages.inc.php:265 msgid "Target for quick access icon" -msgstr "" +msgstr "Mål for hurtigt valg ikon" #: libraries/config/messages.inc.php:266 msgid "Show logo in left frame" -msgstr "" +msgstr "Vis logoet i venstre ramme" #: libraries/config/messages.inc.php:267 msgid "Display logo" -msgstr "" +msgstr "Vis logo" #: libraries/config/messages.inc.php:268 msgid "Display server choice at the top of the left frame" -msgstr "" +msgstr "Vis servervalg øverst i venstre ramme" #: libraries/config/messages.inc.php:269 msgid "Display servers selection" -msgstr "" +msgstr "Vis servervalg" #: libraries/config/messages.inc.php:270 #, fuzzy @@ -3344,84 +3364,87 @@ msgstr "Antallet af tabeller der er åbne." #: libraries/config/messages.inc.php:271 msgid "String that separates databases into different tree levels" -msgstr "" +msgstr "Streng, der inddeler databaser i træ" #: libraries/config/messages.inc.php:272 msgid "Database tree separator" -msgstr "" +msgstr "Separator til databaseinddeling" #: libraries/config/messages.inc.php:273 msgid "" "Only light version; display databases in a tree (determined by the separator " "defined below)" -msgstr "" +msgstr "Kun i lille version; vis databaser i træ (afgjort vha. separator)" #: libraries/config/messages.inc.php:274 msgid "Display databases in a tree" -msgstr "" +msgstr "Vis databaser i træ" #: libraries/config/messages.inc.php:275 msgid "Disable this if you want to see all databases at once" -msgstr "" +msgstr "Deaktiver dette, hvis du ønsker at se alle databaser på een gang" #: libraries/config/messages.inc.php:276 msgid "Use light version" -msgstr "" +msgstr "Brug lille version" #: libraries/config/messages.inc.php:277 msgid "Maximum table tree depth" -msgstr "" +msgstr "Maksimal dybde på databasetræ" #: libraries/config/messages.inc.php:278 msgid "String that separates tables into different tree levels" -msgstr "" +msgstr "Streng, der inddeler tabeller i træ" #: libraries/config/messages.inc.php:279 msgid "Table tree separator" -msgstr "" +msgstr "Separator til tabelinddeling" #: libraries/config/messages.inc.php:280 msgid "URL where logo in the navigation frame will point to" -msgstr "" +msgstr "URL som logoet i navigations-rammen vil pege på" #: libraries/config/messages.inc.php:281 msgid "Logo link URL" -msgstr "" +msgstr "Logo link-URL" #: libraries/config/messages.inc.php:282 msgid "" "Open the linked page in the main window ([kbd]main[/kbd]) or in a new one " "([kbd]new[/kbd])" msgstr "" +"Åbn den linkede side i hovedvinduet ([kbd]main[/kbd]) eller i et nyt ([kbd]" +"new[/kbd])" #: libraries/config/messages.inc.php:283 msgid "Logo link target" -msgstr "" +msgstr "Logo link target" #: libraries/config/messages.inc.php:284 msgid "Highlight server under the mouse cursor" -msgstr "" +msgstr "Fremhæv server under musepil" #: libraries/config/messages.inc.php:285 msgid "Enable highlighting" -msgstr "" +msgstr "Aktiver fremhævning" #: libraries/config/messages.inc.php:286 msgid "Use less graphically intense tabs" -msgstr "" +msgstr "Brug faner med mindre grafik" #: libraries/config/messages.inc.php:287 msgid "Light tabs" -msgstr "" +msgstr "Lette faner" #: libraries/config/messages.inc.php:288 msgid "" "Maximum number of characters shown in any non-numeric column on browse view" -msgstr "" +msgstr "Maksimalt antal tegn vist i ikke-numerisk kolonne ved gennemsyn" +# karakterer gives i skolen eller er personer i film #: libraries/config/messages.inc.php:289 msgid "Limit column characters" -msgstr "" +msgstr "Begræns antal tegn i kolonne" #: libraries/config/messages.inc.php:290 msgid "" @@ -3429,20 +3452,25 @@ msgid "" "only occurs for the current server. Setting this to FALSE makes it easy to " "forget to log out from other servers when connected to multiple servers." msgstr "" +"Hvis TRUE vil logout slette cookies for alle servere; når sat til FALSE sker " +"logout kun for den aktuelle server.Sættes denne til FALSE, kan man let " +"glemme at logge ud fra andre servere, når man er forbundet til flere servere." #: libraries/config/messages.inc.php:291 msgid "Delete all cookies on logout" -msgstr "" +msgstr "Slet alle cookies, når der logges ud" #: libraries/config/messages.inc.php:292 msgid "" "Define whether the previous login should be recalled or not in cookie " "authentication mode" msgstr "" +"Definer om den foregående login skal gentages eller ej i cookie " +"autentifikationstilstand " #: libraries/config/messages.inc.php:293 msgid "Recall user name" -msgstr "" +msgstr "Gendan brugernavn" #: libraries/config/messages.inc.php:294 msgid "" @@ -3451,51 +3479,55 @@ msgid "" "and will be deleted as soon as you close the browser window. This is " "recommended for non-trusted environments." msgstr "" +"Definer hvor længe (i sekunder) en login cookie skal gemmes i browseren. " +"Standard på 0 betyder, at den kun gemmes for den eksisterende session og vil " +"blive slettet så snart browservinduet lukkes. Dette anbefales for ikke-" +"sikrede omgivelser." #: libraries/config/messages.inc.php:295 msgid "Login cookie store" -msgstr "" +msgstr "Login cookie sletning" #: libraries/config/messages.inc.php:296 msgid "Define how long (in seconds) a login cookie is valid" -msgstr "" +msgstr "Definerer hvor længe (i sekunder) en login cookie er gyldig" #: libraries/config/messages.inc.php:297 msgid "Login cookie validity" -msgstr "" +msgstr "Gyldighed for login cookie" #: libraries/config/messages.inc.php:298 msgid "Double size of textarea for LONGTEXT columns" -msgstr "" +msgstr "Dobbelt størrelse for tekstboks for LONGTEXT kolonner" #: libraries/config/messages.inc.php:299 msgid "Bigger textarea for LONGTEXT" -msgstr "" +msgstr "Større tekstboks for LONGTEXT" #: libraries/config/messages.inc.php:300 msgid "Use icons on main page" -msgstr "" +msgstr "Brug ikoner på hovedsiden" #: libraries/config/messages.inc.php:301 msgid "Maximum number of characters used when a SQL query is displayed" -msgstr "" +msgstr "Maksimalt antal tegn, når en SQL-forespørgsel vises" #: libraries/config/messages.inc.php:302 msgid "Maximum displayed SQL length" -msgstr "" +msgstr "Maksimal vist SQL-længde" #: libraries/config/messages.inc.php:303 libraries/config/messages.inc.php:308 #: libraries/config/messages.inc.php:336 msgid "Users cannot set a higher value" -msgstr "" +msgstr "Brugere kan ikke sætte en højere værdi" #: libraries/config/messages.inc.php:304 msgid "Maximum number of databases displayed in left frame and database list" -msgstr "" +msgstr "Maksimalt antal databaser vist i venstre ramme og databaseliste" #: libraries/config/messages.inc.php:305 msgid "Maximum databases" -msgstr "" +msgstr "Maksimalt antal databaser" #: libraries/config/messages.inc.php:306 msgid "" @@ -3503,42 +3535,49 @@ msgid "" "contains more rows, "Previous" and "Next" links will be " "shown." msgstr "" +"Antal rækker vist, når man kigger på et sæt resultater. Hvis resultatet " +"indeholder flere rækker, links til "Forrige" og "Næstet" " +"vil blive vist." #: libraries/config/messages.inc.php:307 msgid "Maximum number of rows to display" -msgstr "" +msgstr "Maksimalt antal viste rækker" #: libraries/config/messages.inc.php:309 msgid "Maximum number of tables displayed in table list" -msgstr "" +msgstr "Maksimalt antal tabeller vist i tabellisten" #: libraries/config/messages.inc.php:310 msgid "Maximum tables" -msgstr "" +msgstr "Maksimalt antal tabeller" #: libraries/config/messages.inc.php:311 msgid "" "Disable the default warning that is displayed if mcrypt is missing for " "cookie authentication" msgstr "" +"Deaktiver standardadvarslen som vises, hvis mcrypt mangler til cookie " +"autentifikation" #: libraries/config/messages.inc.php:312 msgid "mcrypt warning" -msgstr "" +msgstr "mcrypt advarsel" #: libraries/config/messages.inc.php:313 msgid "" "The number of bytes a script is allowed to allocate, eg. [kbd]32M[/kbd] " "([kbd]0[/kbd] for no limit)" msgstr "" +"Antallet af bytes et script må allokere, fx. [kbd]32M[/kbd] ([kbd]0[/kbd] " +"for ubegrænset)" #: libraries/config/messages.inc.php:314 msgid "Memory limit" -msgstr "" +msgstr "Hukommelsesgrænse" #: libraries/config/messages.inc.php:315 msgid "These are Edit, Inline edit, Copy and Delete links" -msgstr "" +msgstr "Dette er Ret, Ret linje, Kopi og Slet links" #: libraries/config/messages.inc.php:316 msgid "Show table row links on left side" @@ -3550,7 +3589,7 @@ msgstr "" #: libraries/config/messages.inc.php:318 msgid "Use natural order for sorting table and database names" -msgstr "" +msgstr "Brug naturlig rækkefølge ved sortering af tabeller og databasenavne" #: libraries/config/messages.inc.php:319 #, fuzzy @@ -3560,37 +3599,39 @@ msgstr "Arrangér tabelrækkefølge efter" #: libraries/config/messages.inc.php:320 libraries/config/messages.inc.php:330 msgid "Use only icons, only text or both" -msgstr "" +msgstr "Brug kun ikoner, kun tekst eller begge" #: libraries/config/messages.inc.php:321 msgid "Iconic navigation bar" -msgstr "" +msgstr "Navigationsbjælke med ikoner" #: libraries/config/messages.inc.php:322 msgid "use GZip output buffering for increased speed in HTTP transfers" -msgstr "" +msgstr "brug GZip output buffering til forhøjet hastighed i HTTP overførsler" #: libraries/config/messages.inc.php:323 msgid "GZip output buffering" -msgstr "" +msgstr "GZip output buffering" #: libraries/config/messages.inc.php:324 msgid "" "[kbd]SMART[/kbd] - i.e. descending order for columns of type TIME, DATE, " "DATETIME and TIMESTAMP, ascending order otherwise" msgstr "" +"[kbd]SMART[/kbd] - dvs faldende orden for kolonner af type TIME, DATE, " +"DATETIME og TIMESTAMP ellers stigende orden" #: libraries/config/messages.inc.php:325 msgid "Default sorting order" -msgstr "" +msgstr "Standard sorteringsrækkefølge" #: libraries/config/messages.inc.php:326 msgid "Use persistent connections to MySQL databases" -msgstr "" +msgstr "Brug vedvarende forbindelser til MySQL databaser" #: libraries/config/messages.inc.php:327 msgid "Persistent connections" -msgstr "" +msgstr "Vedvarende forbindelser" #: libraries/config/messages.inc.php:328 msgid "" @@ -3598,22 +3639,25 @@ msgid "" "Structure page if any of the required tables for the phpMyAdmin " "configuration storage could not be found" msgstr "" +"Deaktiver standardadvarslen, som vises på databasedetaljers strukturside, " +"hvis nogen af de påkrævede tabeller i phpMyAdmin configuration storage ikke " +"kunne findes." #: libraries/config/messages.inc.php:329 msgid "Missing phpMyAdmin configuration storage tables" -msgstr "" +msgstr "Manglende phpMyAdmin configuration storage tabeller" #: libraries/config/messages.inc.php:331 msgid "Iconic table operations" -msgstr "" +msgstr "Tabeloperationer med ikoner" #: libraries/config/messages.inc.php:332 msgid "Disallow BLOB and BINARY columns from editing" -msgstr "" +msgstr "Tillad ikke redigering af BLOB og BINARY kolonner" #: libraries/config/messages.inc.php:333 msgid "Protect binary columns" -msgstr "" +msgstr "Beskyt binære kolonner" #: libraries/config/messages.inc.php:334 msgid "" @@ -3621,30 +3665,33 @@ msgid "" "storage). If disabled, this utilizes JS-routines to display query history " "(lost by window close)." msgstr "" +"Aktiver hvis du ønsker DB-baseret forespørgselshistorik (kræver phpMyAdmin " +"configuration storage). Hvis deaktiveret bruges JS-rutiner til at vise " +"forespørgselshistorik (mistes når vinduet lukkes)." #: libraries/config/messages.inc.php:335 msgid "Permanent query history" -msgstr "" +msgstr "Permanent forespørgselshistorie" #: libraries/config/messages.inc.php:337 msgid "How many queries are kept in history" -msgstr "" +msgstr "Hvor mange forespørgsler er gemt i historikken" #: libraries/config/messages.inc.php:338 msgid "Query history length" -msgstr "" +msgstr "Længde på forespørgselshistorik" #: libraries/config/messages.inc.php:339 msgid "Tab displayed when opening a new query window" -msgstr "" +msgstr "Fane vist, når et nyt forespørgselsvindue åbnes" #: libraries/config/messages.inc.php:340 msgid "Default query window tab" -msgstr "" +msgstr "Standardfane for forespørgselsvindue" #: libraries/config/messages.inc.php:341 msgid "Query window height (in pixels)" -msgstr "" +msgstr "Højde (i pixels) af forespørgselsvindue" #: libraries/config/messages.inc.php:342 #, fuzzy @@ -3666,15 +3713,15 @@ msgstr "Foresp. vindue" #: libraries/config/messages.inc.php:345 msgid "Select which functions will be used for character set conversion" -msgstr "" +msgstr "Vælg hvilke funktioner, der vil blive brugt for tegnsætskonvertering" #: libraries/config/messages.inc.php:346 msgid "Recoding engine" -msgstr "" +msgstr "Omkodningsværktøj" #: libraries/config/messages.inc.php:347 msgid "Repeat the headers every X cells, [kbd]0[/kbd] deactivates this feature" -msgstr "" +msgstr "Gentag overskrifter for hver X celler, [kbd]0[/kbd] deaktiverer dette" #: libraries/config/messages.inc.php:348 #, fuzzy @@ -3684,51 +3731,51 @@ msgstr "Reparér tråde" #: libraries/config/messages.inc.php:349 msgid "Show help button instead of Documentation text" -msgstr "" +msgstr "Vis hjælpeknap i stedet for dokumentationsteksten" #: libraries/config/messages.inc.php:350 msgid "Show help button" -msgstr "" +msgstr "Vis hjælpeknap" #: libraries/config/messages.inc.php:352 msgid "Directory where exports can be saved on server" -msgstr "" +msgstr "Mappe, hvor eksporterede data kan gemmes på serveren" #: libraries/config/messages.inc.php:353 msgid "Save directory" -msgstr "" +msgstr "Gemmemappe" #: libraries/config/messages.inc.php:354 msgid "Leave blank if not used" -msgstr "" +msgstr "Lades blank, hvis ikke brugt" #: libraries/config/messages.inc.php:355 msgid "Host authorization order" -msgstr "" +msgstr "Host autorisationsrækkefølge" #: libraries/config/messages.inc.php:356 msgid "Leave blank for defaults" -msgstr "" +msgstr "Lades blank for standardværdi" #: libraries/config/messages.inc.php:357 msgid "Host authorization rules" -msgstr "" +msgstr "Host autorisationsregler" #: libraries/config/messages.inc.php:358 msgid "Allow logins without a password" -msgstr "" +msgstr "Tillad login uden adgangskode" #: libraries/config/messages.inc.php:359 msgid "Allow root login" -msgstr "" +msgstr "Tillad root login" #: libraries/config/messages.inc.php:360 msgid "HTTP Basic Auth Realm name to display when doing HTTP Auth" -msgstr "" +msgstr "HTTP Basic Auth Realm navn, der vises ved HTTP Auth" #: libraries/config/messages.inc.php:361 msgid "HTTP Realm" -msgstr "" +msgstr "HTTP Realm" #: libraries/config/messages.inc.php:362 msgid "" @@ -3736,142 +3783,158 @@ msgid "" "authentication[/a] (not located in your document root; suggested: /etc/" "swekey.conf)" msgstr "" +"Stien for konfigurationsfilen for [a@http://swekey.com]SweKey hardware " +"autentifikation[/a] (ikke fundet i din dokumentrod; forslag: /etc/swekey." +"conf)" #: libraries/config/messages.inc.php:363 msgid "SweKey config file" -msgstr "" +msgstr "SweKey konfigurationsfil" #: libraries/config/messages.inc.php:364 msgid "Authentication method to use" -msgstr "" +msgstr "Metode for autentifikation" #: libraries/config/messages.inc.php:365 setup/frames/index.inc.php:114 msgid "Authentication type" -msgstr "" +msgstr "Autentifikationstype" #: libraries/config/messages.inc.php:366 msgid "" "Leave blank for no [a@http://wiki.phpmyadmin.net/pma/bookmark]bookmark[/a] " "support, suggested: [kbd]pma_bookmark[/kbd]" msgstr "" +"Lades blank for ingen [a@http://wiki.phpmyadmin.net/pma/bookmark]bookmark[/" +"a] understøttelse, forslag: [kbd]pma_bookmark[/kbd]" #: libraries/config/messages.inc.php:367 msgid "Bookmark table" -msgstr "" +msgstr "Bogmærketabel" #: libraries/config/messages.inc.php:368 msgid "" "Leave blank for no column comments/mime types, suggested: [kbd]" "pma_column_info[/kbd]" msgstr "" +"Lades blank ved ingen kolonnekommentarer/mime types, forslag: [kbd]" +"pma_column_info[/kbd]" #: libraries/config/messages.inc.php:369 msgid "Column information table" -msgstr "" +msgstr "Tabel for kolonneinformation" #: libraries/config/messages.inc.php:370 msgid "Compress connection to MySQL server" -msgstr "" +msgstr "Komprimer forbindelse til MySQL server" #: libraries/config/messages.inc.php:371 msgid "Compress connection" -msgstr "" +msgstr "Komprimer forbindelse" #: libraries/config/messages.inc.php:372 msgid "How to connect to server, keep [kbd]tcp[/kbd] if unsure" -msgstr "" +msgstr "Hvordan forbindes til server, behold [kbd]tcp[/kbd] hvis usikker" #: libraries/config/messages.inc.php:373 msgid "Connection type" -msgstr "" +msgstr "Forbindelsestype" #: libraries/config/messages.inc.php:374 msgid "Control user password" -msgstr "" +msgstr "Adgangskode for kontrolbruger" #: libraries/config/messages.inc.php:375 msgid "" "A special MySQL user configured with limited permissions, more information " "available on [a@http://wiki.phpmyadmin.net/pma/controluser]wiki[/a]" msgstr "" +"En speciel MySQL bruger med begrænsede tilladelser. Mere information på " +"[a@http://wiki.phpmyadmin.net/pma/controluser]wiki[/a]" #: libraries/config/messages.inc.php:376 msgid "Control user" -msgstr "" +msgstr "Kontrolbruger" #: libraries/config/messages.inc.php:377 msgid "Count tables when showing database list" -msgstr "" +msgstr "Optæl tabeller, når databaselisten vises" #: libraries/config/messages.inc.php:378 msgid "Count tables" -msgstr "" +msgstr "Optæl tabeller" #: libraries/config/messages.inc.php:379 msgid "" "Leave blank for no Designer support, suggested: [kbd]pma_designer_coords[/" "kbd]" msgstr "" +"Lad være blank for ingen Designer support, forslag: [kbd]pma_designer_coords" +"[/kbd]" #: libraries/config/messages.inc.php:380 msgid "Designer table" -msgstr "" +msgstr "Designer tabel" #: libraries/config/messages.inc.php:381 msgid "" "More information on [a@http://sf.net/support/tracker.php?aid=1849494]PMA bug " "tracker[/a] and [a@http://bugs.mysql.com/19588]MySQL Bugs[/a]" msgstr "" +"Mere information om [a@http://sf.net/support/tracker.php?aid=1849494]PMA bug " +"tracker[/a] og [a@http://bugs.mysql.com/19588]MySQL Bugs[/a]" #: libraries/config/messages.inc.php:382 msgid "Disable use of INFORMATION_SCHEMA" -msgstr "" +msgstr "Deaktiver brug af INFORMATION_SCHEMA" #: libraries/config/messages.inc.php:383 msgid "What PHP extension to use; you should use mysqli if supported" msgstr "" +"Hvilken PHP-udvidelse der skal bruges; du bør bruge mysqli hvis understøttet" #: libraries/config/messages.inc.php:384 msgid "PHP extension to use" -msgstr "" +msgstr "PHP-udvidelse, der skal bruges" #: libraries/config/messages.inc.php:385 msgid "Hide databases matching regular expression (PCRE)" -msgstr "" +msgstr "Gem databaser som matcher regulært udtryk (PCRE)" #: libraries/config/messages.inc.php:386 msgid "Hide databases" -msgstr "" +msgstr "Skjul databaser" #: libraries/config/messages.inc.php:387 msgid "" "Leave blank for no SQL query history support, suggested: [kbd]pma_history[/" "kbd]" msgstr "" +"Lades blank for ingen historik for SQL-forespørgsler, forslag: [kbd]" +"pma_history[/kbd]" #: libraries/config/messages.inc.php:388 msgid "SQL query history table" -msgstr "" +msgstr "SQL forespørgselsshistoriktabel" #: libraries/config/messages.inc.php:389 msgid "Hostname where MySQL server is running" -msgstr "" +msgstr "Servernavn, hvor MySQL server kører" #: libraries/config/messages.inc.php:390 msgid "Server hostname" -msgstr "" +msgstr "Servernavn" #: libraries/config/messages.inc.php:391 msgid "Logout URL" -msgstr "" +msgstr "Log ud URL" #: libraries/config/messages.inc.php:392 msgid "Try to connect without password" -msgstr "" +msgstr "Prøv at forbinde uden adganskode" #: libraries/config/messages.inc.php:393 msgid "Connect without password" -msgstr "" +msgstr "Forbind uden adgangskode" #: libraries/config/messages.inc.php:394 msgid "" @@ -3881,27 +3944,34 @@ msgid "" "their names in order and use [kbd]*[/kbd] at the end to show the rest in " "alphabetical order." msgstr "" +"Du kan bruge MySQL jokertegn (% and _), escape dem hvis du vil bruge dem som " +"almindelige tegn, fx brug [kbd]'my\\_db'[/kbd] og ikket [kbd]'my_db'[/kbd]. " +"Ved at bruge denne indstilling kan man sortere databaselisten, indtast blot " +"navnene efter hinanden og brug [kbd]*[/kbd] i slutningen for at vise resten " +"i alfabetisk orden." #: libraries/config/messages.inc.php:395 msgid "Show only listed databases" -msgstr "" +msgstr "Vis kun listede databaser" #: libraries/config/messages.inc.php:396 libraries/config/messages.inc.php:433 msgid "Leave empty if not using config auth" -msgstr "" +msgstr "Lades tom hvis du ikke bruger config auth" #: libraries/config/messages.inc.php:397 msgid "Password for config auth" -msgstr "" +msgstr "Adgangskode for config auth" #: libraries/config/messages.inc.php:398 msgid "" "Leave blank for no PDF schema support, suggested: [kbd]pma_pdf_pages[/kbd]" msgstr "" +"Lades blank for ingen understøttelse af PDF-skematik, forslag: [kbd]" +"pma_pdf_pages[/kbd]" #: libraries/config/messages.inc.php:399 msgid "PDF schema: pages table" -msgstr "" +msgstr "PDF-skematik: pages tabel" #: libraries/config/messages.inc.php:400 msgid "" @@ -3909,6 +3979,9 @@ msgid "" "phpmyadmin.net/pma/pmadb]pmadb[/a] for complete information. Leave blank for " "no support. Suggested: [kbd]phpmyadmin[/kbd]" msgstr "" +"Database brugt til relationer, bogmærker, og PDF funktioner. Se [a@http://" +"wiki.phpmyadmin.net/pma/pmadb]pmadb[/a] for komplet information. Lades blank " +"ved ingen understøttelse. Forslag: [kbd]phpmyadmin[/kbd]" #: libraries/config/messages.inc.php:401 #, fuzzy @@ -3918,74 +3991,82 @@ msgstr "databasenavn" #: libraries/config/messages.inc.php:402 msgid "Port on which MySQL server is listening, leave empty for default" -msgstr "" +msgstr "Port hvorpå MySQL server lytter, lades tom for standard" #: libraries/config/messages.inc.php:403 msgid "Server port" -msgstr "" +msgstr "Serverport" #: libraries/config/messages.inc.php:404 msgid "" "Leave blank for no [a@http://wiki.phpmyadmin.net/pma/relation]relation-links" "[/a] support, suggested: [kbd]pma_relation[/kbd]" msgstr "" +"Lades blank for ingen understøttelse af [a@http://wiki.phpmyadmin.net/pma/" +"relation]relation-links[/a], forslag: [kbd]pma_relation[/kbd]" #: libraries/config/messages.inc.php:405 msgid "Relation table" -msgstr "" +msgstr "Relationstabel" #: libraries/config/messages.inc.php:406 msgid "SQL command to fetch available databases" -msgstr "" +msgstr "SQL-kommando til at hente tilgængelige databaser" #: libraries/config/messages.inc.php:407 msgid "SHOW DATABASES command" -msgstr "" +msgstr "SHOW DATABASES kommando" #: libraries/config/messages.inc.php:408 msgid "" "See [a@http://wiki.phpmyadmin.net/pma/auth_types#signon]authentication types" "[/a] for an example" msgstr "" +"Se [a@http://wiki.phpmyadmin.net/pma/auth_types#signon]authentication types[/" +"a] for et eksempel" #: libraries/config/messages.inc.php:409 msgid "Signon session name" -msgstr "" +msgstr "Login sessionsnavn" #: libraries/config/messages.inc.php:410 msgid "Signon URL" -msgstr "" +msgstr "Login URL" #: libraries/config/messages.inc.php:411 msgid "Socket on which MySQL server is listening, leave empty for default" -msgstr "" +msgstr "Socket hvorpå MySQL server lytter, lades tom for standard" #: libraries/config/messages.inc.php:412 msgid "Server socket" -msgstr "" +msgstr "Server socket" #: libraries/config/messages.inc.php:413 msgid "Enable SSL for connection to MySQL server" -msgstr "" +msgstr "Brug SSL til forbindelse til MySQL-serveren" #: libraries/config/messages.inc.php:414 msgid "Use SSL" -msgstr "" +msgstr "Brug SSL" #: libraries/config/messages.inc.php:415 msgid "" "Leave blank for no PDF schema support, suggested: [kbd]pma_table_coords[/kbd]" msgstr "" +"Lades blank for ingen understøttelse af PDF-skematik, forslag: [kbd]" +"pma_table_coords[/kbd]" #: libraries/config/messages.inc.php:416 msgid "PDF schema: table coordinates" -msgstr "" +msgstr "PDF-skematik: tabel coordinates" #: libraries/config/messages.inc.php:417 msgid "" "Table to describe the display columns, leave blank for no support; " "suggested: [kbd]pma_table_info[/kbd]" msgstr "" +"Tabel til at beskrive visningskolonnerne, lades blank for ingen " +"understøttelset; forslag: [kbd]pma_table_info[/kbd]" #: libraries/config/messages.inc.php:418 #, fuzzy @@ -3998,34 +4079,41 @@ msgid "" "Whether a DROP DATABASE IF EXISTS statement will be added as first line to " "the log when creating a database." msgstr "" +"Om en DROP DATABASE IF EXISTS kommando skal tilføjes som første linje i " +"loggen når en database oprettes." #: libraries/config/messages.inc.php:420 msgid "Add DROP DATABASE" -msgstr "" +msgstr "Tilføj DROP DATABASE" #: libraries/config/messages.inc.php:421 msgid "" "Whether a DROP TABLE IF EXISTS statement will be added as first line to the " "log when creating a table." msgstr "" +"Om en DROP TABLE IF EXISTS kommando skal tilføjes som første linje i loggen " +"når en tabel oprettes." #: libraries/config/messages.inc.php:422 msgid "Add DROP TABLE" -msgstr "" +msgstr "Tilføj DROP TABLE" #: libraries/config/messages.inc.php:423 msgid "" "Whether a DROP VIEW IF EXISTS statement will be added as first line to the " "log when creating a view." msgstr "" +"Om en DROP VIEW IF EXISTS kommando skal tilføjes som første linje i loggen " +"når et view oprettes." #: libraries/config/messages.inc.php:424 msgid "Add DROP VIEW" -msgstr "" +msgstr "Tilføj DROP VIEW" #: libraries/config/messages.inc.php:425 msgid "Defines the list of statements the auto-creation uses for new versions." msgstr "" +"Definerer listen af forspørgsler, som auto-creation bruger for nye sessioner." #: libraries/config/messages.inc.php:426 #, fuzzy @@ -4038,16 +4126,19 @@ msgid "" "Leave blank for no SQL query tracking support, suggested: [kbd]pma_tracking[/" "kbd]" msgstr "" +"Lades blank for ingen understøttelse af SQL-forspørgselssporing, forslag: " +"[kbd]pma_tracking[/kbd]" #: libraries/config/messages.inc.php:428 msgid "SQL query tracking table" -msgstr "" +msgstr "Sporingstabel for SQL-forespørgsler" #: libraries/config/messages.inc.php:429 msgid "" "Whether the tracking mechanism creates versions for tables and views " "automatically." msgstr "" +"Om sporingsmekanismen opretter versioner automatisk for tabeller og views." #: libraries/config/messages.inc.php:430 #, fuzzy @@ -4060,42 +4151,48 @@ msgid "" "Leave blank for no user preferences storage in database, suggested: [kbd]" "pma_config[/kbd]" msgstr "" +"Lades blank for ingen bruger preference storage i database, forslag: [kbd]" +"pma_config[/kbd]" #: libraries/config/messages.inc.php:432 msgid "User preferences storage table" -msgstr "" +msgstr "Bruger preference storage tabel" #: libraries/config/messages.inc.php:434 msgid "User for config auth" -msgstr "" +msgstr "Bruger for config auth" #: libraries/config/messages.inc.php:435 msgid "" "Disable if you know that your pma_* tables are up to date. This prevents " "compatibility checks and thereby increases performance" msgstr "" +"Deaktiver, hvis du ved at dine pma_*tables er opdaterede. Dette forhindrer " +"kompatibilitetschecks og forbedrer dermed ydelsen" #: libraries/config/messages.inc.php:436 msgid "Verbose check" -msgstr "" +msgstr "Check med ekstra information" #: libraries/config/messages.inc.php:437 msgid "" "A user-friendly description of this server. Leave blank to display the " "hostname instead." msgstr "" +"En brugervenlig beskrivelse af serveren. Lad stå tom for at vise hostnavnet " +"i stedet." #: libraries/config/messages.inc.php:438 msgid "Verbose name of this server" -msgstr "" +msgstr "Udvidet navn for denne server" #: libraries/config/messages.inc.php:439 msgid "Whether a user should be displayed a "show all (rows)" button" -msgstr "" +msgstr "Om en "vis alle (rækker)" knap, skal vises for brugeren" #: libraries/config/messages.inc.php:440 msgid "Allow to display all the rows" -msgstr "" +msgstr "Tillad visning af alle rækker" #: libraries/config/messages.inc.php:441 msgid "" @@ -4103,20 +4200,25 @@ msgid "" "authentication mode because the password is hard coded in the configuration " "file; this does not limit the ability to execute the same command directly" msgstr "" +"Bemærk, at aktivering af denne har ingen betydning i [kbd]config[/kbd] " +"autentifikationstilstand, fordi adgangskoden er fast indlagt i " +"konfigurationsfilen; dette begrænser ikke muligheden for at udføre den samme " +"kommando direkte" #: libraries/config/messages.inc.php:442 msgid "Show password change form" -msgstr "" +msgstr "Vis formular til ændring af adgangskode" #: libraries/config/messages.inc.php:443 msgid "Show create database form" -msgstr "" +msgstr "Vis formular til databaseoprettelse" #: libraries/config/messages.inc.php:444 msgid "" "Defines whether or not type fields should be initially displayed in edit/" "insert mode" msgstr "" +"Definerer om typefelter skal startes med at vises i ret/indsæt tilstand" #: libraries/config/messages.inc.php:445 #, fuzzy @@ -4126,51 +4228,55 @@ msgstr "Vis åbne tabeller" #: libraries/config/messages.inc.php:446 msgid "Display the function fields in edit/insert mode" -msgstr "" +msgstr "Vis funktionsfelterne i rediger/indsæt tilstand" #: libraries/config/messages.inc.php:447 msgid "Show function fields" -msgstr "" +msgstr "Vis funktionsfelter" #: libraries/config/messages.inc.php:448 msgid "" "Shows link to [a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] " "output" msgstr "" +"Viser link til [a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] " +"output" #: libraries/config/messages.inc.php:449 msgid "Show phpinfo() link" -msgstr "" +msgstr "Vis phpinfo() link" #: libraries/config/messages.inc.php:450 msgid "Show detailed MySQL server information" -msgstr "" +msgstr "Vis detaljeret MySQL serverinformation" #: libraries/config/messages.inc.php:451 msgid "Defines whether SQL queries generated by phpMyAdmin should be displayed" -msgstr "" +msgstr "Definerer om SQL-forespørgsler genereret af phpMyAdmin skal vises" #: libraries/config/messages.inc.php:452 msgid "Show SQL queries" -msgstr "" +msgstr "Vis SQL-forespørgsler" #: libraries/config/messages.inc.php:453 msgid "Allow to display database and table statistics (eg. space usage)" -msgstr "" +msgstr "Tillad visning af database og databasestatistikker (eks. diskforbrug)" #: libraries/config/messages.inc.php:454 msgid "Show statistics" -msgstr "" +msgstr "Vis statistik" #: libraries/config/messages.inc.php:455 msgid "" "If tooltips are enabled and a database comment is set, this will flip the " "comment and the real name" msgstr "" +"Hvis tooltips er aktiverede og en databasekommentar er sat, vil dette skifte " +"mellem kommentaren og det virkelige navn" #: libraries/config/messages.inc.php:456 msgid "Display database comment instead of its name" -msgstr "" +msgstr "Vis databasekommentar i stedet for dens navn" #: libraries/config/messages.inc.php:457 msgid "" @@ -4179,27 +4285,32 @@ msgid "" "['LeftFrameTableSeparator'] directive, so only the folder is called like the " "alias, the table name itself stays unchanged" msgstr "" +"Når denne sættes til [kbd]nested[/kbd] bruges alias for tabelnavnet kun til " +"at splitte/samle tabellerne i henhold til direktivet $cfg" +"['LeftFrameTableSeparator'], så kun mappen benævnes som aliaset; tabelnavnet " +"selv forbliver uændret." #: libraries/config/messages.inc.php:458 msgid "Display table comment instead of its name" -msgstr "" +msgstr "Vis tabelkommentar stedet for dens navn" #: libraries/config/messages.inc.php:459 msgid "Display table comments in tooltips" -msgstr "" +msgstr "Vis tabelkommentarer i tooltips" #: libraries/config/messages.inc.php:460 msgid "" "Mark used tables and make it possible to show databases with locked tables" msgstr "" +"Marker brugte tabeller og gør det muligt at vise databaser med låste tabeller" #: libraries/config/messages.inc.php:461 msgid "Skip locked tables" -msgstr "" +msgstr "Spring over låste tabeller" #: libraries/config/messages.inc.php:466 msgid "Requires SQL Validator to be enabled" -msgstr "" +msgstr "Kræver SQL Validator bliver aktiveret" #: libraries/config/messages.inc.php:468 #: libraries/display_change_password.lib.php:40 @@ -4216,45 +4327,54 @@ msgid "" "[strong]Warning:[/strong] requires PHP SOAP extension or PEAR SOAP to be " "installed" msgstr "" +"[strong]Advarsel[/strong] kræver installation af PHP SOAP udvidelsen eller " +"PEAR SOAP" #: libraries/config/messages.inc.php:470 msgid "Enable SQL Validator" -msgstr "" +msgstr "Aktiver SQL Validator" #: libraries/config/messages.inc.php:471 msgid "" "If you have a custom username, specify it here (defaults to [kbd]anonymous[/" "kbd])" msgstr "" +"Hvis du har dit eger brugernavn, så angiv det her (standard [kbd]anonymous[/" +"kbd])" #: libraries/config/messages.inc.php:472 tbl_tracking.php:405 #: tbl_tracking.php:456 msgid "Username" -msgstr "" +msgstr "Brugernavn" #: libraries/config/messages.inc.php:473 msgid "" "Suggest a database name on the "Create Database" form (if " "possible) or keep the text field empty" msgstr "" +"Foreslå et databasenavn på formularen for "Opret database" (hvis " +"muligt) eller lad feltet være tomt " #: libraries/config/messages.inc.php:474 msgid "Suggest new database name" -msgstr "" +msgstr "Foreslå nyt databasenavn" #: libraries/config/messages.inc.php:475 msgid "A warning is displayed on the main page if Suhosin is detected" -msgstr "" +msgstr "En advarsel vises på hovedsiden, hvis Suhosin er detekteret" #: libraries/config/messages.inc.php:476 msgid "Suhosin warning" -msgstr "" +msgstr "Suhosin advarsel" #: libraries/config/messages.inc.php:477 msgid "" "Textarea size (columns) in edit mode, this value will be emphasized for SQL " "query textareas (*2) and for query window (*1.25)" msgstr "" +"Tekstboksstørrelse (kolonner) i redigeringstilstand; denne værdi vil blive " +"fremhævet i SQL forespørgselstekstbokse (*2) og for forespørgselsvinduet " +"(*1,25)" #: libraries/config/messages.inc.php:478 #, fuzzy @@ -4267,18 +4387,21 @@ msgid "" "Textarea size (rows) in edit mode, this value will be emphasized for SQL " "query textareas (*2) and for query window (*1.25)" msgstr "" +"Tekstboksstørrelse (rækker) i redigeringstilstand; denne værdi vil blive " +"fremhævet i SQL forespørgselstekstbokse (*2) og for forespørgselsvinduet " +"(*1,25)" #: libraries/config/messages.inc.php:480 msgid "Textarea rows" -msgstr "" +msgstr "Tekstboks rækker" #: libraries/config/messages.inc.php:481 msgid "Title of browser window when a database is selected" -msgstr "" +msgstr "Titel på browservindue, når en database er valgt" #: libraries/config/messages.inc.php:483 msgid "Title of browser window when nothing is selected" -msgstr "" +msgstr "Titel på browservindue, når ingenting er valgt" #: libraries/config/messages.inc.php:484 #, fuzzy @@ -4288,11 +4411,11 @@ msgstr "Standardværdi" #: libraries/config/messages.inc.php:485 msgid "Title of browser window when a server is selected" -msgstr "" +msgstr "Titel på browservindue, når en server er valgt" #: libraries/config/messages.inc.php:487 msgid "Title of browser window when a table is selected" -msgstr "" +msgstr "Titel på browservindue, når en tabel er valgt" #: libraries/config/messages.inc.php:489 msgid "" @@ -4301,36 +4424,42 @@ msgid "" "For) header coming from the proxy 1.2.3.4:[br][kbd]1.2.3.4: " "HTTP_X_FORWARDED_FOR[/kbd]" msgstr "" +"Indtast proxies som [kbd]IP: trusted HTTP header[/kbd]. Det følgende " +"eksempel angiver, at phpMyAdmin skulle stole på en HTTP_X_FORWARDED_FOR (X-" +"Forwarded-For) header der kommer fra proxy 1.2.3.4:[br][kbd]1.2.3.4: " +"HTTP_X_FORWARDED_FOR[/kbd]" #: libraries/config/messages.inc.php:490 msgid "List of trusted proxies for IP allow/deny" -msgstr "" +msgstr "Liste af trusted proxies til IP tillad/afvis" #: libraries/config/messages.inc.php:491 msgid "Directory on server where you can upload files for import" -msgstr "" +msgstr "Mappe på server, hvor man kan uploade filer til import" #: libraries/config/messages.inc.php:492 msgid "Upload directory" -msgstr "" +msgstr "Mappe til uploads" #: libraries/config/messages.inc.php:493 msgid "Allow for searching inside the entire database" -msgstr "" +msgstr "Tillad søgning i hele databasen" #: libraries/config/messages.inc.php:494 msgid "Use database search" -msgstr "" +msgstr "Brug databasesøgning" #: libraries/config/messages.inc.php:495 msgid "" "When disabled, users cannot set any of the options below, regardless of the " "checkbox on the right" msgstr "" +"Når deaktiveret kan brugere ikke sætte nogen af indstillingerne nedenfor " +"uafhængig af checkboksen til højre" #: libraries/config/messages.inc.php:496 msgid "Enable the Developer tab in settings" -msgstr "" +msgstr "Aktiver udviklerfanen i indstillinger" #: libraries/config/messages.inc.php:497 msgid "" @@ -4338,18 +4467,21 @@ msgid "" "libraries/import.lib.php for defaults on how many queries a statement may " "contain." msgstr "" +"Vis berørte rækker for hver forespørgsel på multisætninger. Se libraries/" +"import.lib.php for standard for hvor mange forespørgsler en sætning må " +"indeholde." #: libraries/config/messages.inc.php:498 msgid "Verbose multiple statements" -msgstr "" +msgstr "Udvidet info for multiple forespørgsler" #: libraries/config/messages.inc.php:499 setup/frames/index.inc.php:229 msgid "Check for latest version" -msgstr "" +msgstr "Check for den seneste version" #: libraries/config/messages.inc.php:500 msgid "Enables check for latest version on main phpMyAdmin page" -msgstr "" +msgstr "Aktiverer check for den seneste version på hovedsiden for phpMyAdmin" #: libraries/config/messages.inc.php:501 setup/lib/index.lib.php:118 #: setup/lib/index.lib.php:125 setup/lib/index.lib.php:142 @@ -4357,33 +4489,35 @@ msgstr "" #: setup/lib/index.lib.php:161 setup/lib/index.lib.php:164 #: setup/lib/index.lib.php:200 msgid "Version check" -msgstr "" +msgstr "Versionscheck" #: libraries/config/messages.inc.php:502 msgid "" "Enable [a@http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression " "for import and export operations" msgstr "" +"Aktiver [a@http://en.wikipedia.org/wiki/ZIP_(fil_format)]ZIP[/a] " +"komprimering ved import and eksport operationer" #: libraries/config/messages.inc.php:503 msgid "ZIP" -msgstr "" +msgstr "ZIP" #: libraries/config/setup.forms.php:41 msgid "Config authentication" -msgstr "" +msgstr "Config autentifikation" #: libraries/config/setup.forms.php:45 msgid "Cookie authentication" -msgstr "" +msgstr "Cookie autentifikation" #: libraries/config/setup.forms.php:48 msgid "HTTP authentication" -msgstr "" +msgstr "HTTP autentifikation" #: libraries/config/setup.forms.php:51 msgid "Signon authentication" -msgstr "" +msgstr "Login autentifikation" #: libraries/config/setup.forms.php:240 #: libraries/config/user_preferences.forms.php:144 libraries/import/ldi.php:34 @@ -4395,14 +4529,14 @@ msgstr "CSV vha. LOAD DATA" #: libraries/config/user_preferences.forms.php:245 libraries/export/xls.php:17 #: libraries/import/xls.php:20 msgid "Excel 97-2003 XLS Workbook" -msgstr "" +msgstr "Excel 97-2003 XLS Workbook" #: libraries/config/setup.forms.php:252 libraries/config/setup.forms.php:347 #: libraries/config/user_preferences.forms.php:155 #: libraries/config/user_preferences.forms.php:249 #: libraries/export/xlsx.php:17 libraries/import/xlsx.php:20 msgid "Excel 2007 XLSX Workbook" -msgstr "" +msgstr "Excel 2007 XLSX Workbook" #: libraries/config/setup.forms.php:255 libraries/config/setup.forms.php:356 #: libraries/config/user_preferences.forms.php:158 @@ -4414,12 +4548,12 @@ msgstr "Open Document regneark" #: libraries/config/setup.forms.php:262 #: libraries/config/user_preferences.forms.php:165 msgid "Quick" -msgstr "" +msgstr "Hurtig" #: libraries/config/setup.forms.php:266 #: libraries/config/user_preferences.forms.php:169 msgid "Custom" -msgstr "" +msgstr "Brugerdefineret" #: libraries/config/setup.forms.php:287 #: libraries/config/user_preferences.forms.php:189 @@ -4447,32 +4581,32 @@ msgstr "Open Document tekst" #: libraries/config/validate.lib.php:202 libraries/config/validate.lib.php:209 msgid "Could not connect to MySQL server" -msgstr "" +msgstr "Kunne ikke forbinde til MySQL server" #: libraries/config/validate.lib.php:234 msgid "Empty username while using config authentication method" -msgstr "" +msgstr "Tomt brugernavn ved brug af config autentifikation" #: libraries/config/validate.lib.php:238 msgid "Empty signon session name while using signon authentication method" -msgstr "" +msgstr "Tomt signon sessionsnavn ved brug af signon autentifikation" #: libraries/config/validate.lib.php:242 msgid "Empty signon URL while using signon authentication method" -msgstr "" +msgstr "Tomt signon URL ved brug af signon autentifikation" #: libraries/config/validate.lib.php:276 msgid "Empty phpMyAdmin control user while using pmadb" -msgstr "" +msgstr "Tom phpMyAdmin kontrolbruger ved brug af pmadb" #: libraries/config/validate.lib.php:280 msgid "Empty phpMyAdmin control user password while using pmadb" -msgstr "" +msgstr "Tom phpMyAdmin adgangskode for kontrolbruger ved brug af pmadb" #: libraries/config/validate.lib.php:367 #, php-format msgid "Incorrect IP address: %s" -msgstr "" +msgstr "Ukorrekt IP-adresse: %s" #. l10n: Language to use for PHP documentation, please use only languages which do exist in official documentation. #: libraries/core.lib.php:264 @@ -4483,12 +4617,12 @@ msgstr "en" #: libraries/core.lib.php:278 #, php-format msgid "The %s extension is missing. Please check your PHP configuration." -msgstr "" +msgstr "%s udvidelsen mangler. Check din PHP-konfiguration." #: libraries/db_events.inc.php:14 libraries/db_events.inc.php:16 #: libraries/export/sql.php:493 msgid "Events" -msgstr "" +msgstr "Hændelser" #: libraries/db_events.inc.php:24 libraries/db_routines.inc.php:35 #: libraries/display_create_table.lib.php:51 libraries/tbl_triggers.lib.php:26 @@ -4504,7 +4638,7 @@ msgstr "Database ser ud til at være tom!" #: libraries/db_links.inc.php:66 libraries/relation.lib.php:143 #: libraries/tbl_links.inc.php:90 msgid "Tracking" -msgstr "" +msgstr "Sporing" #: libraries/db_links.inc.php:71 msgid "Query" @@ -4550,7 +4684,7 @@ msgstr "(eller den lokale MySQL servers socket er ikke korrekt konfigureret)" #: libraries/dbi/mysql.dbi.lib.php:370 msgid "Details..." -msgstr "" +msgstr "Detaljer..." #: libraries/display_change_password.lib.php:29 main.php:94 #: user_password.php:119 user_password.php:137 @@ -4633,11 +4767,11 @@ msgstr "Eksporttype" #: libraries/display_export.lib.php:113 msgid "Quick - display only the minimal options" -msgstr "" +msgstr "Hurtig - vis kun de minimale indstillinger" #: libraries/display_export.lib.php:129 msgid "Custom - display all possible options" -msgstr "" +msgstr "Brugerdefineret - vis alle indstillinger" #: libraries/display_export.lib.php:137 #, fuzzy @@ -4659,7 +4793,7 @@ msgstr "Rækker" #: libraries/display_export.lib.php:157 msgid "Dump some row(s)" -msgstr "" +msgstr "Hent nogle række(r)" #: libraries/display_export.lib.php:159 #, fuzzy @@ -4669,15 +4803,15 @@ msgstr "Antal felter" #: libraries/display_export.lib.php:162 msgid "Row to begin at:" -msgstr "" +msgstr "Begyndelsesrække:" #: libraries/display_export.lib.php:173 msgid "Dump all rows" -msgstr "" +msgstr "Hent alle rækker" #: libraries/display_export.lib.php:181 libraries/display_export.lib.php:202 msgid "Output:" -msgstr "" +msgstr "Output:" #: libraries/display_export.lib.php:188 libraries/display_export.lib.php:214 #, fuzzy, php-format @@ -4699,15 +4833,15 @@ msgstr "Skabelon for filnavn" #: libraries/display_export.lib.php:229 msgid "@SERVER@ will become the server name" -msgstr "" +msgstr "@SERVER@ vil blive servernavnet" #: libraries/display_export.lib.php:231 msgid ", @DATABASE@ will become the database name" -msgstr "" +msgstr ", @DATABASE@ vil blive databasenavnet" #: libraries/display_export.lib.php:233 msgid ", @TABLE@ will become the table name" -msgstr "" +msgstr ", @TABLE@ vil blive tabelnavnet" #: libraries/display_export.lib.php:237 #, fuzzy, php-format @@ -4726,7 +4860,7 @@ msgstr "" #: libraries/display_export.lib.php:275 msgid "use this for future exports" -msgstr "" +msgstr "brug dette til fremtidige eksports" #: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188 #: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:516 @@ -4787,10 +4921,12 @@ msgid "" "Scroll down to fill in the options for the selected format and ignore the " "options for other formats." msgstr "" +"Rul ned for at udfylde indstillingerne for det valgte format og ignorer " +"indstillingerne for andre formater." #: libraries/display_export.lib.php:347 libraries/display_import.lib.php:260 msgid "Encoding Conversion:" -msgstr "" +msgstr "Inkodningskonvertering" #: libraries/display_import.lib.php:66 msgid "" @@ -4798,16 +4934,20 @@ msgid "" "this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) " "browsers." msgstr "" +"Filen som uploades er sandsynligvis større enn den maksimalt tilladte " +"størrelse, eller dette er en kendt fejl i webkit-baserede browsere (Safari, " +"Google Chrome, Arora etc.) " #: libraries/display_import.lib.php:76 msgid "The file is being processed, please be patient." -msgstr "" +msgstr "Filen behandles, vær tålmodig." #: libraries/display_import.lib.php:98 msgid "" "Please be patient, the file is being uploaded. Details about the upload are " "not available." msgstr "" +"Vær tålmodig; filen uploades. Detaljer om uploaden er ikke tilgængelige." #: libraries/display_import.lib.php:129 #, fuzzy @@ -4836,13 +4976,15 @@ msgstr "Fil til import" #: libraries/display_import.lib.php:156 #, php-format msgid "File may be compressed (%s) or uncompressed." -msgstr "" +msgstr "Filen kan være komprimeret (%s) eller ukomprimeret." #: libraries/display_import.lib.php:158 msgid "" "A compressed file's name must end in <b>.[format].[compression]</b>. " "Example: <b>.sql.zip</b>" msgstr "" +"En komprimeret fil skal slutte med <b>.[format].[compression]</b>. Eksempel: " +"<b>.sql.zip</b>" #: libraries/display_import.lib.php:178 msgid "File uploads are not allowed on this server." @@ -4885,7 +5027,7 @@ msgstr "Antal poster (queries) der skal springes over fra start" #: libraries/display_import.lib.php:250 msgid "Format-Specific Options:" -msgstr "" +msgstr "Formatspecifikke indstillinger:" #: libraries/display_select_lang.lib.php:44 #: libraries/display_select_lang.lib.php:45 setup/frames/index.inc.php:71 @@ -4956,7 +5098,7 @@ msgstr "Komplette tekster" #: libraries/display_tbl.lib.php:578 msgid "Relational key" -msgstr "" +msgstr "Relationel nøgle" #: libraries/display_tbl.lib.php:579 #, fuzzy @@ -4966,11 +5108,11 @@ msgstr "Relationel skematik" #: libraries/display_tbl.lib.php:586 msgid "Show binary contents" -msgstr "" +msgstr "Vis binært indhold" #: libraries/display_tbl.lib.php:588 msgid "Show BLOB contents" -msgstr "" +msgstr "Vis indhold af BLOB" #: libraries/display_tbl.lib.php:598 libraries/relation.lib.php:123 #: libraries/tbl_properties.inc.php:142 transformation_overview.php:46 @@ -4979,7 +5121,7 @@ msgstr "Browser transformation" #: libraries/display_tbl.lib.php:1194 msgid "Copy" -msgstr "" +msgstr "Kopi" #: libraries/display_tbl.lib.php:1209 libraries/display_tbl.lib.php:1221 msgid "The row has been deleted" @@ -5222,26 +5364,30 @@ msgstr "" #: libraries/engines/pbms.lib.php:30 msgid "Garbage Threshold" -msgstr "" +msgstr "Tærskel for garbage " #: libraries/engines/pbms.lib.php:31 msgid "The percentage of garbage in a repository file before it is compacted." msgstr "" +"Procentdelen af utilgængelige data i en repositoryfil, før den bliver " +"komprimeret." #: libraries/engines/pbms.lib.php:35 libraries/replication_gui.lib.php:69 #: server_synchronize.php:1178 msgid "Port" -msgstr "" +msgstr "Port" #: libraries/engines/pbms.lib.php:36 msgid "" "The port for the PBMS stream-based communications. Setting this value to 0 " "will disable HTTP communication with the daemon." msgstr "" +"Porten for PBMS stream-baseret kommunikation. Sættes denne værdi til 0 vil " +"HTTP-kommunikation med dæmonen deaktiveres. " #: libraries/engines/pbms.lib.php:40 msgid "Repository Threshold" -msgstr "" +msgstr "Tærskel for repository" #: libraries/engines/pbms.lib.php:41 msgid "" @@ -5249,20 +5395,25 @@ msgid "" "indicate the unit of the value. A value in bytes is assumed when no unit is " "specified." msgstr "" +"Den maksimale størrelse af en BLOB repositoryfil. Du kan bruge Kb, MB eller " +"GB for at angive værdiens enhed. En værdi i bytes antages, når ingen enhed " +"angives" #: libraries/engines/pbms.lib.php:45 msgid "Temp Blob Timeout" -msgstr "" +msgstr "Timeout for midlertidig Blob" #: libraries/engines/pbms.lib.php:46 msgid "" "The timeout, in seconds, for temporary BLOBs. Uploaded BLOB data is removed " "after this time, unless they are referenced by a record in the database." msgstr "" +"Timeout i sekunder for midlertidige BLOBs. Uploaded BLOB data fjernes efter " +"denne tid medmindre de refereres af en post i databasen." #: libraries/engines/pbms.lib.php:50 msgid "Temp Log Threshold" -msgstr "" +msgstr "Tærskel for midlertidig log" #: libraries/engines/pbms.lib.php:51 msgid "" @@ -5270,26 +5421,33 @@ msgid "" "indicate the unit of the value. A value in bytes is assumed when no unit is " "specified." msgstr "" +"Den maksimale størrelse af en midlertidig BLOB logfil. Du kan bruge Kb, MB " +"eller GB for at angive værdiens enhed. En værdi i bytes antages, når ingen " +"enhed angives" #: libraries/engines/pbms.lib.php:55 msgid "Max Keep Alive" -msgstr "" +msgstr "Maks. Keep Alive" #: libraries/engines/pbms.lib.php:56 msgid "" "The timeout for inactive connection with the keep-alive flag set. After this " "time the connection will be closed. The time-out is in milliseconds (1/1000)." msgstr "" +"Timeout for inaktive forbindelser med keep-alive flag sat. Efter denne tid " +"vil forbindelsen blive lukket. Timeout er i millisekunder (1/1000)." #: libraries/engines/pbms.lib.php:60 msgid "Metadata Headers" -msgstr "" +msgstr "Metadata headers" #: libraries/engines/pbms.lib.php:61 msgid "" "A \":\" delimited list of metadata headers to be used to initialize the " "pbms_metadata_header table when a database is created." msgstr "" +"En \":\"-adskilt liste af metadata headers brugt til at initialisere " +"tabellen pbms_metadata_header, når en database oprettes." #: libraries/engines/pbms.lib.php:94 #, php-format @@ -5297,6 +5455,8 @@ msgid "" "Documentation and further information about PBMS can be found on %sThe " "PrimeBase Media Streaming home page%s." msgstr "" +"Dokumentation og yderligere information om PBMS kan findes på %sThe " +"PrimeBase Media Streaming hjemmeside%s." #: libraries/engines/pbms.lib.php:96 libraries/engines/pbxt.lib.php:127 #, fuzzy @@ -5306,25 +5466,28 @@ msgstr "Relationer" #: libraries/engines/pbms.lib.php:98 msgid "The PrimeBase Media Streaming Blog by Barry Leslie" -msgstr "" +msgstr "The PrimeBase Media Streaming Blog af Barry Leslie" #: libraries/engines/pbms.lib.php:99 msgid "PrimeBase XT Home Page" -msgstr "" +msgstr "PrimeBase XT hjemmeside" #: libraries/engines/pbxt.lib.php:22 msgid "Index cache size" -msgstr "" +msgstr "Størrelse af indexcache" #: libraries/engines/pbxt.lib.php:23 msgid "" "This is the amount of memory allocated to the index cache. Default value is " "32MB. The memory allocated here is used only for caching index pages." msgstr "" +"Dette er mængden af hukommelse allokeret til mellemlageret for indeks. " +"Standardværdien er 32MB. Hukommelsen allokeret her bruges kun til at cache " +"indekssider." #: libraries/engines/pbxt.lib.php:27 msgid "Record cache size" -msgstr "" +msgstr "Størrelse af postcache" #: libraries/engines/pbxt.lib.php:28 msgid "" @@ -5332,50 +5495,61 @@ msgid "" "table data. The default value is 32MB. This memory is used to cache changes " "to the handle data (.xtd) and row pointer (.xtr) files." msgstr "" +"Dette er mængden af hukommelse allokeret til mellemlageret for poster brugt " +"til at cache tabeldata. Standardværdien er 32MB. Denne hukommelse bruges til " +"at cache ændringer til handle data (.xtd) og rækkepointer (.xtr) filer." #: libraries/engines/pbxt.lib.php:32 msgid "Log cache size" -msgstr "" +msgstr "Størrelse af logcache" #: libraries/engines/pbxt.lib.php:33 msgid "" "The amount of memory allocated to the transaction log cache used to cache on " "transaction log data. The default is 16MB." msgstr "" +"Mængden af hukommelse allokeret til mellemlageret for transaktionslogdata. " +"Standard er 16MB" #: libraries/engines/pbxt.lib.php:37 msgid "Log file threshold" -msgstr "" +msgstr "Tærskel for logfil" #: libraries/engines/pbxt.lib.php:38 msgid "" "The size of a transaction log before rollover, and a new log is created. The " "default value is 16MB." msgstr "" +"Størrelsen af en transajktionslog før den ruller over og en ny log oprettes. " +"Standardværdien er 16MB" #: libraries/engines/pbxt.lib.php:42 msgid "Transaction buffer size" -msgstr "" +msgstr "Størrelse af transaktionsbuffer" #: libraries/engines/pbxt.lib.php:43 msgid "" "The size of the global transaction log buffer (the engine allocates 2 " "buffers of this size). The default is 1MB." msgstr "" +"Størrelsen af den globale transaktionslogbuffer (der allokeres 2 buffere af " +"denne størrelse). Standard er 1MB." #: libraries/engines/pbxt.lib.php:47 msgid "Checkpoint frequency" -msgstr "" +msgstr "Checkpoint frekvens" #: libraries/engines/pbxt.lib.php:48 msgid "" "The amount of data written to the transaction log before a checkpoint is " "performed. The default value is 24MB." msgstr "" +"Mængden af data skrevet til transaktionsloggen før et checkpoint udføres. " +"Standardværdien er 24MB." #: libraries/engines/pbxt.lib.php:52 msgid "Data log threshold" -msgstr "" +msgstr "Tærskel for datalog" #: libraries/engines/pbxt.lib.php:53 msgid "" @@ -5384,20 +5558,26 @@ msgid "" "value of this variable can be increased to increase the total amount of data " "that can be stored in the database." msgstr "" +"Den maksimale størrelse af en datalogfil. Standardværdien er 64MB. PBXT kan " +"oprette maksimalt 32000 datalogs, som bruges af alle tabeller. Så værdien af " +"denne variabel kan øges for at øge den totale mængde af data, der kan lagres " +"i databasen." #: libraries/engines/pbxt.lib.php:57 msgid "Garbage threshold" -msgstr "" +msgstr "Tærskel for garbage" #: libraries/engines/pbxt.lib.php:58 msgid "" "The percentage of garbage in a data log file before it is compacted. This is " "a value between 1 and 99. The default is 50." msgstr "" +"Procentdelen af utilgængelige data i en datalogfil før den komprimeres. " +"Dette er en værdi mellem 1 og 99. Standard er 50." #: libraries/engines/pbxt.lib.php:62 msgid "Log buffer size" -msgstr "" +msgstr "Størrelse af logbuffer" #: libraries/engines/pbxt.lib.php:63 msgid "" @@ -5405,26 +5585,28 @@ msgid "" "The engine allocates one buffer per thread, but only if the thread is " "required to write a data log." msgstr "" +"Størrelsen af bufferen for en datalogfil. Standard er 256MB. Der allokeres " +"en buffer per tråd, men kun hvis tråden skal skrive en datalog." #: libraries/engines/pbxt.lib.php:67 msgid "Data file grow size" -msgstr "" +msgstr "Voksestørrelse for datafil" #: libraries/engines/pbxt.lib.php:68 msgid "The grow size of the handle data (.xtd) files." -msgstr "" +msgstr "Voksestørrelsen af handle data filer (.xtd)." #: libraries/engines/pbxt.lib.php:72 msgid "Row file grow size" -msgstr "" +msgstr "Voksestørrelsen af rækkefil" #: libraries/engines/pbxt.lib.php:73 msgid "The grow size of the row pointer (.xtr) files." -msgstr "" +msgstr "Voksestørrelsen af rækkepointerfiler (.xtr)" #: libraries/engines/pbxt.lib.php:77 msgid "Log file count" -msgstr "" +msgstr "Logfilantal" #: libraries/engines/pbxt.lib.php:78 msgid "" @@ -5433,6 +5615,9 @@ msgid "" "will be deleted, otherwise they are renamed and given the next highest " "number." msgstr "" +"Dette er antal transaktionslogfiler (pbxt/system/xlog*.xt), som systemet " +"vedligeholder.Hvis antallet af logs overstiger denne værdi vil gamle logs " +"blive slettede eller er de omdøbt og give det næste højere nummer." #: libraries/engines/pbxt.lib.php:125 #, php-format @@ -5440,14 +5625,16 @@ msgid "" "Documentation and further information about PBXT can be found on the " "%sPrimeBase XT Home Page%s." msgstr "" +"Dokumentation og yderliger information om PBXT kan findes på %sPrimeBase XT " +"hjemmeside%s" #: libraries/engines/pbxt.lib.php:129 msgid "The PrimeBase XT Blog by Paul McCullagh" -msgstr "" +msgstr "The PrimeBase XT Blog by Paul McCullagh" #: libraries/engines/pbxt.lib.php:130 msgid "The PrimeBase Media Streaming (PBMS) home page" -msgstr "" +msgstr "The PrimeBase Media Streaming (PBMS) hjemmeside" #: libraries/export/csv.php:21 libraries/import/csv.php:27 #, fuzzy @@ -5484,7 +5671,7 @@ msgstr "Erstat NULL med" #: libraries/export/csv.php:26 libraries/export/excel.php:23 msgid "Remove carriage return/line feed characters within columns" -msgstr "" +msgstr "Fjern vognretur/linjeskiftstegn i kolonnedata" #: libraries/export/excel.php:32 #, fuzzy @@ -5583,7 +5770,7 @@ msgstr "PHP-version" #: libraries/export/mediawiki.php:15 msgid "MediaWiki Table" -msgstr "" +msgstr "MediaWiki tabel" #: libraries/export/pdf.php:17 msgid "PDF" @@ -5601,13 +5788,15 @@ msgstr "Rapporttitel" #: libraries/export/php_array.php:16 msgid "PHP array" -msgstr "" +msgstr "PHP array" #: libraries/export/sql.php:33 msgid "" "Display comments <i>(includes info such as export timestamp, PHP version, " "and server version)</i>" msgstr "" +"Vis kommentarer <i>(inkluderer info som eksport tidsstempel, PHP version og " +"serverversion)</i>" #: libraries/export/sql.php:35 #, fuzzy @@ -5620,11 +5809,15 @@ msgid "" "Include a timestamp of when databases were created, last updated, and last " "checked" msgstr "" +"Inkluder et tidsstempel for hvornår databaser blev oprettet, sidst opdateret " +"og sidst checket" #: libraries/export/sql.php:65 msgid "" "Database system or older MySQL server to maximize output compatibility with:" msgstr "" +"Databasesystem eller ældre MYSQL server til maksimering af kompatibiltet af " +"output:" #: libraries/export/sql.php:72 libraries/export/sql.php:105 #: libraries/export/sql.php:107 @@ -5648,26 +5841,28 @@ msgid "" "Enclose table and field names with backquotes <i>(Protects field and table " "names formed with special characters or keywords)</i>" msgstr "" +"Omgiv tabel- og feltnavne med backquotes <i>(Beskytter felt- og tabelnavne " +"indeholdende specielle tegn og nøgleord)</i>" #: libraries/export/sql.php:136 msgid "Instead of <code>INSERT</code> statements, use:" -msgstr "" +msgstr "I stedet for <code>INSERT</code> forespørgsler, brug:" #: libraries/export/sql.php:138 msgid "<code>INSERT DELAYED</code> statements" -msgstr "" +msgstr "<code>INSERT DELAYED</code> forespørgsler" #: libraries/export/sql.php:140 msgid "<code>INSERT IGNORE</code> statements" -msgstr "" +msgstr "<code>INSERT IGNORE</code> forspørgsler" #: libraries/export/sql.php:147 msgid "Function to use when dumping data:" -msgstr "" +msgstr "Funktioner der bruges, når data udtrækkes:" #: libraries/export/sql.php:151 msgid "Syntax to use when inserting data:" -msgstr "" +msgstr "Syntaks der bruges, når data indsættes:" #: libraries/export/sql.php:154 msgid "" @@ -5675,6 +5870,9 @@ msgid "" "    Example: <code>INSERT INTO tbl_name (col_A,col_B,col_C) VALUES " "(1,2,3)</code>" msgstr "" +"inkluder kolonnenavne i hver <code>INSERT</code> forespørgsel <br />   " +"    Eksempel: <code>INSERT INTO tbl_name (col_A,col_B,col_C) " +"VALUES (1,2,3)</code>" #: libraries/export/sql.php:155 msgid "" @@ -5682,30 +5880,41 @@ msgid "" "    Example: <code>INSERT INTO tbl_name VALUES (1,2,3), (4,5,6), " "(7,8,9)</code>" msgstr "" +"indsæt flere rækker i hver <code>INSERT</code> forespørgsel<br />   " +"    Eksempel: <code>INSERT INTO tbl_name VALUES (1,2,3), (4,5,6), " +"(7,8,9)</code>" #: libraries/export/sql.php:156 msgid "" "both of the above<br />       Example: <code>INSERT INTO " "tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), (7,8,9)</code>" msgstr "" +"begge af ovenstående<br />       Eksempel: <code>INSERT INTO " +"tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), (7,8,9)</code>" #: libraries/export/sql.php:157 msgid "" "neither of the above<br />       Example: <code>INSERT INTO " "tbl_name VALUES (1,2,3)</code>" msgstr "" +"ingen af ovenstående<br />       Eksempel: <code>INSERT INTO " +"tbl_name VALUES (1,2,3)</code>" #: libraries/export/sql.php:167 msgid "" "Dump binary columns in hexadecimal notation <i>(for example, \"abc\" becomes " "0x616263)</i>" msgstr "" +"Udtræk binære kolonner i hexadecimal notation <i>(fx, \"abc\" becomes " +"0x616263)</i>" #: libraries/export/sql.php:171 msgid "" "Dump TIMESTAMP columns in UTC <i>(enables TIMESTAMP columns to be dumped and " "reloaded between servers in different time zones)</i>" msgstr "" +"Udtræk TIMESTAMP kolonner i UTC <i>(gør at TIMESTAMP kolonner kan udtrækkes " +"og indsættes i servere på tværs af tidszoner)</i>" #: libraries/export/sql.php:209 libraries/export/xml.php:34 msgid "Procedures" @@ -5734,7 +5943,7 @@ msgstr "RELATIONS FOR TABLE (Relationer for tabellen)" #: libraries/export/sql.php:873 libraries/export/xml.php:38 #: libraries/tbl_triggers.lib.php:18 msgid "Triggers" -msgstr "" +msgstr "Triggers" #: libraries/export/sql.php:885 msgid "Structure for view" @@ -5750,7 +5959,7 @@ msgstr "XML" #: libraries/export/xml.php:30 msgid "Object creation options (all are recommended)" -msgstr "" +msgstr "Indstillinger for oprettelse af objekter (alle anbefales)" #: libraries/export/xml.php:40 #, fuzzy @@ -5760,7 +5969,7 @@ msgstr "Visning" #: libraries/export/xml.php:47 msgid "Export contents" -msgstr "" +msgstr "Eksport indhold" #: libraries/footer.inc.php:188 libraries/footer.inc.php:191 #: libraries/footer.inc.php:194 @@ -5783,36 +5992,37 @@ msgstr "MySQL returnerede ingen data (fx ingen rækker)." #: libraries/import.lib.php:1141 msgid "" "The following structures have either been created or altered. Here you can:" -msgstr "" +msgstr "De følgende strukturer er enten oprettet eller ændret. Her kan du: " #: libraries/import.lib.php:1142 msgid "View a structure`s contents by clicking on its name" -msgstr "" +msgstr "Vis en strukturs indhold ved at klikke på dens navn" #: libraries/import.lib.php:1143 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" +"Ændr alle indstillinger ved at klikke på det tilhørende \"Indstilling\" link" #: libraries/import.lib.php:1144 msgid "Edit its structure by following the \"Structure\" link" -msgstr "" +msgstr "Rediger dens struktur ved at følge linket \"Struktur\"" #: libraries/import.lib.php:1147 msgid "Go to database" -msgstr "" +msgstr "Gå til database" #: libraries/import.lib.php:1150 libraries/import.lib.php:1174 msgid "settings" -msgstr "" +msgstr "indstillinger" #: libraries/import.lib.php:1169 msgid "Go to table" -msgstr "" +msgstr "Gå til tabel" #: libraries/import.lib.php:1178 msgid "Go to view" -msgstr "" +msgstr "Gå til view" #: libraries/import/csv.php:37 libraries/import/ods.php:26 #: libraries/import/xls.php:24 libraries/import/xlsx.php:24 @@ -5820,6 +6030,8 @@ msgid "" "The first line of the file contains the table column names <i>(if this is " "unchecked, the first line will become part of the data)</i>" msgstr "" +"Den første linje af filen indeholder tabellens kolonnenavne <i>(hvis der " +"ikke er flueben her, vil den første linje være en datalinje)</i>" #: libraries/import/csv.php:39 msgid "" @@ -5827,6 +6039,9 @@ msgid "" "database, list the corresponding column names here. Column names must be " "separated by commas and not enclosed in quotations." msgstr "" +"Hvis data i hver række af filen ikke er i samme rækkefølge som i databasen, " +"så list de tilsvarende kolonnenavne her. Kolonnenavne skal adskilles med " +"komma og må ikke være i citationstegn." #: libraries/import/csv.php:41 #, fuzzy @@ -5846,6 +6061,8 @@ msgid "" "Invalid column (%s) specified! Ensure that columns names are spelled " "correctly, separated by commas, and not enclosed in quotes." msgstr "" +"Invalid kolonne (%s) angivet! Sørg for, at kolonnenavneer stavet korrekt, " +"adskilt med komma og ikke i citationstegn." #: libraries/import/csv.php:189 libraries/import/csv.php:436 #, php-format @@ -5878,11 +6095,11 @@ msgstr "Denne plugin understøtter ikke komprimeret import!" #: libraries/import/ods.php:28 msgid "Import percentages as proper decimals <i>(ex. 12.00% to .12)</i>" -msgstr "" +msgstr "Importer procenter som rigtige decimaltal <i>(ex. 12.00% to .12)</i>" #: libraries/import/ods.php:29 msgid "Import currencies <i>(ex. $5.00 to 5.00)</i>" -msgstr "" +msgstr "Import valutaer <i>(ex. $5.00 to 5.00)</i>" #: libraries/import/sql.php:32 #, fuzzy @@ -5892,13 +6109,15 @@ msgstr "SQL-kompatibilitetsmodus" #: libraries/import/sql.php:42 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values" -msgstr "" +msgstr "Brug ikke <code>AUTO_INCREMENT</code> for nulværdier" #: libraries/import/xml.php:74 libraries/import/xml.php:130 msgid "" "The XML file specified was either malformed or incomplete. Please correct " "the issue and try again." msgstr "" +"Den angivne XML-fil var enten forkert udformet eller ukomplet. Ret fejlen og " +"prøv igen. " #: libraries/kanji-encoding.lib.php:142 #, fuzzy @@ -5910,7 +6129,7 @@ msgstr "Ingen" #. l10n: This is currently used only in Japanese locales #: libraries/kanji-encoding.lib.php:148 msgid "Convert to Kana" -msgstr "" +msgstr "Konverter til Kana" #: libraries/mult_submits.inc.php:419 tbl_replace.php:331 msgid "No change" @@ -6123,7 +6342,7 @@ msgstr "Log af" #: libraries/navigation_header.inc.php:112 #: libraries/navigation_header.inc.php:114 msgid "Reload navigation frame" -msgstr "" +msgstr "Genindlæs navigationsramme" #: libraries/plugin_interface.lib.php:336 #, fuzzy @@ -6173,30 +6392,34 @@ msgstr "SQL-historik" #: libraries/relation.lib.php:147 msgid "User preferences" -msgstr "" +msgstr "Brugerpræferencer" #: libraries/relation.lib.php:151 msgid "Quick steps to setup advanced features:" -msgstr "" +msgstr "Hurtige trin for at opsætte avancerede muligheder:" #: libraries/relation.lib.php:153 msgid "" "Create the needed tables with the <code>script/create_tables.sql</code>." msgstr "" +"Opret de nødvendige tabeller med <code>script/create_tables.sql</code>." #: libraries/relation.lib.php:154 msgid "Create a pma user and give access to these tables." -msgstr "" +msgstr "Opret en pma bruger og giv adgang til disse tabeller." #: libraries/relation.lib.php:155 msgid "" "Enable advanced features in configuration file (<code>config.inc.php</" "code>), for example by starting from <code>config.sample.inc.php</code>." msgstr "" +"Aktiver avancerede muligheder i konfigurationfilen (<code>config.inc.php</" +"code>), fx ved at starte med <code>config.sample.inc.php</code>." #: libraries/relation.lib.php:156 msgid "Re-login to phpMyAdmin to load the updated configuration file." msgstr "" +"Re-login til phpMyAdmin for at indlæse den opdaterede konfigurationsfil." #: libraries/relation.lib.php:1175 msgid "no description" @@ -6204,17 +6427,19 @@ msgstr "ingen beskrivelse" #: libraries/replication_gui.lib.php:53 msgid "Slave configuration" -msgstr "" +msgstr "Slavekonfiguration" #: libraries/replication_gui.lib.php:53 server_replication.php:353 msgid "Change or reconfigure master server" -msgstr "" +msgstr "Ændr eller rekonfigurer master server" #: libraries/replication_gui.lib.php:54 msgid "" "Make sure, you have unique server-id in your configuration file (my.cnf). If " "not, please add the following line into [mysqld] section:" msgstr "" +"Vær sikker på, du har en unik server-id i din konfigurationsfil (my.cnf). " +"Hvis ikke, så prøv at indsætte følgende linje i [mysqld] sektionen:" #: libraries/replication_gui.lib.php:57 libraries/replication_gui.lib.php:58 #: libraries/replication_gui.lib.php:251 libraries/replication_gui.lib.php:254 @@ -6226,11 +6451,11 @@ msgstr "Brugernavn" #: libraries/replication_gui.lib.php:105 msgid "Master status" -msgstr "" +msgstr "Masterstatus" #: libraries/replication_gui.lib.php:107 msgid "Slave status" -msgstr "" +msgstr "Slavestatus" #: libraries/replication_gui.lib.php:116 libraries/sql_query_form.lib.php:422 #: server_status.php:774 server_variables.php:57 @@ -6252,11 +6477,11 @@ msgstr "Server ID" msgid "" "Only slaves started with the --report-host=host_name option are visible in " "this list." -msgstr "" +msgstr "Kun slaver startet med --report-host=host_name er synlige i listen." #: libraries/replication_gui.lib.php:242 server_replication.php:192 msgid "Add slave replication user" -msgstr "" +msgstr "Tilføj slave replikationsbruger" #: libraries/replication_gui.lib.php:256 server_privileges.php:698 msgid "Any user" @@ -6290,6 +6515,8 @@ msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." msgstr "" +"Når tabellen Host bruges, ignoreres dette felt og værdier lagret i Host " +"bruges i stedet." #: libraries/replication_gui.lib.php:362 msgid "Generate Password" @@ -6325,11 +6552,11 @@ msgstr "Skematik for databasen \"%s\" - Side %s" #: libraries/schema/Export_Relation_Schema.class.php:174 msgid "This page does not contain any tables!" -msgstr "" +msgstr "Denne side indeholder ingen tabeller!" #: libraries/schema/Export_Relation_Schema.class.php:207 msgid "SCHEMA ERROR: " -msgstr "" +msgstr "SCHEMA ERROR: " #: libraries/schema/Pdf_Relation_Schema.class.php:877 #: libraries/schema/Pdf_Relation_Schema.class.php:1116 @@ -6375,7 +6602,7 @@ msgstr "Interne relationer" #: libraries/schema/User_Schema.class.php:116 msgid "FOREIGN KEY" -msgstr "" +msgstr "FOREIGN KEY" #: libraries/schema/User_Schema.class.php:148 msgid "Please choose a page to edit" @@ -6399,7 +6626,7 @@ msgstr "Relationel skematik" #: libraries/schema/User_Schema.class.php:356 msgid "Select Export Relational Type" -msgstr "" +msgstr "Vælg Export Relational Type" #: libraries/schema/User_Schema.class.php:377 msgid "Show grid" @@ -6419,7 +6646,7 @@ msgstr "vis alle tabeller med samme bredde?" #: libraries/schema/User_Schema.class.php:389 msgid "Only show keys" -msgstr "" +msgstr "Vis kun nøgler" #: libraries/schema/User_Schema.class.php:391 msgid "Landscape" @@ -6493,7 +6720,7 @@ msgstr "Lagre" #: libraries/server_links.inc.php:95 server_synchronize.php:1091 #: server_synchronize.php:1099 msgid "Synchronize" -msgstr "" +msgstr "Synkroniser" #: libraries/server_links.inc.php:99 #, fuzzy @@ -6503,25 +6730,25 @@ msgstr "Generelle relationsmuligheder" #: libraries/server_synchronize.lib.php:1337 server_synchronize.php:1115 msgid "Source database" -msgstr "" +msgstr "Kildedatabase" #: libraries/server_synchronize.lib.php:1339 #: libraries/server_synchronize.lib.php:1362 msgid "Current server" -msgstr "" +msgstr "Aktuel server" #: libraries/server_synchronize.lib.php:1341 #: libraries/server_synchronize.lib.php:1364 msgid "Remote server" -msgstr "" +msgstr "Ekstern server" #: libraries/server_synchronize.lib.php:1344 msgid "Difference" -msgstr "" +msgstr "Forskel" #: libraries/server_synchronize.lib.php:1360 server_synchronize.php:1117 msgid "Target database" -msgstr "" +msgstr "Måldatabase" #: libraries/sql_query_form.lib.php:223 #, php-format @@ -6536,7 +6763,7 @@ msgstr "Kør SQL-forspørgsel(er) på database %s" #: libraries/sql_query_form.lib.php:296 navigation.php:276 #: setup/frames/index.inc.php:219 msgid "Clear" -msgstr "" +msgstr "Ryd" #: libraries/sql_query_form.lib.php:301 #, fuzzy @@ -6634,7 +6861,7 @@ msgstr "SLUT RÅ" #: libraries/sqlparser.lib.php:364 msgid "Automatically appended backtick to the end of query!" -msgstr "" +msgstr "Tilføjede automatisk backtick til enden af forspørgslen!" #: libraries/sqlparser.lib.php:367 msgid "Unclosed quote" @@ -6664,7 +6891,7 @@ msgstr "Tabel ser ud til at være tom" #: libraries/tbl_links.inc.php:115 #, php-format msgid "Tracking of %s.%s is activated." -msgstr "" +msgstr "Sporing af %s.%s er aktiveret." #: libraries/tbl_properties.inc.php:104 msgid "Length/Values" @@ -6729,11 +6956,11 @@ msgstr "" #: libraries/tbl_properties.inc.php:371 msgid "ENUM or SET data too long?" -msgstr "" +msgstr "ENUM eller SET data for lang?" #: libraries/tbl_properties.inc.php:373 msgid "Get more editing space" -msgstr "" +msgstr "Få mere redigeringsplads" #: libraries/tbl_properties.inc.php:396 #, fuzzy @@ -6744,7 +6971,7 @@ msgstr "Ingen" #: libraries/tbl_properties.inc.php:397 msgid "As defined:" -msgstr "" +msgstr "Som defineret:" #: libraries/tbl_properties.inc.php:516 tbl_structure.php:153 #: tbl_structure.php:157 tbl_structure.php:566 @@ -6772,7 +6999,7 @@ msgstr "Datalager" #: libraries/tbl_properties.inc.php:756 msgid "PARTITION definition" -msgstr "" +msgstr "PARTITION definition" #: libraries/tbl_properties.inc.php:780 tbl_structure.php:636 #, fuzzy, php-format @@ -6794,7 +7021,7 @@ msgstr "Tilføj en ny bruger" #: libraries/tbl_triggers.lib.php:28 msgid "Event" -msgstr "" +msgstr "Hændelse" #: libraries/transformations/application_octetstream__download.inc.php:9 #, fuzzy @@ -6946,6 +7173,8 @@ msgid "" "Converts an (IPv4) Internet network address into a string in Internet " "standard dotted format." msgstr "" +"Konverterer en IPV4 internet adresse til en streng i internet standard x.x.x." +"x adresseformat" #: libraries/transformations/text_plain__sql.inc.php:9 msgid "Formats text as SQL query with syntax highlighting." @@ -6983,6 +7212,8 @@ msgid "" "Your preferences will be saved for current session only. Storing them " "permanently requires %sphpMyAdmin configuration storage%s." msgstr "" +"Dine præferencer vil kun blive gemt for den aktuelle session. At gemme dem " +"permanent kræver %sphpMyAdmin configuration storage%s." #: libraries/user_preferences.lib.php:142 #, fuzzy @@ -6995,6 +7226,8 @@ msgid "" "Your browser has phpMyAdmin configuration for this domain. Would you like to " "import it for current session?" msgstr "" +"Din browser har phpMyAdmin konfiguration for dette domæne. Vil du importere " +"den for den aktuelle session?" #: libraries/zip_extension.lib.php:25 msgid "No files found inside ZIP archive!" @@ -7017,7 +7250,7 @@ msgstr "MySQL forbindelses-sammenkøring" #: main.php:119 msgid "Appearance Settings" -msgstr "" +msgstr "Indstillinger for udseende" #: main.php:146 prefs_manage.php:274 #, fuzzy @@ -7041,7 +7274,7 @@ msgstr "MySQL Tegnsæt" #: main.php:181 msgid "Web server" -msgstr "" +msgstr "Webserver" #: main.php:187 msgid "MySQL client version" @@ -7049,7 +7282,7 @@ msgstr "MySQL klientversion" #: main.php:189 msgid "PHP extension" -msgstr "" +msgstr "PHP udvidelse" #: main.php:195 msgid "Show PHP information" @@ -7057,7 +7290,7 @@ msgstr "Vis PHP-information" #: main.php:213 msgid "Wiki" -msgstr "" +msgstr "Wiki" #: main.php:216 msgid "Official Homepage" @@ -7071,7 +7304,7 @@ msgstr "Attributter" #: main.php:218 msgid "Get support" -msgstr "" +msgstr "Få support" #: main.php:219 #, fuzzy @@ -7118,12 +7351,19 @@ msgid "" "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" +"Din PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." +"session.gc-maxlifetime(a)]session.gc_maxlifetime[/a] er mindre end cooki " +"gyldighed konfigureret i phpMyAdmin; på grund af dette vil din login session " +"udløbe tidligere end konfigureret i phpMyAdmin" #: main.php:274 msgid "" "Login cookie store is lower than cookie validity configured in phpMyAdmin, " "because of this, your login will expire sooner than configured in phpMyAdmin." msgstr "" +"Login cookie sletning er mindre end cookie gyldighed konfigureret i " +"phpMyAdmin. På grund af dette, vil din login udløbe tidligere end " +"konfigureret i phpMyAdmin." #: main.php:282 msgid "The configuration file now needs a secret passphrase (blowfish_secret)." @@ -7136,6 +7376,9 @@ msgid "" "exists in your phpMyAdmin directory. You should remove it once phpMyAdmin " "has been configured." msgstr "" +"Mappen [code]config[/code], som bruges af setip scriptet, eksisterer stadig " +"i din phpMyAdmin mappe. Du bør slette den, når phpMyAdmin er blevet " +"konfigureret." #: main.php:299 #, fuzzy, php-format @@ -7155,6 +7398,9 @@ msgid "" "functionality will be missing. For example navigation frame will not refresh " "automatically." msgstr "" +"Javascript understøttelse mangler eller er deaktiveret i din browser; nogle " +"phpMyAdmin funktioner vil savnes. Fx navigationsrammen vil ikke opdateres " +"automatisk." #: main.php:329 #, php-format @@ -7170,7 +7416,7 @@ msgstr "" msgid "" "Server running with Suhosin. Please refer to %sdocumentation%s for possible " "issues." -msgstr "" +msgstr "Server med Suhosin.Se %sdocumentation%s for mulige problemer." #: navigation.php:187 server_databases.php:277 server_synchronize.php:1206 msgid "No databases" @@ -7178,7 +7424,7 @@ msgstr "Ingen databaser" #: navigation.php:277 msgid "Filter" -msgstr "" +msgstr "Filter" #: navigation.php:277 #, fuzzy @@ -7342,11 +7588,11 @@ msgstr "" #: pmd_pdf.php:34 msgid "Page has been created" -msgstr "" +msgstr "Side er blevet oprettet" #: pmd_pdf.php:37 msgid "Page creation failed" -msgstr "" +msgstr "Sideoprettelse fejlede" #: pmd_pdf.php:89 #, fuzzy @@ -7396,7 +7642,7 @@ msgstr "Fejl: Relation ikke tilføjet." #: pmd_relation_new.php:62 msgid "FOREIGN KEY relation added" -msgstr "" +msgstr "FOREIGN KEY relation tilføjet" #: pmd_relation_new.php:84 msgid "Internal relation added" @@ -7416,7 +7662,7 @@ msgstr "Rettelserne er gemt!" #: prefs_forms.php:78 msgid "Cannot save settings, submitted form contains errors" -msgstr "" +msgstr "Kan ikke gemme indstillinger, den sendte formular indeholder fejl" #: prefs_manage.php:80 #, fuzzy @@ -7426,15 +7672,15 @@ msgstr "Kunne ikke indlæse standardkonfiguration fra: \"%1$s\"" #: prefs_manage.php:112 msgid "Configuration contains incorrect data for some fields." -msgstr "" +msgstr "Konfigurationen indejolder ukorrekte data for visse felter." #: prefs_manage.php:128 msgid "Do you want to import remaining settings?" -msgstr "" +msgstr "Vil du importere de resterende indstillinger ?" #: prefs_manage.php:225 prefs_manage.php:251 msgid "Saved on: @DATE@" -msgstr "" +msgstr "Gemt den @DATE@" #: prefs_manage.php:239 #, fuzzy @@ -7444,23 +7690,23 @@ msgstr "Importér filer" #: prefs_manage.php:245 msgid "Import from browser's storage" -msgstr "" +msgstr "Import fra browserens lager." #: prefs_manage.php:248 msgid "Settings will be imported from your browser's local storage." -msgstr "" +msgstr "Indstillinger vil blive importeret fra din browsers lokale lager." #: prefs_manage.php:254 msgid "You have no saved settings!" -msgstr "" +msgstr "Du har ingen gemte indstillinger!" #: prefs_manage.php:258 prefs_manage.php:312 msgid "This feature is not supported by your web browser" -msgstr "" +msgstr "Denne funktion er ikke understøttet af din browser." #: prefs_manage.php:263 msgid "Merge with current configuration" -msgstr "" +msgstr "Flet med aktuel konfiguration" #: prefs_manage.php:277 #, php-format @@ -7468,22 +7714,25 @@ msgid "" "You can set more settings by modifying config.inc.php, eg. by using %sSetup " "script%s." msgstr "" +"Du kan sætte flere indstillinger ved at modificere config.inc.php fx ved at " +"bruge %sSetup script%s." #: prefs_manage.php:302 msgid "Save to browser's storage" -msgstr "" +msgstr "Gem i browserens lager" #: prefs_manage.php:306 msgid "Settings will be saved in your browser's local storage." -msgstr "" +msgstr "Indstillinger vil blive gemt i din browsers lokale lager." #: prefs_manage.php:308 msgid "Existing settings will be overwritten!" -msgstr "" +msgstr "Eksisterende indstillinger vil blive overskrevet!" #: prefs_manage.php:323 msgid "You can reset all your settings and restore them to default values." msgstr "" +"Du han nulstille alle dine indstillinger og gendanne dem med standardværdier" #: querywindow.php:93 msgid "Import files" @@ -7562,11 +7811,11 @@ msgstr "Databasestatistik" #: server_databases.php:183 server_replication.php:179 #: server_replication.php:207 msgid "Master replication" -msgstr "" +msgstr "Master replikation" #: server_databases.php:185 server_replication.php:246 msgid "Slave replication" -msgstr "" +msgstr "Slave replikation" #: server_databases.php:268 server_databases.php:269 msgid "Enable Statistics" @@ -7649,7 +7898,7 @@ msgstr "Tillader at droppe tabeller." #: server_privileges.php:44 server_privileges.php:210 #: server_privileges.php:548 msgid "Allows to set up events for the event scheduler" -msgstr "" +msgstr "Tillader at oprette hændelser til hændelsesskeduleren" #: server_privileges.php:45 server_privileges.php:220 #: server_privileges.php:536 @@ -7711,7 +7960,7 @@ msgstr "Begrænser antallet af samtidige forbindelser brugere må have." #: server_privileges.php:55 server_privileges.php:198 #: server_privileges.php:558 msgid "Allows viewing processes of all users" -msgstr "" +msgstr "Tillader at se processer for alle brugere" #: server_privileges.php:56 server_privileges.php:200 #: server_privileges.php:460 server_privileges.php:564 @@ -7767,7 +8016,7 @@ msgstr "" #: server_privileges.php:65 server_privileges.php:211 #: server_privileges.php:549 msgid "Allows creating and dropping triggers" -msgstr "" +msgstr "Tillader oprettelse og sletning af triggers" #: server_privileges.php:66 server_privileges.php:192 #: server_privileges.php:457 server_privileges.php:519 @@ -7945,6 +8194,7 @@ msgstr "Tilføj privilegier på følgende database" #: server_privileges.php:2023 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" +"Jokertegn % og _ skal escapes med en \\ for brug af dem som almindelige tegn." #: server_privileges.php:2026 msgid "Add privileges on the following table" @@ -8003,7 +8253,7 @@ msgstr "Tildel alle privilegier til jokertegn-navn (brugernavn_%)" #: server_privileges.php:2123 #, php-format msgid "Grant all privileges on database "%s"" -msgstr "" +msgstr "Tildel alle privilegier på database "%s"" #: server_privileges.php:2146 #, php-format @@ -8040,21 +8290,22 @@ msgstr "ID" #: server_replication.php:49 msgid "Unknown error" -msgstr "" +msgstr "Ukendt fejl" #: server_replication.php:56 #, php-format msgid "Unable to connect to master %s." -msgstr "" +msgstr "Ikke muligt at forbinde til master %s." #: server_replication.php:63 msgid "" "Unable to read master log position. Possible privilege problem on master." msgstr "" +"Ikke muligt at læse master log position. Muligt rettighedsproblem på master." #: server_replication.php:69 msgid "Unable to change master" -msgstr "" +msgstr "Ikke muligt at ændre master" #: server_replication.php:72 #, php-format @@ -8063,15 +8314,15 @@ msgstr "" #: server_replication.php:180 msgid "This server is configured as master in a replication process." -msgstr "" +msgstr "Denne server er konfigureret som master i en replikationsproces." #: server_replication.php:182 server_status.php:407 msgid "Show master status" -msgstr "" +msgstr "Vis master status" #: server_replication.php:185 msgid "Show connected slaves" -msgstr "" +msgstr "Vis forbundne slaver" #: server_replication.php:208 #, php-format @@ -8079,10 +8330,12 @@ msgid "" "This server is not configured as master in a replication process. Would you " "like to <a href=\"%s\">configure</a> it?" msgstr "" +"Denne serverer ikke konfigureret som master i en replikationsproces. Viol du " +"<a href=\"%s\">konfigurere</a> den?" #: server_replication.php:215 msgid "Master configuration" -msgstr "" +msgstr "Masterkonfiguration" #: server_replication.php:216 msgid "" @@ -8092,24 +8345,31 @@ msgid "" "ignore all databases by default and allow only certain databases to be " "replicated. Please select the mode:" msgstr "" +"Denne server er ikke konfigureret som master server i en replikationsproces. " +"Du kan vælge enten at replikere alle databaser og ignorere visse (godt hvis " +"du vil replikere de fleste databaser) eller du kan vælge at ignorere alle " +"databaser som standard og tillade kun visse databaser at blive replikeret. " +"Vælg tilstand:" #: server_replication.php:219 msgid "Replicate all databases; Ignore:" -msgstr "" +msgstr "Repliker alle databaser; Ignorer:" #: server_replication.php:220 msgid "Ignore all databases; Replicate:" -msgstr "" +msgstr "Ignorer alle databaser; Repliker:" #: server_replication.php:223 msgid "Please select databases:" -msgstr "" +msgstr "Vælg databaser:" #: server_replication.php:226 msgid "" "Now, add the following lines at the end of [mysqld] section in your my.cnf " "and please restart the MySQL server afterwards." msgstr "" +"Nu, tilføj de følgende linjer i slutningen af [mysqld] sektionen i din my." +"cnf og genstart derefter MySQL serveren." #: server_replication.php:228 msgid "" @@ -8117,43 +8377,46 @@ msgid "" "should see a message informing you, that this server <b>is</b> configured as " "master" msgstr "" +"Når du har genstartet MySQL serveren, så klik på Go knappen. Bagefter bør du " +"se en besked, der fortæller, at denne server <b>er</b> konfigureret som " +"master." #: server_replication.php:291 msgid "Slave SQL Thread not running!" -msgstr "" +msgstr "Slave SQL Thread kører ikke!" #: server_replication.php:294 msgid "Slave IO Thread not running!" -msgstr "" +msgstr "Slave IO Thread kører ikke!" #: server_replication.php:303 msgid "" "Server is configured as slave in a replication process. Would you like to:" -msgstr "" +msgstr "Serveren er konfigureret som slave i en replikationsproces. Vil du:" #: server_replication.php:306 msgid "See slave status table" -msgstr "" +msgstr "Se slave status tabel" #: server_replication.php:309 msgid "Synchronize databases with master" -msgstr "" +msgstr "Synkroniser databaser med master" #: server_replication.php:320 msgid "Control slave:" -msgstr "" +msgstr "Kontrolslave:" #: server_replication.php:323 msgid "Full start" -msgstr "" +msgstr "Fuld start" #: server_replication.php:323 msgid "Full stop" -msgstr "" +msgstr "Fuld stop" #: server_replication.php:324 msgid "Reset slave" -msgstr "" +msgstr "Nulstil slave" #: server_replication.php:326 #, fuzzy @@ -8163,7 +8426,7 @@ msgstr "Kun strukturen" #: server_replication.php:328 msgid "Stop SQL Thread only" -msgstr "" +msgstr "Stop kun SQL Thread" #: server_replication.php:331 #, fuzzy @@ -8173,27 +8436,27 @@ msgstr "Kun strukturen" #: server_replication.php:333 msgid "Stop IO Thread only" -msgstr "" +msgstr "Stop kun IO Thread" #: server_replication.php:338 msgid "Error management:" -msgstr "" +msgstr "Fejlhåndtering:" #: server_replication.php:340 msgid "Skipping errors might lead into unsynchronized master and slave!" -msgstr "" +msgstr "Overspringning af fejl kan føre til usynkroniseret master og slave!" #: server_replication.php:342 msgid "Skip current error" -msgstr "" +msgstr "Spring over aktuel fejl" #: server_replication.php:343 msgid "Skip next" -msgstr "" +msgstr "Spring over næste" #: server_replication.php:346 msgid "errors." -msgstr "" +msgstr "fejl." #: server_replication.php:361 #, php-format @@ -8201,6 +8464,8 @@ msgid "" "This server is not configured as slave in a replication process. Would you " "like to <a href=\"%s\">configure</a> it?" msgstr "" +"Serveren er ikke konfigureret som slave i en replikationsprocess. Vil du <a " +"href=\"%s\">konfigurere</a> den?" #: server_status.php:46 msgid "" @@ -8929,14 +9194,18 @@ msgid "" "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</" "b> process." msgstr "" +"Denne MySQL server fungerer som <b>master</b> og <b>slave</b> i en " +"<b>replikation</b>sproces." #: server_status.php:488 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process." msgstr "" +"Denne MySQL server fungerer som <b>master</b> i en <b>replikation</b>sproces." #: server_status.php:490 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process." msgstr "" +"Denne MySQL server fungerer som <b>slave</b> i en <b>replikation</b>sproces." #: server_status.php:492 msgid "" @@ -9026,97 +9295,97 @@ msgstr "" #: server_status.php:872 msgid "Replication status" -msgstr "" +msgstr "Status for replikation" #: server_synchronize.php:92 msgid "Could not connect to the source" -msgstr "" +msgstr "Kunne ikke forbinde til kilden" #: server_synchronize.php:95 msgid "Could not connect to the target" -msgstr "" +msgstr "Kunne ikke forbinde til målet" #: server_synchronize.php:120 server_synchronize.php:123 tbl_create.php:76 #: tbl_get_field.php:19 #, php-format msgid "'%s' database does not exist." -msgstr "" +msgstr "'%s' database eksisterer ikke." #: server_synchronize.php:263 msgid "Structure Synchronization" -msgstr "" +msgstr "Struktursynkronisering" #: server_synchronize.php:270 msgid "Data Synchronization" -msgstr "" +msgstr "Datasynkronisering" #: server_synchronize.php:399 server_synchronize.php:838 msgid "not present" -msgstr "" +msgstr "findes ikke" #: server_synchronize.php:423 server_synchronize.php:866 msgid "Structure Difference" -msgstr "" +msgstr "Strukturforskel" #: server_synchronize.php:424 server_synchronize.php:867 msgid "Data Difference" -msgstr "" +msgstr "Dataforskel" #: server_synchronize.php:429 server_synchronize.php:872 msgid "Add column(s)" -msgstr "" +msgstr "Tilføj kolonne(r)" #: server_synchronize.php:430 server_synchronize.php:873 msgid "Remove column(s)" -msgstr "" +msgstr "Fjern kolonne(r)" #: server_synchronize.php:431 server_synchronize.php:874 msgid "Alter column(s)" -msgstr "" +msgstr "Ændre kolonne(r)" #: server_synchronize.php:432 server_synchronize.php:875 msgid "Remove index(s)" -msgstr "" +msgstr "Fjern indeks(es)" #: server_synchronize.php:433 server_synchronize.php:876 msgid "Apply index(s)" -msgstr "" +msgstr "Brug indeks(es)" #: server_synchronize.php:434 server_synchronize.php:877 msgid "Update row(s)" -msgstr "" +msgstr "Opdater række(r)" #: server_synchronize.php:435 server_synchronize.php:878 msgid "Insert row(s)" -msgstr "" +msgstr "Indsæt række(r)" #: server_synchronize.php:445 server_synchronize.php:889 msgid "Would you like to delete all the previous rows from target tables?" -msgstr "" +msgstr "Vil du slette alle de tidligere rækker fra måltabeller ?" #: server_synchronize.php:448 server_synchronize.php:893 msgid "Apply Selected Changes" -msgstr "" +msgstr "Udfør de valgte ændringer" #: server_synchronize.php:450 server_synchronize.php:895 msgid "Synchronize Databases" -msgstr "" +msgstr "Synkroniser databaser" #: server_synchronize.php:463 msgid "Selected target tables have been synchronized with source tables." -msgstr "" +msgstr "Valgte måltabeller er blevet synkroniseret med kildetabeller." #: server_synchronize.php:941 msgid "Target database has been synchronized with source database" -msgstr "" +msgstr "Måldatabasen er blevet synkroniseret med kildedatabase." #: server_synchronize.php:1002 msgid "The following queries have been executed:" -msgstr "" +msgstr "De følgende forespørgsler er blevet udført:" #: server_synchronize.php:1130 msgid "Enter manually" -msgstr "" +msgstr "Indtast manuelt" #: server_synchronize.php:1138 #, fuzzy @@ -9127,17 +9396,19 @@ msgstr "maks. samtidige forbindelser" #: server_synchronize.php:1167 #, php-format msgid "Configuration: %s" -msgstr "" +msgstr "Konfiguration: %s" #: server_synchronize.php:1182 msgid "Socket" -msgstr "" +msgstr "Socket" #: server_synchronize.php:1228 msgid "" "Target database will be completely synchronized with source database. Source " "database will remain unchanged." msgstr "" +"Måldatabasen vil blive fuldstændigt synkroniseret med kildedatabasen. " +"Kildedatabasen forbliver uændret." #: server_variables.php:39 msgid "Server variables and settings" @@ -9153,11 +9424,11 @@ msgstr "Global værdi" #: setup/frames/config.inc.php:38 setup/frames/index.inc.php:213 msgid "Download" -msgstr "" +msgstr "Udtræk" #: setup/frames/index.inc.php:49 msgid "Cannot load or save configuration" -msgstr "" +msgstr "Kan ikke hente eller gemme konfiguration" #: setup/frames/index.inc.php:50 msgid "" @@ -9165,12 +9436,17 @@ msgid "" "level directory as described in [a(a)Documentation.html#setup_script]" "documentation[/a]. Otherwise you will be only able to download or display it." msgstr "" +"Opret en webserver skrivbar mappe [em]config[/em] i phpMyAdmin topniveau " +"mappen som beskrevet i [a(a)Documentation.html#setup_script]documentation[/a] " +"Ellers vil du kun blive i stand til at downloade eller vise den." #: setup/frames/index.inc.php:57 msgid "" "You are not using a secure connection; all data (including potentially " "sensitive information, like passwords) is transferred unencrypted!" msgstr "" +"Du bruger ikke en sikker forbindelse; alle data (inklusive potentielt følsom " +"information, som adgangskode) sendes ukrypteret!" #: setup/frames/index.inc.php:60 #, php-format @@ -9178,109 +9454,114 @@ msgid "" "If your server is also configured to accept HTTPS requests follow [a@%s]this " "link[/a] to use a secure connection." msgstr "" +"Hvis din serverogså er konfigureret til at acceptere HTTPS requests så følg " +"[a@%s]this link[/a] for at bruge en sikker forbindelse." #: setup/frames/index.inc.php:64 msgid "Insecure connection" -msgstr "" +msgstr "Usikker forbindelse" #: setup/frames/index.inc.php:88 setup/frames/menu.inc.php:15 msgid "Overview" -msgstr "" +msgstr "Oversigt" #: setup/frames/index.inc.php:96 msgid "Show hidden messages (#MSG_COUNT)" -msgstr "" +msgstr "Vis skjulte beskeder (#MSG_COUNT)" #: setup/frames/index.inc.php:136 msgid "There are no configured servers" -msgstr "" +msgstr "Der er ingen konfigurerede servere" #: setup/frames/index.inc.php:144 msgid "New server" -msgstr "" +msgstr "Ny server" #: setup/frames/index.inc.php:173 msgid "Default language" -msgstr "" +msgstr "Standardsprog" #: setup/frames/index.inc.php:183 msgid "let the user choose" -msgstr "" +msgstr "lad brugeren vælge" #: setup/frames/index.inc.php:194 msgid "- none -" -msgstr "" +msgstr "- ingen -" #: setup/frames/index.inc.php:197 msgid "Default server" -msgstr "" +msgstr "Standardserver" #: setup/frames/index.inc.php:207 msgid "End of line" -msgstr "" +msgstr "Linjeafslutning" #: setup/frames/index.inc.php:212 msgid "Display" -msgstr "" +msgstr "Vis" #: setup/frames/index.inc.php:216 msgid "Load" -msgstr "" +msgstr "Indlæs" #: setup/frames/index.inc.php:227 msgid "phpMyAdmin homepage" -msgstr "" +msgstr "phpMyAdmin hjemmeside" #: setup/frames/index.inc.php:228 msgid "Donate" -msgstr "" +msgstr "Doner" #: setup/frames/servers.inc.php:28 msgid "Edit server" -msgstr "" +msgstr "Rediger server" #: setup/frames/servers.inc.php:37 msgid "Add a new server" -msgstr "" +msgstr "Tilføj ny server" #: setup/lib/form_processing.lib.php:42 msgid "Warning" -msgstr "" +msgstr "Advarsel" #: setup/lib/form_processing.lib.php:43 msgid "Submitted form contains errors" -msgstr "" +msgstr "Den sendte formular indeholder fejl" #: setup/lib/form_processing.lib.php:44 msgid "Try to revert erroneous fields to their default values" -msgstr "" +msgstr "Prøv at give de fejlramte felter deres standardværdier" #: setup/lib/form_processing.lib.php:47 msgid "Ignore errors" -msgstr "" +msgstr "Ignorer fejl" #: setup/lib/form_processing.lib.php:49 msgid "Show form" -msgstr "" +msgstr "Vis formular" #: setup/lib/index.lib.php:119 msgid "" "Neither URL wrapper nor CURL is available. Version check is not possible." msgstr "" +"Hverken URL wrapper eller CURL er til rådighed. Versionscheck er ikke mulig." #: setup/lib/index.lib.php:126 msgid "" "Reading of version failed. Maybe you're offline or the upgrade server does " "not respond." msgstr "" +"Læsning af version fejlede. Måske er du offline eller upgradeserveren svarer " +"ikke." #: setup/lib/index.lib.php:143 msgid "Got invalid version string from server" -msgstr "" +msgstr "Fik en ugyldig versionsstreng fra server" #: setup/lib/index.lib.php:150 msgid "Unparsable version string" -msgstr "" +msgstr "Versionsstrengen kan ikke parses" #: setup/lib/index.lib.php:162 #, php-format @@ -9288,10 +9569,12 @@ msgid "" "You are using Git version, run [kbd]git pull[/kbd] :-)[br]The latest stable " "version is %s, released on %s." msgstr "" +"Du bruger Git version, kør [kbd]git pull[/kbd] :-)[br]Sidste stabile version " +"er %s, released %s." #: setup/lib/index.lib.php:165 msgid "No newer stable version is available" -msgstr "" +msgstr "Ingen nyere stabil version er tilgængelig" #: setup/lib/index.lib.php:250 #, php-format @@ -9301,6 +9584,11 @@ msgid "" "proxies list%s. However, IP-based protection may not be reliable if your IP " "belongs to an ISP where thousands of users, including you, are connected to." msgstr "" +"Denne %soption%s bør deaktiveres, da den tillader angribere at lave et " +"bruteforce login til en vilkårlig MySQL server. Hvis du føler, at dette er " +"nødvendigt, brug %strusted proxies list%s. IP-baseret beskyttelse er næppe " +"pålidelig, hvis din IP-adresse hører til en udbyder med mange tusinde " +"brugere." #: setup/lib/index.lib.php:252 msgid "" @@ -9308,6 +9596,9 @@ msgid "" "so a key was automatically generated for you. It is used to encrypt cookies; " "you don't need to remember it." msgstr "" +"Du havde ikke blowfish secret sat og har aktiveret cookie autentifikation, " +"så en nøgle blev automatisk genereret for dig. Den bruges til at kryptere " +"cookies; du behøver ikke huske den." #: setup/lib/index.lib.php:253 #, php-format @@ -9315,17 +9606,22 @@ msgid "" "%sBzip2 compression and decompression%s requires functions (%s) which are " "unavailable on this system." msgstr "" +"%sBzip2 komprimering og dekomprimering%s kræver funktioner (%s) som ikke er " +"tilgængelige på dette system." #: setup/lib/index.lib.php:255 msgid "" "This value should be double checked to ensure that this directory is neither " "world accessible nor readable or writable by other users on your server." msgstr "" +"Denne værdi bør dobbelcheckes for at sikre, at denne mappe er hverken " +"tilgængelig for alle eller læsbar/skrivbar af andre brugere på din server." #: setup/lib/index.lib.php:256 #, php-format msgid "This %soption%s should be enabled if your web server supports it." msgstr "" +"Denne %soption%s bør være aktiveret, hvis din webserver understøtter det." #: setup/lib/index.lib.php:258 #, php-format @@ -9333,6 +9629,8 @@ msgid "" "%sGZip compression and decompression%s requires functions (%s) which are " "unavailable on this system." msgstr "" +"%sGZip komprimering og dekomprimering%s kræver funktioner (%s) som ikke er " +"tilgængelige på dette system." #: setup/lib/index.lib.php:260 #, php-format @@ -9341,6 +9639,9 @@ msgid "" "invalidation if %ssession.gc_maxlifetime%s is lower than its value " "(currently %d)." msgstr "" +"%sLogin cookie gyldighed%s større end 1440 sekunder kan forårsage tilfældig " +"afslutning af session hvis %ssession.gc_maxlifetime%s er mindre end dens " +"værdi (aktuelt %d)." #: setup/lib/index.lib.php:262 #, php-format @@ -9348,6 +9649,9 @@ msgid "" "%sLogin cookie validity%s should be set to 1800 seconds (30 minutes) at " "most. Values larger than 1800 may pose a security risk such as impersonation." msgstr "" +"%sLogin cookie validity%s bør højst sættes til 1800 sekunder (30 minutter). " +"Værdier større end 1800 kan udgøre en sikkerhedsrisiko som fx overtagelse af " +"identitet." #: setup/lib/index.lib.php:264 #, php-format @@ -9355,6 +9659,9 @@ msgid "" "If using cookie authentication and %sLogin cookie store%s is not 0, %sLogin " "cookie validity%s must be set to a value less or equal to it." msgstr "" +"Hvis du bruger cookie autentifikation og %sLogin cookie sletning%s ikke er " +"0, så skal %sLogin cookie gyldighed%s være en værdi mindre end eller lig med " +"den." #: setup/lib/index.lib.php:266 #, php-format @@ -9364,6 +9671,10 @@ msgid "" "protection may not be reliable if your IP belongs to an ISP where thousands " "of users, including you, are connected to." msgstr "" +" Hvis du føler, at dette er nødvendigt, brug yderligere sikring - %shost " +"authentication%s indstillinger og %strusted proxies list%s. IP-baseret " +"beskyttelse er næppe pålidelig, hvis din IP-adresse hører til en udbyder med " +"mange tusinde brugere." #: setup/lib/index.lib.php:268 #, php-format @@ -9374,6 +9685,11 @@ msgid "" "phpMyAdmin panel. Set %sauthentication type%s to [kbd]cookie[/kbd] or [kbd]" "http[/kbd]." msgstr "" +"Du har sat [kbd]config[/kbd] autentifikation og inkluderet brugernavn og " +"adgangskode for auto-login, hvilket er ikke en ønskværdig konfiguration for " +"produktionssystemer. Enhver som kender eller gætter din phpMyAdmin URL kan " +"direkte få adgang til dit phpMyAdmin panel for denne server. Sæt " +"%sautentifikationtype%s til [kbd]cookie[/kbd] eller [kbd]http[/kbd]." #: setup/lib/index.lib.php:270 #, php-format @@ -9381,6 +9697,8 @@ msgid "" "%sZip compression%s requires functions (%s) which are unavailable on this " "system." msgstr "" +"%sZip komprimering%s kræver funktioner (%s) som ikke er tilgængelige på " +"dette system." #: setup/lib/index.lib.php:272 #, php-format @@ -9388,26 +9706,28 @@ msgid "" "%sZip decompression%s requires functions (%s) which are unavailable on this " "system." msgstr "" +"%sZip dekomprimering%s kræver funktioner (%s) som ikke er tilgængelige på " +"dette system." #: setup/lib/index.lib.php:296 msgid "You should use SSL connections if your web server supports it." -msgstr "" +msgstr "Du bør bruge en SSL-forbindelse, hvis din webserver understøtter det. " #: setup/lib/index.lib.php:306 msgid "You should use mysqli for performance reasons." -msgstr "" +msgstr "Du bør bruge mysqli af ydelsesgrunde." #: setup/lib/index.lib.php:331 msgid "You allow for connecting to the server without a password." -msgstr "" +msgstr "Du tillader forbindelse til serveren uden adgangskode" #: setup/lib/index.lib.php:351 msgid "Key is too short, it should have at least 8 characters." -msgstr "" +msgstr "Nøglen er for kort, den bør have mindst 8 tegn." #: setup/lib/index.lib.php:358 msgid "Key should contain letters, numbers [em]and[/em] special characters." -msgstr "" +msgstr "Nøglen bør indeholde bogstaver, numre [em]og[/em] specialtegn." #: sql.php:87 tbl_change.php:253 tbl_select.php:26 tbl_select.php:27 #: tbl_select.php:30 tbl_select.php:33 @@ -9417,12 +9737,12 @@ msgstr "Bladre i fremmedværdier" #: sql.php:163 #, php-format msgid "Using bookmark \"%s\" as default browse query." -msgstr "" +msgstr "Bruger bogmærke \"%s\" som standard gennemsynsforespørgsel" #: sql.php:600 tbl_replace.php:387 #, php-format msgid "Inserted row id: %1$d" -msgstr "" +msgstr "Indsatte række id: %1$d" #: sql.php:617 msgid "Showing as PHP code" @@ -9450,7 +9770,7 @@ msgstr "Mærke" #: tbl_addfield.php:185 tbl_alter.php:99 tbl_indexes.php:97 #, php-format msgid "Table %1$s has been altered successfully" -msgstr "" +msgstr "Tabel %1$s er blevet ændret" #: tbl_change.php:283 tbl_change.php:321 msgid "Function" @@ -9464,7 +9784,7 @@ msgstr " På grund af feltets længde,<br /> kan det muligvis ikke ændres " #: tbl_change.php:875 msgid "Remove BLOB Repository Reference" -msgstr "" +msgstr "Fjern BLOB Repository reference" #: tbl_change.php:881 msgid "Binary - do not edit" @@ -9472,7 +9792,7 @@ msgstr " Binært - må ikke ændres " #: tbl_change.php:929 msgid "Upload to BLOB repository" -msgstr "" +msgstr "Upload til BLOB repository" #: tbl_change.php:1058 msgid "Insert as new row" @@ -9480,11 +9800,11 @@ msgstr "Indsæt som ny række" #: tbl_change.php:1059 msgid "Insert as new row and ignore errors" -msgstr "" +msgstr "Indsæt som ny række og ignorer fejl" #: tbl_change.php:1060 msgid "Show insert query" -msgstr "" +msgstr "Vis indsættelsesforespørgsel" #: tbl_change.php:1071 msgid "and then" @@ -9516,7 +9836,7 @@ msgstr "" #: tbl_change.php:1137 #, php-format msgid "Continue insertion with %s rows" -msgstr "" +msgstr "Fortsæt indsættelse med %s rækker" #: tbl_chart.php:56 #, fuzzy @@ -9536,7 +9856,7 @@ msgstr "Kan være anslået. Se FAQ 3.11" #: tbl_chart.php:90 msgid "Width" -msgstr "" +msgstr "Bredde" #: tbl_chart.php:94 #, fuzzy @@ -9572,7 +9892,7 @@ msgstr "mar" #: tbl_chart.php:135 msgid "Line" -msgstr "" +msgstr "Linje" #: tbl_chart.php:136 msgid "Radar" @@ -9592,7 +9912,7 @@ msgstr "Forespørgselstype" #: tbl_chart.php:146 msgid "Stacked" -msgstr "" +msgstr "Stak" #: tbl_chart.php:147 msgid "Multi" @@ -9621,7 +9941,7 @@ msgstr "" #: tbl_chart.php:181 msgid "Redraw" -msgstr "" +msgstr "Gentegn" #: tbl_create.php:56 #, php-format @@ -9631,7 +9951,7 @@ msgstr "Table %s already exists!" #: tbl_create.php:242 #, php-format msgid "Table %1$s has been created." -msgstr "" +msgstr "Tabel %1$s er blevet oprettet." #: tbl_export.php:24 msgid "View dump (schema) of table" @@ -9757,7 +10077,7 @@ msgstr "Data dump for tabellen" #: tbl_operations.php:688 msgid "Empty the table (TRUNCATE)" -msgstr "" +msgstr "Tøm tabellen (TRUNCATE)" #: tbl_operations.php:708 #, fuzzy @@ -9767,36 +10087,36 @@ msgstr "Kopiér database til" #: tbl_operations.php:729 msgid "Partition maintenance" -msgstr "" +msgstr "Vedligehold af partition" #: tbl_operations.php:737 #, php-format msgid "Partition %s" -msgstr "" +msgstr "Partition %s" #: tbl_operations.php:740 msgid "Analyze" -msgstr "" +msgstr "Analyser" #: tbl_operations.php:741 msgid "Check" -msgstr "" +msgstr "Check" #: tbl_operations.php:742 msgid "Optimize" -msgstr "" +msgstr "Optimer" #: tbl_operations.php:743 msgid "Rebuild" -msgstr "" +msgstr "Genopbyg" #: tbl_operations.php:744 msgid "Repair" -msgstr "" +msgstr "Reparer" #: tbl_operations.php:756 msgid "Remove partitioning" -msgstr "" +msgstr "Fjern partitionering" #: tbl_operations.php:782 msgid "Check referential integrity:" @@ -9828,7 +10148,7 @@ msgstr "Erklæringer" #: tbl_printview.php:377 tbl_structure.php:834 msgid "static" -msgstr "" +msgstr "statisk" #: tbl_printview.php:379 tbl_structure.php:836 msgid "dynamic" @@ -9845,7 +10165,7 @@ msgstr " Rækkestørrelse " #: tbl_relation.php:276 #, php-format msgid "Error creating foreign key on %1$s (check data types)" -msgstr "" +msgstr "Fejl ved dannelse af fremmednøgle på %1$s (check datatyper)" #: tbl_relation.php:402 #, fuzzy @@ -9858,10 +10178,12 @@ msgid "" "An internal relation is not necessary when a corresponding FOREIGN KEY " "relation exists." msgstr "" +"En intern relation er ikke nødvendig, når en tilsvarende FOREIGN KEY " +"relation findes." #: tbl_relation.php:410 msgid "Foreign key constraint" -msgstr "" +msgstr "Begrænsning på fremmednøgle" #: tbl_row_action.php:28 msgid "No rows selected" @@ -9895,19 +10217,19 @@ msgstr "Gennemse bestemte værdier" #: tbl_structure.php:166 tbl_structure.php:167 msgid "Add primary key" -msgstr "" +msgstr "Tilføj primær nøgle" #: tbl_structure.php:168 tbl_structure.php:169 msgid "Add index" -msgstr "" +msgstr "Tilføj indeks" #: tbl_structure.php:170 tbl_structure.php:171 msgid "Add unique index" -msgstr "" +msgstr "Tilføj unikt indeks" #: tbl_structure.php:172 tbl_structure.php:173 msgid "Add FULLTEXT index" -msgstr "" +msgstr "Tilføj FULLTEXT indeks" #: tbl_structure.php:385 #, fuzzy @@ -10010,7 +10332,7 @@ msgstr "" #: tbl_tracking.php:216 msgid "Comment out these two lines if you do not need them." -msgstr "" +msgstr "Udkommenter disse to linjer, hvis du ikke har brug for dem." #: tbl_tracking.php:225 msgid "SQL statements exported. Please copy the dump or execute it." @@ -10023,28 +10345,28 @@ msgstr "Version %s snapshot (SQL kode)" #: tbl_tracking.php:375 msgid "Tracking statements" -msgstr "" +msgstr "Sporingskommandoer" #: tbl_tracking.php:391 tbl_tracking.php:498 #, php-format msgid "Show %s with dates from %s to %s by user %s %s" -msgstr "" +msgstr "Vis %s med datoer fra %s til %s for bruger %s %s" #: tbl_tracking.php:404 tbl_tracking.php:455 msgid "Date" -msgstr "" +msgstr "Dato" #: tbl_tracking.php:406 msgid "Data definition statement" -msgstr "" +msgstr "Datadefinitionsudstryk" #: tbl_tracking.php:457 msgid "Data manipulation statement" -msgstr "" +msgstr "Data manipuleringsudtryk" #: tbl_tracking.php:501 msgid "SQL dump (file download)" -msgstr "" +msgstr "SQL-udtræk (hentning af fil)" #: tbl_tracking.php:502 msgid "SQL dump" @@ -10052,7 +10374,7 @@ msgstr "SQL dump" #: tbl_tracking.php:503 msgid "This option will replace your table and contained data." -msgstr "" +msgstr "Denne indstilling vil erstatte din tabel og dens indeholdte data." #: tbl_tracking.php:503 msgid "SQL execution" diff --git a/po/pt_BR.po b/po/pt_BR.po index e1bb9f6..b1e1fed 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -2376,43 +2376,47 @@ msgstr "Permitir elaboração de terceiros" #: libraries/config/messages.inc.php:23 msgid "Show "Drop database" link to normal users" -msgstr "" +msgstr "Exibir link "Apagar banco de dados" para usuários normais" #: libraries/config/messages.inc.php:24 msgid "" "Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] " "authentication" msgstr "" +"Frase secreta utilizada para encriptar cookies na autenticação por [kbd]" +"cookie[/kbd]" #: libraries/config/messages.inc.php:25 msgid "Blowfish secret" -msgstr "" +msgstr "Segredo Blowfish" #: libraries/config/messages.inc.php:26 msgid "Highlight selected rows" -msgstr "" +msgstr "Destacar linhas selecionadas" #: libraries/config/messages.inc.php:27 msgid "Row marker" -msgstr "" +msgstr "Marcador de linha" #: libraries/config/messages.inc.php:28 msgid "Highlight row pointed by the mouse cursor" -msgstr "" +msgstr "Destacar linha apontada pelo cursor do mouse" #: libraries/config/messages.inc.php:29 msgid "Highlight pointer" -msgstr "" +msgstr "Destacar apontador" #: libraries/config/messages.inc.php:30 msgid "" "Enable [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for " "import and export operations" msgstr "" +"Habilitar compressão [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] para " +"operações de importar e exportar" #: libraries/config/messages.inc.php:31 msgid "Bzip2" -msgstr "" +msgstr "Bzip2" #: libraries/config/messages.inc.php:32 msgid "" @@ -2420,14 +2424,17 @@ msgid "" "columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/" "kbd] - allows newlines in columns" msgstr "" +"Define que tipo de controles de edição devem ser utilizados pelas colunas " +"CHAR e VARCHAR; [kbd]input[/kbd] - permite limitar o tamanho do campo, [kbd]" +"textarea[/kbd] - permite quebra de linhas em colunas" #: libraries/config/messages.inc.php:33 msgid "CHAR columns editing" -msgstr "" +msgstr "Edição de colunas CHAR" #: libraries/config/messages.inc.php:34 msgid "Number of columns for CHAR/VARCHAR textareas" -msgstr "" +msgstr "Número de colunas para caixas de texto CHAR/VARCHAR" #: libraries/config/messages.inc.php:35 msgid "CHAR textarea columns" @@ -2435,7 +2442,7 @@ msgstr "" #: libraries/config/messages.inc.php:36 msgid "Number of rows for CHAR/VARCHAR textareas" -msgstr "" +msgstr "Número de linhas para caixas de texto CHAR/VARCHAR" #: libraries/config/messages.inc.php:37 msgid "CHAR textarea rows" @@ -2450,6 +2457,9 @@ msgid "" "Compress gzip/bzip2 exports on the fly without the need for much memory; if " "you encounter problems with created gzip/bzip2 files disable this feature" msgstr "" +"Comprime exportações gzip/bzip2 imediatamente sem a necessidade de muita " +"memória; se você encontrar problemas com arquivos gzip/bzip2 criados " +"desabilite este recurso" #: libraries/config/messages.inc.php:40 msgid "Compress on the fly" @@ -2465,6 +2475,8 @@ msgid "" "Whether a warning ("Are your really sure...") should be displayed " "when you're about to lose data" msgstr "" +"Exibir aviso ("Você tem certeza...") quando estiver prestes a " +"perder dados" #: libraries/config/messages.inc.php:43 msgid "Confirm DROP queries" @@ -2484,6 +2496,8 @@ msgid "" "[kbd]horizontal[/kbd], [kbd]vertical[/kbd] or a number that indicates " "maximum number for which vertical model is used" msgstr "" +"[kbd]horizontal[/kbd], [kbd]vertical[/kbd] ou um número que indica o número " +"máximo para o qual o modelo vertical é usado" #: libraries/config/messages.inc.php:47 msgid "Display direction for altering/creating columns" @@ -2491,7 +2505,7 @@ msgstr "" #: libraries/config/messages.inc.php:48 msgid "Tab that is displayed when entering a database" -msgstr "" +msgstr "Aba que é exibida quando entrar em um banco de dados" #: libraries/config/messages.inc.php:49 #, fuzzy @@ -2500,7 +2514,7 @@ msgstr "Renomear Banco de Dados para" #: libraries/config/messages.inc.php:50 msgid "Tab that is displayed when entering a server" -msgstr "" +msgstr "Aba que é exibida quando entrar em um servidor" #: libraries/config/messages.inc.php:51 #, fuzzy @@ -2509,7 +2523,7 @@ msgstr "Renomear Banco de Dados para" #: libraries/config/messages.inc.php:52 msgid "Tab that is displayed when entering a table" -msgstr "" +msgstr "Aba que é exibida quando entrar em uma tabela" #: libraries/config/messages.inc.php:53 #, fuzzy @@ -2526,23 +2540,24 @@ msgstr "Mostrar conteúdo binário como HEX" #: libraries/config/messages.inc.php:56 msgid "Show database listing as a list instead of a drop down" -msgstr "" +msgstr "Exibir bancos de dados como uma lista ao invés de uma caixa de seleção" #: libraries/config/messages.inc.php:57 msgid "Display databases as a list" -msgstr "" +msgstr "Exibir bancos de dados como uma lista" #: libraries/config/messages.inc.php:58 msgid "Show server listing as a list instead of a drop down" msgstr "" +"Exibir lista de servidores como uma lista ao invés de uma caixa de seleção" #: libraries/config/messages.inc.php:59 msgid "Display servers as a list" -msgstr "" +msgstr "Exibir servidores como uma lista" #: libraries/config/messages.inc.php:60 msgid "Edit SQL queries in popup window" -msgstr "" +msgstr "Editar consultas SQL em uma janela popup" #: libraries/config/messages.inc.php:61 msgid "Edit in window" @@ -2569,6 +2584,8 @@ msgid "" "Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no " "limit)" msgstr "" +"Define o número de segundos que um script é executado ([kbd]0[/kbd] para sem " +"limite)" #: libraries/config/messages.inc.php:67 msgid "Maximum execution time" @@ -2632,7 +2649,7 @@ msgstr "Substituir NULL por" #: libraries/config/messages.inc.php:76 libraries/config/messages.inc.php:82 msgid "Remove CRLF characters within columns" -msgstr "" +msgstr "Remover caracteres CRLF em colunas" #: libraries/config/messages.inc.php:77 libraries/config/messages.inc.php:243 #: libraries/config/messages.inc.php:251 libraries/import/csv.php:62 @@ -2715,7 +2732,7 @@ msgstr "Tipo de exportação" #: libraries/config/messages.inc.php:112 libraries/config/messages.inc.php:114 msgid "Save on server" -msgstr "" +msgstr "Salvar no servidor" #: libraries/config/messages.inc.php:113 libraries/config/messages.inc.php:115 #: libraries/display_export.lib.php:195 libraries/display_export.lib.php:221 @@ -2740,7 +2757,7 @@ msgstr "Modo de compatibilidade SQL" #: libraries/config/messages.inc.php:120 libraries/config/messages.inc.php:130 msgid "Syntax to use when inserting data" -msgstr "" +msgstr "Sintaxe a utilizar ao inserir dados" #: libraries/config/messages.inc.php:121 msgid "Creation/Update/Check dates" @@ -2782,7 +2799,7 @@ msgstr "Tipo de exportação" #: libraries/config/messages.inc.php:146 msgid "Force secured connection while using phpMyAdmin" -msgstr "" +msgstr "Forçar conexão segura quando usar phpMyAdmin" #: libraries/config/messages.inc.php:147 msgid "Force SSL connection" @@ -2793,26 +2810,30 @@ msgid "" "Sort order for items in a foreign-key dropdown box; [kbd]content[/kbd] is " "the referenced data, [kbd]id[/kbd] is the key value" msgstr "" +"Ordem de classificação para itens em um caixa de seleção de chave " +"estrangeira; [kbd]conteúdo[/kbd] é o dado referenciado, [kbd]id[/kbd] é o " +"valor da chave" #: libraries/config/messages.inc.php:149 msgid "Foreign key dropdown order" -msgstr "" +msgstr "Ordem da caixa de seleção de chave estrangeira" #: libraries/config/messages.inc.php:150 msgid "A dropdown will be used if fewer items are present" msgstr "" +"Uma caixa de seleção será utilizada se poucos itens estiverem presentes" #: libraries/config/messages.inc.php:151 msgid "Foreign key limit" -msgstr "" +msgstr "Limite de chave estrangeira" #: libraries/config/messages.inc.php:152 msgid "Browse mode" -msgstr "" +msgstr "Modo de busca" #: libraries/config/messages.inc.php:153 msgid "Customize browse mode" -msgstr "" +msgstr "Personalizar modo de busca" #: libraries/config/messages.inc.php:155 libraries/config/messages.inc.php:157 #: libraries/config/messages.inc.php:174 libraries/config/messages.inc.php:185 @@ -2832,19 +2853,19 @@ msgstr "CSV" #: libraries/config/messages.inc.php:158 msgid "Developer" -msgstr "" +msgstr "Desenvolvedor" #: libraries/config/messages.inc.php:159 msgid "Settings for phpMyAdmin developers" -msgstr "" +msgstr "Configurações para desenvolvedores phpMyAdmin" #: libraries/config/messages.inc.php:160 msgid "Edit mode" -msgstr "" +msgstr "Modo de edição" #: libraries/config/messages.inc.php:161 msgid "Customize edit mode" -msgstr "" +msgstr "Personalizar modo de edição" #: libraries/config/messages.inc.php:163 #, fuzzy @@ -2867,7 +2888,7 @@ msgstr "Geral" #: libraries/config/messages.inc.php:167 msgid "Set some commonly used options" -msgstr "" +msgstr "Define algumas opções comumente utilizadas" #: libraries/config/messages.inc.php:168 libraries/db_links.inc.php:83 #: libraries/server_links.inc.php:73 libraries/tbl_links.inc.php:82 @@ -2903,7 +2924,7 @@ msgstr "Opções de exportação do Banco de Dados" #: libraries/config/messages.inc.php:177 setup/frames/menu.inc.php:18 msgid "Navigation frame" -msgstr "" +msgstr "Quadro de navegação" #: libraries/config/messages.inc.php:178 msgid "Customize appearance of the navigation frame" @@ -2926,7 +2947,7 @@ msgstr "Opções de exportação do Banco de Dados" #: libraries/config/messages.inc.php:183 setup/frames/menu.inc.php:19 msgid "Main frame" -msgstr "" +msgstr "Quadro principal" #: libraries/config/messages.inc.php:184 msgid "Microsoft Office" @@ -2942,7 +2963,7 @@ msgstr "" #: libraries/config/messages.inc.php:189 msgid "Settings that didn't fit enywhere else" -msgstr "" +msgstr "Configurações que não se encaixavam em nenhum outro lugar" #: libraries/config/messages.inc.php:190 #, fuzzy @@ -4579,7 +4600,7 @@ msgstr "Número de arquivos" #: libraries/display_export.lib.php:162 msgid "Row to begin at:" -msgstr "" +msgstr "Começar na linha:" #: libraries/display_export.lib.php:173 msgid "Dump all rows" @@ -4609,15 +4630,15 @@ msgstr "Nome do arquivo do modelo" #: libraries/display_export.lib.php:229 msgid "@SERVER@ will become the server name" -msgstr "" +msgstr "@SERVER@ se tornará o nome do servidor" #: libraries/display_export.lib.php:231 msgid ", @DATABASE@ will become the database name" -msgstr "" +msgstr ", @DATABASE@ se tornará o nome do banco de dados" #: libraries/display_export.lib.php:233 msgid ", @TABLE@ will become the table name" -msgstr "" +msgstr ", @TABLE@ se tornará o nome da tabela" #: libraries/display_export.lib.php:237 #, fuzzy, php-format @@ -4697,6 +4718,8 @@ msgid "" "Scroll down to fill in the options for the selected format and ignore the " "options for other formats." msgstr "" +"Role para baixo para preencher as opções para o formato selecionado e " +"ignorar as opções de outros formatos." #: libraries/display_export.lib.php:347 libraries/display_import.lib.php:260 #, fuzzy @@ -4745,13 +4768,15 @@ msgstr "Arquivo para importar" #: libraries/display_import.lib.php:156 #, php-format msgid "File may be compressed (%s) or uncompressed." -msgstr "" +msgstr "Arquivo pode ser compactado (%s) ou descompactado." #: libraries/display_import.lib.php:158 msgid "" "A compressed file's name must end in <b>.[format].[compression]</b>. " "Example: <b>.sql.zip</b>" msgstr "" +"O nome de um arquivo compactado deve terminar em <b>.[formato].[compactação]" +"</b>. Exemplo: <b>.sql.zip</b>" #: libraries/display_import.lib.php:178 msgid "File uploads are not allowed on this server." diff --git a/po/sk.po b/po/sk.po index 7017ed2..090f11a 100644 --- a/po/sk.po +++ b/po/sk.po @@ -3786,11 +3786,11 @@ msgstr "Povoliť prihlásenia užívateľa root" #: libraries/config/messages.inc.php:360 msgid "HTTP Basic Auth Realm name to display when doing HTTP Auth" -msgstr "" +msgstr "Názov pre zobrazenie pri použití HTTP autorizácie" #: libraries/config/messages.inc.php:361 msgid "HTTP Realm" -msgstr "" +msgstr "HTTP Realm" #: libraries/config/messages.inc.php:362 msgid "" @@ -4229,6 +4229,10 @@ msgid "" "authentication mode because the password is hard coded in the configuration " "file; this does not limit the ability to execute the same command directly" msgstr "" +"Berte prosím na vedomie, že povolenie tejto voľby nemá žiadny vplyv na " +"prihlasovaciu metódu [kbd]config[/kbd], pretože heslo je uložené v " +"konfiguračnom súbore; toto nemá vplyv na možnosť vykonať rovnaký príkaz " +"priamo" #: libraries/config/messages.inc.php:442 msgid "Show password change form" @@ -4325,6 +4329,8 @@ msgstr "Zobraziť komentáre tabuľky vo vyskakovacom okne nápovedy" msgid "" "Mark used tables and make it possible to show databases with locked tables" msgstr "" +"Označiť použité tabuľky a umožniť zobrazovanie databáz s uzamknutými " +"tabuľkami" #: libraries/config/messages.inc.php:461 #, fuzzy @@ -4376,6 +4382,8 @@ msgid "" "Suggest a database name on the "Create Database" form (if " "possible) or keep the text field empty" msgstr "" +"Navrhnúť mano novej databázy vo formulári pre vytváranie databázy (pokiaľ je " +"to možné) alebo nechať prázdne pole" #: libraries/config/messages.inc.php:474 msgid "Suggest new database name" @@ -4384,6 +4392,8 @@ msgstr "Navrhnúť meno novej databázy" #: libraries/config/messages.inc.php:475 msgid "A warning is displayed on the main page if Suhosin is detected" msgstr "" +"Na hlavnej stránke je zobrazené varovanie pokiaľ je detekované rozšírenie " +"Suhosin" #: libraries/config/messages.inc.php:476 msgid "Suhosin warning" @@ -4394,6 +4404,8 @@ msgid "" "Textarea size (columns) in edit mode, this value will be emphasized for SQL " "query textareas (*2) and for query window (*1.25)" msgstr "" +"Veľkosť editačného okna (počet stĺpcov). Táto hodnota bude zväčšená pre okná " +"SQL dopytov (*2) a pre dopytové okno (*1,25)" #: libraries/config/messages.inc.php:478 #, fuzzy @@ -4406,6 +4418,8 @@ msgid "" "Textarea size (rows) in edit mode, this value will be emphasized for SQL " "query textareas (*2) and for query window (*1.25)" msgstr "" +"Veľkosť editačného okna (počet riadkov). Táto hodnota bude zväčšená pre okná " +"SQL dopytov (*2) a pre dopytové okno (*1,25)" #: libraries/config/messages.inc.php:480 msgid "Textarea rows" @@ -4443,7 +4457,7 @@ msgstr "" #: libraries/config/messages.inc.php:490 msgid "List of trusted proxies for IP allow/deny" -msgstr "" +msgstr "Zoznam dôveryhodných proxy pre povolenie/zakázanie IP adresy" #: libraries/config/messages.inc.php:491 msgid "Directory on server where you can upload files for import" @@ -4466,6 +4480,8 @@ msgid "" "When disabled, users cannot set any of the options below, regardless of the " "checkbox on the right" msgstr "" +"Pokiaľ je vypnuté, užívatelia nemôžu zmeniť žiadne z nižšie uvedených " +"nastavení, bez ohľadu na zaškrtávacie pole vpravo" #: libraries/config/messages.inc.php:496 msgid "Enable the Developer tab in settings" @@ -4503,6 +4519,8 @@ msgid "" "Enable [a@http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression " "for import and export operations" msgstr "" +"Povoliť [a@http://en.wikipedia.org/wiki/ZIP_(súborový_formát)]ZIP[/a] " +"kompresiu pre import a export operácie" #: libraries/config/messages.inc.php:503 msgid "ZIP" @@ -4523,8 +4541,9 @@ msgid "HTTP authentication" msgstr "HTTP overovanie" #: libraries/config/setup.forms.php:51 +#, fuzzy msgid "Signon authentication" -msgstr "" +msgstr "Signon authentication" #: libraries/config/setup.forms.php:240 #: libraries/config/user_preferences.forms.php:144 libraries/import/ldi.php:34 @@ -4594,6 +4613,7 @@ msgstr "Nepodarilo sa pripojiť k zdroju" #: libraries/config/validate.lib.php:234 msgid "Empty username while using config authentication method" msgstr "" +"Pri použití nastavenej autorizačnej metódy nebolo vyplnené užívateľské meno" #: libraries/config/validate.lib.php:238 msgid "Empty signon session name while using signon authentication method" @@ -4625,7 +4645,7 @@ msgstr "en" #: libraries/core.lib.php:278 #, php-format msgid "The %s extension is missing. Please check your PHP configuration." -msgstr "" +msgstr "Chýba rozšírenie %s. Skontrolujte prosín nastavenia PHP." #: libraries/db_events.inc.php:14 libraries/db_events.inc.php:16 #: libraries/export/sql.php:493 @@ -4664,7 +4684,7 @@ msgstr "Oprávnenia" #: libraries/db_routines.inc.php:24 libraries/db_routines.inc.php:26 msgid "Routines" -msgstr "" +msgstr "Rutiny" #: libraries/db_routines.inc.php:37 msgid "Return type" @@ -4779,7 +4799,7 @@ msgstr "" #: libraries/display_export.lib.php:129 msgid "Custom - display all possible options" -msgstr "" +msgstr "Vlastné - zobrazí všetky voľby nastavení" #: libraries/display_export.lib.php:137 #, fuzzy @@ -4817,7 +4837,7 @@ msgstr "Začať od riadku:" #: libraries/display_export.lib.php:173 msgid "Dump all rows" -msgstr "" +msgstr "Vypísať všetky riadky" #: libraries/display_export.lib.php:181 libraries/display_export.lib.php:202 msgid "Output:" @@ -4843,15 +4863,15 @@ msgstr "Vzor pre názov súboru" #: libraries/display_export.lib.php:229 msgid "@SERVER@ will become the server name" -msgstr "" +msgstr "Meno servera bude zmenené na @SERVER@" #: libraries/display_export.lib.php:231 msgid ", @DATABASE@ will become the database name" -msgstr "" +msgstr ", meno databázy bude zmenené na @DATABASE@" #: libraries/display_export.lib.php:233 msgid ", @TABLE@ will become the table name" -msgstr "" +msgstr ", meno tabuľky bude zmenené na @TABLE@" #: libraries/display_export.lib.php:237 #, fuzzy, php-format @@ -4931,6 +4951,8 @@ msgid "" "Scroll down to fill in the options for the selected format and ignore the " "options for other formats." msgstr "" +"Posuňte sa nižšie pre nastavenie vybraného formátu a ignorujte nastavenia " +"ostatných." #: libraries/display_export.lib.php:347 libraries/display_import.lib.php:260 #, fuzzy @@ -4956,6 +4978,8 @@ msgid "" "Please be patient, the file is being uploaded. Details about the upload are " "not available." msgstr "" +"Súbor sa načítava, buďte prosím trpezliví. Podrobnosti o nahrávaní nie sú " +"dostupné." #: libraries/display_import.lib.php:129 #, fuzzy @@ -4991,6 +5015,8 @@ msgid "" "A compressed file's name must end in <b>.[format].[compression]</b>. " "Example: <b>.sql.zip</b>" msgstr "" +"Meno komprimovaného súboru musí končiť na <b>.[formát].[kompresia]</b>. " +"Napríklad: <b>.sql.zip</b>" #: libraries/display_import.lib.php:178 msgid "File uploads are not allowed on this server." @@ -5115,11 +5141,11 @@ msgstr "Relačná schéma" #: libraries/display_tbl.lib.php:586 msgid "Show binary contents" -msgstr "" +msgstr "Zobraziť binárny obsah" #: libraries/display_tbl.lib.php:588 msgid "Show BLOB contents" -msgstr "" +msgstr "Zobraziť obsah BLOBu" #: libraries/display_tbl.lib.php:598 libraries/relation.lib.php:123 #: libraries/tbl_properties.inc.php:142 transformation_overview.php:46 @@ -5128,7 +5154,7 @@ msgstr "Transformácia pri prehliadaní" #: libraries/display_tbl.lib.php:1194 msgid "Copy" -msgstr "" +msgstr "Kopírovať" #: libraries/display_tbl.lib.php:1209 libraries/display_tbl.lib.php:1221 msgid "The row has been deleted" @@ -5370,11 +5396,12 @@ msgstr "" #: libraries/engines/pbms.lib.php:30 msgid "Garbage Threshold" -msgstr "" +msgstr "Hranica odpadu" #: libraries/engines/pbms.lib.php:31 msgid "The percentage of garbage in a repository file before it is compacted." msgstr "" +"Percentuílny podiel odpadu v úložnom súbore predtým, než je súbor zhustený." #: libraries/engines/pbms.lib.php:35 libraries/replication_gui.lib.php:69 #: server_synchronize.php:1178 @@ -5389,7 +5416,7 @@ msgstr "" #: libraries/engines/pbms.lib.php:40 msgid "Repository Threshold" -msgstr "" +msgstr "Hranica veľkosti úložiska" #: libraries/engines/pbms.lib.php:41 msgid "" @@ -5882,7 +5909,7 @@ msgstr "PREPOJENIA PRE TABUĽKU" #: libraries/export/sql.php:873 libraries/export/xml.php:38 #: libraries/tbl_triggers.lib.php:18 msgid "Triggers" -msgstr "" +msgstr "Spúšťače" #: libraries/export/sql.php:885 #, fuzzy hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11684-gd553062
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via d55306252b4a8b4389dfaa0245a3aab6ed0b6376 (commit) from 3f8badd37f3e7ea78a718660e615ecf1c856e2f0 (commit) - Log ----------------------------------------------------------------- commit d55306252b4a8b4389dfaa0245a3aab6ed0b6376 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 10:08:22 2011 +0200 Replace tabs with spaces, cleanup identation ----------------------------------------------------------------------- Summary of changes: Documentation.html | 52 ++-- db_qbe.php | 2 +- import_status.php | 4 +- js/db_structure.js | 4 +- js/server_status.js | 12 +- js/tbl_chart.js | 2 +- js/tbl_select.js | 2 +- js/tbl_structure.js | 8 +- libraries/StorageEngine.class.php | 30 ++-- libraries/Tracker.class.php | 2 +- libraries/auth/http.auth.lib.php | 2 +- libraries/auth/signon.auth.lib.php | 2 +- libraries/common.inc.php | 4 +- libraries/config.values.php | 8 +- libraries/config/FormDisplay.class.php | 4 +- libraries/config/config_functions.lib.php | 6 +- libraries/config/setup.forms.php | 2 +- libraries/config/validate.lib.php | 8 +- libraries/display_import_ajax.lib.php | 8 +- libraries/import/upload/apc.php | 2 +- libraries/import/upload/noplugin.php | 2 +- libraries/import/upload/uploadprogress.php | 2 +- libraries/mult_submits.inc.php | 22 +- libraries/replication.inc.php | 62 +++--- libraries/replication_gui.lib.php | 12 +- libraries/rte/rte_main.inc.php | 6 +- navigation.php | 12 +- pmd_common.php | 6 +- scripts/create-release.sh | 6 +- server_privileges.php | 6 +- server_status.php | 164 ++++++------ setup/frames/index.inc.php | 12 +- setup/frames/menu.inc.php | 14 +- setup/lib/form_processing.lib.php | 6 +- setup/scripts.js | 8 +- sql.php | 2 +- tbl_chart.php | 2 +- tbl_printview.php | 2 +- .../common/PMA_localisedDateTimespan_test.php | 14 +- .../libraries/common/PMA_stringOperations_test.php | 8 +- test/selenium/PmaSeleniumTestCase.php | 6 +- themes/pmahomme/css/theme_left.css.php | 24 +- themes/pmahomme/css/theme_right.css.php | 264 ++++++++++---------- 43 files changed, 413 insertions(+), 413 deletions(-) diff --git a/Documentation.html b/Documentation.html index 6a8d5dc..33bfa85 100644 --- a/Documentation.html +++ b/Documentation.html @@ -59,10 +59,10 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <ul><li><b>PHP</b> <ul><li>You need PHP 5.2.0 or newer, with <tt>session</tt> support (<a href="#faq1_31">see - <abbr title="Frequently Asked Questions">FAQ</abbr> 1.31</a>) - , the Standard PHP Library (SPL) extension and JSON support. + <abbr title="Frequently Asked Questions">FAQ</abbr> 1.31</a>) + , the Standard PHP Library (SPL) extension and JSON support. </li> - <li>To support uploading of ZIP files, you need the PHP <tt>zip</tt> extension.</li> + <li>To support uploading of ZIP files, you need the PHP <tt>zip</tt> extension.</li> <li>For proper support of multibyte strings (eg. UTF-8, which is currently the default), you should install the mbstring and ctype extensions. @@ -778,7 +778,7 @@ since this link provides funding for phpMyAdmin. Please see the <a href="#setup">install section</a> on "Using authentication modes" for more information. - </dd> + </dd> <dt id="servers_auth_http_realm"> <span id="cfg_Servers_auth_http_realm">$cfg['Servers'][$i]['auth_http_realm']</span> string<br /> </dt> @@ -1244,10 +1244,10 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> </dd> <dt><span id="cfg_Servers_AllowNoPassword">$cfg['Servers'][$i]['AllowNoPassword']</span> boolean</dt> - <dd>Whether to allow logins without a password. The default - value of <tt>false</tt> for this parameter prevents unintended access - to a MySQL server with was left with an empty password for root or - on which an anonymous (blank) user is defined. + <dd>Whether to allow logins without a password. The default + value of <tt>false</tt> for this parameter prevents unintended access + to a MySQL server with was left with an empty password for root or + on which an anonymous (blank) user is defined. </dd> <dt id="servers_allowdeny_order"> <span id="cfg_Servers_AllowDeny_order">$cfg['Servers'][$i]['AllowDeny']['order']</span> string @@ -2078,14 +2078,14 @@ $cfg['TrustedProxies'] = This is needed for native MS Excel export, see <a href="#faq6_23"><abbr title="Frequently Asked Questions">FAQ</abbr> - 6.23</a> and to work around limitations of - <tt>open_basedir</tt> for uploaded + 6.23</a> and to work around limitations of + <tt>open_basedir</tt> for uploaded files, see <a href="#faq1_11"><abbr title="Frequently Asked Questions">FAQ</abbr> 1.11</a>. <br /><br /> - If the directory where phpMyAdmin is installed is subject to an - <tt>open_basedir</tt> restriction, you need to create a + If the directory where phpMyAdmin is installed is subject to an + <tt>open_basedir</tt> restriction, you need to create a temporary directory in some directory accessible by the web server. However for security reasons, this directory should be outside the tree published by webserver. If you cannot avoid having this @@ -3105,7 +3105,7 @@ RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization},L] <p> You can also disable the warning using the <a href="#cfg_SuhosinDisableWarning"> - <tt>SuhosinDisableWarning</tt> directive</a>. + <tt>SuhosinDisableWarning</tt> directive</a>. </p> <h4 id="faq1_39"> @@ -3120,7 +3120,7 @@ in your Apache configuration. See <a href="http://httpd.apache.org/docs/2.0/mod/ <a href="#faq1_40">1.40 When accessing phpMyAdmin via an Apache reverse proxy, cookie login does not work.</a></h4> <p>To be able to use cookie auth Apache must know that it has to rewrite the set-cookie headers.<br /> - Example from the Apache 2.2 documentation:</p> + Example from the Apache 2.2 documentation:</p> <pre> ProxyPass /mirror/foo/ http://backend.example.com/ ProxyPassReverse /mirror/foo/ http://backend.example.com/ @@ -3129,9 +3129,9 @@ ProxyPassReverseCookiePath / /mirror/foo/ </pre> <p>Note: if the backend url looks like http://host/~user/phpmyadmin, - the tilde (~) must be url encoded as %7E in the ProxyPassReverse* lines. - This is not specific to phpmyadmin, it's just the behavior of Apache. - </p> + the tilde (~) must be url encoded as %7E in the ProxyPassReverse* lines. + This is not specific to phpmyadmin, it's just the behavior of Apache. + </p> <pre> ProxyPass /mirror/foo/ http://backend.example.com/~user/phpmyadmin @@ -3140,12 +3140,12 @@ http://backend.example.com/%7Euser/phpmyadmin ProxyPassReverseCookiePath /%7Euser/phpmyadmin /mirror/foo </pre> - <p>See <a href="http://httpd.apache.org/docs/2.2/mod/mod_proxy.html">http://httpd.apache.org/docs/2.2/mod/mod_proxy.html</a> - for more details.</p> + <p>See <a href="http://httpd.apache.org/docs/2.2/mod/mod_proxy.html">http://httpd.apache.org/docs/2.2/mod/mod_proxy.html</a> + for more details.</p> <h4 id="faq1_41"> - <a href="#faq1_41">1.41 When I view a database and ask to see its - privileges, I get an error about an unknown column.</a></h4> + <a href="#faq1_41">1.41 When I view a database and ask to see its + privileges, I get an error about an unknown column.</a></h4> <p> The MySQL server's privilege tables are not up to date, you need to run the <tt>mysql_upgrade</tt> command on the server.</p> @@ -4294,7 +4294,7 @@ chmod o+rwx tmp ones is done whenever you enter Structure page for this table.</p> <h4 id="faq6_25"> - <a href="#faq6_25">6.25 How does BLOB streaming work in phpMyAdmin?</a></h4> + <a href="#faq6_25">6.25 How does BLOB streaming work in phpMyAdmin?</a></h4> <p> For general information about BLOB streaming on MySQL, visit <a href="http://blobstreaming.org">blobstreaming.org</a>. You need the following components:</p> <ul> @@ -4308,11 +4308,11 @@ chmod o+rwx tmp <p>Here are details about configuration and operation:</p> <ol> - <li>In <tt>config.inc.php</tt> your host should be defined with a FQDN (fully qualified domain name) instead of "localhost".</li> + <li>In <tt>config.inc.php</tt> your host should be defined with a FQDN (fully qualified domain name) instead of "localhost".</li> <li>Ensure that your target table is under the <tt>PBXT</tt> storage engine and has a <tt>LONGBLOB</tt> column (which must be nullable if you want to remove the BLOB reference from it).</li> - <li>When you insert or update a row in this table, put a checkmark on the "Upload to BLOB repository" optional choice; otherwise, the upload will be done directly in your LONGBLOB column instead of the repository.</li> - <li>Finally when you browse your table, you'll see in your column a link to stream your data, for example "View image". A header containing the correct MIME-type will be sent to your browser; this MIME-type was stored at upload time.</li> -</ol> + <li>When you insert or update a row in this table, put a checkmark on the "Upload to BLOB repository" optional choice; otherwise, the upload will be done directly in your LONGBLOB column instead of the repository.</li> + <li>Finally when you browse your table, you'll see in your column a link to stream your data, for example "View image". A header containing the correct MIME-type will be sent to your browser; this MIME-type was stored at upload time.</li> +</ol> <h4 id="faq6_26"> <a href="#faq6_26">6.26 How can I select a range of rows?</a></h4> diff --git a/db_qbe.php b/db_qbe.php index 42f6123..2ab7f27 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -182,7 +182,7 @@ function showColumnSelectCell($columns, $column_number, $selected = '') if (isset($tab_designer['link'])) { ?> <div id="visual_builder_anchor" class="notice hide"> - <span id="footnote_1"> + <span id="footnote_1"> <?php echo __('Switch to') . ' <a href="' . $tab_designer['link'] . PMA_get_arg_separator('html') . 'query=1">' . __('visual builder') . '</a>'; ?> </span> </div> diff --git a/import_status.php b/import_status.php index d739009..7c77e31 100644 --- a/import_status.php +++ b/import_status.php @@ -18,7 +18,7 @@ if (isset($GLOBALS["message"]) && $GLOBALS["message"]) { header('Content-type: text/html'); // wait 0.3 sec before we check for $_SESSION variable, which is set inside import.php - usleep(300000); + usleep(300000); // wait until message is available while ($_SESSION['Import_message']['message'] == null) { @@ -27,7 +27,7 @@ if (isset($GLOBALS["message"]) && $GLOBALS["message"]) { echo $_SESSION['Import_message']['message']; echo '<fieldset class="tblFooters">' . "\n"; - echo ' [ <a href="' . $_SESSION['Import_message']['go_back_url'] . '">' . __('Back') . '</a> ]' . "\n"; + echo ' [ <a href="' . $_SESSION['Import_message']['go_back_url'] . '">' . __('Back') . '</a> ]' . "\n"; echo '</fieldset>'."\n"; } else { diff --git a/js/db_structure.js b/js/db_structure.js index efc8f2a..559819e 100644 --- a/js/db_structure.js +++ b/js/db_structure.js @@ -69,8 +69,8 @@ $(document).ready(function() { if ($("#insert_table_dialog").length > 0) { $("#insert_table_dialog").remove(); } - var $div = $('<div id="insert_table_dialog"></div>'); - var target = "tbl_change.php"; + var $div = $('<div id="insert_table_dialog"></div>'); + var target = "tbl_change.php"; /** * @var button_options Object that stores the options passed to jQueryUI diff --git a/js/server_status.js b/js/server_status.js index 4a61bfe..ed61204 100644 --- a/js/server_status.js +++ b/js/server_status.js @@ -406,7 +406,7 @@ $(function() { } } } - }, + }, tooltip: { formatter: function() { return '<b>' + this.point.name + '</b><br/>' + Highcharts.numberFormat(this.y, 2) + '<br/>(' + Highcharts.numberFormat(this.percentage, 2) + ' %)'; @@ -1576,12 +1576,12 @@ $(function() { if(data.numRows > 12) { $('div#logTable').prepend( '<fieldset id="logDataFilter">' + - ' <legend>Filters</legend>' + - ' <div class="formelement">' + - ' <label for="filterQueryText">Filter queries by word/regexp:</label>' + - ' <input name="filterQueryText" type="text" id="filterQueryText" style="vertical-align: baseline;" />' + + ' <legend>Filters</legend>' + + ' <div class="formelement">' + + ' <label for="filterQueryText">Filter queries by word/regexp:</label>' + + ' <input name="filterQueryText" type="text" id="filterQueryText" style="vertical-align: baseline;" />' + ((data.numRows > 250) ? ' <button name="startFilterQueryText" id="startFilterQueryText">Filter</button>' : '') + - ' </div>' + + ' </div>' + '</fieldset>' ); diff --git a/js/tbl_chart.js b/js/tbl_chart.js index 3c406d9..16a83b0 100644 --- a/js/tbl_chart.js +++ b/js/tbl_chart.js @@ -22,7 +22,7 @@ $(document).ready(function() { false ); } - }); + }); var currentSettings = { chart: { diff --git a/js/tbl_select.js b/js/tbl_select.js index 8d3049a..cb0c670 100644 --- a/js/tbl_select.js +++ b/js/tbl_select.js @@ -70,7 +70,7 @@ $(document).ready(function() { $("#sqlqueryresults").trigger('makegrid'); $('#tbl_search_form') // work around for bug #3168569 - Issue on toggling the "Hide search criteria" in chrome. - .slideToggle() + .slideToggle() .hide(); $('#togglesearchformlink') // always start with the Show message diff --git a/js/tbl_structure.js b/js/tbl_structure.js index 2d7f471..69f872d 100644 --- a/js/tbl_structure.js +++ b/js/tbl_structure.js @@ -342,10 +342,10 @@ $(document).ready(function() { /** * Loads the append_fields_form to the Change dialog allowing users * to change the columns - * @param string action Variable which parses the name of the - * destination file - * @param string $url Variable which parses the data for the - * post action + * @param string action Variable which parses the name of the + * destination file + * @param string $url Variable which parses the data for the + * post action */ function changeColumns(action,url) { /*Remove the hidden dialogs if there are*/ diff --git a/libraries/StorageEngine.class.php b/libraries/StorageEngine.class.php index bf5de9d..e5c03b5 100644 --- a/libraries/StorageEngine.class.php +++ b/libraries/StorageEngine.class.php @@ -186,20 +186,20 @@ class PMA_StorageEngine return $ret; } - /** - * returns the engine specific handling for - * PMA_ENGINE_DETAILS_TYPE_SIZE type variables. - * - * This function should be overridden when - * PMA_ENGINE_DETAILS_TYPE_SIZE type needs to be - * handled differently for a particular engine. - * - * @return string the formatted value and its unit - */ - function resolveTypeSize($value) - { - return PMA_formatByteDown($value); - } + /** + * returns the engine specific handling for + * PMA_ENGINE_DETAILS_TYPE_SIZE type variables. + * + * This function should be overridden when + * PMA_ENGINE_DETAILS_TYPE_SIZE type needs to be + * handled differently for a particular engine. + * + * @return string the formatted value and its unit + */ + function resolveTypeSize($value) + { + return PMA_formatByteDown($value); + } /** * returns array with detailed info about engine specific server variables @@ -276,7 +276,7 @@ class PMA_StorageEngine } } else { $this->engine_init(); - } + } } /** diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php index c82d0d9..947044a 100644 --- a/libraries/Tracker.class.php +++ b/libraries/Tracker.class.php @@ -472,7 +472,7 @@ class PMA_Tracker * @param string $dbname name of database * @param string $tablename name of table * @param string $version version - * @param string $type type of data(DDL || DML) + * @param string $type type of data(DDL || DML) * @param string || array $new_data the new tracking data * * @return bool result of change diff --git a/libraries/auth/http.auth.lib.php b/libraries/auth/http.auth.lib.php index f4157b6..b31d327 100644 --- a/libraries/auth/http.auth.lib.php +++ b/libraries/auth/http.auth.lib.php @@ -42,7 +42,7 @@ function PMA_auth() header('WWW-Authenticate: Basic realm="' . $realm_message . '"'); header('HTTP/1.0 401 Unauthorized'); if (php_sapi_name() !== 'cgi-fcgi') { - header('status: 401 Unauthorized'); + header('status: 401 Unauthorized'); } // Defines the charset to be used diff --git a/libraries/auth/signon.auth.lib.php b/libraries/auth/signon.auth.lib.php index e095829..a829faa 100644 --- a/libraries/auth/signon.auth.lib.php +++ b/libraries/auth/signon.auth.lib.php @@ -121,7 +121,7 @@ function PMA_auth_check() } } if (isset($_SESSION['PMA_single_signon_host'])) { - $single_signon_host = $_SESSION['PMA_single_signon_host']; + $single_signon_host = $_SESSION['PMA_single_signon_host']; } if (isset($_SESSION['PMA_single_signon_port'])) { diff --git a/libraries/common.inc.php b/libraries/common.inc.php index daf1173..53cde17 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -997,9 +997,9 @@ PMA_Tracker::enable(); * true */ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { - $GLOBALS['is_ajax_request'] = true; + $GLOBALS['is_ajax_request'] = true; } else { - $GLOBALS['is_ajax_request'] = false; + $GLOBALS['is_ajax_request'] = false; } /** diff --git a/libraries/config.values.php b/libraries/config.values.php index 0e72064..7f81924 100644 --- a/libraries/config.values.php +++ b/libraries/config.values.php @@ -68,10 +68,10 @@ $cfg_db['DefaultTabTable'] = array( 'tbl_change.php', // insert row page 'sql.php'); // browse page $cfg_db['QueryWindowDefTab'] = array( - 'sql', // SQL - 'files', // Import files - 'history', // SQL history - 'full'); // All (SQL and SQL history) + 'sql', // SQL + 'files', // Import files + 'history', // SQL history + 'full'); // All (SQL and SQL history) $cfg_db['InitialSlidersState'] = array('open' => __('Open'), 'closed' => __('Closed')); $cfg_db['Import']['format'] = array( 'csv', // CSV diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php index 840d760..3725878 100644 --- a/libraries/config/FormDisplay.class.php +++ b/libraries/config/FormDisplay.class.php @@ -334,8 +334,8 @@ class FormDisplay } return; case 'NULL': - trigger_error("Field $system_path has no type", E_USER_WARNING); - return; + trigger_error("Field $system_path has no type", E_USER_WARNING); + return; } // TrustedProxies requires changes before displaying diff --git a/libraries/config/config_functions.lib.php b/libraries/config/config_functions.lib.php index 8aac9ef..31d4305 100644 --- a/libraries/config/config_functions.lib.php +++ b/libraries/config/config_functions.lib.php @@ -67,9 +67,9 @@ function PMA_lang($lang_key) function PMA_lang_name($canonical_path, $type = 'name', $default = 'key') { $lang_key = str_replace( - array('Servers/1/', '/'), - array('Servers/', '_'), - $canonical_path) . '_' . $type; + array('Servers/1/', '/'), + array('Servers/', '_'), + $canonical_path) . '_' . $type; return isset($GLOBALS["strConfig$lang_key"]) ? ($type == 'desc' ? PMA_lang($lang_key) : $GLOBALS["strConfig$lang_key"]) : ($default == 'key' ? $lang_key : $default); diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php index 5598b93..5f3f729 100644 --- a/libraries/config/setup.forms.php +++ b/libraries/config/setup.forms.php @@ -224,7 +224,7 @@ $forms['Main_frame']['Tabs'] = array( 'DefaultTabServer', 'DefaultTabDatabase', 'DefaultTabTable', - 'QueryWindowDefTab'); + 'QueryWindowDefTab'); $forms['Import']['Import_defaults'] = array('Import' => array( 'format', 'charset', diff --git a/libraries/config/validate.lib.php b/libraries/config/validate.lib.php index bcd62ae..163ff87 100644 --- a/libraries/config/validate.lib.php +++ b/libraries/config/validate.lib.php @@ -132,7 +132,7 @@ function PMA_config_validate($validator_id, &$values, $isPostSource) /** * Empty error handler, used to temporarily restore PHP internal error handler - * + * * @return bool */ function PMA_null_error_handler() @@ -337,8 +337,8 @@ function validate_trusted_proxies($path, $values) $lines = array(); foreach ($values[$path] as $ip => $v) { $lines[] = preg_match('/^-\d+$/', $ip) - ? $v - : $ip . ': ' . $v; + ? $v + : $ip . ': ' . $v; } } else { // AJAX validation @@ -441,7 +441,7 @@ function validate_by_regex($path, $values, $regex) /** * Validates upper bound for numeric inputs - * + * * @param string $path * @param array $values * @param int $max_value diff --git a/libraries/display_import_ajax.lib.php b/libraries/display_import_ajax.lib.php index 1a3f9db..e10a9ea 100644 --- a/libraries/display_import_ajax.lib.php +++ b/libraries/display_import_ajax.lib.php @@ -27,10 +27,10 @@ $upload_id = uniqid(""); * list of available plugins */ $plugins = array( - "uploadprogress", - "apc", - "noplugin" - ); // available plugins. Each plugin has own checkfunction in display_import_ajax.lib.php and own file with functions in upload_#KEY#.php + "uploadprogress", + "apc", + "noplugin" + ); // available plugins. Each plugin has own checkfunction in display_import_ajax.lib.php and own file with functions in upload_#KEY#.php // select available plugin foreach ($plugins as $plugin) { diff --git a/libraries/import/upload/apc.php b/libraries/import/upload/apc.php index 79d435b..a308b1b 100644 --- a/libraries/import/upload/apc.php +++ b/libraries/import/upload/apc.php @@ -30,7 +30,7 @@ function PMA_getUploadStatus($id) { 'percent' => 0, 'total' => 0, 'complete' => 0, - 'plugin' => $ID_KEY + 'plugin' => $ID_KEY ); } $ret = $_SESSION[$SESSION_KEY][$id]; diff --git a/libraries/import/upload/noplugin.php b/libraries/import/upload/noplugin.php index 6cce9ad..a3cb19a 100644 --- a/libraries/import/upload/noplugin.php +++ b/libraries/import/upload/noplugin.php @@ -30,7 +30,7 @@ function PMA_getUploadStatus($id) { 'percent' => 0, 'total' => 0, 'complete' => 0, - 'plugin' => $ID_KEY + 'plugin' => $ID_KEY ); } $ret = $_SESSION[$SESSION_KEY][$id]; diff --git a/libraries/import/upload/uploadprogress.php b/libraries/import/upload/uploadprogress.php index cc7eb27..797ade7 100644 --- a/libraries/import/upload/uploadprogress.php +++ b/libraries/import/upload/uploadprogress.php @@ -30,7 +30,7 @@ function PMA_getUploadStatus($id) { 'percent' => 0, 'total' => 0, 'complete' => 0, - 'plugin' => $ID_KEY + 'plugin' => $ID_KEY ); } $ret = $_SESSION[$SESSION_KEY][$id]; diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 1d3cbd5..3339aaf 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -278,17 +278,17 @@ if (!empty($submit_mult) && !empty($what)) { <?php } else { ?> - <fieldset class="confirmation"> - <legend><?php echo ($what == 'drop_db' ? __('You are about to DESTROY a complete database!') . ' ' : '') . __('Do you really want to '); ?>:</legend> - <tt><?php echo $full_query; ?></tt> - </fieldset> - <fieldset class="tblFooters"> - <input type="submit" name="mult_btn" value="<?php echo __('Yes'); ?>" id="buttonYes" /> - <input type="submit" name="mult_btn" value="<?php echo __('No'); ?>" id="buttonNo" /> - </fieldset> + <fieldset class="confirmation"> + <legend><?php echo ($what == 'drop_db' ? __('You are about to DESTROY a complete database!') . ' ' : '') . __('Do you really want to '); ?>:</legend> + <tt><?php echo $full_query; ?></tt> + </fieldset> + <fieldset class="tblFooters"> + <input type="submit" name="mult_btn" value="<?php echo __('Yes'); ?>" id="buttonYes" /> + <input type="submit" name="mult_btn" value="<?php echo __('No'); ?>" id="buttonNo" /> + </fieldset> <?php - } - require './libraries/footer.inc.php'; + } + require './libraries/footer.inc.php'; } // end if @@ -422,7 +422,7 @@ elseif ($mult_btn == __('Yes')) { . (($i == $selected_cnt-1) ? ');' : ''); break; - case 'add_prefix_tbl': + case 'add_prefix_tbl': $newtablename = $add_prefix . $selected[$i]; $a_query = 'ALTER TABLE ' . PMA_backquote($selected[$i]) . ' RENAME ' . PMA_backquote($newtablename) ; // ADD PREFIX TO TABLE NAME $run_parts = true; diff --git a/libraries/replication.inc.php b/libraries/replication.inc.php index 45fd07d..2b4309b 100644 --- a/libraries/replication.inc.php +++ b/libraries/replication.inc.php @@ -12,14 +12,14 @@ if (! defined('PHPMYADMIN')) { /** * get master replication from server */ -$server_master_replication = PMA_DBI_fetch_result('SHOW MASTER STATUS'); +$server_master_replication = PMA_DBI_fetch_result('SHOW MASTER STATUS'); /** * get slave replication from server */ $server_slave_replication = PMA_DBI_fetch_result('SHOW SLAVE STATUS'); -/** +/** * replication types */ $replication_types = array('master', 'slave'); @@ -108,28 +108,28 @@ foreach ($replication_types as $type) { if (${"server_{$type}_status"}) { if ($type == "master") { ${"server_{$type}_Do_DB"} = explode(",", $server_master_replication[0]["Binlog_Do_DB"]); - $replication_info[$type]['Do_DB'] = ${"server_{$type}_Do_DB"}; + $replication_info[$type]['Do_DB'] = ${"server_{$type}_Do_DB"}; ${"server_{$type}_Ignore_DB"} = explode(",", $server_master_replication[0]["Binlog_Ignore_DB"]); - $replication_info[$type]['Ignore_DB'] = ${"server_{$type}_Ignore_DB"}; + $replication_info[$type]['Ignore_DB'] = ${"server_{$type}_Ignore_DB"}; } elseif ($type == "slave") { ${"server_{$type}_Do_DB"} = explode(",", $server_slave_replication[0]["Replicate_Do_DB"]); - $replication_info[$type]['Do_DB'] = ${"server_{$type}_Do_DB"}; + $replication_info[$type]['Do_DB'] = ${"server_{$type}_Do_DB"}; ${"server_{$type}_Ignore_DB"} = explode(",", $server_slave_replication[0]["Replicate_Ignore_DB"]); - $replication_info[$type]['Ignore_DB'] = ${"server_{$type}_Ignore_DB"}; + $replication_info[$type]['Ignore_DB'] = ${"server_{$type}_Ignore_DB"}; ${"server_{$type}_Do_Table"} = explode(",", $server_slave_replication[0]["Replicate_Do_Table"]); - $replication_info[$type]['Do_Table'] = ${"server_{$type}_Do_Table"}; + $replication_info[$type]['Do_Table'] = ${"server_{$type}_Do_Table"}; ${"server_{$type}_Ignore_Table"} = explode(",", $server_slave_replication[0]["Replicate_Ignore_Table"]); - $replication_info[$type]['Ignore_Table'] = ${"server_{$type}_Ignore_Table"}; + $replication_info[$type]['Ignore_Table'] = ${"server_{$type}_Ignore_Table"}; ${"server_{$type}_Wild_Do_Table"} = explode(",", $server_slave_replication[0]["Replicate_Wild_Do_Table"]); - $replication_info[$type]['Wild_Do_Table'] = ${"server_{$type}_Wild_Do_Table"}; + $replication_info[$type]['Wild_Do_Table'] = ${"server_{$type}_Wild_Do_Table"}; ${"server_{$type}_Wild_Ignore_Table"} = explode(",", $server_slave_replication[0]["Replicate_Wild_Ignore_Table"]); - $replication_info[$type]['Wild_Ignore_Table'] = ${"server_{$type}_Wild_Ignore_Table"}; + $replication_info[$type]['Wild_Ignore_Table'] = ${"server_{$type}_Wild_Ignore_Table"}; } } } @@ -208,7 +208,7 @@ function PMA_replication_slave_change_master($user, $password, $host, $port, $po * @param String $host - mysql server's hostname or IP * @param int $port - mysql remote port * @param String $socket - path to unix socket - * + * * @return mixed $link mysql link on success */ function PMA_replication_connect_to_master($user, $password, $host = null, $port = null, $socket = null) { @@ -217,7 +217,7 @@ function PMA_replication_connect_to_master($user, $password, $host = null, $port $server["port"] = $port; $server["socket"] = $socket; - // 5th parameter set to true means that it's an auxiliary connection + // 5th parameter set to true means that it's an auxiliary connection // and we must not go back to login page if it fails return PMA_DBI_connect($user, $password, false, $server, true); } @@ -239,7 +239,7 @@ function PMA_replication_slave_bin_log_master($link = null) { /** * Get list of replicated databases on master server - * + * * @param mixed mysql link * * @return array array of replicated databases @@ -272,13 +272,13 @@ function PMA_replication_master_replicated_dbs($link = null) { if (array_search($tmp_row[0], $do_db) !== false) { $dblist[] = $tmp_row[0]; } - } + } } // end while return $link; } /** - * This function provides synchronization of structure and data between two mysql servers. + * This function provides synchronization of structure and data between two mysql servers. * TODO: improve code sharing between the function and synchronization * * @param String $db - name of database, which should be synchronized @@ -300,8 +300,8 @@ function PMA_replication_synchronize_db($db, $src_link, $trg_link, $data = true) $target_tables_num = sizeof($trg_tables); /** - * initializing arrays to save table names - */ + * initializing arrays to save table names + */ $unmatched_num_src = 0; $source_tables_uncommon = array(); $unmatched_num_trg = 0; @@ -313,7 +313,7 @@ function PMA_replication_synchronize_db($db, $src_link, $trg_link, $data = true) * Criterion for matching tables is just their names. * Finding the uncommon tables for the source database * BY comparing the matching tables with all the tables in the source database - */ + */ PMA_getMatchingTables($trg_tables, $src_tables, $matching_tables, $source_tables_uncommon); /** @@ -323,10 +323,10 @@ function PMA_replication_synchronize_db($db, $src_link, $trg_link, $data = true) PMA_getNonMatchingTargetTables($trg_tables, $matching_tables, $target_tables_uncommon); /** - * - * Comparing Data In the Matching Tables - * It is assumed that the matching tables are structurally - * and typely exactly the same + * + * Comparing Data In the Matching Tables + * It is assumed that the matching tables are structurally + * and typely exactly the same */ $fields_num = array(); $matching_tables_fields = array(); @@ -344,7 +344,7 @@ function PMA_replication_synchronize_db($db, $src_link, $trg_link, $data = true) } for ($j = 0; $j < sizeof($source_tables_uncommon); $j++) { PMA_dataDiffInUncommonTables($source_tables_uncommon, $src_db, $src_link, $j, $row_count); - } + } /** * INTEGRATION OF STRUCTURE DIFFERENCE CODE @@ -354,7 +354,7 @@ function PMA_replication_synchronize_db($db, $src_link, $trg_link, $data = true) $target_columns = array(); $alter_str_array = array(array()); $add_column_array = array(array()); - $uncommon_columns = array(); + $uncommon_columns = array(); $target_tables_keys = array(); $source_indexes = array(); $target_indexes = array(); @@ -364,11 +364,11 @@ function PMA_replication_synchronize_db($db, $src_link, $trg_link, $data = true) for ($counter = 0; $counter < $matching_tables_num; $counter++) { PMA_structureDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matching_tables, $source_columns, - $target_columns, $alter_str_array, $add_column_array, $uncommon_columns, $criteria, $target_tables_keys, $counter); + $target_columns, $alter_str_array, $add_column_array, $uncommon_columns, $criteria, $target_tables_keys, $counter); PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matching_tables, $source_indexes, $target_indexes, - $add_indexes_array, $alter_indexes_array,$remove_indexes_array, $counter); - } + $add_indexes_array, $alter_indexes_array,$remove_indexes_array, $counter); + } $matching_table_data_diff = array(); $matching_table_structure_diff = array(); @@ -377,14 +377,14 @@ function PMA_replication_synchronize_db($db, $src_link, $trg_link, $data = true) $uncommon_tables = $source_tables_uncommon; /** - * Generating Create Table query for all the non-matching tables present in Source but not in Target and populating tables. - */ - for($q = 0; $q < sizeof($source_tables_uncommon); $q++) { + * Generating Create Table query for all the non-matching tables present in Source but not in Target and populating tables. + */ + for($q = 0; $q < sizeof($source_tables_uncommon); $q++) { if (isset($uncommon_tables[$q])) { PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, $source_tables_uncommon, $q, $uncommon_tables_fields, false); } if (isset($row_count[$q]) && $data) { - PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $source_tables_uncommon, $q, $uncommon_tables_fields, false); + PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $source_tables_uncommon, $q, $uncommon_tables_fields, false); } } } diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php index ac80467..3e8e687 100644 --- a/libraries/replication_gui.lib.php +++ b/libraries/replication_gui.lib.php @@ -113,8 +113,8 @@ function PMA_replication_print_status_table($type, $hidden = false, $title = tru echo ' <table id="server' . $type . 'replicationsummary" class="data"> '; echo ' <thead>'; echo ' <tr>'; - echo ' <th>' . __('Variable') . '</th>'; - echo ' <th>' . __('Value') . '</th>'; + echo ' <th>' . __('Variable') . '</th>'; + echo ' <th>' . __('Value') . '</th>'; echo ' </tr>'; echo ' </thead>'; echo ' <tbody>'; @@ -239,11 +239,11 @@ function PMA_replication_gui_master_addslaveuser() { echo PMA_generate_common_hidden_inputs('', ''); echo '<fieldset id="fieldset_add_user_login">' . '<legend>'.__('Add slave replication user').'</legend>' - . '<input type="hidden" name="grant_count" value="25" />' - . '<input type="hidden" name="createdb" id="createdb_0" value="0" />' + . '<input type="hidden" name="grant_count" value="25" />' + . '<input type="hidden" name="createdb" id="createdb_0" value="0" />' . '<input id="checkbox_Repl_slave_priv" type="hidden" title="Needed for the replication slaves." value="Y" name="Repl_slave_priv"/>' . '<input id="checkbox_Repl_client_priv" type="hidden" title="Needed for the replication slaves." value="Y" name="Repl_client_priv"/>' - . '' + . '' . '<input type="hidden" name="sr_take_action" value="true" />' . '<div class="item">' . '<label for="select_pred_username">' @@ -305,7 +305,7 @@ function PMA_replication_gui_master_addslaveuser() { . ' <option value="localhost"' . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'localhost') ? ' selected="selected"' : '') . '>' . __('Local') - . '</option>'; + . '</option>'; if (!empty($thishost)) { echo ' <option value="thishost"' diff --git a/libraries/rte/rte_main.inc.php b/libraries/rte/rte_main.inc.php index d2950bf..988cf6b 100644 --- a/libraries/rte/rte_main.inc.php +++ b/libraries/rte/rte_main.inc.php @@ -79,13 +79,13 @@ $errors = array(); switch ($_PMA_RTE) { case 'RTN': PMA_RTN_main(); - break; + break; case 'TRI': PMA_TRI_main(); - break; + break; case 'EVN': PMA_EVN_main(); - break; + break; } /** diff --git a/navigation.php b/navigation.php index 966f5f2..0c5668b 100644 --- a/navigation.php +++ b/navigation.php @@ -41,12 +41,12 @@ if (! isset($_SESSION['tmp_user_values']['table_limit_offset']) || $_SESSION['tm $_SESSION['tmp_user_values']['table_limit_offset_db'] = $db; } if (isset($_REQUEST['pos'])) { - if (isset($_REQUEST['tpos'])) { - $_SESSION['tmp_user_values']['table_limit_offset'] = (int) $_REQUEST['pos']; - } - else { - $_SESSION['tmp_user_values']['navi_limit_offset'] = (int) $_REQUEST['pos']; - } + if (isset($_REQUEST['tpos'])) { + $_SESSION['tmp_user_values']['table_limit_offset'] = (int) $_REQUEST['pos']; + } + else { + $_SESSION['tmp_user_values']['navi_limit_offset'] = (int) $_REQUEST['pos']; + } } $pos = $_SESSION['tmp_user_values']['navi_limit_offset']; $tpos = $_SESSION['tmp_user_values']['table_limit_offset']; diff --git a/pmd_common.php b/pmd_common.php index 7ca134b..6593762 100644 --- a/pmd_common.php +++ b/pmd_common.php @@ -203,12 +203,12 @@ function get_script_tabs() '<script type="text/javascript">' . "\n" . '// <![CDATA[' . "\n" . 'var j_tabs = new Array();' . "\n" . - 'var h_tabs = new Array();' . "\n" ; + 'var h_tabs = new Array();' . "\n" ; for ($i = 0, $cnt = count($GLOBALS['PMD']['TABLE_NAME']); $i < $cnt; $i++) { $script_tabs .= "j_tabs['" . $GLOBALS['PMD_URL']['TABLE_NAME'][$i] . "'] = '" . (PMA_foreignkey_supported($GLOBALS['PMD']['TABLE_TYPE'][$i]) ? '1' : '0') . "';\n"; - $script_tabs .="h_tabs['" . $GLOBALS['PMD_URL']['TABLE_NAME'][$i] . "'] = 1;"."\n" ; - } + $script_tabs .="h_tabs['" . $GLOBALS['PMD_URL']['TABLE_NAME'][$i] . "'] = 1;"."\n" ; + } $script_tabs .= '// ]]>' . "\n" . '</script>' . "\n"; diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 0589c28..d411a67 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -156,10 +156,10 @@ cd .. # Prepare all kits for kit in $KITS ; do # Copy all files - name=phpMyAdmin-$version-$kit - cp -r phpMyAdmin-$version $name + name=phpMyAdmin-$version-$kit + cp -r phpMyAdmin-$version $name - # Cleanup translations + # Cleanup translations cd phpMyAdmin-$version-$kit scripts/lang-cleanup.sh $kit rm -f scripts/lang-cleanup.sh diff --git a/server_privileges.php b/server_privileges.php index ba114fb..00073e8 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1070,7 +1070,7 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) { if (! PMA_DBI_try_query($q)) { $message = PMA_Message::rawError(PMA_DBI_getError()); } - break; + break; case '3' : // Grant all privileges on the specified database to the new user $q = 'GRANT ALL PRIVILEGES ON ' @@ -2138,9 +2138,9 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs . '</fieldset>' . "\n" . '</form>' . "\n"; - } + } - // Provide a line with links to the relevant database and table + // Provide a line with links to the relevant database and table if (isset($dbname) && empty($dbname_is_wildcard)) { echo '[ ' . __('Database') . ' <a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' diff --git a/server_status.php b/server_status.php index c88ccdd..9065fce 100644 --- a/server_status.php +++ b/server_status.php @@ -47,12 +47,12 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { if (isset($_REQUEST['varName']) && isset($_REQUEST['varValue'])) { $value = PMA_sqlAddslashes($_REQUEST['varValue']); if (!is_numeric($value)) $value="'".$value."'"; - + if (!preg_match("/[^a-zA-Z0-9_]+/",$_REQUEST['varName'])) PMA_DBI_query('SET GLOBAL ' . $_REQUEST['varName'] . ' = '.$value); - + } - + $loggingVars = PMA_DBI_fetch_result( "SHOW GLOBAL VARIABLES WHERE Variable_name IN ( 'general_log', 'slow_query_log', 'long_query_time', 'log_output')", 0, 1); @@ -74,7 +74,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { ); exit(json_encode($ret)); - + case 'queries': $queries = PMA_DBI_fetch_result( "SHOW GLOBAL STATUS @@ -94,7 +94,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { ); exit(json_encode($ret)); - + case 'traffic': $traffic = PMA_DBI_fetch_result( "SHOW GLOBAL STATUS @@ -108,12 +108,12 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { ); exit(json_encode($ret)); - + case 'chartgrid': $ret = json_decode($_REQUEST['requiredData'], true); $statusVars = array(); $sysinfo = $cpuload = $memory = 0; - + foreach ($ret as $chart_id => $chartNodes) { foreach ($chartNodes as $node_id => $node) { switch ($node['dataType']) { @@ -122,12 +122,12 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { if (!preg_match('/[^a-zA-Z_]+/',$node['name'])) $statusVars[] = $node['name']; break; - + case 'proc': $result = PMA_DBI_query('SHOW PROCESSLIST'); $ret[$chart_id][$node_id]['y'] = PMA_DBI_num_rows($result); break; - + case 'cpu': if (!$sysinfo) { require_once('libraries/sysinfo.lib.php'); @@ -135,13 +135,13 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { } if (!$cpuload) $cpuload = $sysinfo->loadavg(); - + if (PHP_OS == 'Linux') { $ret[$chart_id][$node_id]['idle'] = $cpuload['idle']; $ret[$chart_id][$node_id]['busy'] = $cpuload['busy']; - } else + } else $ret[$chart_id][$node_id]['y'] = $cpuload['loadavg']; - + break; case 'memory': @@ -151,7 +151,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { } if (!$memory) $memory = $sysinfo->memory(); - + $ret[$chart_id][$node_id]['y'] = $memory[$node['name']]; break; } @@ -168,71 +168,71 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { $ret[$chart_id][$node_id]['y'] = $vars[$node['name']]; } } - + $ret['x'] = microtime(true)*1000; - + exit(json_encode($ret)); } } - + if (isset($_REQUEST['log_data'])) { $start = intval($_REQUEST['time_start']); $end = intval($_REQUEST['time_end']); - + if ($_REQUEST['type'] == 'slow') { $q = 'SELECT SUM(query_time) AS TIME(query_time), SUM(lock_time) as lock_time, '. 'SUM(rows_sent) AS rows_sent, SUM(rows_examined) AS rows_examined, sql_text, COUNT(sql_text) AS \'#\' '. 'FROM `mysql`.`slow_log` WHERE event_time > FROM_UNIXTIME('.$start.') '. 'AND event_time < FROM_UNIXTIME('.$end.') GROUP BY sql_text'; - + $result = PMA_DBI_try_query($q); - + $return = array('rows' => array(), 'sum' => array()); $type = ''; - + while ($row = PMA_DBI_fetch_assoc($result)) { $type = substr($row['sql_text'],0,strpos($row['sql_text'],' ')); $return['sum'][$type]++; $return['rows'][] = $row; } - + $return['sum']['TOTAL'] = array_sum($return['sum']); - + PMA_DBI_free_result($result); exit(json_encode($return)); } - + if ($_REQUEST['type'] == 'general') { $q = 'SELECT TIME(event_time) as event_time, user_host, thread_id, server_id, argument, count(argument) as \'#\' FROM `mysql`.`general_log` WHERE command_type=\'Query\' '. 'AND event_time > FROM_UNIXTIME('.$start.') AND event_time < FROM_UNIXTIME('.$end.') '. 'AND argument REGEXP \'^(INSERT|SELECT|UPDATE|DELETE)\' GROUP by argument'; // HAVING count > 1'; - + $result = PMA_DBI_try_query($q); - + $return = array('rows' => array(), 'sum' => array()); $type = ''; $insertTables = array(); $insertTablesFirst = -1; $i = 0; - + while ($row = PMA_DBI_fetch_assoc($result)) { preg_match('/^(\w+)\s/',$row['argument'],$match); $type = strtolower($match[1]); // Ignore undefined index warning, just increase counter by one @$return['sum'][$type] += $row['#']; - + if ($type=='insert' || $type=='update') { // Group inserts if selected if ($type=='insert' && isset($_REQUEST['groupInserts']) && $_REQUEST['groupInserts'] && preg_match('/^INSERT INTO (`|\'|"|)([^\s\\1]+)\\1/i',$row['argument'],$matches)) { $insertTables[$matches[2]]++; if ($insertTables[$matches[2]] > 1) { $return['rows'][$insertTablesFirst]['#'] = $insertTables[$matches[2]]; - + // Add a ... to the end of this query to indicate that there's been other queries if ($return['rows'][$insertTablesFirst]['argument'][strlen($return['rows'][$insertTablesFirst]['argument'])-1] != '.') - $return['rows'][$insertTablesFirst]['argument'] .= '<br/>...'; - + $return['rows'][$insertTablesFirst]['argument'] .= '<br/>...'; + // Group this value, thus do not add to the result list continue; } else { @@ -240,22 +240,22 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { $insertTables[$matches[2]] += $row['#'] - 1; } } - + // Cut off big selects, but append byte count therefor if (strlen($row['argument']) > 180) { - $row['argument'] = substr($row['argument'],0,160) . '... [' . + $row['argument'] = substr($row['argument'],0,160) . '... [' . PMA_formatByteDown(strlen($row['argument']), 2).']'; } } $return['rows'][] = $row; $i++; } - + $return['sum']['TOTAL'] = array_sum($return['sum']); - $return['numRows'] = count($return['rows']); - + $return['numRows'] = count($return['rows']); + PMA_DBI_free_result($result); - + exit(json_encode($return)); } } @@ -559,7 +559,7 @@ require './libraries/server_links.inc.php'; $server = 1; if (isset($_REQUEST['server']) && intval($_REQUEST['server'])) $server = intval($_REQUEST['server']); -$server_db_isLocal = strtolower($cfg['Servers'][$server]['host']) == 'localhost' +$server_db_isLocal = strtolower($cfg['Servers'][$server]['host']) == 'localhost' || $cfg['Servers'][$server]['host'] == '127.0.0.1' || $cfg['Servers'][$server]['host'] == '::1'; @@ -688,7 +688,7 @@ echo __('Runtime Information'); <?php printVariablesTable(); ?> </div> </div> - + <div id="statustabs_charting"> <?php printMonitor(); ?> </div> @@ -706,7 +706,7 @@ function printQueryStatistics() { ?> <h3 id="serverstatusqueries"> - <?php + <?php /* l10n: Questions is the name of a MySQL Status variable */ echo sprintf(__('Questions since startup: %s'),PMA_formatNumber($total_queries, 0)) . ' '; echo PMA_showMySQLDocu('server-status-variables', 'server-status-variables', false, 'statvar_Questions'); @@ -714,17 +714,17 @@ function printQueryStatistics() { <br> <span> <?php - echo 'ø '.__('per hour').': '; + echo 'ø '.__('per hour').': '; echo PMA_formatNumber($total_queries * $hour_factor, 0); echo '<br>'; - - echo 'ø '.__('per minute').': '; - echo PMA_formatNumber( $total_queries * 60 / $server_status['Uptime'], 0); + + echo 'ø '.__('per minute').': '; + echo PMA_formatNumber( $total_queries * 60 / $server_status['Uptime'], 0); echo '<br>'; - + if ($total_queries / $server_status['Uptime'] >= 1) { echo 'ø '.__('per second').': '; - echo PMA_formatNumber( $total_queries / $server_status['Uptime'], 0); + echo PMA_formatNumber( $total_queries / $server_status['Uptime'], 0); } ?> </span> @@ -1289,33 +1289,33 @@ function printMonitor() { ?> <div class="monitorLinks"> <a href="#pauseCharts"> - <img src="themes/dot.gif" class="icon ic_play" alt="" /> + <img src="themes/dot.gif" class="icon ic_play" alt="" /> <?php echo __('Start Monitor'); ?> </a> <a href="#settingsPopup" rel="popupLink" style="display:none;"> - <img src="themes/dot.gif" class="icon ic_s_cog" alt="" /> + <img src="themes/dot.gif" class="icon ic_s_cog" alt="" /> <?php echo __('Settings'); ?> </a> <a href="#monitorInstructionsDialog"> - <img src="themes/dot.gif" class="icon ic_b_help" alt="" /> + <img src="themes/dot.gif" class="icon ic_b_help" alt="" /> <?php echo __('Instructions/Setup'); ?> </a> <a href="#endChartEditMode" style="display:none;"> - <img src="themes/dot.gif" class="icon ic_s_okay" alt="" /> + <img src="themes/dot.gif" class="icon ic_s_okay" alt="" /> <?php echo __('Done rearranging/editing charts'); ?> </a> </div> - + <div class="popupContent settingsPopup"> <a href="#addNewChart"> - <img src="themes/dot.gif" class="icon ic_b_chart" alt="" /> + <img src="themes/dot.gif" class="icon ic_b_chart" alt="" /> <?php echo __('Add chart'); ?> - </a> | + </a> | <a href="#rearrangeCharts"> <?php echo __('Rearrange/edit charts'); ?></a><br> <p> <?php echo __('Refresh rate:'); refreshList('gridChartRefresh'); ?><br> </p> - <p> + <p> <?php echo __('Chart columns:'); ?> <select name="chartColumns"> <option>1</option> @@ -1332,11 +1332,11 @@ function printMonitor() { </p> <a href="#clearMonitorConfig"><?php echo __('Clear monitor config'); ?></a> </div> - + <div id="monitorInstructionsDialog" title="<?php echo __('Monitor Instructions'); ?>" style="display:none;"> <?php echo __('The phpMyAdmin Monitor can assist you in optimizing the server configuration and track down time intensive queries. For the latter you will need to set log_output to \'TABLE\' and have either the slow_query_log or general_log enabled. Note however, that the - general_log produces a lot of data and increases server load by up to 15%'); ?> + general_log produces a lot of data and increases server load by up to 15%'); ?> <p></p> <img class="ajaxIcon" src="<?php echo $GLOBALS['pmaThemeImage']; ?>ajax_clock_small.gif" alt="Loading"> <div class="ajaxContent"> @@ -1350,31 +1350,31 @@ function printMonitor() { <p>When you get to see a sudden spike in activity, select the relevant time span on any chart by holding down the left mouse button and panning over the chart. This will load statistics from the logs helping you find what caused the activity spike.</p>'); - ?> - <p> - <img class="icon ic_s_attention" src="themes/dot.gif" alt=""> - <?php echo __('<b>Please note:</b> - Enabling the general_log may increase the server load by 5-15%. Also be aware that generating statistics from the logs is a + ?> + <p> + <img class="icon ic_s_attention" src="themes/dot.gif" alt=""> + <?php echo __('<b>Please note:</b> + Enabling the general_log may increase the server load by 5-15%. Also be aware that generating statistics from the logs is a load intensive task, so it is advisable to select only a small time span and to disable the general_log and empty its table once monitoring is not required any more. '); ?> - </p> + </p> </div> </div> - + <div id="addChartDialog" title="Add chart" style="display:none;"> <div id="tabGridVariables"> <p><input type="text" name="chartTitle" value="<?php echo __('Chart Title'); ?>" /></p> <?php if ($server_db_isLocal) { ?> - <input type="radio" name="chartType" value="cpu" id="chartCPU"> + <input type="radio" name="chartType" value="cpu" id="chartCPU"> <label for="chartCPU"><?php echo __('CPU Usage'); ?></label><br/> - - <input type="radio" name="chartType" value="memory" id="chartMemory"> + + <input type="radio" name="chartType" value="memory" id="chartMemory"> <label for="chartMemory"><?php echo __('Memory Usage'); ?></label><br/> - - <input type="radio" name="chartType" value="swap" id="chartSwap"> + + <input type="radio" name="chartType" value="swap" id="chartSwap"> <label for="chartSwap"><?php echo __('Swap Usage'); ?></label><br/> <?php } ?> - <input type="radio" name="chartType" value="variable" id="chartStatusVar" checked="checked"> + <input type="radio" name="chartType" value="variable" id="chartStatusVar" checked="checked"> <label for="chartStatusVar"><?php echo __('Status variable(s)'); ?></label><br/> <div id="chartVariableSettings"> <label for="chartSeries"><?php echo __('Select series:'); ?></label><br> @@ -1394,26 +1394,26 @@ function printMonitor() { <option>Select_full_join</option> <option>Slow_queries</option> </select><br> - <label for="variableInput"><?php echo __('or type variable name:'); ?> </label> + <label for="variableInput"><?php echo __('or type variable name:'); ?> </label> <input type="text" name="variableInput" id="variableInput" /> <p></p> - <input type="checkbox" name="differentialValue" id="differentialValue" value="differential" checked="checked" /> + <input type="checkbox" name="differentialValue" id="differentialValue" value="differential" checked="checked" /> <label for="differentialValue"><?php echo __('Display as differential value'); ?></label><br> - <input type="checkbox" id="useDivisor" name="useDivisor" value="1" /> + <input type="checkbox" id="useDivisor" name="useDivisor" value="1" /> <label for="useDivisor"><?php echo __('Apply a divisor'); ?></label> <span class="divisorInput" style="display:none;"> - <input type="text" name="valueDivisor" size="4" value="1"> + <input type="text" name="valueDivisor" size="4" value="1"> (<a href="#kibDivisor"><?php echo __('KiB'); ?></a>, <a href="#mibDivisor"><?php echo __('MiB'); ?></a>) </span><br> - - <input type="checkbox" id="useUnit" name="useUnit" value="1" /> + + <input type="checkbox" id="useUnit" name="useUnit" value="1" /> <label for="useUnit"><?php echo __('Append unit to data values'); ?></label> - + <span class="unitInput" style="display:none;"> <input type="text" name="valueUnit" size="4" value=""> </span> <p> - <a href="#submitAddSeries"><b><?php echo __('Add this series'); ?></b></a> + <a href="#submitAddSeries"><b><?php echo __('Add this series'); ?></b></a> <span id="clearSeriesLink" style="display:none;"> | <a href="#submitClearSeries"><?php echo __('Clear series'); ?></a> </span> @@ -1425,21 +1425,21 @@ function printMonitor() { </div> </div> </div> - + <div id="loadingLogsDialog" title="<?php echo __('Loading logs'); ?>" style="display:none;"> </div> - + <div id="logAnalyseDialog" title="<?php echo __('Log statistics'); ?>"> - + </div> - + <table border="0" class="clearfloat" id="chartGrid"> </table> <div id="logTable"> <br/> </div> - + <script type="text/javascript"> variableNames = [ <?php $i=0; @@ -1461,7 +1461,7 @@ function refreshList($name,$defaultRate=5, $refreshRates=Array(1, 2, 5, 10, 20, <?php foreach ($refreshRates as $rate) { $selected = ($rate == $defaultRate)?' selected="selected"':''; - + if ($rate<60) echo '<option value="'.$rate.'"'.$selected.'>'.sprintf(_ngettext('%d second', '%d seconds', $rate), $rate).'</option>'; else diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php index ea88aa7..83c6684 100644 --- a/setup/frames/index.inc.php +++ b/setup/frames/index.inc.php @@ -88,12 +88,12 @@ if (!$is_https) { <?php // Check for done action info and set notice message if present switch ($action_done) { - case 'config_saved': - messages_set('notice', 'config_saved', __('Configuration saved.'), - PMA_lang(__('Configuration saved to file config/config.inc.php in phpMyAdmin top level directory, copy it to top level one and delete directory config to use it.'))); - break; - default: - break; + case 'config_saved': + messages_set('notice', 'config_saved', __('Configuration saved.'), + PMA_lang(__('Configuration saved to file config/config.inc.php in phpMyAdmin top level directory, copy it to top level one and delete directory config to use it.'))); + break; + default: + break; } ?> diff --git a/setup/frames/menu.inc.php b/setup/frames/menu.inc.php index 4a1ae9c..978a47b 100644 --- a/setup/frames/menu.inc.php +++ b/setup/frames/menu.inc.php @@ -12,11 +12,11 @@ if (!defined('PHPMYADMIN')) { $separator = PMA_get_arg_separator('html'); ?> <ul> - <li><a href="index.php"><?php echo __('Overview') ?></a></li> - <li><a href="?page=form<?php echo $separator ?>formset=Features"><?php echo __('Features') ?></a></li> - <li><a href="?page=form<?php echo $separator ?>formset=Sql_queries"><?php echo __('SQL queries') ?></a></li> - <li><a href="?page=form<?php echo $separator ?>formset=Left_frame"><?php echo __('Navigation frame') ?></a></li> - <li><a href="?page=form<?php echo $separator ?>formset=Main_frame"><?php echo __('Main frame') ?></a></li> - <li><a href="?page=form<?php echo $separator ?>formset=Import"><?php echo __('Import') ?></a></li> - <li><a href="?page=form<?php echo $separator ?>formset=Export"><?php echo __('Export') ?></a></li> + <li><a href="index.php"><?php echo __('Overview') ?></a></li> + <li><a href="?page=form<?php echo $separator ?>formset=Features"><?php echo __('Features') ?></a></li> + <li><a href="?page=form<?php echo $separator ?>formset=Sql_queries"><?php echo __('SQL queries') ?></a></li> + <li><a href="?page=form<?php echo $separator ?>formset=Left_frame"><?php echo __('Navigation frame') ?></a></li> + <li><a href="?page=form<?php echo $separator ?>formset=Main_frame"><?php echo __('Main frame') ?></a></li> + <li><a href="?page=form<?php echo $separator ?>formset=Import"><?php echo __('Import') ?></a></li> + <li><a href="?page=form<?php echo $separator ?>formset=Export"><?php echo __('Export') ?></a></li> </ul> diff --git a/setup/lib/form_processing.lib.php b/setup/lib/form_processing.lib.php index 17f58a6..d54fd80 100644 --- a/setup/lib/form_processing.lib.php +++ b/setup/lib/form_processing.lib.php @@ -12,7 +12,7 @@ * @param FormDisplay $form_display */ function process_formset(FormDisplay $form_display) { - if (filter_input(INPUT_GET, 'mode') == 'revert') { + if (filter_input(INPUT_GET, 'mode') == 'revert') { // revert erroneous fields to their default values $form_display->fixErrors(); // drop post data @@ -33,8 +33,8 @@ function process_formset(FormDisplay $form_display) { $formset = $formset ? "{$separator}formset=$formset" : ''; $id = filter_input(INPUT_GET, 'id', FILTER_VALIDATE_INT); if ($id === null && $page == 'servers') { - // we've just added a new server, get it's id - $id = ConfigFile::getInstance()->getServerCount(); + // we've just added a new server, get it's id + $id = ConfigFile::getInstance()->getServerCount(); } $id = $id ? "{$separator}id=$id" : ''; ?> diff --git a/setup/scripts.js b/setup/scripts.js index f223e04..b4e97dc 100644 --- a/setup/scripts.js +++ b/setup/scripts.js @@ -57,7 +57,7 @@ $.extend(true, validators, { } return true; }, - /** + /** * TrustedProxies field * * @param {boolean} isKeyUp @@ -121,7 +121,7 @@ $.extend(true, validators, { * @param {Object} values values hash {element1_id: value, ...} */ function ajaxValidate(parent, id, values) { - parent = $(parent); + parent = $(parent); // ensure that parent is a fieldset if (parent.attr('tagName') != 'FIELDSET') { parent = parent.closest('fieldset'); @@ -131,7 +131,7 @@ function ajaxValidate(parent, id, values) { } if (parent.data('ajax') != null) { - parent.data('ajax').abort(); + parent.data('ajax').abort(); } parent.data('ajax', $.ajax({ @@ -155,7 +155,7 @@ function ajaxValidate(parent, id, values) { error[parent.id] = [response['error']]; } else { for (var key in response) { - var value = response[key]; + var value = response[key]; error[key] = jQuery.isArray(value) ? value : [value]; } } diff --git a/sql.php b/sql.php index 657311c..7ce5b24 100644 --- a/sql.php +++ b/sql.php @@ -927,7 +927,7 @@ else { } if (isset($profiling_results)) { - // pma_token/url_query needed for chart export + // pma_token/url_query needed for chart export ?> <script type="text/javascript"> pma_token = '<?php echo $_SESSION[' PMA_token ']; ?>'; diff --git a/tbl_chart.php b/tbl_chart.php index b3589e3..ac4bed8 100644 --- a/tbl_chart.php +++ b/tbl_chart.php @@ -93,7 +93,7 @@ url_query = '<?php echo $url_query;?>'; <br> <input type="text" name="chartTitle" value="<?php echo __('Chart title'); ?>"> <?php $keys = array_keys($data[0]); - $yaxis=-1; + $yaxis=-1; if (count($keys)>1) { echo '<br>'; echo __('X-Axis:'); ?> <select name="chartXAxis"> diff --git a/tbl_printview.php b/tbl_printview.php index 6bfe3be..2e40587 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -276,7 +276,7 @@ foreach ($the_tables as $key => $table) { if ($nonisam == false) { // Gets some sizes - $mergetable = PMA_Table::isMerge($db, $table); + $mergetable = PMA_Table::isMerge($db, $table); list($data_size, $data_unit) = PMA_formatByteDown($showtable['Data_length']); if ($mergetable == false) { diff --git a/test/libraries/common/PMA_localisedDateTimespan_test.php b/test/libraries/common/PMA_localisedDateTimespan_test.php index 7ec0364..92f980c 100644 --- a/test/libraries/common/PMA_localisedDateTimespan_test.php +++ b/test/libraries/common/PMA_localisedDateTimespan_test.php @@ -25,10 +25,10 @@ class PMA_localisedDateTimespan_test extends PHPUnit_Framework_TestCase */ protected $tmpSession; - /** - * temporary variable for timezone info - */ - protected $tmpTimezone; + /** + * temporary variable for timezone info + */ + protected $tmpTimezone; /** * storing globals and session @@ -37,8 +37,8 @@ class PMA_localisedDateTimespan_test extends PHPUnit_Framework_TestCase $this->tmpGlobals = $GLOBALS; $this->tmpSession = $_SESSION; - $this->tmpTimezone = date_default_timezone_get(); - date_default_timezone_set('Europe/London'); + $this->tmpTimezone = date_default_timezone_get(); + date_default_timezone_set('Europe/London'); } /** @@ -48,7 +48,7 @@ class PMA_localisedDateTimespan_test extends PHPUnit_Framework_TestCase $GLOBALS = $this->tmpGlobals; $_SESSION = $this->tmpSession; - date_default_timezone_set($this->tmpTimezone); + date_default_timezone_set($this->tmpTimezone); } diff --git a/test/libraries/common/PMA_stringOperations_test.php b/test/libraries/common/PMA_stringOperations_test.php index f57a2b4..ca43335 100644 --- a/test/libraries/common/PMA_stringOperations_test.php +++ b/test/libraries/common/PMA_stringOperations_test.php @@ -36,9 +36,9 @@ class PMA_stringOperations_test extends PHPUnit_Framework_TestCase global $GLOBALS, $_SESSION; $this->tmpGlobals = $GLOBALS; $this->tmpSession = $_SESSION; - + } - + /** * data provider for flipstring test */ @@ -110,8 +110,8 @@ class PMA_stringOperations_test extends PHPUnit_Framework_TestCase return array( array('test', 'test'), array("\r\ntest", "\n\r\ntest"), - array("\ntest", "\ntest"), - array("\n\r\ntest", "\n\r\ntest") + array("\ntest", "\ntest"), + array("\n\r\ntest", "\n\r\ntest") ); } diff --git a/test/selenium/PmaSeleniumTestCase.php b/test/selenium/PmaSeleniumTestCase.php index 7bf7a61..90da642 100644 --- a/test/selenium/PmaSeleniumTestCase.php +++ b/test/selenium/PmaSeleniumTestCase.php @@ -42,8 +42,8 @@ class PmaSeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase } /** - * perform a login - */ + * perform a login + */ public function doLogin() { $this->open(TESTSUITE_PHPMYADMIN_URL); @@ -58,7 +58,7 @@ class PmaSeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase } /* - * Just a dummy to show some example statements + * Just a dummy to show some example statements * public function mockTest() { diff --git a/themes/pmahomme/css/theme_left.css.php b/themes/pmahomme/css/theme_left.css.php index cd1eadf..ae504ea 100644 --- a/themes/pmahomme/css/theme_left.css.php +++ b/themes/pmahomme/css/theme_left.css.php @@ -34,7 +34,7 @@ body { font-family: <?php echo $GLOBALS['cfg']['FontFamily']; ?>; <?php } ?> background: url(./themes/pmahomme/img/left_nav_bg.png) repeat-y right 0% #f3f3f3; - border-right: 1px solid #aaa; + border-right: 1px solid #aaa; color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>; margin: 0; padding: 0; @@ -84,14 +84,14 @@ button { background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>iconsprites.png) no-repeat top left; } -.ic_b_home { background-position: -357px 0; } -.ic_b_selboard { background-position: -754px 0; } -.ic_b_docs { background-position: -136px 0; } -.ic_b_sqlhelp { background-position: -856px 0; } -.ic_s_reload { background-position: -1761px 0; } -.ic_s_loggoff { background-position: -1698px 0; } -.ic_b_browse, .ic_b_sbrowse { background-position: -34px 0; } -.ic_b_view { background-position: -1077px 0; } +.ic_b_home { background-position: -357px 0; } +.ic_b_selboard { background-position: -754px 0; } +.ic_b_docs { background-position: -136px 0; } +.ic_b_sqlhelp { background-position: -856px 0; } +.ic_s_reload { background-position: -1761px 0; } +.ic_s_loggoff { background-position: -1698px 0; } +.ic_b_browse, .ic_b_sbrowse { background-position: -34px 0; } +.ic_b_view { background-position: -1077px 0; } /******************************************************************************/ /* classes */ @@ -121,7 +121,7 @@ div#pmalogo, div#leftframelinks, div#databaseList { text-align: center; - margin: 5px 10px 0px 10px; + margin: 5px 10px 0px 10px; } ul#databaseList { @@ -155,7 +155,7 @@ ul#databaseList li{ list-style:none;text-indent:20px; margin:0px; padding:0px;} ul#databaseList a:hover { - background:url(./themes/pmahomme/img/database.png) no-repeat 0% 50% #e4e4e4; + background:url(./themes/pmahomme/img/database.png) no-repeat 0% 50% #e4e4e4; } ul#databaseList li.selected a { @@ -330,4 +330,4 @@ div#left_tableList ul ul { #fast_filter { width: 85%; padding: 0.1em; -} \ No newline at end of file +} diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index ac4f5d8..a151563 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -55,9 +55,9 @@ h1 { h2 { font-size: 2em; font-weight: normal; - text-shadow: 0px 1px 0px #fff; - padding: 10px 0 10px 3px; - color: #777; + text-shadow: 0px 1px 0px #fff; + padding: 10px 0 10px 3px; + color: #777; } /* Hiding icons in the page titles */ @@ -210,7 +210,7 @@ input[type=submit]{ <?php echo PMA_ieFilter('#ffffff', '#cccccc'); ?> } -input[type=submit]:hover{ position: relative; +input[type=submit]:hover{position: relative; background-image: url(./themes/svg_gradient.php?from=cccccc&to=dddddd); background-size: 100% 100%; background: -webkit-gradient(linear, left top, left bottom, from(#cccccc), to(#dddddd)); @@ -220,7 +220,7 @@ input[type=submit]:hover{ position: relative; cursor:pointer; } -input[type=submit]:active{ position: relative; +input[type=submit]:active{position: relative; top: 1px; left: 1px; } @@ -330,129 +330,129 @@ select[multiple] { background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>iconsprites.png) no-repeat top left; } -.ic_asc_order, .ic_s_desc { background-position: 0 0; } -.ic_b_bookmark { background-position: -17px 0; } -.ic_b_browse, .ic_b_sbrowse { background-position: -34px 0; } -.ic_b_calendar { background-position: -51px 0; } -.ic_b_chart, .ic_b_dbstatistics { background-position: -68px 0; } -.ic_b_close { background-position: -85px 0; } -.ic_b_comment { background-position: -102px 0; } -.ic_b_deltbl { background-position: -119px 0; } -.ic_b_docs { background-position: -136px 0; } -.ic_b_docsql { background-position: -153px 0; } -.ic_b_drop { background-position: -170px 0; } -.ic_b_edit { background-position: -187px 0; } -.ic_b_empty { background-position: -204px 0; } -.ic_b_engine { background-position: -221px 0; } -.ic_b_event_add { background-position: -238px 0; } -.ic_b_events { background-position: -255px 0; } -.ic_b_export, .ic_b_tblexport { background-position: -272px 0; } -.ic_b_firstpage { background-position: -289px 0; } -.ic_b_ftext { background-position: -306px 0; } -.ic_b_globe { background-position: -323px 0; } -.ic_b_help { background-position: -340px 0; } -.ic_b_help_s { background-position: -340px 0; } -.ic_b_home { background-position: -357px 0; } -.ic_b_import, .ic_b_tblimport { background-position: -374px 0; } -.ic_b_index { background-position: -391px 0; } -.ic_b_info { background-position: -408px 0; width: 11px; height: 11px; } -.ic_b_inline_edit { background-position: -420px 0; } -.ic_b_insrow { background-position: -437px 0; } -.ic_b_lastpage { background-position: -454px 0; } -.ic_b_minus { background-position: -471px 0; } -.ic_b_more, .ic_col_drop { background-position: -488px 0; } -.ic_b_newdb { background-position: -505px 0; } -.ic_b_newtbl { background-position: -522px 0; } -.ic_b_nextpage, .ic_play { background-position: -539px 0; } -.ic_b_pdfdoc { background-position: -556px 0; } -.ic_b_plus { background-position: -573px 0; } -.ic_b_prevpage { background-position: -590px 0; } -.ic_b_primary { background-position: -607px 0; } -.ic_b_print { background-position: -624px 0; } -.ic_b_props { background-position: -641px 0; } -.ic_b_relations { background-position: -658px 0; } -.ic_b_routine_add { background-position: -675px 0; } -.ic_b_routines { background-position: -692px 0; } -.ic_b_save { background-position: -709px 0; } -.ic_b_sdb { background-position: -726px 0; width: 10px; height: 10px; } -.ic_b_search { background-position: -737px 0; } -.ic_b_selboard { background-position: -754px 0; } -.ic_b_select { background-position: -771px 0; } -.ic_b_snewtbl { background-position: -788px 0; } -.ic_b_spatial { background-position: -805px 0; } -.ic_b_sql { background-position: -822px 0; } -.ic_b_sqldoc { background-position: -839px 0; } -.ic_b_sqlhelp { background-position: -856px 0; } -.ic_b_tblanalyse { background-position: -873px 0; } -.ic_b_tblops { background-position: -890px 0; } -.ic_b_tbloptimize { background-position: -907px 0; } -.ic_b_tipp { background-position: -924px 0; } -.ic_b_trigger_add { background-position: -941px 0; } -.ic_b_triggers { background-position: -958px 0; } -.ic_b_unique { background-position: -975px 0; } -.ic_b_usradd { background-position: -992px 0; } -.ic_b_usrcheck { background-position: -1009px 0; } -.ic_b_usrdrop { background-position: -1026px 0; } -.ic_b_usredit { background-position: -1043px 0; } -.ic_b_usrlist { background-position: -1060px 0; } -.ic_b_view { background-position: -1077px 0; } -.ic_b_views, .ic_s_views { background-position: -1094px 0; } -.ic_bd_browse { background-position: -1111px 0; } -.ic_bd_deltbl { background-position: -1128px 0; } -.ic_bd_drop { background-position: -1145px 0; } -.ic_bd_edit { background-position: -1162px 0; } -.ic_bd_empty { background-position: -1179px 0; } -.ic_bd_export { background-position: -1196px 0; } -.ic_bd_firstpage { background-position: -1213px 0; width: 16px; height: 13px; } -.ic_bd_ftext { background-position: -1230px 0; } -.ic_bd_index { background-position: -1247px 0; } -.ic_bd_insrow { background-position: -1264px 0; } -.ic_bd_lastpage { background-position: -1281px 0; width: 16px; height: 13px; } -.ic_bd_nextpage { background-position: -1298px 0; width: 8px; height: 13px; } -.ic_bd_prevpage { background-position: -1307px 0; width: 8px; height: 13px; } -.ic_bd_primary { background-position: -1316px 0; } -.ic_bd_sbrowse { background-position: -1333px 0; width: 10px; height: 10px; } -.ic_bd_select { background-position: -1344px 0; } -.ic_bd_spatial { background-position: -1361px 0; } -.ic_bd_unique { background-position: -1378px 0; } -.ic_database, .ic_s_db { background-position: -1395px 0; } -.ic_eye { background-position: -1412px 0; } -.ic_eye_grey { background-position: -1429px 0; } -.ic_item { background-position: -1446px 0; width: 9px; height: 9px; } -.ic_item_ltr { background-position: -1456px 0; width: 5px; height: 9px; } -.ic_item_rtl { background-position: -1462px 0; width: 5px; height: 9px; } -.ic_more { background-position: -1468px 0; width: 13px; height: 8px; } -.ic_pause { background-position: -1482px 0; } -.ic_php_sym { background-position: -1499px 0; } -.ic_s_asc { background-position: -1516px 0; } -.ic_s_asci { background-position: -1533px 0; } -.ic_s_attention, .ic_s_notice { background-position: -1550px 0; } -.ic_s_cancel { background-position: -1567px 0; } -.ic_s_cancel2 { background-position: -1584px 0; } -.ic_s_cog { background-position: -1601px 0; } -.ic_s_error { background-position: -1618px 0; } -.ic_s_error2 { background-position: -1635px 0; width: 11px; height: 11px; } -.ic_s_host { background-position: -1647px 0; } -.ic_s_info { background-position: -1664px 0; } -.ic_s_lang { background-position: -1681px 0; } -.ic_s_loggoff { background-position: -1698px 0; } -.ic_s_okay { background-position: -1715px 0; } -.ic_s_passwd { background-position: -1732px 0; } -.ic_s_really { background-position: -1749px 0; width: 11px; height: 11px; } -.ic_s_reload { background-position: -1761px 0; } -.ic_s_replication { background-position: -1778px 0; } -.ic_s_rights { background-position: -1795px 0; } -.ic_s_sortable { background-position: -1812px 0; } -.ic_s_status { background-position: -1829px 0; } -.ic_s_success { background-position: -1846px 0; } -.ic_s_sync { background-position: -1863px 0; } -.ic_s_tbl { background-position: -1880px 0; } -.ic_s_theme { background-position: -1897px 0; } -.ic_s_vars { background-position: -1914px 0; } -.ic_window-new { background-position: -1931px 0; } +.ic_asc_order, .ic_s_desc { background-position: 0 0; } +.ic_b_bookmark { background-position: -17px 0; } +.ic_b_browse, .ic_b_sbrowse { background-position: -34px 0; } +.ic_b_calendar { background-position: -51px 0; } +.ic_b_chart, .ic_b_dbstatistics { background-position: -68px 0; } +.ic_b_close { background-position: -85px 0; } +.ic_b_comment { background-position: -102px 0; } +.ic_b_deltbl { background-position: -119px 0; } +.ic_b_docs { background-position: -136px 0; } +.ic_b_docsql { background-position: -153px 0; } +.ic_b_drop { background-position: -170px 0; } +.ic_b_edit { background-position: -187px 0; } +.ic_b_empty { background-position: -204px 0; } +.ic_b_engine { background-position: -221px 0; } +.ic_b_event_add { background-position: -238px 0; } +.ic_b_events { background-position: -255px 0; } +.ic_b_export, .ic_b_tblexport { background-position: -272px 0; } +.ic_b_firstpage { background-position: -289px 0; } +.ic_b_ftext { background-position: -306px 0; } +.ic_b_globe { background-position: -323px 0; } +.ic_b_help { background-position: -340px 0; } +.ic_b_help_s { background-position: -340px 0; } +.ic_b_home { background-position: -357px 0; } +.ic_b_import, .ic_b_tblimport { background-position: -374px 0; } +.ic_b_index { background-position: -391px 0; } +.ic_b_info { background-position: -408px 0; width: 11px; height: 11px; } +.ic_b_inline_edit { background-position: -420px 0; } +.ic_b_insrow { background-position: -437px 0; } +.ic_b_lastpage { background-position: -454px 0; } +.ic_b_minus { background-position: -471px 0; } +.ic_b_more, .ic_col_drop { background-position: -488px 0; } +.ic_b_newdb { background-position: -505px 0; } +.ic_b_newtbl { background-position: -522px 0; } +.ic_b_nextpage, .ic_play { background-position: -539px 0; } +.ic_b_pdfdoc { background-position: -556px 0; } +.ic_b_plus { background-position: -573px 0; } +.ic_b_prevpage { background-position: -590px 0; } +.ic_b_primary { background-position: -607px 0; } +.ic_b_print { background-position: -624px 0; } +.ic_b_props { background-position: -641px 0; } +.ic_b_relations { background-position: -658px 0; } +.ic_b_routine_add { background-position: -675px 0; } +.ic_b_routines { background-position: -692px 0; } +.ic_b_save { background-position: -709px 0; } +.ic_b_sdb { background-position: -726px 0; width: 10px; height: 10px; } +.ic_b_search { background-position: -737px 0; } +.ic_b_selboard { background-position: -754px 0; } +.ic_b_select { background-position: -771px 0; } +.ic_b_snewtbl { background-position: -788px 0; } +.ic_b_spatial { background-position: -805px 0; } +.ic_b_sql { background-position: -822px 0; } +.ic_b_sqldoc { background-position: -839px 0; } +.ic_b_sqlhelp { background-position: -856px 0; } +.ic_b_tblanalyse { background-position: -873px 0; } +.ic_b_tblops { background-position: -890px 0; } +.ic_b_tbloptimize { background-position: -907px 0; } +.ic_b_tipp { background-position: -924px 0; } +.ic_b_trigger_add { background-position: -941px 0; } +.ic_b_triggers { background-position: -958px 0; } +.ic_b_unique { background-position: -975px 0; } +.ic_b_usradd { background-position: -992px 0; } +.ic_b_usrcheck { background-position: -1009px 0; } +.ic_b_usrdrop { background-position: -1026px 0; } +.ic_b_usredit { background-position: -1043px 0; } +.ic_b_usrlist { background-position: -1060px 0; } +.ic_b_view { background-position: -1077px 0; } +.ic_b_views, .ic_s_views { background-position: -1094px 0; } +.ic_bd_browse { background-position: -1111px 0; } +.ic_bd_deltbl { background-position: -1128px 0; } +.ic_bd_drop { background-position: -1145px 0; } +.ic_bd_edit { background-position: -1162px 0; } +.ic_bd_empty { background-position: -1179px 0; } +.ic_bd_export { background-position: -1196px 0; } +.ic_bd_firstpage { background-position: -1213px 0; width: 16px; height: 13px; } +.ic_bd_ftext { background-position: -1230px 0; } +.ic_bd_index { background-position: -1247px 0; } +.ic_bd_insrow { background-position: -1264px 0; } +.ic_bd_lastpage { background-position: -1281px 0; width: 16px; height: 13px; } +.ic_bd_nextpage { background-position: -1298px 0; width: 8px; height: 13px; } +.ic_bd_prevpage { background-position: -1307px 0; width: 8px; height: 13px; } +.ic_bd_primary { background-position: -1316px 0; } +.ic_bd_sbrowse { background-position: -1333px 0; width: 10px; height: 10px; } +.ic_bd_select { background-position: -1344px 0; } +.ic_bd_spatial { background-position: -1361px 0; } +.ic_bd_unique { background-position: -1378px 0; } +.ic_database, .ic_s_db { background-position: -1395px 0; } +.ic_eye { background-position: -1412px 0; } +.ic_eye_grey { background-position: -1429px 0; } +.ic_item { background-position: -1446px 0; width: 9px; height: 9px; } +.ic_item_ltr { background-position: -1456px 0; width: 5px; height: 9px; } +.ic_item_rtl { background-position: -1462px 0; width: 5px; height: 9px; } +.ic_more { background-position: -1468px 0; width: 13px; height: 8px; } +.ic_pause { background-position: -1482px 0; } +.ic_php_sym { background-position: -1499px 0; } +.ic_s_asc { background-position: -1516px 0; } +.ic_s_asci { background-position: -1533px 0; } +.ic_s_attention, .ic_s_notice { background-position: -1550px 0; } +.ic_s_cancel { background-position: -1567px 0; } +.ic_s_cancel2 { background-position: -1584px 0; } +.ic_s_cog { background-position: -1601px 0; } +.ic_s_error { background-position: -1618px 0; } +.ic_s_error2 { background-position: -1635px 0; width: 11px; height: 11px; } +.ic_s_host { background-position: -1647px 0; } +.ic_s_info { background-position: -1664px 0; } +.ic_s_lang { background-position: -1681px 0; } +.ic_s_loggoff { background-position: -1698px 0; } +.ic_s_okay { background-position: -1715px 0; } +.ic_s_passwd { background-position: -1732px 0; } +.ic_s_really { background-position: -1749px 0; width: 11px; height: 11px; } +.ic_s_reload { background-position: -1761px 0; } +.ic_s_replication { background-position: -1778px 0; } +.ic_s_rights { background-position: -1795px 0; } +.ic_s_sortable { background-position: -1812px 0; } +.ic_s_status { background-position: -1829px 0; } +.ic_s_success { background-position: -1846px 0; } +.ic_s_sync { background-position: -1863px 0; } +.ic_s_tbl { background-position: -1880px 0; } +.ic_s_theme { background-position: -1897px 0; } +.ic_s_vars { background-position: -1914px 0; } +.ic_window-new { background-position: -1931px 0; } /* Same as ic_b_help, but applied to place where width=11, height=11 attributes were used */ -.ic_b_help_s { background-position: -340px 0; } +.ic_b_help_s { background-position: -340px 0; } /* Same as ic_s_sortable */ img.sortableIcon { background-position: -1812px 0; } @@ -944,12 +944,12 @@ form.login label { /* specific elements */ /* topmenu */ -#topmenu a { - text-shadow:0px 1px 0px #fff; +#topmenu a { + text-shadow:0px 1px 0px #fff; } -#topmenu .error { - background:#eee;border:0px !important;color:#aaa; +#topmenu .error { + background:#eee;border:0px !important;color:#aaa; } ul#topmenu, ul#topmenu2, ul.tabs { @@ -977,7 +977,7 @@ ul#topmenu li, ul#topmenu2 li { vertical-align:-3px; } -#topmenucontainer{ +#topmenucontainer{ background:url(./themes/pmahomme/img/tab_bg.png) repeat-x; border-top:1px solid #aaa; } @@ -1316,7 +1316,7 @@ h3#serverstatusqueries span { img.sortableIcon { float:right; background-repeat:no-repeat; - margin:0; + margin:0; } .buttonlinks { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11683-g3f8badd
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via 3f8badd37f3e7ea78a718660e615ecf1c856e2f0 (commit) via b8d5cee5d7dd90aecdd109da06b3f7e4cbf8ea08 (commit) from bf9def5d50aab33dda6a38e4aa9b820a1f0c086a (commit) - Log ----------------------------------------------------------------- commit 3f8badd37f3e7ea78a718660e615ecf1c856e2f0 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 09:53:41 2011 +0200 Replace tabs with spaces, cleanup identation commit b8d5cee5d7dd90aecdd109da06b3f7e4cbf8ea08 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 09:39:00 2011 +0200 Fix indentation ----------------------------------------------------------------------- Summary of changes: db_structure.php | 20 +- docs.css | 30 ++-- js/functions.js | 220 +++++++++--------- js/navigation.js | 16 +- libraries/auth/swekey/swekey.auth.lib.php | 176 +++++++------- libraries/auth/swekey/swekey.php | 208 +++++++++--------- libraries/engines/pbms.lib.php | 2 +- libraries/import.lib.php | 360 ++++++++++++++-------------- libraries/rte/rte_words.lib.php | 86 ++++---- pmd/styles/default/style1.css | 182 ++++++++-------- pmd_general.php | 142 ++++++------ server_synchronize.php | 116 +++++----- setup/config.php | 38 ++-- 13 files changed, 798 insertions(+), 798 deletions(-) diff --git a/db_structure.php b/db_structure.php index 2bae5a7..01c2156 100644 --- a/db_structure.php +++ b/db_structure.php @@ -58,17 +58,17 @@ $titles = PMA_buildActionTitles(); // 1. No tables if ($num_tables == 0) { - echo '<p>' . __('No tables found in database') . '</p>' . "\n"; + echo '<p>' . __('No tables found in database') . '</p>' . "\n"; - if (empty($db_is_information_schema)) { - require './libraries/display_create_table.lib.php'; - } // end if (Create Table dialog) + if (empty($db_is_information_schema)) { + require './libraries/display_create_table.lib.php'; + } // end if (Create Table dialog) - /** - * Displays the footer - */ - require_once './libraries/footer.inc.php'; - exit; + /** + * Displays the footer + */ + require_once './libraries/footer.inc.php'; + exit; } // else @@ -176,7 +176,7 @@ foreach ($tables as $keyname => $each_table) { } //$display_rows = ' - '; break; - // Mysql 5.0.x (and lower) uses MRG_MyISAM and MySQL 5.1.x (and higher) uses MRG_MYISAM + // Mysql 5.0.x (and lower) uses MRG_MyISAM and MySQL 5.1.x (and higher) uses MRG_MYISAM // Both are aliases for MERGE case 'MRG_MyISAM' : case 'MRG_MYISAM' : diff --git a/docs.css b/docs.css index 96574d9..7e15537 100644 --- a/docs.css +++ b/docs.css @@ -18,8 +18,8 @@ img { #header { margin: 0px; padding: 1em 0.5em 0.5em 1em; - background: #036; - border: 0px; + background: #036; + border: 0px; border-bottom: 1px solid black; } @@ -31,16 +31,16 @@ img { } #header h1 a { - color: #7584b3; + color: #7584b3; } #header h1 a .myadmin { - color: #ffad17; + color: #ffad17; } #body { - margin: 2em 1em 1em 1em; - padding: 0px; + margin: 2em 1em 1em 1em; + padding: 0px; padding-right: 13em; } @@ -54,13 +54,13 @@ ul#footer { font-size: smaller; list-style: none; float: left; - padding: 1em; + padding: 1em; color: gray; border: none; } #footer a { - color: #c19e66; + color: #c19e66; } abbr, acronym { @@ -73,12 +73,12 @@ abbr, acronym { a { text-decoration: none; - color: #c17d11; + color: #c17d11; } a:hover { - text-decoration: underline; - color: #8f5902; + text-decoration: underline; + color: #8f5902; } sup { @@ -128,22 +128,22 @@ ul.header a:hover { } h2 { - color: #727e0a; + color: #727e0a; max-width: 70em; } h3 { - color: #727e0a; + color: #727e0a; max-width: 70em; } h4, h5 { - color: #727e0a; + color: #727e0a; max-width: 70em; } h4 a { - color: #727e0a; + color: #727e0a; } p { diff --git a/js/functions.js b/js/functions.js index dbb962d..1e2cced 100644 --- a/js/functions.js +++ b/js/functions.js @@ -28,7 +28,7 @@ var codemirror_editor = false; * @var chart_activeTimeouts object active timeouts that refresh the charts. When disabling a realtime chart, this can be used to stop the continuous ajax requests */ var chart_activeTimeouts = new Object(); - + /** * Add a hidden field to the form to indicate that this will be an @@ -140,8 +140,8 @@ function PMA_addDatepicker($this_element, options) { if ($this_element.is('.datetimefield')) { showTimeOption = true; } - - var defaultOptions = { + + var defaultOptions = { showOn: 'button', buttonImage: themeCalendarImage, // defined in js/messages.php buttonImageOnly: true, @@ -159,11 +159,11 @@ function PMA_addDatepicker($this_element, options) { // Fix wrong timepicker z-index, doesn't work without timeout setTimeout(function() { - $('#ui-timepicker-div').css('z-index',$('#ui-datepicker-div').css('z-index')) + $('#ui-timepicker-div').css('z-index',$('#ui-datepicker-div').css('z-index')) },0); }, constrainInput: false - }; + }; $this_element.datepicker($.extend(defaultOptions, options)); } @@ -630,13 +630,13 @@ $(document).ready(function() { return; } var $tr = $(this); - + // make the table unselectable (to prevent default highlighting when shift+click) $tr.parents('table').noSelect(); - + if (!e.shiftKey || last_clicked_row == -1) { // usual click - + // XXX: FF fires two click events for <label> (label and checkbox), so we need to handle this differently var $checkbox = $tr.find(':checkbox'); if ($checkbox.length) { @@ -657,14 +657,14 @@ $(document).ready(function() { $tr.toggleClass('marked'); last_click_checked = false; } - + // remember the last clicked row last_clicked_row = last_click_checked ? $('tr.odd:not(.noclick), tr.even:not(.noclick)').index(this) : -1; last_shift_clicked_row = -1; } else { // handle the shift click var start, end; - + // clear last shift click result if (last_shift_clicked_row >= 0) { if (last_shift_clicked_row >= last_clicked_row) { @@ -680,7 +680,7 @@ $(document).ready(function() { .find(':checkbox') .attr('checked', false); } - + // handle new shift click var curr_row = $('tr.odd:not(.noclick), tr.even:not(.noclick)').index(this); if (curr_row >= last_clicked_row) { @@ -695,7 +695,7 @@ $(document).ready(function() { .addClass('marked') .find(':checkbox') .attr('checked', true); - + // remember the last shift clicked row last_shift_clicked_row = curr_row; } @@ -1452,17 +1452,17 @@ function PMA_createTableDialog( div, url , target) { * realtime: { * url: adress to get the data from (will always add token, ajax_request=1 and chart_data=1 to the GET request) * type: the GET request will also add type=[value of the type property] to the request - * callback: Callback function that should draw the point, it's called with 4 parameters in this order: + * callback: Callback function that should draw the point, it's called with 4 parameters in this order: * - the chart object * - the current response value of the GET request, JSON parsed * - the previous response value of the GET request, JSON parsed * - the number of added points - * + * * @return object The created highcharts instance */ function PMA_createChart(passedSettings) { var container = passedSettings.chart.renderTo; - + var settings = { chart: { type: 'spline', @@ -1475,45 +1475,45 @@ function PMA_createChart(passedSettings) { var lastValue = null, curValue = null; var numLoadedPoints = 0, otherSum = 0; var diff; - + // No realtime updates for graphs that are being exported, and disabled when realtime is not set // Also don't do live charting if we don't have the server time - if(thisChart.options.chart.forExport == true || - ! thisChart.options.realtime || + if(thisChart.options.chart.forExport == true || + ! thisChart.options.realtime || ! thisChart.options.realtime.callback || ! server_time_diff) return; - + thisChart.options.realtime.timeoutCallBack = function() { thisChart.options.realtime.postRequest = $.post( thisChart.options.realtime.url, thisChart.options.realtime.postData, function(data) { curValue = jQuery.parseJSON(data); - + if(lastValue==null) diff = curValue.x - thisChart.xAxis[0].getExtremes().max; else diff = parseInt(curValue.x - lastValue.x); - + thisChart.xAxis[0].setExtremes( - thisChart.xAxis[0].getExtremes().min+diff, - thisChart.xAxis[0].getExtremes().max+diff, + thisChart.xAxis[0].getExtremes().min+diff, + thisChart.xAxis[0].getExtremes().max+diff, false ); - + thisChart.options.realtime.callback(thisChart,curValue,lastValue,numLoadedPoints); - + lastValue = curValue; numLoadedPoints++; - + // Timeout has been cleared => don't start a new timeout if(chart_activeTimeouts[container] == null) return; - + chart_activeTimeouts[container] = setTimeout( - thisChart.options.realtime.timeoutCallBack, + thisChart.options.realtime.timeoutCallBack, thisChart.options.realtime.refreshRate - ); + ); }); } - + chart_activeTimeouts[container] = setTimeout(thisChart.options.realtime.timeoutCallBack, 5); } } @@ -1545,7 +1545,7 @@ function PMA_createChart(passedSettings) { tooltip: { formatter: function() { return '<b>' + this.series.name +'</b><br/>' + - Highcharts.dateFormat('%Y-%m-%d %H:%M:%S', this.x) + '<br/>' + + Highcharts.dateFormat('%Y-%m-%d %H:%M:%S', this.x) + '<br/>' + Highcharts.numberFormat(this.y, 2); } }, @@ -1554,18 +1554,18 @@ function PMA_createChart(passedSettings) { }, series: [] } - + /* Set/Get realtime chart default values */ - if(passedSettings.realtime) { - if(!passedSettings.realtime.refreshRate) + if(passedSettings.realtime) { + if(!passedSettings.realtime.refreshRate) passedSettings.realtime.refreshRate = 5000; - - if(!passedSettings.realtime.numMaxPoints) + + if(!passedSettings.realtime.numMaxPoints) passedSettings.realtime.numMaxPoints = 30; - + // Allow custom POST vars to be added passedSettings.realtime.postData = $.extend(false,{ ajax_request: true, chart_data: 1, type: passedSettings.realtime.type },passedSettings.realtime.postData); - + if(server_time_diff) { settings.xAxis.min = new Date().getTime() - server_time_diff - passedSettings.realtime.numMaxPoints * passedSettings.realtime.refreshRate; settings.xAxis.max = new Date().getTime() - server_time_diff + passedSettings.realtime.refreshRate; @@ -2284,9 +2284,9 @@ function checkIndexName(form_id) /** * function to convert the footnotes to tooltips * - * @param jquery-Object $div a div jquery object which specifies the - * domain for searching footnootes. If we - * ommit this parameter the function searches + * @param jquery-Object $div a div jquery object which specifies the + * domain for searching footnootes. If we + * ommit this parameter the function searches * the footnotes in the whole body **/ function PMA_convertFootnotesToTooltips($div) { @@ -2485,65 +2485,65 @@ var toggleButton = function ($obj) { } else { var right = 'left'; } - /** - * var h Height of the button, used to scale the - * background image and position the layers - */ - var h = $obj.height(); - $('img', $obj).height(h); - $('table', $obj).css('bottom', h-1); - /** - * var on Width of the "ON" part of the toggle switch - * var off Width of the "OFF" part of the toggle switch - */ - var on = $('.toggleOn', $obj).width(); - var off = $('.toggleOff', $obj).width(); - // Make the "ON" and "OFF" parts of the switch the same size - $('.toggleOn > div', $obj).width(Math.max(on, off)); - $('.toggleOff > div', $obj).width(Math.max(on, off)); - /** - * var w Width of the central part of the switch - */ - var w = parseInt(($('img', $obj).height() / 16) * 22, 10); - // Resize the central part of the switch on the top - // layer to match the background - $('table td:nth-child(2) > div', $obj).width(w); - /** - * var imgw Width of the background image - * var tblw Width of the foreground layer - * var offset By how many pixels to move the background - * image, so that it matches the top layer - */ - var imgw = $('img', $obj).width(); - var tblw = $('table', $obj).width(); - var offset = parseInt(((imgw - tblw) / 2), 10); - // Move the background to match the layout of the top layer - $obj.find('img').css(right, offset); - /** - * var offw Outer width of the "ON" part of the toggle switch - * var btnw Outer width of the central part of the switch - */ - var offw = $('.toggleOff', $obj).outerWidth(); - var btnw = $('table td:nth-child(2)', $obj).outerWidth(); - // Resize the main div so that exactly one side of - // the switch plus the central part fit into it. - $obj.width(offw + btnw + 2); - /** - * var move How many pixels to move the - * switch by when toggling - */ - var move = $('.toggleOff', $obj).outerWidth(); - // If the switch is initialized to the - // OFF state we need to move it now. - if ($('.container', $obj).hasClass('off')) { + /** + * var h Height of the button, used to scale the + * background image and position the layers + */ + var h = $obj.height(); + $('img', $obj).height(h); + $('table', $obj).css('bottom', h-1); + /** + * var on Width of the "ON" part of the toggle switch + * var off Width of the "OFF" part of the toggle switch + */ + var on = $('.toggleOn', $obj).width(); + var off = $('.toggleOff', $obj).width(); + // Make the "ON" and "OFF" parts of the switch the same size + $('.toggleOn > div', $obj).width(Math.max(on, off)); + $('.toggleOff > div', $obj).width(Math.max(on, off)); + /** + * var w Width of the central part of the switch + */ + var w = parseInt(($('img', $obj).height() / 16) * 22, 10); + // Resize the central part of the switch on the top + // layer to match the background + $('table td:nth-child(2) > div', $obj).width(w); + /** + * var imgw Width of the background image + * var tblw Width of the foreground layer + * var offset By how many pixels to move the background + * image, so that it matches the top layer + */ + var imgw = $('img', $obj).width(); + var tblw = $('table', $obj).width(); + var offset = parseInt(((imgw - tblw) / 2), 10); + // Move the background to match the layout of the top layer + $obj.find('img').css(right, offset); + /** + * var offw Outer width of the "ON" part of the toggle switch + * var btnw Outer width of the central part of the switch + */ + var offw = $('.toggleOff', $obj).outerWidth(); + var btnw = $('table td:nth-child(2)', $obj).outerWidth(); + // Resize the main div so that exactly one side of + // the switch plus the central part fit into it. + $obj.width(offw + btnw + 2); + /** + * var move How many pixels to move the + * switch by when toggling + */ + var move = $('.toggleOff', $obj).outerWidth(); + // If the switch is initialized to the + // OFF state we need to move it now. + if ($('.container', $obj).hasClass('off')) { if (right == 'right') { - $('table, img', $obj).animate({'left': '-=' + move + 'px'}, 0); + $('table, img', $obj).animate({'left': '-=' + move + 'px'}, 0); } else { - $('table, img', $obj).animate({'left': '+=' + move + 'px'}, 0); + $('table, img', $obj).animate({'left': '+=' + move + 'px'}, 0); } - } - // Attach an 'onclick' event to the switch - $('.container', $obj).click(function () { + } + // Attach an 'onclick' event to the switch + $('.container', $obj).click(function () { if ($(this).hasClass('isActive')) { return false; } else { @@ -2552,8 +2552,8 @@ var toggleButton = function ($obj) { var $msg = PMA_ajaxShowMessage(PMA_messages['strLoading']); var $container = $(this); var callback = $('.callback', this).text(); - // Perform the actual toggle - if ($(this).hasClass('on')) { + // Perform the actual toggle + if ($(this).hasClass('on')) { if (right == 'right') { var operator = '-='; } else { @@ -2562,7 +2562,7 @@ var toggleButton = function ($obj) { var url = $(this).find('.toggleOff > span').text(); var removeClass = 'on'; var addClass = 'off'; - } else { + } else { if (right == 'right') { var operator = '+='; } else { @@ -2575,10 +2575,10 @@ var toggleButton = function ($obj) { $.post(url, {'ajax_request': true}, function(data) { if(data.success == true) { PMA_ajaxRemoveMessage($msg); - $container - .removeClass(removeClass) - .addClass(addClass) - .animate({'left': operator + move + 'px'}, function () { + $container + .removeClass(removeClass) + .addClass(addClass) + .animate({'left': operator + move + 'px'}, function () { $container.removeClass('isActive'); }); eval(callback); @@ -2587,7 +2587,7 @@ var toggleButton = function ($obj) { $container.removeClass('isActive'); } }); - }); + }); }; /** @@ -2598,8 +2598,8 @@ $(window).load(function () { $(this) .show() .find('.toggleButton') - toggleButton($(this)); - }); + toggleButton($(this)); + }); }); /** @@ -2641,7 +2641,7 @@ $(document).ready(function() { $checkbox.attr('checked', checked); } // for all td of the same vertical row, toggle the marked class - if (checked) { + if (checked) { $('.vmarker').filter('.row_' + row_num).addClass('marked'); } else { $('.vmarker').filter('.row_' + row_num).removeClass('marked'); @@ -2905,7 +2905,7 @@ $(document).ready(function() { else $(this).removeAttr('unselectable', 'on'); }); } - }; //end noSelect + }; //end noSelect })(jQuery); /** @@ -2943,7 +2943,7 @@ function PMA_createqTip($elements, content, options) { } } } - + $elements.qtip($.extend(true, o, options)); } diff --git a/js/navigation.js b/js/navigation.js index 167eb37..5ce805c 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -58,7 +58,7 @@ function PMA_saveFrameSizeReal() if (parent.text_dir == 'ltr') { pma_navi_width = parseInt(parent.document.getElementById('mainFrameset').cols) } else { - pma_navi_width = parent.document.getElementById('mainFrameset').cols.match(/\d+$/) + pma_navi_width = parent.document.getElementById('mainFrameset').cols.match(/\d+$/) } if ((pma_navi_width > 0) && (pma_navi_width != PMA_getCookie('pma_navi_width'))) { PMA_setCookie('pma_navi_width', pma_navi_width, expires); @@ -209,18 +209,18 @@ $(document).ready(function(){ /* Create table */ $('#newtable a.ajax').click(function(event){ event.preventDefault(); - /*Getting the url */ + /*Getting the url */ var url = $('#newtable a').attr("href"); if (url.substring(0, 15) == "tbl_create.php?") { url = url.substring(15); } - url = url +"&num_fields=&ajax_request=true"; - /*Creating a div on the frame_content frame */ - var div = parent.frame_content.$('<div id="create_table_dialog"></div>'); - var target = "tbl_create.php"; + url = url +"&num_fields=&ajax_request=true"; + /*Creating a div on the frame_content frame */ + var div = parent.frame_content.$('<div id="create_table_dialog"></div>'); + var target = "tbl_create.php"; - /*Calling to the createTableDialog function*/ - PMA_createTableDialog(div , url , target); + /*Calling to the createTableDialog function*/ + PMA_createTableDialog(div , url , target); });//end of create new table });//end of document get ready diff --git a/libraries/auth/swekey/swekey.auth.lib.php b/libraries/auth/swekey/swekey.auth.lib.php index c5f613b..184c845 100644 --- a/libraries/auth/swekey/swekey.auth.lib.php +++ b/libraries/auth/swekey/swekey.auth.lib.php @@ -11,24 +11,24 @@ function Swekey_auth_check() global $cfg; $confFile = $cfg['Server']['auth_swekey_config']; - if (! isset($_SESSION['SWEKEY'])) { + if (! isset($_SESSION['SWEKEY'])) { $_SESSION['SWEKEY'] = array(); } $_SESSION['SWEKEY']['ENABLED'] = (! empty($confFile) && file_exists($confFile)); // Load the swekey.conf file the first time - if ($_SESSION['SWEKEY']['ENABLED'] && empty($_SESSION['SWEKEY']['CONF_LOADED'])) { + if ($_SESSION['SWEKEY']['ENABLED'] && empty($_SESSION['SWEKEY']['CONF_LOADED'])) { $_SESSION['SWEKEY']['CONF_LOADED'] = true; $_SESSION['SWEKEY']['VALID_SWEKEYS'] = array(); $valid_swekeys = explode("\n", @file_get_contents($confFile)); foreach ($valid_swekeys as $line) { if (preg_match("/^[0-9A-F]{32}:.+$/", $line) != false) - { - $items = explode(":", $line); - if (count($items) == 2) + { + $items = explode(":", $line); + if (count($items) == 2) $_SESSION['SWEKEY']['VALID_SWEKEYS'][$items[0]] = trim($items[1]); - } + } else if (preg_match("/^[A-Z_]+=.*$/", $line) != false) { $items = explode("=", $line); $_SESSION['SWEKEY']['CONF_'.trim($items[0])] = trim($items[1]); @@ -36,27 +36,27 @@ function Swekey_auth_check() } // Set default values for settings - if (! isset($_SESSION['SWEKEY']['CONF_SERVER_CHECK'])) - $_SESSION['SWEKEY']['CONF_SERVER_CHECK'] = ""; - if (! isset($_SESSION['SWEKEY']['CONF_SERVER_RNDTOKEN'])) - $_SESSION['SWEKEY']['CONF_SERVER_RNDTOKEN'] = ""; - if (! isset($_SESSION['SWEKEY']['CONF_SERVER_STATUS'])) - $_SESSION['SWEKEY']['CONF_SERVER_STATUS'] = ""; - if (! isset($_SESSION['SWEKEY']['CONF_CA_FILE'])) - $_SESSION['SWEKEY']['CONF_CA_FILE'] = ""; - if (! isset($_SESSION['SWEKEY']['CONF_ENABLE_TOKEN_CACHE'])) - $_SESSION['SWEKEY']['CONF_ENABLE_TOKEN_CACHE'] = true; - if (! isset($_SESSION['SWEKEY']['CONF_DEBUG'])) - $_SESSION['SWEKEY']['CONF_DEBUG'] = false; + if (! isset($_SESSION['SWEKEY']['CONF_SERVER_CHECK'])) + $_SESSION['SWEKEY']['CONF_SERVER_CHECK'] = ""; + if (! isset($_SESSION['SWEKEY']['CONF_SERVER_RNDTOKEN'])) + $_SESSION['SWEKEY']['CONF_SERVER_RNDTOKEN'] = ""; + if (! isset($_SESSION['SWEKEY']['CONF_SERVER_STATUS'])) + $_SESSION['SWEKEY']['CONF_SERVER_STATUS'] = ""; + if (! isset($_SESSION['SWEKEY']['CONF_CA_FILE'])) + $_SESSION['SWEKEY']['CONF_CA_FILE'] = ""; + if (! isset($_SESSION['SWEKEY']['CONF_ENABLE_TOKEN_CACHE'])) + $_SESSION['SWEKEY']['CONF_ENABLE_TOKEN_CACHE'] = true; + if (! isset($_SESSION['SWEKEY']['CONF_DEBUG'])) + $_SESSION['SWEKEY']['CONF_DEBUG'] = false; } // check if a web key has been authenticated if ($_SESSION['SWEKEY']['ENABLED']) { if (empty($_SESSION['SWEKEY']['AUTHENTICATED_SWEKEY'])) return false; - } + } - return true; + return true; } @@ -68,32 +68,32 @@ function Swekey_auth_error() if (! isset($_SESSION['SWEKEY'])) return null; - if (! $_SESSION['SWEKEY']['ENABLED']) + if (! $_SESSION['SWEKEY']['ENABLED']) return null; - require_once './libraries/auth/swekey/authentication.inc.php'; + require_once './libraries/auth/swekey/authentication.inc.php'; ?> <script> function Swekey_GetValidKey() - { - var valids = "<?php - foreach ($_SESSION['SWEKEY']['VALID_SWEKEYS'] as $key => $value) - echo $key.','; - ?>"; - var connected_keys = Swekey_ListKeyIds().split(","); - for (i in connected_keys) - if (connected_keys[i] != null && connected_keys[i].length == 32) - if (valids.indexOf(connected_keys[i]) >= 0) - return connected_keys[i]; + { + var valids = "<?php + foreach ($_SESSION['SWEKEY']['VALID_SWEKEYS'] as $key => $value) + echo $key.','; + ?>"; + var connected_keys = Swekey_ListKeyIds().split(","); + for (i in connected_keys) + if (connected_keys[i] != null && connected_keys[i].length == 32) + if (valids.indexOf(connected_keys[i]) >= 0) + return connected_keys[i]; if (connected_keys.length > 0) - if (connected_keys[0].length == 32) - return "unknown_key_" + connected_keys[0]; + if (connected_keys[0].length == 32) + return "unknown_key_" + connected_keys[0]; - return "none"; - } + return "none"; + } var key = Swekey_GetValidKey(); @@ -103,16 +103,16 @@ function Swekey_auth_error() { window.location.search = "?swekey_reset"; } - else - setTimeout("timedCheck()",1000); + else + setTimeout("timedCheck()",1000); } - setTimeout("timedCheck()",1000); + setTimeout("timedCheck()",1000); </script> - <?php + <?php - if (! empty($_SESSION['SWEKEY']['AUTHENTICATED_SWEKEY'])) - return null; + if (! empty($_SESSION['SWEKEY']['AUTHENTICATED_SWEKEY'])) + return null; if (count($_SESSION['SWEKEY']['VALID_SWEKEYS']) == 0) return sprintf(__('File %s does not contain any key id'), $GLOBALS['cfg']['Server']['auth_swekey_config']); @@ -158,7 +158,7 @@ function Swekey_auth_error() } else { $_SESSION['SWEKEY']['AUTHENTICATED_SWEKEY'] = $swekey_id; - $_SESSION['SWEKEY']['FORCE_USER'] = $_SESSION['SWEKEY']['VALID_SWEKEYS'][$swekey_id]; + $_SESSION['SWEKEY']['FORCE_USER'] = $_SESSION['SWEKEY']['VALID_SWEKEYS'][$swekey_id]; return null; } } @@ -184,19 +184,19 @@ function Swekey_auth_error() if (! isset($swekey_id)) { ?> <script> - if (key.length != 32) - { - window.location.search="?swekey_id=" + key; - } - else - { - var url = "" + window.location; - if (url.indexOf("?") > 0) - url = url.substr(0, url.indexOf("?")); - Swekey_SetUnplugUrl(key, "pma_login", url + "?session_to_unset=<?php echo session_id();?>"); - var otp = Swekey_GetOtp(key, <?php echo '"'.$_SESSION['SWEKEY']['RND_TOKEN'].'"';?>); - window.location.search="?swekey_id=" + key + "&swekey_otp=" + otp; - } + if (key.length != 32) + { + window.location.search="?swekey_id=" + key; + } + else + { + var url = "" + window.location; + if (url.indexOf("?") > 0) + url = url.substr(0, url.indexOf("?")); + Swekey_SetUnplugUrl(key, "pma_login", url + "?session_to_unset=<?php echo session_id();?>"); + var otp = Swekey_GetOtp(key, <?php echo '"'.$_SESSION['SWEKEY']['RND_TOKEN'].'"';?>); + window.location.search="?swekey_id=" + key + "&swekey_otp=" + otp; + } </script> <?php return __('Authenticating...'); @@ -225,7 +225,7 @@ function Swekey_login($input_name, $input_go) echo '<script type="text/javascript">'; if (empty($_SESSION['SWEKEY']['FORCE_USER'])) echo 'var user = null;'; - else + else echo 'var user = "'.$_SESSION['SWEKEY']['FORCE_USER'].'";'; ?> @@ -236,47 +236,47 @@ function Swekey_login($input_name, $input_go) var input_username = document.getElementById("<?php echo $input_name; ?>"); var input_go = document.getElementById("<?php echo $input_go; ?>"); - var swekey_status = document.createElement('img'); - swekey_status.setAttribute('onClick', 'open_swekey_site()'); - swekey_status.setAttribute('style', 'width:8px; height:16px; border:0px; vspace:0px; hspace:0px; frameborder:no'); + var swekey_status = document.createElement('img'); + swekey_status.setAttribute('onClick', 'open_swekey_site()'); + swekey_status.setAttribute('style', 'width:8px; height:16px; border:0px; vspace:0px; hspace:0px; frameborder:no'); if (user == null) - { - swekey_status.setAttribute('src', 'http://artwork.swekey.com/unplugged-8x16.png'); - //swekey_status.setAttribute('title', 'No swekey plugged'); - input_go.disabled = true; - } - else - { - swekey_status.setAttribute('src', 'http://artwork.swekey.com/plugged-8x16.png'); - //swekey_status.setAttribute('title', 'swekey plugged'); - input_username.value = user; - } - input_username.readOnly = true; - - if (input_username.nextSibling == null) - input_username.parentNode.appendChild(swekey_status); - else - input_username.parentNode.insertBefore(swekey_status, input_username.nextSibling); - - <?php + { + swekey_status.setAttribute('src', 'http://artwork.swekey.com/unplugged-8x16.png'); + //swekey_status.setAttribute('title', 'No swekey plugged'); + input_go.disabled = true; + } + else + { + swekey_status.setAttribute('src', 'http://artwork.swekey.com/plugged-8x16.png'); + //swekey_status.setAttribute('title', 'swekey plugged'); + input_username.value = user; + } + input_username.readOnly = true; + + if (input_username.nextSibling == null) + input_username.parentNode.appendChild(swekey_status); + else + input_username.parentNode.insertBefore(swekey_status, input_username.nextSibling); + + <?php echo '</script>'; - } + } } if (!empty($_GET['session_to_unset'])) { - session_write_close(); - session_id($_GET['session_to_unset']); - session_start(); - $_SESSION = array(); - session_write_close(); - session_destroy(); - exit; + session_write_close(); + session_id($_GET['session_to_unset']); + session_start(); + $_SESSION = array(); + session_write_close(); + session_destroy(); + exit; } if (isset($_GET['swekey_reset'])) { - unset($_SESSION['SWEKEY']); + unset($_SESSION['SWEKEY']); } ?> diff --git a/libraries/auth/swekey/swekey.php b/libraries/auth/swekey/swekey.php index b456061..869d3d5 100644 --- a/libraries/auth/swekey/swekey.php +++ b/libraries/auth/swekey/swekey.php @@ -128,7 +128,7 @@ function Swekey_SetStatusServer($server) function Swekey_SetCAFile($cafile) { global $gSwekeyCA; - $gSwekeyCA = $cafile; + $gSwekeyCA = $cafile; } /** @@ -142,7 +142,7 @@ function Swekey_SetCAFile($cafile) function Swekey_EnableTokenCache($enable) { global $gSwekeyTokenCacheEnabled; - $gSwekeyTokenCacheEnabled = ! empty($enable); + $gSwekeyTokenCacheEnabled = ! empty($enable); } @@ -186,51 +186,51 @@ function Swekey_HttpGet($url, &$response_code) global $gSwekeyLastResult; $gSwekeyLastResult = "<not set>"; - // use curl if available - if (function_exists('curl_init')) - { - $sess = curl_init($url); - if (substr($url, 0, 8) == "https://") - { - global $gSwekeyCA; - - if (! empty($gSwekeyCA)) - { - if (file_exists($gSwekeyCA)) - { - if (! curl_setopt($sess, CURLOPT_CAINFO, $gSwekeyCA)) - error_log("SWEKEY_ERROR:Could not set CA file : ".curl_error($sess)); - else - $caFileOk = true; - } - else - error_log("SWEKEY_ERROR:Could not find CA file $gSwekeyCA getting $url"); - } - - curl_setopt($sess, CURLOPT_SSL_VERIFYHOST, '2'); - curl_setopt($sess, CURLOPT_SSL_VERIFYPEER, '2'); - curl_setopt($sess, CURLOPT_CONNECTTIMEOUT, '20'); - curl_setopt($sess, CURLOPT_TIMEOUT, '20'); - } - else - { - curl_setopt($sess, CURLOPT_CONNECTTIMEOUT, '3'); - curl_setopt($sess, CURLOPT_TIMEOUT, '5'); - } - - curl_setopt($sess, CURLOPT_RETURNTRANSFER, '1'); - $res=curl_exec($sess); - $response_code = curl_getinfo($sess, CURLINFO_HTTP_CODE); - $curlerr = curl_error($sess); - curl_close($sess); - - if ($response_code == 200) - { - $gSwekeyLastResult = $res; - return $res; - } - - if (! empty($response_code)) + // use curl if available + if (function_exists('curl_init')) + { + $sess = curl_init($url); + if (substr($url, 0, 8) == "https://") + { + global $gSwekeyCA; + + if (! empty($gSwekeyCA)) + { + if (file_exists($gSwekeyCA)) + { + if (! curl_setopt($sess, CURLOPT_CAINFO, $gSwekeyCA)) + error_log("SWEKEY_ERROR:Could not set CA file : ".curl_error($sess)); + else + $caFileOk = true; + } + else + error_log("SWEKEY_ERROR:Could not find CA file $gSwekeyCA getting $url"); + } + + curl_setopt($sess, CURLOPT_SSL_VERIFYHOST, '2'); + curl_setopt($sess, CURLOPT_SSL_VERIFYPEER, '2'); + curl_setopt($sess, CURLOPT_CONNECTTIMEOUT, '20'); + curl_setopt($sess, CURLOPT_TIMEOUT, '20'); + } + else + { + curl_setopt($sess, CURLOPT_CONNECTTIMEOUT, '3'); + curl_setopt($sess, CURLOPT_TIMEOUT, '5'); + } + + curl_setopt($sess, CURLOPT_RETURNTRANSFER, '1'); + $res=curl_exec($sess); + $response_code = curl_getinfo($sess, CURLINFO_HTTP_CODE); + $curlerr = curl_error($sess); + curl_close($sess); + + if ($response_code == 200) + { + $gSwekeyLastResult = $res; + return $res; + } + + if (! empty($response_code)) { $gSwekeyLastError = $response_code; error_log("SWEKEY_ERROR:Error $gSwekeyLastError ($curlerr) getting $url"); @@ -241,9 +241,9 @@ function Swekey_HttpGet($url, &$response_code) $gSwekeyLastError = $response_code; error_log("SWEKEY_ERROR:Error $curlerr getting $url"); return ""; - } + } - // use pecl_http if available + // use pecl_http if available if (class_exists('HttpRequest')) { // retry if one of the server is down @@ -276,18 +276,18 @@ function Swekey_HttpGet($url, &$response_code) { $reply = $r->send(); $res = $reply->getBody(); - $info = $r->getResponseInfo(); - $response_code = $info['response_code']; - if ($response_code != 200) - { + $info = $r->getResponseInfo(); + $response_code = $info['response_code']; + if ($response_code != 200) + { $gSwekeyLastError = $response_code; error_log("SWEKEY_ERROR:Error ".$gSwekeyLastError." getting ".$url); return ""; } - $gSwekeyLastResult = $res; - return $res; + $gSwekeyLastResult = $res; + return $res; } // catch (HttpException $e) // { @@ -301,14 +301,14 @@ function Swekey_HttpGet($url, &$response_code) return ""; } - global $http_response_header; - $res = @file_get_contents($url); - $response_code = substr($http_response_header[0], 9, 3); //HTTP/1.0 - if ($response_code == 200) - { - $gSwekeyLastResult = $res; - return $res; - } + global $http_response_header; + $res = @file_get_contents($url); + $response_code = substr($http_response_header[0], 9, 3); //HTTP/1.0 + if ($response_code == 200) + { + $gSwekeyLastResult = $res; + return $res; + } $gSwekeyLastError = $response_code; error_log("SWEKEY_ERROR:Error ".$response_code." getting ".$url); @@ -336,7 +336,7 @@ function Swekey_GetRndToken() function Swekey_GetHalfRndToken() { global $gSwekeyRndTokenServer; - return Swekey_HttpGet($gSwekeyRndTokenServer.'/HALF-RND-TOKEN', $response_code); + return Swekey_HttpGet($gSwekeyRndTokenServer.'/HALF-RND-TOKEN', $response_code); } /** @@ -357,7 +357,7 @@ function Swekey_GetFastHalfRndToken() // We check if we have a valid RT is the session if (isset($_SESSION['rnd-token-date'])) if (time() - $_SESSION['rnd-token-date'] < 30) - $res = $_SESSION['rnd-token']; + $res = $_SESSION['rnd-token']; // If not we try to get it from a temp file (PHP >= 5.2.1 only) if (strlen($res) != 32 && $gSwekeyTokenCacheEnabled) @@ -367,18 +367,18 @@ function Swekey_GetFastHalfRndToken() $tempdir = sys_get_temp_dir(); $cachefile = $tempdir."/swekey-rnd-token-".get_current_user(); $modif = filemtime($cachefile); - if ($modif != false) + if ($modif != false) if (time() - $modif < 30) - { - $res = @file_get_contents($cachefile); - if (strlen($res) != 32) - $res = ""; - else - { - $_SESSION['rnd-token'] = $res; - $_SESSION['rnd-token-date'] = $modif; - } - } + { + $res = @file_get_contents($cachefile); + if (strlen($res) != 32) + $res = ""; + else + { + $_SESSION['rnd-token'] = $res; + $_SESSION['rnd-token-date'] = $modif; + } + } } } @@ -390,14 +390,14 @@ function Swekey_GetFastHalfRndToken() $_SESSION['rnd-token-date'] = time(); if (! empty($cachefile)) { - // we unlink the file so no possible tempfile race attack - unlink($cachefile); - $file = fopen($cachefile , "x"); - if ($file != false) - { - @fwrite($file, $res); - @fclose($file); - } + // we unlink the file so no possible tempfile race attack + unlink($cachefile); + $file = fopen($cachefile , "x"); + if ($file != false) + { + @fwrite($file, $res); + @fclose($file); + } } } @@ -434,8 +434,8 @@ function Swekey_GetFastRndToken() function Swekey_CheckOtp($id, $rt, $otp) { global $gSwekeyCheckServer; - $res = Swekey_HttpGet($gSwekeyCheckServer.'/CHECK-OTP/'.$id.'/'.$rt.'/'.$otp, $response_code); - return $response_code == 200 && $res == "OK"; + $res = Swekey_HttpGet($gSwekeyCheckServer.'/CHECK-OTP/'.$id.'/'.$rt.'/'.$otp, $response_code); + return $response_code == 200 && $res == "OK"; } /** @@ -445,9 +445,9 @@ function Swekey_CheckOtp($id, $rt, $otp) define ("SWEKEY_STATUS_OK",0); define ("SWEKEY_STATUS_NOT_FOUND",1); // The key does not exist in the db define ("SWEKEY_STATUS_INACTIVE",2); // The key has never been activated -define ("SWEKEY_STATUS_LOST",3); // The user has lost his key -define ("SWEKEY_STATUS_STOLEN",4); // The key was stolen -define ("SWEKEY_STATUS_FEE_DUE",5); // The annual fee was not paid +define ("SWEKEY_STATUS_LOST",3); // The user has lost his key +define ("SWEKEY_STATUS_STOLEN",4); // The key was stolen +define ("SWEKEY_STATUS_FEE_DUE",5); // The annual fee was not paid define ("SWEKEY_STATUS_OBSOLETE",6); // The hardware is no longer supported define ("SWEKEY_STATUS_UNKOWN",201); // We could not connect to the authentication server @@ -455,7 +455,7 @@ define ("SWEKEY_STATUS_UNKOWN",201); // We could not connect to the authentica * Values that are associated with a key. * The Javascript Api can also return the following values */ -define ("SWEKEY_STATUS_REPLACED",100); // This key has been replaced by a backup key +define ("SWEKEY_STATUS_REPLACED",100); // This key has been replaced by a backup key define ("SWEKEY_STATUS_BACKUP_KEY",101); // This key is a backup key that is not activated yet define ("SWEKEY_STATUS_NOTPLUGGED",200); // This key is not plugged in the computer @@ -469,21 +469,21 @@ define ("SWEKEY_STATUS_NOTPLUGGED",200); // This key is not plugged in the compu */ function Swekey_GetStatusStr($status) { - switch($status) - { - case SWEKEY_STATUS_OK : return 'OK'; - case SWEKEY_STATUS_NOT_FOUND : return 'Key does not exist in the db'; - case SWEKEY_STATUS_INACTIVE : return 'Key not activated'; - case SWEKEY_STATUS_LOST : return 'Key was lost'; - case SWEKEY_STATUS_STOLEN : return 'Key was stolen'; - case SWEKEY_STATUS_FEE_DUE : return 'The annual fee was not paid'; - case SWEKEY_STATUS_OBSOLETE : return 'Key no longer supported'; - case SWEKEY_STATUS_REPLACED : return 'This key has been replaced by a backup key'; + switch($status) + { + case SWEKEY_STATUS_OK : return 'OK'; + case SWEKEY_STATUS_NOT_FOUND : return 'Key does not exist in the db'; + case SWEKEY_STATUS_INACTIVE : return 'Key not activated'; + case SWEKEY_STATUS_LOST : return 'Key was lost'; + case SWEKEY_STATUS_STOLEN : return 'Key was stolen'; + case SWEKEY_STATUS_FEE_DUE : return 'The annual fee was not paid'; + case SWEKEY_STATUS_OBSOLETE : return 'Key no longer supported'; + case SWEKEY_STATUS_REPLACED : return 'This key has been replaced by a backup key'; case SWEKEY_STATUS_BACKUP_KEY : return 'This key is a backup key that is not activated yet'; case SWEKEY_STATUS_NOTPLUGGED : return 'This key is not plugged in the computer'; - case SWEKEY_STATUS_UNKOWN : return 'Unknow Status, could not connect to the authentication server'; - } - return 'unknown status '.$status; + case SWEKEY_STATUS_UNKOWN : return 'Unknow Status, could not connect to the authentication server'; + } + return 'unknown status '.$status; } /** @@ -497,7 +497,7 @@ function Swekey_GetStatusStr($status) function Swekey_GetStatus($id) { global $gSwekeyStatusServer; - $res = Swekey_HttpGet($gSwekeyStatusServer.'/GET-STATUS/'.$id, $response_code); + $res = Swekey_HttpGet($gSwekeyStatusServer.'/GET-STATUS/'.$id, $response_code); if ($response_code == 200) return intval($res); diff --git a/libraries/engines/pbms.lib.php b/libraries/engines/pbms.lib.php index 7f8c44b..7f8f58c 100644 --- a/libraries/engines/pbms.lib.php +++ b/libraries/engines/pbms.lib.php @@ -23,7 +23,7 @@ class PMA_StorageEngine_pbms extends PMA_StorageEngine $this->support = PMA_ENGINE_SUPPORT_YES; } - function getVariables() + function getVariables() { return array( 'pbms_garbage_threshold' => array( diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 73f9008..f257205 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -336,35 +336,35 @@ function PMA_importGetNextChunk($size = 32768) */ function PMA_getColumnAlphaName($num) { - $A = 65; // ASCII value for capital "A" - $col_name = ""; - - if ($num > 26) { - $div = (int)($num / 26); - $remain = (int)($num % 26); - - // subtract 1 of divided value in case the modulus is 0, - // this is necessary because A-Z has no 'zero' - if ($remain == 0) { - $div--; - } - - // recursive function call - $col_name = PMA_getColumnAlphaName($div); - // use modulus as new column number - $num = $remain; - } - - if ($num == 0) { - // use 'Z' if column number is 0, - // this is necessary because A-Z has no 'zero' - $col_name .= chr(($A + 26) - 1); - } else { - // convert column number to ASCII character - $col_name .= chr(($A + $num) - 1); - } - - return $col_name; + $A = 65; // ASCII value for capital "A" + $col_name = ""; + + if ($num > 26) { + $div = (int)($num / 26); + $remain = (int)($num % 26); + + // subtract 1 of divided value in case the modulus is 0, + // this is necessary because A-Z has no 'zero' + if ($remain == 0) { + $div--; + } + + // recursive function call + $col_name = PMA_getColumnAlphaName($div); + // use modulus as new column number + $num = $remain; + } + + if ($num == 0) { + // use 'Z' if column number is 0, + // this is necessary because A-Z has no 'zero' + $col_name .= chr(($A + 26) - 1); + } else { + // convert column number to ASCII character + $col_name .= chr(($A + $num) - 1); + } + + return $col_name; } /** @@ -387,19 +387,19 @@ function PMA_getColumnNumberFromName($name) { $num_chars = strlen($name); $column_number = 0; for ($i = 0; $i < $num_chars; ++$i) { - // read string from back to front - $char_pos = ($num_chars - 1) - $i; - - // convert capital character to ASCII value - // and subtract 64 to get corresponding decimal value - // ASCII value of "A" is 65, "B" is 66, etc. - // Decimal equivalent of "A" is 1, "B" is 2, etc. - $number = (ord($name[$char_pos]) - 64); - - // base26 to base10 conversion : multiply each number - // with corresponding value of the position, in this case - // $i=0 : 1; $i=1 : 26; $i=2 : 676; ... - $column_number += $number * pow(26,$i); + // read string from back to front + $char_pos = ($num_chars - 1) - $i; + + // convert capital character to ASCII value + // and subtract 64 to get corresponding decimal value + // ASCII value of "A" is 65, "B" is 66, etc. + // Decimal equivalent of "A" is 1, "B" is 2, etc. + $number = (ord($name[$char_pos]) - 64); + + // base26 to base10 conversion : multiply each number + // with corresponding value of the position, in this case + // $i=0 : 1; $i=1 : 26; $i=2 : 676; ... + $column_number += $number * pow(26,$i); } return $column_number; } else { @@ -453,7 +453,7 @@ function PMA_getM($last_cumulative_size) { * @return int Scale of the given decimal size notation */ function PMA_getD($last_cumulative_size) { - return (int)substr($last_cumulative_size, (strpos($last_cumulative_size, ",") + 1), (strlen($last_cumulative_size) - strpos($last_cumulative_size, ","))); + return (int)substr($last_cumulative_size, (strpos($last_cumulative_size, ",") + 1), (strlen($last_cumulative_size) - strpos($last_cumulative_size, ","))); } /** @@ -489,7 +489,7 @@ function PMA_getDecimalSize(&$cell) { * @return string Size of the given cell in the type-appropriate format */ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type, &$cell) { - $curr_size = strlen((string)$cell); + $curr_size = strlen((string)$cell); /** * If the cell is NULL, don't treat it as a varchar @@ -500,17 +500,17 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type /** * What to do if the current cell is of type VARCHAR */ - elseif ($curr_type == VARCHAR) { + elseif ($curr_type == VARCHAR) { /** * The last cumulative type was VARCHAR */ - if ($last_cumulative_type == VARCHAR) { - if ($curr_size >= $last_cumulative_size) { - return $curr_size; + if ($last_cumulative_type == VARCHAR) { + if ($curr_size >= $last_cumulative_size) { + return $curr_size; } else { - return $last_cumulative_size; + return $last_cumulative_size; } - } + } /** * The last cumulative type was DECIMAL */ @@ -522,7 +522,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type } else { return $oldM; } - } + } /** * The last cumulative type was BIGINT or INT */ @@ -532,7 +532,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type } else { return $last_cumulative_size; } - } + } /** * This is the first row to be analyzed */ @@ -549,7 +549,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type return -1; } - } + } /** * What to do if the current cell is of type DECIMAL */ @@ -557,66 +557,66 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type /** * The last cumulative type was VARCHAR */ - if ($last_cumulative_type == VARCHAR) { + if ($last_cumulative_type == VARCHAR) { /* Convert $last_cumulative_size from varchar to decimal format */ - $size = PMA_getDecimalSize($cell); + $size = PMA_getDecimalSize($cell); - if ($size[M] >= $last_cumulative_size) { - return $size[M]; + if ($size[M] >= $last_cumulative_size) { + return $size[M]; } else { - return $last_cumulative_size; + return $last_cumulative_size; } - } + } /** * The last cumulative type was DECIMAL */ elseif ($last_cumulative_type == DECIMAL) { - $size = PMA_getDecimalSize($cell); + $size = PMA_getDecimalSize($cell); - $oldM = PMA_getM($last_cumulative_size); - $oldD = PMA_getD($last_cumulative_size); + $oldM = PMA_getM($last_cumulative_size); + $oldD = PMA_getD($last_cumulative_size); - /* New val if M or D is greater than current largest */ - if ($size[M] > $oldM || $size[D] > $oldD) { - /* Take the largest of both types */ - return (string)((($size[M] > $oldM) ? $size[M] : $oldM) . "," . (($size[D] > $oldD) ? $size[D] : $oldD)); + /* New val if M or D is greater than current largest */ + if ($size[M] > $oldM || $size[D] > $oldD) { + /* Take the largest of both types */ + return (string)((($size[M] > $oldM) ? $size[M] : $oldM) . "," . (($size[D] > $oldD) ? $size[D] : $oldD)); } else { - return $last_cumulative_size; + return $last_cumulative_size; } - } + } /** * The last cumulative type was BIGINT or INT */ elseif ($last_cumulative_type == BIGINT || $last_cumulative_type == INT) { - /* Convert $last_cumulative_size from int to decimal format */ - $size = PMA_getDecimalSize($cell); + /* Convert $last_cumulative_size from int to decimal format */ + $size = PMA_getDecimalSize($cell); - if ($size[M] >= $last_cumulative_size) { - return $size[FULL]; + if ($size[M] >= $last_cumulative_size) { + return $size[FULL]; } else { - return ($last_cumulative_size.",".$size[D]); + return ($last_cumulative_size.",".$size[D]); } - } + } /** * This is the first row to be analyzed */ elseif (! isset($last_cumulative_type) || $last_cumulative_type == NONE) { /* First row of the column */ - $size = PMA_getDecimalSize($cell); + $size = PMA_getDecimalSize($cell); - return $size[FULL]; - } + return $size[FULL]; + } /** * An error has DEFINITELY occurred */ - else { + else { /** * TODO: Handle this MUCH more elegantly */ return -1; } - } + } /** * What to do if the current cell is of type BIGINT or INT */ @@ -624,41 +624,41 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type /** * The last cumulative type was VARCHAR */ - if ($last_cumulative_type == VARCHAR) { - if ($curr_size >= $last_cumulative_size) { - return $curr_size; + if ($last_cumulative_type == VARCHAR) { + if ($curr_size >= $last_cumulative_size) { + return $curr_size; } else { - return $last_cumulative_size; + return $last_cumulative_size; } - } + } /** * The last cumulative type was DECIMAL */ elseif ($last_cumulative_type == DECIMAL) { $oldM = PMA_getM($last_cumulative_size); - $oldD = PMA_getD($last_cumulative_size); - $oldInt = $oldM - $oldD; - $newInt = strlen((string)$cell); - - /* See which has the larger integer length */ - if ($oldInt >= $newInt) { - /* Use old decimal size */ - return $last_cumulative_size; + $oldD = PMA_getD($last_cumulative_size); + $oldInt = $oldM - $oldD; + $newInt = strlen((string)$cell); + + /* See which has the larger integer length */ + if ($oldInt >= $newInt) { + /* Use old decimal size */ + return $last_cumulative_size; } else { - /* Use $newInt + $oldD as new M */ - return (($newInt + $oldD) . "," . $oldD); + /* Use $newInt + $oldD as new M */ + return (($newInt + $oldD) . "," . $oldD); } - } + } /** * The last cumulative type was BIGINT or INT */ elseif ($last_cumulative_type == BIGINT || $last_cumulative_type == INT) { - if ($curr_size >= $last_cumulative_size) { - return $curr_size; + if ($curr_size >= $last_cumulative_size) { + return $curr_size; } else { - return $last_cumulative_size; + return $last_cumulative_size; } - } + } /** * This is the first row to be analyzed */ @@ -668,18 +668,18 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type /** * An error has DEFINITELY occurred */ - else { + else { /** * TODO: Handle this MUCH more elegantly */ return -1; } - } + } /** * An error has DEFINITELY occurred */ - else { + else { /** * TODO: Handle this MUCH more elegantly */ @@ -713,11 +713,11 @@ function PMA_detectType($last_cumulative_type, &$cell) { if ($cell == (string)(float)$cell && strpos($cell, ".") !== false && substr_count($cell, ".") == 1) { return DECIMAL; } else { - if (abs($cell) > 2147483647) { - return BIGINT; - } else { - return INT; - } + if (abs($cell) > 2147483647) { + return BIGINT; + } else { + return INT; + } } } else { return VARCHAR; @@ -737,62 +737,62 @@ function PMA_detectType($last_cumulative_type, &$cell) { * @return array array(array $types, array $sizes) */ function PMA_analyzeTable(&$table) { - /* Get number of rows in table */ - $numRows = count($table[ROWS]); - /* Get number of columns */ - $numCols = count($table[COL_NAMES]); - /* Current type for each column */ - $types = array(); - $sizes = array(); - - /* Initialize $sizes to all 0's */ - for ($i = 0; $i < $numCols; ++$i) { - $sizes[$i] = 0; - } + /* Get number of rows in table */ + $numRows = count($table[ROWS]); + /* Get number of columns */ + $numCols = count($table[COL_NAMES]); + /* Current type for each column */ + $types = array(); + $sizes = array(); + + /* Initialize $sizes to all 0's */ + for ($i = 0; $i < $numCols; ++$i) { + $sizes[$i] = 0; + } /* Initialize $types to NONE */ for ($i = 0; $i < $numCols; ++$i) { $types[$i] = NONE; } - /* Temp vars */ - $curr_type = NONE; - $curr_size = 0; - - /* If the passed array is not of the correct form, do not process it */ - if (is_array($table) && ! is_array($table[TBL_NAME]) && is_array($table[COL_NAMES]) && is_array($table[ROWS])) { - /* Analyze each column */ - for ($i = 0; $i < $numCols; ++$i) { - /* Analyze the column in each row */ - for ($j = 0; $j < $numRows; ++$j) { - /* Determine type of the current cell */ - $curr_type = PMA_detectType($types[$i], $table[ROWS][$j][$i]); - /* Determine size of the current cell */ - $sizes[$i] = PMA_detectSize($sizes[$i], $types[$i], $curr_type, $table[ROWS][$j][$i]); - - /** - * If a type for this column has already been declared, - * only alter it if it was a number and a varchar was found - */ - if ($curr_type != NONE) { - if ($curr_type == VARCHAR) { - $types[$i] = VARCHAR; - } else if ($curr_type == DECIMAL) { - if ($types[$i] != VARCHAR) { - $types[$i] = DECIMAL; - } - } else if ($curr_type == BIGINT) { - if ($types[$i] != VARCHAR && $types[$i] != DECIMAL) { - $types[$i] = BIGINT; - } - } else if ($curr_type == INT) { - if ($types[$i] != VARCHAR && $types[$i] != DECIMAL && $types[$i] != BIGINT) { - $types[$i] = INT; - } - } - } - } - } + /* Temp vars */ + $curr_type = NONE; + $curr_size = 0; + + /* If the passed array is not of the correct form, do not process it */ + if (is_array($table) && ! is_array($table[TBL_NAME]) && is_array($table[COL_NAMES]) && is_array($table[ROWS])) { + /* Analyze each column */ + for ($i = 0; $i < $numCols; ++$i) { + /* Analyze the column in each row */ + for ($j = 0; $j < $numRows; ++$j) { + /* Determine type of the current cell */ + $curr_type = PMA_detectType($types[$i], $table[ROWS][$j][$i]); + /* Determine size of the current cell */ + $sizes[$i] = PMA_detectSize($sizes[$i], $types[$i], $curr_type, $table[ROWS][$j][$i]); + + /** + * If a type for this column has already been declared, + * only alter it if it was a number and a varchar was found + */ + if ($curr_type != NONE) { + if ($curr_type == VARCHAR) { + $types[$i] = VARCHAR; + } else if ($curr_type == DECIMAL) { + if ($types[$i] != VARCHAR) { + $types[$i] = DECIMAL; + } + } else if ($curr_type == BIGINT) { + if ($types[$i] != VARCHAR && $types[$i] != DECIMAL) { + $types[$i] = BIGINT; + } + } else if ($curr_type == INT) { + if ($types[$i] != VARCHAR && $types[$i] != DECIMAL && $types[$i] != BIGINT) { + $types[$i] = INT; + } + } + } + } + } /* Check to ensure that all types are valid */ $len = count($types); @@ -803,16 +803,16 @@ function PMA_analyzeTable(&$table) { } } - return array($types, $sizes); - } - else - { + return array($types, $sizes); + } + else + { /** * TODO: Handle this better */ - return false; - } + return false; + } } /* Needed to quell the beast that is PMA_Message */ @@ -944,10 +944,10 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null, &$additional_sql = * * Only one insert query is formed for each table */ - $tempSQLStr = ""; - $col_count = 0; + $tempSQLStr = ""; + $col_count = 0; $num_tables = count($tables); - for ($i = 0; $i < $num_tables; ++$i) { + for ($i = 0; $i < $num_tables; ++$i) { $num_cols = count($tables[$i][COL_NAMES]); $num_rows = count($tables[$i][ROWS]); @@ -963,10 +963,10 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null, &$additional_sql = $tempSQLStr .= ") VALUES "; - for ($j = 0; $j < $num_rows; ++$j) { + for ($j = 0; $j < $num_rows; ++$j) { $tempSQLStr .= "("; - for ($k = 0; $k < $num_cols; ++$k) { + for ($k = 0; $k < $num_cols; ++$k) { if ($analyses != null) { $is_varchar = ($analyses[$i][TYPES][$col_count] === VARCHAR); } else { @@ -979,22 +979,22 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null, &$additional_sql = } $tempSQLStr .= (($is_varchar) ? "'" : ""); - $tempSQLStr .= PMA_sqlAddSlashes((string)$tables[$i][ROWS][$j][$k]); - $tempSQLStr .= (($is_varchar) ? "'" : ""); + $tempSQLStr .= PMA_sqlAddSlashes((string)$tables[$i][ROWS][$j][$k]); + $tempSQLStr .= (($is_varchar) ? "'" : ""); - if ($k != ($num_cols - 1)) { - $tempSQLStr .= ", "; + if ($k != ($num_cols - 1)) { + $tempSQLStr .= ", "; } - if ($col_count == ($num_cols - 1)) { - $col_count = 0; - } else { - $col_count++; + if ($col_count == ($num_cols - 1)) { + $col_count = 0; + } else { + $col_count++; } /* Delete the cell after we are done with it */ unset($tables[$i][ROWS][$j][$k]); - } + } $tempSQLStr .= ")"; @@ -1002,10 +1002,10 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null, &$additional_sql = $tempSQLStr .= ",\n "; } - $col_count = 0; + $col_count = 0; /* Delete the row after we are done with it */ unset($tables[$i][ROWS][$j]); - } + } $tempSQLStr .= ";"; @@ -1015,7 +1015,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null, &$additional_sql = * to store them in a (possibly large) buffer */ PMA_importRunQuery($tempSQLStr, $tempSQLStr); - } + } /* No longer needed */ unset($tempSQLStr); diff --git a/libraries/rte/rte_words.lib.php b/libraries/rte/rte_words.lib.php index 6e7836a..e046ac2 100644 --- a/libraries/rte/rte_words.lib.php +++ b/libraries/rte/rte_words.lib.php @@ -1,5 +1,5 @@ <?php - +/* vim: set expandtab sw=4 ts=4 sts=4: */ /** * This function is used to retreive some language strings that are used * in functionalities that are common to routines, triggers and events. @@ -10,49 +10,49 @@ */ function PMA_RTE_getWord($index) { - global $_PMA_RTE; + global $_PMA_RTE; - switch ($_PMA_RTE) { - case 'RTN': - $words = array( - 'add' => __('Add routine'), - 'docu' => 'STORED_ROUTINES', - 'export' => __('Export of routine %s'), - 'human' => __('routine'), - 'no_create' => __('You do not have the necessary privileges to create a routine'), - 'not_found' => __('No routine with name %1$s found in database %2$s'), - 'nothing' => __('There are no routines to display.'), - 'title' => __('Routines'), - ); - break; - case 'TRI': - $words = array( - 'add' => __('Add trigger'), - 'docu' => 'TRIGGERS', - 'export' => __('Export of trigger %s'), - 'human' => __('trigger'), - 'no_create' => __('You do not have the necessary privileges to create a trigger'), - 'not_found' => __('No trigger with name %1$s found in database %2$s'), - 'nothing' => __('There are no triggers to display.'), - 'title' => __('Triggers'), - ); - break; - case 'EVN': - $words = array( - 'add' => __('Add event'), - 'docu' => 'EVENTS', - 'export' => __('Export of event %s'), - 'human' => __('event'), - 'no_create' => __('You do not have the necessary privileges to create an event'), - 'not_found' => __('No event with name %1$s found in database %2$s'), - 'nothing' => __('There are no events to display.'), - 'title' => __('Events'), - ); - break; - default: - $words = array(); - break; - } + switch ($_PMA_RTE) { + case 'RTN': + $words = array( + 'add' => __('Add routine'), + 'docu' => 'STORED_ROUTINES', + 'export' => __('Export of routine %s'), + 'human' => __('routine'), + 'no_create' => __('You do not have the necessary privileges to create a routine'), + 'not_found' => __('No routine with name %1$s found in database %2$s'), + 'nothing' => __('There are no routines to display.'), + 'title' => __('Routines'), + ); + break; + case 'TRI': + $words = array( + 'add' => __('Add trigger'), + 'docu' => 'TRIGGERS', + 'export' => __('Export of trigger %s'), + 'human' => __('trigger'), + 'no_create' => __('You do not have the necessary privileges to create a trigger'), + 'not_found' => __('No trigger with name %1$s found in database %2$s'), + 'nothing' => __('There are no triggers to display.'), + 'title' => __('Triggers'), + ); + break; + case 'EVN': + $words = array( + 'add' => __('Add event'), + 'docu' => 'EVENTS', + 'export' => __('Export of event %s'), + 'human' => __('event'), + 'no_create' => __('You do not have the necessary privileges to create an event'), + 'not_found' => __('No event with name %1$s found in database %2$s'), + 'nothing' => __('There are no events to display.'), + 'title' => __('Events'), + ); + break; + default: + $words = array(); + break; + } return isset($words[$index]) ? $words[$index] : ''; } // end PMA_RTE_getWord() diff --git a/pmd/styles/default/style1.css b/pmd/styles/default/style1.css index eb3d690..21ddbce 100644 --- a/pmd/styles/default/style1.css +++ b/pmd/styles/default/style1.css @@ -147,19 +147,19 @@ form { } .option_tab { - padding-left: 2px; - padding-right: 2px; - width: 5px; + padding-left: 2px; + padding-right: 2px; + width: 5px; } .select_all { - vertical-align: top; - padding-left: 2px; - padding-right: 2px; - cursor: default; - width: 1px; - color: #000000; - background-image: url(images/Header.png); + vertical-align: top; + padding-left: 2px; + padding-right: 2px; + cursor: default; + width: 1px; + color: #000000; + background-image: url(images/Header.png); background-repeat: repeat-x; } @@ -456,127 +456,127 @@ z-index:999; } h2.tiger{ - background-repeat: repeat-x; + background-repeat: repeat-x; padding: 1px; font-weight: bold; - font-size:14px; - padding: 50 20 50 20px; - margin: 0 0 5px 0; - width: 250px; - float: left; - color : #333; - text-align: center; + font-size:14px; + padding: 50 20 50 20px; + margin: 0 0 5px 0; + width: 250px; + float: left; + color : #333; + text-align: center; } h2.tiger a { - background-image: url(images/Header.png); - text-align: center; - text-decoration: none; - color : #333; - display: block; + background-image: url(images/Header.png); + text-align: center; + text-decoration: none; + color : #333; + display: block; } h2.tiger a:hover { - color: #000; - background-image: url(images/Header_Linked.png); + color: #000; + background-image: url(images/Header_Linked.png); } h2.active { - background-image: url(images/Header.png); + background-image: url(images/Header.png); background-repeat: repeat-x; padding: 1px; - background-position: left bottom; + background-position: left bottom; } .toggle_container { - margin: 0 0 5px; - padding: 0; - border-top: 1px solid #d6d6d6; - background: #FFF ; - width: 250px; - overflow: hidden; - font-size: 1.2em; - clear: both; + margin: 0 0 5px; + padding: 0; + border-top: 1px solid #d6d6d6; + background: #FFF ; + width: 250px; + overflow: hidden; + font-size: 1.2em; + clear: both; } .toggle_container .block { - background-color: #DBE4E8; - padding:40 15 40 15px; /*--Padding of Container--*/ - border:1px solid #999; - color:#000; + background-color: #DBE4E8; + padding:40 15 40 15px; /*--Padding of Container--*/ + border:1px solid #999; + color:#000; } .history_table { - text-align: center; - background-color: #9999CC; + text-align: center; + background-color: #9999CC; } .history_table2 { - text-align: center; - background-color: #DBE4E8; + text-align: center; + background-color: #DBE4E8; } #filter { - display: none; - position: absolute; - top: 0%; - left: 0%; - width: 100%; - height: 100%; - background-color: #CCA; - z-index:10; - opacity:0.5; - filter: alpha(opacity=50); + display: none; + position: absolute; + top: 0%; + left: 0%; + width: 100%; + height: 100%; + background-color: #CCA; + z-index:10; + opacity:0.5; + filter: alpha(opacity=50); } #box { - display: none; - position: absolute; - top: 20%; - left: 30%; - width: 500px; - height: 220px; - padding: 48px; - margin:0; - border: 1px solid black; - background-color: white; - z-index:101; - overflow: visible; + display: none; + position: absolute; + top: 20%; + left: 30%; + width: 500px; + height: 220px; + padding: 48px; + margin:0; + border: 1px solid black; + background-color: white; + z-index:101; + overflow: visible; } #boxtitle { - position:absolute; - float:center; - top:0; - left:0; - width:593px; - height:20px; - padding:0; - padding-top:4px; - left-padding:8px; - margin:0; - border-bottom:4px solid #3CF; - background-color: #D0DCE0; //#09c; - color:black; - font-weight:bold; - padding-left: 2px; - font-family:"Times New Roman", Times, serif; - font-size:16px; - text-align:left; + position:absolute; + float:center; + top:0; + left:0; + width:593px; + height:20px; + padding:0; + padding-top:4px; + left-padding:8px; + margin:0; + border-bottom:4px solid #3CF; + background-color: #D0DCE0; //#09c; + color:black; + font-weight:bold; + padding-left: 2px; + font-family:"Times New Roman", Times, serif; + font-size:16px; + text-align:left; } #tblfooter { - background-color: D3DCE3; - float: right; - padding-top:10px; - color: black; - font-weight: normal; + background-color: D3DCE3; + float: right; + padding-top:10px; + color: black; + font-weight: normal; } input.btn { - color:#333; - font: bold 84%'trebuchet ms',helvetica,sans-serif; - background-color: #D0DCE0; + color:#333; + font: bold 84%'trebuchet ms',helvetica,sans-serif; + background-color: #D0DCE0; } diff --git a/pmd_general.php b/pmd_general.php index 74ff124..a93265e 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -41,23 +41,23 @@ echo ' var server = "' . PMA_escapeJsString($server) . '"; var db = "' . PMA_escapeJsString($db) . '"; var token = "' . PMA_escapeJsString($token) . '";'; - echo "\n"; - if ($_REQUEST['query']) { - echo ' - $(document).ready(function() { - $(".trigger").click(function() { - $(".panel").toggle("fast"); - $(this).toggleClass("active"); - return false; - }); - });'; - } + echo "\n"; + if ($_REQUEST['query']) { + echo ' + $(document).ready(function() { + $(".trigger").click(function() { + $(".panel").toggle("fast"); + $(this).toggleClass("active"); + return false; + }); + });'; + } ?> // ]]> </script> <script src="pmd/scripts/ajax.js" type="text/javascript"></script> <script src="pmd/scripts/history.js" type="text/javascript"></script> - <script src="pmd/scripts/move.js" type="text/javascript"></script> + <script src="pmd/scripts/move.js" type="text/javascript"></script>  @@ -205,12 +205,12 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { <thead> <tr> <?php - if (isset($_REQUEST['query'])) { - echo '<td class="select_all">'; - echo '<input type="checkbox" value="select_all_'.htmlspecialchars($t_n_url).'" style="margin: 0px;" '; + if (isset($_REQUEST['query'])) { + echo '<td class="select_all">'; + echo '<input type="checkbox" value="select_all_'.htmlspecialchars($t_n_url).'" style="margin: 0px;" '; echo 'id="select_all_'.htmlspecialchars($t_n_url).'" title="select all" '; echo 'onclick="Select_all(\''. htmlspecialchars($t_n_url) .'\',\''.htmlspecialchars($GLOBALS['PMD_OUT']["OWNER"][$i]).'\')"></td>'; - }?> + }?> <td class="small_tab" onmouseover="this.className='small_tab2';" onmouseout="this.className='small_tab';" id="id_hide_tbody_<?php echo $t_n_url ?>" @@ -238,11 +238,11 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { echo $GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i]; ?></td> <?php - if (isset($_REQUEST['query'])) { - echo '<td class="tab_zag" onmouseover="Table_onover(\''.htmlspecialchars($t_n_url).'\',0,1)" id="id_zag_'.htmlspecialchars($t_n_url).'_2"'; + if (isset($_REQUEST['query'])) { + echo '<td class="tab_zag" onmouseover="Table_onover(\''.htmlspecialchars($t_n_url).'\',0,1)" id="id_zag_'.htmlspecialchars($t_n_url).'_2"'; echo 'onmousedown="cur_click=document.getElementById(\''.htmlspecialchars($t_n_url).'\');"'; echo 'onmouseout="Table_onover(\''.htmlspecialchars($t_n_url).'\',1,1)">'; - }?> + }?> </tr> </thead> <tbody id="id_tbody_<?php echo $t_n_url ?>" @@ -274,13 +274,13 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { } ?>)"> <?php - if (isset($_REQUEST['query'])) { - echo '<td class="select_all">'; - echo '<input value="'.htmlspecialchars($t_n_url).urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'"'; + if (isset($_REQUEST['query'])) { + echo '<td class="select_all">'; + echo '<input value="'.htmlspecialchars($t_n_url).urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'"'; echo 'type="checkbox" id="select_'.htmlspecialchars($t_n_url).'._'.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'" '; - echo 'style="margin: 0px;" title="select_'.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'" '; - echo 'onclick="store_column(\''.urlencode($GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i]).'\',\''.htmlspecialchars($GLOBALS['PMD_OUT']["OWNER"][$i]).'\',\''.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'\')"></td>'; - }?> + echo 'style="margin: 0px;" title="select_'.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'" '; + echo 'onclick="store_column(\''.urlencode($GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i]).'\',\''.htmlspecialchars($GLOBALS['PMD_OUT']["OWNER"][$i]).'\',\''.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'\')"></td>'; + }?> <td width="10px" colspan="3" id="<?php echo $t_n_url.".".urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]) ?>"> <div style="white-space:nowrap"> @@ -316,12 +316,12 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { </td> <?php if (isset($_REQUEST['query'])) { - //$temp = $GLOBALS['PMD_OUT']["OWNER"][$i].'.'.$GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i]; - echo '<td class="small_tab_pref" onmouseover="this.className=\'small_tab_pref2\';"'; - echo 'onmouseout="this.className=\'small_tab_pref\';"'; - echo 'onclick="Click_option(\'pmd_optionse\',\''.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'\',\''.$GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i].'\')" >'; - echo '<img src="pmd/images/exec_small.png" title="options" alt="" /></td> '; - } ?> + //$temp = $GLOBALS['PMD_OUT']["OWNER"][$i].'.'.$GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i]; + echo '<td class="small_tab_pref" onmouseover="this.className=\'small_tab_pref2\';"'; + echo 'onmouseout="this.className=\'small_tab_pref\';"'; + echo 'onclick="Click_option(\'pmd_optionse\',\''.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'\',\''.$GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i].'\')" >'; + echo '<img src="pmd/images/exec_small.png" title="options" alt="" /></td> '; + } ?> </tr> <?php } @@ -451,7 +451,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { <table width="168" border="0" align="center" cellpadding="2" cellspacing="0"> <thead> <tr> - <td colspan="2" rowspan="2" id="option_col_name" nowrap="nowrap" align="center"></td> + <td colspan="2" rowspan="2" id="option_col_name" nowrap="nowrap" align="center"></td> </tr> </thead> <tbody id="where"> @@ -480,7 +480,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { <tr><td align="center" nowrap="nowrap"><b><?php echo __('Rename to'); ?></b></td></tr> <tr> <td width="58" nowrap="nowrap"><?php echo __('New name'); ?></td> - <td width="102"><input type="text" value="" id="new_name"/></td> + <td width="102"><input type="text" value="" id="new_name"/></td> </tr> <tr><td align="center" nowrap="nowrap"><b><?php echo __('Aggregate'); ?></b></td></tr> <tr> @@ -495,11 +495,11 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { </select> </td></tr> <tr> - <td nowrap="nowrap" width="58" align="center"><b>GROUP BY</b></td> + <td nowrap="nowrap" width="58" align="center"><b>GROUP BY</b></td> <td><input type="checkbox" value="groupby" id="groupby"/></td> </tr> <tr> - <td nowrap="nowrap" width="58" align="center"><b>ORDER BY</b></td> + <td nowrap="nowrap" width="58" align="center"><b>ORDER BY</b></td> <td><input type="checkbox" value="orderby" id="orderby"/></td> </tr> <tr><td align="center" nowrap="nowrap"><b>HAVING</b></td></tr> @@ -514,7 +514,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { <option value="avg"> AVG </option> <option value="count"> COUNT </option> </select> - </td></tr> + </td></tr> <tr> <td width="58" nowrap="nowrap"><?php echo __('Relation operator'); ?></td> <td width="102"><select name="h_rel_opt" id="h_rel_opt"> @@ -530,11 +530,11 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { <option value="NOT IN"> NOT IN </option> </select> </td> - </tr> + </tr> <tr> <td width="58" nowrap="nowrap"><?php echo __('Value'); ?>/<br/><?php echo __('subquery'); ?></td> - <td width="102"><textarea id="having" value="" cols="18"></textarea></td> - </tr> + <td width="102"><textarea id="having" value="" cols="18"></textarea></td> + </tr> </tbody> <tbody> <tr> @@ -580,7 +580,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { <tr> <td width="58" nowrap="nowrap"><?php echo __('New name'); ?></td> <td width="102"> - <input type="text" value="" id="e_rename"/> + <input type="text" value="" id="e_rename"/> </td> </tr> </tbody> @@ -610,11 +610,11 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { <table id="query_having" style="visibility:<?php echo $hidden ?>;" width="5%" border="0" cellpadding="0" cellspacing="0"> <tbody> - <tr> - <td class="frams1" width="10px"></td> - <td class="frams5" width="99%" ></td> - <td class="frams2" width="10px"><div class="bor"></div></td> - </tr> + <tr> + <td class="frams1" width="10px"></td> + <td class="frams5" width="99%" ></td> + <td class="frams2" width="10px"><div class="bor"></div></td> + </tr> <tr> <td class="frams8"></td> <td class="input_tab"> @@ -641,7 +641,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { <tr> <td width="58" nowrap="nowrap"><?php echo __('Operator'); ?></td> <td width="102"><select name="hrel_opt" id="hrel_opt"> - <option value="--" selected="selected"> -- </option> + <option value="--" selected="selected"> -- </option> <option value="=" > = </option> <option value=">"> > </option> <option value="<"> < </option> @@ -658,7 +658,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { <td nowrap="nowrap"><?php echo __('Value'); ?>/<br /><?php echo __('subquery'); ?></td> <td><textarea id="hQuery" value="" cols="18"></textarea> </td> - </tr> + </tr> </tbody> <tbody> <tr> @@ -704,13 +704,13 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { <tr> <td width="58" nowrap="nowrap"><?php echo __('Operator'); ?></td> <td width="102"> - <select name="operator" id="e_operator"> - <option value="---" selected="selected">---</option> - <option value="sum" > SUM </option> - <option value="min"> MIN </option> - <option value="max"> MAX </option> - <option value="avg"> AVG </option> - <option value="avg"> COUNT </option> + <select name="operator" id="e_operator"> + <option value="---" selected="selected">---</option> + <option value="sum" > SUM </option> + <option value="min"> MIN </option> + <option value="max"> MAX </option> + <option value="avg"> AVG </option> + <option value="avg"> COUNT </option> </select> </td></tr> </tbody> @@ -740,11 +740,11 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { <table id="query_where" style="visibility:<?php echo $hidden ?>;" width="5%" border="0" cellpadding="0" cellspacing="0"> <tbody> - <tr> - <td class="frams1" width="10px"></td> - <td class="frams5" width="99%" ></td> - <td class="frams2" width="10px"><div class="bor"></div></td> - </tr> + <tr> + <td class="frams1" width="10px"></td> + <td class="frams5" width="99%" ></td> + <td class="frams2" width="10px"><div class="bor"></div></td> + </tr> <tr> <td class="frams8"></td> <td class="input_tab"> @@ -758,7 +758,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { <tr> <td width="58" nowrap="nowrap"><?php echo __('Operator'); ?></td> <td width="102"><select name="erel_opt" id="erel_opt"> - <option value="--" selected="selected"> -- </option> + <option value="--" selected="selected"> -- </option> <option value="=" > = </option> <option value=">"> > </option> <option value="<"> < </option> @@ -775,7 +775,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { <td nowrap="nowrap"><?php echo __('Value'); ?>/<br /><?php echo __('subquery'); ?></td> <td><textarea id="eQuery" value="" cols="18"></textarea> </td> - </tr> + </tr> </tbody> <tbody> <tr> @@ -802,16 +802,16 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { <?php if ($_REQUEST['query']) { - echo '<div class="panel">'; - echo '<div style="clear:both;"></div>'; - echo '<div id="ab"></div>'; - echo '<div style="clear:both;"></div>'; - echo '</div>'; - echo '<a class="trigger" href="#">' . __('Active options') . '</a>'; - echo '<div id="filter"></div>'; - echo '<div id="box">'; - echo '<span id="boxtitle"></span>'; - echo '<form method="post" action="db_qbe.php" >'; + echo '<div class="panel">'; + echo '<div style="clear:both;"></div>'; + echo '<div id="ab"></div>'; + echo '<div style="clear:both;"></div>'; + echo '</div>'; + echo '<a class="trigger" href="#">' . __('Active options') . '</a>'; + echo '<div id="filter"></div>'; + echo '<div id="box">'; + echo '<span id="boxtitle"></span>'; + echo '<form method="post" action="db_qbe.php" >'; echo '<textarea cols="80" name="sql_query" id="textSqlquery" rows="15"></textarea><div id="tblfooter">'; echo ' <input type="submit" name="submit_sql" class="btn">'; echo ' <input type="button" name="cancel" value="Cancel" onClick="closebox()" class="btn">'; diff --git a/server_synchronize.php b/server_synchronize.php index 431ae6b..6c23d97 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -60,22 +60,22 @@ if ((isset($_REQUEST['submit_connect']))) { ${"{$con}_port"} = $_REQUEST[$con . '_port']; ${"{$con}_socket"} = $_REQUEST[$con . '_socket']; ${"{$con}_db"} = $_REQUEST[$con . '_db']; - ${"{$con}_type"} = $_REQUEST[$con . '_type']; + ${"{$con}_type"} = $_REQUEST[$con . '_type']; if (${"{$con}_type"} == 'cur') { - ${"{$con}_connection"} = null; - ${"{$con}_server"} = null; - ${"{$con}_db"} = $_REQUEST[$con . '_db_sel']; - continue; + ${"{$con}_connection"} = null; + ${"{$con}_server"} = null; + ${"{$con}_db"} = $_REQUEST[$con . '_db_sel']; + continue; } if (isset(${"{$con}_socket"}) && ! empty(${"{$con}_socket"})) { - ${"{$con}_server"}['socket'] = ${"{$con}_socket"}; + ${"{$con}_server"}['socket'] = ${"{$con}_socket"}; } else { - ${"{$con}_server"}['host'] = ${"{$con}_host"}; - if (isset(${"{$con}_port"}) && ! empty(${"{$con}_port"}) && ((int)${"{$con}_port"} * 1) > 0) { - ${"{$con}_server"}['port'] = (int)${"{$con}_port"}; - } + ${"{$con}_server"}['host'] = ${"{$con}_host"}; + if (isset(${"{$con}_port"}) && ! empty(${"{$con}_port"}) && ((int)${"{$con}_port"} * 1) > 0) { + ${"{$con}_server"}['port'] = (int)${"{$con}_port"}; + } } ${"{$con}_connection"} = PMA_DBI_connect(${"{$con}_username"}, ${"{$con}_password"}, $is_controluser = false, ${"{$con}_server"}, $auxiliary_connection = true); @@ -102,14 +102,14 @@ if ((isset($_REQUEST['submit_connect']))) { * Creating the link object for both source and target databases and * selecting the source and target databases using these links */ - foreach ($cons as $con) { - if (${"{$con}_connection"} != null) { - ${"{$con}_link"} = PMA_DBI_connect(${"{$con}_username"}, ${"{$con}_password"}, $is_controluser = false, ${"{$con}_server"}); - } else { + foreach ($cons as $con) { + if (${"{$con}_connection"} != null) { + ${"{$con}_link"} = PMA_DBI_connect(${"{$con}_username"}, ${"{$con}_password"}, $is_controluser = false, ${"{$con}_server"}); + } else { ${"{$con}_link"} = null; } - ${"{$con}_db_selected"} = PMA_DBI_select_db(${"{$con}_db"}, ${"{$con}_link"}); - } // end foreach ($cons as $con) + ${"{$con}_db_selected"} = PMA_DBI_select_db(${"{$con}_db"}, ${"{$con}_link"}); + } // end foreach ($cons as $con) if (($src_db_selected != 1) || ($trg_db_selected != 1)) { /** @@ -225,10 +225,10 @@ if ((isset($_REQUEST['submit_connect']))) { $_SESSION['src_password'] = $src_password; $_SESSION['trg_password'] = $trg_password; $_SESSION['trg_password'] = $trg_password; - $_SESSION['src_server'] = $src_server; - $_SESSION['trg_server'] = $trg_server; - $_SESSION['src_type'] = $src_type; - $_SESSION['trg_type'] = $trg_type; + $_SESSION['src_server'] = $src_server; + $_SESSION['trg_server'] = $trg_server; + $_SESSION['src_type'] = $src_type; + $_SESSION['trg_type'] = $trg_type; $_SESSION['matching_tables_keys'] = $matching_tables_keys; $_SESSION['uncommon_tables_fields'] = $uncommon_tables_fields; $_SESSION['uncommon_tables_row_count'] = $row_count; @@ -731,7 +731,7 @@ if (isset($_REQUEST['Table_ids'])) { if (($num_alter_cols > 0) || ($num_insert_cols > 0) || ($num_remove_cols > 0) || ($num_add_index > 0) || ($num_remove_index > 0)) { echo '<img class="icon struct_img" src="' . $pmaThemeImage . 'new_struct.jpg" width="29" height="29" - alt="' . __('Click to select') . '" + alt="' . __('Click to select') . '" onclick="showDetails(' . "'MS" . $i . "','" . $num_alter_cols . "','" . $num_insert_cols . "','" . $num_remove_cols . "','" . $num_add_index . "','" . $num_remove_index . "'" .', this ,' . "'" . htmlspecialchars($matching_tables[$i]) . "'" . ')"/>'; } @@ -799,7 +799,7 @@ if (isset($_REQUEST['Table_ids'])) { if (!(in_array($j, $uncommon_table_data_diff))) { if (isset($row_count[$j]) && ($row_count > 0)) { echo '<img class="icon data_img" src="' . $pmaThemeImage . 'new_data.jpg" width="29" height="29" - alt="' . __('Click to select') . '" + alt="' . __('Click to select') . '" onclick="showDetails(' . "'UD" . $j . "','" . null ."','" . $row_count[$j] ."','" . null . "','" . null . "','" . null . "'" . ', this ,' . "'". htmlspecialchars($source_tables_uncommon[$j]) . "'" . ')" />'; } @@ -1117,8 +1117,8 @@ if (isset($_REQUEST['synchronize_db'])) { <table id="serverconnection_<?php echo $type; ?>_remote" class="data"> <caption class="tblHeaders"><?php echo $database_header; ?></caption> <tr class="odd"> - <td colspan="2" style="text-align: center"> - <select name="<?php echo $type; ?>_type" id="<?php echo $type; ?>_type" class="server_selector"> + <td colspan="2" style="text-align: center"> + <select name="<?php echo $type; ?>_type" id="<?php echo $type; ?>_type" class="server_selector"> <?php if ($GLOBALS['cfg']['AllowArbitraryServer']) { $preselected_option = 'rmt'; @@ -1162,53 +1162,53 @@ if (isset($_REQUEST['synchronize_db'])) { . htmlspecialchars(sprintf(__('Configuration: %s'), $label)) . '</option>'; } // end foreach ?> - </select> - </td> + </select> + </td> </tr> - <tr class="even toggler remote-server"> - <td><?php echo __('Server'); ?></td> + <tr class="even toggler remote-server"> + <td><?php echo __('Server'); ?></td> <td><input type="text" name="<?php echo $type; ?>_host" class="server-host" <?php echo $possibly_readonly; ?>/></td> - </tr> - <tr class="odd toggler remote-server"> - <td><?php echo __('Port'); ?></td> + </tr> + <tr class="odd toggler remote-server"> + <td><?php echo __('Port'); ?></td> <td><input type="text" name="<?php echo $type; ?>_port" class="server-port" <?php echo $possibly_readonly; ?> value="3306" maxlength="5" size="5" /></td> - </tr> - <tr class="even toggler remote-server"> - <td><?php echo __('Socket'); ?></td> + </tr> + <tr class="even toggler remote-server"> + <td><?php echo __('Socket'); ?></td> <td><input type="text" name="<?php echo $type; ?>_socket" class="server-socket" <?php echo $possibly_readonly; ?>/></td> - </tr> - <tr class="odd toggler remote-server"> - <td><?php echo __('User name'); ?></td> + </tr> + <tr class="odd toggler remote-server"> + <td><?php echo __('User name'); ?></td> <td><input type="text" name="<?php echo $type; ?>_username" class="server-user" /></td> - </tr> - <tr class="even toggler remote-server"> - <td><?php echo __('Password'); ?></td> + </tr> + <tr class="even toggler remote-server"> + <td><?php echo __('Password'); ?></td> <td><input type="password" name="<?php echo $type; ?>_pass" class="server-pass" /> </td> - </tr> - <tr class="odd toggler remote-server"> - <td><?php echo __('Database'); ?></td> + </tr> + <tr class="odd toggler remote-server"> + <td><?php echo __('Database'); ?></td> <td><input type="text" name="<?php echo $type; ?>_db" class="server-db" /></td> - </tr> - <tr class="even toggler current-server" style="display: none;"> - <td><?php echo __('Database'); ?></td> - <td> + </tr> + <tr class="even toggler current-server" style="display: none;"> + <td><?php echo __('Database'); ?></td> + <td> <?php // these unset() do not complain if the elements do not exist unset($databases['mysql']); unset($databases['information_schema']); - if (count($databases) == 0) { - echo __('No databases'); - } else { - echo ' - <select name="' . $type . '_db_sel"> - '; - foreach ($databases as $db) { - echo ' <option>' . htmlspecialchars($db['SCHEMA_NAME']) . '</option>'; - } + if (count($databases) == 0) { + echo __('No databases'); + } else { + echo ' + <select name="' . $type . '_db_sel"> + '; + foreach ($databases as $db) { + echo ' <option>' . htmlspecialchars($db['SCHEMA_NAME']) . '</option>'; + } echo '</select>'; - } - echo '</td> </tr> + } + echo '</td> </tr> </table>'; } unset ($types, $type); diff --git a/setup/config.php b/setup/config.php index 193b57f..5333cb0 100644 --- a/setup/config.php +++ b/setup/config.php @@ -26,34 +26,34 @@ if (isset($_POST['eol'])) { } if (PMA_ifSetOr($_POST['submit_clear'], '')) { - // - // Clear current config and return to main page - // - ConfigFile::getInstance()->resetConfigData(); + // + // Clear current config and return to main page + // + ConfigFile::getInstance()->resetConfigData(); // drop post data header('HTTP/1.1 303 See Other'); header('Location: index.php'); exit; } elseif (PMA_ifSetOr($_POST['submit_download'], '')) { - // - // Output generated config file - // + // + // Output generated config file + // header('Content-Type: text/plain'); header('Content-Disposition: attachment; filename="config.inc.php"'); echo ConfigGenerator::getConfigFile(); exit; } elseif (PMA_ifSetOr($_POST['submit_save'], '')) { - // - // Save generated config file on the server - // + // + // Save generated config file on the server + // file_put_contents($config_file_path, ConfigGenerator::getConfigFile()); header('HTTP/1.1 303 See Other'); header('Location: index.php?action_done=config_saved'); exit; } elseif (PMA_ifSetOr($_POST['submit_load'], '')) { - // - // Load config file from the server - // + // + // Load config file from the server + // $cfg = array(); require_once $config_file_path; ConfigFile::getInstance()->setConfigData($cfg); @@ -61,17 +61,17 @@ if (PMA_ifSetOr($_POST['submit_clear'], '')) { header('Location: index.php'); exit; } elseif (PMA_ifSetOr($_POST['submit_delete'], '')) { - // - // Delete config file on the server - // + // + // Delete config file on the server + // @unlink($config_file_path); header('HTTP/1.1 303 See Other'); header('Location: index.php'); exit; } else { - // - // Show generated config file in a <textarea> - // + // + // Show generated config file in a <textarea> + // header('HTTP/1.1 303 See Other'); header('Location: index.php?page=config'); exit; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11681-gbf9def5
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via bf9def5d50aab33dda6a38e4aa9b820a1f0c086a (commit) from 6b75d60e91d8a937e3356ce1aad673be0ee0bfaa (commit) - Log ----------------------------------------------------------------- commit bf9def5d50aab33dda6a38e4aa9b820a1f0c086a Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 09:29:41 2011 +0200 Wrap some long lines ----------------------------------------------------------------------- Summary of changes: libraries/sqlparser.lib.php | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 91ec780..fa77136 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -72,7 +72,11 @@ if (! defined('PMA_MINIMUM_COMMON')) { global $timer; $t = $timer; - $arr[] = array('type' => $type, 'data' => $data, 'pos' => $pos, 'time' => $t); + $arr[] = array( + 'type' => $type, + 'data' => $data, + 'pos' => $pos, + 'time' => $t); $timer = microtime(); $arrsize++; } // end of the "PMA_SQP_arrayAdd()" function @@ -151,7 +155,8 @@ if (! defined('PMA_MINIMUM_COMMON')) { global $SQP_errorString; $debugstr = 'ERROR: ' . $message . "\n"; $debugstr .= 'MySQL: '.PMA_MYSQL_STR_VERSION . "\n"; - $debugstr .= 'USR OS, AGENT, VER: ' . PMA_USR_OS . ' ' . PMA_USR_BROWSER_AGENT . ' ' . PMA_USR_BROWSER_VER . "\n"; + $debugstr .= 'USR OS, AGENT, VER: ' . PMA_USR_OS . ' '; + $debugstr .= PMA_USR_BROWSER_AGENT . ' ' . PMA_USR_BROWSER_VER . "\n"; $debugstr .= 'PMA: ' . PMA_VERSION . "\n"; $debugstr .= 'PHP VER,OS: ' . PMA_PHP_STR_VERSION . ' ' . PHP_OS . "\n"; $debugstr .= 'LANG: ' . $GLOBALS['lang'] . "\n"; @@ -161,7 +166,10 @@ if (! defined('PMA_MINIMUM_COMMON')) { if (@function_exists('gzcompress')) { $encodedstr = gzcompress($debugstr, 9); } - $encodedstr = preg_replace("/(\015\012)|(\015)|(\012)/", '<br />' . "\n", chunk_split(base64_encode($encodedstr))); + $encodedstr = preg_replace( + "/(\015\012)|(\015)|(\012)/", + '<br />' . "\n", + chunk_split(base64_encode($encodedstr))); $SQP_errorString .= __('There is a chance that you may have found a bug in the SQL parser. Please examine your query closely, and check that the quotes are correct and not mis-matched. Other possible failure causes may be that you are uploading a file with binary outside of a quoted text area. You can also try your query on the MySQL command line interface. The MySQL server error output below, if there is any, may also help you in diagnosing the problem. If you still have problems or if the parser fails where the command line interface succeeds, please reduce your SQL query input to the single query that causes problems, and submit a bug report with the data chunk in the CUT section below:') @@ -2706,7 +2714,9 @@ function PMA_SQP_buildCssData() } for ($i = 0; $i < 8; $i++) { - $css_string .= PMA_SQP_buildCssRule('syntax_indent' . $i, 'margin-left', ($i * $cfg['SQP']['fmtInd']) . $cfg['SQP']['fmtIndUnit']); + $css_string .= PMA_SQP_buildCssRule( + 'syntax_indent' . $i, 'margin-left', + ($i * $cfg['SQP']['fmtInd']) . $cfg['SQP']['fmtIndUnit']); } return $css_string; @@ -2725,7 +2735,10 @@ if (! defined('PMA_MINIMUM_COMMON')) { function PMA_SQP_formatNone($arr) { $formatted_sql = htmlspecialchars($arr['raw']); - $formatted_sql = preg_replace("@((\015\012)|(\015)|(\012)){3,}@", "\n\n", $formatted_sql); + $formatted_sql = preg_replace( + "@((\015\012)|(\015)|(\012)){3,}@", + "\n\n", + $formatted_sql); return $formatted_sql; } // end of the "PMA_SQP_formatNone()" function hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11680-g6b75d60
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via 6b75d60e91d8a937e3356ce1aad673be0ee0bfaa (commit) from 236582fb4f86ed8ae6022afc17af37e1d4a19cb9 (commit) - Log ----------------------------------------------------------------- commit 6b75d60e91d8a937e3356ce1aad673be0ee0bfaa Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 09:27:49 2011 +0200 Document that this is IPv4 only ----------------------------------------------------------------------- Summary of changes: libraries/ip_allow_deny.lib.php | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libraries/ip_allow_deny.lib.php b/libraries/ip_allow_deny.lib.php index 2b969d1..ad4b4a3 100644 --- a/libraries/ip_allow_deny.lib.php +++ b/libraries/ip_allow_deny.lib.php @@ -4,6 +4,8 @@ * This library is used with the server IP allow/deny host authentication * feature * + * @todo Broken for IPv6 + * * @package phpMyAdmin */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11679-g236582f
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via 236582fb4f86ed8ae6022afc17af37e1d4a19cb9 (commit) from 9405dbb82a38ca03e0d5a54e06b73be80ec51692 (commit) - Log ----------------------------------------------------------------- commit 236582fb4f86ed8ae6022afc17af37e1d4a19cb9 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 09:25:14 2011 +0200 Fix mistakenly broken regexp ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 2 +- libraries/ip_allow_deny.lib.php | 4 ++-- libraries/sqlparser.lib.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 1607d6e..27d99bc 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -567,7 +567,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '', } // end if if (!empty($error_message)) { - $error_message = preg_replace("@((\015\012)|(\015)|(\012)) {3,}@", "\n\n", $error_message); + $error_message = preg_replace("@((\015\012)|(\015)|(\012)){3,}@", "\n\n", $error_message); } // modified to show the help on error-returns // (now error-messages-server) diff --git a/libraries/ip_allow_deny.lib.php b/libraries/ip_allow_deny.lib.php index c8481ba..2b969d1 100644 --- a/libraries/ip_allow_deny.lib.php +++ b/libraries/ip_allow_deny.lib.php @@ -30,7 +30,7 @@ function PMA_getIp() $trusted_header_value = PMA_getenv($GLOBALS['cfg']['TrustedProxies'][$direct_ip]); $matches = array(); // the $ checks that the header contains only one IP address, ?: makes sure the () don't capture - $is_ip = preg_match('|^(?:[0-9]{1,3}\.) {3,3}[0-9]{1,3}$|', $trusted_header_value, $matches); + $is_ip = preg_match('|^(?:[0-9]{1,3}\.){3,3}[0-9]{1,3}$|', $trusted_header_value, $matches); if ($is_ip && (count($matches) == 1)) { // True IP behind a proxy return $matches[0]; @@ -46,7 +46,7 @@ function PMA_getIp() * Based on IP Pattern Matcher * Originally by J.Adams <jna(a)retina.net> * Found on <http://www.php.net/manual/en/function.ip2long.php> - * Modified for phpMyAdmin + * Modified for phpMyAdmin * * Matches: * xxx.xxx.xxx.xxx (exact) diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 267d99b..91ec780 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -2725,7 +2725,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { function PMA_SQP_formatNone($arr) { $formatted_sql = htmlspecialchars($arr['raw']); - $formatted_sql = preg_replace("@((\015\012)|(\015)|(\012)) {3,}@", "\n\n", $formatted_sql); + $formatted_sql = preg_replace("@((\015\012)|(\015)|(\012)){3,}@", "\n\n", $formatted_sql); return $formatted_sql; } // end of the "PMA_SQP_formatNone()" function hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11678-g9405dbb
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via 9405dbb82a38ca03e0d5a54e06b73be80ec51692 (commit) from 25bda8e991f2820971c343315cd3ab3d974b2684 (commit) - Log ----------------------------------------------------------------- commit 9405dbb82a38ca03e0d5a54e06b73be80ec51692 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 09:21:55 2011 +0200 Fix spacing after @param ----------------------------------------------------------------------- Summary of changes: db_search.php | 8 +- export.php | 2 +- libraries/Config.class.php | 30 ++-- libraries/Error.class.php | 18 +- libraries/Error_Handler.class.php | 22 ++-- libraries/File.class.php | 32 ++-- libraries/Index.class.php | 28 ++-- libraries/List.class.php | 6 +- libraries/List_Database.class.php | 14 +- libraries/Message.class.php | 72 ++++---- libraries/StorageEngine.class.php | 16 +- libraries/Table.class.php | 108 ++++++------ libraries/Theme.class.php | 16 +- libraries/Theme_Manager.class.php | 10 +- libraries/Tracker.class.php | 72 ++++---- libraries/blowfish.php | 8 +- libraries/bookmark.lib.php | 20 +- libraries/charset_conversion.lib.php | 6 +- libraries/common.lib.php | 222 +++++++++++++------------- libraries/core.lib.php | 58 ++++---- libraries/database_interface.lib.php | 122 +++++++------- libraries/db_info.inc.php | 6 +- libraries/db_structure.lib.php | 10 +- libraries/display_select_lang.lib.php | 4 +- libraries/display_tbl.lib.php | 148 ++++++++-------- libraries/export/codegen.php | 16 +- libraries/export/csv.php | 16 +- libraries/export/htmlword.php | 36 ++-- libraries/export/json.php | 16 +- libraries/export/latex.php | 38 ++-- libraries/export/mediawiki.php | 16 +- libraries/export/ods.php | 16 +- libraries/export/odt.php | 36 ++-- libraries/export/pdf.php | 16 +- libraries/export/php_array.php | 16 +- libraries/export/sql.php | 70 ++++---- libraries/export/texytext.php | 36 ++-- libraries/export/xls.php | 16 +- libraries/export/xlsx.php | 16 +- libraries/export/xml.php | 16 +- libraries/export/yaml.php | 16 +- libraries/file_listing.php | 10 +- libraries/grab_globals.lib.php | 6 +- libraries/iconv_wrapper.lib.php | 6 +- libraries/import.lib.php | 50 +++--- libraries/ip_allow_deny.lib.php | 6 +- libraries/js_escape.lib.php | 6 +- libraries/kanji-encoding.lib.php | 14 +- libraries/mysql_charsets.lib.php | 4 +- libraries/opendocument.lib.php | 4 +- libraries/plugin_interface.lib.php | 40 +++--- libraries/relation.lib.php | 86 +++++----- libraries/sanitizing.lib.php | 4 +- libraries/select_lang.lib.php | 6 +- libraries/select_server.lib.php | 4 +- libraries/server_synchronize.lib.php | 294 ++++++++++++++++---------------- libraries/sql_query_form.lib.php | 12 +- libraries/sqlparser.lib.php | 34 ++-- libraries/sqlvalidator.class.php | 68 ++++---- libraries/sqlvalidator.lib.php | 2 +- libraries/string.lib.php | 16 +- libraries/string_mb.lib.php | 16 +- libraries/string_native.lib.php | 16 +- libraries/string_type_ctype.lib.php | 14 +- libraries/string_type_native.lib.php | 14 +- libraries/transformations.lib.php | 22 ++-- libraries/url_generating.lib.php | 16 +- libraries/zip.lib.php | 8 +- libraries/zip_extension.lib.php | 4 +- main.php | 16 +- navigation.php | 14 +- pmd_common.php | 2 +- server_privileges.php | 14 +- tbl_relation.php | 8 +- tbl_tracking.php | 8 +- 75 files changed, 1147 insertions(+), 1147 deletions(-) diff --git a/db_search.php b/db_search.php index 6191b14..acbe0cb 100644 --- a/db_search.php +++ b/db_search.php @@ -113,10 +113,10 @@ if (isset($_REQUEST['submit_search'])) { * explode * count * strlen - * @param string the table name - * @param string restrict the search to this field - * @param string the string to search - * @param integer type of search (1 -> 1 word at least, 2 -> all words, + * @param string the table name + * @param string restrict the search to this field + * @param string the string to search + * @param integer type of search (1 -> 1 word at least, 2 -> all words, * 3 -> exact string, 4 -> regexp) * * @return array 3 SQL querys (for count, display and delete results) diff --git a/export.php b/export.php index 36c1d58..d7c2f87 100644 --- a/export.php +++ b/export.php @@ -129,7 +129,7 @@ $time_start = time(); * Output handler for all exports, if needed buffering, it stores data into * $dump_buffer, otherwise it prints thems out. * - * @param string $line the insert statement + * @param string $line the insert statement * @return bool Whether output suceeded */ function PMA_exportOutputHandler($line) diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 28f9ac3..0130252 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -75,7 +75,7 @@ class PMA_Config /** * constructor * - * @param string source to read config from + * @param string source to read config from */ function __construct($source = null) { @@ -333,7 +333,7 @@ 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 */ function load($source = null) { @@ -563,7 +563,7 @@ class PMA_Config /** * set source - * @param string $source + * @param string $source */ function setSource($source) { @@ -635,7 +635,7 @@ class PMA_Config /** * returns specific config setting - * @param string $setting + * @param string $setting * @return mixed value */ function get($setting) @@ -649,8 +649,8 @@ 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 */ function set($setting, $value) { @@ -1075,7 +1075,7 @@ class PMA_Config * returns options for font size selection * * @static - * @param string $current_size current selected font size with unit + * @param string $current_size current selected font size with unit * @return array selectable font sizes */ static protected function _getFontsizeOptions($current_size = '82%') @@ -1135,7 +1135,7 @@ class PMA_Config * returns html selectbox for font sizes * * @static - * @param string $current_size currently slected font size with unit + * @param string $current_size currently slected font size with unit * @return string html selectbox */ static protected function _getFontsizeSelection() @@ -1169,7 +1169,7 @@ class PMA_Config * return complete font size selection form * * @static - * @param string $current_size currently slected font size with unit + * @param string $current_size currently slected font size with unit * @return string html selectbox */ static public function getFontsizeForm() @@ -1187,7 +1187,7 @@ class PMA_Config /** * removes cookie * - * @param string $cookie name of cookie to remove + * @param string $cookie name of cookie to remove * @return boolean result of setcookie() */ function removeCookie($cookie) @@ -1200,11 +1200,11 @@ class PMA_Config * 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) + * @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() */ function setCookie($cookie, $value, $default = null, $validity = null, $httponly = true) diff --git a/libraries/Error.class.php b/libraries/Error.class.php index e5d105c..1925a61 100644 --- a/libraries/Error.class.php +++ b/libraries/Error.class.php @@ -93,10 +93,10 @@ class PMA_Error extends PMA_Message /** * Constructor * - * @param integer $errno - * @param string $errstr - * @param string $errfile - * @param integer $errline + * @param integer $errno + * @param string $errstr + * @param string $errfile + * @param integer $errline */ public function __construct($errno, $errstr, $errfile, $errline) { @@ -116,7 +116,7 @@ class PMA_Error extends PMA_Message /** * sets PMA_Error::$_backtrace * - * @param array $backtrace + * @param array $backtrace */ public function setBacktrace($backtrace) { @@ -126,7 +126,7 @@ class PMA_Error extends PMA_Message /** * sets PMA_Error::$_line * - * @param integer $line + * @param integer $line */ public function setLine($line) { @@ -136,7 +136,7 @@ class PMA_Error extends PMA_Message /** * sets PMA_Error::$_file * - * @param string $file + * @param string $file */ public function setFile($file) { @@ -147,7 +147,7 @@ class PMA_Error extends PMA_Message /** * returns unique PMA_Error::$_hash, if not exists it will be created * - * @param string $file + * @param string $file * @return string PMA_Error::$_hash */ public function getHash() @@ -329,7 +329,7 @@ class PMA_Error extends PMA_Message * and make users feel save to submit error reports * * @static - * @param string $dest path to be shorten + * @param string $dest path to be shorten * @return string shortened path */ static function relPath($dest) diff --git a/libraries/Error_Handler.class.php b/libraries/Error_Handler.class.php index f65dc4b..1a9cdb0 100644 --- a/libraries/Error_Handler.class.php +++ b/libraries/Error_Handler.class.php @@ -83,10 +83,10 @@ class PMA_Error_Handler * Do not use the context parameter as we want to avoid storing the * complete $GLOBALS inside $_SESSION['errors'] * - * @param integer $errno - * @param string $errstr - * @param string $errfile - * @param integer $errline + * @param integer $errno + * @param string $errstr + * @param string $errfile + * @param integer $errline */ public function handleError($errno, $errstr, $errfile, $errline) { @@ -126,7 +126,7 @@ class PMA_Error_Handler * log error to configured log facility * * @todo finish! - * @param PMA_Error $error + * @param PMA_Error $error */ protected function _logError($error) { @@ -136,10 +136,10 @@ class PMA_Error_Handler /** * trigger a custom error * - * @param string $errorInfo - * @param integer $errorNumber - * @param string $file - * @param integer $line + * @param string $errorInfo + * @param integer $errorNumber + * @param string $file + * @param integer $line */ public function triggerError($errorInfo, $errorNumber = null, $file = null, $line = null) { @@ -150,7 +150,7 @@ class PMA_Error_Handler /** * display fatal error and exit * - * @param PMA_Error $error + * @param PMA_Error $error */ protected function _dispFatalError($error) { @@ -191,7 +191,7 @@ class PMA_Error_Handler /** * display HTML header * - * @param PMA_error $error + * @param PMA_error $error */ protected function _dispPageStart($error = null) { diff --git a/libraries/File.class.php b/libraries/File.class.php index 031a266..bad9bca 100644 --- a/libraries/File.class.php +++ b/libraries/File.class.php @@ -78,7 +78,7 @@ class PMA_File * constructor * * @access public - * @param string $name file name + * @param string $name file name */ function __construct($name = false) { @@ -129,7 +129,7 @@ class PMA_File * file objects with temp flags are deleted with object destruction * * @access public - * @param boolean sets the temp flag + * @param boolean sets the temp flag * @return boolean PMA_File::$_is_temp */ function isTemp($is_temp = null) @@ -145,7 +145,7 @@ class PMA_File * accessor * * @access public - * @param string $name file name + * @param string $name file name */ function setName($name) { @@ -208,7 +208,7 @@ class PMA_File /** * @access public - * @param string name of file uploaded + * @param string name of file uploaded * @return boolean success */ function setUploadedFile($name) @@ -226,8 +226,8 @@ class PMA_File /** * @access public - * @param string $key the md5 hash of the column name - * @param string $rownumber + * @param string $key the md5 hash of the column name + * @param string $rownumber * @return boolean success */ function setUploadedFromTblChangeRequest($key, $rownumber) @@ -319,9 +319,9 @@ class PMA_File * * @access public * @static - * @param array $file the array - * @param string $rownumber - * @param string $key + * @param array $file the array + * @param string $rownumber + * @param string $key * @return array */ function fetchUploadedFromTblChangeRequestMultiple($file, $rownumber, $key) @@ -341,8 +341,8 @@ class PMA_File * sets the name if the file to the one selected in the tbl_change form * * @access public - * @param string $key the md5 hash of the column name - * @param string $rownumber + * @param string $key the md5 hash of the column name + * @param string $rownumber * @return boolean success */ function setSelectedFromTblChangeRequest($key, $rownumber = null) @@ -421,8 +421,8 @@ class PMA_File * and uses the submitted/selected file * * @access public - * @param string $key the md5 hash of the column name - * @param string $rownumber + * @param string $key the md5 hash of the column name + * @param string $rownumber * @return boolean success */ function checkTblChangeForm($key, $rownumber) @@ -444,7 +444,7 @@ class PMA_File /** * * @access public - * @param string $name + * @param string $name * @return boolean success */ function setLocalSelectedFile($name) @@ -672,7 +672,7 @@ class PMA_File /** * advances the file pointer in the file handle by $length bytes/chars * - * @param integer $length numbers of chars/bytes to skip + * @param integer $length numbers of chars/bytes to skip * @return boolean * @todo this function is unused */ @@ -808,7 +808,7 @@ class PMA_File * sets reference to most recent BLOB repository reference * * @access public - * @param string - BLOB repository reference + * @param string - BLOB repository reference */ static function setRecentBLOBReference($ref) { diff --git a/libraries/Index.class.php b/libraries/Index.class.php index 7cc4799..25f613f 100644 --- a/libraries/Index.class.php +++ b/libraries/Index.class.php @@ -86,7 +86,7 @@ class PMA_Index /** * Constructor * - * @param array $params + * @param array $params */ public function __construct($params = array()) { @@ -111,8 +111,8 @@ class PMA_Index /** * returns an array with all indexes from the given table * - * @param string $table - * @param string $schema + * @param string $table + * @param string $schema * @return array */ static public function getFromTable($table, $schema) @@ -129,8 +129,8 @@ class PMA_Index /** * return primary if set, false otherwise * - * @param string $table - * @param string $schema + * @param string $table + * @param string $schema * @return mixed primary index or false if no one exists */ static public function getPrimary($table, $schema) @@ -147,8 +147,8 @@ class PMA_Index /** * Load index data for table * - * @param string $table - * @param string $schema + * @param string $table + * @param string $schema * @return boolean */ static protected function _loadIndexes($table, $schema) @@ -176,7 +176,7 @@ class PMA_Index /** * Add column to index * - * @param array $params column params + * @param array $params column params */ public function addColumn($params) { @@ -216,7 +216,7 @@ class PMA_Index /** * Returns true if $column indexed in this index * - * @param string $column + * @param string $column * @return boolean */ public function hasColumn($column) @@ -403,10 +403,10 @@ class PMA_Index /** * Show index data * - * @param string $table The tablename - * @param array $indexes_info Referenced info array - * @param array $indexes_data Referenced data array - * @param boolean $print_mode + * @param string $table The tablename + * @param array $indexes_info Referenced info array + * @param array $indexes_data Referenced data array + * @param boolean $print_mode * @access public * @return array Index collection array */ @@ -539,7 +539,7 @@ class PMA_Index * Function to check over array of indexes and look for common problems * * @access public - * @param string name of table + * @param string name of table * @return string Output HTML */ static public function findDuplicates($table, $schema) diff --git a/libraries/List.class.php b/libraries/List.class.php index 83a42c1..694546a 100644 --- a/libraries/List.class.php +++ b/libraries/List.class.php @@ -52,7 +52,7 @@ abstract class PMA_List extends ArrayObject * checks if the given db names exists in the current list, if there is * missing at least one item it returns false otherwise true * - * @param string $db_name,.. one or more mysql result resources + * @param string $db_name,.. one or more mysql result resources * @return boolean true if all items exists, otheriwse false */ public function exists() @@ -70,8 +70,8 @@ abstract class PMA_List extends ArrayObject /** * returns HTML <option>-tags to be used inside <select></select> * - * @param mixed $selected the selected db or true for selecting current db - * @param boolean $include_information_schema + * @param mixed $selected the selected db or true for selecting current db + * @param boolean $include_information_schema * @return string HTML option tags */ public function getHtmlOptions($selected = '', $include_information_schema = true) diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php index 7616f60..259bbf8 100644 --- a/libraries/List_Database.class.php +++ b/libraries/List_Database.class.php @@ -56,8 +56,8 @@ require_once './libraries/List.class.php'; /** * Constructor * - * @param mixed $db_link_user user database link resource|object - * @param mixed $db_link_control control database link resource|object + * @param mixed $db_link_user user database link resource|object + * @param mixed $db_link_control control database link resource|object */ public function __construct($db_link_user = null, $db_link_control = null) { @@ -89,7 +89,7 @@ require_once './libraries/List.class.php'; * retrieves database list from server * * @todo we could also search mysql tables if all fail? - * @param string $like_db_name usally a db_name containing wildcards + * @param string $like_db_name usally a db_name containing wildcards */ protected function _retrieve($like_db_name = null) { @@ -219,8 +219,8 @@ require_once './libraries/List.class.php'; /** * returns array with dbs grouped with extended infos * - * @param integer $offset - * @param integer $count + * @param integer $offset + * @param integer $count * @return array db list */ public function getGroupedDetails($offset, $count) @@ -297,8 +297,8 @@ require_once './libraries/List.class.php'; /** * returns a part of the items * - * @param integer $offset - * @param integer $count + * @param integer $offset + * @param integer $count * @return array some items */ public function getLimitedItems($offset, $count) diff --git a/libraries/Message.class.php b/libraries/Message.class.php index d5e7d07..5a6afac 100644 --- a/libraries/Message.class.php +++ b/libraries/Message.class.php @@ -137,10 +137,10 @@ class PMA_Message /** * Constructor * - * @param string $string - * @param integer $number - * @param array $params - * @param integer $sanitize + * @param string $string + * @param integer $number + * @param array $params + * @param integer $sanitize */ public function __construct($string = '', $number = PMA_Message::NOTICE, $params = array(), $sanitize = PMA_Message::SANITIZE_NONE) @@ -166,7 +166,7 @@ class PMA_Message * shorthand for getting a simple success message * * @static - * @param string $string a localized string e.g. __('Your SQL query has been executed successfully') + * @param string $string a localized string e.g. __('Your SQL query has been executed successfully') * @return PMA_Message */ static public function success($string = '') @@ -184,7 +184,7 @@ class PMA_Message * shorthand for getting a simple error message * * @static - * @param string $string a localized string e.g. __('Error') + * @param string $string a localized string e.g. __('Error') * @return PMA_Message */ static public function error($string = '') @@ -202,7 +202,7 @@ class PMA_Message * shorthand for getting a simple notice message * * @static - * @param string $string a localized string e.g. __('The additional features for working with linked tables have been deactivated. To find out why click %shere%s.') + * @param string $string a localized string e.g. __('The additional features for working with linked tables have been deactivated. To find out why click %shere%s.') * @return PMA_Message */ static public function notice($string) @@ -216,8 +216,8 @@ class PMA_Message * shorthand for getting a customized message * * @static - * @param string $message - * @param integer $type + * @param string $message + * @param integer $type * @return PMA_Message */ static public function raw($message, $type = PMA_Message::NOTICE) @@ -233,7 +233,7 @@ class PMA_Message * shorthand for getting a customized message * * @static - * @param integer $rows Number of rows + * @param integer $rows Number of rows * @return PMA_Message */ static public function affected_rows($rows) @@ -249,7 +249,7 @@ class PMA_Message * shorthand for getting a customized message * * @static - * @param integer $rows Number of rows + * @param integer $rows Number of rows * @return PMA_Message */ static public function deleted_rows($rows) @@ -265,7 +265,7 @@ class PMA_Message * shorthand for getting a customized message * * @static - * @param integer $rows Number of rows + * @param integer $rows Number of rows * @return PMA_Message */ static public function inserted_rows($rows) @@ -281,7 +281,7 @@ class PMA_Message * shorthand for getting a customized error message * * @static - * @param string $message + * @param string $message * @return PMA_Message */ static public function rawError($message) @@ -295,7 +295,7 @@ class PMA_Message * shorthand for getting a customized notice message * * @static - * @param string $message + * @param string $message * @return PMA_Message */ static public function rawNotice($message) @@ -309,7 +309,7 @@ class PMA_Message * shorthand for getting a customized success message * * @static - * @param string $message + * @param string $message * @return PMA_Message */ static public function rawSuccess($message) @@ -321,7 +321,7 @@ class PMA_Message * returns whether this message is a success message or not * and optionaly makes this message a success message * - * @param boolean $set + * @param boolean $set * @return boolean whether this is a success message or not */ public function isSuccess($set = false) @@ -337,7 +337,7 @@ class PMA_Message * returns whether this message is a notice message or not * and optionally makes this message a notice message * - * @param boolean $set + * @param boolean $set * @return boolean whether this is a notice message or not */ public function isNotice($set = false) @@ -353,7 +353,7 @@ class PMA_Message * returns whether this message is an error message or not * and optionally makes this message an error message * - * @param boolean $set + * @param boolean $set * @return boolean whether this is an error message or not */ public function isError($set = false) @@ -368,8 +368,8 @@ class PMA_Message /** * set raw message (overrides string) * - * @param string $message - * @param boolean $sanitize whether to sanitize $message or not + * @param string $message + * @param boolean $sanitize whether to sanitize $message or not */ public function setMessage($message, $sanitize = false) { @@ -382,8 +382,8 @@ class PMA_Message /** * set string (does not take effect if raw message is set) * - * @param string $_string - * @param boolean $sanitize whether to sanitize $string or not + * @param string $_string + * @param boolean $sanitize whether to sanitize $string or not */ public function setString($_string, $sanitize = true) { @@ -396,7 +396,7 @@ class PMA_Message /** * set message type number * - * @param integer $number + * @param integer $number */ public function setNumber($number) { @@ -413,8 +413,8 @@ class PMA_Message * $message->addParam('<img src="img" />', false); * </code> * - * @param mixed $param - * @param boolean $raw + * @param mixed $param + * @param boolean $raw */ public function addParam($param, $raw = true) { @@ -430,8 +430,8 @@ class PMA_Message /** * add another string to be concatenated on displaying * - * @param string $string to be added - * @param string $separator to use between this and previous string/message + * @param string $string to be added + * @param string $separator to use between this and previous string/message */ public function addString($string, $separator = ' ') { @@ -442,8 +442,8 @@ class PMA_Message /** * add a bunch of messages at once * - * @param array $messages to be added - * @param string $separator to use between this and previous string/message + * @param array $messages to be added + * @param string $separator to use between this and previous string/message */ public function addMessages($messages, $separator = ' ') { @@ -455,8 +455,8 @@ class PMA_Message /** * add another raw message to be concatenated on displaying * - * @param mixed $message to be added - * @param string $separator to use between this and previous string/message + * @param mixed $message to be added + * @param string $separator to use between this and previous string/message */ public function addMessage($message, $separator = ' ') { @@ -474,8 +474,8 @@ class PMA_Message /** * set all params at once, usually used in conjunction with string * - * @param array $params - * @param boolean $sanitize + * @param array $params + * @param boolean $sanitize */ public function setParams($params, $sanitize = false) { @@ -509,7 +509,7 @@ class PMA_Message * Sanitizes $message * * @static - * @param mixed $message the message(s) + * @param mixed $message the message(s) * @return mixed the sanitized message(s) * @access public */ @@ -531,7 +531,7 @@ class PMA_Message * for formatting * * @static - * @param string $message the message + * @param string $message the message * @return string the decoded message * @access public */ @@ -662,7 +662,7 @@ class PMA_Message /** * sets and returns whether the message was displayed or not * - * @param boolean $is_displayed + * @param boolean $is_displayed * @return boolean PMA_Message::$_is_displayed */ public function isDisplayed($is_displayed = false) diff --git a/libraries/StorageEngine.class.php b/libraries/StorageEngine.class.php index d3e1019..bf5de9d 100644 --- a/libraries/StorageEngine.class.php +++ b/libraries/StorageEngine.class.php @@ -68,10 +68,10 @@ class PMA_StorageEngine * returns HTML code for storage engine select box * * @static - * @param string $name The name of the select form element - * @param string $id The ID of the form field - * @param string $selected The selected engine - * @param boolean $offerUnavailableEngines + * @param string $name The name of the select form element + * @param string $id The ID of the form field + * @param string $selected The selected engine + * @param boolean $offerUnavailableEngines * Should unavailable storage engines be offered? * @return string html selectbox */ @@ -106,7 +106,7 @@ class PMA_StorageEngine * * Loads the corresponding engine plugin, if available. * - * @param string $engine The engine ID + * @param string $engine The engine ID * @return object The engine plugin */ static public function getEngine($engine) @@ -127,7 +127,7 @@ class PMA_StorageEngine * return true if given engine name is supported/valid, otherwise false * * @static - * @param string $engine name of engine + * @param string $engine name of engine * @return boolean whether $engine is valid or not */ static public function isValid($engine) @@ -248,7 +248,7 @@ class PMA_StorageEngine /** * Constructor * - * @param string $engine The engine ID + * @param string $engine The engine ID */ function __construct($engine) { @@ -381,7 +381,7 @@ class PMA_StorageEngine * Generates the requested information page * * @abstract - * @param string $id The page ID + * @param string $id The page ID * * @return string The page * boolean or false on error. diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 66ceaea..d2a0dbe 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -63,8 +63,8 @@ class PMA_Table /** * Constructor * - * @param string $table_name table name - * @param string $db_name database name + * @param string $table_name table name + * @param string $db_name database name */ function __construct($table_name, $db_name) { @@ -96,7 +96,7 @@ class PMA_Table /** * sets table name * - * @param string $table_name new table name + * @param string $table_name new table name */ function setName($table_name) { @@ -106,7 +106,7 @@ class PMA_Table /** * returns table name * - * @param boolean $backquoted whether to quote name with backticks `` + * @param boolean $backquoted whether to quote name with backticks `` * @return string table name */ function getName($backquoted = false) @@ -120,7 +120,7 @@ class PMA_Table /** * sets database name for this table * - * @param string $db_name + * @param string $db_name */ function setDbName($db_name) { @@ -130,7 +130,7 @@ class PMA_Table /** * returns database name for this table * - * @param boolean $backquoted whether to quote name with backticks `` + * @param boolean $backquoted whether to quote name with backticks `` * @return string database name for this table */ function getDbName($backquoted = false) @@ -144,7 +144,7 @@ class PMA_Table /** * returns full name for table, including database name * - * @param boolean $backquoted whether to quote name with backticks `` + * @param boolean $backquoted whether to quote name with backticks `` * @return string */ function getFullName($backquoted = false) @@ -175,7 +175,7 @@ class PMA_Table /** * returns value for given setting/param * - * @param string $param name for value to return + * @param string $param name for value to return * @return mixed value for $param */ function get($param) @@ -226,8 +226,8 @@ class PMA_Table * * @deprecated * @todo see what we could do with the possible existence of $table_is_view - * @param string $db the database name - * @param string $table the table name + * @param string $db the database name + * @param string $table the table name * @return boolean whether this is a view */ static protected function _isView($db, $table) @@ -247,8 +247,8 @@ class PMA_Table * * If the ENGINE of the table is MERGE or MRG_MYISAM (alias), this is a merge table. * - * @param string $db the database name - * @param string $table the table name + * @param string $db the database name + * @param string $table the table name * @return boolean true if it is a merge table */ static public function isMerge($db = null, $table = null) @@ -313,19 +313,19 @@ class PMA_Table * * @todo move into class PMA_Column * @todo on the interface, some js to clear the default value when the default current_timestamp is checked - * @param string $name name - * @param string $type type ('INT', 'VARCHAR', 'BIT', ...) - * @param string $length length ('2', '5,2', '', ...) - * @param string $attribute - * @param string $collation - * @param bool|string $null with 'NULL' or 'NOT NULL' - * @param string $default_type whether default is CURRENT_TIMESTAMP, + * @param string $name name + * @param string $type type ('INT', 'VARCHAR', 'BIT', ...) + * @param string $length length ('2', '5,2', '', ...) + * @param string $attribute + * @param string $collation + * @param bool|string $null with 'NULL' or 'NOT NULL' + * @param string $default_type whether default is CURRENT_TIMESTAMP, * NULL, NONE, USER_DEFINED - * @param string $default_value default value for USER_DEFINED default type - * @param string $extra 'AUTO_INCREMENT' - * @param string $comment field comment - * @param array &$field_primary list of fields for PRIMARY KEY - * @param string $index + * @param string $default_value default value for USER_DEFINED default type + * @param string $extra 'AUTO_INCREMENT' + * @param string $comment field comment + * @param array &$field_primary list of fields for PRIMARY KEY + * @param string $index * @return string field specification */ static function generateFieldSpec($name, $type, $length = '', $attribute = '', @@ -424,10 +424,10 @@ class PMA_Table * Revision 13 July 2001: Patch for limiting dump size from * vinay(a)sanisoft.com & girish(a)sanisoft.com * - * @param string $db the current database name - * @param string $table the current table name - * @param bool $force_exact whether to force an exact count - * @param bool $is_view + * @param string $db the current database name + * @param string $table the current table name + * @param bool $force_exact whether to force an exact count + * @param bool $is_view * * @return mixed the number of records if "retain" param is true, * otherwise true @@ -498,21 +498,21 @@ class PMA_Table * Generates column specification for ALTER syntax * * @see PMA_Table::generateFieldSpec() - * @param string $oldcol old column name - * @param string $newcol new column name - * @param string $type type ('INT', 'VARCHAR', 'BIT', ...) - * @param string $length length ('2', '5,2', '', ...) - * @param string $attribute - * @param string $collation - * @param bool|string $null with 'NULL' or 'NOT NULL' - * @param string $default_type whether default is CURRENT_TIMESTAMP, + * @param string $oldcol old column name + * @param string $newcol new column name + * @param string $type type ('INT', 'VARCHAR', 'BIT', ...) + * @param string $length length ('2', '5,2', '', ...) + * @param string $attribute + * @param string $collation + * @param bool|string $null with 'NULL' or 'NOT NULL' + * @param string $default_type whether default is CURRENT_TIMESTAMP, * NULL, NONE, USER_DEFINED - * @param string $default_value default value for USER_DEFINED default type - * @param string $extra 'AUTO_INCREMENT' - * @param string $comment field comment - * @param array &$field_primary list of fields for PRIMARY KEY - * @param string $index - * @param mixed $default_orig + * @param string $default_value default value for USER_DEFINED default type + * @param string $extra 'AUTO_INCREMENT' + * @param string $comment field comment + * @param array &$field_primary list of fields for PRIMARY KEY + * @param string $index + * @param mixed $default_orig * @return string field specification */ static public function generateAlter($oldcol, $newcol, $type, $length, @@ -529,11 +529,11 @@ class PMA_Table * Inserts existing entries in a PMA_* table by reading a value from an old entry * * @global relation variable - * @param string $work The array index, which Relation feature to check ('relwork', 'commwork', ...) - * @param string $pma_table The array index, which PMA-table to update ('bookmark', 'relation', ...) - * @param array $get_fields Which fields will be SELECT'ed from the old entry - * @param array $where_fields Which fields will be used for the WHERE query (array('FIELDNAME' => 'FIELDVALUE')) - * @param array $new_fields Which fields will be used as new VALUES. These are the important + * @param string $work The array index, which Relation feature to check ('relwork', 'commwork', ...) + * @param string $pma_table The array index, which PMA-table to update ('bookmark', 'relation', ...) + * @param array $get_fields Which fields will be SELECT'ed from the old entry + * @param array $where_fields Which fields will be used for the WHERE query (array('FIELDNAME' => 'FIELDVALUE')) + * @param array $new_fields Which fields will be used as new VALUES. These are the important * keys which differ from the old entry. * (array('FIELDNAME' => 'NEW FIELDVALUE')) * @return int|true @@ -995,7 +995,7 @@ class PMA_Table * * @todo add check for valid chars in filename on current system/os * @see http://dev.mysql.com/doc/refman/5.0/en/legal-names.html - * @param string $table_name name to check + * @param string $table_name name to check * @return boolean whether the string is valid or not */ function isValidName($table_name) @@ -1021,9 +1021,9 @@ class PMA_Table /** * renames table * - * @param string $new_name new table name - * @param string $new_db new database name - * @param bool $is_view is this for a VIEW rename? + * @param string $new_name new table name + * @param string $new_db new database name + * @param bool $is_view is this for a VIEW rename? * @return bool success */ function rename($new_name, $new_db = null, $is_view = false) @@ -1161,7 +1161,7 @@ class PMA_Table * - UNIQUE(x,y) // NONE * * - * @param bool $backquoted whether to quote name with backticks `` + * @param bool $backquoted whether to quote name with backticks `` * @return array */ public function getUniqueColumns($backquoted = true) @@ -1188,7 +1188,7 @@ class PMA_Table * * e.g. index(col1, col2) would only return col1 * - * @param bool $backquoted whether to quote name with backticks `` + * @param bool $backquoted whether to quote name with backticks `` * @return array */ public function getIndexedColumns($backquoted = true) @@ -1209,7 +1209,7 @@ class PMA_Table * * returns an array with all columns * - * @param bool $backquoted whether to quote name with backticks `` + * @param bool $backquoted whether to quote name with backticks `` * @return array */ public function getColumns($backquoted = true) diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php index d1b79fd..7b01fa8 100644 --- a/libraries/Theme.class.php +++ b/libraries/Theme.class.php @@ -107,7 +107,7 @@ class PMA_Theme { * * @static * @access public - * @param string $folder path to theme + * @param string $folder path to theme * @return object PMA_Theme */ static public function load($folder) @@ -172,7 +172,7 @@ class PMA_Theme { * set path to theme * * @access public - * @param string $path path to theme + * @param string $path path to theme */ function setPath($path) { @@ -183,7 +183,7 @@ class PMA_Theme { * sets version * * @access public - * @param string new version + * @param string new version */ function setVersion($version) { @@ -206,7 +206,7 @@ class PMA_Theme { * returns true if theme version is equal or higher to $version * * @access public - * @param string $version version to compare to + * @param string $version version to compare to * @return boolean */ function checkVersion($version) @@ -218,7 +218,7 @@ class PMA_Theme { * sets name * * @access public - * @param string $name new name + * @param string $name new name */ function setName($name) { @@ -240,7 +240,7 @@ class PMA_Theme { * sets id * * @access public - * @param string $id new id + * @param string $id new id */ function setId($id) { @@ -260,7 +260,7 @@ class PMA_Theme { /** * @access public - * @param string path to images for this theme + * @param string path to images for this theme */ function setImgPath($path) { @@ -280,7 +280,7 @@ class PMA_Theme { * load css (send to stdout, normally the browser) * * @access public - * @param string $type left, right or print + * @param string $type left, right or print */ function loadCss(&$type) { diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php index b179ccc..86ddc8d 100644 --- a/libraries/Theme_Manager.class.php +++ b/libraries/Theme_Manager.class.php @@ -55,7 +55,7 @@ class PMA_Theme_Manager /** * sets path to folder containing the themes * - * @param string $path path to themes folder + * @param string $path path to themes folder * @return boolean success */ function setThemesPath($path) @@ -80,7 +80,7 @@ class PMA_Theme_Manager /** * sets if there are different themes per server * - * @param boolean $per_server + * @param boolean $per_server */ function setThemePerServer($per_server) { @@ -200,7 +200,7 @@ class PMA_Theme_Manager /** * @private - * @param string $folder + * @param string $folder * @return boolean */ /*private*/ function _checkThemeFolder($folder) @@ -252,7 +252,7 @@ class PMA_Theme_Manager /** * checks if given theme name is a known theme * - * @param string $theme name fo theme to check for + * @param string $theme name fo theme to check for */ function checkTheme($theme) { @@ -266,7 +266,7 @@ class PMA_Theme_Manager /** * returns HTML selectbox, with or without form enclosed * - * @param boolean $form whether enclosed by from tags or not + * @param boolean $form whether enclosed by from tags or not */ function getHtmlSelectBox($form = true) { diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php index da9a56a..c82d0d9 100644 --- a/libraries/Tracker.class.php +++ b/libraries/Tracker.class.php @@ -168,7 +168,7 @@ class PMA_Tracker * * @static * - * @param string $string part of SQL statement + * @param string $string part of SQL statement * * @return string the name of table */ @@ -198,8 +198,8 @@ class PMA_Tracker * * @static * - * @param string $dbname name of database - * @param string $tablename name of table + * @param string $dbname name of database + * @param string $tablename name of table * * @return boolean true or false */ @@ -250,11 +250,11 @@ class PMA_Tracker * * @static * - * @param string $dbname name of database - * @param string $tablename name of table - * @param string $version version - * @param string $tracking_set set of tracking statements - * @param string $is_view if table is a view + * @param string $dbname name of database + * @param string $tablename name of table + * @param string $version version + * @param string $tracking_set set of tracking statements + * @param string $is_view if table is a view * * @return int result of version insertion */ @@ -357,8 +357,8 @@ class PMA_Tracker * * @static * - * @param string $dbname name of database - * @param string $tablename name of table + * @param string $dbname name of database + * @param string $tablename name of table * * @return int result of version insertion */ @@ -378,10 +378,10 @@ class PMA_Tracker * * @static * - * @param string $dbname name of database - * @param string $version version - * @param string $query query - * @param string $tracking_set set of tracking statements + * @param string $dbname name of database + * @param string $version version + * @param string $query query + * @param string $tracking_set set of tracking statements * * @return int result of version insertion */ @@ -443,10 +443,10 @@ class PMA_Tracker * * @static * - * @param string $dbname name of database - * @param string $tablename name of table - * @param string $version version - * @param integer $new_state the new state of tracking + * @param string $dbname name of database + * @param string $tablename name of table + * @param string $version version + * @param integer $new_state the new state of tracking * * @return int result of SQL query */ @@ -469,11 +469,11 @@ class PMA_Tracker * * @static * - * @param string $dbname name of database - * @param string $tablename name of table - * @param string $version version - * @param string $type type of data(DDL || DML) - * @param string || array $new_data the new tracking data + * @param string $dbname name of database + * @param string $tablename name of table + * @param string $version version + * @param string $type type of data(DDL || DML) + * @param string || array $new_data the new tracking data * * @return bool result of change */ @@ -514,9 +514,9 @@ class PMA_Tracker * * @static * - * @param string $dbname name of database - * @param string $tablename name of table - * @param string $version version + * @param string $dbname name of database + * @param string $tablename name of table + * @param string $version version * * @return int result of SQL query */ @@ -531,9 +531,9 @@ class PMA_Tracker * * @static * - * @param string $dbname name of database - * @param string $tablename name of table - * @param string $version version + * @param string $dbname name of database + * @param string $tablename name of table + * @param string $version version * * @return int result of SQL query */ @@ -549,9 +549,9 @@ class PMA_Tracker * * @static * - * @param string $dbname name of database - * @param string $tablename name of table - * @param string $statement tracked statement + * @param string $dbname name of database + * @param string $tablename name of table + * @param string $statement tracked statement * * @return int (-1 if no version exists | > 0 if a version exists) */ @@ -581,9 +581,9 @@ class PMA_Tracker * * @static * - * @param string $dbname name of database - * @param string $tablename name of table - * @param string $version version number + * @param string $dbname name of database + * @param string $tablename name of table + * @param string $version version number * * @return mixed record DDM log, DDL log, structure snapshot, tracked statements. */ @@ -892,7 +892,7 @@ class PMA_Tracker * * * @static - * @param string $query a SQL query + * @param string $query a SQL query */ static public function handleQuery($query) { diff --git a/libraries/blowfish.php b/libraries/blowfish.php index 710015f..69abf52 100644 --- a/libraries/blowfish.php +++ b/libraries/blowfish.php @@ -483,8 +483,8 @@ class Horde_Cipher_blowfish /** * Encryption using blowfish algorithm * - * @param string original data - * @param string the secret + * @param string original data + * @param string the secret * * @return string the encrypted result * @@ -511,8 +511,8 @@ function PMA_blowfish_encrypt($data, $secret) /** * Decryption using blowfish algorithm * - * @param string encrypted data - * @param string the secret + * @param string encrypted data + * @param string the secret * * @return string original data * diff --git a/libraries/bookmark.lib.php b/libraries/bookmark.lib.php index c978730..723b042 100644 --- a/libraries/bookmark.lib.php +++ b/libraries/bookmark.lib.php @@ -41,7 +41,7 @@ function PMA_Bookmark_getParams() * * @global resource the controluser db connection handle * - * @param string the current database name + * @param string the current database name * * @return array the bookmarks list (key as index, label as value) * @@ -86,11 +86,11 @@ function PMA_Bookmark_getList($db) * * @global resource the controluser db connection handle * - * @param string the current database name - * @param mixed the id of the bookmark to get - * @param string which field to look up the $id - * @param boolean true: get all bookmarks regardless of the owning user - * @param boolean whether to ignore bookmarks with no user + * @param string the current database name + * @param mixed the id of the bookmark to get + * @param string which field to look up the $id + * @param boolean true: get all bookmarks regardless of the owning user + * @param boolean whether to ignore bookmarks with no user * * @return string the sql query * @@ -127,9 +127,9 @@ function PMA_Bookmark_get($db, $id, $id_field = 'id', $action_bookmark_all = fal * * @global resource the controluser db connection handle * - * @param array the properties of the bookmark to add; here, + * @param array the properties of the bookmark to add; here, * $fields['query'] is urlencoded - * @param boolean whether to make the bookmark available for all users + * @param boolean whether to make the bookmark available for all users * * @return boolean whether the INSERT succeeds or not * @@ -156,8 +156,8 @@ function PMA_Bookmark_save($fields, $all_users = false) * * @global resource the controluser db connection handle * - * @param string the current database name - * @param integer the id of the bookmark to get + * @param string the current database name + * @param integer the id of the bookmark to get * * @access public */ diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php index 9acd184..b3ae693 100644 --- a/libraries/charset_conversion.lib.php +++ b/libraries/charset_conversion.lib.php @@ -58,9 +58,9 @@ if ($PMA_recoding_engine == PMA_CHARSET_ICONV_AIX) { * Converts encoding of text according to parameters with detected * conversion function. * - * @param string source charset - * @param string target charset - * @param string what to convert + * @param string source charset + * @param string target charset + * @param string what to convert * * @return string converted text * diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 34d20d9..1607d6e 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -207,7 +207,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 * @access public */ @@ -439,9 +439,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 * @return string html code for a footnote marker * @access public */ @@ -480,11 +480,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 @@ -630,10 +630,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 */ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count = false) @@ -760,9 +760,9 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count = * * </code> * - * @param mixed $a_name the database, table or field name to "backquote" + * @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 + * @param boolean $do_it a flag to bypass this function (used by dump * functions) * @return mixed the "backquoted" database, table or field name * @access public @@ -854,10 +854,10 @@ if (!$jsonly) * 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 * @access public */ @@ -1237,7 +1237,7 @@ function PMA_profilingSupported() /** * Displays a form with the Profiling checkbox * - * @param string $sql_query + * @param string $sql_query * @access public */ function PMA_profilingCheckbox($sql_query) @@ -1329,11 +1329,11 @@ function PMA_localizeNumber($value) * 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 * @@ -1411,7 +1411,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) */ function PMA_extractValueFromFormattedSize($formatted_size) @@ -1500,8 +1500,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 * @access public */ @@ -1599,8 +1599,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 */ function PMA_generate_html_tabs($tabs, $url_params, $base_dir='') @@ -1627,14 +1627,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 + * @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 + * @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 boolean $strip_img + * @param string $target * * @return string the results to be echoed or saved in an array */ @@ -1762,7 +1762,7 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), /** * Returns a given timespan value in a readable format. * - * @param int $seconds the timespan + * @param int $seconds the timespan * * @return string the formatted value */ @@ -1791,8 +1791,8 @@ function PMA_timespanFormat($seconds) * 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 * @return string The flipped string @@ -1838,11 +1838,11 @@ function PMA_flipstring($string, $Separator = "<br />\n") * 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? + * @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 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 * @@ -1889,11 +1889,11 @@ 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 @@ -2011,12 +2011,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 * * @access public */ @@ -2052,17 +2052,17 @@ 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 + * @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 + * @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 string $prompt The prompt to display (sometimes empty) * * @return string * @access public @@ -2151,12 +2151,12 @@ 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 */ @@ -2238,7 +2238,7 @@ function PMA_listNavigator($count, $pos, $_url_params, $script, $frame, $max_cou * $user_dir = PMA_userDir('/var/pma_tmp/%u/'); // '/var/pma_tmp/root/' * * </code> - * @param string $dir with wildcard for user + * @param string $dir with wildcard for user * @return string per user directory */ function PMA_userDir($dir) @@ -2254,7 +2254,7 @@ function PMA_userDir($dir) /** * returns html code for db link to default db page * - * @param string $database + * @param string $database * @return string html link to default db page */ function PMA_getDbLink($database = null) @@ -2277,10 +2277,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) { @@ -2292,10 +2292,10 @@ function PMA_externalBug($functionality, $component, $minimum_version, $bugref) /** * Generates and echoes an HTML checkbox * - * @param string $html_field_name the checkbox HTML field - * @param string $label - * @param boolean $checked is it initially checked? - * @param boolean $onclick should it submit the form on click? + * @param string $html_field_name the checkbox HTML field + * @param string $label + * @param boolean $checked is it initially checked? + * @param boolean $onclick should it submit the form on click? */ function PMA_display_html_checkbox($html_field_name, $label, $checked, $onclick) { @@ -2305,12 +2305,12 @@ function PMA_display_html_checkbox($html_field_name, $label, $checked, $onclick) /** * Generates and echoes a set of radio HTML fields * - * @param string $html_field_name the radio HTML field - * @param array $choices the choices values and labels - * @param string $checked_choice the choice to check by default - * @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 + * @param string $html_field_name the radio HTML field + * @param array $choices the choices values and labels + * @param string $checked_choice the choice to check by default + * @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 */ function PMA_display_html_radio($html_field_name, $choices, $checked_choice = '', $line_break = true, $escape_label = true, $class='') { foreach ($choices as $choice_value => $choice_label) { @@ -2337,10 +2337,10 @@ 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 + * @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 * @return string * @todo support titles @@ -2365,8 +2365,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) { @@ -2389,10 +2389,10 @@ function PMA_generate_slider_effect($id, $message) /** * 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 + * @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 @@ -2543,8 +2543,8 @@ 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 integer $length + * @param numeric $value coming from a BIT field + * @param integer $length * @return string the printable value */ function PMA_printable_bit_value($value, $length) { @@ -2559,7 +2559,7 @@ function PMA_printable_bit_value($value, $length) { /** * Verifies whether the value contains a non-printable character * - * @param string $value + * @param string $value * @return boolean */ function PMA_contains_nonprintable_ascii($value) { @@ -2570,7 +2570,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 * @return string the converted value */ function PMA_convert_bit_default_value($bit_default_value) { @@ -2580,7 +2580,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 * @return array associative array containing type, spec_in_brackets * and possibly enum_set_values (another array) */ @@ -2656,7 +2656,7 @@ function PMA_extractFieldSpec($fieldspec) { /** * Verifies if this table's engine supports foreign keys * - * @param string $engine + * @param string $engine * @return boolean */ function PMA_foreignkey_supported($engine) { @@ -2671,7 +2671,7 @@ function PMA_foreignkey_supported($engine) { /** * Replaces some characters by a displayable equivalent * - * @param string $content + * @param string $content * @return string the content with characters replaced */ function PMA_replace_binary_contents($content) { @@ -2798,9 +2798,9 @@ function PMA_expandUserString($string, $escape = null, $updates = array()) { * function that generates a json output for an ajax request and ends script * execution * - * @param bool $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 bool $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 * */ function PMA_ajaxResponse($message, $success = true, $extra_data = array()) @@ -2924,8 +2924,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. * @@ -3007,9 +3007,9 @@ function PMA_unsupportedDatatypes() { /** * Creates a dropdown box with MySQL functions for a particular column. * - * @param array $field Data about the column for which + * @param array $field Data about the column for which * to generate the dropdown - * @param bool $insert_mode Whether the operation is 'insert' + * @param bool $insert_mode Whether the operation is 'insert' * * @global array $cfg PMA configuration * @global array $analyzed_sql Analyzed SQL query @@ -3112,10 +3112,10 @@ function PMA_getFunctionsForField($field, $insert_mode) * // user has this privilege on database 'mydb'. * * - * @param string $priv The privilege to check - * @param mixed $db null, to only check global 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 + * @param mixed $tbl null, to only check global privileges * string, db name where to also check for privileges * @return bool */ diff --git a/libraries/core.lib.php b/libraries/core.lib.php index fe533e3..bb542ba 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -30,9 +30,9 @@ * </code> * * @see PMA_isValid() - * @param mixed $var param to check - * @param mixed $default default value - * @param mixed $type var type or array of values to check against $var + * @param mixed $var param to check + * @param mixed $default default value + * @param mixed $type var type or array of values to check against $var * @return mixed $var or $default */ function PMA_ifSetOr(&$var, $default = null, $type = 'similar') @@ -80,9 +80,9 @@ function PMA_ifSetOr(&$var, $default = null, $type = 'similar') * @todo create some testsuites * @todo add some more var types like hex, bin, ...? * @see http://php.net/gettype - * @param mixed $var variable to check - * @param mixed $type var type or array of valid values to check against $var - * @param mixed $compare var to compare with $var + * @param mixed $var variable to check + * @param mixed $type var type or array of valid values to check against $var + * @param mixed $compare var to compare with $var * @return boolean whether valid or not */ function PMA_isValid(&$var, $type = 'length', $compare = null) @@ -171,7 +171,7 @@ function PMA_isValid(&$var, $type = 'length', $compare = null) * require() when a part of the path comes from an insecure source * like a cookie or form. * - * @param string The path to check + * @param string The path to check * * @return string The secured path * @@ -192,8 +192,8 @@ function PMA_securePath($path) * loads language file if not loaded already * * @todo use detected argument separator (PMA_Config) - * @param string $error_message the error message or named error message - * @param string|array $message_args arguments applied to $error_message + * @param string $error_message the error message or named error message + * @param string|array $message_args arguments applied to $error_message * @return exit */ function PMA_fatalError($error_message, $message_args = null) @@ -276,7 +276,7 @@ function PMA_warnMissingExtension($extension, $fatal = false, $extra = '') /** * returns count of tables in given db * - * @param string $db database to count tables for + * @param string $db database to count tables for * @return integer count of tables in $db */ function PMA_getTableCount($db) @@ -308,7 +308,7 @@ function PMA_getTableCount($db) * (renamed with PMA prefix to avoid double definition when embedded * in Moodle) * - * @param string $size + * @param string $size * @return integer $size */ function PMA_get_real_size($size = 0) @@ -343,9 +343,9 @@ function PMA_get_real_size($size = 0) * * @see http://php.net/array_merge * @see http://php.net/array_merge_recursive - * @param array array to merge - * @param array array to merge - * @param array ... + * @param array array to merge + * @param array array to merge + * @param array ... * @return array merged array */ function PMA_array_merge_recursive() @@ -398,8 +398,8 @@ function PMA_array_merge_recursive() * @see http://www.php-security.org/MOPB/MOPB-02-2007.html * @see http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-1549 * - * @param array $array array to walk - * @param string $function function to call for every array element + * @param array $array array to walk + * @param string $function function to call for every array element */ function PMA_arrayWalkRecursive(&$array, $function, $apply_to_keys_also = false) { @@ -431,8 +431,8 @@ function PMA_arrayWalkRecursive(&$array, $function, $apply_to_keys_also = false) * checks given given $page against given $whitelist and returns true if valid * it ignores optionaly query paramters in $page (script.php?ignored) * - * @param string &$page page to check - * @param array $whitelist whitelist to check page against + * @param string &$page page to check + * @param array $whitelist whitelist to check page against * @return boolean whether $page is valid or not (in $whitelist or not) */ function PMA_checkPageValidity(&$page, $whitelist) @@ -460,7 +460,7 @@ function PMA_checkPageValidity(&$page, $whitelist) * searchs in $_SERVER, $_ENV than trys getenv() and apache_getenv() * in this order * - * @param string $var_name variable name + * @param string $var_name variable name * @return string value of $var or empty string */ function PMA_getenv($var_name) { @@ -481,7 +481,7 @@ function PMA_getenv($var_name) { /** * Send HTTP header, taking IIS limits into account (600 seems ok) * - * @param string $uri the header to send + * @param string $uri the header to send * @return boolean always true */ function PMA_sendHeaderLocation($uri) @@ -542,9 +542,9 @@ function PMA_sendHeaderLocation($uri) * $path is a string describing position of an element in an associative array, * eg. Servers/1/host refers to $array[Servers][1][host] * - * @param string $path - * @param array $array - * @param mixed $default + * @param string $path + * @param array $array + * @param mixed $default * @return mixed array element or $default */ function PMA_array_read($path, $array, $default = null) @@ -563,9 +563,9 @@ function PMA_array_read($path, $array, $default = null) /** * Stores value in an array * - * @param string $path - * @param array &$array - * @param mixed $value + * @param string $path + * @param array &$array + * @param mixed $value */ function PMA_array_write($path, &$array, $value) { @@ -584,9 +584,9 @@ function PMA_array_write($path, &$array, $value) /** * Removes value from an array * - * @param string $path - * @param array &$array - * @param mixed $value + * @param string $path + * @param array &$array + * @param mixed $value */ function PMA_array_remove($path, &$array) { diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index e7d08a5..42bd352 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -22,7 +22,7 @@ define('PMA_DBI_GETVAR_GLOBAL', 2); /** * Checks one of the mysql extensions * - * @param string $extension mysql extension to check + * @param string $extension mysql extension to check */ function PMA_DBI_checkMysqlExtension($extension = 'mysql') { if (! function_exists($extension . '_connect')) { @@ -145,7 +145,7 @@ function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_r * uses language to charset mapping from mysql/share/errmsg.txt * and charset names to ISO charset from information_schema.CHARACTER_SETS * - * @param string $message + * @param string $message * @return string $message */ function PMA_DBI_convert_message($message) { @@ -218,8 +218,8 @@ function PMA_DBI_convert_message($message) { /** * returns array with table names for given db * - * @param string $database name of database - * @param mixed $link mysql link resource|object + * @param string $database name of database + * @param mixed $link mysql link resource|object * @return array tables names */ function PMA_DBI_get_tables($database, $link = null) @@ -231,8 +231,8 @@ function PMA_DBI_get_tables($database, $link = null) /** * usort comparison callback * - * @param string $a first argument to sort - * @param string $b second argument to sort + * @param string $a first argument to sort + * @param string $b second argument to sort * * @return integer a value representing whether $a should be before $b in the * sorted array or not @@ -275,14 +275,14 @@ function PMA_usort_comparison_callback($a, $b) * </code> * * @todo move into PMA_Table - * @param string $database database - * @param string|false $table table - * @param boolean|string $tbl_is_group $table is a table group - * @param resource $link mysql link - * @param integer $limit_offset zero-based offset for the count - * @param boolean|integer $limit_count number of tables to return - * @param string $sort_by table attribute to sort by - * @param string $sort_order direction to sort (ASC or DESC) + * @param string $database database + * @param string|false $table table + * @param boolean|string $tbl_is_group $table is a table group + * @param resource $link mysql link + * @param integer $limit_offset zero-based offset for the count + * @param boolean|integer $limit_count number of tables to return + * @param string $sort_by table attribute to sort by + * @param string $sort_order direction to sort (ASC or DESC) * @return array list of tables in given db(s) */ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = false, $link = null, @@ -526,13 +526,13 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals * returns array with databases containing extended infos about them * * @todo move into PMA_List_Database? - * @param string $database database - * @param boolean $force_stats retrieve stats also for MySQL < 5 - * @param resource $link mysql link - * @param string $sort_by column to order by - * @param string $sort_order ASC or DESC - * @param integer $limit_offset starting offset for LIMIT - * @param bool|int $limit_count row count for LIMIT or true for $GLOBALS['cfg']['MaxDbList'] + * @param string $database database + * @param boolean $force_stats retrieve stats also for MySQL < 5 + * @param resource $link mysql link + * @param string $sort_by column to order by + * @param string $sort_order ASC or DESC + * @param integer $limit_offset starting offset for LIMIT + * @param bool|int $limit_count row count for LIMIT or true for $GLOBALS['cfg']['MaxDbList'] * @return array $databases */ function PMA_DBI_get_databases_full($database = null, $force_stats = false, @@ -698,10 +698,10 @@ function PMA_DBI_get_databases_full($database = null, $force_stats = false, * returns detailed array with all columns for given table in database, * or all tables/databases * - * @param string $database name of database - * @param string $table name of table to retrieve columns from - * @param string $column name of specific column - * @param mixed $link mysql link resource + * @param string $database name of database + * @param string $table name of table to retrieve columns from + * @param string $column name of specific column + * @param mixed $link mysql link resource * @return array */ function PMA_DBI_get_columns_full($database = null, $table = null, @@ -825,10 +825,10 @@ function PMA_DBI_get_columns_full($database = null, $table = null, /** * array PMA_DBI_get_columns(string $database, string $table, bool $full = false, mysql db link $link = null) * - * @param string $database name of database - * @param string $table name of table to retrieve columns from - * @param boolean $full whether to return full info or only column names - * @param mixed $link mysql link resource + * @param string $database name of database + * @param string $table name of table to retrieve columns from + * @param boolean $full whether to return full info or only column names + * @param mixed $link mysql link resource * @return array column names */ function PMA_DBI_get_columns($database, $table, $full = false, $link = null) @@ -846,9 +846,9 @@ function PMA_DBI_get_columns($database, $table, $full = false, $link = null) /** * returns value of given mysql server variable * - * @param string $var mysql server variable name - * @param int $type PMA_DBI_GETVAR_SESSION|PMA_DBI_GETVAR_GLOBAL - * @param mixed $link mysql link resource|object + * @param string $var mysql server variable name + * @param int $type PMA_DBI_GETVAR_SESSION|PMA_DBI_GETVAR_GLOBAL + * @param mixed $link mysql link resource|object * @return mixed value for mysql server variable */ @@ -881,8 +881,8 @@ function PMA_DBI_get_variable($var, $type = PMA_DBI_GETVAR_SESSION, $link = null * Function called just after a connection to the MySQL database server has been established * It sets the connection collation, and determins the version of MySQL which is running. * - * @param mixed $link mysql link resource|object - * @param boolean $is_controluser + * @param mixed $link mysql link resource|object + * @param boolean $is_controluser */ function PMA_DBI_postConnect($link, $is_controluser = false) { @@ -938,13 +938,13 @@ function PMA_DBI_postConnect($link, $is_controluser = false) * // $user_name = 'John Doe' * </code> * - * @param string|mysql_result $result query or mysql result - * @param integer $row_number row to fetch the value from, + * @param string|mysql_result $result query or mysql result + * @param integer $row_number row to fetch the value from, * starting at 0, with 0 beeing default - * @param integer|string $field field to fetch the value from, + * @param integer|string $field field to fetch the value from, * starting at 0, with 0 beeing default - * @param resource $link mysql link - * @param mixed $options + * @param resource $link mysql link + * @param mixed $options * @return mixed value of first field in first row from result * or false if not found */ @@ -993,12 +993,12 @@ function PMA_DBI_fetch_value($result, $row_number = 0, $field = 0, $link = null, * // $user = array('id' => 123, 'name' => 'John Doe') * </code> * - * @param string|mysql_result $result query or mysql result - * @param string $type NUM|ASSOC|BOTH + * @param string|mysql_result $result query or mysql result + * @param string $type NUM|ASSOC|BOTH * returned array should either numeric * associativ or booth - * @param resource $link mysql link - * @param mixed $options + * @param resource $link mysql link + * @param mixed $options * @return array|boolean first row from result * or false if result is empty */ @@ -1072,13 +1072,13 @@ function PMA_DBI_fetch_single_row($result, $type = 'ASSOC', $link = null, $optio * // $users['admin']['John Doe'] = '123' * </code> * - * @param string|mysql_result $result query or mysql result - * @param string|integer $key field-name or offset + * @param string|mysql_result $result query or mysql result + * @param string|integer $key field-name or offset * used as key for array - * @param string|integer $value value-name or offset + * @param string|integer $value value-name or offset * used as value for array - * @param resource $link mysql link - * @param mixed $options + * @param resource $link mysql link + * @param mixed $options * @return array resultrows or values indexed by $key */ function PMA_DBI_fetch_result($result, $key = null, $value = null, @@ -1202,7 +1202,7 @@ function PMA_DBI_getCompatibilities() /** * returns warnings for last query * - * @param resource $link mysql link resource + * @param resource $link mysql link resource * @return array warnings */ function PMA_DBI_get_warnings($link = null) @@ -1245,9 +1245,9 @@ function PMA_isSuperuser() /** * returns an array of PROCEDURE or FUNCTION names for a db * - * @param string $db db name - * @param string $which PROCEDURE | FUNCTION - * @param resource $link mysql link + * @param string $db db name + * @param string $which PROCEDURE | FUNCTION + * @param resource $link mysql link * * @return array the procedure names or function names */ @@ -1266,10 +1266,10 @@ function PMA_DBI_get_procedures_or_functions($db, $which, $link = null) /** * returns the definition of a specific PROCEDURE, FUNCTION or EVENT * - * @param string $db db name - * @param string $which PROCEDURE | FUNCTION | EVENT - * @param string $name the procedure|function|event name - * @param resource $link mysql link + * @param string $db db name + * @param string $which PROCEDURE | FUNCTION | EVENT + * @param string $name the procedure|function|event name + * @param resource $link mysql link * * @return string the definition */ @@ -1287,9 +1287,9 @@ function PMA_DBI_get_definition($db, $which, $name, $link = null) /** * returns details about the TRIGGERs for a specific table or database * - * @param string $db db name - * @param string $table table name - * @param string $delimiter the delimiter to use (may be empty) + * @param string $db db name + * @param string $table tablme delimiter to use (may be empty)null) null) $optioull)abel = true, $class='') { find out why click %shere%s.')ɣ��*�D��*��*��*ɣ��4�* ��*6 ��!�!�ȣ��ɣ��xt�* ��"��*��*�ȣ��*�ȣ��ov�*��*`v�*�dv�*�iv�*�D��*xt�* ��*�!�!�ȣ��ɣ��=��*��"��*��*�ȣ��*�ȣ��ȣ��ȣ��*�p�ɣ��*�D��*��о��*GHIJKMNOP�ȣ��ɣ��H��*��"��*��*�ȣ��0ov�*��*��*�)��*`v�*�dv�*�iv�*�D��*H��*��࿣��*8��*��*(��*��@��*��*��p��* �nv�*��*�iv�*��x��*��*�dv�*��yx��*��*`v�*@��Zx��*��*�$��*��*�)��*`v�*؄�*�dv�*�iv�*�D��*�m��*�£��*#%')*-.035678:<=�ȣ��ɣ��p�p��*�ã��"��*8��*��*؄�*��*�D��*cf�<��*ɣ��p�p��*�ã��£��*�%��wq�-��s��,~9��u]�� 4Q��U^Qʉ��u��*ēv��B��*Pʣ��F��*F��*?�?��*ʣ��p��0ţ��<��*��*��*�ˣ��B��*`ʣ��ȣ��l��*ɣ��B��*ɣ��e name + * @param string $delimiter the delimiter to use (may be empty) * * @return array information about triggers (may be empty) */ @@ -1352,8 +1352,8 @@ function PMA_DBI_get_triggers($db, $table = '', $delimiter = '//') /** * Returns true if $db.$view_name is a view, false if not * - * @param string $db database name - * @param string $view_name view/table name + * @param string $db database name + * @param string $view_name view/table name * * @return bool true if $db.$view_name is a view, false if not */ diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php index de56e83..dc82af4 100644 --- a/libraries/db_info.inc.php +++ b/libraries/db_info.inc.php @@ -35,9 +35,9 @@ $pos = $_SESSION['tmp_user_values']['table_limit_offset']; /** * fills given tooltip arrays * - * @param array $tooltip_truename tooltip data - * @param array $tooltip_aliasname tooltip data - * @param array $table tabledata + * @param array $tooltip_truename tooltip data + * @param array $tooltip_aliasname tooltip data + * @param array $table tabledata */ function PMA_fillTooltip(&$tooltip_truename, &$tooltip_aliasname, $table) { diff --git a/libraries/db_structure.lib.php b/libraries/db_structure.lib.php index 82a3f58..179e752 100644 --- a/libraries/db_structure.lib.php +++ b/libraries/db_structure.lib.php @@ -13,8 +13,8 @@ if (! defined('PHPMYADMIN')) { * void PMA_TableHeader([bool $db_is_information_schema = false]) * display table header (<table><thead>...</thead><tbody>) * - * @param boolean $db_is_information_schema - * @param boolean $replication + * @param boolean $db_is_information_schema + * @param boolean $replication */ function PMA_TableHeader($db_is_information_schema = false, $replication = false) { @@ -65,9 +65,9 @@ function PMA_TableHeader($db_is_information_schema = false, $replication = false /** * Creates a clickable column header for table information * - * @param string title to use for the link - * @param string corresponds to sortable data name mapped in libraries/db_info.inc.php - * @param string initial sort order + * @param string title to use for the link + * @param string corresponds to sortable data name mapped in libraries/db_info.inc.php + * @param string initial sort order * @returns string link to be displayed in the table header */ function PMA_SortableTableHeader($title, $sort, $initial_sort_order = 'ASC') diff --git a/libraries/display_select_lang.lib.php b/libraries/display_select_lang.lib.php index 4f846bf..4ed3ec2 100644 --- a/libraries/display_select_lang.lib.php +++ b/libraries/display_select_lang.lib.php @@ -12,8 +12,8 @@ if (! defined('PHPMYADMIN')) { /** * Sorts available languages by their true english names * - * @param array the array to be sorted - * @param mixed a required parameter + * @param array the array to be sorted + * @param mixed a required parameter * @return the sorted array * @access private */ diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index adaa407..9e02c24 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -28,9 +28,9 @@ require_once './libraries/Index.class.php'; * the "display printable view" option. * Of course '0'/'1' means the feature won't/will be enabled. * - * @param string &$the_disp_mode the synthetic value for display_mode (see a few + * @param string &$the_disp_mode the synthetic value for display_mode (see a few * lines above for explanations) - * @param integer &$the_total the total number of rows returned by the SQL query + * @param integer &$the_total the total number of rows returned by the SQL query * without any programmatically appended "LIMIT" clause * (just a copy of $unlim_num_rows if it exists, else * computed inside this function) @@ -463,10 +463,10 @@ function PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, $id_for_di /** * Displays the headers of the results table * - * @param array which elements to display - * @param array the list of fields properties - * @param integer the total number of fields returned by the SQL query - * @param array the analyzed query + * @param array which elements to display + * @param array the list of fields properties + * @param integer the total number of fields returned by the SQL query + * @param array the analyzed query * * @return boolean $clause_is_unique * @@ -1060,9 +1060,9 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ /** * Prepares the display for a value * - * @param string $class - * @param string $condition_field - * @param string $value + * @param string $class + * @param string $condition_field + * @param string $value * * @return string the td */ @@ -1073,8 +1073,8 @@ function PMA_buildValueDisplay($class, $condition_field, $value) { /** * Prepares the display for a null value * - * @param string $class - * @param string $condition_field + * @param string $class + * @param string $condition_field * * @return string the td */ @@ -1086,9 +1086,9 @@ function PMA_buildNullDisplay($class, $condition_field) { /** * Prepares the display for an empty value * - * @param string $class - * @param string $condition_field - * @param string $align + * @param string $class + * @param string $condition_field + * @param string $align * * @return string the td */ @@ -1142,11 +1142,11 @@ function PMA_addClass($class, $condition_field, $meta, $nowrap, $is_field_trunca /** * Displays the body of the results table * - * @param integer the link id associated to the query which results have + * @param integer the link id associated to the query which results have * to be displayed - * @param array which elements to display - * @param array the list of relations - * @param array the analyzed query + * @param array which elements to display + * @param array the list of relations + * @param array the analyzed query * * @return boolean always true * @@ -2026,10 +2026,10 @@ function PMA_displayTable_checkConfigParams() * Displays a table of results returned by a SQL query. * This function is called by the "sql.php" script. * - * @param integer the link id associated to the query which results have + * @param integer the link id associated to the query which results have * to be displayed - * @param array the display mode - * @param array the analyzed query + * @param array the display mode + * @param array the analyzed query * * @global string $db the database name * @global string $table the table name @@ -2392,8 +2392,8 @@ function default_function($buffer) { /** * Displays operations that are available on results. * - * @param array the display mode - * @param array the analyzed query + * @param array the display mode + * @param array the analyzed query * * @global string $db the database name * @global string $table the table name @@ -2535,12 +2535,12 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) { * Verifies what to do with non-printable contents (binary or BLOB) * in Browse mode. * - * @param string $category BLOB|BINARY|GEOMETRY - * @param string $content the binary content - * @param string $transform_function - * @param string $transform_options - * @param string $default_function - * @param object $meta the meta-information about this field + * @param string $category BLOB|BINARY|GEOMETRY + * @param string $content the binary content + * @param string $transform_function + * @param string $transform_options + * @param string $default_function + * @param object $meta the meta-information about this field * @return mixed string or float */ function PMA_handle_non_printable_contents($category, $content, $transform_function, $transform_options, $default_function, $meta, $url_params = array()) { @@ -2580,17 +2580,17 @@ function PMA_handle_non_printable_contents($category, $content, $transform_funct * Prepares the displayable content of a data cell in Browse mode, * taking into account foreign key description field and transformations * - * @param string $class - * @param string $condition_field - * @param string $analyzed_sql - * @param object $meta the meta-information about this field - * @param string $map - * @param string $data - * @param string $transform_function - * @param string $default_function - * @param string $nowrap - * @param string $where_comparison - * @param bool $is_field_truncated + * @param string $class + * @param string $condition_field + * @param string $analyzed_sql + * @param object $meta the meta-information about this field + * @param string $map + * @param string $data + * @param string $transform_function + * @param string $default_function + * @param string $nowrap + * @param string $where_comparison + * @param bool $is_field_truncated * @return string formatted data */ function PMA_prepare_row_data($class, $condition_field, $analyzed_sql, $meta, $map, $data, $transform_function, $default_function, $nowrap, $where_comparison, $transform_options, $is_field_truncated ) { @@ -2681,13 +2681,13 @@ function PMA_prepare_row_data($class, $condition_field, $analyzed_sql, $meta, $m /** * Generates a checkbox for multi-row submits * - * @param string $del_url - * @param array $is_display - * @param string $row_no - * @param string $where_clause_html - * @param string $del_query - * @param string $id_suffix - * @param string $class + * @param string $del_url + * @param array $is_display + * @param string $row_no + * @param string $where_clause_html + * @param string $del_query + * @param string $id_suffix + * @param string $class * @return string the generated HTML */ @@ -2710,11 +2710,11 @@ function PMA_generateCheckboxForMulti($del_url, $is_display, $row_no, $where_cla /** * Generates an Edit link * - * @param string $edit_url - * @param string $class - * @param string $edit_str - * @param string $where_clause - * @param string $where_clause_html + * @param string $edit_url + * @param string $class + * @param string $edit_str + * @param string $where_clause + * @param string $where_clause_html * @return string the generated HTML */ function PMA_generateEditLink($edit_url, $class, $edit_str, $where_clause, $where_clause_html) { @@ -2737,10 +2737,10 @@ function PMA_generateEditLink($edit_url, $class, $edit_str, $where_clause, $wher /** * Generates an Copy link * - * @param string $copy_url - * @param string $copy_str - * @param string $where_clause - * @param string $where_clause_html + * @param string $copy_url + * @param string $copy_str + * @param string $where_clause + * @param string $where_clause_html * @return string the generated HTML */ function PMA_generateCopyLink($copy_url, $copy_str, $where_clause, $where_clause_html, $class) { @@ -2767,10 +2767,10 @@ function PMA_generateCopyLink($copy_url, $copy_str, $where_clause, $where_clause /** * Generates a Delete link * - * @param string $del_url - * @param string $del_str - * @param string $js_conf - * @param string $class + * @param string $del_url + * @param string $del_str + * @param string $js_conf + * @param string $class * @return string the generated HTML */ function PMA_generateDeleteLink($del_url, $del_str, $js_conf, $class) { @@ -2791,20 +2791,20 @@ function PMA_generateDeleteLink($del_url, $del_str, $js_conf, $class) { * Generates checkbox and links at some position (left or right) * (only called for horizontal mode) * - * @param string $position - * @param string $del_url - * @param array $is_display - * @param string $row_no - * @param string $where_clause - * @param string $where_clause_html - * @param string $del_query - * @param string $id_suffix - * @param string $edit_url - * @param string $copy_url - * @param string $class - * @param string $edit_str - * @param string $del_str - * @param string $js_conf + * @param string $position + * @param string $del_url + * @param array $is_display + * @param string $row_no + * @param string $where_clause + * @param string $where_clause_html + * @param string $del_query + * @param string $id_suffix + * @param string $edit_url + * @param string $copy_url + * @param string $class + * @param string $edit_str + * @param string $del_str + * @param string $js_conf * @return string the generated HTML */ function PMA_generateCheckboxAndLinks($position, $del_url, $is_display, $row_no, $where_clause, $where_clause_html, $del_query, $id_suffix, $edit_url, $copy_url, $class, $edit_str, $copy_str, $del_str, $js_conf) { diff --git a/libraries/export/codegen.php b/libraries/export/codegen.php index 35fe21d..357eac0 100644 --- a/libraries/export/codegen.php +++ b/libraries/export/codegen.php @@ -73,7 +73,7 @@ function PMA_exportHeader() /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -86,7 +86,7 @@ function PMA_exportDBHeader($db) /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -99,7 +99,7 @@ function PMA_exportDBFooter($db) /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -112,11 +112,11 @@ function PMA_exportDBCreate($db) /** * Outputs the content of a table in NHibernate format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/csv.php b/libraries/export/csv.php index 0240e9b..19ca573 100644 --- a/libraries/export/csv.php +++ b/libraries/export/csv.php @@ -96,7 +96,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -108,7 +108,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -120,7 +120,7 @@ function PMA_exportDBFooter($db) { /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -132,11 +132,11 @@ function PMA_exportDBCreate($db) { /** * Outputs the content of a table in CSV format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php index 049cdc6..6604ac6 100644 --- a/libraries/export/htmlword.php +++ b/libraries/export/htmlword.php @@ -69,7 +69,7 @@ xmlns="http://www.w3.org/TR/REC-html40"> /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -81,7 +81,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -93,7 +93,7 @@ function PMA_exportDBFooter($db) { /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -105,11 +105,11 @@ function PMA_exportDBCreate($db) { /** * Outputs the content of a table in HTML (Microsoft Word) format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public @@ -170,20 +170,20 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) /** * Outputs table's structure * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param bool $do_relation whether to include relation comments - * @param bool $do_comments whether to include the pmadb-style column comments + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param bool $do_relation whether to include relation comments + * @param bool $do_comments whether to include the pmadb-style column comments * as comments in the structure; this is deprecated * but the parameter is left here because export.php * calls PMA_exportStructure() also for other export * types which use this parameter - * @param bool $do_mime whether to include mime comments - * @param bool $dates whether to include creation/update/check dates - * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' - * @param string $export_type 'server', 'database', 'table' + * @param bool $do_mime whether to include mime comments + * @param bool $dates whether to include creation/update/check dates + * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' + * @param string $export_type 'server', 'database', 'table' * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/json.php b/libraries/export/json.php index 989ef88..e008f0c 100644 --- a/libraries/export/json.php +++ b/libraries/export/json.php @@ -67,7 +67,7 @@ function PMA_exportHeader() /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -81,7 +81,7 @@ function PMA_exportDBHeader($db) /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -94,7 +94,7 @@ function PMA_exportDBFooter($db) /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -107,11 +107,11 @@ function PMA_exportDBCreate($db) /** * Outputs the content of a table in JSON format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/latex.php b/libraries/export/latex.php index 0742109..080d0ac 100644 --- a/libraries/export/latex.php +++ b/libraries/export/latex.php @@ -85,7 +85,7 @@ if (isset($plugin_list)) { /** * Escapes some special characters for use in TeX/LaTeX * - * @param string the string to convert + * @param string the string to convert * * @return string the converted string with escape codes * @@ -140,7 +140,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -156,7 +156,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -168,7 +168,7 @@ function PMA_exportDBFooter($db) { /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -180,11 +180,11 @@ function PMA_exportDBCreate($db) { /** * Outputs the content of a table in LaTeX table/sideways table environment * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public @@ -277,20 +277,20 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { /** * Outputs table's structure * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param bool $do_relation whether to include relation comments - * @param bool $do_comments whether to include the pmadb-style column comments + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param bool $do_relation whether to include relation comments + * @param bool $do_comments whether to include the pmadb-style column comments * as comments in the structure; this is deprecated * but the parameter is left here because export.php * calls PMA_exportStructure() also for other export * types which use this parameter - * @param bool $do_mime whether to include mime comments - * @param bool $dates whether to include creation/update/check dates - * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' - * @param string $export_type 'server', 'database', 'table' + * @param bool $do_mime whether to include mime comments + * @param bool $dates whether to include creation/update/check dates + * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' + * @param string $export_type 'server', 'database', 'table' * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/mediawiki.php b/libraries/export/mediawiki.php index 7599df9..8ec3749 100644 --- a/libraries/export/mediawiki.php +++ b/libraries/export/mediawiki.php @@ -49,7 +49,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -61,7 +61,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -73,7 +73,7 @@ function PMA_exportDBFooter($db) { /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -85,11 +85,11 @@ function PMA_exportDBCreate($db) { /** * Outputs the content of a table in MediaWiki format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/ods.php b/libraries/export/ods.php index 9d9ff13..fa62a96 100644 --- a/libraries/export/ods.php +++ b/libraries/export/ods.php @@ -102,7 +102,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -114,7 +114,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -126,7 +126,7 @@ function PMA_exportDBFooter($db) { /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -138,11 +138,11 @@ function PMA_exportDBCreate($db) { /** * Outputs the content of a table in ODS format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/odt.php b/libraries/export/odt.php index f2b13a0..dba6e1c 100644 --- a/libraries/export/odt.php +++ b/libraries/export/odt.php @@ -100,7 +100,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -113,7 +113,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -125,7 +125,7 @@ function PMA_exportDBFooter($db) { /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -137,11 +137,11 @@ function PMA_exportDBCreate($db) { /** * Outputs the content of a table in ODT format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public @@ -209,20 +209,20 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { /** * Outputs table's structure * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param bool $do_relation whether to include relation comments - * @param bool $do_comments whether to include the pmadb-style column comments + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param bool $do_relation whether to include relation comments + * @param bool $do_comments whether to include the pmadb-style column comments * as comments in the structure; this is deprecated * but the parameter is left here because export.php * calls PMA_exportStructure() also for other export * types which use this parameter - * @param bool $do_mime whether to include mime comments - * @param bool $dates whether to include creation/update/check dates - * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' - * @param string $export_type 'server', 'database', 'table' + * @param bool $do_mime whether to include mime comments + * @param bool $dates whether to include creation/update/check dates + * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' + * @param string $export_type 'server', 'database', 'table' * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php index e135bc8..01ffc88 100644 --- a/libraries/export/pdf.php +++ b/libraries/export/pdf.php @@ -408,7 +408,7 @@ function PMA_exportHeader() /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -421,7 +421,7 @@ function PMA_exportDBHeader($db) /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -434,7 +434,7 @@ function PMA_exportDBFooter($db) /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -447,11 +447,11 @@ function PMA_exportDBCreate($db) /** * Outputs the content of a table in PDF format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/php_array.php b/libraries/export/php_array.php index 1996e6f..783afe0 100644 --- a/libraries/export/php_array.php +++ b/libraries/export/php_array.php @@ -68,7 +68,7 @@ function PMA_exportHeader() /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -82,7 +82,7 @@ function PMA_exportDBHeader($db) /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -95,7 +95,7 @@ function PMA_exportDBFooter($db) /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -108,11 +108,11 @@ function PMA_exportDBCreate($db) /** * Outputs the content of a table as a fragment of PHP code * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/sql.php b/libraries/export/sql.php index 81058a8..0781db4 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -304,7 +304,7 @@ if (! isset($sql_backquotes)) { /** * Exports routines (procedures and functions) * - * @param string $db + * @param string $db * @return bool Whether it suceeded * * @access public @@ -371,7 +371,7 @@ function PMA_exportRoutines($db) { /** * Possibly outputs comment * - * @param string $text Text of comment + * @param string $text Text of comment * @return string The formatted comment * * @access private @@ -536,7 +536,7 @@ function PMA_exportHeader() /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -572,7 +572,7 @@ function PMA_exportDBCreate($db) /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -588,7 +588,7 @@ function PMA_exportDBHeader($db) /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -642,9 +642,9 @@ function PMA_exportDBFooter($db) /** * Returns a stand-in CREATE definition to resolve view dependencies * - * @param string $db the database name - * @param string $view the view name - * @param string $crlf the end of line sequence + * @param string $db the database name + * @param string $view the view name + * @param string $crlf the end of line sequence * @return string resulting definition * * @access public @@ -673,13 +673,13 @@ function PMA_getTableDefStandIn($db, $view, $crlf) { /** * Returns $table's CREATE definition * - * @param string $db the database name - * @param string $table the table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param bool $show_dates whether to include creation/update/check dates - * @param bool $add_semicolon whether to add semicolon and end-of-line at the end - * @param bool $view whether we're handling a view + * @param string $db the database name + * @param string $table the table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param bool $show_dates whether to include creation/update/check dates + * @param bool $add_semicolon whether to add semicolon and end-of-line at the end + * @param bool $view whether we're handling a view * @return string resulting schema * * @access public @@ -878,11 +878,11 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false, $a /** * Returns $table's comments, relations etc. * - * @param string $db database name - * @param string $table table name - * @param string $crlf end of line sequence - * @param bool $do_relation whether to include relation comments - * @param bool $do_mime whether to include mime comments + * @param string $db database name + * @param string $table table name + * @param string $crlf end of line sequence + * @param bool $do_relation whether to include relation comments + * @param bool $do_mime whether to include mime comments * @return string resulting comments * * @access private @@ -947,20 +947,20 @@ function PMA_getTableComments($db, $table, $crlf, $do_relation = false, $do_mime /** * Outputs table's structure * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param bool $relation whether to include relation comments - * @param bool $comments whether to include the pmadb-style column comments + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param bool $relation whether to include relation comments + * @param bool $comments whether to include the pmadb-style column comments * as comments in the structure; this is deprecated * but the parameter is left here because export.php * calls PMA_exportStructure() also for other export * types which use this parameter - * @param bool $mime whether to include mime comments - * @param bool $dates whether to include creation/update/check dates - * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' - * @param string $export_type 'server', 'database', 'table' + * @param bool $mime whether to include mime comments + * @param bool $dates whether to include creation/update/check dates + * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' + * @param string $export_type 'server', 'database', 'table' * @return bool Whether it suceeded * * @access public @@ -1025,11 +1025,11 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $relation = false, /** * Outputs the content of a table in SQL format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/texytext.php b/libraries/export/texytext.php index 6294311..06de740 100644 --- a/libraries/export/texytext.php +++ b/libraries/export/texytext.php @@ -57,7 +57,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -69,7 +69,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -81,7 +81,7 @@ function PMA_exportDBFooter($db) { /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -93,11 +93,11 @@ function PMA_exportDBCreate($db) { /** * Outputs the content of a table in Texy format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public @@ -152,20 +152,20 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) /** * Outputs table's structure * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param bool $do_relation whether to include relation comments - * @param bool $do_comments whether to include the pmadb-style column comments + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param bool $do_relation whether to include relation comments + * @param bool $do_comments whether to include the pmadb-style column comments * as comments in the structure; this is deprecated * but the parameter is left here because export.php * calls PMA_exportStructure() also for other export * types which use this parameter - * @param bool $do_mime whether to include mime comments - * @param bool $dates whether to include creation/update/check dates - * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' - * @param string $export_type 'server', 'database', 'table' + * @param bool $do_mime whether to include mime comments + * @param bool $dates whether to include creation/update/check dates + * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' + * @param string $export_type 'server', 'database', 'table' * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/xls.php b/libraries/export/xls.php index 6116e2a..5747f08 100644 --- a/libraries/export/xls.php +++ b/libraries/export/xls.php @@ -91,7 +91,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -105,7 +105,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -117,7 +117,7 @@ function PMA_exportDBFooter($db) { /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -129,11 +129,11 @@ function PMA_exportDBCreate($db) { /** * Outputs the content of a table in XLS format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/xlsx.php b/libraries/export/xlsx.php index 758d98d..8f5cb19 100644 --- a/libraries/export/xlsx.php +++ b/libraries/export/xlsx.php @@ -90,7 +90,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -104,7 +104,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -116,7 +116,7 @@ function PMA_exportDBFooter($db) { /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -128,11 +128,11 @@ function PMA_exportDBCreate($db) { /** * Outputs the content of a table in XLSX format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/xml.php b/libraries/export/xml.php index 9247e22..26953af 100644 --- a/libraries/export/xml.php +++ b/libraries/export/xml.php @@ -233,7 +233,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -258,7 +258,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -278,7 +278,7 @@ function PMA_exportDBFooter($db) { /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -290,11 +290,11 @@ function PMA_exportDBCreate($db) { /** * Outputs the content of a table in XML format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/yaml.php b/libraries/export/yaml.php index 017cae6..26b19a9 100644 --- a/libraries/export/yaml.php +++ b/libraries/export/yaml.php @@ -64,7 +64,7 @@ function PMA_exportHeader() /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -77,7 +77,7 @@ function PMA_exportDBHeader($db) /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -90,7 +90,7 @@ function PMA_exportDBFooter($db) /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -103,11 +103,11 @@ function PMA_exportDBCreate($db) /** * Outputs the content of a table in YAML format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/file_listing.php b/libraries/file_listing.php index ff1cf9d..720ba82 100644 --- a/libraries/file_listing.php +++ b/libraries/file_listing.php @@ -10,8 +10,8 @@ /** * Returns array of filtered file names * - * @param string directory to list - * @param string regular expression to match files + * @param string directory to list + * @param string regular expression to match files * @returns array sorted file list on success, false on failure */ function PMA_getDirContent($dir, $expression = '') @@ -39,9 +39,9 @@ function PMA_getDirContent($dir, $expression = '') /** * Returns options of filtered file names * - * @param string directory to list - * @param string regullar expression to match files - * @param string currently active choice + * @param string directory to list + * @param string regullar expression to match files + * @param string currently active choice * @returns array sorted file list on success, false on failure */ function PMA_getFileSelectOptions($dir, $extensions = '', $active = '') diff --git a/libraries/grab_globals.lib.php b/libraries/grab_globals.lib.php index d198855..aafd169 100644 --- a/libraries/grab_globals.lib.php +++ b/libraries/grab_globals.lib.php @@ -15,9 +15,9 @@ if (! defined('PHPMYADMIN')) { /** * copy values from one array to another, usually from a superglobal into $GLOBALS * - * @param array $array values from - * @param array $target values to - * @param boolean $sanitize prevent importing key names in $_import_blacklist + * @param array $array values from + * @param array $target values to + * @param boolean $sanitize prevent importing key names in $_import_blacklist */ function PMA_recursive_extract($array, &$target, $sanitize = true) { diff --git a/libraries/iconv_wrapper.lib.php b/libraries/iconv_wrapper.lib.php index 1f00c13..61e6875 100644 --- a/libraries/iconv_wrapper.lib.php +++ b/libraries/iconv_wrapper.lib.php @@ -40,9 +40,9 @@ $gnu_iconv_to_aix_iconv_codepage_map = array ( * Wrapper around IBM AIX iconv(), whose character set naming differs * from the GNU version of iconv(). * - * @param string input character set - * @param string output character set - * @param string the string to convert + * @param string input character set + * @param string output character set + * @param string the string to convert * * @return mixed converted string or false on failure * diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 79b4ade..73f9008 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -44,7 +44,7 @@ function PMA_checkTimeout() /** * Detects what compression filse uses * - * @param string $filepath filename to check + * @param string $filepath filename to check * @return string MIME type of compression, none for none * @access public */ @@ -73,9 +73,9 @@ function PMA_detectCompression($filepath) * Runs query inside import buffer. This is needed to allow displaying * of last SELECT, SHOW or HANDLER results and similar nice stuff. * - * @param string $sql query to run - * @param string $full query to display, this might be commented - * @param bool $controluser whether to use control user for queries + * @param string $sql query to run + * @param string $full query to display, this might be commented + * @param bool $controluser whether to use control user for queries * @access public */ function PMA_importRunQuery($sql = '', $full = '', $controluser = false) @@ -207,9 +207,9 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false) /** * Looks for the presence of USE to possibly change current db * - * @param string $buffer buffer to examine - * @param string $db current db - * @param bool $reload reload + * @param string $buffer buffer to examine + * @param string $db current db + * @param bool $reload reload * @return array (current or new db, whether to reload) * @access public */ @@ -227,7 +227,7 @@ function PMA_lookForUse($buffer, $db, $reload) /** * Returns next part of imported file/buffer * - * @param int $size size of buffer to read (this is maximal size function will return) + * @param int $size size of buffer to read (this is maximal size function will return) * @return string part of file/buffer * @access public */ @@ -331,7 +331,7 @@ function PMA_importGetNextChunk($size = 32768) * * @access public * - * @param int $num + * @param int $num * @return string The column's "Excel" name */ function PMA_getColumnAlphaName($num) @@ -378,7 +378,7 @@ function PMA_getColumnAlphaName($num) * * @access public * - * @param string $name (i.e. "A", or "BC", etc.) + * @param string $name (i.e. "A", or "BC", etc.) * @return int The column number */ function PMA_getColumnNumberFromName($name) { @@ -437,7 +437,7 @@ define("SIZES", 1); * * @access public * - * @param string $last_cumulative_size + * @param string $last_cumulative_size * @return int Precision of the given decimal size notation */ function PMA_getM($last_cumulative_size) { @@ -449,7 +449,7 @@ function PMA_getM($last_cumulative_size) { * * @access public * - * @param string $last_cumulative_size + * @param string $last_cumulative_size * @return int Scale of the given decimal size notation */ function PMA_getD($last_cumulative_size) { @@ -461,7 +461,7 @@ function PMA_getD($last_cumulative_size) { * * @access public * - * @param string &$cell + * @param string &$cell * @return array Contains the precision, scale, and full size representation of the given decimal cell */ function PMA_getDecimalSize(&$cell) { @@ -482,10 +482,10 @@ function PMA_getDecimalSize(&$cell) { * * @access public * - * @param string $last_cumulative_size Last cumulative column size - * @param int $last_cumulative_type Last cumulative column type (NONE or VARCHAR or DECIMAL or INT or BIGINT) - * @param int $curr_type Type of the current cell (NONE or VARCHAR or DECIMAL or INT or BIGINT) - * @param string &$cell The current cell + * @param string $last_cumulative_size Last cumulative column size + * @param int $last_cumulative_type Last cumulative column type (NONE or VARCHAR or DECIMAL or INT or BIGINT) + * @param int $curr_type Type of the current cell (NONE or VARCHAR or DECIMAL or INT or BIGINT) + * @param string &$cell The current cell * @return string Size of the given cell in the type-appropriate format */ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type, &$cell) { @@ -693,8 +693,8 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type * * @access public * - * @param int $last_cumulative_type Last cumulative column type (VARCHAR or INT or BIGINT or DECIMAL or NONE) - * @param string &$cell String representation of the cell for which a best-fit type is to be determined + * @param int $last_cumulative_type Last cumulative column type (VARCHAR or INT or BIGINT or DECIMAL or NONE) + * @param string &$cell String representation of the cell for which a best-fit type is to be determined * @return int The MySQL type representation (VARCHAR or INT or BIGINT or DECIMAL or NONE) */ function PMA_detectType($last_cumulative_type, &$cell) { @@ -733,7 +733,7 @@ function PMA_detectType($last_cumulative_type, &$cell) { * * @access public * - * @param &$table array(string $table_name, array $col_names, array $rows) + * @param &$table array(string $table_name, array $col_names, array $rows) * @return array array(array $types, array $sizes) */ function PMA_analyzeTable(&$table) { @@ -826,11 +826,11 @@ $import_notice = null; * * @access public * - * @param string $db_name Name of the database - * @param array &$tables Array of tables for the specified database - * @param array &$analyses Analyses of the tables - * @param array &$additional_sql Additional SQL statements to be executed - * @param array $options Associative array of options + * @param string $db_name Name of the database + * @param array &$tables Array of tables for the specified database + * @param array &$analyses Analyses of the tables + * @param array &$additional_sql Additional SQL statements to be executed + * @param array $options Associative array of options * @return void */ function PMA_buildSQL($db_name, &$tables, &$analyses = null, &$additional_sql = null, $options = null) { diff --git a/libraries/ip_allow_deny.lib.php b/libraries/ip_allow_deny.lib.php index 1537b43..c8481ba 100644 --- a/libraries/ip_allow_deny.lib.php +++ b/libraries/ip_allow_deny.lib.php @@ -56,8 +56,8 @@ function PMA_getIp() * Does not match: * xxx.xxx.xxx.xx[yyy-zzz] (range, partial octets not supported) * - * @param string string of IP range to match - * @param string string of IP to test against range + * @param string string of IP range to match + * @param string string of IP to test against range * * @return boolean always true * @@ -112,7 +112,7 @@ function PMA_ipMaskTest($testRange, $ipToTest) /** * Runs through IP Allow/Deny rules the use of it below for more information * - * @param string 'allow' | 'deny' type of rule to match + * @param string 'allow' | 'deny' type of rule to match * * @return bool Matched a rule ? * diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php index f7e8fb3..53e5052 100644 --- a/libraries/js_escape.lib.php +++ b/libraries/js_escape.lib.php @@ -13,8 +13,8 @@ * This function is used to displays a javascript confirmation box for * "DROP/DELETE/ALTER" queries. * - * @param string $a_string the string to format - * @param boolean $add_backquotes whether to add backquotes to the string or not + * @param string $a_string the string to format + * @param boolean $add_backquotes whether to add backquotes to the string or not * * @return string the formatted string * @@ -42,7 +42,7 @@ function PMA_jsFormat($a_string = '', $add_backquotes = true) * We also remove NUL byte as some browsers (namely MSIE) ignore it and * inserting it anywhere inside </script would allow to bypass this check. * - * @param string $string the string to be escaped + * @param string $string the string to be escaped * @return string the escaped string */ function PMA_escapeJsString($string) diff --git a/libraries/kanji-encoding.lib.php b/libraries/kanji-encoding.lib.php index 552bd13..59891f5 100644 --- a/libraries/kanji-encoding.lib.php +++ b/libraries/kanji-encoding.lib.php @@ -65,9 +65,9 @@ function PMA_change_enc_order() { * Kanji string encoding convert * 2002/1/4 by Y.Kawada * - * @param string the string to convert - * @param string the destination encoding code - * @param string set 'kana' convert to JIS-X208-kana + * @param string the string to convert + * @param string the destination encoding code + * @param string set 'kana' convert to JIS-X208-kana * * @global string the available encoding codes list * @@ -98,9 +98,9 @@ function PMA_kanji_str_conv($str, $enc, $kana) { * Kanji file encoding convert * 2002/1/4 by Y.Kawada * - * @param string the name of the file to convert - * @param string the destination encoding code - * @param string set 'kana' convert to JIS-X208-kana + * @param string the name of the file to convert + * @param string the destination encoding code + * @param string set 'kana' convert to JIS-X208-kana * * @return string the name of the converted file */ @@ -131,7 +131,7 @@ function PMA_kanji_file_conv($file, $enc, $kana) { * Defines radio form fields to switch between encoding modes * 2002/1/4 by Y.Kawada * - * @param string spaces character to prepend the output with + * @param string spaces character to prepend the output with * * @return string xhtml code for the radio controls */ diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php index 53c309a..fc6b18f 100644 --- a/libraries/mysql_charsets.lib.php +++ b/libraries/mysql_charsets.lib.php @@ -153,7 +153,7 @@ function PMA_generateCharsetQueryPart($collation) { /** * returns collation of given db * - * @param string $db name of db + * @param string $db name of db * @return string collation of $db */ function PMA_getDbCollation($db) { @@ -190,7 +190,7 @@ function PMA_getServerCollation() { * returns description for given collation * * - * @param string $collation MySQL collation string + * @param string $collation MySQL collation string * @return string collation description */ function PMA_getCollationDescr($collation) { diff --git a/libraries/opendocument.lib.php b/libraries/opendocument.lib.php index 810d97f..4af590a 100644 --- a/libraries/opendocument.lib.php +++ b/libraries/opendocument.lib.php @@ -23,8 +23,8 @@ $GLOBALS['OpenDocumentNS'] = 'xmlns:office="urn:oasis:names:tc:opendocument:xmln /** * Minimalistic creator of OASIS OpenDocument * - * @param string desired MIME type - * @param string document content + * @param string desired MIME type + * @param string document content * * @return string OASIS OpenDocument data * diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php index 703215f..b0b82f0 100644 --- a/libraries/plugin_interface.lib.php +++ b/libraries/plugin_interface.lib.php @@ -11,8 +11,8 @@ * * Reads all plugin information from directory $plugins_dir. * - * @param string $plugins_dir directrory with plugins - * @param mixed $plugin_param parameter to plugin by which they can decide whether they can work + * @param string $plugins_dir directrory with plugins + * @param mixed $plugin_param parameter to plugin by which they can decide whether they can work * @return array list of plugins */ function PMA_getPlugins($plugins_dir, $plugin_param) @@ -40,7 +40,7 @@ function PMA_getPlugins($plugins_dir, $plugin_param) * * returns locale string for $name or $name if no locale is found * - * @param string $name for local string + * @param string $name for local string * @return string locale string for $name */ function PMA_getString($name) @@ -53,9 +53,9 @@ function PMA_getString($name) * * returns html input tag option 'checked' if plugin $opt should be set by config or request * - * @param string $section name of config section in + * @param string $section name of config section in * $GLOBALS['cfg'][$section] for plugin - * @param string $opt name of option + * @param string $opt name of option * @return string hmtl input tag option 'checked' */ function PMA_pluginCheckboxCheck($section, $opt) @@ -73,9 +73,9 @@ function PMA_pluginCheckboxCheck($section, $opt) * * returns default value for option $opt * - * @param string $section name of config section in + * @param string $section name of config section in * $GLOBALS['cfg'][$section] for plugin - * @param string $opt name of option + * @param string $opt name of option * @return string default value for option $opt */ function PMA_pluginGetDefault($section, $opt) @@ -107,10 +107,10 @@ function PMA_pluginGetDefault($section, $opt) * * returns html input tag option 'checked' if option $opt should be set by config or request * - * @param string $section name of config section in + * @param string $section name of config section in * $GLOBALS['cfg'][$section] for plugin - * @param string $opt name of option - * @param string $val value of option to check against + * @param string $opt name of option + * @param string $val value of option to check against * @return string html input tag option 'checked' */ function PMA_pluginIsActive($section, $opt, $val) @@ -131,11 +131,11 @@ function PMA_pluginIsActive($section, $opt, $val) * returns html select form element for plugin choice * and hidden fields denoting whether each plugin must be exported as a file * - * @param string $section name of config section in + * @param string $section name of config section in * $GLOBALS['cfg'][$section] for plugin - * @param string $name name of select element - * @param array &$list array with plugin configuration defined in plugin file - * @param string $cfgname name of config value, if none same as $name + * @param string $name name of select element + * @param array &$list array with plugin configuration defined in plugin file + * @param string $cfgname name of config value, if none same as $name * @return string html select tag */ function PMA_pluginGetChoice($section, $name, &$list, $cfgname = null) @@ -173,11 +173,11 @@ function PMA_pluginGetChoice($section, $name, &$list, $cfgname = null) * * returns single option in a list element * - * @param string $section name of config section in + * @param string $section name of config section in * $GLOBALS['cfg'][$section] for plugin - * @param string $plugin_name unique plugin name - * @param string $id option id - * @param array &$opt plugin option details + * @param string $plugin_name unique plugin name + * @param string $id option id + * @param array &$opt plugin option details * @return string table row with option */ function PMA_pluginGetOneOption($section, $plugin_name, $id, &$opt) @@ -285,8 +285,8 @@ function PMA_pluginGetOneOption($section, $plugin_name, $id, &$opt) * * return html div with editable options for plugin * - * @param string $section name of config section in $GLOBALS['cfg'][$section] - * @param array &$list array with plugin configuration defined in plugin file + * @param string $section name of config section in $GLOBALS['cfg'][$section] + * @param array &$list array with plugin configuration defined in plugin file * @return string html fieldset with plugin options */ function PMA_pluginGetOptions($section, &$list) diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 0b74c70..86d4ab1 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -12,8 +12,8 @@ if (! defined('PHPMYADMIN')) { /** * Executes a query as controluser if possible, otherwise as normal user * - * @param string the query to execute - * @param boolean whether to display SQL error messages or not + * @param string the query to execute + * @param boolean whether to display SQL error messages or not * * @return integer the result set, or false if no result set * @@ -42,7 +42,7 @@ function PMA_query_as_controluser($sql, $show_error = true, $options = 0) } // end of the "PMA_query_as_controluser()" function /** - * @param bool $verbose whether to print diagnostic info + * @param bool $verbose whether to print diagnostic info * @return array $cfgRelation */ function PMA_getRelationsParam($verbose = false) @@ -65,7 +65,7 @@ function PMA_getRelationsParam($verbose = false) /** * prints out diagnostic info for pma relation feature * - * @param array $cfgRelation + * @param array $cfgRelation */ function PMA_printRelationsParamDiagnostic($cfgRelation) { @@ -157,10 +157,10 @@ function PMA_printRelationsParamDiagnostic($cfgRelation) /** * prints out one diagnostic message for a feature * - * @param string feature name in a message string - * @param string the $GLOBALS['cfgRelation'] parameter to check - * @param array utility messages - * @param boolean whether to skip a line after the message + * @param string feature name in a message string + * @param string the $GLOBALS['cfgRelation'] parameter to check + * @param array utility messages + * @param boolean whether to skip a line after the message */ function PMA_printDiagMessageForFeature($feature_name, $relation_parameter, $messages, $skip_line=true) { @@ -175,10 +175,10 @@ function PMA_printDiagMessageForFeature($feature_name, $relation_parameter, $mes /** * prints out one diagnostic message for a configuration parameter * - * @param string config parameter name to display - * @param boolean whether this parameter is set - * @param array utility messages - * @param string anchor in Documentation.html + * @param string config parameter name to display + * @param boolean whether this parameter is set + * @param array utility messages + * @param string anchor in Documentation.html */ function PMA_printDiagMessageForParameter($parameter, $relation_parameter_set, $messages, $doc_anchor) { @@ -362,10 +362,10 @@ function PMA__getRelationsParam() * optionally a given column in a table * * @access public - * @param string $db the name of the db to check for - * @param string $table the name of the table to check for - * @param string $column the name of the column to check for - * @param string $source the source for foreign key information + * @param string $db the name of the db to check for + * @param string $table the name of the table to check for + * @param string $column the name of the column to check for + * @param string $source the source for foreign key information * @return array db,table,column */ function PMA_getForeigners($db, $table, $column = '', $source = 'both') @@ -458,8 +458,8 @@ function PMA_getForeigners($db, $table, $column = '', $source = 'both') * Gets the display field of a table * * @access public - * @param string $db the name of the db to check for - * @param string $table the name of the table to check for + * @param string $db the name of the db to check for + * @param string $table the name of the table to check for * @return string field name */ function PMA_getDisplayField($db, $table) @@ -503,8 +503,8 @@ function PMA_getDisplayField($db, $table) * Gets the comments for all rows of a table or the db itself * * @access public - * @param string the name of the db to check for - * @param string the name of the table to check for + * @param string the name of the db to check for + * @param string the name of the table to check for * @return array [field_name] = comment */ function PMA_getComments($db, $table = '') @@ -532,7 +532,7 @@ function PMA_getComments($db, $table = '') * Gets the comment for a db * * @access public - * @param string the name of the db to check for + * @param string the name of the db to check for * @return string comment */ function PMA_getDbComment($db) @@ -564,7 +564,7 @@ function PMA_getDbComment($db) * Gets the comment for a db * * @access public - * @param string the name of the db to check for + * @param string the name of the db to check for * @return string comment */ function PMA_getDbComments() @@ -595,8 +595,8 @@ function PMA_getDbComments() * Set a database comment to a certain value. * * @access public - * @param string $db the name of the db - * @param string $comment the value of the column + * @param string $db the name of the db + * @param string $comment the value of the column * @return boolean true, if comment-query was made. */ function PMA_setDbComment($db, $comment = '') @@ -638,10 +638,10 @@ function PMA_setDbComment($db, $comment = '') /** * Set a SQL history entry * - * @param string $db the name of the db - * @param string $table the name of the table - * @param string $username the username - * @param string $sqlquery the sql query + * @param string $db the name of the db + * @param string $table the name of the table + * @param string $username the username + * @param string $sqlquery the sql query * @access public */ function PMA_setHistory($db, $table, $username, $sqlquery) @@ -696,7 +696,7 @@ function PMA_setHistory($db, $table, $username, $sqlquery) /** * Gets a SQL history entry * - * @param string $username the username + * @param string $username the username * @return array list of history items * @access public */ @@ -725,7 +725,7 @@ function PMA_getHistory($username) * deletes entries that exceeds $cfg['QueryHistoryMax'], oldest first, for the * given user * - * @param string $username the username + * @param string $username the username * @access public */ function PMA_purgeHistory($username) @@ -758,9 +758,9 @@ function PMA_purgeHistory($username) /** * Prepares the dropdown for one mode * - * @param array $foreign the keys and values for foreigns - * @param string $data the current data of the dropdown - * @param string $mode the needed mode + * @param array $foreign the keys and values for foreigns + * @param string $data the current data of the dropdown + * @param string $mode the needed mode * * @return array the <option value=""><option>s * @@ -821,10 +821,10 @@ function PMA__foreignDropdownBuild($foreign, $data, $mode) /** * Outputs dropdown with values of foreign fields * - * @param array array of the displayed row - * @param string the foreign field - * @param string the foreign field to display - * @param string the current data of the dropdown (field in row) + * @param array array of the displayed row + * @param string the foreign field + * @param string the foreign field to display + * @param string the current data of the dropdown (field in row) * @return string the <option value=""><option>s * @access public */ @@ -893,11 +893,11 @@ function PMA_foreignDropdown($disp_row, $foreign_field, $foreign_display, $data, /** * Gets foreign keys in preparation for a drop-down selector * - * @param array array of the foreign keys - * @param string the foreign field name - * @param bool whether to override the total - * @param string a possible filter - * @param string a possible LIMIT clause + * @param array array of the foreign keys + * @param string the foreign field name + * @param bool whether to override the total + * @param string a possible filter + * @param string a possible LIMIT clause * @return array data about the foreign keys * @access public */ @@ -976,7 +976,7 @@ function PMA_getForeignData($foreigners, $field, $override_total, $foreign_filte /** * Finds all related tables * - * @param string whether to go from master to foreign or vice versa + * @param string whether to go from master to foreign or vice versa * @return boolean always true * @global array $tab_left the list of tables that we still couldn't connect * @global array $tab_know the list of allready connected tables diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php index 95a6ec0..b308f1c 100644 --- a/libraries/sanitizing.lib.php +++ b/libraries/sanitizing.lib.php @@ -18,8 +18,8 @@ * * <a title="<?php echo PMA_sanitize($foo, true); ?>">bar</a> * - * @param string the message - * @param boolean whether to escape html in result + * @param string the message + * @param boolean whether to escape html in result * * @return string the sanitized message * diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index 7d1de46..284fdbe 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -102,7 +102,7 @@ function PMA_langCheck() * checks given lang and sets it if valid * returns true on success, otherwise flase * - * @param string $lang language to set + * @param string $lang language to set * @return bool success */ function PMA_langSet(&$lang) @@ -121,8 +121,8 @@ function PMA_langSet(&$lang) * Analyzes some PHP environment variables to find the most probable language * that should be used * - * @param string string to analyze - * @param integer type of the PHP environment variable which value is $str + * @param string string to analyze + * @param integer type of the PHP environment variable which value is $str * * @return bool true on success, otherwise false * diff --git a/libraries/select_server.lib.php b/libraries/select_server.lib.php index 68541d8..6d230ea 100644 --- a/libraries/select_server.lib.php +++ b/libraries/select_server.lib.php @@ -9,8 +9,8 @@ /** * display server selection in list or selectbox form, or option tags only * - * @param boolean $not_only_options whether to include form tags or not - * @param boolean $ommit_fieldset whether to ommit fieldset tag or not + * @param boolean $not_only_options whether to include form tags or not + * @param boolean $ommit_fieldset whether to ommit fieldset tag or not */ function PMA_select_server($not_only_options, $ommit_fieldset) { diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index 2c7e69c..12cea2a 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -372,11 +372,11 @@ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $ma /** * PMA_dataDiffInUncommonTables() finds the data difference in $source_tables_uncommon * - * @param $source_tables_uncommon array of table names; containing table names that are in source db and not in target db - * @param $src_db name of source database - * @param $src_link connection established with source server - * @param $index index of a table from $matching_table array - * @param $row_count number of rows + * @param $source_tables_uncommon array of table names; containing table names that are in source db and not in target db + * @param $src_db name of source database + * @param $src_link connection established with source server + * @param $index index of a table from $matching_table array + * @param $row_count number of rows * @return nothing */ function PMA_dataDiffInUncommonTables($source_tables_uncommon, $src_db, $src_link, $index, &$row_count) @@ -390,15 +390,15 @@ function PMA_dataDiffInUncommonTables($source_tables_uncommon, $src_db, $src_lin * PMA_updateTargetTables() sets the updated field values to target table rows using $update_array[$matching_table_index] * * - * @param $table Array containing matching tables' names - * @param $update_array A three dimensional array containing field + * @param $table Array containing matching tables' names + * @param $update_array A three dimensional array containing field * value updates required for each matching table - * @param $src_db Name of source database - * @param $trg_db Name of target database - * @param $trg_link Connection established with target server - * @param $matching_table_index index of matching table in matching_table_array - * @param $matching_table_keys - * @param $display true/false value + * @param $src_db Name of source database + * @param $trg_db Name of target database + * @param $trg_link Connection established with target server + * @param $matching_table_index index of matching table in matching_table_array + * @param $matching_table_keys + * @param $display true/false value * @return nothing */ function PMA_updateTargetTables($table, $update_array, $src_db, $trg_db, $trg_link, $matching_table_index, $matching_table_keys, $display) @@ -447,30 +447,30 @@ function PMA_updateTargetTables($table, $update_array, $src_db, $trg_db, $trg_li /** * PMA_insertIntoTargetTable() inserts missing rows in the target table using $array_insert[$matching_table_index] * - * @param $matching_table array containing matching table names - * @param $src_db name of source database - * @param $trg_db name of target database - * @param $src_link connection established with source server - * @param $trg_link connection established with target server - * @param $table_fields array containing field names of a table - * @param $array_insert - * @param $matching_table_index index of matching table in matching_table_array - * @param $matching_tables_keys array containing field names that are keys in the matching table - * @param $source_columns array containing source column information - * @param $add_column_array array containing column names that are to be added in target table - * @param $criteria array containing criterias like type, null, collation, default etc - * @param $target_tables_keys array containing field names that are keys in the target table - * @param $uncommon_tables array containing table names that are present in source db but not in targt db - * @param $uncommon_tables_fields array containing field names of the uncommon tables - * @param $uncommon_cols column names that are present in target table and not in source table - * @param $alter_str_array array containing column names that are to be altered - * @param $source_indexes column names on which indexes are made in source table - * @param $target_indexes column names on which indexes are made in target table - * @param $add_indexes_array array containing column names on which index is to be added in target table - * @param $alter_indexes_array array containing column names whose indexes are to be altered. Only index name and uniqueness of an index can be changed - * @param $delete_array array containing rows that are to be deleted - * @param $update_array array containing rows that are to be updated in target - * @param $display true/false value + * @param $matching_table array containing matching table names + * @param $src_db name of source database + * @param $trg_db name of target database + * @param $src_link connection established with source server + * @param $trg_link connection established with target server + * @param $table_fields array containing field names of a table + * @param $array_insert + * @param $matching_table_index index of matching table in matching_table_array + * @param $matching_tables_keys array containing field names that are keys in the matching table + * @param $source_columns array containing source column information + * @param $add_column_array array containing column names that are to be added in target table + * @param $criteria array containing criterias like type, null, collation, default etc + * @param $target_tables_keys array containing field names that are keys in the target table + * @param $uncommon_tables array containing table names that are present in source db but not in targt db + * @param $uncommon_tables_fields array containing field names of the uncommon tables + * @param $uncommon_cols column names that are present in target table and not in source table + * @param $alter_str_array array containing column names that are to be altered + * @param $source_indexes column names on which indexes are made in source table + * @param $target_indexes column names on which indexes are made in target table + * @param $add_indexes_array array containing column names on which index is to be added in target table + * @param $alter_indexes_array array containing column names whose indexes are to be altered. Only index name and uniqueness of an index can be changed + * @param $delete_array array containing rows that are to be deleted + * @param $update_array array containing rows that are to be updated in target + * @param $display true/false value * @return nothing */ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link, $trg_link, $table_fields, &$array_insert, $matching_table_index, @@ -587,14 +587,14 @@ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link, /** * PMA_createTargetTables() Create the missing table $uncommon_table in target database * - * @param $src_db name of source database - * @param $trg_db name of target database - * @param $src_link connection established with source server - * @param $trg_link connection established with target server - * @param $uncommon_tables names of tables present in source but not in target - * @param $table_index index of table in $uncommon_tables array - * @param $uncommon_tables_fields field names of the uncommon table - * @param $display true/false value + * @param $src_db name of source database + * @param $trg_db name of target database + * @param $src_link connection established with source server + * @param $trg_link connection established with target server + * @param $uncommon_tables names of tables present in source but not in target + * @param $table_index index of table in $uncommon_tables array + * @param $uncommon_tables_fields field names of the uncommon table + * @param $display true/false value * @return nothing */ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncommon_tables, $table_index, &$uncommon_tables_fields, $display) @@ -640,14 +640,14 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncomm /** * PMA_populateTargetTables() inserts data into uncommon tables after they have been created * - * @param $src_db name of source database - * @param $trg_db name of target database - * @param $src_link connection established with source server - * @param $trg_link connection established with target server - * @param $uncommon_tables array containing uncommon table names (table names that are present in source but not in target db) - * @param $table_index index of table in matching_table_array - * @param $uncommon_tables_fields field names of the uncommon table - * @param $display true/false value + * @param $src_db name of source database + * @param $trg_db name of target database + * @param $src_link connection established with source server + * @param $trg_link connection established with target server + * @param $uncommon_tables array containing uncommon table names (table names that are present in source but not in target db) + * @param $table_index index of table in matching_table_array + * @param $uncommon_tables_fields field names of the uncommon table + * @param $display true/false value * * @return nothing * @@ -682,13 +682,13 @@ function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncom /** * PMA_deleteFromTargetTable() delete rows from target table * - * @param $trg_db name of target database - * @param $trg_link connection established with target server - * @param $matching_tables array containing matching table names - * @param $table_index index of table in matching_table_array - * @param $target_tables_keys primary key names of the target tables - * @param $delete_array array containing the key values of rows that are to be deleted - * @param $display true/false value + * @param $trg_db name of target database + * @param $trg_link connection established with target server + * @param $matching_tables array containing matching table names + * @param $table_index index of table in matching_table_array + * @param $target_tables_keys primary key names of the target tables + * @param $delete_array array containing the key values of rows that are to be deleted + * @param $display true/false value * @return nothing */ function PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $table_index, $target_tables_keys, $delete_array, $display) @@ -739,21 +739,21 @@ function PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $table_ * Keys for all the source tables that have a corresponding target table are placed in $matching_tables_keys. * Keys for all the target tables that have a corresponding source table are placed in $target_tables_keys. * - * @param $src_db name of source database - * @param $trg_db name of target database - * @param $src_link connection established with source server - * @param $trg_link connection established with target server - * @param $matching_tables array containing names of matching tables - * @param $source_columns array containing columns information of the source tables - * @param $target_columns array containing columns information of the target tables - * @param $alter_str_array three dimensional associative array first index being the matching table index, second index being column name for which target + * @param $src_db name of source database + * @param $trg_db name of target database + * @param $src_link connection established with source server + * @param $trg_link connection established with target server + * @param $matching_tables array containing names of matching tables + * @param $source_columns array containing columns information of the source tables + * @param $target_columns array containing columns information of the target tables + * @param $alter_str_array three dimensional associative array first index being the matching table index, second index being column name for which target * column have some criteria different and third index containing the criteria which is different. - * @param $add_column_array two dimensional associative array, first index of the array contain the matching table number and second index contain the + * @param $add_column_array two dimensional associative array, first index of the array contain the matching table number and second index contain the * column name which is to be added in the target table - * @param $uncommon_columns array containing the columns that are present in the target table but not in the source table - * @param $criteria array containing the criterias which are to be checked for field that is present in source table and target table - * @param $target_tables_keys array containing the field names which is key in the target table - * @param $matching_table_index integer number of the matching table + * @param $uncommon_columns array containing the columns that are present in the target table but not in the source table + * @param $criteria array containing the criterias which are to be checked for field that is present in source table and target table + * @param $target_tables_keys array containing the field names which is key in the target table + * @param $matching_table_index integer number of the matching table * @return nothing */ function PMA_structureDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matching_tables, &$source_columns, &$target_columns, &$alter_str_array, @@ -802,22 +802,22 @@ function PMA_structureDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matc /** * PMA_addColumnsInTargetTable() adds column that are present in source table but not in target table * - * @param $src_db name of source database - * @param $trg_db name of target database - * @param $src_link connection established with source server - * @param $trg_link connection established with target server - * @param $matching_tables array containing names of matching tables - * @param $source_columns array containing columns information of the source tables - * @param $add_column_array array containing the names of the column(field) that are to be added in the target - * @param $matching_tables_fields - * @param $criteria array containing the criterias - * @param $matching_tables_keys array containing the field names which is key in the source table - * @param $target_tables_keys array containing the field names which is key in the target table - * @param $uncommon_tables array containing the table names that are present in source db and not in target db - * @param $uncommon_tables_fields array containing the names of the fields of the uncommon tables - * @param $table_counter integer number of the matching table - * @param $uncommon_cols - * @param $display true/false value + * @param $src_db name of source database + * @param $trg_db name of target database + * @param $src_link connection established with source server + * @param $trg_link connection established with target server + * @param $matching_tables array containing names of matching tables + * @param $source_columns array containing columns information of the source tables + * @param $add_column_array array containing the names of the column(field) that are to be added in the target + * @param $matching_tables_fields + * @param $criteria array containing the criterias + * @param $matching_tables_keys array containing the field names which is key in the source table + * @param $target_tables_keys array containing the field names which is key in the target table + * @param $uncommon_tables array containing the table names that are present in source db and not in target db + * @param $uncommon_tables_fields array containing the names of the fields of the uncommon tables + * @param $table_counter integer number of the matching table + * @param $uncommon_cols + * @param $display true/false value * @return nothing */ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $matching_tables, $source_columns, &$add_column_array, $matching_tables_fields, @@ -901,14 +901,14 @@ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $ma * PMA_checkForeignKeys() checks if the referenced table have foreign keys. * uses PMA_createTargetTables() * - * @param $src_db name of source database - * @param $src_link connection established with source server - * @param $trg_db name of target database - * @param $trg_link connection established with target server - * @param $referenced_table table whose column is a foreign key in another table - * @param $uncommon_tables array containing names that are uncommon - * @param $uncommon_tables_fields field names of the uncommon table - * @param $display true/false value + * @param $src_db name of source database + * @param $src_link connection established with source server + * @param $trg_db name of target database + * @param $trg_link connection established with target server + * @param $referenced_table table whose column is a foreign key in another table + * @param $uncommon_tables array containing names that are uncommon + * @param $uncommon_tables_fields field names of the uncommon table + * @param $display true/false value * @return nothing */ function PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link ,$referenced_table, &$uncommon_tables, &$uncommon_tables_fields, $display) @@ -932,17 +932,17 @@ function PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link ,$reference /** * PMA_alterTargetTableStructure() alters structure of the target table using $alter_str_array * - * @param $trg_db name of target database - * @param $trg_link connection established with target server - * @param $matching_tables array containing names of matching tables - * @param $source_columns array containing columns information of the source table - * @param $alter_str_array array containing the column name and criteria which is to be altered for the targert table - * @param $matching_tables_fields array containing the name of the fields for the matching table - * @param $criteria array containing the criterias - * @param $matching_tables_keys array containing the field names which is key in the source table - * @param $target_tables_keys array containing the field names which is key in the target table - * @param $matching_table_index integer number of the matching table - * @param $display true/false value + * @param $trg_db name of target database + * @param $trg_link connection established with target server + * @param $matching_tables array containing names of matching tables + * @param $source_columns array containing columns information of the source table + * @param $alter_str_array array containing the column name and criteria which is to be altered for the targert table + * @param $matching_tables_fields array containing the name of the fields for the matching table + * @param $criteria array containing the criterias + * @param $matching_tables_keys array containing the field names which is key in the source table + * @param $target_tables_keys array containing the field names which is key in the target table + * @param $matching_table_index integer number of the matching table + * @param $display true/false value * @return nothing */ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$source_columns, &$alter_str_array, $matching_tables_fields, $criteria, @@ -1067,12 +1067,12 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$s /** * PMA_removeColumnsFromTargetTable() removes the columns which are present in target table but not in source table. * - * @param $trg_db name of target database - * @param $trg_link connection established with target server - * @param $matching_tables array containing names of matching tables - * @param $uncommon_columns array containing the names of the column which are to be dropped from the target table - * @param $table_counter index of the matching table as in $matchiing_tables array - * @param $display true/false value + * @param $trg_db name of target database + * @param $trg_link connection established with target server + * @param $matching_tables array containing names of matching tables + * @param $uncommon_columns array containing the names of the column which are to be dropped from the target table + * @param $table_counter index of the matching table as in $matchiing_tables array + * @param $display true/false value * @return nothing */ function PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, $uncommon_columns, $table_counter, $display) @@ -1123,17 +1123,17 @@ function PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, * indexes to be altered in $alter_indexes_array and indexes to be removed from target table in $remove_indexes_array. * Only keyname and uniqueness characteristic of the indexes are altered. * - * @param $src_db name of source database - * @param $trg_db name of target database - * @param $src_link connection established with source server - * @param $trg_link connection established with target server - * @param $matching_tables array containing the matching tables name - * @param $source_indexes array containing the indexes of the source table - * @param $target_indexes array containing the indexes of the target table - * @param $add_indexes_array array containing the name of the column on which the index is to be added in the target table - * @param $alter_indexes_array array containing the key name which needs to be altered - * @param $remove_indexes_array array containing the key name of the index which is to be removed from the target table - * @param $table_counter number of the matching table + * @param $src_db name of source database + * @param $trg_db name of target database + * @param $src_link connection established with source server + * @param $trg_link connection established with target server + * @param $matching_tables array containing the matching tables name + * @param $source_indexes array containing the indexes of the source table + * @param $target_indexes array containing the indexes of the target table + * @param $add_indexes_array array containing the name of the column on which the index is to be added in the target table + * @param $alter_indexes_array array containing the key name which needs to be altered + * @param $remove_indexes_array array containing the key name of the index which is to be removed from the target table + * @param $table_counter number of the matching table * @return nothing */ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matching_tables, &$source_indexes, &$target_indexes, &$add_indexes_array, @@ -1188,16 +1188,16 @@ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matchi /** * PMA_applyIndexesDiff() create indexes, alters indexes and remove indexes. * - * @param $trg_db name of target database - * @param $trg_link connection established with target server - * @param $matching_tables array containing the matching tables name - * @param $source_indexes array containing the indexes of the source table - * @param $target_indexes array containing the indexes of the target table - * @param $add_indexes_array array containing the column names on which indexes are to be created in target table - * @param $alter_indexes_array array containing the column names for which indexes are to be altered - * @param $remove_indexes_array array containing the key name of the indexes which are to be removed from the target table - * @param $table_counter number of the matching table - * @param $display true/false value + * @param $trg_db name of target database + * @param $trg_link connection established with target server + * @param $matching_tables array containing the matching tables name + * @param $source_indexes array containing the indexes of the source table + * @param $target_indexes array containing the indexes of the target table + * @param $add_indexes_array array containing the column names on which indexes are to be created in target table + * @param $alter_indexes_array array containing the column names for which indexes are to be altered + * @param $remove_indexes_array array containing the key name of the indexes which are to be removed from the target table + * @param $table_counter number of the matching table + * @param $display true/false value * @return nothing */ function PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_indexes, $target_indexes, $add_indexes_array, $alter_indexes_array, @@ -1276,7 +1276,7 @@ function PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_ind * PMA_displayQuery() displays a query, taking the maximum display size * into account * - * @param $query the query to display + * @param $query the query to display * @return nothing */ function PMA_displayQuery($query) { @@ -1289,7 +1289,7 @@ function PMA_displayQuery($query) { /** * PMA_syncDisplayHeaderSource() shows the header for source database * - * @param string $src_db source db name + * @param string $src_db source db name * @return nothing */ function PMA_syncDisplayHeaderSource($src_db) { @@ -1311,8 +1311,8 @@ function PMA_syncDisplayHeaderSource($src_db) { /** * PMA_syncDisplayHeaderTargetAndMatchingTables() shows the header for target database and the matching tables * - * @param string $trg_db target db name - * @param array $matching_tables + * @param string $trg_db target db name + * @param array $matching_tables * @return boolean $odd_row current value of this toggle */ function PMA_syncDisplayHeaderTargetAndMatchingTables($trg_db, $matching_tables) { @@ -1338,7 +1338,7 @@ function PMA_syncDisplayHeaderTargetAndMatchingTables($trg_db, $matching_tables) /** * PMA_syncDisplayBeginTableRow() displays the TR tag for alternating colors * - * @param boolean $odd_row current status of the toggle + * @param boolean $odd_row current status of the toggle * @return boolean $odd_row final status of the toggle */ function PMA_syncDisplayBeginTableRow($odd_row) { @@ -1352,10 +1352,10 @@ function PMAw($odd_row) { the toggleing colorsg_db, $matching_tables) tablesxes_array, $alter_indexes_array,,elds,tass, $edit_str, $copy_str, $del_str, $js_conf) {��*ɣ��4�* ��*6 ��!�!�ȣ��ɣ��xt�* ��"��*��*�ȣ��*�ȣ��ov�*��*`v�*�dv�*�iv�*�D��*xt�* ��*�!�!�ȣ��ɣ��=��*��"��*��*�ȣ��*�ȣ��ȣ��ȣ��*�p�ɣ��*�D��*��о��*GHIJKMNOP�ȣ��ɣ��H��*��"��*��*�ȣ��0ov�*��*��*�)��*`v�*�dv�*�iv�*�D��*H��*��࿣��*8��*��*(��*��@��*��*��p��* �nv�*��*�iv�*��x��*��*�dv�*��yx��*��*`v�*@��Zx��*��*�$��*��*�)��*`v�*؄�*�dv�*�iv�*�D��*�m��*�£��*#%')*-.035678:<=�ȣ��ɣ��p�p��*�ã��"��*8��*��*؄�*��*�D��*cf�<��*ɣ��p�p��*�ã��£��*�%��wq�-��s��,~9��u]�� 4Q��U^Qʉ��u��*ēv��B��*Pʣ��F��*F��*?�?��*ʣ��p��0ţ��<��*��*��*�ˣ��B��*`ʣ��ȣ��l��*ɣ��B��*ɣ��_syncDisplayBeginTableRow($odd_row) { /** * array PMA_get_column_values (string $database, string $table, string $column , mysql db link $link = null) * - * @param string $database name of database - * @param string $table name of table to retrieve columns from - * @param string $column name of the column to retrieve data from - * @param mixed $link mysql link resource + * @param string $database name of database + * @param string $table name of table to retrieve columns from + * @param string $column name of the column to retrieve data from + * @param mixed $link mysql link resource * @return array $field_values */ function PMA_get_column_values($database, $table, $column, $link = null) @@ -1381,9 +1381,9 @@ function PMA_get_column_values($database, $table, $column, $link = null) /** * array PMA_get_table_indexes($database, $table, $link = null) * - * @param string $database name of database - * @param string $table name of the table whose indexes are to be retreived - * @param mixed $link mysql link resource + * @param string $database name of database + * @param string $table name of the table whose indexes are to be retreived + * @param mixed $link mysql link resource * @return array $indexes */ function PMA_get_table_indexes($database, $table, $link = null) diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index 06a2b51..e38cac2 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -30,12 +30,12 @@ require_once './libraries/bookmark.lib.php'; // used for file listing * @usedby tbl_structure.php * @usedby tbl_tracking.php * @usedby querywindow.php - * @param boolean|string $query query to display in the textarea + * @param boolean|string $query query to display in the textarea * or true to display last executed - * @param boolean|string $display_tab sql|files|history|full|false + * @param boolean|string $display_tab sql|files|history|full|false * what part to display * false if not inside querywindow - * @param string $delimiter + * @param string $delimiter */ function PMA_sqlQueryForm($query = true, $display_tab = false, $delimiter = ';') { @@ -157,9 +157,9 @@ function PMA_sqlQueryForm($query = true, $display_tab = false, $delimiter = ';') * prints querybox fieldset * * @usedby PMA_sqlQueryForm() - * @param string $query query to display in the textarea - * @param boolean $is_querywindow if inside querywindow or not - * @param string $delimiter default delimiter to use + * @param string $query query to display in the textarea + * @param boolean $is_querywindow if inside querywindow or not + * @param string $delimiter default delimiter to use */ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter = ';') { diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 10895f1..267d99b 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -120,8 +120,8 @@ if (! defined('PMA_MINIMUM_COMMON')) { /** * Set an error message for the system * - * @param string The error message - * @param string The failing SQL query + * @param string The error message + * @param string The failing SQL query * * @access private * @scope SQL Parser internal @@ -141,8 +141,8 @@ if (! defined('PMA_MINIMUM_COMMON')) { /** * Do display the bug report * - * @param string The error message - * @param string The failing SQL query + * @param string The error message + * @param string The failing SQL query * * @access public */ @@ -182,7 +182,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { /** * Parses the SQL queries * - * @param string The SQL query list + * @param string The SQL query list * * @return mixed Most of times, nothing... * @@ -795,8 +795,8 @@ if (! defined('PMA_MINIMUM_COMMON')) { /** * Checks for token types being what we want... * - * @param string String of type that we have - * @param string String of type that we want + * @param string String of type that we have + * @param string String of type that we want * * @return boolean result of check * @@ -820,7 +820,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { /** * Analyzes SQL queries * - * @param array The SQL queries + * @param array The SQL queries * * @return array The analyzed SQL queries * @@ -2046,7 +2046,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { * * @todo check why adding a "\n" after the </span> would cause extra blanks * to be displayed: SELECT p . person_name - * @param array The SQL queries html formatted + * @param array The SQL queries html formatted * * @return array The colorized SQL queries * @@ -2069,10 +2069,10 @@ if (! defined('PMA_MINIMUM_COMMON')) { /** * Formats SQL queries to html * - * @param array The SQL queries - * @param string mode - * @param integer starting token - * @param integer number of tokens to format, -1 = all + * @param array The SQL queries + * @param string mode + * @param integer starting token + * @param integer number of tokens to format, -1 = all * * @return string The formatted SQL queries * @@ -2663,9 +2663,9 @@ if (! defined('PMA_MINIMUM_COMMON')) { /** * Builds a CSS rule used for html formatted SQL queries * - * @param string The class name - * @param string The property name - * @param string The property value + * @param string The class name + * @param string The property name + * @param string The property value * * @return string The CSS rule * @@ -2716,7 +2716,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { /** * Gets SQL queries with no format * - * @param array The SQL queries list + * @param array The SQL queries list * * @return string The SQL queries with no format * diff --git a/libraries/sqlvalidator.class.php b/libraries/sqlvalidator.class.php index f7b836a..abbe6e9 100644 --- a/libraries/sqlvalidator.class.php +++ b/libraries/sqlvalidator.class.php @@ -73,7 +73,7 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Service opening * - * @param string URL of Mimer SQL Validator WSDL file + * @param string URL of Mimer SQL Validator WSDL file * * @return object Object to use * @@ -93,16 +93,16 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Service initializer to connect to server * - * @param object Service object - * @param string Username - * @param string Password - * @param string Name of calling program - * @param string Version of calling program - * @param string Target DBMS - * @param string Version of target DBMS - * @param string Connection Technology - * @param string version of Connection Technology - * @param integer boolean of 1/0 to specify if we are an interactive system + * @param object Service object + * @param string Username + * @param string Password + * @param string Name of calling program + * @param string Version of calling program + * @param string Target DBMS + * @param string Version of target DBMS + * @param string Connection Technology + * @param string version of Connection Technology + * @param integer boolean of 1/0 to specify if we are an interactive system * * @return object stdClass return object with data * @@ -139,10 +139,10 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Validator sytem call * - * @param object Service object - * @param object Session object - * @param string SQL Query to validate - * @param string Data return type + * @param object Service object + * @param object Session object + * @param string SQL Query to validate + * @param string Data return type * * @return object stClass return with data * @@ -170,7 +170,7 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Validator sytem call * - * @param string SQL Query to validate + * @param string SQL Query to validate * * @return object stdClass return with data * @@ -221,8 +221,8 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Sets credentials * - * @param string the username - * @param string the password + * @param string the username + * @param string the password * * @access public */ @@ -236,8 +236,8 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Sets the calling program * - * @param string the calling program name - * @param string the calling program revision + * @param string the calling program name + * @param string the calling program revision * * @access public */ @@ -251,8 +251,8 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Appends the calling program * - * @param string the calling program name - * @param string the calling program revision + * @param string the calling program name + * @param string the calling program revision * * @access public */ @@ -266,8 +266,8 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Sets the target DBMS * - * @param string the target DBMS name - * @param string the target DBMS revision + * @param string the target DBMS name + * @param string the target DBMS revision * * @access public */ @@ -281,8 +281,8 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Appends the target DBMS * - * @param string the target DBMS name - * @param string the target DBMS revision + * @param string the target DBMS name + * @param string the target DBMS revision * * @access public */ @@ -296,8 +296,8 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Sets the connection technology used * - * @param string the connection technology name - * @param string the connection technology revision + * @param string the connection technology name + * @param string the connection technology revision * * @access public */ @@ -311,8 +311,8 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Appends the connection technology used * - * @param string the connection technology name - * @param string the connection technology revision + * @param string the connection technology name + * @param string the connection technology revision * * @access public */ @@ -326,7 +326,7 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Sets whether interactive mode should be used or not * - * @param integer whether interactive mode should be used or not + * @param integer whether interactive mode should be used or not * * @access public */ @@ -339,7 +339,7 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Sets the output type to use * - * @param string the output type to use + * @param string the output type to use * * @access public */ @@ -399,7 +399,7 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Call to determine just if a query is valid or not. * - * @param string SQL statement to validate + * @param string SQL statement to validate * * @return string Validator string from Mimer * @@ -415,7 +415,7 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Call for complete validator response * - * @param string SQL statement to validate + * @param string SQL statement to validate * * @return string Validator string from Mimer * diff --git a/libraries/sqlvalidator.lib.php b/libraries/sqlvalidator.lib.php index a559ccf..dd3b8ad 100644 --- a/libraries/sqlvalidator.lib.php +++ b/libraries/sqlvalidator.lib.php @@ -49,7 +49,7 @@ if ($cfg['SQLValidator']['use'] == true) { * * <http://developer.mimer.com/validator/index.htm> * - * @param string SQL query to validate + * @param string SQL query to validate * * @return string Validator result string * diff --git a/libraries/string.lib.php b/libraries/string.lib.php index 6e2d26d..0cfef41 100644 --- a/libraries/string.lib.php +++ b/libraries/string.lib.php @@ -57,9 +57,9 @@ if ($GLOBALS['PMA_allow_ctype']) { /** * Checks if a given character position in the string is escaped or not * - * @param string string to check for - * @param integer the character to check for - * @param integer starting position in the string + * @param string string to check for + * @param integer the character to check for + * @param integer starting position in the string * @return boolean whether the character is escaped or not */ function PMA_STR_charIsEscaped($string, $pos, $start = 0) @@ -88,9 +88,9 @@ function PMA_STR_charIsEscaped($string, $pos, $start = 0) /** * Checks if a number is in a range * - * @param integer number to check for - * @param integer lower bound - * @param integer upper bound + * @param integer number to check for + * @param integer lower bound + * @param integer upper bound * @return boolean whether the number is in the range or not */ function PMA_STR_numberInRangeInclusive($num, $lower, $upper) @@ -101,8 +101,8 @@ function PMA_STR_numberInRangeInclusive($num, $lower, $upper) /** * Checks if a character is an SQL identifier * - * @param string character to check for - * @param boolean whether the dot character is valid or not + * @param string character to check for + * @param boolean whether the dot character is valid or not * @return boolean whether the character is an SQL identifier or not */ function PMA_STR_isSqlIdentifier($c, $dot_is_valid = false) diff --git a/libraries/string_mb.lib.php b/libraries/string_mb.lib.php index 7b8e14b..0feb876 100644 --- a/libraries/string_mb.lib.php +++ b/libraries/string_mb.lib.php @@ -18,7 +18,7 @@ /** * Returns length of string depending on current charset. * - * @param string string to count + * @param string string to count * @return int string length */ function PMA_strlen($string) @@ -29,9 +29,9 @@ function PMA_strlen($string) /** * Returns substring from string, works depending on current charset. * - * @param string $string string to count - * @param int $start start of substring - * @param int $length length of substring + * @param string $string string to count + * @param int $start start of substring + * @param int $length length of substring * @return string */ function PMA_substr($string, $start, $length = 2147483647) @@ -42,9 +42,9 @@ function PMA_substr($string, $start, $length = 2147483647) /** * Returns postion of $needle in $haystack or false if not found * - * @param string $haystack - * @param string $needle - * @param int $offset + * @param string $haystack + * @param string $needle + * @param int $offset * @return integer position of $needle in $haystack or false */ function PMA_strpos($haystack, $needle, $offset = 0) @@ -55,7 +55,7 @@ function PMA_strpos($haystack, $needle, $offset = 0) /** * Make a string lowercase * - * @param string $string + * @param string $string * @return string */ function PMA_strtolower($string) diff --git a/libraries/string_native.lib.php b/libraries/string_native.lib.php index b07c315..6fee5ca 100644 --- a/libraries/string_native.lib.php +++ b/libraries/string_native.lib.php @@ -18,7 +18,7 @@ /** * Returns length of string depending on current charset. * - * @param string string to count + * @param string string to count * @return int string length */ function PMA_strlen($string) @@ -29,9 +29,9 @@ function PMA_strlen($string) /** * Returns substring from string, works depending on current charset. * - * @param string $string string to count - * @param int $start start of substring - * @param int $length length of substring + * @param string $string string to count + * @param int $start start of substring + * @param int $length length of substring * @return string */ function PMA_substr($string, $start, $length = 2147483647) @@ -42,9 +42,9 @@ function PMA_substr($string, $start, $length = 2147483647) /** * Returns postion of $needle in $haystack or false if not found * - * @param string $haystack - * @param string $needle - * @param int $offset + * @param string $haystack + * @param string $needle + * @param int $offset * @return integer position of $needle in $haystack or false */ function PMA_strpos($haystack, $needle, $offset = 0) @@ -55,7 +55,7 @@ function PMA_strpos($haystack, $needle, $offset = 0) /** * Make a string lowercase * - * @param string $string + * @param string $string * @return string */ function PMA_strtolower($string) diff --git a/libraries/string_type_ctype.lib.php b/libraries/string_type_ctype.lib.php index 590e59d..271b0f7 100644 --- a/libraries/string_type_ctype.lib.php +++ b/libraries/string_type_ctype.lib.php @@ -18,7 +18,7 @@ /** * Checks if a character is an alphanumeric one * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is an alphanumeric one or not */ function PMA_STR_isAlnum($c) @@ -29,7 +29,7 @@ function PMA_STR_isAlnum($c) /** * Checks if a character is an alphabetic one * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is an alphabetic one or not */ function PMA_STR_isAlpha($c) @@ -40,7 +40,7 @@ function PMA_STR_isAlpha($c) /** * Checks if a character is a digit * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is a digit or not */ function PMA_STR_isDigit($c) @@ -51,7 +51,7 @@ function PMA_STR_isDigit($c) /** * Checks if a character is an upper alphabetic one * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is an upper alphabetic one or not */ function PMA_STR_isUpper($c) @@ -63,7 +63,7 @@ function PMA_STR_isUpper($c) /** * Checks if a character is a lower alphabetic one * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is a lower alphabetic one or not */ function PMA_STR_isLower($c) @@ -74,7 +74,7 @@ function PMA_STR_isLower($c) /** * Checks if a character is a space one * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is a space one or not */ function PMA_STR_isSpace($c) @@ -85,7 +85,7 @@ function PMA_STR_isSpace($c) /** * Checks if a character is an hexadecimal digit * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is an hexadecimal digit or not */ function PMA_STR_isHexDigit($c) diff --git a/libraries/string_type_native.lib.php b/libraries/string_type_native.lib.php index 0bcb08f..46a6544 100644 --- a/libraries/string_type_native.lib.php +++ b/libraries/string_type_native.lib.php @@ -18,7 +18,7 @@ /** * Checks if a character is an alphanumeric one * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is an alphanumeric one or not */ function PMA_STR_isAlnum($c) @@ -29,7 +29,7 @@ function PMA_STR_isAlnum($c) /** * Checks if a character is an alphabetic one * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is an alphabetic one or not */ function PMA_STR_isAlpha($c) @@ -40,7 +40,7 @@ function PMA_STR_isAlpha($c) /** * Checks if a character is a digit * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is a digit or not */ function PMA_STR_isDigit($c) @@ -55,7 +55,7 @@ function PMA_STR_isDigit($c) /** * Checks if a character is an upper alphabetic one * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is an upper alphabetic one or not */ function PMA_STR_isUpper($c) @@ -70,7 +70,7 @@ function PMA_STR_isUpper($c) /** * Checks if a character is a lower alphabetic one * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is a lower alphabetic one or not */ function PMA_STR_isLower($c) @@ -85,7 +85,7 @@ function PMA_STR_isLower($c) /** * Checks if a character is a space one * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is a space one or not */ function PMA_STR_isSpace($c) @@ -104,7 +104,7 @@ function PMA_STR_isSpace($c) /** * Checks if a character is an hexadecimal digit * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is an hexadecimal digit or not */ function PMA_STR_isHexDigit($c) diff --git a/libraries/transformations.lib.php b/libraries/transformations.lib.php index 4a69e77..a5460ab 100644 --- a/libraries/transformations.lib.php +++ b/libraries/transformations.lib.php @@ -19,7 +19,7 @@ * // } * </code> * - * @param string $option_string comma separated options + * @param string $option_string comma separated options * @return array options */ function PMA_transformation_getOptions($option_string) @@ -118,9 +118,9 @@ function PMA_getAvailableMIMEtypes() * Gets the mimetypes for all columns of a table * * @access public - * @param string $db the name of the db to check for - * @param string $table the name of the table to check for - * @param string $strict whether to include only results having a mimetype set + * @param string $db the name of the db to check for + * @param string $table the name of the table to check for + * @param string $strict whether to include only results having a mimetype set * @return array [field_name][field_key] = field_value */ function PMA_getMIME($db, $table, $strict = false) @@ -149,13 +149,13 @@ function PMA_getMIME($db, $table, $strict = false) * Set a single mimetype to a certain value. * * @access public - * @param string $db the name of the db - * @param string $table the name of the table - * @param string $key the name of the column - * @param string $mimetype the mimetype of the column - * @param string $transformation the transformation of the column - * @param string $transformation_options the transformation options of the column - * @param string $forcedelete force delete, will erase any existing comments for this column + * @param string $db the name of the db + * @param string $table the name of the table + * @param string $key the name of the column + * @param string $mimetype the mimetype of the column + * @param string $transformation the transformation of the column + * @param string $transformation_options the transformation options of the column + * @param string $forcedelete force delete, will erase any existing comments for this column * @return boolean true, if comment-query was made. */ function PMA_setMIME($db, $table, $key, $mimetype, $transformation, diff --git a/libraries/url_generating.lib.php b/libraries/url_generating.lib.php index c8b343b..e3cc02a 100644 --- a/libraries/url_generating.lib.php +++ b/libraries/url_generating.lib.php @@ -10,11 +10,11 @@ * Generates text with hidden inputs. * * @see PMA_generate_common_url() - * @param string optional database name + * @param string optional database name * (can also be an array of parameters) - * @param string optional table name - * @param int indenting level - * @param string do not generate a hidden field for this parameter + * @param string optional table name + * @param int indenting level + * @param string do not generate a hidden field for this parameter * (can be an array of strings) * * @return string string with input fields @@ -160,16 +160,16 @@ function PMA_getHiddenFields($values, $pre = '') * // script.php?server=1&lang=en * </code> * - * @param mixed assoc. array with url params or optional string with database name + * @param mixed assoc. array with url params or optional string with database name * if first param is an array there is also an ? prefixed to the url * - * @param string - if first param is array: 'html' to use htmlspecialchars() + * @param string - if first param is array: 'html' to use htmlspecialchars() * on the resulting URL (for a normal URL displayed in HTML) * or something else to avoid using htmlspecialchars() (for * a URL sent via a header); if not set,'html' is assumed * - if first param is not array: optional table name * - * @param string - if first param is array: optional character to + * @param string - if first param is array: optional character to * use instead of '?' * - if first param is not array: optional character to use * instead of '&' for dividing URL parameters @@ -256,7 +256,7 @@ function PMA_generate_common_url() * extracted from arg_separator.input as set in php.ini * we do not use arg_separator.output to avoid problems with & and & * - * @param string whether to encode separator or not, currently 'none' or 'html' + * @param string whether to encode separator or not, currently 'none' or 'html' * @return string character used for separating url parts usally ; or & * @access public */ diff --git a/libraries/zip.lib.php b/libraries/zip.lib.php index 23f28ce..9208e93 100644 --- a/libraries/zip.lib.php +++ b/libraries/zip.lib.php @@ -71,7 +71,7 @@ class zipfile * Converts an Unix timestamp to a four byte DOS date and time format (date * in high two bytes, time in low two bytes allowing magnitude comparison). * - * @param integer the current Unix timestamp + * @param integer the current Unix timestamp * * @return integer the current date in a four byte DOS format * @@ -97,9 +97,9 @@ class zipfile /** * Adds "file" to archive * - * @param string file contents - * @param string name of the file in the archive (may contains the path) - * @param integer the current timestamp + * @param string file contents + * @param string name of the file in the archive (may contains the path) + * @param integer the current timestamp * * @access public */ diff --git a/libraries/zip_extension.lib.php b/libraries/zip_extension.lib.php index 0527911..b665b74 100644 --- a/libraries/zip_extension.lib.php +++ b/libraries/zip_extension.lib.php @@ -9,7 +9,7 @@ /** * Gets zip file contents * - * @param string $file + * @param string $file * @return array ($error_message, $file_data); $error_message * is empty if no error */ @@ -71,7 +71,7 @@ function PMA_getZipContents($file) /** * Gets zip error message * - * @param integer error code + * @param integer error code * @return string error message */ function PMA_getZipError($code) diff --git a/main.php b/main.php index e1eec63..fd4d448 100644 --- a/main.php +++ b/main.php @@ -368,14 +368,14 @@ if (file_exists('./libraries/language_stats.inc.php')) { /** * prints list item for main page * - * @param string $name displayed text - * @param string $id id, used for css styles - * @param string $url make item as link with $url as target - * @param string $mysql_help_page display a link to MySQL's manual - * @param string $target special target for $url - * @param string $a_id id for the anchor, used for jQuery to hook in functions - * @param string $class class for the li element - * @param string $a_class class for the anchor element + * @param string $name displayed text + * @param string $id id, used for css styles + * @param string $url make item as link with $url as target + * @param string $mysql_help_page display a link to MySQL's manual + * @param string $target special target for $url + * @param string $a_id id for the anchor, used for jQuery to hook in functions + * @param string $class class for the li element + * @param string $a_class class for the anchor element */ function PMA_printListItem($name, $id = null, $url = null, $mysql_help_page = null, $target = null, $a_id = null, $class = null, $a_class = null) { diff --git a/navigation.php b/navigation.php index e473dd8..966f5f2 100644 --- a/navigation.php +++ b/navigation.php @@ -327,9 +327,9 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) { * @global string $href_left * @global string $db_start * @global string $common_url_query - * @param array $ext_dblist extended db list - * @param integer $offset - * @param integer $count + * @param array $ext_dblist extended db list + * @param integer $offset + * @param integer $count */ function PMA_displayDbList($ext_dblist, $offset, $count) { global $element_counter, $img_minus, $img_plus, $href_left, @@ -494,10 +494,10 @@ function PMA_displayDbList($ext_dblist, $offset, $count) { * @global string html code for '-' image * @global string html code for '+' image * @global string html code for self link - * @param array $tables array of tables/tablegroups - * @param boolean $visible whether the list is visible or not - * @param string $tab_group_full full tab group name - * @param string $table_db db of this table + * @param array $tables array of tables/tablegroups + * @param boolean $visible whether the list is visible or not + * @param string $tab_group_full full tab group name + * @param string $table_db db of this table */ function PMA_displayTableList($tables, $visible = false, $tab_group_full = '', $table_db = '') diff --git a/pmd_common.php b/pmd_common.php index cbe37ed..7ca134b 100644 --- a/pmd_common.php +++ b/pmd_common.php @@ -167,7 +167,7 @@ function get_pk_or_unique_keys() /** * returns all indizes * - * @param boolean whether to include ony unique ones + * @param boolean whether to include ony unique ones * @return array indizes */ function get_all_keys($unique_only = false) diff --git a/server_privileges.php b/server_privileges.php index 8dad17d..ba114fb 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -157,7 +157,7 @@ function PMA_wildcardEscapeForGrant($dbname, $tablename) { /** * Generates a condition on the user name * - * @param string the user's initial + * @param string the user's initial * @return string the generated condition */ function PMA_rangeOfUsers($initial = '') @@ -176,8 +176,8 @@ function PMA_rangeOfUsers($initial = '') /** * Extracts the privilege information of a priv table row * - * @param array $row the row - * @param boolean $enableHTML add <dfn> tag with tooltips + * @param array $row the row + * @param boolean $enableHTML add <dfn> tag with tooltips * * @global resource $user_link the database connection * @@ -404,9 +404,9 @@ function PMA_display_column_privs($columns, $row, $name_for_select, /** * Displays the privileges form table * - * @param string $db the database - * @param string $table the table - * @param boolean $submit wheather to display the submit button or not + * @param string $db the database + * @param string $table the table + * @param boolean $submit wheather to display the submit button or not * @global array $cfg the phpMyAdmin configuration * @global ressource $user_link the database connection * @@ -739,7 +739,7 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = true) * Displays the fields used by the "new user" form as well as the * "change login information / copy user" form. * - * @param string $mode are we creating a new user or are we just + * @param string $mode are we creating a new user or are we just * changing one? (allowed values: 'new', 'change') * @global array $cfg the phpMyAdmin configuration * @global ressource $user_link the database connection diff --git a/tbl_relation.php b/tbl_relation.php index e3f4338..e204c80 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -48,9 +48,9 @@ $options_array = array( /** * Generate dropdown choices * - * @param string Message to display - * @param string Name of the <select> field - * @param array Choices for dropdown + * @param string Message to display + * @param string Name of the <select> field + * @param array Choices for dropdown * @return string The existing value (for selected) * * @access public @@ -74,7 +74,7 @@ function PMA_generate_dropdown($dropdown_question, $select_name, $choices, $sele /** * Split a string on backquote pairs * - * @param string original string + * @param string original string * @return array containing the elements (and their surrounding backquotes) * * @access public diff --git a/tbl_tracking.php b/tbl_tracking.php index 0003055..e308066 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -52,10 +52,10 @@ if (isset($_REQUEST['report_export'])) { /** * Filters tracking entries * - * @param array the entries to filter - * @param string "from" date - * @param string "to" date - * @param string users + * @param array the entries to filter + * @param string "from" date + * @param string "to" date + * @param string users * * @return array filtered entries * hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11677-g25bda8e
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via 25bda8e991f2820971c343315cd3ab3d974b2684 (commit) from 219ec73d69a0bee94ac3bf98757db25360862b39 (commit) - Log ----------------------------------------------------------------- commit 25bda8e991f2820971c343315cd3ab3d974b2684 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 09:18:02 2011 +0200 Fix spacing on opening code block ----------------------------------------------------------------------- Summary of changes: db_datadict.php | 2 +- db_structure.php | 2 +- libraries/common.lib.php | 6 +++--- libraries/export/pdf.php | 10 +++++----- libraries/footer.inc.php | 2 +- libraries/import/ldi.php | 2 +- libraries/ip_allow_deny.lib.php | 2 +- libraries/logging.lib.php | 2 +- libraries/mult_submits.inc.php | 4 ++-- libraries/relation.lib.php | 2 +- libraries/sql_query_form.lib.php | 2 +- libraries/sqlparser.lib.php | 6 +++--- libraries/transformations.lib.php | 2 +- pmd_general.php | 6 +++--- schema_edit.php | 4 ++-- server_privileges.php | 2 +- server_synchronize.php | 2 +- tbl_indexes.php | 2 +- tbl_tracking.php | 10 +++++----- themes.php | 2 +- transformation_wrapper.php | 2 +- 21 files changed, 37 insertions(+), 37 deletions(-) diff --git a/db_datadict.php b/db_datadict.php index acd96dc..531fbe0 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -91,7 +91,7 @@ while ($row = PMA_DBI_fetch_row($rowset)) { $pk_array[$row['Column_name']] = 1; } // Retains keys informations - if ($row['Key_name'] != $lastIndex){ + if ($row['Key_name'] != $lastIndex) { $indexes[] = $row['Key_name']; $lastIndex = $row['Key_name']; } diff --git a/db_structure.php b/db_structure.php index 6dc82bf..2bae5a7 100644 --- a/db_structure.php +++ b/db_structure.php @@ -367,7 +367,7 @@ foreach ($tables as $keyname => $each_table) { // that needs to be repaired if (isset($each_table['TABLE_ROWS']) && ($each_table['ENGINE'] != null || $table_is_view)) { if ($table_is_view) { - if ($each_table['TABLE_ROWS'] >= $GLOBALS['cfg']['MaxExactCountViews']){ + if ($each_table['TABLE_ROWS'] >= $GLOBALS['cfg']['MaxExactCountViews']) { $row_count_pre = '~'; $sum_row_count_pre = '~'; $show_superscript = PMA_showHint(PMA_sanitize(sprintf(__('This view has at least this number of rows. Please refer to %sdocumentation%s.'), '[a@./Documentation.html#cfg_MaxExactCountViews@_blank]', '[/a]'))); diff --git a/libraries/common.lib.php b/libraries/common.lib.php index fd0701b..34d20d9 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -567,7 +567,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '', } // end if if (!empty($error_message)) { - $error_message = preg_replace("@((\015\012)|(\015)|(\012)){3,}@", "\n\n", $error_message); + $error_message = preg_replace("@((\015\012)|(\015)|(\012)) {3,}@", "\n\n", $error_message); } // modified to show the help on error-returns // (now error-messages-server) @@ -2692,7 +2692,7 @@ function PMA_replace_binary_contents($content) { function PMA_duplicateFirstNewline($string) { $first_occurence = strpos($string, "\r\n"); - if ($first_occurence === 0){ + if ($first_occurence === 0) { $string = "\n".$string; } return $string; @@ -3065,7 +3065,7 @@ function PMA_getFunctionsForField($field, $insert_mode) // Create the output $retval = ' <option></option>' . "\n"; // loop on the dropdown array and print all available options for that field. - foreach ($dropdown as $each_dropdown){ + foreach ($dropdown as $each_dropdown) { $retval .= ' '; $retval .= '<option'; if ($default_function === $each_dropdown) { diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php index bb89fda..e135bc8 100644 --- a/libraries/export/pdf.php +++ b/libraries/export/pdf.php @@ -213,7 +213,7 @@ class PMA_PDF extends TCPDF function setAttributes($attr = array()) { - foreach ($attr as $key => $val){ + foreach ($attr as $key => $val) { $this->$key = $val ; } } @@ -246,20 +246,20 @@ class PMA_PDF extends TCPDF // loop through results header and set initial col widths/ titles/ alignment // if a col title is less than the starting col width, reduce that column size - for ($i = 0; $i < $this->numFields; $i++){ + for ($i = 0; $i < $this->numFields; $i++) { $stringWidth = $this->getstringwidth($this->fields[$i]->name) + 6 ; // save the real title's width $titleWidth[$i] = $stringWidth; $totalTitleWidth += $stringWidth; // set any column titles less than the start width to the column title width - if ($stringWidth < $this->sColWidth){ + if ($stringWidth < $this->sColWidth) { $colFits[$i] = $stringWidth ; } $this->colTitles[$i] = $this->fields[$i]->name; $this->display_column[$i] = true; - switch ($this->fields[$i]->type){ + switch ($this->fields[$i]->type) { case 'int': $this->colAlign[$i] = 'R'; break; @@ -317,7 +317,7 @@ class PMA_PDF extends TCPDF } $totAlreadyFitted = 0; - foreach ($colFits as $key => $val){ + foreach ($colFits as $key => $val) { // set fitted columns to smallest size $this->tablewidths[$key] = $val; // to work out how much (if any) space has been freed up diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php index bbeb04b..aa1af7a 100644 --- a/libraries/footer.inc.php +++ b/libraries/footer.inc.php @@ -70,7 +70,7 @@ if (!$GLOBALS['is_ajax_request']) { <?php if (empty($GLOBALS['error_message'])) { ?> -$(document).ready(function(){ +$(document).ready(function() { // updates current settings if (window.parent.setAll) { window.parent.setAll('<?php diff --git a/libraries/import/ldi.php b/libraries/import/ldi.php index fe5264c..b3b711e 100644 --- a/libraries/import/ldi.php +++ b/libraries/import/ldi.php @@ -80,7 +80,7 @@ if (strlen($ldi_enclosed) > 0) { if (strlen($ldi_escaped) > 0) { $sql .= ' ESCAPED BY \'' . PMA_sqlAddSlashes($ldi_escaped) . '\''; } -if (strlen($ldi_new_line) > 0){ +if (strlen($ldi_new_line) > 0) { if ($ldi_new_line == 'auto') { $ldi_new_line = PMA_whichCrlf() == "\n" ? '\n' : '\r\n'; } diff --git a/libraries/ip_allow_deny.lib.php b/libraries/ip_allow_deny.lib.php index 30bce24..1537b43 100644 --- a/libraries/ip_allow_deny.lib.php +++ b/libraries/ip_allow_deny.lib.php @@ -30,7 +30,7 @@ function PMA_getIp() $trusted_header_value = PMA_getenv($GLOBALS['cfg']['TrustedProxies'][$direct_ip]); $matches = array(); // the $ checks that the header contains only one IP address, ?: makes sure the () don't capture - $is_ip = preg_match('|^(?:[0-9]{1,3}\.){3,3}[0-9]{1,3}$|', $trusted_header_value, $matches); + $is_ip = preg_match('|^(?:[0-9]{1,3}\.) {3,3}[0-9]{1,3}$|', $trusted_header_value, $matches); if ($is_ip && (count($matches) == 1)) { // True IP behind a proxy return $matches[0]; diff --git a/libraries/logging.lib.php b/libraries/logging.lib.php index 8764247..1dabc9a 100644 --- a/libraries/logging.lib.php +++ b/libraries/logging.lib.php @@ -11,7 +11,7 @@ /** * Logs user information to webserver logs. */ -function PMA_log_user($user, $status = 'ok'){ +function PMA_log_user($user, $status = 'ok') { if (function_exists('apache_note')) { apache_note('userID', $user); apache_note('userStatus', $status); diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 0f7e218..1d3cbd5 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -246,7 +246,7 @@ if (!empty($submit_mult) && !empty($what)) { <?php echo PMA_generate_common_hidden_inputs($_url_params); ?> -<?php if ($what == 'replace_prefix_tbl' || $what == 'copy_tbl_change_prefix'){ ?> +<?php if ($what == 'replace_prefix_tbl' || $what == 'copy_tbl_change_prefix') { ?> <fieldset class = "input"> <legend><?php echo ($what == 'replace_prefix_tbl' ? __('Replace table prefix') : __('Copy table with prefix')) ?>:</legend> <table> @@ -263,7 +263,7 @@ if (!empty($submit_mult) && !empty($what)) { </fieldset> <?php } - elseif ($what == 'add_prefix_tbl'){ ?> + elseif ($what == 'add_prefix_tbl') { ?> <fieldset class = "input"> <legend><?php echo __('Add table prefix') ?>:</legend> <table> diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index c2acd8e..0b74c70 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -628,7 +628,7 @@ function PMA_setDbComment($db, $comment = '') AND `column_name` = \'(db_comment)\''; } - if (isset($upd_query)){ + if (isset($upd_query)) { return PMA_query_as_controluser($upd_query); } diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index 5a0f364..06a2b51 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -420,7 +420,7 @@ function PMA_sqlQueryFormBookmark() * * @usedby PMA_sqlQueryForm() */ -function PMA_sqlQueryFormUpload(){ +function PMA_sqlQueryFormUpload() { $errors = array (); $matcher = '@\.sql(\.(' . PMA_supportedDecompressions() . '))?$@'; // we allow only SQL here diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 8469344..10895f1 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -1523,7 +1523,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { $subresult['queryflags']['need_confirm'] = 1; } - if ($first_reserved_word=='SELECT'){ + if ($first_reserved_word=='SELECT') { $position_of_first_select = $i; } @@ -2550,7 +2550,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { } break; default: - if ($close_docu_link && in_array($arr[$i]['data'], array('LIKE', 'NOT', 'IN', 'REGEXP', 'NULL'))){ + if ($close_docu_link && in_array($arr[$i]['data'], array('LIKE', 'NOT', 'IN', 'REGEXP', 'NULL'))) { $after .= '</a>'; $close_docu_link = false; } else if ($docu && isset($PMA_SQPdata_functions_docs[$arr[$i]['data']])) { @@ -2725,7 +2725,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { function PMA_SQP_formatNone($arr) { $formatted_sql = htmlspecialchars($arr['raw']); - $formatted_sql = preg_replace("@((\015\012)|(\015)|(\012)){3,}@", "\n\n", $formatted_sql); + $formatted_sql = preg_replace("@((\015\012)|(\015)|(\012)) {3,}@", "\n\n", $formatted_sql); return $formatted_sql; } // end of the "PMA_SQP_formatNone()" function diff --git a/libraries/transformations.lib.php b/libraries/transformations.lib.php index e58ecf8..4a69e77 100644 --- a/libraries/transformations.lib.php +++ b/libraries/transformations.lib.php @@ -208,7 +208,7 @@ function PMA_setMIME($db, $table, $key, $mimetype, $transformation, . '\'' . PMA_sqlAddSlashes($transformation_options) . '\')'; } - if (isset($upd_query)){ + if (isset($upd_query)) { return PMA_query_as_controluser($upd_query); } else { return false; diff --git a/pmd_general.php b/pmd_general.php index 10a862c..74ff124 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -44,8 +44,8 @@ echo ' echo "\n"; if ($_REQUEST['query']) { echo ' - $(document).ready(function(){ - $(".trigger").click(function(){ + $(document).ready(function() { + $(".trigger").click(function() { $(".panel").toggle("fast"); $(this).toggleClass("active"); return false; @@ -113,7 +113,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 ($_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="'; diff --git a/schema_edit.php b/schema_edit.php index 1545d8f..4ab41d4 100644 --- a/schema_edit.php +++ b/schema_edit.php @@ -53,7 +53,7 @@ if (! $cfgRelation['displaywork']) { require_once './libraries/footer.inc.php'; } -if (! isset($cfgRelation['table_coords'])){ +if (! isset($cfgRelation['table_coords'])) { echo sprintf(__('<b>%s</b> table not found or not set in %s'), 'table_coords', 'config.inc.php') . '<br />' . "\n" . PMA_showDocu('table_coords') . "\n"; require_once './libraries/footer.inc.php'; @@ -83,7 +83,7 @@ if ($cfgRelation['pdfwork']) { * @param string $do It tells what the Schema is supposed to do * create and select a page, generate schema etc */ - if (isset($_REQUEST['do'])){ + if (isset($_REQUEST['do'])) { $user_schema->setAction($_REQUEST['do']); $user_schema->processUserChoice(); } diff --git a/server_privileges.php b/server_privileges.php index ecd1fa6..8dad17d 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -2376,7 +2376,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs $user_form .= '</tbody>' . "\n" . '</table></form>' . "\n"; - if ($GLOBALS['is_ajax_request'] == true){ + if ($GLOBALS['is_ajax_request'] == true) { $extra_data['user_form'] = $user_form; $message = PMA_Message::success(__('User has been added.')); PMA_ajaxResponse($message, $message->isSuccess(), $extra_data); diff --git a/server_synchronize.php b/server_synchronize.php index 3412336..431ae6b 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -91,7 +91,7 @@ if ((isset($_REQUEST['submit_connect']))) { if (! $src_connection && $src_type != 'cur') { echo __('Could not connect to the source') . '<br />'; } - if (! $trg_connection && $trg_type != 'cur'){ + if (! $trg_connection && $trg_type != 'cur') { echo __('Could not connect to the target'); } echo '</div>'; diff --git a/tbl_indexes.php b/tbl_indexes.php index 84555d8..1daca81 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -87,7 +87,7 @@ if (isset($_REQUEST['do_save_data'])) { } } // end while - if (empty($index_fields)){ + if (empty($index_fields)) { $error = PMA_Message::error(__('No index parts defined!')); } else { $sql_query .= ' (' . implode(', ', $index_fields) . ')'; diff --git a/tbl_tracking.php b/tbl_tracking.php index b249f4c..0003055 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -369,13 +369,13 @@ if (isset($_REQUEST['snapshot'])) { */ if (isset($_REQUEST['report']) && (isset($_REQUEST['delete_ddlog']) || isset($_REQUEST['delete_dmlog']))) { - if (isset($_REQUEST['delete_ddlog'])){ + if (isset($_REQUEST['delete_ddlog'])) { // Delete ddlog row data $delete_id = $_REQUEST['delete_ddlog']; // Only in case of valable id - if ($delete_id == (int)$delete_id){ + if ($delete_id == (int)$delete_id) { unset($data['ddlog'][$delete_id]); if (PMA_Tracker::changeTrackingData($_REQUEST['db'], $_REQUEST['table'], $_REQUEST['version'], 'DDL', $data['ddlog'])) @@ -386,13 +386,13 @@ if (isset($_REQUEST['report']) && (isset($_REQUEST['delete_ddlog']) || isset($_R } } - if (isset($_REQUEST['delete_dmlog'])){ + if (isset($_REQUEST['delete_dmlog'])) { // Delete dmlog row data $delete_id = $_REQUEST['delete_dmlog']; // Only in case of valable id - if ($delete_id == (int)$delete_id){ + if ($delete_id == (int)$delete_id) { unset($data['dmlog'][$delete_id]); if (PMA_Tracker::changeTrackingData($_REQUEST['db'], $_REQUEST['table'], $_REQUEST['version'], 'DML', $data['dmlog'])) @@ -658,7 +658,7 @@ if ($last_version > 0) { } else { $version_status = __('not active'); } - if ($version['version'] == $last_version){ + if ($version['version'] == $last_version) { if ($version['tracking_active'] == 1) { $tracking_active = true; } else { diff --git a/themes.php b/themes.php index 624c668..0e37ee4 100644 --- a/themes.php +++ b/themes.php @@ -22,7 +22,7 @@ require './libraries/header_meta_style.inc.php'; ?> <script type="text/javascript" language="javascript"> // <![CDATA[ -function takeThis(what){ +function takeThis(what) { if (window.opener && window.opener.document.forms['setTheme'].elements['set_theme']) { window.opener.document.forms['setTheme'].elements['set_theme'].value = what; window.opener.document.forms['setTheme'].submit(); diff --git a/transformation_wrapper.php b/transformation_wrapper.php index 50d7ceb..f229bd3 100644 --- a/transformation_wrapper.php +++ b/transformation_wrapper.php @@ -88,7 +88,7 @@ if (! isset($resize)) { $ratioWidth = $srcWidth/$newWidth; $ratioHeight = $srcHeight/$newHeight; - if ($ratioWidth < $ratioHeight){ + if ($ratioWidth < $ratioHeight) { $destWidth = $srcWidth/$ratioHeight; $destHeight = $newHeight; } else { hooks/post-receive -- phpMyAdmin

1 0