Skip to content

Commit

Permalink
Base – 0.0.0-DEV.4
Browse files Browse the repository at this point in the history
Melhorias a adição do Composer
  • Loading branch information
KaduAmaral committed May 31, 2016
1 parent 1f07d8a commit c73f60c
Show file tree
Hide file tree
Showing 76 changed files with 61 additions and 10,155 deletions.
9 changes: 8 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# Dependencias
app/*
!app/appsconfig.php.example
/vendor
composer.lock
composer.phar

# Windows image file caches
Thumbs.db
ehthumbs.db
Expand Down Expand Up @@ -40,4 +47,4 @@ $RECYCLE.BIN/
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk
.apdisk
13 changes: 8 additions & 5 deletions app/appsconfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@

return objectify(Array(
'example' => Array(
<<<<<<< HEAD
'url' => 'http://localhost/Base/public_html/',
'view' => APPS . 'example' . DS . 'view' . DS,
=======
'url' => 'http://localhost/Base/public_html/'
>>>>>>> origin/master
'database' => Array(
'driver' => 'mysql',
'port' => 3306,
'host' => 'localhost',
'user' => 'root',
'pass' => '',
'schema' => 'test;charset=utf8'
)
)
));
7 changes: 7 additions & 0 deletions app/appsconfig.php.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?php

return objectify(Array(
'site' => Array(
'url' => 'http://contoso.com/',
)
));
8 changes: 4 additions & 4 deletions app/example/controller/errorcontroller.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ class ErrorController extends Controller {
public $error;

function index() {
$this->output = $this->load->view('errors/filenotfound.phtml', Array(
'head' => $this->load->view('commons/head.phtml'),
'menu' => $this->load->view('commons/menu.phtml'),
'footer' => $this->load->view('commons/footer.phtml'),
$this->output = $this->load->view('errors/filenotfound', Array(
'head' => $this->load->view('commons/head'),
'menu' => $this->load->view('commons/menu'),
'footer' => $this->load->view('commons/footer'),
'file' => $this->error,
'error' => $this->message
));
Expand Down
8 changes: 4 additions & 4 deletions app/example/controller/filenotfoundcontroller.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ class FileNotFoundController extends Controller
public $file;

function index() {
$this->output = $this->load->view('errors/filenotfound.phtml', Array(
'head' => $this->load->view('commons/head.phtml'),
'menu' => $this->load->view('commons/menu.phtml'),
'footer' => $this->load->view('commons/footer.phtml'),
$this->output = $this->load->view('errors/filenotfound', Array(
'head' => $this->load->view('commons/head'),
'menu' => $this->load->view('commons/menu'),
'footer' => $this->load->view('commons/footer'),
'file' => $this->file
));
}
Expand Down
6 changes: 3 additions & 3 deletions app/example/controller/logincontroller.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ function index() {
'</div></div>'.
'%footer%',
Array(
'header' => $this->load->view('commons/head.phtml'),
'menu' => $this->load->view('commons/menu.phtml'),
'footer' =>$this->load->view('commons/footer.phtml')
'header' => $this->load->view('commons/head'),
'menu' => $this->load->view('commons/menu'),
'footer' =>$this->load->view('commons/footer')
)
);
}
Expand Down
7 changes: 3 additions & 4 deletions app/example/controller/maincontroller.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@
namespace Controller;

use \Core\Controller;

use \Core\SendMail;
/**
* Main Controller
*/
class MainController extends Controller
{

class MainController extends Controller {

public function index(){

return $this->load->view('pages/index');
Expand Down
149 changes: 0 additions & 149 deletions base/addons/ConnectionPDO/ConnectionPDO.php

This file was deleted.

19 changes: 0 additions & 19 deletions base/addons/ConnectionPDO/drivers/driverinterface.php

This file was deleted.

Loading

0 comments on commit c73f60c

Please sign in to comment.