From 2f1aa2d5962762dab1dd24609347ffbf72fd6b52 Mon Sep 17 00:00:00 2001
From: www <www@37.187.101.7>
Date: Sun, 8 Feb 2015 22:43:20 +0100
Subject: [PATCH] 	new file:   .gitconfig 	modified:   .gitignore 
 modified:   SRC/app/config/app.php 	new file:  
 SRC/app/controllers/testBd.php 	modified:   SRC/app/routes.php 	new
 file:   SRC/app/views/testBd.php

---
 .bash_history                     | 14 ++++++++++++++
 .gitconfig                        |  3 +++
 .gitignore                        |  4 ++++
 SRC/app/config/app.php            |  2 +-
 SRC/app/config/database.php       |  6 +++---
 SRC/app/config/local/database.php | 18 +++---------------
 SRC/app/controllers/testBd.php    |  9 +++++++++
 SRC/app/routes.php                |  2 ++
 SRC/app/views/testBd.php          |  5 +++++
 9 files changed, 44 insertions(+), 19 deletions(-)
 create mode 100644 .bash_history
 create mode 100644 .gitconfig
 create mode 100644 SRC/app/controllers/testBd.php
 create mode 100644 SRC/app/views/testBd.php

diff --git a/.bash_history b/.bash_history
new file mode 100644
index 0000000..5da5fde
--- /dev/null
+++ b/.bash_history
@@ -0,0 +1,14 @@
+ls
+git commit -a
+git config --global user.email www@37.187.101.7 
+git config --global user.name www
+git commit -a
+git push
+ls
+cd SRC/
+ls
+clear
+ls
+git pull
+git pull
+exit
diff --git a/.gitconfig b/.gitconfig
new file mode 100644
index 0000000..cfa2b58
--- /dev/null
+++ b/.gitconfig
@@ -0,0 +1,3 @@
+[user]
+	email = www@37.187.101.7
+	name = www
diff --git a/.gitignore b/.gitignore
index 499c122..fceb7f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,7 @@
 *.aux
 *.lof
 *.pdf
+
+SRC/app/config/local/database.php
+SRC/app/config/database.php
+
diff --git a/SRC/app/config/app.php b/SRC/app/config/app.php
index 175d54f..8feb9b7 100644
--- a/SRC/app/config/app.php
+++ b/SRC/app/config/app.php
@@ -13,7 +13,7 @@ return array(
 	|
 	*/
 
-	'debug' => false,
+	'debug' => true,
 
 	/*
 	|--------------------------------------------------------------------------
diff --git a/SRC/app/config/database.php b/SRC/app/config/database.php
index 3498fa8..0f1c277 100644
--- a/SRC/app/config/database.php
+++ b/SRC/app/config/database.php
@@ -55,9 +55,9 @@ return array(
 		'mysql' => array(
 			'driver'    => 'mysql',
 			'host'      => 'localhost',
-			'database'  => 'forge',
-			'username'  => 'forge',
-			'password'  => '',
+			'database'  => 'moduleweb',
+			'username'  => 'root',
+			'password'  => 'l3miashs2015',
 			'charset'   => 'utf8',
 			'collation' => 'utf8_unicode_ci',
 			'prefix'    => '',
diff --git a/SRC/app/config/local/database.php b/SRC/app/config/local/database.php
index fbcb95a..a17c311 100644
--- a/SRC/app/config/local/database.php
+++ b/SRC/app/config/local/database.php
@@ -19,29 +19,17 @@ return array(
 	*/
 
 	'connections' => array(
-
 		'mysql' => array(
 			'driver'    => 'mysql',
 			'host'      => 'localhost',
-			'database'  => 'homestead',
-			'username'  => 'homestead',
-			'password'  => 'secret',
+			'database'  => 'moduleweb',
+			'username'  => 'root',
+			'password'  => 'l3miashs2015',
 			'charset'   => 'utf8',
 			'collation' => 'utf8_unicode_ci',
 			'prefix'    => '',
 		),
 
-		'pgsql' => array(
-			'driver'   => 'pgsql',
-			'host'     => 'localhost',
-			'database' => 'homestead',
-			'username' => 'homestead',
-			'password' => 'secret',
-			'charset'  => 'utf8',
-			'prefix'   => '',
-			'schema'   => 'public',
-		),
-
 	),
 
 );
diff --git a/SRC/app/controllers/testBd.php b/SRC/app/controllers/testBd.php
new file mode 100644
index 0000000..2e44d5d
--- /dev/null
+++ b/SRC/app/controllers/testBd.php
@@ -0,0 +1,9 @@
+<?php
+class testBd extends BaseController {
+    public function getS()
+    {
+        $r = DB::select('select s from test where id = 1');
+        return View::make('testBd', array('s' => $r[0]->s));
+    }
+
+}
\ No newline at end of file
diff --git a/SRC/app/routes.php b/SRC/app/routes.php
index ca7df19..3027eb0 100644
--- a/SRC/app/routes.php
+++ b/SRC/app/routes.php
@@ -27,3 +27,5 @@ Route::get('home', function()
 {
 	return View::make('home');
 });
+
+Route::get('testBd', 'testBd@getS');
\ No newline at end of file
diff --git a/SRC/app/views/testBd.php b/SRC/app/views/testBd.php
new file mode 100644
index 0000000..59ae297
--- /dev/null
+++ b/SRC/app/views/testBd.php
@@ -0,0 +1,5 @@
+<html>
+    <body>
+        <h1>S = <?php echo $s; ?></h1>
+    </body>
+</html>
\ No newline at end of file