1
0
mirror of https://gitlab.com/JKANetwork/CheckServer.git synced 2026-02-22 21:13:46 +01:00

Change connect to load and fix code

This commit is contained in:
2018-01-09 23:27:59 +01:00
parent 42583d198e
commit 5e33adbbaf
10 changed files with 105 additions and 115 deletions

View File

@@ -1,5 +1,5 @@
<?php
require_once 'functions.php';
require_once 'load.php';
requirelogin();
//Calculo día 1 del mes en curso
@@ -38,7 +38,7 @@ switch($page){
$ID_G = $chks[$idchk]['ID_G']; //For nameGroup
$chks[$idchk]['nameGroup'] = dbw_query_fetch_array($db_conn,"SELECT * FROM GROUPS WHERE ID_G='$ID_G'")['name'];
$ID_TC = $chks[$idchk]['ID_TC'];
$chks[$idchk]['nameTCheck'] = textTypeChk($T_,$ID_TC);
$chks[$idchk]['nameTCheck'] = textTypeChk($ID_TC);
}
@@ -47,7 +47,7 @@ switch($page){
$emptyG[] = array('name' =>$emptygrp['name']);
}
echo $twig->render('panel/p_checks.twig', array('T_' => $T_, 'mpage' => 'checks','you' => $you, 'checks' => $chks,'groups' => $groups,'emptygrp' => $emptyG));
renderPage('panel/p_checks.twig',array('mpage' => 'checks','you' => $you, 'checks' => $chks,'groups' => $groups,'emptygrp' => $emptyG));
break;
//Forms to add or edit a check (Not saving, only forms)
@@ -65,17 +65,18 @@ switch($page){
foreach(arrayTypeChk() as $key => $value){
$tchecks[] = array(
'ID_TC' =>$key,
'name' => textTypeChk($T_,$key)
'name' => textTypeChk($key)
);
}
//En este if hago las diferencias entre add y edit, para no repetir código.
if ($page == 'addcheck'){
echo $twig->render('panel/p_addedit.twig', array('T_' => $T_, 'mpage' => 'checks', 'type' => 'new','groups' => $groups,'tchecks' => $tchecks));
renderPage('panel/p_addedit.twig', array('mpage' => 'checks', 'type' => 'new','groups' => $groups,'tchecks' => $tchecks));
}elseif ($page == 'editcheck'){
$ID_C = (int)$_GET['ID_C']; //Check to edit
$checkdata = dbw_query_fetch_array($db_conn,"SELECT * FROM CHECKS WHERE ID_C='$ID_C'"); //Checkdata
echo $twig->render('panel/p_addedit.twig', array('T_' => $T_, 'mpage' => 'checks', 'you' => $you, 'type' => 'edit','groups' => $groups,'tchecks' => $tchecks,'check' => $checkdata));
renderPage('panel/p_addedit.twig', array('mpage' => 'checks', 'you' => $you, 'type' => 'edit','groups' => $groups,'tchecks' => $tchecks,'check' => $checkdata));
}
break;
@@ -144,8 +145,7 @@ switch($page){
'checks' => $countchk
);
}
echo $twig->render('panel/p_groups.twig', array('T_' => $T_, 'you' => $you, 'mpage' => 'groups', 'groups' => $groups));
renderPage('panel/p_groups.twig', array('you' => $you, 'mpage' => 'groups', 'groups' => $groups));
break;
case 'addgroup':
@@ -186,8 +186,7 @@ switch($page){
->text($result['text']);
$news[$ID_N]['mdtext'] = $result['text']; //Raw text
}
echo $twig->render('panel/p_news.twig', array('T_' => $T_, 'you' => $you, 'mpage' => 'news', 'allnews' => $news));
renderPage('panel/p_news.twig', array('you' => $you, 'mpage' => 'news', 'allnews' => $news));
break;
case 'newnews':
@@ -218,8 +217,7 @@ switch($page){
while ($syso = dbw_fetch_array($db_conn,$results)){
$sys[$syso['option']] = $syso['value'];
}
echo $twig->render('panel/p_settings.twig', array('T_' => $T_, 'you' => $you, 'mpage' => 'settings', 'sys' => $sys));
renderPage('panel/p_settings.twig', array('you' => $you, 'mpage' => 'settings', 'sys' => $sys));
break;
case 'users':
@@ -233,8 +231,7 @@ switch($page){
'fullrights' => $us['fullRights']
);
}
echo $twig->render('panel/p_users.twig', array('T_' => $T_, 'mpage' => 'users', 'you' => $you, 'users' => $user));
renderPage('panel/p_users.twig', array('mpage' => 'users', 'you' => $you, 'users' => $user));
break;
case 'adduser':
@@ -291,10 +288,10 @@ switch($page){
}
}
$group = nameGroupFromIDG($db_conn,IDGFromIDC($db_conn,$ID_C));
$group = nameGroupFromIDG(IDGFromIDC($ID_C));
$pagedata = array('cgood' => $cgood,'cbad' => $cbad,'name' => nameFromIDC($db_conn,$ID_C), 'group' => $group,'cant' => $cant,'fails' => $fails);
echo $twig->render('panel/p_viewhist.twig', array('T_' => $T_, 'mpage' => 'viewhist', 'you' => $you,'pagedata' => $pagedata));
renderPage('panel/p_viewhist.twig', array('mpage' => 'viewhist', 'you' => $you,'pagedata' => $pagedata));
break;
// Página principal
@@ -310,8 +307,8 @@ switch($page){
while ($fail = dbw_fetch_array($db_conn,$failssql)){ //Create array
$fails[] = array (
'ID_C' => $fail['ID_C'],
'name' => nameFromIDC($db_conn,$fail['ID_C']),
'groupName' => nameGroupFromIDG($db_conn,IDGFromIDC($db_conn,$fail['ID_C'])),
'name' => nameFromIDC($fail['ID_C']),
'groupName' => nameGroupFromIDG(IDGFromIDC($fail['ID_C'])),
'typeCheck' => textTypeChk($T_,$fail['ID_TC']),
'errorText' => $fail['errorText'],
'date' => date('j/n/Y',$fail['timestamp']),
@@ -322,7 +319,7 @@ switch($page){
$fails = array(); //Empty
}
echo $twig->render('panel/p_index.twig', array('T_' => $T_, 'you' => $you, 'mpage' => 'index', 'data' => $data,'fails' => $fails)); //Render
renderPage('panel/p_index.twig', array('you' => $you, 'mpage' => 'index', 'data' => $data,'fails' => $fails)); //Render
break;
}