Merge branch 'master' into calendar_import
This commit is contained in:
commit
657eef354a
|
@ -547,7 +547,7 @@ Calendar={
|
||||||
$('#share_user').live('change', function(){
|
$('#share_user').live('change', function(){
|
||||||
if($('#sharewithuser_' + $('#share_user option:selected').text()).length == 0){
|
if($('#sharewithuser_' + $('#share_user option:selected').text()).length == 0){
|
||||||
Calendar.UI.Share.share(Calendar.UI.Share.currentid, Calendar.UI.Share.idtype, $('#share_user option:selected').text(), 'user');
|
Calendar.UI.Share.share(Calendar.UI.Share.currentid, Calendar.UI.Share.idtype, $('#share_user option:selected').text(), 'user');
|
||||||
var newitem = '<li id="sharewithuser_' + $('#share_user option:selected').text() +'"><input type="checkbox" width="12px" style="visibility:hidden;" title="' + $('#share_user option:selected').text() + '">' + $('#share_user option:selected').text() + '<img src="' + oc_webroot + '/core/img/actions/delete.svg" class="svg action" style="display:none;float:right;"></li>';
|
var newitem = '<li id="sharewithuser_' + $('#share_user option:selected').text() +'"><input type="checkbox" width="12px" style="visibility:hidden;" title="' + $('#share_user option:selected').text() + '">' + $('#share_user option:selected').text() + '<img src="' + OC.imagePath('core', 'actions/delete.svg') + '" class="svg action" style="display:none;float:right;"></li>';
|
||||||
$('#sharewithuser_list').append(newitem);
|
$('#sharewithuser_list').append(newitem);
|
||||||
$('#sharewithuser_' + $('#share_user option:selected').text() + ' > img').click(function(){
|
$('#sharewithuser_' + $('#share_user option:selected').text() + ' > img').click(function(){
|
||||||
$('#share_user option[value="' + $(this).parent().text() + '"]').removeAttr('disabled');
|
$('#share_user option[value="' + $(this).parent().text() + '"]').removeAttr('disabled');
|
||||||
|
@ -562,7 +562,7 @@ Calendar={
|
||||||
$('#share_group').live('change', function(){
|
$('#share_group').live('change', function(){
|
||||||
if($('#sharewithgroup_' + $('#share_group option:selected').text()).length == 0){
|
if($('#sharewithgroup_' + $('#share_group option:selected').text()).length == 0){
|
||||||
Calendar.UI.Share.share(Calendar.UI.Share.currentid, Calendar.UI.Share.idtype, $('#share_group option:selected').text(), 'group');
|
Calendar.UI.Share.share(Calendar.UI.Share.currentid, Calendar.UI.Share.idtype, $('#share_group option:selected').text(), 'group');
|
||||||
var newitem = '<li id="sharewithgroup_' + $('#share_group option:selected').text() +'"><input type="checkbox" width="12px" style="visibility:hidden;" title="' + $('#share_group option:selected').text() + '">' + $('#share_group option:selected').text() + '<img src="' + oc_webroot + '/core/img/actions/delete.svg" class="svg action" style="display:none;float:right;"></li>';
|
var newitem = '<li id="sharewithgroup_' + $('#share_group option:selected').text() +'"><input type="checkbox" width="12px" style="visibility:hidden;" title="' + $('#share_group option:selected').text() + '">' + $('#share_group option:selected').text() + '<img src="' + OC.imagePath('core', 'actions/delete.svg') + '" class="svg action" style="display:none;float:right;"></li>';
|
||||||
$('#sharewithgroup_list').append(newitem);
|
$('#sharewithgroup_list').append(newitem);
|
||||||
$('#sharewithgroup_' + $('#share_group option:selected').text() + ' > img').click(function(){
|
$('#sharewithgroup_' + $('#share_group option:selected').text() + ' > img').click(function(){
|
||||||
$('#share_group option[value="' + $(this).parent().text() + '"]').removeAttr('disabled');
|
$('#share_group option[value="' + $(this).parent().text() + '"]').removeAttr('disabled');
|
||||||
|
|
|
@ -67,6 +67,8 @@ OC={
|
||||||
if(type){
|
if(type){
|
||||||
link+= '/'+type+'/';
|
link+= '/'+type+'/';
|
||||||
}
|
}
|
||||||
|
if(link.substring(link.length-1) != '/')
|
||||||
|
link+='/';
|
||||||
link+=file;
|
link+=file;
|
||||||
}else{
|
}else{
|
||||||
link+='/';
|
link+='/';
|
||||||
|
|
|
@ -128,6 +128,14 @@ class OC_DB {
|
||||||
}else{
|
}else{
|
||||||
$dsn='pgsql:dbname='.$name.';host='.$host;
|
$dsn='pgsql:dbname='.$name.';host='.$host;
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
|
* Ugly fix for pg connections pbm when password use spaces
|
||||||
|
*/
|
||||||
|
$e_user = addslashes($user);
|
||||||
|
$e_password = addslashes($pass);
|
||||||
|
$pass = $user = null;
|
||||||
|
$dsn .= ";user='$e_user';password='$e_password'";
|
||||||
|
/** END OF FIX***/
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
try{
|
try{
|
||||||
|
|
Loading…
Reference in New Issue