diff --git a/css/default.css b/css/default.css index acfb2f27fcc058dc8498b4e7400be58a074cc291..aed77abdc70b2d58290ea2143457aac975ed6eb2 100644 --- a/css/default.css +++ b/css/default.css @@ -72,7 +72,6 @@ img { background: #303030; border-left: 1px solid #646464; border-right: 1px solid #646464; - width: 901px; margin: 0 auto; } @@ -171,7 +170,6 @@ img { */ div#newsbox { - /*width: 530px;*/ margin: 0px 15px 20px 15px; } @@ -194,6 +192,76 @@ div#newsbox h1 { border-bottom: 1px solid #303030; } + +div#lastnewsbox { + width: 530px; + margin: 0px 15px 20px 15px; +} + +div#lastnewsbox ul { + background: #1D1D1D; + padding: 15px; +} + +div#lastnewsbox li { + display: block; +} + +div#lastnewsbox h1 { + height: 26px; + font-size: 14px; + font-family: Tahoma,'Trebuchet MS',Verdana,Arial,"Lucida-Grande",Sans-serif; + padding: 10px; + background: #1D1D1D; + color: #B8B8B8; + border-bottom: 1px solid #303030; +} + +div#memberbox { + /*width: 530px;*/ + margin: 0px 15px 20px 15px; +} + +div#memberbox ul { + background: #1D1D1D; + padding: 15px; +} + +div#memberbox li { + display: block; +} + +div#memberbox h1 { + height: 26px; + font-size: 14px; + font-family: Tahoma,'Trebuchet MS',Verdana,Arial,"Lucida-Grande",Sans-serif; + padding: 10px; + background: #1D1D1D; + color: #B8B8B8; + border-bottom: 1px solid #303030; +} + +div#editobox { + margin: 0px 15px 20px 15px; +} + +div#editobox table { + background: #1D1D1D; + font-size: 12px; + padding: 5px; +} + +div#editobox h1 { + height: 26px; + font-size: 20px; + font-family: Tahoma,'Trebuchet MS',Verdana,Arial,"Lucida-Grande",Sans-serif; + padding: 10px; + background: #1D1D1D; + color: #B8B8B8; + border-bottom: 1px solid #303030; +} + + .rightbox a { text-decoration: none; color: #cccccc; @@ -238,6 +306,7 @@ div.rightbox h1 { padding: 0px; margin: 0px; background: #303030; + width: 901px; } #left_side { @@ -298,33 +367,6 @@ div#menu height: 130px; } -/* - #right_side li a:hover { - color: #cfc5ab; - height: 26px; - font: 10px Verdana, "Lucida Grande", Tahoma, Helvetica, Sans-Serif; - text-decoration: none; - } - -#right_side li { -display: block; -list-style-type: none; -padding: 0; -margin: 0; -} - -#right_side ul { -margin: 0px 0px 0px 10px; -} - -#right_side li a,span{ -color: #aaa28b; -height: 26px; -font: 10px Verdana, "Lucida Grande", Tahoma, Helvetica, Sans-Serif; -text-decoration: none; -} -*/ - #right_side h2 { color: #aaa28b; margin: 10px 0px 0px 0px; diff --git a/include/admin_home.php b/include/admin_home.php index c27d23467336512b9c0ae6ea0a99389d5147452e..13aa550ad446ef665b1d17b4238f97e9941d8d1f 100644 --- a/include/admin_home.php +++ b/include/admin_home.php @@ -1,5 +1,4 @@ = $GLOBALS["REPORTER"] ) -{ - $str = '
'; - $str .= ' + if ($_SESSION["user_right"] >= $GLOBALS["MEMBRE"]) { + $str = '
'; + $str .= '
@@ -55,15 +51,12 @@ $str .= ' @@ -228,6 +224,9 @@ function dispAdminAddMember() { + + + @@ -301,7 +300,7 @@ function dispAdminAddMember() { - + @@ -393,6 +392,10 @@ $str = ' + + + + diff --git a/include/admin_menu.php b/include/admin_menu.php index a0f1a326fbf7ab908db2345c801ae8bf00f08b74..eb26e491bf2068e59cd5f8c4c86efda01ed348cf 100644 --- a/include/admin_menu.php +++ b/include/admin_menu.php @@ -13,6 +13,7 @@ function dispAdminMenu() { $str .= '
Blacklist
'; $str .= '
Munin
'; $str .= '
PHPMyAdmin
'; + $str .= '
Mailman
'; } return $str; } \ No newline at end of file diff --git a/include/admin_tables.php b/include/admin_tables.php index 56a244fe5fc70912e8b60da7ea4462cc64d914c2..a8c5e37285ae8c5b8ce673935e80909fbb34203e 100644 --- a/include/admin_tables.php +++ b/include/admin_tables.php @@ -1,6 +1,5 @@ \ No newline at end of file diff --git a/include/auth.php b/include/auth.php index 98b6018c4082a1779b5b6c52d8636bfd166b7331..705f941080d19a60a3f06c7676b331341d1b3181 100644 --- a/include/auth.php +++ b/include/auth.php @@ -12,12 +12,12 @@ function auth_init() { auth_disconnect(); // Process auth if asked - if ($_POST['connect']) { if (!auth_connect(stripslashes($_POST['user_login']), stripslashes($_POST['user_pass']))) redirect('/?html=Connection&fail='.stripslashes($_POST['user_login'])); } + //Process disconnect if asked if ($_POST['disconnect']) auth_disconnect(); @@ -28,12 +28,11 @@ function auth_connect($login, $pass) { $result = getOneUserByLogin($login); if (mysql_num_rows($result) > 0) { $user = mysql_fetch_array($result); - if ($user["user_login"] == $login && $user["user_pass"] == $md5_pass) - if (!auth_blacklisted($login)) { - $_SESSION["user_right"] = $user["user_right"]; - $_SESSION["user_id"] = $user["user_id"]; - return true; - } + if ($user["user_login"] == $login && $user["user_pass"] == $md5_pass) { + $_SESSION["user_right"] = $user["user_right"]; + $_SESSION["user_id"] = $user["user_id"]; + return true; + } } return false; } @@ -43,10 +42,4 @@ function auth_disconnect() { $_SESSION["user_right"] = 0; } -function auth_blacklisted($login) { - $result = getOneBlacklistByLogin($login); - - return mysql_num_rows($result) > 0; -} - ?> \ No newline at end of file diff --git a/include/contacts.php b/include/contacts.php index 9d458ff338d1707ba81645674e7b661b669465c8..3d8194051f8e3e38893213f5a3450e946f21dd11 100644 --- a/include/contacts.php +++ b/include/contacts.php @@ -1,215 +1,43 @@ -
-
-

Liens

-
  • '; - /////// BEGIN TABLE DOWN /////// - $str .= dispTableBegin("l i e n s", "95", 1); - $str .= ' -
'; - $str .= dispContactsLinks(); - $str .= ' - - '; - $str .= dispTableEnd(); - $str .= ' - - - -
-
-

Contactez nous

-
    -
  • '; - /////// BEGIN TABLE UP /////// - $str .= dispTableBegin("c o n t a c t", "90", 1); - $str .= ' -
- - - '; - $str .= dispTableEnd(); - $str .= ''; - -echo $str; -} - - - -function dispContactsAssoInfos() { - - - $str = ''; - $result = getAssoInfos(); - - if (mysql_num_rows($result)){ - - $asso = mysql_fetch_array($result); - - ////// NAME ////// - if ($asso["asso_name"]) { - $str .= ' - - - '; - } - - ////// ADDRESS ////// - if ($asso["asso_address"]) { - $str .= ' - - - '; - } - - ////// MAIL ////// - if ($asso["asso_mail"] || $asso["asso_mail2"]) { - - ////// SPACE ////// - $str .= ''; - - $str .= ' - '; - - ////// PHONE ////// - $str .= ' - - - - - - '; - - if ($asso["asso_phone_comment"]) { - $str .= ' - - - - '; - - } - } - - ////// SPACE ////// - $str .= ''; - - } - - return ($str); - + // display links + $str = '
'; + $str .= '
'; + $str .= '

Liens

'; + $str .= '
  • '; + $str .= dispContactsLinks(); + $str .= '
'; + $str .= '
'; + $str .= '
'; + + // display contacts + $str .= '
'; + $str .= '
'; + $str .= '

Contactez-nous

'; + $str .= '
  • '; + $str .= '
@@ -40,9 +37,8 @@ if ($_SESSION["user_right"] >= $GLOBALS["REPORTER"] ) '; -$str .= dispAdminMenu(); - -$str .= ' + $str .= dispAdminMenu(); + $str .= '
'; - - if ($_GET['section_admin']) { - $section_admin= $_GET['section_admin']; - $str .= $tab_section_admin[$section_admin](); - } - else - { - - + + if ($_GET['section_admin']) { + $section_admin= $_GET['section_admin']; + $str .= $tab_section_admin[$section_admin](); + } + else { $total_size_videos = 0; $nb_videos_publics = 0; $nb_videos_tendus = 0; diff --git a/include/admin_members.php b/include/admin_members.php index 87b86eb81df5c1fe168e732f4726c00456ba0e69..8e627093e9db476632f08d744a845022d7eb3602 100644 --- a/include/admin_members.php +++ b/include/admin_members.php @@ -1,19 +1,15 @@
Alias: @eptv.fr
Numéro de téléphone:
Ajouter à la mailingAjouter à la mailing< list staff Oui
Alias: @eptv.fr
Tel:
- - '; - $str .= dispContactsAssoInfos(); - $str .= ' -
-
- - '.$asso["asso_name"].' - -
- '.$asso["asso_address"].' -
- - - - '; - - if ($asso["asso_mail"]) { - $str .= ' - - '; - } - - if ($asso["asso_mail"] && $asso["asso_mail2"]) { - $str .= ''; - } - - if ($asso["asso_mail2"]) { - $str .= ' - - - '; - } - - $str .= ' - -
- - mail:   - - - - '.$asso["asso_mail"].' - -   ou   - - '.$asso["asso_mail2"].' - -
'; - - } - - if ($asso["asso_phone"]) { - - ////// SPACE ////// - $str .= '
- - - - - - - -
- - téléphone: - - - - '.$asso["asso_phone"].' - -
-
- - '.$asso["asso_phone_comment"].' - -
'; + $str .= ''; + $str .= ''; + $str .= ''; + $str .= ''; + $str .= '
Association EPTV
14-16 rue Voltaire
94270 le Kremlin Bicetre
eMail: contact@eptv.fr
Téléphone: 01 44 08 01 54
'; + $str .= '
'; + + echo $str; } - - function dispContactsLinks() { - $str =''; - - $result = getAllLinks(); - if (mysql_num_rows($result)){ - - while ($link = mysql_fetch_array($result)) { - - $str .= ' - - - - - '.$link["link_link"].' - - - - '.$link["link_comment"].' -
- - -
- '; - } - } - -return($str); + $str = ''; + $str .= ''; + $str .= ''; + $str .= ''; + $str .= ''; + $str .= ''; + $str .= ''; + $str .= ''; + $str .= '
Facebook EPTVSuivez l\'actualités d\'EPTV sur facebook en devenant fan
Twitter EPTVEPTV twitte son actualité, suivez-la !
BDELe site du BDE EPITA/EPITECH
EPITALe site de L\'école EPITA
EPITECHLe site de L\'école EPITECH
Pitivi Un projet de fin d\'etude Epitech pour l\'édition de vidéo
Seblu.netRetrouvez les vidéos de Seblu on-line
'; + return $str; } ?> \ No newline at end of file diff --git a/include/footer.php b/include/footer.php index c148078661b7f34b142d401de1ed604c1e6e4c0f..e6e211198ad538d6e143c911eac1583b4dfcc7c6 100644 --- a/include/footer.php +++ b/include/footer.php @@ -4,7 +4,7 @@ function dispFooter() { echo '
'; echo ' '; echo '
'; echo '
'; diff --git a/include/global.php b/include/global.php index 45ceecfcd3b0fe4ccd1c8292f511dcab875aa765..f51d0c0c1ba4bf3d3db50171b417e263454c9e29 100644 --- a/include/global.php +++ b/include/global.php @@ -8,15 +8,14 @@ $GLOBALS["EPISUB"] = 4; $GLOBALS["REPORTER"] = 5; $GLOBALS["PRIV_GUEST"] = 6; $GLOBALS["EPTV"] = 7; -$GLOBALS["ROOT"] = 8; +//$GLOBALS["ROOT"] = 8; /* New vars */ $GLOBALS["ANONYM"] = 0; $GLOBALS["FAN"] = 2; -$GLOBALS["EPIFAN"] = 4; -$GLOBALS["VIF"] = 6; -$GLOBALS["ANCIEN"] = 8; +$GLOBALS["EPI"] = 4; +$GLOBALS["VIP"] = 6; $GLOBALS["MEMBRE"] = 10; -//$GLOBALS["ROOT"] = 12; +$GLOBALS["ROOT"] = 20; ?> diff --git a/include/home.php b/include/home.php index 6cebd98ddccf5b3a49b26d9b0763ffb1a64abf41..0dc9c7fcf1ad95194646a9c7240ea3fff353ff74 100644 --- a/include/home.php +++ b/include/home.php @@ -1,35 +1,27 @@ '; $str .= ' '; $str .= ''; - $str .= '
-
-

 Dernières actualités Flux RSS Actualiés

-
-
-
-
-

 Edito

- '; + $str .= '
'; + $str .= '
'; + $str .= '

 Les dernières actualités Flux RSS Actualiés

'; - $str .= dispHomeEdito(); - - $str .= ' -
-
-

 Dernières vidéo Flux RSS Vidéos

- '; + $str .= '
    '; + $str .= dispNewsRows(15); + $str .= '
'; + $str .= '
'; + $str .= '
'; + $str .= '
'; + $str .= '
'; + $str .= '

 Les dernières vidéos Flux RSS Vidéos

'; $str .= dispHomeLastVideos(); - $str .='
'; echo $str; @@ -40,12 +32,17 @@ function dispHomeEdito(){ if (mysql_num_rows($result)) $edito = mysql_fetch_array($result); - $str = ''; + $str = '
'; + $str .= '
'; + $str .= '

 Edito : '.$edito["edito_title"].'

'; + $str .= ''; + $str .= ''; + $str .= '
'; + $str .= ''.$edito["edito_comment"].'
'; + $str .= '
'; + $str .= '
'; - return ($str); + return $str; } function dispHomeLastVideos(){ diff --git a/include/html.php b/include/html.php index 28d48590f5c2d731adc3cd4bd27465c8570389b9..647d44cb37329a96ed2e638a32bcf22f70391077 100644 --- a/include/html.php +++ b/include/html.php @@ -36,6 +36,9 @@ function dispHTMLHeader() { echo ''; echo ' EPTV'; echo ' '; + echo ' '; + echo ' '; + echo ' '; echo ' '; echo ' '; echo ' '; @@ -49,7 +52,6 @@ function dispHTMLHeader() { // display html body function dispHTMLBody() { echo ''; - // echo '
'; echo '
'; dispMenu(); echo '
'; @@ -60,7 +62,6 @@ function dispHTMLBody() { echo ' '; - // echo '
'; echo ''; } diff --git a/include/members.php b/include/members.php index ffae29cfd3f328301e454976e584bc76f8b756fd..e0fc33f555e8f89ffd607695f0cbb96d12fdc04c 100644 --- a/include/members.php +++ b/include/members.php @@ -7,7 +7,13 @@ function dispTableMembers($tab) { while ($tab[$cpt]) { $result = getOneUserByID($tab[$cpt]); $member = mysql_fetch_array($result); - $str .= "".$member["user_pseudo"]."(".$member["user_login"].")"; + $str .= ""; + if ($_SESSION["user_right"] > $GLOBALS["ANONYM"]) + $str .= ""; + $str .= "".$member["user_pseudo"].""; + if ($_SESSION["user_right"] > $GLOBALS["ANONYM"]) + $str .= ""; + $str .= "(".$member["user_login"].")"; if ($member["user_statut"] == "0") $str .= "Nouveau"; else @@ -21,8 +27,8 @@ function dispTableMembers($tab) { function dispMembers() { - $str = '
'; - $str .= '
'; + $str = '
'; + $str .= '
'; $str .= '

Membres

'; $str .= '
    '; @@ -84,7 +90,7 @@ function dispMembers() { $str .= '
'; - $str .= '
+ /* $str .= '

L´association

    @@ -92,6 +98,7 @@ function dispMembers() {
'; + */ echo $str; } diff --git a/include/menu.php b/include/menu.php index e08678fbc7605dc57c17b4100281ae6ab9718335..4b5a570301722ae466d199e5ea4afd37d50bc7cc 100644 --- a/include/menu.php +++ b/include/menu.php @@ -6,11 +6,11 @@ function dispMenu() { $str .= '
  • Home
    • '; $str .= '
  • Actualités
    • '; $str .= '
  • Vidéos
    • '; - $str .= '
  • Membres
    • '; - $str .= '
  • Fans
    • '; + //$str .= '
  • Fans
    • '; if ($_SESSION["user_right"] >= 7) - $str .= '
  • Admin
    • '; - $str .= '
  • Contact
    • '; + $str .= '
  • Admin
    • '; + $str .= '
  • Membres
    • '; + $str .= '
  • Contact
    • '; $str .= ''; $str .= '   '; $str .= ''; diff --git a/include/postfix.php b/include/postfix.php new file mode 100644 index 0000000000000000000000000000000000000000..05752142611b733661218cac264624297996e6ac --- /dev/null +++ b/include/postfix.php @@ -0,0 +1,19 @@ + 0) { + $f = fopen($postfix_alias_file, "w"); + fwrite($f, $str); + fclose($f); + system("/usr/bin/newaliases"); + } + } +?> \ No newline at end of file diff --git a/include/sql.php b/include/sql.php index a0f9934fb77fe68aa788d562099550985d5cc54e..ffc7242cc8b6118ae9406796eaeab19bc0c327da 100644 --- a/include/sql.php +++ b/include/sql.php @@ -93,26 +93,6 @@ function getLastVideosByTendu($tendu) { return mysql_query($query); } -################################## -########## SQL CONTACTS ######## -################################## - -function getAssoInfos() { - $query = "select * from $DB.asso_db"; - return mysql_query($query); -} - -function getOneLinkById($id) { - $id = mysql_real_escape_string($id); - $query = "select * from $DB.links_db WHERE link_id='$id'"; - return mysql_query($query); -} - -function getAllLinks() { - $query = "select * from $DB.links_db"; - return mysql_query($query); -} - ############################### ########## SQL USERS ######## ############################### @@ -146,6 +126,14 @@ function getUsersByStatut($statut) { return mysql_query($query); } +function getOneUserMail($login) { + $result = getOneUserByLogin($login); + $user = mysql_fetch_array($result); + if ($user["user_alias"] != NULL) + return $user["user_alias"]."@eptv.fr"; + return $user["user_mail"]; +} + ################################ ########## SQL MEMBERS ######## ################################