Issue Tracker / Patches / #36 patch to 5dev37 (see TAR for any files not herein: images)

Logged In: YES
user_id=37894

(sigh), Ok, how about I paste the patch in here?

-----------------------------------------------------------
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/404_to_5dev.mysql
issue-tracker2/404_to_5dev.mysql
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/404_to_5dev.mysql 1969-12-31
19:00:00.000000000 -0500
--- issue-tracker2/404_to_5dev.mysql 2005-02-04
18:35:33.319724224 -0500
***************
*** 0 ****
--- 1,14 ----
+ -- CHANGELOG says: "Added short_name for groups, this
allows for
+ -- a name abbreviation to be displayed instead of the full
group name. Also added
+ -- option to preferences so each user can decide if they
want the full name or the
+ -- short name to be displayed."
+ ALTER TABLE groups ADD short_name VARCHAR(8);
+
+ -- WARNING: this change makes going back to 4.0.4
problematic unless
+ -- you also alter it to use report_id instead of rid
+ ALTER TABLE reports CHANGE rid report_id int(11)
auto_increment;
+
+ ALTER TABLE reports ADD savedate INTEGER NOT NULL;
+
+ -- CHANGELOG says: "Added ability to give a description
for file uploads"
+ ALTER TABLE files ADD description VARCHAR(64) DEFAULT NULL;
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/5dev_bugs.txt
issue-tracker2/5dev_bugs.txt
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/5dev_bugs.txt
1969-12-31 19:00:00.000000000 -0500
--- issue-tracker2/5dev_bugs.txt 2005-02-04
16:44:38.000000000 -0500
***************
*** 0 ****
--- 1,167 ----
+ * On Preferences screen, not filling in First Name and
Last Name BUT filling in
+ everything else, ERASES everything else and shows error
message in red:
+ "Please enter your first name. Please enter your last name."
+ That's not nice! Show error but preserve any filled-in
entries.
+
+ * Setup instructions don't say to make includes/motd
write-able by www daemon.
+
+ * Some lines in index.php have three (3) ='s in if()'s. Is
that right?
+ (new to PHP, can you tell? :)
+
+ * Is this right? Is the "N" supposed to be followed by a ';'?
+ mysql> SELECT * FROM configuration WHERE
variable='cached_data';
+ +-------------+-------+----------+
+ | variable | value | constant |
+ +-------------+-------+----------+
+ | cached_data | N; | f |
+ +-------------+-------+----------+
+
+ * includes/classes/dbi.api_class.php
+ Function query() doesn't check if $this->link is alive -
and there are
+ times when it's not... added warning and return FALSE.
+
+ * modules/groups/actions/new.php is trying to insert data into
+ columns that don't exist:
+ INSERT INTO groups
(name,short_name,address,address2,contact,tech,tao,brm,sales,amount,bought,start_date,end_date,email,notes)
VALUES('Purchase','prchs','','','','','','','','0','0','1107406800','1107406800','','Notes')
+ But "short_name" column is not defined -
+ this is a different between 4.0.4 and 5dev. Add
functionality with:
+ mysql> ALTER TABLE groups ADD short_name VARCHAR(8);
+ CHANGELOG says: "Added short_name for groups, this allows for
+ a name abbreviation to be displayed instead of the full
group name. Also added
+ option to preferences so each user can decide if they want
the full name or the
+ short name to be displayed."
+
+ * Something is trying to run this query:
+ DELETE FROM group_products WHERE gid='13'WHERE pid='4';
+ but it SHOULD be:
+ DELETE FROM group_products WHERE gid='13' AND pid='4';
+ Ok, it's a bug. Replace/fix this function in file:
+ includes/classes/dbi.api_class.php
+ -------------------------------------------------------------
+ function delete($table,$matches)
+ {
+ $conditions = null;
+

+ if (empty($table) or count($matches) < 1) {
+ return;
+ }
+

+ //fmg: function broken b/c sql ends up of the form:
+ // DELETE FROM <table> WHERE a='a1' WHERE b='b1'
WHERE c='c1'...
+ // b/c $conditions never reset from null
+ $sql = "DELETE FROM {$table} ";
+

+ foreach ($matches as $field => $value) {
+ $sql .= is_null($conditions) ? "WHERE " : "AND ";
+ $sql .= "{$field}='{$value}' "; //fmg: added space here
+ //fmg: reset $conditions so next time in loop print
"AND"
+ $conditions = TRUE;
+ }
+

+ $this->query($sql);
+ }
+ -------------------------------------------------------------
+
+ * there is a bug in themes/default/date-picker.js where
gMonthName
+ is undefined in initial calendar view (under FireFox
V1.0). The fix
+ is to change the function to be: (segment)
+ -------------------------------------------------------------
+ Calendar.prototype.show = function() {
+ var vCode = "";
+

+ this.gWinCal.document.open();
+ //fmg: without this I get "Undefined" for initial month
name!
+ this.gMonthName = Calendar.get_month(this.gMonth - 1)
+

+ // Setup the page...
+ this.wwrite("<html>");
+ -------------------------------------------------------------
+
+ * Something is trying to run this query:
+ SELECT report_id,name,savedate FROM reports WHERE userid='10';
+ But "report_id" column is not defined - this is a
different between
+ 4.0.4 and 5dev. Add functionality with:
+ mysql> ALTER TABLE reports CHANGE rid report_id int(11)
auto_increment;
+ mysql> ALTER TABLE reports ADD savedate INTEGER NOT NULL;
+ * * * WARNING: this change makes going back to 4.0.4
problematic unless
+ you also alter it to use report_id instead
of rid * * *
+
+ * Something is trying to run this query:
+ SELECT fid,description,userid,uploaded_on,name,private
FROM files WHERE typeid='1'AND file_type='issues' ORDER BY
uploaded_on
+ But "description" column is not defined - this is a
different between
+ 4.0.4 and 5dev. Add functionality with:
+ mysql> ALTER TABLE files ADD description VARCHAR(64)
DEFAULT NULL;
+
+ * If I click on "View Issue" (in header) without entering
a number, I
+ get a blank "modify" screen (not "enter new"). To make it
jump to
+ enter new (e.g., if on the phone and need quick access),
in file:
+ modules/issues/actions/view.php, change top of file to:
+ -------------------------------------------------------------
+ if (!isset($_ENV['api'])) {
+ exit;
+ }
+
+ //fmg: don't open blank in this case - redirect to Main (???)
+ if (empty($_POST['issueid']) and empty($_GET['issueid'])) {
+ $_ENV['api']['sys']->redirect("?module=issues&action=new");
+ }
+ -------------------------------------------------------------
+ Preferably it should be a preferences option - a choice of:
+ 1) Enter new issue
+ 2) Show issues (main menu)
+ 3) Refresh current screen (NOP)
+
+ * There is a bug in template modules/users/tpl/view.tpl
and the Add/Remove
+ from group text is in wrong place/missing. Fix it by
changing text to
+ read:
+ -------------------------------------------------------------
+ 
+ <td width="25%"><label
for="add_groups">{t}Add to
+ Groups{/t}:</label>
+ <select name="add_groups[]" size="10"
multiple="multiple"
+ style="width: 100%;">
+ {foreach from=$groups item=group}
+ {if $api.perms->check("update_group",$group.gid)}
+ <option
value="{$group.gid}">{$group.name}</option>
+ {/if}
+ {/foreach}
+ </select>
+ </td>
+ <td width="25%"><label
for="del_groups">{t}Delete from
+ Groups{/t}:</label>
+ <select name="del_groups[]" size="10"
multiple="multiple"
+ style="width: 100%;">
+ {foreach from=$user_groups item=gid}
+ {if $api.perms->check("update_group",$gid)}
+ -------------------------------------------------------------
+
+ * When you click on "Forgot Password" it doesn't show you
the header.tpl:
+ this is a bug in this module
modules/users/actions/forgotten_password.php
+ Change the top of the file to be:
+ -------------------------------------------------------------
+ if (!isset($_ENV['api'])) {
+ exit;
+ }
+
+ $_ENV['api']['tpl']->display('header.tpl');
+ -------------------------------------------------------------
+
+ * parser script has an issue with missing "(" in if() on
line 313:
+ -------------------------------------------------------------
+ // Ok now we actually create/update the issue
+ if (empty($parser->args['issue'])) {
+ list($registered) =
$_ENV['mod']['admin']->fetch_status(TYPE_REGISTERED);
+

+ $insert['gid'] = $parser->args['group'];
+ $insert['status'] = $registered;
+ $insert['opened_by'] = empty($userid) ? _CLIENT_ : $userid;
+ $insert['opened'] = $currtime;
+ $insert['modified'] = $currtime;
+ $insert['summary'] = $parser->subject;
+ $insert['problem'] = $parser->body;
+ $insert['severity'] = SEV_NORMAL;
+ if $parser->args['private'] == "true") { //
<<<< here
+ $insert['private'] = "t";
+ }
+ -------------------------------------------------------------
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/docs/developers.txt
issue-tracker2/docs/developers.txt
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/docs/developers.txt
1969-12-31 19:00:00.000000000 -0500
--- issue-tracker2/docs/developers.txt 2005-02-03
15:28:36.000000000 -0500
***************
*** 0 ****
--- 1,6 ----
+ * I want to add a new icon
+ 1) add mapping to includes/classes/theme.class.php of the
form:
+ "name" => "images/newimg.png",
+ 2) copy 16x16 PNG non-interlaced image to ROOT/images
+ 3) now you can refer to it as $images['name'] elsewhere
+
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/docs/HELP
issue-tracker2/docs/HELP
*** /usr/src/redhat/SOURCES/issue-tracker-5dev/docs/HELP
2004-12-13 12:55:21.000000000 -0500
--- issue-tracker2/docs/HELP 2005-01-29 22:22:10.000000000 -0500
***************
*** 7,11 ****
directory should contain basic text/html files that relate
to the modules
and actions of Issue-Tracker, and as of the writing of
this file the help
! directory is completely empty, UGH! As stated though the
help system is
very basic and easy to setup. The Issue-Tracker framework
will look in
the help directory each page view for a help file matching
the current
--- 7,11 ----
directory should contain basic text/html files that relate
to the modules
and actions of Issue-Tracker, and as of the writing of
this file the help
! directory is completely empty, UGH[*]! As stated though
the help system is
very basic and easy to setup. The Issue-Tracker framework
will look in
the help directory each page view for a help file matching
the current
***************
*** 23,24 ****
--- 23,28 ----
named the same as the module with a .hlp extension.
If you have any questions please email me at
tm@tuxmonkey.com.
+
+ [*] Not anymore. The pre-successful-login error-checking
code fakes a
+ module called "help" and there are several files in
modules/help/help
+ //fmg 01/05
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/docs/INSTALL
issue-tracker2/docs/INSTALL
*** /usr/src/redhat/SOURCES/issue-tracker-5dev/docs/INSTALL
2004-12-13 12:55:21.000000000 -0500
--- issue-tracker2/docs/INSTALL 2005-01-29
22:17:18.000000000 -0500
***************
*** 2,3 ****
--- 2,4 ----

- See Administrator's Guide
(https://sourceforge.net/project/showfiles.php?group_id=72973)
+ - or, if no internet, see docs/admin_guide.html
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/error.php
issue-tracker2/error.php
*** /usr/src/redhat/SOURCES/issue-tracker-5dev/error.php
1969-12-31 19:00:00.000000000 -0500
--- issue-tracker2/error.php 2005-01-29 21:43:50.000000000 -0500
***************
*** 0 ****
--- 1,91 ----
+ <?php
+ /* $Id: index.php 27 2004-09-30 16:02:32Z root $ */
+ // fmg: split from index.php b/c I've only known PHP for
2-3 hours and
+ // can't seem to keep it from recursing if I
try to use index.php
+ // in the redirects. Please fix if you know how!
+ /**
+ * @package Issue-Tracker
+ */
+ #apd_set_pprof_trace('/tmp/apd');
+ ob_start("ob_gzhandler");
+
+ /** Set the BROWSER constant to TRUE */
+ define("BROWSER",TRUE);
+
+ //fmg: set LIMITEDINIT to TRUE (does not init dbase, else
get recursion!)
+ define("LIMITEDINIT",TRUE);
+
+ /** Call the initialization script */
+ require("initialize.php");
+
+ # Increase the time limit from 30 seconds to 1 minute
+ set_time_limit(_MINUTE_);
+
+ # Setup Locale
+ if (!isset($_SESSION['prefs']['locale'])) {
+ if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+ $locale = split(",",$_SERVER['HTTP_ACCEPT_LANGUAGE']);
+ $_SESSION['prefs']['locale'] = $locale[0];
+
+ if
(!file_exists(_LOCALE_."/".$_SESSION['prefs']['locale'])) {
+ $_SESSION['prefs']['locale'] = 'en-us';
+ }
+ } else {
+ $_SESSION['prefs']['locale'] = 'en-us';
+ }
+ }
+ if (strpos($_SESSION['prefs']['locale'],"-")) {
+ $parts = split("-",$_SESSION['prefs']['locale']);
+ $_SESSION['prefs']['locale'] =
$parts[0]."_".strtoupper($parts[1]);
+ }
+ bindtextdomain('messages',_LOCALE_)."<br />";
+ textdomain('messages');
+ putenv('LANG='.$_SESSION['prefs']['locale']);
+ if (setlocale(LC_ALL,$_SESSION['prefs']['locale']) ===
FALSE) {
+ echo "hrm";
+ }
+
+ if (isset($_GET['module'])) {
+ if ($_GET['module'] == 'help') {
+ $help_file = _MODULES_.$_GET['module']."/help/";
+
+ if (isset($_GET['action'])) {
+ $help_file .= $_GET['action'].".hlp";
+ }
+
+ //fmg: this had a bug: was referencing "$file" not
"$help_file"
+ if ($fp = fopen($help_file,'r')) {
+ $buffer = fread($fp,filesize($help_file));
+ fclose($fp);
+ } else {
+ $buffer = _("Could not find the help file for the
requested module/action.".
+ "<br>($help_file)");
+ }
+
+ $_ENV['api']['tpl']->display('header.tpl');
+ $_ENV['api']['tpl']->assign('help',$buffer);
+
+ //fmg: if we got any extra code/errors, show it/them
+ if (isset($_GET['sqlerr'])) {
+ print "<strong>MySQL reported
error:</strong> ".$_GET['sqlerr'];
+ }//if got extra parameter
+ if ( isset($_GET['sqlerr']) &&
isset($_GET['errstr']) ) {
+ print "<br>"; //all in the name of vanity...
+ }//if both
+ if (isset($_GET['errstr'])) {
+ print "<strong>Error set was:</strong>
".$_GET['errstr'];
+ }//if got error string
+
+ //fmg: help files assume error code appears ABOVE
help message
+ $_ENV['api']['tpl']->display('fatal.tpl'); //fmg:
don't move
+ }//if help
+ }//if module
+
+ $_ENV['api']['tpl']->display('footer.tpl');
+
+ # Save fetch cache
+ if ($_ENV['api']['dbi']->cache_fetch_results === TRUE) {
+ $_ENV['api']['dbi']->save_cache();
+ }
+ exit; //fmg: exit, stage left...
+ ?>
Binary files
/usr/src/redhat/SOURCES/issue-tracker-5dev/images/delete_old.png
and issue-tracker2/images/delete_old.png differ
Binary files
/usr/src/redhat/SOURCES/issue-tracker-5dev/images/delete.png
and issue-tracker2/images/delete.png differ
Binary files
/usr/src/redhat/SOURCES/issue-tracker-5dev/images/severity.png
and issue-tracker2/images/severity.png differ
Binary files
/usr/src/redhat/SOURCES/issue-tracker-5dev/images/user_old.png
and issue-tracker2/images/user_old.png differ
Binary files
/usr/src/redhat/SOURCES/issue-tracker-5dev/images/user.png
and issue-tracker2/images/user.png differ
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/includes/classes/dbi.api_class.php
issue-tracker2/includes/classes/dbi.api_class.php
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/includes/classes/dbi.api_class.php
2004-12-13 12:55:22.000000000 -0500
--- issue-tracker2/includes/classes/dbi.api_class.php
2005-02-03 20:40:53.000000000 -0500
***************
*** 52,56 ****
var $link;
/** Whether or not to log all queries */
! var $log_queries = FALSE;
/** Time in seconds before a query is considered taking
too long */
var $long_query = 2;
--- 52,56 ----
var $link;
/** Whether or not to log all queries */
! var $log_queries = TRUE; //fmg
/** Time in seconds before a query is considered taking
too long */
var $long_query = 2;
***************
*** 60,68 ****
var $email_from;
/** Standard logging of failed queries and database
messages */
! var $logging = FALSE;
/** Should DBI run in debug mode */
! var $debug = FALSE;
/** Directory to store logs in */
! var $log_dir = "./";
/** Whether or not to cache query results of fetch_*
methods */
var $cache_fetch_results = TRUE;
--- 60,68 ----
var $email_from;
/** Standard logging of failed queries and database
messages */
! var $logging = TRUE; //fmg
/** Should DBI run in debug mode */
! var $debug = TRUE; //fmg
/** Directory to store logs in */
! var $log_dir = "/var/www/html/issue-tracker2/logs/";
/** Whether or not to cache query results of fetch_*
methods */
var $cache_fetch_results = TRUE;
***************
*** 79,82 ****
--- 79,83 ----
* @param array $params
*/
+ //fmg: I presume init() is only called ONCE per user's
session?
function init($params = array())
{
***************
*** 87,96 ****
switch ($this->type) {
case "mysql":
! $this->link =
mysql_connect($this->host,$this->user,$this->pass)
! or $this->logger("Database connection
failed!","DBI");
! if ($this->link) {
! mysql_select_db($this->name,$this->link);
! }
! break;
case "pgsql":
# Build the connection string
--- 88,146 ----
switch ($this->type) {
case "mysql":
! //fmg: handle port number too
! $host_str = $this->host;
! $host_str .= !empty($this->port) ? ":".$this->port: "";
! #print "$host_str,$this->user,$this->pass<p>";
! #print "Client info =
".mysql_get_client_info()."<p>";
! //fmg: just do it, we check below
! $this->link =
mysql_connect($host_str,$this->user,$this->pass);
!
! //fmg: not connected
! if (!$this->link) {
! header("Location:
error.php?module=help&action=ErrNoConn".
!
"&sqlerr=".mysql_errno()."&errstr=".mysql_error() );
! exit; // bye
! }//if not connected
!
! // fmg: can we get a list of databases
(just one if authenticated
! // for a specific database,
e.g., Issue-Tracker - only root
! // or some highly privileged
user can see ALL databases!)
! // (could be several after
you've been playing it for a while)
! $handle = mysql_list_dbs($this->link);
! $num = 0; while ($row =
mysql_fetch_row($handle)) { $num++;}
! mysql_free_result($handle); //free(handle)
! if (!$num) { // redirect user to error page
! header("Location:
error.php?module=help&action=ErrNoDbases".
!
"&sqlerr=".mysql_errno()."&errstr=".mysql_error() );
! exit; // bye
! } else {
! //fmg: we can find ONE+ databases
and it may still NOT be the one
! // specified by the config.php
! //select the named database
! if
(!mysql_select_db($this->name,$this->link)) {
! header("Location:
error.php?module=help&action=ErrNoName".
!
"&sqlerr=".mysql_errno()."&errstr=".mysql_error() );
! exit; // bye
! }//if can't select specified dbase
! }//if no databases visible to us
!
! //fmg: final check is to verify that a
magic field exists in
! // data.sql (to ensure complete
installation)
! // ** CORRECT RESPONSE IS 'Parser' **
! $sql = "SELECT last_name FROM users WHERE ".
! " email='emailparser' AND
first_name='Email';";
! $handle = mysql_query($sql);
! list($result) = mysql_fetch_row($handle);
! mysql_free_result($handle); //free(handle)
! if ( empty($result) ) { //null: redirect
to error page
! header("Location:
error.php?module=help&aa=1&action=ErrNoTables".
!
"&sqlerr=".mysql_errno()."&errstr=".mysql_error() );
! exit; // bye
! } else if ( !($result == 'Parser') ) {
//something wrong
! header("Location:
error.php?module=help&aa=2&action=ErrNoTables".
!
"&sqlerr=".mysql_errno()."&errstr=".mysql_error() );
! exit; // bye
! }//if no magic field
! break; //we're doing good if we get here :)
case "pgsql":
# Build the connection string
***************
*** 103,106 ****
--- 153,161 ----
$this->link = pg_connect($conn_str)
or $this->logger("Database connection
failed!","DBI");
+ //fmg: test for connection or redirect user
+ if (!$this->link) {
+ header("Location:
error.php?module=help&action=ErrNoConn" );
+ exit; // bye
+ }//if not connected
break;
case "sqlite":
***************
*** 111,121 ****
or $this->logger("Failed to open SQLite
database: {$this->name}","DBI");
}
break;
default:
$this->logger("Unknown database type in
init()","DBI");
break;
! }

! if ($this->cache_fetch_results === TRUE and
!empty($this->link)) {
$this->load_cache();
}
--- 166,185 ----
or $this->logger("Failed to open SQLite
database: {$this->name}","DBI");
}
+ //fmg: test for connection or redirect user
+ if (!$this->link) {
+ header("Location:
error.php?module=help&action=ErrNoConn" );
+ exit; // bye
+ }//if not connected
break;
default:
$this->logger("Unknown database type in
init()","DBI");
+ header("Location:
error.php?module=help&action=ErrNoConn".
+ "&errstr=Unknown database type
($this->type) in init()" );
+ exit; // bye
break;
! }//switch $this->type

! //fmg: Is !empty(A) same as A?
! if ($this->cache_fetch_results === TRUE and $this->link) {
$this->load_cache();
}
***************
*** 134,137 ****
--- 198,207 ----
return FALSE;
}
+
+ //fmg: check if $this->link is alive!
+ if (!$this->link) {
+ $this->logger("query($sql) called on bad SQL
connection","DBI");
+ return FALSE;
+ }

if ($this->log_queries) {
***************
*** 158,162 ****
$start = $this->getmicrotime();
}
! $result = @pg_query($this->link,$sql);
if ($this->debug) {
$query_time = $this->getmicrotime() - $start;
--- 228,232 ----
$start = $this->getmicrotime();
}
! if ($result) $result = @pg_query($this->link,$sql);
if ($this->debug) {
$query_time = $this->getmicrotime() - $start;
***************
*** 183,187 ****
break;
default:
! $this->logger("Unknown database type in
query()","DBI");
break;
}
--- 253,257 ----
break;
default:
! $this->logger("Unknown database type
'(".$this->type.")' in query()","DBI");
break;
}
***************
*** 197,201 ****
return FALSE;
}
! }

/**
--- 267,271 ----
return FALSE;
}
! }//function query

/**
***************
*** 227,231 ****
break;
default:
! $this->logger("Unknown database type in
num_fields()","DBI");
break;
}
--- 297,301 ----
break;
default:
! $this->logger("Unknown database type
'(".$this->type.")' in num_fields()","DBI");
break;
}
***************
*** 263,267 ****
break;
default:
! $this->logger("Unknown database type in
field_name()","DBI");
break;
}
--- 333,337 ----
break;
default:
! $this->logger("Unknown database type
'(".$this->type.")' field_name()","DBI");
break;
}
***************
*** 298,302 ****
break;
default:
! $this->logger("Unknown database type in
num_rows()","DBI");
break;
}
--- 368,372 ----
break;
default:
! $this->logger("Unknown database type
'(".$this->type.")' num_rows()","DBI");
break;
}
***************
*** 389,393 ****
break;
default:
! $this->logger("Unknown database type in
fetch()","DBI");
break;
}
--- 459,463 ----
break;
default:
! $this->logger("Unknown database type
'(".$this->type.")' fetch()","DBI");
break;
}
***************
*** 662,665 ****
--- 732,737 ----
$sql .= "($fields) ";
$sql .= "VALUES($values);";
+ //fmg: debug why can't add group ($table is
invalid == query_stats)
+ //print "<br>(sql='$sql')<br>";
$result = $this->query($sql);

***************
*** 717,725 ****
}

$sql = "DELETE FROM {$table} ";

foreach ($matches as $field => $value) {
$sql .= is_null($conditions) ? "WHERE " : "AND ";
! $sql .= "{$field}='{$value}'";
}

--- 789,804 ----
}

+ //fmg: function broken b/c sql ends up of the form:
+ // DELETE FROM <table> WHERE a='a1' WHERE
b='b1' WHERE c='c1'...
+ // b/c $conditions never reset from null
$sql = "DELETE FROM {$table} ";

foreach ($matches as $field => $value) {
$sql .= is_null($conditions) ? "WHERE " : "AND ";
! //fmg: need extra space either ^here or
! $sql .= "{$field}='{$value}' ";
! //fmg: ^here (else list is
wrong!)
! //fmg: reset $conditions so next time in loop
it's "AND"
! $conditions = TRUE;
}

***************
*** 770,777 ****
--- 849,858 ----
if ($this->num_rows($result) > 0) {
$update['value'] = serialize($GLOBALS['cache']);
+ $this->logger("UPDATE cache =
'".$update['value']."'","DBI");
$this->update("configuration",$update,"WHERE
variable='cached_data'");
} else {
$insert['variable'] = "cached_data";
$insert['value'] = serialize($GLOBALS['cache']);
+ $this->logger("SAVE cache =
'".$insert['value']."'","DBI");
$this->insert("configuration",$insert);
}
***************
*** 793,796 ****
--- 874,878 ----
}

+ $this->logger("LOAD cache = '$data'","DBI");
$GLOBALS['cache'] = $data;
}
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/includes/classes/theme.class.php
issue-tracker2/includes/classes/theme.class.php
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/includes/classes/theme.class.php
2004-12-13 12:55:22.000000000 -0500
--- issue-tracker2/includes/classes/theme.class.php
2005-02-03 15:29:26.000000000 -0500
***************
*** 467,470 ****
--- 467,471 ----
"query" => "images/query.png",
"search" => "images/search.png",
+ "severity" => "images/severity.png",
"show_closed" => "images/show_closed.png",
"status" => "images/status.png",
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/includes/functions/html.func.php
issue-tracker2/includes/functions/html.func.php
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/includes/functions/html.func.php
2004-12-13 12:55:21.000000000 -0500
--- issue-tracker2/includes/functions/html.func.php
2005-02-02 09:24:24.000000000 -0500
***************
*** 62,66 ****
$crumbs .= "Issue #".$_GET['issueid'];
$crumbs .= "</a>";
! }

if (!empty($_GET['action'])) {
--- 62,66 ----
$crumbs .= "Issue #".$_GET['issueid'];
$crumbs .= "</a>";
! }//if empty issueid

if (!empty($_GET['action'])) {
***************
*** 95,99 ****

$crumbs .= "$divider<a href=\"$url\">"._($action)."</a>";
! }

return $crumbs;
--- 95,99 ----

$crumbs .= "$divider<a href=\"$url\">"._($action)."</a>";
! }//if empty action

return $crumbs;
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/index.php
issue-tracker2/index.php
*** /usr/src/redhat/SOURCES/issue-tracker-5dev/index.php
2004-12-13 12:55:21.000000000 -0500
--- issue-tracker2/index.php 2005-02-03 12:50:19.000000000 -0500
***************
*** 13,16 ****
--- 13,19 ----
define("BROWSER",TRUE);

+ //fmg: LIMITEDINIT is left undefined (only defined if
error.php called)
+ #define("LIMITEDINIT",FALSE); //leave commented out in
index.php
+
/** Call the initialization script */
require("initialize.php");
***************
*** 94,98 ****
$_ENV['api']['tpl']->assign('show_admin',TRUE);
}
! }

$_ENV['api']['init']->module_includes('tabs');
--- 97,101 ----
$_ENV['api']['tpl']->assign('show_admin',TRUE);
}
! }//if has userid

$_ENV['api']['init']->module_includes('tabs');
***************
*** 102,109 ****
}

! if (isset($_GET['module'])) {
! if ($_GET['module'] == 'help') {
$help_file = _MODULES_.$_GET['mod']."/help/";
!
if (!isset($_GET['act'])) {
$help_file .= $_GET['mod'].".hlp";
--- 105,112 ----
}

! if (isset($_GET['module'])) { //if help module specified
explicitly
! if ($_GET['module'] == 'help' or $_GET['module'] ==
'pophelp') {
$help_file = _MODULES_.$_GET['mod']."/help/";
!
if (!isset($_GET['act'])) {
$help_file .= $_GET['mod'].".hlp";
***************
*** 112,130 ****
}

! if ($fp = fopen($file,'r')) {
! $buffer = fread($fp,filesize($file));
fclose($fp);
} else {
! $buffer = _("Could not find a help file for
requested module/action.");
}

! $_ENV['api']['tpl']->display('header.tpl');
! $_ENV['api']['tpl']->assign('help',$buffer);
! $_ENV['api']['tpl']->display('help.tpl');
} else if ($_GET['module'] == "users"
! and $_GET['action'] == "whois") {
$_ENV['api']['tpl']->display('header.tpl');
$_ENV['mod']['users']->whois($_GET['userid']);
! } else {
$help_file = _MODULES_.$_GET['module']."/help/";

--- 115,145 ----
}

! //fmg: bug - written as $file but SHOULD BE
$help_file!
! //fmg: since this bug lived from 4.0.3 to 5dev, I can
! // tell you guys don't use help at all :-)
! if ($fp = fopen($help_file,'r')) {
! $buffer = fread($fp,filesize($help_file));
fclose($fp);
} else {
! $buffer = _("Could not find a help file ($help_file".
! ") for requested module/action.");
}

! //fmg: different template if popup help
! if ($_GET['module'] == 'pophelp') {
! $_ENV['api']['tpl']->assign('nofooter','true');
//is this how we do it?
! $_ENV['api']['tpl']->display('popheader.tpl');
! $_ENV['api']['tpl']->assign('help',$buffer);
! $_ENV['api']['tpl']->display('pophelp.tpl');
! } else {
! $_ENV['api']['tpl']->display('header.tpl');
! $_ENV['api']['tpl']->assign('help',$buffer);
! $_ENV['api']['tpl']->display('help.tpl');
! }//if popup help
} else if ($_GET['module'] == "users"
! and $_GET['action'] == "whois") { //if users module
specified
$_ENV['api']['tpl']->display('header.tpl');
$_ENV['mod']['users']->whois($_GET['userid']);
! } else { //all other modules, check if
<module>/help/<module>.hlp exists
$help_file = _MODULES_.$_GET['module']."/help/";

***************
*** 136,142 ****

if (file_exists($help_file)) {
$_ENV['api']['tpl']->assign('help_file',$help_file);
! }
!
if
(file_exists(_MODULES_.$_GET['module']."/hooks/noauth.php")) {
/** Include the noauth hook if it exists */
--- 151,164 ----

if (file_exists($help_file)) {
+ print "";
+ $hurl =
_URL_."?module=pophelp&mod=".$_GET['module'];
+ if ( isset($_GET['action']) ) {
+ $hurl .= "&action=".$_GET['action'];
+ }//if action
+ $_ENV['api']['tpl']->assign('help_url',$hurl);
+ //still assign it so we know to show popup javashit
$_ENV['api']['tpl']->assign('help_file',$help_file);
! }//if help exists, assign it
!
if
(file_exists(_MODULES_.$_GET['module']."/hooks/noauth.php")) {
/** Include the noauth hook if it exists */
***************
*** 144,151 ****
}

- # make sure the timezone is set
if (!isset($_COOKIE['tz'])) {
$_COOKIE['tz'] = 0;
! }

if (isset($_SESSION['userid'])) {
--- 166,172 ----
}

if (!isset($_COOKIE['tz'])) {
$_COOKIE['tz'] = 0;
! }//if timezone not set, set it

if (isset($_SESSION['userid'])) {
***************
*** 165,191 ****
and $_SESSION['prefs']['admin_menu'] == "t") {
$_ENV['api']['tpl']->assign('show_admin_menu',TRUE);
! }

$_ENV['api']['tpl']->assign('leftnav_menu',$leftnav_menu);
$_ENV['api']['tpl']->assign('pmenus',$pmenus);
! }

if
(file_exists(_MODULES_."{$_GET['module']}/hooks/iconbar.php")) {

include_once(_MODULES_."{$_GET['module']}/hooks/iconbar.php");
! }

$_ENV['api']['tpl']->display('header.tpl');
if (empty($_GET['nonav'])) {
$_ENV['api']['tpl']->display("leftnav.tpl");
! }

if (file_exists($script)) {
/** Module Script */
include_once($script);
! }

if (empty($_GET['nonav'])) {
$_ENV['api']['tpl']->display('rightnav.tpl');
! }
} else {
if (is_array($noauth)) {
--- 186,212 ----
and $_SESSION['prefs']['admin_menu'] == "t") {
$_ENV['api']['tpl']->assign('show_admin_menu',TRUE);
! }//if user is admin

$_ENV['api']['tpl']->assign('leftnav_menu',$leftnav_menu);
$_ENV['api']['tpl']->assign('pmenus',$pmenus);
! }//if no nonav

if
(file_exists(_MODULES_."{$_GET['module']}/hooks/iconbar.php")) {

include_once(_MODULES_."{$_GET['module']}/hooks/iconbar.php");
! }//if hook exists

$_ENV['api']['tpl']->display('header.tpl');
if (empty($_GET['nonav'])) {
$_ENV['api']['tpl']->display("leftnav.tpl");
! }//if no nonav

if (file_exists($script)) {
/** Module Script */
include_once($script);
! }//if script exists

if (empty($_GET['nonav'])) {
$_ENV['api']['tpl']->display('rightnav.tpl');
! }//if no nonav
} else {
if (is_array($noauth)) {
***************
*** 198,202 ****
} else {
$script .= "{$_GET['module']}.php";
! }

if (in_array($check,$noauth)) {
--- 219,223 ----
} else {
$script .= "{$_GET['module']}.php";
! }//have action

if (in_array($check,$noauth)) {
***************
*** 204,212 ****
/** Module Script */
include_once($script);
! }
}
! }
! }
! }
} else if (isset($_SESSION['userid'])) {
if (empty($_GET['nonav'])) {
--- 225,233 ----
/** Module Script */
include_once($script);
! }//script exists
}
! }//if have noauth
! }//if userid is set
! }//if module is ???? (switch)
} else if (isset($_SESSION['userid'])) {
if (empty($_GET['nonav'])) {
***************
*** 220,228 ****
and $_SESSION['prefs']['admin_menu'] == "t") {
$_ENV['api']['tpl']->assign('show_admin_menu',TRUE);
! }

$_ENV['api']['tpl']->assign('leftnav_menu',$leftnav_menu);
$_ENV['api']['tpl']->assign('pmenus',$pmenus);
! }

$_ENV['api']['tpl']->display("header.tpl");
--- 241,249 ----
and $_SESSION['prefs']['admin_menu'] == "t") {
$_ENV['api']['tpl']->assign('show_admin_menu',TRUE);
! }//if user is admin

$_ENV['api']['tpl']->assign('leftnav_menu',$leftnav_menu);
$_ENV['api']['tpl']->assign('pmenus',$pmenus);
! }//if no nonav

$_ENV['api']['tpl']->display("header.tpl");
***************
*** 243,259 ****
$_ENV['api']['tpl']->assign("motd",$motd);
fclose($fp);
! }
! }

$_ENV['api']['tpl']->display("header.tpl");
$_ENV['api']['tpl']->display('login.tpl');
! }
!
! $_ENV['api']['tpl']->display('footer.tpl');

- # Save fetch cache
if ($_ENV['api']['dbi']->cache_fetch_results === TRUE) {
$_ENV['api']['dbi']->save_cache();
! }

if ($GLOBALS['config']['main']['use_tidy'] === TRUE
--- 264,285 ----
$_ENV['api']['tpl']->assign("motd",$motd);
fclose($fp);
! }//if motd opened
! }//if motd exists

$_ENV['api']['tpl']->display("header.tpl");
$_ENV['api']['tpl']->display('login.tpl');
! }//if userid is set
!
! //fmg: different footer if popup help
! if ($_GET['module'] == 'pophelp') {
! $_ENV['api']['tpl']->display('popfooter.tpl');
! } else {
! $_ENV['api']['tpl']->display('footer.tpl');
! }//if popup

if ($_ENV['api']['dbi']->cache_fetch_results === TRUE) {
+ print "called!";
$_ENV['api']['dbi']->save_cache();
! }//if save cache

if ($GLOBALS['config']['main']['use_tidy'] === TRUE
***************
*** 270,273 ****
} else {
ob_end_flush();
! }
?>
--- 296,299 ----
} else {
ob_end_flush();
! }//if use tidy
?>
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/initialize.php
issue-tracker2/initialize.php
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/initialize.php
2004-12-13 12:55:21.000000000 -0500
--- issue-tracker2/initialize.php 2005-02-03
11:41:57.000000000 -0500
***************
*** 52,61 ****
$_ENV['api']['init']->load_classes();

! # Setup DBI
! $_ENV['api']['dbi']->init($config['database']);

$_ENV['api']['dbi']->set('admin_email',$config['main']['admin_email']);

$_ENV['api']['dbi']->set('email_from',$config['main']['system_email']);
$_ENV['api']['dbi']->set('log_queries',TRUE);
! $_ENV['api']['dbi']->set('debug',FALSE);
$_ENV['api']['dbi']->set('log_dir',_LOGS_);
$_ENV['api']['dbi']->set('cache_fetch_results',FALSE);
--- 52,64 ----
$_ENV['api']['init']->load_classes();

! # Setup DBI only if not called from error.php
! if (!defined('LIMITEDINIT')) {
! $_ENV['api']['dbi']->init($config['database']);
! }//if want to skip dbase init (error.php mode)
! $_ENV['api']['dbi']->logger("After INIT","DBI");

$_ENV['api']['dbi']->set('admin_email',$config['main']['admin_email']);

$_ENV['api']['dbi']->set('email_from',$config['main']['system_email']);
$_ENV['api']['dbi']->set('log_queries',TRUE);
! $_ENV['api']['dbi']->set('debug',TRUE);
$_ENV['api']['dbi']->set('log_dir',_LOGS_);
$_ENV['api']['dbi']->set('cache_fetch_results',FALSE);
***************
*** 135,139 ****
$_ENV['api']['tpl']->assign('const_severities',$severities);

$_ENV['api']['tpl']->assign('const_status_types',$status_types);
! }

# Load all function files located in the _FUNCTIONS_ directory
--- 138,142 ----
$_ENV['api']['tpl']->assign('const_severities',$severities);

$_ENV['api']['tpl']->assign('const_status_types',$status_types);
! }//if BROWSER

# Load all function files located in the _FUNCTIONS_ directory
***************
*** 171,174 ****
$_ENV['api']['tpl']->assign('title',$title);
$_ENV['api']['tpl']->assign('crumbs',build_crumbs());
! }
?>
--- 174,177 ----
$_ENV['api']['tpl']->assign('title',$title);
$_ENV['api']['tpl']->assign('crumbs',build_crumbs());
! }//if BROWSER
?>
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/admin/help/aa
issue-tracker2/modules/admin/help/aa
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/admin/help/aa
1969-12-31 19:00:00.000000000 -0500
--- issue-tracker2/modules/admin/help/aa 2005-02-03
10:59:22.000000000 -0500
***************
*** 0 ****
--- 1,60 ----
+ <img src="modules/admin/help/admin_sa_cu2.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_cu.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_dqt1.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_dqt2.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_motd_err.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_motd.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_pm1.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_pm2.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_pm_cp.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_pm_cps.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_pm_dps0.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_pm_dps1.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_pm_dps2.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_pm_dps3.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_pm_dps4.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_pm_dps5.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_sm_cs1.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_sm_cs.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_sm.jpg">
+ <p>
+
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/admin/help/admin.hlp
issue-tracker2/modules/admin/help/admin.hlp
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/admin/help/admin.hlp
1969-12-31 19:00:00.000000000 -0500
--- issue-tracker2/modules/admin/help/admin.hlp 2005-02-03
10:59:42.000000000 -0500
***************
*** 0 ****
--- 1,63 ----
+ <h2>Admin[istration] help</h2>
+
+ <img src="modules/admin/help/admin_sa_cu2.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_cu.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_dqt1.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_dqt2.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_motd_err.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_motd.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_pm1.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_pm2.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_pm_cp.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_pm_cps.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_pm_dps0.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_pm_dps1.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_pm_dps2.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_pm_dps3.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_pm_dps4.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_pm_dps5.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_sm_cs1.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_sm_cs.jpg">
+ <p>
+
+ <img src="modules/admin/help/admin_sa_sm.jpg">
+ <p>
+
+ <hr>
Binary files
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/admin/help/admin_sa_cu2.jpg
and issue-tracker2/modules/admin/help/admin_sa_cu2.jpg differ
Binary files
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/admin/help/admin_sa_cu.jpg
and issue-tracker2/modules/admin/help/admin_sa_cu.jpg differ
Binary files
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/admin/help/admin_sa_dqt1.jpg
and issue-tracker2/modules/admin/help/admin_sa_dqt1.jpg differ
Binary files
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/admin/help/admin_sa_dqt2.jpg
and issue-tracker2/modules/admin/help/admin_sa_dqt2.jpg differ
Binary files
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/admin/help/admin_sa.jpg
and issue-tracker2/modules/admin/help/admin_sa.jpg differ
Binary files
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/admin/help/admin_sa_motd_err.jpg
and issue-tracker2/modules/admin/help/admin_sa_motd_err.jpg
differ
Binary files
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/admin/help/admin_sa_motd.jpg
and issue-tracker2/modules/admin/help/admin_sa_motd.jpg differ
Binary files
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/admin/help/admin_sa_pm1.jpg
and issue-tracker2/modules/admin/help/admin_sa_pm1.jpg differ
Binary files
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/admin/help/admin_sa_pm2.jpg
and issue-tracker2/modules/admin/help/admin_sa_pm2.jpg differ
Binary files
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/admin/help/admin_sa_pm_cp.jpg
and issue-tracker2/modules/admin/help/admin_sa_pm_cp.jpg differ
Binary files
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/admin/help/admin_sa_pm_cps.jpg
and issue-tracker2/modules/admin/help/admin_sa_pm_cps.jpg differ
Binary files
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/admin/help/admin_sa_pm_dps0.jpg
and issue-tracker2/modules/admin/help/admin_sa_pm_dps0.jpg
differ
Binary files
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/admin/help/admin_sa_pm_dps1.jpg
and issue-tracker2/modules/admin/help/admin_sa_pm_dps1.jpg
differ
Binary files
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/admin/help/admin_sa_pm_dps2.jpg
and issue-tracker2/modules/admin/help/admin_sa_pm_dps2.jpg
differ
Binary files
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/admin/help/admin_sa_pm_dps3.jpg
and issue-tracker2/modules/admin/help/admin_sa_pm_dps3.jpg
differ
Binary files
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/admin/help/admin_sa_pm_dps4.jpg
and issue-tracker2/modules/admin/help/admin_sa_pm_dps4.jpg
differ
Binary files
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/admin/help/admin_sa_pm_dps5.jpg
and issue-tracker2/modules/admin/help/admin_sa_pm_dps5.jpg
differ
Binary files
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/admin/help/admin_sa_sm_cs1.jpg
and issue-tracker2/modules/admin/help/admin_sa_sm_cs1.jpg differ
Binary files
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/admin/help/admin_sa_sm_cs.jpg
and issue-tracker2/modules/admin/help/admin_sa_sm_cs.jpg differ
Binary files
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/admin/help/admin_sa_sm.jpg
and issue-tracker2/modules/admin/help/admin_sa_sm.jpg differ
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/groups/actions/new.php
issue-tracker2/modules/groups/actions/new.php
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/groups/actions/new.php
2004-12-13 12:55:22.000000000 -0500
--- issue-tracker2/modules/groups/actions/new.php 2005-02-03
21:33:18.000000000 -0500
***************
*** 13,17 ****
}

- if (!empty($_POST['GroupName'])) {
// make sure a group name was given
if (empty($_POST['GroupName'])) {
--- 13,16 ----
***************
*** 81,88 ****

$_ENV['api']['sys']->redirect("?module=groups&action=edit&type=categories&gid=$gid");
} else {
! $_ENV['api']['sys']->push_fatal_error(t("The group
could not be created."));
! }
! }
! }

$_ENV['api']['tpl']->mdisplay("groups","new.tpl");
--- 80,87 ----

$_ENV['api']['sys']->redirect("?module=groups&action=edit&type=categories&gid=$gid");
} else {
!
$_ENV['api']['dbi']->logger("modules/groups/actions/new.php:
null(gid)","phperrors");
! $_ENV['api']['sys']->push_error(t("The group could
not be created."));
! }//if got gid
! }//if no errors defined

$_ENV['api']['tpl']->mdisplay("groups","new.tpl");
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/groups/hooks/class.php
issue-tracker2/modules/groups/hooks/class.php
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/groups/hooks/class.php
2004-12-13 12:55:22.000000000 -0500
--- issue-tracker2/modules/groups/hooks/class.php 2005-02-03
20:17:23.000000000 -0500
***************
*** 640,645 ****
array_push($groups,$subGroup['child_gid']);
}
! }
! }
unset($subGroups);
}
--- 640,645 ----
array_push($groups,$subGroup['child_gid']);
}
! }//foreach
! }//if not array
unset($subGroups);
}
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/help/help/ErrNoConn.hlp
issue-tracker2/modules/help/help/ErrNoConn.hlp
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/help/help/ErrNoConn.hlp
1969-12-31 19:00:00.000000000 -0500
--- issue-tracker2/modules/help/help/ErrNoConn.hlp
2005-01-29 23:01:19.000000000 -0500
***************
*** 0 ****
--- 1,17 ----
+
+ 
+
+ <strong>Issue-Tracker is Unavailable</strong><p>
+
+ <font size="4" color="red">Why?</font>
+ I could <strong>NOT CONNECT</strong> to SQL server.<p>
+
+ <font size="4" color="red">Now what?</font>
+ Please verify that the server (mysqld or psqld) is
running
+ and that its socket agrees with where Issue-Tracker is
+ looking for it. (If MySQL returned an error code,
it will be
+ above).<p>
+
+ <font size="4" color="red">Huh?</font> See the
+ [<a href="docs/admin_guide.html#TROUBLE">Admin's
Guide</a>] for more
+ information.<p>
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/help/help/ErrNoDbases.hlp
issue-tracker2/modules/help/help/ErrNoDbases.hlp
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/help/help/ErrNoDbases.hlp
1969-12-31 19:00:00.000000000 -0500
--- issue-tracker2/modules/help/help/ErrNoDbases.hlp
2005-01-29 23:01:32.000000000 -0500
***************
*** 0 ****
--- 1,26 ----
+ 
+
+ <strong>Issue-Tracker is Unavailable</strong><p>
+
+ <font size="4" color="red">Why?</font>
+ I DID establish a connection to the SQL server but was
+ <strong>UNABLE</strong> to find ANY databases!<p>
+
+ This usually means one or more of the following:<br>
+
+ <ul>
+ <li>that the initial connection was really a
+ hallucination and you're not really getting connected
+ <li>that you have no databases at all (unlikely, as
+ MySQL ships with at least one called 'test')
+ <li>that the initial data is not properly imported
(unlikely,
+ see above),
+ <li>that something is hosed on the
PHP<->MySQL level
+ </ul><p>
+
+ (If MySQL returned an error code, it will be
above).<p>
+
+ <font size="4" color="red">Now what?</font>
+ See the
+ [<a href="docs/admin_guide.html#TROUBLE">Admin's
Guide</a>] for more
+ information.<p>
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/help/help/ErrNoName.hlp
issue-tracker2/modules/help/help/ErrNoName.hlp
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/help/help/ErrNoName.hlp
1969-12-31 19:00:00.000000000 -0500
--- issue-tracker2/modules/help/help/ErrNoName.hlp
2005-01-29 23:02:20.000000000 -0500
***************
*** 0 ****
--- 1,19 ----
+ 
+
+ <strong>Issue-Tracker is Unavailable</strong><p>
+
+ <font size="4" color="red">Now what?</font>
+ I was able to establish a connection to the SQL
server. I also
+ got a list of databases <strong>BUT</strong>
+ the one you specified was not accessible or not
found.<p>
+
+ <font size="4" color="red">Now what?</font>
+ This usually means that the connection to the
server is working
+ but that you did not create the databases or that
you spelled the
+ name incorrectly at some point.<p>
+
+ (If MySQL returned an error code, it will be
above).<p>
+
+ <font size="4" color="red">Huh?</font> See the
+ [<a href="docs/admin_guide.html#TROUBLE">Admin's
Guide</a>] for more
+ information.<p>
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/help/help/ErrNoTables.hlp
issue-tracker2/modules/help/help/ErrNoTables.hlp
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/help/help/ErrNoTables.hlp
1969-12-31 19:00:00.000000000 -0500
--- issue-tracker2/modules/help/help/ErrNoTables.hlp
2005-01-29 23:02:30.000000000 -0500
***************
*** 0 ****
--- 1,22 ----
+ 
+
+ <strong>Issue-Tracker is Unavailable</strong><p>
+
+ <font size="4" color="red">Why?</font>
+ I was able to establish a connection to the SQL
server,
+ select the database you requested,
+ <strong>BUT DID NOT</strong> any tables in it!<p>
+
+ <font size="4" color="red">Now what?</font>
+ This usually means one or more of the following:<br>
+ <li>that the SQL tables were not created properly
+ <li>that the initial data was not properly imported
+ <li>that you specified the wrong database, or,
+ <li>that something is hosed on the PHP<->MySQL level
+ </ul><p>
+
+ (If MySQL returned an error code, it will be
above).<p>
+
+ <font size="4" color="red">Huh?</font> See the
+ [<a href="docs/admin_guide.html#TROUBLE">Admin's
Guide</a>] for more
+ information.<p>
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/issues/actions/choose.php
issue-tracker2/modules/issues/actions/choose.php
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/issues/actions/choose.php
2004-12-13 12:55:22.000000000 -0500
--- issue-tracker2/modules/issues/actions/choose.php
2005-02-03 16:19:41.000000000 -0500
***************
*** 9,32 ****
}

! $results = implode(",",$_SESSION['groups']);

! $sql = "SELECT gid,name FROM groups ";
! $sql .= "WHERE active='t' ";

! if (!empty($_GET['start'])) {
$sql .= $_GET['start'] != "ALL" ? "AND UPPER(name) LIKE
'".$_GET['start']."%' " : "";

if (!$_ENV['api']['perms']->is_employee() and
$_GET['start'] != "ALL") {
$sql .= "AND gid IN ($results) ";
! }
! } else {
$sql .= "AND gid IN ($results) ";
! }

! $sql .= "ORDER BY name";
! $results = $_ENV['api']['dbi']->fetch_all($sql,"array",-1);
! $groups = array();

! if (is_array($results)) {
foreach ($results as $row) {
if
($_ENV['mod']['groups']->show_group($row['gid'],$_SESSION['userid']))
{
--- 9,34 ----
}

! //fmg: prevents warning if no groups defined/passed
! if ($_SESSION['groups']) {
! $results = implode(",",$_SESSION['groups']);

! $sql = "SELECT gid,name FROM groups ";
! $sql .= "WHERE active='t' ";

! if (!empty($_GET['start'])) {
$sql .= $_GET['start'] != "ALL" ? "AND UPPER(name) LIKE
'".$_GET['start']."%' " : "";

if (!$_ENV['api']['perms']->is_employee() and
$_GET['start'] != "ALL") {
$sql .= "AND gid IN ($results) ";
! }//if is employee
! } else {
$sql .= "AND gid IN ($results) ";
! }//if start set

! $sql .= "ORDER BY name";
! $results = $_ENV['api']['dbi']->fetch_all($sql,"array",-1);
! $groups = array();

! if (is_array($results)) {
foreach ($results as $row) {
if
($_ENV['mod']['groups']->show_group($row['gid'],$_SESSION['userid']))
{
***************
*** 40,48 ****
'lng' =>
$_ENV['mod']['issues']->num_status_issues(TYPE_LONG_TERM,$row['gid'])
);
! }
! }
! }

! $_ENV['api']['tpl']->assign('groups',$groups);
$_ENV['api']['tpl']->mdisplay("issues","choose.tpl");
?>
--- 42,51 ----
'lng' =>
$_ENV['mod']['issues']->num_status_issues(TYPE_LONG_TERM,$row['gid'])
);
! }//if show_group
! }//foreach
! }//if results

! $_ENV['api']['tpl']->assign('groups',$groups);
! }//if groups specified
$_ENV['api']['tpl']->mdisplay("issues","choose.tpl");
?>
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/issues/actions/group.php
issue-tracker2/modules/issues/actions/group.php
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/issues/actions/group.php
2004-12-13 12:55:22.000000000 -0500
--- issue-tracker2/modules/issues/actions/group.php
2005-02-03 22:57:06.000000000 -0500
***************
*** 28,32 ****
$rows[$key]['escfrom'] =
$_ENV['mod']['issues']->escalated_from($key,$_GET['gid']);
}
! }

$num_rows = count($rows);
--- 28,32 ----
$rows[$key]['escfrom'] =
$_ENV['mod']['issues']->escalated_from($key,$_GET['gid']);
}
! }//foreach

$num_rows = count($rows);
***************
*** 41,44 ****
$_ENV['api']['tpl']->assign('url',$url);
$_ENV['api']['tpl']->mdisplay("issues","group.tpl");
! }
?>
--- 41,44 ----
$_ENV['api']['tpl']->assign('url',$url);
$_ENV['api']['tpl']->mdisplay("issues","group.tpl");
! }//if gid empty
?>
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/issues/actions/new.php
issue-tracker2/modules/issues/actions/new.php
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/issues/actions/new.php
2004-12-13 12:55:22.000000000 -0500
--- issue-tracker2/modules/issues/actions/new.php 2005-02-03
17:05:25.000000000 -0500
***************
*** 77,83 ****
$_POST['summary'] = $summary;
$_POST['problem'] = $problem;
! }
! }
! }

$_ENV['api']['tpl']->assign('products',$_ENV['mod']['groups']->products($_GET['gid']));
--- 77,86 ----
$_POST['summary'] = $summary;
$_POST['problem'] = $problem;
! }//if summary
! }//if can view issue
! //fmg: tracking down redirect-loop
! //} else {
! // $_ENV['api']['sys']->push_fatal_error(t("No such
issue."));
! }//if got icopy

$_ENV['api']['tpl']->assign('products',$_ENV['mod']['groups']->products($_GET['gid']));
***************
*** 92,95 ****
$_ENV['api']['sys']->redirect();
}
! }
?>
--- 95,98 ----
$_ENV['api']['sys']->redirect();
}
! }//if gid empty
?>
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/issues/actions/update.php
issue-tracker2/modules/issues/actions/update.php
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/issues/actions/update.php
2004-12-13 12:55:22.000000000 -0500
--- issue-tracker2/modules/issues/actions/update.php
2005-02-03 22:56:55.000000000 -0500
***************
*** 11,15 ****
if ($_ENV['api']['validate']->is_numeric($_GET['issueid'])
!== TRUE) {
$_ENV['api']['sys']->push_error(t("Issue ID must be a
numeric value."));
- $_ENV['api']['sys']->redirect();
}

--- 11,14 ----
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/issues/actions/view.php
issue-tracker2/modules/issues/actions/view.php
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/issues/actions/view.php
2004-12-13 12:55:22.000000000 -0500
--- issue-tracker2/modules/issues/actions/view.php
2005-02-03 23:33:02.000000000 -0500
***************
*** 9,12 ****
--- 9,23 ----
}

+ //fmg: don't open blank in this case - redirect to Main (???)
+ if (empty($_POST['issueid']) and empty($_GET['issueid'])) {
+ // if (some_option_in_prefences == TRUE) {
+ // //redirect to main menu (show issues)
+ // $_ENV['api']['sys']->redirect();
+ // } else {
+ //jump to enter new issue
+
$_ENV['api']['sys']->redirect("?module=issues&action=new");
+ // }
+ }
+
if (empty($_GET['issueid']) and !empty($_POST['issueid'])) {

$_ENV['api']['sys']->redirect("?module=issues&action=view&issueid={$_POST['issueid']}");
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/issues/hooks/class.php
issue-tracker2/modules/issues/hooks/class.php
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/issues/hooks/class.php
2004-12-13 12:55:22.000000000 -0500
--- issue-tracker2/modules/issues/hooks/class.php 2005-02-03
16:25:03.000000000 -0500
***************
*** 81,84 ****
--- 81,85 ----
function toggle_subscribe($issueid,$userid)
{
+ if (empty($issueid)) return FALSE;
if (!$this->is_subscribed($issueid,$userid)) {
$insert['issueid'] = $issueid;
***************
*** 101,104 ****
--- 102,106 ----
function is_subscribed($issueid,$userid)
{
+ if (empty($issueid)) return FALSE;
$sql = "SELECT issueid FROM subscriptions ";
$sql .= "WHERE userid='$userid' ";
***************
*** 120,123 ****
--- 122,126 ----
function groups($issueid)
{
+ if (empty($issueid)) return FALSE;
$sql = "SELECT i.gid FROM issue_groups i, groups g ";
$sql .= "WHERE i.issueid='$issueid' ";
***************
*** 337,340 ****
--- 340,344 ----
function is_closed($issueid)
{
+ if (empty($issueid)) return FALSE;
$closed =
$_ENV['mod']['admin']->fetch_status(array(TYPE_CLOSED,TYPE_AUTO_CLOSED));

***************
*** 355,358 ****
--- 359,363 ----
function owner($issueid)
{
+ if (empty($issueid)) return FALSE;
$owner = $this->get_details($issueid,"opened_by");
return $owner['opened_by'];
***************
*** 367,370 ****
--- 372,376 ----
function members($issueid)
{
+ if (empty($issueid)) return FALSE;
$groups = $this->groups($issueid);

***************
*** 393,396 ****
--- 399,403 ----
function event_modify_time($eid)
{
+ if (empty($eid)) return FALSE;
$sql = "SELECT modified,userid FROM
event_modifications ";
$sql .= "WHERE eid='$eid' ";
***************
*** 418,421 ****
--- 425,429 ----
function summary($issueid)
{
+ if (empty($issueid)) return FALSE;
$summary = $this->get_details($issueid,"summary");
return stripslashes($summary['summary']);
***************
*** 430,433 ****
--- 438,442 ----
function escalation_groups($issueid)
{
+ if (empty($issueid)) return FALSE;
$egroups = array();
$groups = $this->groups($issueid);
***************
*** 449,452 ****
--- 458,462 ----
function statuses($issueid)
{
+ if (empty($issueid)) return FALSE;
$statuses = array();
$groups = $this->groups($issueid);
***************
*** 470,473 ****
--- 480,484 ----
function internal_statuses($issueid)
{
+ if (empty($issueid)) return FALSE;
$statuses = array();
$groups = $this->groups($issueid);
***************
*** 491,494 ****
--- 502,506 ----
function categories($issueid)
{
+ if (empty($issueid)) return FALSE;
$categories = array();
$groups = $this->groups($issueid);
***************
*** 761,764 ****
--- 773,778 ----
function show($issueid,$gid)
{
+ if (empty($issueid)) return FALSE;
+
$sql = "SELECT show_issue FROM issue_groups ";
$sql .= "WHERE issueid='$issueid' ";
***************
*** 779,782 ****
--- 793,797 ----
function reopen_issue($issueid)
{
+ if (empty($issueid)) return FALSE;
$issue_groups = $this->groups($issueid);
$owner = $this->owner($issueid);
***************
*** 810,813 ****
--- 825,829 ----
function escalate_issue($issueid,$gid)
{
+ if (empty($issueid)) return FALSE;
$sql = "SELECT show_issue FROM issue_groups ";
$sql .= "WHERE issueid='$issueid' ";
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/issues/issues.php
issue-tracker2/modules/issues/issues.php
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/issues/issues.php
2004-12-13 12:55:22.000000000 -0500
--- issue-tracker2/modules/issues/issues.php 2005-02-03
16:37:36.000000000 -0500
***************
*** 17,21 ****
// the group issues file
$gid = $_SESSION['groups'][0];
!
$_ENV['api']['sys']->redirect("?module=issues&action=group&gid=$gid");
}
?>
--- 17,26 ----
// the group issues file
$gid = $_SESSION['groups'][0];
! if (!empty($gid)) {
!
$_ENV['api']['sys']->redirect("?module=issues&action=group&gid=$gid");
! //fmg: tracking down redirect-loop
! //} else {
! // $_ENV['api']['sys']->push_error(t("No valid
Groups."));
! }//if got gid
}
?>
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/prefs/actions/group.php
issue-tracker2/modules/prefs/actions/group.php
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/prefs/actions/group.php
2004-12-13 12:55:22.000000000 -0500
--- issue-tracker2/modules/prefs/actions/group.php
2005-01-30 00:13:32.000000000 -0500
***************
*** 9,13 ****
}

! if ($_GET['submit'] == "true") {
foreach ($_SESSION['groups'] as $key => $val) {
if ($_POST[('notemail'.$val)] == "on") {
--- 9,15 ----
}

! //fmg: avoid run-time warning:
! // Invalid argument supplied for foreach() in
modules/prefs/actions/group.php on line 12
! if ($_GET['submit'] == "true" &&
!empty($_SESSION['groups']) ) {
foreach ($_SESSION['groups'] as $key => $val) {
if ($_POST[('notemail'.$val)] == "on") {
***************
*** 30,34 ****
}

! $ugroups = implode(",",$_SESSION['groups']);
$sql = "SELECT g.gid,g.name,u.show_group,u.severity FROM
group_users u, groups g ";
$sql .= "WHERE u.gid IN ($ugroups) ";
--- 32,40 ----
}

! //fmg: avoid run-time warning:
! // implode(): Bad arguments. in
modules/prefs/actions/group.php on line 32
! if (!empty($_SESSION['groups']) ) {
! $ugroups = implode(",",$_SESSION['groups']);
! }//if got session
$sql = "SELECT g.gid,g.name,u.show_group,u.severity FROM
group_users u, groups g ";
$sql .= "WHERE u.gid IN ($ugroups) ";
Binary files
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/prefs/help/pref_ap.jpg
and issue-tracker2/modules/prefs/help/pref_ap.jpg differ
Binary files
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/prefs/help/pref_gp.jpg
and issue-tracker2/modules/prefs/help/pref_gp.jpg differ
Binary files
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/prefs/help/pref_header_bar.jpg
and issue-tracker2/modules/prefs/help/pref_header_bar.jpg differ
Binary files
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/prefs/help/pref_ilp.jpg
and issue-tracker2/modules/prefs/help/pref_ilp.jpg differ
Binary files
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/prefs/help/pref_passwd.jpg
and issue-tracker2/modules/prefs/help/pref_passwd.jpg differ
Binary files
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/prefs/help/pref_pi.jpg
and issue-tracker2/modules/prefs/help/pref_pi.jpg differ
Binary files
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/prefs/help/pref_pm1.jpg
and issue-tracker2/modules/prefs/help/pref_pm1.jpg differ
Binary files
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/prefs/help/pref_pm2.jpg
and issue-tracker2/modules/prefs/help/pref_pm2.jpg differ
Binary files
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/prefs/help/pref_pm3.jpg
and issue-tracker2/modules/prefs/help/pref_pm3.jpg differ
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/prefs/help/prefs.hlp
issue-tracker2/modules/prefs/help/prefs.hlp
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/prefs/help/prefs.hlp
1969-12-31 19:00:00.000000000 -0500
--- issue-tracker2/modules/prefs/help/prefs.hlp 2005-02-02
21:55:34.000000000 -0500
***************
*** 0 ****
--- 1,25 ----
+ <h2>Preferences help</h2>
+ <p>
+ <img src="modules/prefs/help/pref_header_bar.jpg"><br>
+ Clicking on the will open a new window where you may
configure your group preferences. Be sure you save any
changes to Preferences first by clicking on the
+ <img src="modules/prefs/help/pref_uup.jpg"> button (bottom
of page).
+ <p>
+ <img src="modules/prefs/help/pref_pi.jpg">
+ <p>
+ <img src="modules/prefs/help/pref_passwd.jpg">
+ <p>
+ <img src="modules/prefs/help/pref_pm1.jpg">
+ <p>
+ <img src="modules/prefs/help/pref_pm2.jpg">
+ <p>
+ <img src="modules/prefs/help/pref_pm3.jpg">
+ <p>
+ <img src="modules/prefs/help/pref_gp.jpg">
+ <p>
+ <img src="modules/prefs/help/pref_ap.jpg">
+ <p>
+ <img src="modules/prefs/help/pref_ilp.jpg">
+ <p>
+ <center><img src="modules/prefs/help/pref_uup.jpg"></center>
+ <p>
+ <hr>
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/prefs/help/prefs.html
issue-tracker2/modules/prefs/help/prefs.html
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/prefs/help/prefs.html
1969-12-31 19:00:00.000000000 -0500
--- issue-tracker2/modules/prefs/help/prefs.html 2005-02-02
16:04:36.000000000 -0500
***************
*** 0 ****
--- 1,26 ----
+ <html>
+ <head><title>Preferences help</title></head>
+ <body>
+ <img src="pref_header_bar.jpg">
+ <p>
+ <img src="pref_pi.jpg">
+ <p>
+ <img src="pref_passwd.jpg">
+ <p>
+ <img src="pref_pm1.jpg">
+ <p>
+ <img src="pref_pm2.jpg">
+ <p>
+ <img src="pref_pm3.jpg">
+ <p>
+ <img src="pref_gp.jpg">
+ <p>
+ <img src="pref_ap.jpg">
+ <p>
+ <img src="pref_ilp.jpg">
+ <p>
+ <center><img src="pref_uup.jpg"></center>
+ <p>
+ <input type="submit" value="Close This Help Window"
onClick="window.close();" />
+ </body>
+ </html>
Binary files
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/prefs/help/pref_uup.jpg
and issue-tracker2/modules/prefs/help/pref_uup.jpg differ
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/prefs/prefs.php
issue-tracker2/modules/prefs/prefs.php
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/prefs/prefs.php
2004-12-13 12:55:22.000000000 -0500
--- issue-tracker2/modules/prefs/prefs.php 2005-02-02
12:17:07.000000000 -0500
***************
*** 105,108 ****
--- 105,113 ----
}

+ //fmg: set have_help variable for smarty - don't know
better way
+ if (!empty($help_file)) {
+
$_ENV['mod']['users']->update_preference($_SESSION['userid'],"session_warning",$_POST['SessionTimeoutWarning']);
+ }//no help
+
if (!empty($_GET['mid'])) {
$sql = "DELETE FROM menus ";
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/users/actions/forgotten_password.php
issue-tracker2/modules/users/actions/forgotten_password.php
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/users/actions/forgotten_password.php
2004-12-13 12:55:22.000000000 -0500
---
issue-tracker2/modules/users/actions/forgotten_password.php
2005-02-04 16:14:51.000000000 -0500
***************
*** 9,12 ****
--- 9,15 ----
}

+ //fmg: show header too
+ $_ENV['api']['tpl']->display('header.tpl');
+
if (!empty($_POST['username']) and !empty($_POST['email'])) {
$sql = "SELECT userid,email FROM users ";
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/users/tpl/users.tpl
issue-tracker2/modules/users/tpl/users.tpl
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/users/tpl/users.tpl
2004-12-13 12:55:22.000000000 -0500
--- issue-tracker2/modules/users/tpl/users.tpl 2005-02-03
14:37:52.000000000 -0500
***************
*** 19,23 ****
</div>
</span>
! <br /><br />
<table cellpadding="2" cellspacing="0"
border="0" width="100%" class="sortable" id="user_list">
<thead class="borders">
--- 19,23 ----
</div>
</span>
! <br />
<table cellpadding="2" cellspacing="0"
border="0" width="100%" class="sortable" id="user_list">
<thead class="borders">
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/users/tpl/view.tpl
issue-tracker2/modules/users/tpl/view.tpl
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/modules/users/tpl/view.tpl
2004-12-13 12:55:22.000000000 -0500
--- issue-tracker2/modules/users/tpl/view.tpl 2005-02-04
16:06:30.000000000 -0500
***************
*** 54,59 ****
{/if}
<tr>
! <td width="25%"><label
for="add_groups">{t}Add to Groups{/t}:</label></td>
! <td width="25%">
<select name="add_groups[]" size="10"
multiple="multiple" style="width: 100%;">
{foreach from=$groups item=group}
--- 54,59 ----
{/if}
<tr>
! 
! <td width="25%"><label
for="add_groups">{t}Add to Groups{/t}:</label>
<select name="add_groups[]" size="10"
multiple="multiple" style="width: 100%;">
{foreach from=$groups item=group}
***************
*** 64,68 ****
</select>
</td>
! <td width="25%">
<select name="del_groups[]" size="10"
multiple="multiple" style="width: 100%;">
{foreach from=$user_groups item=gid}
--- 64,68 ----
</select>
</td>
! <td width="25%"><label
for="del_groups">{t}Delete from Groups{/t}:</label>
<select name="del_groups[]" size="10"
multiple="multiple" style="width: 100%;">
{foreach from=$user_groups item=gid}
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/parser
issue-tracker2/parser
*** /usr/src/redhat/SOURCES/issue-tracker-5dev/parser
2004-12-13 12:55:21.000000000 -0500
--- issue-tracker2/parser 2005-02-04 16:44:43.000000000 -0500
***************
*** 311,315 ****
$insert['problem'] = $parser->body;
$insert['severity'] = SEV_NORMAL;
! if $parser->args['private'] == "true") {
$insert['private'] = "t";
}
--- 311,315 ----
$insert['problem'] = $parser->body;
$insert['severity'] = SEV_NORMAL;
! if ($parser->args['private'] == "true") {
$insert['private'] = "t";
}
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/README.fmg
issue-tracker2/README.fmg
*** /usr/src/redhat/SOURCES/issue-tracker-5dev/README.fmg
1969-12-31 19:00:00.000000000 -0500
--- issue-tracker2/README.fmg 2005-02-04 18:55:49.899775944
-0500
***************
*** 0 ****
--- 1,32 ----
+ * See file ROOT/5dev_bugs.txt for running log of issues I
find with it5dev
+
+ * Documentation was created with vim (what else?!?!) and
'import' which is
+ % import -version
+ Version: ImageMagick 5.5.7 03/23/04 Q16
http://www.imagemagick.org
+ Copyright: Copyright (C) 2003 ImageMagick Studio LLC
+ using the following tcsh alias which allows for precise
selection of region:
+ alias capture "sleep 8 && import -quality 90 -comment \!*
\!*.jpg"
+ Note that when using it, leave OFF the extension:
+ % capture admin_sa_pm_cps
+ (You have 8 seconds to activate the window in question,
wait for prompt
+ to turn to a cross, select the region by clicking in
upper-left-hand-corner
+ and dragging to cover area desired and only then releasing
the mouse-button.
+ Easy, eh?)
+
+ * I am beating the error.php way of showing errors
pre-login into the popup
+ .HLP we use now for everything else.
+
+ * See themes/default/tpl/README.fmg for further info.
+
+ * No reason why a macro can't piece together the scattered
.HLP files
+ (and their images) into a comprehensive manual (later).
Anyone want to
+ give it a shot?
+
+ * error.php is a chopped copy of index.php but adjusted
not to init()
+ the dbase connections so as not to cause looping. This is
because
+ index.php invokes error.php in case the dbase connection
is not viable.
+ If you know how to do this so that only index.php is
needed, be my guest...
+
+ * new images/user.png - more obvious :) (resized
gnome-robots2.png)
+
+ * new images/delete.png - more obvious. (resized
gnome-error.png)
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/setup/5dev_schema.mysql
issue-tracker2/setup/5dev_schema.mysql
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/setup/5dev_schema.mysql
1969-12-31 19:00:00.000000000 -0500
--- issue-tracker2/setup/5dev_schema.mysql 2005-02-03
18:25:51.000000000 -0500
***************
*** 0 ****
--- 1,8 ----
+ -- fmg: I am deducing this format from data it wants to
write...
+ CREATE TABLE query_stats (
+ qid INTEGER AUTO_INCREMENT,
+ query VARCHAR(255) NOT NULL,
+ execute_time NUMERIC(18,17) DEFAULT NULL,
+ PRIMARY KEY (qid)
+ );
+
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/setup/create_db.sh
issue-tracker2/setup/create_db.sh
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/setup/create_db.sh
1969-12-31 19:00:00.000000000 -0500
--- issue-tracker2/setup/create_db.sh 2005-01-30
11:26:29.000000000 -0500
***************
*** 0 ****
--- 1,12 ----
+ #!/bin/sh
+ DATABASE="issuetracker"
+ USR="it"
+ HST="localhost"
+ #
+ echo "Running this more than once will KEEP ADDING DATA -
making for a mess!"
+ #
+ mysqladmin --user=$USR -p --host=$HST CREATE $DATABASE
+ #
+ mysql -f --user=$USR -p --host=$HST $DATABASE < schema.mysql
+ mysql -f --user=$USR -p --host=$HST $DATABASE <
constraints.mysql
+ mysql -f --user=$USR -p --host=$HST $DATABASE < indexes.sql
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/setup/tt
issue-tracker2/setup/tt
*** /usr/src/redhat/SOURCES/issue-tracker-5dev/setup/tt
1969-12-31 19:00:00.000000000 -0500
--- issue-tracker2/setup/tt 2005-02-03 18:06:00.000000000 -0500
***************
*** 0 ****
--- 1 ----
+
Only in /usr/src/redhat/SOURCES/issue-tracker-5dev: .svn
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/themes/default/date-picker.js
issue-tracker2/themes/default/date-picker.js
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/themes/default/date-picker.js
2004-12-13 12:55:21.000000000 -0500
--- issue-tracker2/themes/default/date-picker.js 2005-02-03
22:07:57.000000000 -0500
***************
*** 25,29 ****
if (p_month == null) {
this.gMonthName = null;
! this.gMonth = null;
this.gYearly = true;
} else {
--- 25,29 ----
if (p_month == null) {
this.gMonthName = null;
! this.gMonth = null;
this.gYearly = true;
} else {
***************
*** 156,159 ****
--- 156,161 ----

this.gWinCal.document.open();
+ //fmg: without this I get "Undefined" for initial month
name!
+ this.gMonthName = Calendar.get_month(this.gMonth - 1)

// Setup the page...
***************
*** 493,497 ****
p_item : Return Item.
*/
-
p_item = arguments[0];
if (arguments[1] == null)
--- 495,498 ----
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/themes/default/tpl/fatal.tpl
issue-tracker2/themes/default/tpl/fatal.tpl
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/themes/default/tpl/fatal.tpl
1969-12-31 19:00:00.000000000 -0500
--- issue-tracker2/themes/default/tpl/fatal.tpl 2005-01-29
21:44:50.000000000 -0500
***************
*** 0 ****
--- 1,8 ----
+ 
+ <br />
+ {container txt="Fatal"}
+ <br />
+ {$help}
+ {/container}
+ <br />
+ 
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/themes/default/tpl/header.tpl
issue-tracker2/themes/default/tpl/header.tpl
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/themes/default/tpl/header.tpl
2004-12-13 12:55:21.000000000 -0500
--- issue-tracker2/themes/default/tpl/header.tpl 2005-02-02
22:53:04.000000000 -0500
***************
*** 35,39 ****
{if !empty($smarty.session.userid)}
<tr>
! <td class="crumb"> &rsaquo; {$crumbs}</td>
{if $api.perms->is_admin($smarty.session.userid)}
<td class="crumb" width="20%" align="right"><a
href="?module=admin">Administration</a></td>
--- 35,47 ----
{if !empty($smarty.session.userid)}
<tr>
! <td class="crumb"> &rsaquo; {$crumbs}
! 
! {if !empty($help_file)}
!
          
! (<a href="javascript:void
window.open('{$help_url}','popup_help','status=yes,toolbar=no,scrollbars=yes,titlebar=yes,menubar=no,resizable=yes,directories=no,location=no');">Popup
Help</a>)
! {else}
! 
! {/if}
! </td>
{if $api.perms->is_admin($smarty.session.userid)}
<td class="crumb" width="20%" align="right"><a
href="?module=admin">Administration</a></td>
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/themes/default/tpl/popfooter.tpl
issue-tracker2/themes/default/tpl/popfooter.tpl
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/themes/default/tpl/popfooter.tpl
1969-12-31 19:00:00.000000000 -0500
--- issue-tracker2/themes/default/tpl/popfooter.tpl
2005-02-02 21:34:32.000000000 -0500
***************
*** 0 ****
--- 1,7 ----
+ 
+ </tr>
+ </table>
+ </body>
+ </html>
+ 
+
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/themes/default/tpl/popheader.tpl
issue-tracker2/themes/default/tpl/popheader.tpl
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/themes/default/tpl/popheader.tpl
1969-12-31 19:00:00.000000000 -0500
--- issue-tracker2/themes/default/tpl/popheader.tpl
2005-02-02 21:33:16.000000000 -0500
***************
*** 0 ****
--- 1,25 ----
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Strict//EN">
+ 
+ <html>
+ <head>
+ <title>{t}{$title}{/t}</title>
+ <link rel="stylesheet" type="text/css"
href="themes/default/stylesheet.css" />
+ {if preg_match("/MSIE/",$smarty.server.HTTP_USER_AGENT)}
+ <script type="text/javascript"
src="themes/default/pngfix.js"></script>
+ <link rel="stylesheet" type="text/css"
href="themes/default/ie.css" />
+ {/if}
+ {if $smarty.session.javascript eq TRUE}
+ {include file="javascript.tpl"}
+ {/if}
+ <script type="text/javascript"
src="themes/default/sorttable.js"></script>
+ <script type="text/javascript"
src="themes/default/date-picker.js"></script>
+ </head>
+ {if $smarty.session.prefs.session_warning eq "t" and
$smarty.session.javascript eq TRUE}
+ <body onLoad="loader(); return true;"
onUnLoad="unloader(); return true;">
+ {else}
+ <body>
+ {/if}
+ <table width="100%" cellspacing="0" cellpadding="0"
border="0">
+ <tr>
+ 
+
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/themes/default/tpl/pophelp.tpl
issue-tracker2/themes/default/tpl/pophelp.tpl
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/themes/default/tpl/pophelp.tpl
1969-12-31 19:00:00.000000000 -0500
--- issue-tracker2/themes/default/tpl/pophelp.tpl 2005-02-02
21:53:04.000000000 -0500
***************
*** 0 ****
--- 1,7 ----
+ 
+ {container txt="The HELP you requested:"}
+ {button img=$images.no txt="Close HELP Window"
click="window.close();"}
+ {$help}
+ {button img=$images.no txt="Close HELP Window"
click="window.close();"}
+ {/container}
+ 
diff -P -t -r -C 2 -x cache -x logs -x sessions -x conf -x
admin_guide.html -x admin_guide_images
/usr/src/redhat/SOURCES/issue-tracker-5dev/themes/default/tpl/README.fmg
issue-tracker2/themes/default/tpl/README.fmg
***
/usr/src/redhat/SOURCES/issue-tracker-5dev/themes/default/tpl/README.fmg
1969-12-31 19:00:00.000000000 -0500
--- issue-tracker2/themes/default/tpl/README.fmg 2005-02-02
22:54:47.000000000 -0500
***************
*** 0 ****
--- 1,20 ----
+ //fmg: 01/05
+ fatal.tpl is a copy of help.tpl with "close window"
removed as there is no
+ window to close - that screen is the final thing before
"exit;" :)
+
+ //fmg: 02/02
+ header.tpl modified with addition of javascript to popup a
new window with
+ the HLP - IF IT EXISTS!
+
+ //fmg: 02/02
+ pophelp.tpl is a copy of help.tpl with "close window" on
both top and bottom
+ of the help info and also changed to "close HELP window" -
to pacify the
+ user that their session window will not be closed.
+
+ //fmg: 02/02
+ popheader.tpl is a copy of header.tpl molested to not
print any stuff we usually
+ find in a header. (I don't know how to *set* the
$smarty.get.nofooter variable!)
+
+ //fmg: 02/02
+ popfooter.tpl is a copy of footer.tpl molested to not
print any stuff we usually
+ find in a footer. (I don't know how to *set* the
$smarty.get.nofooter variable!)
-----------------------------------------------------------

Cheers,
Fil

patch to 5dev37 (see TAR for any files not herein: images)

Group

Searches

Help

#36 patch to 5dev37 (see TAR for any files not herein: images)

Discussion