Thread: [Cs-project-svn_notify] SF.net SVN: cs-project: [660] releases/1.1

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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]

Thread: [Cs-project-svn_notify] SF.net SVN: cs-project: [660] releases/1.1

cs-project-svn_notify