* Working copy off polr.avc.edu running PHP 8.0

.gitignore

@@ -16,3 +16,4 @@ yarn-error.log
 /.fleet
 /.idea
 /.vscode
+/artisan

README.md

@@ -1,66 +1,81 @@
-<p align="center"><a href="https://laravel.com" target="_blank"><img src="https://raw.githubusercontent.com/laravel/art/master/logo-lockup/5%20SVG/2%20CMYK/1%20Full%20Color/laravel-logolockup-cmyk-red.svg" width="400" alt="Laravel Logo"></a></p>
+<img src="https://i.imgur.com/ckI6GTu.png" width="350px" alt="Polr Logo" />
 
-<p align="center">
-<a href="https://travis-ci.org/laravel/framework"><img src="https://travis-ci.org/laravel/framework.svg" alt="Build Status"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/dt/laravel/framework" alt="Total Downloads"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/v/laravel/framework" alt="Latest Stable Version"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/l/laravel/framework" alt="License"></a>
-</p>
 
-## About Laravel
+:aerial_tramway: A modern, minimalist, and lightweight URL shortener.
 
-Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable and creative experience to be truly fulfilling. Laravel takes the pain out of development by easing common tasks used in many web projects, such as:
+[![GitHub license](https://img.shields.io/badge/license-GPLv2%2B-blue.svg)]()
+[![GitHub release](https://img.shields.io/github/release/cydrobolt/polr.svg)](https://github.com/cydrobolt/polr/releases)
+[![Builds status](https://travis-ci.org/cydrobolt/polr.svg)](https://travis-ci.org/cydrobolt/polr)
+[![Docs](https://img.shields.io/badge/docs-latest-brightgreen.svg?style=flat)](http://polr.readthedocs.org/en/latest/)
 
-- [Simple, fast routing engine](https://laravel.com/docs/routing).
-- [Powerful dependency injection container](https://laravel.com/docs/container).
-- Multiple back-ends for [session](https://laravel.com/docs/session) and [cache](https://laravel.com/docs/cache) storage.
-- Expressive, intuitive [database ORM](https://laravel.com/docs/eloquent).
-- Database agnostic [schema migrations](https://laravel.com/docs/migrations).
-- [Robust background job processing](https://laravel.com/docs/queues).
-- [Real-time event broadcasting](https://laravel.com/docs/broadcasting).
 
-Laravel is accessible, powerful, and provides tools required for large, robust applications.
+Polr is an intrepid, self-hostable open-source link shortening web application with a robust API. It allows you to host your own URL shortener, to brand your URLs, and to gain control over your data. Polr is especially easy to use, and provides a modern, themable feel.
 
-## Learning Laravel
+[Getting Started](http://docs.polrproject.org/en/latest/user-guide/installation/) - [API Documentation](http://docs.polrproject.org/en/latest/developer-guide/api/) - [Contributing](https://github.com/cydrobolt/polr/blob/master/.github/CONTRIBUTING.md) - [Bugs](https://github.com/cydrobolt/polr/issues) - [IRC](http://webchat.freenode.net/?channels=#polr)
 
-Laravel has the most extensive and thorough [documentation](https://laravel.com/docs) and video tutorial library of all modern web application frameworks, making it a breeze to get started with the framework.
+### Quickstart
 
-You may also try the [Laravel Bootcamp](https://bootcamp.laravel.com), where you will be guided through building a modern Laravel application from scratch.
+Polr is written in PHP and Lumen, using MySQL as its primary database.
 
-If you don't feel like reading, [Laracasts](https://laracasts.com) can help. Laracasts contains over 2000 video tutorials on a range of topics including Laravel, modern PHP, unit testing, and JavaScript. Boost your skills by digging into our comprehensive video library.
+ - To get started with Polr on your server, check out the [installation guide](http://docs.polrproject.org/en/latest/user-guide/installation/). You can clone this repository, or download a [release](https://github.com/cydrobolt/polr/releases).
+ - To get started with the Polr API, check out the [API guide](http://docs.polrproject.org/en/latest/developer-guide/api/).
 
-## Laravel Sponsors
 
-We would like to extend our thanks to the following sponsors for funding Laravel development. If you are interested in becoming a sponsor, please visit the Laravel [Patreon page](https://patreon.com/taylorotwell).
+Installation TL;DR: clone or download this repository, set document root to `public/`, create MySQL database, go to `yoursite.com/setup` and follow instructions.
 
-### Premium Partners
+### Demo
 
-- **[Vehikl](https://vehikl.com/)**
-- **[Tighten Co.](https://tighten.co)**
-- **[Kirschbaum Development Group](https://kirschbaumdevelopment.com)**
-- **[64 Robots](https://64robots.com)**
-- **[Cubet Techno Labs](https://cubettech.com)**
-- **[Cyber-Duck](https://cyber-duck.co.uk)**
-- **[Many](https://www.many.co.uk)**
-- **[Webdock, Fast VPS Hosting](https://www.webdock.io/en)**
-- **[DevSquad](https://devsquad.com)**
-- **[Curotec](https://www.curotec.com/services/technologies/laravel/)**
-- **[OP.GG](https://op.gg)**
-- **[WebReinvent](https://webreinvent.com/?utm_source=laravel&utm_medium=github&utm_campaign=patreon-sponsors)**
-- **[Lendio](https://lendio.com)**
+To test out the demo, head to [demo.polr.me](http://demo.polr.me) and use the following credentials:
 
-## Contributing
+- Username: `demo-admin`
+- Password: `demo-admin`
 
-Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](https://laravel.com/docs/contributions).
+### Upgrading Polr
+*Upgrading from 1.x:*
 
-## Code of Conduct
+There are breaking changes between 2.x and 1.x; it is not yet possible to automatically upgrade to 2.x.
 
-In order to ensure that the Laravel community is welcoming to all, please review and abide by the [Code of Conduct](https://laravel.com/docs/contributions#code-of-conduct).
+*Upgrading from 2.x:*
+ - Back up your database and files
+ - Update by using `git pull` or downloading a release
+ - Run `composer install --no-dev -o` to ensure dependencies are up to date
+ - Migrate with `php artisan migrate` to ensure database structure is up to date
 
-## Security Vulnerabilities
+#### Browser Extensions
 
-If you discover a security vulnerability within Laravel, please send an e-mail to Taylor Otwell via [[email protected]](mailto:taylor@laravel.com). All security vulnerabilities will be promptly addressed.
+* Safari - [Polr.safariextension](https://github.com/cleverdevil/Polr.safariextension)
 
-## License
+#### Libraries
 
-The Laravel framework is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).
+* Python - [mypolr](https://github.com/fauskanger/mypolr)
+
+#### Acknowledgements
+We would like to thank Oregon State University's Open Source Lab for providing resources for our infrastructure. The Polr website and demo are hosted on their infrastructure.
+
+<a href="//osuosl.org"><img height="100em" src="http://i.imgur.com/1VtLxyX.png" /></a>
+
+Thank you to [lastspark](https://thenounproject.com/lastspark/) for providing our logo's icon.
+
+#### Versioning
+
+Polr uses [Semantic Versioning](http://semver.org/)
+
+
+#### License
+
+
+    Copyright (C) 2013-2018 Chaoyi Zha
+
+    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 2
+    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, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

app/Http/Controllers/AdminPaginationController.php

@@ -1,17 +1,19 @@
 <?php
 namespace App\Http\Controllers;
 use Illuminate\Http\Request;
-use Yajra\Datatables\Facades\Datatables;
+use Yajra\DataTables\Facades\DataTables;
+use Carbon\Carbon;
 
 use App\Models\Link;
 use App\Models\User;
 use App\Helpers\UserHelper;
 use App\Factories\LinkFactory;
 
+error_log('AdminPaginationController');
 
 class AdminPaginationController extends Controller {
     /**
-     * Process AJAX Datatables pagination queries from the admin panel.
+     * Process AJAX DataTables pagination queries from the admin panel.
      *
      * @return Response
      */
@@ -136,11 +138,12 @@ public function paginateAdminUsers(Request $request) {
         self::ensureAdmin();
 
         $admin_users = User::select(['username', 'email', 'created_at', 'active', 'api_key', 'api_active', 'api_quota', 'role', 'id']);
-        return Datatables::of($admin_users)
-            ->addColumn('api_action', [$this, 'renderAdminApiActionCell'])
-            ->addColumn('toggle_active', [$this, 'renderToggleUserActiveCell'])
-            ->addColumn('change_role', [$this, 'renderChangeUserRoleCell'])
-            ->addColumn('delete', [$this, 'renderDeleteUserCell'])
+        return DataTables::of($admin_users)
+            ->addColumn('api_action', function($admin_user) {return $this->renderAdminApiActionCell($admin_user);})
+            ->addColumn('toggle_active', function($admin_user) {return $this->renderToggleUserActiveCell($admin_user);})
+            ->addColumn('change_role', function($admin_user) {return $this->renderChangeUserRoleCell($admin_user);})
+            ->addColumn('delete', function($admin_user) {return $this->renderDeleteUserCell($admin_user);})
+            ->editColumn('created_at', function ($user_link) {return Carbon::parse($user_link->created_at)->format('Y-m-d H:i:s');})
             ->escapeColumns(['username', 'email'])
             ->make(true);
     }
@@ -149,12 +152,13 @@ public function paginateAdminLinks(Request $request) {
         self::ensureAdmin();
 
         $admin_links = Link::select(['short_url', 'secret_key', 'long_url', 'clicks', 'created_at', 'creator', 'is_disabled']);
-        return Datatables::of($admin_links)
-            ->addColumn('disable', [$this, 'renderToggleLinkActiveCell'])
-            ->addColumn('delete', [$this, 'renderDeleteLinkCell'])
-            ->editColumn('clicks', [$this, 'renderClicksCell'])
-            ->editColumn('short_url', [$this, 'renderShortUrlCell'])
-            ->editColumn('long_url', [$this, 'renderLongUrlCell'])
+        return DataTables::of($admin_links)
+            ->addColumn('disable', function($admin_link) {return $this->renderToggleLinkActiveCell($admin_link);})
+            ->addColumn('delete', function($admin_link) {return $this->renderDeleteLinkCell($admin_link);})
+            ->editColumn('clicks', function($admin_link) {return $this->renderClicksCell($admin_link);})
+            ->editColumn('short_url', function($admin_link) {return $this->renderShortUrlCell($admin_link);})
+            ->editColumn('long_url', function($admin_link) {return $this->renderLongUrlCell($admin_link);})
+            ->editColumn('created_at', function ($user_link) {return Carbon::parse($user_link->created_at)->format('Y-m-d H:i:s');})
             ->removeColumn('secret_key')
             ->escapeColumns(['creator'])
             ->make(true);
@@ -167,10 +171,12 @@ public function paginateUserLinks(Request $request) {
         $user_links = Link::where('creator', $username)
             ->select(['id', 'short_url', 'secret_key', 'long_url', 'clicks', 'created_at']);
 
-        return Datatables::of($user_links)
-            ->editColumn('clicks', [$this, 'renderClicksCell'])
-            ->editColumn('short_url', [$this, 'renderShortUrlCell'])
-            ->editColumn('long_url', [$this, 'renderLongUrlCell'])
+        return DataTables::of($user_links)
+            ->editColumn('clicks', function($user_link) {return $this->renderClicksCell($user_link);})
+            ->editColumn('short_url', function($user_link) {return $this->renderShortUrlCell($user_link);})
+            ->editColumn('long_url', function($user_link) {return $this->renderLongUrlCell($user_link);})
+            ->editColumn('created_at', function ($user_link) {return Carbon::parse($user_link->created_at)->format('Y-m-d H:i:s');})
+            ->escapeColumns([])
             ->removeColumn('secret_key')
             ->make(true);
     }

composer.json

@@ -1,19 +1,20 @@
 {
-    "name": "laravel/laravel",
-    "type": "project",
-    "description": "The Laravel Framework.",
-    "keywords": ["framework", "laravel"],
-    "license": "MIT",
+    "name": "cydrobolt/polr",
+    "description": "The Polr URL Shortener.",
+    "keywords": ["url-shortener", "url", "cms"],
+    "license": "GPLv2+",
+    "type": "project",    
     "require": {
         "php": "^8.0.2",
+        "geoip2/geoip2": "^2.13",
         "guzzlehttp/guzzle": "^7.2",
         "laravel/framework": "^9.19",
+        "laravel/helpers": "^1.5",
         "laravel/sanctum": "^3.0",
         "laravel/tinker": "^2.7",
         "onelogin/php-saml": "^4.1",
-        "yajra/laravel-datatables-oracle": "^10.2",
         "torann/geoip": "^3.0",
-        "geoip2/geoip2": "^2.13"
+        "yajra/laravel-datatables-oracle": "^10.2"
     },
     "require-dev": {
         "fakerphp/faker": "^1.9.1",