diff --git a/build/webpack.config.js b/build/webpack.config.js index e690763..9ff9248 100644 --- a/build/webpack.config.js +++ b/build/webpack.config.js @@ -102,7 +102,7 @@ module.exports = (env, argv) => { new CopyWebpackPlugin({ patterns: [ { from: path.resolve(LIB, 'index.php'), to: 'index.php' }, - { from: path.resolve(SRC, 'images', 'logo_black.png'), to: 'images' }, + { from: path.resolve(SRC, 'images', 'logo_title.png'), to: 'images' }, { from: path.resolve(SRC, 'images', 'spot-logo-only.svg'), to: 'images' } ] }), diff --git a/composer.json b/composer.json index 7645f9d..89c6414 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "franzz/spot", - "description": "Spotty", + "description": "LiveTrail", "type": "project", "license": "GPL-3.0-or-later", "repositories": [ diff --git a/i18n/en.json b/i18n/en.json index a05cf99..558ae6b 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -17,7 +17,7 @@ "credits": { "git": "Git Repository", "license": "under GPLv3 license", - "project": "Spotty Project" + "project": "$0 Project" }, "email": { "confirmation": { diff --git a/i18n/es.json b/i18n/es.json index f66e48e..104abc2 100644 --- a/i18n/es.json +++ b/i18n/es.json @@ -17,7 +17,7 @@ "credits": { "git": "Repositorio de Git", "license": "bajo licencia GPLv3", - "project": "Proyecto Spotty" + "project": "Proyecto $0" }, "email": { "confirmation": { diff --git a/i18n/fr.json b/i18n/fr.json index ba63ece..6247e33 100644 --- a/i18n/fr.json +++ b/i18n/fr.json @@ -17,7 +17,7 @@ "credits": { "git": "Dépôt Git", "license": "sous licence GPLv3", - "project": "Projet Spotty" + "project": "Projet $0" }, "email": { "confirmation": { diff --git a/lib/Email.php b/lib/Email.php index e35313f..297235f 100644 --- a/lib/Email.php +++ b/lib/Email.php @@ -57,8 +57,8 @@ class Email extends PhpObject { $oPHPMailer->Password = Settings::MAIL_PASS; //SMTP password $oPHPMailer->SMTPSecure = PHPMailer::ENCRYPTION_STARTTLS; //Enable TLS encryption; `PHPMailer::ENCRYPTION_SMTPS` encouraged $oPHPMailer->Port = 587; //TCP port to connect to, use 465 for `PHPMailer::ENCRYPTION_SMTPS` above - $oPHPMailer->setFrom(Settings::MAIL_FROM, 'Spotty'); - $oPHPMailer->addReplyTo(Settings::MAIL_FROM, 'Spotty'); + $oPHPMailer->setFrom(Settings::MAIL_FROM, Spot::PROJECT_NAME); + $oPHPMailer->addReplyTo(Settings::MAIL_FROM, Spot::PROJECT_NAME); $bSuccess = true; foreach($this->asDests as $asDest) { diff --git a/lib/Spot.php b/lib/Spot.php index 934b117..091825a 100755 --- a/lib/Spot.php +++ b/lib/Spot.php @@ -41,6 +41,7 @@ class Spot extends Main const MAIL_CHUNK_SIZE = 5; const DEFAULT_LANG = 'en'; + const PROJECT_NAME = 'LiveTrail'; const MAIN_PAGE = 'index'; @@ -184,14 +185,15 @@ class Spot extends Main 'default_maps' => $this->oMap->getProjectMaps(-1), 'chunk_size' => self::FEED_CHUNK_SIZE, 'hash_sep' => '-', - 'title' => 'Spotty', + 'title' => self::PROJECT_NAME, 'default_page' => 'project' ) ), self::MAIN_PAGE, array( 'tags' => [ - 'language' => $this->oLang->getLanguage() + 'language' => $this->oLang->getLanguage(), + 'title' => self::PROJECT_NAME, ], 'instances' => [ 'entrypoint' => $this->getAppEntryPoints() diff --git a/src/components/projectNewsletter.vue b/src/components/projectNewsletter.vue index e16e976..c336742 100644 --- a/src/components/projectNewsletter.vue +++ b/src/components/projectNewsletter.vue @@ -53,7 +53,6 @@ export default {