diff --git a/.gitignore b/.gitignore index 433fc3b..1f20d36 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ mail.log vendor/canary/logs/* .env components/* +mailhog.log diff --git a/app/controllers/admin/contact.php b/app/controllers/admin/send_mail.php similarity index 93% rename from app/controllers/admin/contact.php rename to app/controllers/admin/send_mail.php index a71f3c6..e89a3dd 100644 --- a/app/controllers/admin/contact.php +++ b/app/controllers/admin/send_mail.php @@ -1,8 +1,8 @@ @@ -19,13 +19,13 @@ use TheTempusProject\Houdini\Classes\Views; use TheTempusProject\Models\User; use TheTempusProject\Models\Subscribe; -class Contact extends AdminController { +class SendMail extends AdminController { public static $user; public static $subscribe; public function __construct() { parent::__construct(); - self::$title = 'Admin - Contact'; + self::$title = 'Admin - Send Mail'; self::$user = new User; self::$subscribe = new Subscribe; } diff --git a/app/controllers/home.php b/app/controllers/home.php index 3d91789..daf116d 100644 --- a/app/controllers/home.php +++ b/app/controllers/home.php @@ -86,7 +86,7 @@ class Home extends Controller { self::$title = 'Terms and Conditions - {SITENAME}'; self::$pageDescription = '{SITENAME} Terms and Conditions of use. Please use {SITENAME} safely.'; Components::set( 'TERMS', Views::simpleView( 'terms' ) ); - Views::raw( '
{TERMS}
' ); + Views::view( 'termsPage' ); } public function hashtag( $id = null ) { diff --git a/app/css/main-dark.css b/app/css/main-dark.css index 3d33e90..c76d335 100644 --- a/app/css/main-dark.css +++ b/app/css/main-dark.css @@ -15,6 +15,9 @@ .context-main-bg { background-color: #2c2c2c; } +.bg-default { + background-color: #2c2c2c; +} .context-other { color: #000; } diff --git a/app/css/main.css b/app/css/main.css index 74e1631..7f64ee8 100644 --- a/app/css/main.css +++ b/app/css/main.css @@ -9,12 +9,15 @@ * @license https://opensource.org/licenses/MIT [MIT LICENSE] */ - + .context-other-bg { + background-color: #eaeaea; +} .context-main-bg { background-color: #f7f7f7; } + /* Base styles for the switch container */ .material-switch { position: relative; @@ -295,4 +298,15 @@ body { .feature-icon-small { width: 3rem; height: 3rem; -} \ No newline at end of file +} + +.gradient-custom-2 { + /* fallback for old browsers */ + background: #fccb90; + + /* Chrome 10-25, Safari 5.1-6 */ + background: -webkit-linear-gradient(to right, #2c2c2c, #1e1e1e, #1e1e1e); + + /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */ + background: linear-gradient(to right, #2c2c2c, #1e1e1e, #1e1e1e); +} diff --git a/app/plugins/blog/views/admin/dashboard.html b/app/plugins/blog/views/admin/dashboard.html index 0f64a36..e7984f2 100644 --- a/app/plugins/blog/views/admin/dashboard.html +++ b/app/plugins/blog/views/admin/dashboard.html @@ -15,7 +15,7 @@ {title} {contentSummary} - + {/LOOP} diff --git a/app/plugins/blog/views/admin/list.html b/app/plugins/blog/views/admin/list.html index 702eea4..436c766 100644 --- a/app/plugins/blog/views/admin/list.html +++ b/app/plugins/blog/views/admin/list.html @@ -24,7 +24,7 @@ {commentCount} {DTC}{created}{/DTC} {DTC}{edited}{/DTC} - + diff --git a/app/plugins/blog/views/recentWidget.html b/app/plugins/blog/views/recentWidget.html index 155978b..e256079 100644 --- a/app/plugins/blog/views/recentWidget.html +++ b/app/plugins/blog/views/recentWidget.html @@ -1,5 +1,5 @@ -
-
+
+

Recent Posts

    diff --git a/app/plugins/bugreport/views/admin/view.html b/app/plugins/bugreport/views/admin/view.html index 7aaaecf..6b8b5b9 100644 --- a/app/plugins/bugreport/views/admin/view.html +++ b/app/plugins/bugreport/views/admin/view.html @@ -1,7 +1,7 @@
    -
    -
    +
    +

    Bug Report

    diff --git a/app/plugins/bugreport/views/create.html b/app/plugins/bugreport/views/create.html index 5dd63c0..1b3ce74 100644 --- a/app/plugins/bugreport/views/create.html +++ b/app/plugins/bugreport/views/create.html @@ -1,4 +1,5 @@ -
    + +

    Bug Report

    Thank you for visiting our bug reporting page. We value our users' input highly and in an effort to better serve your needs, please fill out the form below to help us address this issue.

    We read each and every bug report submitted, and by submitting this form you allow us to send you a follow-up email.

    diff --git a/app/plugins/comments/views/admin/dashboard.html b/app/plugins/comments/views/admin/dashboard.html index 7fc7b6d..f0c27b1 100644 --- a/app/plugins/comments/views/admin/dashboard.html +++ b/app/plugins/comments/views/admin/dashboard.html @@ -13,7 +13,7 @@ {authorName} {content} - + {/LOOP} diff --git a/app/plugins/comments/views/admin/list.html b/app/plugins/comments/views/admin/list.html index 37b460d..20c49c4 100644 --- a/app/plugins/comments/views/admin/list.html +++ b/app/plugins/comments/views/admin/list.html @@ -22,7 +22,7 @@ {contentTitle} {content} {DTC}{created}{/DTC} - + diff --git a/app/plugins/comments/views/list.html b/app/plugins/comments/views/list.html index 2a4777d..840d104 100644 --- a/app/plugins/comments/views/list.html +++ b/app/plugins/comments/views/list.html @@ -1,22 +1,23 @@
    -
    - - Comments - {count} +
    +

    + Comments +

    + {count}
    -
    -
      +
      +
        {LOOP}
      • -
        -
        - +
        +
        + User Avatar
        -
        -
        -
        - By: {authorName} on {DTC date}{created}{/DTC} -
        +
        +
        + + By: {authorName} on {DTC date}{created}{/DTC} +
        {content} @@ -28,12 +29,8 @@ {/LOOP} {ALT}
      • -
        -
        -
        -

        Be the first to comment.

        -
        -
        +
        +

        Be the first to comment.

        • {/ALT} diff --git a/app/plugins/feedback/controllers/admin/feedback.php b/app/plugins/contact/controllers/admin/contact.php similarity index 63% rename from app/plugins/feedback/controllers/admin/feedback.php rename to app/plugins/contact/controllers/admin/contact.php index 582f537..1a1aa4a 100644 --- a/app/plugins/feedback/controllers/admin/feedback.php +++ b/app/plugins/contact/controllers/admin/contact.php @@ -1,10 +1,10 @@ * @link https://TheTempusProject.com @@ -18,29 +18,29 @@ use TheTempusProject\Houdini\Classes\Views; use TheTempusProject\Houdini\Classes\Navigation; use TheTempusProject\Houdini\Classes\Components; use TheTempusProject\Classes\AdminController; -use TheTempusProject\Models\Feedback as FeedbackModel; +use TheTempusProject\Models\Contact as ContactModel; -class Feedback extends AdminController { - protected static $feedback; +class Contact extends AdminController { + protected static $contact; public function __construct() { parent::__construct(); - self::$title = 'Admin - Feedback'; - self::$feedback = new FeedbackModel; - $view = Navigation::activePageSelect( 'nav.admin', '/admin/feedback' ); + self::$title = 'Admin - Contact'; + self::$contact = new ContactModel; + $view = Navigation::activePageSelect( 'nav.admin', '/admin/contact' ); Components::set( 'ADMINNAV', $view ); } public function view( $id = null ) { - Views::view( 'feedback.admin.view', self::$feedback->findById( $id ) ); + Views::view( 'contact.admin.view', self::$contact->findById( $id ) ); } public function delete( $data = null ) { if ( Input::exists( 'submit' ) ) { $data = Input::post( 'F_' ); } - if ( self::$feedback->delete( (array) $data ) ) { - Issues::add( 'success', 'feedback deleted' ); + if ( self::$contact->delete( (array) $data ) ) { + Issues::add( 'success', 'contact deleted' ); } else { Issues::add( 'error', 'There was an error with your request.' ); } @@ -48,11 +48,11 @@ class Feedback extends AdminController { } public function clear( $data = null ) { - self::$feedback->clear(); + self::$contact->clear(); $this->index(); } public function index( $data = null ) { - Views::view( 'feedback.admin.list', self::$feedback->listPaginated() ); + Views::view( 'contact.admin.list', self::$contact->listPaginated() ); } } diff --git a/app/plugins/feedback/controllers/feedback.php b/app/plugins/contact/controllers/contact.php similarity index 58% rename from app/plugins/feedback/controllers/feedback.php rename to app/plugins/contact/controllers/contact.php index 72a816f..a849547 100644 --- a/app/plugins/feedback/controllers/feedback.php +++ b/app/plugins/contact/controllers/contact.php @@ -1,10 +1,10 @@ * @link https://TheTempusProject.com @@ -20,25 +20,25 @@ use TheTempusProject\Bedrock\Functions\Check; use TheTempusProject\Bedrock\Functions\Input; use TheTempusProject\Bedrock\Functions\Session; use TheTempusProject\Hermes\Functions\Redirect; -use TheTempusProject\Models\Feedback as FeedbackModel; +use TheTempusProject\Models\Contact as ContactModel; -class Feedback extends Controller { - protected static $feedback; +class Contact extends Controller { + protected static $contact; public function index() { - self::$feedback = new FeedbackModel; - self::$title = 'Feedback - {SITENAME}'; - self::$pageDescription = 'At {SITENAME}, we value our users\' input. You can provide any feedback or suggestions using this form.'; + self::$contact = new ContactModel; + self::$title = 'Contact - {SITENAME}'; + self::$pageDescription = 'At {SITENAME}, we value our users\' input. You can provide any contact or suggestions using this form.'; if ( !Input::exists() ) { - return Views::view( 'feedback.create' ); + return Views::view( 'contact.create' ); } - if ( !Forms::check( 'feedback' ) ) { + if ( !Forms::check( 'contact' ) ) { Issues::add( 'error', [ 'There was an error with your form, please check your submission and try again.' => Check::userErrors() ] ); - return Views::view( 'feedback.create' ); + return Views::view( 'contact.create' ); } - $result = self::$feedback->create( Input::post( 'name' ), Input::post( 'feedbackEmail' ), Input::post( 'entry' ) ); + $result = self::$contact->create( Input::post( 'name' ), Input::post( 'contactEmail' ), Input::post( 'entry' ) ); if ( $result ) { - Session::flash( 'success', 'Thank you! Your feedback has been received.' ); + Session::flash( 'success', 'Thank you! Your contact has been received.' ); Redirect::to( 'home/index' ); } else { Issues::add( 'error', [ 'There was an error with your form, please check your submission and try again.' => Check::userErrors() ] ); diff --git a/app/plugins/feedback/forms.php b/app/plugins/contact/forms.php similarity index 69% rename from app/plugins/feedback/forms.php rename to app/plugins/contact/forms.php index 36bd805..f2265cb 100644 --- a/app/plugins/feedback/forms.php +++ b/app/plugins/contact/forms.php @@ -1,35 +1,35 @@ * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] */ -namespace TheTempusProject\Plugins\Feedback; +namespace TheTempusProject\Plugins\Contact; use TheTempusProject\Bedrock\Functions\Input; use TheTempusProject\Bedrock\Functions\Check; use TheTempusProject\Classes\Forms; -class FeedbackForms extends Forms { +class ContactForms extends Forms { /** * Adds these functions to the form list. */ public function __construct() { - self::addHandler( 'feedback', __CLASS__, 'feedback' ); + self::addHandler( 'contact', __CLASS__, 'contact' ); } /** - * Validates the feedback form. + * Validates the contact form. * * @return {bool} */ - public static function feedback() { + public static function contact() { if ( !Input::exists( 'name' ) ) { Check::addUserError( 'You must provide a name.' ); return false; @@ -38,12 +38,12 @@ class FeedbackForms extends Forms { Check::addUserError( 'Invalid name.' ); return false; } - if ( !empty( Input::post( 'feedbackEmail' ) ) && !Check::email( Input::post( 'feedbackEmail' ) ) ) { + if ( !empty( Input::post( 'contactEmail' ) ) && !Check::email( Input::post( 'contactEmail' ) ) ) { Check::addUserError( 'Invalid Email.' ); return false; } if ( Input::post( 'entry' ) == '' ) { - Check::addUserError( 'Feedback cannot be empty.' ); + Check::addUserError( 'Contact cannot be empty.' ); return false; } if ( !Check::token() ) { @@ -53,4 +53,4 @@ class FeedbackForms extends Forms { } } -new FeedbackForms; +new ContactForms; diff --git a/app/plugins/feedback/models/feedback.php b/app/plugins/contact/models/contact.php similarity index 80% rename from app/plugins/feedback/models/feedback.php rename to app/plugins/contact/models/contact.php index b010ea2..8730883 100644 --- a/app/plugins/feedback/models/feedback.php +++ b/app/plugins/contact/models/contact.php @@ -1,12 +1,12 @@ * @link https://TheTempusProject.com @@ -17,9 +17,9 @@ namespace TheTempusProject\Models; use TheTempusProject\Bedrock\Functions\Check; use TheTempusProject\Canary\Bin\Canary as Debug; use TheTempusProject\Classes\DatabaseModel; -use TheTempusProject\Plugins\Feedback as Plugin; +use TheTempusProject\Plugins\Contact as Plugin; -class Feedback extends DatabaseModel { +class Contact extends DatabaseModel { public $tableName = 'feedback'; public $databaseMatrix = [ [ 'name', 'varchar', '128' ], @@ -39,7 +39,7 @@ class Feedback extends DatabaseModel { } /** - * Saves a feedback form to the db. + * Saves a contact form to the db. * * @param string $name -the name on the form * @param string $email -the email provided @@ -48,7 +48,7 @@ class Feedback extends DatabaseModel { */ public function create( $name, $email, $feedback ) { if ( !$this->plugin->checkEnabled() ) { - Debug::info( 'Feedback is disabled in the config.' ); + Debug::info( 'Contact is disabled in the config.' ); return false; } $fields = [ @@ -59,14 +59,14 @@ class Feedback extends DatabaseModel { 'ip' => $_SERVER['REMOTE_ADDR'], ]; if ( !self::$db->insert( $this->tableName, $fields ) ) { - Debug::info( 'Feedback::create - failed to insert to db' ); + Debug::info( 'Contact::create - failed to insert to db' ); return false; } return self::$db->lastId(); } /** - * Function to clear feedback from the DB. + * Function to clear contact from the DB. * * @todo is there a way i could check for success here I'm pretty sure this is just a bad idea? * @return bool @@ -76,8 +76,8 @@ class Feedback extends DatabaseModel { self::$log = new Log; } self::$db->delete( $this->tableName, ['ID', '>=', '0'] ); - self::$log->admin( 'Cleared Feedback' ); - Debug::info( 'Feedback Cleared' ); + self::$log->admin( 'Contacts Cleared' ); + Debug::info( 'Contacts Cleared' ); return true; } } diff --git a/app/plugins/feedback/plugin.php b/app/plugins/contact/plugin.php similarity index 65% rename from app/plugins/feedback/plugin.php rename to app/plugins/contact/plugin.php index bde7ba4..21883a0 100644 --- a/app/plugins/feedback/plugin.php +++ b/app/plugins/contact/plugin.php @@ -1,10 +1,10 @@ * @link https://TheTempusProject.com @@ -14,18 +14,18 @@ namespace TheTempusProject\Plugins; use TheTempusProject\Classes\Plugin; -class Feedback extends Plugin { - public $pluginName = 'TP Feedback'; +class Contact extends Plugin { + public $pluginName = 'TP Contact'; public $pluginAuthor = 'JoeyK'; public $pluginWebsite = 'https://TheTempusProject.com'; public $modelVersion = '1.0'; public $pluginVersion = '3.0'; - public $pluginDescription = 'A simple plugin which adds a form and management for user submitted feedback.'; - public $configName = 'feedback'; + public $pluginDescription = 'A simple plugin which adds a form and management for user submitted contact forms.'; + public $configName = 'contact'; public $configMatrix = [ 'enabled' => [ 'type' => 'radio', - 'pretty' => 'Enable User Feedback.', + 'pretty' => 'Enable User Contact.', 'default' => true, ], 'sendEmail' => [ @@ -36,25 +36,25 @@ class Feedback extends Plugin { 'emailTemplate' => [ 'type' => 'text', 'pretty' => 'Email Template', - 'default' => 'feedbackEmail', + 'default' => 'contactEmail', ], ]; public $permissionMatrix = [ - 'feedback' => [ - 'pretty' => 'Can Submit Feedback', - 'default' => false, + 'contact' => [ + 'pretty' => 'Can Submit Contact', + 'default' => true, ], ]; public $contact_footer_links = [ [ - 'text' => 'Feedback', - 'url' => '{ROOT_URL}feedback', + 'text' => 'Contact', + 'url' => '{ROOT_URL}contact', ], ]; public $admin_links = [ [ - 'text' => ' Feedback', - 'url' => '{ROOT_URL}admin/feedback', + 'text' => ' Contact', + 'url' => '{ROOT_URL}admin/contact', ], ]; } diff --git a/app/plugins/feedback/views/admin/list.html b/app/plugins/contact/views/admin/list.html similarity index 66% rename from app/plugins/feedback/views/admin/list.html rename to app/plugins/contact/views/admin/list.html index 0a60223..01eea1e 100644 --- a/app/plugins/feedback/views/admin/list.html +++ b/app/plugins/contact/views/admin/list.html @@ -1,6 +1,6 @@ -Feedback +Contact Forms {PAGINATION} -
        + @@ -20,8 +20,8 @@ - - + + @@ -39,4 +39,4 @@
        -clear all \ No newline at end of file +clear all \ No newline at end of file diff --git a/app/plugins/feedback/views/admin/view.html b/app/plugins/contact/views/admin/view.html similarity index 88% rename from app/plugins/feedback/views/admin/view.html rename to app/plugins/contact/views/admin/view.html index 31173a6..ecd441d 100644 --- a/app/plugins/feedback/views/admin/view.html +++ b/app/plugins/contact/views/admin/view.html @@ -1,9 +1,9 @@
        -
        -
        -

        Feedback

        +
        +
        +

        Contact

        @@ -43,7 +43,7 @@
        {ADMIN} -
        + diff --git a/app/plugins/feedback/views/create.html b/app/plugins/contact/views/create.html similarity index 54% rename from app/plugins/feedback/views/create.html rename to app/plugins/contact/views/create.html index 57cbfef..946f66a 100644 --- a/app/plugins/feedback/views/create.html +++ b/app/plugins/contact/views/create.html @@ -1,15 +1,17 @@ -
        -

        Feedback

        -

        - Here at {SITENAME}, we highly value your feedback. We constantly strive to provide our users with the highest level of quality in everything we do. -

        -

        - If you would like to provide any suggestions or comments on our service, we ask that you please fill out the quick form below and let us know what's on your mind. -

        +
        +

        Contact Us

        +
        +

        + Here at {SITENAME}, we highly value your feedback. We constantly strive to provide our users with the highest level of quality in everything we do. +

        +

        + If you would like to provide any suggestions or comments on our service, we ask that you please fill out the quick form below and let us know what's on your mind. +

        +
        - +
        @@ -17,15 +19,15 @@
        - +
        - +
        - +
        Max: 2000 characters diff --git a/app/plugins/feedback/views/feedback.html b/app/plugins/contact/views/feedback.html similarity index 100% rename from app/plugins/feedback/views/feedback.html rename to app/plugins/contact/views/feedback.html diff --git a/app/templates/default/default.inc.php b/app/templates/default/default.inc.php index 6635071..14ac95a 100644 --- a/app/templates/default/default.inc.php +++ b/app/templates/default/default.inc.php @@ -58,6 +58,7 @@ class DefaultLoader extends Loader { Components::set( 'topNavRightDropdown', Template::parse( App::$topNavRightDropdown ) ); Components::set( 'STATUS', Views::simpleView( 'nav.statusLoggedIn' ) ); Components::set( 'USERNAME', \ucfirst( App::$activeUser->username ) ); + Components::set( 'AVATAR', App::$activeUser->avatar ); } else { Components::set( 'STATUS', Views::simpleView( 'nav.statusLoggedOut' ) ); } diff --git a/app/templates/default/default.tpl b/app/templates/default/default.tpl index 5066e02..ed87582 100644 --- a/app/templates/default/default.tpl +++ b/app/templates/default/default.tpl @@ -63,7 +63,7 @@
        {/ISSUES} -
        +
        {CONTENT}
        diff --git a/app/views/about.html b/app/views/about.html index 35ff1f7..3bc1bf6 100644 --- a/app/views/about.html +++ b/app/views/about.html @@ -1,6 +1,7 @@ -
        -

        - AllTheBookmarks was built out of a need to manage my own bookmarks better. As a web developer, I would not only use urls for every aspect of my job, but i also needed to switch browsers, operating systems, or devices. For years I had a version of this tool that I used on my own local network. In 2025 I'm bringing it to anyone who wants it. +

        +

        Welcome to AllTheBookmarks

        +

        + AllTheBookmarks was built out of a need to manage my own bookmarks better. As a web developer, I would not only use URLs for every aspect of my job, but I also needed to switch browsers, operating systems, or devices. For years, I had a version of this tool that I used on my own local network. In 2025, I'm bringing it to anyone who wants it.

        Right now this entire system was built and managed by myself. As stated, I have used my own version of this for years but translating it to publicly available is not a 1 to 1 job. There may be bugs or issues encountered while you use the produxct. I can't guarantee a fix for every need in every case immidiately, but I do actively keep track of bugs and work hard to ensure everyone has a great experiience usiing the app. diff --git a/app/views/admin/dashboard/users.html b/app/views/admin/dashboard/users.html index 8464bb2..b5db217 100644 --- a/app/views/admin/dashboard/users.html +++ b/app/views/admin/dashboard/users.html @@ -13,7 +13,7 @@

        - + {/LOOP} diff --git a/app/views/admin/groups/list.html b/app/views/admin/groups/list.html index ba8df0a..3a79bc7 100644 --- a/app/views/admin/groups/list.html +++ b/app/views/admin/groups/list.html @@ -18,7 +18,7 @@ - + - + - + - +
        {ID} {DTC}{time}{/DTC} {feedback}
        {username}
        {name} {userCount} diff --git a/app/views/admin/groups/list_members.html b/app/views/admin/groups/list_members.html index 472ee7f..59623e8 100644 --- a/app/views/admin/groups/list_members.html +++ b/app/views/admin/groups/list_members.html @@ -20,7 +20,7 @@ {ID} {username} {DTC date}{registered}{/DTC} diff --git a/app/views/admin/groups/view.html b/app/views/admin/groups/view.html index 572a224..86490f8 100644 --- a/app/views/admin/groups/view.html +++ b/app/views/admin/groups/view.html @@ -1,8 +1,8 @@
        -
        -
        +
        +

        {name}

        diff --git a/app/views/admin/modules/models/view.html b/app/views/admin/modules/models/view.html index 6ba687b..c5de60b 100644 --- a/app/views/admin/modules/models/view.html +++ b/app/views/admin/modules/models/view.html @@ -1,8 +1,8 @@
        -
        -
        +
        +

        Model Info

        diff --git a/app/views/admin/modules/plugins/view.html b/app/views/admin/modules/plugins/view.html index 109dedb..5b8f8f1 100644 --- a/app/views/admin/modules/plugins/view.html +++ b/app/views/admin/modules/plugins/view.html @@ -1,8 +1,8 @@
        -
        -
        +
        +

        Plugin Info

        diff --git a/app/views/admin/routes/list.html b/app/views/admin/routes/list.html index cd64e8f..2005a7e 100644 --- a/app/views/admin/routes/list.html +++ b/app/views/admin/routes/list.html @@ -24,7 +24,7 @@
        		{redirect_type} {original_url} {forwarded_url} diff --git a/app/views/admin/routes/view.html b/app/views/admin/routes/view.html index 3abbc83..bc0d039 100644 --- a/app/views/admin/routes/view.html +++ b/app/views/admin/routes/view.html @@ -1,8 +1,8 @@
        -
        -
        +
        +

        {nickname}

        diff --git a/app/views/admin/tokens/view.html b/app/views/admin/tokens/view.html index 1653976..72cc885 100644 --- a/app/views/admin/tokens/view.html +++ b/app/views/admin/tokens/view.html @@ -1,8 +1,8 @@
        -
        -
        +
        +

        {name}

        diff --git a/app/views/admin/users/list.html b/app/views/admin/users/list.html index 4328830..28b5b35 100644 --- a/app/views/admin/users/list.html +++ b/app/views/admin/users/list.html @@ -20,7 +20,7 @@
        		{ID} {username} {DTC date}{registered}{/DTC} diff --git a/app/views/admin/users/view.html b/app/views/admin/users/view.html index facedc2..5c0cd8a 100644 --- a/app/views/admin/users/view.html +++ b/app/views/admin/users/view.html @@ -1,8 +1,8 @@
        -
        -
        +
        +

        {username}

        @@ -54,7 +54,7 @@ {ADMIN} - + diff --git a/app/views/faq.html b/app/views/faq.html index 65c623a..42c18f0 100644 --- a/app/views/faq.html +++ b/app/views/faq.html @@ -1,6 +1,7 @@ -
        +

        Frequently Asked Questions

        +
        diff --git a/app/views/login.html b/app/views/login.html index 609b04f..ea01670 100644 --- a/app/views/login.html +++ b/app/views/login.html @@ -1,44 +1,56 @@ - - Please sign in +
        +
        +
        +
        +
        +
        +
        +
        + +
        + logo +

        AllTheBookmarks

        +
        + + +

        Please login to your account

        + +
        + +
        + +
        + +
        + +
        + + Forgot password? +
        + +
        +

        Don't have an account?

        +         - -
        - -
        - -
        -
        - - -
        - -
        - -
        -
        - - -
        -
        -
        -
        - - + + +
        + + + + +
        +
        +
        +
        +

        I appreciate you.

        +

        As a solo developer, i appreciate each and every person who uses my products. There aren't many of you, so thank you

        +
        +
        +
        +
        - - -
        -
        - -
        -
        - - - - - - -

        Don't have an account? You can register here.

        -

        If you need assistance with your username or password, please Click here.

        +
        \ No newline at end of file diff --git a/app/views/nav/statusLoggedIn.html b/app/views/nav/statusLoggedIn.html index c88fe05..f70ed40 100644 --- a/app/views/nav/statusLoggedIn.html +++ b/app/views/nav/statusLoggedIn.html @@ -7,7 +7,7 @@ data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> - {USERNAME} + {USERNAME}
        • Profile
          • diff --git a/app/views/nav/statusLoggedOut.html b/app/views/nav/statusLoggedOut.html index 5f0e9de..088b013 100644 --- a/app/views/nav/statusLoggedOut.html +++ b/app/views/nav/statusLoggedOut.html @@ -1,15 +1,15 @@ -
        • + +
          -
          +
          diff --git a/app/views/privacy.html b/app/views/privacy.html index 38eb7cf..b6942ce 100644 --- a/app/views/privacy.html +++ b/app/views/privacy.html @@ -1,198 +1,204 @@ -

          Privacy Policy

          -

          Last updated: December 09, 2024

          -

          This Privacy Policy describes Our policies and procedures on the collection, use and disclosure of Your information when You use the Service and tells You about Your privacy rights and how the law protects You.

          -

          We use Your Personal data to provide and improve the Service. By using the Service, You agree to the collection and use of information in accordance with this Privacy Policy. This Privacy Policy has been created with the help of the Privacy Policy Generator.

          -

          Interpretation and Definitions

          -

          Interpretation

          -

          The words of which the initial letter is capitalized have meanings defined under the following conditions. The following definitions shall have the same meaning regardless of whether they appear in singular or in plural.

          -

          Definitions

          -

          For the purposes of this Privacy Policy:

          -
            -
          • -

            Account means a unique account created for You to access our Service or parts of our Service.

            -
            • -
          • -

            Affiliate means an entity that controls, is controlled by or is under common control with a party, where "control" means ownership of 50% or more of the shares, equity interest or other securities entitled to vote for election of directors or other managing authority.

            -
            • -
          • -

            Application refers to All The Bookmarks, the software program provided by the Company.

            -
            • -
          • -

            Company (referred to as either "the Company", "We", "Us" or "Our" in this Agreement) refers to All The Bookmarks.

            -
            • -
          • -

            Cookies are small files that are placed on Your computer, mobile device or any other device by a website, containing the details of Your browsing history on that website among its many uses.

            -
            • -
          • -

            Country refers to: Georgia, United States

            -
            • -
          • -

            Device means any device that can access the Service such as a computer, a cellphone or a digital tablet.

            -
            • -
          • -

            Personal Data is any information that relates to an identified or identifiable individual.

            -
            • -
          • -

            Service refers to the Application or the Website or both.

            -
            • -
          • -

            Service Provider means any natural or legal person who processes the data on behalf of the Company. It refers to third-party companies or individuals employed by the Company to facilitate the Service, to provide the Service on behalf of the Company, to perform services related to the Service or to assist the Company in analyzing how the Service is used.

            -
            • -
          • -

            Third-party Social Media Service refers to any website or any social network website through which a User can log in or create an account to use the Service.

            -
            • -
          • -

            Usage Data refers to data collected automatically, either generated by the use of the Service or from the Service infrastructure itself (for example, the duration of a page visit).

            -
            • -
          • -

            Website refers to All The Bookmarks, accessible from https://allthebookmarks.com

            -
            • -
          • -

            You means the individual accessing or using the Service, or the company, or other legal entity on behalf of which such individual is accessing or using the Service, as applicable.

            -
            • -
          -

          Collecting and Using Your Personal Data

          -

          Types of Data Collected

          -

          Personal Data

          -

          While using Our Service, We may ask You to provide Us with certain personally identifiable information that can be used to contact or identify You. Personally identifiable information may include, but is not limited to:

          -
            -
          • -

            Email address

            -
            • -
          • -

            First name and last name

            -
            • -
          • -

            Usage Data

            -
            • -
          -

          Usage Data

          -

          Usage Data is collected automatically when using the Service.

          -

          Usage Data may include information such as Your Device's Internet Protocol address (e.g. IP address), browser type, browser version, the pages of our Service that You visit, the time and date of Your visit, the time spent on those pages, unique device identifiers and other diagnostic data.

          -

          When You access the Service by or through a mobile device, We may collect certain information automatically, including, but not limited to, the type of mobile device You use, Your mobile device unique ID, the IP address of Your mobile device, Your mobile operating system, the type of mobile Internet browser You use, unique device identifiers and other diagnostic data.

          -

          We may also collect information that Your browser sends whenever You visit our Service or when You access the Service by or through a mobile device.

          -

          Information from Third-Party Social Media Services

          -

          The Company allows You to create an account and log in to use the Service through the following Third-party Social Media Services:

          -
            -
          • Google
            • -
          • Facebook
            • -
          • Instagram
            • -
          • Twitter
            • -
          • LinkedIn
            • -
          -

          If You decide to register through or otherwise grant us access to a Third-Party Social Media Service, We may collect Personal data that is already associated with Your Third-Party Social Media Service's account, such as Your name, Your email address, Your activities or Your contact list associated with that account.

          -

          You may also have the option of sharing additional information with the Company through Your Third-Party Social Media Service's account. If You choose to provide such information and Personal Data, during registration or otherwise, You are giving the Company permission to use, share, and store it in a manner consistent with this Privacy Policy.

          -

          Tracking Technologies and Cookies

          -

          We use Cookies and similar tracking technologies to track the activity on Our Service and store certain information. Tracking technologies used are beacons, tags, and scripts to collect and track information and to improve and analyze Our Service. The technologies We use may include:

          -
            -
          • Cookies or Browser Cookies. A cookie is a small file placed on Your Device. You can instruct Your browser to refuse all Cookies or to indicate when a Cookie is being sent. However, if You do not accept Cookies, You may not be able to use some parts of our Service. Unless you have adjusted Your browser setting so that it will refuse Cookies, our Service may use Cookies.
            • -
          • Web Beacons. Certain sections of our Service and our emails may contain small electronic files known as web beacons (also referred to as clear gifs, pixel tags, and single-pixel gifs) that permit the Company, for example, to count users who have visited those pages or opened an email and for other related website statistics (for example, recording the popularity of a certain section and verifying system and server integrity).
            • -
          -

          Cookies can be "Persistent" or "Session" Cookies. Persistent Cookies remain on Your personal computer or mobile device when You go offline, while Session Cookies are deleted as soon as You close Your web browser. You can learn more about cookies on TermsFeed website article.

          -

          We use both Session and Persistent Cookies for the purposes set out below:

          -
            -
          • -

            Necessary / Essential Cookies

            -

            Type: Session Cookies

            -

            Administered by: Us

            -

            Purpose: These Cookies are essential to provide You with services available through the Website and to enable You to use some of its features. They help to authenticate users and prevent fraudulent use of user accounts. Without these Cookies, the services that You have asked for cannot be provided, and We only use these Cookies to provide You with those services.

            -
            • -
          • -

            Cookies Policy / Notice Acceptance Cookies

            -

            Type: Persistent Cookies

            -

            Administered by: Us

            -

            Purpose: These Cookies identify if users have accepted the use of cookies on the Website.

            -
            • -
          • -

            Functionality Cookies

            -

            Type: Persistent Cookies

            -

            Administered by: Us

            -

            Purpose: These Cookies allow us to remember choices You make when You use the Website, such as remembering your login details or language preference. The purpose of these Cookies is to provide You with a more personal experience and to avoid You having to re-enter your preferences every time You use the Website.

            -
            • -
          -

          For more information about the cookies we use and your choices regarding cookies, please visit our Cookies Policy or the Cookies section of our Privacy Policy.

          -

          Use of Your Personal Data

          -

          The Company may use Personal Data for the following purposes:

          -
            -
          • -

            To provide and maintain our Service, including to monitor the usage of our Service.

            -
            • -
          • -

            To manage Your Account: to manage Your registration as a user of the Service. The Personal Data You provide can give You access to different functionalities of the Service that are available to You as a registered user.

            -
            • -
          • -

            For the performance of a contract: the development, compliance and undertaking of the purchase contract for the products, items or services You have purchased or of any other contract with Us through the Service.

            -
            • -
          • -

            To contact You: To contact You by email, telephone calls, SMS, or other equivalent forms of electronic communication, such as a mobile application's push notifications regarding updates or informative communications related to the functionalities, products or contracted services, including the security updates, when necessary or reasonable for their implementation.

            -
            • -
          • -

            To provide You with news, special offers and general information about other goods, services and events which we offer that are similar to those that you have already purchased or enquired about unless You have opted not to receive such information.

            -
            • -
          • -

            To manage Your requests: To attend and manage Your requests to Us.

            -
            • -
          • -

            For business transfers: We may use Your information to evaluate or conduct a merger, divestiture, restructuring, reorganization, dissolution, or other sale or transfer of some or all of Our assets, whether as a going concern or as part of bankruptcy, liquidation, or similar proceeding, in which Personal Data held by Us about our Service users is among the assets transferred.

            -
            • -
          • -

            For other purposes: We may use Your information for other purposes, such as data analysis, identifying usage trends, determining the effectiveness of our promotional campaigns and to evaluate and improve our Service, products, services, marketing and your experience.

            -
            • -
          -

          We may share Your personal information in the following situations:

          -
            -
          • With Service Providers: We may share Your personal information with Service Providers to monitor and analyze the use of our Service, to contact You.
            • -
          • For business transfers: We may share or transfer Your personal information in connection with, or during negotiations of, any merger, sale of Company assets, financing, or acquisition of all or a portion of Our business to another company.
            • -
          • With Affiliates: We may share Your information with Our affiliates, in which case we will require those affiliates to honor this Privacy Policy. Affiliates include Our parent company and any other subsidiaries, joint venture partners or other companies that We control or that are under common control with Us.
            • -
          • With business partners: We may share Your information with Our business partners to offer You certain products, services or promotions.
            • -
          • With other users: when You share personal information or otherwise interact in the public areas with other users, such information may be viewed by all users and may be publicly distributed outside. If You interact with other users or register through a Third-Party Social Media Service, Your contacts on the Third-Party Social Media Service may see Your name, profile, pictures and description of Your activity. Similarly, other users will be able to view descriptions of Your activity, communicate with You and view Your profile.
            • -
          • With Your consent: We may disclose Your personal information for any other purpose with Your consent.
            • -
          -

          Retention of Your Personal Data

          -

          The Company will retain Your Personal Data only for as long as is necessary for the purposes set out in this Privacy Policy. We will retain and use Your Personal Data to the extent necessary to comply with our legal obligations (for example, if we are required to retain your data to comply with applicable laws), resolve disputes, and enforce our legal agreements and policies.

          -

          The Company will also retain Usage Data for internal analysis purposes. Usage Data is generally retained for a shorter period of time, except when this data is used to strengthen the security or to improve the functionality of Our Service, or We are legally obligated to retain this data for longer time periods.

          -

          Transfer of Your Personal Data

          -

          Your information, including Personal Data, is processed at the Company's operating offices and in any other places where the parties involved in the processing are located. It means that this information may be transferred to — and maintained on — computers located outside of Your state, province, country or other governmental jurisdiction where the data protection laws may differ than those from Your jurisdiction.

          -

          Your consent to this Privacy Policy followed by Your submission of such information represents Your agreement to that transfer.

          -

          The Company will take all steps reasonably necessary to ensure that Your data is treated securely and in accordance with this Privacy Policy and no transfer of Your Personal Data will take place to an organization or a country unless there are adequate controls in place including the security of Your data and other personal information.

          -

          Delete Your Personal Data

          -

          You have the right to delete or request that We assist in deleting the Personal Data that We have collected about You.

          -

          Our Service may give You the ability to delete certain information about You from within the Service.

          -

          You may update, amend, or delete Your information at any time by signing in to Your Account, if you have one, and visiting the account settings section that allows you to manage Your personal information. You may also contact Us to request access to, correct, or delete any personal information that You have provided to Us.

          -

          Please note, however, that We may need to retain certain information when we have a legal obligation or lawful basis to do so.

          -

          Disclosure of Your Personal Data

          -

          Business Transactions

          -

          If the Company is involved in a merger, acquisition or asset sale, Your Personal Data may be transferred. We will provide notice before Your Personal Data is transferred and becomes subject to a different Privacy Policy.

          -

          Law enforcement

          -

          Under certain circumstances, the Company may be required to disclose Your Personal Data if required to do so by law or in response to valid requests by public authorities (e.g. a court or a government agency).

          -

          Other legal requirements

          -

          The Company may disclose Your Personal Data in the good faith belief that such action is necessary to:

          -
            -
          • Comply with a legal obligation
            • -
          • Protect and defend the rights or property of the Company
            • -
          • Prevent or investigate possible wrongdoing in connection with the Service
            • -
          • Protect the personal safety of Users of the Service or the public
            • -
          • Protect against legal liability
            • -
          -

          Security of Your Personal Data

          -

          The security of Your Personal Data is important to Us, but remember that no method of transmission over the Internet, or method of electronic storage is 100% secure. While We strive to use commercially acceptable means to protect Your Personal Data, We cannot guarantee its absolute security.

          -

          Children's Privacy

          -

          Our Service does not address anyone under the age of 13. We do not knowingly collect personally identifiable information from anyone under the age of 13. If You are a parent or guardian and You are aware that Your child has provided Us with Personal Data, please contact Us. If We become aware that We have collected Personal Data from anyone under the age of 13 without verification of parental consent, We take steps to remove that information from Our servers.

          -

          If We need to rely on consent as a legal basis for processing Your information and Your country requires consent from a parent, We may require Your parent's consent before We collect and use that information.

          -

          Links to Other Websites

          -

          Our Service may contain links to other websites that are not operated by Us. If You click on a third party link, You will be directed to that third party's site. We strongly advise You to review the Privacy Policy of every site You visit.

          -

          We have no control over and assume no responsibility for the content, privacy policies or practices of any third party sites or services.

          -

          Changes to this Privacy Policy

          -

          We may update Our Privacy Policy from time to time. We will notify You of any changes by posting the new Privacy Policy on this page.

          -

          We will let You know via email and/or a prominent notice on Our Service, prior to the change becoming effective and update the "Last updated" date at the top of this Privacy Policy.

          -

          You are advised to review this Privacy Policy periodically for any changes. Changes to this Privacy Policy are effective when they are posted on this page.

          -

          Contact Us

          -

          If you have any questions about this Privacy Policy, You can contact us:

          - \ No newline at end of file +
          +

          Privacy Policy

          +

          Last updated: December 09, 2024

          +

          This Privacy Policy describes Our policies and procedures on the collection, use and disclosure of Your information when You use the Service and tells You about Your privacy rights and how the law protects You.

          +

          We use Your Personal data to provide and improve the Service. By using the Service, You agree to the collection and use of information in accordance with this Privacy Policy. This Privacy Policy has been created with the help of the Privacy Policy Generator.

          +

          Interpretation and Definitions

          +

          Interpretation

          +

          The words of which the initial letter is capitalized have meanings defined under the following conditions. The following definitions shall have the same meaning regardless of whether they appear in singular or in plural.

          +

          Definitions

          +

          For the purposes of this Privacy Policy:

          +
            +
          • +

            Account means a unique account created for You to access our Service or parts of our Service.

            +
            • +
          • +

            Affiliate means an entity that controls, is controlled by or is under common control with a party, where "control" means ownership of 50% or more of the shares, equity interest or other securities entitled to vote for election of directors or other managing authority.

            +
            • +
          • +

            Application refers to All The Bookmarks, the software program provided by the Company.

            +
            • +
          • +

            Company (referred to as either "the Company", "We", "Us" or "Our" in this Agreement) refers to All The Bookmarks.

            +
            • +
          • +

            Cookies are small files that are placed on Your computer, mobile device or any other device by a website, containing the details of Your browsing history on that website among its many uses.

            +
            • +
          • +

            Country refers to: Georgia, United States

            +
            • +
          • +

            Device means any device that can access the Service such as a computer, a cellphone or a digital tablet.

            +
            • +
          • +

            Personal Data is any information that relates to an identified or identifiable individual.

            +
            • +
          • +

            Service refers to the Application or the Website or both.

            +
            • +
          • +

            Service Provider means any natural or legal person who processes the data on behalf of the Company. It refers to third-party companies or individuals employed by the Company to facilitate the Service, to provide the Service on behalf of the Company, to perform services related to the Service or to assist the Company in analyzing how the Service is used.

            +
            • +
          • +

            Third-party Social Media Service refers to any website or any social network website through which a User can log in or create an account to use the Service.

            +
            • +
          • +

            Usage Data refers to data collected automatically, either generated by the use of the Service or from the Service infrastructure itself (for example, the duration of a page visit).

            +
            • +
          • +

            Website refers to All The Bookmarks, accessible from https://allthebookmarks.com

            +
            • +
          • +

            You means the individual accessing or using the Service, or the company, or other legal entity on behalf of which such individual is accessing or using the Service, as applicable.

            +
            • +
          +

          Collecting and Using Your Personal Data

          +

          Types of Data Collected

          +

          Personal Data

          +

          While using Our Service, We may ask You to provide Us with certain personally identifiable information that can be used to contact or identify You. Personally identifiable information may include, but is not limited to:

          +
            +
          • +

            Email address

            +
            • +
          • +

            First name and last name

            +
            • +
          • +

            Usage Data

            +
            • +
          +

          Usage Data

          +

          Usage Data is collected automatically when using the Service.

          +

          Usage Data may include information such as Your Device's Internet Protocol address (e.g. IP address), browser type, browser version, the pages of our Service that You visit, the time and date of Your visit, the time spent on those pages, unique device identifiers and other diagnostic data.

          +

          When You access the Service by or through a mobile device, We may collect certain information automatically, including, but not limited to, the type of mobile device You use, Your mobile device unique ID, the IP address of Your mobile device, Your mobile operating system, the type of mobile Internet browser You use, unique device identifiers and other diagnostic data.

          +

          We may also collect information that Your browser sends whenever You visit our Service or when You access the Service by or through a mobile device.

          +

          Information from Third-Party Social Media Services

          +

          The Company allows You to create an account and log in to use the Service through the following Third-party Social Media Services:

          +
            +
          • Google
            • +
          • Facebook
            • +
          • Instagram
            • +
          • Twitter
            • +
          • LinkedIn
            • +
          +

          If You decide to register through or otherwise grant us access to a Third-Party Social Media Service, We may collect Personal data that is already associated with Your Third-Party Social Media Service's account, such as Your name, Your email address, Your activities or Your contact list associated with that account.

          +

          You may also have the option of sharing additional information with the Company through Your Third-Party Social Media Service's account. If You choose to provide such information and Personal Data, during registration or otherwise, You are giving the Company permission to use, share, and store it in a manner consistent with this Privacy Policy.

          +

          Tracking Technologies and Cookies

          +

          We use Cookies and similar tracking technologies to track the activity on Our Service and store certain information. Tracking technologies used are beacons, tags, and scripts to collect and track information and to improve and analyze Our Service. The technologies We use may include:

          +
            +
          • Cookies or Browser Cookies. A cookie is a small file placed on Your Device. You can instruct Your browser to refuse all Cookies or to indicate when a Cookie is being sent. However, if You do not accept Cookies, You may not be able to use some parts of our Service. Unless you have adjusted Your browser setting so that it will refuse Cookies, our Service may use Cookies.
            • +
          • Web Beacons. Certain sections of our Service and our emails may contain small electronic files known as web beacons (also referred to as clear gifs, pixel tags, and single-pixel gifs) that permit the Company, for example, to count users who have visited those pages or opened an email and for other related website statistics (for example, recording the popularity of a certain section and verifying system and server integrity).
            • +
          +

          Cookies can be "Persistent" or "Session" Cookies. Persistent Cookies remain on Your personal computer or mobile device when You go offline, while Session Cookies are deleted as soon as You close Your web browser. You can learn more about cookies on TermsFeed website article.

          +

          We use both Session and Persistent Cookies for the purposes set out below:

          +
            +
          • +

            Necessary / Essential Cookies

            +

            Type: Session Cookies

            +

            Administered by: Us

            +

            Purpose: These Cookies are essential to provide You with services available through the Website and to enable You to use some of its features. They help to authenticate users and prevent fraudulent use of user accounts. Without these Cookies, the services that You have asked for cannot be provided, and We only use these Cookies to provide You with those services.

            +
            • +
          • +

            Cookies Policy / Notice Acceptance Cookies

            +

            Type: Persistent Cookies

            +

            Administered by: Us

            +

            Purpose: These Cookies identify if users have accepted the use of cookies on the Website.

            +
            • +
          • +

            Functionality Cookies

            +

            Type: Persistent Cookies

            +

            Administered by: Us

            +

            Purpose: These Cookies allow us to remember choices You make when You use the Website, such as remembering your login details or language preference. The purpose of these Cookies is to provide You with a more personal experience and to avoid You having to re-enter your preferences every time You use the Website.

            +
            • +
          +

          For more information about the cookies we use and your choices regarding cookies, please visit our Cookies Policy or the Cookies section of our Privacy Policy.

          +

          Use of Your Personal Data

          +

          The Company may use Personal Data for the following purposes:

          +
            +
          • +

            To provide and maintain our Service, including to monitor the usage of our Service.

            +
            • +
          • +

            To manage Your Account: to manage Your registration as a user of the Service. The Personal Data You provide can give You access to different functionalities of the Service that are available to You as a registered user.

            +
            • +
          • +

            For the performance of a contract: the development, compliance and undertaking of the purchase contract for the products, items or services You have purchased or of any other contract with Us through the Service.

            +
            • +
          • +

            To contact You: To contact You by email, telephone calls, SMS, or other equivalent forms of electronic communication, such as a mobile application's push notifications regarding updates or informative communications related to the functionalities, products or contracted services, including the security updates, when necessary or reasonable for their implementation.

            +
            • +
          • +

            To provide You with news, special offers and general information about other goods, services and events which we offer that are similar to those that you have already purchased or enquired about unless You have opted not to receive such information.

            +
            • +
          • +

            To manage Your requests: To attend and manage Your requests to Us.

            +
            • +
          • +

            For business transfers: We may use Your information to evaluate or conduct a merger, divestiture, restructuring, reorganization, dissolution, or other sale or transfer of some or all of Our assets, whether as a going concern or as part of bankruptcy, liquidation, or similar proceeding, in which Personal Data held by Us about our Service users is among the assets transferred.

            +
            • +
          • +

            For other purposes: We may use Your information for other purposes, such as data analysis, identifying usage trends, determining the effectiveness of our promotional campaigns and to evaluate and improve our Service, products, services, marketing and your experience.

            +
            • +
          +

          We may share Your personal information in the following situations:

          +
            +
          • With Service Providers: We may share Your personal information with Service Providers to monitor and analyze the use of our Service, to contact You.
            • +
          • For business transfers: We may share or transfer Your personal information in connection with, or during negotiations of, any merger, sale of Company assets, financing, or acquisition of all or a portion of Our business to another company.
            • +
          • With Affiliates: We may share Your information with Our affiliates, in which case we will require those affiliates to honor this Privacy Policy. Affiliates include Our parent company and any other subsidiaries, joint venture partners or other companies that We control or that are under common control with Us.
            • +
          • With business partners: We may share Your information with Our business partners to offer You certain products, services or promotions.
            • +
          • With other users: when You share personal information or otherwise interact in the public areas with other users, such information may be viewed by all users and may be publicly distributed outside. If You interact with other users or register through a Third-Party Social Media Service, Your contacts on the Third-Party Social Media Service may see Your name, profile, pictures and description of Your activity. Similarly, other users will be able to view descriptions of Your activity, communicate with You and view Your profile.
            • +
          • With Your consent: We may disclose Your personal information for any other purpose with Your consent.
            • +
          +

          Retention of Your Personal Data

          +

          The Company will retain Your Personal Data only for as long as is necessary for the purposes set out in this Privacy Policy. We will retain and use Your Personal Data to the extent necessary to comply with our legal obligations (for example, if we are required to retain your data to comply with applicable laws), resolve disputes, and enforce our legal agreements and policies.

          +

          The Company will also retain Usage Data for internal analysis purposes. Usage Data is generally retained for a shorter period of time, except when this data is used to strengthen the security or to improve the functionality of Our Service, or We are legally obligated to retain this data for longer time periods.

          +

          Transfer of Your Personal Data

          +

          Your information, including Personal Data, is processed at the Company's operating offices and in any other places where the parties involved in the processing are located. It means that this information may be transferred to — and maintained on — computers located outside of Your state, province, country or other governmental jurisdiction where the data protection laws may differ than those from Your jurisdiction.

          +

          Your consent to this Privacy Policy followed by Your submission of such information represents Your agreement to that transfer.

          +

          The Company will take all steps reasonably necessary to ensure that Your data is treated securely and in accordance with this Privacy Policy and no transfer of Your Personal Data will take place to an organization or a country unless there are adequate controls in place including the security of Your data and other personal information.

          +

          Delete Your Personal Data

          +

          You have the right to delete or request that We assist in deleting the Personal Data that We have collected about You.

          +

          Our Service may give You the ability to delete certain information about You from within the Service.

          +

          You may update, amend, or delete Your information at any time by signing in to Your Account, if you have one, and visiting the account settings section that allows you to manage Your personal information. You may also contact Us to request access to, correct, or delete any personal information that You have provided to Us.

          +

          Please note, however, that We may need to retain certain information when we have a legal obligation or lawful basis to do so.

          +

          Disclosure of Your Personal Data

          +

          Business Transactions

          +

          If the Company is involved in a merger, acquisition or asset sale, Your Personal Data may be transferred. We will provide notice before Your Personal Data is transferred and becomes subject to a different Privacy Policy.

          +

          Law enforcement

          +

          Under certain circumstances, the Company may be required to disclose Your Personal Data if required to do so by law or in response to valid requests by public authorities (e.g. a court or a government agency).

          +

          Other legal requirements

          +

          The Company may disclose Your Personal Data in the good faith belief that such action is necessary to:

          +
            +
          • Comply with a legal obligation
            • +
          • Protect and defend the rights or property of the Company
            • +
          • Prevent or investigate possible wrongdoing in connection with the Service
            • +
          • Protect the personal safety of Users of the Service or the public
            • +
          • Protect against legal liability
            • +
          +

          Security of Your Personal Data

          +

          The security of Your Personal Data is important to Us, but remember that no method of transmission over the Internet, or method of electronic storage is 100% secure. While We strive to use commercially acceptable means to protect Your Personal Data, We cannot guarantee its absolute security.

          +

          Children's Privacy

          +

          Our Service does not address anyone under the age of 13. We do not knowingly collect personally identifiable information from anyone under the age of 13. If You are a parent or guardian and You are aware that Your child has provided Us with Personal Data, please contact Us. If We become aware that We have collected Personal Data from anyone under the age of 13 without verification of parental consent, We take steps to remove that information from Our servers.

          +

          If We need to rely on consent as a legal basis for processing Your information and Your country requires consent from a parent, We may require Your parent's consent before We collect and use that information.

          +

          Links to Other Websites

          +

          Our Service may contain links to other websites that are not operated by Us. If You click on a third party link, You will be directed to that third party's site. We strongly advise You to review the Privacy Policy of every site You visit.

          +

          We have no control over and assume no responsibility for the content, privacy policies or practices of any third party sites or services.

          +

          Changes to this Privacy Policy

          +

          We may update Our Privacy Policy from time to time. We will notify You of any changes by posting the new Privacy Policy on this page.

          +

          We will let You know via email and/or a prominent notice on Our Service, prior to the change becoming effective and update the "Last updated" date at the top of this Privacy Policy.

          +

          You are advised to review this Privacy Policy periodically for any changes. Changes to this Privacy Policy are effective when they are posted on this page.

          +

          Contact Us

          +

          If you have any questions about this Privacy Policy, You can contact us:

          + +
          + Back to Top +
          +
          + diff --git a/app/views/profile.html b/app/views/profile.html index 9b309a7..8da62b0 100644 --- a/app/views/profile.html +++ b/app/views/profile.html @@ -55,12 +55,12 @@
          + {ADMIN} Message - {ADMIN} - Edit + Edit Delete diff --git a/app/views/termsPage.html b/app/views/termsPage.html new file mode 100644 index 0000000..16b2bb1 --- /dev/null +++ b/app/views/termsPage.html @@ -0,0 +1,6 @@ +
          + {TERMS} +
          + Back to Top +
          +
          \ No newline at end of file diff --git a/index.php b/index.php index 6885133..8a858d3 100644 --- a/index.php +++ b/index.php @@ -23,6 +23,11 @@ use TheTempusProject\Hermes\Functions\Route; use TheTempusProject\Houdini\Classes\Components; use TheTempusProject\Houdini\Classes\Views; +// I switched to cloudflare which uses a dynamic proxy kinda thing, so any IP address lookups go wonky unless i get the OG IIP +if ( isset( $_SERVER['HTTP_CF_CONNECTING_IP'] ) && filter_var( $_SERVER['HTTP_CF_CONNECTING_IP'], FILTER_VALIDATE_IP ) ) { + $_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_CF_CONNECTING_IP']; +} + /** * Instantiate a new instance of our application. *