diff --git a/app/Views/welcome_message.php b/app/Views/welcome_message.php index 90a1d60..63cb307 100644 --- a/app/Views/welcome_message.php +++ b/app/Views/welcome_message.php @@ -1 +1,20 @@ -... \ No newline at end of file + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/core1/SAVVY/config.php b/public/core1/SAVVY/config.php index d4e020b..4de90ac 100644 --- a/public/core1/SAVVY/config.php +++ b/public/core1/SAVVY/config.php @@ -31,6 +31,7 @@ $db_pass = $savvyext->cfgReadChar('database.pass'); $conn_string = "host=${db_host} port=${db_port} dbname=${db_name} user=${db_user} password=${db_pass}"; $pgconn = pg_connect($conn_string); + if ($pgconn) { // echo "Okay"; } else { diff --git a/public/core1/core/backend.php b/public/core1/core/backend.php index 911005d..3058767 100644 --- a/public/core1/core/backend.php +++ b/public/core1/core/backend.php @@ -29,18 +29,32 @@ class savvyext_api_savvy{ "port" => "5432" ]; + var $google= +[ + "api_key" => "AIzaSyBMNecOHz0OHbJti5P9foh_PVPYZntr18I", + "api_key_old" => "AIzaSyDvjiRTxngOQyBP4zpqFlZuiquc0ROvo9c", + "drive_client_id" => "343605975098-frdrsttkgkih8dm19js6itgs6ps261ea.apps.googleusercontent.com", + "drive_client_secret" => "XbUr5SW9Y1CaEjO_3fvglRna", + "drive_card_images" => "1NjftJBnFj9zTqWX7GLDhvlh28JOMeqv3", + "storage_project_id" => "float-app-224118"; + "storage_auth_file" => "/home/savvy/savvy/savvyext/etc/float-app-224118-52ef1783d2c5.json", + "kms_project_id" => "float-app-224118", + "kms_auth_file" => "/home/savvy/savvy/savvyext/etc/float-app-224118-52ef1783d2c5.json", + "kms_keyring_id" => "development", + "kms_key_id" => "oauth2_tokens" +]; + public function cfgReadChar($varname){ $pieces = explode(".", $varname); - if ( $pieces[0] == 'database'){ -return $this->database[$pieces[1]]; - - } - - if ( $pieces[0] == 'gpsdatabase'){ + if ( $pieces[0] == 'database'){ + return $this->database[$pieces[1]]; + } + if ( $pieces[0] == 'gpsdatabase'){ return $this->gpsdatabase[$pieces[1]]; - } - return $pieces[0][$pieces[1]]; // piece1 + } + + return $this=>$pieces[0][$pieces[1]]; // piece1 } public function cfgReadLong($varname){