may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Urejen vmesnik za pregled uporabnikov za managerje (pregled nad uporabniki, omejitev števila računov v pregledu...)

Browse Source
This commit is contained in:
pero1203 2020-12-10 13:09:02 +01:00
parent 68571d2cb9
commit 6d590ef3d2
14 changed files with 455 additions and 442 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/survey/SurveyAdmin.php
View File

@ -3383,11 +3383,11 @@ class SurveyAdmin
elseif($_GET['m'] == 'odjavljeni'){ elseif($_GET['m'] == 'odjavljeni'){
$sas->unsignedUsersList(); $sas->unsignedUsersList();
} }
elseif(in_array($_GET['m'], ['all', 'my'])){ elseif($_GET['m'] == 'all'){
$sas->allUsersList(); $sas->allUsersList();
} }
else { else {
$sas->anketa_list_users(); $sas->assignedUsersList();
} }
echo '</div>'; echo '</div>';

4
admin/survey/SurveyAdminAjax.php
View File

@ -5134,10 +5134,6 @@ class SurveyAdminAjax {
$s = sisplet_query("DELETE FROM srv_password WHERE ank_id='$this->anketa' AND password = '$password'"); $s = sisplet_query("DELETE FROM srv_password WHERE ank_id='$this->anketa' AND password = '$password'");
if (!$s) echo mysqli_error($GLOBALS['connect_db']); if (!$s) echo mysqli_error($GLOBALS['connect_db']);
} }
} elseif ($_GET['a'] == 'refreshUserDiagnostic') {
$sas = new SurveyAdminSettings();
$sas->anketa_list_users();
} elseif ($_GET['a'] == 'getDataStatusTitles') { } elseif ($_GET['a'] == 'getDataStatusTitles') {
global $lang; global $lang;
$return = array(); $return = array();

377
admin/survey/SurveyAdminSettings.php
View File

@ -7214,7 +7214,6 @@ class SurveyAdminSettings {
$arrayTestni = array(); $arrayTestni = array();
for ($i=1; $i<=$_POST['stevilo_vnosov']; $i++) { for ($i=1; $i<=$_POST['stevilo_vnosov']; $i++) {
// if(session_id() == '') {session_start();}
session_start(); session_start();
$_SESSION['progressBar'][$this->anketa]['current'] = $i; $_SESSION['progressBar'][$this->anketa]['current'] = $i;
session_commit(); session_commit();
@ -7983,27 +7982,11 @@ class SurveyAdminSettings {
} elseif ($_GET['delete_testdata'] == 1 || $_GET['delete_autogen_testdata'] == 1) { } elseif ($_GET['delete_testdata'] == 1 || $_GET['delete_autogen_testdata'] == 1) {
// Komentarje moramo obdrzat - zato jih zacasno shranimo in na novo vstavimo
/*$comment_bck = array();
$sqlComment = sisplet_query("SELECT dt.vre_id AS vre_id, dt.text AS text, dt.usr_id AS usr_id FROM srv_data_text".$this->db_table." dt, srv_user u WHERE u.ank_id='$this->anketa' AND u.testdata='1' AND dt.usr_id=u.id AND dt.spr_id='0'");
while($rowComment = mysqli_fetch_array($sqlComment)){
$comment_bck[] = $rowComment;
}*/
if($_GET['delete_autogen_testdata'] == 1) if($_GET['delete_autogen_testdata'] == 1)
sisplet_query("DELETE FROM srv_user WHERE ank_id='$this->anketa' AND testdata='2'"); sisplet_query("DELETE FROM srv_user WHERE ank_id='$this->anketa' AND testdata='2'");
else else
sisplet_query("DELETE FROM srv_user WHERE ank_id='$this->anketa' AND (testdata='1' OR testdata='2')"); sisplet_query("DELETE FROM srv_user WHERE ank_id='$this->anketa' AND (testdata='1' OR testdata='2')");
// Komentarje nazaj vstavimo
/*foreach($comment_bck as $comment){
$sqlComment = sisplet_query("INSERT INTO srv_data_text".$this->db_table." (spr_id, vre_id, text, usr_id) VALUES ('0', '".$comment['vre_id']."', '".$comment['text']."', NULL)");
}*/
#datoteki z podatki moramo zgenerirati na novo #datoteki z podatki moramo zgenerirati na novo
sisplet_query("UPDATE srv_data_files SET head_file_time='0000-00-00', data_file_time='0000-00-00' WHERE sid='$this->anketa'"); sisplet_query("UPDATE srv_data_files SET head_file_time='0000-00-00', data_file_time='0000-00-00' WHERE sid='$this->anketa'");
sisplet_query("COMMIT"); sisplet_query("COMMIT");
@ -8136,9 +8119,7 @@ class SurveyAdminSettings {
echo '</fieldset>'; echo '</fieldset>';
echo '<p>'.$lang['srv_testni_nakonec'].'</p>'; echo '<p>'.$lang['srv_testni_nakonec'].'</p>';
} }
} }
} }
@ -8267,205 +8248,6 @@ class SurveyAdminSettings {
echo '</fieldset>'; echo '</fieldset>';
} }
function anketa_list_users() {
global $lang, $global_user_id, $admin_type;
$_GET['show'] = isset($_POST['show']) && $_POST['show'] == 'all' ? 'all' : $_GET['show'];
$_GET['limit'] = isset($_POST['limit']) ? $_POST['limit'] : $_GET['limit'];
if ($admin_type == 0) {
echo '<h3>';
echo '<a href="index.php?a=diagnostics&t=uporabniki&m=my" '.($_GET['m']=='my'?'style="text-decoration:underline"':'').'>'.$lang['srv_users_added'].'</a>';
echo '<span class="spaceLeft">|</span>';
echo '<span class="spaceLeft"><a href="index.php?a=diagnostics&t=uporabniki&m=all" '.($_GET['m']=='all'?'style="text-decoration:underline"':'').'>'.$lang['srv_users_all'].'</a></span>';
echo '<br /><br />';
echo '</h3>';
}
# povezava polj z polji iz baze za sortiranje
$sort_by_array = array(
'name'=>'u.name',
'email'=>'u.email',
'type'=>'u.type',
//'cnt'=>'sa1.survey_count',
//'archive'=>'sa2.survey_archive',
'cnt'=>'d1.dostop_survey_count',
'archive'=>'d2.dostop_survey_archive',
'registred'=>'u.when_reg',
'login'=>'u.last_login'
);
$fields = array(
'name'=>$lang['srv_survey_list_users_name'],
'email'=>$lang['srv_survey_list_users_email'],
'type'=>$lang['admin_type'],
'cnt'=>$lang['srv_survey_list_users_survey_count'],
'archive'=>$lang['srv_survey_list_users_survey_archive_count'],
'registred'=>$lang['srv_survey_list_users_registred'],
'login'=>$lang['srv_survey_list_users_last_login'],
);
$srt_field = isset($sort_by_array[$_POST['field']]) ? $_POST['field'] : 'cnt';
$srt_type = isset($_POST['type']) && $_POST['type'] == 'asc' ? 'asc' : 'desc';
# omejitev uporabnikov kateri nimajo anket
// pri managerjih naj bodo vsi, ker cene se ne vidijo novo dodani uporabniki
#if ($admin_type == 0)
# $limit_no_survey = ' WHERE sa1.survey_count > 0';
#else
$limit_no_survey = ' WHERE 1=1';
# izvedemo poljubno sortiranje
$order_by = ' ORDER BY ' . $sort_by_array[$srt_field] . ' '. $srt_type;
// managerji in admini vidijo tudi svoje uporabnike
if ($admin_type == 1 || $admin_type == 0) {
$user_condition = " AND (u.id = '".$global_user_id."' OR u.id IN (SELECT user FROM srv_dostop_manage WHERE manager='".$global_user_id."') )";
# ostali uporabniki lahko vidijo samo svoje ankete
} elseif ((int)$global_user_id > 0) {
$user_condition = " AND u.id = '".$global_user_id."'";
}
// Meta admini spet kao vidijo vse
//if ( Dostop::isMetaAdmin() )
// opcija za vse admine
if ( $_GET['show'] == 'all')
$user_condition = "";
//}
#
// Stevilo prikazanih
if(isset($_GET['limit'])){
$limit = " LIMIT ".(int)$_GET['limit'];
$limit_cnt = (int)$_GET['limit'];
}
else{
$limit = " LIMIT 100";
$limit_cnt = 100;
}
// Stran (ce ne prikazujemo vseh)
if(isset($_GET['page'])){
$offset = " OFFSET ".(((int)$_GET['page']-1) * $limit_cnt);
}
else{
$offset = " OFFSET 0";
}
// Ce imamo iskanje izvedemo drugacen query
if($admin_type == 0 && isset($_POST['search_users'])){
// Po novem stejemo vse ankete z dostopom (ne samo tiste katerih je avtor)
$sql_string = "SELECT u.id, u.type, u.status, u.email, u.name, u.surname, date_format(u.when_reg, '%d.%m.%Y') as when_reg, d1.dostop_survey_count, d2.dostop_survey_archive, date_format(u.last_login, '%d.%m.%Y') as last_login FROM users AS u "
." LEFT OUTER JOIN ( SELECT srv_dostop.ank_id, srv_dostop.uid, count(*) AS dostop_survey_count FROM srv_dostop, srv_anketa WHERE srv_anketa.id=srv_dostop.ank_id AND srv_anketa.backup='0' GROUP BY srv_dostop.uid ) AS d1 ON d1.uid = u.id "
." LEFT OUTER JOIN ( SELECT srv_dostop.ank_id, srv_dostop.uid, count(*) AS dostop_survey_archive FROM srv_dostop, srv_anketa WHERE srv_anketa.id=srv_dostop.ank_id AND srv_anketa.backup>'0' GROUP BY srv_dostop.uid ) AS d2 ON d2.uid = u.id "
." WHERE u.email LIKE '%".$_POST['search_users']."%' OR u.name LIKE '%".$_POST['search_users']."%' OR u.surname LIKE '%".$_POST['search_users']."%' "
. $order_by;
}
else{
// Po novem stejemo vse ankete z dostopom (ne samo tiste katerih je avtor)
$sql_string = "SELECT u.id, u.type, u.status, u.email, u.name, u.surname, date_format(u.when_reg, '%d.%m.%Y') as when_reg, d1.dostop_survey_count, d2.dostop_survey_archive, date_format(u.last_login, '%d.%m.%Y') as last_login FROM users AS u "
." LEFT OUTER JOIN ( SELECT srv_dostop.ank_id, srv_dostop.uid, count(*) AS dostop_survey_count FROM srv_dostop, srv_anketa WHERE srv_anketa.id=srv_dostop.ank_id AND srv_anketa.backup='0' GROUP BY srv_dostop.uid ) AS d1 ON d1.uid = u.id "
." LEFT OUTER JOIN ( SELECT srv_dostop.ank_id, srv_dostop.uid, count(*) AS dostop_survey_archive FROM srv_dostop, srv_anketa WHERE srv_anketa.id=srv_dostop.ank_id AND srv_anketa.backup>'0' GROUP BY srv_dostop.uid ) AS d2 ON d2.uid = u.id "
. $limit_no_survey
. $user_condition
. $order_by
. $limit . $offset;
}
$sql_query = sisplet_query($sql_string);
if (!$sql_query) echo mysqli_error($GLOBALS['connect_db']);
$sqlu = sisplet_query("SELECT * FROM users WHERE id = '$global_user_id'");
$rowu = mysqli_fetch_array($sqlu);
if ($admin_type == 0) {
echo '<h2>'.$lang['administrator'].': '.$rowu['name'].' '.$rowu['surname'].'</h2>';
} elseif ($admin_type == 1) {
echo '<h2>'.$lang['manager'].': '.$rowu['name'].' '.$rowu['surname'].'</h2>';
}
echo '<table id="survey_list_users">';
echo '<tr>';
echo '<th></th>';
foreach ($fields AS $field => $title) {
echo '<th class="pointer">';
if ($srt_field !== $field) {
$img_src = 'sort_unsorted';
echo '<div onClick="refresh_user_diagnostic(\''.$field.'\', \'desc\', \''.$_GET['show'].'\', \''.$_GET['limit'].'\')">'.$title.'</div>';
} else {
if ($srt_type == 'desc') {
$img_src = 'sort_descending';
echo '<div onClick="refresh_user_diagnostic(\''.$field.'\', \'asc\', \''.$_GET['show'].'\', \''.$_GET['limit'].'\')" class="red">'.$title.'<span class="faicon '.$img_src.'" title=""></span></div>';
} else {
$img_src = 'sort_ascending';
echo '<div onClick="refresh_user_diagnostic(\''.$field.'\', \'desc\', \''.$_GET['show'].'\', \''.$_GET['limit'].'\')" class="red">'.$title.'<span class="faicon '.$img_src.'" title=""></span></div>';
}
}
echo '</th>';
}
echo '</tr>';
while ($row_query = mysqli_fetch_array($sql_query)) {
echo '<tr>';
echo '<td>';
echo ' <a href="#" onclick="edit_user(\''.$row_query['id'].'\'); return false;" title="'.$lang['srv_profile_edit'].'"><span class="faicon users icon-as_link"></span></a>';
echo '</td>';
echo '<td>';
echo $row_query['name'].' '.$row_query['surname'];
echo '</td>';
if ( true /*$_GET['show'] == '' or Dostop::isMetaAdmin()*/ ) {
echo '<td><span class="as_link" onClick="surveyList_user(\'uid\',\''.$row_query['id'].'\'); window.location.href=\'index.php\';">' . $row_query['email'] . '</span></td>';
} else {
echo '<td><span>' . $row_query['email'] . '</span></td>';
}
if ($row_query['type'] == '0') $type = $lang['admin_admin'];
elseif ($row_query['type'] == '1') $type = $lang['admin_manager'];
elseif ($row_query['type'] == '2') $type = $lang['admin_clan'];
elseif ($row_query['type'] == '3') $type = $lang['admin_narocnik'];
echo '<td>' . $type . ' '.($row_query['status']==0?'<span class="sprites cross" title="'.$lang['srv_user_banned'].'"></span>':'').'</td>';
echo '<td class="anl_ac">'.(int)$row_query['dostop_survey_count'].'</td>';
echo '<td class="anl_ac">'.(int)$row_query['dostop_survey_archive'].'</td>';
echo '<td class="anl_ac">'.$row_query['when_reg'].'</td>';
echo '<td class="anl_ac">'.$row_query['last_login'].'</td>';
echo '</tr>';
}
echo '</table>';
// poiscemo uporabnike, ki imajo managerski pregled na uporabnikovimi anketami
$sqlu = sisplet_query("SELECT u.id, u.name, u.surname, u.email FROM srv_dostop_manage m, users u WHERE u.id=m.manager AND m.user = '$global_user_id'");
if ( mysqli_num_rows($sqlu) > 0 ) {
echo '<br><br><h3><b>'.$lang['srv_manager_manager'].':</b></h3>';
while ($rowu = mysqli_fetch_assoc($sqlu)) {
echo '<a href="ajax.php?t=dostop&a=edit_remove_user_manager&uid='.$rowu['id'].'" onclick="if ( confirm(\'?\')) { } else {return false;}"><span class="faicon delete"></span></a> '.$rowu['email'].' - '.$rowu['name'].' '.$rowu['surname'].'<br>';
}
}
// managerji in admini lahko dodajajo uporabnike, ki jih nato managirajo
$this->dodeljeniUporabniki();
// admin lahko doda novega uporabnika
$this->dodajNovegaUporabnika();
}
/** /**
* Uporabnik (administrator, manager) lahko dodajata nove uporabnike in jim dodelita dostop * Uporabnik (administrator, manager) lahko dodajata nove uporabnike in jim dodelita dostop
*/ */
@ -8474,15 +8256,16 @@ class SurveyAdminSettings {
global $lang; global $lang;
global $virtual_domain; global $virtual_domain;
// admini in na virtualkah tudi managerji lahko dodajajo uporabnike, ki jih nato managirajo // admini lahko dodajajo uporabnike, ki jih nato managirajo
if( !($admin_type == 0 || ($admin_type == 1 && $virtual_domain == true)) ) if($admin_type != 0)
return ''; return '';
echo '<div id="dodajanjeNovega">';
echo ' | <a href="#" onclick="$(\'#dodajanjeNovega\').slideToggle(); return false;">'.$lang['srv_users_add_new'].'</a><br><div id="dodajanjeNovega" '.(!empty($_GET['add']) && ($_GET['error']=='pass' || $_GET['error']=='email') ? '' : ' style="display: none"').'>'; echo '<form class="manager_add_user" name="admin_add_user" action="ajax.php?t=dostop&a=add_new_user" method="post">';
echo '<form class="manager_add_user" action="ajax.php?t=dostop&a=add_new_user" method="post">';
echo '<h3><b>'.$lang['srv_users_add_new_title'].'</b></h3>'; echo '<h3><b>'.$lang['srv_users_add_new_title'].'</b></h3>';
echo '<p><label for="email">'.$lang['email'].':</label><input type="email" id="email" name="email"> '.(!empty($_GET['add']) && $_GET['error']=='email'?'<span class="red">'.$lang['srv_added_false'].'</span>':'').'</p>'; echo '<p><label for="email">'.$lang['email'].':</label><input type="email" id="email" name="email"> '.(!empty($_GET['add']) && $_GET['error']=='email'?'<span class="red">'.$lang['srv_added_false'].'</span>':'').'</p>';
echo '<p><label for="name">'.$lang['name'].':</label><input type="text" id="name" name="name"></p>'; echo '<p><label for="name">'.$lang['name'].':</label><input type="text" id="name" name="name"></p>';
echo '<p><label for="surname">'.$lang['surname'].':</label><input type="text" id="surname" name="surname"></p>'; echo '<p><label for="surname">'.$lang['surname'].':</label><input type="text" id="surname" name="surname"></p>';
@ -8494,14 +8277,17 @@ class SurveyAdminSettings {
<option value="2">'.$lang['srv_diagnostics_filter_lang_ang'].'</option> <option value="2">'.$lang['srv_diagnostics_filter_lang_ang'].'</option>
</select> </select>
</p>'; </p>';
echo '<p><button type="submit">'.$lang['add'].'</button></p>';
//echo '<p><button type="submit">'.$lang['add'].'</button></p>';
echo '<p><div class="buttonwrapper floatLeft">';
echo ' <a class="ovalbutton ovalbutton_orange" href="#" onclick="document.admin_add_user.submit();">'.$lang['create'].'</a>';
echo '</div></p>';
echo '</form>'; echo '</form>';
echo '</div>'; echo '</div>';
} }
/** /**
* Uporabnik (administrator, manager) lahko dodajata nove uporabnike in jim dodelita dostop * Uporabnik (administrator, manager) lahko dodajata nove uporabnike in jim dodelita dostop
*/ */
@ -8509,38 +8295,76 @@ class SurveyAdminSettings {
global $admin_type; global $admin_type;
global $lang; global $lang;
global $global_user_id; global $global_user_id;
global $virtual_domain;
// managerji in admini lahko dodajajo uporabnike, ki jih nato managirajo // managerji in admini lahko dodajajo uporabnike, ki jih nato managirajo
if( !($admin_type == 1 || $admin_type == 0) ) if( !($admin_type == 1 || $admin_type == 0) )
return ''; return '';
// Na virtualkah imajo managerji omejitev st. dodeljenih uporabnikov
if(/*$virtual_domain && */$admin_type == 1){
echo '<br><br><a href="#" onclick="$(\'#dodajanje\').slideToggle(); return false;">'.$lang['srv_invitation_system_validateAndAdd'].'</a><div id="dodajanje" '.(empty($_GET['add']) && ($_GET['error']=='pass' || $_GET['error']=='email') ? '' : ' style="display: none"').'>'; // Limit st. dodeljenih uporabnikov
$managed_accounts_limit = 5;
echo '<form class="manager_add_user" action="ajax.php?t=dostop&a=manager_add_user" method="post">'; // Prestejemo dodeljene uporabnike
echo '<h3><b>'.$lang['srv_manager_add_user'].'</b></h3>'; $sql = sisplet_query("SELECT u.email
FROM srv_dostop_manage m, users u
WHERE m.manager='".$global_user_id."' AND u.id=m.user AND u.email NOT LIKE ('D3LMD-%') AND u.email NOT LIKE ('UNSU8MD-%')
");
$managed_accounts_count = mysqli_num_rows($sql);
// Manager na virtualkah ima omejitev koliko uporabnikov lahko pregleduje
if($managed_accounts_count >= $managed_accounts_limit){
echo '<p class="bold red" style="padding-left:0px;">Dosegli ste maksimalno število uporabnikov v pregledu ('.$managed_accounts_count.'/'.$managed_accounts_limit.').</p>';
return;
}
elseif($managed_accounts_count > 0){
echo '<p class="bold" style="padding-left:0px;">Trenutno imate pregled nad '.$managed_accounts_count.' od maksimalno '.$managed_accounts_limit.' računi.</p>';
}
else{
echo '<p class="bold" style="padding-left:0px;">Pod pregled lahko dodate '.$managed_accounts_limit.' uporabniških računov.</p>';
}
}
echo '<div id="dodajanje">';
echo '<form class="manager_add_user" name="manager_add_user" action="ajax.php?t=dostop&a=manager_add_user" method="post">';
echo '<h3><b>'.$lang['srv_users_add_assigned_title'].'</b></h3>';
echo '<p><label for="email">'.$lang['email'].':</label><input type="email" id="email" name="email"> '.(empty($_GET['add']) && $_GET['error']=='email'?'<span class="red">'.$lang['srv_added_false'].'</span>':'').'</p>'; echo '<p><label for="email">'.$lang['email'].':</label><input type="email" id="email" name="email"> '.(empty($_GET['add']) && $_GET['error']=='email'?'<span class="red">'.$lang['srv_added_false'].'</span>':'').'</p>';
echo '<p><label for="name">'.$lang['name'].':</label><input type="text" id="name" name="name"></p>'; echo '<p><label for="name">'.$lang['name'].':</label><input type="text" id="name" name="name"></p>';
echo '<p><label for="surname">'.$lang['surname'].':</label><input type="text" id="surname" name="surname"></p>'; echo '<p><label for="surname">'.$lang['surname'].':</label><input type="text" id="surname" name="surname"></p>';
echo '<p><label for="password">'.$lang['password'].':</label><input type="password" id="password" name="password"> '.(empty($_GET['add']) && $_GET['error']=='pass'?'<span class="red">'.$lang['pass_doesnt_match'].'</span>':'').'</p>'; echo '<p><label for="password">'.$lang['password'].':</label><input type="password" id="password" name="password"> '.(empty($_GET['add']) && $_GET['error']=='pass'?'<span class="red">'.$lang['pass_doesnt_match'].'</span>':'').'</p>';
echo '<p><label for="password2">'.$lang['again'].':</label><input type="password" id="password2" name="password2"></p>'; echo '<p><label for="password2">'.$lang['again'].':</label><input type="password" id="password2" name="password2"></p>';
echo '<p><button type="submit">'.$lang['add'].'</button></p>';
//echo '<p><button type="submit">'.$lang['add'].'</button></p>';
echo '<p><div class="buttonwrapper floatLeft">';
echo ' <a class="ovalbutton ovalbutton_orange" href="#" onclick="document.manager_add_user.submit();">'.$lang['create_add'].'</a>';
echo '</div></p>';
echo '</form>'; echo '</form>';
// admini si lahko dodajajo ze obstojece uporabnike // admini si lahko dodajajo ze obstojece uporabnike
if ($admin_type == 0) { if ($admin_type == 0) {
echo '<br><form class="manager_add_user" action="ajax.php?t=dostop&a=admin_add_user" method="post">'; echo '<br /><br /><br />';
echo '<form class="manager_add_user" name="admin_add_dostop" action="ajax.php?t=dostop&a=admin_add_user" method="post">';
echo '<h3><b>'.$lang['srv_manager_add_user2'].'</b></h3>'; echo '<h3><b>'.$lang['srv_manager_add_user2'].'</b></h3>';
echo '<p><select name="uid" class="js-obstojeci-uporabniki-admin-ajax" style="width: 500px;"></select></p>'; echo '<p><select name="uid" class="js-obstojeci-uporabniki-admin-ajax" style="width: 500px;"></select></p>';
echo '<p><button type="submit">'.$lang['add'].'</button></p>';
//echo '<p><button type="submit">'.$lang['add'].'</button></p>';
echo '<p><div class="buttonwrapper floatLeft">';
echo ' <a class="ovalbutton ovalbutton_orange" href="#" onclick="document.admin_add_dostop.submit();">'.$lang['add'].'</a>';
echo '</div></p>';
echo '</form>'; echo '</form>';
} }
// Managerji lahko dodajajo samo uporabnike z dolocenimi emaili (če jim domeno posebej nastavi admin) // Managerji lahko dodajajo samo uporabnike z dolocenimi emaili (če jim domeno posebej nastavi admin)
// TODO: trenutno onemogočimo dodaja ostalih uporabnikov za managerje. Ko bo stvar vezana na domeno se jim bo omogočilo dodajanje samo domenskih // TODO: trenutno onemogočimo dodaja ostalih uporabnikov za managerje. Ko bo stvar vezana na domeno se jim bo omogočilo dodajanje samo domenskih
elseif(false && $admin_type == 1){ /*elseif(false && $admin_type == 1){
UserSetting :: getInstance()->Init($global_user_id); UserSetting :: getInstance()->Init($global_user_id);
$emails = UserSetting :: getInstance()->getUserSetting('manage_domain'); $emails = UserSetting :: getInstance()->getUserSetting('manage_domain');
@ -8551,7 +8375,7 @@ class SurveyAdminSettings {
echo '<p><button type="submit" id="manager-email-submit" style="display:none;">'.$lang['add'].'</button></p>'; echo '<p><button type="submit" id="manager-email-submit" style="display:none;">'.$lang['add'].'</button></p>';
echo '</form>'; echo '</form>';
} }*/
echo '</div>'; echo '</div>';
} }
@ -8559,23 +8383,12 @@ class SurveyAdminSettings {
/** /**
* Seznam vseh uporabnikov znotraj 1ke * Seznam vseh uporabnikov znotraj 1ke
*/ */
public function allUsersList() public function allUsersList(){
{
global $lang; global $lang;
global $admin_type; global $admin_type;
echo '<a href="index.php?a=diagnostics&t=uporabniki&m=my" '.($_GET['m']=='my'?'style="text-decoration:underline"':'').'>'.$lang['srv_users_added'].'</a>'; echo '<table id="all_users_list" class="dataTable">';
if($admin_type == 0) {
echo '<span class="spaceLeft">|</span>';
echo '<span class="spaceLeft"><a href="index.php?a=diagnostics&t=uporabniki&m=all" '.($_GET['m'] == 'all' ? 'style="text-decoration:underline"' : '').'>'.$lang['srv_users_all'].'</a></span>';
}
echo '<br /><br />';
echo '<table id="'.($_GET['m'] == 'all' ? 'all_users_list' : 'my_users_list').'" class="dataTable">';
echo '<thead><tr>'; echo '<thead><tr>';
echo '<th>' . $lang['srv_survey_list_users_name'] . '</th>'; echo '<th>' . $lang['srv_survey_list_users_name'] . '</th>';
echo '<th>' . $lang['srv_survey_list_users_email'] . '</th>'; echo '<th>' . $lang['srv_survey_list_users_email'] . '</th>';
@ -8589,13 +8402,83 @@ class SurveyAdminSettings {
echo '<th>' . $lang['srv_survey_list_users_last_login'] . '</th>'; echo '<th>' . $lang['srv_survey_list_users_last_login'] . '</th>';
echo '<th style="max-width: 70px;">'.$lang['edit2'].'</th>'; echo '<th style="max-width: 70px;">'.$lang['edit2'].'</th>';
echo '</tr></thead>'; echo '</tr></thead>';
echo '</table>'; echo '</table>';
$this->dodeljeniUporabniki(); // Dodajanje uporabnikov
echo '<div class="add_user">';
// admin lahko doda novega uporabnika // Admin lahko doda novega uporabnika v sistem (brez pregleda)
if($admin_type == '0'){
echo '<fieldset class="new_user"><legend>'.$lang['srv_users_add_new'].'</legend>';
$this->dodajNovegaUporabnika(); $this->dodajNovegaUporabnika();
echo '</fieldset>';
}
echo '</div>';
}
/**
* Osnovni pregled uporabnikov za managerje in admine
*/
public function assignedUsersList(){
global $lang;
global $admin_type;
global $global_user_id;
$sqlU = sisplet_query("SELECT name, surname, email FROM users WHERE id='".$global_user_id."'");
$rowU = mysqli_fetch_array($sqlU);
// Naslov
echo '<h2 style="margin-bottom:30px;">';
if($admin_type == 0)
echo $lang['administrator'];
elseif($admin_type == 1)
echo $lang['manager'];
else
echo $lang['user'];
echo ': '.$rowU['name'].' '.$rowU['surname'].' ('.$rowU['email'].')';
echo ' <a href="#" onclick="edit_user(\''.$global_user_id.'\'); return false;" title="Uredi"><i class="fa fa-pencil-alt link-moder"></i></a>';
echo '</h2>';
// Tabela
echo '<fieldset style="max-width: 100% !important;"><legend>'.$lang['srv_users_assigned_title'].'</legend>';
//echo '<h4 style="margin-bottom: 10px;">'.$lang['srv_users_assigned_title'].'</h4>';
echo '<table id="my_users_list" class="dataTable">';
echo '<thead><tr>';
echo '<th>' . $lang['srv_survey_list_users_name'] . '</th>';
echo '<th>' . $lang['srv_survey_list_users_email'] . '</th>';
echo '<th>' . $lang['admin_type'] . '</th>';
echo '<th>' . $lang['lang'] . '</th>';
echo '<th>' . $lang['srv_survey_list_users_aai'] . '</th>';
echo '<th>' . $lang['srv_survey_list_users_survey_count'] . '</th>';
echo '<th>' . $lang['srv_survey_list_users_survey_archive_count'] . '</th>';
echo '<th>' . $lang['users_gdpr_title'] . '</th>';
echo '<th>' . $lang['srv_survey_list_users_registred'] . '</th>';
echo '<th>' . $lang['srv_survey_list_users_last_login'] . '</th>';
echo '<th style="max-width: 70px;">'.$lang['edit2'].'</th>';
echo '</tr></thead>';
echo '</table>';
echo '</fieldset>';
// Dodajanje uporabnikov
echo '<div class="add_user">';
// Manager ali admin lahko doda novega uporabnika pod pregled
echo '<fieldset class="assign_user"><legend>'.$lang['srv_users_add_assigned'].'</legend>';
$this->dodeljeniUporabniki();
echo '</fieldset>';
echo '</div>';
} }
/** /**

4
admin/survey/classes/class.Common.php
View File

@ -1560,7 +1560,7 @@ class Common {
} }
//Users //Users
else if ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'uporabniki' && (in_array($_GET['m'], array('my', 'izbrisani', 'nepotrjeni', 'odjavljeni', 'sa-modul'))) ) { else if ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'uporabniki') {
$help_url = 'https://www.1ka.si/d/en/help/user-guide/my-surveys/users'; $help_url = 'https://www.1ka.si/d/en/help/user-guide/my-surveys/users';
} }
@ -1982,7 +1982,7 @@ class Common {
} }
//Uporabniki //Uporabniki
else if ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'uporabniki' && (in_array($_GET['m'], array('my', 'izbrisani', 'nepotrjeni', 'odjavljeni', 'sa-modul'))) ) { else if ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'uporabniki') {
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/moje-ankete/uporabniki'; $help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/moje-ankete/uporabniki';
} }

174
admin/survey/classes/class.Dostop.php
View File

@ -229,14 +229,16 @@ class Dostop {
} elseif ($_GET['a'] == 'all_users_list') { } elseif ($_GET['a'] == 'all_users_list') {
if ($_GET['m'] == 'delete') { if ($_GET['m'] == 'delete') {
$this->ajax_all_users_list_delete(); $this->ajax_all_users_list_delete();
}if ($_GET['m'] == 'ban') { }
if ($_GET['m'] == 'ban') {
$this->ajax_all_users_list_ban(); $this->ajax_all_users_list_ban();
}else { }
else {
$this->ajax_all_users_list(); $this->ajax_all_users_list();
} }
} elseif($_GET['a'] == 'my_users_list'){ } elseif($_GET['a'] == 'my_users_list'){
$this->ajax_all_users_list(true); $this->ajax_all_users_list_my();
} elseif ($_GET['a'] == 'delete_users_list') { } elseif ($_GET['a'] == 'delete_users_list') {
$this->ajax_delete_users_list(); $this->ajax_delete_users_list();
@ -247,9 +249,11 @@ class Dostop {
} elseif ($_GET['a'] == 'unconfirmed_mail_user_list') { } elseif ($_GET['a'] == 'unconfirmed_mail_user_list') {
if ($_GET['m'] == 'delete') { if ($_GET['m'] == 'delete') {
$this->ajax_unconfirmed_mail_user_list_delet_user(); $this->ajax_unconfirmed_mail_user_list_delet_user();
} elseif ($_GET['m'] == 'accept') { }
elseif ($_GET['m'] == 'accept') {
$this->ajax_confirm_user_email(); $this->ajax_confirm_user_email();
} else { }
else {
$this->ajax_unconfirmed_mail_user_list(); $this->ajax_unconfirmed_mail_user_list();
} }
} }
@ -477,10 +481,7 @@ class Dostop {
echo '<h3><span class="bold">'; echo '<h3><span class="bold">';
if ($r['type'] == 2) { if ($r['type'] == 2 || $r['type'] == 3) {
echo $lang['admin_clan'];
}
elseif ($r['type'] == 3) {
echo $lang['admin_narocnik']; echo $lang['admin_narocnik'];
} }
elseif ($r['type'] == 1) { elseif ($r['type'] == 1) {
@ -661,6 +662,7 @@ class Dostop {
global $lang; global $lang;
global $global_user_id; global $global_user_id;
global $admin_type; global $admin_type;
global $virtual_domain;
$uid = $_POST['uid']; $uid = $_POST['uid'];
@ -733,9 +735,13 @@ class Dostop {
echo '<p><label for="manage_domain" style="width:200px;">Manager domene (npr. 1ka.si):</label><input type="text" id="manage_domain" name="manage_domain" value="' . $emails . '" autocomplete="off" size="30"></p>'; echo '<p><label for="manage_domain" style="width:200px;">Manager domene (npr. 1ka.si):</label><input type="text" id="manage_domain" name="manage_domain" value="' . $emails . '" autocomplete="off" size="30"></p>';
} }
// Na virtualkah manager ne sme odstraniti uporabnika iz pregleda (zaradi omejitve)
if($admin_type != '1' || !$virtual_domain){
$sqlu = sisplet_query("SELECT * FROM srv_dostop_manage WHERE manager='$global_user_id' AND user='$uid'"); $sqlu = sisplet_query("SELECT * FROM srv_dostop_manage WHERE manager='$global_user_id' AND user='$uid'");
if (mysqli_num_rows($sqlu) > 0) { if (mysqli_num_rows($sqlu) > 0) {
echo '<p><a href="ajax.php?t=dostop&a=edit_remove_user&uid=' . $uid . '" onclick="if ( confirm(\'?\')) { } else {return false;}">' . $lang['srv_manager_rem_user2'] . '</a></p>'; echo '<br /><p><a href="ajax.php?t=dostop&a=edit_remove_user&uid=' . $uid . '" onclick="if ( confirm(\'?\')) { } else {return false;}">' . $lang['srv_manager_rem_user2'] . '</a></p>';
}
} }
echo '</div>'; echo '</div>';
@ -962,7 +968,7 @@ class Dostop {
} }
} }
//header("Location: index.php?a=diagnostics&t=uporabniki&m=my&error=" . ($error !== FALSE ? $error : '')); header("Location: index.php?a=diagnostics&t=uporabniki".($error !== FALSE ? '&error='.$error : ''));
} }
/** /**
@ -1043,12 +1049,122 @@ class Dostop {
/** /**
* Seznam vseh uporabnikov znotrja 1ke * Seznam vseh uporabnikov znotrja 1ke
*/ */
function ajax_all_users_list($my = null) function ajax_all_users_list(){
{
global $admin_languages; global $admin_languages;
global $global_user_id; global $global_user_id;
global $lang; global $lang;
global $admin_type; global $admin_type;
$seznam = [];
$iskanjeSql = "";
if(!empty($_POST['search']['value'])){
$iskaniNiz = $_POST['search']['value'];
$iskanjeSql = " AND (u.name LIKE '%".$iskaniNiz."%' OR u.surname LIKE '%".$iskaniNiz."%' OR u.email LIKE '%".$iskaniNiz."%' OR d1.dostop_survey_count LIKE '%".$iskaniNiz."%' OR d2.dostop_survey_archive LIKE '%".$iskaniNiz."%')";
}
// Pridobimo vse uporabnike
$sql = "SELECT u.id as id, u.type as type, u.status, u.email as email, u.name as name, u.surname as surname, u.lang as lang, u.eduroam as aai, date_format(u.when_reg, '%d.%m.%Y') as registriran, u.gdpr_agree as gdpr_agree, d1.dostop_survey_count as st_anket, d2.dostop_survey_archive as st_arhivskih, date_format(u.last_login, '%d.%m.%Y') as last_login, ue.email as second_email FROM users AS u ".
" LEFT OUTER JOIN ( SELECT srv_dostop.ank_id, srv_dostop.uid, count(*) AS dostop_survey_count FROM srv_dostop, srv_anketa WHERE srv_anketa.id=srv_dostop.ank_id AND srv_anketa.backup='0' GROUP BY srv_dostop.uid ) AS d1 ON d1.uid = u.id ".
" LEFT OUTER JOIN ( SELECT srv_dostop.ank_id, srv_dostop.uid, count(*) AS dostop_survey_archive FROM srv_dostop, srv_anketa WHERE srv_anketa.id=srv_dostop.ank_id AND srv_anketa.backup>'0' GROUP BY srv_dostop.uid ) AS d2 ON d2.uid = u.id ".
" LEFT OUTER JOIN (SELECT user_emails.email, user_emails.user_id FROM user_emails WHERE active=1) AS ue ON ue.user_id = u.id".
" WHERE u.email NOT LIKE ('D3LMD-%') AND u.email NOT LIKE ('UNSU8MD-%') ".$iskanjeSql;
// Filtri, ki jih datatables pošilja in po katerih filtriramo
if($_POST['order'][0]['column'] < 10) {
$orderPolje = [
"u.name ".$_POST['order'][0]['dir'].", u.surname",
"u.email",
"u.type",
"u.lang",
"u.eduroam", //AAI
"d1.dostop_survey_count", //st_anket
"d2.dostop_survey_archive", //st_arhivskih
"u.gdpr_agree",
"u.when_reg",
"u.last_login"
];
if($_POST['order'][0]['column'] == 7){
$vrednost='u.gdpr_agree desc';
if($_POST['order'][0]['dir'] == 'asc'){
$vrednost= ' FIELD (u.gdpr_agree, 0, \'-1\', 1)';
}
$sql .= " ORDER BY ".$vrednost;
}
else {
$sql .= " ORDER BY ".$orderPolje[$_POST['order'][0]['column']]." ".$_POST['order'][0]['dir'];
}
}
if($_POST['length'] != '-1') {
$sql .= " LIMIT ".$_POST['start'].", ".$_POST['length'];
}
$resultQuery = sisplet_query($sql);
$resultU = lazyLoadSqlObj($resultQuery);
// Seznam uporabnikov vrne za administratorje vse za ostale pa samo tiste, ki smo jih dodali k uporabniku.
if (!empty($resultU)) {
if (!empty($resultU->name)) {
$vsi[] = $resultU;
}
else {
$vsi = $resultU;
}
foreach ($vsi as $uporabnik) {
$seznam[] = [
iconv(mb_detect_encoding( $uporabnik->name, mb_detect_order(), true), "UTF-8", $uporabnik->name) .' '.iconv(mb_detect_encoding( $uporabnik->surname, mb_detect_order(), true), "UTF-8", $uporabnik->surname),
(!empty($uporabnik->second_email) ? iconv(mb_detect_encoding( $uporabnik->second_email, mb_detect_order(), true), "UTF-8", $uporabnik->second_email) : iconv(mb_detect_encoding( $uporabnik->email, mb_detect_order(), true), "UTF-8", $uporabnik->email)),
$this->userTypeToText($uporabnik->type),
$admin_languages[$uporabnik->lang],
(!empty($uporabnik->aai) ? $this->vrniDaNe($uporabnik->aai) : $lang['no1']),
(!empty($uporabnik->st_anket) ? $uporabnik->st_anket : 0),
(!empty($uporabnik->st_arhivskih) ? $uporabnik->st_arhivskih : 0),
$lang["users_gdpr".$uporabnik->gdpr_agree],
$uporabnik->registriran,
$uporabnik->last_login,
'<a href="#" onclick="edit_user(\''.$uporabnik->id.'\'); return false;" title="'.$lang['srv_info_modify'].'"><i class="fa fa-pencil-alt link-sv-moder"></i></a>'.
' | <a href="#" onclick="vsiUporabnikiAkcija(\''.$uporabnik->id.'\', \'ban\'); return false;" title="'.$lang[($uporabnik->status == 0 ? 'srv_user_banned' : 'srv_user_notbanned')].'"><i class="fa fa-ban '.($uporabnik->status == 0 ? 'link-rdec' : 'link-sv-moder').'"></i></a>'.
' | <a href="#" onclick="vsiUporabnikiAkcija(\''.$uporabnik->id.'\', \'delete\'); return false;" title="'.$lang['srv_multicrosstabs_tables_delete_short'].'"><i class="fa fa-times link-sv-moder"></i></a>'
];
}
}
$sql_recordsTotal = sisplet_query("SELECT count(id) as stVseh FROM users WHERE email NOT LIKE ('D3LMD-%') AND email NOT LIKE ('UNSU8MD-%')", "obj");
// Število vseh zadetkov, ki jih imamo v bazi
$recordsTotal = 0;
if(!empty($sql_recordsTotal)) {
$recordsTotal = $sql_recordsTotal->stVseh;
}
// Število filtriranih zadetkov
$recordFiltered = $recordsTotal;
if(!empty($_POST['search']['value']))
$recordFiltered = sizeof($vsi);
echo json_encode([
"draw" => (!empty($_POST['draw']) ? $_POST['draw'] : 1),
"recordsTotal" => $recordsTotal,
"recordsFiltered" => $recordFiltered,
"data" => $seznam // polje z vsebino
]);
}
/**
* Seznam dodeljenih uporabnikov (manager in admin)
*/
function ajax_all_users_list_my(){
global $admin_languages;
global $global_user_id;
global $lang;
global $admin_type;
$seznam = []; $seznam = [];
$iskanjeSql = ""; $iskanjeSql = "";
@ -1065,19 +1181,16 @@ class Dostop {
" WHERE u.email NOT LIKE ('D3LMD-%') AND u.email NOT LIKE ('UNSU8MD-%') ".$iskanjeSql; " WHERE u.email NOT LIKE ('D3LMD-%') AND u.email NOT LIKE ('UNSU8MD-%') ".$iskanjeSql;
// Filter samo po lastnih uporabnikih // Filter samo po lastnih uporabnikih
if(!empty($my)){
// Med lastne uporabnike prikažemo tudi, tiste ki so bili registrirani z isto domeno
UserSetting :: getInstance()->Init($global_user_id);
$domena = UserSetting :: getInstance()->getUserSetting('manage_domain');
$isciPoDomeni = ''; $isciPoDomeni = '';
// Med lastne uporabnike prikažemo tudi, tiste ki so bili registrirani z isto domeno
/*UserSetting :: getInstance()->Init($global_user_id);
$domena = UserSetting :: getInstance()->getUserSetting('manage_domain');
if(!empty($domena)){ if(!empty($domena)){
$isciPoDomeni = " OR u.email LIKE '%".$domena."'"; $isciPoDomeni = " OR u.email LIKE '%".$domena."'";
} }*/
$sql .= " AND (u.id IN (SELECT user FROM srv_dostop_manage WHERE manager='".$global_user_id."') ".$isciPoDomeni.")";
$sql .= " AND (u.id = '".$global_user_id."' OR u.id IN (SELECT user FROM srv_dostop_manage WHERE manager='".$global_user_id."') ".$isciPoDomeni.")";
}
// Filtri, ki jih datatables pošilja in po katerih filtriramo // Filtri, ki jih datatables pošilja in po katerih filtriramo
@ -1103,7 +1216,8 @@ class Dostop {
} }
$sql .= " ORDER BY ".$vrednost; $sql .= " ORDER BY ".$vrednost;
}else { }
else {
$sql .= " ORDER BY ".$orderPolje[$_POST['order'][0]['column']]." ".$_POST['order'][0]['dir']; $sql .= " ORDER BY ".$orderPolje[$_POST['order'][0]['column']]." ".$_POST['order'][0]['dir'];
} }
} }
@ -1116,11 +1230,12 @@ class Dostop {
$resultU = lazyLoadSqlObj($resultQuery); $resultU = lazyLoadSqlObj($resultQuery);
// Seznam uporabnikov vrne za administratorje vse za ostale pa samo tiste, ki smo jih dodali k uporabniku. // Seznam uporabnikov vrne za administratorje vse za ostale pa samo tiste, ki smo jih dodali k uporabniku.
if (!empty($resultU) && ($this->jeAdministrator() || !$this->jeAdministrator() && !empty($my) )) { if (!empty($resultU) && ($this->jeAdministrator() || !$this->jeAdministrator())) {
if (!empty($resultU->name)) { if (!empty($resultU->name)) {
$vsi[] = $resultU; $vsi[] = $resultU;
} else { }
else {
$vsi = $resultU; $vsi = $resultU;
} }
@ -1144,14 +1259,9 @@ class Dostop {
} }
} }
$sql_recordsTotal = sisplet_query("SELECT count(id) as stVseh FROM users WHERE email NOT LIKE ('D3LMD-%') AND email NOT LIKE ('UNSU8MD-%')", "obj");
// Število vseh zadetkov, ki jih imamo v bazi // Število vseh zadetkov, ki jih imamo v bazi
$recordsTotal = 0; $recordsTotal = 0;
if(!empty($sql_recordsTotal) && is_null($my)) {
$recordsTotal = $sql_recordsTotal->stVseh;
} elseif(!is_null($my)) {
$recordsTotal = sizeof($vsi); $recordsTotal = sizeof($vsi);
}
// Število filtriranih zadetkov // Število filtriranih zadetkov
$recordFiltered = $recordsTotal; $recordFiltered = $recordsTotal;
@ -1164,7 +1274,6 @@ class Dostop {
"recordsFiltered" => $recordFiltered, "recordsFiltered" => $recordFiltered,
"data" => $seznam // polje z vsebino "data" => $seznam // polje z vsebino
]); ]);
} }
/** /**
@ -1238,7 +1347,8 @@ class Dostop {
$type = $lang['admin_manager']; $type = $lang['admin_manager'];
break; break;
case 2: case 2:
$type = $lang['admin_clan']; case 3:
$type = $lang['admin_narocnik'];
break; break;
} }

39
admin/survey/classes/class.SurveyList.php
View File

@ -239,14 +239,26 @@ class SurveyList {
echo '<div id="secondNavigation" class="library clr">'; echo '<div id="secondNavigation" class="library clr">';
if ($_GET['a']=='diagnostics') { if ($_GET['a']=='diagnostics') {
if ($_GET['t'] == 'uporabniki') { if ($_GET['t'] == 'uporabniki') {
// Admini imajo pregled nad vsemi zavihki uporabnikov
if ($admin_type == 0) { if ($admin_type == 0) {
echo '<ul class="secondNavigation">'; echo '<ul class="secondNavigation">';
#zavihek ankete - seznam vseh uporabnikov #zavihek osnovni pregled uporabnikov
echo '<li>'; echo '<li>';
echo '<a class="no-img single '.(in_array($_GET['m'], ['my', 'all']) ? 'active' : '').'"' echo '<a class="no-img single '.((!isset($_GET['m']) || $_GET['m'] == 'my') ? 'active' : '').'"'
.' href="index.php?a=diagnostics&t=uporabniki&m=my" title="'.$lang['n_users_list_all'].'">'; .' href="index.php?a=diagnostics&t=uporabniki" title="'.$lang['n_users_list_all'].'">';
echo $lang['n_users_list'].'</a>';
echo '</li>';
echo '<li class="space"></li>';
#zavihek seznam vseh uporabnikov
echo '<li>';
echo '<a class="no-img single '.($_GET['m'] == 'all' ? 'active' : '').'"'
.' href="index.php?a=diagnostics&t=uporabniki&m=all" title="'.$lang['n_users_list_all'].'">';
echo $lang['n_users_list_all'].'</a>'; echo $lang['n_users_list_all'].'</a>';
echo '</li>'; echo '</li>';
@ -286,12 +298,25 @@ class SurveyList {
echo $lang['srv_hierarchy_users_access'].'</a>'; echo $lang['srv_hierarchy_users_access'].'</a>';
echo '</li>'; echo '</li>';
echo '</ul>'; echo '</ul>';
} }
} else { // Menegerji imajo samo osnovni pregled svojih uporabnikov
if ($admin_type == 1) {
echo '<ul class="secondNavigation">';
#zavihek osnovni pregled uporabnikov
echo '<li>';
echo '<a class="no-img single active" href="index.php?a=diagnostics&t=uporabniki" title="'.$lang['n_users_list_all'].'">';
echo $lang['n_users_list'].'</a>';
echo '</li>';
echo '</ul>';
}
}
else {
if ($admin_type == 0) { if ($admin_type == 0) {
echo '<ul class="secondNavigation">'; echo '<ul class="secondNavigation">';
#zavihek ankete #zavihek ankete
@ -701,7 +726,7 @@ class SurveyList {
# ni smiselno da ostali uporabniki vidijo zavihek, ker so tako prikazane samo njihove ankete # ni smiselno da ostali uporabniki vidijo zavihek, ker so tako prikazane samo njihove ankete
echo '<li class="spaceBig">&nbsp;</li>'; echo '<li class="spaceBig">&nbsp;</li>';
echo '<li>'; echo '<li>';
echo '<a href="index.php?a=diagnostics&t=uporabniki&m=my" title="' . $lang['hour_users'] . '">'; echo '<a href="index.php?a=diagnostics&t=uporabniki" title="' . $lang['hour_users'] . '">';
echo '<div class="smaller-singlebutton-'.$css_5.'">'. $lang['hour_users'] . '</div>'; echo '<div class="smaller-singlebutton-'.$css_5.'">'. $lang['hour_users'] . '</div>';
echo '</a>'; echo '</a>';
echo '</li>'; echo '</li>';

2
admin/survey/index.php
View File

@ -113,7 +113,7 @@
if(isset($_GET['a']) && ($_GET['a'] == 'hierarhija_superadmin' || $_GET['a'] == 'hierarhija')){ if(isset($_GET['a']) && ($_GET['a'] == 'hierarhija_superadmin' || $_GET['a'] == 'hierarhija')){
echo '<script type="text/javascript" src="minify/g=jshierarhija?v='.$rowv['value'].'"></script>'; echo '<script type="text/javascript" src="minify/g=jshierarhija?v='.$rowv['value'].'"></script>';
} }
elseif($_GET['a'] == 'narocila' || ($_GET['t'] == 'uporabniki' && in_array($_GET['m'], ['all', 'my', 'izbrisani', 'nepotrjeni', 'odjavljeni']))){ elseif($_GET['a'] == 'narocila' || $_GET['t'] == 'uporabniki'){
echo '<script type="text/javascript" src="minify/g=jsLastLib?v='.$rowv['value'].'"></script>'; echo '<script type="text/javascript" src="minify/g=jsLastLib?v='.$rowv['value'].'"></script>';
} }
else{ else{

35
admin/survey/script/dostop.js
View File

@ -293,41 +293,6 @@ $(document).ready(function () {
deferRender: true, deferRender: true,
select: true, select: true,
buttons: [ buttons: [
{
extend: 'copy',
exportOptions: {
columns: ':visible'
}
},
{
extend: 'print',
exportOptions: {
columns: ':visible'
}
},
{
extend: 'csv',
bom: true,
exportOptions: {
columns: ':visible'
}
},
{
extend: 'excel',
bom: true,
exportOptions: {
columns: ':visible'
}
},
{
extend: 'pdf',
orientation: 'landscape',
pageSize: 'LEGAL',
exportOptions: {
columns: ':visible'
}
},
'colvis'
], ],
language: { language: {
"url": siteUrl+"admin/survey/script/datatables/Slovenian.json" "url": siteUrl+"admin/survey/script/datatables/Slovenian.json"

4
admin/survey/script/script.js
View File

@ -4229,10 +4229,6 @@ function add_to_library(anketa,where) {
$.post('ajax.php?a=add_to_library', {anketa:anketa, where:where}); $.post('ajax.php?a=add_to_library', {anketa:anketa, where:where});
} }
function refresh_user_diagnostic(field, type, show, limit) {
$('#survey_list').load('ajax.php?a=refreshUserDiagnostic', {field:field, type:type, show:show, limit:limit});
}
function create_archive_survey(anketa, msg) { function create_archive_survey(anketa, msg) {
$('#fade').fadeTo('slow', 1); $('#fade').fadeTo('slow', 1);
$('#fullscreen').html('').fadeIn('slow').draggable({delay:100, cancel: 'input, textarea, select, .buttonwrapper'}); $('#fullscreen').html('').fadeIn('slow').draggable({delay:100, cancel: 'input, textarea, select, .buttonwrapper'});

14
lang/1.php
View File

@ -174,7 +174,7 @@ $lang = array (
"logged_in_as" => "Prijavljeni ste kot", "logged_in_as" => "Prijavljeni ste kot",
"administrator" => "Administrator", "administrator" => "Administrator",
"manager" => "Manager", "manager" => "Manager",
"user" => "&#269;lan", "user" => "Uporabnik",
"add_hor_link" => "Dodaj vodoravno povezavo", "add_hor_link" => "Dodaj vodoravno povezavo",
"send" => "Po&#154;lji", "send" => "Po&#154;lji",
"add_link" => "Dodaj povezavo", "add_link" => "Dodaj povezavo",
@ -715,7 +715,8 @@ $lang = array (
"n_list" => "Spisek prejemnikov", "n_list" => "Spisek prejemnikov",
"n_desc_list" => "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i>Zahtevali ste spisek prejemnikov. Preverite ga, ter potrdite<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;oziroma popravite prejemnike.<br><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<b>Spisek prejemnikov</b></i><br><br>", "n_desc_list" => "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i>Zahtevali ste spisek prejemnikov. Preverite ga, ter potrdite<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;oziroma popravite prejemnike.<br><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<b>Spisek prejemnikov</b></i><br><br>",
"n_list_users" => "Uporabniki", "n_list_users" => "Uporabniki",
"n_users_list_all" => "Seznam vseh", "n_users_list" => "Pregled",
"n_users_list_all" => "Vsi",
"n_deleted_users" => "Izbrisani", "n_deleted_users" => "Izbrisani",
"n_unsigned_users" => "Odjavljeni", "n_unsigned_users" => "Odjavljeni",
"n_unconfirmed_users" => "Nepotrjeni", "n_unconfirmed_users" => "Nepotrjeni",
@ -5607,6 +5608,8 @@ $lang = array (
"srv_manager_add_user4" => '<span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail</span>', "srv_manager_add_user4" => '<span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail</span>',
"srv_manager_rem_user2" => 'Odstranite uporabnika iz svojega pregleda', "srv_manager_rem_user2" => 'Odstranite uporabnika iz svojega pregleda',
"srv_manager_manager" => 'Uporabniki, ki imajo managerski pregled nad vašimi anketami', "srv_manager_manager" => 'Uporabniki, ki imajo managerski pregled nad vašimi anketami',
"create" => 'Ustvari',
"create_add" => 'Ustvari in dodaj',
"srv_library_left" => 'Standardna vprašanja lahko dodajate v anketo', "srv_library_left" => 'Standardna vprašanja lahko dodajate v anketo',
"srv_library_left_right" => 'Moja vprašanja, ki jih lahko dodajate v knjižnico in iz knjižnice v anketo', "srv_library_left_right" => 'Moja vprašanja, ki jih lahko dodajate v knjižnico in iz knjižnice v anketo',
"srv_language_settings" => 'Jezikovne nastavitve', "srv_language_settings" => 'Jezikovne nastavitve',
@ -6217,8 +6220,11 @@ $lang = array (
'srv_test_sett_txt' => 'Uredniške nastavitve testiranja in komentarjev', 'srv_test_sett_txt' => 'Uredniške nastavitve testiranja in komentarjev',
'srv_users_viewing' => 'aktivnih urednikov', 'srv_users_viewing' => 'aktivnih urednikov',
'srv_users_viewing2' => 'Trenutno aktivni uredniki', 'srv_users_viewing2' => 'Trenutno aktivni uredniki',
'srv_users_add_new' => 'Dodaj novega uporabnika', 'srv_users_add_new' => 'Nov uporabnik',
"srv_users_add_new_title" => 'Dodajte novega uporabnika v sistem <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail, da je bil registriran v sistem.</span>', "srv_users_add_new_title" => 'Ustvarite novega uporabnika v sistemu <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail, da je bil registriran v sistem.</span>',
'srv_users_add_assigned' => 'Dodajte pregled nad uporabniki',
"srv_users_add_assigned_title" => 'Ustvarite novega uporabnika nad katerim boste imeli pregled <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail, da je bil registriran v sistem.</span></span>',
"srv_users_assigned_title" => 'Uporabniki nad katerimi imate pregled',
'srv_uredniske_nastavitve' => 'Uredniške nastavitve', 'srv_uredniske_nastavitve' => 'Uredniške nastavitve',
'srv_q_inicialke' => 'Respondenti naj vnesejo tudi svoje inicialke', 'srv_q_inicialke' => 'Respondenti naj vnesejo tudi svoje inicialke',
'srv_q_inicialke_alert' => 'Opozorilo za inicialke', 'srv_q_inicialke_alert' => 'Opozorilo za inicialke',

8
lang/2.php
View File

@ -703,6 +703,7 @@ $lang = array (
"n_n_users" => "Notify users", "n_n_users" => "Notify users",
"n_desc_list" => "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i>You requested listing of recipients. Check it<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;and confirm or change the receivers.<br><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<b>List of email recipients</b></i><br><br>", "n_desc_list" => "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i>You requested listing of recipients. Check it<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;and confirm or change the receivers.<br><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<b>List of email recipients</b></i><br><br>",
"n_list_users" => "Users", "n_list_users" => "Users",
"n_users_list" => "Overview",
"n_users_list_all" => "All users", "n_users_list_all" => "All users",
"n_deleted_users" => "Deleted users", "n_deleted_users" => "Deleted users",
"n_unsigned_users" => "Unsigned users", "n_unsigned_users" => "Unsigned users",
@ -5502,6 +5503,8 @@ $lang = array (
"srv_manager_add_user4" => '<span style="color: gray; font-size:80%; font-weight:normal">User will be notified with an e-mail</span>', "srv_manager_add_user4" => '<span style="color: gray; font-size:80%; font-weight:normal">User will be notified with an e-mail</span>',
"srv_manager_rem_user2" => 'Remove user', "srv_manager_rem_user2" => 'Remove user',
"srv_manager_manager" => 'Users with managing view of your surveys', "srv_manager_manager" => 'Users with managing view of your surveys',
"create" => 'Create',
"create_add" => 'Create and add',
"srv_library_left" => '', "srv_library_left" => '',
"srv_library_left_right" => '', "srv_library_left_right" => '',
"srv_language_settings" => 'Language settings', "srv_language_settings" => 'Language settings',
@ -6107,7 +6110,10 @@ $lang = array (
'srv_users_viewing' => 'active editors', 'srv_users_viewing' => 'active editors',
'srv_users_viewing2' => 'Currently active editors', 'srv_users_viewing2' => 'Currently active editors',
'srv_users_add_new' => 'Add new user', 'srv_users_add_new' => 'Add new user',
"srv_users_add_new_title" => 'Add new user to the sistem<br><span style="color: gray; font-size:80%; font-weight:normal">User will be notified with an e-mail about this registration.</span>', "srv_users_add_new_title" => 'Create new user in the system<br><span style="color: gray; font-size:80%; font-weight:normal">User will be notified about this registration with an e-mail.</span>',
'srv_users_add_assigned' => 'Add assigned users',
"srv_users_add_assigned_title" => 'Create new user you will have overview on<br><span style="color: gray; font-size:80%; font-weight:normal">User will be notified about this registration with an e-mail.</span></span>',
"srv_users_assigned_title" => 'Your assigned users',
'srv_uredniske_nastavitve' => 'Editor settings', 'srv_uredniske_nastavitve' => 'Editor settings',
'srv_q_inicialke' => 'Respondents should enter their initials', 'srv_q_inicialke' => 'Respondents should enter their initials',
'srv_enter_inicialke' => 'Please enter your initials', 'srv_enter_inicialke' => 'Please enter your initials',

12
public/css/admin.css
View File

@ -12578,6 +12578,16 @@ ul #surveyList {
.users_list_box { .users_list_box {
min-height: 250px !important; min-height: 250px !important;
} }
.users_list_box .add_user {
display: flex;
align-items: flex-start;
}
.users_list_box .add_user fieldset {
width: 500px;
}
.users_list_box .add_user fieldset.new_user {
margin: 40px 40px 0 0;
}
#survey_list_inner { #survey_list_inner {
padding: 10px; padding: 10px;
@ -17044,7 +17054,7 @@ form.manager_add_user label {
} }
.dataTables_length { .dataTables_length {
padding: 5px 0; padding: 5px 0 15px 0;
} }
button.dt-button { button.dt-button {

16
resources/sass/admin/main_page/survey_list.scss
View File

@ -123,8 +123,24 @@ ul {
.survey_list_box { .survey_list_box {
min-height: 250px !important; min-height: 250px !important;
} }
// Seznami uporabnikov
.users_list_box { .users_list_box {
min-height: 250px !important; min-height: 250px !important;
.add_user {
display: flex;
align-items: flex-start;
fieldset{
width: 500px;
&.new_user{
margin: 40px 40px 0 0;
}
}
}
} }
#survey_list_inner { #survey_list_inner {

2
resources/sass/admin/users.scss
View File

@ -68,7 +68,7 @@ form.manager_add_user {
margin-bottom: 10px; margin-bottom: 10px;
} }
.dataTables_length { .dataTables_length {
padding: 5px 0; padding: 5px 0 15px 0;
} }
button.dt-button { button.dt-button {
cursor: pointer; cursor: pointer;