github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-07-06 04:51:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

imroved favorites handler

Browse source
This commit is contained in:
Serghey Rodin 2015-10-28 16:37:41 +02:00
parent cd437282b2
commit a5efa885d8
4 changed files with 13 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

48
web/add/favorite/index.php
View file

@ -1,65 +1,23 @@
<? <?
echo 'adding favorite <br><br>';
// Init
error_reporting(NULL); error_reporting(NULL);
ob_start();
session_start(); session_start();
// mail_acc
// firewall
include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
// Check POST request // Check token
//if (!empty($_POST['ok'])) {
// Check token
// if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { // if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) {
// header('location: /login/'); // header('location: /login/');
// exit(); // exit();
// } // }
// v-list-user-favourites
// v-delete-user-favourites admin web test0011.com
// Protect input // Protect input
// $v_section = escapeshellarg($_POST['v_section']);
// $v_unit_id = escapeshellarg($_POST['v_unit_id']);
$v_section = escapeshellarg($_REQUEST['v_section']); $v_section = escapeshellarg($_REQUEST['v_section']);
$v_unit_id = escapeshellarg($_REQUEST['v_unit_id']); $v_unit_id = escapeshellarg($_REQUEST['v_unit_id']);
// $v_section = 'web'; $_SESSION['favourites'][strtoupper($_REQUEST['v_section'])][$_REQUEST['v_unit_id']] = 1;
// $v_unit_id = 'test0011.com';
echo VESTA_CMD."v-add-user-favourites ".$_SESSION['user']." ".$v_section." ".$v_unit_id;
echo ' - ';
// Add cron job
exec (VESTA_CMD."v-add-user-favourites ".$_SESSION['user']." ".$v_section." ".$v_unit_id, $output, $return_var); exec (VESTA_CMD."v-add-user-favourites ".$_SESSION['user']." ".$v_section." ".$v_unit_id, $output, $return_var);
check_return_code($return_var,$output); // check_return_code($return_var,$output);
var_dump($return_var);
echo '<br> -------------------- <br>';
var_dump($output);
echo '<br> -------------------- <br>';
/*
echo '<br>favorites:<br>';
// Data
exec (VESTA_CMD."v-list-user-favourites $user json", $output, $return_var);
$data = json_decode(implode('', $output), true);
$data = array_reverse($data,true);
print_r($data);
*/
//}
?> ?>

10
web/delete/favorite/index.php
View file

@ -1,19 +1,15 @@
<?php <?php
echo 'delete Favorites<br>';
error_reporting(NULL); error_reporting(NULL);
ob_start();
session_start(); session_start();
include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
unset($_SESSION['favourites'][strtoupper($_REQUEST['v_section'])][$_REQUEST['v_unit_id']]);
$v_section = escapeshellarg($_REQUEST['v_section']); $v_section = escapeshellarg($_REQUEST['v_section']);
$v_unit_id = escapeshellarg($_REQUEST['v_unit_id']); $v_unit_id = escapeshellarg($_REQUEST['v_unit_id']);
exec (VESTA_CMD."v-delete-user-favourites ".$_SESSION['user']." ".$v_section." ".$v_unit_id, $output, $return_var); exec (VESTA_CMD."v-delete-user-favourites ".$_SESSION['user']." ".$v_section." ".$v_unit_id, $output, $return_var);
check_return_code($return_var,$output); // check_return_code($return_var,$output);
?> ?>

9
web/inc/main.php
View file

@ -89,6 +89,9 @@ if (isset($_SESSION['language'])) {
case 'es': case 'es':
setlocale(LC_ALL, 'es_ES.utf8'); setlocale(LC_ALL, 'es_ES.utf8');
break; break;
case 'ja':
setlocale(LC_ALL, 'ja_JP.utf8');
break;
default: default:
setlocale(LC_ALL, 'en_US.utf8'); setlocale(LC_ALL, 'en_US.utf8');
} }
@ -102,11 +105,7 @@ if (isset($_SESSION['look']) && ( $_SESSION['look'] != 'admin' )) {
$user = $_SESSION['look']; $user = $_SESSION['look'];
} }
if (isset($_SESSION['user'])) { function get_favourites(){
get_favorites();
}
function get_favorites(){
exec (VESTA_CMD."v-list-user-favourites ".$_SESSION['user']." json", $output, $return_var); exec (VESTA_CMD."v-list-user-favourites ".$_SESSION['user']." json", $output, $return_var);
// $data = json_decode(implode('', $output).'}', true); // $data = json_decode(implode('', $output).'}', true);
$data = json_decode(implode('', $output), true); $data = json_decode(implode('', $output), true);

3
web/login/index.php
View file

@ -67,6 +67,9 @@ if (isset($_POST['user']) && isset($_POST['password'])) {
$_SESSION['user'] = key($data); $_SESSION['user'] = key($data);
$v_user = $_SESSION['user']; $v_user = $_SESSION['user'];
// Get user favorites
get_favourites();
// Define language // Define language
if (!empty($data[$v_user]['LANGUAGE'])) $_SESSION['language'] = $data[$v_user]['LANGUAGE']; if (!empty($data[$v_user]['LANGUAGE'])) $_SESSION['language'] = $data[$v_user]['LANGUAGE'];