Home Explore Help
Sign In
aspeer
/
PublicPrinterControl
Watch 1
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Finalise copyright

Aaron Speer 6 years ago
parent
8f6ed35ad4
commit
a8d298804f
10 changed files with 94 additions and 8 deletions
Split View Show Diff Stats
  1. 7 0
      app/Controller.php
  2. 13 1
      app/Controllers/HomeController.php
  3. 7 0
      app/Model.php
  4. 7 0
      app/Models/HomeModel.php
  5. 6 0
      app/View.php
  6. 6 0
      public/index.php
  7. 10 2
      views/home.twig
  8. 19 3
      views/templates/app.twig
  9. 10 1
      views/templates/partials/navigation.twig
  10. 9 1
      views/upload.twig

+ 7 - 0
app/Controller.php
View File 

@@ -1,4 +1,11 @@
 
 <?php
 
+/**
 
+ * Public Printer Control System
 
+ *
 
+ * Copyright © 2018 - 2019, Aaron Speer, aaron.speerfamily.ie ajamesspeer@gmail.com.
 
+ * All Rights Reserved.
 
+ */
 
+
 
 namespace App;
 
 class Controller {
 
 }

+ 13 - 1
app/Controllers/HomeController.php
View File 

@@ -1,4 +1,11 @@
 
 <?php
 
+/**
 
+ * Public Printer Control System
 
+ *
 
+ * Copyright © 2018 - 2019, Aaron Speer, aaron.speerfamily.ie ajamesspeer@gmail.com.
 
+ * All Rights Reserved.
 
+ */
 
+
 
 namespace App\Controllers;
 
 
 use App\Models\HomeModel;
 
@@ -14,8 +21,11 @@ class HomeController extends Controller {
 
   }
 
 
   public function index(){
 
+    global $config;
 
     echo $this->twig->render('home.twig', array(
 
 			"messages" => $this->model->getMessages(),
 
+      "instr" => $config["step2instructions"],
 
+      "name" => $config["appname"]
 
     ));
 
   }
 
 
@@ -49,7 +59,9 @@ class HomeController extends Controller {
 
   			"messages" => $this->model->getMessages(),
 
         "link" => $address,
 
         "printers" => $config["printers"],
 
-        "path" => escapeshellcmd($address)
 
+        "path" => escapeshellcmd($address),
 
+        "instr" => $config["failedinstructions"],
 
+        "name" => $config["appname"]
 
       ));
 
     }
 
     else {

+ 7 - 0
app/Model.php
View File 

@@ -1,4 +1,11 @@
 
 <?php
 
+/**
 
+ * Public Printer Control System
 
+ *
 
+ * Copyright © 2018 - 2019, Aaron Speer, aaron.speerfamily.ie ajamesspeer@gmail.com.
 
+ * All Rights Reserved.
 
+ */
 
+
 
 namespace App;
 
 class Model {
 
   public function sanitiseData($data)

+ 7 - 0
app/Models/HomeModel.php
View File 

@@ -1,4 +1,11 @@
 
 <?php
 
+/**
 
+ * Public Printer Control System
 
+ *
 
+ * Copyright © 2018 - 2019, Aaron Speer, aaron.speerfamily.ie ajamesspeer@gmail.com.
 
+ * All Rights Reserved.
 
+ */
 
+
 
 namespace App\Models;
 
 use App\Model;
 
 class HomeModel extends Model

+ 6 - 0
app/View.php
View File 

@@ -1,4 +1,10 @@
 
 <?php
 
+/**
 
+ * Public Printer Control System
 
+ *
 
+ * Copyright © 2018 - 2019, Aaron Speer, aaron.speerfamily.ie ajamesspeer@gmail.com.
 
+ * All Rights Reserved.
 
+ */
 
 
 function viewError($name, $content, $type) {
 
   return "<div class='alert alert-" . $type . "'> <a href='#' class='close' data-dismiss='alert' aria-label='close'>&times;</a>" . "<strong>" . $name . "</strong> " . $content . "</div>";

+ 6 - 0
public/index.php
View File 

@@ -1,4 +1,10 @@
 
 <?php
 
+/**
 
+ * Public Printer Control System
 
+ *
 
+ * Copyright © 2018 - 2019, Aaron Speer, aaron.speerfamily.ie ajamesspeer@gmail.com.
 
+ * All Rights Reserved.
 
+ */
 
 
 exec("find tmp -mmin +4 | sed 's/\s/\\&/g' | xargs rm -rf");
 
 exec("mkdir tmp");

+ 10 - 2
views/home.twig
View File 

@@ -1,8 +1,16 @@
 
+{#
 
+/**
 
+ * Public Printer Control System
 
+ *
 
+ * Copyright © 2018 - 2019, Aaron Speer, aaron.speerfamily.ie ajamesspeer@gmail.com.
 
+ * All Rights Reserved.
 
+ */
 
+#}
 
 {% extends "templates/app.twig" %}
 
 {% block content %}
 
 
 <div class="page-header">
 
-  <h1>Welcome to the SAIMUN 2019 Public Printing Web App</h1>
 
+  <h1>Welcome to the {{name}} Public Printing Web App</h1>
 
 </div>
 
 {% for message in messages %}
 
   {{ makeError(message[0], message[1], message[2]) | raw }}
 
@@ -16,7 +24,7 @@
 
       <div class="panel-body">
 
         <ol>
 
           <li>Select the file you wish to print using the button on this page. PDFs work best, however most simple Word files should work.</li>
 
-          <li>If you have a .pages (Apple Pages), or more complex Word file (i.e. Formatted Notepaper) please export it as a PDF, or use the public PCs on the 2nd floor</li>
 
+          <li>{{instr}}</li>
 
           <li>Press the "Preview and Print" button</li>
 
           <li>You will then be prompted to view the file, enter number of copies and select printer</li>
 
           <li>Your document will then be added to the print queue</li>

+ 19 - 3
views/templates/app.twig
View File 

@@ -1,7 +1,23 @@
 
+{#
 
+/**
 
+ * Public Printer Control System
 
+ *
 
+ * Copyright © 2018 - 2019, Aaron Speer, aaron.speerfamily.ie ajamesspeer@gmail.com.
 
+ * All Rights Reserved.
 
+ */
 
+#}
 
 <!DOCTYPE html>
 
+<!--
 
+/**
 
+ * Public Printer Control System
 
+ *
 
+ * Copyright © 2018 - 2019, Aaron Speer, aaron.speerfamily.ie ajamesspeer@gmail.com.
 
+ * All Rights Reserved.
 
+ */
 
+-->
 
 <html lang="en">
 
 <head>
 
-  <title>SAIMUN Print</title>
 
+  <title>{{name}} Print</title>
 
   <meta charset="utf-8">
 
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
   <link rel="stylesheet" href="/assets/style.css">
 
@@ -14,8 +30,8 @@
 
     {% block content %}{% endblock %}
 
   </div>
 
   <div class="footer">
 
-   <p class="text-muted"><br>SAIMUN Print<br>
 
-     Copyright <a href="mailto:ajamesspeer@gmail.com">Aaron Speer</a>, © 2016-{{ "now"|date("Y") }},<br>
 
+   <p class="text-muted"><br>Powered By Public Printer Control System<br>
 
+     Copyright <a href="https://aaron.speerfamily.ie">Aaron Speer</a>, © 2016-{{ "now"|date("Y") }},<br>
 
  </div>
 
  <link rel="stylesheet" href="/assets/yetibootstrap.min.css">
 
  <script src="/assets/jquery.min.js"></script>

+ 10 - 1
views/templates/partials/navigation.twig
View File 

@@ -1,3 +1,12 @@
 
+{#
 
+/**
 
+ * Public Printer Control System
 
+ *
 
+ * Copyright © 2018 - 2019, Aaron Speer, aaron.speerfamily.ie ajamesspeer@gmail.com.
 
+ * All Rights Reserved.
 
+ */
 
+#}
 
+
 
 <nav class="navbar navbar-default navbar-fixed-top">
 
 <div class="container">
 
   <div class="navbar-header">
 
@@ -6,7 +15,7 @@
 
       <span class="icon-bar"></span>
 
       <span class="icon-bar"></span>
 
     </button>
 
-    <a  class="navbar-brand" href="/">SAIMUN 2019</a>
 
+    <a  class="navbar-brand" href="/">{{name}}</a>
 
   </div>
 
   <div class="collapse navbar-collapse" id="myNavbar">
 
     <ul class="nav navbar-nav">

+ 9 - 1
views/upload.twig
View File 

@@ -1,3 +1,11 @@
 
+{#
 
+/**
 
+ * Public Printer Control System
 
+ *
 
+ * Copyright © 2018 - 2019, Aaron Speer, aaron.speerfamily.ie ajamesspeer@gmail.com.
 
+ * All Rights Reserved.
 
+ */
 
+#}
 
 {% extends "templates/app.twig" %}
 
 {% block content %}
 
 
@@ -72,7 +80,7 @@
 
   <div id="esc" style="display: none" class="panel panel-danger">
 
     <div class="panel-heading">Failed!</div>
 
     <div class="panel-body">
 
-      <p>Try uploading a PDF, or use the public PCs on the 2nd Floor</p>
 
+      <p>{{instr}}</p>
 
       <a href="/" class="btn btn-danger">Return to Homepage</a>
 
     </div>
 
   </div>