[xoops-svn] SF.net SVN: xoops-svn:[12598] XoopsCore/branches/2.5.x/2.5.7

[<be...@us...>]

Revision: 12598
          http://sourceforge.net/p/xoops/svn/12598
Author:   beckmi
Date:     2014-06-15 03:34:59 +0000 (Sun, 15 Jun 2014)
Log Message:
-----------
removing hard-coded text in Installation

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
    XoopsCore/branches/2.5.x/2.5.7/docs/lang_diff.txt
    XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/functions.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/install.php

Modified: XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt	2014-06-14 18:08:20 UTC (rev 12597)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt	2014-06-15 03:34:59 UTC (rev 12598)
@@ -13,6 +13,7 @@
 - deprecated destoryVars($var) in object.php (cesag/rgriffith)
 - update phpmailer translation array to include all keys, and remove reassignment of $PHPMAILER_LANG as array() (cesag/rgriffith)
 - added XoopsRequest class (rgriffith)
+- removed hard-coded text from installation (mamba)
 
 Updated:
  - TinyMCE to 3.5.11 (mamba)

Modified: XoopsCore/branches/2.5.x/2.5.7/docs/lang_diff.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/docs/lang_diff.txt	2014-06-14 18:08:20 UTC (rev 12597)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/lang_diff.txt	2014-06-15 03:34:59 UTC (rev 12598)
@@ -4,6 +4,14 @@
 Below are language differences from a version to next version.
 
 ===============================
+2014/06/14: Version 2.5.7 Final
+===============================
+ADDED/DELETED DEFINES
+
+/install/language/english/install.php
+- added define('WRITTEN_LICENSE',"Written XOOPS %s License Key: <strong>%s</strong>");
+
+===============================
 2014/03/18: Version 2.5.7 RC1
 ===============================
 ADDED/DELETED DEFINES

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/functions.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/functions.php	2014-06-14 18:08:20 UTC (rev 12597)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/functions.php	2014-06-15 03:34:59 UTC (rev 12598)
@@ -183,7 +183,8 @@
         $error = !is_writeable($path);
     }
 
-    return xoDiag($error ? -1 : 1, $error ? 'Not writable' : 'Writable');
+    return xoDiag($error ? -1 : 1, $error ? ' ' : ' ');
+
 }
 
 /**
@@ -454,7 +455,7 @@
     fclose($fver);
     chmod($licensefile, 0444);
 
-    return "Written XOOPS " . XOOPS_LICENSE_CODE . " License Key: <strong>{$system_key}</strong>";
+    return sprintf(WRITTEN_LICENSE, XOOPS_LICENSE_CODE, $system_key);
 }
 
 /**

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/install.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/install.php	2014-06-14 18:08:20 UTC (rev 12597)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/install.php	2014-06-15 03:34:59 UTC (rev 12598)
@@ -18,8 +18,8 @@
 // Translator: XOOPS Translation Team
 define('SHOW_HIDE_HELP',"Show/hide help text");
 // License
-define('LICENSE_NOT_WRITEABLE','License is %s . <br/><span style="colour:#ff0000">Make ../include/license.php Writable</span>');
-define('LICENSE_IS_WRITEABLE','License is %s');
+define('LICENSE_NOT_WRITEABLE','%s License is NOT writable! <br/><span style="colour:#ff0000">Make ../include/license.php Writable</span>');
+define('LICENSE_IS_WRITEABLE','%s License is writable.');
 // Configuration check page
 define('SERVER_API',"Server API");
 define('PHP_EXTENSION',"%s extension");
@@ -178,3 +178,5 @@
 define('PASSWORD_MEDIUM',"Medium");
 define('PASSWORD_STRONG',"Strong");
 define('PASSWORD_STRONGEST',"Strongest");
+//2.5.7
+define('WRITTEN_LICENSE',"Written XOOPS %s License Key: <strong>%s</strong>");