From 20a9f135e773ae6f36ce3d41ac5d29b39e408ea7 Mon Sep 17 00:00:00 2001 From: Mysaa Date: Sat, 5 Jun 2021 18:30:26 +0200 Subject: [PATCH] Commit de suppression de certaints projets un peu trop ambitieux --- 404.php | 2 +- chatTest/chat.css | 56 --------- chatTest/chat.php | 84 -------------- includes/header.php | 6 +- includes/inter.php | 81 +++++++------ index.php | 5 +- logging.php | 2 +- login.php | 4 +- megaProcess/downloadJar.php | 1 - others.php | 2 +- profile.php | 14 +-- projet.php | 221 +++++++++++++++++++++--------------- projetV1.php | 12 +- projetV2.php | 131 --------------------- projets.php | 8 +- register.php | 6 +- registering.php | 6 +- 17 files changed, 202 insertions(+), 439 deletions(-) delete mode 100644 chatTest/chat.css delete mode 100644 chatTest/chat.php delete mode 100644 megaProcess/downloadJar.php delete mode 100644 projetV2.php diff --git a/404.php b/404.php index 710be83..8ef14a2 100644 --- a/404.php +++ b/404.php @@ -15,7 +15,7 @@ Si vous le voulez , vous pouvez essayer de trouver le code html de votre page web là dedans:
-
+
Plus
diff --git a/chatTest/chat.css b/chatTest/chat.css deleted file mode 100644 index 3e2b16e..0000000 --- a/chatTest/chat.css +++ /dev/null @@ -1,56 +0,0 @@ -/* CSS Document */ -body { - font:12px arial; - color: #222; - text-align:center; - padding:35px; } - -form, p, span { - margin:0; - padding:0; } - -input { font:12px arial; } - -a { - color:#0000FF; - text-decoration:none; } - - a:hover { text-decoration:underline; } - -#wrapper, #loginform { - margin:0 auto; - padding-bottom:25px; - background:#EBF4FB; - width:504px; - border:1px solid #ACD8F0; } - -#loginform { padding-top:18px; } - - #loginform p { margin: 5px; } - -#chatbox { - text-align:left; - margin:0 auto; - margin-bottom:25px; - padding:10px; - background:#fff; - height:270px; - width:430px; - border:1px solid #ACD8F0; - overflow:auto; } - -#usermsg { - width:395px; - border:1px solid #ACD8F0; } - -#submit { width: 60px; } - -.error { color: #ff0000; } - -#menu { padding:12.5px 25px 12.5px 25px; } - -.welcome { float:left; } - -.logout { float:right; } - -.msgln { margin:0 0 2px 0; } \ No newline at end of file diff --git a/chatTest/chat.php b/chatTest/chat.php deleted file mode 100644 index 39d9d9d..0000000 --- a/chatTest/chat.php +++ /dev/null @@ -1,84 +0,0 @@ - - - - -Chat - Customer Module - - - -
- - -
- -
- - -
-
- - - -
-

Please enter your name to continue:

- - - -
-
- '; -} - -if(isset($_POST['enter'])){ - if($_POST['name'] != ""){ - $_SESSION['name'] = stripslashes(htmlspecialchars($_POST['name'])); - } - else{ - echo 'Please type in a name'; - } -} -?> - - -
- -
- -
- - -
-
- - - - \ No newline at end of file diff --git a/includes/header.php b/includes/header.php index a32aa9f..c900238 100644 --- a/includes/header.php +++ b/includes/header.php @@ -1,6 +1,6 @@
prepare('SELECT * FROM users WHERE ID=? AND mdp=?'); + $req = $bdd->prepare('SELECT * FROM users WHERE ID=? AND mdp=?'); if(isset($_SESSION['session_id']) && isset($_SESSION['session_mdp'])){ $req->execute(array($_SESSION['session_id'],$_SESSION['session_mdp'])); $rep = $req->fetch(); @@ -17,9 +17,9 @@
- + - +
diff --git a/includes/inter.php b/includes/inter.php index 175ef1b..795967f 100644 --- a/includes/inter.php +++ b/includes/inter.php @@ -1,47 +1,42 @@ prepare('SELECT * FROM users WHERE ID=? AND mdp=?'); - $req->execute(array($username,$mdp)); - return (bool)$req->fetch(); - } - - function isConnected(){ - return isConnected2S($_SESSION['session_id'],$_SESSION['session_mdp']); - } - - function getProjectVersionDataFromIDs($project,$version){ - $req=$GLOBALS['bdd']->prepare('SELECT p.ID AS pID , '. - 'v.versionAbs AS versionAbs , '. - 'p.name AS name , '. - 'v.version AS version , '. - 'v.language AS language , '. - 'p.permissions AS permissions , '. - 'p.ownersID AS owners '. - 'FROM projets AS p '. - 'INNER JOIN versions AS v '. - 'ON v.project_id = p.ID '. - 'WHERE v.project_id LIKE = ? AND v.versionAbs = ?'); - $req->execute(array($_GET['id'],$_GET['v'])); - if(($data = $req->fetch())){ - return $data; - }else{ - return NULL; - } - } - - function getProjectVersionData(){ - return getProjectVersionDataFromIds($_GET['id'],$_GET['v']); - } - - function getPermissionsFromData($data){ - $permissions = array(FALSE,FALSE,FALSE,FALSE); - $permissions[0] = preg_match('#^1#',$data['permissions']); - $permissions[1] = preg_match('#^(0|1)1#',$data['permissions']); - $permissions[2] = preg_match('#^(0|1){2}1#',$data['permissions']); - $permissions[3] = preg_match('#^(0|1){3}1#',$data['permissions']); +include_once 'includes/bdd.php'; +function isConnected2S($username, $mdp) { + $req = $bdd->prepare ( 'SELECT * FROM users WHERE ID=? AND mdp=?' ); + $req->execute ( array ( + $username, + $mdp + ) ); + return ( bool ) $req->fetch (); +} +function isConnected() { + return isConnected2S ( $_SESSION ['session_id'], $_SESSION ['session_mdp'] ); +} +function getProjectVersionDataFromIDs($project, $version) { + $req = $bdd->prepare ( 'SELECT p.ID AS pID , ' . 'v.versionAbs AS versionAbs , ' . 'p.name AS name , ' . 'v.version AS version , ' . 'v.language AS language , ' . 'p.permissions AS permissions , ' . 'p.ownersID AS owners ' . 'FROM projets AS p ' . 'INNER JOIN versions AS v ' . 'ON v.project_id = p.ID ' . 'WHERE v.project_id LIKE = ? AND v.versionAbs = ?' ); + $req->execute ( array ( + $_GET ['id'], + $_GET ['v'] + ) ); + if (($data = $req->fetch ())) { + return $data; + } else { + return NULL; } +} +function getProjectVersionData() { + return getProjectVersionDataFromIds ( $_GET ['id'], $_GET ['v'] ); +} +function getPermissionsFromData($data) { + $permissions = array ( + FALSE, + FALSE, + FALSE, + FALSE + ); + $permissions [0] = preg_match ( '#^1#', $data ['permissions'] ); + $permissions [1] = preg_match ( '#^(0|1)1#', $data ['permissions'] ); + $permissions [2] = preg_match ( '#^(0|1){2}1#', $data ['permissions'] ); + $permissions [3] = preg_match ( '#^(0|1){3}1#', $data ['permissions'] ); +} ?> \ No newline at end of file diff --git a/index.php b/index.php index 1c9eb88..1b170a9 100644 --- a/index.php +++ b/index.php @@ -58,8 +58,7 @@
-

Lorem Ipsum
\({\begin{pmatrix}\cos \theta &-\sin \theta \\[3pt]\sin \theta &\cos \theta \\\end{pmatrix}}\) -

+

Lorem Ipsum

Nihil morati post haec militares avidi saepe turbarum adorti sunt Montium primum, qui divertebat in proximo, levi corpore senem atque morbosum, et hirsutis resticulis cruribus eius innexis divaricaturn sine spiramento ullo ad usque praetorium traxere praefecti.Alii summum decus in @@ -77,7 +76,7 @@ publicum, ut his inlecebris alios quoque ad indicanda proliceret paria vel maiora.Haec igitur Epicuri non probo, inquam.De cetero vellem equidem aut ipse doctrinis fuisset instructior est enim, quod tibi ita videri necesse est, non satis politus iis artibus, quas qui tenent, eruditi appellantur aut ne deterruisset alios a studiis.quamquam te quidem video minime esse deterritum.Cuius acerbitati uxor grave accesserat incentivum, germanitate Augusti - turgida supra modum, quam Hannibaliano fratris filio antehac Constantinus iunxerat pater, Megaera quaedam mortalis, inflammatrix saevientis adsidua, + turgida supra modum, quam Hannibaliano regi fratris filio antehac Constantinus iunxerat pater, Megaera quaedam mortalis, inflammatrix saevientis adsidua, humani cruoris avida nihil mitius quam maritus; qui paulatim eruditiores facti processu temporis ad nocendum per clandestinos versutosque rumigerulos conpertis leviter addere quaedam male suetos falsa et placentia sibi discentes, adfectati regni vel artium nefandarum calumnias insontibus adfligebant. Quibus ita sceleste patratis Paulus cruore perfusus reversusque ad principis castra multos coopertos paene catenis adduxit in squalorem deiectos atque diff --git a/logging.php b/logging.php index 66a9a8a..c74a1cb 100644 --- a/logging.php +++ b/logging.php @@ -5,7 +5,7 @@ session_start(); include_once 'includes/bdd.php'; -$req=$GLOBALS['bdd']->prepare('SELECT * FROM users WHERE pseudo=?'); +$req=$bdd->prepare('SELECT * FROM users WHERE pseudo=?'); $req->execute(array($_POST['pseudo'])); $reponce=$req->fetch(); diff --git a/login.php b/login.php index acc9460..40fc80b 100644 --- a/login.php +++ b/login.php @@ -11,10 +11,10 @@
- +
- +
diff --git a/megaProcess/downloadJar.php b/megaProcess/downloadJar.php deleted file mode 100644 index a814366..0000000 --- a/megaProcess/downloadJar.php +++ /dev/null @@ -1 +0,0 @@ -query($requete)or die(print_r($GLOBALS['bdd']->errorInfo())); + $req = $bdd->query($requete)or die(print_r($bdd->errorInfo())); $projects = array(); while($rep = $req->fetch()){ diff --git a/profile.php b/profile.php index a218fbc..154ef42 100644 --- a/profile.php +++ b/profile.php @@ -10,7 +10,7 @@ prepare('SELECT * FROM users WHERE ID=? AND mdp=?'); + $req=$bdd->prepare('SELECT * FROM users WHERE ID=? AND mdp=?'); if(isset($_SESSION['session_id']) && isset($_SESSION['session_mdp'])){ $req->execute(array($_SESSION['session_id'],$_SESSION['session_mdp'])); } @@ -21,14 +21,14 @@
Changer le mot de passe :
- -
+ +
- -
+ +
- -
+ +
- - + + - + - + + include_once 'includes/inter.php'; + + $permissions = array ( + FALSE, + FALSE, + FALSE, + FALSE + ); + $connected = isConnected (); + $owner = FALSE; + + $data = array (); + if (isset ( $_GET ['id'] ) && isset ( $_GET ['v'] )) { + $data = getProjectVersionData (); + if ($data == NULL) { + $permissions = getPermissionsWithData ( $data ); + } else { + header ( 'Location:40A.php' ); + goto end; + } + } else { + header ( 'Location:40A.php' ); + goto end; + } + + if ($connected) + $owner = preg_match ( '[^0-9]?' . $_SESSION ['session_id'] . '[^0-9]?', $data ['owners'] ); + + if ($permissions [0] || $owner) { + ?>

Le projet en version

-
+
- > - " alt="Télécharger le jar" title="Télécharger le jar" src="pictures/download_jar.png"> - - - > - " alt="Voir la source" title="Voir la source" src="pictures/view_code.png"> - - - > - " alt="Télécharger la source" title="Télécharger la source" src="pictures/download_code.png"> - - - > - " alt="Voir la doc" title="Voir la doc" src="pictures/view_javadoc.png"> - - - > - " alt="Télecharger la doc" title="Télecharger la doc" src="pictures/download_javadoc.png"> - - + > + " + alt="Télécharger le jar" + title="Télécharger le jar" + src="pictures/download_jar.png" /> -
+ + > + " + alt="Voir la source" title="Voir la source" + src="pictures/view_code.png" /> + + + > + " + alt="Télécharger la source" + title="Télécharger la source" + src="pictures/download_code.png" /> + + + > + " + alt="Voir la doc" title="Voir la doc" src="pictures/view_javadoc.png" /> + + + > + " + alt="Télecharger la doc" title="Télecharger la doc" + src="pictures/download_javadoc.png" /> + + + +
- > - " alt="Télécharger le xlsm" title="Télécharger le xlsm" src="pictures/download_xlsm.png"> - - - > - " alt="Voir la source" title="Voir la source" src="pictures/voir_vb.png"> - - - > - " alt="Télécharger la source" title="Télécharger la source" src="pictures/download_vb.png"> - - + > + " + alt="Télécharger le xlsm" + title="Télécharger le xlsm" + src="pictures/download_xlsm.png" /> + + + > + " + alt="Voir la source" title="Voir la source" src="pictures/voir_vb.png" /> + + + > + " + alt="Télécharger la source" + title="Télécharger la source" + src="pictures/download_vb.png" /> + + -
-
-

Toutes les versions :

-
- - - - +
+
+

Toutes les versions :

+
+
Version
+ + + prepare($requete); - $req->execute(array($_GET['id'])); - while($rep = $req->fetch()){ - ?> + $requete = 'SELECT p.ID AS projectID , v.versionAbs AS versionAbs , p.name AS projectName , v.version AS versionName ' . 'FROM projets AS p ' . 'INNER JOIN versions AS v ' . 'ON v.project_id = p.ID ' . 'WHERE v.project_id = ?'; + $req = $bdd->prepare ( $requete ); + $req->execute ( array ( + $_GET ['id'] + ) ); + while ( $rep = $req->fetch () ) { + ?> - - + +
Version
>
> +
- + + end: + ?> - \ No newline at end of file + \ No newline at end of file diff --git a/projetV1.php b/projetV1.php index 4d36d28..87c8f5e 100644 --- a/projetV1.php +++ b/projetV1.php @@ -11,12 +11,12 @@ prepare('SELECT * FROM users WHERE ID=? AND mdp=?'); + $req=$bdd->prepare('SELECT * FROM users WHERE ID=? AND mdp=?'); if(isset($_SESSION['session_id']) && isset($_SESSION['session_mdp'])){ $req->execute(array($_SESSION['session_id'],$_SESSION['session_mdp'])); $connected = $req->fetch(); } - $req=$GLOBALS['bdd']->prepare('SELECT * FROM projets WHERE permissions LIKE "1___" AND ID=?'); + $req=$bdd->prepare('SELECT * FROM projets WHERE permissions LIKE "1___" AND ID=?'); $req->execute(array($_GET['id'])); $viewPerm = $req->fetch(); if(($connected && isset($_SESSION['session_id']) && isset($_SESSION['session_mdp'])) || $viewPerm){ @@ -25,7 +25,7 @@ 'INNER JOIN versions AS v '. 'ON v.project_id = p.ID '. 'WHERE v.project_id = ? AND v.versionAbs = ?'; - $req = $GLOBALS['bdd']->prepare($requete); + $req = $bdd->prepare($requete); $req->execute(array($_GET['id'],$_GET['v'])); $rep=$req->fetch(); if($rep){ @@ -34,10 +34,10 @@ 'INNER JOIN versions AS v '. 'ON v.project_id = p.ID '. 'WHERE v.project_id = ? AND v.versionAbs = ? AND (p.ownersID REGEXP \'[^0-9]?' . $_SESSION['session_id'] .'[^0-9]?\' OR p.permissions LIKE "1%")'; - $req = $GLOBALS['bdd']->prepare($requete); + $req = $bdd->prepare($requete); $req->execute(array($_GET['id'],$_GET['v'])); $fsyuf = $req->fetch(); - $req = $GLOBALS['bdd']->prepare('SELECT p.ID AS projectID FROM projets AS p INNER JOIN versions AS v ON v.project_id = p.ID WHERE v.project_id = ? AND v.versionAbs = ? AND p.ownersID REGEXP \'[^0-9]?' . (isset($_SESSION['session_id']))?$_SESSION['session_id']:'err' .'[^0-9]?\''); + $req = $bdd->prepare('SELECT p.ID AS projectID FROM projets AS p INNER JOIN versions AS v ON v.project_id = p.ID WHERE v.project_id = ? AND v.versionAbs = ? AND p.ownersID REGEXP \'[^0-9]?' . (isset($_SESSION['session_id']))?$_SESSION['session_id']:'err' .'[^0-9]?\''); $req->execute(array($_GET['id'],$_GET['v'])); if($req->fetch()){ $owner=TRUE; @@ -78,7 +78,7 @@ 'INNER JOIN versions AS v '. 'ON v.project_id = p.ID '. 'WHERE v.project_id = ?'; - $req = $GLOBALS['bdd']->prepare($requete); + $req = $bdd->prepare($requete); $req->execute(array($_GET['id'])); while($rep = $req->fetch()){ ?> diff --git a/projetV2.php b/projetV2.php deleted file mode 100644 index f829c19..0000000 --- a/projetV2.php +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - - - - - prepare('SELECT * FROM users WHERE ID=? AND mdp=?'); - $req->execute(array($_SESSION['session_id'],$_SESSION['session_mdp'])); - $connected = (bool)$req->fetch(); - } - $data = array(); - if(isset($_GET['id']) && isset($_GET['v'])){ - $req=$GLOBALS['bdd']->prepare('SELECT p.ID AS pID , '. - 'v.versionAbs AS versionAbs , '. - 'p.name AS name , '. - 'v.version AS version , '. - 'v.language AS language , '. - 'p.permissions AS permissions , '. - 'p.ownersID AS owners '. - 'FROM projets AS p '. - 'INNER JOIN versions AS v '. - 'ON v.project_id = p.ID '. - 'WHERE v.project_id = ? AND v.versionAbs = ?'); - $req->execute(array($_GET['id'],$_GET['v'])); - if($rep=$req->fetch()){ - $data = $rep; - $permissions[0] = preg_match('#^1#',$data['permissions']); - $permissions[1] = preg_match('#^(0|1)1#',$data['permissions']); - $permissions[2] = preg_match('#^1(0|1){2}1#',$data['permissions']); - $permissions[3] = preg_match('#^1(0|1){3}1#',$data['permissions']); - }else{ - header('Location:40A.php'); - goto end; - } - }else{ - header('Location:40A.php'); - goto end; - } - if($connected) - $owner = preg_match('[^0-9]?' . $_SESSION['session_id'] .'[^0-9]?',$data ['owners']); - - if($permissions[0] || $owner){ - ?> - -

Le projet en version

-
- - > - " alt="Télécharger le jar" title="Télécharger le jar" src="pictures/download_jar.png"> - - - > - " alt="Voir la source" title="Voir la source" src="pictures/view_code.png"> - - - > - " alt="Télécharger la source" title="Télécharger la source" src="pictures/download_code.png"> - - - > - " alt="Voir la doc" title="Voir la doc" src="pictures/view_javadoc.png"> - - - > - " alt="Télecharger la doc" title="Télecharger la doc" src="pictures/download_javadoc.png"> - - - -
- - > - " alt="Télécharger le xlsm" title="Télécharger le xlsm" src="pictures/download_xlsm.png"> - - - > - " alt="Voir la source" title="Voir la source" src="pictures/voir_vb.png"> - - - > - " alt="Télécharger la source" title="Télécharger la source" src="pictures/download_vb.png"> - - - - -
-
-

Toutes les versions :

-
- - - - - prepare($requete); - $req->execute(array($_GET['id'])); - while($rep = $req->fetch()){ - ?> - - - - -
Version
>
- - - - - - - - \ No newline at end of file diff --git a/projets.php b/projets.php index 4c623eb..cd228cc 100644 --- a/projets.php +++ b/projets.php @@ -14,7 +14,7 @@ prepare('SELECT * FROM users WHERE ID=? AND mdp=?'); + $req=$bdd->prepare('SELECT * FROM users WHERE ID=? AND mdp=?'); if(isset($_SESSION['session_id']) && isset($_SESSION['session_mdp'])){ $req->execute(array($_SESSION['session_id'],$_SESSION['session_mdp'])); } @@ -26,8 +26,8 @@ 'INNER JOIN versions AS v '. 'ON v.project_id = p.ID '. 'WHERE p.ownersID REGEXP \'[^0-9]?' . $_SESSION['session_id'] .'[^0-9]?\' '; - $req = $GLOBALS['bdd']->query($requete)or die(print_r($GLOBALS['bdd']->errorInfo())); - //$req = $GLOBALS['bdd']->query('SELECT * FROM projets WHERE ownersID REGEXP \'[^0-9]?' . $_SESSION['session_id'] .'[^0-9]?\''); + $req = $bdd->query($requete)or die(print_r($bdd->errorInfo())); + //$req = $bdd->query('SELECT * FROM projets WHERE ownersID REGEXP \'[^0-9]?' . $_SESSION['session_id'] .'[^0-9]?\''); $projects = array(); while($rep = $req->fetch()){ if(!isset($projects[$rep['projectID']])){ @@ -45,7 +45,7 @@ header('Location:401.php'); } ?> -
+
diff --git a/register.php b/register.php index da92bbe..39358da 100644 --- a/register.php +++ b/register.php @@ -29,13 +29,13 @@
- +
- +
- +
diff --git a/registering.php b/registering.php index 424afab..98e0b40 100644 --- a/registering.php +++ b/registering.php @@ -1,15 +1,15 @@ -prepare("SELECT * FROM users WHERE pseudo=?"); + $req = $bdd->prepare("SELECT * FROM users WHERE pseudo=?"); $req->execute(array($_POST['pseudo'])); if($req->fetch()){ header('Location:register.php?i=5'); }else{ - $req = $GLOBALS['bdd']->prepare('INSERT INTO users(pseudo,mdp,date_creation) VALUES (?,?,NOW())'); + $req = $bdd->prepare('INSERT INTO users(pseudo,mdp,date_creation) VALUES (?,?,NOW())'); $req->execute(array($_POST['pseudo'],$_POST['mdp'])); $_SESSION['session_id'] = $reponce['ID']; $_SESSION['session_mdp'] = $reponce['mdp'];