cs-project-svn_notify Mailing List for CS-Project (Page 16)
Brought to you by:
crazedsanity
Menu
▾
▴
cs-project-svn_notify — Subversion commit notifications
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(65) |
Dec
(47) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(34) |
Feb
(82) |
Mar
(21) |
Apr
(12) |
May
(16) |
Jun
|
Jul
(6) |
Aug
(8) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
(1) |
Feb
(52) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(9) |
Aug
(5) |
Sep
(12) |
Oct
(11) |
Nov
(4) |
Dec
(15) |
| 2010 |
Jan
|
Feb
|
Mar
(6) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(9) |
| 2012 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
|
From: <cra...@us...> - 2007-11-21 21:30:06
|
Revision: 666
http://cs-project.svn.sourceforge.net/cs-project/?rev=666&view=rev
Author: crazedsanity
Date: 2007-11-21 13:29:25 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
No longer wordwrap() note body in main noteClass.
/lib/get_notes():
-- remove arbitrary call to wordwrap().
Modified Paths:
--------------
trunk/lib/noteClass.php
Modified: trunk/lib/noteClass.php
===================================================================
--- trunk/lib/noteClass.php 2007-11-21 20:51:59 UTC (rev 665)
+++ trunk/lib/noteClass.php 2007-11-21 21:29:25 UTC (rev 666)
@@ -2,11 +2,11 @@
/*
* SVN INFORMATION:::
* ------------------
- * SVN Signature::::::: $Id$
- * Last Author::::::::: $Author$
- * Current Revision:::: $Revision$
- * Repository Location: $HeadURL$
- * Last Updated:::::::: $Date$
+ * SVN Signature::::::: $Id:noteClass.php 626 2007-11-20 16:54:11Z crazedsanity $
+ * Last Author::::::::: $Author:crazedsanity $
+ * Current Revision:::: $Revision:626 $
+ * Repository Location: $HeadURL:https://cs-project.svn.sourceforge.net/svnroot/cs-project/trunk/lib/noteClass.php $
+ * Last Updated:::::::: $Date:2007-11-20 10:54:11 -0600 (Tue, 20 Nov 2007) $
*/
@@ -103,7 +103,6 @@
foreach($retval as $id=>$arr) {
//add some wrapping & cleaning (so the data appears properly)
- $retval[$id]['body'] = wordwrap($arr['body'], 95);
$retval[$id]['subject'] = cleanString($retval[$id]['subject'], "htmlentity_plus_brackets");
$retval[$id]['body'] = cleanString($retval[$id]['body'], "htmlentity_plus_brackets");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cra...@us...> - 2007-11-21 20:52:01
|
Revision: 665
http://cs-project.svn.sourceforge.net/cs-project/?rev=665&view=rev
Author: crazedsanity
Date: 2007-11-21 12:51:59 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
More formatting of issue body & notes.
Modified Paths:
--------------
trunk/includes/content/helpdesk.inc
trunk/includes/extern/helpdesk.inc
trunk/templates/extern/helpdesk/view.content.tmpl
Modified: trunk/includes/content/helpdesk.inc
===================================================================
--- trunk/includes/content/helpdesk.inc 2007-11-21 20:34:21 UTC (rev 664)
+++ trunk/includes/content/helpdesk.inc 2007-11-21 20:51:59 UTC (rev 665)
@@ -247,7 +247,7 @@
$page->add_template_var("select_category_list", $categoryList);
//convert the returned data into htmlentities so brackets show properly.
- $helpdeskData['subject'] = $bbCodeParser->parseString(cleanString($helpdeskData['subject'], "htmlentity_plus_brackets"), TRUE);
+ $helpdeskData['subject'] = $bbCodeParser->parseString(cleanString($helpdeskData['subject'], "htmlentity_plus_brackets"));
$helpdeskData['subject'] = preg_replace('/\s\s/', ' ', $helpdeskData['subject']);
$helpdeskData['subject'] = preg_replace('/\S\s\s/', ' ', $helpdeskData['subject']);
Modified: trunk/includes/extern/helpdesk.inc
===================================================================
--- trunk/includes/extern/helpdesk.inc 2007-11-21 20:34:21 UTC (rev 664)
+++ trunk/includes/extern/helpdesk.inc 2007-11-21 20:51:59 UTC (rev 665)
@@ -146,8 +146,9 @@
unset($helpdeskData['notes']);
//make the wrapping SANE.
- $helpdeskData['subject'] = wordwrap($helpdeskData['subject'], FORMAT_WORDWRAP);
- $helpdeskData['subject'] = $bbCodeParser->parseString($helpdeskData['subject'], TRUE);
+ #$helpdeskData['subject'] = wordwrap($helpdeskData['subject'], FORMAT_WORDWRAP);
+ $helpdeskData['subject'] = cleanString($helpdeskData['subject'], "htmlentity_plus_brackets");
+ $helpdeskData['subject'] = $bbCodeParser->parseString($helpdeskData['subject']);
$helpdeskData['subject'] = preg_replace('/\s\s/', ' ', $helpdeskData['subject']);
$helpdeskData['subject'] = preg_replace('/\S\s\s/', ' ', $helpdeskData['subject']);
@@ -179,7 +180,7 @@
$baseRow = $page->templateRows['issueNotes'];
foreach($myNotes as $repArr) {
$repArr['body'] = cleanString($repArr['body'], "htmlentity_plus_brackets");
- $repArr['body'] = $bbCodeParser->parseString($repArr['body'], TRUE);
+ $repArr['body'] = $bbCodeParser->parseString($repArr['body'], FALSE);
$repArr['body'] = preg_replace('/\s\s/', ' ', $repArr['body']);
$repArr['body'] = preg_replace('/\S\s\s/', ' ', $repArr['body']);
Modified: trunk/templates/extern/helpdesk/view.content.tmpl
===================================================================
--- trunk/templates/extern/helpdesk/view.content.tmpl 2007-11-21 20:34:21 UTC (rev 664)
+++ trunk/templates/extern/helpdesk/view.content.tmpl 2007-11-21 20:51:59 UTC (rev 665)
@@ -43,7 +43,8 @@
<th style="border-bottom:solid #000 1px;" align="right">Notes:<BR><font size="-3"><i>(Includes previous/current<BR>solution(s), if available)</i></font></th>
<td style="border-bottom:solid #000 1px;" colspan="2">
<!-- BEGIN issueNotes --><div style="border-top:dashed #000 1px;">%%solutionIndicator%% <u> [#%%note_id%%] <b>%%subject%%</b> (%%fname%%@%%created%%)</u></div>
- <div style="width:100%; overflow:auto"><code style="font-size:10px;">%%body%%</code></div>
+
+ <BR><div style="width:100%; overflow:auto"><code style="font-size:10px;">%%body%%</code></div>
<!-- END issueNotes -->
</td>
</tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cra...@us...> - 2007-11-21 20:34:26
|
Revision: 664
http://cs-project.svn.sourceforge.net/cs-project/?rev=664&view=rev
Author: crazedsanity
Date: 2007-11-21 12:34:21 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
Formatting of helpdesk issue body & notes without "pre" tags.
Modified Paths:
--------------
trunk/includes/content/helpdesk.inc
trunk/includes/extern/helpdesk.inc
trunk/templates/content/helpdesk/view.content.tmpl
trunk/templates/extern/helpdesk/view.content.tmpl
Modified: trunk/includes/content/helpdesk.inc
===================================================================
--- trunk/includes/content/helpdesk.inc 2007-11-21 19:03:03 UTC (rev 663)
+++ trunk/includes/content/helpdesk.inc 2007-11-21 20:34:21 UTC (rev 664)
@@ -247,12 +247,16 @@
$page->add_template_var("select_category_list", $categoryList);
//convert the returned data into htmlentities so brackets show properly.
- $helpdeskData['subject'] = $bbCodeParser->parseString(cleanString($helpdeskData['subject'], "htmlentity_plus_brackets"));
+ $helpdeskData['subject'] = $bbCodeParser->parseString(cleanString($helpdeskData['subject'], "htmlentity_plus_brackets"), TRUE);
+ $helpdeskData['subject'] = preg_replace('/\s\s/', ' ', $helpdeskData['subject']);
+ $helpdeskData['subject'] = preg_replace('/\S\s\s/', ' ', $helpdeskData['subject']);
+
+
$helpdeskData['name'] = cleanString($helpdeskData['name'], "htmlentity_plus_brackets");
$helpdeskData['solution'] = cleanString($helpdeskData['solution'], "htmlentity_plus_brackets");
//make the wrapping SANE.
- $helpdeskData['subject'] = wordwrap($helpdeskData['subject'], FORMAT_WORDWRAP);
+ #$helpdeskData['subject'] = wordwrap($helpdeskData['subject'], FORMAT_WORDWRAP);
//show the buttons appropriate to their membership level & ownership.
//if they're the owner, show the "solution" section.
@@ -367,6 +371,9 @@
foreach($myNotes as $repArr) {
$repArr['body'] = $bbCodeParser->parseString(cleanString($repArr['body'], "htmlentity_plus_brackets"));
$repArr['subject'] = cleanString($repArr['subject'], "htmlentity_plus_brackets");
+ $repArr['subject'] = preg_replace('/\s\s/', ' ', $repArr['subject']);
+ $repArr['subject'] = preg_replace('/\S\s\s/', ' ', $repArr['subject']);
+
$repArr['solutionIndicator'] = "";
if($repArr['is_solution'] == 't') {
Modified: trunk/includes/extern/helpdesk.inc
===================================================================
--- trunk/includes/extern/helpdesk.inc 2007-11-21 19:03:03 UTC (rev 663)
+++ trunk/includes/extern/helpdesk.inc 2007-11-21 20:34:21 UTC (rev 664)
@@ -147,7 +147,9 @@
//make the wrapping SANE.
$helpdeskData['subject'] = wordwrap($helpdeskData['subject'], FORMAT_WORDWRAP);
- $helpdeskData['subject'] = $bbCodeParser->parseString($helpdeskData['subject'],FALSE);
+ $helpdeskData['subject'] = $bbCodeParser->parseString($helpdeskData['subject'], TRUE);
+ $helpdeskData['subject'] = preg_replace('/\s\s/', ' ', $helpdeskData['subject']);
+ $helpdeskData['subject'] = preg_replace('/\S\s\s/', ' ', $helpdeskData['subject']);
//add everything to the page as a template var...
foreach($helpdeskData as $field=>$value) {
@@ -177,7 +179,10 @@
$baseRow = $page->templateRows['issueNotes'];
foreach($myNotes as $repArr) {
$repArr['body'] = cleanString($repArr['body'], "htmlentity_plus_brackets");
- $repArr['body'] = $bbCodeParser->parseString($repArr['body'], FALSE);
+ $repArr['body'] = $bbCodeParser->parseString($repArr['body'], TRUE);
+ $repArr['body'] = preg_replace('/\s\s/', ' ', $repArr['body']);
+ $repArr['body'] = preg_replace('/\S\s\s/', ' ', $repArr['body']);
+
$repArr['subject'] = cleanString($repArr['subject'], "htmlentity_plus_brackets");
$repArr['solutionIndicator'] = "";
Modified: trunk/templates/content/helpdesk/view.content.tmpl
===================================================================
--- trunk/templates/content/helpdesk/view.content.tmpl 2007-11-21 19:03:03 UTC (rev 663)
+++ trunk/templates/content/helpdesk/view.content.tmpl 2007-11-21 20:34:21 UTC (rev 664)
@@ -142,7 +142,7 @@
<th style="border-bottom:solid #000 1px;" align="right">Issue Text:</th>
- <td style="border-bottom:solid #000 1px;" width="650" colspan="2" nowrap><pre>{subject}</pre></td>
+ <td style="border-bottom:solid #000 1px;" width="650" colspan="2" nowrap><code>{subject}</code></td>
</tr>
<tr>
<th style="border-bottom:solid #000 1px;" align="right">Notes:<BR><font size="-3"><i>(Includes previous/current<BR>solution(s), if available)</i></font></th>
Modified: trunk/templates/extern/helpdesk/view.content.tmpl
===================================================================
--- trunk/templates/extern/helpdesk/view.content.tmpl 2007-11-21 19:03:03 UTC (rev 663)
+++ trunk/templates/extern/helpdesk/view.content.tmpl 2007-11-21 20:34:21 UTC (rev 664)
@@ -37,17 +37,17 @@
<th style="border-bottom:solid #000 1px;" align="right" valign="top">Issue Text:</th>
- <td style="border-bottom:solid #000 1px;" width="650" colspan="2"><pre>{subject}</pre></td>
+ <td style="border-bottom:solid #000 1px;" width="650" colspan="2"><code>{subject}</code></td>
</tr>
<tr>
<th style="border-bottom:solid #000 1px;" align="right">Notes:<BR><font size="-3"><i>(Includes previous/current<BR>solution(s), if available)</i></font></th>
<td style="border-bottom:solid #000 1px;" colspan="2">
<!-- BEGIN issueNotes --><div style="border-top:dashed #000 1px;">%%solutionIndicator%% <u> [#%%note_id%%] <b>%%subject%%</b> (%%fname%%@%%created%%)</u></div>
- <div style="width:100%; overflow:auto"><pre style="font-size:10px;">%%body%%</pre></div>
+ <div style="width:100%; overflow:auto"><code style="font-size:10px;">%%body%%</code></div>
<!-- END issueNotes -->
</td>
</tr>
-<!-- BEGIN remark_row -->
+
<tr>
<td colspan="3"><h3 style="display:inline">Email:</h3>
@@ -72,7 +72,7 @@
<input name="action" value="Remark" type="submit">
</td>
</tr>
-<!-- END remxark_row -->
+
</tbody>
</table>
</form>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cra...@us...> - 2007-11-21 19:03:13
|
Revision: 663
http://cs-project.svn.sourceforge.net/cs-project/?rev=663&view=rev
Author: crazedsanity
Date: 2007-11-21 11:03:03 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
*** RELEASE 1.1.0-BETA15 ***
SUMMARY OF CHANGES:::
* fix tag display on existing issue (#118)
Modified Paths:
--------------
releases/1.1/VERSION
releases/1.1/lib/helpdeskClass.php
releases/1.1/lib/tagClass.php
Modified: releases/1.1/VERSION
===================================================================
--- releases/1.1/VERSION 2007-11-21 19:00:56 UTC (rev 662)
+++ releases/1.1/VERSION 2007-11-21 19:03:03 UTC (rev 663)
@@ -1,4 +1,4 @@
$Id:VERSION 628 2007-11-20 16:58:45Z crazedsanity $
-VERSION: 1.1.0-BETA14
+VERSION: 1.1.0-BETA15
$HeadURL:https://cs-project.svn.sourceforge.net/svnroot/cs-project/trunk/VERSION $
Modified: releases/1.1/lib/helpdeskClass.php
===================================================================
--- releases/1.1/lib/helpdeskClass.php 2007-11-21 19:00:56 UTC (rev 662)
+++ releases/1.1/lib/helpdeskClass.php 2007-11-21 19:03:03 UTC (rev 663)
@@ -413,7 +413,7 @@
function get_category_list($selectThis=NULL) {
//create a list of tags.
$object = new tagClass($this->db);
- $mainTagList = $object->get_tag_list();
+ $mainTagList = $object->get_tag_list(TRUE);
//create the "replacement array" and such.
$tagList = array();
Modified: releases/1.1/lib/tagClass.php
===================================================================
--- releases/1.1/lib/tagClass.php 2007-11-21 19:00:56 UTC (rev 662)
+++ releases/1.1/lib/tagClass.php 2007-11-21 19:03:03 UTC (rev 663)
@@ -53,7 +53,7 @@
* @return (array) PASS: contains tag_name_id=>name array.
* @return (exception) database error or no rows.
*/
- public function get_tag_list() {
+ public function get_tag_list($getAllData=FALSE) {
$sql = "SELECT * FROM tag_name_table ORDER BY modifier, lower(name)";
$numrows = $this->db->exec($sql);
$dberror = $this->db->errorMsg();
@@ -67,7 +67,12 @@
}
else {
//good to go!
- $data = $this->db->farray_fieldnames("tag_name_id", NULL, 0);
+ if($getAllData) {
+ $data = $this->db->farray_fieldnames("tag_name_id", NULL, 0);
+ }
+ else {
+ $data = $this->db->farray_nvp('tag_name_id', 'name');
+ }
return($data);
}
}//end get_tag_list()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cra...@us...> - 2007-11-21 19:00:58
|
Revision: 662
http://cs-project.svn.sourceforge.net/cs-project/?rev=662&view=rev
Author: crazedsanity
Date: 2007-11-21 11:00:56 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
Version bump (1.1.0-BETA15)
Modified Paths:
--------------
trunk/VERSION
Modified: trunk/VERSION
===================================================================
--- trunk/VERSION 2007-11-21 18:59:54 UTC (rev 661)
+++ trunk/VERSION 2007-11-21 19:00:56 UTC (rev 662)
@@ -1,4 +1,4 @@
$Id:VERSION 628 2007-11-20 16:58:45Z crazedsanity $
-VERSION: 1.1.0-BETA14
+VERSION: 1.1.0-BETA15
$HeadURL:https://cs-project.svn.sourceforge.net/svnroot/cs-project/trunk/VERSION $
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cra...@us...> - 2007-11-21 18:59:57
|
Revision: 661
http://cs-project.svn.sourceforge.net/cs-project/?rev=661&view=rev
Author: crazedsanity
Date: 2007-11-21 10:59:54 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
Fix problem with displaying tags on existing issues.
FIXES ISSUE:::
#118: Helpdesk tag list shows "Array"
/lib/helpdeskClass.php:
* get_category_list():
-- pass TRUE to the call to tagClass::get_tag_list().
/lib/tagClass.php:
* get_tag_list():
-- ARG CHANGE: NEW ARG: #1 ($getAllData=FALSE)
-- option to retrieve all data vs. the traditional tag_name_id + name.
Modified Paths:
--------------
trunk/lib/helpdeskClass.php
trunk/lib/tagClass.php
Modified: trunk/lib/helpdeskClass.php
===================================================================
--- trunk/lib/helpdeskClass.php 2007-11-21 18:08:22 UTC (rev 660)
+++ trunk/lib/helpdeskClass.php 2007-11-21 18:59:54 UTC (rev 661)
@@ -413,7 +413,7 @@
function get_category_list($selectThis=NULL) {
//create a list of tags.
$object = new tagClass($this->db);
- $mainTagList = $object->get_tag_list();
+ $mainTagList = $object->get_tag_list(TRUE);
//create the "replacement array" and such.
$tagList = array();
Modified: trunk/lib/tagClass.php
===================================================================
--- trunk/lib/tagClass.php 2007-11-21 18:08:22 UTC (rev 660)
+++ trunk/lib/tagClass.php 2007-11-21 18:59:54 UTC (rev 661)
@@ -53,7 +53,7 @@
* @return (array) PASS: contains tag_name_id=>name array.
* @return (exception) database error or no rows.
*/
- public function get_tag_list() {
+ public function get_tag_list($getAllData=FALSE) {
$sql = "SELECT * FROM tag_name_table ORDER BY modifier, lower(name)";
$numrows = $this->db->exec($sql);
$dberror = $this->db->errorMsg();
@@ -67,7 +67,12 @@
}
else {
//good to go!
- $data = $this->db->farray_fieldnames("tag_name_id", NULL, 0);
+ if($getAllData) {
+ $data = $this->db->farray_fieldnames("tag_name_id", NULL, 0);
+ }
+ else {
+ $data = $this->db->farray_nvp('tag_name_id', 'name');
+ }
return($data);
}
}//end get_tag_list()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cra...@us...> - 2007-11-21 18:08:28
|
Revision: 660
http://cs-project.svn.sourceforge.net/cs-project/?rev=660&view=rev
Author: crazedsanity
Date: 2007-11-21 10:08:22 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
*** RELEASE 1.1.0-BETA14 ***
SUMMARY OF CHANGES:::
* better logging when remarking on helpdesk issues.
* catch exceptions when sending emails (attempts to send ALL emails).
* better exception logging
* added "svn:eol-style" to files for M$ Windows users/developers.
* emails contain SVN "Id".
* new users are sent emails.
* fix problems with creating new users + email addresses.
* set priority based on associated tags (initial creation) (issue #77)
* array_as_option_list() checks display & value (instead of just value)
* add randomness to URL when redirecting after POSTing to defeat browser cache.
* tags returned in a more complex manner now.
* issue creation allows multiple tags to be linked immediately
* "bug" is always automatically selected for issue creation.
* fixed invalid image links.
* use cs-content v0.10.5
SVN COMMAND:::
merge -r620:HEAD https://cs-project.svn.sourceforge.net/svnroot/cs-project/trunk
Modified Paths:
--------------
releases/1.1/VERSION
releases/1.1/docs/sql/setup/03__indexes_etc.sql
releases/1.1/docs/sql/upgrades/upgradeTo1.1.0-BETA3_part1.sql
releases/1.1/includes/content/helpdesk.inc
releases/1.1/includes/extern/helpdesk.inc
releases/1.1/includes/login.inc
releases/1.1/lib/adminUserClass.php
releases/1.1/lib/contactClass.php
releases/1.1/lib/cs-content/VERSION
releases/1.1/lib/cs-content/contentSystemClass.php
releases/1.1/lib/cs-content/cs_fileSystemClass.php
releases/1.1/lib/cs-content/cs_genericPageClass.php
releases/1.1/lib/cs-content/cs_globalFunctions.php
releases/1.1/lib/cs-content/cs_phpDB.php
releases/1.1/lib/cs-content/cs_sessionClass.php
releases/1.1/lib/cs-content/cs_versionAbstract.class.php
releases/1.1/lib/cs-content/sample_files/public_html/index.php
releases/1.1/lib/cs-content/sample_files/templates/footer.shared.tmpl
releases/1.1/lib/cs-content/sample_files/templates/header.shared.tmpl
releases/1.1/lib/cs-content/sample_files/templates/infobar.shared.tmpl
releases/1.1/lib/cs-content/sample_files/templates/main.shared.tmpl
releases/1.1/lib/cs-content/sample_files/templates/menu.shared.tmpl
releases/1.1/lib/cs-content/sample_files/templates/system/construction.content.tmpl
releases/1.1/lib/cs-content/sample_files/templates/system/message_box.tmpl
releases/1.1/lib/globalFunctions.php
releases/1.1/lib/helpdeskClass.php
releases/1.1/lib/recordContactLink.class.php
releases/1.1/lib/site_config.php
releases/1.1/lib/tagClass.php
releases/1.1/public_html/images/index.html
releases/1.1/templates/content/helpdesk/create.content.tmpl
releases/1.1/templates/content/helpdesk/view.content.tmpl
releases/1.1/templates/email/helpdesk-new.tmpl
releases/1.1/templates/email/helpdesk-remark.tmpl
releases/1.1/templates/email/lost_password.tmpl
releases/1.1/templates/extern/helpdesk/create.content.tmpl
releases/1.1/templates/system/message_box.tmpl
releases/1.1/upgrade/upgrade.xml
Added Paths:
-----------
releases/1.1/docs/sql/upgrades/upgradeTo1.1.0-BETA14.sql
releases/1.1/templates/email/new_user.tmpl
releases/1.1/upgrade/upgradeTo1.1.0-BETA14.php
Property Changed:
----------------
releases/1.1/LICENSE
releases/1.1/VERSION
releases/1.1/docs/sql/setup/01__storedprocs.sql
releases/1.1/docs/sql/setup/02__tables.sql
releases/1.1/docs/sql/setup/03__indexes_etc.sql
releases/1.1/includes/content/contacts.inc
releases/1.1/includes/content/helpdesk.inc
releases/1.1/includes/content/notes.inc
releases/1.1/includes/content/project.inc
releases/1.1/includes/content/settings.inc
releases/1.1/includes/content/summary.inc
releases/1.1/includes/content/tags.inc
releases/1.1/includes/content/todo.inc
releases/1.1/includes/content.inc
releases/1.1/includes/extern.inc
releases/1.1/includes/help/lost_password.inc
releases/1.1/includes/help.inc
releases/1.1/includes/login.inc
releases/1.1/includes/setup/1.inc
releases/1.1/includes/setup/2.inc
releases/1.1/includes/setup/3.inc
releases/1.1/includes/setup/4.inc
releases/1.1/includes/setup/5.inc
releases/1.1/includes/setup.inc
releases/1.1/lib/_unitTests_/cs-arrayToPath_tests.php
releases/1.1/lib/_unitTests_/cs-content_tests.php
releases/1.1/lib/_unitTests_/cs-phpxml_tests.php
releases/1.1/lib/_unitTests_/data/test.xml
releases/1.1/lib/adminUserClass.php
releases/1.1/lib/attributeClass.php
releases/1.1/lib/globalFunctions.php
releases/1.1/lib/logsClass.php
releases/1.1/lib/mainRecordClass.php
releases/1.1/lib/noteClass.php
releases/1.1/lib/prefClass.php
releases/1.1/lib/projectClass.php
releases/1.1/lib/recordContactLink.class.php
releases/1.1/lib/sessionCacheClass.php
releases/1.1/lib/session_class.php
releases/1.1/lib/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE
releases/1.1/lib/simpletest/LICENSE
releases/1.1/lib/simpletest/README
releases/1.1/lib/simpletest/VERSION
releases/1.1/lib/simpletest/authentication.php
releases/1.1/lib/simpletest/autorun.php
releases/1.1/lib/simpletest/browser.php
releases/1.1/lib/simpletest/collector.php
releases/1.1/lib/simpletest/compatibility.php
releases/1.1/lib/simpletest/cookies.php
releases/1.1/lib/simpletest/default_reporter.php
releases/1.1/lib/simpletest/detached.php
releases/1.1/lib/simpletest/docs/en/authentication_documentation.html
releases/1.1/lib/simpletest/docs/en/browser_documentation.html
releases/1.1/lib/simpletest/docs/en/docs.css
releases/1.1/lib/simpletest/docs/en/expectation_documentation.html
releases/1.1/lib/simpletest/docs/en/form_testing_documentation.html
releases/1.1/lib/simpletest/docs/en/group_test_documentation.html
releases/1.1/lib/simpletest/docs/en/index.html
releases/1.1/lib/simpletest/docs/en/mock_objects_documentation.html
releases/1.1/lib/simpletest/docs/en/overview.html
releases/1.1/lib/simpletest/docs/en/partial_mocks_documentation.html
releases/1.1/lib/simpletest/docs/en/reporter_documentation.html
releases/1.1/lib/simpletest/docs/en/unit_test_documentation.html
releases/1.1/lib/simpletest/docs/en/web_tester_documentation.html
releases/1.1/lib/simpletest/docs/fr/authentication_documentation.html
releases/1.1/lib/simpletest/docs/fr/browser_documentation.html
releases/1.1/lib/simpletest/docs/fr/docs.css
releases/1.1/lib/simpletest/docs/fr/expectation_documentation.html
releases/1.1/lib/simpletest/docs/fr/form_testing_documentation.html
releases/1.1/lib/simpletest/docs/fr/group_test_documentation.html
releases/1.1/lib/simpletest/docs/fr/index.html
releases/1.1/lib/simpletest/docs/fr/mock_objects_documentation.html
releases/1.1/lib/simpletest/docs/fr/overview.html
releases/1.1/lib/simpletest/docs/fr/partial_mocks_documentation.html
releases/1.1/lib/simpletest/docs/fr/reporter_documentation.html
releases/1.1/lib/simpletest/docs/fr/server_stubs_documentation.html
releases/1.1/lib/simpletest/docs/fr/unit_test_documentation.html
releases/1.1/lib/simpletest/docs/fr/web_tester_documentation.html
releases/1.1/lib/simpletest/dumper.php
releases/1.1/lib/simpletest/eclipse.php
releases/1.1/lib/simpletest/encoding.php
releases/1.1/lib/simpletest/errors.php
releases/1.1/lib/simpletest/exceptions.php
releases/1.1/lib/simpletest/expectation.php
releases/1.1/lib/simpletest/extensions/pear_test_case.php
releases/1.1/lib/simpletest/extensions/phpunit_test_case.php
releases/1.1/lib/simpletest/extensions/testdox/test.php
releases/1.1/lib/simpletest/extensions/testdox.php
releases/1.1/lib/simpletest/form.php
releases/1.1/lib/simpletest/frames.php
releases/1.1/lib/simpletest/http.php
releases/1.1/lib/simpletest/invoker.php
releases/1.1/lib/simpletest/mock_objects.php
releases/1.1/lib/simpletest/page.php
releases/1.1/lib/simpletest/parser.php
releases/1.1/lib/simpletest/reflection_php4.php
releases/1.1/lib/simpletest/reflection_php5.php
releases/1.1/lib/simpletest/remote.php
releases/1.1/lib/simpletest/reporter.php
releases/1.1/lib/simpletest/scorer.php
releases/1.1/lib/simpletest/selector.php
releases/1.1/lib/simpletest/shell_tester.php
releases/1.1/lib/simpletest/simpletest.php
releases/1.1/lib/simpletest/socket.php
releases/1.1/lib/simpletest/tag.php
releases/1.1/lib/simpletest/test_case.php
releases/1.1/lib/simpletest/unit_tester.php
releases/1.1/lib/simpletest/url.php
releases/1.1/lib/simpletest/user_agent.php
releases/1.1/lib/simpletest/web_tester.php
releases/1.1/lib/simpletest/xml.php
releases/1.1/lib/site_config.php
releases/1.1/lib/tagClass.php
releases/1.1/lib/todoClass.php
releases/1.1/lib/upgradeClass.php
releases/1.1/lib/userClass.php
releases/1.1/public_html/.htaccess
releases/1.1/public_html/content
releases/1.1/public_html/css/common.css
releases/1.1/public_html/extern
releases/1.1/public_html/help
releases/1.1/public_html/images/index.html
releases/1.1/public_html/index.php
releases/1.1/public_html/js/builder.js
releases/1.1/public_html/js/controls.js
releases/1.1/public_html/js/cs-project.js
releases/1.1/public_html/js/dragdrop.js
releases/1.1/public_html/js/effects.js
releases/1.1/public_html/js/prototype.js
releases/1.1/public_html/js/scriptaculous.js
releases/1.1/public_html/js/slider.js
releases/1.1/public_html/js/unittest.js
releases/1.1/public_html/login.php
releases/1.1/public_html/setup
releases/1.1/templates/content/contacts/index.content.tmpl
releases/1.1/templates/content/contacts/view.content.tmpl
releases/1.1/templates/content/helpdesk/create.content.tmpl
releases/1.1/templates/content/helpdesk/index.content.tmpl
releases/1.1/templates/content/helpdesk/view.content.tmpl
releases/1.1/templates/content/index.content.tmpl
releases/1.1/templates/content/notes/index.shared.tmpl
releases/1.1/templates/content/project/create.content.tmpl
releases/1.1/templates/content/project/index.content.tmpl
releases/1.1/templates/content/project/view/index.content.tmpl
releases/1.1/templates/content/project/view/related_issue.content.tmpl
releases/1.1/templates/content/project/view/related_note.content.tmpl
releases/1.1/templates/content/project/view/related_todo.content.tmpl
releases/1.1/templates/content/settings/index.content.tmpl
releases/1.1/templates/content/summary/index.content.tmpl
releases/1.1/templates/content/tags/shared.content.tmpl
releases/1.1/templates/content/todo/create.content.tmpl
releases/1.1/templates/content/todo/view.content.tmpl
releases/1.1/templates/email/helpdesk-new.tmpl
releases/1.1/templates/email/helpdesk-remark.tmpl
releases/1.1/templates/email/lost_password.tmpl
releases/1.1/templates/extern/helpdesk/create.content.tmpl
releases/1.1/templates/extern/helpdesk/index.content.tmpl
releases/1.1/templates/extern/helpdesk/view.content.tmpl
releases/1.1/templates/footer.shared.tmpl
releases/1.1/templates/header.shared.tmpl
releases/1.1/templates/index.content.tmpl
releases/1.1/templates/infobar.shared.tmpl
releases/1.1/templates/login.tmpl
releases/1.1/templates/main.shared.tmpl
releases/1.1/templates/setup/1.content.tmpl
releases/1.1/templates/setup/2.content.tmpl
releases/1.1/templates/setup/3.content.tmpl
releases/1.1/templates/setup/4.content.tmpl
releases/1.1/templates/setup/5.content.tmpl
releases/1.1/templates/setup/html_title.shared.tmpl
releases/1.1/templates/setup/index.content.tmpl
releases/1.1/templates/setup/stepData.shared.tmpl
releases/1.1/templates/system/404.shared.tmpl
releases/1.1/templates/system/message_box.tmpl
releases/1.1/templates/tabs.shared.tmpl
releases/1.1/upgrade/upgrade.xml
releases/1.1/upgrade/upgradeTo1.1.0-BETA10.php
releases/1.1/upgrade/upgradeTo1.1.0-BETA12.php
releases/1.1/upgrade/upgradeTo1.1.0-BETA13.php
releases/1.1/upgrade/upgradeTo1.1.0-BETA2.php
releases/1.1/upgrade/upgradeTo1.1.0-BETA3.php
releases/1.1/upgrade/upgradeTo1.1.0-BETA4.php
releases/1.1/upgrade/upgradeTo1.1.0-BETA7.php
Property changes on: releases/1.1/LICENSE
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: releases/1.1/VERSION
===================================================================
--- releases/1.1/VERSION 2007-11-21 17:42:49 UTC (rev 659)
+++ releases/1.1/VERSION 2007-11-21 18:08:22 UTC (rev 660)
@@ -1,4 +1,4 @@
-$Id$
+$Id:VERSION 628 2007-11-20 16:58:45Z crazedsanity $
-VERSION: 1.1.0-BETA13
-$HeadURL$
+VERSION: 1.1.0-BETA14
+$HeadURL:https://cs-project.svn.sourceforge.net/svnroot/cs-project/trunk/VERSION $
Property changes on: releases/1.1/VERSION
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: releases/1.1/docs/sql/setup/01__storedprocs.sql
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: releases/1.1/docs/sql/setup/02__tables.sql
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: releases/1.1/docs/sql/setup/03__indexes_etc.sql
===================================================================
--- releases/1.1/docs/sql/setup/03__indexes_etc.sql 2007-11-21 17:42:49 UTC (rev 659)
+++ releases/1.1/docs/sql/setup/03__indexes_etc.sql 2007-11-21 18:08:22 UTC (rev 660)
@@ -1,8 +1,8 @@
--
-- SVN INFORMATION:::
-- SVN Signature: $Id:::: 03__indexes_etc.sql 253 2007-09-29 19:48:37Z crazedsanity $
--- Last Committted Date:: $Date$
--- Last Committed Path::: $HeadURL$
+-- Last Committted Date:: $Date:2007-11-20 11:02:38 -0600 (Tue, 20 Nov 2007) $
+-- Last Committed Path::: $HeadURL:https://cs-project.svn.sourceforge.net/svnroot/cs-project/trunk/docs/sql/setup/03__indexes_etc.sql $
--
--
Property changes on: releases/1.1/docs/sql/setup/03__indexes_etc.sql
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: releases/1.1/docs/sql/upgrades/upgradeTo1.1.0-BETA14.sql (from rev 659, trunk/docs/sql/upgrades/upgradeTo1.1.0-BETA14.sql)
===================================================================
--- releases/1.1/docs/sql/upgrades/upgradeTo1.1.0-BETA14.sql (rev 0)
+++ releases/1.1/docs/sql/upgrades/upgradeTo1.1.0-BETA14.sql 2007-11-21 18:08:22 UTC (rev 660)
@@ -0,0 +1,13 @@
+--
+-- SVN INFORMATION:::
+--
+-- SVN Signature::::::: $Id$
+-- Last Committted::::: $Date$
+-- Last Committed Path: $HeadURL$
+--
+
+
+ALTER TABLE tag_name_table ADD COLUMN modifier int;
+UPDATE tag_name_table SET modifier = -1;
+ALTER TABLE tag_name_table ALTER COLUMN modifier SET DEFAULT -1;
+ALTER TABLE tag_name_table ALTER COLUMN modifier SET NOT NULL;
Property changes on: releases/1.1/docs/sql/upgrades/upgradeTo1.1.0-BETA14.sql
___________________________________________________________________
Name: svn:keywords
+ Id
HeadURL
Date
Revision
Author
Name: svn:eol-style
+ native
Modified: releases/1.1/docs/sql/upgrades/upgradeTo1.1.0-BETA3_part1.sql
===================================================================
--- releases/1.1/docs/sql/upgrades/upgradeTo1.1.0-BETA3_part1.sql 2007-11-21 17:42:49 UTC (rev 659)
+++ releases/1.1/docs/sql/upgrades/upgradeTo1.1.0-BETA3_part1.sql 2007-11-21 18:08:22 UTC (rev 660)
@@ -1,8 +1,8 @@
--
-- SVN INFORMATION:::
--- SVN Signature::::::: $Id$
--- Last Committted::::: $Date$
--- Last Committed Path: $HeadURL$
+-- SVN Signature::::::: $Id:upgradeTo1.1.0-BETA3_part1.sql 443 2007-10-24 16:56:31Z crazedsanity $
+-- Last Committted::::: $Date:2007-10-24 11:56:31 -0500 (Wed, 24 Oct 2007) $
+-- Last Committed Path: $HeadURL:https://cs-project.svn.sourceforge.net/svnroot/cs-project/trunk/docs/sql/upgrades/upgradeTo1.1.0-BETA3_part1.sql $
--
ALTER TABLE contact_table
Property changes on: releases/1.1/includes/content/contacts.inc
___________________________________________________________________
Name: svn:eol-style
-
+ native
Modified: releases/1.1/includes/content/helpdesk.inc
===================================================================
--- releases/1.1/includes/content/helpdesk.inc 2007-11-21 17:42:49 UTC (rev 659)
+++ releases/1.1/includes/content/helpdesk.inc 2007-11-21 18:08:22 UTC (rev 660)
@@ -2,10 +2,10 @@
/*
* SVN INFORMATION:::
* ------------------
- * Last Author: $Author$
- * Current Revision: $Revision$
- * Repository Location: $HeadURL$
- * Last Updated: $Date$
+ * Last Author: $Author:crazedsanity $
+ * Current Revision: $Revision:637 $
+ * Repository Location: $HeadURL:https://cs-project.svn.sourceforge.net/svnroot/cs-project/trunk/includes/content/helpdesk.inc $
+ * Last Updated: $Date:2007-11-20 11:04:33 -0600 (Tue, 20 Nov 2007) $
*/
if($_POST) {
$action = strtolower($_POST['action']);
@@ -123,7 +123,7 @@
else {
exit("invalid action: [$action]");
}
- } elseif($_POST['submit'] == "go" && count($_POST['data']) > 1) {
+ } elseif(isset($_POST['submit']) && count($_POST['data']) > 1) {
//CREATING NEW RECORD!!!
$dataArr = $_POST['data'];
$result = $proj->helpdeskObj->create_record($dataArr);
@@ -180,7 +180,7 @@
if(!$byPassUrlExtras && count($urlExtrasArr) > 0) {
$urlExtrasStr = string_from_array($urlExtrasArr, "url");
if($urlExtrasStr !== 0) {
- $url .= "?". $urlExtrasStr;
+ $url .= "?". $urlExtrasStr .'&random='. time();
}
}
conditional_header($url);
@@ -205,7 +205,7 @@
$page->set_all_block_rows("content");
//show the "category" selection.
- $categoryList = $proj->helpdeskObj->get_category_list();
+ $categoryList = $proj->helpdeskObj->get_category_list('bug');
$page->add_template_var("select_tags", $categoryList);
//
Property changes on: releases/1.1/includes/content/helpdesk.inc
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: releases/1.1/includes/content/notes.inc
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: releases/1.1/includes/content/project.inc
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: releases/1.1/includes/content/settings.inc
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: releases/1.1/includes/content/summary.inc
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: releases/1.1/includes/content/tags.inc
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: releases/1.1/includes/content/todo.inc
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: releases/1.1/includes/content.inc
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: releases/1.1/includes/extern/helpdesk.inc
===================================================================
--- releases/1.1/includes/extern/helpdesk.inc 2007-11-21 17:42:49 UTC (rev 659)
+++ releases/1.1/includes/extern/helpdesk.inc 2007-11-21 18:08:22 UTC (rev 660)
@@ -1,296 +1,296 @@
-<?php
-/*
- *
- * SVN INFORMATION:::
- * ------------------
- * Last Author::::::::: $Author$
- * Current Revision:::: $Revision$
- * Repository Location: $HeadURL$
- * Last Updated:::::::: $Date$
-
- */
-
-$page->set_all_block_rows("header");
-
-$myContactId = $page->session->get_cookie('CS_CONTACT_ID');
-
-if($_POST) {
- $postAction = strtolower($_POST['action']);
- if($postAction == "remark") {
- $helpdeskId = $_POST['ID'];
-
- if(is_numeric($helpdeskId)) {
- //now check to make sure they can actually remark on it...
- $helpdeskData = $proj->helpdeskObj->get_record($helpdeskId);
-
- if(is_array($helpdeskData)) {
- //okay, so they can still remark.
-
- //get information about the user based on the email address...
- if(strlen($_POST['email'])) {
- $contactObj = new contactClass($proj->db);
- $myContactId = $contactObj->get_contact_id_from_email($_POST['email'], TRUE);
- $page->session->create_cookie('CS_CONTACT_ID', $myContactId);
-
- //Add "contact_id" to the session, so the note gets created properly.
- $_SESSION['contact_id'] = $myContactId;
- }
-
- $result = $proj->helpdeskObj->remark($helpdeskId, $_POST['remark']);
-
- //now tell 'em what happened.
- if($result >= 1) {
- set_message_wrapper(array(
- "title" => "Remark Accepted",
- "message" => "Your remark has been added to the database. Thank you for your feedback.",
- "type" => "status"
- ));
- }
- else {
- set_message_wrapper(array(
- "title" => "Remark Failed",
- "message" => "Seems like the issue may have been updated in the interim: check your email for a new link to be used for remarking.",
- "type" => "error"
- ));
- }
- }
- else {
- //not an array. Something screwed up in the session?
- set_message_wrapper(array(
- "title" => "Unable to retrieve issue data",
- "message" => "Something went horribly wrong. Tell somebody, would ya?",
- "type" => "error"
- ));
- }
- conditional_header("/extern/helpdesk/view?ID=$helpdeskId");
- exit;
- }
- else {
- //hmmm... invalid ID.
- set_message_wrapper(array(
- "title" => "Data Error",
- "message" => "Unable to retrieve the helpdesk issue's ID.<BR>\n" .
- "Remarking failed.",
- "type" => "error"
- ));
- conditional_header("/extern/helpdesk/");
- exit;
- }
- }
- elseif($_POST && strtolower($_POST['submit']) == "go" && !isset($_POST['action'])) {
- //they're CREATING an issue.
- $result = $proj->helpdeskObj->create_record($_POST['data']);
-
- //first, determine what happened from the result...
- if($result > 0) {
- //everything worked.
- set_message_wrapper(array(
- "title" => "Issue Successfully Created",
- "message" => "Your issue has been added to the helpdesk. You should receive an email shortly with confirmation.",
- "type" => "notice"
- ));
- }
- else {
- //something failed.
- set_message_wrapper(array(
- "title" => "Unable to Create Issue",
- "message" => "Something broke. Sorry.",
- "type" => "notice"
- ));
- }
-
- //send 'em packing.
- conditional_header("/extern/helpdesk/view?ID=$result");
- exit;
- }
- elseif($_POST['action'] == "filter") {
- if($_POST['reset_filter']) {
- $page->ui->unset_cache("filter");
- }
- else {
- //store the filter.
- $page->ui->set_cache("filter", $_POST['filter']);
- }
-
- //now redirect to the main page: it'll have to pull that filter data & use it.
- conditional_header($_GLOBALS['PHP_SELF'] ."?step=kb&from=filter");
- exit;
- }
-}
-else {
- $action = $page->ftsSections[2];
- $helpdeskId = $_GET['ID'];
- $page->add_template_var("id", $helpdeskId);
- if(isset($_GET['sort'])) {
- store_and_return_sorting($page, $_GET['sort'], $_GET['sortType']);
- conditional_header($GLOBALS['PHP_SELF'] ."?from=re-sort&sortFieldWas=". $_GET['sort']);
- exit;
- }
- elseif($action == 'view' && $_GET['dropCookie']) {
- $page->session->drop_cookie('CS_CONTACT_ID');
- $goHere = $_SERVER['PHP_SELF'] .'?ID='. $_GET['ID'] .'&random='. time();
- $page->conditional_header($goHere, TRUE);
- }
- elseif(($action == "view" || $action == "respond") && is_numeric($helpdeskId)) {
- $htmlTitle = "View Issue #$helpdeskId";
- $helpdeskData = $proj->helpdeskObj->get_record($helpdeskId);
-
- $bbCodeParser = new bbCodeParser($proj, $proj->helpdeskObj);
-
- //show it's "access" properly..
- $page->add_template_var("select_acc_". $helpdeskData['acc'], "selected");
-
- //convert the returned data into htmlentities so brackets show properly.
- $helpdeskData['name'] = cleanString($helpdeskData['name'], "htmlspecial");
- $myNotes = $helpdeskData['notes'];
- unset($helpdeskData['notes']);
-
- //make the wrapping SANE.
- $helpdeskData['subject'] = wordwrap($helpdeskData['subject'], FORMAT_WORDWRAP);
- $helpdeskData['subject'] = $bbCodeParser->parseString($helpdeskData['subject'],FALSE);
-
- //add everything to the page as a template var...
- foreach($helpdeskData as $field=>$value) {
- $page->add_template_var($field, $value);
- }
-
- //remove all block rows unless they're supposed to be kept...
- $doNotRipRows = array();
- if(is_numeric($page->session->get_cookie('CS_CONTACT_ID'))) {
- $doNotRipRows[] = 'remark_showEmail';
- $contactObj = new contactClass($page->db);
- $contactObj->set_contact_id($page->session->get_cookie('CS_CONTACT_ID'));
- $data = $contactObj->get_contact();
- $page->add_template_var('displayEmail', $data['email']);
- }
- else {
- $doNotRipRows[] = 'remark_editEmail';
- }
-
- if(in_array($helpdeskData['status_id'], $GLOBALS['STATUS_NOTENDED'])) {
- $doNotRipRows[] = 'remark_row';
- }
- $page->set_all_block_rows("content", $doNotRipRows);
-
- //now parse the note rows.
- if(is_array($myNotes) && count($myNotes)) {
- $baseRow = $page->templateRows['issueNotes'];
- foreach($myNotes as $repArr) {
- $repArr['body'] = cleanString($repArr['body'], "htmlentity_plus_brackets");
- $repArr['body'] = $bbCodeParser->parseString($repArr['body'], FALSE);
- $repArr['subject'] = cleanString($repArr['subject'], "htmlentity_plus_brackets");
-
- $repArr['solutionIndicator'] = "";
- if($repArr['is_solution'] == 't') {
- $repArr['solutionIndicator'] = "<img src='/images/checkmark_green.jpg' height='14px'>";
- }
- $issueNotesRow .= mini_parser($baseRow, $repArr, '%%', '%%');
- }
- $page->add_template_var('issueNotes', $issueNotesRow);
- }
-
- }
- elseif($action == "create") {
- //set the html title.
- $page->add_template_var("html_title", "Create a Helpdesk Issue");
- $page->add_template_var("email", $_SESSION['email']);
- $page->set_all_block_rows("content", array("create_form"));
-
+<?php
+/*
+ *
+ * SVN INFORMATION:::
+ * ------------------
+ * Last Author::::::::: $Author$
+ * Current Revision:::: $Revision$
+ * Repository Location: $HeadURL$
+ * Last Updated:::::::: $Date$
+
+ */
+
+$page->set_all_block_rows("header");
+
+$myContactId = $page->session->get_cookie('CS_CONTACT_ID');
+
+if($_POST) {
+ $postAction = strtolower($_POST['action']);
+ if($postAction == "remark") {
+ $helpdeskId = $_POST['ID'];
+
+ if(is_numeric($helpdeskId)) {
+ //now check to make sure they can actually remark on it...
+ $helpdeskData = $proj->helpdeskObj->get_record($helpdeskId);
+
+ if(is_array($helpdeskData)) {
+ //okay, so they can still remark.
+
+ //get information about the user based on the email address...
+ if(strlen($_POST['email'])) {
+ $contactObj = new contactClass($proj->db);
+ $myContactId = $contactObj->get_contact_id_from_email($_POST['email'], TRUE);
+ $page->session->create_cookie('CS_CONTACT_ID', $myContactId);
+
+ //Add "contact_id" to the session, so the note gets created properly.
+ $_SESSION['contact_id'] = $myContactId;
+ }
+
+ $result = $proj->helpdeskObj->remark($helpdeskId, $_POST['remark']);
+
+ //now tell 'em what happened.
+ if($result >= 1) {
+ set_message_wrapper(array(
+ "title" => "Remark Accepted",
+ "message" => "Your remark has been added to the database. Thank you for your feedback.",
+ "type" => "status"
+ ));
+ }
+ else {
+ set_message_wrapper(array(
+ "title" => "Remark Failed",
+ "message" => "Seems like the issue may have been updated in the interim: check your email for a new link to be used for remarking.",
+ "type" => "error"
+ ));
+ }
+ }
+ else {
+ //not an array. Something screwed up in the session?
+ set_message_wrapper(array(
+ "title" => "Unable to retrieve issue data",
+ "message" => "Something went horribly wrong. Tell somebody, would ya?",
+ "type" => "error"
+ ));
+ }
+ conditional_header("/extern/helpdesk/view?ID=$helpdeskId");
+ exit;
+ }
+ else {
+ //hmmm... invalid ID.
+ set_message_wrapper(array(
+ "title" => "Data Error",
+ "message" => "Unable to retrieve the helpdesk issue's ID.<BR>\n" .
+ "Remarking failed.",
+ "type" => "error"
+ ));
+ conditional_header("/extern/helpdesk/");
+ exit;
+ }
+ }
+ elseif($_POST && strtolower($_POST['submit']) == "go" && !isset($_POST['action'])) {
+ //they're CREATING an issue.
+ $result = $proj->helpdeskObj->create_record($_POST['data']);
+
+ //first, determine what happened from the result...
+ if($result > 0) {
+ //everything worked.
+ set_message_wrapper(array(
+ "title" => "Issue Successfully Created",
+ "message" => "Your issue has been added to the helpdesk. You should receive an email shortly with confirmation.",
+ "type" => "notice"
+ ));
+ }
+ else {
+ //something failed.
+ set_message_wrapper(array(
+ "title" => "Unable to Create Issue",
+ "message" => "Something broke. Sorry.",
+ "type" => "notice"
+ ));
+ }
+
+ //send 'em packing.
+ conditional_header("/extern/helpdesk/view?ID=$result");
+ exit;
+ }
+ elseif($_POST['action'] == "filter") {
+ if($_POST['reset_filter']) {
+ $page->ui->unset_cache("filter");
+ }
+ else {
+ //store the filter.
+ $page->ui->set_cache("filter", $_POST['filter']);
+ }
+
+ //now redirect to the main page: it'll have to pull that filter data & use it.
+ conditional_header($_GLOBALS['PHP_SELF'] ."?step=kb&from=filter");
+ exit;
+ }
+}
+else {
+ $action = $page->ftsSections[2];
+ $helpdeskId = $_GET['ID'];
+ $page->add_template_var("id", $helpdeskId);
+ if(isset($_GET['sort'])) {
+ store_and_return_sorting($page, $_GET['sort'], $_GET['sortType']);
+ conditional_header($GLOBALS['PHP_SELF'] ."?from=re-sort&sortFieldWas=". $_GET['sort']);
+ exit;
+ }
+ elseif($action == 'view' && $_GET['dropCookie']) {
+ $page->session->drop_cookie('CS_CONTACT_ID');
+ $goHere = $_SERVER['PHP_SELF'] .'?ID='. $_GET['ID'] .'&random='. time();
+ $page->conditional_header($goHere, TRUE);
+ }
+ elseif(($action == "view" || $action == "respond") && is_numeric($helpdeskId)) {
+ $htmlTitle = "View Issue #$helpdeskId";
+ $helpdeskData = $proj->helpdeskObj->get_record($helpdeskId);
+
+ $bbCodeParser = new bbCodeParser($proj, $proj->helpdeskObj);
+
+ //show it's "access" properly..
+ $page->add_template_var("select_acc_". $helpdeskData['acc'], "selected");
+
+ //convert the returned data into htmlentities so brackets show properly.
+ $helpdeskData['name'] = cleanString($helpdeskData['name'], "htmlspecial");
+ $myNotes = $helpdeskData['notes'];
+ unset($helpdeskData['notes']);
+
+ //make the wrapping SANE.
+ $helpdeskData['subject'] = wordwrap($helpdeskData['subject'], FORMAT_WORDWRAP);
+ $helpdeskData['subject'] = $bbCodeParser->parseString($helpdeskData['subject'],FALSE);
+
+ //add everything to the page as a template var...
+ foreach($helpdeskData as $field=>$value) {
+ $page->add_template_var($field, $value);
+ }
+
+ //remove all block rows unless they're supposed to be kept...
+ $doNotRipRows = array();
+ if(is_numeric($page->session->get_cookie('CS_CONTACT_ID'))) {
+ $doNotRipRows[] = 'remark_showEmail';
+ $contactObj = new contactClass($page->db);
+ $contactObj->set_contact_id($page->session->get_cookie('CS_CONTACT_ID'));
+ $data = $contactObj->get_contact();
+ $page->add_template_var('displayEmail', $data['email']);
+ }
+ else {
+ $doNotRipRows[] = 'remark_editEmail';
+ }
+
+ if(in_array($helpdeskData['status_id'], $GLOBALS['STATUS_NOTENDED'])) {
+ $doNotRipRows[] = 'remark_row';
+ }
+ $page->set_all_block_rows("content", $doNotRipRows);
+
+ //now parse the note rows.
+ if(is_array($myNotes) && count($myNotes)) {
+ $baseRow = $page->templateRows['issueNotes'];
+ foreach($myNotes as $repArr) {
+ $repArr['body'] = cleanString($repArr['body'], "htmlentity_plus_brackets");
+ $repArr['body'] = $bbCodeParser->parseString($repArr['body'], FALSE);
+ $repArr['subject'] = cleanString($repArr['subject'], "htmlentity_plus_brackets");
+
+ $repArr['solutionIndicator'] = "";
+ if($repArr['is_solution'] == 't') {
+ $repArr['solutionIndicator'] = "<img src='/images/checkmark_green.jpg' height='14px'>";
+ }
+ $issueNotesRow .= mini_parser($baseRow, $repArr, '%%', '%%');
+ }
+ $page->add_template_var('issueNotes', $issueNotesRow);
+ }
+
+ }
+ elseif($action == "create") {
+ //set the html title.
+ $page->add_template_var("html_title", "Create a Helpdesk Issue");
+ $page->add_template_var("email", $_SESSION['email']);
+ $page->set_all_block_rows("content", array("create_form"));
+
//show the "category" properly.
- $categoryList = $proj->helpdeskObj->get_category_list($helpdeskData['helpdesk_cat_id']);
+ $categoryList = $proj->helpdeskObj->get_category_list($helpdeskData['helpdesk_cat_id']);
$page->add_template_var("select_category_list", $categoryList);
- $page->add_template_var("select_tags", $categoryList);
+ $page->add_template_var("select_tags", $categoryList);
$page->add_template_var("id", $helpdeskId);
- }
- else {
-
- //================================================================================================================
- $titleSub = "Show All";
- //change the content of the page properly.
- #$page->change_content(html_file_to_string("modules/helpdesk/helpdesk_main.tmpl"));
- $page->set_all_block_rows("content", array("helpdesk_search"));
-
- $filterData = $page->ui->get_cache("filter");
- $currentSortArr = store_and_return_sorting($page,NULL,NULL);
- if(is_array($filterData)) {
- $page->add_template_var("filter_keyword", $filterData['keyword']);
- $page->add_template_var("filter_field_". $filterData['field'] ."_selected", "selected");
- }
- else {
- //no filter array... set one.
- $filterData = array();
- $page->ui->set_cache("filter", $filterData);
- }
- $page->add_template_var("filter_status_id_". $filterData['status_id'] ."_selected", "selected");
- unset($filterData['status']);
-
- //the data will already show only items with the given status, so don't add that to the filter again.
- $primaryFilterArr = array("status_id" => $filterData['status_id']);
- if($filterData['status_id'] == 'all') {
- //literally show ALL records.
- $primaryFilterArr = NULL;
- }
- elseif(!is_numeric($filterData['status_id'])) {
- //only show the "not ended" ones.
- $primaryFilterArr = array('status_id' => array(0,1,2,6));
- }
- $filter = $filterData;
- unset($filter['status']);
-
- //pull the recordset.
- $helpdeskArr = $proj->helpdeskObj->get_records($primaryFilterArr, $currentSortArr, $filter);
- $page->add_template_var("numRows", count($helpdeskArr));
-
- //if there's an array, show it...
- if(is_array($helpdeskArr) && count($helpdeskArr) > 0) {
- //got good data.
- $baseRow = $page->templateRows['helpdesk_row'];
- foreach($helpdeskArr as $helpdeskId=>$subData) {
- unset($deleteLink);
- if($subData['von'] == $_SESSION['uid']) {
- $deleteLink = mini_parser($baseDeleteLink, $subData, "%%", "%%");
- }
-
-
- swapValue($bgColor, "rgb(213, 213, 213)", "rgb(194, 194, 194)");
- swapValue($bgColor2, "#d5d5d5", "#c2c2c2");
-
- $subData['bgColor'] = $bgColor;
- $subData['bgColor2']= $bgColor2;
-
- //define the text fields, so they can be cleaned & truncated.
- $previewLength = 160;
- $textFieldArr = array("name", "subject", "solution", "remark");
- foreach($textFieldArr as $cleanThisField) {
- //truncate them...
- $subData[$cleanThisField] = truncate_string($subData[$cleanThisField], $previewLength, "... [more]", TRUE);
-
- //now clean 'em (clean after to avoid truncating html special characters.
- $subData[$cleanThisField] = cleanString($subData[$cleanThisField], "htmlentity");
-
- //more special parsing to ensure GenericPage{} doesn't make the $ (and random characters after it) disappear.
- $subData[$cleanThisField] = str_replace('$', '\$', $subData[$cleanThisField]);
- }
-
- //force the "text" preview to wrap.
- $subData['subject'] = wordwrap($subData['subject'], (($previewLength * 2)/3), "\n", 1);
-
- //truncate the email address...
- $subData['email'] = truncate_string($subData['email'], 20, "...", TRUE);
-
- $subData['helpdesk_id'] = $helpdeskId;
- unset($subData['id']);
-
- //show the "created" and "updated" strings properly...
- $subData['created'] = parse_date_string($subData['div1'],TRUE);
- $subData['updated'] = parse_date_string($subData['div2'],TRUE);
- $finalRow .= mini_parser($baseRow, $subData, "%%", "%%");
- }
- $page->add_template_var("helpdesk_row", $finalRow);
- }
- }
-}
-
-#$page->print_page();
-
-?>
\ No newline at end of file
+ }
+ else {
+
+ //================================================================================================================
+ $titleSub = "Show All";
+ //change the content of the page properly.
+ #$page->change_content(html_file_to_string("modules/helpdesk/helpdesk_main.tmpl"));
+ $page->set_all_block_rows("content", array("helpdesk_search"));
+
+ $filterData = $page->ui->get_cache("filter");
+ $currentSortArr = store_and_return_sorting($page,NULL,NULL);
+ if(is_array($filterData)) {
+ $page->add_template_var("filter_keyword", $filterData['keyword']);
+ $page->add_template_var("filter_field_". $filterData['field'] ."_selected", "selected");
+ }
+ else {
+ //no filter array... set one.
+ $filterData = array();
+ $page->ui->set_cache("filter", $filterData);
+ }
+ $page->add_template_var("filter_status_id_". $filterData['status_id'] ."_selected", "selected");
+ unset($filterData['status']);
+
+ //the data will already show only items with the given status, so don't add that to the filter again.
+ $primaryFilterArr = array("status_id" => $filterData['status_id']);
+ if($filterData['status_id'] == 'all') {
+ //literally show ALL records.
+ $primaryFilterArr = NULL;
+ }
+ elseif(!is_numeric($filterData['status_id'])) {
+ //only show the "not ended" ones.
+ $primaryFilterArr = array('status_id' => array(0,1,2,6));
+ }
+ $filter = $filterData;
+ unset($filter['status']);
+
+ //pull the recordset.
+ $helpdeskArr = $proj->helpdeskObj->get_records($primaryFilterArr, $currentSortArr, $filter);
+ $page->add_template_var("numRows", count($helpdeskArr));
+
+ //if there's an array, show it...
+ if(is_array($helpdeskArr) && count($helpdeskArr) > 0) {
+ //got good data.
+ $baseRow = $page->templateRows['helpdesk_row'];
+ foreach($helpdeskArr as $helpdeskId=>$subData) {
+ unset($deleteLink);
+ if($subData['von'] == $_SESSION['uid']) {
+ $deleteLink = mini_parser($baseDeleteLink, $subData, "%%", "%%");
+ }
+
+
+ swapValue($bgColor, "rgb(213, 213, 213)", "rgb(194, 194, 194)");
+ swapValue($bgColor2, "#d5d5d5", "#c2c2c2");
+
+ $subData['bgColor'] = $bgColor;
+ $subData['bgColor2']= $bgColor2;
+
+ //define the text fields, so they can be cleaned & truncated.
+ $previewLength = 160;
+ $textFieldArr = array("name", "subject", "solution", "remark");
+ foreach($textFieldArr as $cleanThisField) {
+ //truncate them...
+ $subData[$cleanThisField] = truncate_string($subData[$cleanThisField], $previewLength, "... [more]", TRUE);
+
+ //now clean 'em (clean after to avoid truncating html special characters.
+ $subData[$cleanThisField] = cleanString($subData[$cleanThisField], "htmlentity");
+
+ //more special parsing to ensure GenericPage{} doesn't make the $ (and random characters after it) disappear.
+ $subData[$cleanThisField] = str_replace('$', '\$', $subData[$cleanThisField]);
+ }
+
+ //force the "text" preview to wrap.
+ $subData['subject'] = wordwrap($subData['subject'], (($previewLength * 2)/3), "\n", 1);
+
+ //truncate the email address...
+ $subData['email'] = truncate_string($subData['email'], 20, "...", TRUE);
+
+ $subData['helpdesk_id'] = $helpdeskId;
+ unset($subData['id']);
+
+ //show the "created" and "updated" strings properly...
+ $subData['created'] = parse_date_string($subData['div1'],TRUE);
+ $subData['updated'] = parse_date_string($subData['div2'],TRUE);
+ $finalRow .= mini_parser($baseRow, $subData, "%%", "%%");
+ }
+ $page->add_template_var("helpdesk_row", $finalRow);
+ }
+ }
+}
+
+#$page->print_page();
+
+?>
Property changes on: releases/1.1/includes/extern.inc
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: releases/1.1/includes/help/lost_password.inc
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: releases/1.1/includes/help.inc
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: releases/1.1/includes/login.inc
===================================================================
--- releases/1.1/includes/login.inc 2007-11-21 17:42:49 UTC (rev 659)
+++ releases/1.1/includes/login.inc 2007-11-21 18:08:22 UTC (rev 660)
@@ -1,63 +1,63 @@
-<?php
-/*
- * SVN INFORMATION:::
- * ------------------
- * Last Author::::::::: $Author$
- * Current Revision:::: $Revision$
- * Repository Location: $HeadURL$
- * Last Updated:::::::: $Date$
- */
-
-
-$page->clear_content("header");
-
-$db = new cs_phpDB;
-$db->connect(get_config_db_params());
-$page->db = &$db;
-
-if(isset($_GET['loginDestination']) && strlen($_GET['loginDestination'])) {
- $_SESSION['loginDestination'] = $_GET['loginDestination'];
-}
-
-if(!$_GET['logout'] && !$_POST && $page->session->sid_check == 1) {
- //they came here & need to be redirected.
- conditional_header("/content?from=login&reason=alreadyLoggedIn");
- exit;
-}
-elseif($_GET['logout']) {
- //call the logout function.
- $res = $page->session->logout();
- conditional_header("/login.php?redirFrom=logout");
- exit;
-}
-elseif($_POST['username'] && $_POST['password']) {
-
-
- $loginRes = $page->session->login($_POST['username'],$_POST['password']);
-
- if($loginRes == 1) {
- //TODO: use their "startmodule" (or whatever it's called) is if nothing specific is requested.
- $goHere = "/content?from=login";
- if(strlen($_SESSION['loginDestination']) && urldecode($_SESSION['loginDestination']) !== '/') {
- //go where they asked.
- $goHere = urldecode($_SESSION['loginDestination']);
- unset($_SESSION['loginDestination']);
- }
- else {
- $prefObj = new pref($page->db, $_SESSION['uid']);
- $startModule = $prefObj->get_pref_value_by_name('startModule');
- $goHere = "/content/". $startModule;
- }
-
- conditional_header($goHere);
- exit;
- }
-}
-
-if($_GET['destination']) {
- $_SESSION['loginDestination'] = urlencode($_GET['destination']);
-}
-//show the default page.
-$page->change_content(html_file_to_string("login.tmpl"));
-
+<?php
+/*
+ * SVN INFORMATION:::
+ * ------------------
+ * Last Author::::::::: $Author$
+ * Current Revision:::: $Revision$
+ * Repository Location: $HeadURL$
+ * Last Updated:::::::: $Date$
+ */
+
+
+$page->clear_content("header");
+
+$db = new cs_phpDB;
+$db->connect(get_config_db_params());
+$page->db = &$db;
+
+if(isset($_GET['loginDestination']) && strlen($_GET['loginDestination'])) {
+ $_SESSION['loginDestination'] = $_GET['loginDestination'];
+}
+
+if(!$_GET['logout'] && !$_POST && $page->session->sid_check == 1) {
+ //they came here & need to be redirected.
+ conditional_header("/content?from=login&reason=alreadyLoggedIn");
+ exit;
+}
+elseif($_GET['logout']) {
+ //call the logout function.
+ $res = $page->session->logout();
+ conditional_header("/login.php?redirFrom=logout");
+ exit;
+}
+elseif($_POST['username'] && $_POST['password']) {
+
+
+ $loginRes = $page->session->login($_POST['username'],$_POST['password']);
+
+ if($loginRes == 1) {
+ //TODO: use their "startmodule" (or whatever it's called) is if nothing specific is requested.
+ $goHere = "/content?from=login";
+ if(strlen($_SESSION['loginDestination']) && urldecode($_SESSION['loginDestination']) !== '/') {
+ //go where they asked.
+ $goHere = urldecode($_SESSION['loginDestination']);
+ unset($_SESSION['loginDestination']);
+ }
+ else {
+ $prefObj = new pref($page->db, $_SESSION['uid']);
+ $startModule = $prefObj->get_pref_value_by_name('startModule');
+ $goHere = "/content/". $startModule;
+ }
+
+ conditional_header($goHere);
+ exit;
+ }
+}
+
+if($_GET['destination']) {
+ $_SESSION['loginDestination'] = urlencode($_GET['destination']);
+}
+//show the default page.
+$page->change_content(html_file_to_string("login.tmpl"));
+
?>
\ No newline at end of file
Property changes on: releases/1.1/includes/login.inc
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: releases/1.1/includes/setup/1.inc
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: releases/1.1/includes/setup/2.inc
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: releases/1.1/includes/setup/3.inc
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: releases/1.1/includes/setup/4.inc
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: releases/1.1/includes/setup/5.inc
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: releases/1.1/includes/setup.inc
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: releases/1.1/lib/_unitTests_/cs-arrayToPath_tests.php
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: releases/1.1/lib/_unitTests_/cs-content_tests.php
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: releases/1.1/lib/_unitTests_/cs-phpxml_tests.php
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: releases/1.1/lib/_unitTests_/data/test.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: releases/1.1/lib/adminUserClass.php
===================================================================
--- releases/1.1/lib/adminUserClass.php 2007-11-21 17:42:49 UTC (rev 659)
+++ releases/1.1/lib/adminUserClass.php 2007-11-21 18:08:22 UTC (rev 660)
@@ -3,11 +3,11 @@
/*
* SVN INFORMATION:::
* ------------------
- * SVN Signature::::::: $Id$
- * Last Author::::::::: $Author$
- * Current Revision:::: $Revision$
- * Repository Location: $HeadURL$
- * Last Updated:::::::: $Date$
+ * SVN Signature::::::: $Id:adminUserClass.php 626 2007-11-20 16:54:11Z crazedsanity $
+ * Last Author::::::::: $Author:crazedsanity $
+ * Current Revision:::: $Revision:626 $
+ * Repository Location: $HeadURL:https://cs-project.svn.sourceforge.net/svnroot/cs-project/trunk/lib/adminUserClass.php $
+ * Last Updated:::::::: $Date:2007-11-20 10:54:11 -0600 (Tue, 20 Nov 2007) $
*/
class adminUserClass extends userClass {
@@ -85,6 +85,7 @@
);
//good to go: encrypt the password.
+ $originalPassword = $data['password'];
$data['password'] = $this->encrypt_pass($data['password'], $contactId);
$sql = "INSERT INTO user_table ". string_from_array($data, 'insert', NULL, $cleanStringArr, TRUE, TRUE);
@@ -107,6 +108,14 @@
//now add the user to the specified group.
$this->add_user_to_group($uid, $data['group_id']);
+
+ //now send an email out to the user to let 'em know.
+ $templateContents = html_file_to_string('email/new_user.tmpl');
+ $repArr = $data;
+ $repArr['uid'] = $retval;
+ $repArr['password'] = $originalPassword;
+ $subject = 'Registration Confirmation ['. $repArr['username'] .']';
+ send_email($data['email'], $subject, $templateContents, $repArr);
}
else {
$details = "Created new user (". $data['username'] .") [NEW ID QUERY FAILED, numrows=(". $this->lastNumrows ."), DBERROR::: ". $this->lastError ."]";
Property changes on: releases/1.1/lib/adminUserClass.php
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: releases/1.1/lib/attributeClass.php
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: releases/1.1/lib/contactClass.php
===================================================================
--- releases/1.1/lib/contactClass.php 2007-11-21 17:42:49 UTC (rev 659)
+++ releases/1.1/lib/contactClass.php 2007-11-21 18:08:22 UTC (rev 660)
@@ -447,15 +447,24 @@
$retval = $data[0];
//before completing, let's create the primary email address.
- $contactObj = new contactClass($this->db);
- $contactObj->set_contact_id($retval);
- $contactObj->create_contact_email($email, TRUE);
- $this->db->commitTrans();
-
- //set the internal contactId.
$this->set_contact_id($retval);
+ $contactEmailId = $this->create_contact_email($email, TRUE);
- $this->logsObj->log_by_class("Created new contact (". $retval .")");
+ //update the contact_email_id on their contact record.
+ $sql = "UPDATE contact_table SET contact_email_id=". $contactEmailId ." WHERE contact_id=". $retval;
+ if(is_numeric($contactEmailId) && $this->run_sql($sql)) {
+ $this->db->commitTrans();
+
+ //set the internal contactId.
+ $this->set_contact_id($retval);
+
+ $this->logsObj->log_by_class("Created new contact (". $retval .")");
+ }
+ else {
+ $this->db->rollbackTrans();
+
+ $this->logsObj->log_by_class(__METHOD__ .": failed to create email for new contact (". $contactEmailId .")");
+ }
}
}
}
Modified: releases/1.1/lib/cs-content/VERSION
===================================================================
--- releases/1.1/lib/cs-content/VERSION 2007-11-21 17:42:49 UTC (rev 659)
+++ releases/1.1/lib/cs-content/VERSION 2007-11-21 18:08:22 UTC (rev 660)
@@ -1,5 +1,5 @@
## Stores the current version of the cs-content system, and it's source. Please do NOT modify this file.
-VERSION: 0.10.4
+VERSION: 0.10.5
PROJECT: cs-content
-$HeadURL: https://cs-content.svn.sourceforge.net/svnroot/cs-content/releases/0.10/VERSION $
\ No newline at end of file
+$HeadURL:https://cs-content.svn.sourceforge.net/svnroot/cs-content/trunk/VERSION $
\ No newline at end of file
Modified: releases/1.1/lib/cs-content/contentSystemClass.php
===================================================================
--- releases/1.1/lib/cs-content/contentSystemClass.php 2007-11-21 17:42:49 UTC (rev 659)
+++ releases/1.1/lib/cs-content/contentSystemClass.php 2007-11-21 18:08:22 UTC (rev 660)
@@ -2,9 +2,9 @@
/*
* FILE INFORMATION:
* $HeadURL: https://cs-content.svn.sourceforge.net/svnroot/cs-content/releases/0.10/contentSystemClass.php $
- * $Id: contentSystemClass.php 214 2007-11-07 17:35:59Z crazedsanity $
- * $LastChangedDate: 2007-11-07 11:35:59 -0600 (Wed, 07 Nov 2007) $
- * $LastChangedRevision: 214 $
+ * $Id: contentSystemClass.php 221 2007-11-21 17:39:01Z crazedsanity $
+ * $LastChangedDate: 2007-11-21 11:39:01 -0600 (Wed, 21 Nov 2007) $
+ * $LastChangedRevision: 221 $
* $LastChangedBy: crazedsanity $
*
* HOW THE SYSTEM WORKS:::
@@ -687,9 +687,8 @@
}
else {
//TODO: make it *actually* die gracefully... the way it works now looks more like puke than grace.
- $this->gfObj->debug_print(__METHOD__ .": something broke. \nDETAILS::: $details" .
+ throw new exception(__METHOD__ .": something broke. \nDETAILS::: $details" .
"\nREASON::: ". $this->reason);
- exit;
}
}//end die_gracefully()
//------------------------------------------------------------------------
Modified: releases/1.1/lib/cs-content/cs_fileSystemClass.php
===================================================================
--- releases/1.1/lib/cs-content/cs_fileSystemClass.php 2007-11-21 17:42:49 UTC (rev 659)
+++ releases/1.1/lib/cs-content/cs_fileSystemClass.php 2007-11-21 18:08:22 UTC (rev 660)
@@ -3,10 +3,10 @@
/*
* FILE INFORMATION:
* $HeadURL: https://cs-content.svn.sourceforge.net/svnroot/cs-content/releases/0.10/cs_fileSystemClass.php $
- * $Id: cs_fileSystemClass.php 214 2007-11-07 17:35:59Z crazedsanity $
- * $LastChangedDate: 2007-11-07 11:35:59 -0600 (Wed, 07 Nov 2007) $
+ * $Id: cs_fileSystemClass.php 221 2007-11-21 17:39:01Z crazedsanity $
+ * $LastChangedDate: 2007-11-21 11:39:01 -0600 (Wed, 21 Nov 2007) $
* $LastChangedBy: crazedsanity $
- * $LastChangedRevision: 214 $
+ * $LastChangedRevision: 221 $
*/
require_once(dirname(__FILE__) ."/cs_globalFunctions.php");
@@ -253,6 +253,7 @@
* can enlighten me, I'd be glad to give them credit.
*/
private function translate_perms($in_Perms) {
+ $sP = "";
$sP .= (($in_Perms & 0x0100) ? 'r' : '-') .
(($in_Perms & 0x0080) ? 'w' : '-') .
(($in_Perms & 0x0040) ? (($in_Perms & 0x0800) ? 's' : 'x' ) :
Modified: releases/1.1/lib/cs-content/cs_genericPageClass.php
===================================================================
--- releases/1.1/lib/cs-content/cs_genericPageClass.php 2007-11-21 17:42:49 UTC (rev 659)
+++ releases/1.1/lib/cs-content/cs_genericPageClass.php 2007-11-21 18:08:22 UTC (rev 660)
@@ -2,10 +2,10 @@
/*
* FILE INFORMATION:
* $HeadURL: https://cs-content.svn.sourceforge.net/svnroot/cs-content/releases/0.10/cs_genericPageClass.php $
- * $Id: cs_genericPageClass.php 172 2007-10-01 16:24:17Z crazedsanity $
- * $LastChangedDate: 2007-10-01 11:24:17 -0500 (Mon, 01 Oct 2007) $
+ * $Id: cs_genericPageClass.php 221 2007-11-21 17:39:01Z crazedsanity $
+ * $LastChangedDate: 2007-11-21 11:39:01 -0600 (Wed, 21 Nov 2007) $
* $LastChangedBy: crazedsanity $
- * $LastChangedRevision: 172 $
+ * $LastChangedRevision: 221 $
*/
require_once(dirname(__FILE__) ."/template.inc");
require_once(dirname(__FILE__) ."/cs_versionAbstract.class.php");
@@ -65,7 +65,7 @@
$this->add_template_var($key, $value);
}
}
- if(is_array($GLOBALS['templateFiles'])) {
+ if(isset($GLOBALS['templateFiles']) && is_array($GLOBALS['templateFiles'])) {
foreach($GLOBALS['templateFiles'] as $key => $value) {
$this->templateFiles[$key] = $value;
}
@@ -257,7 +257,7 @@
if($stripUndefVars) {
$numLoops = 0;
- while(preg_match_all('/\{.*?\}/', $this->templateObj->varvals[out], $tags) && $numLoops < 50) {
+ while(preg_match_all('/\{.*?\}/', $this->templateObj->varvals['out'], $tags) && $numLoops < 50) {
$tags = $tags[0];
//TODO: figure out why this works when running it twice.
@@ -287,7 +287,7 @@
public function process_set_message() {
//if there's not a message set, skip.
$errorBox = $this->file_to_string("system/message_box.tmpl");
- if(is_array($_SESSION['message'])) {
+ if(isset($_SESSION['message']) && is_array($_SESSION['message'])) {
//let's make sure the "type" value is *lowercase*.
$_SESSION['message']['type'] = strtolower($_SESSION['message']['type']);
Modified: releases/1.1/lib/cs-content/cs_globalFunctions.php
===================================================================
--- releases/1.1/lib/cs-content/cs_globalFunctions.php 2007-11-21 17:42:49 UTC (rev 659)
+++ releases/1.1/lib/cs-content/cs_globalFunctions.php 2007-11-21 18:08:22 UTC (rev 660)
@@ -82,6 +82,7 @@
*/
public function string_from_array($array,$style=NULL,$separator=NULL, $cleanString=NULL, $removeEmptyVals=FALSE) {
+ $retval = NULL;
//precheck... if it's not an array, kill it.
if(!is_array($array)) {
return(NULL);
@@ -271,7 +272,7 @@
}
else {
//not an array.
- $retval = 0;
+ $retval = NULL;
}
return($retval);
@@ -660,7 +661,7 @@
foreach($data as $value=>$display) {
//see if it's the value that's been selected.
$selectedString = "";
- if($value == $checkedValue) {
+ if($value == $checkedValue || $display == $checkedValue) {
//yep, it's selected.
$selectedString = " ". $myType;
}
Modified: releases/1.1/lib/cs-content/cs_phpDB.php
===================================================================
--- releases/1.1/lib/cs-content/cs_phpDB.php 2007-11-21 17:42:49 UTC (rev 659)
+++ releases/1.1/lib/cs-content/cs_phpDB.php 2007-11-21 18:08:22 UTC (rev 660)
@@ -4,8 +4,8 @@
* A class for generic PostgreSQL database access.
*
* SVN INFORMATION:::
- * SVN Signature:::::::: $Id: cs_phpDB.php 207 2007-10-31 17:44:42Z crazedsanity $
- * Last Committted Date: $Date: 2007-10-31 12:44:42 -0500 (Wed, 31 Oct 2007) $
+ * SVN Signature:::::::: $Id: cs_phpDB.php 221 2007-11-21 17:39:01Z crazedsanity $
+ * Last Committted Date: $Date: 2007-11-21 11:39:01 -0600 (Wed, 21 Nov 2007) $
* Last Committed Path:: $HeadURL: https://cs-content.svn.sourceforge.net/svnroot/cs-content/releases/0.10/cs_phpDB.php $
*
*/
@@ -24,6 +24,11 @@
//
///////////////////////
+//TODO: option to not use layered transactions
+//TODO: rollbackTrans() in layered transaction causes abort when final layer is committed/aborted
+//TODO: stop sending queries to backend when transction is bad/aborted.
+//TODO: commit/abort specific layer requests (i.e. if there's 8 layers & the first is named "x", calling commitTrans("x") will cause the whole transaction to commit & all layers to be destroyed.
+
require_once(dirname(__FILE__) ."/cs_versionAbstract.class.php");
class cs_phpDB extends cs_versionAbstract {
Modified: releases/1.1/lib/cs-content/cs_sessionClass.php
===================================================================
--- releases/1.1/lib/cs-content/cs_sessionClass.php 2007-11-21 17:42:49 UTC (rev 659)
+++ releases/1.1/lib/cs-content/cs_sessionClass.php 2007-11-21 18:08:22 UTC (rev 660)
@@ -2,10 +2,10 @@
/*
* FILE INFORMATION:
* $HeadURL: https://cs-content.svn.sourceforge.net/svnroot/cs-content/releases/0.10/cs_sessionClass.php $
- * $Id: cs_sessionClass.php 214 2007-11-07 17:35:59Z crazedsanity $
- * $LastChangedDate: 2007-11-07 11:35:59 -0600 (Wed, 07 Nov 2007) $
+ * $Id: cs_sessionClass.php 221 2007-11-21 17:39:01Z crazedsanity $
+ * $LastChangedDate: 2007-11-21 11:39:01 -0600 (Wed, 21 Nov 2007) $
* $LastChangedBy: crazedsanity $
- * $LastChangedRevision: 214 $
+ * $LastChangedRevision: 221 $
*/
require_once(dirname(__FILE__) ."/cs_versionAbstract.class.php");
Modified: releases/1.1/lib/cs-content/cs_versionAbstract.class.php
===================================================================
--- releases/1.1/lib/cs-content/cs_versionAbstract.class.php 2007-11-21 17:42:49 UTC (rev 659)
+++ releases/1.1/lib/cs-content/cs_versionAbstract.class.php 2007-11-21 18:08:22 UTC (rev 660)
@@ -5,9 +5,9 @@
* SVN INFORMATION:::
* -------------------
* Last Author::::::::: $Author: crazedsanity $
- * Current Revision:::: $Revision: 155 $
+ * Current Revision:::: $Revision: 221 $
* Repository Location: $HeadURL: https://cs-content.svn.sourceforge.net/svnroot/cs-content/releases/0.10/cs_versionAbstract.class.php $
- * Last Updated:::::::: $Date: 2007-09-12 14:28:20 -0500 (Wed, 12 Sep 2007) $
+ * Last Updated:::::::: $Date: 2007-11-21 11:39:01 -0600 (Wed, 21 Nov 2007) $
*/
abstract class cs_versionAbstract {
Modified: releases/1.1/lib/cs-content/sample_files/public_html/index.php
===================================================================
--- releases/1.1/lib/cs-content/sample_files/public_html/index.php 2007-11-21 17:42:49 UTC (rev 659)
+++ rel...
[truncated message content] |
|
From: <cra...@us...> - 2007-11-21 17:42:54
|
Revision: 659
http://cs-project.svn.sourceforge.net/cs-project/?rev=659&view=rev
Author: crazedsanity
Date: 2007-11-21 09:42:49 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
Updated to use cs-content v0.10.5
Modified Paths:
--------------
trunk/lib/globalFunctions.php
Modified: trunk/lib/globalFunctions.php
===================================================================
--- trunk/lib/globalFunctions.php 2007-11-21 17:31:12 UTC (rev 658)
+++ trunk/lib/globalFunctions.php 2007-11-21 17:42:49 UTC (rev 659)
@@ -17,7 +17,7 @@
function get_required_external_lib_versions($projectName=NULL) {
//format: {className} => array({projectName} => {exactVersion})
$requirements = array(
- 'contentSystem' => array('cs-content', '0.10.4'),
+ 'contentSystem' => array('cs-content', '0.10.5'),
'XMLParser' => array('cs-phpxml', '0.5.5'),
'arrayToPath' => array('cs-arrayToPath', '0.2.2')
);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cra...@us...> - 2007-11-21 17:31:22
|
Revision: 658
http://cs-project.svn.sourceforge.net/cs-project/?rev=658&view=rev
Author: crazedsanity
Date: 2007-11-21 09:31:12 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
Version bump (1.1.0-BETA14)
Modified Paths:
--------------
trunk/VERSION
Modified: trunk/VERSION
===================================================================
--- trunk/VERSION 2007-11-21 17:25:21 UTC (rev 657)
+++ trunk/VERSION 2007-11-21 17:31:12 UTC (rev 658)
@@ -1,4 +1,4 @@
-$Id$
+$Id:VERSION 628 2007-11-20 16:58:45Z crazedsanity $
-VERSION: 1.1.0-BETA13
-$HeadURL$
+VERSION: 1.1.0-BETA14
+$HeadURL:https://cs-project.svn.sourceforge.net/svnroot/cs-project/trunk/VERSION $
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cra...@us...> - 2007-11-21 17:25:23
|
Revision: 657
http://cs-project.svn.sourceforge.net/cs-project/?rev=657&view=rev
Author: crazedsanity
Date: 2007-11-21 09:25:21 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
Updated external create template to match internal.
NOTE: it seems there was a version of the external template that hid the email
section if the contact_id cookie was set...
Modified Paths:
--------------
trunk/templates/extern/helpdesk/create.content.tmpl
Modified: trunk/templates/extern/helpdesk/create.content.tmpl
===================================================================
--- trunk/templates/extern/helpdesk/create.content.tmpl 2007-11-21 17:22:26 UTC (rev 656)
+++ trunk/templates/extern/helpdesk/create.content.tmpl 2007-11-21 17:25:21 UTC (rev 657)
@@ -9,34 +9,48 @@
<tr>
<td>Enter your email:</td>
- <td colspan="5">
+ <td>
<input name="data[email]" value="{email}" size="20" maxlength="80" type="text" {cust_email_readonly}></td>
</tr>
<tr>
<td>Give your request a name:</td>
- <td colspan="5"><input name="data[name]" size="80" maxlength="80" type="text"><br></td>
+ <td><input name="data[name]" size="80" maxlength="80" type="text" tabindex="1"><br></td>
</tr>
<tr>
<td>Describe your request:</td>
- <td colspan="5"><textarea name="data[subject]" cols="65" rows="10"></textarea><br></td>
+ <td><textarea name="data[subject]" cols="65" rows="10" tabindex="2"></textarea><br></td>
</tr>
<tr>
<td>Issue Category:</td>
- <td colspan="5">
- <select name="data[initialTag]">
- {select_tags}
- </select>
- </td>
-</tr>
-<tr>
- <td align="right">
- <input name="module" value="helpdesk" type="HIDDEN">
- <input name="data[parentRecordId]" value="{linked_proj}" type="HIDDEN">
- <input name="submit" value="go" type="submit">
+
+ <td>
+ <table cellpadding="0" cellspacing="3" width="100%">
+ <tr>
+ <td>
+ <select id='tagList' name="data[initialTag][]" multiple tabindex="3">
+ {select_tags}
+ </select>
+ </td>
+
+ <td align="left">
+ <div class="note" style="border-bottom:solid #000 1px; padding-bottom:10px;">
+ <h3 style="display:inline">Selecting Tags:</h3><br>
+ Select all the tags that <u>apply to your issue</u>. In parenthesis beside <br>
+ each item is a number: this indicates how it will affect the issue. Please <br>
+ select tags based on relevance and NOT just to make the issue more <br>
+ important.
+ </div>
+
+ <input name="module" value="helpdesk" type="HIDDEN">
+ <input name="data[parentRecordId]" value="{linked_proj}" type="HIDDEN">
+ <input name="submit" value="Create New Issue" type="submit" tabindex="4">
+ </td>
+ </tr>
+ </table>
</td>
</tr>
</tbody>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cra...@us...> - 2007-11-21 17:22:29
|
Revision: 656
http://cs-project.svn.sourceforge.net/cs-project/?rev=656&view=rev
Author: crazedsanity
Date: 2007-11-21 09:22:26 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
Fix image links.
Modified Paths:
--------------
trunk/templates/content/helpdesk/create.content.tmpl
Modified: trunk/templates/content/helpdesk/create.content.tmpl
===================================================================
--- trunk/templates/content/helpdesk/create.content.tmpl 2007-11-21 17:14:19 UTC (rev 655)
+++ trunk/templates/content/helpdesk/create.content.tmpl 2007-11-21 17:22:26 UTC (rev 656)
@@ -1,10 +1,10 @@
<h2>Help desk</h2>
-<img src="/images/s.gif" border="0" height="1" vspace="2" width="400">
+<img src="/images/pixel_black.gif" border="0" height="1" vspace="2" width="400">
<h4>request form</h4>
<form action="{PHP_SELF}" method="post">
-<table border=1>
+<table>
<tbody>
<tr>
<td>Enter your email:</td>
@@ -56,6 +56,6 @@
</tbody>
</table>
</form>
-<br><img src="/images/s.gif" border="0" height="1" vspace="2" width="400"><br><br>
+<br><img src="/images/pixel_black.gif" border="0" height="1" vspace="2" width="400"><br><br>
<a href="helpdesk_cust.php?step=kb">Search the knowledge database</a>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cra...@us...> - 2007-11-21 17:14:22
|
Revision: 655
http://cs-project.svn.sourceforge.net/cs-project/?rev=655&view=rev
Author: crazedsanity
Date: 2007-11-21 09:14:19 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
Better looking template for creating issues (internal).
Modified Paths:
--------------
trunk/templates/content/helpdesk/create.content.tmpl
Modified: trunk/templates/content/helpdesk/create.content.tmpl
===================================================================
--- trunk/templates/content/helpdesk/create.content.tmpl 2007-11-21 17:11:00 UTC (rev 654)
+++ trunk/templates/content/helpdesk/create.content.tmpl 2007-11-21 17:14:19 UTC (rev 655)
@@ -4,39 +4,53 @@
<h4>request form</h4>
<form action="{PHP_SELF}" method="post">
-<table>
+<table border=1>
<tbody>
<tr>
<td>Enter your email:</td>
- <td colspan="5">
+ <td>
<input name="data[email]" value="{email}" size="20" maxlength="80" type="text" {cust_email_readonly}></td>
</tr>
<tr>
<td>Give your request a name:</td>
- <td colspan="5"><input name="data[name]" size="80" maxlength="80" type="text" tabindex="1"><br></td>
+ <td><input name="data[name]" size="80" maxlength="80" type="text" tabindex="1"><br></td>
</tr>
<tr>
<td>Describe your request:</td>
- <td colspan="5"><textarea name="data[subject]" cols="65" rows="10" tabindex="2"></textarea><br></td>
+ <td><textarea name="data[subject]" cols="65" rows="10" tabindex="2"></textarea><br></td>
</tr>
<tr>
<td>Issue Category:</td>
- <td colspan="5">
- <select name="data[initialTag]" tabindex="3">
- {select_tags}
- </select>
- </td>
-</tr>
-<tr>
- <td align="right">
- <input name="module" value="helpdesk" type="HIDDEN">
- <input name="data[parentRecordId]" value="{linked_proj}" type="HIDDEN">
- <input name="submit" value="go" type="submit" tabindex="4">
+
+ <td>
+ <table cellpadding="0" cellspacing="3" width="100%">
+ <tr>
+ <td>
+ <select id='tagList' name="data[initialTag][]" multiple tabindex="3">
+ {select_tags}
+ </select>
+ </td>
+
+ <td align="left">
+ <div class="note" style="border-bottom:solid #000 1px; padding-bottom:10px;">
+ <h3 style="display:inline">Selecting Tags:</h3><br>
+ Select all the tags that <u>apply to your issue</u>. In parenthesis beside <br>
+ each item is a number: this indicates how it will affect the issue. Please <br>
+ select tags based on relevance and NOT just to make the issue more <br>
+ important.
+ </div>
+
+ <input name="module" value="helpdesk" type="HIDDEN">
+ <input name="data[parentRecordId]" value="{linked_proj}" type="HIDDEN">
+ <input name="submit" value="Create New Issue" type="submit" tabindex="4">
+ </td>
+ </tr>
+ </table>
</td>
</tr>
</tbody>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cra...@us...> - 2007-11-21 17:11:22
|
Revision: 654
http://cs-project.svn.sourceforge.net/cs-project/?rev=654&view=rev
Author: crazedsanity
Date: 2007-11-21 09:11:00 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
Just check if "submit" is an index in $_POST, instead of requiring it to be "go".
Modified Paths:
--------------
trunk/includes/content/helpdesk.inc
Modified: trunk/includes/content/helpdesk.inc
===================================================================
--- trunk/includes/content/helpdesk.inc 2007-11-21 16:56:20 UTC (rev 653)
+++ trunk/includes/content/helpdesk.inc 2007-11-21 17:11:00 UTC (rev 654)
@@ -123,7 +123,7 @@
else {
exit("invalid action: [$action]");
}
- } elseif($_POST['submit'] == "go" && count($_POST['data']) > 1) {
+ } elseif(isset($_POST['submit']) && count($_POST['data']) > 1) {
//CREATING NEW RECORD!!!
$dataArr = $_POST['data'];
$result = $proj->helpdeskObj->create_record($dataArr);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cra...@us...> - 2007-11-21 16:56:23
|
Revision: 653
http://cs-project.svn.sourceforge.net/cs-project/?rev=653&view=rev
Author: crazedsanity
Date: 2007-11-21 08:56:20 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
Colorized tag list w/modifiers, set initial priority based on selected tag mods.
/lib/helpdeskClass.php:
* create_record():
-- get list of tags & update priority based on the modifiers of the
selected tags.
-- add each of the selected tags to the record.
* get_category_list():
-- special magic to colorize the list.
-- NOTE: there's no reason to reference categories in place of tags
anymore; this should be updated.
Modified Paths:
--------------
trunk/lib/helpdeskClass.php
Modified: trunk/lib/helpdeskClass.php
===================================================================
--- trunk/lib/helpdeskClass.php 2007-11-21 16:51:23 UTC (rev 652)
+++ trunk/lib/helpdeskClass.php 2007-11-21 16:56:20 UTC (rev 653)
@@ -292,6 +292,25 @@
if(!is_numeric($dataArr['priority'])) {
$dataArr['priority'] = 9;
}
+
+ $tagObj = new tagClass($this->db);
+ if(is_array($dataArr['initialTag']) && count($dataArr['initialTag'])) {
+
+ //get the list of tags, so we know what the total modifier is.
+ $allTags = $tagObj->get_tag_list();
+
+ foreach($dataArr['initialTag'] as $id) {
+ $dataArr['priority'] += $allTags[$id]['modifier'];
+ }
+
+ if($dataArr['priority'] > 9) {
+ $dataArr['priority'] = 9;
+ }
+ elseif($dataArr['priority'] < 0) {
+ $dataArr['priority'] = 0;
+ }
+
+ }
$dataArr['is_helpdesk_issue'] = 't';
$newRecord = parent::create_record($dataArr, TRUE);
@@ -311,9 +330,10 @@
$linkObj->add_link($newRecord, $myNewRecordArr[$retval]['creator_contact_id']);
//now, let's tag it.
- if(isset($dataArr['initialTag']) && is_numeric($dataArr['initialTag'])) {
- $tagObj = new tagClass($this->db);
- $tagObj->add_tag($newRecord, $dataArr['initialTag']);
+ if(is_array($dataArr['initialTag']) && count($dataArr['initialTag'])) {
+ foreach($dataArr['initialTag'] as $id) {
+ $tagObj->add_tag($newRecord, $id);
+ }
}
//determine what to do next...
@@ -393,10 +413,43 @@
function get_category_list($selectThis=NULL) {
//create a list of tags.
$object = new tagClass($this->db);
- $tagList = $object->get_tag_list();
+ $mainTagList = $object->get_tag_list();
+ //create the "replacement array" and such.
+ $tagList = array();
+ foreach($mainTagList as $tagNameId => $subData) {
+ $tagList[$tagNameId] = $subData['name'];
+ $mod = $subData['modifier'];
+ if($mod > 0) {
+ if($mod == 1) {
+ $mainTagList[$tagNameId]['bgcolor'] = '#CCC';
+ }
+ elseif($mod == 2) {
+ $mainTagList[$tagNameId]['bgcolor'] = '#BBB';
+ }
+ else {
+ $mainTagList[$tagNameId]['bgcolor'] = '#AAA';
+ }
+ }
+ elseif($mod < 0) {
+ if($mod == -1) {
+ $mainTagList[$tagNameId]['bgcolor'] = 'yellow';
+ }
+ elseif($mod == -2) {
+ $mainTagList[$tagNameId]['bgcolor'] = 'orange';
+ }
+ else {
+ $mainTagList[$tagNameId]['bgcolor'] = 'red';
+ }
+ }
+ else {
+ $mainTagList[$tagNameId]['bgcolor'] = 'white';
+ }
+ }
+
//now create the list.
- $retval = array_as_option_list($tagList);
+ $templateString = "\t\t<option value='%%value%%' %%selectedString%% style=\"background-color:%%bgcolor%%\">%%display%% (%%modifier%%)</option>";
+ $retval = array_as_option_list($tagList, $selectThis, 'select', $templateString, $mainTagList);
return($retval);
}//end get_category_list()
//================================================================================================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cra...@us...> - 2007-11-21 16:51:44
|
Revision: 652
http://cs-project.svn.sourceforge.net/cs-project/?rev=652&view=rev
Author: crazedsanity
Date: 2007-11-21 08:51:23 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
Tags returned in a complex array with better ordering.
/lib/tagClass.php:
* get_tag_list():
-- primary ordering by modifier; secondarily by lower(name)
-- data retrieved by cs_phpDB::farray_fieldnames() instead of
cs_phpDB::farray_nvp() (the returned array is more complex).
Modified Paths:
--------------
trunk/lib/tagClass.php
Modified: trunk/lib/tagClass.php
===================================================================
--- trunk/lib/tagClass.php 2007-11-21 16:45:44 UTC (rev 651)
+++ trunk/lib/tagClass.php 2007-11-21 16:51:23 UTC (rev 652)
@@ -4,11 +4,11 @@
*
* SVN INFORMATION:::
* ------------------
- * SVN Signature::::::: $Id$
- * Last Author::::::::: $Author$
- * Current Revision:::: $Revision$
- * Repository Location: $HeadURL$
- * Last Updated:::::::: $Date$
+ * SVN Signature::::::: $Id:tagClass.php 626 2007-11-20 16:54:11Z crazedsanity $
+ * Last Author::::::::: $Author:crazedsanity $
+ * Current Revision:::: $Revision:626 $
+ * Repository Location: $HeadURL:https://cs-project.svn.sourceforge.net/svnroot/cs-project/trunk/lib/tagClass.php $
+ * Last Updated:::::::: $Date:2007-11-20 10:54:11 -0600 (Tue, 20 Nov 2007) $
*
*
* Class for tagging items, so they can be viewed in a different way: this way, for items pertaining to
@@ -54,7 +54,7 @@
* @return (exception) database error or no rows.
*/
public function get_tag_list() {
- $sql = "SELECT * FROM tag_name_table ORDER BY lower(name)";
+ $sql = "SELECT * FROM tag_name_table ORDER BY modifier, lower(name)";
$numrows = $this->db->exec($sql);
$dberror = $this->db->errorMsg();
@@ -67,7 +67,7 @@
}
else {
//good to go!
- $data = $this->db->farray_nvp("tag_name_id", "name");
+ $data = $this->db->farray_fieldnames("tag_name_id", NULL, 0);
return($data);
}
}//end get_tag_list()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cra...@us...> - 2007-11-21 16:45:48
|
Revision: 651
http://cs-project.svn.sourceforge.net/cs-project/?rev=651&view=rev
Author: crazedsanity
Date: 2007-11-21 08:45:44 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
Set special tag modifiers (if present), add upgrade script to xml file.
Modified Paths:
--------------
trunk/upgrade/upgrade.xml
trunk/upgrade/upgradeTo1.1.0-BETA14.php
Modified: trunk/upgrade/upgrade.xml
===================================================================
--- trunk/upgrade/upgrade.xml 2007-11-21 16:44:46 UTC (rev 650)
+++ trunk/upgrade/upgrade.xml 2007-11-21 16:45:44 UTC (rev 651)
@@ -64,5 +64,11 @@
<class_name>upgrade_to_1_1_0_BETA13</class_name>
<call_method>run_upgrade</call_method>
</v1.1.0-BETA12>
+ <v1.1.0-BETA13>
+ <target_version>1.1.0-BETA14</target_version>
+ <script_name>upgradeTo1.1.0-BETA14.php</script_name>
+ <class_name>upgrade_to_1_1_0_BETA14</class_name>
+ <call_method>run_upgrade</call_method>
+ </v1.1.0-BETA13>
</matching>
</upgrade>
Modified: trunk/upgrade/upgradeTo1.1.0-BETA14.php
===================================================================
--- trunk/upgrade/upgradeTo1.1.0-BETA14.php 2007-11-21 16:44:46 UTC (rev 650)
+++ trunk/upgrade/upgradeTo1.1.0-BETA14.php 2007-11-21 16:45:44 UTC (rev 651)
@@ -33,7 +33,6 @@
$this->run_schema_changes();
$this->update_tag_modifiers();
-
$this->db->commitTrans(__METHOD__);
}//end run_upgrade()
@@ -52,6 +51,61 @@
$this->logsObj->log_by_class($details, 'system');
}//end run_schema_changes()
//=========================================================================
+
+
+
+ //=========================================================================
+ private function update_tag_modifiers() {
+
+ $sql = "SELECT tag_name_id, name FROM tag_name_table ORDER BY tag_name_id";
+ if($this->run_sql($sql) && $this->lastNumrows > 1) {
+ $allTags = $this->db->farray_nvp('tag_name_id', 'name');
+
+ $specialModifiers = array(
+ 'critical' => -5,
+ 'exception' => -2,
+ 'invalid data' => -2,
+ 'authentication' => -1,
+ 'bug' => -1,
+ 'cannot fix' => -1,
+ 'data cleaning' => -1,
+ 'feature request' => -1,
+ 'email' => 0,
+ 'formatting' => 0,
+ 'has dependencies' => 0,
+ 'information' => 0,
+ 'network related' => 0,
+ 'session' => 0,
+ 'upgrade' => 1,
+ 'duplicate' => 2,
+ 'cannot reproduce' => 3,
+ );
+
+ $updates = 0;
+ foreach($allTags as $id=>$name) {
+ if(is_numeric($specialModifiers[$name])) {
+ //change the modifier accordingly...
+ $sql = "UPDATE tag_name_table SET modifier=". $specialModifiers[$name] ." WHERE tag_name_id=". $id;
+ if($this->run_sql($sql) && $this->lastNumrows == 1) {
+ $updates++;
+ }
+ else {
+ throw new exception(__METHOD__ .": failed to update tag (". $name .") with special " .
+ "modifier (". $specialModifiers[$name] .")");
+ }
+
+ //
+ $details = "Changed modifier of [tag_name_id=". $id ."] to (". $specialModifiers[$name] .")";
+ $this->logsObj->log_by_class($details, 'update');
+ }
+ }
+ }
+ else {
+ throw new exception(__METHOD__ .": failed to retrieve tag names");
+ }
+
+ }//end update_tag_modifiers()
+ //=========================================================================
}
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cra...@us...> - 2007-11-21 16:44:50
|
Revision: 650
http://cs-project.svn.sourceforge.net/cs-project/?rev=650&view=rev
Author: crazedsanity
Date: 2007-11-21 08:44:46 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
Fix SQL so it actually works. ;)
Modified Paths:
--------------
trunk/docs/sql/upgrades/upgradeTo1.1.0-BETA14.sql
Modified: trunk/docs/sql/upgrades/upgradeTo1.1.0-BETA14.sql
===================================================================
--- trunk/docs/sql/upgrades/upgradeTo1.1.0-BETA14.sql 2007-11-21 16:44:10 UTC (rev 649)
+++ trunk/docs/sql/upgrades/upgradeTo1.1.0-BETA14.sql 2007-11-21 16:44:46 UTC (rev 650)
@@ -9,5 +9,5 @@
ALTER TABLE tag_name_table ADD COLUMN modifier int;
UPDATE tag_name_table SET modifier = -1;
-ALTER TABLE tag_name_table ALTER COLUMN SET DEFAULT -1;
-ALTER TABLE tag_name_table SET NOT NULL;
+ALTER TABLE tag_name_table ALTER COLUMN modifier SET DEFAULT -1;
+ALTER TABLE tag_name_table ALTER COLUMN modifier SET NOT NULL;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cra...@us...> - 2007-11-21 16:44:17
|
Revision: 649
http://cs-project.svn.sourceforge.net/cs-project/?rev=649&view=rev
Author: crazedsanity
Date: 2007-11-21 08:44:10 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
Add random to redirect URL (avoid browser cache), auto-select bug for new issues.
Modified Paths:
--------------
trunk/includes/content/helpdesk.inc
Modified: trunk/includes/content/helpdesk.inc
===================================================================
--- trunk/includes/content/helpdesk.inc 2007-11-21 15:55:00 UTC (rev 648)
+++ trunk/includes/content/helpdesk.inc 2007-11-21 16:44:10 UTC (rev 649)
@@ -2,10 +2,10 @@
/*
* SVN INFORMATION:::
* ------------------
- * Last Author: $Author$
- * Current Revision: $Revision$
- * Repository Location: $HeadURL$
- * Last Updated: $Date$
+ * Last Author: $Author:crazedsanity $
+ * Current Revision: $Revision:637 $
+ * Repository Location: $HeadURL:https://cs-project.svn.sourceforge.net/svnroot/cs-project/trunk/includes/content/helpdesk.inc $
+ * Last Updated: $Date:2007-11-20 11:04:33 -0600 (Tue, 20 Nov 2007) $
*/
if($_POST) {
$action = strtolower($_POST['action']);
@@ -180,7 +180,7 @@
if(!$byPassUrlExtras && count($urlExtrasArr) > 0) {
$urlExtrasStr = string_from_array($urlExtrasArr, "url");
if($urlExtrasStr !== 0) {
- $url .= "?". $urlExtrasStr;
+ $url .= "?". $urlExtrasStr .'&random='. time();
}
}
conditional_header($url);
@@ -205,7 +205,7 @@
$page->set_all_block_rows("content");
//show the "category" selection.
- $categoryList = $proj->helpdeskObj->get_category_list();
+ $categoryList = $proj->helpdeskObj->get_category_list('bug');
$page->add_template_var("select_tags", $categoryList);
//
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cra...@us...> - 2007-11-21 15:55:06
|
Revision: 648
http://cs-project.svn.sourceforge.net/cs-project/?rev=648&view=rev
Author: crazedsanity
Date: 2007-11-21 07:55:00 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
Fix array_as_option_list() to check the display value against checkedValue too.
/lib/globalFunctions.php:
* array_as_option_list():
-- check $display against $checkedValue (instead of just $value).
Modified Paths:
--------------
trunk/lib/globalFunctions.php
Modified: trunk/lib/globalFunctions.php
===================================================================
--- trunk/lib/globalFunctions.php 2007-11-20 19:55:31 UTC (rev 647)
+++ trunk/lib/globalFunctions.php 2007-11-21 15:55:00 UTC (rev 648)
@@ -2,11 +2,11 @@
/*
* SVN INFORMATION:::
* ------------------
- * SVN Signature::::::: $Id$
- * Last Author::::::::: $Author$
- * Current Revision:::: $Revision$
- * Repository Location: $HeadURL$
- * Last Updated:::::::: $Date$
+ * SVN Signature::::::: $Id:globalFunctions.php 626 2007-11-20 16:54:11Z crazedsanity $
+ * Last Author::::::::: $Author:crazedsanity $
+ * Current Revision:::: $Revision:626 $
+ * Repository Location: $HeadURL:https://cs-project.svn.sourceforge.net/svnroot/cs-project/trunk/lib/globalFunctions.php $
+ * Last Updated:::::::: $Date:2007-11-20 10:54:11 -0600 (Tue, 20 Nov 2007) $
*/
@@ -462,7 +462,7 @@
foreach($data as $value=>$display) {
//see if it's the value that's been selected.
$selectedString = "";
- if($value == $checkedValue) {
+ if($value == $checkedValue || $display == $checkedValue) {
//yep, it's selected.
$selectedString = " ". $myType;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cra...@us...> - 2007-11-20 19:55:56
|
Revision: 647
http://cs-project.svn.sourceforge.net/cs-project/?rev=647&view=rev
Author: crazedsanity
Date: 2007-11-20 11:55:31 -0800 (Tue, 20 Nov 2007)
Log Message:
-----------
Database modifications to set priority based on associated tags (issue #77).
Added Paths:
-----------
trunk/docs/sql/upgrades/upgradeTo1.1.0-BETA14.sql
trunk/upgrade/upgradeTo1.1.0-BETA14.php
Copied: trunk/docs/sql/upgrades/upgradeTo1.1.0-BETA14.sql (from rev 646, trunk/docs/sql/upgrades/upgradeTo1.1.0-BETA13.sql)
===================================================================
--- trunk/docs/sql/upgrades/upgradeTo1.1.0-BETA14.sql (rev 0)
+++ trunk/docs/sql/upgrades/upgradeTo1.1.0-BETA14.sql 2007-11-20 19:55:31 UTC (rev 647)
@@ -0,0 +1,13 @@
+--
+-- SVN INFORMATION:::
+--
+-- SVN Signature::::::: $Id$
+-- Last Committted::::: $Date$
+-- Last Committed Path: $HeadURL$
+--
+
+
+ALTER TABLE tag_name_table ADD COLUMN modifier int;
+UPDATE tag_name_table SET modifier = -1;
+ALTER TABLE tag_name_table ALTER COLUMN SET DEFAULT -1;
+ALTER TABLE tag_name_table SET NOT NULL;
Copied: trunk/upgrade/upgradeTo1.1.0-BETA14.php (from rev 646, trunk/upgrade/upgradeTo1.1.0-BETA13.php)
===================================================================
--- trunk/upgrade/upgradeTo1.1.0-BETA14.php (rev 0)
+++ trunk/upgrade/upgradeTo1.1.0-BETA14.php 2007-11-20 19:55:31 UTC (rev 647)
@@ -0,0 +1,57 @@
+<?php
+/*
+ * Created on Nov 20, 2007
+ */
+
+
+class upgrade_to_1_1_0_BETA14 extends dbAbstract {
+
+ private $logsObj;
+
+ //=========================================================================
+ public function __construct(cs_phpDB &$db) {
+ if(!$db->is_connected()) {
+ throw new exception(__METHOD__ .": database is not connected");
+ }
+ $this->db = $db;
+
+ $this->logsObj = new logsClass($this->db, 'Upgrade');
+
+ $this->gfObj = new cs_globalFunctions;
+ $this->gfObj->debugPrintOpt = DEBUGPRINTOPT;
+ }//end __construct()
+ //=========================================================================
+
+
+
+ //=========================================================================
+ public function run_upgrade() {
+
+
+ $this->db->beginTrans(__METHOD__);
+
+ $this->run_schema_changes();
+ $this->update_tag_modifiers();
+
+
+ $this->db->commitTrans(__METHOD__);
+
+ }//end run_upgrade()
+ //=========================================================================
+
+
+
+ //=========================================================================
+ private function run_schema_changes() {
+
+ $this->gfObj->debug_print(__METHOD__ .": running SQL file...");
+ $this->run_sql_file(dirname(__FILE__) .'/../docs/sql/upgrades/upgradeTo1.1.0-BETA14.sql');
+
+ $details = "Executed SQL file, '". $this->lastSQLFile ."'. Encoded contents::: ".
+ base64_encode($this->fsObj->read($this->lastSQLFile));
+ $this->logsObj->log_by_class($details, 'system');
+ }//end run_schema_changes()
+ //=========================================================================
+}
+
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cra...@us...> - 2007-11-20 19:02:41
|
Revision: 646
http://cs-project.svn.sourceforge.net/cs-project/?rev=646&view=rev
Author: crazedsanity
Date: 2007-11-20 11:02:33 -0800 (Tue, 20 Nov 2007)
Log Message:
-----------
Remove changes & upgrades that require the contact_id in contact_email_table to be
deferrable + initially deferred (fixed in the code).
Modified Paths:
--------------
trunk/docs/schema/cs_project.schema.sql
trunk/docs/sql/setup/03__indexes_etc.sql
Removed Paths:
-------------
trunk/docs/sql/upgrades/upgradeTo1.1.0-BETA14.sql
trunk/upgrade/upgradeTo1.1.0-BETA14.php
Modified: trunk/docs/schema/cs_project.schema.sql
===================================================================
--- trunk/docs/schema/cs_project.schema.sql 2007-11-20 18:58:07 UTC (rev 645)
+++ trunk/docs/schema/cs_project.schema.sql 2007-11-20 19:02:33 UTC (rev 646)
@@ -2004,8 +2004,7 @@
--
ALTER TABLE ONLY contact_email_table
- ADD CONSTRAINT contact_email_table_contact_id_fkey FOREIGN KEY (contact_id) REFERENCES contact_table(contact_id)
- DEFERRABLE INITIALLY DEFERRED;
+ ADD CONSTRAINT contact_email_table_contact_id_fkey FOREIGN KEY (contact_id) REFERENCES contact_table(contact_id);
--
Modified: trunk/docs/sql/setup/03__indexes_etc.sql
===================================================================
--- trunk/docs/sql/setup/03__indexes_etc.sql 2007-11-20 18:58:07 UTC (rev 645)
+++ trunk/docs/sql/setup/03__indexes_etc.sql 2007-11-20 19:02:33 UTC (rev 646)
@@ -466,8 +466,7 @@
--
ALTER TABLE ONLY contact_email_table
- ADD CONSTRAINT contact_email_table_contact_id_fkey FOREIGN KEY (contact_id) REFERENCES contact_table(contact_id)
- DEFERRABLE INITIALLY DEFERRED;
+ ADD CONSTRAINT contact_email_table_contact_id_fkey FOREIGN KEY (contact_id) REFERENCES contact_table(contact_id);
--
Deleted: trunk/docs/sql/upgrades/upgradeTo1.1.0-BETA14.sql
===================================================================
--- trunk/docs/sql/upgrades/upgradeTo1.1.0-BETA14.sql 2007-11-20 18:58:07 UTC (rev 645)
+++ trunk/docs/sql/upgrades/upgradeTo1.1.0-BETA14.sql 2007-11-20 19:02:33 UTC (rev 646)
@@ -1,12 +0,0 @@
---
--- SVN INFORMATION:::
---
--- SVN Signature::::::: $Id$
--- Last Committted::::: $Date$
--- Last Committed Path: $HeadURL$
---
-
-ALTER TABLE contact_email_table DROP CONSTRAINT "contact_email_table_contact_id_fkey";
-ALTER TABLE ONLY contact_email_table
- ADD CONSTRAINT contact_email_table_contact_id_fkey FOREIGN KEY (contact_id) REFERENCES contact_table(contact_id)
- DEFERRABLE INITIALLY DEFERRED;
Deleted: trunk/upgrade/upgradeTo1.1.0-BETA14.php
===================================================================
--- trunk/upgrade/upgradeTo1.1.0-BETA14.php 2007-11-20 18:58:07 UTC (rev 645)
+++ trunk/upgrade/upgradeTo1.1.0-BETA14.php 2007-11-20 19:02:33 UTC (rev 646)
@@ -1,55 +0,0 @@
-<?php
-/*
- * Created on Oct 29, 2007
- */
-
-
-class upgrade_to_1_1_0_BETA13 extends dbAbstract {
-
- private $logsObj;
-
- //=========================================================================
- public function __construct(cs_phpDB &$db) {
- if(!$db->is_connected()) {
- throw new exception(__METHOD__ .": database is not connected");
- }
- $this->db = $db;
-
- $this->logsObj = new logsClass($this->db, 'Upgrade');
-
- $this->gfObj = new cs_globalFunctions;
- $this->gfObj->debugPrintOpt = DEBUGPRINTOPT;
- }//end __construct()
- //=========================================================================
-
-
-
- //=========================================================================
- public function run_upgrade() {
-
-
- $this->db->beginTrans(__METHOD__);
-
- $this->run_schema_changes();
-
- $this->db->commitTrans(__METHOD__);
-
- }//end run_upgrade()
- //=========================================================================
-
-
-
- //=========================================================================
- private function run_schema_changes() {
-
- $this->gfObj->debug_print(__METHOD__ .": running SQL file...");
- $this->run_sql_file(dirname(__FILE__) .'/../docs/sql/upgrades/upgradeTo1.1.0-BETA14.sql');
-
- $details = "Executed SQL file, '". $this->lastSQLFile ."'. Encoded contents::: ".
- base64_encode($this->fsObj->read($this->lastSQLFile));
- $this->logsObj->log_by_class($details, 'system');
- }//end run_schema_changes()
- //=========================================================================
-}
-
-?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cra...@us...> - 2007-11-20 18:58:15
|
Revision: 645
http://cs-project.svn.sourceforge.net/cs-project/?rev=645&view=rev
Author: crazedsanity
Date: 2007-11-20 10:58:07 -0800 (Tue, 20 Nov 2007)
Log Message:
-----------
Fixed layout of new user email.
Modified Paths:
--------------
trunk/templates/email/new_user.tmpl
Modified: trunk/templates/email/new_user.tmpl
===================================================================
--- trunk/templates/email/new_user.tmpl 2007-11-20 18:57:45 UTC (rev 644)
+++ trunk/templates/email/new_user.tmpl 2007-11-20 18:58:07 UTC (rev 645)
@@ -7,9 +7,10 @@
sure it is stored in a safe location.</b></font></p>
<p>Thank you for registering!<br>
- Username: {username}<br>
- Password: {password}<br>
- Email: {email}
+ <b>User ID:</b> {uid}<br>
+ <b>Username:</b> {username}<br>
+ <b>Password:</b> {password}<br>
+ <b>Email:</b> {email}
</p>
<hr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cra...@us...> - 2007-11-20 18:57:50
|
Revision: 644
http://cs-project.svn.sourceforge.net/cs-project/?rev=644&view=rev
Author: crazedsanity
Date: 2007-11-20 10:57:45 -0800 (Tue, 20 Nov 2007)
Log Message:
-----------
Fix new user creation problems.
/lib/adminUserClass.php:
* create_user():
-- store unencrypted password for the "new user" email.
-- sends an email to the new user with their username, password, etc.
/lib/contactClass.php:
* create_contact():
-- no longer creates a copy of itself... (?)
-- once the email is created, update the main contact record so the
transaction doesn't get aborted at the very end.
Modified Paths:
--------------
trunk/lib/adminUserClass.php
trunk/lib/contactClass.php
Modified: trunk/lib/adminUserClass.php
===================================================================
--- trunk/lib/adminUserClass.php 2007-11-20 18:32:35 UTC (rev 643)
+++ trunk/lib/adminUserClass.php 2007-11-20 18:57:45 UTC (rev 644)
@@ -3,11 +3,11 @@
/*
* SVN INFORMATION:::
* ------------------
- * SVN Signature::::::: $Id$
- * Last Author::::::::: $Author$
- * Current Revision:::: $Revision$
- * Repository Location: $HeadURL$
- * Last Updated:::::::: $Date$
+ * SVN Signature::::::: $Id:adminUserClass.php 626 2007-11-20 16:54:11Z crazedsanity $
+ * Last Author::::::::: $Author:crazedsanity $
+ * Current Revision:::: $Revision:626 $
+ * Repository Location: $HeadURL:https://cs-project.svn.sourceforge.net/svnroot/cs-project/trunk/lib/adminUserClass.php $
+ * Last Updated:::::::: $Date:2007-11-20 10:54:11 -0600 (Tue, 20 Nov 2007) $
*/
class adminUserClass extends userClass {
@@ -85,6 +85,7 @@
);
//good to go: encrypt the password.
+ $originalPassword = $data['password'];
$data['password'] = $this->encrypt_pass($data['password'], $contactId);
$sql = "INSERT INTO user_table ". string_from_array($data, 'insert', NULL, $cleanStringArr, TRUE, TRUE);
@@ -107,6 +108,14 @@
//now add the user to the specified group.
$this->add_user_to_group($uid, $data['group_id']);
+
+ //now send an email out to the user to let 'em know.
+ $templateContents = html_file_to_string('email/new_user.tmpl');
+ $repArr = $data;
+ $repArr['uid'] = $retval;
+ $repArr['password'] = $originalPassword;
+ $subject = 'Registration Confirmation ['. $repArr['username'] .']';
+ send_email($data['email'], $subject, $templateContents, $repArr);
}
else {
$details = "Created new user (". $data['username'] .") [NEW ID QUERY FAILED, numrows=(". $this->lastNumrows ."), DBERROR::: ". $this->lastError ."]";
Modified: trunk/lib/contactClass.php
===================================================================
--- trunk/lib/contactClass.php 2007-11-20 18:32:35 UTC (rev 643)
+++ trunk/lib/contactClass.php 2007-11-20 18:57:45 UTC (rev 644)
@@ -447,15 +447,24 @@
$retval = $data[0];
//before completing, let's create the primary email address.
- $contactObj = new contactClass($this->db);
- $contactObj->set_contact_id($retval);
- $contactObj->create_contact_email($email, TRUE);
- $this->db->commitTrans();
-
- //set the internal contactId.
$this->set_contact_id($retval);
+ $contactEmailId = $this->create_contact_email($email, TRUE);
- $this->logsObj->log_by_class("Created new contact (". $retval .")");
+ //update the contact_email_id on their contact record.
+ $sql = "UPDATE contact_table SET contact_email_id=". $contactEmailId ." WHERE contact_id=". $retval;
+ if(is_numeric($contactEmailId) && $this->run_sql($sql)) {
+ $this->db->commitTrans();
+
+ //set the internal contactId.
+ $this->set_contact_id($retval);
+
+ $this->logsObj->log_by_class("Created new contact (". $retval .")");
+ }
+ else {
+ $this->db->rollbackTrans();
+
+ $this->logsObj->log_by_class(__METHOD__ .": failed to create email for new contact (". $contactEmailId .")");
+ }
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cra...@us...> - 2007-11-20 18:32:38
|
Revision: 643
http://cs-project.svn.sourceforge.net/cs-project/?rev=643&view=rev
Author: crazedsanity
Date: 2007-11-20 10:32:35 -0800 (Tue, 20 Nov 2007)
Log Message:
-----------
Fix problematic constraint in existing schema & install SQL.
Modified Paths:
--------------
trunk/docs/schema/cs_project.schema.sql
trunk/docs/sql/setup/03__indexes_etc.sql
Modified: trunk/docs/schema/cs_project.schema.sql
===================================================================
--- trunk/docs/schema/cs_project.schema.sql 2007-11-20 18:31:53 UTC (rev 642)
+++ trunk/docs/schema/cs_project.schema.sql 2007-11-20 18:32:35 UTC (rev 643)
@@ -2004,7 +2004,8 @@
--
ALTER TABLE ONLY contact_email_table
- ADD CONSTRAINT contact_email_table_contact_id_fkey FOREIGN KEY (contact_id) REFERENCES contact_table(contact_id);
+ ADD CONSTRAINT contact_email_table_contact_id_fkey FOREIGN KEY (contact_id) REFERENCES contact_table(contact_id)
+ DEFERRABLE INITIALLY DEFERRED;
--
Modified: trunk/docs/sql/setup/03__indexes_etc.sql
===================================================================
--- trunk/docs/sql/setup/03__indexes_etc.sql 2007-11-20 18:31:53 UTC (rev 642)
+++ trunk/docs/sql/setup/03__indexes_etc.sql 2007-11-20 18:32:35 UTC (rev 643)
@@ -1,8 +1,8 @@
--
-- SVN INFORMATION:::
-- SVN Signature: $Id:::: 03__indexes_etc.sql 253 2007-09-29 19:48:37Z crazedsanity $
--- Last Committted Date:: $Date$
--- Last Committed Path::: $HeadURL$
+-- Last Committted Date:: $Date:2007-11-20 11:02:38 -0600 (Tue, 20 Nov 2007) $
+-- Last Committed Path::: $HeadURL:https://cs-project.svn.sourceforge.net/svnroot/cs-project/trunk/docs/sql/setup/03__indexes_etc.sql $
--
--
@@ -466,7 +466,8 @@
--
ALTER TABLE ONLY contact_email_table
- ADD CONSTRAINT contact_email_table_contact_id_fkey FOREIGN KEY (contact_id) REFERENCES contact_table(contact_id);
+ ADD CONSTRAINT contact_email_table_contact_id_fkey FOREIGN KEY (contact_id) REFERENCES contact_table(contact_id)
+ DEFERRABLE INITIALLY DEFERRED;
--
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cra...@us...> - 2007-11-20 18:31:55
|
Revision: 642
http://cs-project.svn.sourceforge.net/cs-project/?rev=642&view=rev
Author: crazedsanity
Date: 2007-11-20 10:31:53 -0800 (Tue, 20 Nov 2007)
Log Message:
-----------
Upgrade script for fixing a problematic constraint.
Added Paths:
-----------
trunk/docs/sql/upgrades/upgradeTo1.1.0-BETA14.sql
trunk/upgrade/upgradeTo1.1.0-BETA14.php
Copied: trunk/docs/sql/upgrades/upgradeTo1.1.0-BETA14.sql (from rev 641, trunk/docs/sql/upgrades/upgradeTo1.1.0-BETA13.sql)
===================================================================
--- trunk/docs/sql/upgrades/upgradeTo1.1.0-BETA14.sql (rev 0)
+++ trunk/docs/sql/upgrades/upgradeTo1.1.0-BETA14.sql 2007-11-20 18:31:53 UTC (rev 642)
@@ -0,0 +1,12 @@
+--
+-- SVN INFORMATION:::
+--
+-- SVN Signature::::::: $Id$
+-- Last Committted::::: $Date$
+-- Last Committed Path: $HeadURL$
+--
+
+ALTER TABLE contact_email_table DROP CONSTRAINT "contact_email_table_contact_id_fkey";
+ALTER TABLE ONLY contact_email_table
+ ADD CONSTRAINT contact_email_table_contact_id_fkey FOREIGN KEY (contact_id) REFERENCES contact_table(contact_id)
+ DEFERRABLE INITIALLY DEFERRED;
Copied: trunk/upgrade/upgradeTo1.1.0-BETA14.php (from rev 641, trunk/upgrade/upgradeTo1.1.0-BETA13.php)
===================================================================
--- trunk/upgrade/upgradeTo1.1.0-BETA14.php (rev 0)
+++ trunk/upgrade/upgradeTo1.1.0-BETA14.php 2007-11-20 18:31:53 UTC (rev 642)
@@ -0,0 +1,55 @@
+<?php
+/*
+ * Created on Oct 29, 2007
+ */
+
+
+class upgrade_to_1_1_0_BETA13 extends dbAbstract {
+
+ private $logsObj;
+
+ //=========================================================================
+ public function __construct(cs_phpDB &$db) {
+ if(!$db->is_connected()) {
+ throw new exception(__METHOD__ .": database is not connected");
+ }
+ $this->db = $db;
+
+ $this->logsObj = new logsClass($this->db, 'Upgrade');
+
+ $this->gfObj = new cs_globalFunctions;
+ $this->gfObj->debugPrintOpt = DEBUGPRINTOPT;
+ }//end __construct()
+ //=========================================================================
+
+
+
+ //=========================================================================
+ public function run_upgrade() {
+
+
+ $this->db->beginTrans(__METHOD__);
+
+ $this->run_schema_changes();
+
+ $this->db->commitTrans(__METHOD__);
+
+ }//end run_upgrade()
+ //=========================================================================
+
+
+
+ //=========================================================================
+ private function run_schema_changes() {
+
+ $this->gfObj->debug_print(__METHOD__ .": running SQL file...");
+ $this->run_sql_file(dirname(__FILE__) .'/../docs/sql/upgrades/upgradeTo1.1.0-BETA14.sql');
+
+ $details = "Executed SQL file, '". $this->lastSQLFile ."'. Encoded contents::: ".
+ base64_encode($this->fsObj->read($this->lastSQLFile));
+ $this->logsObj->log_by_class($details, 'system');
+ }//end run_schema_changes()
+ //=========================================================================
+}
+
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
