[geeklog-cvs] geeklog: Use constants to define the minimum PHP and MySQL versions

Sun Sep 6 05:01:44 EDT 2009

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/5f9005f9c657
changeset: 7286:5f9005f9c657
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Sep 06 11:00:27 2009 +0200
description:
Use constants to define the minimum PHP and MySQL versions

diffstat:

 public_html/admin/install/index.php                              |  10 +++--
 public_html/admin/install/install-plugins.php                    |   4 +-
 public_html/admin/install/language/chinese_simplified_utf-8.php  |   8 ++--
 public_html/admin/install/language/chinese_traditional_utf-8.php |   8 ++--
 public_html/admin/install/language/english.php                   |   8 ++--
 public_html/admin/install/language/german.php                    |   8 ++--
 public_html/admin/install/language/hebrew_utf-8.php              |   8 ++--
 public_html/admin/install/language/japanese_utf-8.php            |   8 ++--
 public_html/admin/install/language/polish.php                    |   8 ++--
 public_html/admin/install/lib-install.php                        |  15 ++++++-
 public_html/admin/install/migrate.php                            |   7 ++-
 11 files changed, 52 insertions(+), 40 deletions(-)

diffs (277 lines):

diff -r 0021451d31d4 -r 5f9005f9c657 public_html/admin/install/index.php

--- a/public_html/admin/install/index.php	Sun Sep 06 10:23:14 2009 +0200
+++ b/public_html/admin/install/index.php	Sun Sep 06 11:00:27 2009 +0200
@@ -227,8 +227,10 @@
         // Check if the user's version of MySQL is out of date
         } else if (INST_mysqlOutOfDate($DB)) { 
 
-            $display .= '<h1>' . $LANG_INSTALL[51] . '</h1>' . LB;
-            $display .= '<p>' . $LANG_INSTALL[52]
+            $myv = mysql_v($DB['host'], $DB['user'], $DB['pass']);
+            $display .= '<h1>' . sprintf($LANG_INSTALL[51], SUPPORTED_MYSQL_VER)
+                     . '</h1>' . LB;
+            $display .= '<p>' . sprintf($LANG_INSTALL[52], SUPPORTED_MYSQL_VER)
                      . $myv[0] . '.' . $myv[1] . '.' . $myv[2]
                      . $LANG_INSTALL[53] . '</p>' . LB;
 
@@ -952,8 +954,8 @@
 if (INST_phpOutOfDate()) {
 
     // If their version of PHP is not supported, print an error:
-    $display .= '<h1 class="heading">' . str_replace('4.1.0', SUPPORTED_PHP_VER, $LANG_INSTALL[4]) . '</h1>' . LB;
-    $display .= '<p>' . str_replace('4.1.0', SUPPORTED_PHP_VER, $LANG_INSTALL[5]) . phpversion() . $LANG_INSTALL[6] . '</p>' . LB;
+    $display .= '<h1 class="heading">' . sprintf($LANG_INSTALL[4], SUPPORTED_PHP_VER) . '</h1>' . LB;
+    $display .= '<p>' . sprintf($LANG_INSTALL[5], SUPPORTED_PHP_VER) . phpversion() . $LANG_INSTALL[6] . '</p>' . LB;
 
 } else {
 
diff -r 0021451d31d4 -r 5f9005f9c657 public_html/admin/install/install-plugins.php
--- a/public_html/admin/install/install-plugins.php	Sun Sep 06 10:23:14 2009 +0200
+++ b/public_html/admin/install/install-plugins.php	Sun Sep 06 11:00:27 2009 +0200
@@ -74,8 +74,8 @@
 if (INST_phpOutOfDate()) {
 
     // If their version of PHP is not supported, print an error:
-    $display .= '<h1>' . $LANG_INSTALL[4] . '</h1>' . LB;
-    $display .= '<p>' . $LANG_INSTALL[5] . $phpv[0] . '.' . $phpv[1] . '.' . (int) $phpv[2] . $LANG_INSTALL[6] . '</p>' . LB;
+    $display .= '<h1>' . sprintf($LANG_INSTALL[4], SUPPORTED_PHP_VER) . '</h1>' . LB;
+    $display .= '<p>' . sprintf($LANG_INSTALL[5], SUPPORTED_PHP_VER) . $phpv[0] . '.' . $phpv[1] . '.' . (int) $phpv[2] . $LANG_INSTALL[6] . '</p>' . LB;
 
 } else {
 
diff -r 0021451d31d4 -r 5f9005f9c657 public_html/admin/install/language/chinese_simplified_utf-8.php
--- a/public_html/admin/install/language/chinese_simplified_utf-8.php	Sun Sep 06 10:23:14 2009 +0200
+++ b/public_html/admin/install/language/chinese_simplified_utf-8.php	Sun Sep 06 11:00:27 2009 +0200
@@ -54,8 +54,8 @@
     1 => 'å®‰è£
æ”¯åŠ©',
     2 => 'ç»ˆæžç½‘å¿—ç³»ç»Ÿ',
     3 => 'å¿—ä¹å®‰è£
',
-    4 => 'éœ€è¦PHP 4.3.0',
-    5 => 'æŠ±æ‰, å¿—ä¹è¦æ±‚æœ€å°‘ PHP 4.3.0 æ¥æ“ä½œ(ä½ æœ‰çš„æ˜¯',
+    4 => 'éœ€è¦PHP %s',
+    5 => 'æŠ±æ‰, å¿—ä¹è¦æ±‚æœ€å°‘ PHP %s æ¥æ“ä½œ(ä½ æœ‰çš„æ˜¯',
     6 => '). è¯· <a href="http://www.php.net/downloads.php">å‡çº§PHP</a> å®‰è£
 æˆ–è¯·ä½ çš„ç½‘ç«™æœåŠ¡å‘˜å¸®ä½ å®‰è£
.',
     7 => 'æ‰¾ä¸åˆ°å¿—ä¹æ¡£æ¡ˆ',
     8 => 'å®‰è£
ç³»ç»Ÿæ— æ³•æ‰¾åˆ°å
³é”®çš„å¿—ä¹æ¡£æ¡ˆ. ä¹Ÿè®¸ä½ å°†å®ƒä»¬æ¬ç§»è¿‡. è¯·æŒ‡å®šæ‰€éœ€æ¡£æ¡ˆå’Œç›®å½•çš„è·¯å¾„:',
@@ -101,8 +101,8 @@
     48 => 'ç½‘ç«™ç”µé‚®',
     49 => 'ç½‘ç«™çš„ ä¸å¯å›žä¿¡çš„ç”µé‚®',
     50 => 'å®‰è£
',
-    51 => 'éœ€è¦ MySQL 3.23.2',
-    52 => 'æŠ±æ‰, å¿—ä¹éœ€è¦æœ€å°‘ MySQL 3.23.2 æ¥æ“ä½œ (ä½ æœ‰çš„æ˜¯ ',
+    51 => 'éœ€è¦ MySQL %s',
+    52 => 'æŠ±æ‰, å¿—ä¹éœ€è¦æœ€å°‘ MySQL %s æ¥æ“ä½œ (ä½ æœ‰çš„æ˜¯ ',
     53 => '). è¯· <a href="http://dev.mysql.com/downloads/mysql/">å‡çº§ä½ çš„MySQL</a> å®‰è£
 æˆ–è¯·ä½ çš„ç½‘ç«™ä¸»æœºæœåŠ¡å‘˜å¸®ä½ å‡çº§.',
     54 => 'é”™è¯¯çš„æ•°æ®åº“èµ„æ–™',
     55 => 'æŠ±æ‰, æ•°æ®åº“èµ„æ–™å¥½åƒä¸å‡†ç¡®. è¯·å›žåŽ»å†è¯•ä¸€æ¬¡.',
diff -r 0021451d31d4 -r 5f9005f9c657 public_html/admin/install/language/chinese_traditional_utf-8.php
--- a/public_html/admin/install/language/chinese_traditional_utf-8.php	Sun Sep 06 10:23:14 2009 +0200
+++ b/public_html/admin/install/language/chinese_traditional_utf-8.php	Sun Sep 06 11:00:27 2009 +0200
@@ -54,8 +54,8 @@
     1 => 'å®‰è£æ”¯åŠ©',
     2 => 'çµ‚æ¥µç¶²å¿—ç³»çµ±',
     3 => 'å¿—æ¨‚å®‰è£',
-    4 => 'éœ€è¦PHP 4.3.0',
-    5 => 'æŠ±æ‰, å¿—æ¨‚è¦æ±‚æœ€å°‘ PHP 4.3.0 ä¾†æ“ä½œ(ä½ æœ‰çš„æ˜¯',
+    4 => 'éœ€è¦PHP %s',
+    5 => 'æŠ±æ‰, å¿—æ¨‚è¦æ±‚æœ€å°‘ PHP %s ä¾†æ“ä½œ(ä½ æœ‰çš„æ˜¯',
     6 => '). è«‹ <a href="http://www.php.net/downloads.php">å‡ç´šPHP</a> å®‰è£ æˆ–è«‹ä½ çš„ç¶²ç«™æœå‹™å“¡å¹«ä½ å®‰è£.',
     7 => 'æ‰¾ä¸åˆ°å¿—æ¨‚æª”æ¡ˆ',
     8 => 'å®‰è£ç³»çµ±ç„¡æ³•æ‰¾åˆ°é—œéµçš„å¿—æ¨‚æª”æ¡ˆ. ä¹Ÿè¨±ä½ å°‡å®ƒå€‘æ¬ç§»éŽ. è«‹æŒ‡å®šæ‰€éœ€æª”æ¡ˆå’Œç›®éŒ„çš„è·¯å¾‘:',
@@ -101,8 +101,8 @@
     48 => 'ç¶²ç«™é›»éƒµ',
     49 => 'ç¶²ç«™çš„ ä¸å¯å›žä¿¡çš„é›»éƒµ',
     50 => 'å®‰è£',
-    51 => 'éœ€è¦ MySQL 3.23.2',
-    52 => 'æŠ±æ‰, å¿—æ¨‚éœ€è¦æœ€å°‘ MySQL 3.23.2 ä¾†æ“ä½œ (ä½ æœ‰çš„æ˜¯ ',
+    51 => 'éœ€è¦ MySQL %s',
+    52 => 'æŠ±æ‰, å¿—æ¨‚éœ€è¦æœ€å°‘ MySQL %s ä¾†æ“ä½œ (ä½ æœ‰çš„æ˜¯ ',
     53 => '). è«‹ <a href="http://dev.mysql.com/downloads/mysql/">å‡ç´šä½ çš„MySQL</a> å®‰è£ æˆ–è«‹ä½ çš„ç¶²ç«™ä¸»æ©Ÿæœå‹™å“¡å¹«ä½ å‡ç´š.',
     54 => 'éŒ¯èª¤çš„è³‡æ–™åº«è³‡æ–™',
     55 => 'æŠ±æ‰, è³‡æ–™åº«è³‡æ–™å¥½åƒä¸æº–ç¢º. è«‹å›žåŽ»å†è©¦ä¸€æ¬¡.',
diff -r 0021451d31d4 -r 5f9005f9c657 public_html/admin/install/language/english.php
--- a/public_html/admin/install/language/english.php	Sun Sep 06 10:23:14 2009 +0200
+++ b/public_html/admin/install/language/english.php	Sun Sep 06 11:00:27 2009 +0200
@@ -53,8 +53,8 @@
     1 => 'Installation Support',
     2 => 'The Ultimate Weblog System',
     3 => 'Geeklog Installation',
-    4 => 'PHP 4.3.0 required',
-    5 => 'Sorry, but Geeklog requires at least PHP 4.3.0 to run (you have version ',
+    4 => 'PHP %s required',
+    5 => 'Sorry, but Geeklog requires at least PHP %s to run (you have version ',
     6 => '). Please <a href="http://www.php.net/downloads.php">upgrade your PHP</a> install or ask your hosting service to do it for you.',
     7 => 'Unable to locate Geeklog files',
     8 => 'The installer was unable to locate critical Geeklog files. This is probably because you have moved them from their default location. Please specify the paths to the files and directories below:',
@@ -100,8 +100,8 @@
     48 => 'Site Email',
     49 => 'Site No-Reply Email',
     50 => 'Install',
-    51 => 'MySQL 3.23.2 or newer required',
-    52 => 'Sorry, but Geeklog requires at least MySQL 3.23.2 to run (you have version ',
+    51 => 'MySQL %s or newer required',
+    52 => 'Sorry, but Geeklog requires at least MySQL %s to run (you have version ',
     53 => '). Please <a href="http://dev.mysql.com/downloads/mysql/">upgrade your MySQL</a> install or ask your hosting service to do it for you.',
     54 => 'Incorrect database information',
     55 => 'Sorry, but the database information you entered does not appear to be correct. Please go back and try again.',
diff -r 0021451d31d4 -r 5f9005f9c657 public_html/admin/install/language/german.php
--- a/public_html/admin/install/language/german.php	Sun Sep 06 10:23:14 2009 +0200
+++ b/public_html/admin/install/language/german.php	Sun Sep 06 11:00:27 2009 +0200
@@ -53,8 +53,8 @@
     1 => 'Hilfe zur Installation',
     2 => 'Zuverlässigkeit eingebaut',
     3 => 'Geeklog-Installation',
-    4 => 'PHP 4.3.0 benötigt',
-    5 => 'Sorry, Geeklog benötigt mindestens PHP 4.3.0 (Du hast Version ',
+    4 => 'PHP %s benötigt',
+    5 => 'Sorry, Geeklog benötigt mindestens PHP %s (Du hast Version ',
     6 => '). Bitte <a href="http://www.php.net/downloads.php">aktualisiere Deine PHP-Installation</a> oder bitte Deinen Hosting-Provider darum.',
     7 => 'Geeklog-Dateien nicht gefunden',
     8 => 'Das Installations-Skript hat einige wichtige Geeklog-Dateien nicht gefunden. Wahrscheinlich hast Du diese in andere Verzeichnisse verschoben. Bitte gib hier die Pfade zu den Dateien und Verzeichnissen an:',
@@ -100,8 +100,8 @@
     48 => 'Website-Email-Adresse',
     49 => '"No Reply"-Email-Adresse',
     50 => 'Installieren',
-    51 => 'MySQL 3.23.2 benötigt',
-    52 => 'Sorry, aber Geeklog setzt mindestens MySQL 3.23.2 voraus (Du hast Version ',
+    51 => 'MySQL %s benötigt',
+    52 => 'Sorry, aber Geeklog setzt mindestens MySQL %s voraus (Du hast Version ',
     53 => '). Bitte <a href="http://dev.mysql.com/downloads/mysql/">aktualisiere Deine MySQL-Version</a> oder bitte Deinen Website-Hoster, es für Dich zu erledigen.',
     54 => 'Datenbank-Informationen unvollständig oder nicht korrekt.',
     55 => 'Sorry, aber die Datenbank-Informationen, die Du eingegeben hast, scheinen nicht korrekt zu sein. Bitte klicke auf "Zurück" und versuche es noch einmal.',
diff -r 0021451d31d4 -r 5f9005f9c657 public_html/admin/install/language/hebrew_utf-8.php
--- a/public_html/admin/install/language/hebrew_utf-8.php	Sun Sep 06 10:23:14 2009 +0200
+++ b/public_html/admin/install/language/hebrew_utf-8.php	Sun Sep 06 11:00:27 2009 +0200
@@ -49,8 +49,8 @@
     1 => '×ª×ž×™×›×ª ×”×ª×§× ×”',
     2 => 'The Ultimate Weblog System',
     3 => '×”×ª×§× ×ª Geeklog',
-    4 => '×“×¨×•×© PHP 4.3.0',
-    5 => '×ž×¦×˜×¢×¨×™×, ××‘×œ Geeklog ×“×•×¨×© ×œ×¤×—×•×ª PHP 4.3.0 ×‘×©×‘×™×œ ×œ×¨×•×¥ (×œ×›× ×™×© ×’×™×¨×¡×” ',
+    4 => '×“×¨×•×© PHP %s',
+    5 => '×ž×¦×˜×¢×¨×™×, ××‘×œ Geeklog ×“×•×¨×© ×œ×¤×—×•×ª PHP %s ×‘×©×‘×™×œ ×œ×¨×•×¥ (×œ×›× ×™×© ×’×™×¨×¡×” ',
     6 => '). ×× × <a href="http://www.php.net/downloads.php">×©×“×¨×’×• ××ª ×’×™×¨×¡×ª ×”-PHP ×©×œ×›×</a> ××• ×‘×§×©×• ×ž×ž××¨×—×™ ×”×©×¨×ª ×©×œ×›× ×œ×¢×©×•×ª ×–××ª ×‘×©×‘×™×œ×›×.',
     7 => '×œ× ××•×ª×¨×• ×”×§×‘×¦×™× ×©×œ Geeklog',
     8 => '×”×”×ª×§× ×” ×œ× ×”×¦×œ×™×—×” ×œ××ª×¨ ××ª ×”×§×‘×¦×™× ×”×—×©×•×‘×™× ×©×œ Geeklog. ×–×” ×›× ×¨××” ×ž×¤× ×™ ×©×”×™×–×–×ª× ××•×ª× ×ž×ž×™×§×•× ×‘×¨×™×¨×ª ×”×ž×—×“×œ ×©×œ×”×. ×× × ×¦×™×™× ×• ××ª ×”× ×ª×™×‘×™× ×œ×§×‘×¦×™× ×•×œ×¡×¤×¨×™×•×ª ×œ×”×œ×Ÿ:',
@@ -96,8 +96,8 @@
     48 => '×›×ª×•×‘×ª ×”××™×ž×™×™×œ ×©×œ ×”××ª×¨',
     49 => '×›×ª×•×‘×ª ×”××™×ž×™×™×œ ×©×œ No-Reply',
     50 => '×”×ª×§× ×”',
-    51 => '× ×“×¨×© MySQL 3.23.2 ××• ×™×•×ª×¨ ×—×“×©',
-    52 => '×ž×¦×˜×¢×¨×™×, ××š Geeklog ×“×•×¨×© ×œ×¤×—×•×ª MySQL 3.23.2 ×›×“×™ ×œ×¨×•×¥ (×œ×›× ×™×© ×’×™×¨×¡×” ',
+    51 => '× ×“×¨×© MySQL %s ××• ×™×•×ª×¨ ×—×“×©',
+    52 => '×ž×¦×˜×¢×¨×™×, ××š Geeklog ×“×•×¨×© ×œ×¤×—×•×ª MySQL %s ×›×“×™ ×œ×¨×•×¥ (×œ×›× ×™×© ×’×™×¨×¡×” ',
     53 => '). ×× × <a href="http://dev.mysql.com/downloads/mysql/">×©×“×¨×’×• ××ª ×’×™×¨×¡×ª ×”-MySQL ×©×œ×›×</a> ××• ×‘×§×©×• ×ž×ž××¨×—×™ ×”×©×¨×ª ×©×œ×›× ×œ×¢×©×•×ª ×–××ª ×‘×©×‘×™×œ×›×.',
     54 => '×ž×™×“×¢ ×ž××’×¨ ×”×ž×™×“×¢ ××™× ×• × ×›×•×Ÿ',
     55 => '×ž×¦×˜×¢×¨×™×, ××š ×ž×™×“×¢ ×ž××’×¨ ×”×ž×™×“×¢ ×©×¦×™×™× ×ª× × ×¨××” ×©×’×•×™. ×× × ×—×™×–×¨×• ×•× ×¡×• ×©×•×‘.',
diff -r 0021451d31d4 -r 5f9005f9c657 public_html/admin/install/language/japanese_utf-8.php
--- a/public_html/admin/install/language/japanese_utf-8.php	Sun Sep 06 10:23:14 2009 +0200
+++ b/public_html/admin/install/language/japanese_utf-8.php	Sun Sep 06 11:00:27 2009 +0200
@@ -55,8 +55,8 @@
     1 => 'ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã§å›°ã£ãŸã‚‰ã€ã“ã¡ã‚‰ã®ã‚µã‚¤ãƒˆã¸',
     2 => 'The Ultimate Weblog System',
     3 => 'Geeklogã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹',
-    4 => 'PHP 4.3.0ä»¥ä¸ŠãŒå¿
è¦ã§ã™',
-    5 => 'æ®‹å¿µãªãŒã‚‰Geeklogã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹ã«ã¯æœ€ä½Žã§ã‚‚PHP 4.3.0ãŒå¿
è¦ã§ã™(ç¾åœ¨ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯ ',
+    4 => 'PHP %sä»¥ä¸ŠãŒå¿
è¦ã§ã™',
+    5 => 'æ®‹å¿µãªãŒã‚‰Geeklogã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹ã«ã¯æœ€ä½Žã§ã‚‚PHP %sãŒå¿
è¦ã§ã™(ç¾åœ¨ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯ ',
     6 => ')ã€‚è‡ªåˆ†ã§<a href="http://www.php.net/downloads.php">PHPã‚’ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚¢ãƒƒãƒ—ã™ã‚‹</a>ã‹ã€ãƒ›ã‚¹ãƒ†ã‚£ãƒ³ã‚°ä¼šç¤¾ã«ä¾é ¼ã—ã¦ãã ã•ã„ã€‚',
     7 => 'Geeklogãƒ•ã‚¡ã‚¤ãƒ«ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“',
     8 => 'Geeklogã®é‡è¦ãªãƒ•ã‚¡ã‚¤ãƒ«ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã€‚ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®ä½ç½®ã‹ã‚‰ç§»å‹•ã•ã›ã¦ã„ã‚‹ã¨æ€ã‚ã‚Œã¾ã™ã€‚ä¸‹ã®ãƒ†ã‚ã‚¹ãƒˆãƒœãƒƒã‚¯ã‚¹ã«ãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒ‘ã‚¹ã‚’å
¥åŠ›ã—ã¦ãã ã•ã„ã€‚:',
@@ -102,8 +102,8 @@
     48 => 'ã‚µã‚¤ãƒˆã®Email',
     49 => 'ã‚µã‚¤ãƒˆã®No-Reply Email',
     50 => 'ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«',
-    51 => 'å°‘ãªãã¨ã‚‚MySQL 3.23.2ãŒå¿
è¦ã§ã™',
-    52 => 'æ®‹å¿µãªãŒã‚‰Geeklogã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹ã«ã¯æœ€ä½Žã§ã‚‚MySQL 3.23.2ãŒå¿
è¦ã§ã™(ç¾åœ¨ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯ ',
+    51 => 'å°‘ãªãã¨ã‚‚MySQL %sãŒå¿
è¦ã§ã™',
+    52 => 'æ®‹å¿µãªãŒã‚‰Geeklogã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹ã«ã¯æœ€ä½Žã§ã‚‚MySQL %sãŒå¿
è¦ã§ã™(ç¾åœ¨ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯ ',
     53 => ')ã€‚è‡ªåˆ†ã§<a href="http://dev.mysql.com/downloads/mysql/">MySQLã‚’ã‚¢ãƒƒãƒ—ã‚°ãƒ¬ãƒ¼ãƒ‰ã™ã‚‹</a>ã‹ã€ãƒ›ã‚¹ãƒ†ã‚£ãƒ³ã‚°ä¼šç¤¾ã«ä¾é ¼ã—ã¦ãã ã•ã„ã€‚',
     54 => 'ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹æƒ
å ±ãŒä¸æ£ç¢ºã§ã™',
     55 => 'æ®‹å¿µãªãŒã‚‰å
¥åŠ›ã—ãŸãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹æƒ
å ±ãŒä¸æ£ç¢ºã§ã™ã€‚æˆ»ã£ã¦ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„ã€‚',
diff -r 0021451d31d4 -r 5f9005f9c657 public_html/admin/install/language/polish.php
--- a/public_html/admin/install/language/polish.php	Sun Sep 06 10:23:14 2009 +0200
+++ b/public_html/admin/install/language/polish.php	Sun Sep 06 11:00:27 2009 +0200
@@ -53,8 +53,8 @@
     1 => 'Instalacja Pomoc',
     2 => 'The Ultimate Weblog System',
     3 => 'Geeklog - Instalacja',
-    4 => 'Wymagane PHP 4.3.0',
-    5 => 'Sorry, ale Geeklog wymaga do uruchomienia co najmniej PHP 4.3.0 (wersja zainstalowana to ',
+    4 => 'Wymagane PHP %s',
+    5 => 'Sorry, ale Geeklog wymaga do uruchomienia co najmniej PHP %s (wersja zainstalowana to ',
     6 => '). Proszê <a href="http://www.php.net/downloads.php">uaktualniæ wersjê PHP</a> lub zg³osiæ to do swojego providera hostingu.',
     7 => 'Nie mo¿na zlokalizowaæ plików Geeklog-a',
     8 => 'The installation script was unable to locate critical Geeklog files. This is probably because you have moved them from their default location. Please specify the paths to the files and directories below:',
@@ -100,8 +100,8 @@
     48 => 'Adres email strony',
     49 => 'Bezzwrotny adres email strony',
     50 => 'Instaluj',
-    51 => 'Wymagana baza MySQL 3.23.2',
-    52 => 'Sorry, but Geeklog requires at least MySQL 3.23.2 to run (you have version ',
+    51 => 'Wymagana baza MySQL %s',
+    52 => 'Sorry, but Geeklog requires at least MySQL %s to run (you have version ',
     53 => '). Please <a href="http://dev.mysql.com/downloads/mysql/">upgrade your MySQL</a> install or ask your hosting service to do it for you.',
     54 => 'Ba³êdne informacje o bazie danych',
     55 => 'Sorry, but the database information you entered does not appear to be correct. Please go back and try again.',
diff -r 0021451d31d4 -r 5f9005f9c657 public_html/admin/install/lib-install.php
--- a/public_html/admin/install/lib-install.php	Sun Sep 06 10:23:14 2009 +0200
+++ b/public_html/admin/install/lib-install.php	Sun Sep 06 11:00:27 2009 +0200
@@ -64,6 +64,9 @@
 if (!defined('SUPPORTED_PHP_VER')) {
     define('SUPPORTED_PHP_VER', '4.3.0');
 }
+if (!defined('SUPPORTED_MYSQL_VER')) {
+    define('SUPPORTED_MYSQL_VER', '3.23.2');
+}
 
 $_REQUEST = array_merge($_GET, $_POST);
 
@@ -273,14 +276,20 @@
  */
 function INST_mysqlOutOfDate($db)
 {
+    $minv = explode('.', SUPPORTED_MYSQL_VER);
+
     if ($db['type'] == 'mysql' || $db['type'] == 'mysql-innodb') {
         $myv = mysql_v($db['host'], $db['user'], $db['pass']);
-        if (($myv[0] < 3) || (($myv[0] == 3) && ($myv[1] < 23)) ||
-                (($myv[0] == 3) && ($myv[1] == 23) && ($myv[2] < 2))) {
+
+        if (($myv[0] <  $minv[0]) ||
+           (($myv[0] == $minv[0]) && ($myv[1] <  $minv[1])) ||
+           (($myv[0] == $minv[0]) && ($myv[1] == $minv[1]) && ($myv[2] < $minv[2]))) {
+
             return true;
         }
-        return false;
     }
+
+    return false;
 }
 
 /**
diff -r 0021451d31d4 -r 5f9005f9c657 public_html/admin/install/migrate.php
--- a/public_html/admin/install/migrate.php	Sun Sep 06 10:23:14 2009 +0200
+++ b/public_html/admin/install/migrate.php	Sun Sep 06 11:00:27 2009 +0200
@@ -258,8 +258,8 @@
 if (INST_phpOutOfDate()) {
 
     // If their version of PHP is not supported, print an error:
-    $display .= '<h1>' . $LANG_INSTALL[4] . '</h1>' . LB;
-    $display .= '<p>' . $LANG_INSTALL[5] . $phpv[0] . '.' . $phpv[1] . '.' . (int) $phpv[2] . $LANG_INSTALL[6] . '</p>' . LB;
+    $display .= '<h1>' . sprintf($LANG_INSTALL[4], SUPPORTED_PHP_VER) . '</h1>' . LB;
+    $display .= '<p>' . sprintf($LANG_INSTALL[5], SUPPORTED_PHP_VER) . $phpv[0] . '.' . $phpv[1] . '.' . (int) $phpv[2] . $LANG_INSTALL[6] . '</p>' . LB;
 
 } else {
 
@@ -483,7 +483,8 @@
             // (needs to connect to MySQL in order to check)
             if (INST_mysqlOutOfDate($DB)) {
 
-                $display .= INST_getAlertMsg($LANG_INSTALL[51]);
+                $display .= INST_getAlertMsg(sprintf($LANG_INSTALL[51],
+                                                     SUPPORTED_MYSQL_VER));
                 $import_errors++;
 
             } 

