Skip to content
Permalink
Browse files Browse the repository at this point in the history
2.1.27
Added filter in Roles page
Improve truncating title in list of items
  • Loading branch information
nilsteampassnet committed Oct 4, 2017
1 parent 8be3cc3 commit ef32e9c
Show file tree
Hide file tree
Showing 11 changed files with 135 additions and 58 deletions.
1 change: 1 addition & 0 deletions changelog.md
Expand Up @@ -11,6 +11,7 @@
Fixed issue while restoring DB from administration page
Improved / Fixed administration task for encrypting/decrypting files
Improved security regarding item history display
Added filter in Roles
#1947 Dependency & array update in install checks
#1945 Cannot delete items
#1944 File upload results in error
Expand Down
12 changes: 11 additions & 1 deletion includes/css/passman.css
Expand Up @@ -165,7 +165,7 @@ float:left;

.td_title{
font-weight:bold;
min-width: 150px;
min-width: 120px;
}

ul{
Expand All @@ -181,6 +181,11 @@ list-style-type:none;
padding: 10px;
}

.normal {
font: normal; "Lucida Grande";
color: #464646;
}

.readme{
font-family: sans-serif;
font-size: 9px;
Expand Down Expand Up @@ -392,4 +397,9 @@ div.dataTables_processing { z-index: 1; }

.hidden {
display: none;
}

.no-border {
border: none;
border-collapse: collapse;
}
3 changes: 2 additions & 1 deletion index.php
Expand Up @@ -117,6 +117,7 @@
$session_hide_maintenance = $superGlobal->get("hide_maintenance", "SESSION");
$session_initial_url = $superGlobal->get("initial_url", "SESSION");
$server_request_uri = $superGlobal->get("REQUEST_URI", "SERVER");
$session_nb_users_online = $superGlobal->get("nb_users_online", "SESSION");


/* DEFINE WHAT LANGUAGE TO USE */
Expand Down Expand Up @@ -783,7 +784,7 @@ class="ui-state-error ui-corner-all">
<a href="https://www.reddit.com/r/TeamPass/" target="_blank" style="color:#F0F0F0;" class="tip" title="'.addslashes($LANG['admin_help']).'"><i class="fa fa-reddit-alien"></i></a>
</div>
<div style="float:left;width:32%;text-align:center;">
', ($session_user_id !== null && empty($session_user_id) === false) ? '<i class="fa fa-users"></i>&nbsp;'.$_SESSION['nb_users_online'].'&nbsp;'.$LANG['users_online'].'&nbsp;|&nbsp;<i class="fa fa-hourglass-end"></i>&nbsp;'.$LANG['index_expiration_in'].'&nbsp;<div style="display:inline;" id="countdown"></div>' : '', '
', ($session_user_id !== null && empty($session_user_id) === false) ? '<i class="fa fa-users"></i>&nbsp;'.$session_nb_users_online.'&nbsp;'.$LANG['users_online'].'&nbsp;|&nbsp;<i class="fa fa-hourglass-end"></i>&nbsp;'.$LANG['index_expiration_in'].'&nbsp;<div style="display:inline;" id="countdown"></div>' : '', '
</div><div id="countdown2"></div>
<div style="float:right;text-align:right;">
<i class="fa fa-clock-o"></i>&nbsp;'. $LANG['server_time']." : ".@date($SETTINGS['date_format'], (string) $_SERVER['REQUEST_TIME'])." - ".@date($SETTINGS['time_format'], (string) $_SERVER['REQUEST_TIME']).'
Expand Down
2 changes: 1 addition & 1 deletion install/install.queries.php
Expand Up @@ -364,7 +364,7 @@ function encryptFollowingDefuse($message, $ascii_key)
$mysqli_result = mysqli_query(
$dbTmp,
"CREATE TABLE IF NOT EXISTS `".$var['tbl_prefix']."misc` (
`id` int(12) NOT null AUTO_INCREMENT,
`increment_id` int(12) NOT null AUTO_INCREMENT,
`type` varchar(50) NOT NULL,
`intitule` varchar(100) NOT NULL,
`valeur` varchar(500) NOT NULL,
Expand Down
20 changes: 14 additions & 6 deletions install/upgrade_run_2.1.27.php
Expand Up @@ -188,11 +188,19 @@ function cleanFields($txt)
// alter table Items
mysqli_query($db_link, "ALTER TABLE `".$pre."items` MODIFY pw_len INT(5) NOT NULL DEFAULT '0'");

// alter table misc to add an index
mysqli_query(
$db_link,
"ALTER TABLE `".$pre."misc` ADD `id` INT(12) NOT NULL AUTO_INCREMENT FIRST, ADD PRIMARY KEY (`id`)"
);
// alter table MISC - rename ID is exists
$result = mysqli_query("SHOW COLUMNS FROM `misc` LIKE 'id'");
if (mysqli_num_rows($result) !== 0) {
// Change name of field
mysqli_query($db_link, "ALTER TABLE `".$pre."misc` CHANGE `id` `increment_id` INT(12) NOT NULL");
} else {
// alter table misc to add an index
$res = addColumnIfNotExist(
$pre."misc",
"increment_id",
"INT(12) NOT NULL AUTO_INCREMENT FIRST, ADD PRIMARY KEY (`id`)"
);
}

// alter table misc to add an index
mysqli_query(
Expand Down Expand Up @@ -703,7 +711,7 @@ function replace_a_line($data)
utf8_encode(
"<?php
global \$SETTINGS;
\$SETTINGS = array (" . $config_text . "
\$SETTINGS = array (" . $config_text . "
);"
)
);
Expand Down
27 changes: 21 additions & 6 deletions items.load.php
Expand Up @@ -792,7 +792,9 @@ function(data) {

function EditerItem()
{
$("#div_formulaire_edition_item_info").html("<?php echo "<i class='fa fa-cog fa-spin fa-lg'></i>&nbsp;".addslashes($LANG['please_wait'])."..."; ?>").show();
$("#div_formulaire_edition_item_info")
.html("<?php echo "<i class='fa fa-cog fa-spin fa-lg'></i>&nbsp;".addslashes($LANG['please_wait'])."..."; ?>")
.removeClass("hidden");
$("#item_detail_zone_loader").addClass("hidden");
var erreur = "";
var reg=new RegExp("[.|,|;|:|!|=|+|-|*|/|#|\"|'|&]");
Expand Down Expand Up @@ -965,7 +967,7 @@ function(data) {
LoadingPage();
} else {
//refresh item in list
$("#fileclass"+data.id).text($('#edit_label').val());
$("#fileclass"+data.id).html('<div class="truncate">' + $('#edit_label').val() + '</div>');

//Refresh form
$("#id_label").text($('#edit_label').val());
Expand Down Expand Up @@ -1088,16 +1090,24 @@ function(data) {
);*/

} else {
$('#edit_show_error').html("<?php echo addslashes($LANG['error_complex_not_enought']); ?>").show();
$('#edit_show_error')
.html("<?php echo addslashes($LANG['error_complex_not_enought']); ?>")
.show();
$("#div_formulaire_edition_item ~ .ui-dialog-buttonpane").find("button:contains('<?php echo addslashes($LANG['save_button']); ?>')").prop("disabled", false);
$("#div_formulaire_edition_item_info").addClass("hidden").html("");
$("#div_formulaire_edition_item_info")
.addClass("hidden")
.html("");
}
}

if (erreur != "") {
$('#edit_show_error').html(erreur).show();
$("#div_formulaire_edition_item_info").addClass("hidden").html("");
$("#div_formulaire_edition_item ~ .ui-dialog-buttonpane").find("button:contains('<?php echo addslashes($LANG['save_button']); ?>')").prop("disabled", false);
$("#div_formulaire_edition_item_info")
.addClass("hidden")
.html("");
$("#div_formulaire_edition_item ~ .ui-dialog-buttonpane")
.find("button:contains('<?php echo addslashes($LANG['save_button']); ?>')")
.prop("disabled", false);
}
}

Expand Down Expand Up @@ -3293,6 +3303,11 @@ function(data) {
function(data) {
if (data[0].error === "") {
$("#div_suggest_change_wait").html("<?php echo addslashes($LANG['suggestion_done']); ?>").show(1).delay(1500).fadeOut(1000);

// set indicator if item has change proposal
$("#item_extra_info").prepend('<i class="fa fa-lightbulb-o fa-sm mi-yellow tip" title="<?php echo addslashes($LANG['item_has_change_proposal']); ?>" onclick=""></i>&nbsp;');
$(".tip").tooltipster({multiple: true});

setTimeout(
function() {
$("#div_suggest_change").dialog("close");
Expand Down
50 changes: 27 additions & 23 deletions items.php
Expand Up @@ -226,11 +226,11 @@
<i class="fa fa-warning"></i>&nbsp;<b>'.$LANG['pw_is_expired_-_update_it'].'</b>
</div>
</div>
<table width="100%" id="item_details_table">';
<table width="100%" class="no-border" id="item_details_table">';
// Line for LABEL
echo '
<tr>
<td valign="top" class="td_title" colspan="2">
<td valign="top" class="td_title" width="120px" style="background-color:rgba(178, 178, 178, 0.13);">
<div class="quick_menu2" style="float:left; margin-right: 5px;">
<ul class="quick_menu ui-menu">
<li><i class="fa fa-bars"></i>
Expand All @@ -252,7 +252,11 @@
</li>
</ul>
</div>
<div id="id_label" style="display:inline; margin:4px 0px 0px 120px; "></div>
</td>
<td valign="middle" style="background-color:rgba(178, 178, 178, 0.13);">
<span id="id_label" style="font-weight:bold;"></span>
</td>
<td style="background-color:rgba(178, 178, 178, 0.13);">
<input type="hidden" id="hid_label" value="', isset($dataItem) ? htmlspecialchars($dataItem['label']) : '', '" />
<div style="float:right; font-family:arial; margin-right:5px;" id="item_viewed_x_times"></div>
Expand All @@ -266,15 +270,15 @@
echo '
<tr>
<td valign="top" class="td_title" width="180px">&nbsp;<i class="fa fa-angle-right"></i>&nbsp;'.$LANG['description'].' :</td>
<td>
<td colspan="2">
<div id="id_desc" style="font-style:italic;display:inline;"></div><input type="hidden" id="hid_desc" value="', isset($dataItem) ? htmlspecialchars($dataItem['description']) : '', '" />
</td>
</tr>';
// Line for PW
echo '
<tr>
<td valign="top" class="td_title">&nbsp;<i class="fa fa-angle-right"></i>&nbsp;'.$LANG['pw'].' :<span id="button_quick_pw_copy" class="fa fa-paste fa-border fa-sm tip" style="cursor:pointer;display:none;float:right;margin-right:2px;" title="'.$LANG['item_menu_copy_pw'].'"></i></td>
<td>
<td colspan="2">
&nbsp;
<div id="id_pw" class="unhide_masked_data" style="float:left; cursor:pointer; width:300px;"></div>
<input type="hidden" id="hid_pw" value="" />
Expand All @@ -285,7 +289,7 @@
echo '
<tr>
<td valign="top" class="td_title">&nbsp;<i class="fa fa-angle-right"></i>&nbsp;'.$LANG['index_login'].' :<span id="button_quick_login_copy" class="fa fa-paste fa-border fa-sm tip" style="cursor:pointer;display:none;float:right;margin-right:2px;" title="'.$LANG['item_menu_copy_login'].'"></span></td>
<td>
<td colspan="2">
<div id="id_login" style="float:left;"></div>
<input type="hidden" id="hid_login" value="" />
</td>
Expand All @@ -294,23 +298,23 @@
echo '
<tr>
<td valign="top" class="td_title">&nbsp;<i class="fa fa-angle-right"></i>&nbsp;'.$LANG['email'].' :</td>
<td>
<td colspan="2">
<div id="id_email" style="display:inline;"></div><input type="hidden" id="hid_email" value="" />
</td>
</tr>';
// Line for URL
echo '
<tr>
<td valign="top" class="td_title">&nbsp;<i class="fa fa-angle-right"></i>&nbsp;'.$LANG['url'].' :</td>
<td>
<td colspan="2">
<div id="id_url" style="display:inline;"></div><input type="hidden" id="hid_url" value="" />
</td>
</tr>';
// Line for FILES
echo '
<tr>
<td valign="top" class="td_title">&nbsp;<i class="fa fa-angle-right"></i>&nbsp;'.$LANG['files_&_images'].' :</td>
<td>
<td colspan="2">
<div id="id_files" style="display:inline;font-size:11px;"></div><input type="hidden" id="hid_files" />
<div id="dialog_files" style="display: none;">
Expand All @@ -321,42 +325,42 @@
echo '
<tr>
<td valign="top" class="td_title">&nbsp;<i class="fa fa-angle-right"></i>&nbsp;'.$LANG['restricted_to'].' :</td>
<td>
<td colspan="2">
<div id="id_restricted_to" style="display:inline;"></div><input type="hidden" id="hid_restricted_to" /><input type="hidden" id="hid_restricted_to_roles" />
</td>
</tr>';
// Line for TAGS
echo '
<tr>
<td valign="top" class="td_title">&nbsp;<i class="fa fa-angle-right"></i>&nbsp;'.$LANG['tags'].' :</td>
<td>
<td colspan="2">
<div id="id_tags" style="display:inline;"></div><input type="hidden" id="hid_tags" />
</td>
</tr>';
// Line for KBs
if (isset($SETTINGS['enable_kb']) && $SETTINGS['enable_kb'] == 1) {
echo '
<tr>
<td valign="top" class="td_title">&nbsp;<i class="fa fa-angle-right"></i>&nbsp;'.$LANG['kbs'].' :</td>
<td>
<div id="id_kbs" style="display:inline;"></div><input type="hidden" id="hid_kbs" />
</td>
</tr>';
<tr>
<td valign="top" class="td_title">&nbsp;<i class="fa fa-angle-right"></i>&nbsp;'.$LANG['kbs'].' :</td>
<td colspan="2">
<div id="id_kbs" style="display:inline;"></div><input type="hidden" id="hid_kbs" />
</td>
</tr>';
}
// lines for FIELDS
if (isset($SETTINGS['item_extra_fields']) && $SETTINGS['item_extra_fields'] == 1) {
foreach ($_SESSION['item_fields'] as $elem) {
$itemCatName = $elem[0];
echo '
<tr class="tr_fields hidden" id="tr_catfield_'.$elem[0].'">
<td valign="top" class="td_title">&nbsp;<i class="fa fa-angle-right"></i>&nbsp;'.$elem[1].' :</td>
<td></td>
</tr>';
<tr class="tr_fields hidden" id="tr_catfield_'.$elem[0].'">
<td valign="top" class="td_title">&nbsp;<i class="fa fa-angle-right"></i>&nbsp;'.$elem[1].' :</td>
<td colspan="2"></td>
</tr>';
foreach ($elem[2] as $field) {
echo '
<tr class="tr_cf tr_fields hidden" id="cf_tr_'.$field[0].'">
<td valign="top" class="td_title">&nbsp;&nbsp;<i class="fa fa-caret-right"></i>&nbsp;<i>'.$field[1].'</i> :</td>
<td>';
<td colspan="2">';
if ($field[3] === "masked") {
echo '
<div id="id_field_'.htmlspecialchars($field[0]).'_'.$elem[0].'" style="float:left; cursor:pointer; width:300px;" class="fields_div unhide_masked_data pointer"></div><input type="hidden" id="hid_field_'.htmlspecialchars($field[0]).'_'.$elem[0].'" class="fields" />';
Expand Down Expand Up @@ -778,7 +782,7 @@
</div>';
}
echo '
<div style="display:none; padding:5px;" id="div_formulaire_edition_item_info" class="ui-state-default ui-corner-all"></div>
<div style="padding:5px;" id="div_formulaire_edition_item_info" class="ui-state-default ui-corner-all hidden"></div>
</div>
</form>
</div>';
Expand Down
30 changes: 22 additions & 8 deletions roles.load.php
Expand Up @@ -205,8 +205,6 @@ function(data) {
}
});



refresh_roles_matrix();
});

Expand Down Expand Up @@ -280,7 +278,7 @@ function refresh_roles_matrix(order)
$("#div_loading").show();

//clean up
$("#roles_next, #roles_previous").hide();
$(".roles_next, .roles_previous").hide();

//manage start query
if (order == "next") {
Expand All @@ -299,26 +297,42 @@ function refresh_roles_matrix(order)
"sources/roles.queries.php",
{
type : "refresh_roles_matrix",
start : start
start : start,
filter : $("#filter_roles").val()
},
function(data) {
//decrypt data
data = $.parseJSON(data);
$("#matrice_droits").html("");
if (data.new_table != "") {
if (data.new_table !== "") {
$("#matrice_droits").html(data.new_table);
if (data.next < data.all) {
$("#roles_next").show();
if (data.next < data.all && data.next >= 9) {
$(".roles_next").show();
}
if (data.next >= 9 && data.previous >= 0) {
$("#roles_previous").show();
$(".roles_previous").show();
}
//manage next & previous arrows
$('#next_role').val(data.next);
$('#previous_role').val(data.previous);

$("#filter_roles").val("");
} else {
$("#matrice_droits").html(data.error);
}

// Prepare autocomplete for filterbox
//Prepare autocomplete for filter
$("#filter_roles")
.autocomplete({
source: data.list_of_roles,
focus: function() {
// prevent value inserted on focus
return false;
}
}
);

$("#div_loading").hide();
}
);
Expand Down

0 comments on commit ef32e9c

Please sign in to comment.