Skip to content

Commit

Permalink
Merge pull request #438 from npds/v16.0.3-beta-dev
Browse files Browse the repository at this point in the history 
V16.0.3 beta dev
  • Loading branch information
@jipexu
jipexu committed Jan 6, 2019
2 parents 883e716 + f67bfd2 commit 9842aa0
Show file tree
Hide file tree
Showing 8 changed files with 76 additions and 85 deletions.
10 changes: 7 additions & 3 deletions revolution_16/mainfile.php
View file
Expand Up @@ -2829,8 +2829,9 @@ function fab_espace_groupe($gr, $t_gr, $i_gr) {
$useroutils .= '<a class="list-group-item text-primary" href="'.$url.'" target="_blank" title="'.translate("Visit this Website").'" data-toggle="tooltip"><i class="fa fa-2x fa-external-link align-middle fa-fw"></i><span class="ml-2 d-none d-sm-inline">'.translate("Visit this Website").'</span></a>';
if ($mns)
$useroutils .= '<a class="list-group-item text-primary" href="minisite.php?op='.$uname.'" target="_blank" target="_blank" title="'.translate("Visit the Mini Web Site !").'" data-toggle="tooltip"><i class="fa fa-2x fa-desktop align-middle fa-fw"></i><span class="ml-2 d-none d-sm-inline">'.translate("Visit the Mini Web Site !").'</span></a>';
if ($posterdata_extend[$ch_lat] !='')
$useroutils .= '<a class="list-group-item text-primary" href="modules.php?ModPath=geoloc&amp;ModStart=geoloc&op=u'.$uid.'" title="'.translate("Location").'" ><i class="fa fa-map-marker fa-2x align-middle fa-fw"></i><span class="ml-2 d-none d-sm-inline">'.translate("Location").'</span></a>';
if (!$short_user)
if ($posterdata_extend[$ch_lat] !='')
$useroutils .= '<a class="list-group-item text-primary" href="modules.php?ModPath=geoloc&amp;ModStart=geoloc&op=u'.$uid.'" title="'.translate("Location").'" ><i class="fa fa-map-marker fa-2x align-middle fa-fw"></i><span class="ml-2 d-none d-sm-inline">'.translate("Location").'</span></a>';

$conn= '<i class="fa fa-plug text-muted" title="'.$uname.' '.translate('is not connected !').'" data-toggle="tooltip" ></i>';
if (!$user_avatar)
Expand All @@ -2852,7 +2853,10 @@ function fab_espace_groupe($gr, $t_gr, $i_gr) {
$li_mb.= '
<li class="list-group-item list-group-item-action d-flex flex-row p-2">
<div id="li_mb_'.$uname.'_'.$gr.'" class="n-ellipses">
'.$conn.'<a class="ml-2" tabindex="0" data-title="'.$uname.'" data-toggle="popover" data-trigger="focus" data-html="true" data-content=\'<div class="list-group mb-3">'.$useroutils.'</div><div class="mx-auto text-center" style="max-width:170px;">'.$my_rsos[$count].'</div>\'><img class=" btn-outline-primary img-thumbnail img-fluid n-ava-small " src="'.$imgtmp.'" alt="avatar" title="'.$uname.'" /></a><span class="ml-2">'.$uname.'</span>
'.$conn.'<a class="ml-2" tabindex="0" data-title="'.$uname.'" data-toggle="popover" data-trigger="focus" data-html="true" data-content=\'<div class="list-group mb-3">'.$useroutils.'</div><div class="mx-auto text-center" style="max-width:170px;">';
if (!$short_user)
$li_mb.= $my_rsos[$count];
$li_mb.= '</div>\'><img class=" btn-outline-primary img-thumbnail img-fluid n-ava-small " src="'.$imgtmp.'" alt="avatar" title="'.$uname.'" /></a><span class="ml-2">'.$uname.'</span>
</div>
</li>';
$count++;
Expand Down
98 changes: 45 additions & 53 deletions revolution_16/modules/upload/include/minigf.php
View file
Expand Up @@ -92,20 +92,13 @@ function uploadFile(f) {
f.pcfile.focus();
}
}
/*
function confirmSendFile(f) {
if (window.confirm("<?php echo upload_translate('Joindre le fichier maintenant ?')?>")) {
uploadFile(f);
}
}
*/

function confirmSendFile(f) {
bootbox.confirm("<?php echo upload_translate('Joindre le fichier maintenant ?')?>",
function(result) {
if (result === true) {
uploadFile(f);
}
}
});
}

Expand All @@ -128,14 +121,14 @@ function(result) {
settype($att_table,'string');
settype($thanks_msg,'string');
echo '
<form method="post" action="'.$_SERVER['PHP_SELF'].'" enctype="multipart/form-data" name="form0" onsubmit="return checkForm(this);">
<input type="hidden" name="actiontype" value="" />
<input type="hidden" name="ModPath" value="'.$ModPath.'" />
<input type="hidden" name="ModStart" value="'.$ModStart.'" />
<input type="hidden" name="IdPost" value="'.$IdPost.'" />
<input type="hidden" name="IdForum" value="'.$IdForum.'" />
<input type="hidden" name="IdTopic" value="'.$IdTopic.'" />
<input type="hidden" name="apli" value="'.$apli.'" />';
<form method="post" action="'.$_SERVER['PHP_SELF'].'" enctype="multipart/form-data" name="form0" onsubmit="return checkForm(this);">
<input type="hidden" name="actiontype" value="" />
<input type="hidden" name="ModPath" value="'.$ModPath.'" />
<input type="hidden" name="ModStart" value="'.$ModStart.'" />
<input type="hidden" name="IdPost" value="'.$IdPost.'" />
<input type="hidden" name="IdForum" value="'.$IdForum.'" />
<input type="hidden" name="IdTopic" value="'.$IdTopic.'" />
<input type="hidden" name="apli" value="'.$apli.'" />';

$tsz=0;
$att=getAttachments ($apli,$IdPost,0 ,$Mmod);
Expand All @@ -145,22 +138,21 @@ function(result) {
if (is_array($att)) {
$att_count=count($att);
$display_att=true;
if ($Mmod) {
if ($Mmod)
$vizut='<th data-halign="center" data-align="center">'.upload_translate("Visibilité").'</th>';
}
$att_table='
<table data-toggle="table" data-classes="table table-sm table-no-bordered table-hover table-striped" data-mobile-responsive="true">
<thead>
<tr>
<th class="n-t-col-xs-1"><i class="fa fa-trash-o fa-lg text-muted"></i></th>
<th class="n-t-col-xs-3" data-halign="center" data-align="center" data-sortable="true">'.upload_translate("Fichier").'</th>
<th data-halign="center" data-align="center" data-sortable="true">'.upload_translate("Type").'</th>
<th data-halign="center" data-align="right">'.upload_translate("Taille").'</th>
<th data-halign="center" data-align="center">'.upload_translate("Affichage intégré").'</th>
'.$vizut.'
</tr>
</thead>
<tbody>';
<table data-toggle="table" data-classes="table table-sm table-no-bordered table-hover table-striped" data-mobile-responsive="true">
<thead>
<tr>
<th class="n-t-col-xs-1"><i class="fa fa-trash-o fa-lg text-muted"></i></th>
<th class="n-t-col-xs-3" data-halign="center" data-align="center" data-sortable="true">'.upload_translate("Fichier").'</th>
<th data-halign="center" data-align="center" data-sortable="true">'.upload_translate("Type").'</th>
<th data-halign="center" data-align="right">'.upload_translate("Taille").'</th>
<th data-halign="center" data-align="center">'.upload_translate("Affichage intégré").'</th>
'.$vizut.'
</tr>
</thead>
<tbody>';
$Fichier = new FileManagement; // essai class PHP7
$visu='';
for ($i=0; $i<$att_count; $i++) {
Expand All @@ -172,50 +164,48 @@ function(result) {
// This mime-type can't be displayed inline
echo '<input type="hidden" name="inline_att['.$id.']" value="0" />';
$inline_box='--';
} else {
} else
$inline_box=getListBox("inline_att[$id]", $inline_list, $att[$i]["inline"]);
}
if ($Mmod) {
$visu='<td>'.getCheckBox ("visible_att[]", $id, ($att[$i]["visible"]==1)?$id:-1, "").'</td>';
$visible_list.=$id.',';
}
$att_table.='
<tr>
<td>'.getCheckBox("del_att[]", $id, 0, '').'</td>
<td>'.$att[$i]['att_name'].'</td>
<td>'.$att[$i]['att_type'].'</td>
<td>'.$sz.'</td>
<td>'.$inline_box.'</td>
'.$visu.'
</tr>';
<tr>
<td>'.getCheckBox("del_att[]", $id, 0, '').'</td>
<td>'.$att[$i]['att_name'].'</td>
<td>'.$att[$i]['att_type'].'</td>
<td>'.$sz.'</td>
<td>'.$inline_box.'</td>
'.$visu.'
</tr>';
}
// $total_sz = $Fichier->Pretty_Size($tsz);
$total_sz = $Fichier->file_size_format($tsz,1);
$visu_button='';
echo '<input type="hidden" name="visible_list" value="'.$visible_list.'">';
$att_inline_button='<button class="btn btn-outline-primary btn-sm btn-block" onclick="InlineType(this.form);">'.upload_translate("Adapter").'<span class="d-none d-xl-inline"> '.upload_translate("Affichage intégré").'</span></button>';
if ($Mmod) {
if ($Mmod)
$visu_button='<button class="btn btn-outline-primary btn-sm btn-block" onclick="visibleFile(this.form);">'.upload_translate("Adapter").'<span class="d-none d-xl-inline"> '.upload_translate("Visibilité").'</span></button>';
}

$att_table.='
</tbody>
</table>
<div class="row p-2">
<div class="col-sm-4 col-6 mb-2"><i class="fa fa-level-up fa-2x fa-flip-horizontal text-danger mr-1"></i><a class="text-danger" href="#" onclick="deleteFile(document.form0); return false;"><span class="d-sm-none" title="'.upload_translate("Supprimer les fichiers sélectionnés").'" data-toggle="tooltip" data-placement="right" ><i class="fa fa-trash-o fa-2x ml-1"></i></span><span class="d-none d-sm-inline">'.upload_translate("Supprimer les fichiers sélectionnés").'</span></a></div>
<div class="col-sm-4 text-right col-6 mb-2"><strong>'.upload_translate("Total :").' '.$total_sz.'</strong></div>
<div class="col-sm-2 text-center-sm mb-2 col-12 ">'.$att_inline_button.'</div>
<div class="col-sm-2 text-center-sm mb-2 col-12">'.$visu_button.'</div>
</div>';
</tbody>
</table>
<div class="row p-2">
<div class="col-sm-4 col-6 mb-2"><i class="fa fa-level-up fa-2x fa-flip-horizontal text-danger mr-1"></i><a class="text-danger" href="#" onclick="deleteFile(document.form0); return false;"><span class="d-sm-none" title="'.upload_translate("Supprimer les fichiers sélectionnés").'" data-toggle="tooltip" data-placement="right" ><i class="fa fa-trash-o fa-2x ml-1"></i></span><span class="d-none d-sm-inline">'.upload_translate("Supprimer les fichiers sélectionnés").'</span></a></div>
<div class="col-sm-4 text-right col-6 mb-2"><strong>'.upload_translate("Total :").' '.$total_sz.'</strong></div>
<div class="col-sm-2 text-center-sm mb-2 col-12 ">'.$att_inline_button.'</div>
<div class="col-sm-2 text-center-sm mb-2 col-12">'.$visu_button.'</div>
</div>';
}

$att_upload_table='
<div class="card card-body my-2">
<p>'.upload_translate("Extensions autorisées").' : <small class="text-success">'.$bn_allowed_extensions.'</small></p>
<div class="form-group row">
<label class="col-form-label col-sm-3">'.upload_translate("Fichier joint").'</label>
<label class="col-form-label col-sm-3" for="pcfile">'.upload_translate("Fichier joint").'</label>
<div class="col-sm-9">
<input type="file" class="form-control" id="pcfile" name="pcfile" size="30" onchange="confirmSendFile(this.form);" />
<input type="file" class="form-control" id="pcfile" name="pcfile" onchange="confirmSendFile(this.form);" />
</div>
</div>
<div class="form-group row">
Expand All @@ -224,9 +214,11 @@ function(result) {
</div>
</div>
</div>';

$att_form='
<div class="container-fluid p-3">
<div class="text-right">
<button class="btn btn-outline-secondary btn-sm" onclick="self.close()">X</button>
</div>
'.$thanks_msg;
$att_form.=$att_upload_table.$att_table;
echo $att_form.'
Expand Down
9 changes: 3 additions & 6 deletions revolution_16/modules/upload/include_forum/upload.func.forum.php
View file
Expand Up @@ -36,12 +36,10 @@ function load_mimetypes () {
function getAttachments ($apli, $post_id, $att_id=0, $Mmod=0 ) {
global $upload_table;
$query = "SELECT att_id, att_name, att_type, att_size, att_path, inline, compteur, visible FROM $upload_table WHERE apli='$apli' && post_id='$post_id'";
if ($att_id>0) {
if ($att_id>0)
$query .= " AND att_id=$att_id";
}
if (!$Mmod) {
if (!$Mmod)
$query .= " AND visible=1";
}
$query .= " ORDER BY att_type,att_name";
$result = sql_query($query);
$i=0;
Expand Down Expand Up @@ -93,9 +91,8 @@ function insertAttachment ($apli, $IdPost, $IdTopic, $IdForum, $name, $path, $in
$stamp = time();
$sql = "INSERT INTO $upload_table VALUES ('', '$IdPost', '$IdTopic','$IdForum', '$stamp', '$name', '$type', '$size', '$path', '1', '$apli', '0', '$visible_forum')";
$ret = sql_query($sql);
if (!$ret) {
if (!$ret)
return -1;
}
return sql_last_id ();
}
/************************************************************************/
Expand Down
18 changes: 8 additions & 10 deletions revolution_16/modules/upload/include_forum/upload_forum2.php
View file
Expand Up @@ -54,19 +54,19 @@
if (array_key_exists(11,$cookie)) $skin=$cookie[11];
}
echo '
<link rel="stylesheet" href="lib/font-awesome/css/font-awesome.min.css" />';
<link rel="stylesheet" href="lib/font-awesome/css/font-awesome.min.css" />';
if($skin!='') {
echo '
<link rel="stylesheet" href="themes/_skins/'.$skin.'/bootstrap.min.css" />
<link rel="stylesheet" href="themes/_skins/'.$skin.'/extra.css" />';
<link rel="stylesheet" href="themes/_skins/'.$skin.'/bootstrap.min.css" />
<link rel="stylesheet" href="themes/_skins/'.$skin.'/extra.css" />';
} else
echo '
<link rel="stylesheet" href="lib/bootstrap/dist/css/bootstrap.min.css" />';
<link rel="stylesheet" href="lib/bootstrap/dist/css/bootstrap.min.css" />';
echo '
<link rel="stylesheet" href="lib/bootstrap-table/dist/bootstrap-table.css" />';//hardcoded lol
<link rel="stylesheet" href="lib/bootstrap-table/dist/bootstrap-table.css" />';//hardcoded lol
echo import_css($theme, $language, $site_font, '','');
echo '
</head>
</head>
<body>';

// Moderator
Expand Down Expand Up @@ -104,12 +104,10 @@ function forum_upload() {
list($sum)=sql_fetch_row(sql_query("SELECT SUM(att_size ) FROM $upload_table WHERE apli = '$apli' && post_id = '$IdPost'"));

// gestion du quota de place d'un post
if (($MAX_FILE_SIZE_TOTAL - $sum)<$MAX_FILE_SIZE) {
if (($MAX_FILE_SIZE_TOTAL - $sum)<$MAX_FILE_SIZE)
$MAX_FILE_SIZE = $MAX_FILE_SIZE_TOTAL - $sum;
}
include "modules/upload/include/fileupload.php";
// $thanks_msg='';
settype($thanks_msg,'string');
settype($thanks_msg,'string');

// Récupération des valeurs de PCFILE
global $HTTP_POST_FILES, $_FILES;
Expand Down
4 changes: 2 additions & 2 deletions revolution_16/themes/Rev2016/footer.php
View file
Expand Up @@ -21,7 +21,7 @@
case '2':
echo '
</div>
<div id="col_RB" class="col-sm-3">';
<div id="col_RB" class="col-md-3 col-sm-12">';
leftblocks();
rightblocks();
echo '
Expand All @@ -31,7 +31,7 @@
default :
echo '
</div>
<div id="col_RB" class="col-sm-3">';
<div id="col_RB" class="col-md-3 col-sm-12">';
leftblocks();
rightblocks();
echo '
Expand Down
4 changes: 2 additions & 2 deletions revolution_16/themes/Rev2016/header.php
View file
Expand Up @@ -70,11 +70,11 @@
break;
case '2':
echo '
<div id="col_princ" class="col-sm-9">';
<div id="col_princ" class="col-md-9">';
break;
default:
echo '
<div id="col_princ" class="col-sm-9">';
<div id="col_princ" class="col-md-9">';
break;
}
?>
8 changes: 4 additions & 4 deletions revolution_16/themes/npds-boost_sk/footer.php
View file
Expand Up @@ -31,7 +31,7 @@
</div>';
colsyst('#col_RB');
echo '
<div id="col_RB" class="n-c col-lg-3 ">'."\n";
<div id="col_RB" class="collapse show col-lg-3 ">'."\n";
rightblocks();
echo '
</div>
Expand All @@ -43,13 +43,13 @@
</div>';
colsyst('#col_LB');
echo'
<div id="col_LB" class="n-c col-lg-3">'."\n";
<div id="col_LB" class="collapse show col-lg-3">'."\n";
leftblocks();
echo '
</div>';
colsyst('#col_RB');
echo'
<div id="col_RB" class="n-c col-lg-3">'."\n";
<div id="col_RB" class="collapse show col-lg-3">'."\n";
rightblocks();
echo '
</div>
Expand All @@ -61,7 +61,7 @@
</div>';
colsyst('#col_LB');
echo'
<div id="col_LB" class="n-c col-lg-3">'."\n";
<div id="col_LB" class="collapse show col-lg-3">'."\n";
leftblocks();
echo '
</div>
Expand Down
10 changes: 5 additions & 5 deletions revolution_16/themes/npds-boost_sk/header.php
View file
Expand Up @@ -97,7 +97,7 @@ function colsyst($coltarget) {
case '1':
colsyst('#col_LB');
echo '
<div id="col_LB" class="n-c col-lg-3">';
<div id="col_LB" class="collapse show col-lg-3">';
leftblocks();
echo '
</div>
Expand All @@ -110,13 +110,13 @@ function colsyst($coltarget) {
case '3':
colsyst('#col_LB');
echo '
<div id="col_LB" class="n-c col-lg-3">';
<div id="col_LB" class="collapse show col-lg-3">';
leftblocks();
echo '
</div>';
colsyst('#col_RB');
echo'
<div id="col_RB" class="n-c col-lg-3">';
<div id="col_RB" class="collapse show col-lg-3">';
rightblocks();
echo '
</div>
Expand All @@ -129,7 +129,7 @@ function colsyst($coltarget) {
case '5':
colsyst('#col_RB');
echo '
<div id="col_RB" class="n-c col-lg-3">';
<div id="col_RB" class="collapse show col-lg-3">';
rightblocks();
echo '
</div>
Expand All @@ -138,7 +138,7 @@ function colsyst($coltarget) {
default:
colsyst('#col_LB');
echo '
<div id="col_LB" class="n-c col-lg-3">';
<div id="col_LB" class="collapse show col-lg-3">';
leftblocks();
echo '
</div>
Expand Down

0 comments on commit 9842aa0

Please sign in to comment.