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

Update Terms Of Use rewrite rules

Browse Source
This commit is contained in:
Romain Neutron
2012-02-10 13:15:54 +01:00
parent a17f5fa950
commit 9ed411edab
3 changed files with 117 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
config/nginx.rewrite.rules
View File

@@ -18,6 +18,8 @@ rewrite ^/admin/typeahead/.*$ /admin/router.php last;
rewrite ^/prod/records/edit/.*$ /prod/router.php last; rewrite ^/prod/records/edit/.*$ /prod/router.php last;
rewrite ^/prod/records/movecollection/.*$ /prod/router.php last; rewrite ^/prod/records/movecollection/.*$ /prod/router.php last;
rewrite ^/prod/records/delete/.*$ /prod/router.php last;
rewrite ^/prod/order/.*$ /prod/router.php last;
rewrite ^/prod/bridge/.*$ /prod/router.php last; rewrite ^/prod/bridge/.*$ /prod/router.php last;
rewrite ^/prod/lists/.*$ /prod/router.php last; rewrite ^/prod/lists/.*$ /prod/router.php last;
rewrite ^/prod/MustacheLoader/.*$ /prod/router.php last; rewrite ^/prod/MustacheLoader/.*$ /prod/router.php last;
@@ -33,6 +35,11 @@ rewrite ^/prod/TOU/.*$ /prod/router.php last;
rewrite ^/prod/UserPreferences/.*$ /prod/router.php last; rewrite ^/prod/UserPreferences/.*$ /prod/router.php last;
rewrite ^/prod/$ /prod/router.php last; rewrite ^/prod/$ /prod/router.php last;
rewrite ^/prod/query/.*$ /prod/router.php last;
rewrite ^/prod/export/.*$ /prod/router.php last;
rewrite ^/prod/record/preview/.*$ /prod/router.php last;
rewrite ^/prod/notifications/.*$ /prod/router.php last;
rewrite ^/robots.txt$ /index.php last; rewrite ^/robots.txt$ /index.php last;
rewrite ^/feeds/.*$ /index.php last; rewrite ^/feeds/.*$ /index.php last;

13
www/.htaccess
View File

@@ -20,9 +20,11 @@
RewriteRule ^prod/records/edit/.*$ /prod/router.php [L] RewriteRule ^prod/records/edit/.*$ /prod/router.php [L]
RewriteRule ^prod/records/movecollection/.*$ /prod/router.php [L] RewriteRule ^prod/records/movecollection/.*$ /prod/router.php [L]
RewriteRule ^prod/UserPreferences/.*$ /prod/router.php [L] RewriteRule ^prod/records/delete/.*$ /prod/router.php [L]
RewriteRule ^prod/order/.*$ /prod/router.php [L]
RewriteRule ^prod/UserPreferences/.*$ /prod/router.php [L]
RewriteRule ^prod/bridge/.*$ /prod/router.php [L] RewriteRule ^prod/bridge/.*$ /prod/router.php [L]
RewriteRule ^prod/MustacheLoader/.*$ /prod/router.php [L] RewriteRule ^prod/MustacheLoader/.*$ /prod/router.php [L]
RewriteRule ^prod/feeds/.*$ /prod/router.php [L] RewriteRule ^prod/feeds/.*$ /prod/router.php [L]
RewriteRule ^prod/tooltip/.*$ /prod/router.php [L] RewriteRule ^prod/tooltip/.*$ /prod/router.php [L]
RewriteRule ^prod/lists/.*$ /prod/router.php [L] RewriteRule ^prod/lists/.*$ /prod/router.php [L]
@@ -30,11 +32,16 @@
RewriteRule ^prod/push/.*$ /prod/router.php [L] RewriteRule ^prod/push/.*$ /prod/router.php [L]
RewriteRule ^prod/printer/.*$ /prod/router.php [L] RewriteRule ^prod/printer/.*$ /prod/router.php [L]
RewriteRule ^prod/story/.*$ /prod/router.php [L] RewriteRule ^prod/story/.*$ /prod/router.php [L]
RewriteRule ^prod/TOU/.*$ /prod/router.php [L] RewriteRule ^prod/TOU/.*$ /prod/router.php [L]
RewriteRule ^prod/WorkZone/.*$ /prod/router.php [L] RewriteRule ^prod/WorkZone/.*$ /prod/router.php [L]
RewriteRule ^prod/language/.*$ /prod/router.php [L] RewriteRule ^prod/language/.*$ /prod/router.php [L]
RewriteRule ^prod/$ /prod/router.php [L] RewriteRule ^prod/$ /prod/router.php [L]
RewriteRule ^prod/query/.*$ /prod/router.php [L]
RewriteRule ^prod/export/.*$ /prod/router.php [L]
RewriteRule ^prod/record/preview/.*$ /prod/router.php [L]
RewriteRule ^prod/notifications/.*$ /prod/router.php [L]
RewriteRule ^robots.txt$ /index.php [L] RewriteRule ^robots.txt$ /index.php [L]
RewriteRule ^feeds/.*$ /index.php [L] RewriteRule ^feeds/.*$ /index.php [L]

201
www/client/jquery.p4client.1.0.js
View File

@@ -30,23 +30,22 @@ function acceptCgus(name,value)
function cancelCgus(id) function cancelCgus(id)
{ {
$.ajax({
$.ajax({ type: "POST",
type: "POST", url: "/prod/TOU/deny/" + id + "/",
url: "/prod/prodFeedBack.php", dataType:'json',
data: { success: function(data){
sbas_id:id, if(data.success)
action:'DENY_CGU' {
}, alert(language.cgusRelog);
success: function(data){ self.location.replace(self.location.href);
if(data == '1') }
{ alert
alert(language.cgusRelog); {
self.location.replace(self.location.href); humane.error(data.message);
} }
} }
}); });
} }
function activateCgus() function activateCgus()
@@ -98,20 +97,20 @@ $(document).ready(function(){
getLanguage(); getLanguage();
$('.datepicker').datepicker({ $('.datepicker').datepicker({
firstDay: 1, firstDay: 1,
changeYear: true, changeMonth:true, changeYear: true, changeMonth:true,
showOn: 'button', buttonImage:'/skins/icons/cal.png', buttonImageOnly: true showOn: 'button', buttonImage:'/skins/icons/cal.png', buttonImageOnly: true
}); });
checkFilters(); checkFilters();
window.setTimeout("checkBaskets();", 5000); window.setTimeout("checkBaskets();", 5000);
$('.actives').hover(function(){ $('.actives').hover(function(){
$(this).addClass("hover"); $(this).addClass("hover");
},function(){ },function(){
$(this).removeClass("hover"); $(this).removeClass("hover");
}); });
// if (!$.browser.msie || ($.browser.msie && $.browser.version != '6.0')) { // if (!$.browser.msie || ($.browser.msie && $.browser.version != '6.0')) {
// $('#bandeau .publilist').hover(function(){ // $('#bandeau .publilist').hover(function(){
// $(this).addClass("hover"); // $(this).addClass("hover");
@@ -127,9 +126,9 @@ $(document).ready(function(){
// },function(){ // },function(){
// $(this).removeClass("hover"); // $(this).removeClass("hover");
// }) // })
// //
// } // }
sessionactive(); sessionactive();
resize(); resize();
$(window).resize(function(){ $(window).resize(function(){
@@ -211,10 +210,10 @@ function resizePreview(){
$(n).height(h); $(n).height(h);
}); });
$('#PREVIEWIMGCONT').height(h - $('#PREVIEWCURRENT').height()); $('#PREVIEWIMGCONT').height(h - $('#PREVIEWCURRENT').height());
$('#PREVIEWIMGDESC').height(h-$('#PREVIEWOTHERS').height()); $('#PREVIEWIMGDESC').height(h-$('#PREVIEWOTHERS').height());
$('#PREVIEWIMGDESC .descBoxes').height($('#PREVIEWIMGDESC').height() - 30); $('#PREVIEWIMGDESC .descBoxes').height($('#PREVIEWIMGDESC').height() - 30);
p4.preview.height = $('#PREVIEWIMGCONT').height(); p4.preview.height = $('#PREVIEWIMGCONT').height();
p4.preview.width = $('#PREVIEWIMGCONT').width(); p4.preview.width = $('#PREVIEWIMGCONT').width();
setPreview(); setPreview();
@@ -228,36 +227,36 @@ function controlPubliSize()
} }
function pquit(){ function pquit(){
if (parent.opener) if (parent.opener)
self.close(); self.close();
else else
{ {
document.forms['logout'].submit(); document.forms['logout'].submit();
} }
} }
function resize(){ function resize(){
var h = bodySize.y = $(window).height() - $('#mainMenu').outerHeight(); var h = bodySize.y = $(window).height() - $('#mainMenu').outerHeight();
var w = bodySize.x = $(window).width(); var w = bodySize.x = $(window).width();
controlPubliSize(); controlPubliSize();
var rightw = w - 265; var rightw = w - 265;
rightw = ((rightw) > 0) ? rightw : 0; rightw = ((rightw) > 0) ? rightw : 0;
$('#container').height($(window).height()); $('#container').height($(window).height());
$('#container').width($(window).width()); $('#container').width($(window).width());
$('#right').width(rightw); $('#right').width(rightw);
$('#answers').height(h - $('#nb_answersEXT').outerHeight() - $('#navigation').outerHeight() - 20); $('#answers').height(h - $('#nb_answersEXT').outerHeight() - $('#navigation').outerHeight() - 20);
$('#answers').width(rightw); $('#answers').width(rightw);
resizeSearch(); resizeSearch();
if (p4.preview.open) { if (p4.preview.open) {
resizePreview(); resizePreview();
} }
if ($.browser.msie && $.browser.version == '6.0') { if ($.browser.msie && $.browser.version == '6.0') {
@@ -295,12 +294,12 @@ function getHome(cas){
type: cas type: cas
}, },
beforeSend: function(){ beforeSend: function(){
// if (answAjaxrunning) // if (answAjaxrunning)
// answAjax.abort(); // answAjax.abort();
clearAnswers(); clearAnswers();
answAjaxrunning = true; answAjaxrunning = true;
$('#answers').addClass('loading'); $('#answers').addClass('loading');
}, },
error: function(){ error: function(){
answAjaxrunning = false; answAjaxrunning = false;
@@ -318,14 +317,14 @@ function getHome(cas){
{ {
$('.boxPubli .diapo').css('width','').addClass('w160px').css('margin','0pt 0px 8px 8px'); $('.boxPubli .diapo').css('width','').addClass('w160px').css('margin','0pt 0px 8px 8px');
} }
return; return;
} }
}); });
break; break;
default: default:
break; break;
} }
@@ -355,7 +354,7 @@ function initBasketForm(){
var options = { var options = {
target: '#baskets', target: '#baskets',
beforeSend: function(){ beforeSend: function(){
if (baskAjaxrunning) if (baskAjaxrunning)
baskAjax.abort(); baskAjax.abort();
baskAjaxrunning = true; baskAjaxrunning = true;
$('.baskIndicator').addClass('baskLoading'); $('.baskIndicator').addClass('baskLoading');
@@ -382,7 +381,7 @@ function initBasketForm(){
$('#baskets').removeClass('loading'); $('#baskets').removeClass('loading');
$('.baskIndicator').removeClass('baskLoading'); $('.baskIndicator').removeClass('baskLoading');
$('#blocBask img.baskTips').tooltip(); $('#blocBask img.baskTips').tooltip();
$("#flechenochu").bind('click', function(){ $("#flechenochu").bind('click', function(){
baskDisplay = false; baskDisplay = false;
saveBaskStatus(false); saveBaskStatus(false);
@@ -450,7 +449,7 @@ function initAnswerForm(){
target: '#answers', target: '#answers',
beforeSend: function(formData){ beforeSend: function(formData){
clearAnswers(); clearAnswers();
if (answAjaxrunning) if (answAjaxrunning)
return; return;
answAjaxrunning = true; answAjaxrunning = true;
$('#tooltip').css({ $('#tooltip').css({
@@ -501,12 +500,12 @@ function chgOngSearch(tab){
if($('#'+tab).length == 0) if($('#'+tab).length == 0)
return; return;
for (i = 0; i <= tTabs.length; i++) { for (i = 0; i <= tTabs.length; i++) {
if ((o = $('#' + tTabs[i]))) if ((o = $('#' + tTabs[i])))
var rmC = (tTabs[i] == tab) ? "inactif" : "actif"; var rmC = (tTabs[i] == tab) ? "inactif" : "actif";
var addC = (tTabs[i] == tab) ? "actif" : "inactif"; var addC = (tTabs[i] == tab) ? "actif" : "inactif";
o.addClass(addC).removeClass(rmC); o.addClass(addC).removeClass(rmC);
if ((o = document.getElementById("id" + tTabs[i]))) { if ((o = document.getElementById("id" + tTabs[i]))) {
o.style.display = (tTabs[i] == tab) ? "" : "none"; o.style.display = (tTabs[i] == tab) ? "" : "none";
} }
@@ -517,10 +516,10 @@ function chgOngSearch(tab){
if (tab == "ongAdvSearch") { if (tab == "ongAdvSearch") {
document.getElementById("idongSearch").style.display = ""; document.getElementById("idongSearch").style.display = "";
} }
resizeSearch(); resizeSearch();
} }
function doSpecialSearch(qry, allbase){ function doSpecialSearch(qry, allbase){
// if($('#ongSearch').length>0) // if($('#ongSearch').length>0)
// chgOngSearch('ongSearch'); // chgOngSearch('ongSearch');
@@ -557,12 +556,12 @@ function doSearch()
{ {
$('#searchForm').submit(); $('#searchForm').submit();
} }
function chgOng(num){ function chgOng(num){
for (i = 1; i <= 5; i++) { for (i = 1; i <= 5; i++) {
if ((o = document.getElementById("idOnglet" + i))) if ((o = document.getElementById("idOnglet" + i)))
o.className = (i == num) ? "actif" : "inactif"; o.className = (i == num) ? "actif" : "inactif";
if ((o = document.getElementById("onglet" + i))) if ((o = document.getElementById("onglet" + i)))
o.style.display = (i == num) ? "block" : "none"; o.style.display = (i == num) ? "block" : "none";
} }
return; return;
@@ -575,7 +574,7 @@ function checkBases(etat){
} }
function resizeSearch(){ function resizeSearch(){
var searchh = (bodySize.y-$('#baskets').height()); var searchh = (bodySize.y-$('#baskets').height());
searchh = ((searchh)>0)?searchh:0; searchh = ((searchh)>0)?searchh:0;
var menu = $('#bigTabsBckg').height(); var menu = $('#bigTabsBckg').height();
@@ -586,7 +585,7 @@ function resizeSearch(){
/************* /*************
* Topics * Topics
**************/ **************/
function doThesSearch(type,sbid,term,field) function doThesSearch(type,sbid,term,field)
{ {
@@ -599,20 +598,20 @@ function doThesSearch(type,sbid,term,field)
function chgProp(path, v, k){ function chgProp(path, v, k){
var q2; var q2;
if (!k) if (!k)
k = "*"; k = "*";
if (k != null) if (k != null)
v = v + " [" + k + "]"; v = v + " [" + k + "]";
document.getElementById("thprop_a_" + path).innerHTML = '"' + v + '"'; document.getElementById("thprop_a_" + path).innerHTML = '"' + v + '"';
q = document.getElementById("thprop_q").innerText; q = document.getElementById("thprop_q").innerText;
if (!q) if (!q)
if (document.getElementById("thprop_q") && document.getElementById("thprop_q").textContent) if (document.getElementById("thprop_q") && document.getElementById("thprop_q").textContent)
q = document.getElementById("thprop_q").textContent; q = document.getElementById("thprop_q").textContent;
q2 = ""; q2 = "";
for (i = 0; i < q.length; i++) for (i = 0; i < q.length; i++)
q2 += q.charCodeAt(i) == 160 ? " " : q.charAt(i); // correction pour safari ! q2 += q.charCodeAt(i) == 160 ? " " : q.charAt(i); // correction pour safari !
doSpecialSearch(q2, true); doSpecialSearch(q2, true);
return (false); return (false);
@@ -620,9 +619,9 @@ function chgProp(path, v, k){
function clktri(id){ function clktri(id){
var o = $('#TOPIC_UL' + id); var o = $('#TOPIC_UL' + id);
if ($('#TOPIC_UL' + id).hasClass('closed')) if ($('#TOPIC_UL' + id).hasClass('closed'))
$('#TOPIC_TRI' + id + ' ,#TOPIC_UL' + id).removeClass('closed').addClass('opened'); $('#TOPIC_TRI' + id + ' ,#TOPIC_UL' + id).removeClass('closed').addClass('opened');
else else
$('#TOPIC_TRI' + id + ' ,#TOPIC_UL' + id).removeClass('opened').addClass('closed'); $('#TOPIC_TRI' + id + ' ,#TOPIC_UL' + id).removeClass('opened').addClass('closed');
} }
@@ -657,7 +656,7 @@ function newBasket(){
buttons["OK"] = function(e){saveNewBask();$(this).dialog('close');}; buttons["OK"] = function(e){saveNewBask();$(this).dialog('close');};
buttons[language.annuler] = function(e){$(this).dialog('close');}; buttons[language.annuler] = function(e){$(this).dialog('close');};
$('#DIALOG').empty().append("<input type='text' value='' id='newBaskName' />").attr('title',language.createWinInvite).dialog({ $('#DIALOG').empty().append("<input type='text' value='' id='newBaskName' />").attr('title',language.createWinInvite).dialog({
autoOpen:false, autoOpen:false,
closeOnEscape :true, closeOnEscape :true,
@@ -665,16 +664,16 @@ function newBasket(){
draggable:false, draggable:false,
modal:true modal:true
}).dialog('open').dialog('option','buttons',buttons); }).dialog('open').dialog('option','buttons',buttons);
} }
function saveNewBask(){ function saveNewBask(){
var tmp = $('#newBaskName')[0].value; var tmp = $('#newBaskName')[0].value;
if (tmp == null) if (tmp == null)
return; return;
mytest = false; mytest = false;
for (k = 0; (k < tmp.length && !mytest); k++) { for (k = 0; (k < tmp.length && !mytest); k++) {
if (tmp.charAt(k) != " ") if (tmp.charAt(k) != " ")
mytest = true; mytest = true;
} }
if (!mytest) { if (!mytest) {
@@ -715,7 +714,7 @@ function openCompare(sselid){
$('#ssel2val')[0].value = sselid; $('#ssel2val')[0].value = sselid;
$('#validatorEject').submit(); $('#validatorEject').submit();
} }
function setVisible(el){ function setVisible(el){
el.style.visibility = 'visible'; el.style.visibility = 'visible';
} }
@@ -747,22 +746,22 @@ function gotopage(pag){
function evt_print(basrec){ function evt_print(basrec){
var url = "/include/printpage.php?callclient=1"; var url = "/include/printpage.php?callclient=1";
if(typeof(basrec) == 'undefined') if(typeof(basrec) == 'undefined')
url += "&SSTTID="+$('#chutier_name')[0].options[$('#chutier_name')[0].selectedIndex].value; url += "&SSTTID="+$('#chutier_name')[0].options[$('#chutier_name')[0].selectedIndex].value;
else else
url += "&lst=" + basrec; url += "&lst=" + basrec;
var top; var top;
var left; var left;
$('#MODALDL').attr('src',url); $('#MODALDL').attr('src',url);
var t = (bodySize.y - 300) / 2; var t = (bodySize.y - 300) / 2;
var l = (bodySize.x - 490) / 2; var l = (bodySize.x - 490) / 2;
$('#MODALDL').css({ $('#MODALDL').css({
'display': 'block', 'display': 'block',
'opacity': 0, 'opacity': 0,
@@ -772,16 +771,16 @@ function evt_print(basrec){
'left': l, 'left': l,
'height': '300px' 'height': '300px'
}).fadeTo(500, 1); }).fadeTo(500, 1);
showOverlay(2); showOverlay(2);
} }
function evt_dwnl(lst) function evt_dwnl(lst)
{ {
var dialog_box = $('#dialog_dwnl'); var dialog_box = $('#dialog_dwnl');
dialog_box = $('#dialog_dwnl'); dialog_box = $('#dialog_dwnl');
dialog_box.empty().addClass('loading').dialog({ dialog_box.empty().addClass('loading').dialog({
width:800, width:800,
@@ -796,7 +795,7 @@ function evt_dwnl(lst)
}, },
beforeclose:function(){ beforeclose:function(){
tinyMCE.execCommand('mceRemoveControl',true,'sendmail_message'); tinyMCE.execCommand('mceRemoveControl',true,'sendmail_message');
tinyMCE.execCommand('mceRemoveControl',true,'order_usage'); tinyMCE.execCommand('mceRemoveControl',true,'order_usage');
} }
}).dialog('open'); }).dialog('open');
@@ -804,39 +803,39 @@ function evt_dwnl(lst)
var datas = "&SSTTID="+$('#chutier_name')[0].options[$('#chutier_name')[0].selectedIndex].value; var datas = "&SSTTID="+$('#chutier_name')[0].options[$('#chutier_name')[0].selectedIndex].value;
else else
var datas = "&lst=" + lst; var datas = "&lst=" + lst;
$.post("/include/multiexports.php", datas, function(data) { $.post("/include/multiexports.php", datas, function(data) {
dialog_box.removeClass('loading').empty().append(data); dialog_box.removeClass('loading').empty().append(data);
$('.tabs', dialog_box).tabs(); $('.tabs', dialog_box).tabs();
tinyMCE.execCommand('mceAddControl',true,'sendmail_message'); tinyMCE.execCommand('mceAddControl',true,'sendmail_message');
tinyMCE.execCommand('mceAddControl',true,'order_usage'); tinyMCE.execCommand('mceAddControl',true,'order_usage');
$('.close_button', dialog_box).bind('click',function(){ $('.close_button', dialog_box).bind('click',function(){
dialog_box.dialog('close').dialog('destroy'); dialog_box.dialog('close').dialog('destroy');
}); });
return false; return false;
}); });
} }
//function evt_dwnl(lst){ //function evt_dwnl(lst){
// var top; // var top;
// var left; // var left;
// //
// var url = "" + // var url = "" +
// "/include/multiexports.php" + // "/include/multiexports.php" +
// "?" + // "?" +
// "&callclient=1"; // "&callclient=1";
// //
// //
// $('#MODALDL').attr('src',url); // $('#MODALDL').attr('src',url);
// //
// //
// var t = (bodySize.y - 400) / 2; // var t = (bodySize.y - 400) / 2;
// var l = (bodySize.x - 550) / 2; // var l = (bodySize.x - 550) / 2;
// //
// $('#MODALDL').css({ // $('#MODALDL').css({
// 'display': 'block', // 'display': 'block',
// 'opacity': 0, // 'opacity': 0,
@@ -846,7 +845,7 @@ function evt_dwnl(lst)
// 'left': l, // 'left': l,
// 'height': '400px' // 'height': '400px'
// }).fadeTo(500, 1); // }).fadeTo(500, 1);
// //
// showOverlay(2); // showOverlay(2);
//} //}
@@ -854,20 +853,20 @@ function profil(value)
{ {
var top; var top;
var left; var left;
if(value==undefined) if(value==undefined)
value = "0"; value = "0";
var url = "" + var url = "" +
"/include/profile.php" + "/include/profile.php" +
"?callclient=1&onglet="+value; "?callclient=1&onglet="+value;
$('#MODALDL').attr('src',url); $('#MODALDL').attr('src',url);
var t = (bodySize.y - 550) / 2; var t = (bodySize.y - 550) / 2;
var l = (bodySize.x - 490) / 2; var l = (bodySize.x - 490) / 2;
$('#MODALDL').css({ $('#MODALDL').css({
'display': 'block', 'display': 'block',
'opacity': 0, 'opacity': 0,
@@ -877,7 +876,7 @@ function profil(value)
'left': l, 'left': l,
'height': '550px' 'height': '550px'
}).fadeTo(500, 1); }).fadeTo(500, 1);
showOverlay(2); showOverlay(2);
} }