Skip to content

Commit

Permalink
Merge pull request #271 from npds/v16-beta-dev
Browse files Browse the repository at this point in the history 
V16 beta dev
  • Loading branch information
@jipexu
jipexu authored Dec 23, 2017
2 parents cbb876b + f4c6dfd commit b25fcfb
Show file tree
Hide file tree
Showing 11 changed files with 266 additions and 285 deletions.
20 changes: 13 additions & 7 deletions revolution_16/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
function select_start_page($op) {
global $Start_Page, $index;
if (!AutoReg()) { global $user; unset($user); }
if (($Start_Page=='') or ($op=="index.php") or ($op=="edito")or ($op=="edito-nonews")) {
if (($Start_Page=='') or ($op=="index.php") or ($op=="edito") or ($op=="edito-nonews")) {
$index = 1;
theindex($op, '', '');
die('');
Expand Down Expand Up @@ -187,28 +187,34 @@ function aff_news($op,$catid,$marqeur) {
if ($op=='categories') {
if (sizeof($news_tab)==$storynum) {
$marqeur=$marqeur+sizeof($news_tab);
echo "<p align=\"right\"><a href=\"index.php?op=$url&amp;catid=$catid&amp;marqeur=$marqeur\" class=\"page_suivante\" title=\"$transl1\">$transl1</a></p>";
echo '
<div class="text-right"><a href="index.php?op='.$url.'&amp;catid='.$catid.'&amp;marqeur='.$marqeur.'" class="page_suivante" >'.$transl1.'<i class="fa fa-chevron-right fa-lg ml-2" title="'.$transl1.'" data-toggle="tooltip"></i></a></div>';
} else {
if ($marqeur>=$storynum)
echo "<p align=\"right\"><a href=\"index.php?op=$url&amp;catid=$catid&amp;marqeur=0\" class=\"page_suivante\" title=\"$transl2\">$transl2</a></p>";
echo '
<div class="text-right"><a href="index.php?op='.$url.'&amp;catid='.$catid.'&amp;marqeur=0" class="page_suivante" title="'.$transl2.'">'.$transl2.'</a></div>';
}
}
if ($op=='news') {
if (sizeof($news_tab)==$storynum) {
$marqeur=$marqeur+sizeof($news_tab);
echo "<p align=\"right\"><a href=\"index.php?op=$url&amp;catid=$catid&amp;marqeur=$marqeur\" class=\"page_suivante\" title=\"$transl1\">$transl1</a></p>";
echo '
<div class="text-right"><a href="index.php?op='.$url.'&amp;catid='.$catid.'&amp;marqeur='.$marqeur.'" class="page_suivante" >'.$transl1.'<i class="fa fa-chevron-right fa-lg ml-2" title="'.$transl1.'" data-toggle="tooltip"></i></a></div>';
} else {
if ($marqeur>=$storynum)
echo "<p align=\"right\"><a href=\"index.php?op=$url&amp;catid=$catid&amp;marqeur=0\" class=\"page_suivante\" title=\"$transl2\">$transl2</a></p>";
echo '
<div class="text-right"><a href="index.php?op='.$url.'&amp;catid='.$catid.'&amp;marqeur=0" class="page_suivante" title="'.$transl2.'">'.$transl2.'</a></div>';
}
}
if ($op=='topics') {
if (sizeof($news_tab)==$storynum) {
$marqeur=$marqeur+sizeof($news_tab);
echo "<p align=\"right\"><a href=\"index.php?op=newtopic&amp;topic=$catid&amp;marqeur=$marqeur\" class=\"page_suivante\" title=\"$transl1\">$transl1</a></p>";
echo '
<div align="right"><a href="index.php?op=newtopic&amp;topic='.$topic.'&amp;marqeur='.$marqeur.'" class="page_suivante" >'.$transl1.'<i class="fa fa-chevron-right fa-lg ml-2" title="'.$transl1.'" data-toggle="tooltip"></i></a></div>';
} else {
if ($marqeur>=$storynum)
echo "<p align=\"right\"><a href=\"index.php?op=newtopic&amp;topic=$catid&amp;marqeur=0\" class=\"page_suivante\" title=\"$transl2\">$transl2</a></p>";
echo '
<div class="text-right"><a href="index.php?op=newtopic&amp;topic='.$topic.'&amp;marqeur=0" class="page_suivante" title="'.$transl2.'">'.$transl2.'</a></div>';
}
}
}
Expand Down
18 changes: 9 additions & 9 deletions revolution_16/memberslist.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -288,20 +288,20 @@ function avatar($user_avatar) {
settype($ch_lat,'string');
$useroutils = '';
if ($temp_user['uid']!= 1 and $temp_user['uid']!='')
$useroutils .= '<a class="list-group-item text-primary" href="user.php?op=userinfo&amp;uname='.$temp_user['uname'].'" target="_blank" title="'.translate("Profile").'" ><i class="fa fa-user fa-2x align-middle"></i><span class="ml-3 d-none d-sm-inline">'.translate("Profile").'</span></a>';
$useroutils .= '<a class="list-group-item text-primary text-center text-md-left" href="user.php?op=userinfo&amp;uname='.$temp_user['uname'].'" target="_blank" title="'.translate("Profile").'" ><i class="fa fa-user fa-2x align-middle"></i><span class="ml-3 d-none d-md-inline">'.translate("Profile").'</span></a>';
if ($temp_user['uid']!= 1 and $temp_user['uid']!='')
$useroutils .= '<a class="list-group-item text-primary" href="powerpack.php?op=instant_message&amp;to_userid='.urlencode($temp_user['uname']).'" title="'.translate("Send internal Message").'" ><i class="fa fa-envelope-o fa-2x align-middle"></i><span class="ml-3 d-none d-sm-inline">'.translate("Message").'</span></a>';
$useroutils .= '<a class="list-group-item text-primary text-center text-md-left" href="powerpack.php?op=instant_message&amp;to_userid='.urlencode($temp_user['uname']).'" title="'.translate("Send internal Message").'" ><i class="fa fa-envelope-o fa-2x align-middle"></i><span class="ml-3 d-none d-md-inline">'.translate("Message").'</span></a>';
if ($temp_user['femail']!='')
$useroutils .= '<a class="list-group-item text-primary" href="mailto:'.anti_spam($temp_user['femail'],1).'" target="_blank" title="'.translate("Email").'" ><i class="fa fa-at fa-2x align-middle"></i><span class="ml-3 d-none d-sm-inline">'.translate("Email").'</span></a>';
$useroutils .= '<a class="list-group-item text-primary text-center text-md-left" href="mailto:'.anti_spam($temp_user['femail'],1).'" target="_blank" title="'.translate("Email").'" ><i class="fa fa-at fa-2x align-middle"></i><span class="ml-3 d-none d-md-inline">'.translate("Email").'</span></a>';
if ($temp_user['url']!='')
$useroutils .= '<a class="list-group-item text-primary" href="'.$temp_user['url'].'" target="_blank" title="'.translate("Visit this Website").'"><i class="fa fa-external-link fa-2x align-middle"></i><span class="ml-3 d-none d-sm-inline">'.translate("Visit this Website").'</span></a>';
$useroutils .= '<a class="list-group-item text-primary text-center text-md-left" href="'.$temp_user['url'].'" target="_blank" title="'.translate("Visit this Website").'"><i class="fa fa-external-link fa-2x align-middle"></i><span class="ml-3 d-none d-md-inline">'.translate("Visit this Website").'</span></a>';
if ($temp_user['mns'])
$useroutils .= '<a class="list-group-item text-primary" href="minisite.php?op='.$temp_user['uname'].'" target="_blank" target="_blank" title="'.translate("Visit the Mini Web Site !").'" ><i class="fa fa-desktop fa-2x align-middle"></i><span class="ml-3 d-none d-sm-inline">'.translate("Visit the Mini Web Site !").'</span></a>';
if ($user and $temp_user['uid']!= 1)
$useroutils .= '<a class="list-group-item text-primary" href="memberslist.php?letter='.$letter.'&amp;sortby='.$sortby.'&amp;list='.$list.urlencode($temp_user['uname']).',&amp;page='.$page.'&amp;gr_from_ws='.$gr_from_ws.'" title="'.translate("Add to mailing list").'" ><i class="fa fa-plus-circle fa-2x align-middle">&nbsp;</i><span class="ml-3 d-none d-sm-inline">'.translate("Mailing list").'</span></a>';
$useroutils .= '<a class="list-group-item text-primary text-center text-md-left" href="minisite.php?op='.$temp_user['uname'].'" target="_blank" target="_blank" title="'.translate("Visit the Mini Web Site !").'" ><i class="fa fa-desktop fa-2x align-middle"></i><span class="ml-3 d-none d-md-inline">'.translate("Visit the Mini Web Site !").'</span></a>';
if(autorisation(-127))
$useroutils .= '<a class="list-group-item text-primary text-center text-md-left" href="memberslist.php?letter='.$letter.'&amp;sortby='.$sortby.'&amp;list='.$list.urlencode($temp_user['uname']).',&amp;page='.$page.'&amp;gr_from_ws='.$gr_from_ws.'" title="'.translate("Add to mailing list").'" ><i class="fa fa-plus-circle fa-2x align-middle">&nbsp;</i><span class="ml-3 d-none d-md-inline">'.translate("Mailing list").'</span></a>';
if ($user and $temp_user['uid']!= 1) {
if ($posterdata_extend[$ch_lat] !='')
$useroutils .= '<a class="list-group-item text-primary" href="modules.php?ModPath=geoloc&amp;ModStart=geoloc&op=u'.$temp_user['uid'].'" title="'.translate("Location").'" ><i class="fa fa-map-marker fa-2x align-middle">&nbsp;</i><span class="ml-3 d-none d-sm-inline">'.translate("Location").'</span></a>';
$useroutils .= '<a class="list-group-item text-primary text-center text-md-left" href="modules.php?ModPath=geoloc&amp;ModStart=geoloc&op=u'.$temp_user['uid'].'" title="'.translate("Location").'" ><i class="fa fa-map-marker fa-2x align-middle">&nbsp;</i><span class="ml-3 d-none d-md-inline">'.translate("Location").'</span></a>';
}
$op_result = sql_query("SELECT open FROM ".$NPDS_Prefix."users_status WHERE uid='".$temp_user['uid']."'");
list($open_user) = sql_fetch_row($op_result);
Expand All @@ -320,7 +320,7 @@ function avatar($user_avatar) {
<td>';
}
if ($ibid_avatar=avatar($temp_user['user_avatar']))
echo '<a tabindex="0" data-toggle="popover" data-trigger="click" data-html="true" data-title="<h4>'.$temp_user['uname'].'</h4>" data-content=\'<div class="list-group">'.$useroutils.'</div><hr />'.$my_rsos[$a].'\'></i><img data-html="true" title="" data-toggle="tooltip" class=" btn-outline-'.$clconnect.' img-thumbnail img-fluid n-ava-small" src="'.$ibid_avatar.'" alt="'.$temp_user['uname'].'" /></a>
echo '<a tabindex="0" data-toggle="popover" data-placement="bottom" data-trigger="click" data-html="true" data-title="'.$temp_user['uname'].'" data-content=\'<div class="list-group">'.$useroutils.'</div><div class="text-center mt-3">'.$my_rsos[$a].'</div>\'></i><img data-html="true" title="" data-toggle="tooltip" class=" btn-outline-'.$clconnect.' img-thumbnail img-fluid n-ava-small" src="'.$ibid_avatar.'" alt="'.$temp_user['uname'].'" /></a>
</td>
<td><a href="user.php?op=userinfo&amp;uname='.$temp_user['uname'].'" title="'.date(translate("dateinternal"),$temp_user['user_regdate']);
if ($admin and $temp_user['user_lastvisit']!='') {
Expand Down
69 changes: 36 additions & 33 deletions revolution_16/modules/comments/comments.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,48 +112,51 @@ function Caff_pub($topic, $file_name, $archive) {
if (!$short_user) {
$posterdata_extend = get_userdata_extend_from_id($myrow['poster_id']);
include('modules/reseaux-sociaux/reseaux-sociaux.conf.php');
if (array_key_exists('M2', $posterdata_extend)) {
if ($posterdata_extend['M2']!='') {
$socialnetworks= explode(';',$posterdata_extend['M2']);
foreach ($socialnetworks as $socialnetwork) {
$res_id[] = explode('|',$socialnetwork);
}
sort($res_id);
sort($rs);
foreach ($rs as $v1) {
foreach($res_id as $y1) {
$k = array_search( $y1[0],$v1);
if (false !== $k) {
$my_rs.='<a class="mr-3" href="'.$v1[1].$y1[1].'" target="_blank"><i class="fa fa-'.$v1[2].' fa-2x text-primary"></i></a>';
break;
}
else $my_rs.='';
if($user or autorisation(-127)) {

if (array_key_exists('M2', $posterdata_extend)) {
if ($posterdata_extend['M2']!='') {
$socialnetworks= explode(';',$posterdata_extend['M2']);
foreach ($socialnetworks as $socialnetwork) {
$res_id[] = explode('|',$socialnetwork);
}
sort($res_id);
sort($rs);
foreach ($rs as $v1) {
foreach($res_id as $y1) {
$k = array_search( $y1[0],$v1);
if (false !== $k) {
$my_rs.='<a class="mr-3" href="'.$v1[1].$y1[1].'" target="_blank"><i class="fa fa-'.$v1[2].' fa-2x text-primary"></i></a>';
break;
}
else $my_rs.='';
}
}
$my_rsos[]=$my_rs;
}
$my_rsos[]=$my_rs;
}
else $my_rsos[]='';
else $my_rsos[]='';
} else $my_rsos[]='';
} else $my_rsos[]='';
}
include('modules/geoloc/geoloc_conf.php');
settype($ch_lat,'string');

$useroutils = '';
if ($posterdata['uid']!= 1 and $posterdata['uid']!='')
$useroutils .= '<hr />';
if ($posterdata['uid']!= 1 and $posterdata['uid']!='')
$useroutils .= '<a class="list-group-item text-primary" href="user.php?op=userinfo&amp;uname='.$posterdata['uname'].'" target="_blank" title="'.translate("Profile").'" data-toggle="tooltip"><i class="fa fa-2x fa-user"></i><span class="ml-3 d-none d-md-inline">'.translate("Profile").'</span></a>';
if ($posterdata['uid']!= 1 and $posterdata['uid']!='')
$useroutils .= '<a class="list-group-item text-primary" href="powerpack.php?op=instant_message&amp;to_userid='.$posterdata["uname"].'" title="'.translate("Send internal Message").'" data-toggle="tooltip"><i class="fa fa-2x fa-envelope-o"></i><span class="ml-3 d-none d-md-inline">'.translate("Message").'</span></a>';
if ($posterdata['femail']!='')
$useroutils .= '<a class="list-group-item text-primary" href="mailto:'.anti_spam($posterdata['femail'],1).'" target="_blank" title="'.translate("Email").'" data-toggle="tooltip"><i class="fa fa-at fa-2x"></i><span class="ml-3 d-none d-md-inline">'.translate("Email").'</span></a>';
if($user or autorisation(-127)) {
if ($posterdata['uid']!= 1 and $posterdata['uid']!='')
$useroutils .= '<a class="list-group-item text-primary text-center text-md-left" href="user.php?op=userinfo&amp;uname='.$posterdata['uname'].'" target="_blank" title="'.translate("Profile").'" data-toggle="tooltip"><i class="fa fa-user fa-2x align-middle"></i><span class="ml-3 d-none d-md-inline">'.translate("Profile").'</span></a>';
if ($posterdata['uid']!= 1 and $posterdata['uid']!='')
$useroutils .= '<a class="list-group-item text-primary text-center text-md-left" href="powerpack.php?op=instant_message&amp;to_userid='.$posterdata["uname"].'" title="'.translate("Send internal Message").'" data-toggle="tooltip"><i class="fa fa-envelope-o fa-2x align-middle"></i><span class="ml-3 d-none d-md-inline">'.translate("Message").'</span></a>';
if ($posterdata['femail']!='')
$useroutils .= '<a class="list-group-item text-primary text-center text-md-left" href="mailto:'.anti_spam($posterdata['femail'],1).'" target="_blank" title="'.translate("Email").'" data-toggle="tooltip"><i class="fa fa-at fa-2x align-middle"></i><span class="ml-3 d-none d-md-inline">'.translate("Email").'</span></a>';
if ($myrow['poster_id']!=1)
if ($posterdata_extend[$ch_lat] !='')
$useroutils .= '<a class="list-group-item list-group-item-action text-primary text-center text-md-left" href="modules.php?ModPath=geoloc&amp;ModStart=geoloc&amp;op='.$posterdata['uname'].'" title="'.translate("Location").'" ><i class="fa fa-map-marker fa-2x align-middle"></i><span class="ml-3 d-none d-md-inline">'.translate("Location").'</span></a>';
}
if ($posterdata['url']!='')
$useroutils .= '<a class="list-group-item text-primary" href="'.$posterdata['url'].'" target="_blank" title="'.translate("Visit this Website").'" data-toggle="tooltip"><i class="fa fa-2x fa-external-link"></i><span class="ml-3 d-none d-md-inline">'.translate("Visit this Website").'</span></a>';
$useroutils .= '<a class="list-group-item text-primary text-center text-md-left" href="'.$posterdata['url'].'" target="_blank" title="'.translate("Visit this Website").'" data-toggle="tooltip"><i class="fa fa-external-link fa-2x align-middle"></i><span class="ml-3 d-none d-md-inline">'.translate("Visit this Website").'</span></a>';
if ($posterdata['mns'])
$useroutils .= '<a class="list-group-item text-primary" href="minisite.php?op='.$posterdata['uname'].'" target="_blank" target="_blank" title="'.translate("Visit the Mini Web Site !").'" data-toggle="tooltip"><i class="fa fa-2x fa-desktop"></i><span class="ml-3 d-none d-md-inline">'.translate("Visit the Mini Web Site !").'</span></a>';
if ($myrow['poster_id']!=1)
if ($posterdata_extend[$ch_lat] !='')
$useroutils .= '<a class="list-group-item list-group-item-action text-primary" href="modules.php?ModPath=geoloc&amp;ModStart=geoloc&amp;op='.$posterdata['uname'].'" title="'.translate("Location").'" ><i class="fa fa-map-marker fa-2x"></i><span class="ml-3 d-none d-md-inline">'.translate("Location").'</span></a>';
$useroutils .= '<a class="list-group-item text-primary text-center text-md-left" href="minisite.php?op='.$posterdata['uname'].'" target="_blank" target="_blank" title="'.translate("Visit the Mini Web Site !").'" data-toggle="tooltip"><i class="fa fa-desktop fa-2x align-middle"></i><span class="ml-3 d-none d-md-inline">'.translate("Visit the Mini Web Site !").'</span></a>';

echo '
<div class="row">
Expand All @@ -172,7 +175,7 @@ function Caff_pub($topic, $file_name, $archive) {
if ($ibid=theme_image("forum/avatar/".$posterdata['user_avatar'])) {$imgtmp=$ibid;} else {$imgtmp="images/forum/avatar/".$posterdata['user_avatar'];}
}
echo '
<a style="position:absolute; top:1rem;" tabindex="0" data-toggle="popover" data-trigger="focus" data-html="true" data-title="'.$posterdata['uname'].'" data-content=\''.member_qualif($posterdata['uname'], $posts,$posterdata['rank']).'<br /><div class="list-group">'.$useroutils.'</div><hr />'.$my_rsos[$count].'\'><img class=" btn-secondary img-thumbnail img-fluid n-ava" src="'.$imgtmp.'" alt="'.$posterdata['uname'].'" /></a>';
<a style="position:absolute; top:1rem;" tabindex="0" data-toggle="popover" data-trigger="focus" data-html="true" data-title="'.$posterdata['uname'].'" data-content=\'<div class="my-2">'.member_qualif($posterdata['uname'], $posts,$posterdata['rank']).'</div><div class="list-group">'.$useroutils.'</div><div class="text-center mt-3">'.$my_rsos[$count].'</div>\'><img class=" btn-secondary img-thumbnail img-fluid n-ava" src="'.$imgtmp.'" alt="'.$posterdata['uname'].'" /></a>';
}
}
echo '&nbsp;<span style="position:absolute; left:6em;" class="text-muted"><strong>'.$posterdata['uname'].'</strong></span>';
Expand Down
2 changes: 1 addition & 1 deletion revolution_16/powerpack_f.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ function instant_members_message() {
$PopUp=JavaPopUp("readpmsg_imm.php?op=new_msg","IMM",600,500);
$PopUp="<a href=\"javascript:void(0);\" onclick=\"window.open($PopUp);\">";
if ($ibid[$i]['username']==$cookie[1]) {$icon=$PopUp;} else {$icon="";}
$icon.='<i class="fa fa-envelope fa-lg faa-shake animated" title="'.translate("New").' : '.$new_messages.'" data-toggle="tooltip"></i>';
$icon.='<i class="fa fa-envelope fa-lg faa-shake animated" title="'.translate("New").'<span class=\'badge-pill badge-danger ml-2\'>'.$new_messages.'</span>" data-html="true" data-toggle="tooltip"></i>';
if ($ibid[$i]['username']==$cookie[1]) {$icon.='</a>';}
} else {
$messages = sql_num_rows(sql_query("SELECT msg_id FROM ".$NPDS_Prefix."priv_msgs WHERE to_userid = '$userid' AND type_msg='0' AND dossier='...'"));
Expand Down
Loading

0 comments on commit b25fcfb

Please sign in to comment.