Quick Search:

Mode

Context

Displaying 3 lines of context. None | Less | More | Full

Other Diffs

Ignore

Blank Lines Whitespace:

Diff

353
 
356
 
356
 
template.php
_> 11 <?php
  22 /*
<> 3 -  $Id: template.php 353 2005-12-19 11:59:56Z hpdl $
   3+  $Id: template.php 356 2005-12-20 04:13:12Z hpdl $
44 
  55   osCommerce, Open Source E-Commerce Solutions
  66   http://www.oscommerce.com
     
 !
306306     }
  307307 
  308308 /**
<>  309+ * Return all templates in an array
   310+ *
   311+ * @access public
   312+ * @return array
   313+ */
   314+
   315+    function &getTemplates() {
   316+      global $osC_Database;
   317+
   318+      $templates = array();
   319+
   320+      $Qtemplates = $osC_Database->query('select id, code, title from :table_templates');
   321+      $Qtemplates->bindTable(':table_templates', TABLE_TEMPLATES);
   322+      $Qtemplates->setCache('templates');
   323+      $Qtemplates->execute();
   324+
   325+      while ($Qtemplates->next()) {
   326+        $templates [] = $Qtemplates->toArray();
   327+      }
   328+
   329+      $Qtemplates->freeResult();
   330+
   331+      return $templates;
   332+    }
   333+
   334+/**
309335  * Checks to see if the page has a title set
  310336  *
  311337  * @access public
     
 !
348374       global $osC_Database;
  349375 
  350376       if ( (isset($_SESSION['template']) === false) || (isset($_GET['template']) && !empty($_GET['template'])) ) {
<> 351 -        $Qtemplates = $osC_Database->query('select id, code from :table_templates');
  352 -        $Qtemplates->bindTable(':table_templates', TABLE_TEMPLATES);
  353 -        $Qtemplates->setCache('templates');
  354 -        $Qtemplates->execute();
   377+        $set_template = (isset($_GET['template']) && !empty($_GET['template'])) ? $_GET['template'] : DEFAULT_TEMPLATE;
355378 
<> 356 -        $template = (isset($_GET['template']) && !empty($_GET['template'])) ? $_GET['template'] : DEFAULT_TEMPLATE;
  357 -
358379         $data = array();
  359380         $data_default = array();
  360381 
<> 361 -        while ($Qtemplates->next()) {
  362 -          if ($Qtemplates->value('code') == DEFAULT_TEMPLATE) {
  363 -            $data_default = array('id' => $Qtemplates->valueInt('id'), 'code' => $Qtemplates->value('code'));
  364 -          } elseif ($Qtemplates->value('code') == $template) {
  365 -            $data = array('id' => $Qtemplates->valueInt('id'), 'code' => $Qtemplates->value('code'));
   382+        foreach ($this->getTemplates() as $template) {
   383+          if ($template['code'] == DEFAULT_TEMPLATE) {
   384+            $data_default = array('id' => $template['id'], 'code' => $template['code']);
   385+          } elseif ($template['code'] == $set_template) {
   386+            $data = array('id' => $template['id'], 'code' => $template['code']);
366387           }
  367388         }
  368389 
<> 369 -        $Qtemplates->freeResult();
  370 -
<_ 371390         if (empty($data)) {
  372391           $data =& $data_default;
  373392         }