Thread: [Cs-project-svn_notify] SF.net SVN: cs-project: [637] trunk/includes
Brought to you by:
crazedsanity
From: <cra...@us...> - 2007-11-20 17:04:35
|
Revision: 637 http://cs-project.svn.sourceforge.net/cs-project/?rev=637&view=rev Author: crazedsanity Date: 2007-11-20 09:04:33 -0800 (Tue, 20 Nov 2007) Log Message: ----------- Added the Subversion property "svn:eol-style" as "native". For M$ users. Property Changed: ---------------- trunk/includes/content/contacts.inc trunk/includes/content/helpdesk.inc trunk/includes/content/notes.inc trunk/includes/content/project.inc trunk/includes/content/settings.inc trunk/includes/content/summary.inc trunk/includes/content/tags.inc trunk/includes/content/todo.inc trunk/includes/help/lost_password.inc trunk/includes/setup/1.inc trunk/includes/setup/2.inc trunk/includes/setup/3.inc trunk/includes/setup/4.inc trunk/includes/setup/5.inc Property changes on: trunk/includes/content/contacts.inc ___________________________________________________________________ Name: svn:eol-style - + native Property changes on: trunk/includes/content/helpdesk.inc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/includes/content/notes.inc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/includes/content/project.inc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/includes/content/settings.inc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/includes/content/summary.inc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/includes/content/tags.inc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/includes/content/todo.inc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/includes/help/lost_password.inc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/includes/setup/1.inc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/includes/setup/2.inc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/includes/setup/3.inc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/includes/setup/4.inc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/includes/setup/5.inc ___________________________________________________________________ Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2007-11-20 17:05:01
|
Revision: 638 http://cs-project.svn.sourceforge.net/cs-project/?rev=638&view=rev Author: crazedsanity Date: 2007-11-20 09:04:59 -0800 (Tue, 20 Nov 2007) Log Message: ----------- Added the Subversion property "svn:eol-style" as "native". For M$ users. Modified Paths: -------------- trunk/includes/login.inc Property Changed: ---------------- trunk/includes/content.inc trunk/includes/extern.inc trunk/includes/help.inc trunk/includes/login.inc trunk/includes/setup.inc Property changes on: trunk/includes/content.inc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/includes/extern.inc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/includes/help.inc ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/includes/login.inc =================================================================== --- trunk/includes/login.inc 2007-11-20 17:04:33 UTC (rev 637) +++ trunk/includes/login.inc 2007-11-20 17:04:59 UTC (rev 638) @@ -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: trunk/includes/login.inc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/includes/setup.inc ___________________________________________________________________ Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2007-11-23 17:19:42
|
Revision: 672 http://cs-project.svn.sourceforge.net/cs-project/?rev=672&view=rev Author: crazedsanity Date: 2007-11-23 09:19:39 -0800 (Fri, 23 Nov 2007) Log Message: ----------- Helpdesk converts newlines to BR's in body again (internal & external). Modified Paths: -------------- trunk/includes/content/helpdesk.inc trunk/includes/extern/helpdesk.inc Modified: trunk/includes/content/helpdesk.inc =================================================================== --- trunk/includes/content/helpdesk.inc 2007-11-21 22:20:25 UTC (rev 671) +++ trunk/includes/content/helpdesk.inc 2007-11-23 17:19:39 UTC (rev 672) @@ -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")); + $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']); Modified: trunk/includes/extern/helpdesk.inc =================================================================== --- trunk/includes/extern/helpdesk.inc 2007-11-21 22:20:25 UTC (rev 671) +++ trunk/includes/extern/helpdesk.inc 2007-11-23 17:19:39 UTC (rev 672) @@ -148,7 +148,7 @@ //make the wrapping SANE. #$helpdeskData['subject'] = wordwrap($helpdeskData['subject'], FORMAT_WORDWRAP); $helpdeskData['subject'] = cleanString($helpdeskData['subject'], "htmlentity_plus_brackets"); - $helpdeskData['subject'] = $bbCodeParser->parseString($helpdeskData['subject']); + $helpdeskData['subject'] = $bbCodeParser->parseString($helpdeskData['subject'], TRUE); $helpdeskData['subject'] = preg_replace('/\s\s/', ' ', $helpdeskData['subject']); $helpdeskData['subject'] = preg_replace('/\S\s\s/', ' ', $helpdeskData['subject']); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |