hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-15 22:13:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

tag 3.1.14

Browse Source
This commit is contained in:
Alchemy
2011-05-23 15:50:08 +02:00
parent 967a9b339e
commit ff8cd59afb
5 changed files with 674 additions and 606 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/version.inc
View File

@@ -1,2 +1,2 @@
<?php
define('GV_version','3.1.13');
define('GV_version','3.1.14');

459
www/admin/demand.php
View File

@@ -1,34 +1,35 @@
<?php
require_once dirname( __FILE__ ) . "/../../lib/bootstrap.php";
require_once dirname(__FILE__) . "/../../lib/bootstrap.php";
$session = session::getInstance();
$request = httpRequest::getInstance();
$parm = $request->get_parms("deny","accept","accept_hd","watermark","template");
$parm = $request->get_parms("deny", "accept", "accept_hd", "watermark", "template");
$lng = isset($session->locale)?$session->locale:GV_default_lng;
$lng = isset($session->locale) ? $session->locale : GV_default_lng;
if(isset($session->usr_id) && isset($session->ses_id))
if (isset($session->usr_id) && isset($session->ses_id))
{
$ses_id = $session->ses_id;
$usr_id = $session->usr_id;
if(!$session->admin)
if (!$session->admin)
{
phrasea::headers(403);
}
}
else{
else
{
phrasea::headers(403);
}
if(!($ph_session = phrasea_open_session($ses_id,$usr_id)))
if (!($ph_session = phrasea_open_session($ses_id, $usr_id)))
{
phrasea::headers(403);
}
$conn = connection::getInstance();
if(!$conn)
if (!$conn)
{
phrasea::headers(500);
}
@@ -36,26 +37,25 @@ if(!$conn)
$allnames = array();
foreach($ph_session['bases'] as $base)
foreach ($ph_session['bases'] as $base)
{
foreach($base['collections'] as $coll)
foreach ($base['collections'] as $coll)
{
$allnames[$coll['base_id']] = $coll['name'];
}
}
$templates = array();
if(!is_null($parm['template']))
if (!is_null($parm['template']))
{
foreach($parm['template'] as $tmp)
foreach ($parm['template'] as $tmp)
{
if(trim($tmp) != '')
if (trim($tmp) != '')
{
$tmp = explode('_',$tmp);
$tmp = explode('_', $tmp);
if(count($tmp) == 2)
if (count($tmp) == 2)
{
$templates[$tmp[0]] = $tmp[1];
}
@@ -64,199 +64,261 @@ if(!is_null($parm['template']))
}
$deny = $accept = $options = array();
if(!is_null($parm['deny']))
if (!is_null($parm['deny']))
{
foreach($parm['deny'] as $den)
foreach ($parm['deny'] as $den)
{
$den = explode('_',$den);
if(count($den) == 2 && !isset($templates[$den[0]]))
$den = explode('_', $den);
if (count($den) == 2 && !isset($templates[$den[0]]))
{
$deny[$den[0]][$den[1]]=$den[1];
$deny[$den[0]][$den[1]] = $den[1];
}
}
}
if(!is_null($parm['accept']))
if (!is_null($parm['accept']))
{
foreach($parm['accept'] as $acc)
foreach ($parm['accept'] as $acc)
{
$acc = explode('_',$acc);
if(count($acc) == 2 && !isset($templates[$acc[0]]))
$acc = explode('_', $acc);
if (count($acc) == 2 && !isset($templates[$acc[0]]))
{
$accept[$acc[0]][$acc[1]] = $acc[1];
$options[$acc[0]][$acc[1]]=array('HD'=>false,'WM'=>false);
$options[$acc[0]][$acc[1]] = array('HD' => false, 'WM' => false);
}
}
}
if(!is_null($parm['accept_hd']))
if (!is_null($parm['accept_hd']))
{
foreach($parm['accept_hd'] as $accHD)
foreach ($parm['accept_hd'] as $accHD)
{
$accHD = explode('_',$accHD);
if(count($accHD) == 2 && isset($accept[$accHD[0]]) && isset($options[$accHD[0]][$accHD[1]]))
$accHD = explode('_', $accHD);
if (count($accHD) == 2 && isset($accept[$accHD[0]]) && isset($options[$accHD[0]][$accHD[1]]))
{
$options[$accHD[0]][$accHD[1]]['HD'] = true;
}
}
}
if(!is_null($parm['watermark']))
if (!is_null($parm['watermark']))
{
foreach($parm['watermark'] as $wm)
foreach ($parm['watermark'] as $wm)
{
$wm = explode('_',$wm);
if(count($wm) == 2 && isset($accept[$wm[0]]) && isset($options[$wm[0]][$wm[1]]))
$wm = explode('_', $wm);
if (count($wm) == 2 && isset($accept[$wm[0]]) && isset($options[$wm[0]][$wm[1]]))
{
$options[$wm[0]][$wm[1]]['WM'] = true;
}
}
}
if(!is_null($templates) || !is_null($parm['deny']) || !is_null($parm['accept']))
// if(!isset($done[$usr]))
// $done[$usr] = array();
//
// $done[$usr][$bas] = true;
//
if (!is_null($templates) || !is_null($parm['deny']) || !is_null($parm['accept']))
{
$done = array();
$cache_to_update = array();
foreach($templates as $usr=>$template_id)
foreach ($templates as $usr => $template_id)
{
$cache_to_update[$usr] = true;
$sql = "REPLACE INTO sbasusr (SELECT null as sbasusr_id, sbas_id, '".$conn->escape_string($usr)."' as usr_id, bas_manage, bas_modify_struct, bas_modif_th, bas_chupub FROM sbasusr WHERE usr_id='".$conn->escape_string($template_id)."')";
$conn->query($sql);
$sql = "REPLACE INTO basusr (SELECT null as id, base_id, '".$conn->escape_string($usr)."' as usr_id, canpreview, canhd, canputinalbum, candwnldhd, candwnldsubdef, candwnldpreview, cancmd, canadmin, actif, canreport, canpush, creationdate, basusr_infousr, mask_and, mask_xor, restrict_dwnld, month_dwnld_max, remain_dwnld, time_limited, limited_from, limited_to, canaddrecord, canmodifrecord, candeleterecord, chgstatus, lastconn, imgtools, manage, modify_struct, bas_manage, bas_modify_struct, needwatermark FROM basusr WHERE usr_id='".$conn->escape_string($template_id)."')";
if($conn->query($sql))
$sql = 'SELECT distinct base_id FROM basusr WHERE usr_id="' . $conn->escape_string($template_id) . '" AND actif="1"';
if ($rs = $conn->query($sql))
{
if(!isset($done[$usr]))
while ($row = $conn->fetch_assoc($rs))
{
if (!isset($done[$usr]))
$done[$usr] = array();
$sql = 'SELECT base_id FROM basusr WHERE usr_id = "'.$conn->escape_string($template_id).'" AND base_id NOT IN (SELECT base_id FROM basusr WHERE usr_id = "'.$conn->escape_string($usr).'")';
if($rs = $conn->query($sql))
$done[$usr][$row['base_id']] = true;
}
$conn->free_result($rs);
}
$sql = "REPLACE INTO sbasusr (SELECT null as sbasusr_id, sbas_id, '" . $conn->escape_string($usr) . "' as usr_id, bas_manage, bas_modify_struct, bas_modif_th, bas_chupub FROM sbasusr WHERE usr_id='" . $conn->escape_string($template_id) . "')";
$conn->query($sql);
$sql = "REPLACE INTO basusr (SELECT null as id, base_id, '" . $conn->escape_string($usr) . "' as usr_id, canpreview
, canhd, canputinalbum, candwnldhd, candwnldsubdef, candwnldpreview, cancmd
, canadmin, actif, canreport, canpush, creationdate, basusr_infousr, mask_and, mask_xor
, restrict_dwnld, month_dwnld_max, remain_dwnld, time_limited, limited_from, limited_to
, canaddrecord, canmodifrecord, candeleterecord, chgstatus, lastconn, imgtools, manage
, modify_struct, bas_manage, bas_modify_struct, needwatermark FROM basusr
WHERE usr_id='" . $conn->escape_string($template_id) . "')";
if ($conn->query($sql))
{
while($row = $conn->fetch_assoc($rs))
if (!isset($done[$usr]))
$done[$usr] = array();
$sql = 'SELECT base_id FROM basusr WHERE usr_id = "' . $conn->escape_string($template_id) . '" AND base_id NOT IN (SELECT base_id FROM basusr WHERE usr_id = "' . $conn->escape_string($usr) . '")';
if ($rs = $conn->query($sql))
{
while ($row = $conn->fetch_assoc($rs))
{
$done[$usr][$row['base_id']] = true;
}
}
$sql = "DELETE FROM demand WHERE usr_id='".$conn->escape_string($usr)."'";
$sql = "DELETE FROM demand WHERE usr_id='" . $conn->escape_string($usr) . "'";
$conn->query($sql);
$sql = "SELECT usr_login as lastModel from usr where usr_id='".$conn->escape_string($template_id)."'";
if($rs = $conn->query($sql))
$sql = "SELECT usr_login as lastModel from usr where usr_id='" . $conn->escape_string($template_id) . "'";
if ($rs = $conn->query($sql))
{
if($row = $conn->fetch_assoc($rs))
if ($row = $conn->fetch_assoc($rs))
{
$sql = "UPDATE usr SET lastModel = '".$conn->escape_string($row['lastModel'])."' WHERE usr_id = '".$conn->escape_string($usr)."' ";
$sql = "UPDATE usr SET lastModel = '" . $conn->escape_string($row['lastModel']) . "' WHERE usr_id = '" . $conn->escape_string($usr) . "' ";
$conn->query($sql);
}
}
}
}
foreach($deny as $usr=>$bases)
foreach ($deny as $usr => $bases)
{
$cache_to_update[$usr] = true;
foreach($bases as $bas)
foreach ($bases as $bas)
{
$sql = "UPDATE demand SET en_cours=0,refuser=1,date_modif=now() WHERE usr_id='".$conn->escape_string($usr)."' AND base_id='".$conn->escape_string($bas)."'";
$sql = "UPDATE demand SET en_cours=0,refuser=1,date_modif=now() WHERE usr_id='" . $conn->escape_string($usr) . "' AND base_id='" . $conn->escape_string($bas) . "'";
if($conn->query($sql))
if ($conn->query($sql))
{
if(!isset($done[$usr]))
if (!isset($done[$usr]))
$done[$usr] = array();
$done[$usr][$bas] = false;
}
}
}
foreach($accept as $usr=>$bases)
foreach ($accept as $usr => $bases)
{
$cache_to_update[$usr] = true;
foreach($bases as $bas)
foreach ($bases as $bas)
{
$sql = "INSERT INTO sbasusr (sbas_id,usr_id,bas_manage, bas_modify_struct) VALUES ('".$conn->escape_string(phrasea::sbasFromBas($bas))."','".$conn->escape_string($usr)."','0','0')";
$sql = "INSERT INTO sbasusr (sbas_id,usr_id,bas_manage, bas_modify_struct) VALUES ('" . $conn->escape_string(phrasea::sbasFromBas($bas)) . "','" . $conn->escape_string($usr) . "','0','0')";
$conn->query($sql);
$wm = $options[$usr][$bas]['WM'];
$hd = $options[$usr][$bas]['HD'];
$f = $v = '';
$f.="base_id,"; $v.="$bas,";
$f.="usr_id,"; $v.="$usr,";
$f.="canpreview,"; $v.="1,";
$f.="canhd,"; $v.="0,";
$f.="canputinalbum,"; $v.="1,";
$f.="base_id,";
$v.="$bas,";
$f.="usr_id,";
$v.="$usr,";
$f.="canpreview,";
$v.="1,";
$f.="canhd,";
$v.="0,";
$f.="canputinalbum,";
$v.="1,";
if($hd)
{ $f.="candwnldhd,"; $v.="1,"; }
if ($hd)
{
$f.="candwnldhd,";
$v.="1,";
}
else
{ $f.="candwnldhd,"; $v.="0,"; }
{
$f.="candwnldhd,";
$v.="0,";
}
if($wm)
{ $f.="needwatermark,"; $v.="1,"; }
if ($wm)
{
$f.="needwatermark,";
$v.="1,";
}
else
{ $f.="needwatermark,"; $v.="0,"; }
{
$f.="needwatermark,";
$v.="0,";
}
$f.="candwnldsubdef,"; $v.="0,";
$f.="candwnldpreview,"; $v.="1,";
$f.="cancmd,"; $v.="0,";
$f.="canadmin,"; $v.="0,";
$f.="actif,"; $v.="1,";
$f.="canreport,"; $v.="0,";
$f.="canpush,"; $v.="0,";
$f.="creationdate,"; $v.="now(),";
$f.="basusr_infousr,"; $v.="'',";
$f.="mask_and,"; $v.="0,";
$f.="mask_xor,"; $v.="0,";
$f.="restrict_dwnld,"; $v.="0,";
$f.="month_dwnld_max,"; $v.="0,";
$f.="remain_dwnld,"; $v.="0,";
$f.="time_limited,"; $v.="0,";
$f.="canaddrecord,"; $v.="0,";
$f.="canmodifrecord,"; $v.="0,";
$f.="candeleterecord"; $v.="0";
$f.="candwnldsubdef,";
$v.="0,";
$f.="candwnldpreview,";
$v.="1,";
$f.="cancmd,";
$v.="0,";
$f.="canadmin,";
$v.="0,";
$f.="actif,";
$v.="1,";
$f.="canreport,";
$v.="0,";
$f.="canpush,";
$v.="0,";
$f.="creationdate,";
$v.="now(),";
$f.="basusr_infousr,";
$v.="'',";
$f.="mask_and,";
$v.="0,";
$f.="mask_xor,";
$v.="0,";
$f.="restrict_dwnld,";
$v.="0,";
$f.="month_dwnld_max,";
$v.="0,";
$f.="remain_dwnld,";
$v.="0,";
$f.="time_limited,";
$v.="0,";
$f.="canaddrecord,";
$v.="0,";
$f.="canmodifrecord,";
$v.="0,";
$f.="candeleterecord";
$v.="0";
$sql = "INSERT INTO basusr ( $f ) VALUES ( $v )";
$conn->query($sql);
if(!isset($done[$usr]))
if (!isset($done[$usr]))
$done[$usr] = array();
$done[$usr][$bas] = true;
$sql = "DELETE FROM demand WHERE usr_id='".$conn->escape_string($usr)."' AND base_id='".$conn->escape_string($bas)."'";
$sql = "DELETE FROM demand WHERE usr_id='" . $conn->escape_string($usr) . "' AND base_id='" . $conn->escape_string($bas) . "'";
$conn->query($sql);
}
}
$cache_user = cache_user::getInstance();
foreach($cache_to_update as $usr_id=>$true)
foreach ($cache_to_update as $usr_id => $true)
$cache_user->delete($usr_id);
foreach($done as $usr=>$bases)
foreach ($done as $usr => $bases)
{
$sql = 'SELECT usr_mail FROM usr WHERE usr_id = "'.$conn->escape_string($usr).'"';
$sql = 'SELECT usr_mail FROM usr WHERE usr_id = "' . $conn->escape_string($usr) . '"';
$accept = $deny = '';
if($rs = $conn->query($sql))
if ($rs = $conn->query($sql))
{
if($row = $conn->fetch_assoc($rs))
if ($row = $conn->fetch_assoc($rs))
{
if(p4string::checkMail($row['usr_mail']))
if (p4string::checkMail($row['usr_mail']))
{
foreach($bases as $bas=>$isok)
foreach ($bases as $bas => $isok)
{
if(isset($allnames[$bas]))
if (isset($allnames[$bas]))
{
if($isok === true)
$accept .= '<li>'.$allnames[$bas]."</li>\n";
if($isok === false)
$deny .= '<li>'.$allnames[$bas]."</li>\n";
if ($isok === true)
$accept .= '<li>' . $allnames[$bas] . "</li>\n";
if ($isok === false)
$deny .= '<li>' . $allnames[$bas] . "</li>\n";
}
}
}
if(($accept != '' || $deny != ''))
if (($accept != '' || $deny != ''))
{
mail::register_confirm($row['usr_mail'], $accept, $deny);
}
@@ -267,7 +329,7 @@ if(!is_null($templates) || !is_null($parm['deny']) || !is_null($parm['accept']))
phrasea::headers();
?>
<html lang="<?php echo $session->usr_i18n;?>">
<html lang="<?php echo $session->usr_i18n; ?>">
<head>
<link type="text/css" rel="stylesheet" href="/include/minify/f=skins/common/main.css" />
<link type="text/css" rel="stylesheet" href="/include/minify/f=skins/admin/admincolor.css" />
@@ -343,8 +405,8 @@ phrasea::headers();
var bool = true;
var first = true;
$('.'+that+'_checker:not(:disabled)').each(function(){
// if(!$(this)[0].disabled)
// {
// if(!$(this)[0].disabled)
// {
if(first && $(this)[0].checked)
bool = false;
$(this)[0].checked = bool;
@@ -359,7 +421,7 @@ phrasea::headers();
checkAdd(this)
if(that == 'accept')
checkRemove(this)
// }
// }
});
}
</script>
@@ -375,25 +437,24 @@ phrasea::headers();
<body><form method='post' action='demand.php'>
<?php
$out = "";
<?php
$out = "";
$lastMonth = time() - (3 * 4 * 7 * 24 * 60 * 60);
$sql = "delete from demand where date_modif <'".date('Y-m-d', $lastMonth)."'";
$sql = "delete from demand where date_modif <'" . date('Y-m-d', $lastMonth) . "'";
$conn->query($sql);
// on filtre les bases administrables
$sql = "SELECT base_id FROM basusr WHERE usr_id='".$conn->escape_string($session->usr_id)."' AND canadmin=1";
$sql = "SELECT base_id FROM basusr WHERE usr_id='" . $conn->escape_string($session->usr_id) . "' AND canadmin=1";
$baslist = array();
if($rs = $conn->query($sql))
if ($rs = $conn->query($sql))
{
while($row = $conn->fetch_assoc($rs))
while ($row = $conn->fetch_assoc($rs))
{
$baslist[] = $row["base_id"];
}
@@ -402,119 +463,118 @@ $sql = "SELECT base_id FROM basusr WHERE usr_id='".$conn->escape_string($session
$models = '<option value="">aucun</option>';
$sql = 'SELECT usr_id, usr_login FROM usr WHERE model_of = "'.$conn->escape_string($session->usr_id).'"';
if($rs = $conn->query($sql))
$sql = 'SELECT usr_id, usr_login FROM usr WHERE model_of = "' . $conn->escape_string($session->usr_id) . '"';
if ($rs = $conn->query($sql))
{
while($row = $conn->fetch_assoc($rs))
$models .= '<option value="%stemplate%s_'.$row['usr_id'].'">'.$row['usr_login'].'</option>';
while ($row = $conn->fetch_assoc($rs))
$models .= '<option value="%stemplate%s_' . $row['usr_id'] . '">' . $row['usr_login'] . '</option>';
}
$sql = "SELECT demand.date_modif,demand.base_id,usr.usr_id , usr.usr_login ,usr.usr_nom,usr.usr_prenom, usr.societe,CONCAT(usr.usr_nom,' ',usr.usr_prenom,'\n',fonction,' (',societe,')') AS info
FROM (demand INNER JOIN usr on demand.usr_id=usr.usr_id AND demand.en_cours=1)
WHERE (base_id='" . implode("' OR base_id='",$baslist) ."') ORDER BY demand.usr_id DESC,demand.base_id ASC";
WHERE (base_id='" . implode("' OR base_id='", $baslist) . "') ORDER BY demand.usr_id DESC,demand.base_id ASC";
//$out .= '<div>'.$baslibs . "</div>";
if($rs = $conn->query($sql))
if ($rs = $conn->query($sql))
{
$out .= "<div id=\"top_box\" style='height:40px;overflow:hidden;'>";
$out .= "<div id=\"title\">"._('admin:: demandes en cours')."</div>";
$out .= "<div id=\"title\">" . _('admin:: demandes en cours') . "</div>";
$out .= "<div>";
$out .= "<table style='width:100%'>".
"<tr>".
"<td style='width:20px'><img onclick='checkAll(\"deny\")' style='cursor:pointer;' class='tipInfoUsr' title=\""._('admin:: refuser l\'acces')."\" src='/skins/icons/delete.gif'/></td>".
"<td style='width:20px'><img onclick='checkAll(\"accept\")' style='cursor:pointer;' class='tipInfoUsr' title='"._('admin:: donner les droits de telechargement et consultation de previews')."' src='/skins/icons/cmdok.gif'/></td>".
"<td style='width:20px'><span onclick='checkAll(\"accept_hd\")' style='cursor:pointer;' class='tipInfoUsr' title='"._('admin:: donner les droits de telechargements de preview et hd')."'>HD</span></td>".
"<td style='width:20px'><span onclick='checkAll(\"watermark\")' style='cursor:pointer;' class='tipInfoUsr' title='"._('admin:: watermarquer les documents')."'>W</span></td>".
"<td style='width:120px'>" . _('admin::compte-utilisateur identifiant') . "</td>".
"<td style='width:auto'>" . _('admin::compte-utilisateur societe') . "</td>".
"<td style='width:130px'>" . _('admin::compte-utilisateur date d\'inscription') . "</td>".
"<td style='width:150px'>"._('admin::collection')."</td>".
"</tr>".
$out .= "<table style='width:100%'>" .
"<tr>" .
"<td style='width:20px'><img onclick='checkAll(\"deny\")' style='cursor:pointer;' class='tipInfoUsr' title=\"" . _('admin:: refuser l\'acces') . "\" src='/skins/icons/delete.gif'/></td>" .
"<td style='width:20px'><img onclick='checkAll(\"accept\")' style='cursor:pointer;' class='tipInfoUsr' title='" . _('admin:: donner les droits de telechargement et consultation de previews') . "' src='/skins/icons/cmdok.gif'/></td>" .
"<td style='width:20px'><span onclick='checkAll(\"accept_hd\")' style='cursor:pointer;' class='tipInfoUsr' title='" . _('admin:: donner les droits de telechargements de preview et hd') . "'>HD</span></td>" .
"<td style='width:20px'><span onclick='checkAll(\"watermark\")' style='cursor:pointer;' class='tipInfoUsr' title='" . _('admin:: watermarquer les documents') . "'>W</span></td>" .
"<td style='width:120px'>" . _('admin::compte-utilisateur identifiant') . "</td>" .
"<td style='width:auto'>" . _('admin::compte-utilisateur societe') . "</td>" .
"<td style='width:130px'>" . _('admin::compte-utilisateur date d\'inscription') . "</td>" .
"<td style='width:150px'>" . _('admin::collection') . "</td>" .
"</tr>" .
"</table>";
$out .= "</div>";
$out .= "</div><div id=\"tab_demandes\" style='overflow-y:scroll;overflow-x:hidden'>";
$out .= "<table style='width:100%' class='ulist' cellspacing='0' cellpading='0'>".
"<tr>".
"<td style='width:20px'></td>".
"<td style='width:20px'></td>".
"<td style='width:20px'></td>".
"<td style='width:20px'></td>".
"<td style='width:120px'></td>".
"<td style='width:auto'></td>".
"<td style='width:130px'></td>".
"<td style='width:150px'></td>".
$out .= "<table style='width:100%' class='ulist' cellspacing='0' cellpading='0'>" .
"<tr>" .
"<td style='width:20px'></td>" .
"<td style='width:20px'></td>" .
"<td style='width:20px'></td>" .
"<td style='width:20px'></td>" .
"<td style='width:120px'></td>" .
"<td style='width:auto'></td>" .
"<td style='width:130px'></td>" .
"<td style='width:150px'></td>" .
"</tr>";
$class = '';
$currentUsr = null;
while(($row = $conn->fetch_assoc($rs)))
while (($row = $conn->fetch_assoc($rs)))
{
if($row['usr_id'] != $currentUsr)
if ($row['usr_id'] != $currentUsr)
{
if($currentUsr !== null)
if ($currentUsr !== null)
{
$out .= '</table></div></td></tr>';
}
$currentUsr = $row['usr_id'];
$class = $class=='g'?'':'g';
$class = $class == 'g' ? '' : 'g';
$info = "" ;
$sqlInfo = "SELECT * FROM usr WHERE usr_id='".$conn->escape_string($row['usr_id'])."'";
if($rsInfo = $conn->query($sqlInfo))
$info = "";
$sqlInfo = "SELECT * FROM usr WHERE usr_id='" . $conn->escape_string($row['usr_id']) . "'";
if ($rsInfo = $conn->query($sqlInfo))
{
if($rowInfo = $conn->fetch_assoc($rsInfo))
if ($rowInfo = $conn->fetch_assoc($rsInfo))
{
$info .= "<div><div>" . _('admin::compte-utilisateur identifiant') . " : " . ($rowInfo["usr_login"]) ."</div>";
$info .= "<div><div>" . _('admin::compte-utilisateur identifiant') . " : " . ($rowInfo["usr_login"]) . "</div>";
$info .= "<div>". _('admin::compte-utilisateur nom') . "/" . _('admin::compte-utilisateur prenom') . " : " ;
$info .= ($rowInfo["usr_nom"]) ." ";
$info .= ($rowInfo["usr_prenom"]);
$info .= "<div>" . _('admin::compte-utilisateur nom') . "/" . _('admin::compte-utilisateur prenom') . " : ";
$info .= ( $rowInfo["usr_nom"]) . " ";
$info .= ( $rowInfo["usr_prenom"]);
$info .= "</div>";
$info .= "<div>". _('admin::compte-utilisateur email') . " : " ;
$info .= ($rowInfo["usr_mail"]) ;
$info .= "<div>" . _('admin::compte-utilisateur email') . " : ";
$info .= ( $rowInfo["usr_mail"]);
$info .= "</div>";
$info .= "<div>". _('admin::compte-utilisateur telephone') . " : " ;
$info .= ($rowInfo["tel"]) ;
$info .= "<div>" . _('admin::compte-utilisateur telephone') . " : ";
$info .= ( $rowInfo["tel"]);
$info .= "</div>";
$info .= "<div>". _('admin::compte-utilisateur poste') . " : " ;
$info .= ($rowInfo["fonction"]) ;
$info .= "<div>" . _('admin::compte-utilisateur poste') . " : ";
$info .= ( $rowInfo["fonction"]);
$info .= "</div>";
$info .= "<div>". _('admin::compte-utilisateur societe') . " : " ;
$info .= ($rowInfo["societe"]) ;
$info .= "<div>" . _('admin::compte-utilisateur societe') . " : ";
$info .= ( $rowInfo["societe"]);
$info .= "</div>";
$info .= "<div>". _('admin::compte-utilisateur activite') . " : " ;
$info .= ($rowInfo["activite"]) ;
$info .= "<div>" . _('admin::compte-utilisateur activite') . " : ";
$info .= ( $rowInfo["activite"]);
$info .= "</div>";
$info .= "<div>" . _('admin::compte-utilisateur adresse'). " : ";
$info .= "". ($rowInfo["adresse"]);
$info .= "<div>" . _('admin::compte-utilisateur adresse') . " : ";
$info .= "" . ($rowInfo["adresse"]);
$info .= "</div>";
$info .= "<div>";
$info .= ($rowInfo["cpostal"])." ";
$info .= ($rowInfo["ville"]);
$info .= "</div>". "</div>";
$info .= ( $rowInfo["cpostal"]) . " ";
$info .= ( $rowInfo["ville"]);
$info .= "</div>" . "</div>";
}
}
$info = "<div style='margin:5px;'>".$info."</div>";
$info = "<div style='margin:5px;'>" . $info . "</div>";
$out .= '<tr class="tipInfoUsr '.$class.'" title="'.str_replace('"','&quot;',$info).'" id="USER_' . $row['usr_id'] .'"' . '>' ;
$out .= '<tr class="tipInfoUsr ' . $class . '" title="' . str_replace('"', '&quot;', $info) . '" id="USER_' . $row['usr_id'] . '"' . '>';
$out .= "<td>";
$out .= " ";
$out .= "</td>";
@@ -528,49 +588,48 @@ $sql = "SELECT base_id FROM basusr WHERE usr_id='".$conn->escape_string($session
$out .= " ";
$out .= "</td>";
$out .= '<td>';
$out .= '' . ($row["usr_login"]) ;
$out .= '</td>' ;
$out .= '' . ($row["usr_login"]);
$out .= '</td>';
$tmp = $row["usr_nom"]." ".$row["usr_prenom"].( $row["societe"]?" (".$row["societe"].")":"" );
$out .= '<td>' . ( trim($tmp) ). '</td>' ;
$tmp = $row["usr_nom"] . " " . $row["usr_prenom"] . ( $row["societe"] ? " (" . $row["societe"] . ")" : "" );
$out .= '<td>' . ( trim($tmp) ) . '</td>';
$out .= '<td colspan="2"> '._('admin:: appliquer le modele ').' <select name="template[]" id="model_'.$row['usr_id'].'" onchange="modelChecker('.$row['usr_id'].')">'.str_replace('%stemplate%s',$row['usr_id'],$models).'</select></td>';
$out .= '<td colspan="2"> ' . _('admin:: appliquer le modele ') . ' <select name="template[]" id="model_' . $row['usr_id'] . '" onchange="modelChecker(' . $row['usr_id'] . ')">' . str_replace('%stemplate%s', $row['usr_id'], $models) . '</select></td>';
$out .= '</tr>';
$out .= '<tr><td colspan="8"><div id="sub_usr_'.$row['usr_id'].'"><table cellspacing="0" cellpading="0" style="width:100%">'.
"<tr style='height:0px;dispolay:none;'>".
"<td style='width:20px'></td>".
"<td style='width:20px'></td>".
"<td style='width:20px'></td>".
"<td style='width:20px'></td>".
"<td style='width:120px'></td>".
"<td style='width:auto'></td>".
"<td style='width:130px'></td>".
"<td style='width:150px'></td>".
$out .= '<tr><td colspan="8"><div id="sub_usr_' . $row['usr_id'] . '"><table cellspacing="0" cellpading="0" style="width:100%">' .
"<tr style='height:0px;dispolay:none;'>" .
"<td style='width:20px'></td>" .
"<td style='width:20px'></td>" .
"<td style='width:20px'></td>" .
"<td style='width:20px'></td>" .
"<td style='width:120px'></td>" .
"<td style='width:auto'></td>" .
"<td style='width:130px'></td>" .
"<td style='width:150px'></td>" .
"</tr>";
}
$out .= '<tr class="'.$class.'">' ;
$out .= '<tr class="' . $class . '">';
$out .= "<td>";
$out .= "<input name='deny[]' value='".$row['usr_id']."_".$row['base_id']."' onclick='checkDeny(this)' id='deny_".$row['usr_id']."_".$row['base_id']."' class='deny_checker tipInfoUsr checker_".$row['usr_id']."' title=\""._('admin:: refuser l\'acces')."\" class='' type=\"checkbox\"/>";
$out .= "<input name='deny[]' value='" . $row['usr_id'] . "_" . $row['base_id'] . "' onclick='checkDeny(this)' id='deny_" . $row['usr_id'] . "_" . $row['base_id'] . "' class='deny_checker tipInfoUsr checker_" . $row['usr_id'] . "' title=\"" . _('admin:: refuser l\'acces') . "\" class='' type=\"checkbox\"/>";
$out .= "</td>";
$out .= "<td>";
$out .= "<input name='accept[]' value='".$row['usr_id']."_".$row['base_id']."' onclick='checkRemove(this)' id='accept_".$row['usr_id']."_".$row['base_id']."' class='disabler_".$row['usr_id']."_".$row['base_id']." accept_checker tipInfoUsr checker_".$row['usr_id']."' title='"._('admin:: donner les droits de telechargement et consultation de previews')."' class='checker_".$row['usr_id']."' type=\"checkbox\"/>";
$out .= "<input name='accept[]' value='" . $row['usr_id'] . "_" . $row['base_id'] . "' onclick='checkRemove(this)' id='accept_" . $row['usr_id'] . "_" . $row['base_id'] . "' class='disabler_" . $row['usr_id'] . "_" . $row['base_id'] . " accept_checker tipInfoUsr checker_" . $row['usr_id'] . "' title='" . _('admin:: donner les droits de telechargement et consultation de previews') . "' class='checker_" . $row['usr_id'] . "' type=\"checkbox\"/>";
$out .= "</td>";
$out .= "<td>";
$out .= "<input name='accept_hd[]' value='".$row['usr_id']."_".$row['base_id']."' onclick='checkAdd(this)' id='accept_hd_".$row['usr_id']."_".$row['base_id']."' class='disabler_".$row['usr_id']."_".$row['base_id']." accept_hd_checker tipInfoUsr checker_".$row['usr_id']."' title='"._('admin:: donner les droits de telechargements de preview et hd')."' class='checker_".$row['usr_id']."' type=\"checkbox\"/>";
$out .= "<input name='accept_hd[]' value='" . $row['usr_id'] . "_" . $row['base_id'] . "' onclick='checkAdd(this)' id='accept_hd_" . $row['usr_id'] . "_" . $row['base_id'] . "' class='disabler_" . $row['usr_id'] . "_" . $row['base_id'] . " accept_hd_checker tipInfoUsr checker_" . $row['usr_id'] . "' title='" . _('admin:: donner les droits de telechargements de preview et hd') . "' class='checker_" . $row['usr_id'] . "' type=\"checkbox\"/>";
$out .= "</td>";
$out .= "<td>";
$out .= "<input name='watermark[]' value='".$row['usr_id']."_".$row['base_id']."' onclick='checkAdd(this)' id='watermark_".$row['usr_id']."_".$row['base_id']."' class='disabler_".$row['usr_id']."_".$row['base_id']." watermark_checker tipInfoUsr checker_".$row['usr_id']."' title='"._('admin:: watermarquer les documents')."' class='checker_".$row['usr_id']."' type=\"checkbox\"/>";
$out .= "<input name='watermark[]' value='" . $row['usr_id'] . "_" . $row['base_id'] . "' onclick='checkAdd(this)' id='watermark_" . $row['usr_id'] . "_" . $row['base_id'] . "' class='disabler_" . $row['usr_id'] . "_" . $row['base_id'] . " watermark_checker tipInfoUsr checker_" . $row['usr_id'] . "' title='" . _('admin:: watermarquer les documents') . "' class='checker_" . $row['usr_id'] . "' type=\"checkbox\"/>";
$out .= "</td>";
$out .= "<td colspan='2'>";
$out .= "</td>";
$out .= '<td>' . ($row["date_modif"]) . '</td>' ;
$out .= '<td>' . ($row["date_modif"]) . '</td>';
if(isset($allnames[$row["base_id"]]))
$out .= '<td>' . $allnames[$row["base_id"]]. '</td>';
if (isset($allnames[$row["base_id"]]))
$out .= '<td>' . $allnames[$row["base_id"]] . '</td>';
else
$out .= '<td>' . $row["base_id"] . '</td>';
@@ -583,21 +642,19 @@ $sql = "SELECT base_id FROM basusr WHERE usr_id='".$conn->escape_string($session
$out .= "</table>";
$out .= "</div>";
}
$conn->free_result($rs);
$out .= " <div id='bottom_box' style='height:40px;overflow:hidden;'>";
$out .= " <div id=\"divboutdemand\" style=\"text-align:center;\">";
$out .= " <input type='submit' value='"._('boutton::valider')."' />";
$out .= " <input type='submit' value='" . _('boutton::valider') . "' />";
$out .= " </div>";
$out .= " </div></form>";
$out .= " </body>";
$out .= "</html>";
print($out);
?>
<script>$('.tipInfoUsr').tooltip();</script>
print($out);
?>
<script>$('.tipInfoUsr').tooltip();</script>
</body>
</html>

6
www/lightbox/jquery.lightbox.ie6.js
View File

@@ -429,14 +429,14 @@ function display_basket_element(compare, sselcont_id)
{
if(compare)
{
$('.agreement_selector').show();
// $('.agreement_selector').show();
$('#record_infos, #right_column').hide();
$('#record_wrapper').stop().css({width:'100%'});
display_record(compare);
}
else
{
$('.agreement_selector').hide();
// $('.agreement_selector').hide();
$('#record_wrapper').css({width:($('#innerWrapper').width() - $('#record_infos').outerWidth() - $('#right_column').outerWidth() - 2)});
display_record(compare);
$('#record_infos, #right_column').show();
@@ -558,6 +558,7 @@ function display_record(compare)
if(compare)
{
$('.agreement_selector').show();
main_container.addClass('comparison');
var double_portrait_width = main_container_innerwidth / 2;
@@ -673,6 +674,7 @@ function display_record(compare)
}
else
{
$('.agreement_selector').hide();
main_container.removeClass('comparison');
if(compare_box.is(':visible'))

6
www/lightbox/jquery.lightbox.js
View File

@@ -520,7 +520,7 @@ function display_basket_element(compare, sselcont_id)
{
if(compare)
{
$('.agreement_selector').show();
// $('.agreement_selector').show();
// $('#record_wrapper').stop().animate({right:0},100,function(){display_record(compare);});
$('#record_wrapper').css({right:0});
display_record(compare);
@@ -528,7 +528,7 @@ function display_basket_element(compare, sselcont_id)
}
else
{
$('.agreement_selector').hide();
// $('.agreement_selector').hide();
$('#record_wrapper').css({right:250});
display_record(compare);
$('#right_column').show();
@@ -810,6 +810,7 @@ function display_record(compare)
if(compare)
{
$('.agreement_selector').show();
main_container.addClass('comparison');
var double_portrait_width = main_container_innerwidth / 2;
@@ -926,6 +927,7 @@ function display_record(compare)
}
else
{
$('.agreement_selector').hide();
main_container.removeClass('comparison');
if(compare_box.is(':visible'))

149
www/login/register.php
View File

@@ -73,7 +73,7 @@ if($request->has_post_datas())
foreach($parm as $field=>$value)
{
if(is_string($value) && isset($arrayVerif[$field]))
if(is_string($value) && isset($arrayVerif[$field]) && $arrayVerif[$field] === true)
{
if(trim($value) == '' )
$needed[$field] = _('forms::ce champ est requis');
@@ -340,6 +340,9 @@ phrasea::headers();
$first = true;
$sep = $msg = $rules = '';
foreach($arrayVerif as $ar=>$ver)
{
if($ver === false)
continue;
if($ar != 'form_password')
{
if(!$first)
@@ -361,6 +364,7 @@ phrasea::headers();
$msg .= '}';
}
}
?>
@@ -507,19 +511,6 @@ phrasea::headers();
</td>
</tr>
<tr><td colspan="3">&nbsp;</td></tr>
<tr>
<td class="form_label">
<label for="form_city">
<?php echo (isset($arrayVerif['form_geonameid']) && $arrayVerif['form_geonameid']===true)?'<span class="requiredField">*</span>':''?> <?php echo _('admin::compte-utilisateur ville')?> :
</label>
</td>
<td class="form_input">
<input id="form_geonameid" type="text" geonameid="<?php echo $parm["form_geonameid"]?>" value="<?php echo geonames::name_from_id($parm["form_geonameid"])?>" class="input_element geoname_field" name="form_geonameid">
</td>
<td class="form_alert">
<?php echo isset($needed['form_geonameid'])?$needed['form_geonameid']:''?>
</td>
</tr>
<tr>
<td class="form_label">
<?php echo _('admin::compte-utilisateur sexe')?> :
@@ -533,6 +524,19 @@ phrasea::headers();
<?php echo isset($needed['form_gender'])?$needed['form_gender']:''?>
</td>
</tr>
<tr>
<td class="form_label">
<label for="form_firstname">
<?php echo (isset($arrayVerif['form_firstname']) && $arrayVerif['form_firstname']===true)?'<span class="requiredField">*</span>':''?> <?php echo _('admin::compte-utilisateur prenom')?> :
</label>
</td>
<td class="form_input">
<input id="form_firstname" autocomplete="off" type="text" value="<?php echo $parm["form_firstname"]?>" class="input_element" name="form_firstname">
</td>
<td class="form_alert">
<?php echo isset($needed['form_firstname'])?$needed['form_firstname']:''?>
</td>
</tr>
<tr>
<td class="form_label">
<label for="form_lastname">
@@ -546,17 +550,73 @@ phrasea::headers();
<?php echo isset($needed['form_lastname'])?$needed['form_lastname']:''?>
</td>
</tr>
<tr><td colspan="3">&nbsp;</td></tr>
<tr>
<td class="form_label">
<label for="form_firstname">
<?php echo (isset($arrayVerif['form_firstname']) && $arrayVerif['form_firstname']===true)?'<span class="requiredField">*</span>':''?> <?php echo _('admin::compte-utilisateur prenom')?> :
<label for="form_address">
<?php echo (isset($arrayVerif['form_address']) && $arrayVerif['form_address']===true)?'<span class="requiredField">*</span>':''?> <?php echo _('admin::compte-utilisateur adresse')?> :
</label>
</td>
<td class="form_input">
<input id="form_firstname" autocomplete="off" type="text" value="<?php echo $parm["form_firstname"]?>" class="input_element" name="form_firstname">
<input id="form_address" autocomplete="off" type="text" value="<?php echo $parm["form_address"]?>" class="input_element" name="form_address">
</td>
<td class="form_alert">
<?php echo isset($needed['form_firstname'])?$needed['form_firstname']:''?>
<?php echo isset($needed['form_address'])?$needed['form_address']:''?>
</td>
</tr>
<tr>
<td class="form_label">
<label for="form_zip">
<?php echo (isset($arrayVerif['form_zip']) && $arrayVerif['form_zip']===true)?'<span class="requiredField">*</span>':''?> <?php echo _('admin::compte-utilisateur code postal')?> :
</label>
</td>
<td class="form_input">
<input id="form_zip" autocomplete="off" type="text" value="<?php echo $parm["form_zip"]?>" class="input_element" name="form_zip">
</td>
<td class="form_alert">
<?php echo isset($needed['form_zip'])?$needed['form_zip']:''?>
</td>
</tr>
<tr>
<td class="form_label">
<label for="form_city">
<?php echo (isset($arrayVerif['form_geonameid']) && $arrayVerif['form_geonameid']===true)?'<span class="requiredField">*</span>':''?> <?php echo _('admin::compte-utilisateur ville')?> :
</label>
</td>
<td class="form_input">
<input id="form_geonameid" type="text" geonameid="<?php echo $parm["form_geonameid"]?>" value="<?php echo geonames::name_from_id($parm["form_geonameid"])?>" class="input_element geoname_field" name="form_geonameid">
</td>
<td class="form_alert">
<?php echo isset($needed['form_geonameid'])?$needed['form_geonameid']:''?>
</td>
</tr>
<tr><td colspan="3">&nbsp;</td></tr>
<tr>
<td class="form_label">
<label for="form_phone">
<?php echo (isset($arrayVerif['form_phone']) && $arrayVerif['form_phone']===true)?'<span class="requiredField">*</span>':''?> <?php echo _('admin::compte-utilisateur telephone')?> :
</label>
</td>
<td class="form_input">
<input id="form_phone" autocomplete="off" type="text" value="<?php echo $parm["form_phone"]?>" class="input_element" name="form_phone">
</td>
<td class="form_alert">
<?php echo isset($needed['form_phone'])?$needed['form_phone']:''?>
</td>
</tr>
<tr><td colspan="3">&nbsp;</td></tr>
<tr>
<td class="form_label">
<label for="form_company">
<?php echo (isset($arrayVerif['form_company']) && $arrayVerif['form_company']===true)?'<span class="requiredField">*</span>':''?> <?php echo _('admin::compte-utilisateur societe')?> :
</label>
</td>
<td class="form_input">
<input id="form_company" autocomplete="off" type="text" value="<?php echo $parm["form_company"]?>" class="input_element" name="form_company">
</td>
<td class="form_alert">
<?php echo isset($needed['form_company'])?$needed['form_company']:''?>
</td>
</tr>
<tr>
@@ -585,19 +645,6 @@ phrasea::headers();
<?php echo isset($needed['form_activity'])?$needed['form_activity']:''?>
</td>
</tr>
<tr>
<td class="form_label">
<label for="form_phone">
<?php echo (isset($arrayVerif['form_phone']) && $arrayVerif['form_phone']===true)?'<span class="requiredField">*</span>':''?> <?php echo _('admin::compte-utilisateur telephone')?> :
</label>
</td>
<td class="form_input">
<input id="form_phone" autocomplete="off" type="text" value="<?php echo $parm["form_phone"]?>" class="input_element" name="form_phone">
</td>
<td class="form_alert">
<?php echo isset($needed['form_phone'])?$needed['form_phone']:''?>
</td>
</tr>
<tr>
<td class="form_label">
<label for="form_fax">
@@ -611,46 +658,6 @@ phrasea::headers();
<?php echo isset($needed['form_fax'])?$needed['form_fax']:''?>
</td>
</tr>
<tr>
<td class="form_label">
<label for="form_company">
<?php echo (isset($arrayVerif['form_company']) && $arrayVerif['form_company']===true)?'<span class="requiredField">*</span>':''?> <?php echo _('admin::compte-utilisateur societe')?> :
</label>
</td>
<td class="form_input">
<input id="form_company" autocomplete="off" type="text" value="<?php echo $parm["form_company"]?>" class="input_element" name="form_company">
</td>
<td class="form_alert">
<?php echo isset($needed['form_company'])?$needed['form_company']:''?>
</td>
</tr>
<tr>
<td class="form_label">
<label for="form_address">
<?php echo (isset($arrayVerif['form_address']) && $arrayVerif['form_address']===true)?'<span class="requiredField">*</span>':''?> <?php echo _('admin::compte-utilisateur adresse')?> :
</label>
</td>
<td class="form_input">
<input id="form_address" autocomplete="off" type="text" value="<?php echo $parm["form_address"]?>" class="input_element" name="form_address">
</td>
<td class="form_alert">
<?php echo isset($needed['form_address'])?$needed['form_address']:''?>
</td>
</tr>
<tr>
<td class="form_label">
<label for="form_zip">
<?php echo (isset($arrayVerif['form_zip']) && $arrayVerif['form_zip']===true)?'<span class="requiredField">*</span>':''?> <?php echo _('admin::compte-utilisateur code postal')?> :
</label>
</td>
<td class="form_input">
<input id="form_zip" autocomplete="off" type="text" value="<?php echo $parm["form_zip"]?>" class="input_element" name="form_zip">
</td>
<td class="form_alert">
<?php echo isset($needed['form_zip'])?$needed['form_zip']:''?>
</td>
</tr>
<tr>