Merge pull request #2 from Krakinou/Testing

Integration Admin Panel

README.md

@@ -30,7 +30,7 @@ TODO :
 
 [ ] Why the flag don't show??
 
-[ ] Implement Admin panel
+[X] Implement Admin panel
 
 [ ] Add backup restore script
 

conf/index_source.php

@@ -19,9 +19,7 @@
 			<a href="/" title="Startseite"><strong>EmailPoubelle</strong> </a>
 		</header>
 		<div id="b">
-			<article>
-				<h1><?= _('Emails trash free') ?></h1>
-				<p><?= _('Generate trash emails without lifetime constraint') ?>. </p>
+			<article style="float:left">
 				<?php 
 				// Intégration dans votre site :
 				if (file_exists('../conf.php')) {
@@ -30,6 +28,7 @@
 					include('../conf-dist.php');
 				}
 				include('../emailPoubelle.php');
+				include('../emailPoubelleAdmin.php');
 				?>
 		</div>
 	</div>

manifest.json

@@ -53,6 +53,15 @@
                 },
                 "example": "homer"
             },
+            {
+                "name": "password",
+                "type": "password",
+                "ask": {
+                    "en": "Enter a password to access the admin panel",
+                    "fr": "Entrer un mot de passe pour accéder au tableau d'administration"
+                },
+                "example": "AveryStrongPassword"
+            },
             {
                 "name": "public_site",
                 "ask": {
@@ -62,8 +71,6 @@
                 "choices": ["Yes", "No"],
                 "default": "No"
             }
-
-
         ]
     }
 }

scripts/install

@@ -15,6 +15,7 @@ ynh_abort_if_errors
 domain=$YNH_APP_ARG_DOMAIN
 path_url=$YNH_APP_ARG_PATH
 admin=$YNH_APP_ARG_ADMIN
+password=$YNH_APP_ARG_PASSWORD
 is_public=$4
 final_path=/var/www/$app
 db_user=emailPoubelle
@@ -95,6 +96,7 @@ ynh_replace_string "//      define('DBPASS',"    "        define('DBPASS',"   $f
 ynh_replace_string "baseMysql"                   "$db_user"                   $final_path/conf.php
 ynh_replace_string "utilisateurMysql"            "$db_user"                   $final_path/conf.php
 ynh_replace_string "motdepassedefou"             "$db_pwd"                    $final_path/conf.php
+ynh_replace_string "define('ADMIN_PASSWORD', 'admin');" "define('ADMIN_PASSWORD', '$password');" $final_path/conf.php
 #setting conf file not world-readable (dude, there is a plain-text password !)
 sudo chmod o-r $final_path/conf.php
 

src/conf-dist.php

@@ -51,7 +51,7 @@ define('URLPAGE', 'http://'.$_SERVER["SERVER_NAME"].$_SERVER["SCRIPT_NAME"]);
 // Email 
 define('EMAILTAGSUJET', '[EmailPoubelle]');
 // From de l'email
-define('EMAILFROM', '"NO REPLAY emailPoubelle" <emailpoubelle@exemple.com>');
+define('EMAILFROM', '"NO REPLY emailPoubelle" <emailpoubelle@exemple.com>');
 define('EMAILEND', 'emailPoubelle.zici.fr');
 
 // Alisas interdit : (regex ligne par ligne) - commenter pour désactiver