From 5768569a2aad6e10ae105e1931833928d9987c35 Mon Sep 17 00:00:00 2001
From: mrflos <mrflos@lilo.org>
Date: Fri, 3 Feb 2023 22:08:34 +0300
Subject: [PATCH] fix(install) : handle curl with herse

---
 utils.inc.php         | 13 ++++++++++---
 yeswiki-installer.php |  6 +++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/utils.inc.php b/utils.inc.php
index 6896351..5405003 100644
--- a/utils.inc.php
+++ b/utils.inc.php
@@ -217,7 +217,7 @@ function removePhpFpmConfig($user)
     exec('service '.$_SERVER['phpservice'].' reload', $output);
 }
 
-function copyYesWikiFiles($domain, $user, $dbUser)
+function copyYesWikiFiles($domain, $user, $dbUser, $herseUser = null, $hersePass = null)
 {
     $tmpFile = '/tmp/yeswiki.zip';
     $destDir = '/home'.'/'.$user.'/'.$domain;
@@ -231,8 +231,11 @@ function copyYesWikiFiles($domain, $user, $dbUser)
     exec($sudo.'mv '.$destDir.'/doryphore/* '.$destDir.'/');
     exec($sudo.'rm -rf '.$destDir.'/doryphore');
     unlink($tmpFile);
-
-    $curl = 'curl -X POST --insecure --data-urlencode \'config[default_language]=fr\' --data-urlencode \'config[wakka_name]='.$domain.'\' --data-urlencode \'config[root_page]=PagePrincipale\' --data-urlencode \'config[mysql_host]=localhost\' --data-urlencode \'config[mysql_database]='.$dbUser['database'].'\' --data-urlencode \'config[mysql_user]='.$dbUser['user'].'\' --data-urlencode \'config[mysql_password]='.$dbUser['password'].'\' --data-urlencode \'config[table_prefix]=yeswiki_\' --data-urlencode \'admin_name='.$_SERVER['admin_id'].'\' --data-urlencode \'admin_password='.$_SERVER['admin_password'].'\' --data-urlencode \'admin_password_conf='.$_SERVER['admin_password'].'\' --data-urlencode \'admin_email='.$_SERVER['admin_email'].'\' --data-urlencode \'config[rewrite_mode]=0\' --data-urlencode \'config[allow_raw_html]=1\' --data-urlencode \'config[allow_robots]=1\' --data-urlencode \'submit=Continue\' \'https://'.$domain.'/?PagePrincipale&installAction=install\' 2>&1';
+    $herse = '';
+    if (!empty($herseUser) && !empty($hersePass)) {
+        $herse = $herseUser.':'.$hersePass; 
+    }
+    $curl = 'curl -X POST --insecure --data-urlencode \'config[default_language]=fr\' --data-urlencode \'config[wakka_name]='.$domain.'\' --data-urlencode \'config[root_page]=PagePrincipale\' --data-urlencode \'config[mysql_host]=localhost\' --data-urlencode \'config[mysql_database]='.$dbUser['database'].'\' --data-urlencode \'config[mysql_user]='.$dbUser['user'].'\' --data-urlencode \'config[mysql_password]='.$dbUser['password'].'\' --data-urlencode \'config[table_prefix]=yeswiki_\' --data-urlencode \'admin_name='.$_SERVER['admin_id'].'\' --data-urlencode \'admin_password='.$_SERVER['admin_password'].'\' --data-urlencode \'admin_password_conf='.$_SERVER['admin_password'].'\' --data-urlencode \'admin_email='.$_SERVER['admin_email'].'\' --data-urlencode \'config[rewrite_mode]=0\' --data-urlencode \'config[allow_raw_html]=1\' --data-urlencode \'config[allow_robots]=1\' --data-urlencode \'submit=Continue\' \'https://'.$herse.$domain.'/?PagePrincipale&installAction=install\' 2>&1';
     $output = [];
     exec($curl, $output);
     //echo implode("\n", $output);
@@ -260,6 +263,10 @@ function editConfigFile() {
   
 }
 
+function addExtensions() {
+    // ferme pour l'option ferme
+}
+
 function addStatistics() {
     // requete SQL
     // INSERT INTO `matomo_site` (`idsite`, `name`, `main_url`, `ts_created`, `ecommerce`, `sitesearch`, `sitesearch_keyword_parameters`, `sitesearch_category_parameters`, `timezone`, `currency`, `exclude_unknown_urls`, `excluded_ips`, `excluded_parameters`, `excluded_user_agents`, `excluded_referrers`, `group`, `type`, `keep_url_fragment`, `creator_login`) VALUES (NULL, 'Partage ton outil', 'https://partagetonoutil.fr', '2023-02-01 00:00:00', '0', '1', '', '', 'Europe/Paris', 'EUR', '0', '', '', '', '', '', 'website', '0', 'superadmin'); 
diff --git a/yeswiki-installer.php b/yeswiki-installer.php
index 8adf24a..4519b87 100755
--- a/yeswiki-installer.php
+++ b/yeswiki-installer.php
@@ -76,7 +76,11 @@ if (0 == posix_getuid()) {
             if ($confirm || $input->confirmed()) {
                 $unixUser = createUnixUserWithQuota($user, $quota);
                 $dbUser = createSQLUserAndDatabase($user, $type);
-                copyYesWikiFiles($domain, $user, $dbUser);
+                if ($needHerse) {
+                    copyYesWikiFiles($domain, $user, $dbUser, $herseUser, $hersePass);
+                } else {
+                    copyYesWikiFiles($domain, $user, $dbUser);
+                }
                 createNginxConfig($domain, $user, $herseUser, $hersePass);
                 createPhpFpmConfig($user);
                 $climate->shout(