install messages persist, some colour coordination

diff --git a/index.php b/index.php
index e858fcc974f6249460926d8ce8a4f0c83e14717a..6c1302486863e26473c30c12da25687772f7dcbc 100644 (file)
--- a/index.php
+++ b/index.php
@@ -17,7 +17,7 @@ if(isset($lang) && strlen($lang))
 
 require_once("dba.php");
 $db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
-       unset($db_host, $db_user, $db_pass, $db_data);
+        unset($db_host, $db_user, $db_pass, $db_data);
 
 if(! $install)
        require_once("session.php");

diff --git a/mod/install.php b/mod/install.php
index 67c1a479ebcbeff0464832bbbc1574042300380d..5e0a3ee90d5d4004646ac5989b747cf4e454bef4 100644 (file)
--- a/mod/install.php
+++ b/mod/install.php
@@ -44,8 +44,11 @@ function install_post(&$a) {
                // that you'll see the following important notice (which is stored in the session). 
 
                session_write_close();
+
                require_once('session.php');
                session_start();
+               session_regenerate_id();
+
                $_SESSION['sysmsg'] = '';
 
                notice( t('Database import succeeded.') . EOL 
@@ -94,12 +97,11 @@ function install_content(&$a) {
 }
 
 function check_php(&$phpath) {
+       $o = '';
        $phpath = trim(shell_exec('which php'));
        if(! strlen($phpath)) {
-               $o .= <<< EOT
-Could not find a command line version of PHP in the web server PATH. This is required. Please adjust the configuration file .htconfig.php accordingly.
-
-EOT;
+               $o .= t('Could not find a command line version of PHP in the web server PATH.');
+               $o .= t('This is required. Please adjust the configuration file .htconfig.php accordingly.');
        }
        return $o;
 }
@@ -109,16 +111,10 @@ function check_htconfig() {
        if(((file_exists('.htconfig.php')) && (! is_writable('.htconfig.php')))
                || (! is_writable('.'))) {
 
-$o .= <<< EOT
-
-The web installer needs to be able to create a file called ".htconfig.php" in the top folder of 
-your web server. It is unable to do so. This is most often a permission setting, as the web server 
-may not be able to write files in your folder (even if you can).
-
-Please check with your site documentation or support people to see if this situation can be corrected. 
-If not, you may be required to perform a manual installation. Please see the file "INSTALL" for instructions. 
-
-EOT;
+               $o = t('The web installer needs to be able to create a file called ".htconfig.php" in the top folder of your web server and it is unable to do so.');
+               $o .= t('This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can.');
+               $o .= t('Please check with your site documentation or support people to see if this situation can be corrected.');
+               $o .= t('If not, you may be required to perform a manual installation. Please see the file "INSTALL" for instructions.'); 
        }
 
 return $o;
@@ -126,12 +122,9 @@ return $o;
 
        
 function manual_config(&$a) {
-$o .= <<< EOT
-The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.
-
-<textarea rows="24" cols="80" >{$a->data}</textarea>
-EOT;
-return $o;
+       $o = t('The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.');
+       $o .= "<textarea rows=\"24\" cols=\"80\" >{$a->data}</textarea>";
+       return $o;
 }
 
 

diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index 1f09501c122b18690c0960c9991680a7416ddd43..9dc9d6339e70c91c8dfafa036d93ef66bf3027e3 100644 (file)
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -24,7 +24,7 @@ a, a:visited {
        text-decoration: none;
 }
 a:hover {
-       color: #29BBF2;
+       color: #0CBEFE;
        text-decoration: none;
 }
 input, select {
@@ -33,7 +33,7 @@ input, select {
 }
 input:hover {
 
-       background-color: #29BBF2;
+       background-color: #0CBEFE;
 /*     background-color: #49dbFa; */
        color: black;
 /*     color: #F5F6FB; */
@@ -76,7 +76,7 @@ blockquote:before {
        border: 1px solid #858585;
 }
 #notification-show-hide-link:hover {
-       background-color: #29BBF2;
+       background-color: #0CBEFE;
        color: #F5F6FB;
        border: 1px solid #F5F6FB;
 }
@@ -105,7 +105,7 @@ blockquote:before {
 }
 
 .fakelink:hover {
-       color: #29BBF2;
+       color: #0CBEFE;
        text-decoration: none;
        cursor: pointer;
 }
@@ -206,7 +206,7 @@ footer {
        /*margin: 20px 20px 20px 20px;*/
 
        position: fixed;
-       background-color: #29BBF2;
+       background-color: #0CBEFE;
        width: 100%;
        padding: 2px 3%;
 }
@@ -226,7 +226,7 @@ footer {
        font-weight: bold;
 }
 .powered a:hover {
-       color: #F8FF15;
+       color: #FFC019;
 }
 .error-message {
        color: #FF0000;
@@ -253,7 +253,7 @@ footer {
        border-radius-topright: 3px;
 }
 .nav-link:hover {
-       background-color: #29BBF2;
+       background-color: #0CBEFE;
        color: #F5F6FB;
 }
 
@@ -308,7 +308,7 @@ footer {
        border-radius-topright: 3px;
 }
 .nav-commlink:hover {
-       background-color: #29BBF2;
+       background-color: #0CBEFE;
        color: #F5F6FB;
 }
 
@@ -1320,7 +1320,7 @@ input#dfrn-url {
        border: 1px solid #858585;
 }
 .profile-tabs:hover {
-       background-color: #29BBF2;
+       background-color: #0CBEFE;
        color: #F5F6FB;
        border: 1px solid #F5F6FB;
        /*cursor: pointer;*/
@@ -1548,7 +1548,7 @@ a.mail-list-link:hover {
        /*display: block;*/
 }
 .message-links a:hover {
-       background-color: #29BBF2;
+       background-color: #0CBEFE;
        color: #F5F6FB;
        /*border: 1px solid #F5F6FB;*/
 }