mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-15 22:13:13 +00:00
tag 3.1.14
This commit is contained in:
Alchemy
@@ -1,2 +1,2 @@
|
||||
<?php
|
||||
define('GV_version','3.1.13');
|
||||
define('GV_version','3.1.14');
|
||||
|
||||
@@ -18,7 +18,8 @@ if(isset($session->usr_id) && isset($session->ses_id))
|
||||
phrasea::headers(403);
|
||||
}
|
||||
}
|
||||
else{
|
||||
else
|
||||
{
|
||||
phrasea::headers(403);
|
||||
}
|
||||
|
||||
@@ -42,7 +43,6 @@ foreach($ph_session['bases'] as $base)
|
||||
foreach ($base['collections'] as $coll)
|
||||
{
|
||||
$allnames[$coll['base_id']] = $coll['name'];
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -112,6 +112,14 @@ if(!is_null($parm['watermark']))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
// 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();
|
||||
@@ -122,10 +130,29 @@ if(!is_null($templates) || !is_null($parm['deny']) || !is_null($parm['accept']))
|
||||
{
|
||||
$cache_to_update[$usr] = true;
|
||||
|
||||
$sql = 'SELECT distinct base_id FROM basusr WHERE usr_id="' . $conn->escape_string($template_id) . '" AND actif="1"';
|
||||
if ($rs = $conn->query($sql))
|
||||
{
|
||||
while ($row = $conn->fetch_assoc($rs))
|
||||
{
|
||||
if (!isset($done[$usr]))
|
||||
$done[$usr] = array();
|
||||
|
||||
$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)."')";
|
||||
$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))
|
||||
{
|
||||
if (!isset($done[$usr]))
|
||||
@@ -182,40 +209,75 @@ if(!is_null($templates) || !is_null($parm['deny']) || !is_null($parm['accept']))
|
||||
$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,"; }
|
||||
{
|
||||
$f.="candwnldhd,";
|
||||
$v.="1,";
|
||||
}
|
||||
else
|
||||
{ $f.="candwnldhd,"; $v.="0,"; }
|
||||
{
|
||||
$f.="candwnldhd,";
|
||||
$v.="0,";
|
||||
}
|
||||
|
||||
if ($wm)
|
||||
{ $f.="needwatermark,"; $v.="1,"; }
|
||||
{
|
||||
$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);
|
||||
@@ -376,7 +438,6 @@ phrasea::headers();
|
||||
<body><form method='post' action='demand.php'>
|
||||
|
||||
<?php
|
||||
|
||||
$out = "";
|
||||
|
||||
|
||||
@@ -507,7 +568,6 @@ $sql = "SELECT base_id FROM basusr WHERE usr_id='".$conn->escape_string($session
|
||||
|
||||
$info .= ( $rowInfo["ville"]);
|
||||
$info .= "</div>" . "</div>";
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -548,7 +608,6 @@ $sql = "SELECT base_id FROM basusr WHERE usr_id='".$conn->escape_string($session
|
||||
"<td style='width:130px'></td>" .
|
||||
"<td style='width:150px'></td>" .
|
||||
"</tr>";
|
||||
|
||||
}
|
||||
|
||||
$out .= '<tr class="' . $class . '">';
|
||||
@@ -583,7 +642,6 @@ $sql = "SELECT base_id FROM basusr WHERE usr_id='".$conn->escape_string($session
|
||||
$out .= "</table>";
|
||||
|
||||
$out .= "</div>";
|
||||
|
||||
}
|
||||
$conn->free_result($rs);
|
||||
|
||||
@@ -596,7 +654,6 @@ $sql = "SELECT base_id FROM basusr WHERE usr_id='".$conn->escape_string($session
|
||||
$out .= "</html>";
|
||||
|
||||
print($out);
|
||||
|
||||
?>
|
||||
<script>$('.tipInfoUsr').tooltip();</script>
|
||||
</body>
|
||||
|
||||
@@ -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'))
|
||||
|
||||
@@ -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'))
|
||||
|
||||
@@ -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"> </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"> </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"> </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"> </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>
|
||||
|
||||
Reference in New Issue
Block a user