From 21455bfd1004c4a3153050ac5995b8dc680c2042 Mon Sep 17 00:00:00 2001 From: Camil Staps Date: Wed, 27 Jul 2016 16:48:53 +0200 Subject: Class names start with a capital --- include/about.php | 4 ++-- include/assignments-edit.php | 4 ++-- include/assignments-new.php | 4 ++-- include/assignments-overview.php | 20 ++++++++++---------- include/assignments-view.php | 14 +++++++------- include/assignments.php | 6 +++--- include/clients-edit.php | 4 ++-- include/clients-new.php | 2 +- include/clients-overview.php | 4 ++-- include/clients-view.php | 20 ++++++++++---------- include/clients.php | 6 +++--- include/contacts-edit.php | 4 ++-- include/contacts-new.php | 4 ++-- include/contacts-overview.php | 18 +++++++++--------- include/contacts.php | 6 +++--- include/discounts-edit.php | 4 ++-- include/discounts-new.php | 4 ++-- include/discounts-overview.php | 18 +++++++++--------- include/discounts.php | 6 +++--- include/home.php | 16 ++++++++-------- include/offers-edit.php | 4 ++-- include/offers-new.php | 4 ++-- include/offers-overview.php | 20 ++++++++++---------- include/offers-view.php | 28 ++++++++++++++-------------- include/offers.php | 12 ++++++------ include/settings.php | 4 ++-- include/users-new.php | 2 +- 27 files changed, 121 insertions(+), 121 deletions(-) (limited to 'include') diff --git a/include/about.php b/include/about.php index e7ab3d4..c2eb179 100644 --- a/include/about.php +++ b/include/about.php @@ -40,8 +40,8 @@ require('./header.php');
About
-

BusinessAdmin is open source software under the GPL 3.0 license.

-

A full version of the license is available here. An excerpt is shown below:

+

BusinessAdmin is open source software under the GPL 3.0 license.

+

A full version of the license is available here. An excerpt is shown below:

BusinessAdmin: administrative software for small companies
 Copyright (C) 2015 Camil Staps (ViviSoft)
 
diff --git a/include/assignments-edit.php b/include/assignments-edit.php
index 7c63680..d2f5a6c 100644
--- a/include/assignments-edit.php
+++ b/include/assignments-edit.php
@@ -20,10 +20,10 @@
 require_once('./conf.php');
 require_once('./login-ajax.php');
 
-$response = new response();
+$response = new Response();
 
 try {
-	$assignment = new assignment($_pdo, $_REQUEST['pk']);
+	$assignment = new Assignment($_pdo, $_REQUEST['pk']);
 
 	$name = explode('-', $_REQUEST['name']);
 	$what_to_edit = $name[count($name) - 1];
diff --git a/include/assignments-new.php b/include/assignments-new.php
index 405c5fa..bcc545a 100644
--- a/include/assignments-new.php
+++ b/include/assignments-new.php
@@ -20,10 +20,10 @@
 require_once('./conf.php');
 require_once('./login-ajax.php');
 
-$response = new response();
+$response = new Response();
 
 try {
-	$offer = new offer($_pdo, $_REQUEST['offerId']);
+	$offer = new Offer($_pdo, $_REQUEST['offerId']);
 
 	$assignment = $offer->createAssignment(
 		$_REQUEST['title'],
diff --git a/include/assignments-overview.php b/include/assignments-overview.php
index 0e364d1..d4b350e 100644
--- a/include/assignments-overview.php
+++ b/include/assignments-overview.php
@@ -46,17 +46,17 @@ require_once('./login.php');
 								data-mixer-order-price='{$assignment->getPricePerHour()}'>
 							{$assignment->getId()}
 							
-								#{$assignment->getOffer()->getId()} to
-								{$assignment->getOffer()->getContact()->getName()}
-								({$assignment->getOffer()->getContact()->getClient()->name})
+								#{$assignment->getOffer()->getId()} to
+								{$assignment->getOffer()->getContact()->getName()}
+								({$assignment->getOffer()->getContact()->getClient()->name})
 							
-								{$assignment->getTitle()}
-

{$assignment->getDescription(false)}

+ {$assignment->getTitle()}
+

{$assignment->getDescription(false)}

- {$assignment->getHours()}h + {$assignment->getHours()}h - ".constants::invoice_valuta."{$assignment->getPricePerHour()} / hr
- {$assignment->getVAT()}% VAT + ".Constants::invoice_valuta."{$assignment->getPricePerHour()} / hr
+ {$assignment->getVAT()}% VAT @@ -77,7 +77,7 @@ require_once('./login.php');
Create new
-
@@ -114,7 +114,7 @@ require_once('./login.php'); data-bv-integer="true" data-bv-integer-message="Please enter an integer" />
- +
@@ -43,14 +43,14 @@ $_assignment = new assignment($_pdo, $_id); data-mixer-order-price='{$_assignment->getPricePerHour()}'> {$_assignment->getId()} - #{$_assignment->getOffer()->getId()} to - {$_assignment->getOffer()->getContact()->getName()} - ({$_assignment->getOffer()->getContact()->getClient()->name}) + #{$_assignment->getOffer()->getId()} to + {$_assignment->getOffer()->getContact()->getName()} + ({$_assignment->getOffer()->getContact()->getClient()->name}) - {$_assignment->getHours()}h + {$_assignment->getHours()}h - ".constants::invoice_valuta."{$_assignment->getPricePerHour()} / hr
- {$_assignment->getVAT()}% VAT + ".Constants::invoice_valuta."{$_assignment->getPricePerHour()} / hr
+ {$_assignment->getVAT()}% VAT "; ?> diff --git a/include/assignments.php b/include/assignments.php index 14ed8da..7c3c79d 100644 --- a/include/assignments.php +++ b/include/assignments.php @@ -45,8 +45,8 @@ require('./header.php'); if (isset($_GET['id'])) { $id = (int) $_GET['id']; try { - $assignment = new assignment($_pdo, $id); - $header = "Assignments / {$assignment->getTitle()}"; + $assignment = new Assignment($_pdo, $id); + $header = "Assignments / {$assignment->getTitle()}"; $show_individual = $id; } catch (PDOException $e) { $alert = "
The assignment with id $id could not be found.
"; @@ -64,7 +64,7 @@ require('./header.php'); echo "
"; $id = (int) $_GET['delete']; try { - $assignment = new assignment($_pdo, $id); + $assignment = new Assignment($_pdo, $id); if ($assignment->delete()) { echo "
The assignment with title {$assignment->getTitle()} has been removed.
"; } else { diff --git a/include/clients-edit.php b/include/clients-edit.php index 3d92d06..00961aa 100644 --- a/include/clients-edit.php +++ b/include/clients-edit.php @@ -20,10 +20,10 @@ require_once('./conf.php'); require_once('./login-ajax.php'); -$response = new response(); +$response = new Response(); try { - $client = new client($_pdo, $_REQUEST['pk']); + $client = new Client($_pdo, $_REQUEST['pk']); if ($client->setName($_REQUEST['value'])) { $response->success = true; } else { diff --git a/include/clients-new.php b/include/clients-new.php index fe66026..d1cf503 100644 --- a/include/clients-new.php +++ b/include/clients-new.php @@ -20,7 +20,7 @@ require_once('./conf.php'); require_once('./login-ajax.php'); -$response = new response(); +$response = new Response(); try { $client = BusinessAdmin::createClient($_pdo, $_REQUEST['name']); diff --git a/include/clients-overview.php b/include/clients-overview.php index 860e671..cdced81 100644 --- a/include/clients-overview.php +++ b/include/clients-overview.php @@ -41,7 +41,7 @@ require_once('./login.php'); data-mixer-order-name='{$client->name}'> {$client->id} - + {$client->name} @@ -64,7 +64,7 @@ require_once('./login.php');
Create new
-
diff --git a/include/clients-view.php b/include/clients-view.php index 007d94c..2472a80 100644 --- a/include/clients-view.php +++ b/include/clients-view.php @@ -19,7 +19,7 @@ require_once('./login.php'); -$_client = new client($_pdo, $_id); +$_client = new Client($_pdo, $_id); ?>
@@ -41,22 +41,22 @@ $_client = new client($_pdo, $_id); foreach ($contacts as $contact) { echo " {$contact->getId()} - {$contact->getName()} + {$contact->getName()} - {$contact->getAddress()}
- {$contact->getPostalCode()} - {$contact->getCity()}
- {$contact->getCountry()} + {$contact->getAddress()}
+ {$contact->getPostalCode()} + {$contact->getCity()}
+ {$contact->getCountry()} - {$contact->getLanguage()} + {$contact->getLanguage()} - - + + "; } if (count($contacts) == 0) { - echo "There are no contacts in the database. Why not create one?"; + echo "There are no contacts in the database. Why not create one?"; } ?> diff --git a/include/clients.php b/include/clients.php index f762859..1e7110b 100644 --- a/include/clients.php +++ b/include/clients.php @@ -45,8 +45,8 @@ require('./header.php'); if (isset($_GET['id'])) { $id = (int) $_GET['id']; try { - $client = new client($_pdo, $id); - $header = "Clients / {$client->name}"; + $client = new Client($_pdo, $id); + $header = "Clients / {$client->name}"; $show_individual = $id; } catch (PDOException $e) { $alert = "
The client with id $id could not be found.
"; @@ -64,7 +64,7 @@ require('./header.php'); echo "
"; $id = (int) $_GET['delete']; try { - $client = new client($_pdo, $id); + $client = new Client($_pdo, $id); if ($client->delete()) { echo "
The client with name {$client->name} has been removed.
"; } else { diff --git a/include/contacts-edit.php b/include/contacts-edit.php index ac924a9..ead27d9 100644 --- a/include/contacts-edit.php +++ b/include/contacts-edit.php @@ -20,10 +20,10 @@ require_once('./conf.php'); require_once('./login-ajax.php'); -$response = new response(); +$response = new Response(); try { - $contact = new contact($_pdo, $_REQUEST['pk']); + $contact = new Contact($_pdo, $_REQUEST['pk']); $name = explode('-', $_REQUEST['name']); $what_to_edit = $name[count($name) - 1]; diff --git a/include/contacts-new.php b/include/contacts-new.php index 440e744..c75298c 100644 --- a/include/contacts-new.php +++ b/include/contacts-new.php @@ -20,10 +20,10 @@ require_once('./conf.php'); require_once('./login-ajax.php'); -$response = new response(); +$response = new Response(); try { - $client = new client($_pdo, $_REQUEST['clientId']); + $client = new Client($_pdo, $_REQUEST['clientId']); $contact = $client->createContact( $_REQUEST['name'], diff --git a/include/contacts-overview.php b/include/contacts-overview.php index 9cd71f3..4f2e6cf 100644 --- a/include/contacts-overview.php +++ b/include/contacts-overview.php @@ -43,20 +43,20 @@ require_once('./login.php'); data-mixer-order-name='{$contact->getName()}'> {$contact->getId()} - {$contact->getName()}
+ {$contact->getName()}
({$contact->getClient()->name}) - {$contact->getEmail()}
+ {$contact->getEmail()}

- {$contact->getAddress()}
- " . ($contact->getAddress_2() != '' ? "{$contact->getAddress_2()}
" : "") . " - {$contact->getPostalCode()} - {$contact->getCity()}
- {$contact->getCountry()} + {$contact->getAddress()}
+ " . ($contact->getAddress_2() != '' ? "{$contact->getAddress_2()}
" : "") . " + {$contact->getPostalCode()} + {$contact->getCity()}
+ {$contact->getCountry()} - {$contact->getLanguage()} + {$contact->getLanguage()} @@ -77,7 +77,7 @@ require_once('./login.php');
Create new
-
diff --git a/include/contacts.php b/include/contacts.php index 09a452f..1231e24 100644 --- a/include/contacts.php +++ b/include/contacts.php @@ -45,8 +45,8 @@ require('./header.php'); if (isset($_GET['id'])) { $id = (int) $_GET['id']; try { - $contact = new contact($_pdo, $id); - $header = "Contacts / {$contact->getName()}"; + $contact = new Contact($_pdo, $id); + $header = "Contacts / {$contact->getName()}"; $show_individual = $id; } catch (PDOException $e) { $alert = "
The contact with id $id could not be found.
"; @@ -64,7 +64,7 @@ require('./header.php'); echo "
"; $id = (int) $_GET['delete']; try { - $contact = new contact($_pdo, $id); + $contact = new Contact($_pdo, $id); if ($contact->delete()) { echo "
The contact with name {$contact->getName()} has been removed.
"; } else { diff --git a/include/discounts-edit.php b/include/discounts-edit.php index 2d64bd9..797a95b 100644 --- a/include/discounts-edit.php +++ b/include/discounts-edit.php @@ -20,10 +20,10 @@ require_once('./conf.php'); require_once('./login-ajax.php'); -$response = new response(); +$response = new Response(); try { - $discount = new discount($_pdo, $_REQUEST['pk']); + $discount = new Discount($_pdo, $_REQUEST['pk']); $name = explode('-', $_REQUEST['name']); $what_to_edit = $name[count($name) - 1]; diff --git a/include/discounts-new.php b/include/discounts-new.php index b0cfa07..26452aa 100644 --- a/include/discounts-new.php +++ b/include/discounts-new.php @@ -20,10 +20,10 @@ require_once('./conf.php'); require_once('./login-ajax.php'); -$response = new response(); +$response = new Response(); try { - $offer = new offer($_pdo, $_REQUEST['offerId']); + $offer = new Offer($_pdo, $_REQUEST['offerId']); $discount = $offer->createDiscount( $_REQUEST['title'], diff --git a/include/discounts-overview.php b/include/discounts-overview.php index 1bf55d6..60ddf13 100644 --- a/include/discounts-overview.php +++ b/include/discounts-overview.php @@ -44,16 +44,16 @@ require_once('./login.php'); data-mixer-order-value='{$discount->getValue()}'> {$discount->getId()} - #{$discount->getOffer()->getId()} to - {$discount->getOffer()->getContact()->getName()} - ({$discount->getOffer()->getContact()->getClient()->name}) + #{$discount->getOffer()->getId()} to + {$discount->getOffer()->getContact()->getName()} + ({$discount->getOffer()->getContact()->getClient()->name}) - {$discount->getTitle()}
-

{$discount->getDescription(false)}

+ {$discount->getTitle()}
+

{$discount->getDescription(false)}

- ".constants::invoice_valuta."{$discount->getValue()}
- {$discount->getVAT()}% VAT + ".Constants::invoice_valuta."{$discount->getValue()}
+ {$discount->getVAT()}% VAT @@ -74,7 +74,7 @@ require_once('./login.php');
Create new
-
@@ -104,7 +104,7 @@ require_once('./login.php');
- + Discounts / {$discount->getTitle()}"; + $discount = new Discount($_pdo, $id); + $header = "Discounts / {$discount->getTitle()}"; $show_individual = $id; } catch (PDOException $e) { $alert = "
The discount with id $id could not be found.
"; @@ -64,7 +64,7 @@ require('./header.php'); echo "
"; $id = (int) $_GET['delete']; try { - $discount = new discount($_pdo, $id); + $discount = new Discount($_pdo, $id); if ($discount->delete()) { echo "
The discount with title {$discount->getTitle()} has been removed.
"; } else { diff --git a/include/home.php b/include/home.php index 6a25743..a15d2c4 100644 --- a/include/home.php +++ b/include/home.php @@ -51,7 +51,7 @@ require('./header.php');
- +