Minor changes and additions (#931)

docker/docker-compose.yml

@@ -12,7 +12,7 @@ services:
     ports:
       - 80:80
     volumes:
-      - "../:/var/www/html:delegated"
+      - "../:/var/www/html"
     depends_on:
       - php
       - mysql
@@ -42,7 +42,7 @@ services:
       dockerfile: docker/php/Dockerfile
     container_name: controlpanel_php
     volumes:
-      - "../:/var/www/html:delegated"
+      - "../:/var/www/html"
     networks:
       - laravel
 
@@ -61,19 +61,5 @@ services:
     networks:
       - laravel
 
-  redis:
-    image: "redis:alpine"
-    command: redis-server --requirepass sOmE_sEcUrE_pAsS
-    ports:
-      - "6379:6379"
-    volumes:
-      - $PWD/redis-data:/var/lib/redis
-      - $PWD/redis.conf:/usr/local/etc/redis/redis.conf
-    environment:
-      - REDIS_REPLICATION_MODE=master
-    networks:
-      - laravel
-
-
 volumes:
-  mysql:
+  mysql:

docker/php/Dockerfile

@@ -1,16 +1,14 @@
-FROM php:8.0-fpm-alpine3.13
+FROM php:8.1-fpm-buster
+RUN apt-get update \
+  && apt-get install -y build-essential zlib1g-dev default-mysql-client curl gnupg procps vim git unzip libzip-dev libpq-dev libicu-dev libonig-dev libpng-dev libjpeg-dev libfreetype6-dev
 
-RUN apk update && apk upgrade
-RUN apk add --no-cache --repository https://alpine.global.ssl.fastly.net/alpine/edge/community/
-
-RUN apk add --no-cache curl-dev icu-dev libzip-dev
-RUN docker-php-ext-install mysqli pdo pdo_mysql intl zip
+RUN docker-php-ext-install mysqli pdo pdo_mysql intl zip gd bcmath
 
 ADD ./docker/php/www.conf /usr/local/etc/php-fpm.d/
 
 RUN mkdir -p /var/www/html
 
-RUN addgroup -g 1000 laravel && adduser -G laravel -g laravel -s /bin/sh -D laravel
+RUN addgroup --gid 1000 laravel && adduser --ingroup laravel --uid 1000 --shell /bin/sh --disabled-password --gecos "" laravel
 RUN chown laravel:laravel /var/www/html
 
 WORKDIR /var/www/html
@@ -18,4 +16,3 @@ WORKDIR /var/www/html
 USER laravel
 
 COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
-

public/install/functions.php

@@ -19,7 +19,7 @@ $required_extensions = ['openssl', 'gd', 'mysql', 'PDO', 'mbstring', 'tokenizer'
 
 $requirements = [
     'minPhp' => '8.1',
-    'maxPhp' => '8.3', // This version is not supported
+    'maxPhp' => '8.4', // This version is not supported
     'mysql' => '5.7.22',
 ];
 

themes/default/views/admin/overview/index.blade.php

@@ -43,7 +43,7 @@
                             class="mr-2 fas fa-link"></i> {{__('Documentation')}}</a>
                 </div>
                 <div class="col-md-3">
-                    <a href="https://github.com/ControlPanel-gg/dashboard" class="px-3 btn btn-dark btn-block"><i
+                    <a href="https://github.com/Ctrlpanel-gg/panel" class="px-3 btn btn-dark btn-block"><i
                             class="mr-2 fab fa-github"></i> {{__('Github')}}</a>
                 </div>
                 <div class="col-md-3">

themes/default/views/information/privacy-content.blade.php

@@ -49,8 +49,8 @@
             Service or from the Service infrastructure itself (for example, the duration of a page visit).</p>
     </li>
     <li>
-        <p><strong>Website</strong> refers to CtrlPanel, accessible from <a href="controlpanel"
-                rel="external nofollow noopener" target="_blank">controlpanel</a></p>
+        <p><strong>Website</strong> refers to CtrlPanel, accessible from <a href="ctrlpanel"
+                rel="external nofollow noopener" target="_blank">ctrlpanel</a></p>
     </li>
     <li>
         <p><strong>You</strong> means the individual accessing or using the Service, or the company, or other legal

themes/default/views/information/tos-content.blade.php

@@ -146,6 +146,10 @@
 
 <p>- PayPal</p>
 
+<p>- Stripe</p>
+
+<p>- Mollie</p>
+
 <p></p>
 
 <p>You agree to provide current, complete, and accurate purchase and account information for all purchases made via the Site. You further agree to promptly update account and payment information, including email address, payment method, and payment card expiration date, so that we can complete your transactions and contact you as needed. Sales tax will be added to the price of purchases as deemed required by us. We may change prices at any time. All payments shall beinU.S. dollars.</p>