From 16cd098a05ac370005e27f49027dd667316ddb8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Luttringer?= Date: Wed, 3 Mar 2010 19:13:09 +0000 Subject: [PATCH] disable logging in http disable loggin in http on connection page enforce https on connexion button on index page disconnect user if it's not in https (dropping if loosing ssl) delete photo directory and admin page and links in admin page delete admin page of forum fix redirect on blacklist site fix indentation and trailing whitespace in some files add a sexy redirection function found on http://php.net/manual/fr/function.header.php add link to munin and phpmyadmin in admin link fix fucking bad color #d3d3df by #303030 in all admin pages ! svn ignore include/db_connect.php --- admin/admin_blacklist.php | 10 +- admin/admin_edito.php | 8 +- admin/admin_forum.php | 14 - admin/admin_home.php | 161 ++------- admin/admin_links.php | 8 +- admin/admin_members.php | 8 +- admin/admin_menu.php | 12 +- admin/admin_news.php | 8 +- admin/admin_photos.php | 671 -------------------------------------- admin/admin_tables.php | 11 - admin/admin_users.php | 8 +- admin/admin_videos.php | 137 ++++---- css/main.css | 31 +- include/functions_www.php | 18 + include/menu.php | 49 +-- index.php | 116 +++---- public/connection.php | 65 ++-- 17 files changed, 250 insertions(+), 1085 deletions(-) delete mode 100644 admin/admin_forum.php delete mode 100644 admin/admin_photos.php diff --git a/admin/admin_blacklist.php b/admin/admin_blacklist.php index aa550f2..667f3b2 100644 --- a/admin/admin_blacklist.php +++ b/admin/admin_blacklist.php @@ -40,7 +40,7 @@ $str = ' - + -
@@ -146,7 +146,7 @@ $str = '
+ -
@@ -226,7 +226,7 @@ function dispAdminAddBlacklist() {
+ @@ -297,7 +297,7 @@ $str = ' -
+ '; @@ -394,7 +394,7 @@ $str = ' -
+ '; diff --git a/admin/admin_edito.php b/admin/admin_edito.php index 7f08fda..6ed8c23 100644 --- a/admin/admin_edito.php +++ b/admin/admin_edito.php @@ -36,7 +36,7 @@ $str = ' -
+ - -
@@ -132,7 +132,7 @@ function dispAdminAddEdito () {
+ @@ -196,7 +196,7 @@ $str = ' - +
+ '; @@ -283,7 +283,7 @@ $str = ' -
+ '; diff --git a/admin/admin_forum.php b/admin/admin_forum.php deleted file mode 100644 index 89c2d63..0000000 --- a/admin/admin_forum.php +++ /dev/null @@ -1,14 +0,0 @@ -
OKAY?'; - -return $str; -} - -?> \ No newline at end of file diff --git a/admin/admin_home.php b/admin/admin_home.php index 928dd4e..73bcc07 100644 --- a/admin/admin_home.php +++ b/admin/admin_home.php @@ -6,10 +6,8 @@ include_once "admin/admin_tables.php"; include_once "admin/functions_sql_admin.php"; include_once "admin/admin_menu.php"; include_once "admin/admin_videos.php"; -include_once "admin/admin_photos.php"; include_once "admin/admin_news.php"; include_once "admin/admin_edito.php"; -include_once "admin/admin_forum.php"; include_once "admin/admin_links.php"; include_once "admin/admin_members.php"; include_once "admin/admin_users.php"; @@ -25,7 +23,7 @@ $str = '
- + - - -
- + - @@ -58,7 +56,7 @@ $str .= '
@@ -39,16 +37,16 @@ $str = '  a d m i n - - + +
+ '; - + $str .= dispAdminMenu(); - + $str .= '
'; @@ -70,7 +68,7 @@ $str .= ' else { - + $total_size_videos = 0; $nb_videos_publics = 0; $nb_videos_tendus = 0; @@ -100,36 +98,6 @@ $str .= ' ;} - $total_size_photos = 0; - $nb_photos_publics = 0; - $nb_photos_tendus = 0; - $nb_photos_privates = 0; - $nb_photos_eptv = 0; - $nb_photos_bonus = 0; - $nb_photos_adm = 0; - - $result = getAllPhotos(); - for ($nb_photos = 0; $photo = mysql_fetch_array($result); $nb_photos++) { - - $total_size_photos += $photo["photo_size"]; - - if ($photo["photo_tendu"] == '0') - $nb_photos_publics++; - else if ($photo["photo_tendu"] == '1') - $nb_photos_tendus++; - else if ($photo["photo_tendu"] == '2') - $nb_photos_privates++; - - if ($photo["photo_type"] == 'eptvprod') - $nb_photos_eptv++; - else if ($photo["photo_type"] == 'eptvbonus') - $nb_photos_bonus++; - else if ($photo["photo_type"] == 'eptv.adm') - $nb_photos_adm++; - ;} - - - $result = getLastNews(2); for ($nb_news = 0; $news = mysql_fetch_array($result); $nb_news++) { ;} @@ -148,7 +116,7 @@ $str .= ' $result = getAllUsers(); for ($nb_users = 0; $user = mysql_fetch_array($result); $nb_users++) { - + if ($user["user_right"] == 1) $nb_users_basics++; else if ($user["user_right"] == 2) @@ -169,7 +137,7 @@ $str .= ' $str .= ' - + - + -
@@ -180,12 +148,12 @@ $str .= '   w e l c o m e   t o   a d m i n i s t r a c h e u n - +
+ - @@ -267,90 +235,11 @@ $str .= ' - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -445,7 +334,7 @@ $str .= '
@@ -197,7 +165,7 @@ $str .= ' Nombre total de Vidéos: ' + ' .$nb_videos. '
- Nombre total d\'Albums Photos: - ' - .$nb_photos. - '
-     Nombre total de Photos: - ' - .$total_size_photos. - ' Img
-     Nombre d\'Albums Photos Publics: - ' - .$nb_photos_publics. - '
-     Nombre d\'Albums Photos Tendus: - ' - .$nb_photos_tendus. - '
-     Nombre d\'Albums Photos Privées: - ' - .$nb_photos_privates. - '
-     Nombre d\'Albums Photos Eptv: - ' - .$nb_photos_eptv. - '
-     Nombre d\'Albums Photos Bonus: - ' - .$nb_photos_bonus. - '
-     Nombre d\'Albums Photos .Adm: - ' - .$nb_photos_adm. - '
Nombre total de News: ' + ' .$nb_news. '
- + '; @@ -459,9 +348,9 @@ $str .= '
+ + +
'; @@ -473,18 +362,18 @@ $str = ' - + - -
- +
- Arf, pas tout de suite... + Arf, pas tout de suite... - +
+
'; } diff --git a/admin/admin_links.php b/admin/admin_links.php index 9e18d0d..86a4580 100644 --- a/admin/admin_links.php +++ b/admin/admin_links.php @@ -32,7 +32,7 @@ $str = '
+ -
@@ -128,7 +128,7 @@ function dispAdminAddLink() {
+ @@ -187,7 +187,7 @@ $str = ' -
+ '; @@ -258,7 +258,7 @@ $str = ' -
+ '; diff --git a/admin/admin_members.php b/admin/admin_members.php index 65567f9..c95a7f0 100644 --- a/admin/admin_members.php +++ b/admin/admin_members.php @@ -46,7 +46,7 @@ function dispAdminMembers () { $str .= ' -
+ -
@@ -202,7 +202,7 @@ function dispAdminAddMember() {
+ @@ -352,7 +352,7 @@ $str = ' -
+ '; @@ -537,7 +537,7 @@ $str = ' -
+ '; diff --git a/admin/admin_menu.php b/admin/admin_menu.php index 6e79cbc..5adff33 100644 --- a/admin/admin_menu.php +++ b/admin/admin_menu.php @@ -2,8 +2,6 @@ function dispAdminMenu() { - - $str = ' @@ -18,9 +16,6 @@ $str = ' } $str .= ' -
- Photos -
@@ -28,7 +23,7 @@ $str = ' if ($_SESSION["user_right"] >= $GLOBALS["EPTV"]) { $str .= ' -
+
@@ -44,7 +39,10 @@ $str = ' Blacklist
+ '; diff --git a/admin/admin_news.php b/admin/admin_news.php index ddd39bb..759f4d7 100644 --- a/admin/admin_news.php +++ b/admin/admin_news.php @@ -33,7 +33,7 @@ $str = '
-
+ -
@@ -176,7 +176,7 @@ function dispAdminAddNews() {
+ @@ -254,7 +254,7 @@ $str = ' -
+ '; @@ -348,7 +348,7 @@ $str = ' - -
+ '; diff --git a/admin/admin_photos.php b/admin/admin_photos.php deleted file mode 100644 index 6cff58d..0000000 --- a/admin/admin_photos.php +++ /dev/null @@ -1,671 +0,0 @@ - - - - -
- - - - - - - - - - - - - -
- - -   a l l   p h o t o s - - -
- -
-
-
-
-
'; - - - - - - - - if (mysql_num_rows($result_prod)) { - $str .= dispAdminPhotosByType($result_prod, " e p t v   p r o d u c t i o n"); - } - - if (mysql_num_rows($result_bonus)) { - $str .= dispAdminPhotosByType($result_bonus, " e p t v   b o n u s"); - } - - if (mysql_num_rows($result_adm)) { - $str .= dispAdminPhotosByType($result_adm, " e p t v . a d m"); - } - -return $str; - -} - - - - -function dispAdminPhotosByType($result, $photo_type) { - - $str = ' - - - - -
- - - - - - - - -
- - - '.$photo_type.' - - -
- - - - -
- - - '; - - while ($photo = mysql_fetch_array($result)) { - - $vid_id = $photo["photo_id"]; - - $str .= dispWhenTendu($photo["photo_tendu"]); - - $str .= ' - - - '.$photo["photo_name"].' - - - - '; - - if ($photo["photo_user_id"] == $_SESSION["user_id"] || $_SESSION["user_right"] == $GLOBALS["ROOT"]){ - $str .= ' - - - '; - } - - - $str .= ''; - } - -$str .= ' -
- '.$photo["photo_date"].' - - '.$photo["photo_size"].' Img - -
- -
- 		-
- -
-
-
-
-
-
- '; - - return ($str); - -} - - - - - - - -function dispAdminPhotosSolos () { - - $rep_def = "photos/"; - - if ($_SESSION["user_right"] < $GLOBALS["REPORTER"] ) - { - return("T'es ouf"); - } - - - // Files on BDD - - $result = getAllphotos(); - - while ($photo = mysql_fetch_array($result)) { - $tab_path_bdd[] = $photo["photo_path"]; - } - - - // Files on Serveur - - $tab_path_local = find_reccur_file($rep_def); - - - - for ($cpt_local = 0; $tab_path_local[$cpt_local]; $cpt_local++) - { - for ($cpt_bdd = 0; $tab_path_bdd[$cpt_bdd] && $tab_path_bdd[$cpt_bdd] != $tab_path_local[$cpt_local]; $cpt_bdd++) - { - ; - } - if (!$tab_path_bdd[$cpt_bdd]) - { - $tab_solo[] = $tab_path_local[$cpt_local]; - } - - } - - - - - $str = ' - - - - - -
- - - - - - - - -
- - -   p h o t o s   s o l o s - - -
- - - - -
- - '; - - - for ($i = 0; $tab_solo[$i]; $i++) - { - - $str .= ' - - - - - - - - - '; - - } - - $str .= ' - -
- '.$tab_solo[$i].' - -
- -
-
-
-
-
- - '; - - - - - return $str; - -} - - - - -function dispAdminAddPhotos () { - - $date = get_date(); - $vid_path = ""; - - if (isset($_GET['vid_path'])) - { - $vid_path = $_GET['vid_path']; - } - - - $str = ' - - - - -
- - - - - - -
- - -   a d d   p h o t o   a l b u m   t o   d a t a b a s e - - -
- - - -
- - - - - - - - - - - - - - '; - - - -$str .=' - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path de l\'album photo - '; - - if (isset($_REQUEST['file'])) - { - $str .= ''; - } - else - { - $str .= ''; - } - - - $str .= " - Browser... "; - - - - $str .= ' -
Nom de l\'album photo:
Nombre de photos:
Date de dépot:
Catégorie - - -
-
-
Commentaire: - -
Groupe Photo - - -
-
-
News - Poster une news automatique sur le site. (nom de l\'album photo + date + commentaire + groupe) -
- -
-
-'; - - -return $str; -} - - -function dispAdminModifPhotos () { - -$vid_id =$_GET['vid_id']; - -$result = getOnePhoto($vid_id); - -$str = ' - - - - -
- - - - - - -
- - -   m o d i f y   a l b u m   p h o t o - - -
- - - '; - - if (mysql_num_rows($result)){ - $photo = mysql_fetch_array($result); - } - - $str .= ' - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - '; - - - $str .= ' - - - - - - - - - - - - - -
Path de l\'album photo: - '; - - if (isset($_REQUEST['file'])) - { - $str .= ''; - } - else - { - $str .= ''; - } - - - $str .= " - Browser... "; - -$str .= ' - - -
Nom de l\'album photo:
Nombre de photos:
Date de dépot:
Catégorie - - -
-
-
Commentaire: - -
Groupe Photos - - -
-
-
Postée par: - '; - - $id_user = getOneUserById($photo["photo_user_id"]); - - if (mysql_num_rows($id_user)){ - $id_user = mysql_fetch_array($id_user); - } - - $str .= $id_user["user_pseudo"].'
- -
-
- -'; - -return $str; -} - - -function dispAdminDelPhotos () { - - $vid_id =$_GET['vid_id']; - - $result = getOnePhoto($vid_id); - - -$str = ' - - - - -
- - - - - - -
- - -   d e l e t e   a l b u m   p h o t o - - -
- - - '; - - if (mysql_num_rows($result)){ - $photo = mysql_fetch_array($result); - } - - $str .= ' - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - '; - } - else if ($photo["photo_tendu"] == 1){ - $str .= 'Tendu'; - } - else if ($photo["photo_tendu"] == 2){ - $str .= 'Privée'; - } - - $str .= ' - - '; - - $str .= ' - - - - -
Nom de l\'album photo: '.$photo["photo_name"].'
Nombre de photos: '.$photo["photo_size"].'
Path de l\'album photo: - - ' .$photo["photo_path"].' - -
Date de dépot: '.$photo["photo_date"].' à '.$photo["photo_time"] .'
Catégorie: - '.$photo["photo_type"].' - -
Commentaire: - '.$photo["photo_comment"].' -
Groupe Photos: '; - - if ($photo["photo_tendu"] == 0){ - $str .= 'Public
Postée par: - '; - - $id_user = getOneUserById($photo["photo_user_id"]); - - if (mysql_num_rows($id_user)){ - $id_user = mysql_fetch_array($id_user); - } - - $str .= $id_user["user_pseudo"].'
- -
-
- -'; - -return $str; -} - - -?> \ No newline at end of file diff --git a/admin/admin_tables.php b/admin/admin_tables.php index 62247dd..56a244f 100644 --- a/admin/admin_tables.php +++ b/admin/admin_tables.php @@ -12,15 +12,6 @@ $tab_section_admin[ModifVideo] = adminModifVideo; // sql modif a video $tab_section_admin[AdminDelVideos] = dispAdminDelVideos; // disp admin delete a video $tab_section_admin[DelVideo] = adminDeleteVideo; // sql delete a video -$tab_section_admin[AdminPhotos] = dispAdminPhotos; -$tab_section_admin[AdminPhotosSolos] = dispAdminPhotosSolos; // disp admin Photos solos -$tab_section_admin[AdminAddPhotos] = dispAdminAddPhotos; // disp admin add a Photo -$tab_section_admin[AddPhoto] = adminAddPhoto; // sql add a Photo -$tab_section_admin[AdminModifPhotos] = dispAdminModifPhotos; // disp admin modif a Photo -$tab_section_admin[ModifPhoto] = adminModifPhoto; // sql modif a Photo -$tab_section_admin[AdminDelPhotos] = dispAdminDelPhotos; // disp admin delete a Photo -$tab_section_admin[DelPhoto] = adminDeletePhoto; // sql delete a Photo - $tab_section_admin[AdminNews] = dispAdminNews; $tab_section_admin[AdminAddNews] = dispAdminAddNews; // disp admin add a news $tab_section_admin[AddNews] = adminAddNews; // sql add a news @@ -29,8 +20,6 @@ $tab_section_admin[ModifNews] = adminModifNews; // sql modif a news $tab_section_admin[AdminDelNews] = dispAdminDelNews; // disp admin delete a news $tab_section_admin[DelNews] = adminDeleteNews; // sql delete a news - - $tab_section_admin[AdminEdito] = dispAdminEdito; $tab_section_admin[AdminAddEdito] = dispAdminAddEdito; // disp admin add an edito $tab_section_admin[AddEdito] = adminAddEdito; // sql add an edito diff --git a/admin/admin_users.php b/admin/admin_users.php index d8074fb..e06ab29 100644 --- a/admin/admin_users.php +++ b/admin/admin_users.php @@ -47,7 +47,7 @@ $str = ' $str .= '
+ -
@@ -146,7 +146,7 @@ function dispAdminAddUser() {
+ @@ -254,7 +254,7 @@ $str = ' -
+ '; @@ -371,7 +371,7 @@ $str = ' -
+ '; diff --git a/admin/admin_videos.php b/admin/admin_videos.php index f3a3d1e..38b5764 100644 --- a/admin/admin_videos.php +++ b/admin/admin_videos.php @@ -16,10 +16,8 @@ $result_prod = getVideosByType("eptvprod"); $result_bonus = getVideosByType("eptvbonus"); $result_adm = getVideosByType("eptv.adm"); - - $str = ' - +
@@ -53,15 +51,10 @@ $str = '
'; - - - - - if (mysql_num_rows($result_prod)) { - $str .= dispAdminVideosByType($result_prod, " e p t v   p r o d u c t i o n"); + $str .= dispAdminVideosByType($result_prod, " e p t v   p r o d u c t i o n"); } - + if (mysql_num_rows($result_bonus)) { $str .= dispAdminVideosByType($result_bonus, " e p t v   b o n u s"); } @@ -78,8 +71,8 @@ return $str; function dispAdminVideosByType($result, $video_type) { - - $str = ' + + $str = '
@@ -30,7 +28,7 @@ $str = '   a l l   v i d e o s - +
- + -
@@ -90,12 +83,12 @@ function dispAdminVideosByType($result, $video_type) { '.$video_type.' - +
+ '; } @@ -240,7 +233,7 @@ function dispAdminVideosSolos () { $str = ' - +
@@ -104,13 +97,13 @@ function dispAdminVideosByType($result, $video_type) { '; while ($video = mysql_fetch_array($result)) { - + $vid_id = $video["video_id"]; $str .= dispWhenTendu($video["video_tendu"]); $str .= ' - + @@ -118,7 +111,7 @@ function dispAdminVideosByType($result, $video_type) { '; if ($video["video_path_daily"]) { $str .= ''; - } + } $str .= ' '.$video["video_date"].' @@ -132,13 +125,13 @@ function dispAdminVideosByType($result, $video_type) { $str .= ' - +
-
+
- + -
@@ -251,12 +244,12 @@ function dispAdminVideosSolos () {   v i d e o s   s o l o s - +
+ @@ -277,7 +270,7 @@ function dispAdminVideosSolos () { @@ -298,7 +291,7 @@ function dispAdminVideosSolos () {
@@ -266,7 +259,7 @@ function dispAdminVideosSolos () { for ($i = 0; $tab_solo[$i]; $i++) { - + $str .= '
- +
- + '; @@ -322,7 +315,7 @@ function dispAdminAddVideos () { } - $str = ' + $str = ' - + -
@@ -333,13 +326,13 @@ function dispAdminAddVideos () {   a d d   v i d e o   t o   d a t a b a s e - +
+ - +
@@ -366,24 +359,24 @@ function dispAdminAddVideos () { - + - + '; - - + + $str .=' - + - +
Path Dailymotion:
Nom de la Vidéo:
Date de dépot:
Catégorie @@ -402,7 +395,7 @@ $str .=' - +
Groupe Vidéo @@ -446,12 +439,12 @@ return $str; function dispAdminModifVideos () { - + $vid_id =$_GET['vid_id']; $result = getOneVideo($vid_id); -$str = ' +$str = '
- + -
@@ -462,23 +455,23 @@ $str = '   m o d i f y   v i d e o - +
+ - + '; if (mysql_num_rows($result)){ - $video = mysql_fetch_array($result); + $video = mysql_fetch_array($result); } $str .= '
- + @@ -497,7 +490,7 @@ $str = ' $str .= " Browser... "; - + $str .= ' @@ -506,11 +499,11 @@ $str .= ' - + - + - - - - - - '; + + + + + + + + '; + else + $str .= "Pour vous connecter au site, vous devez utiliser une connexion SSL!"; $str .= dispTableEnd(); @@ -73,7 +76,7 @@ function dispConnectionRegister() { /////// CONNECTION REGISTER /////// - +
Path de la Vidéo:
Path Dailymotion:
Nom de la Vidéo:
Date de dépot:
Catégorie @@ -529,7 +522,7 @@ $str .= ' - + @@ -575,7 +568,7 @@ $str .= '
Groupe Vidéo @@ -545,7 +538,7 @@ $str .= ' '; - $str .= ' + $str .= ' @@ -567,7 +560,7 @@ $str .= ' - +
Postée par: '; @@ -553,7 +546,7 @@ $str .= ' $id_user = getOneUserById($video["video_user_id"]); if (mysql_num_rows($id_user)){ - $id_user = mysql_fetch_array($id_user); + $id_user = mysql_fetch_array($id_user); } $str .= $id_user["user_pseudo"].'
- + '; return $str; @@ -589,7 +582,7 @@ function dispAdminDelVideos () { $result = getOneVideo($vid_id); -$str = ' +$str = ' - + - diff --git a/css/main.css b/css/main.css index bda13f6..94084f3 100644 --- a/css/main.css +++ b/css/main.css @@ -7,13 +7,13 @@ body margin: 0px; padding: 0px; font-size: 11px; - color: #CCCCCC; - font-family: Tahoma,'Trebuchet MS',Verdana,Arial,"Lucida-Grande",Sans-serif; + color: #CCCCCC; + font-family: Tahoma,'Trebuchet MS',Verdana,Arial,"Lucida-Grande",Sans-serif; } -* { +* { margin: 0; padding: 0; - font-family: Tahoma,'Trebuchet MS',Verdana,Arial,"Lucida-Grande",Sans-serif; + font-family: Tahoma,'Trebuchet MS',Verdana,Arial,"Lucida-Grande",Sans-serif; } ul, li { list-style-type: none; @@ -37,7 +37,7 @@ img { .copyrights { color: #646464; - font-family: Tahoma,'Trebuchet MS',Verdana,Arial,"Lucida-Grande",Sans-serif; + font-family: Tahoma,'Trebuchet MS',Verdana,Arial,"Lucida-Grande",Sans-serif; text-align: center; margin: 10px 0px 0px 0px; } @@ -51,7 +51,7 @@ img { background: #303030; top: 0px; width: 901px; - margin: 0 auto; + margin: 0 auto; } #main_body { @@ -116,7 +116,7 @@ div.top_box color: #B8B8B8; padding: 8px 0px 0px 0px; font-size: 13px; - font-family: Tahoma,'Trebuchet MS',Verdana,Arial,"Lucida-Grande",Sans-serif; + font-family: Tahoma,'Trebuchet MS',Verdana,Arial,"Lucida-Grande",Sans-serif; text-decoration: none; text-align: center; } @@ -126,7 +126,7 @@ div.top_box height: 22px; color: #99FF33; font-size: 13px; - font-family: Tahoma,'Trebuchet MS',Verdana,Arial,"Lucida-Grande",Sans-serif; + font-family: Tahoma,'Trebuchet MS',Verdana,Arial,"Lucida-Grande",Sans-serif; text-decoration: none; text-align: center; } @@ -185,7 +185,7 @@ div#newsbox li { div#newsbox h1 { height: 26px; font-size: 14px; - font-family: Tahoma,'Trebuchet MS',Verdana,Arial,"Lucida-Grande",Sans-serif; + font-family: Tahoma,'Trebuchet MS',Verdana,Arial,"Lucida-Grande",Sans-serif; padding: 10px; background: #1D1D1D; color: #B8B8B8; @@ -224,7 +224,7 @@ div.rightbox li { div.rightbox h1 { height: 26px; font-size: 14px; - font-family: Tahoma,'Trebuchet MS',Verdana,Arial,"Lucida-Grande",Sans-serif; + font-family: Tahoma,'Trebuchet MS',Verdana,Arial,"Lucida-Grande",Sans-serif; padding: 10px; background: #1D1D1D; color: #B8B8B8; @@ -263,7 +263,7 @@ div.rightbox h1 { padding: 0px 0px 5px 20px; } -#left_side h3 { +#left_side h3 { color: #aaa28b; margin: 10px 0px 0px 0px; padding: 0px 0px 0px 5px; @@ -313,15 +313,15 @@ div#menu margin: 10px 0px 0px 0px; padding: 0px 0px 0px 5px; font-size: 12px; - font-family: Tahoma,'Trebuchet MS',Verdana,Arial,"Lucida-Grande",Sans-serif; + font-family: Tahoma,'Trebuchet MS',Verdana,Arial,"Lucida-Grande",Sans-serif; } -#right_side h3 { +#right_side h3 { color: #aaa28b; margin: 10px 0px 0px 0px; padding: 0px 0px 0px 5px; font-size: 12px; - font-family: Tahoma,'Trebuchet MS',Verdana,Arial,"Lucida-Grande",Sans-serif; + font-family: Tahoma,'Trebuchet MS',Verdana,Arial,"Lucida-Grande",Sans-serif; } @@ -420,8 +420,7 @@ a { color: #cccccc; } -table a.texte_link, -table +table a.texte_link,table { color: #FFFFFF; } diff --git a/include/functions_www.php b/include/functions_www.php index 3f393ea..a5e0098 100644 --- a/include/functions_www.php +++ b/include/functions_www.php @@ -70,5 +70,23 @@ function get_time(){ // r return($time); } +//Try PHP header redirect, then Java redirect, then try http redirect.: +function redirect($url) { + if (!headers_sent()) { + //If headers not sent yet... then do php redirect + header('Location: '.$url); + exit; + } + else { + //If headers are sent... do java redirect... if java disabled, do html redirect. + echo ''; + echo ''; + exit; + } +} ?> \ No newline at end of file diff --git a/include/menu.php b/include/menu.php index 8f20e84..dacd7cc 100644 --- a/include/menu.php +++ b/include/menu.php @@ -1,38 +1,23 @@ '; - - -$str .= '  -'; - if ($_SESSION["user_right"] > $GLOBALS["ANONYM"]) { - $str .= "Déconnexion"; - } - else { - $str .= "Connexion"; - } - -$str .= ''; - - -echo $str; -} - - - ?> diff --git a/index.php b/index.php index 5609deb..90b355c 100644 --- a/index.php +++ b/index.php @@ -1,7 +1,6 @@ 0) + userDisconnect(); ?> + @@ -102,7 +97,7 @@ function initThis() /* function popup(_m,_b) { - + var content="
@@ -600,43 +593,43 @@ $str = '   d e l e t e   v i d e o - +
+ - + '; if (mysql_num_rows($result)){ - $video = mysql_fetch_array($result); + $video = mysql_fetch_array($result); } $str .= '
- + - + - + @@ -646,7 +639,7 @@ $str = ' '.$video["video_comment"].' - + '; } - $str .= ' + $str .= ' '; @@ -677,7 +670,7 @@ $str = ' - +
Nom de la Vidéo: '.$video["video_name"].'
Path de la Vidéo: - + ' .$video["video_path"].' - +
Date de dépot: '.$video["video_date"].' à '.$video["video_time"] .'
Catégorie: - '.$video["video_type"].' + '.$video["video_type"].'
Groupe Vidéo: '; @@ -660,7 +653,7 @@ $str = ' $str .= 'Privée
Postée par: '; @@ -668,7 +661,7 @@ $str = ' $id_user = getOneUserById($video["video_user_id"]); if (mysql_num_rows($id_user)){ - $id_user = mysql_fetch_array($id_user); + $id_user = mysql_fetch_array($id_user); } $str .= $id_user["user_pseudo"].'
"+_m+"
"; if(old) { @@ -168,73 +163,62 @@ if(isNS4||isIE) -
- - + +
- - - 0) { - echo ''; - } - else { - echo ''; - }*/ - ?> - + 0) + echo ''; + else + echo ''; + */ + ?> + + + - + -
- + diff --git a/public/connection.php b/public/connection.php index 8c3b1c9..26d2b6e 100644 --- a/public/connection.php +++ b/public/connection.php @@ -5,7 +5,7 @@ function dispConnection(){ /////// BEGIN TABLE UP /////// if ($_SESSION["user_right"] == 0) { - $str .= dispConnectionLogin(); + $str .= dispConnectionLogin(); } else { $str .= dispConnectionDisconnect(); @@ -38,16 +38,19 @@ function dispConnectionLogin() { /////// CONNECTION LOGIN /////// $str = dispTableBegin("c o n n e x i o n", "30", 1); - $str .= ' + if ($_SERVER['HTTPS'] == "on") + $str .= ' -
-
Login
Pass

Login
Pass

-
+
@@ -104,7 +107,7 @@ function dispConnectionEpiRegister() { /////// CONNECTION EPI REGISTER ///////
-
+
@@ -133,7 +136,7 @@ function dispConnectionProfile() { /////// CONNECTION PROFIL ///////
-
+
@@ -166,7 +169,7 @@ function dispConnectionDisconnect() { /////// CONNECTION PROFIL ///////
Salut à toi '.$user["user_pseudo"].'