Commit 638ed087 authored by Antoine Tenart's avatar Antoine Tenart

revert

parent 14ef5034
...@@ -348,7 +348,7 @@ L'équipe info AE"; ...@@ -348,7 +348,7 @@ L'équipe info AE";
"ORDER BY `ae_carte`.`id_carte_ae`"); "ORDER BY `ae_carte`.`id_carte_ae`");
$printable['sev'] = array(); $printable['sev'] = array();
while ( $row = $req->get_row() ) while ( $row = $req->get_row() )
if ( file_exists("/data/matmatronch/" . $row['id_utilisateur'] .".identity.jpg")) if ( file_exists("../var/img/matmatronch/" . $row['id_utilisateur'] .".identity.jpg"))
$printable['sev'][]=$row['id_utilisateur']; $printable['sev'][]=$row['id_utilisateur'];
$req = new requete($site->db, $req = new requete($site->db,
...@@ -360,7 +360,7 @@ L'équipe info AE"; ...@@ -360,7 +360,7 @@ L'équipe info AE";
"ORDER BY `ae_carte`.`id_carte_ae`"); "ORDER BY `ae_carte`.`id_carte_ae`");
$printable['mon'] = array(); $printable['mon'] = array();
while ( $row = $req->get_row() ) while ( $row = $req->get_row() )
if ( file_exists("/data/matmatronch/" . $row['id_utilisateur'] .".identity.jpg")) if ( file_exists("../var/img/matmatronch/" . $row['id_utilisateur'] .".identity.jpg"))
$printable['mon'][]=$row['id_utilisateur']; $printable['mon'][]=$row['id_utilisateur'];
$req = new requete($site->db, $req = new requete($site->db,
...@@ -372,7 +372,7 @@ L'équipe info AE"; ...@@ -372,7 +372,7 @@ L'équipe info AE";
"ORDER BY `ae_carte`.`id_carte_ae`"); "ORDER BY `ae_carte`.`id_carte_ae`");
$printable['bel'] = array(); $printable['bel'] = array();
while ( $row = $req->get_row() ) while ( $row = $req->get_row() )
if ( file_exists("/data/matmatronch/" . $row['id_utilisateur'] .".identity.jpg")) if ( file_exists("../var/img/matmatronch/" . $row['id_utilisateur'] .".identity.jpg"))
$printable['bel'][]=$row['id_utilisateur']; $printable['bel'][]=$row['id_utilisateur'];
$print = new contents("PDFs à imprimer "); $print = new contents("PDFs à imprimer ");
...@@ -389,7 +389,7 @@ L'équipe info AE"; ...@@ -389,7 +389,7 @@ L'équipe info AE";
"ORDER BY `ae_carte`.`id_carte_ae`"); "ORDER BY `ae_carte`.`id_carte_ae`");
$nprintable = array(); $nprintable = array();
while ( $row = $req->get_row() ) while ( $row = $req->get_row() )
if ( !file_exists("/data/matmatronch/" . $row['id_utilisateur'] .".identity.jpg")) if ( !file_exists("../var/img/matmatronch/" . $row['id_utilisateur'] .".identity.jpg"))
$nprintable[]=$row['id_utilisateur']; $nprintable[]=$row['id_utilisateur'];
$req = new requete($site->db, $req = new requete($site->db,
......
...@@ -468,7 +468,7 @@ elseif ( $_REQUEST["action"] == "searchstudent" ) ...@@ -468,7 +468,7 @@ elseif ( $_REQUEST["action"] == "searchstudent" )
$ville->load_by_id($user->id_ville); $ville->load_by_id($user->id_ville);
$pays->load_by_id($user->id_pays); $pays->load_by_id($user->id_pays);
$cts->add(new image($user->prenom . " " . $user->nom,$topdir."/data/matmatronch/".$user->id.".identity.jpg","fiche_image")); $cts->add(new image($user->prenom . " " . $user->nom,$topdir."/var/img/matmatronch/".$user->id.".identity.jpg","fiche_image"));
$cts->add_paragraph( $cts->add_paragraph(
"<b>". $user->prenom . " " . $user->nom . "</b><br/>" . "<b>". $user->prenom . " " . $user->nom . "</b><br/>" .
$user->surnom."<br/>\n". $user->surnom."<br/>\n".
......
...@@ -85,7 +85,7 @@ while ( $row = $req->get_row() ) ...@@ -85,7 +85,7 @@ while ( $row = $req->get_row() )
$img = $wwwtopdir."images/icons/128/user.png"; $img = $wwwtopdir."images/icons/128/user.png";
if ( file_exists($topdir."var/img/matmatronch/".$row['id_utilisateur'].".identity.jpg") ) if ( file_exists($topdir."var/img/matmatronch/".$row['id_utilisateur'].".identity.jpg") )
$img = "/data/matmatronch/".$row['id_utilisateur'].".identity.jpg"; $img = "/var/img/matmatronch/".$row['id_utilisateur'].".identity.jpg";
if ( $row['desc_role'] ) if ( $row['desc_role'] )
$role = $row['desc_role']; $role = $row['desc_role'];
......
...@@ -68,7 +68,7 @@ class productinfo extends stdcontents ...@@ -68,7 +68,7 @@ class productinfo extends stdcontents
$this->buffer .= "<img src=\"".$wwwtopdir."../d.php?id_file=".$product->id_file."&amp;action=download&amp;download=preview\" alt=\"\" class=\"fiche_image\" title=\"".$produit->nom."\" alt=\"".$produit->nom."\"/>\n"; $this->buffer .= "<img src=\"".$wwwtopdir."../d.php?id_file=".$product->id_file."&amp;action=download&amp;download=preview\" alt=\"\" class=\"fiche_image\" title=\"".$produit->nom."\" alt=\"".$produit->nom."\"/>\n";
} }
else else
$this->buffer .= "<img src=\"/data/matmatronch/na.gif"."\" alt=\"\" class=\"fiche_image\" />\n"; $this->buffer .= "<img src=\"/var/img/matmatronch/na.gif"."\" alt=\"\" class=\"fiche_image\" />\n";
$this->buffer .= "</div>"; $this->buffer .= "</div>";
......
...@@ -118,9 +118,9 @@ if ( isset($_REQUEST["id_election"])) ...@@ -118,9 +118,9 @@ if ( isset($_REQUEST["id_election"]))
$cdts[$id_liste] .= "<div class=\"candidat\"><br/>"; $cdts[$id_liste] .= "<div class=\"candidat\"><br/>";
if ( file_exists($topdir."var/img/matmatronch/".$srow['id_utilisateur'].".identity.jpg") ) if ( file_exists($topdir."var/img/matmatronch/".$srow['id_utilisateur'].".identity.jpg") )
$cdts[$id_liste] .= "<img src=\"/data/matmatronch/".$srow['id_utilisateur'].".identity.jpg\" alt=\"\" onclick=\"document.getElementById('$idradio').checked = true;\" /><br/>\n"; $cdts[$id_liste] .= "<img src=\"/var/img/matmatronch/".$srow['id_utilisateur'].".identity.jpg\" alt=\"\" onclick=\"document.getElementById('$idradio').checked = true;\" /><br/>\n";
else else
$cdts[$id_liste] .= "<img src=\"/data/matmatronch/na.gif"."\" alt=\"\" onclick=\"document.getElementById('$idradio').checked = true;\" /><br/>\n"; $cdts[$id_liste] .= "<img src=\"/var/img/matmatronch/na.gif"."\" alt=\"\" onclick=\"document.getElementById('$idradio').checked = true;\" /><br/>\n";
$cdts[$id_liste] .= $srow['prenom_utl']." ".$srow['nom_utl']; $cdts[$id_liste] .= $srow['prenom_utl']." ".$srow['nom_utl'];
...@@ -229,9 +229,9 @@ if ( isset($_REQUEST["id_election"])) ...@@ -229,9 +229,9 @@ if ( isset($_REQUEST["id_election"]))
$cdts[$id_liste] .= "<div class=\"candidat\"><input type=\"radio\" id=\"$idradio\" name=\"vote[$id_poste]\" value=\"".$srow['id_utilisateur']."\" /><br/>"; $cdts[$id_liste] .= "<div class=\"candidat\"><input type=\"radio\" id=\"$idradio\" name=\"vote[$id_poste]\" value=\"".$srow['id_utilisateur']."\" /><br/>";
if ( file_exists($topdir."var/img/matmatronch/".$srow['id_utilisateur'].".identity.jpg") ) if ( file_exists($topdir."var/img/matmatronch/".$srow['id_utilisateur'].".identity.jpg") )
$cdts[$id_liste] .= "<img src=\"/data/matmatronch/".$srow['id_utilisateur'].".identity.jpg\" alt=\"\" onclick=\"document.getElementById('$idradio').checked = true;\" /><br/>\n"; $cdts[$id_liste] .= "<img src=\"/var/img/matmatronch/".$srow['id_utilisateur'].".identity.jpg\" alt=\"\" onclick=\"document.getElementById('$idradio').checked = true;\" /><br/>\n";
else else
$cdts[$id_liste] .= "<img src=\"/data/matmatronch/na.gif"."\" alt=\"\" onclick=\"document.getElementById('$idradio').checked = true;\" /><br/>\n"; $cdts[$id_liste] .= "<img src=\"/var/img/matmatronch/na.gif"."\" alt=\"\" onclick=\"document.getElementById('$idradio').checked = true;\" /><br/>\n";
$cdts[$id_liste] .= $srow['prenom_utl']." ".$srow['nom_utl']; $cdts[$id_liste] .= $srow['prenom_utl']." ".$srow['nom_utl'];
......
...@@ -48,7 +48,7 @@ $fiche->add_title(2,htmlentities($user->prenom." ".$user->nom,ENT_COMPAT,"UTF-8" ...@@ -48,7 +48,7 @@ $fiche->add_title(2,htmlentities($user->prenom." ".$user->nom,ENT_COMPAT,"UTF-8"
if (file_exists("/data/matmatronch/".$user->id.".identity.i.jpg")) if (file_exists("/data/matmatronch/".$user->id.".identity.i.jpg"))
{ {
$fiche->puts("<p align=\"center\"><img src=\"/data/matmatronch/".$user->id.".identity.i.jpg\" /></p>"); $fiche->puts("<p align=\"center\"><img src=\"/var/img/matmatronch/".$user->id.".identity.i.jpg\" /></p>");
} }
else if (file_exists("/data/matmatronch/".$user->id.".identity.jpg")) else if (file_exists("/data/matmatronch/".$user->id.".identity.jpg"))
{ {
...@@ -56,11 +56,11 @@ else if (file_exists("/data/matmatronch/".$user->id.".identity.jpg")) ...@@ -56,11 +56,11 @@ else if (file_exists("/data/matmatronch/".$user->id.".identity.jpg"))
$dest = "/data/matmatronch/".$user->id.".identity.i.jpg"; $dest = "/data/matmatronch/".$user->id.".identity.i.jpg";
print_r(exec("/usr/share/php5/exec/convert $src -thumbnail 64x64 -quality 95 $dest")); print_r(exec("/usr/share/php5/exec/convert $src -thumbnail 64x64 -quality 95 $dest"));
$fiche->puts("<p align=\"center\"><img src=\"/data/matmatronch/".$user->id.".identity.i.jpg\" /></p>"); $fiche->puts("<p align=\"center\"><img src=\"/var/img/matmatronch/".$user->id.".identity.i.jpg\" /></p>");
} }
else if (file_exists("/data/matmatronch/".$user->id.".i.jpg")) else if (file_exists("/data/matmatronch/".$user->id.".i.jpg"))
{ {
$fiche->puts("<p align=\"center\"><img src=\"/data/matmatronch/".$user->id.".i.jpg\" /></p>"); $fiche->puts("<p align=\"center\"><img src=\"/var/img/matmatronch/".$user->id.".i.jpg\" /></p>");
} }
else if (file_exists("/data/matmatronch/".$user->id.".jpg")) else if (file_exists("/data/matmatronch/".$user->id.".jpg"))
{ {
...@@ -68,7 +68,7 @@ else if (file_exists("/data/matmatronch/".$user->id.".jpg")) ...@@ -68,7 +68,7 @@ else if (file_exists("/data/matmatronch/".$user->id.".jpg"))
$dest = "/data/matmatronch/".$user->id.".i.jpg"; $dest = "/data/matmatronch/".$user->id.".i.jpg";
print_r(exec("/usr/share/php5/exec/convert $src -thumbnail 64x64 -quality 95 $dest")); print_r(exec("/usr/share/php5/exec/convert $src -thumbnail 64x64 -quality 95 $dest"));
$fiche->puts("<p align=\"center\"><img src=\"/data/matmatronch/".$user->id.".i.jpg\" /></p>"); $fiche->puts("<p align=\"center\"><img src=\"/var/img/matmatronch/".$user->id.".i.jpg\" /></p>");
} }
......
...@@ -137,7 +137,7 @@ class userinfo extends stdcontents ...@@ -137,7 +137,7 @@ class userinfo extends stdcontents
} }
else else
$this->buffer .= "<img src=\"/data/matmatronch/na.gif"."\" alt=\"\" class=\"fiche_image\" />\n"; $this->buffer .= "<img src=\"/var/img/matmatronch/na.gif"."\" alt=\"\" class=\"fiche_image\" />\n";
$this->buffer .= "</div>"; $this->buffer .= "</div>";
...@@ -370,11 +370,11 @@ class userinfo extends stdcontents ...@@ -370,11 +370,11 @@ class userinfo extends stdcontents
$this->buffer .= "</div>"; $this->buffer .= "</div>";
if (file_exists($topdir."var/img/matmatronch/".$user->id.".jpg")) if (file_exists($topdir."var/img/matmatronch/".$user->id.".jpg"))
$this->buffer .= "<img src=\"".$topdir."/data/matmatronch/".$user->id.".jpg\" class=\"fiche_image_full\"/>\n"; $this->buffer .= "<img src=\"".$topdir."/var/img/matmatronch/".$user->id.".jpg\" class=\"fiche_image_full\"/>\n";
elseif (file_exists($topdir."var/img/matmatronch/".$user->id.".identity.jpg")) elseif (file_exists($topdir."var/img/matmatronch/".$user->id.".identity.jpg"))
$this->buffer .= "<img src=\"".$topdir."/data/matmatronch/".$user->id.".identity.jpg\" class=\"fiche_image_full\"/>\n<br /><i>(Photo MatMatronch non pr&eacute;sente&nbsp;!)</i>\n"; $this->buffer .= "<img src=\"".$topdir."/var/img/matmatronch/".$user->id.".identity.jpg\" class=\"fiche_image_full\"/>\n<br /><i>(Photo MatMatronch non pr&eacute;sente&nbsp;!)</i>\n";
else else
$this->buffer .= "<img src=\"/data/matmatronch/na.gif"."\" alt=\"\" class=\"fiche_image_full\" />\n"; $this->buffer .= "<img src=\"/var/img/matmatronch/na.gif"."\" alt=\"\" class=\"fiche_image_full\" />\n";
$this->buffer .= "<br/><br/><div class=\"citation\" style=\"width: 250px; text-align: center;\"><i>".$user->citation."</i></div>"; $this->buffer .= "<br/><br/><div class=\"citation\" style=\"width: 250px; text-align: center;\"><i>".$user->citation."</i></div>";
$this->buffer .= "</div>"; $this->buffer .= "</div>";
...@@ -443,7 +443,7 @@ class userinfov2 extends stdcontents ...@@ -443,7 +443,7 @@ class userinfov2 extends stdcontents
if ( $exif["FILE"]["FileDateTime"] ) if ( $exif["FILE"]["FileDateTime"] )
$date_prise_vue = $exif["FILE"]["FileDateTime"]; $date_prise_vue = $exif["FILE"]["FileDateTime"];
$img = "/data/matmatronch/".$user->id.".identity.jpg?".$date_prise_vue; $img = "/var/img/matmatronch/".$user->id.".identity.jpg?".$date_prise_vue;
$imgclass="idimg"; $imgclass="idimg";
} }
......
...@@ -96,7 +96,7 @@ class pdfcarteae extends FPDF ...@@ -96,7 +96,7 @@ class pdfcarteae extends FPDF
$this->Image($this->img_front[$infos['type_carte']],$x,$y,$this->width,$this->height); $this->Image($this->img_front[$infos['type_carte']],$x,$y,$this->width,$this->height);
$src = "/data/matmatronch/".$infos['id'].".identity.jpg"; $src = "../var/img/matmatronch/".$infos['id'].".identity.jpg";
$this->Image($src, $this->Image($src,
$x+$this->pos[$infos['type_carte']]['photo']['x'], $x+$this->pos[$infos['type_carte']]['photo']['x'],
......
...@@ -102,7 +102,7 @@ if (isset($_REQUEST["simplesearch"])) { ...@@ -102,7 +102,7 @@ if (isset($_REQUEST["simplesearch"])) {
"<div class=\"utl\">\n". "<div class=\"utl\">\n".
"<b>".$row["prenom_utl"]." ".$row["nom_utl"]."</b>\n<br/>\n". "<b>".$row["prenom_utl"]." ".$row["nom_utl"]."</b>\n<br/>\n".
"<b>".$row["surnom_utbm"]."</b>\n<br/>\n". "<b>".$row["surnom_utbm"]."</b>\n<br/>\n".
"<img src=\"/data/matmatronch/".$row["id_utilisateur"].".identity.jpg?".$date_prise_vue."\"/>\n". "<img src=\"/var/img/matmatronch/".$row["id_utilisateur"].".identity.jpg?".$date_prise_vue."\"/>\n".
"<a href=\"mailto:".$row["email_utl"]."\">".$row["email_utl"]."</a>\n<br/>\n". "<a href=\"mailto:".$row["email_utl"]."\">".$row["email_utl"]."</a>\n<br/>\n".
"<a href=\"tel:".$row["tel_portable_utl"]."\">".$row["tel_portable_utl"]."</a>\n<br/>\n". "<a href=\"tel:".$row["tel_portable_utl"]."\">".$row["tel_portable_utl"]."</a>\n<br/>\n".
"</div>\n" "</div>\n"
......
...@@ -42,7 +42,7 @@ if ( $_REQUEST["page"] == "avatars" ) ...@@ -42,7 +42,7 @@ if ( $_REQUEST["page"] == "avatars" )
if ( $_REQUEST["action"] == "agree" ) if ( $_REQUEST["action"] == "agree" )
{ {
$id = intval(array_shift($ids)); $id = intval(array_shift($ids));
copy("/data/matmatronch/".$id.".jpg","/data/matmatronch/".$id.".identity.jpg"); copy("../var/img/matmatronch/".$id.".jpg","../var/img/matmatronch/".$id.".identity.jpg");
} }
elseif ( $_REQUEST["action"] == "reject" ) elseif ( $_REQUEST["action"] == "reject" )
{ {
...@@ -57,7 +57,7 @@ if ( $_REQUEST["page"] == "avatars" ) ...@@ -57,7 +57,7 @@ if ( $_REQUEST["page"] == "avatars" )
$site->start_page("matmatronch","Administration"); $site->start_page("matmatronch","Administration");
$cts = new contents("Photos manquantes"); $cts = new contents("Photos manquantes");
$cts->add_paragraph("<img src=\"/data/matmatronch/".$id.".jpg\" />"); $cts->add_paragraph("<img src=\"../var/img/matmatronch/".$id.".jpg\" />");
$cts->add_paragraph("<a href=\"?page=avatars&amp;action=reject&amp;id_utilisateurs=$ids\">Refuser</a>"); $cts->add_paragraph("<a href=\"?page=avatars&amp;action=reject&amp;id_utilisateurs=$ids\">Refuser</a>");
$cts->add_paragraph("<a href=\"?page=avatars&amp;action=agree&amp;id_utilisateurs=$ids\">Accepter</a>"); $cts->add_paragraph("<a href=\"?page=avatars&amp;action=agree&amp;id_utilisateurs=$ids\">Accepter</a>");
...@@ -91,13 +91,13 @@ $sas_todo=array(); ...@@ -91,13 +91,13 @@ $sas_todo=array();
$user = new utilisateur($site->db); $user = new utilisateur($site->db);
while ( $row = $req->get_row() ) while ( $row = $req->get_row() )
{ {
if ( !file_exists("/data/matmatronch/" . $row['id_utilisateur'] .".identity.jpg")) if ( !file_exists("../var/img/matmatronch/" . $row['id_utilisateur'] .".identity.jpg"))
{ {
$user->_load_all($row); $user->_load_all($row);
$info = ""; $info = "";
if ( file_exists("/data/matmatronch/" . $row['id_utilisateur'] .".jpg")) if ( file_exists("../var/img/matmatronch/" . $row['id_utilisateur'] .".jpg"))
{ {
$info = ", avartar disponible"; $info = ", avartar disponible";
$avatar_todo[] = $user->id; $avatar_todo[] = $user->id;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment