Menu
▾
▴
phpwebsite-comm-cvs-commits — Read-Only CVS commits log list
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(120) |
Jun
(74) |
Jul
(97) |
Aug
(35) |
Sep
(35) |
Oct
(34) |
Nov
|
Dec
(6) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(18) |
Feb
(8) |
Mar
(7) |
Apr
(23) |
May
(28) |
Jun
(31) |
Jul
(27) |
Aug
(34) |
Sep
(48) |
Oct
(511) |
Nov
(197) |
Dec
(333) |
| 2005 |
Jan
(212) |
Feb
(33) |
Mar
(94) |
Apr
(51) |
May
(16) |
Jun
|
Jul
(200) |
Aug
(43) |
Sep
(88) |
Oct
(60) |
Nov
(62) |
Dec
(41) |
| 2006 |
Jan
(94) |
Feb
(49) |
Mar
(54) |
Apr
|
May
(39) |
Jun
(39) |
Jul
(61) |
Aug
(36) |
Sep
(23) |
Oct
(76) |
Nov
(73) |
Dec
(32) |
| 2007 |
Jan
|
Feb
(87) |
Mar
|
Apr
(8) |
May
(36) |
Jun
(49) |
Jul
(54) |
Aug
(8) |
Sep
(50) |
Oct
(36) |
Nov
|
Dec
(3) |
| 2008 |
Jan
(133) |
Feb
(54) |
Mar
(39) |
Apr
(2) |
May
(6) |
Jun
(74) |
Jul
(97) |
Aug
(70) |
Sep
(12) |
Oct
(20) |
Nov
(64) |
Dec
(24) |
| 2009 |
Jan
(25) |
Feb
(49) |
Mar
(18) |
Apr
|
May
|
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
(10) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(7) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Eloi G. <ada...@us...> - 2004-04-22 17:05:43
|
Update of /cvsroot/phpwebsite-comm/modules/article/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3900/templates Modified Files: summary_view.tpl Log Message: Bug Fixes Index: summary_view.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/summary_view.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** summary_view.tpl 9 Jul 2003 20:24:29 -0000 1.1 --- summary_view.tpl 22 Apr 2004 17:05:29 -0000 1.2 *************** *** 2,6 **** {TITLE_LINK} <div class="smalltext"> ! Posted by {CREATED_USER} on {CREATED_DATE} (Read: {HITS} times) </div> <!-- END TITLE --> --- 2,6 ---- {TITLE_LINK} <div class="smalltext"> ! {UPDATED_TEXT} (Read: {HITS} times) </div> <!-- END TITLE --> |
|
From: Eloi G. <ada...@us...> - 2004-04-22 17:05:43
|
Update of /cvsroot/phpwebsite-comm/modules/article/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3900/class Modified Files: Article.php Log Message: Bug Fixes Index: Article.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/Article.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Article.php 21 Apr 2004 19:54:32 -0000 1.16 --- Article.php 22 Apr 2004 17:05:23 -0000 1.17 *************** *** 240,249 **** $_SESSION['OBJ_layout']->meta_vars['meta_robots'] = $this->meta_robots; } ! $article_tags['CREATED_TEXT'] = "<b>" ! . $_SESSION['translate']->it('Created By [var1] on [var2]', '</b>' ! . $this->created_username .'<b>', '</b>'.$article_tags['CREATED_DATE']); ! $article_tags['UPDATED_TEXT'] = "<b>" ! . $_SESSION['translate']->it('Last Updated By [var1] on [var2]', '</b>' ! . $this->updated_username.'<b>', '</b>'.$article_tags['UPDATED_DATE']); if ($Fullpage) /* Full article display */ --- 240,247 ---- $_SESSION['OBJ_layout']->meta_vars['meta_robots'] = $this->meta_robots; } ! $article_tags['CREATED_TEXT'] = $_SESSION['translate']->it('Created by [var1] on [var2]' ! , $this->created_username, $article_tags['CREATED_DATE']); ! $article_tags['UPDATED_TEXT'] = $_SESSION['translate']->it('Last updated by [var1] on [var2]' ! , $this->updated_username, $article_tags['UPDATED_DATE']); if ($Fullpage) /* Full article display */ |
|
From: Eloi G. <ada...@us...> - 2004-04-22 17:05:43
|
Update of /cvsroot/phpwebsite-comm/modules/article/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3900/lang Modified Files: article.en.lng Log Message: Bug Fixes Index: article.en.lng =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/lang/article.en.lng,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** article.en.lng 19 Feb 2004 21:48:53 -0000 1.6 --- article.en.lng 22 Apr 2004 17:05:28 -0000 1.7 *************** *** 37,41 **** a:|:Confirm Action:|:Confirm Action a:|:Create New Article:|:Create New Article ! a:|:Created By [var1] on [var2]:|:Created By [var1] on [var2] a:|:CURRENT:|:CURRENT a:|:Current Articles:|:Current Articles --- 37,41 ---- a:|:Confirm Action:|:Confirm Action a:|:Create New Article:|:Create New Article ! a:|:Created by [var1] on [var2]:|:Created by [var1] on [var2] a:|:CURRENT:|:CURRENT a:|:Current Articles:|:Current Articles *************** *** 62,66 **** a:|:kept:|:kept a:|:Last Update:|:Last Update ! a:|:Last Updated By [var1] on [var2]:|:Last Updated By [var1] on [var2] a:|:Let Article Manager automatically generate meta descriptions:|:Let Article Manager automatically generate meta descriptions a:|:Link caption:|:Link caption --- 62,66 ---- a:|:kept:|:kept a:|:Last Update:|:Last Update ! a:|:Last updated by [var1] on [var2]:|:Last updated by [var1] on [var2] a:|:Let Article Manager automatically generate meta descriptions:|:Let Article Manager automatically generate meta descriptions a:|:Link caption:|:Link caption |
|
From: Eloi G. <ada...@us...> - 2004-04-21 19:56:58
|
Update of /cvsroot/phpwebsite-comm/modules/article/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1462/class Modified Files: Article.php Section.php Log Message: Bug Fixes Index: Section.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/Section.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Section.php 19 Feb 2004 21:46:42 -0000 1.9 --- Section.php 21 Apr 2004 19:54:55 -0000 1.10 *************** *** 128,132 **** } ! $image_string = '<img src="' . $temp_image . '" width="' . $this->image['width'] . '" height="' . $this->image['height'] . '" alt="' . $this->image['alt'] --- 128,132 ---- } ! $image_string = '<img src="./' . $temp_image . '" width="' . $this->image['width'] . '" height="' . $this->image['height'] . '" alt="' . $this->image['alt'] *************** *** 143,147 **** $template_array['TITLE'] = PHPWS_Text::parseOutput($this->title); $template_array['TEXT'] = PHPWS_Text::parseOutput($this->text); ! $template_array['PRINT_ICON'] = '<a href="index.php?module=article&op=view_printable&ARTICLE_id=' . $article_id . '&lay_quiet=1" target="_blank"><img src="mod/article/img/print.gif" border="0" width="22" height="20" alt="Printable Version"/></a>'; $template_array['CREATED_DATE'] = $created_date; --- 143,147 ---- $template_array['TITLE'] = PHPWS_Text::parseOutput($this->title); $template_array['TEXT'] = PHPWS_Text::parseOutput($this->text); ! $template_array['PRINT_ICON'] = '<a href="./index.php?module=article&op=view_printable&ARTICLE_id=' . $article_id . '&lay_quiet=1" target="_blank"><img src="mod/article/img/print.gif" border="0" width="22" height="20" alt="Printable Version"/></a>'; $template_array['CREATED_DATE'] = $created_date; Index: Article.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/Article.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Article.php 19 Feb 2004 21:46:42 -0000 1.15 --- Article.php 21 Apr 2004 19:54:32 -0000 1.16 *************** *** 212,216 **** $copyright = '<a href="'.$rights[rand(0,2)].'"><img src="http://'.PHPWS_SOURCE_HTTP . 'mod/article/img/mark.gif" border="0" title="Article Manager module by by George! Software." alt="Article Manager module by by George! Software."></a>'; ! $article_link = 'index.php?module=article&view='.$this->id; $article_tags['TITLE'] = $this->title; --- 212,216 ---- $copyright = '<a href="'.$rights[rand(0,2)].'"><img src="http://'.PHPWS_SOURCE_HTTP . 'mod/article/img/mark.gif" border="0" title="Article Manager module by by George! Software." alt="Article Manager module by by George! Software."></a>'; ! $article_link = './index.php?module=article&view='.$this->id; $article_tags['TITLE'] = $this->title; *************** *** 346,350 **** . $_SESSION['translate']->it('Printable Version') . '" title="' . $_SESSION['translate']->it('Printable Version') . '"/></a>'; ! $article_tags['EMAIL'] = '<a href="index.php?module=article&email='.$this->id .'"><img src="http://'. PHPWS_SOURCE_HTTP . 'mod/article/img/mailto.png" border="0" width="19" height="12" alt="' --- 346,350 ---- . $_SESSION['translate']->it('Printable Version') . '" title="' . $_SESSION['translate']->it('Printable Version') . '"/></a>'; ! $article_tags['EMAIL'] = '<a href="./index.php?module=article&email='.$this->id .'"><img src="http://'. PHPWS_SOURCE_HTTP . 'mod/article/img/mailto.png" border="0" width="19" height="12" alt="' *************** *** 359,368 **** $article_tags['EDIT'] = '['. $_SESSION['translate']->it('Locked') . ']'; else ! $article_tags['EDIT'] = '[<a href="index.php?module=article&edit='.$this->id .'">' . $_SESSION['translate']->it('Edit').'</a>]'; /* if user can delete articles or can delete this article... */ if ($_SESSION['SES_ART_master']->can('delete',$this->created_username)) ! $article_tags['DELETE'] = '[<a href="index.php?module=article&edit=delete&ARTICLE_id=' . $this->id.'">'.$_SESSION['translate']->it('Delete').' </a>]'; --- 359,368 ---- $article_tags['EDIT'] = '['. $_SESSION['translate']->it('Locked') . ']'; else ! $article_tags['EDIT'] = '[<a href="./index.php?module=article&edit='.$this->id .'">' . $_SESSION['translate']->it('Edit').'</a>]'; /* if user can delete articles or can delete this article... */ if ($_SESSION['SES_ART_master']->can('delete',$this->created_username)) ! $article_tags['DELETE'] = '[<a href="./index.php?module=article&edit=delete&ARTICLE_id=' . $this->id.'">'.$_SESSION['translate']->it('Delete').' </a>]'; |
|
From: Eloi G. <ada...@us...> - 2004-04-21 19:56:43
|
Update of /cvsroot/phpwebsite-comm/modules/article/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1462/templates Modified Files: listing.tpl listing_row.tpl Log Message: Bug Fixes Index: listing_row.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/listing_row.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** listing_row.tpl 9 Jul 2003 20:24:29 -0000 1.1 --- listing_row.tpl 21 Apr 2004 19:55:49 -0000 1.2 *************** *** 1,21 **** <!-- BEGIN CONTENT --> ! <tr> ! <td width="100%"{BG}> {ARTICLE_TITLE} </td> ! <td align="center"{BG}> {HOME_FLAG} </td> ! <td align="center"{BG} nowrap> {DATE} </td> ! <td{BG}> {PUB_EXP} </td> ! <td{BG}> {EDIT} </td> ! <td{BG}> {DELETE} </td> --- 1,21 ---- <!-- BEGIN CONTENT --> ! <tr<!-- BEGIN tog1 -->{ODDROW}class="bg_medium"<!-- END tog1 -->> ! <td width="100%"> {ARTICLE_TITLE} </td> ! <td align="center"> {HOME_FLAG} </td> ! <td align="center" nowrap> {DATE} </td> ! <td> {PUB_EXP} </td> ! <td> {EDIT} </td> ! <td> {DELETE} </td> Index: listing.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/listing.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** listing.tpl 9 Jul 2003 20:24:29 -0000 1.1 --- listing.tpl 21 Apr 2004 19:55:43 -0000 1.2 *************** *** 1,4 **** <!-- BEGIN CONTENT --> ! <table width="100%" border="0" cellspacing="0" cellpadding="2"> <tr> <td width="100%" class="bg_dark" align="center"> --- 1,4 ---- <!-- BEGIN CONTENT --> ! <table class="bg_light" width="100%" border="0" cellspacing="0" cellpadding="2"> <tr> <td width="100%" class="bg_dark" align="center"> |
|
From: Eloi G. <ada...@us...> - 2004-04-21 19:56:39
|
Update of /cvsroot/phpwebsite-comm/modules/article/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1462/docs Modified Files: Changes.txt Log Message: Bug Fixes Index: Changes.txt =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/docs/Changes.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Changes.txt 19 Feb 2004 21:46:45 -0000 1.6 --- Changes.txt 21 Apr 2004 19:55:20 -0000 1.7 *************** *** 1,3 **** --- 1,38 ---- ======================== + Changes in version 2.3 + ======================== + - Standardized all relative links + - Fixed Bug Report [ 910071 ] Main article listing was messing up row display continuity where cells had null values. + - Fixed Bug Report [ 910071 ] Changed template variables for listing_row.tpl. + Changed {BG} to {ODDROW} so that tablerow class values are now specified in the template - not in the code. + Thanks, smsulliva! + - Fixed double-display of section editing screen. + TODO: Change all forms to use the EZForm class in preparation for 0.9.4 + TODO: NEW FEATURE! TrackBack system allows AM to be used as a blog. + TODO: - Fixed Bug Report [902591] "Bug in Image Library" + TODO: - Fixed display of archives so that listings are shown in descending order (most recent first). The order can be changed by adding "order=ASC" to the URL. + TODO: - Fixed display of archives so that expired listings are only shown to those authorized to re-publish them. Switch to enable display of all articles is now "all=1". "current=1" + is now obsolete. + - Some of the documentation in "MOST-USED URL EXTENSIONS" in INTRODUCTION.txt has changed to the following: + ================== + To see all articles for a specific day, enter + http://www.yoursite.com/index.php?module=article&view=archives&year=2003&month=8&day=27 + + To see all articles for a specific month, enter + http://www.yoursite.com/index.php?module=article&view=archives&year=2003&month=8 + + To see all articles for a specific year, enter + http://www.yoursite.com/index.php?module=article&view=archives&year=2003 + + To see all articles for a specific year in order from oldest to newest, enter + http://www.yoursite.com/index.php?module=article&view=archives&year=2003&order=ASC + + NOTE: The above links will show currently viewable articles published on these dates. + If you want to see the articles created or updated on these dates, add "&datetype=created_date" or "&datetype=updated_date" to the link. + If you want to see ALL (expired and unexpired) articles, add "&all=1" to the link. + ================== + + + ======================== Changes in version 2.2 ======================== |
|
From: Eloi G. <ada...@us...> - 2004-04-21 19:56:24
|
Update of /cvsroot/phpwebsite-comm/modules/article/inc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1462/inc Modified Files: AM_list_articles.php A_edit.php Log Message: Bug Fixes Index: A_edit.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/A_edit.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** A_edit.php 19 Feb 2004 21:46:46 -0000 1.1 --- A_edit.php 21 Apr 2004 19:55:40 -0000 1.2 *************** *** 63,70 **** if($SECT_id == $value) { ! if (isset($_SESSION['SES_ART_section']) && $value==$_SESSION['SES_ART_section']->id) ! $is_new_section = false; ! else $_SESSION['SES_ART_section'] = $this->sections[$value]; $article_body .= $_SESSION['SES_ART_section']->edit_section(); } --- 63,69 ---- if($SECT_id == $value) { ! if (isset($_SESSION['SES_ART_section']) && $value!=$_SESSION['SES_ART_section']->id) $_SESSION['SES_ART_section'] = $this->sections[$value]; + $is_new_section = false; $article_body .= $_SESSION['SES_ART_section']->edit_section(); } Index: AM_list_articles.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/AM_list_articles.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AM_list_articles.php 19 Feb 2004 21:46:46 -0000 1.1 --- AM_list_articles.php 21 Apr 2004 19:55:23 -0000 1.2 *************** *** 76,84 **** /* Now create the Row HTML */ foreach($result as $value) { $row = array(); ! PHPWS_WizardBag::toggle($bg, " class=\"bg_medium\""); ! $row['BG'] = $bg; /* If this page is viewable, allow the user to toggle the mainpage switch. */ --- 76,87 ---- /* Now create the Row HTML */ + $count=1; foreach($result as $value) { $row = array(); ! if ($count++%2) ! $row['ODDROW'] = ' '; ! // PHPWS_WizardBag::toggle($bg, " class=\"bg_medium\""); ! // $row['BG'] = $bg; /* If this page is viewable, allow the user to toggle the mainpage switch. */ *************** *** 105,109 **** /* Set up date */ ! $row['DATE'] = substr($value[$temp_date],0,10); /* Set var to expire/publish the article if it's not the home page */ --- 108,113 ---- /* Set up date */ ! if(!$row['DATE'] = substr($value[$temp_date],0,10)) ! $row['DATE'] = ' '; /* Set var to expire/publish the article if it's not the home page */ *************** *** 112,118 **** ?'<input type="submit" name="ARTICLE_vars[edit:expire]" value="'.$Fexpire.'" />' :'<input type="submit" name="ARTICLE_vars[edit:publish]" value="'.$Fpublish.'" />'; /* Set up Edit button */ ! if ($this->can("edit",$value['created_username'])) /* If someone else is not editing this page... */ if (!PHPWS_Article::isLocked($value['editlock'], $value['edituser'])) --- 116,126 ---- ?'<input type="submit" name="ARTICLE_vars[edit:expire]" value="'.$Fexpire.'" />' :'<input type="submit" name="ARTICLE_vars[edit:publish]" value="'.$Fpublish.'" />'; + else + $row['PUB_EXP'] = ' '; + /* Set up Edit button */ ! if ($this->can('edit',$value['created_username'])) ! { /* If someone else is not editing this page... */ if (!PHPWS_Article::isLocked($value['editlock'], $value['edituser'])) *************** *** 121,128 **** --- 129,141 ---- else $row['EDIT'] = '['.$_SESSION['translate']->it('Locked').']'; + } + else + $row['EDIT'] = ' '; /* Set up Delete button */ if (isset($Fdelete)) $row['DELETE'] = '<input type="submit" name="ARTICLE_vars[edit:delete]" value="'.$Fdelete.'" />'; + else + $row['DELETE'] = ' '; $content[0] = '<input type="hidden" name="module" value="article" id='.$value['id'].' />' *************** *** 150,152 **** $this->popbox($_SESSION['translate']->it('Current Articles'), $content); ! ?> --- 163,165 ---- $this->popbox($_SESSION['translate']->it('Current Articles'), $content); ! ?> \ No newline at end of file |
|
From: Tony M. <cl...@us...> - 2004-04-13 00:47:00
|
Update of /cvsroot/phpwebsite-comm/modules/mailto/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29074/mailto/templates Modified Files: edit.tpl mail.tpl view.tpl Log Message: Removed search capability. Added Help Added Prefix to be prepended onto the subject of the mail Added Real Name field (optional) Index: mail.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailto/templates/mail.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mail.tpl 4 Apr 2004 00:24:30 -0000 1.3 --- mail.tpl 13 Apr 2004 00:33:05 -0000 1.4 *************** *** 3,7 **** {START_FORM} <b>{LABEL_TO}:</b> {MT_TO}<br /><br /> ! <b>{LABEL_FROM}:</b>     {MT_FROM} {FROM_HELP}<br /><br /> <b>{LABEL_SUBJECT}:</b> {MT_SUBJECT} {SUBJECT_HELP}<br /><br /> <b>{LABEL_MESSAGE}: {MESSAGE_HELP}</b><br /> --- 3,8 ---- {START_FORM} <b>{LABEL_TO}:</b> {MT_TO}<br /><br /> ! <b>{LABEL_NAME}:</b>{MT_NAME} {NAME_HELP}<br /> ! <b>{LABEL_FROM}:</b> {MT_FROM} {FROM_HELP}<br /><br /> <b>{LABEL_SUBJECT}:</b> {MT_SUBJECT} {SUBJECT_HELP}<br /><br /> <b>{LABEL_MESSAGE}: {MESSAGE_HELP}</b><br /> Index: view.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailto/templates/view.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** view.tpl 4 Apr 2004 00:24:30 -0000 1.3 --- view.tpl 13 Apr 2004 00:33:05 -0000 1.4 *************** *** 5,8 **** --- 5,10 ---- <b>{LABEL_ADDRESS}:</b> {MT_ADDRESS}<br /><br /> + <b>{LABEL_PREFIX}:</b> + {MT_PREFIX}<br /><br /> <b>{LABEL_SUBJECT}:</b> {MT_SUBJECT}<br /><br /> Index: edit.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailto/templates/edit.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** edit.tpl 4 Apr 2004 00:24:30 -0000 1.3 --- edit.tpl 13 Apr 2004 00:33:05 -0000 1.4 *************** *** 6,9 **** --- 6,11 ---- <b>{ADDRESS_LABEL}:</b><br /> {MT_ADDRESS} {ADDRESS_HELP}<br /><br /> + <b>{PREFIX_LABEL}:</b><br /> + {MT_PREFIX} {PREFIX_HELP}<br /><br /> <b>{SUBJECT_LABEL}:</b><br /> {MT_SUBJECT} {SUBJECT_HELP}<br /><br /> |
|
From: Tony M. <cl...@us...> - 2004-04-13 00:46:59
|
Update of /cvsroot/phpwebsite-comm/modules/mailto/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29074/mailto/class Modified Files: Mailto.php Log Message: Removed search capability. Added Help Added Prefix to be prepended onto the subject of the mail Added Real Name field (optional) Index: Mailto.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailto/class/Mailto.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Mailto.php 4 Apr 2004 04:23:17 -0000 1.5 --- Mailto.php 13 Apr 2004 00:33:04 -0000 1.6 *************** *** 14,24 **** --- 14,27 ---- var $_reqlogin = NULL; var $_from = NULL; + var $_name = NULL; var $_message = NULL; var $_referer = NULL; var $_subject = NULL; var $_lock_subject = NULL; + var $_prefix = NULL; function PHPWS_Mailto($MT_ID = NULL) { $exclude[] = "_from"; + $exclude[] = "_name"; $exclude[] = "_message"; $exclude[] = "_referer"; *************** *** 71,74 **** --- 74,79 ---- $tags["MT_LOCK_SUBJECT"] = "No"; } + $tags["MT_PREFIX"] = $this->getPrefix(); + $tags["LABEL_SUBJECT"] = $_SESSION["translate"]->it("Subject"); $tags["LABEL_LABEL"] = $_SESSION["translate"]->it("Label"); *************** *** 78,81 **** --- 83,87 ---- $tags["LABEL_REQLOGIN"] = $_SESSION["translate"]->it("Require Login?"); $tags["LABEL_LOCK_SUBJECT"] = $_SESSION["translate"]->it("Lock Subject?"); + $tags["LABEL_PREFIX"] = $_SESSION["translate"]->it("Prefix"); return PHPWS_Template::processTemplate($tags, "mailto", "view.tpl"); *************** *** 94,97 **** --- 100,104 ---- $form->add("MT_ADDRESS", "text", $this->getAddress()); $form->add("MT_SUBJECT", "text", $this->getSubject()); + $form->add("MT_PREFIX", "text", $this->getPrefix()); $form->add("MT_REQLOGIN", "checkbox"); $form->setMatch("MT_REQLOGIN", $this->_reqlogin); *************** *** 120,123 **** --- 127,132 ---- $tags["SUBJECT_LABEL"] = $_SESSION["translate"]->it("Subject"); $tags["SUBJECT_HELP"] = $_SESSION["OBJ_help"]->show_link("mailto", "subject"); + $tags["PREFIX_LABEL"] = $_SESSION["translate"]->it("Prefix"); + $tags["PREFIX_HELP"] = $_SESSION["OBJ_help"]->show_link("mailto", "prefix"); $tags["LOCK_SUBJECT_LABEL"] = $_SESSION["translate"]->it("Lock Subject?"); $tags["LOCK_SUBJECT_HELP"] = $_SESSION["OBJ_help"]->show_link("mailto", "lock_subject"); *************** *** 149,152 **** --- 158,165 ---- } + if(isset($_REQUEST["MT_PREFIX"])) { + $this->_prefix = $_REQUEST["MT_PREFIX"]; + } + if(isset($_REQUEST["MT_REQLOGIN"])) { $this->_reqlogin = 1; *************** *** 194,197 **** --- 207,212 ---- } $form->setSize("MT_SUBJECT", 50); + $form->add("MT_NAME", "text", $this->_name); + $form->setSize("MT_NAME", 30); $form->add("MT_MESSAGE", "textarea", $this->_message); $form->setRows("MT_MESSAGE", 15); *************** *** 202,205 **** --- 217,221 ---- $form->add("MT_ADDRESS", "hidden", $this->getAddress()); $form->add("MT_LABEL", "hidden", $this->getLabel()); + $form->add("MT_PREFIX", "hidden", $this->getPrefix()); $form->add("MT_REFERER", "hidden" ,$this->_referer); *************** *** 218,223 **** $tags["LABEL_TO"] = $_SESSION["translate"]->it("To"); ! $tags["LABEL_FROM"] = $_SESSION["translate"]->it("From"); $tags["FROM_HELP"] = $_SESSION["OBJ_help"]->show_link("mailto", "from"); $tags["LABEL_SUBJECT"] = $_SESSION["translate"]->it("Subject"); $tags["SUBJECT_HELP"] = $_SESSION["OBJ_help"]->show_link("mailto", "subject"); --- 234,241 ---- $tags["LABEL_TO"] = $_SESSION["translate"]->it("To"); ! $tags["LABEL_FROM"] = $_SESSION["translate"]->it("From E-mail Address"); $tags["FROM_HELP"] = $_SESSION["OBJ_help"]->show_link("mailto", "from"); + $tags["LABEL_NAME"] = $_SESSION["translate"]->it("From Name"); + $tags["NAME_HELP"] = $_SESSION["OBJ_help"]->show_link("mailto", "name"); $tags["LABEL_SUBJECT"] = $_SESSION["translate"]->it("Subject"); $tags["SUBJECT_HELP"] = $_SESSION["OBJ_help"]->show_link("mailto", "subject"); *************** *** 276,284 **** } ! $addedheaders = "From: ".$_REQUEST["MT_FROM"]."\r\n"; ! $addedheaders .= "X-Mail-Addr: ".$_SERVER["REMOTE_ADDR"]."\r\n";; ! $addedheaders .= "X-Mail-DateTime: ".date("r"); ! mail($_REQUEST["MT_LABEL"]." <".$_REQUEST["MT_ADDRESS"]."> ", stripslashes($_REQUEST["MT_SUBJECT"]), stripslashes($_REQUEST["MT_MESSAGE"]), $addedheaders); $_SESSION["mailto_time"] = time(); --- 294,310 ---- } ! if(isset($_REQUEST["MT_NAME"])) { ! $addedHeaders = "From: " . $_REQUEST["MT_NAME"] . " <" . $_REQUEST["MT_FROM"].">\r\n"; ! } else { ! $addedHeaders = "From: ".$_REQUEST["MT_FROM"]."\r\n"; ! } ! $addedHeaders .= "X-Mail-Addr: ".$_SERVER["REMOTE_ADDR"]."\r\n";; ! $addedHeaders .= "X-Mail-DateTime: ".date("r"); ! $toString = $_REQUEST["MT_LABEL"]." <".$_REQUEST["MT_ADDRESS"].">"; ! $subjectString = stripslashes($_REQUEST["MT_PREFIX"] . " " . $_REQUEST["MT_SUBJECT"]); ! $messageString = stripslashes($_REQUEST["MT_MESSAGE"]); ! ! mail($toString, $subjectString, $messageString, $addedHeaders); $_SESSION["mailto_time"] = time(); *************** *** 401,404 **** --- 427,438 ---- }// END FUNC getFrom + function getPrefix() { + if(isset($this->_prefix) && strlen($this->_prefix) > 0) { + return $this->_prefix; + } else { + return NULL; + } + }// END FUNC getPrefix + function getReqlogin() { if(isset($this->_reqlogin)) { |
|
From: Tony M. <cl...@us...> - 2004-04-13 00:46:59
|
Update of /cvsroot/phpwebsite-comm/modules/mailto/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29074/mailto/boost Modified Files: install.sql uninstall.php update.php Log Message: Removed search capability. Added Help Added Prefix to be prepended onto the subject of the mail Added Real Name field (optional) Index: install.sql =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailto/boost/install.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** install.sql 29 Mar 2004 21:08:01 -0000 1.2 --- install.sql 13 Apr 2004 00:33:01 -0000 1.3 *************** *** 13,16 **** --- 13,17 ---- subject text, lock_subject smallint NOT NULL default '0', + prefix varchar(20) default NULL, PRIMARY KEY (id) ); Index: uninstall.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailto/boost/uninstall.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** uninstall.php 4 Apr 2004 00:24:28 -0000 1.2 --- uninstall.php 13 Apr 2004 00:33:01 -0000 1.3 *************** *** 11,14 **** --- 11,16 ---- } + require_once(PHPWS_SOURCE_DIR.'mod/help/class/CLS_help.php'); + /* Import the uninstall database file and dump the result into the status variable */ if($status = $GLOBALS["core"]->sqlImport(PHPWS_SOURCE_DIR . "mod/mailto/boost/uninstall.sql", 1, 1)) { *************** *** 16,23 **** /* Unregister from the Help system */ ! if(!CLS_help::uninstall_help("mailto")) { ! $content .= "Problem unregistering Mailto from the Help system.<br />"; ! } else { $content .= "Mailto successfully removed from the Help system.<br />"; } --- 18,25 ---- /* Unregister from the Help system */ ! if(CLS_help::uninstall_help("mailto")) { $content .= "Mailto successfully removed from the Help system.<br />"; + } else { + $content .= "Problem unregistering Mailto from the Help system.<br />"; } Index: update.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailto/boost/update.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** update.php 4 Apr 2004 00:24:28 -0000 1.3 --- update.php 13 Apr 2004 00:33:01 -0000 1.4 *************** *** 30,39 **** if ($currentVersion < "0.1.2"){ /* Unregister with core search module */ if(isset($_SESSION["OBJ_search"])) { $GLOBALS["core"]->sqlDelete("mod_search_register", "module", "mailto"); ! $content .= "Mailto successfully unregistered from the search module.<br />"; } /* Register with the Help system */ if(!CLS_help::setup_help("mailto")) { --- 30,51 ---- if ($currentVersion < "0.1.2"){ + /* Add new "prefix" field */ + if($GLOBALS['core']->query("ALTER TABLE mod_mailto_items ADD COLUMN `prefix` " . + "varchar (20) DEFAULT NULL AFTER `lock_subject`", TRUE)) { + $content .= "Added database field holding a prefix to be placed before every subject. <br />"; + } else { + $content .= "Boost failed to create the attribute 'prefix' under the table 'mod_mailto_items'. <br /><br />"; + $status = 0; + } + /* Unregister with core search module */ if(isset($_SESSION["OBJ_search"])) { $GLOBALS["core"]->sqlDelete("mod_search_register", "module", "mailto"); ! $content .= "Mailto successfully unregistered from the search module because search was not needed.. <br />"; } + /* Unregister with the help system as a safety precaution */ + CLS_help::uninstall_help("mailto"); + /* Register with the Help system */ if(!CLS_help::setup_help("mailto")) { *************** *** 42,46 **** $content .= "Mailto registered successfully with the Help system.<br />"; } ! $content .= "Mailto successfully updated for version 0.1.2 changes.<br />"; --- 54,59 ---- $content .= "Mailto registered successfully with the Help system.<br />"; } ! ! $content .= "Name field added to \"From\" on the mailto form.<br />"; $content .= "Mailto successfully updated for version 0.1.2 changes.<br />"; |
|
From: Tony M. <cl...@us...> - 2004-04-13 00:46:59
|
Update of /cvsroot/phpwebsite-comm/modules/mailto/conf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29074/mailto/conf Modified Files: boost.php Log Message: Removed search capability. Added Help Added Prefix to be prepended onto the subject of the mail Added Real Name field (optional) Index: boost.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailto/conf/boost.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** boost.php 2 Apr 2004 02:28:58 -0000 1.3 --- boost.php 13 Apr 2004 00:33:05 -0000 1.4 *************** *** 13,17 **** /* The proper name for your module to be shown to users */ ! $mod_pname = "Mailto Module"; /* The modules you wish to allow your module to be viewed on */ --- 13,17 ---- /* The proper name for your module to be shown to users */ ! $mod_pname = "Mailto"; /* The modules you wish to allow your module to be viewed on */ |
|
From: Tony M. <cl...@us...> - 2004-04-04 04:35:44
|
Update of /cvsroot/phpwebsite-comm/modules/mailto/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11811/mailto/class Modified Files: Mailto.php Log Message: Fixed e-mail checking bugaboo. Now checking allows bypass it's only to catch blatant errors. Also fixed a validation bug where it would preload your e-mail address after warning you instead of what you changed it to. Index: Mailto.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailto/class/Mailto.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Mailto.php 4 Apr 2004 00:24:30 -0000 1.4 --- Mailto.php 4 Apr 2004 04:23:17 -0000 1.5 *************** *** 175,184 **** if($this->_reqlogin == 0) { if(isset($_SESSION['OBJ_user']->username)) { ! $form->add("MT_FROM", "text", $_SESSION['OBJ_user']->username." <".$_SESSION['OBJ_user']->email.">"); } else { $form->add("MT_FROM", "text", $this->_from); } } else { ! $form->add("MT_FROM", "hidden", $_SESSION['OBJ_user']->username." <".$_SESSION['OBJ_user']->email.">"); } $form->setSize("MT_FROM", 30); --- 175,189 ---- if($this->_reqlogin == 0) { if(isset($_SESSION['OBJ_user']->username)) { ! /* Only load it if it has not been loaded yet */ ! if(!isset($_REQUEST["MT_FROM"])) { ! $form->add("MT_FROM", "text", $_SESSION['OBJ_user']->email); ! } else { ! $form->add("MT_FROM", "text", $this->_from); ! } } else { $form->add("MT_FROM", "text", $this->_from); } } else { ! $form->add("MT_FROM", "hidden", $_SESSION['OBJ_user']->email); } $form->setSize("MT_FROM", 30); *************** *** 206,210 **** if($this->_reqlogin <> 0) { ! $tags["MT_FROM"] = $_SESSION['OBJ_user']->username." <".$_SESSION['OBJ_user']->email.">"; } --- 211,215 ---- if($this->_reqlogin <> 0) { ! $tags["MT_FROM"] = $_SESSION['OBJ_user']->email; } *************** *** 323,327 **** if(is_string($address)) { if(strlen($address) > 0) { ! $this->_address = PHPWS_Text::parseOutput($address); return TRUE; } else { --- 328,332 ---- if(is_string($address)) { if(strlen($address) > 0) { ! $this->_address = $address; return TRUE; } else { *************** *** 337,341 **** function setSubject($subject) { if(strlen($subject) > 0) { ! $this->_address = PHPWS_Text::parseOutput($subject); return TRUE; } else { --- 342,346 ---- function setSubject($subject) { if(strlen($subject) > 0) { ! $this->_address = $subject; return TRUE; } else { *************** *** 347,351 **** function setMessage($msg) { if(strlen($msg) > 0) { ! $this->_message = PHPWS_Text::parseOutput($msg); return TRUE; } else { --- 352,356 ---- function setMessage($msg) { if(strlen($msg) > 0) { ! $this->_message = $msg; return TRUE; } else { *************** *** 357,361 **** function getAddress() { if(isset($this->_address) && strlen($this->_address) > 0) { ! return PHPWS_Text::parseOutput($this->_address); } else { return NULL; --- 362,366 ---- function getAddress() { if(isset($this->_address) && strlen($this->_address) > 0) { ! return $this->_address; } else { return NULL; *************** *** 364,381 **** function setFrom($from) { ! if (strstr("<", $from) && !strstr(">", $from)) $from .= ">"; ! if (!(list($name, $email) = split("<", $from, 2))) $email = $from; ! $email = str_replace(">", "", $email); ! if (eregi("^[_a-z0-9-]+(\.[_a-z0-9-]+)*@([0-9a-z][0-9a-z-]*[0-9a-z]\.)+[a-z]{2}[mtgvu]?$", $email, $check)) { ! if ( getmxrr(substr(strstr($check[0], '@'), 1), $validate_email_temp) ) { $this->_from = $from; return true; } else { ! $message = $_SESSION["translate"]->it("E-mail address does not appear to be set up properly"); return new PHPWS_Error("mailto", "PHPWS_Mailto::mailit", $message); - // echo 'MX record not found for email: '.$email; } } else { ! $message = $_SESSION["translate"]->it("E-mail address is badly formed. It must be either of the form <i>Your Name <yo...@na...></i> or <i>yo...@na...</i>. Please correct it and try again."); return new PHPWS_Error("mailto", "PHPWS_Mailto::mailit", $message); } --- 369,384 ---- function setFrom($from) { ! if (eregi("^[_a-z0-9-]+(\.[_a-z0-9-]+)*@([0-9a-z][0-9a-z-]*[0-9a-z]\.)+[a-z]{2,4}[mtgvu]?$", $from, $check) || $from == $_SESSION["save_from"]) { ! if (getmxrr(substr(strstr($check[0], '@'), 1), $validate_email_temp) || $from == $_SESSION["save_from"] ) { $this->_from = $from; return true; } else { ! $_SESSION["save_from"] = $from; ! $message = $_SESSION["translate"]->it("E-mail address does not appear to be set up properly. Check the e-mail and if it's correct, press the [Mail it!] button again to send it. Otherwise correct the e-mail address then resend it."); return new PHPWS_Error("mailto", "PHPWS_Mailto::mailit", $message); } } else { ! $_SESSION["save_from"] = $from; ! $message = $_SESSION["translate"]->it("E-mail address is badly formed. It must be of the form <i>yo...@na...</i>. If you are sure it is correct, press [Mail it!] again, otherwise, please correct it and try again."); return new PHPWS_Error("mailto", "PHPWS_Mailto::mailit", $message); } *************** *** 384,388 **** function getFrom() { if(isset($this->_from) && strlen($this->_from) > 0) { ! return PHPWS_Text::parseOutput($this->_from); } else { return NULL; --- 387,391 ---- function getFrom() { if(isset($this->_from) && strlen($this->_from) > 0) { ! return $this->_from; } else { return NULL; *************** *** 392,396 **** function getSubject() { if(isset($this->_subject) && strlen($this->_subject) > 0) { ! return PHPWS_Text::parseOutput($this->_subject); } else { return NULL; --- 395,399 ---- function getSubject() { if(isset($this->_subject) && strlen($this->_subject) > 0) { ! return $this->_subject; } else { return NULL; |
|
From: Tony M. <cl...@us...> - 2004-04-04 00:36:53
|
Update of /cvsroot/phpwebsite-comm/modules/mailto/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11662/mailto/templates Modified Files: edit.tpl mail.tpl menu.tpl view.tpl Log Message: Registered with the help facility. Removed the search facility. Index: menu.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailto/templates/menu.tpl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** menu.tpl 26 Mar 2004 18:56:49 -0000 1.1.1.1 --- menu.tpl 4 Apr 2004 00:24:30 -0000 1.2 *************** *** 9,10 **** --- 9,11 ---- <br /> <b>{MAILTO_MESSAGE}</b> + {ACTION_HELP} Index: mail.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailto/templates/mail.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mail.tpl 29 Mar 2004 21:08:04 -0000 1.2 --- mail.tpl 4 Apr 2004 00:24:30 -0000 1.3 *************** *** 3,9 **** {START_FORM} <b>{LABEL_TO}:</b> {MT_TO}<br /><br /> ! <b>{LABEL_FROM}:</b>     {MT_FROM}<br /><br /> ! <b>{LABEL_SUBJECT}:</b> {MT_SUBJECT}<br /><br /> ! <b>{LABEL_MESSAGE}:</b><br /> {MT_MESSAGE}<br /><br /> {MT_SAVE} --- 3,9 ---- {START_FORM} <b>{LABEL_TO}:</b> {MT_TO}<br /><br /> ! <b>{LABEL_FROM}:</b>     {MT_FROM} {FROM_HELP}<br /><br /> ! <b>{LABEL_SUBJECT}:</b> {MT_SUBJECT} {SUBJECT_HELP}<br /><br /> ! <b>{LABEL_MESSAGE}: {MESSAGE_HELP}</b><br /> {MT_MESSAGE}<br /><br /> {MT_SAVE} Index: view.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailto/templates/view.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** view.tpl 29 Mar 2004 21:08:04 -0000 1.2 --- view.tpl 4 Apr 2004 00:24:30 -0000 1.3 *************** *** 10,14 **** {MT_LOCK_SUBJECT}<br /><br /> <b>{LABEL_URL}:</b> ! {MT_URL}<br /><br /> <b>{LABEL_REQLOGIN}:</b> {MT_REQLOGIN}<br /> --- 10,14 ---- {MT_LOCK_SUBJECT}<br /><br /> <b>{LABEL_URL}:</b> ! {MT_URL} {URL_HELP}<br /><br /> <b>{LABEL_REQLOGIN}:</b> {MT_REQLOGIN}<br /> Index: edit.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailto/templates/edit.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** edit.tpl 29 Mar 2004 21:08:04 -0000 1.2 --- edit.tpl 4 Apr 2004 00:24:30 -0000 1.3 *************** *** 3,14 **** {START_FORM} <b>{LABEL_LABEL}:</b><br /> ! {MT_LABEL}<br /><br /> <b>{ADDRESS_LABEL}:</b><br /> ! {MT_ADDRESS}<br /><br /> <b>{SUBJECT_LABEL}:</b><br /> ! {MT_SUBJECT}<br /><br /> <b>{LOCK_SUBJECT_LABEL}:</b> ! {MT_LOCK_SUBJECT}<br /><br /> <b>{REQLOGIN_LABEL}:</b> ! {MT_REQLOGIN}<br /><br /> {MT_SAVE} --- 3,14 ---- {START_FORM} <b>{LABEL_LABEL}:</b><br /> ! {MT_LABEL} {LABEL_HELP}<br /><br /> <b>{ADDRESS_LABEL}:</b><br /> ! {MT_ADDRESS} {ADDRESS_HELP}<br /><br /> <b>{SUBJECT_LABEL}:</b><br /> ! {MT_SUBJECT} {SUBJECT_HELP}<br /><br /> <b>{LOCK_SUBJECT_LABEL}:</b> ! {MT_LOCK_SUBJECT} {LOCK_SUBJECT_HELP}<br /><br /> <b>{REQLOGIN_LABEL}:</b> ! {MT_REQLOGIN} {REQLOGIN_HELP}<br /><br /> {MT_SAVE} |
|
From: Tony M. <cl...@us...> - 2004-04-04 00:36:53
|
Update of /cvsroot/phpwebsite-comm/modules/mailto/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11662/mailto/class Modified Files: Mailto.php MailtoManager.php Log Message: Registered with the help facility. Removed the search facility. Index: MailtoManager.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailto/class/MailtoManager.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** MailtoManager.php 26 Mar 2004 18:56:49 -0000 1.1.1.1 --- MailtoManager.php 4 Apr 2004 00:24:30 -0000 1.2 *************** *** 25,28 **** --- 25,29 ---- $tags["LIST_MAILTOS"] = "<a href=\"index.php?module=mailto&MT_MAN_OP=main\">$listMailtos</a>"; + $tags["ACTION_HELP"] = $_SESSION["OBJ_help"]->show_link("mailto", "action"); if(isset($_SESSION["PHPWS_Mailto_Message"])) { Index: Mailto.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailto/class/Mailto.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Mailto.php 2 Apr 2004 02:28:57 -0000 1.3 --- Mailto.php 4 Apr 2004 00:24:30 -0000 1.4 *************** *** 46,50 **** if($_SESSION['OBJ_user']->allow_access("mailto", "view")) { $form = new EZForm("mailto_view"); ! $form->add("MT_URL", "text", "<a href=\"index.php?module=mailto&PHPWS_MAN_ITEMS[]=".$this->getID()."&MT_MAN_OP=mail\">Link text</a>"); $form->setSize("MT_URL", 80); $form->add("module", "hidden", "mailto"); --- 46,50 ---- if($_SESSION['OBJ_user']->allow_access("mailto", "view")) { $form = new EZForm("mailto_view"); ! $form->add("MT_URL", "text", "<a href=\"index.php?module=mailto&PHPWS_MAN_ITEMS[]=".$this->getID()."&MT_MAN_OP=mail\">Link text</a>"); $form->setSize("MT_URL", 80); $form->add("module", "hidden", "mailto"); *************** *** 75,78 **** --- 75,79 ---- $tags["LABEL_ADDRESS"] = $_SESSION["translate"]->it("Address"); $tags["LABEL_URL"] = $_SESSION["translate"]->it("URL"); + $tags["URL_HELP"] = $_SESSION["OBJ_help"]->show_link("mailto", "url"); $tags["LABEL_REQLOGIN"] = $_SESSION["translate"]->it("Require Login?"); $tags["LABEL_LOCK_SUBJECT"] = $_SESSION["translate"]->it("Lock Subject?"); *************** *** 114,121 **** --- 115,127 ---- $tags["LABEL_LABEL"] = $_SESSION["translate"]->it("Label"); + $tags["LABEL_HELP"] = $_SESSION["OBJ_help"]->show_link("mailto", "label"); $tags["ADDRESS_LABEL"] = $_SESSION["translate"]->it("Address"); + $tags["ADDRESS_HELP"] = $_SESSION["OBJ_help"]->show_link("mailto", "address"); $tags["SUBJECT_LABEL"] = $_SESSION["translate"]->it("Subject"); + $tags["SUBJECT_HELP"] = $_SESSION["OBJ_help"]->show_link("mailto", "subject"); $tags["LOCK_SUBJECT_LABEL"] = $_SESSION["translate"]->it("Lock Subject?"); + $tags["LOCK_SUBJECT_HELP"] = $_SESSION["OBJ_help"]->show_link("mailto", "lock_subject"); $tags["REQLOGIN_LABEL"] = $_SESSION["translate"]->it("Require Login?"); + $tags["REQLOGIN_HELP"] = $_SESSION["OBJ_help"]->show_link("mailto", "reqlogin"); return PHPWS_Template::processTemplate($tags, "mailto", "edit.tpl"); *************** *** 169,180 **** if($this->_reqlogin == 0) { if(isset($_SESSION['OBJ_user']->username)) { ! //$form->add("MT_FROM", "text", $_SESSION['OBJ_user']->username." <".$_SESSION['OBJ_user']->email.">"); ! $form->add("MT_FROM", "text", $_SESSION['OBJ_user']->email); } else { $form->add("MT_FROM", "text", $this->_from); } } else { ! //$form->add("MT_FROM", "hidden", $_SESSION['OBJ_user']->username." <".$_SESSION['OBJ_user']->email.">"); ! $form->add("MT_FROM", "text", $_SESSION['OBJ_user']->email); } $form->setSize("MT_FROM", 30); --- 175,184 ---- if($this->_reqlogin == 0) { if(isset($_SESSION['OBJ_user']->username)) { ! $form->add("MT_FROM", "text", $_SESSION['OBJ_user']->username." <".$_SESSION['OBJ_user']->email.">"); } else { $form->add("MT_FROM", "text", $this->_from); } } else { ! $form->add("MT_FROM", "hidden", $_SESSION['OBJ_user']->username." <".$_SESSION['OBJ_user']->email.">"); } $form->setSize("MT_FROM", 30); *************** *** 202,207 **** if($this->_reqlogin <> 0) { ! //$tags["MT_FROM"] = $_SESSION['OBJ_user']->username." <".$_SESSION['OBJ_user']->email.">"; ! $tags["MT_FROM"] = $_SESSION['OBJ_user']->email; } --- 206,210 ---- if($this->_reqlogin <> 0) { ! $tags["MT_FROM"] = $_SESSION['OBJ_user']->username." <".$_SESSION['OBJ_user']->email.">"; } *************** *** 211,216 **** --- 214,222 ---- $tags["LABEL_TO"] = $_SESSION["translate"]->it("To"); $tags["LABEL_FROM"] = $_SESSION["translate"]->it("From"); + $tags["FROM_HELP"] = $_SESSION["OBJ_help"]->show_link("mailto", "from"); $tags["LABEL_SUBJECT"] = $_SESSION["translate"]->it("Subject"); + $tags["SUBJECT_HELP"] = $_SESSION["OBJ_help"]->show_link("mailto", "subject"); $tags["LABEL_MESSAGE"] = $_SESSION["translate"]->it("Message"); + $tags["MESSAGE_HELP"] = $_SESSION["OBJ_help"]->show_link("mailto", "message"); return PHPWS_Template::processTemplate($tags, "mailto", "mail.tpl"); *************** *** 317,322 **** if(is_string($address)) { if(strlen($address) > 0) { ! //$this->_address = PHPWS_Text::parseOutput($address); ! $this->_address; return TRUE; } else { --- 323,327 ---- if(is_string($address)) { if(strlen($address) > 0) { ! $this->_address = PHPWS_Text::parseOutput($address); return TRUE; } else { *************** *** 352,357 **** function getAddress() { if(isset($this->_address) && strlen($this->_address) > 0) { ! // return PHPWS_Text::parseOutput($this->_address); ! return $this->_address; } else { return NULL; --- 357,361 ---- function getAddress() { if(isset($this->_address) && strlen($this->_address) > 0) { ! return PHPWS_Text::parseOutput($this->_address); } else { return NULL; *************** *** 360,375 **** function setFrom($from) { ! if (PHPWS_Text::isValidInput($from, "email")){ ! if ( $from == $_SESSION["from"] && getmxrr(substr(strstr($from, '@'), 1), $validate_email_temp) ) { $this->_from = $from; return true; } else { ! $_SESSION["from"] = $from; ! $message = $_SESSION["translate"]->it("E-mail address does not appear to be set up properly. If you are sure this is a valid e-mail address, press [Mail it!], otherwise, correct it and try again."); return new PHPWS_Error("mailto", "PHPWS_Mailto::mailit", $message); // echo 'MX record not found for email: '.$email; } } else { ! $message = $_SESSION["translate"]->it("E-mail address is badly formed. It must be of the form <em>you...@do...</em>. Please correct it and try again."); return new PHPWS_Error("mailto", "PHPWS_Mailto::mailit", $message); } --- 364,381 ---- function setFrom($from) { ! if (strstr("<", $from) && !strstr(">", $from)) $from .= ">"; ! if (!(list($name, $email) = split("<", $from, 2))) $email = $from; ! $email = str_replace(">", "", $email); ! if (eregi("^[_a-z0-9-]+(\.[_a-z0-9-]+)*@([0-9a-z][0-9a-z-]*[0-9a-z]\.)+[a-z]{2}[mtgvu]?$", $email, $check)) { ! if ( getmxrr(substr(strstr($check[0], '@'), 1), $validate_email_temp) ) { $this->_from = $from; return true; } else { ! $message = $_SESSION["translate"]->it("E-mail address does not appear to be set up properly"); return new PHPWS_Error("mailto", "PHPWS_Mailto::mailit", $message); // echo 'MX record not found for email: '.$email; } } else { ! $message = $_SESSION["translate"]->it("E-mail address is badly formed. It must be either of the form <i>Your Name <yo...@na...></i> or <i>yo...@na...</i>. Please correct it and try again."); return new PHPWS_Error("mailto", "PHPWS_Mailto::mailit", $message); } *************** *** 378,383 **** function getFrom() { if(isset($this->_from) && strlen($this->_from) > 0) { ! //return PHPWS_Text::parseOutput($this->_from); ! return $this->_from; } else { return NULL; --- 384,388 ---- function getFrom() { if(isset($this->_from) && strlen($this->_from) > 0) { ! return PHPWS_Text::parseOutput($this->_from); } else { return NULL; |
|
From: Tony M. <cl...@us...> - 2004-04-04 00:36:52
|
Update of /cvsroot/phpwebsite-comm/modules/mailto/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11662/mailto/boost Modified Files: install.php uninstall.php update.php Log Message: Registered with the help facility. Removed the search facility. Index: uninstall.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailto/boost/uninstall.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** uninstall.php 26 Mar 2004 18:56:49 -0000 1.1.1.1 --- uninstall.php 4 Apr 2004 00:24:28 -0000 1.2 *************** *** 15,21 **** $content .= "All mailto tables successfully removed!<br /><br />"; ! /* Unregister with core search module */ ! if(isset($_SESSION["OBJ_search"])) { ! $GLOBALS["core"]->sqlDelete("mod_search_register", "module", "phatfile"); } --- 15,23 ---- $content .= "All mailto tables successfully removed!<br /><br />"; ! /* Unregister from the Help system */ ! if(!CLS_help::uninstall_help("mailto")) { ! $content .= "Problem unregistering Mailto from the Help system.<br />"; ! } else { ! $content .= "Mailto successfully removed from the Help system.<br />"; } Index: install.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailto/boost/install.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** install.php 2 Apr 2004 02:28:48 -0000 1.2 --- install.php 4 Apr 2004 00:24:28 -0000 1.3 *************** *** 20,26 **** $content .= "All mailto tables successfully written.<br /><br />"; ! /* Register with core search module */ ! require_once(PHPWS_SOURCE_DIR.'mod/search/class/Search.php'); ! PHPWS_Search::register("mailto"); $status = 1; --- 20,31 ---- $content .= "All mailto tables successfully written.<br /><br />"; ! /* Extra stuff goes here */ ! ! /* Register with the Help system */ ! if(!CLS_help::setup_help("mailto")) { ! $content .= "Problem registering Mailto with the Help system.<br />"; ! } else { ! $content .= "Mailto registered successfully with the Help system.<br />"; ! } $status = 1; Index: update.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailto/boost/update.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** update.php 29 Mar 2004 21:08:01 -0000 1.2 --- update.php 4 Apr 2004 00:24:28 -0000 1.3 *************** *** 28,30 **** --- 28,49 ---- } + if ($currentVersion < "0.1.2"){ + + /* Unregister with core search module */ + if(isset($_SESSION["OBJ_search"])) { + $GLOBALS["core"]->sqlDelete("mod_search_register", "module", "mailto"); + $content .= "Mailto successfully unregistered from the search module.<br />"; + } + + /* Register with the Help system */ + if(!CLS_help::setup_help("mailto")) { + $content .= "Problem registering Mailto with the Help system.<br />"; + } else { + $content .= "Mailto registered successfully with the Help system.<br />"; + } + + $content .= "Mailto successfully updated for version 0.1.2 changes.<br />"; + + } + ?> |
|
From: Tony M. <cl...@us...> - 2004-04-02 19:11:36
|
Update of /cvsroot/phpwebsite-comm/modules/quotes/conf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17801/quotes/conf Modified Files: boost.php Log Message: Minor bug fixes and reorganization. Index: boost.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/quotes/conf/boost.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** boost.php 18 Jan 2004 02:21:13 -0000 1.2 --- boost.php 2 Apr 2004 18:58:50 -0000 1.3 *************** *** 8,12 **** /* The version of your module. Make sure to increment this on updates */ ! $version = "0.2.1"; /* The unix style name for your module */ --- 8,12 ---- /* The version of your module. Make sure to increment this on updates */ ! $version = "0.2"; /* The unix style name for your module */ |
|
From: Tony M. <cl...@us...> - 2004-04-02 19:11:33
|
Update of /cvsroot/phpwebsite-comm/modules/quotes/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17801/quotes/boost Modified Files: install.php uninstall.php update.php Log Message: Minor bug fixes and reorganization. Index: update.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/quotes/boost/update.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** update.php 18 Jan 2004 02:21:09 -0000 1.2 --- update.php 2 Apr 2004 18:58:50 -0000 1.3 *************** *** 1,16 **** - <?php - /* update.php - Script to update the module when changes are made */ - - if (!$_SESSION["OBJ_user"]->isDeity()){ - header("location:index.php"); - exit(); - } - - $status = 1; - - if ($currentVersion < "0.2.1") { - $content .= "Updating Quotes Module to Version 0.2.1<br />"; - $content .= "Local references for includes in runtime.php fixed.<br />"; - } - - ?> --- 0 ---- |
|
From: Tony M. <cl...@us...> - 2004-04-02 19:11:17
|
Update of /cvsroot/phpwebsite-comm/modules/quotes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17801/quotes Modified Files: index.php Log Message: Minor bug fixes and reorganization. |
|
From: Tony M. <cl...@us...> - 2004-04-02 02:41:01
|
Update of /cvsroot/phpwebsite-comm/modules/mailto/conf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6730/mailto/conf Modified Files: boost.php Log Message: Fixed problems with email validation. Some typos. Index: boost.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailto/conf/boost.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** boost.php 29 Mar 2004 21:08:04 -0000 1.2 --- boost.php 2 Apr 2004 02:28:58 -0000 1.3 *************** *** 7,11 **** /* The version of your module. Make sure to increment this on updates */ ! $version = "0.1.1"; /* The unix style name for your module */ --- 7,11 ---- /* The version of your module. Make sure to increment this on updates */ ! $version = "0.1.2"; /* The unix style name for your module */ |
|
From: Tony M. <cl...@us...> - 2004-04-02 02:41:01
|
Update of /cvsroot/phpwebsite-comm/modules/mailto/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6730/mailto/class Modified Files: Mailto.php Log Message: Fixed problems with email validation. Some typos. Index: Mailto.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailto/class/Mailto.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Mailto.php 29 Mar 2004 21:08:04 -0000 1.2 --- Mailto.php 2 Apr 2004 02:28:57 -0000 1.3 *************** *** 46,50 **** if($_SESSION['OBJ_user']->allow_access("mailto", "view")) { $form = new EZForm("mailto_view"); ! $form->add("MT_URL", "text", "<a href=\"index.php?module=mailto&PHPWS_MAN_ITEMS[]=".$this->getID()."&MT_MAN_OP=mail\">Link text</a>"); $form->setSize("MT_URL", 80); $form->add("module", "hidden", "mailto"); --- 46,50 ---- if($_SESSION['OBJ_user']->allow_access("mailto", "view")) { $form = new EZForm("mailto_view"); ! $form->add("MT_URL", "text", "<a href=\"index.php?module=mailto&PHPWS_MAN_ITEMS[]=".$this->getID()."&MT_MAN_OP=mail\">Link text</a>"); $form->setSize("MT_URL", 80); $form->add("module", "hidden", "mailto"); *************** *** 169,178 **** if($this->_reqlogin == 0) { if(isset($_SESSION['OBJ_user']->username)) { ! $form->add("MT_FROM", "text", $_SESSION['OBJ_user']->username." <".$_SESSION['OBJ_user']->email.">"); } else { $form->add("MT_FROM", "text", $this->_from); } } else { ! $form->add("MT_FROM", "hidden", $_SESSION['OBJ_user']->username." <".$_SESSION['OBJ_user']->email.">"); } $form->setSize("MT_FROM", 30); --- 169,180 ---- if($this->_reqlogin == 0) { if(isset($_SESSION['OBJ_user']->username)) { ! //$form->add("MT_FROM", "text", $_SESSION['OBJ_user']->username." <".$_SESSION['OBJ_user']->email.">"); ! $form->add("MT_FROM", "text", $_SESSION['OBJ_user']->email); } else { $form->add("MT_FROM", "text", $this->_from); } } else { ! //$form->add("MT_FROM", "hidden", $_SESSION['OBJ_user']->username." <".$_SESSION['OBJ_user']->email.">"); ! $form->add("MT_FROM", "text", $_SESSION['OBJ_user']->email); } $form->setSize("MT_FROM", 30); *************** *** 200,204 **** if($this->_reqlogin <> 0) { ! $tags["MT_FROM"] = $_SESSION['OBJ_user']->username." <".$_SESSION['OBJ_user']->email.">"; } --- 202,207 ---- if($this->_reqlogin <> 0) { ! //$tags["MT_FROM"] = $_SESSION['OBJ_user']->username." <".$_SESSION['OBJ_user']->email.">"; ! $tags["MT_FROM"] = $_SESSION['OBJ_user']->email; } *************** *** 314,318 **** if(is_string($address)) { if(strlen($address) > 0) { ! $this->_address = PHPWS_Text::parseOutput($address); return TRUE; } else { --- 317,322 ---- if(is_string($address)) { if(strlen($address) > 0) { ! //$this->_address = PHPWS_Text::parseOutput($address); ! $this->_address; return TRUE; } else { *************** *** 348,352 **** function getAddress() { if(isset($this->_address) && strlen($this->_address) > 0) { ! return PHPWS_Text::parseOutput($this->_address); } else { return NULL; --- 352,357 ---- function getAddress() { if(isset($this->_address) && strlen($this->_address) > 0) { ! // return PHPWS_Text::parseOutput($this->_address); ! return $this->_address; } else { return NULL; *************** *** 355,372 **** function setFrom($from) { ! if (strstr("<", $from) && !strstr(">", $from)) $from .= ">"; ! if (!(list($name, $email) = split("<", $from, 2))) $email = $from; ! $email = str_replace(">", "", $email); ! if (eregi("^[_a-z0-9-]+(\.[_a-z0-9-]+)*@([0-9a-z][0-9a-z-]*[0-9a-z]\.)+[a-z]{2}[mtgvu]?$", $email, $check)) { ! if ( getmxrr(substr(strstr($check[0], '@'), 1), $validate_email_temp) ) { $this->_from = $from; return true; } else { ! $message = $_SESSION["translate"]->it("E-mail address does not appear to be set up properly"); return new PHPWS_Error("mailto", "PHPWS_Mailto::mailit", $message); // echo 'MX record not found for email: '.$email; } } else { ! $message = $_SESSION["translate"]->it("E-mail address is badly formed. It must be either of the form <i>Your Name <yo...@na...></i> or <i>yo...@na...</i>. Please correct it and try again."); return new PHPWS_Error("mailto", "PHPWS_Mailto::mailit", $message); } --- 360,375 ---- function setFrom($from) { ! if (PHPWS_Text::isValidInput($from, "email")){ ! if ( $from == $_SESSION["from"] && getmxrr(substr(strstr($from, '@'), 1), $validate_email_temp) ) { $this->_from = $from; return true; } else { ! $_SESSION["from"] = $from; ! $message = $_SESSION["translate"]->it("E-mail address does not appear to be set up properly. If you are sure this is a valid e-mail address, press [Mail it!], otherwise, correct it and try again."); return new PHPWS_Error("mailto", "PHPWS_Mailto::mailit", $message); // echo 'MX record not found for email: '.$email; } } else { ! $message = $_SESSION["translate"]->it("E-mail address is badly formed. It must be of the form <em>you...@do...</em>. Please correct it and try again."); return new PHPWS_Error("mailto", "PHPWS_Mailto::mailit", $message); } *************** *** 375,379 **** function getFrom() { if(isset($this->_from) && strlen($this->_from) > 0) { ! return PHPWS_Text::parseOutput($this->_from); } else { return NULL; --- 378,383 ---- function getFrom() { if(isset($this->_from) && strlen($this->_from) > 0) { ! //return PHPWS_Text::parseOutput($this->_from); ! return $this->_from; } else { return NULL; |
|
From: Tony M. <cl...@us...> - 2004-04-02 02:41:01
|
Update of /cvsroot/phpwebsite-comm/modules/mailto/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6730/mailto/boost Modified Files: install.php Log Message: Fixed problems with email validation. Some typos. Index: install.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailto/boost/install.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** install.php 26 Mar 2004 18:56:49 -0000 1.1.1.1 --- install.php 2 Apr 2004 02:28:48 -0000 1.2 *************** *** 21,36 **** /* Register with core search module */ ! $search['module'] = "mailto"; ! $search['search_class'] = "PHPWS_MailtoManager"; ! $search['search_function'] = "search"; ! $search['search_cols'] = "none"; ! $search['view_string'] = "none"; ! $search['show_block'] = 0; ! ! if(!$GLOBALS["core"]->sqlInsert($search, "mod_search_register")) { ! $content .= "Database problem when attempting to register with Search module.<br /><br />"; ! } else { ! $content .= "Successfully registered with Search module!<br /><br />"; ! } $status = 1; --- 21,26 ---- /* Register with core search module */ ! require_once(PHPWS_SOURCE_DIR.'mod/search/class/Search.php'); ! PHPWS_Search::register("mailto"); $status = 1; |
|
From: Tony M. <cl...@us...> - 2004-03-29 21:19:35
|
Update of /cvsroot/phpwebsite-comm/modules/mailto/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21138/modules/mailto/templates Modified Files: edit.tpl mail.tpl view.tpl Log Message: Added a pre-set subject option, also the ability to lock down the subject. Did some convention clean-up. Index: mail.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailto/templates/mail.tpl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** mail.tpl 26 Mar 2004 18:56:49 -0000 1.1.1.1 --- mail.tpl 29 Mar 2004 21:08:04 -0000 1.2 *************** *** 2,9 **** <h1>{TITLE}</h1> {START_FORM} ! <b>{TO_LABEL}:</b> {MT_TO}<br /><br /> ! <b>{FROM_LABEL}:</b>     {MT_FROM}<br /><br /> ! <b>{SUBJECT_LABEL}:</b> {MT_SUBJECT}<br /><br /> ! <b>{MESSAGE_LABEL}:</b><br /> {MT_MESSAGE}<br /><br /> {MT_SAVE} --- 2,9 ---- <h1>{TITLE}</h1> {START_FORM} ! <b>{LABEL_TO}:</b> {MT_TO}<br /><br /> ! <b>{LABEL_FROM}:</b>     {MT_FROM}<br /><br /> ! <b>{LABEL_SUBJECT}:</b> {MT_SUBJECT}<br /><br /> ! <b>{LABEL_MESSAGE}:</b><br /> {MT_MESSAGE}<br /><br /> {MT_SAVE} Index: view.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailto/templates/view.tpl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** view.tpl 26 Mar 2004 18:56:49 -0000 1.1.1.1 --- view.tpl 29 Mar 2004 21:08:04 -0000 1.2 *************** *** 5,8 **** --- 5,12 ---- <b>{LABEL_ADDRESS}:</b> {MT_ADDRESS}<br /><br /> + <b>{LABEL_SUBJECT}:</b> + {MT_SUBJECT}<br /><br /> + <b>{LABEL_LOCK_SUBJECT}:</b> + {MT_LOCK_SUBJECT}<br /><br /> <b>{LABEL_URL}:</b> {MT_URL}<br /><br /> Index: edit.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailto/templates/edit.tpl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** edit.tpl 26 Mar 2004 18:56:49 -0000 1.1.1.1 --- edit.tpl 29 Mar 2004 21:08:04 -0000 1.2 *************** *** 6,9 **** --- 6,13 ---- <b>{ADDRESS_LABEL}:</b><br /> {MT_ADDRESS}<br /><br /> + <b>{SUBJECT_LABEL}:</b><br /> + {MT_SUBJECT}<br /><br /> + <b>{LOCK_SUBJECT_LABEL}:</b> + {MT_LOCK_SUBJECT}<br /><br /> <b>{REQLOGIN_LABEL}:</b> {MT_REQLOGIN}<br /><br /> |
|
From: Tony M. <cl...@us...> - 2004-03-29 21:19:34
|
Update of /cvsroot/phpwebsite-comm/modules/mailto/conf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21138/modules/mailto/conf Modified Files: boost.php Log Message: Added a pre-set subject option, also the ability to lock down the subject. Did some convention clean-up. Index: boost.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailto/conf/boost.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** boost.php 26 Mar 2004 18:56:49 -0000 1.1.1.1 --- boost.php 29 Mar 2004 21:08:04 -0000 1.2 *************** *** 1,12 **** <?php /** ! * This is a mailto boost.php configuration file. Edit it to be ! * used with your module. * - * $Id$ */ /* The version of your module. Make sure to increment this on updates */ ! $version = "0.1.0"; /* The unix style name for your module */ --- 1,11 ---- <?php /** ! * This is a mailto boost.php configuration file. ! * * */ /* The version of your module. Make sure to increment this on updates */ ! $version = "0.1.1"; /* The unix style name for your module */ |
|
From: Tony M. <cl...@us...> - 2004-03-29 21:19:34
|
Update of /cvsroot/phpwebsite-comm/modules/mailto/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21138/modules/mailto/class Modified Files: Mailto.php Log Message: Added a pre-set subject option, also the ability to lock down the subject. Did some convention clean-up. Index: Mailto.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailto/class/Mailto.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Mailto.php 26 Mar 2004 18:56:49 -0000 1.1.1.1 --- Mailto.php 29 Mar 2004 21:08:04 -0000 1.2 *************** *** 14,24 **** var $_reqlogin = NULL; var $_from = NULL; - var $_subject = NULL; var $_message = NULL; var $_referer = NULL; function PHPWS_Mailto($MT_ID = NULL) { $exclude[] = "_from"; - $exclude[] = "_subject"; $exclude[] = "_message"; $exclude[] = "_referer"; --- 14,24 ---- var $_reqlogin = NULL; var $_from = NULL; var $_message = NULL; var $_referer = NULL; + var $_subject = NULL; + var $_lock_subject = NULL; function PHPWS_Mailto($MT_ID = NULL) { $exclude[] = "_from"; $exclude[] = "_message"; $exclude[] = "_referer"; *************** *** 60,72 **** $tags["MT_LABEL"] = $this->getLabel(); $tags["MT_ADDRESS"] = $this->getAddress(); ! if($this->getReqLogin() == 1) { $tags["MT_REQLOGIN"] = "Yes"; } else { ! $tags["MT_REQLOGIN"] = "Yes"; } $tags["LABEL_LABEL"] = $_SESSION["translate"]->it("Label"); $tags["LABEL_ADDRESS"] = $_SESSION["translate"]->it("Address"); $tags["LABEL_URL"] = $_SESSION["translate"]->it("URL"); $tags["LABEL_REQLOGIN"] = $_SESSION["translate"]->it("Require Login?"); return PHPWS_Template::processTemplate($tags, "mailto", "view.tpl"); --- 60,80 ---- $tags["MT_LABEL"] = $this->getLabel(); $tags["MT_ADDRESS"] = $this->getAddress(); ! $tags["MT_SUBJECT"] = $this->getSubject(); ! if($this->_reqlogin == 1) { $tags["MT_REQLOGIN"] = "Yes"; } else { ! $tags["MT_REQLOGIN"] = "No"; } + if($this->_lock_subject == 1) { + $tags["MT_LOCK_SUBJECT"] = "Yes"; + } else { + $tags["MT_LOCK_SUBJECT"] = "No"; + } + $tags["LABEL_SUBJECT"] = $_SESSION["translate"]->it("Subject"); $tags["LABEL_LABEL"] = $_SESSION["translate"]->it("Label"); $tags["LABEL_ADDRESS"] = $_SESSION["translate"]->it("Address"); $tags["LABEL_URL"] = $_SESSION["translate"]->it("URL"); $tags["LABEL_REQLOGIN"] = $_SESSION["translate"]->it("Require Login?"); + $tags["LABEL_LOCK_SUBJECT"] = $_SESSION["translate"]->it("Lock Subject?"); return PHPWS_Template::processTemplate($tags, "mailto", "view.tpl"); *************** *** 84,89 **** --- 92,100 ---- $form->add("MT_LABEL", "text", $this->getLabel()); $form->add("MT_ADDRESS", "text", $this->getAddress()); + $form->add("MT_SUBJECT", "text", $this->getSubject()); $form->add("MT_REQLOGIN", "checkbox"); $form->setMatch("MT_REQLOGIN", $this->_reqlogin); + $form->add("MT_LOCK_SUBJECT", "checkbox"); + $form->setMatch("MT_LOCK_SUBJECT", $this->_lock_subject); $form->add("MT_SAVE", "submit", $_SESSION["translate"]->it("Save Mailto")); $form->add("module", "hidden", "mailto"); *************** *** 104,107 **** --- 115,120 ---- $tags["LABEL_LABEL"] = $_SESSION["translate"]->it("Label"); $tags["ADDRESS_LABEL"] = $_SESSION["translate"]->it("Address"); + $tags["SUBJECT_LABEL"] = $_SESSION["translate"]->it("Subject"); + $tags["LOCK_SUBJECT_LABEL"] = $_SESSION["translate"]->it("Lock Subject?"); $tags["REQLOGIN_LABEL"] = $_SESSION["translate"]->it("Require Login?"); *************** *** 126,129 **** --- 139,146 ---- } + if(isset($_REQUEST["MT_SUBJECT"])) { + $this->_subject = $_REQUEST["MT_SUBJECT"]; + } + if(isset($_REQUEST["MT_REQLOGIN"])) { $this->_reqlogin = 1; *************** *** 132,135 **** --- 149,158 ---- } + if(isset($_REQUEST["MT_LOCK_SUBJECT"])) { + $this->_lock_subject = 1; + } else { + $this->_lock_subject = 0; + } + $this->commit(); *************** *** 145,154 **** if($this->_reqlogin == 0) { ! $form->add("MT_FROM", "text", $this->_from); } else { $form->add("MT_FROM", "hidden", $_SESSION['OBJ_user']->username." <".$_SESSION['OBJ_user']->email.">"); } $form->setSize("MT_FROM", 30); ! $form->add("MT_SUBJECT", "text", $this->_subject); $form->setSize("MT_SUBJECT", 50); $form->add("MT_MESSAGE", "textarea", $this->_message); --- 168,185 ---- if($this->_reqlogin == 0) { ! if(isset($_SESSION['OBJ_user']->username)) { ! $form->add("MT_FROM", "text", $_SESSION['OBJ_user']->username." <".$_SESSION['OBJ_user']->email.">"); ! } else { ! $form->add("MT_FROM", "text", $this->_from); ! } } else { $form->add("MT_FROM", "hidden", $_SESSION['OBJ_user']->username." <".$_SESSION['OBJ_user']->email.">"); } $form->setSize("MT_FROM", 30); ! if($this->_lock_subject == 0) { ! $form->add("MT_SUBJECT", "text", $this->_subject); ! } else { ! $form->add("MT_SUBJECT", "hidden", $this->_subject); ! } $form->setSize("MT_SUBJECT", 50); $form->add("MT_MESSAGE", "textarea", $this->_message); *************** *** 164,167 **** --- 195,202 ---- $tags = $form->getTemplate(); + if($this->_lock_subject == 1) { + $tags["MT_SUBJECT"] = $this->_subject; + } + if($this->_reqlogin <> 0) { $tags["MT_FROM"] = $_SESSION['OBJ_user']->username." <".$_SESSION['OBJ_user']->email.">"; *************** *** 171,178 **** $tags["MT_TO"] = $this->getLabel(); ! $tags["TO_LABEL"] = $_SESSION["translate"]->it("To"); ! $tags["FROM_LABEL"] = $_SESSION["translate"]->it("From"); ! $tags["SUBJECT_LABEL"] = $_SESSION["translate"]->it("Subject"); ! $tags["MESSAGE_LABEL"] = $_SESSION["translate"]->it("Message"); return PHPWS_Template::processTemplate($tags, "mailto", "mail.tpl"); --- 206,213 ---- $tags["MT_TO"] = $this->getLabel(); ! $tags["LABEL_TO"] = $_SESSION["translate"]->it("To"); ! $tags["LABEL_FROM"] = $_SESSION["translate"]->it("From"); ! $tags["LABEL_SUBJECT"] = $_SESSION["translate"]->it("Subject"); ! $tags["LABEL_MESSAGE"] = $_SESSION["translate"]->it("Message"); return PHPWS_Template::processTemplate($tags, "mailto", "mail.tpl"); *************** *** 346,349 **** --- 381,392 ---- }// END FUNC getFrom + function getSubject() { + if(isset($this->_subject) && strlen($this->_subject) > 0) { + return PHPWS_Text::parseOutput($this->_subject); + } else { + return NULL; + } + }// END FUNC getFrom + function getReqlogin() { if(isset($this->_reqlogin)) { *************** *** 354,357 **** --- 397,408 ---- }// END FUNC getFrom + function getLock_subject() { + if(isset($this->_lock_subject)) { + return 1; + } else { + return 0; + } + }// END FUNC getFrom + function action() { $content = NULL; |
|
From: Tony M. <cl...@us...> - 2004-03-29 21:19:34
|
Update of /cvsroot/phpwebsite-comm/modules/mailto/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21138/modules/mailto/boost Modified Files: install.sql update.php Log Message: Added a pre-set subject option, also the ability to lock down the subject. Did some convention clean-up. Index: install.sql =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailto/boost/install.sql,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** install.sql 26 Mar 2004 18:56:49 -0000 1.1.1.1 --- install.sql 29 Mar 2004 21:08:01 -0000 1.2 *************** *** 11,14 **** --- 11,16 ---- address text NOT NULL, reqlogin smallint NOT NULL default '0', + subject text, + lock_subject smallint NOT NULL default '0', PRIMARY KEY (id) ); Index: update.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailto/boost/update.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** update.php 26 Mar 2004 18:56:49 -0000 1.1.1.1 --- update.php 29 Mar 2004 21:08:01 -0000 1.2 *************** *** 1,10 **** - /*** - * This is the boost update file for mailto - * - */ - <?php ! ! if (!$_SESSION["OBJ_user"]->isDeity()){ header("location:index.php"); exit(); --- 1,4 ---- <?php ! if(!$_SESSION["OBJ_user"]->isDeity()) { header("location:index.php"); exit(); *************** *** 13,15 **** --- 7,30 ---- $status = 1; + if ($currentVersion < "0.1.1"){ + if($GLOBALS['core']->query("ALTER TABLE mod_mailto_items ADD COLUMN `subject` " . + "text AFTER `reqlogin`", TRUE)) { + $content .= "Added database attribute for the subject.<br />"; + } else { + $content .= "Boost failed to create the attribute 'subject' under the table 'mod_mailto_items'. <br /><br />"; + $status = 0; + } + + if($GLOBALS['core']->query("ALTER TABLE mod_mailto_items ADD COLUMN `lock_subject` " . + "smallint NOT NULL DEFAULT 0 AFTER `subject`", TRUE)) { + $content .= "Added database attribute to indicate if the subject should be locked. <br />"; + } else { + $content .= "Boost failed to create the attribute 'lock_subject' under the table 'mod_mailto_items'. <br /><br />"; + $status = 0; + } + + $content .= "mailto successfully updated for version 0.1.1 changes.<br />"; + + } + ?> |
