add cache link to adoption message; closes opencaching#1950

following5 · Feb 6, 2019 · 1ba07b0 · 1ba07b0
1 parent 82ae903
commit 1ba07b0
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 2 deletions.
diff --git a/Controllers/CacheAdoptionController.php b/Controllers/CacheAdoptionController.php
@@ -178,7 +178,7 @@ private function actionAccept(GeoCache $cacheObj)
         $this->db->commit();
 
         $message = tr('adopt_15');
-        $message = str_replace('{cacheName}', $cacheObj->getCacheName(), $message);
+        $message = str_replace('{cacheName}', $cacheObj->getLinkedName(), $message);
         $this->infoMsg = $message;
 
         EmailSender::sendAdoptionSuccessMessage(__DIR__.'/../tpl/stdstyle/email/adoption.email.html',

diff --git a/Utils/View/View.php b/Utils/View/View.php
@@ -61,6 +61,11 @@ public function setVar($varName, $varValue)
         $this->$varName = $varValue;
     }
 
+    public static function makeLink($uri, $plainText)
+    {
+        return '<a href="'.$uri.'">'.htmlspecialchars($plainText).'</a>';
+    }
+
     public function __call($method, $args)
     {
         if (property_exists($this, $method) && is_callable($this->$method)) {

diff --git a/lib/Objects/GeoCache/GeoCache.php b/lib/Objects/GeoCache/GeoCache.php
@@ -10,6 +10,8 @@
 use lib\Objects\User\User;
 use Utils\EventHandler\EventHandler;
 use Utils\I18n\I18n;
+use Utils\Uri\SimpleRouter;
+use Utils\View\View;
 
 /**
  * Description of geoCache
@@ -1706,4 +1708,19 @@ public static function nanoIsInUse()
             self::SIZE_NANO
         ) != 0;
     }
+
+    public function getAbsLink()
+    {
+        return SimpleRouter::getAbsLink('ViewCache') . '?wp=' . $this->getWaypointId();
+    }
+
+    public function getLinkedName()
+    {
+        return View::makeLink($this->getAbsLink(), $this->cacheName);
+    }
+
+    public function getLinkedWaypointId()
+    {
+        return View::makeLink($this->getAbsLink(), $this->geocacheWaypointId);
+    }
 }
diff --git a/tpl/stdstyle/cacheAdoption/chooseUser.tpl.php b/tpl/stdstyle/cacheAdoption/chooseUser.tpl.php
@@ -15,9 +15,11 @@
     </div>
 
     <div>
+      <p>
         <label for="username">{{adopt_07}}</label>
-        <input id="username" type="text" size="25" name="username" />
+        <input id="username" type="text" size="20" name="username" />
         <input type="submit" class="btn btn-sm btn-primary" value="{{adopt_08}}" />
+      </p>
     </div>
 
     <input type="hidden" name ="cacheid" value="{cacheid}" />