Merge remote-tracking branch 'origin/changes-part-1a' into changes-part-1

Author: DanProgs

install/installCheck.php

@@ -25,7 +25,7 @@
 
 $inst_phase = 'checking';  // global variable -> absolutely wrong use as usual, used on installHead.inc
 $msg='';
-include 'installHead.inc';
+include_once 'installHead.inc';
 ?>
 <div class="tlStory">
 
@@ -72,5 +72,5 @@
 <?php
 }
 
-include 'installFooter.inc';
+include_once 'installFooter.inc';
 ?>

install/installDbInput.php

@@ -24,7 +24,7 @@
 
 $msg='';
 $inst_phase = 'dbaccess';  // global variable -> absolutely wrong use as usual, used on installHead.inc
-include 'installHead.inc';
+include_once 'installHead.inc';
 ?>
 <div class="tlStory">
 
@@ -210,7 +210,7 @@ function validate() {
     </p>
 
     <p>
-      <?php 
+      <?php
       if ($_SESSION['isNew']) {
           echo 'After successfull installation You will' . ' have the following login for TestLink Administrator:<br />' . 'login name: admin <br /> password  : admin';
       }
@@ -223,4 +223,4 @@ function validate() {
   </form>
 
 </div>
-<?php include 'installFooter.inc'; ?>
+<?php include_once 'installFooter.inc'; ?>

install/installHead.inc

@@ -42,8 +42,8 @@ function getPhaseAttr($inst_phase, $phase)
   <li<?php echo getPhaseAttr($inst_phase,'dbaccess')?> >Definition of DB access</li>
   <li<?php echo getPhaseAttr($inst_phase,'dbprocess')?> >
   <?php if ($_SESSION['isNew'])
-  echo "Create DB, testlink DB user, structures and default data & create configuration file.";
-  else echo "Update DB structures and migrate data."; ?>
+  {echo "Create DB, testlink DB user, structures and default data & create configuration file.";}
+  else {echo "Update DB structures and migrate data.";} ?>
   </li>
   <li<?php echo getPhaseAttr($inst_phase,'final') ?>>Verify the procedure result and continue
       to TestLink login.</li>

install/installIntro.php

@@ -44,7 +44,7 @@
 	exit;
 }
 
-include 'installHead.inc';
+include_once 'installHead.inc';
 ?>
 <div class="tlStory">
 <p><b>TestLink</b> is developed and shared under GPL license. You are welcome to share your changes
@@ -96,4 +96,4 @@ function ableButton() {
 <p>
 
 </div>
-<?php include 'installFooter.inc'; ?>
+<?php include_once 'installFooter.inc'; ?>

install/installNewDB.php

@@ -210,7 +210,7 @@
 }
 
 $db = new database($dbDriverName);
-define('NO_DSN',FALSE);
+define('NO_DSN',false);
 @$conn_result = $db->connect(NO_DSN,$db_server, $db_admin_name, $db_admin_pass);
 
 if( $conn_result['status'] == 0 )  {
@@ -264,7 +264,7 @@
   $db->close();
   $db = null;
 
-  $db = New database($dbDriverName);
+  $db = new database($dbDriverName);
   $conn_result=$db->connect(NO_DSN,$db_server, $db_admin_name, $db_admin_pass);
   echo "<br /><b>Creating database `" . $db_name . "`</b>:";
 
@@ -502,7 +502,7 @@
 }
 
 
-if($sqlParser->install_failed==true)
+if($sqlParser->install_failed)
 {
   echo "<span class='notok'>Failed!</span></b> - {$inst_type_verbose} failed!";
   $errors += 1;
@@ -629,7 +629,7 @@ function write_config_db($filename, $data)
   }
 
   // Write $somecontent to our opened file.
-  if (@fwrite($handle, $configString) === FALSE)
+  if (@fwrite($handle, $configString) === false)
   {
     $ret['status'] = 'ko';
   }

install/installUtils.php

@@ -511,11 +511,11 @@ function _mysql_make_user($dbhandler,$db_host,$db_name,$login,$passwd) {
   $isMariaDB = false;
   $isMySQL = false;
   foreach ($vg as $vn => $vv) {
-    if (strripos($vv,'MariaDB') !== FALSE) {
+    if (strripos($vv,'MariaDB') !== false) {
        $isMariaDB = true;
        break;
     }
-    if (strripos($vv,'MySQL') !== FALSE) {
+    if (strripos($vv,'MySQL') !== false) {
        $isMySQL = true;
        break;
     }
@@ -880,7 +880,7 @@ function _mssql_make_user($db,$the_host,$db_name,$login,$passwd)
   // I've problems trying to set password,
   // then I will use as workaround setting a NULL password
   // and after do a password change.
-  $passwd_null=NULL;
+  $passwd_null=null;
   $stmt = $db->db->PrepareSP('SP_PASSWORD');
   $db->db->InParameter($stmt,$login,'loginame');
   $db->db->InParameter($stmt,$passwd_null,'old');