Fixes Made after Server Testing (#47)

* Minor Fixes and Fixes * Minor Fixes
bearlike · Apr 24, 2020 · b919d2c · b919d2c
1 parent 6ba940a
commit b919d2c
Show file tree

Hide file tree

Showing 31 changed files with 74 additions and 69 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 # Git ignore file for
-# https://github.com/K-Kraken/cms-for-organisations
+# https://github.com/K-Kraken/REMS-For-Organisations
 
 # Uploaded Files for certificate generation
 members/CDS_Admin/Uploaded files/

diff --git a/README.md b/README.md
@@ -1,20 +1,21 @@
 <h1 align="center">
   <br>
-  <img src="https://i.imgur.com/BypQLTA.png" alt="CMS For Organisations" height="250px">
+  <img src="https://i.imgur.com/w5PZAuO.png" alt="CMS For Organisations" height="250px">
   <br>
 </h1>
-<h4 align="center">User-friendly CMS for small organisations and clubs. Form Generator, Mailer, Certificate Generator and much more :)</h4>
+<h4 align="center">User-friendly REMS for small organisations and clubs. Form Generator, Mailer, Certificate Generator and much more :)</h4>
 
 <p align="center">
-  <img src="https://img.shields.io/github/last-commit/K-Kraken/cms-for-organisations?color=blue&style=flat-square">
-  <a href="/LICENSE"><img src="https://img.shields.io/github/license/K-Kraken/cms-for-organisations.svg?style=flat-square"></a>
-     <a href="https://github.com/K-Kraken/cms-for-organisations/issues"><img src="https://img.shields.io/github/issues-raw/K-Kraken/cms-for-organisations?color=red&style=flat-square"/></a>
+  <img src="https://img.shields.io/github/last-commit/K-Kraken/REMS-For-Organisations?color=blue&style=flat-square">
+  <a href="/LICENSE"><img src="https://img.shields.io/github/license/K-Kraken/REMS-For-Organisations.svg?style=flat-square"></a>
+     <a href="https://github.com/K-Kraken/REMS-For-Organisations/issues"><img src="https://img.shields.io/github/issues-raw/K-Kraken/REMS-For-Organisations?color=red&style=flat-square"/></a>
 </p>
 
 
 
 
 
+
 ### Why are we doing it?
 We are running a chapter (club) at our college. We organize 20+ events for our 1500+ participants. It was a tedious process to manually make forms, certificates, advertising via mail so we decided to automate that process. Any organization, clubs or institutions looking for a similar service can fork our project and tweak it according to their needs.
 
@@ -31,11 +32,11 @@ What things you need to run the software:
 
 ### Installation
 
-1. Create and Import the CMS Database dump for  **MySQL-MariaDB** from [here](/docs/files/Sample_CMS_Database.sql) 
+1. Create and Import the Main Database dump for  **MySQL-MariaDB** from [here](/docs/files/Sample_REMS_Database.sql) 
 2. Create a Forms Database.
 3. Copy the files from this repository to a location in the root directory of the web server
 4. Rename `member/secrets.php_` to `member/secrets.php`
-5. Update your database credentials, databases names (CMS and Forms) and API Keys in `member/secrets.php` and `public/cds-public.php`
+5. Update your database credentials, databases names (Main and Forms) and API Keys in `member/secrets.php` and `public/cds-public.php`
 6. With your Web Server and MySQL server running, visit the site
    - ```
       Default Username: admin
@@ -117,9 +118,9 @@ Perhaps our most desired feature, it gives an option to toggle the page between
 
 
 ## Outside Contributors
-| Contributors           |     Profile Links                        | PR               |
-| ---------------------- | ---------------------------------------- | -----------------| 
-| **Dhiraj V**           | [dhirajv2000](https://github.com/dhirajv2000) | [#28](https://github.com/K-Kraken/cms-for-organisations/pull/28)              |
+| Contributors | Profile Links                                 | PR                                                           |
+| ------------ | --------------------------------------------- | ------------------------------------------------------------ |
+| **Dhiraj V** | [dhirajv2000](https://github.com/dhirajv2000) | [#28](https://github.com/K-Kraken/REMS-For-Organisations/pull/28) |
 
 ## Acknowledgments
 

diff --git a/docs/files/Sample_CMS_Database.sql → docs/files/Sample_REMS_Database.sql b/docs/files/Sample_CMS_Database.sql → docs/files/Sample_REMS_Database.sql
@@ -1,5 +1,5 @@
 -- CMS For Organisations
--- Link: https://github.com/K-Kraken/cms-for-organisations
+-- Link: https://github.com/K-Kraken/REMS-For-Organisations
 -- --------------------------------------------------------------
 -- Name: SQL Dump
 -- Made on version 4.9.1
@@ -9,7 +9,7 @@
 --
 
 --
--- Database: `main_cms_database` represented by $dbname in the secrets.php
+-- Database: `main_rems_database` represented by $MainDB in the secrets.php
 --
 
 DELIMITER $$

diff --git a/docs/images/logo.png b/docs/images/logo.png
diff --git a/index.php b/index.php
@@ -1,9 +1,10 @@
+<?php include("members/secrets_.php");  ?>
 <html>
 
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
-    <title>Certificate Distribution System (CDS): SVCE-ACM</title>
+    <title>Certificate Distribution System (CDS):<?php echo " ".$OrgName; ?></title>
     <link rel="icon" type="image/png" sizes="600x600" href="assets/img/Logo_White.png">
     <link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i">

diff --git a/members/activity-log.php b/members/activity-log.php
@@ -13,7 +13,7 @@
 } else {
     $perPage = $_GET['perPage'];
 }
-$conn = new mysqli($servername, $username, $password, $dbname);
+$conn = new mysqli($servername, $username, $password, $MainDB);
 // Check connection
 if ($conn->connect_error) {
     die("Connection failed: " . $conn->connect_error);
@@ -34,7 +34,7 @@
 <head id="head_tag">
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
-    <title>Activity Log: SVCE-ACM</title>
+    <title>Activity Log:<?php echo " ".$OrgName; ?></title>
     <link rel="icon" type="image/png" sizes="600x600" href="../assets/img/Logo_White.png">
     <link rel="stylesheet" href="../assets/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i">

diff --git a/members/cds-admin.php b/members/cds-admin.php
@@ -18,7 +18,7 @@
             echo "<title>Generating</title>";
         }
         else{
-            echo "<title>CDS Admin: SVCE-ACM CMS</title>";
+            echo "<title>CDS Admin:".$OrgName."</title>";
         }
     ?>
     <link rel="icon" type="image/png" sizes="600x600" href="../assets/img/Logo_White.png">
@@ -113,7 +113,7 @@ class="fa fa-upload" aria-hidden="true"></i></a>
         }
     }
     echo "<br>";
-    $conn = new mysqli($servername, $username, $password, $dbname);
+    $conn = new mysqli($servername, $username, $password, $MainDB);
     if ($conn->connect_error) {
         die("Connection failed: " . $conn->connect_error); // IF-Fail to Connect
     }

diff --git a/members/change-password.php b/members/change-password.php
@@ -1,12 +1,8 @@
 <?php
 include('mainFunction.php');
 include("secrets_.php");
-$servername ='localhost';
-$username = 'root';
-$password = '';
-$dbname = 'svcehost_cms';
 
-$conn = new mysqli($servername, $username, $password, $dbname);
+$conn = new mysqli($servername, $username, $password, $MainDB);
 if ($conn->connect_error) {
     die("Connection failed: " . $conn->connect_error);
 }
@@ -47,7 +43,7 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
-    <title>Forgotten Password - SVCE-ACM: CMS</title>
+    <title>Forgotten Password -<?php echo " ".$OrgName; ?></title>
     <link rel="icon" type="image/png" sizes="600x600" href="../assets/img/Logo_White.png">
     <link rel="stylesheet" href="../assets/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i">

diff --git a/members/dashboard.php b/members/dashboard.php
@@ -1,6 +1,6 @@
 <?php
     include("header.php");
-    $conn1 = new mysqli($servername, $username, $password, $dbname);
+    $conn1 = new mysqli($servername, $username, $password, $MainDB);
     // Check connection
     if ($conn1->connect_error) {
         die("Connection failed: " . $conn->connect_error);
@@ -31,7 +31,7 @@
 <head id="head_tag">
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
-    <title>Dashboard: SVCE-ACM CMS</title>
+    <title>Dashboard:<?php echo " ".$OrgName; ?></title>
     <link rel="icon" type="image/png" sizes="600x600" href="../assets/img/Logo_White.png">
     <link rel="stylesheet" href="../assets/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i">
@@ -44,7 +44,7 @@
      <?php include("navigation.php"); ?>
             <div class="container-fluid">
                 <div class="d-sm-flex justify-content-between align-items-center mb-4">
-                    <h3 class="text-dark mb-0">Welcome!</h3><a class="btn btn-danger btn-sm d-none d-sm-inline-block" role="button" href="https://github.com/K-Kraken/cms-for-organisations/issues" style="background-color: #ce1126;border-color: #e5053a;"><i class="fas fa-bug fa-sm text-white-50"></i>&nbsp;Raise a Issue</a></div>
+                    <h3 class="text-dark mb-0">Welcome!</h3><a class="btn btn-danger btn-sm d-none d-sm-inline-block" role="button" href="https://github.com/K-Kraken/REMS-For-Organisations/issues" style="background-color: #ce1126;border-color: #e5053a;"><i class="fas fa-bug fa-sm text-white-50"></i>&nbsp;Raise a Issue</a></div>
                 <div
                     class="row">
                     <div class="col-md-6 col-xl-4 mb-4">

diff --git a/members/db-manage.php b/members/db-manage.php
@@ -16,15 +16,15 @@
     }
     if(!(empty($_POST['db']))){
         if($_POST['db']==1)
-            $db=$dbname;
+            $db=$MainDB;
         else if($_POST['db']==2)
             $db=$formDB;
         else if($_POST['db']==3)
             $db=$mailerDB;
     }
     else{
         $_POST['db']=1;
-        $db=$dbname;
+        $db=$MainDB;
     }
     if(empty($_GET['search'])){
         $_GET['search']="";
@@ -75,7 +75,7 @@
 <head id="head_tag">
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
-    <title>Database Management: SVCE-ACM</title>
+    <title>Database Management:<?php echo " ".$OrgName; ?></title>
     <link rel="icon" type="image/png" sizes="600x600" href="../assets/img/Logo_White.png">
     <link rel="stylesheet" href="../assets/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i">

diff --git a/members/db-ops/delete.php b/members/db-ops/delete.php
@@ -15,7 +15,7 @@
         header('Location: ../pages/error.php?error=Error while executing the query');
     }
     $submit_stmt->execute();
-     if($_POST['db']==$dbname)
+     if($_POST['db']==$MainDB)
          $dbc=1;
      else if($_POST['db']==$formDB)
 	    $dbc=2;

diff --git a/members/db-ops/insert.php b/members/db-ops/insert.php
@@ -25,7 +25,7 @@
 	if (!$submit_stmt) {
 		header('Location: ../pages/error.php?error='.$conn->error);
 	}
-     if($_POST['db']==$dbname)
+     if($_POST['db']==$MainDB)
          $dbc=1;
      else if($_POST['db']==$formDB)
 	    $dbc=2;

diff --git a/members/db-ops/modify.php b/members/db-ops/modify.php
@@ -38,7 +38,7 @@
         }
         $updateSQL=$updateSQL." WHERE id=".$id;
         echo $updateSQL."<br><br>";
-        if($_POST['db']==$dbname)
+        if($_POST['db']==$MainDB)
             $dbc=1;
         else if($_POST['db']==$formDB)
             $dbc=2;
@@ -60,7 +60,7 @@
 <head id="head_tag">
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
-    <title>Modify Row: SVCE-ACM</title>
+    <title>Modify Row:<?php echo " ".$OrgName; ?></title>
     <link rel="icon" type="image/png" sizes="600x600" href="../../assets/img/Logo_White.png">
     <link rel="stylesheet" href="../../assets/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i">

diff --git a/members/db-ops/pushAlert.php b/members/db-ops/pushAlert.php
@@ -1,6 +1,6 @@
 <?php
      include("../header.php");
-     $alertConn = new mysqli($servername, $username, $password, $dbname);
+     $alertConn = new mysqli($servername, $username, $password, $MainDB);
      if ($alertConn->connect_error) {
      	die("Connection failed: " . $alertConn->connect_error);
      }

diff --git a/members/forgot-password.php b/members/forgot-password.php
@@ -10,7 +10,7 @@
 require '../src/PHPMailer/SMTP.php';
 
 
-$conn = new mysqli($servername, $username, $password, $dbname);
+$conn = new mysqli($servername, $username, $password, $MainDB);
 if ($conn->connect_error) {
     die("Connection failed: " . $conn->connect_error);
 }
@@ -20,7 +20,7 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
-    <title>Forgotten Password - SVCE-ACM: CMS</title>
+    <title>Forgotten Password -<?php echo " ".$OrgName; ?></title>
     <link rel="icon" type="image/png" sizes="600x600" href="../assets/img/Logo_White.png">
     <link rel="stylesheet" href="../assets/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i">

diff --git a/members/form-gen/index.php b/members/form-gen/index.php
@@ -37,7 +37,7 @@
 <head id="head_tag">
      <meta charset="utf-8">
      <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
-     <title>From Generator: SVCE-ACM</title>
+     <title>From Generator:<?php echo " ".$OrgName; ?></title>
      <link rel="icon" type="image/png" sizes="600x600" href="../../assets/img/Logo_White.png">
      <link rel="stylesheet" href="../../assets/bootstrap/css/bootstrap.min.css">
      <link rel="stylesheet"

diff --git a/members/form-gen/view-reg.php b/members/form-gen/view-reg.php
@@ -111,7 +111,7 @@
 <head id="head_tag">
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
-    <title>View Registrants: SVCE-ACM</title>
+    <title>View Registrants:<?php echo " ".$OrgName; ?></title>
     <link rel="icon" type="image/png" sizes="600x600" href="../../assets/img/Logo_White.png">
     <link rel="stylesheet" href="../../assets/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i">

diff --git a/members/link-short.php b/members/link-short.php
@@ -66,7 +66,7 @@
 <head id="head_tag">
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
-    <title>Link Shortener: SVCE-ACM CMS</title>
+    <title>Link Shortener:<?php echo " ".$OrgName; ?></title>
     <link rel="icon" type="image/png" sizes="600x600" href="../assets/img/Logo_White.png">
     <link rel="stylesheet" href="../assets/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i">

diff --git a/members/mail-list.php b/members/mail-list.php
@@ -12,7 +12,7 @@
 <head id="head_tag">
      <meta charset="utf-8">
      <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
-     <title>Mailing List: SVCE-ACM CMS</title>
+     <title>Mailing List:<?php echo " ".$OrgName; ?></title>
      <link rel="icon" type="image/png" sizes="600x600" href="../assets/img/Logo_White.png">
      <link rel="stylesheet" href="../assets/bootstrap/css/bootstrap.min.css">
      <link rel="stylesheet"

diff --git a/members/mailer.php b/members/mailer.php
@@ -23,7 +23,7 @@
 <head id="head_tag">
      <meta charset="utf-8">
      <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
-     <title>Bulk Mailer: SVCE-ACM CMS</title>
+     <title>Bulk Mailer:<?php echo " ".$OrgName; ?></title>
      <link rel="icon" type="image/png" sizes="600x600" href="../assets/img/Logo_White.png">
      <link rel="stylesheet" href="../assets/bootstrap/css/bootstrap.min.css">
      <link rel="stylesheet"

diff --git a/members/mainFunction.php b/members/mainFunction.php
@@ -3,7 +3,7 @@
 // Call Example: logActivity($_SESSION['uname'], "Log Something");
 function logActivity($loggedOnUser, $log) {
       include("secrets_.php");
-  $logActivityConn = new mysqli($servername, $username, $password, $dbname);
+  $logActivityConn = new mysqli($servername, $username, $password, $MainDB);
   if ($logActivityConn->connect_error) {
       die("Connection failed: " . $logActivityConn->connect_error);
   }
@@ -22,7 +22,7 @@ function logActivity($loggedOnUser, $log) {
 // Call Example: retIsAdmin($_SESSION['uname']);
 function retIsAdmin($loggedOnUser) {
       include("secrets_.php");
-      $retIsAdmin = new mysqli($servername, $username, $password, $dbname);
+      $retIsAdmin = new mysqli($servername, $username, $password, $MainDB);
       if ($retIsAdmin->connect_error) {
             die("Connection failed: " . $retIsAdmin->connect_error);
       }
@@ -40,7 +40,7 @@ function retIsAdmin($loggedOnUser) {
 // Call Example: retProfilePic($_SESSION['uname']);
 function retProfilePic($loggedOnUser) {
       include("secrets_.php");
-      $retProfilePic = new mysqli($servername, $username, $password, $dbname);
+      $retProfilePic = new mysqli($servername, $username, $password, $MainDB);
       if ($retProfilePic->connect_error) {
             die("Connection failed: " . $retProfilePic->connect_error);
       }

diff --git a/members/member-login.php b/members/member-login.php
@@ -1,4 +1,5 @@
 <?php
+    include("secrets_.php");
     session_start();
     if (!empty($_SESSION)){
         if ($_SESSION['remember']==1){
@@ -18,7 +19,7 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
-    <title>Login: SVCE-ACM</title>
+    <title>Login:<?php echo " ".$OrgName; ?></title>
     <link rel="icon" type="image/png" sizes="600x600" href="../assets/img/Logo_White.png">
     <link rel="stylesheet" href="../assets/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i">

diff --git a/members/navigation.php b/members/navigation.php
@@ -8,7 +8,7 @@
 
 $alertCount=0;
 $readReamining="";
-$retAlerts = new mysqli($servername, $username, $password, $dbname);
+$retAlerts = new mysqli($servername, $username, $password, $MainDB);
 if ($retAlerts->connect_error) {
 	die("Connection failed: " . $retAlerts->connect_error);
 }

diff --git a/members/pages/404.php b/members/pages/404.php
@@ -4,7 +4,7 @@
 <head id="head_tag">
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
-    <title>Page Not Found: SVCE-ACM</title>
+    <title>Page Not Found:<?php echo " ".$OrgName; ?></title>
     <link rel="icon" type="image/png" sizes="600x600" href="../../assets/img/Logo_White.png">
     <link rel="stylesheet" href="../../assets/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i">

diff --git a/members/pages/error.php b/members/pages/error.php
@@ -12,7 +12,7 @@
 <head id="head_tag">
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
-    <title>Uh-Oh: SVCE-ACM</title>
+    <title>Uh-Oh:<?php echo " ".$OrgName; ?></title>
     <link rel="icon" type="image/png" sizes="600x600" href="../../assets/img/Logo_White.png">
     <link rel="stylesheet" href="../../assets/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i">