diff --git a/install.md b/install.md index efad463..3cb59b8 100644 --- a/install.md +++ b/install.md @@ -1,3 +1,4 @@ 1) git clone 2) install docker 3) docker volume create --name=sys0-db +4) open /install/create_db.php diff --git a/install.sh b/install.sh index 831548a..b148a8a 100755 --- a/install.sh +++ b/install.sh @@ -1,3 +1,11 @@ #!/bin/bash chmod 777 sys0-code/log +mkdir -p sys0-code/user_files +mkdir -p sys0-code/user_files/public +chmod 777 sys0-code/user_files +chmod 777 sys0-code/user_files/public +touch sys0-code/log/sys0.log +touch sys0-code/log/log.txt +chmod 777 sys0-code/log/sys0.log +chmod 777 sys0-code/log/log.txt docker volume create sys0-db diff --git a/php-conf/php.ini b/php-conf/php.ini index 85ce491..a18a42a 100644 --- a/php-conf/php.ini +++ b/php-conf/php.ini @@ -901,7 +901,7 @@ default_socket_timeout = 60 ; ; For example: ; -; extension=mysqli + extension=mysqli ; ; When the extension library to load is not located in the default extension ; directory, You may specify an absolute path to the library file: diff --git a/srv_dockerfile b/srv_dockerfile index 2e5b43c..aaaf2b6 100644 --- a/srv_dockerfile +++ b/srv_dockerfile @@ -1,16 +1,4 @@ -# Extend the official PHP image FROM php:apache - -# Install the mysqli extension RUN docker-php-ext-install mysqli #RUN a2enmod ssl RUN service apache2 restart -#COPY ./cyberhex-code /var/www/html -#RUN mkdir -p /var/www/html/install/ -#RUN mkdir -p /var/www/html/database_srv -#RUN mkdir -p /var/www/html/export -#RUN mkdir -p /var/www/html/import -#RUN chown -R www-data:www-data /var/www/html/export/ -#RUN chown -R www-data:www-data /var/www/html/import/ -#RUN chown -R www-data:www-data /var/www/html/install/ -#RUN chown -R www-data:www-data /var/www/html/database_srv/ diff --git a/sys0-code/api/queue.php b/sys0-code/api/queue.php index a959a2f..aa8e6cf 100644 --- a/sys0-code/api/queue.php +++ b/sys0-code/api/queue.php @@ -36,7 +36,8 @@ else $sql="Select id,apikey,printer_url from printer where id=$print_on and free=1"; //echo $sql; - $stmt = mysqli_prepare($link, $sql)mysqli_stmt_execute($stmt); + $stmt = mysqli_prepare($link, $sql); + mysqli_stmt_execute($stmt); mysqli_stmt_store_result($stmt); mysqli_stmt_bind_result($stmt, $id,$papikey,$purl); mysqli_stmt_fetch($stmt); diff --git a/sys0-code/api/update_color.php b/sys0-code/api/update_color.php index f960312..0029abd 100644 --- a/sys0-code/api/update_color.php +++ b/sys0-code/api/update_color.php @@ -6,7 +6,6 @@ include "../config/config.php"; ?> - load_user()"; - - ?> -
diff --git a/sys0-code/assets/html/footer.html b/sys0-code/assets/html/footer.html index 2b34bdd..b83db14 100644 --- a/sys0-code/assets/html/footer.html +++ b/sys0-code/assets/html/footer.html @@ -4,8 +4,6 @@