r1318: Created the ProcessBugDataForDisplay() function that removes redundant code...

diff --git a/favorite.php b/favorite.php
index 194b24393cb1e69b8cc8bafde3307440d6cde207..457d0585879485109afe4c646ec250525b9a2983 100644 (file)
--- a/favorite.php
+++ b/favorite.php
@@ -82,20 +82,7 @@ if ($_REQUEST['do'] == 'manage')
        while ($bug = $db->fetch_array($favorites))
        {
                $funct->exec_swap_bg($stylevar['alt_color'], '');
-               $bug['bgcolor'] = ($bugsys->userinfo['showcolors'] ? $bugsys->datastore['status']["$bug[status]"]['color'] : $funct->bgcolour);
-               $bug['product'] = $bugsys->datastore['product']["$bug[product]"]['title'];
-               $bug['version'] = $bugsys->datastore['version']["$bug[version]"]['version'];
-               $bug['status'] = $bugsys->datastore['status']["$bug[status]"]['status'];
-               $bug['resolution'] = $bugsys->datastore['resolution']["$bug[resolution]"]['resolution'];
-               $bug['priority'] = $bugsys->datastore['priority']["$bug[priority]"]['priority'];
-               $bug['severity'] = $bugsys->datastore['severity']["$bug[severity]"]['severity'];
-               
-               $bug['hiddendisplay'] = ((!can_perform('canviewhidden', $bug['product']) AND $bug['hiddenlastposttime']) ? true : false);
-               
-               $bug['lastposttime'] = ($bug['hiddendisplay'] ? $bug['hiddenlastposttime'] : $bug['lastposttime']);
-               $bug['lastpost'] = ($bug['hiddendisplay'] ? $bug['hiddenlastpostbyname'] : $bug['lastpostbyname']);
-               
-               $bug['lastposttime'] = $datef->format($bugsys->options['dateformat'], $bug['lastposttime']);
+               ProcessBugDataForDisplay(&$bug, $funct->bgcolour);
                eval('$bugs .= "' . $template->fetch('trackerhome_bits') . '";');
        }
        

diff --git a/includes/functions.php b/includes/functions.php
index 26ec30a54572e42e2c83e65c38d1833d69714979..7515f3b6cb3f9519f93c5c8bc958f6f18f7802f6 100755 (executable)
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -615,6 +615,39 @@ function check_bug_permissions($bug, $userinfo = null)
        return true;
 }
 
+// ###################################################################
+/**
+* Takes an array of bug information and returns another array with
+* information that is suitable for display as all the IDs have been
+* replaced by their string equivalents
+*
+* @param       array   Unprocessed bug data
+* @param       string  Color to display if the user has opted to not show status colours
+*
+* @param       array   Bug array with data fit for display
+*/
+function ProcessBugDataForDisplay($bug, $color = '')
+{
+       global $bugsys;
+       
+       $bug['hiddendisplay'] = (can_perform('canviewhidden', $bug['product']) OR (can_perform('canviewownhidden') AND $bug['userid'] == $bugsys->userinfo['userid']));
+       
+       $bug['bgcolor'] = ($bugsys->userinfo['showcolors'] ? $bugsys->datastore['status']["$bug[status]"]['color'] : $color);
+       $bug['product'] = $bugsys->datastore['product']["$bug[product]"]['title'];
+       $bug['version'] = $bugsys->datastore['version']["$bug[version]"]['version'];
+       $bug['status'] = $bugsys->datastore['status']["$bug[status]"]['status'];
+       $bug['resolution'] = $bugsys->datastore['resolution']["$bug[resolution]"]['resolution'];
+       $bug['priority'] = $bugsys->datastore['priority']["$bug[priority]"]['priority'];
+       $bug['severity'] = $bugsys->datastore['severity']["$bug[severity]"]['severity'];
+       
+       $bug['lastposttime'] = ($bug['hiddendisplay'] ? $bug['hiddenlastposttime'] : $bug['lastposttime']);
+       $bug['lastpost'] = ($bug['hiddendisplay'] ? $bug['hiddenlastpostbyname'] : $bug['lastpostbyname']);
+       
+       $bug['lastposttime'] = $bugsys->datef->format($bugsys->options['dateformat'], $bug['lastposttime']);
+       
+       return $bug;
+}
+
 /*=====================================================================*\
 || ###################################################################
 || # $HeadURL$

diff --git a/index.php b/index.php
index 6559848b705dbb435ea7a3b3e40fb485dd303e97..9b8626a1a3f50c23ed1ee34f20d79ff82a988e52 100644 (file)
--- a/index.php
+++ b/index.php
@@ -59,23 +59,8 @@ $bugs_fetch = $db->query($sort->fetch_sql_query(null, $pagination->fetch_limit($
 
 while ($bug = $db->fetch_array($bugs_fetch))
 {
-       $funct->exec_swap_bg($stylevar['alt_color'], '');
-       
-       $bug['hiddendisplay'] = ((can_perform('canviewhidden', $bug['product']) OR (can_perform('canviewownhidden') AND $bug['userid'] == $bugsys->userinfo['userid'])) ? false : true);
-       
-       $bug['bgcolor'] = ($bugsys->userinfo['showcolors'] ? $bugsys->datastore['status']["$bug[status]"]['color'] : $funct->bgcolour);
-       $bug['product'] = $bugsys->datastore['product']["$bug[product]"]['title'];
-       $bug['version'] = $bugsys->datastore['version']["$bug[version]"]['version'];
-       $bug['status'] = $bugsys->datastore['status']["$bug[status]"]['status'];
-       $bug['resolution'] = $bugsys->datastore['resolution']["$bug[resolution]"]['resolution'];
-       $bug['priority'] = $bugsys->datastore['priority']["$bug[priority]"]['priority'];
-       $bug['severity'] = $bugsys->datastore['severity']["$bug[severity]"]['severity'];
-       
-       $bug['lastposttime'] = ($bug['hiddendisplay'] ? $bug['hiddenlastposttime'] : $bug['lastposttime']);
-       $bug['lastpost'] = ($bug['hiddendisplay'] ? $bug['hiddenlastpostbyname'] : $bug['lastpostbyname']);
-       
-       $bug['lastposttime'] = $datef->format($bugsys->options['dateformat'], $bug['lastposttime']);
-       
+       $funct->exec_swap_bg($stylevar['alt_color'], '');       
+       ProcessBugDataForDisplay(&$bug, $funct->bgcolour);
        eval('$bugs .= "' . $template->fetch('trackerhome_bits') . '";');
 }
 

diff --git a/search.php b/search.php
index cc1260f0aa5d1d16d5d973c88fb1c9769f28c997..c90576e0be09dc9fd81cdf415d5523c539d6366f 100644 (file)
--- a/search.php
+++ b/search.php
@@ -401,17 +401,7 @@ if ($_REQUEST['do'] == 'results')
        while ($bug = $db->fetch_array($search))
        {
                $funct->exec_swap_bg($stylevar['alt_color'], '');
-               $bug['bgcolor'] = ($bugsys->userinfo['showcolors'] ? $bugsys->datastore['status']["$bug[status]"]['color'] : $funct->bgcolour);
-               $bug['hiddendisplay'] = ((can_perform('canviewhidden', $bug['product']) OR (can_perform('canviewownhidden') AND $bug['userid'] == $bugsys->userinfo['userid'])) ? false : true);
-               $bug['product'] = $bugsys->datastore['product']["$bug[product]"]['title'];
-               $bug['version'] = $bugsys->datastore['version']["$bug[version]"]['version'];
-               $bug['status'] = $bugsys->datastore['status']["$bug[status]"]['status'];
-               $bug['resolution'] = $bugsys->datastore['resolution']["$bug[resolution]"]['resolution'];
-               $bug['priority'] = $bugsys->datastore['priority']["$bug[priority]"]['priority'];
-               $bug['severity'] = $bugsys->datastore['severity']["$bug[severity]"]['severity'];
-               $bug['lastposttime'] = ($bug['hiddendisplay'] ? $bug['hiddenlastposttime'] : $bug['lastposttime']);
-               $bug['lastpost'] = ($bug['hiddendisplay'] ? $bug['hiddenlastpostbyname'] : $bug['lastpostbyname']);
-               $bug['lastposttime'] = $datef->format($bugsys->options['dateformat'], $bug['lastposttime']);
+               ProcessBugDataForDisplay(&$bug, $funct->bgcolour);
                $bug['urladd'] = "&hilight=$hilight";
                eval('$bugs .= "' . $template->fetch('trackerhome_bits') . '";');
        }