oops: Fix page lookup equipment

account.php

@@ -37,7 +37,7 @@ elseif ($thisclient) {
     // Existing client (with an account) updating profile
     else {
         $user = User::lookup($thisclient->getId());
-        $content = Page::lookup(Page::getIdByType('registration-thanks'));
+        $content = Page::lookupByType('registration-thanks');
         $inc = isset($_GET['confirmed'])
             ? 'register.confirmed.inc.php' : 'profile.inc.php';
     }
@@ -94,7 +94,7 @@ elseif ($_POST) {
     if (!$errors) {
         switch ($_POST['do']) {
         case 'create':
-            $content = Page::lookup(Page::getIdByType('registration-confirm'));
+            $content = Page::lookupByType('registration-confirm');
             $inc = 'register.confirm.inc.php';
             $acct->sendConfirmEmail();
             break;

include/ajax.content.php

@@ -157,7 +157,7 @@ class ContentAjaxAPI extends AjaxController {
 
         $langs = $cfg->getSecondaryLanguages();
 
-        $content = Page::lookup(Page::getIdByType($type, $lang));
+        $content = Page::lookupByType($type, $lang);
         include STAFFINC_DIR . 'templates/content-manage.tmpl.php';
     }
 

include/class.client.php

@@ -55,7 +55,7 @@ abstract class TicketUser {
 
         if (!($ticket = $this->getTicket())
                 || !($email = $ost->getConfig()->getDefaultEmail())
-                || !($content = Page::lookup(Page::getIdByType('access-link'))))
+                || !($content = Page::lookupByType('access-link')))
             return;
 
         $vars = array(

include/class.page.php

@@ -196,6 +196,18 @@ class Page extends VerySimpleModel {
         return self::getActivePages(array('type' => 'thank-you'));
     }
 
+    static function lookup($id, $lang=false) {
+        try {
+            $qs = self::objects()->filter(array('id'=>$id));
+            if ($lang)
+                $qs = $qs->filter(array('lang'=>$lang));
+            return $qs->one();
+        }
+        catch (DoesNotExist $ex) {
+            return null;
+        }
+    }
+
     static function getIdByName($name, $lang=false) {
         try {
             $qs = self::objects()->filter(array('name'=>$name))
@@ -210,14 +222,12 @@ class Page extends VerySimpleModel {
         }
     }
 
-    static function getIdByType($type, $lang=false) {
+    static function lookupByType($type, $lang=false) {
         try {
-            $qs = self::objects()->filter(array('type'=>$type))
-                ->values_flat('id');
+            $qs = self::objects()->filter(array('type'=>$type));
             if ($lang)
                 $qs = $qs->filter(array('lang'=>$lang));
-            list($id) = $qs->one();
-            return $id;
+            return $qs->one();
         }
         catch (DoesNotExist $ex) {
             return null;

include/class.staff.php

@@ -687,7 +687,7 @@ class Staff extends AuthenticatedUser {
     function sendResetEmail($template='pwreset-staff') {
         global $ost, $cfg;
 
-        $content = Page::lookup(Page::getIdByType($template));
+        $content = Page::lookupByType($template);
         $token = Misc::randCode(48); // 290-bits
 
         if (!$content)

include/class.user.php

@@ -941,7 +941,7 @@ class UserAccount extends UserAccountModel {
         $token = Misc::randCode(48); // 290-bits
 
         $email = $cfg->getDefaultEmail();
-        $content = Page::lookup(Page::getIdByType($template));
+        $content = Page::lookupByType($template);
 
         if (!$email ||  !$content)
             return new Error(sprintf(_S('%s: Unable to retrieve template'),

include/client/login.inc.php

@@ -4,7 +4,7 @@ if(!defined('OSTCLIENTINC')) die('Access Denied');
 $email=Format::input($_POST['luser']?:$_GET['e']);
 $passwd=Format::input($_POST['lpasswd']?:$_GET['t']);
 
-$content = Page::lookup(Page::getIdByType('banner-client'));
+$content = Page::lookupByType('banner-client');
 
 if ($content) {
     list($title, $body) = $ost->replaceTemplateVariables(

scp/login.php

@@ -23,7 +23,7 @@ TextDomain::configureForUser();
 require_once(INCLUDE_DIR.'class.staff.php');
 require_once(INCLUDE_DIR.'class.csrf.php');
 
-$content = Page::lookup(Page::getIdByType('banner-staff'));
+$content = Page::lookupByType('banner-staff');
 
 $dest = $_SESSION['_staff']['auth']['dest'];
 $msg = $_SESSION['_staff']['auth']['msg'];