Merge pull request #1 from norbertglen/master

All changes from phase 4
I-TECH · Feb 22, 2017 · bf2aaac · bf2aaac
2 parents 1cfc0ce + 5223d95
commit bf2aaac
Show file tree

Hide file tree

Showing 1,521 changed files with 65,482 additions and 1,135 deletions.
diff --git a/.buildpath b/.buildpath
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<buildpath>
+	<buildpathentry kind="src" path=""/>
+	<buildpathentry kind="con" path="org.eclipse.php.core.LANGUAGE"/>
+</buildpath>
diff --git a/.project b/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>KenyaGBV</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.dltk.core.scriptbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.php.core.PHPNature</nature>
+	</natures>
+</projectDescription>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+encoding//Reports/index.php=UTF-8
+encoding//Reports/report_by_health_sector.php=UTF-8
+encoding//Sectors/Health/index.php=UTF-8
+encoding//UI/css/style.css=UTF-8
diff --git a/.settings/org.eclipse.php.core.prefs b/.settings/org.eclipse.php.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+include_path=0;/KenyaGBV
+use_asp_tags_as_php=false
diff --git a/.settings/org.eclipse.php.debug.core.Debug_Process_Preferences.prefs b/.settings/org.eclipse.php.debug.core.Debug_Process_Preferences.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.php.debug.core.use-project-settings=true
diff --git a/Data_uploadandapproval/BackUp/data_import bk 17_03-2015-10-47am.php b/Data_uploadandapproval/BackUp/data_import bk 17_03-2015-10-47am.php
@@ -26,7 +26,7 @@
 	  ?>
 	</div> 
 	  </div> 
-	  <div id="main-content">
+	  <div id="main-content_with_side_bar">
 	    <div id="bread-crumbs">
 	      <!--breadcrumbs-->
 	    </div>

diff --git a/Data_uploadandapproval/BackUp/data_import.php b/Data_uploadandapproval/BackUp/data_import.php
@@ -26,7 +26,7 @@
 	  ?>
 	</div> 
 	  </div> 
-	  <div id="main-content">
+	  <div id="main-content_with_side_bar">
 	    <div id="bread-crumbs">
 	      <!--breadcrumbs-->
 	    </div>

diff --git a/Data_uploadandapproval/BackUp/data_importBk.php b/Data_uploadandapproval/BackUp/data_importBk.php
@@ -26,7 +26,7 @@
 	  ?>
 	</div> 
 	  </div> 
-	  <div id="main-content">
+	  <div id="main-content_with_side_bar">
 	    <div id="bread-crumbs">
 	      <!--breadcrumbs-->
 	    </div>

diff --git a/Data_uploadandapproval/BackUp/file_upload-testworked.php b/Data_uploadandapproval/BackUp/file_upload-testworked.php
@@ -44,7 +44,7 @@
 	  ?>
 	</div> 
 	  </div> 
-	  <div id="main-content">
+	  <div id="main-content_with_side_bar">
 	    <div id="bread-crumbs">
 	      <!--breadcrumbs-->
 	    </div>

diff --git a/Data_uploadandapproval/BackUp/file_upload.php b/Data_uploadandapproval/BackUp/file_upload.php
@@ -44,7 +44,7 @@
 	  ?>
 	</div> 
 	  </div> 
-	  <div id="main-content">
+	  <div id="main-content_with_side_bar">
 	    <div id="bread-crumbs">
 	      <!--breadcrumbs-->
 	    </div>

diff --git a/Data_uploadandapproval/BackUp/importdatafile.php b/Data_uploadandapproval/BackUp/importdatafile.php
@@ -42,7 +42,7 @@
 	  ?>
 	</div> 
 	  </div> 
-	  <div id="main-content">
+	  <div id="main-content_with_side_bar">
 	    <div id="bread-crumbs">
 	      <!--breadcrumbs-->
 	    </div>

diff --git a/Data_uploadandapproval/BackUp/upload3.php b/Data_uploadandapproval/BackUp/upload3.php
@@ -42,7 +42,7 @@
 	  ?>
 	</div> 
 	  </div> 
-	  <div id="main-content">
+	  <div id="main-content_with_side_bar">
 	    <div id="bread-crumbs">
 	      <!--breadcrumbs-->
 	    </div>

diff --git a/Data_uploadandapproval/Classes/ImportExcel.class.php b/Data_uploadandapproval/Classes/ImportExcel.class.php
diff --git a/Data_uploadandapproval/Classes/UploadExcel_testworked.class.php b/Data_uploadandapproval/Classes/UploadExcel_testworked.class.php
diff --git a/Data_uploadandapproval/data_approval.php b/Data_uploadandapproval/data_approval.php
@@ -31,7 +31,9 @@
 
 
 
-include "../includes/headerlevel2.php"; 
+//include "../includes/headerlevel2.php"; 
+include "../includes/Dash_header.php"; 
+include "../includes/topbar.php"; //TA:60:1
 include_once('../includes/connection.php');
 include_once('../includes/functions.php');
 
@@ -45,7 +47,7 @@
 	  ?>
 	</div> 
 	  </div> 
-	  <div id="main-content">
+	  <div id="main-content_with_side_bar">
 	    <div id="bread-crumbs">
 	      <!--breadcrumbs-->
 	    </div>

diff --git a/Data_uploadandapproval/data_import.php b/Data_uploadandapproval/data_import.php
@@ -27,7 +27,7 @@
 	  ?>
 	</div> 
 	  </div> 
-	  <div id="main-content">
+	  <div id="main-content_with_side_bar">
 	    <div id="bread-crumbs">
 	      <!--breadcrumbs-->
 	    </div>

diff --git a/Data_uploadandapproval/data_import3.php b/Data_uploadandapproval/data_import3.php
@@ -25,7 +25,7 @@
 	  ?>
 	</div> 
 	  </div> 
-	  <div id="main-content">
+	  <div id="main-content_with_side_bar">
 	    <div id="bread-crumbs">
 	      <!--breadcrumbs-->
 	    </div>

diff --git a/Data_uploadandapproval/file_upload.php b/Data_uploadandapproval/file_upload.php
@@ -34,8 +34,9 @@
 your database.
 */
 
-include "../includes/headerlevel2.php"; 
-
+//include "../includes/headerlevel2.php"; 
+include "../includes/Dash_header.php"; 
+include "../includes/topbar.php"; //TA:60:1
 ?>
 	  <div id="sidebar">
 	  <center><h3 style="text-size:18px;  font-family: TStar-Bol"></h3></center>
@@ -45,7 +46,7 @@
 	  ?>
 	</div> 
 	  </div> 
-	  <div id="main-content">
+	  <div id="main-content_with_side_bar">
 	    <div id="bread-crumbs">
 	      <!--breadcrumbs-->
 	    </div>

diff --git a/Data_uploadandapproval/import_data.php b/Data_uploadandapproval/import_data.php
@@ -19,7 +19,7 @@
 	  ?>
 	</div> 
 	  </div> 
-	  <div id="main-content">
+	  <div id="main-content_with_side_bar">
 	    <div id="bread-crumbs">
 	      <!--breadcrumbs-->
 	    </div>

diff --git a/Data_uploadandapproval/import_files.php b/Data_uploadandapproval/import_files.php
@@ -13,7 +13,9 @@
 $user = unserialize($_SESSION['user']);
 
 
-include "../includes/headerlevel2.php"; 
+//include "../includes/headerlevel2.php"; 
+include "../includes/Dash_header.php"; 
+include "../includes/topbar.php"; //TA:60:1
 ?>
 	  <div id="sidebar">
 	  <center><h3 style="text-size:18px;  font-family: TStar-Bol"></h3></center>
@@ -23,7 +25,7 @@
 	  ?>
 	</div> 
 	  </div> 
-	  <div id="main-content">
+	  <div id="main-content_with_side_bar">
 	    <div id="bread-crumbs">
 	      <!--breadcrumbs-->
 	    </div>

diff --git a/Data_uploadandapproval/import_indicators.php b/Data_uploadandapproval/import_indicators.php
@@ -19,7 +19,7 @@
 	  ?>
 	</div> 
 	  </div> 
-	  <div id="main-content">
+	  <div id="main-content_with_side_bar">
 	    <div id="bread-crumbs">
 	      <!--breadcrumbs-->
 	    </div>

diff --git a/Data_uploadandapproval/reject_file.php b/Data_uploadandapproval/reject_file.php
@@ -57,7 +57,7 @@
 	  ?>
 	</div> 
 	  </div> 
-	  <div id="main-content">
+	  <div id="main-content_with_side_bar">
 	    <div id="bread-crumbs">
 	      <!--breadcrumbs-->
 	    </div>

diff --git a/Data_uploadandapproval/reject_reason.php b/Data_uploadandapproval/reject_reason.php
@@ -69,7 +69,7 @@
 	  ?>
 	</div> 
 	  </div> 
-	  <div id="main-content">
+	  <div id="main-content_with_side_bar">
 	    <div id="bread-crumbs">
 	      <!--breadcrumbs-->
 	    </div>

diff --git a/Data_uploadandapproval/smtpmail/library.php b/Data_uploadandapproval/smtpmail/library.php
@@ -1,8 +1,16 @@
 <?php
-error_reporting(0);
+/*error_reporting(0);
 define("SMTP_HOST", "mail.ardech.co.ke"); //Hostname of the mail server
 define("SMTP_PORT", "587"); //Port of the SMTP like to be 25, 80, 465 or 587
 define("SMTP_UNAME", "info@ardech.co.ke"); //Username for SMTP authentication any valid email created in your domain
-define("SMTP_PWORD", "123.qwe"); //Password for SMTP authentication
+define("SMTP_PWORD", "123.qwe"); //Password for SMTP authentication*/
+// you can get your SMTP host here http://www.asif18.com/6/php/list-of-smtp-and-pop3-severs,-hosts,-ports-email-servers/
+?>
+<?php
+error_reporting(0);
+define("SMTP_HOST", "smtp.gmail.com"); //Hostname of the mail server
+define("SMTP_PORT", "587"); //Port of the SMTP like to be 25, 80, 465 or 587
+define("SMTP_UNAME", "norbertglen7@gmail.com"); //Username for SMTP authentication any valid email created in your domain
+define("SMTP_PWORD", "ldirdkmehmfdatgw"); //Password for SMTP authentication
 // you can get your SMTP host here http://www.asif18.com/6/php/list-of-smtp-and-pop3-severs,-hosts,-ports-email-servers/
-?>
+?>
diff --git a/Data_uploadandapproval/smtpmail/smtpgmail.php b/Data_uploadandapproval/smtpmail/smtpgmail.php
@@ -13,11 +13,11 @@
 $mail->SetFrom("benardkkoech@gmail.com");
 $mail->Subject = "Your Gmail SMTP Mail";
 $mail->Body = "<b>Hi, your first SMTP mail via gmail server has been received. Great Job!.. <br/><br/>by <a href='http://www.asif18.com/7/php/send-mails-using-smtp-in-php-by-gmail-server-or-own-domain-server/'>Asif18</a></b>";
-$mail->AddAddress("benardkkoech@gmail.com");
+$mail->AddAddress("norbertglen7@gmail.com");
  if(!$mail->Send()){
 	echo "Mailer Error: " . $mail->ErrorInfo;
 }
 else{
 	echo "Message has been sent";
 }
-?>
+?>
diff --git a/Data_uploadandapproval/upload2.php b/Data_uploadandapproval/upload2.php
diff --git a/Data_uploadandapproval/view_file.php b/Data_uploadandapproval/view_file.php
@@ -63,7 +63,7 @@
 //If the form wasn't submitted, or didn't validate
 //then we show the registration form again
 
-include "includes/header.php"; 
+include "includes/Dash_header.php";include "includes/topbar.php"; //TA:60:1 
 ?>
 	  <div id="sidebar">
 	  <center><h3 style="text-size:18px; font-family: TStar-Bol"></h3></center>
@@ -73,7 +73,7 @@
 	  ?>
 	</div> 
 	  </div> 
-	  <div id="main-content">
+	  <div id="main-content_with_side_bar">
 	    <div id="bread-crumbs">
 	      <!--breadcrumbs-->
 	    </div>

diff --git a/Data_uploadandapproval/view_uploaded.php b/Data_uploadandapproval/view_uploaded.php
@@ -9,7 +9,9 @@
 
 //get the user object from the session
 $user = unserialize($_SESSION['user']);
-include "../includes/headerlevel2.php"; 
+//include "../includes/headerlevel2.php"; 
+include "../includes/Dash_header.php"; 
+include "../includes/topbar.php"; //TA:60:1
 ?>
  <div id="sidebar">
 	  <center><h3 style="text-size:18px;  font-family: TStar-Bol"></h3></center>
@@ -19,7 +21,7 @@
 	  ?>
 	</div> 
 	  </div> 
-	  <div id="main-content">
+	  <div id="main-content_with_side_bar">
 	    <div id="bread-crumbs">
 	      <!--breadcrumbs-->
 	    </div>
@@ -77,7 +79,7 @@
                           <th align="left"><b>Indicator</b></th>
 			  <th align="left"><b>County</b></th>
 			  <th align="left"><b>Survey Period</b></th>
-			  <th align="left"><b>Agregates</b></th>
+			  <th align="left"><b>Aggregates</b></th>
 			  <!--<th align="left"><b>Date</b></th>-->
 
 
@@ -122,4 +124,4 @@
 	//Redirect user back to login page if there is no valid session created
 	header("Location: ../../login.php");
 }
-?>
+?>
diff --git a/Database/gbvis_1-4-2015_12-40pm.sql b/Database/gbvis_1-4-2015_12-40pm.sql
diff --git a/Database/gbvis_16 _03_2015_12_30pm.sql b/Database/gbvis_16 _03_2015_12_30pm.sql
diff --git a/Database/gbvis_7-04-15_10-15am.sql b/Database/gbvis_7-04-15_10-15am.sql
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		eclipse.preferences.version=1
		org.eclipse.php.debug.core.use-project-settings=true