Merge branch 'dev' of github.com:int2001/Cloudlog into dev

application/views/user/edit.php

@@ -476,7 +476,7 @@
 			<div class="col-md-6">
 				<div class="card">
 					<div class="card-header">
-						<?php echo lang('account_previous_qsl_type'); ?>
+						<?php echo lang('account_qrzcom_hamqthcom_images'); ?>
 					</div>
 					<div class="card-body">
 						<div class="form-group">

docker/Dockerfile

@@ -7,14 +7,16 @@ RUN touch /usr/local/etc/php/conf.d/uploads.ini \
 && echo "max_execution_time = 60" >> /usr/local/etc/php/conf.d/uploads.ini
 RUN apt-get update \
 && apt-get install -y git curl libxml2-dev libonig-dev
-RUN docker-php-ext-install mysqli
+RUN docker-php-ext-install mysqli mbstring xml
 #RUN docker-php-ext-install curl
-RUN docker-php-ext-install mbstring
-RUN docker-php-ext-install xml
 #RUN docker-php-ext-install openssl
-WORKDIR /var/www/html
+RUN rm -rf /var/www/html/docker/
 COPY ./ /var/www/html/
-RUN ls && rm -rf /var/www/html/docker/ \ 
+WORKDIR /var/www/html
+RUN cd /var/www/html \
+&& echo "Setting root as owner of the folder..." \
+&& chown -R root:root /var/www/html \
+&& echo "Setting permissions to the install folder" \
 && chown -R root:www-data ./application/config/ \
 && chown -R root:www-data ./application/logs/ \
 && chown -R root:www-data ./assets/qslcard/ \
@@ -30,4 +32,7 @@ RUN ls && rm -rf /var/www/html/docker/ \
 && chmod -R g+rw ./updates/ \
 && chmod -R g+rw ./uploads/ \
 && chmod -R g+rw ./images/eqsl_card_images/ \
-&& chmod -R g+rw ./assets/json/
+&& chmod -R g+rw ./assets/json/ \
+&& chmod 777 /var/www/html/install \
+&& echo "Make sure everything is fine" \
+&& dir -ls