Well dev

.gitignore

@@ -4,6 +4,8 @@ well2/models/my_settings.php
 .DS_Store
 .svn
 test.php
-
+PDF/certs/*
+well2/RadarUserCSV/*
+well2/PDF/certs/*
 
 

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "well2"]
+	path = well2
+	url = https://github.com/susom/WELL_PORTAL_V2.git

PDF/generatePDFcertificate.php

@@ -22,10 +22,14 @@
 
 $pdf->SetXY(($_w/2)-($_wtext/2), ($_h/2));
 $pdf->Write(0, $txt);
-$filename = array();
+$userfolder = $loggedInUser->id . "_" . $loggedInUser->firstname . "_" . $loggedInUser->lastname;
+if (!file_exists("../PDF/certs/$userfolder")) {
+    mkdir("../PDF/certs/$userfolder", 0777, true);
+}
+$filename 	= array();
 $filename[] = $loggedInUser->id;
 $filename[] = $loggedInUser->firstname;
 $filename[] = $loggedInUser->lastname;
-$filename[] = Date("Y");
-$filename ="../PDF/certs/".implode("_",$filename).".pdf";
+$filename[] = $arm_year;
+$filename ="../PDF/certs/$userfolder/".implode("_",$filename).".pdf";
 $pdf->Output($filename,'F');

Radarstyle.css

@@ -0,0 +1,119 @@
+
+
+body {
+  font-family: "Open Sans", sans-serif;
+  font-size: 12px;
+  font-weight: 400;
+  padding-top: 10px;
+  padding-bottom: 100px;
+}
+html {
+  overflow-y: scroll;
+}
+h1 {
+  color: steelblue;
+  font-weight: 800;
+  font-size: 1.7em;
+}
+h2 {
+  color: steelblue;
+  font-size: 1.3em;
+  padding-bottom: 10px;
+}
+h3 {
+  color: gray;
+  font-size: 1.2em;
+  padding-bottom: 10px;
+}
+footer a,
+footer a:hover, footer a:visited {
+  color: #D2A000;
+}
+.text-small {
+  font-size: 12px;
+  font-style: italic;
+}
+footer {
+  color: white;
+  padding-top: 5px;
+  border-top: 1px solid gray;
+  font-size: 12px;
+  position: fixed;
+  left: 0;
+  bottom: 0;
+  height: 50px;
+  width: 100%;
+  background: black;
+  text-align: center;
+}
+pre {
+  height: 200px;
+  font-size: 9px;
+  overflow-y: scroll;
+}
+.form-control-inline {
+  display: inline;
+  width: 40px;
+  margin-right: 5px;
+}
+.visualization {
+}
+.configuration {
+  position:relative;
+  font-size: 0.8em;
+  width: 217px;
+  border: 1px solid #ddd;
+  padding-left: 20px;
+  margin-bottom: 20px;
+  left:80px;
+}
+.checkbox {
+  margin-left: 20px;
+}
+/* Customizable classes used in D3 vis, uncomment to customize
+.svg-vis {
+  background-color: gray;
+  opacity: 0.5;
+}
+.verticesTooltip {
+  position: absolute;
+  color: red;
+  font-size: 12px;
+  width: 100px;
+  height: auto;
+  padding: 5px;
+  border: 2px solid gray;
+  border-radius: 5px;
+  pointer-events: none;
+  opacity: 0;
+  background: #f4f4f;
+}
+.level-lines {
+  stroke: red;
+  stroke-width: 1px;
+}
+.level-labels {
+  fill: red;
+  font-size: 12px;
+}
+.axis-lines {
+  stroke: blue;
+  stroke-width: 2px;
+}
+.axis-labels {
+  fill: blue;
+  font-size: 12px;
+}
+.polygon-vertices {
+  fill-opacity: 0.6;
+}
+.polygon-areas {
+  fill-opacity: 0.6;
+}
+.legend-tiles {
+  fill-opacity: 0.3;
+}
+.legend-labels {
+  font-size: 15px;
+}
+*/

index.php

@@ -14,7 +14,7 @@
         include("models/inc/language_select.php");
       ?>
       <div class="well">
-        <p class="login_reg">test
+        <p class="login_reg">
           <a href="login.php<?php echo $lang_req ?>" class="btn btn-success"><?php echo lang("ACCOUNT_LOGIN_PAGE") ?></a>  
           <a href="register.php<?php echo $lang_req ?>" class="btn btn-success"><?php echo lang("ACCOUNT_REGISTER_PAGE") ?></a>
         </p>
@@ -24,5 +24,4 @@
 </div>
 <?php 
 include("models/inc/gl_footer.php");
-?>
-
+?>

register.php

@@ -39,8 +39,8 @@
 
 	// use the email as the username if configured
 	$username 	= $portal_config['useEmailAsUsername'] ? $email : trim($_POST["username"]);
-	$password 	= md5("somelongthingsurewhynot" + $username); //USE A TEMP PASSWORD FOR NOW
-	
+	$password 	= md5("somelongthingsurewhynot" . $username); //USE A TEMP PASSWORD FOR NOW
+
 	$fname 		= (!empty($_POST["firstname"]) 	? $_POST["firstname"] : null ) ;
 	$lname 		= (!empty($_POST["lastname"]) 	? $_POST["lastname"] : null) ;
 	$zip 		= (!empty($_POST["zip"]) 		? intval($_POST["zip"]) :null ) ;