github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-21 05:44:08 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Imrovements for Softaculous App Installer

Browse source
This commit is contained in:
Serghey Rodin 2017-12-27 19:07:30 +02:00
commit 85f6d3a08f
4 changed files with 47 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/v-add-vesta-softaculous
View file

@ -22,8 +22,10 @@ source $VESTA/conf/vesta.conf
#----------------------------------------------------------# #----------------------------------------------------------#
if [ "$TYPE" = 'WEB' ]; then if [ "$TYPE" = 'WEB' ]; then
if [ ! -e "$VESTA/softaculous" ] && [ ! -e "$VESTA/ioncube" ]; then
$BIN/v-schedule-vesta-softaculous $BIN/v-schedule-vesta-softaculous
exit exit
fi
else else
cmd="v-add-vesta-softaculous" cmd="v-add-vesta-softaculous"
check_cron=$(grep "$cmd" $VESTA/data/users/admin/cron.conf 2> /dev/null) check_cron=$(grep "$cmd" $VESTA/data/users/admin/cron.conf 2> /dev/null)

41
bin/v-list-sys-vesta-updates
View file

@ -14,6 +14,7 @@ format=${1-shell}
# Includes # Includes
source $VESTA/func/main.sh source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
fields="\$NAME \$VERSION \$RELEASE \$ARCH \$UPDATED \$DESCR \$TIME \$DATE" fields="\$NAME \$VERSION \$RELEASE \$ARCH \$UPDATED \$DESCR \$TIME \$DATE"
# JSON list function # JSON list function
@ -123,6 +124,46 @@ data="$data\nNAME='vesta-nginx' VERSION='$VERSION' RELEASE='$RELEASE'"
data="$data ARCH='$ARCH' UPDATED='$UPDATED' DESCR='internal web server'" data="$data ARCH='$ARCH' UPDATED='$UPDATED' DESCR='internal web server'"
data="$data TIME='$TIME' DATE='$DATE'" data="$data TIME='$TIME' DATE='$DATE'"
# Checking installed vesta-ioncube version
if [ "$SOFTACULOUS" = 'yes' ]; then
if [ -e "/etc/redhat-release" ]; then
eval $(rpm --queryformat="$rpm_format" -q vesta-ioncube)
DATE=$(date -d @$UTIME +%F)
TIME=$(date -d @$UTIME +%T)
else
dpkg_data=$(dpkg-query -s vesta-ioncube)
pkg_date=$(stat -c "%Y" /var/lib/dpkg/info/vesta-php.list)
ARCH=$(echo "$dpkg_data"|grep Architecture | cut -f 2 -d ' ')
VERSION=$(echo "$dpkg_data"|grep ^Vers |cut -f2 -d ' '|cut -f1 -d \-)
RELEASE=$(echo "$dpkg_data"|grep ^Vers |cut -f2 -d ' '|cut -f2 -d \-)
DATE=$(date -d @$pkg_date +"%F")
TIME=$(date -d @$pkg_date +"%T")
fi
data="$data\nNAME='vesta-ioncube' VERSION='$VERSION' RELEASE='$RELEASE'"
data="$data ARCH='$ARCH' UPDATED='$UPDATED' DESCR='php encoder'"
data="$data TIME='$TIME' DATE='$DATE'"
fi
# Checking installed vesta-softaculous version
if [ "$SOFTACULOUS" = 'yes' ]; then
if [ -e "/etc/redhat-release" ]; then
eval $(rpm --queryformat="$rpm_format" -q vesta-softaculous)
DATE=$(date -d @$UTIME +%F)
TIME=$(date -d @$UTIME +%T)
else
dpkg_data=$(dpkg-query -s vesta-softaculous)
pkg_date=$(stat -c "%Y" /var/lib/dpkg/info/vesta-php.list)
ARCH=$(echo "$dpkg_data"|grep Architecture | cut -f 2 -d ' ')
VERSION=$(echo "$dpkg_data"|grep ^Vers |cut -f2 -d ' '|cut -f1 -d \-)
RELEASE=$(echo "$dpkg_data"|grep ^Vers |cut -f2 -d ' '|cut -f2 -d \-)
DATE=$(date -d @$pkg_date +"%F")
TIME=$(date -d @$pkg_date +"%T")
fi
data="$data\nNAME='vesta-softaculous' VERSION='$VERSION' RELEASE='$RELEASE'"
data="$data ARCH='$ARCH' UPDATED='$UPDATED' DESCR='app installer'"
data="$data TIME='$TIME' DATE='$DATE'"
fi
# Listing data # Listing data
case $format in case $format in

2
bin/v-update-sys-vesta-all
View file

@ -22,7 +22,7 @@ source $VESTA/conf/vesta.conf
#----------------------------------------------------------# #----------------------------------------------------------#
# Starting update loop # Starting update loop
for package in vesta vesta-nginx vesta-php; do for package in vesta vesta-nginx vesta-php vesta-ioncube vesta-softaculous; do
$BIN/v-update-sys-vesta "$package" $BIN/v-update-sys-vesta "$package"
done done

3
web/inc/main.php
View file

@ -29,13 +29,12 @@ if(isset($_SERVER['HTTP_FORWARDED'])){
$user_combined_ip .= '|'. $_SERVER['HTTP_FORWARDED']; $user_combined_ip .= '|'. $_SERVER['HTTP_FORWARDED'];
} }
if(!isset($_SESSION['user_combined_ip'])){ if(!isset($_SESSION['user_combined_ip'])){
$_SESSION['user_combined_ip'] = $user_combined_ip; $_SESSION['user_combined_ip'] = $user_combined_ip;
} }
// Checking user to use session from the same IP he has been logged in // Checking user to use session from the same IP he has been logged in
if($_SESSION['user_combined_ip'] != $user_combined_ip){ if($_SESSION['user_combined_ip'] != $user_combined_ip && $_SERVER['REMOTE_ADDR'] != '127.0.0.1'){
session_destroy(); session_destroy();
session_start(); session_start();
$_SESSION['request_uri'] = $_SERVER['REQUEST_URI']; $_SESSION['request_uri'] = $_SERVER['REQUEST_URI'];