little change; the website generate slug when a blogpost/project is created,... (e7ffa7e6) · Commits · Corentin Bettiol / l3m-website

index.php

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -11,5 +11,4 @@ require_once('site/controller/adminController.php');

	// afficher le contenu (qui va switcher sur le contenu dynamique à afficher)		// afficher le contenu (qui va switcher sur le contenu dynamique à afficher)
	require_once('site/layout/layout.php');		require_once('site/layout/layout.php');

	?>		?>
	No newline at end of file

l3m-website-dist.conf

+3 −12

Original line number	Original line	Diff line number	Diff line
	@@ -12,17 +12,8 @@

	RewriteEngine On		RewriteEngine On
	RewriteRule ^/(about\|changelog\|blog\|rss\|projects\|contact\|patate\|eplucher)$ /index.php?action=$1		RewriteRule ^/(about\|changelog\|blog\|rss\|projects\|contact\|patate\|eplucher)$ /index.php?action=$1
	RewriteRule ^/article/([a-zA-Z0-9\-:!?+.;/,\%9áàâäãåçéèêëíìîïñóòôöõúùûüýÿæœÁÀÂÄÃÅÇÉÈÊËÍÌÎÏÑÓÒÔÖÕÚÙÛÜÝŸÆŒ]*)$ /index.php?action=blog&title=$1		RewriteRule ^/article/([-a-z0-9]+)$ /index.php?action=blog&title=$1
	RewriteRule ^/project/([a-zA-Z0-9\-:!?+.;/,\%9áàâäãåçéèêëíìîïñóòôöõúùûüýÿæœÁÀÂÄÃÅÇÉÈÊËÍÌÎÏÑÓÒÔÖÕÚÙÛÜÝŸÆŒ]*)$ /index.php?action=project&title=$1		RewriteRule ^/project/([-a-z0-9]+)$ /index.php?action=project&title=$1
	RewriteRule ^/patate/blog/([a-zA-Z0-9\-:!?+.;/,\%9áàâäãåçéèêëíìîïñóòôöõúùûüýÿæœÁÀÂÄÃÅÇÉÈÊËÍÌÎÏÑÓÒÔÖÕÚÙÛÜÝŸÆŒ]*)/edit$ /index.php?action=patate&title=$1&editb		RewriteRule ^/patate/(blog\|project)/([-a-z0-9]+)/(edit\|submit\|delete)$ /index.php?action=patate&type=$1$3&title=$2
	RewriteRule ^/patate/blog/([a-zA-Z0-9\-:!?+.;/,\%9áàâäãåçéèêëíìîïñóòôöõúùûüýÿæœÁÀÂÄÃÅÇÉÈÊËÍÌÎÏÑÓÒÔÖÕÚÙÛÜÝŸÆŒ]*)/delete$ /index.php?action=patate&title=$1&deleteb
	RewriteRule ^/patate/blog/submit$ /index.php?action=patate&submitb
	RewriteRule ^/patate/blog/edit$ /index.php?action=patate&editb
	RewriteRule ^/patate/blog/send$ /index.php?action=patate&sendb
	RewriteRule ^/patate/project/([a-zA-Z0-9\-:!?+.;/,\%9áàâäãåçéèêëíìîïñóòôöõúùûüýÿæœÁÀÂÄÃÅÇÉÈÊËÍÌÎÏÑÓÒÔÖÕÚÙÛÜÝŸÆŒ]*)/edit$ /index.php?action=patate&title=$1&editp
	RewriteRule ^/patate/project/([a-zA-Z0-9\-:!?+.;/,\%9áàâäãåçéèêëíìîïñóòôöõúùûüýÿæœÁÀÂÄÃÅÇÉÈÊËÍÌÎÏÑÓÒÔÖÕÚÙÛÜÝŸÆŒ]*)/delete$ /index.php?action=patate&title=$1&deletep
	RewriteRule ^/patate/project/submit$ /index.php?action=patate&submitp
	RewriteRule ^/patate/project/edit$ /index.php?action=patate&editp
	RewriteRule ^/patate/project/send$ /index.php?action=patate&sendp

	</VirtualHost>		</VirtualHost>

site/controller/adminController.php

+67 −54

Original line number	Original line	Diff line number	Diff line
	@@ -6,8 +6,7 @@ require_once('site/model/AdminManager.php');
	// tente de connecter l'administrateur		// tente de connecter l'administrateur
	function loginAdminPage($pageName){		function loginAdminPage($pageName){
	if(password_verify($_POST['pass'], pass) && $_POST['user'] == user){		if(password_verify($_POST['pass'], pass) && $_POST['user'] == user){
	$_SESSION['user'] = $_POST['user'];		$_SESSION['user'] = user;
	$_SESSION['pass'] = $_POST['pass'];
	header('Location:/patate');		header('Location:/patate');
	}		}
	else		else
	@@ -17,10 +16,14 @@ function loginAdminPage($pageName){
	// afficher le panneau d'administration & gère l'administration du site		// afficher le panneau d'administration & gère l'administration du site
	function writeAdminPage($pageName){		function writeAdminPage($pageName){
	$admin = new AdminManager();		$admin = new AdminManager();

	if($admin->verifyAdminConnect()){		if($admin->verifyAdminConnect()){
	if(isset($_GET['editb'])){		if(isset($_GET['type'])){
	if(isset($_GET['title'])){		switch ($_GET['type']){
	$title = urldecode($_GET['title']);
			case 'blogedit':
			if(!isset($_POST['title'])){
			$title = htmlspecialchars($_GET['title']);
	if($blogpost = $admin->getBlogPost($title))		if($blogpost = $admin->getBlogPost($title))
	require('site/view/private/editblogView.php');		require('site/view/private/editblogView.php');
	else		else
	@@ -30,9 +33,26 @@ function writeAdminPage($pageName){
	$admin->updateBlogPost();		$admin->updateBlogPost();
	header('Location:/patate');		header('Location:/patate');
	}		}
			break;

			case 'blogsubmit':
			if(isset($_POST['title'])){
			$admin->sendBlogPost();
			//header('Location:/patate');
	}		}
	else if(isset($_GET['editp'])){		else
			require('site/view/private/createBlogView.php');
			break;

			case 'blogdelete':
	if(isset($_GET['title'])){		if(isset($_GET['title'])){
			$admin->deleteBlogPost($_GET['title']);
			header('Location:/patate');
			}
			break;

			case 'projectedit':
			if(!isset($_POST['name'])){
	$title = urldecode($_GET['title']);		$title = urldecode($_GET['title']);
	$project = $admin->getProject($title);		$project = $admin->getProject($title);
	require('site/view/private/editProjectView.php');		require('site/view/private/editProjectView.php');
	@@ -41,37 +61,30 @@ function writeAdminPage($pageName){
	$admin->updateProject();		$admin->updateProject();
	header('Location:/patate');		header('Location:/patate');
	}		}
	}		break;
	else if(isset($_GET['submitb'])){
	require('site/view/private/createBlogView.php');		case 'projectsubmit':
	}		if(isset($_POST['name'])){
	else if(isset($_GET['submitp'])){
	require('site/view/private/createProjectView.php');
	}
	else if(isset($_GET['sendb'])){
	$admin->sendBlogPost();
	header('Location:/');
	}
	else if(isset($_GET['sendp'])){
	$admin->sendProject();		$admin->sendProject();
	header('Location:/projects');
	}
	else if(isset($_GET['deleteb'])){
	if(isset($_GET['title'])){
	$title = urldecode($_GET['title']);
	$admin->deleteBlogPost($title);
	header('Location:/patate');		header('Location:/patate');
	}		}
	}		else
	else if(isset($_GET['deletep'])){		require('site/view/private/createProjectView.php');
			break;

			case 'projectdelete':
	if(isset($_GET['title'])){		if(isset($_GET['title'])){
	$title = urldecode($_GET['title']);		$admin->deleteProject($_GET['title']);
	$admin->deleteProject($title);
	header('Location:/patate');		header('Location:/patate');
	}		}
			break;

			default:
			# code...
			break;
			}
	}		}
	else{		else{

	$blogposts = $admin->getBlogPosts();		$blogposts = $admin->getBlogPosts();
	$projects = $admin->getProjects();		$projects = $admin->getProjects();

site/controller/mainController.php

+6 −5

Original line number	Original line	Diff line number	Diff line
	@@ -87,8 +87,8 @@ function writeBlogPage($pageName){
	$blogpost = $blog->get($title);		$blogpost = $blog->get($title);
	if($blogpost != false)		if($blogpost != false)
	require('site/view/public/blogPostView.php');		require('site/view/public/blogPostView.php');
	else		//else
	header('Location:/404');		// header('Location:/404');
	}		}
	// si on affiche la liste des posts		// si on affiche la liste des posts
	else{		else{
	@@ -106,10 +106,11 @@ function writeProjectPage($pageName){
	if(isset($_GET['title'])){		if(isset($_GET['title'])){
	$title = urldecode($_GET['title']);		$title = urldecode($_GET['title']);
	$project = $project->get($title);		$project = $project->get($title);
	if($project != false)		if($project != false){
	require('site/view/public/projectView.php');		require('site/view/public/projectView.php');
	else		}
	header('Location:/404');		//else
			// header('Location:/404');
	}		}
	// si on affiche la liste des projets		// si on affiche la liste des projets
	else{		else{

site/model/AdminManager.php

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -17,19 +17,19 @@ class AdminManager extends Base

	public function getBlogPost($link)		public function getBlogPost($link)
	{		{
	$blogpost = new BlogManager(null, null, null, null, null, null); // moche :c		$blogpost = new BlogManager(null, null, null, null, null, null);
	return $blogpost->get($link);		return $blogpost->get($link);
	}		}

	public function getProject($link)		public function getProject($link)
	{		{
	$project = new ProjectManager(null,null,null,null,null); // moche :c		$project = new ProjectManager(null,null,null,null,null);
	return $project->get($link);		return $project->get($link);
	}		}


	public function verifyAdminConnect(){		public function verifyAdminConnect(){
	return isset($_SESSION['user']) && $_SESSION['user'] == user && isset($_SESSION['pass']) && password_verify($_SESSION['pass'], pass);		return isset($_SESSION['user']) && $_SESSION['user'] == user;
	}		}

	public function updateBlogPost(){		public function updateBlogPost(){
	@@ -43,13 +43,13 @@ class AdminManager extends Base
	}		}

	public function sendBlogPost(){		public function sendBlogPost(){
	$blog = new BlogManager($_POST['time'], $_POST['title'], $_POST['content'], $_POST['shortContent'], $_POST['id']);		$blog = new BlogManager($_POST['time'], $_POST['title'], $_POST['content'], $_POST['shortContent'], null);
	$blog->send();		$blog->send();
	}		}


	public function sendProject(){		public function sendProject(){
	$project = new ProjectManager($_POST['name'], $_POST['link'], $_POST['content'], $_POST['shortContent'], $_POST['id']);		$project = new ProjectManager($_POST['name'], $_POST['link'], $_POST['content'], $_POST['shortContent'], null);
	$project->send();		$project->send();
	}		}