diff --git a/.gitignore b/.gitignore index 4990985..97bc918 100644 --- a/.gitignore +++ b/.gitignore @@ -1,18 +1,18 @@ -/composer.lock -/vendor/* -/_relicats -/.idea +composer.lock +vendor +_relicats +.idea -/application/modules/phplist -/application/modules/symfony -/application/modules/wordpress -/application/modules/prestashop - -/public/prestashop/install-dev/theme/* -/public/prestashop/js/* -/public/prestashop/themes/* -/public/wordpress/wp-admin/css/* -/public/wordpress/wp-admin/js/* -/public/wordpress/wp-content/themes/* -/public/wordpress/wp-includes/css/* -/public/wordpress/wp-includes/js/* +# Avoid directory tests install of third party application module +application/modules/phplist +application/modules/symfony +application/modules/wordpress +application/modules/prestashop +public/prestashop/install-dev/theme/* +public/prestashop/js/* +public/prestashop/themes/* +public/wordpress/wp-admin/css/* +public/wordpress/wp-admin/js/* +public/wordpress/wp-content/themes/* +public/wordpress/wp-includes/css/* +public/wordpress/wp-includes/js/* diff --git a/application/class/Bdd.php b/application/class/Bdd.php index 69001d0..9bd0733 100644 --- a/application/class/Bdd.php +++ b/application/class/Bdd.php @@ -10,28 +10,58 @@ class Bdd { switch($bdd) { case 'bdd1': - $this->bdd = new PDO(DSN_BDD1, USER_BDD1, PASS_BDD1); + $this->bdd = new \PDO(DSN_BDD1, USER_BDD1, PASS_BDD1); break; case 'bdd2': - $this->bdd = new PDO(DSN_BDD2, USER_BDD2, PASS_BDD2); + $this->bdd = new \PDO(DSN_BDD2, USER_BDD2, PASS_BDD2); break; default: - $this->bdd = new PDO(DSN_BDD_DEFAULT, USER_BDD_DEFAULT, PASS_BDD_DEFAULT); + $this->bdd = new \PDO(DSN_BDD_DEFAULT, USER_BDD_DEFAULT, PASS_BDD_DEFAULT); } + $this->bdd->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_WARNING); + $this->bdd->setAttribute(\PDO::ATTR_DEFAULT_FETCH_MODE, \PDO::FETCH_ASSOC); } - public function faireUneRequete($sql) + public function faireSQLRequete($sql) { - $req = $this->bdd->query($sql, PDO::FETCH_ASSOC); + $req = $this->bdd->query($sql); return $req; } - public function exploiterResultat($res){ + /** + * + * Exemple: + * $sql = "SELECT * FROM annonce WHERE cat_id = :categorie and ann_est_valide = 1"; + * $req = $bdd->faireBindRequete($sql, + * array( + * array('categorie', $categorie, \PDO::PARAM_INT), + * ) + * ); + * $data = $bdd->exploiterResultat($req) + * + * + * @param $sql + * @param array|null $params + * @return bool|\PDOStatement + */ + public function faireBindRequete($sql,Array $params = null){ + $req = $this->bdd->prepare($sql); + if($params){ + foreach ($params as $value) { + $req->bindParam($value[0],Caracter::normalise_ChaineDeCaracteres($value[1]),$value[2]); + } + } + $req->execute(); + //$req->closeCursor(); + return $req; + } + public function exploiterResultat($req){ + $res = $req->fetchAll(); foreach($res as $data) { foreach ($data as $key => $row) { if (is_string($row)) { - $row = Caracter::normalise_ChaineDeCaracteresDownload($row); + $row = Caracter::normalise_ChaineDeCaracteres($row); } $data[$key] = $row; } diff --git a/application/class/Caracter.php b/application/class/Caracter.php index a170028..3db6312 100644 --- a/application/class/Caracter.php +++ b/application/class/Caracter.php @@ -9,9 +9,8 @@ use ForceUTF8\Encoding; class Caracter { - public static function normalise_ChaineDeCaracteresDownload($chaine) + public static function normalise_ChaineDeCaracteres($chaine) { - //return Caracter::remplacerAccents($chaine); return Encoding::fixUTF8(Caracter::fp_stripslashes($chaine)); } diff --git a/application/class/Url.php b/application/class/Url.php index c976f61..cafb4a9 100644 --- a/application/class/Url.php +++ b/application/class/Url.php @@ -14,12 +14,12 @@ class Url public function __construct($method, $appRequest) { - //on créé le registre des modules symfony + //on créé le registre des modules d'applications tierces $this->registre = new \MVC\Classe\ModularRegister(); //définition des parametres de base $page = array(); - $page['name'] = 'accueil'; + $page['name'] = 'index'; $page['description'] = ""; $page['params'] = array(); $page['control'] = false; @@ -32,11 +32,10 @@ class Url //print_r($urlParts); if(isset($urlParts[0])) { //Récupération du nom de la page - ($urlParts[0] == 'index' || $urlParts[0] == '') ? $page['name'] = 'accueil' : $page['name'] = $urlParts[0]; - //array_shift($urlParts); + ($urlParts[0] == 'index' || $urlParts[0] == '') ? $page['name'] = 'index' : $page['name'] = $urlParts[0]; unset($urlParts[0]); }else{ - $page['name'] = 'accueil'; + $page['name'] = 'index'; } //il se peut que l'on ait des variable avec ? dans l'url @@ -47,8 +46,7 @@ class Url if($page['name'] == 'control'){ $page['control'] = true; - ($urlParts[1] == 'index' || $urlParts[1] == '' ) ? $page['name']='accueil' : $page['name']=$urlParts[1]; - //array_shift($urlParts); + ($urlParts[1] == 'index' || $urlParts[1] == '' ) ? $page['name']='index' : $page['name']=$urlParts[1]; unset($urlParts[1]); } @@ -63,7 +61,7 @@ class Url $page['params'] = array(); $this->page = $page; return; - }else { + } else { foreach ($urlParts as $key => $value) { $values[] = $value; $keys[] = $key; diff --git a/application/class/Vue.php b/application/class/Vue.php index 40a66b8..1bc9fe3 100644 --- a/application/class/Vue.php +++ b/application/class/Vue.php @@ -20,6 +20,9 @@ class Vue{ //l'inclusion du controlleur doit renvoyer le tableau $templateData require CONTROLLER_PATH . DIRECTORY_SEPARATOR . $name . '.php'; + + + //TEMPLATING BLADE $paths = new \SplPriorityQueue; diff --git a/application/config/files/routing.yml b/application/config/files/routing.yml index 8cd0fc0..c54412d 100644 --- a/application/config/files/routing.yml +++ b/application/config/files/routing.yml @@ -1,6 +1,6 @@ home_route: path: / - defaults: { controller: 'FooController::indexAction' } + defaults: { controller: '' } foo_route: path: /foo @@ -11,11 +11,3 @@ foo_placeholder_route: defaults: { controller: 'FooConduit::load' } requirements: id: '[0-9]+' - -docs_route: - path: /docs - defaults: { controller: 'DocConduit::index' } - -docs_name_route: - path: /docs/file/{name} - defaults: { controller: 'DocConduit::readfile' } \ No newline at end of file diff --git a/application/include/actions/MenudocsAction.php b/application/include/actions/MenudocsAction.php deleted file mode 100644 index 82549c0..0000000 --- a/application/include/actions/MenudocsAction.php +++ /dev/null @@ -1,35 +0,0 @@ -render('menu-docs', array('files'=>$files)); - } - -} diff --git a/application/include/conduits/DocConduit.php b/application/include/conduits/DocConduit.php deleted file mode 100644 index de361b0..0000000 --- a/application/include/conduits/DocConduit.php +++ /dev/null @@ -1,41 +0,0 @@ -render('docs', array('page_title' => 'Foo', 'description' => 'DocConduit','files' => $files)); - } - // Route('/docs/file/{name}') - public function readfile(){ - - $markdown = file_get_contents(DATA_PATH.'/docs/'.$this->name); - - $my_html = MarkdownExtra::defaultTransform($markdown); - - return $this->render('docs', array('page_title' => 'Foo', 'description' => 'DocConduit','data' => $my_html)); - - } -} \ No newline at end of file diff --git a/application/include/conduits/IndexConduit.php b/application/include/conduits/IndexConduit.php new file mode 100644 index 0000000..1c62f36 --- /dev/null +++ b/application/include/conduits/IndexConduit.php @@ -0,0 +1,15 @@ +render('index', array("templating_a"=>'blade',"templating_b"=>'twig',"templating_c"=>'edge')); + } + +} \ No newline at end of file diff --git a/application/include/controlleurs/AccueilHttpReponse.php b/application/include/controlleurs/AccueilHttpReponse.php deleted file mode 100644 index c239bb9..0000000 --- a/application/include/controlleurs/AccueilHttpReponse.php +++ /dev/null @@ -1,45 +0,0 @@ -params); - Dumper::dump($this->data); - $text = ob_get_clean(); - Logger::addLog('http11.put', '____Hello Put____' . PHP_EOL . $text); - } - public function delete() - { - ob_start(); - Dumper::dump($this->params); - Dumper::dump($this->data); - $text = ob_get_clean(); - Logger::addLog('http11.delete', '____Hello Delete:____' . PHP_EOL . $text); - - } - - public function get() - { - ob_start(); - Dumper::dump($this->params); - Dumper::dump($this->data); - $text = ob_get_clean(); - Logger::addLog('http11.get', '____Hello GET____' . PHP_EOL . $text); - } - - public function post() - { - ob_start(); - Dumper::dump($this->params); - Dumper::dump($this->data); - $text = ob_get_clean(); - Logger::addLog('http11.post', '____Hello POST____' . PHP_EOL . $text); - } -} \ No newline at end of file diff --git a/application/include/controlleurs/ErrorHttpReponse.php b/application/include/controlleurs/ErrorHttpReponse.php deleted file mode 100644 index 09a411e..0000000 --- a/application/include/controlleurs/ErrorHttpReponse.php +++ /dev/null @@ -1,27 +0,0 @@ -getProviders())) { - // Store the provider for the callback event - $storage->set('provider', $url_params['provider']); - \MVC\Classe\Session::setStorage($storage); - \MVC\Classe\Session::setUserProfile(array()); - } else { - $error = $url_params['provider']; - } - } - - // - // Event 2: User clicked LOGOUT link - // - if (isset($url_params['logout'])) { - if (in_array($url_params['logout'], $hybridauth->getProviders())) { - // Disconnect the adapter - $adapter = $hybridauth->getAdapter($url_params['logout']); - $adapter->disconnect(); - } else { - $error = $url_params['logout']; - } - } - - // - // Event 3: Provider returns via CALLBACK - // - if ($url_params['provider'] = $storage->get('provider')) { - - \MVC\Classe\Session::setHybridAuth($hybridauth); - $hybridauth->authenticate($url_params['provider']); - - - } - -} catch (Exception $e) { - error_log($e->getMessage()); - echo $e->getMessage(); -} diff --git a/application/include/controlleurs/authentification.php b/application/include/controlleurs/authentification.php deleted file mode 100644 index 5c2b45b..0000000 --- a/application/include/controlleurs/authentification.php +++ /dev/null @@ -1,11 +0,0 @@ -getConnectedAdapters(); - -$templateData['hybridauth'] = $hybridauth; -$templateData['adapters'] = $adapters; \ No newline at end of file diff --git a/application/include/controlleurs/beers.php b/application/include/controlleurs/beers.php deleted file mode 100644 index c01f667..0000000 --- a/application/include/controlleurs/beers.php +++ /dev/null @@ -1,7 +0,0 @@ -'blade',"templating_b"=>'twig',"templating_c"=>'edge'); -Logger::addLog('ok', 'Hello world'); \ No newline at end of file diff --git a/application/include/controlleurs/compte.php b/application/include/controlleurs/compte.php deleted file mode 100644 index eeffb53..0000000 --- a/application/include/controlleurs/compte.php +++ /dev/null @@ -1,22 +0,0 @@ -authenticate(\MVC\Classe\Session::getStorage()->get('provider')); -$adapters = $hybridauth->getConnectedAdapters(); -foreach ($adapters as $adapter){ - $userProfile[] = $adapter->getUserProfile(); - \MVC\Classe\Session::setId($adapter->getUserProfile()->identifier); - \MVC\Classe\Session::setUserName($adapter->getUserProfile()->displayName); -} -\MVC\Classe\Session::setUserProfile($userProfile); - -//Dumper::dump($_SESSION); - -$templateData['adapters'] = $adapters; \ No newline at end of file diff --git a/application/include/controlleurs/accueil.php b/application/include/controlleurs/index.php similarity index 100% rename from application/include/controlleurs/accueil.php rename to application/include/controlleurs/index.php diff --git a/application/include/controlleurs/logout.php b/application/include/controlleurs/logout.php deleted file mode 100644 index 70f45b2..0000000 --- a/application/include/controlleurs/logout.php +++ /dev/null @@ -1,34 +0,0 @@ -getProviders())) { - // Disconnect the adapter - $adapter = $hybridauth->getAdapter($url_params['logout']); - $adapter->disconnect(); - \MVC\Classe\Session::destroy(); - header("location: ".MVC\Classe\Url::link_rewrite(false,'accueil')); - } else { - $error = $url_params['logout']; - } - } - - -} catch (Exception $e) { - error_log($e->getMessage()); - echo $e->getMessage(); -} diff --git a/application/include/modeles/authentificate.model b/application/include/modeles/authentificate.model deleted file mode 100644 index 7cd2d33..0000000 --- a/application/include/modeles/authentificate.model +++ /dev/null @@ -1,4 +0,0 @@ -name : authentificate -page_title: Hybrid Authentification de l'application -description : La page d'authentification -params : params diff --git a/application/include/modeles/authentification.model b/application/include/modeles/authentification.model deleted file mode 100644 index 716809e..0000000 --- a/application/include/modeles/authentification.model +++ /dev/null @@ -1,4 +0,0 @@ -name : authentification -page_title: Hybrid Authentification de l'application -description : La page d'authentification -params : params diff --git a/application/include/modeles/beers.model b/application/include/modeles/beers.model deleted file mode 100644 index e4f701c..0000000 --- a/application/include/modeles/beers.model +++ /dev/null @@ -1,5 +0,0 @@ -name : beers -page_title : module_title -description : module_description -params : module_params - diff --git a/application/include/modeles/compte.model b/application/include/modeles/compte.model deleted file mode 100644 index 419a991..0000000 --- a/application/include/modeles/compte.model +++ /dev/null @@ -1,4 +0,0 @@ -name : compte -page_title: Compte(s) utilisateurs de l'application -description : La page d'accès privé -params : params diff --git a/application/include/modeles/accueil.model b/application/include/modeles/index.model similarity index 85% rename from application/include/modeles/accueil.model rename to application/include/modeles/index.model index be4ce17..2de4062 100644 --- a/application/include/modeles/accueil.model +++ b/application/include/modeles/index.model @@ -1,4 +1,4 @@ -name : accueil +name : index page_title : Accueil de l'application description : zatou stra bracadabla params : params diff --git a/application/include/modeles/logout.model b/application/include/modeles/logout.model deleted file mode 100644 index e9167c7..0000000 --- a/application/include/modeles/logout.model +++ /dev/null @@ -1,4 +0,0 @@ -name : logout -page_title: Hybrid Authentification de l'application -description : La page d'authentification -params : params diff --git a/application/include/vues/layout/body.blade.php b/application/include/vues/layout/body.blade.php index 791f23c..553cf52 100644 --- a/application/include/vues/layout/body.blade.php +++ b/application/include/vues/layout/body.blade.php @@ -10,28 +10,13 @@
-
- -
@@ -44,39 +29,11 @@ - - - - -
- -
- + + + + + -
  • Documentation - {{\MVC\Classe\ControlleurAction::inserer('menudocs.default',[])}} -
    • - - - - - - - - - +
    +
    +@yield('content') +
    +
    -
    -
    - @yield('content') -
    -
    + + + - - - - - - + + @endsection \ No newline at end of file diff --git a/application/include/vues/view/authentificate.blade.php b/application/include/vues/view/authentificate.blade.php deleted file mode 100644 index 285e2d2..0000000 --- a/application/include/vues/view/authentificate.blade.php +++ /dev/null @@ -1,14 +0,0 @@ -@extends('body') - -@section('sidebar') - -@endsection - -@section('content') - -@endsection - -@section('top-javascript') - -@endsection - diff --git a/application/include/vues/view/authentification.blade.php b/application/include/vues/view/authentification.blade.php deleted file mode 100644 index 09187c0..0000000 --- a/application/include/vues/view/authentification.blade.php +++ /dev/null @@ -1,27 +0,0 @@ -@extends('body') - -@section('sidebar') - @parent - -

    This is appended to the master sidebar.

    -@endsection - -@section('content') -

    Sign in

    - - -@endsection - -@section('top-javascript') -@endsection - diff --git a/application/include/vues/view/beers.blade.php b/application/include/vues/view/beers.blade.php deleted file mode 100644 index ad9a33e..0000000 --- a/application/include/vues/view/beers.blade.php +++ /dev/null @@ -1,37 +0,0 @@ -@extends('body') - -@section('sidebar') - @parent - -

    This is appended to the master sidebar.

    -@endsection - -@section('content') - - - - -@endsection \ No newline at end of file diff --git a/application/include/vues/view/compte.blade.php b/application/include/vues/view/compte.blade.php deleted file mode 100644 index 3b423f0..0000000 --- a/application/include/vues/view/compte.blade.php +++ /dev/null @@ -1,31 +0,0 @@ -@extends('body') - -@section('sidebar') - @parent - -

    This is appended to the master sidebar.

    - Authentification -@endsection - -@section('content') - -

    Compte utilisateur

    - - @if ($adapters) -

    You are logged in:

    - - @endif - - -@endsection - diff --git a/application/include/vues/view/docs.blade.php b/application/include/vues/view/docs.blade.php deleted file mode 100644 index 200ff26..0000000 --- a/application/include/vues/view/docs.blade.php +++ /dev/null @@ -1,19 +0,0 @@ -@extends('body') - -@section('sidebar') - @parent -@endsection - -@section('content') - @if (isset($files)) - -

    Sommaire:

    - - @foreach( $files as $file) - {{ $file }}
    - @endforeach - @endif - @if (isset($data)) - {{$data}} - @endif -@endsection \ No newline at end of file diff --git a/application/include/vues/view/foo.blade.php b/application/include/vues/view/foo.blade.php deleted file mode 100644 index a8e4457..0000000 --- a/application/include/vues/view/foo.blade.php +++ /dev/null @@ -1,16 +0,0 @@ -@extends('body') - -@section('sidebar') - @parent - -

    This is appended to the master sidebar.

    -@endsection - -@section('content') - Foo Controlleur - @if (isset($id)) - {{$id}} - @else - id not exist - @endif -@endsection \ No newline at end of file diff --git a/application/include/vues/view/accueil.blade.php b/application/include/vues/view/index.blade.php similarity index 100% rename from application/include/vues/view/accueil.blade.php rename to application/include/vues/view/index.blade.php diff --git a/application/include/vues/view/menu-docs.blade.php b/application/include/vues/view/menu-docs.blade.php deleted file mode 100644 index 49705ba..0000000 --- a/application/include/vues/view/menu-docs.blade.php +++ /dev/null @@ -1,8 +0,0 @@ - \ No newline at end of file diff --git a/application/traitements/ajax-example.php b/application/traitements/ajax-example.php index c6286cd..7940182 100644 --- a/application/traitements/ajax-example.php +++ b/application/traitements/ajax-example.php @@ -1,15 +1,13 @@