Added setup-auth to tests.

Author: shannah

.travis/test_create.sh

@@ -17,3 +17,4 @@ trap print_errors EXIT
 php $XATAFACE/tools/create.php testapp
 cd testapp/bin
 bash install-module.sh calendar 1.0
+bash setup-auth.sh

Dataface/Application.php

@@ -890,7 +890,11 @@ function __construct($conf = null) {
 			$_REQUEST['-lang'] = basename($_REQUEST['-lang']);
 			$this->_conf['lang'] = $_REQUEST['-lang'];
 			if ( @$_COOKIE[$prefix.'lang'] !== $_REQUEST['-lang'] ){
-				setcookie($prefix.'lang', $_REQUEST['-lang'], null, '/');
+				if (php_sapi_name() === 'cli') {
+					//fwrite(STDERR, "\nNOTICE: Running in CLI mode mode, so not setting language cookie\n");
+				} else {
+					setcookie($prefix.'lang', $_REQUEST['-lang'], null, '/');
+				}
 			}
 		} else if (isset( $_COOKIE[$prefix.'lang']) ){
 			$this->_conf['lang'] = $_COOKIE[$prefix.'lang'];
@@ -902,7 +906,11 @@ function __construct($conf = null) {
 					$this->getAvailableLanguages()
 				)
 			);
-			setcookie($prefix.'lang', $this->_conf['lang'], null, '/');
+			if (php_sapi_name() === 'cli') {
+				//fwrite(STDERR, "\nNOTICE: Running in CLI mode so not setting the lang cookie.\n");
+			} else {
+				setcookie($prefix.'lang', $this->_conf['lang'], null, '/');
+			}
 		}
 
 		$this->_conf['lang'] = basename($this->_conf['lang']);

public-api.php

@@ -875,8 +875,8 @@ function df_q($sql){
 		} else {
 			$res = xf_db_query($sql, df_db());
 			if ( !$res ){
-				error_log("Error executing SQL: $sql");
-				error_log(xf_db_error(df_db()));
+				//error_log("Error executing SQL: $sql");
+				//error_log(xf_db_error(df_db()));
 				throw new Exception(xf_db_error(df_db()));
 			}
 			return $res;

scaffold_template/bin/inc/setup-auth.php

@@ -1,4 +1,5 @@
 <?php
+echo "Setting up authentication on app...\n";
 chdir(dirname(__FILE__).'/../../app');
 require_once 'xataface/public-api.php';
 df_init(dirname(__FILE__).'/../../app/index.php', 'xataface');
@@ -144,14 +145,14 @@
 
 echo "Adding default admin user...";
 chdir("../bin");
-exec("sh add-user.sh admin '[email protected]' ADMIN password", $buffer, $res);
+exec("bash add-user.sh admin '[email protected]' ADMIN password", $buffer, $res);
 if ($res !== 0) {
     fwrite(STDERR, "Failed\n");
     print_r($buffer);
     exit(1);
 }
-echo "Done.  User 'admin' created with password 'password'\n";
-echo "You should change this user's password after logging in.";
+echo "Done.\nUser 'admin' created with password 'password'\n";
+echo "You should change this user's password after logging in.\n";
 chdir("../app");
 
 

scaffold_template/bin/setup-auth.sh

@@ -1,13 +1,19 @@
 #!/bin/bash
+echo "Setting up auth..."
+set -e
 SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
 TABLES_DIR=$SCRIPTPATH/../app/tables
 [ -d "$TABLES_DIR" ] || mkdir "$TABLES_DIR"
-
-status=`bash $SCRIPTPATH/mysql.server.sh status`
-if [[ $status == *"ERROR!"* ]]; then
-    $SCRIPTPATH/mysql.server.sh start || (echo "Failed to start mysql" && exit 1)
+echo "Checking mysql server status..."
+set +e
+bash $SCRIPTPATH/mysql.server.sh status
+status=$?
+set -e
+echo "$status\n"
+if [[ $status != 0 ]]; then
+    bash $SCRIPTPATH/mysql.server.sh start || (echo "Failed to start mysql" && exit 1)
     function finish() {
-        $SCRIPTPATH/mysql.server stop
+        bash $SCRIPTPATH/mysql.server.sh stop
     }
     trap finish EXIT
 fi