Vous êtes connecté en tant que anonymous
Se Deconnecter
Browse code
adding assynchronous Loader
git authored on 21/03/2019 14:07:03
Showing 7 changed files
- application/class/asynchronous.class.php
- application/class/bdd.class.php
- application/class/tri.class.php
- application/class/url.class.php
- application/class/vue.class.php
- application/layout/include/standard/bottom-javascript.phtml
- application/layout/include/standard/top-css.phtml
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,32 @@ |
| 1 |
+<?php |
|
| 2 |
+ |
|
| 3 |
+class Asyncronous{
|
|
| 4 |
+ |
|
| 5 |
+ private $css; |
|
| 6 |
+ private $javascript; |
|
| 7 |
+ |
|
| 8 |
+ public function __construct() |
|
| 9 |
+ {
|
|
| 10 |
+ $this->css = ""; |
|
| 11 |
+ $this->javascript = ""; |
|
| 12 |
+ } |
|
| 13 |
+ |
|
| 14 |
+ public function addCss($code){
|
|
| 15 |
+ $this->css .= "\n"; |
|
| 16 |
+ $this->css .= $code; |
|
| 17 |
+ } |
|
| 18 |
+ |
|
| 19 |
+ public function addJs($code){
|
|
| 20 |
+ $this->javascript .= "\n"; |
|
| 21 |
+ $this->javascript .= $code; |
|
| 22 |
+ } |
|
| 23 |
+ |
|
| 24 |
+ public function printCss(){
|
|
| 25 |
+ echo $this->css; |
|
| 26 |
+ } |
|
| 27 |
+ |
|
| 28 |
+ public function printJs(){
|
|
| 29 |
+ echo $this->javascript; |
|
| 30 |
+ } |
|
| 31 |
+ |
|
| 32 |
+} |
|
| 0 | 33 |
\ No newline at end of file |
| ... | ... |
@@ -4,14 +4,14 @@ class Bdd |
| 4 | 4 |
{
|
| 5 | 5 |
public $bdd; |
| 6 | 6 |
|
| 7 |
- public function __construct($bdd = 'bdd1') |
|
| 7 |
+ public function __construct($bdd = 'fiches3') |
|
| 8 | 8 |
{
|
| 9 | 9 |
switch($bdd) {
|
| 10 |
- case 'bdd1': |
|
| 11 |
- $this->bdd = new PDO(DSN_BDD1, USER_BDD1, PASS_BDD1); |
|
| 10 |
+ case 'fiches3': |
|
| 11 |
+ $this->bdd = new PDO(DSN_FICHES, USER_FICHES, PASS_FICHES); |
|
| 12 | 12 |
break; |
| 13 |
- case 'bdd2': |
|
| 14 |
- $this->bdd = new PDO(DSN_BDD2, USER_BDD2, PASS_BDD2); |
|
| 13 |
+ case 'abitop': |
|
| 14 |
+ $this->bdd = new PDO(DSN_ABITOP, USER_ABITOP, PASS_ABITOP); |
|
| 15 | 15 |
break; |
| 16 | 16 |
default: |
| 17 | 17 |
$this->bdd = new PDO(DSN_FICHES, USER_FICHES, PASS_FICHES); |
| ... | ... |
@@ -13,4 +13,121 @@ class Tri{
|
| 13 | 13 |
} |
| 14 | 14 |
return ($a < $b) ? -1 : 1; |
| 15 | 15 |
} |
| 16 |
+ |
|
| 17 |
+ public static function cmpIp($ip1,$ip2){
|
|
| 18 |
+ |
|
| 19 |
+ $tab_ip1 = explode(".",$ip1);
|
|
| 20 |
+ $tab_ip2 = explode(".",$ip2);
|
|
| 21 |
+ |
|
| 22 |
+ $octet0 = Tri::cmp($tab_ip1[0],$tab_ip2[0]); |
|
| 23 |
+ $octet1 = Tri::cmp($tab_ip1[1],$tab_ip2[1]); |
|
| 24 |
+ $octet2 = Tri::cmp($tab_ip1[2],$tab_ip2[2]); |
|
| 25 |
+ $octet3 = Tri::cmp($tab_ip1[3],$tab_ip2[3]); |
|
| 26 |
+ |
|
| 27 |
+ if($octet0 == 0){
|
|
| 28 |
+ //égal |
|
| 29 |
+ if($octet1 == 0){
|
|
| 30 |
+ //égal |
|
| 31 |
+ if($octet2 == 0){
|
|
| 32 |
+ //égal |
|
| 33 |
+ if($octet3 == 0){
|
|
| 34 |
+ //égal |
|
| 35 |
+ return 0; |
|
| 36 |
+ }elseif($octet3 == 1){
|
|
| 37 |
+ //supérieur |
|
| 38 |
+ return 1; |
|
| 39 |
+ }else{
|
|
| 40 |
+ //inférieur |
|
| 41 |
+ return -1; |
|
| 42 |
+ } |
|
| 43 |
+ }elseif($octet2 == 1){
|
|
| 44 |
+ //suppérieur |
|
| 45 |
+ return 1; |
|
| 46 |
+ }else{
|
|
| 47 |
+ //inférieur |
|
| 48 |
+ return -1; |
|
| 49 |
+ } |
|
| 50 |
+ }elseif($octet1 == 1){
|
|
| 51 |
+ //suppérieur |
|
| 52 |
+ return 1; |
|
| 53 |
+ }else{
|
|
| 54 |
+ //inférieur |
|
| 55 |
+ return -1; |
|
| 56 |
+ } |
|
| 57 |
+ }elseif($octet0 == 1){
|
|
| 58 |
+ //suppérieur |
|
| 59 |
+ return 1; |
|
| 60 |
+ }else{
|
|
| 61 |
+ //inférieur |
|
| 62 |
+ return -1; |
|
| 63 |
+ } |
|
| 64 |
+ } |
|
| 65 |
+ |
|
| 66 |
+ public static function cmpInterval($tab_ip1,$tab_ip2){
|
|
| 67 |
+ $vlan_test_adresse_ip_debut = $tab_ip1[0]; |
|
| 68 |
+ $vlan_test_adresse_ip_fin = $tab_ip1[1]; |
|
| 69 |
+ |
|
| 70 |
+ $vlan_adresse_ip_debut = $tab_ip2[0]; |
|
| 71 |
+ $vlan_adresse_ip_fin = $tab_ip2[1]; |
|
| 72 |
+ |
|
| 73 |
+ $ip_debut_cmp = Tri::cmpIp($vlan_test_adresse_ip_debut,$vlan_adresse_ip_debut); |
|
| 74 |
+ $ip_debfin_cmp = Tri::cmpIp($vlan_test_adresse_ip_debut,$vlan_adresse_ip_fin); |
|
| 75 |
+ $ip_fin_cmp = Tri::cmpIp($vlan_test_adresse_ip_fin,$vlan_adresse_ip_fin); |
|
| 76 |
+ $ip_findeb_cmp = Tri::cmpIp($vlan_test_adresse_ip_fin,$vlan_adresse_ip_debut); |
|
| 77 |
+ |
|
| 78 |
+ //ip1_debut ? ip2_debut |
|
| 79 |
+ if($ip_debut_cmp == 0){
|
|
| 80 |
+ //égal |
|
| 81 |
+ if ($ip_fin_cmp == 0) {
|
|
| 82 |
+ return 'sont égaux'; |
|
| 83 |
+ } |
|
| 84 |
+ return 'chevauche par le debut (egalité debut)'; |
|
| 85 |
+ |
|
| 86 |
+ }elseif($ip_debut_cmp == 1){
|
|
| 87 |
+ //supérieur |
|
| 88 |
+ //ip1_debut ? ip2_fin |
|
| 89 |
+ if ($ip_debfin_cmp == 0) {
|
|
| 90 |
+ //égal |
|
| 91 |
+ return 'forme une jonction par le debut avec'; |
|
| 92 |
+ } elseif ($ip_debfin_cmp == 1) {
|
|
| 93 |
+ //supérieur |
|
| 94 |
+ return 'est different (apres)'; |
|
| 95 |
+ } else {
|
|
| 96 |
+ //inférieur |
|
| 97 |
+ //ip1_fin ? ip2_fin |
|
| 98 |
+ if ($ip_fin_cmp == 0) {
|
|
| 99 |
+ //égal |
|
| 100 |
+ return 'chevauche par la fin (egalité fin)'; |
|
| 101 |
+ } elseif ($ip_fin_cmp == 1) {
|
|
| 102 |
+ //supérieur |
|
| 103 |
+ return 'chevauche par le debut'; |
|
| 104 |
+ } else {
|
|
| 105 |
+ return 'est inclue dans'; |
|
| 106 |
+ } |
|
| 107 |
+ } |
|
| 108 |
+ } else {
|
|
| 109 |
+ //inférieur |
|
| 110 |
+ if($ip_findeb_cmp == 0){
|
|
| 111 |
+ //égal |
|
| 112 |
+ return 'forme une jonction par la fin avec'; |
|
| 113 |
+ |
|
| 114 |
+ }elseif($ip_findeb_cmp == 1){
|
|
| 115 |
+ //supérieur |
|
| 116 |
+ if($ip_fin_cmp == 0){
|
|
| 117 |
+ //égal |
|
| 118 |
+ return 'est inclue dans (egalité fin)'; |
|
| 119 |
+ |
|
| 120 |
+ }elseif($ip_fin_cmp == 1){
|
|
| 121 |
+ //supérieur (3) |
|
| 122 |
+ return 'inclue'; |
|
| 123 |
+ |
|
| 124 |
+ }else{
|
|
| 125 |
+ //inférieur (2) |
|
| 126 |
+ return 'chevauche par la fin'; |
|
| 127 |
+ } |
|
| 128 |
+ }else{
|
|
| 129 |
+ return 'est different (avant)'; |
|
| 130 |
+ } |
|
| 131 |
+ } |
|
| 132 |
+ } |
|
| 16 | 133 |
} |
| 17 | 134 |
\ No newline at end of file |
| ... | ... |
@@ -24,9 +24,13 @@ class Url |
| 24 | 24 |
|
| 25 | 25 |
//print_r($urlParts); |
| 26 | 26 |
//Récupération du nom de la page |
| 27 |
- ($urlParts[0] == 'index' || $urlParts[0] == '' ) ? $page['name']='accueil' : $page['name']=$urlParts[0]; |
|
| 28 |
- //array_shift($urlParts); |
|
| 29 |
- unset($urlParts[0]); |
|
| 27 |
+ if(isset($urlParts[0])) {
|
|
| 28 |
+ ($urlParts[0] == 'index' || $urlParts[0] == '') ? $page['name'] = 'accueil' : $page['name'] = $urlParts[0]; |
|
| 29 |
+ //array_shift($urlParts); |
|
| 30 |
+ unset($urlParts[0]); |
|
| 31 |
+ }else{
|
|
| 32 |
+ $page['name'] = 'accueil'; |
|
| 33 |
+ } |
|
| 30 | 34 |
|
| 31 | 35 |
if($page['name'] == 'control'){
|
| 32 | 36 |
$page['control'] = true; |
| ... | ... |
@@ -1,6 +1,7 @@ |
| 1 | 1 |
<?php |
| 2 | 2 |
|
| 3 | 3 |
define( "LAYOUT_PATH" , APPLICATION_PATH . DIRECTORY_SEPARATOR . "layout"); |
| 4 |
+include CLASSES_PATH . DIRECTORY_SEPARATOR . "asynchronous.class.php"; |
|
| 4 | 5 |
|
| 5 | 6 |
|
| 6 | 7 |
class Vue{
|
| ... | ... |
@@ -12,6 +13,8 @@ class Vue{
|
| 12 | 13 |
|
| 13 | 14 |
extract( $baseControlleur->modele->page ); |
| 14 | 15 |
|
| 16 |
+ $asynchroneLoader = new Asyncronous(); |
|
| 17 |
+ |
|
| 15 | 18 |
ob_start(); |
| 16 | 19 |
require CONTROLLER_PATH.DIRECTORY_SEPARATOR.$name.'.php'; |
| 17 | 20 |
require VIEW_PATH.DIRECTORY_SEPARATOR.$name.'.phtml'; |