From 9714f3d8cc311f3b75a4727156de2ab33cf3895e Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Wed, 27 Jul 2016 16:28:19 +0200
Subject: Removed redundant whitespace & retab
---
classes/file.php | 228 +++++++++++++++---------------
classes/response.php | 166 +++++++++++-----------
conf.php | 6 +-
css/businessadmin.css | 42 +++---
footer.php | 3 +-
header.php | 68 ++++-----
include/404.php | 36 ++---
include/about.php | 112 +++++++--------
include/ajax-collapse.php | 4 +-
include/assignments-edit.php | 6 +-
include/assignments-new.php | 6 +-
include/assignments-overview.php | 288 +++++++++++++++++++-------------------
include/assignments-view.php | 10 +-
include/assignments.php | 6 +-
include/clients-edit.php | 6 +-
include/clients-new.php | 6 +-
include/clients-overview.php | 190 ++++++++++++-------------
include/clients-view.php | 6 +-
include/clients.php | 6 +-
include/contacts-edit.php | 6 +-
include/contacts-new.php | 6 +-
include/contacts.php | 6 +-
include/discounts-edit.php | 6 +-
include/discounts-new.php | 6 +-
include/discounts-overview.php | 28 ++--
include/discounts.php | 6 +-
include/home.php | 2 +-
include/offers-edit.php | 6 +-
include/offers-new.php | 6 +-
include/offers-overview.php | 8 +-
include/offers-view.php | 292 +++++++++++++++++++--------------------
include/offers.php | 6 +-
include/users-new.php | 6 +-
install/index.php | 8 +-
install/upgrade.php | 6 +-
js/businessadmin.js | 186 ++++++++++++-------------
login-ajax.php | 10 +-
login.php | 10 +-
nav.php | 6 +-
39 files changed, 905 insertions(+), 906 deletions(-)
diff --git a/classes/file.php b/classes/file.php
index f6019ec..b07064e 100644
--- a/classes/file.php
+++ b/classes/file.php
@@ -1,22 +1,22 @@
.
*/
@@ -25,124 +25,124 @@
* An interface to the file table in the database
*/
class file {
- /**
- * @var PDO $pdo The PDO class for database communication
- * @var int $id The id of the file
- * @var string $filename The relative path to the file
- */
- protected $pdo, $id, $filename;
+ /**
+ * @var PDO $pdo The PDO class for database communication
+ * @var int $id The id of the file
+ * @var string $filename The relative path to the file
+ */
+ protected $pdo, $id, $filename;
- /**
- * Create a new instance
- *
- * @param PDO $pdo The PDO class, to access the database
- * @param int $id The id of the file to fetch
- *
- * @throws PDOException If something went wrong with the database
- * @throws Exception If the file could not be found
- */
- public function __construct($pdo, $id) {
- $this->pdo = $pdo;
+ /**
+ * Create a new instance
+ *
+ * @param PDO $pdo The PDO class, to access the database
+ * @param int $id The id of the file to fetch
+ *
+ * @throws PDOException If something went wrong with the database
+ * @throws Exception If the file could not be found
+ */
+ public function __construct($pdo, $id) {
+ $this->pdo = $pdo;
- $stmt = $this->pdo->prepare("SELECT * FROM `".constants::db_prefix."file` WHERE `id`=?");
- $stmt->execute(array($id));
- if ($stmt->rowCount() == 0) {
- throw new Exception("The file with id '$id' could not be found.");
- }
- $file = $stmt->fetch(PDO::FETCH_ASSOC);
+ $stmt = $this->pdo->prepare("SELECT * FROM `".constants::db_prefix."file` WHERE `id`=?");
+ $stmt->execute(array($id));
+ if ($stmt->rowCount() == 0) {
+ throw new Exception("The file with id '$id' could not be found.");
+ }
+ $file = $stmt->fetch(PDO::FETCH_ASSOC);
- $this->id = $file['id'];
- $this->filename = $file['filename'];
- }
+ $this->id = $file['id'];
+ $this->filename = $file['filename'];
+ }
- //------------------------------------------------------------------------------
- // Getters and setters
- //------------------------------------------------------------------------------
+ //------------------------------------------------------------------------------
+ // Getters and setters
+ //------------------------------------------------------------------------------
- /**
- * Get the ID of the file
- *
- * @return int The ID
- */
- public function getId() {
- return $this->id;
- }
+ /**
+ * Get the ID of the file
+ *
+ * @return int The ID
+ */
+ public function getId() {
+ return $this->id;
+ }
- /**
- * Get the relative filename of the file
- *
- * @see file::getFilenamePath To get the full internal path to the file
- * @see file::getFilenameURI To get the full external path to the file
- *
- * @return string The filename
- */
- public function getFilename() {
- return $this->filename;
- }
+ /**
+ * Get the relative filename of the file
+ *
+ * @see file::getFilenamePath To get the full internal path to the file
+ * @see file::getFilenameURI To get the full external path to the file
+ *
+ * @return string The filename
+ */
+ public function getFilename() {
+ return $this->filename;
+ }
- /**
- * Get the full internal path to the file
- *
- * @see file::getFilename To get the relative filename
- * @see file::getFilenameURI To get the full external path to the file
- *
- * @return string The path
- */
- public function getFilenamePath() {
- return constants::files_folder . $this->filename;
- }
+ /**
+ * Get the full internal path to the file
+ *
+ * @see file::getFilename To get the relative filename
+ * @see file::getFilenameURI To get the full external path to the file
+ *
+ * @return string The path
+ */
+ public function getFilenamePath() {
+ return constants::files_folder . $this->filename;
+ }
- /**
- * Get the full external path to the file
- *
- * @see file::getFilename To get the relative filename
- * @see file::getFilenamePath To get the full internal path to the file
- *
- * @return string The URI
- */
- public function getFilenameURI() {
- return constants::files_folder_external . $this->filename;
- }
+ /**
+ * Get the full external path to the file
+ *
+ * @see file::getFilename To get the relative filename
+ * @see file::getFilenamePath To get the full internal path to the file
+ *
+ * @return string The URI
+ */
+ public function getFilenameURI() {
+ return constants::files_folder_external . $this->filename;
+ }
- //------------------------------------------------------------------------------
- // Other functions
- //------------------------------------------------------------------------------
+ //------------------------------------------------------------------------------
+ // Other functions
+ //------------------------------------------------------------------------------
- /**
- * Move this file to the trash and delete all records for it
- *
- * Physically, this moves the file to a trash folder
- * Then, the file will be removed from the file table in the database
- * Any appendices linking to this file with fileId will have fileId NULL
- * Any offers linking to this file with invoice_fileId will have invoice_fileId NULL
- *
- * @throws PDOException If there's something wrong with the database
- *
- * @return bool True on success, false on failure
- */
- public function delete() {
- // Try to move the file to trash
- $newname = pathinfo($this->filename, PATHINFO_FILENAME) . '--' . date('Y-m-d.H.i.s.') . pathinfo($this->filename, PATHINFO_EXTENSION);
- $newdir = pathinfo($this->getFilenamePath(), PATHINFO_DIRNAME) . '/' . constants::files_folder_trash . '/';
- if (!file_exists($newdir)) {
- if (!mkdir($newdir)) {
- return false;
- }
- }
- if (!(@rename($this->getFilenamePath(), $newdir . $newname))) {
- return false;
- }
+ /**
+ * Move this file to the trash and delete all records for it
+ *
+ * Physically, this moves the file to a trash folder
+ * Then, the file will be removed from the file table in the database
+ * Any appendices linking to this file with fileId will have fileId NULL
+ * Any offers linking to this file with invoice_fileId will have invoice_fileId NULL
+ *
+ * @throws PDOException If there's something wrong with the database
+ *
+ * @return bool True on success, false on failure
+ */
+ public function delete() {
+ // Try to move the file to trash
+ $newname = pathinfo($this->filename, PATHINFO_FILENAME) . '--' . date('Y-m-d.H.i.s.') . pathinfo($this->filename, PATHINFO_EXTENSION);
+ $newdir = pathinfo($this->getFilenamePath(), PATHINFO_DIRNAME) . '/' . constants::files_folder_trash . '/';
+ if (!file_exists($newdir)) {
+ if (!mkdir($newdir)) {
+ return false;
+ }
+ }
+ if (!(@rename($this->getFilenamePath(), $newdir . $newname))) {
+ return false;
+ }
- // Remove offers linked by invoice_fileId
- $this->pdo->query("UPDATE `".constants::db_prefix."offer` SET `invoice_fileId`=NULL WHERE `invoice_fileId`={$this->id}");
+ // Remove offers linked by invoice_fileId
+ $this->pdo->query("UPDATE `".constants::db_prefix."offer` SET `invoice_fileId`=NULL WHERE `invoice_fileId`={$this->id}");
- // Remove the record of the file
- $stmt = $this->pdo->prepare("DELETE FROM `".constants::db_prefix."file` WHERE `id`=?");
- $stmt->execute(array($this->id));
- if ($stmt->rowCount() == 1) {
- return true;
- } else {
- return false;
- }
- }
-}
\ No newline at end of file
+ // Remove the record of the file
+ $stmt = $this->pdo->prepare("DELETE FROM `".constants::db_prefix."file` WHERE `id`=?");
+ $stmt->execute(array($this->id));
+ if ($stmt->rowCount() == 1) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+}
diff --git a/classes/response.php b/classes/response.php
index babf5ed..d997c00 100644
--- a/classes/response.php
+++ b/classes/response.php
@@ -1,22 +1,22 @@
.
*/
@@ -25,88 +25,88 @@
* Provides a standard to base all responses to be called with AJAX on
*/
class response {
- /** The variable to keep the response in until output */
- private $response;
- /** The variable to keep the HTTP response code in until output */
- private $http_response_code;
+ /** The variable to keep the response in until output */
+ private $response;
+ /** The variable to keep the HTTP response code in until output */
+ private $http_response_code;
- /**
- * Create a new instance
- */
- public function __construct() {
- $this->response = array();
- $this->http_response_code = 200;
- }
+ /**
+ * Create a new instance
+ */
+ public function __construct() {
+ $this->response = array();
+ $this->http_response_code = 200;
+ }
- /**
- * Set a variable of the response
- *
- * @param string $name The name of the variable to set
- * @param string $value The (new) value for the variable
- */
- public function __set($name, $value) {
- $this->response[$name] = $value;
- }
+ /**
+ * Set a variable of the response
+ *
+ * @param string $name The name of the variable to set
+ * @param string $value The (new) value for the variable
+ */
+ public function __set($name, $value) {
+ $this->response[$name] = $value;
+ }
- /**
- * Get a variable of the response
- *
- * @param string $name The name of the variable to get
- *
- * @return mixed The value of the variable
- */
- public function __get($name) {
- return $this->response[$name];
- }
+ /**
+ * Get a variable of the response
+ *
+ * @param string $name The name of the variable to get
+ *
+ * @return mixed The value of the variable
+ */
+ public function __get($name) {
+ return $this->response[$name];
+ }
- /**
- * Check if a variable of the response is set
- *
- * @param string $name The name of the variable to check
- *
- * @return bool True if the variable exists, false otherwise
- */
- public function __isset($name) {
- return isset($this->response[$name]);
- }
+ /**
+ * Check if a variable of the response is set
+ *
+ * @param string $name The name of the variable to check
+ *
+ * @return bool True if the variable exists, false otherwise
+ */
+ public function __isset($name) {
+ return isset($this->response[$name]);
+ }
- /**
- * Unset a variable of the response
- *
- * @param string $name The variable to unset
- */
- public function __unset($name) {
- unset($this->response[$name]);
- }
+ /**
+ * Unset a variable of the response
+ *
+ * @param string $name The variable to unset
+ */
+ public function __unset($name) {
+ unset($this->response[$name]);
+ }
- /**
- * Get or set the HTTP response code
- *
- * If a parameter is provided, it is used as the new HTTP response code, and a bool is returned for success or failure. Otherwise, the current one is returned.
- *
- * @param int $code The new code
- *
- * @return int|bool True on successful change, false on unsuccesful change, int when the current code is returned
- */
- public function http_response_code($code = null) {
- if ($code === null) {
- return $this->http_response_code;
- } else {
- if (http_response_code($code)) {
- $this->http_response_code = $code;
- return true;
- } else {
- return false;
- }
- }
- }
+ /**
+ * Get or set the HTTP response code
+ *
+ * If a parameter is provided, it is used as the new HTTP response code, and a bool is returned for success or failure. Otherwise, the current one is returned.
+ *
+ * @param int $code The new code
+ *
+ * @return int|bool True on successful change, false on unsuccesful change, int when the current code is returned
+ */
+ public function http_response_code($code = null) {
+ if ($code === null) {
+ return $this->http_response_code;
+ } else {
+ if (http_response_code($code)) {
+ $this->http_response_code = $code;
+ return true;
+ } else {
+ return false;
+ }
+ }
+ }
- /**
- * Output the response in json
- *
- * @return string The response in json format
- */
- public function getJson() {
- return json_encode($this->response);
- }
-}
\ No newline at end of file
+ /**
+ * Output the response in json
+ *
+ * @return string The response in json format
+ */
+ public function getJson() {
+ return json_encode($this->response);
+ }
+}
diff --git a/conf.php b/conf.php
index 9c1cffc..4d14829 100644
--- a/conf.php
+++ b/conf.php
@@ -11,17 +11,17 @@
*
* BusinessAdmin: administrative software for small companies
* Copyright (C) 2015 Camil Staps (ViviSoft)
- *
+ *
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
diff --git a/css/businessadmin.css b/css/businessadmin.css
index 07bf218..e898740 100644
--- a/css/businessadmin.css
+++ b/css/businessadmin.css
@@ -1,17 +1,17 @@
/**
* BusinessAdmin: administrative software for small companies
* Copyright (C) 2015 Camil Staps (ViviSoft)
- *
+ *
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
@@ -19,24 +19,24 @@
/* If you change the external URL of the control panel, also change the URLs below: */
@font-face {
- font-family: Ubuntu;
- src: url('/BusinessAdmin/fonts/Ubuntu-R.ttf');
+ font-family: Ubuntu;
+ src: url('/BusinessAdmin/fonts/Ubuntu-R.ttf');
}
@font-face {
- font-family: Ubuntu;
- font-style: italic;
- src: url('/BusinessAdmin/fonts/Ubuntu-RI.ttf');
+ font-family: Ubuntu;
+ font-style: italic;
+ src: url('/BusinessAdmin/fonts/Ubuntu-RI.ttf');
}
@font-face {
- font-family: Ubuntu;
- font-weight: bold;
- src: url('/BusinessAdmin/fonts/Ubuntu-B.ttf');
+ font-family: Ubuntu;
+ font-weight: bold;
+ src: url('/BusinessAdmin/fonts/Ubuntu-B.ttf');
}
@font-face {
- font-family: Ubuntu;
- font-style: italic;
- font-weight: bold;
- src: url('/BusinessAdmin/fonts/Ubuntu-BI.ttf');
+ font-family: Ubuntu;
+ font-style: italic;
+ font-weight: bold;
+ src: url('/BusinessAdmin/fonts/Ubuntu-BI.ttf');
}
/********************** Do not edit below this line **********************/
@@ -101,13 +101,13 @@ td .btn.btn-circle:last-child {
}
#collapse-menu {
- margin-right: 16px;
- margin-top: 16px;
- float: right;
+ margin-right: 16px;
+ margin-top: 16px;
+ float: right;
}
@media (max-width: 767px) {
- #collapse-menu {
- display: none;
- }
+ #collapse-menu {
+ display: none;
+ }
}
diff --git a/footer.php b/footer.php
index 9870926..308b1d0 100644
--- a/footer.php
+++ b/footer.php
@@ -1,3 +1,2 @@
-
-