diff --git a/composer.json b/composer.json
index 9ed60c08625bde4563bd101be1e19af6d240940a..80ca18de96518d7adb0de75aee2e57d79c140267 100644
--- a/composer.json
+++ b/composer.json
@@ -5,19 +5,15 @@
},
"require": {
"jasig/phpcas": "1.3.x-dev",
- "pear-pear.php.net/HTTP_Request2": "*",
+ "pear/http_request2": "*",
"tedivm/stash": "0.12.*",
- "unl/php-wdn-templates": "^5.2",
+ "unl/php-wdn-templates": "^5.3",
"unl/unl_cache_lite": "0.1.*",
"php-activerecord/php-activerecord": "^1.1",
"altorouter/altorouter": "1.1.0",
"phpmailer/phpmailer": "^5.2"
},
"repositories": [
- {
- "type": "pear",
- "url": "http://pear.php.net"
- },
{
"type": "vcs",
"url": "https://github.com/unlpear/UNL_Cache_Lite.git"
diff --git a/composer.lock b/composer.lock
index f06a4865b3087f952955f168e5b377413012e5e0..1a91bc483b47e9b81da4228e6ae07fdd8378bcb1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "418f404820492c5b99c30c47e5f21fbf",
+ "content-hash": "c3c7a8fc44c3bf68a94eb2d5dcbe7244",
"packages": [
{
"name": "altorouter/altorouter",
@@ -113,206 +113,190 @@
"time": "2019-01-01T10:53:16+00:00"
},
{
- "name": "pear-pear.php.net/Archive_Tar",
- "version": "1.4.3",
- "dist": {
- "type": "file",
- "url": "http://pear.php.net/get/Archive_Tar-1.4.3.tgz"
- },
- "require": {
- "php": ">=5.2.0.0"
- },
- "replace": {
- "pear-pear/archive_tar": "== 1.4.3.0"
- },
- "type": "pear-library",
- "autoload": {
- "classmap": [
- ""
- ]
+ "name": "pear/http_request2",
+ "version": "v2.4.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/pear/HTTP_Request2.git",
+ "reference": "84da432fbbf615593bd8aa25408aca3478b77502"
},
- "include-path": [
- "/"
- ],
- "license": [
- "New BSD License"
- ],
- "description": "This class provides handling of tar files in PHP.\nIt supports creating, listing, extracting and adding to tar files.\nGzip support is available if PHP has the zlib extension built-in or\nloaded. Bz2 compression is also supported with the bz2 extension loaded."
- },
- {
- "name": "pear-pear.php.net/Console_Getopt",
- "version": "1.4.1",
"dist": {
- "type": "file",
- "url": "http://pear.php.net/get/Console_Getopt-1.4.1.tgz"
+ "type": "zip",
+ "url": "https://api.github.com/repos/pear/HTTP_Request2/zipball/84da432fbbf615593bd8aa25408aca3478b77502",
+ "reference": "84da432fbbf615593bd8aa25408aca3478b77502",
+ "shasum": ""
},
"require": {
- "php": ">=5.4.0.0"
+ "pear/net_url2": "^2.2.0",
+ "pear/pear_exception": "^1.0.0",
+ "php": ">=5.6.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^3.7|^4.8|^5.7"
},
- "replace": {
- "pear-pear/console_getopt": "== 1.4.1.0"
+ "suggest": {
+ "ext-curl": "Allows using cURL as a request backend.",
+ "ext-fileinfo": "Adds support for looking up mime-types using finfo.",
+ "ext-openssl": "Allows handling SSL requests when not using cURL.",
+ "ext-zlib": "Allows handling gzip compressed responses."
},
- "type": "pear-library",
+ "type": "library",
"autoload": {
- "classmap": [
- ""
- ]
+ "psr-0": {
+ "HTTP_Request2": ""
+ }
},
- "include-path": [
- "/"
- ],
+ "notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-2-Clause"
+ "BSD-3-Clause"
],
- "description": "This is a PHP implementation of \"getopt\" supporting both\nshort and long options."
- },
- {
- "name": "pear-pear.php.net/HTTP_Request2",
- "version": "2.3.0",
- "dist": {
- "type": "file",
- "url": "http://pear.php.net/get/HTTP_Request2-2.3.0.tgz"
- },
- "require": {
- "pear-pear.php.net/net_url2": ">=2.2.0.0",
- "pear-pear.php.net/pear": ">=1.9.2.0",
- "php": ">=5.2.0.0"
- },
- "replace": {
- "pear-pear/http_request2": "== 2.3.0.0"
- },
- "type": "pear-library",
- "autoload": {
- "classmap": [
- ""
- ]
- },
- "include-path": [
- "/"
+ "authors": [
+ {
+ "name": "Alexey Borzov",
+ "email": "avb@php.net"
+ }
],
- "license": [
- "BSD 3-Clause License"
+ "description": "Provides an easy way to perform HTTP requests.",
+ "homepage": "https://pear.php.net/package/HTTP_Request2",
+ "keywords": [
+ "PEAR",
+ "curl",
+ "http",
+ "request"
],
- "description": "PHP5 rewrite of HTTP_Request package (with parts of HTTP_Client). Provides\ncleaner API and pluggable Adapters:\n * Socket adapter, based on old HTTP_Request code,\n * Curl adapter, wraps around PHP's cURL extension,\n * Mock adapter, to use for testing packages dependent on HTTP_Request2.\nSupports POST requests with data and file uploads, basic and digest\nauthentication, cookies, managing cookies across requests, proxies, gzip and\ndeflate encodings, redirects, monitoring the request progress with Observers..."
+ "support": {
+ "docs": "https://pear.php.net/manual/en/package.http.http-request2.php",
+ "issues": "https://pear.php.net/bugs/search.php?cmd=display&package_name[]=HTTP_Request2",
+ "source": "https://github.com/pear/HTTP_Request2"
+ },
+ "time": "2020-09-24T22:07:33+00:00"
},
{
- "name": "pear-pear.php.net/Net_URL2",
- "version": "2.2.1",
+ "name": "pear/net_url2",
+ "version": "v2.2.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/pear/Net_URL2.git",
+ "reference": "07fd055820dbf466ee3990abe96d0e40a8791f9d"
+ },
"dist": {
- "type": "file",
- "url": "http://pear.php.net/get/Net_URL2-2.2.1.tgz"
+ "type": "zip",
+ "url": "https://api.github.com/repos/pear/Net_URL2/zipball/07fd055820dbf466ee3990abe96d0e40a8791f9d",
+ "reference": "07fd055820dbf466ee3990abe96d0e40a8791f9d",
+ "shasum": ""
},
"require": {
- "php": ">=5.1.4.0"
+ "php": ">=5.1.4"
+ },
+ "require-dev": {
+ "phpunit/phpunit": ">=3.3.0"
},
- "replace": {
- "pear-pear/net_url2": "== 2.2.1.0"
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.2.x-dev"
+ }
},
- "type": "pear-library",
"autoload": {
"classmap": [
- ""
+ "Net/URL2.php"
]
},
+ "notification-url": "https://packagist.org/downloads/",
"include-path": [
- "/"
+ "./"
],
"license": [
"BSD-3-Clause"
],
- "description": "Provides parsing of URLs into their constituent parts (scheme, host, path etc.), URL generation, and resolving of\n relative URLs."
- },
- {
- "name": "pear-pear.php.net/PEAR",
- "version": "1.10.6",
- "dist": {
- "type": "file",
- "url": "http://pear.php.net/get/PEAR-1.10.6.tgz"
- },
- "require": {
- "ext-pcre": "*",
- "ext-xml": "*",
- "pear-pear.php.net/archive_tar": ">=1.4.0.0",
- "pear-pear.php.net/console_getopt": ">=1.4.1.0",
- "pear-pear.php.net/structures_graph": ">=1.1.0.0",
- "pear-pear.php.net/xml_util": ">=1.3.0.0",
- "php": ">=5.4.0.0"
- },
- "conflict": {
- "pear-pear.php.net/pear_frontend_gtk": "<0.4.0.0",
- "pear-pear.php.net/pear_frontend_web": "<=0.4.0.0"
- },
- "replace": {
- "pear-pear/pear": "== 1.10.6.0"
- },
- "type": "pear-library",
- "autoload": {
- "classmap": [
- ""
- ]
- },
- "include-path": [
- "/"
+ "authors": [
+ {
+ "name": "David Coallier",
+ "email": "davidc@php.net"
+ },
+ {
+ "name": "Tom Klingenberg",
+ "email": "tkli@php.net"
+ },
+ {
+ "name": "Christian Schmidt",
+ "email": "chmidt@php.net"
+ }
],
- "license": [
- "New BSD License"
+ "description": "Class for parsing and handling URL. Provides parsing of URLs into their constituent parts (scheme, host, path etc.), URL generation, and resolving of relative URLs.",
+ "homepage": "https://github.com/pear/Net_URL2",
+ "keywords": [
+ "PEAR",
+ "net",
+ "networking",
+ "rfc3986",
+ "uri",
+ "url"
],
- "description": "The PEAR package contains:\n * the PEAR installer, for creating, distributing\n and installing packages\n * the PEAR_Exception PHP5 error handling mechanism\n * the PEAR_ErrorStack advanced error handling mechanism\n * the PEAR_Error error handling mechanism\n * the OS_Guess class for retrieving info about the OS\n where PHP is running on\n * the System class for quick handling of common operations\n with files and directories\n * the PEAR base class\n Features in a nutshell:\n * full support for channels\n * pre-download dependency validation\n * new package.xml 2.0 format allows tremendous flexibility while maintaining BC\n * support for optional dependency groups and limited support for sub-packaging\n * robust dependency support\n * full dependency validation on uninstall\n * remote install for hosts with only ftp access - no more problems with\n restricted host installation\n * full support for mirroring\n * support for bundling several packages into a single tarball\n * support for static dependencies on a url-based package\n * support for custom file roles and installation tasks"
+ "support": {
+ "issues": "https://pear.php.net/bugs/search.php?cmd=display&package_name[]=Net_URL2",
+ "source": "https://github.com/pear/Net_URL2"
+ },
+ "time": "2017-08-25T06:16:11+00:00"
},
{
- "name": "pear-pear.php.net/Structures_Graph",
- "version": "1.1.1",
+ "name": "pear/pear_exception",
+ "version": "v1.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/pear/PEAR_Exception.git",
+ "reference": "dbb42a5a0e45f3adcf99babfb2a1ba77b8ac36a7"
+ },
"dist": {
- "type": "file",
- "url": "http://pear.php.net/get/Structures_Graph-1.1.1.tgz"
+ "type": "zip",
+ "url": "https://api.github.com/repos/pear/PEAR_Exception/zipball/dbb42a5a0e45f3adcf99babfb2a1ba77b8ac36a7",
+ "reference": "dbb42a5a0e45f3adcf99babfb2a1ba77b8ac36a7",
+ "shasum": ""
},
"require": {
- "php": ">=5.3.0.0"
+ "php": ">=4.4.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "*"
},
- "replace": {
- "pear-pear/structures_graph": "== 1.1.1.0"
+ "type": "class",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
},
- "type": "pear-library",
"autoload": {
"classmap": [
- ""
+ "PEAR/"
]
},
+ "notification-url": "https://packagist.org/downloads/",
"include-path": [
- "/"
+ "."
],
"license": [
- "LGPL-3.0+"
+ "BSD-2-Clause"
],
- "description": "Structures_Graph is a package for creating and manipulating graph datastructures. It allows building of directed\nand undirected graphs, with data and metadata stored in nodes. The library provides functions for graph traversing\nas well as for characteristic extraction from the graph topology."
- },
- {
- "name": "pear-pear.php.net/XML_Util",
- "version": "1.4.3",
- "dist": {
- "type": "file",
- "url": "http://pear.php.net/get/XML_Util-1.4.3.tgz"
- },
- "require": {
- "ext-pcre": "*",
- "php": ">=5.4.0.0"
- },
- "replace": {
- "pear-pear/xml_util": "== 1.4.3.0"
- },
- "type": "pear-library",
- "autoload": {
- "classmap": [
- ""
- ]
- },
- "include-path": [
- "/"
+ "authors": [
+ {
+ "name": "Helgi Thormar",
+ "email": "dufuz@php.net"
+ },
+ {
+ "name": "Greg Beaver",
+ "email": "cellog@php.net"
+ }
],
- "license": [
- "BSD License"
+ "description": "The PEAR Exception base class.",
+ "homepage": "https://github.com/pear/PEAR_Exception",
+ "keywords": [
+ "exception"
],
- "description": "Selection of methods that are often needed when working with XML documents. Functionality includes creating of attribute lists from arrays, creation of tags, validation of XML names and more."
+ "support": {
+ "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=PEAR_Exception",
+ "source": "https://github.com/pear/PEAR_Exception"
+ },
+ "time": "2019-12-10T10:24:42+00:00"
},
{
"name": "php-activerecord/php-activerecord",
@@ -352,6 +336,10 @@
"activerecord",
"orm"
],
+ "support": {
+ "issues": "https://github.com/jpfuentes2/php-activerecord/issues",
+ "source": "https://github.com/jpfuentes2/php-activerecord/tree/master"
+ },
"time": "2017-06-11T22:05:37+00:00"
},
{
@@ -538,16 +526,16 @@
},
{
"name": "unl/php-wdn-templates",
- "version": "v5.2.1",
+ "version": "v5.3.0",
"source": {
"type": "git",
"url": "https://github.com/unl/phpunltemplates.git",
- "reference": "7648850d99cc8b6f03307a7feca7d31b18e9a233"
+ "reference": "090d6c7c8ac8ab2828165bd06574ecb48caf1a88"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/unl/phpunltemplates/zipball/7648850d99cc8b6f03307a7feca7d31b18e9a233",
- "reference": "7648850d99cc8b6f03307a7feca7d31b18e9a233",
+ "url": "https://api.github.com/repos/unl/phpunltemplates/zipball/090d6c7c8ac8ab2828165bd06574ecb48caf1a88",
+ "reference": "090d6c7c8ac8ab2828165bd06574ecb48caf1a88",
"shasum": ""
},
"require": {
@@ -591,20 +579,24 @@
],
"description": "A PHP library for rendering the UNL templates",
"homepage": "http://wdn.unl.edu/",
- "time": "2020-07-16T20:24:35+00:00"
+ "support": {
+ "issues": "https://github.com/unl/phpunltemplates/issues",
+ "source": "https://github.com/unl/phpunltemplates/tree/v5.3.0"
+ },
+ "time": "2021-01-27T17:05:21+00:00"
},
{
"name": "unl/unl_cache_lite",
- "version": "v0.1.1",
+ "version": "v0.1.2",
"source": {
"type": "git",
"url": "https://github.com/unlpear/UNL_Cache_Lite.git",
- "reference": "ead1a59700a52f84250de2820d650e207ee7d698"
+ "reference": "5aa07f2add74ae3864b45a03a1f7fe37a01ac4b4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/unlpear/UNL_Cache_Lite/zipball/ead1a59700a52f84250de2820d650e207ee7d698",
- "reference": "ead1a59700a52f84250de2820d650e207ee7d698",
+ "url": "https://api.github.com/repos/unlpear/UNL_Cache_Lite/zipball/5aa07f2add74ae3864b45a03a1f7fe37a01ac4b4",
+ "reference": "5aa07f2add74ae3864b45a03a1f7fe37a01ac4b4",
"shasum": ""
},
"type": "library",
@@ -615,10 +607,10 @@
},
"description": "a speedy and safe caching library",
"support": {
- "source": "https://github.com/unlpear/UNL_Cache_Lite/tree/v0.1.1",
+ "source": "https://github.com/unlpear/UNL_Cache_Lite/tree/v0.1.2",
"issues": "https://github.com/unlpear/UNL_Cache_Lite/issues"
},
- "time": "2014-08-25T20:13:04+00:00"
+ "time": "2020-12-10T21:17:32+00:00"
},
{
"name": "zaininnari/html-minifier",
@@ -789,5 +781,6 @@
"prefer-stable": false,
"prefer-lowest": false,
"platform": [],
- "platform-dev": []
+ "platform-dev": [],
+ "plugin-api-version": "2.0.0"
}
diff --git a/src/Models/Lockup.php b/src/Models/Lockup.php
index 98750371b395b2cd579275caac780f1d61615fd5..6c14c120ac4d76bf7aa6e3560f9a258eec8dc3eb 100644
--- a/src/Models/Lockup.php
+++ b/src/Models/Lockup.php
@@ -92,7 +92,7 @@ class Lockup extends \ActiveRecord\Model {
} else if ($this->isFullyApproved()) {
return 'Fully Approved';
} else {
- return 'Communicator: ' . ucwords(join(explode('_', $this->status), ' ')) . ';<br>Creative: ' . ucwords(join(explode('_', $this->creative_status), ' '));
+ return 'Communicator: ' . ucwords(join(' ', explode('_', $this->status))) . ';<br>Creative: ' . ucwords(join(' ', explode('_', $this->creative_status)));
}
}
diff --git a/src/Views/main_template.php b/src/Views/main_template.php
index 02eb26e8db2403193d15130535d9e3c7c691274c..5db87662eccf33fb1801cf0b26370c3aac59025c 100644
--- a/src/Views/main_template.php
+++ b/src/Views/main_template.php
@@ -1,12 +1,12 @@
<?php
use UNL\Templates\Templates;
-$page = Templates::factory('AppLocal', Templates::VERSION_5_2);
+$page = Templates::factory('AppLocal', Templates::VERSION_5_3);
# this should be the server root, that is, the public directory of where static files come from.
-# the templates library will stick /wdn/templates_5.2 on there for you
+# the templates library will stick /wdn/templates_5.3 on there for you
$wdn_include_path = \Core::ROOT . '/public';
-if (file_exists($wdn_include_path . '/wdn/templates_5.2')) {
+if (file_exists($wdn_include_path . '/wdn/templates_5.3')) {
$page->setLocalIncludePath($wdn_include_path);
}
@@ -24,7 +24,7 @@ $page->titlegraphic = '<a class="dcf-txt-h5" href="' . $baseURL . '">UNL Lockup
$page->affiliation = '<a href="http://ucomm.unl.edu">University Communication</a>';
// Add WDN Deprecated Styles
-$page->head .= '<link rel="preload" href="/wdn/templates_5.2/css/deprecated.css" as="style" onload="this.onload=null;this.rel=\'stylesheet\'"> <noscript><link rel="stylesheet" href="/wdn/templates_5.2/css/deprecated.css"></noscript>';
+$page->head .= '<link rel="preload" href="/wdn/templates_5.3/css/deprecated.css" as="style" onload="this.onload=null;this.rel=\'stylesheet\'"> <noscript><link rel="stylesheet" href="/wdn/templates_5.3/css/deprecated.css"></noscript>';
# css
$page->addStyleSheet($baseURL . 'css/main.css');