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...> - 2009-01-25 03:58:47
|
Update of /cvsroot/phpwebsite-comm/modules/article/docs In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3399/docs Modified Files: Changes.txt Log Message: 4.21 Release Index: Changes.txt =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/docs/Changes.txt,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** Changes.txt 25 Jan 2009 03:52:21 -0000 1.42 --- Changes.txt 25 Jan 2009 03:58:41 -0000 1.43 *************** *** 1,7 **** - + Chronological Homepage summary views now use their own boxes, not Layout's - + Added rel=nofollow to print and email links - + TODO--xxxxx--AM uses the core XML-RPC library now + TODO--xxxxx--Changed old bg_dark/medium/light references to xxxx ======================== --- 1,5 ---- + TODO--xxxxx--AM uses the core XML-RPC library now + TODO--xxxxx--Changed old bg_dark/medium/light references to xxxx + + TODO--xxxxx--AM uses breakpost now ======================== *************** *** 16,19 **** --- 14,19 ---- + A `post-upgrade conversion` script is included to convert newlines to br tags in an existing AM installation + `Also on this Site` and `Popular Articles` templates now use their own box definitions, not the standard layout one. + + Chronological Homepage summary views now use their own boxes, not Layout's + + Added rel=nofollow to print and email links |
|
From: Eloi G. <ada...@us...> - 2009-01-25 03:52:34
|
Update of /cvsroot/phpwebsite-comm/modules/article/docs In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2535/docs Modified Files: Changes.txt Log Message: Added rel=nofollow to print and email links Index: Changes.txt =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/docs/Changes.txt,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** Changes.txt 22 Jan 2009 01:36:13 -0000 1.41 --- Changes.txt 25 Jan 2009 03:52:21 -0000 1.42 *************** *** 1,3 **** --- 1,4 ---- + Chronological Homepage summary views now use their own boxes, not Layout's + + Added rel=nofollow to print and email links + TODO--xxxxx--AM uses the core XML-RPC library now |
|
From: Eloi G. <ada...@us...> - 2009-01-25 03:52:33
|
Update of /cvsroot/phpwebsite-comm/modules/article/class In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2535/class Modified Files: Article.php Log Message: Added rel=nofollow to print and email links Index: Article.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/Article.php,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** Article.php 18 Dec 2008 05:44:31 -0000 1.59 --- Article.php 25 Jan 2009 03:52:19 -0000 1.60 *************** *** 272,280 **** $s = dgettext('article', 'Printable Version'); $article_tags['PRINT_ICON'] = '<a href="./index.php?module=article&op=print&id='.$this->id ! .'" target="_blank" style="text-decoration:none" title="'. $s . '"><img src="' . PHPWS_Core::getHomeHttp() . 'images/mod/article/print.gif" border="0" width="22" height="20" alt="'.$s.'" />'.dgettext('article', 'Print').'</a>'; $s = dgettext('article', 'E-mail this Article to a Friend'); $article_tags['EMAIL'] = '<a href="./index.php?module=article&op=email&id='.$this->id ! .'" style="text-decoration:none" title="'.$s.'"><img src="'. PHPWS_Core::getHomeHttp() . 'images/mod/article/mailto.png" border="0" width="19" height="12" alt="'.$s.'" />'.dgettext('article', 'eMail').'</a>'; } --- 272,280 ---- $s = dgettext('article', 'Printable Version'); $article_tags['PRINT_ICON'] = '<a href="./index.php?module=article&op=print&id='.$this->id ! .'" target="_blank" style="text-decoration:none" title="'. $s . '" rel="nofollow"><img src="' . PHPWS_Core::getHomeHttp() . 'images/mod/article/print.gif" border="0" width="22" height="20" alt="'.$s.'" />'.dgettext('article', 'Print').'</a>'; $s = dgettext('article', 'E-mail this Article to a Friend'); $article_tags['EMAIL'] = '<a href="./index.php?module=article&op=email&id='.$this->id ! .'" style="text-decoration:none" title="'.$s.'" rel="nofollow"><img src="'. PHPWS_Core::getHomeHttp() . 'images/mod/article/mailto.png" border="0" width="19" height="12" alt="'.$s.'" />'.dgettext('article', 'eMail').'</a>'; } |
|
From: Eloi G. <ada...@us...> - 2009-01-22 02:16:53
|
Update of /cvsroot/phpwebsite-comm/modules/article/boost In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2168/boost Modified Files: update.php Log Message: Put search back the way it was. Noone's complaining Index: update.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/boost/update.php,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** update.php 21 Jan 2009 16:27:19 -0000 1.28 --- update.php 22 Jan 2009 01:36:12 -0000 1.29 *************** *** 275,279 **** + Deleted reference to obsolete file (AM_Modsettings.php) + If the specified XML file isn`t found in the branch directory, XML_import will look in the hub directory as well. - + Search now indexes all words, not just the uncommon ones. + The conversion script now uses PHPWS_Text::breaker to convert newlines to br tags + A `post-upgrade conversion` script is included to convert newlines to br tags in an existing AM installation --- 275,278 ---- |
|
From: Eloi G. <ada...@us...> - 2009-01-22 02:16:49
|
Update of /cvsroot/phpwebsite-comm/modules/article/docs In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2168/docs Modified Files: Changes.txt Log Message: Put search back the way it was. Noone's complaining Index: Changes.txt =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/docs/Changes.txt,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** Changes.txt 21 Jan 2009 16:27:19 -0000 1.40 --- Changes.txt 22 Jan 2009 01:36:13 -0000 1.41 *************** *** 12,16 **** + Deleted reference to obsolete file (AM_Modsettings.php) + If the specified XML file isn`t found in the branch directory, XML_import will look in the hub directory as well. - + Search now indexes all words, not just the uncommon ones. + The conversion script now uses PHPWS_Text::breaker to convert newlines to br tags + A `post-upgrade conversion` script is included to convert newlines to br tags in an existing AM installation --- 12,15 ---- |
|
From: Eloi G. <ada...@us...> - 2009-01-22 02:16:41
|
Update of /cvsroot/phpwebsite-comm/modules/article/inc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2168/inc Modified Files: A_save.php Log Message: Put search back the way it was. Noone's complaining Index: A_save.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/A_save.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** A_save.php 21 Jan 2009 16:28:08 -0000 1.22 --- A_save.php 22 Jan 2009 01:36:10 -0000 1.23 *************** *** 114,120 **** $search = new Search($this->key_id); $search->resetKeywords(); ! $search->addKeywords($texttags['TITLE'], 0); ! $search->addKeywords(@$texttags['SUMMARYTEXT'], 0); ! $search->addKeywords($texttags['BODYTEXT'], 0); $result = $search->save(); unset($texttags); --- 114,120 ---- $search = new Search($this->key_id); $search->resetKeywords(); ! $search->addKeywords($texttags['TITLE']); ! $search->addKeywords(@$texttags['SUMMARYTEXT']); ! $search->addKeywords($texttags['BODYTEXT']); $result = $search->save(); unset($texttags); |
|
From: Eloi G. <ada...@us...> - 2009-01-21 16:28:18
|
Update of /cvsroot/phpwebsite-comm/modules/article/inc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3047/inc Modified Files: A_save.php Log Message: Search now indexes all words, not just the uncommon ones. Index: A_save.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/A_save.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** A_save.php 18 Dec 2008 05:48:06 -0000 1.21 --- A_save.php 21 Jan 2009 16:28:08 -0000 1.22 *************** *** 114,120 **** $search = new Search($this->key_id); $search->resetKeywords(); ! $search->addKeywords($texttags['TITLE']); ! $search->addKeywords(@$texttags['SUMMARYTEXT']); ! $search->addKeywords($texttags['BODYTEXT']); $result = $search->save(); unset($texttags); --- 114,120 ---- $search = new Search($this->key_id); $search->resetKeywords(); ! $search->addKeywords($texttags['TITLE'], 0); ! $search->addKeywords(@$texttags['SUMMARYTEXT'], 0); ! $search->addKeywords($texttags['BODYTEXT'], 0); $result = $search->save(); unset($texttags); |
|
From: Eloi G. <ada...@us...> - 2009-01-21 16:27:33
|
Update of /cvsroot/phpwebsite-comm/modules/article/inc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2933/inc Modified Files: runtime_chronological.php runtime.php runtime_categorized.php Log Message: `Also on this Site` and `Popular Articles` templates now use their own box definitions, not the standard layout one. Index: runtime_chronological.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/runtime_chronological.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** runtime_chronological.php 21 Nov 2008 14:16:26 -0000 1.15 --- runtime_chronological.php 21 Jan 2009 16:27:18 -0000 1.16 *************** *** 102,111 **** $tpl->setCurrentBlock('list_rows'); $tpl->parseCurrentBlock(); ! } ! $template['CONTENT'] = $tpl->get(); ! ! $template['TITLE'] = dgettext('article', 'Also on this Site...'); ! $finalContent = PHPWS_Template::process($template, 'layout', 'box.tpl'); ! Layout::add($finalContent, 'article', 'summaries', true); } /* If there are x articles before these, display the "Prev Articles" Block */ --- 102,108 ---- $tpl->setCurrentBlock('list_rows'); $tpl->parseCurrentBlock(); ! } ! $tpl->setData(array('TITLE'=>dgettext('article', 'Also on this Site...'))); ! Layout::add($tpl->get(), 'article', 'summaries', true); } /* If there are x articles before these, display the "Prev Articles" Block */ Index: runtime_categorized.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/runtime_categorized.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** runtime_categorized.php 18 Dec 2008 05:41:58 -0000 1.12 --- runtime_categorized.php 21 Jan 2009 16:27:18 -0000 1.13 *************** *** 96,103 **** $tpl->parseCurrentBlock(); } ! $template['CONTENT'] = $tpl->get(); ! $template['TITLE'] = dgettext('article', 'Also on this Site...'); ! $finalContent = PHPWS_Template::process($template, 'layout', 'box.tpl'); ! Layout::add($finalContent, 'article', 'summaries', true); } ?> \ No newline at end of file --- 96,101 ---- $tpl->parseCurrentBlock(); } ! $tpl->setData(array('TITLE'=>dgettext('article', 'Also on this Site...'))); ! Layout::add($tpl->get(), 'article', 'summaries', true); } ?> \ No newline at end of file Index: runtime.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/runtime.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** runtime.php 21 Nov 2008 14:16:26 -0000 1.18 --- runtime.php 21 Jan 2009 16:27:18 -0000 1.19 *************** *** 66,79 **** if(count($result)) { ! $content = ''; foreach($result AS $summary) { ! $link = PHPWS_Text::rewriteLink($summary['title'], 'article', array('id'=> $summary['id'])); ! $content .= '<li>'.$link.'</li><br />
'; } ! if (!empty($content)) { $template['TITLE'] = dgettext('article', 'Popular Articles'); ! $template['CONTENT'] = '<ul>'.$content.'</ul>'; ! $finalContent = PHPWS_Template::process($template, 'layout', 'box.tpl'); Layout::add($finalContent, 'article', 'popular'); } --- 66,78 ---- if(count($result)) { ! $list = array(); foreach($result AS $summary) { ! $list[]['ITEM'] = PHPWS_Text::rewriteLink($summary['title'], 'article', array('id'=> $summary['id'])); } ! if (!empty($list)) { $template['TITLE'] = dgettext('article', 'Popular Articles'); ! $template['listrows'] = $list; ! $finalContent = PHPWS_Template::process($template, 'article', 'popular_links.tpl'); Layout::add($finalContent, 'article', 'popular'); } |
|
From: Eloi G. <ada...@us...> - 2009-01-21 16:27:30
|
Update of /cvsroot/phpwebsite-comm/modules/article/templates In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2933/templates Modified Files: runtime_categorized.tpl runtime_chronological.tpl Added Files: popular_links.tpl Log Message: `Also on this Site` and `Popular Articles` templates now use their own box definitions, not the standard layout one. Index: runtime_chronological.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/runtime_chronological.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** runtime_chronological.tpl 21 Aug 2008 20:17:22 -0000 1.5 --- runtime_chronological.tpl 21 Jan 2009 16:27:15 -0000 1.6 *************** *** 1,53 **** ! <table style="text-align: left; width: 100%;" border="0" cellpadding="10" cellspacing="10"> ! <tbody> ! <!-- BEGIN list_rows --> ! <tr> ! <!-- BEGIN list_columns --> ! <td style="width:{CELL_WIDTH}%" > ! ! <!-- BEGIN TITLE --> ! <h2>{TITLE_LINK}</h2> ! <div class="smaller"> ! {UPDATED_TEXT} -- {UPDATED_DATE_SHORT} (Read: {HITS} times) ! </div> ! <br /> ! <!-- END TITLE --> ! <!-- BEGIN CONTENT --> ! <!-- BEGIN CATEGORIES --> ! <div style="float:right;"> ! {CATEGORY_ICONS} ! </div> ! <!-- END CATEGORIES --> ! <!-- BEGIN IMG --> ! <div> ! {IMAGE} ! <!-- BEGIN IMG_CAP --> ! <div class="smaller"> ! {CAPTION} </div> ! <!-- END IMG_CAP --> ! </div> ! <br /> ! <!-- END IMG --> ! ! {SUMMARYTEXT} ! ! <div class="smaller" style="clear:both; text-align:right"> ! <br /> ! <!-- BEGIN INFO --> ! {READMORE} {MOREWORDS} - {MOREPAGES} ! <!-- END INFO --> ! {EDIT} {DELETE} {NUM_COMMENTS} {PRINT_ICON} {EMAIL} ! <br /> ! </div> ! <!-- END CONTENT --> ! </td> ! <!-- END list_columns --> ! </tr> ! <!-- END list_rows --> ! </tbody> ! </table> --- 1,60 ---- ! <div class="box"> ! <div class="box-title"><h1>{TITLE}</h1></div> ! <div class="box-content"> ! ! <table style="text-align: left; width: 100%;" border="0" cellpadding="10" cellspacing="10"> ! <tbody> ! <!-- BEGIN list_rows --> ! <tr> ! <!-- BEGIN list_columns --> ! <td style="width:{CELL_WIDTH}%" > ! <!-- BEGIN TITLE --> ! <h2>{TITLE_LINK}</h2> ! <div class="smaller"> ! {UPDATED_TEXT} -- {UPDATED_DATE_SHORT} (Read: {HITS} times) ! </div> ! <br /> ! <!-- END TITLE --> ! <!-- BEGIN CONTENT --> ! <!-- BEGIN CATEGORIES --> ! <div style="float:right;"> ! {CATEGORY_ICONS} ! </div> ! <!-- END CATEGORIES --> ! ! <!-- BEGIN IMG --> ! <div> ! {IMAGE} ! <!-- BEGIN IMG_CAP --> ! <div class="smaller"> ! {CAPTION} ! </div> ! <!-- END IMG_CAP --> </div> ! <br /> ! <!-- END IMG --> ! {SUMMARYTEXT} ! <div class="smaller" style="clear:both; text-align:right"> ! <br /> ! <!-- BEGIN INFO --> ! {READMORE} {MOREWORDS} - {MOREPAGES} ! <!-- END INFO --> ! {EDIT} {DELETE} {NUM_COMMENTS} {PRINT_ICON} {EMAIL} ! <br /> ! </div> ! <!-- END CONTENT --> ! ! </td> ! <!-- END list_columns --> ! </tr> ! <!-- END list_rows --> ! ! </tbody> ! </table> ! ! </div> ! </div> Index: runtime_categorized.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/runtime_categorized.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** runtime_categorized.tpl 18 Dec 2008 05:46:32 -0000 1.5 --- runtime_categorized.tpl 21 Jan 2009 16:27:15 -0000 1.6 *************** *** 1,51 **** ! <table style="text-align: left; width: 100%;" border="0" cellpadding="10" cellspacing="10"> ! <tbody> ! ! <!-- BEGIN list_rows --> ! <tr> ! <!-- BEGIN list_columns --> ! <td style="width:{CELL_WIDTH}%" > ! <!-- BEGIN CATEGORY_IMAGE --> ! <div style="float:left; padding-right:10px"> ! {CATEGORY_ICON} ! </div> ! <!-- END CATEGORY_IMAGE --> ! <hr> ! <h2> ! {CATEGORY_NAME} ! </h2> ! <hr> ! <!-- BEGIN list_headline_summaries --> ! <h3 style="clear:left">{TITLE_LINK}</h3> ! ! <!-- BEGIN IMG --> ! <div> ! {IMAGE} ! <!-- BEGIN IMG_CAP --> ! <div class="smaller"> ! {CAPTION} </div> ! <!-- END IMG_CAP --> ! </div> ! <!-- END IMG --> ! ! <!-- BEGIN SUMMARY --> ! <span class="smaller">{SUMMARYTEXT}</span> ! <br /> ! <!-- END SUMMARY --> ! ! <!-- END list_headline_summaries --> ! <ul style="margin:0 0 0 18px;padding:0;"> ! <!-- BEGIN list_headline_titles --> ! <li> ! {TITLE_LINK} ! </li> ! <!-- END list_headline_titles --> ! </ul> ! </td> ! <!-- END list_columns --> ! </tr> ! <!-- END list_rows --> ! ! </tbody> ! </table> --- 1,58 ---- ! <div class="box"> ! <div class="box-title"><h1>{TITLE}</h1></div> ! <div class="box-content"> ! ! <table style="text-align: left; width: 100%;" border="0" cellpadding="10" cellspacing="10"> ! <tbody> ! ! <!-- BEGIN list_rows --> ! <tr> ! <!-- BEGIN list_columns --> ! <td style="width:{CELL_WIDTH}%" > ! <!-- BEGIN CATEGORY_IMAGE --> ! <div style="float:left; padding-right:10px"> ! {CATEGORY_ICON} ! </div> ! <!-- END CATEGORY_IMAGE --> ! <hr> ! <h2> ! {CATEGORY_NAME} ! </h2> ! <hr> ! <!-- BEGIN list_headline_summaries --> ! <h3 style="clear:left">{TITLE_LINK}</h3> ! ! <!-- BEGIN IMG --> ! <div> ! {IMAGE} ! <!-- BEGIN IMG_CAP --> ! <div class="smaller"> ! {CAPTION} ! </div> ! <!-- END IMG_CAP --> </div> ! <!-- END IMG --> ! ! <!-- BEGIN SUMMARY --> ! <span class="smaller">{SUMMARYTEXT}</span> ! <br /> ! <!-- END SUMMARY --> ! ! <!-- END list_headline_summaries --> ! <ul style="margin:0 0 0 18px;padding:0;"> ! <!-- BEGIN list_headline_titles --> ! <li> ! {TITLE_LINK} ! </li> ! <!-- END list_headline_titles --> ! </ul> ! </td> ! <!-- END list_columns --> ! </tr> ! <!-- END list_rows --> ! ! </tbody> ! </table> ! ! </div> ! </div> --- NEW FILE: popular_links.tpl --- <div class="box"> <div class="box-title"><h1>{TITLE}</h1></div> <div class="box-content"> <ul style="margin:0 0 0 18px;padding:0;"> <!-- BEGIN listrows --> <li> {ITEM} </li> <!-- END listrows --> </ul> </div> </div> |
|
From: Eloi G. <ada...@us...> - 2009-01-21 16:27:29
|
Update of /cvsroot/phpwebsite-comm/modules/article/docs In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2933/docs Modified Files: Changes.txt Log Message: `Also on this Site` and `Popular Articles` templates now use their own box definitions, not the standard layout one. Index: Changes.txt =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/docs/Changes.txt,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** Changes.txt 22 Nov 2008 00:43:59 -0000 1.39 --- Changes.txt 21 Jan 2009 16:27:19 -0000 1.40 *************** *** 1,3 **** --- 1,20 ---- + + Chronological Homepage summary views now use their own boxes, not Layout's + + TODO--xxxxx--AM uses the core XML-RPC library now + + TODO--xxxxx--Changed old bg_dark/medium/light references to xxxx + + ======================== + Changes in version 4.2.1 + ======================== + + Fixed a minor categorized summary display bug + + Article title links now show the summary in the tooltip + + Customized category display added + + Deleted reference to obsolete file (AM_Modsettings.php) + + If the specified XML file isn`t found in the branch directory, XML_import will look in the hub directory as well. + + Search now indexes all words, not just the uncommon ones. + + The conversion script now uses PHPWS_Text::breaker to convert newlines to br tags + + A `post-upgrade conversion` script is included to convert newlines to br tags in an existing AM installation + + `Also on this Site` and `Popular Articles` templates now use their own box definitions, not the standard layout one. + ============================================= |
|
From: Eloi G. <ada...@us...> - 2009-01-21 16:27:28
|
Update of /cvsroot/phpwebsite-comm/modules/article/boost In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2933/boost Modified Files: update.php Log Message: `Also on this Site` and `Popular Articles` templates now use their own box definitions, not the standard layout one. Index: update.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/boost/update.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** update.php 22 Nov 2008 00:43:59 -0000 1.27 --- update.php 21 Jan 2009 16:27:19 -0000 1.28 *************** *** 254,258 **** --- 254,284 ---- + Made bulk operation selection text more understandable. </pre>'; + + case version_compare($currentVersion, '4.2.1', '<'): + $files = array('templates/popular_links.tpl', 'templates/runtime_categorized.tpl', 'templates/runtime_chronological.tpl'); + if (PHPWS_Boost::updateFiles($files, 'article')) { + $content[] = '+ Updated the following files: ' . implode("\n ", $files); + } + else { + $content[] = '+ Unable to update the following files: ' . implode("\n ", $files); + return false; + } + + $content[] = '<pre> + ======================== + Changes in version 4.2.1 + ======================== + + Fixed a minor categorized summary display bug + + Article title links now show the summary in the tooltip + + Customized category display added + + Deleted reference to obsolete file (AM_Modsettings.php) + + If the specified XML file isn`t found in the branch directory, XML_import will look in the hub directory as well. + + Search now indexes all words, not just the uncommon ones. + + The conversion script now uses PHPWS_Text::breaker to convert newlines to br tags + + A `post-upgrade conversion` script is included to convert newlines to br tags in an existing AM installation + + `Also on this Site` and `Popular Articles` templates now use their own box definitions, not the standard layout one. + </pre>'; + } // end of switch |
|
From: Eloi G. <ada...@us...> - 2009-01-19 16:44:11
|
Update of /cvsroot/phpwebsite-comm/modules/article/class In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4037/class Modified Files: AM_Actions.php Log Message: If the specified XML file isn't found in the branch directory, XML_import will look in the hub directory as well. Index: AM_Actions.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/AM_Actions.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** AM_Actions.php 21 Nov 2008 06:13:14 -0000 1.15 --- AM_Actions.php 19 Jan 2009 16:44:02 -0000 1.16 *************** *** 228,234 **** $overwritten = false; /* If the file exists, load it. */ ! $filename = PHPWS_HOME_DIR . $directory . $file; ! if (!$xml = PHPWS_File::readFile($filename)) ! return sprintf(dgettext('article', '"%s" could not be read.'), $filename); /* Unserialize the data structure */ --- 228,236 ---- $overwritten = false; /* If the file exists, load it. */ ! $filename = $directory . $file; ! if (!$xml = @PHPWS_File::readFile(PHPWS_HOME_DIR . $filename)) ! //file not found -- look in source dir ! if (!$xml = @PHPWS_File::readFile(PHPWS_SOURCE_DIR . $filename)) ! return sprintf(dgettext('article', '"%s" could not be read.'), $filename); /* Unserialize the data structure */ |
|
From: Eloi G. <ada...@us...> - 2008-12-18 05:48:10
|
Update of /cvsroot/phpwebsite-comm/modules/article/inc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20378/inc Modified Files: A_save.php Log Message: Deleted reference to obsolete file (AM_Modsettings.php) Index: A_save.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/A_save.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** A_save.php 21 Nov 2008 06:13:14 -0000 1.20 --- A_save.php 18 Dec 2008 05:48:06 -0000 1.21 *************** *** 133,137 **** /* Reset headline caching if this will be on there */ if ($this->announce) { - PHPWS_Core::initModClass('article', 'AM_ModSettings.php'); PHPWS_AM_Data::reset_cache(); } --- 133,136 ---- |
|
From: Eloi G. <ada...@us...> - 2008-12-18 05:46:36
|
Update of /cvsroot/phpwebsite-comm/modules/article/templates In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20185/templates Modified Files: runtime_categorized.tpl Log Message: Fixed a minor categorized summary display bug Index: runtime_categorized.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/runtime_categorized.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** runtime_categorized.tpl 21 Aug 2008 20:17:22 -0000 1.4 --- runtime_categorized.tpl 18 Dec 2008 05:46:32 -0000 1.5 *************** *** 33,41 **** <span class="smaller">{SUMMARYTEXT}</span> <br /> - <br /> <!-- END SUMMARY --> <!-- END list_headline_summaries --> ! <ul> <!-- BEGIN list_headline_titles --> <li> --- 33,40 ---- <span class="smaller">{SUMMARYTEXT}</span> <br /> <!-- END SUMMARY --> <!-- END list_headline_summaries --> ! <ul style="margin:0 0 0 18px;padding:0;"> <!-- BEGIN list_headline_titles --> <li> |
|
From: Eloi G. <ada...@us...> - 2008-12-18 05:46:20
|
Update of /cvsroot/phpwebsite-comm/modules/article/class In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20084/class Modified Files: AM_Lists.php Log Message: Customized category display added Index: AM_Lists.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/AM_Lists.php,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** AM_Lists.php 22 Nov 2008 06:41:54 -0000 1.26 --- AM_Lists.php 18 Dec 2008 05:46:08 -0000 1.27 *************** *** 384,388 **** /* Create DBPager object */ PHPWS_Core::initCoreClass('DBPager.php'); - PHPWS_Core::initModClass('article', 'AM_ModSettings.php'); PHPWS_Core::initModClass('article', 'AM_EditForms.php'); --- 384,387 ---- *************** *** 394,398 **** $pager->addToggle('class="toggle1"'); $pager->addRowTags('_get_tags'); ! $pager->setSearch('title'); $columns = PHPWS_Article::get_summary_columns(true); foreach ($columns AS $column) --- 393,398 ---- $pager->addToggle('class="toggle1"'); $pager->addRowTags('_get_tags'); ! $pager->setSearch('title'); ! $pager->setOrder('updated_date', 'desc', true); $columns = PHPWS_Article::get_summary_columns(true); foreach ($columns AS $column) |
|
From: Eloi G. <ada...@us...> - 2008-12-18 05:46:13
|
Update of /cvsroot/phpwebsite-comm/modules/article/templates In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20084/templates Modified Files: list_summaries.tpl Added Files: list_category_summaries.tpl Log Message: Customized category display added --- NEW FILE: list_category_summaries.tpl --- <table width="100%" border="0" cellspacing="0" cellpadding="2" summary="{TBL_SUMMARY}"> <tr class="bg_dark" style="white-space:nowrap"> <th scope="col" width="100%" style="text-align:center" colspan="2"> {TITLE_SORT} </th> <th scope="col" class="smaller"> {CREATED_DATE_SORT} <br /> {UPDATED_DATE_SORT} </th> <th scope="col" class="smaller"> {PUBLICATION_DATE_SORT} <br /> {EXPIRATION_DATE_SORT} </th> </tr> <!-- BEGIN message --> <tr> <td colspan="4"> {EMPTY_MESSAGE} </td> </tr> <!-- END message --> <!-- BEGIN listrows --> <tr {TOGGLE}> <td colspan="5"> <h2>{TITLE_LINK}</h2> <!-- BEGIN CATEGORIES --> <div style="float:right;"> {CATEGORY} </div> <!-- END CATEGORIES --> {SUMMARYTEXT} <div class="smaller" style="clear:both; text-align:right"> (Read: {HITS} times) {MOREWORDS} - {MOREPAGES} </div> </td> </tr> <!-- END listrows --> </table> <!-- BEGIN navigate --> <hr /> <div class="align-center"> {PAGE_LABEL} {PAGES}<br /> {LIMIT_LABEL} {LIMITS}<br /><br /> </div> <!-- END navigate --> Index: list_summaries.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/list_summaries.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** list_summaries.tpl 17 Sep 2007 04:24:30 -0000 1.2 --- list_summaries.tpl 18 Dec 2008 05:46:08 -0000 1.3 *************** *** 1,4 **** --- 1,6 ---- + <!-- BEGIN SRCH --> {SEARCH_MENU} <br /> + <!-- END SRCH --> <table width="100%" border="0" cellspacing="0" cellpadding="2" summary="{TBL_SUMMARY}"> |
|
From: Eloi G. <ada...@us...> - 2008-12-18 05:46:12
|
Update of /cvsroot/phpwebsite-comm/modules/article/inc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20084/inc Added Files: categories.php Log Message: Customized category display added --- NEW FILE: categories.php --- <?php /** * This is the category listing file for the article module. * * @version $Id: categories.php,v 1.1 2008/12/18 05:46:09 adarkling Exp $ * * @author Eloi George <el...@NO...> */ PHPWS_Core::initModClass('article', 'AM_Data.php'); PHPWS_Core::initModClass('article', 'Section.php'); PHPWS_Core::initModClass('article', 'Article.php'); PHPWS_Core::initModClass('article', 'Image.php'); /* Create DBPager object */ PHPWS_Core::initCoreClass('DBPager.php'); $pager = new DBPager('article', 'PHPWS_Article'); Key::restrictView($pager->db, $module); $pager->setModule('article'); $pager->setTemplate('list_category_summaries.tpl'); $pager->setEmptyMessage(dgettext('article', 'No articles found.')); $pager->addToggle('class="toggle2"'); $pager->addToggle('class="toggle1"'); $pager->addRowTags('_get_tags'); $pager->setSearch('title'); $columns = PHPWS_Article::get_summary_columns(true); foreach ($columns AS $column) $pager->db->addColumn($column); $pager->addWhere('category_items.cat_id', $category->id); $pager->addWhere('category_items.module', 'article'); $pager->addWhere('category_items.key_id', 'article.key_id'); $pager->setOrder('updated_date', 'desc', true); $lbls = array(); $lbls['TITLE_LABEL'] = PHPWS_Text::rewriteLink(dgettext('article', 'Click here for more article search/sort options') , 'article', array('id'=>'news','category'=>$category->id)); $lbls['EXTTITLE_LABEL'] = dgettext('article', 'Title'); $lbls['CREATED_DATE_LABEL'] = dgettext('article', 'Created on'); $lbls['UPDATED_DATE_LABEL'] = dgettext('article', 'Updated on'); $lbls['PUBLICATION_DATE_LABEL'] = dgettext('article', 'Publish on'); $lbls['EXPIRATION_DATE_LABEL'] = dgettext('article', 'Expire on'); $pager->addPageTags($lbls); $pager->addSortHeader('title', $lbls['EXTTITLE_LABEL']); $pager->addSortHeader('created_date', $lbls['CREATED_DATE_LABEL']); $pager->addSortHeader('updated_date', $lbls['UPDATED_DATE_LABEL']); $pager->addSortHeader('publication_date', $lbls['PUBLICATION_DATE_LABEL']); $pager->addSortHeader('expiration_date', $lbls['EXPIRATION_DATE_LABEL']); $content = $pager->get(); ?> |
|
From: Eloi G. <ada...@us...> - 2008-12-18 05:44:36
|
Update of /cvsroot/phpwebsite-comm/modules/article/class In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19917/class Modified Files: Article.php Log Message: Article title links now show the summary in the tooltip Index: Article.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/Article.php,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** Article.php 21 Nov 2008 14:16:23 -0000 1.58 --- Article.php 18 Dec 2008 05:44:31 -0000 1.59 *************** *** 639,647 **** * @return HTML */ ! function get_title_link ($id = null, $title = null) { $vars['id'] = ($id)? $id : $this->id; ! $title = (!empty($title))? $title : $this->title; ! return PHPWS_Text::rewriteLink($title, 'article', $vars); } --- 639,652 ---- * @return HTML */ ! function get_title_link ($id = null, $title = null, $summary = null) { $vars['id'] = ($id)? $id : $this->id; ! if (empty($title)) { ! $title = $this->title; ! if (empty($summary)) { ! $summary = $this->summary; ! } ! } ! return PHPWS_Text::rewriteLink($title, 'article', $vars, null, $summary); } |
|
From: Eloi G. <ada...@us...> - 2008-12-18 05:42:13
|
Update of /cvsroot/phpwebsite-comm/modules/article/inc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19667/inc Modified Files: runtime_categorized.php Log Message: Fixed summary display bug Index: runtime_categorized.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/runtime_categorized.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** runtime_categorized.php 18 Nov 2008 05:08:55 -0000 1.11 --- runtime_categorized.php 18 Dec 2008 05:41:58 -0000 1.12 *************** *** 33,40 **** if (!($result)) continue; - foreach ($result AS $key => $value) { - if ($key > $config['summaries_per_category']) - unset($result[$key]['summary']); - } $content[] = $result; --- 33,36 ---- *************** *** 79,88 **** $pos = $i + ($j * $rows); foreach ($content[$pos] AS $key => $value) { - if ($key < $config['summaries_per_category']) - $tpl->setCurrentBlock('list_headline_summaries'); - else - $tpl->setCurrentBlock('list_headline_titles'); $temp = new PHPWS_Article($value); $arr = $temp->_get_tags(); $tpl->setData($arr); $tpl->parseCurrentBlock(); --- 75,87 ---- $pos = $i + ($j * $rows); foreach ($content[$pos] AS $key => $value) { $temp = new PHPWS_Article($value); $arr = $temp->_get_tags(); + if ($key < $config['summaries_per_category']) { + $tpl->setCurrentBlock('list_headline_summaries'); + } + else { + $tpl->setCurrentBlock('list_headline_titles'); + unset($arr['SUMMARYTEXT']); + } $tpl->setData($arr); $tpl->parseCurrentBlock(); |
|
From: Verdon V. <ve...@us...> - 2008-12-05 15:23:04
|
Update of /cvsroot/phpwebsite-comm/modules/vshop/class In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13083/class Modified Files: vShop.php vShop_Forms.php vShop_Tax.php Added Files: vShop_Option_set.php vShop_Option_value.php Log Message: initial 0.7.0 work --- NEW FILE: vShop_Option_set.php --- <?php /** * vshop - phpwebsite module * * See docs/AUTHORS and docs/COPYRIGHT for relevant info. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * @version $Id: vShop_Option_set.php,v 1.1 2008/12/05 15:22:52 verdonv Exp $ * @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net> */ class vShop_Option_set { public $id = 0; public $title = null; public $type = 0; public $_error = null; public function __construct($id=0) { if (!$id) { return; } $this->id = (int)$id; $this->init(); } public function init() { $db = new PHPWS_DB('vshop_option_sets'); $result = $db->loadObject($this); if (PEAR::isError($result)) { $this->_error = & $result; $this->id = 0; } elseif (!$result) { $this->id = 0; } } public function setTitle($title) { $this->title = strip_tags($title); } public function setType($type) { $this->type = (int)$type; } public function getTitle($print=false) { if (empty($this->title)) { return null; } if ($print) { return PHPWS_Text::parseOutput($this->title); } else { return $this->title; } } public function getType($print=false) { if (empty($this->type)) { return null; } if ($print) { require PHPWS_SOURCE_DIR . 'mod/vshop/inc/option_types.php'; return $types[$this->type]; } else { return $this->type; } } public function getAllValues($limit=false) { PHPWS_Core::initModClass('vshop', 'vShop_Option_value.php'); $db = new PHPWS_DB('vshop_option_values'); $db->addOrder('sort asc'); $db->addOrder('title asc'); $db->addWhere('set_id', $this->id); if ($limit) { $db->setLimit((int)$limit); } $result = $db->getObjects('vShop_Option_value'); return $result; } public function getQtyValues() { $db = new PHPWS_DB('vshop_option_values'); $db->addWhere('set_id', $this->id); $qty = $db->count(); return $qty; } public function view() { if (!$this->id) { PHPWS_Core::errorPage(404); } $tpl['OPTION_SET_LINKS'] = $this->links(); $tpl['TITLE'] = $this->getTitle(true); $tpl['TYPE'] = $this->getType(true); $tpl['SET_LABEL'] = dgettext('vshop', 'Set details'); $tpl['VALUES_LABEL'] = dgettext('vshop', 'Possible values'); $tpl['TITLE_LABEL'] = dgettext('vshop', 'Name: '); $tpl['TYPE_LABEL'] = dgettext('vshop', 'Element type: '); $values = $this->getAllValues(); if (PHPWS_Error::logIfError($values)) { $this->vshop->content = dgettext('vshop', 'An error occurred when accessing this set\'s values.'); return; } if ($values) { foreach ($values as $value) { $tpl['values'][] = $value->viewTpl(); } } else { if (Current_User::allow('vshop', 'settings')) $tpl['EMPTY'] = dgettext('vshop', 'Click on "New value" to start.'); } return PHPWS_Template::process($tpl, 'vshop', 'view_option_set.tpl'); } public function links() { $links = array(); if (Current_User::allow('vshop', 'settings')) { $vars['option_set_id'] = $this->id; $vars['aop'] = 'edit_option_set'; $links[] = PHPWS_Text::secureLink(dgettext('vshop', 'Edit option set'), 'vshop', $vars); } if (Current_User::allow('vshop', 'settings')) { $vars['aop'] = 'new_option_value'; $links[] = PHPWS_Text::secureLink(dgettext('vshop', 'Add Value'), 'vshop', $vars); } // $links = array_merge($links, vShop::navLinks()); if($links) return implode(' | ', $links); } public function delete() { if (!$this->id) { return; } $db = new PHPWS_DB('vshop_option_sets'); $db->addWhere('id', $this->id); PHPWS_Error::logIfError($db->delete()); } public function rowTag() { // $vars['id'] = $this->id; $vars['option_set_id'] = $this->id; $links = array(); if (Current_User::allow('vshop', 'settings')) { $vars['aop'] = 'new_option_value'; $links[] = PHPWS_Text::secureLink(dgettext('vshop', 'Add Value'), 'vshop', $vars); } if (Current_User::allow('vshop', 'settings')) { $vars['aop'] = 'edit_option_set'; $links[] = PHPWS_Text::secureLink(dgettext('vshop', 'Edit'), 'vshop', $vars); $vars['aop'] = 'delete_option_set'; $js['ADDRESS'] = PHPWS_Text::linkAddress('vshop', $vars, true); $js['QUESTION'] = sprintf(dgettext('vshop', 'Are you sure you want to delete the option set %s?'), $this->getTitle()); $js['LINK'] = dgettext('vshop', 'Delete'); $links[] = javascript('confirm', $js); } $tpl['TITLE'] = $this->viewLink(); $tpl['TYPE'] = $this->getType(true); $tpl['VALUES'] = $this->getQtyValues(); if($links) $tpl['ACTION'] = implode(' | ', $links); return $tpl; } public function save() { $db = new PHPWS_DB('vshop_option_sets'); $result = $db->saveObject($this); if (PEAR::isError($result)) { return $result; } } public function viewLink() { $vars['aop'] = 'view_option_set'; $vars['option_set'] = $this->id; return PHPWS_Text::moduleLink(dgettext('vshop', $this->title), 'vshop', $vars); } } ?> Index: vShop.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/vshop/class/vShop.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** vShop.php 3 Dec 2008 22:17:42 -0000 1.4 --- vShop.php 5 Dec 2008 15:22:52 -0000 1.5 *************** *** 27,39 **** class vShop { ! public $forms = null; ! public $panel = null; ! public $title = null; ! public $message = null; ! public $content = null; ! public $dept = null; ! public $item = null; ! public $tax = null; ! public $order = null; --- 27,42 ---- class vShop { ! public $forms = null; ! public $panel = null; ! public $title = null; ! public $message = null; ! public $content = null; ! public $dept = null; ! public $item = null; ! public $tax = null; ! public $order = null; ! public $option_set = null; ! public $option_value = null; ! public $attribute = null; *************** *** 55,58 **** --- 58,72 ---- case 'post_tax': case 'delete_tax': + case 'view_option_set': + case 'new_option_set': + case 'edit_option_set': + case 'post_option_set': + case 'delete_option_set': + case 'view_option_value': + case 'new_option_value': + case 'edit_option_value': + case 'post_option_value': + case 'delete_option_value': + PHPWS_Core::initModClass('vshop', 'vShop_Forms.php'); $settingsPanel = vShop_Forms::settingsPanel(); *************** *** 68,72 **** if (isset($_GET['tab'])) { PHPWS_Core::initModClass('vshop', 'vShop_Forms.php'); ! if ($_GET['tab'] == 'settings' || $_GET['tab'] == 'taxes') { $settingsPanel = vShop_Forms::settingsPanel(); $settingsPanel->enableSecure(); --- 82,86 ---- if (isset($_GET['tab'])) { PHPWS_Core::initModClass('vshop', 'vShop_Forms.php'); ! if ($_GET['tab'] == 'settings' || $_GET['tab'] == 'taxes' || $_GET['tab'] == 'option_sets' || $_GET['tab'] == 'option_values') { $settingsPanel = vShop_Forms::settingsPanel(); $settingsPanel->enableSecure(); *************** *** 208,211 **** --- 222,318 ---- + case 'view_option_set': + $settingsPanel->setCurrentTab('option_sets'); + $this->loadOption_set(); + $this->title = $this->option_set->getTitle(true); + $this->content = $this->option_set->view(); + break; + + case 'new_option_set': + case 'edit_option_set': + $settingsPanel->setCurrentTab('option_sets'); + if (!Current_User::authorized('vshop', 'settings')) { + Current_User::disallow(); + } + $this->loadForm('edit_option_set'); + break; + + case 'post_option_set': + $settingsPanel->setCurrentTab('option_sets'); + if (!Current_User::authorized('vshop', 'settings')) { + Current_User::disallow(); + } + if ($this->postOption_set()) { + if (PHPWS_Error::logIfError($this->option_set->save())) { + $this->forwardMessage(dgettext('vshop', 'Error occurred when saving option set.')); + PHPWS_Core::reroute('index.php?module=vshop&aop=menu&tab=option_sets'); + } else { + $this->forwardMessage(dgettext('vshop', 'Option set saved successfully.')); + PHPWS_Core::reroute('index.php?module=vshop&aop=menu&tab=option_sets'); + } + } else { + $this->loadForm('edit_option_set'); + } + break; + + case 'delete_option_set': + $settingsPanel->setCurrentTab('option_sets'); + if (!Current_User::authorized('vshop', 'settings')) { + Current_User::disallow(); + } + $this->loadOption_set(); + $this->option_set->delete(); + $this->message = dgettext('vshop', 'Option set deleted.'); + $this->loadForm('option_sets'); + break; + + + case 'view_option_value': + $settingsPanel->setCurrentTab('option_values'); + $this->loadOption_value(); + $this->title = $this->option_value->getTitle(true); + $this->content = $this->option_value->view(); + break; + + case 'new_option_value': + case 'edit_option_value': + $settingsPanel->setCurrentTab('option_values'); + if (!Current_User::authorized('vshop', 'settings')) { + Current_User::disallow(); + } + // $this->loadOption_value(); + $this->loadForm('edit_option_value'); + break; + + case 'post_option_value': + $settingsPanel->setCurrentTab('option_values'); + if (!Current_User::authorized('vshop', 'settings')) { + Current_User::disallow(); + } + if ($this->postOption_value()) { + if (PHPWS_Error::logIfError($this->option_value->save())) { + $this->forwardMessage(dgettext('vshop', 'Error occurred when saving option set value.')); + PHPWS_Core::reroute('index.php?module=vshop&aop=menu&tab=option_values'); + } else { + $this->forwardMessage(dgettext('vshop', 'Option set value saved successfully.')); + PHPWS_Core::reroute('index.php?module=vshop&aop=menu&tab=option_values'); + } + } else { + $this->loadForm('edit_option_value'); + } + break; + + case 'delete_option_value': + $settingsPanel->setCurrentTab('option_values'); + if (!Current_User::authorized('vshop', 'settings')) { + Current_User::disallow(); + } + $this->loadOption_value(); + $this->option_value->delete(); + $this->message = dgettext('vshop', 'Option set value deleted.'); + $this->loadForm('option_values'); + break; + + case 'post_settings': $settingsPanel->setCurrentTab('settings'); *************** *** 330,333 **** --- 437,450 ---- case 'post_tax': case 'delete_tax': + case 'view_option_set': + case 'new_option_set': + case 'edit_option_set': + case 'post_option_set': + case 'delete_option_set': + case 'view_option_value': + case 'new_option_value': + case 'edit_option_value': + case 'post_option_value': + case 'delete_option_value': $settingsPanel->setContent($this->content); $this->content = $settingsPanel->display(); *************** *** 340,344 **** case 'menu': if (isset($_GET['tab'])) { ! if ($_GET['tab'] == 'settings' || $_GET['tab'] == 'taxes') { $settingsPanel->setContent($this->content); $this->content = $settingsPanel->display(); --- 457,461 ---- case 'menu': if (isset($_GET['tab'])) { ! if ($_GET['tab'] == 'settings' || $_GET['tab'] == 'taxes' || $_GET['tab'] == 'option_sets' || $_GET['tab'] == 'option_values') { $settingsPanel->setContent($this->content); $this->content = $settingsPanel->display(); *************** *** 677,680 **** --- 794,846 ---- + public function loadOption_set($id=0) + { + PHPWS_Core::initModClass('vshop', 'vShop_Option_set.php'); + + if ($id) { + $this->option_set = new vShop_Option_set($id); + } elseif (isset($_REQUEST['option_set_id'])) { + $this->option_set = new vShop_Option_set($_REQUEST['option_set_id']); + // } elseif (isset($_REQUEST['id'])) { + // $this->option_set = new vShop_Option_set($_REQUEST['id']); + } elseif (isset($_REQUEST['option_set'])) { + $this->option_set = new vShop_Option_set($_REQUEST['option_set']); + } else { + $this->option_set = new vShop_Option_set; + } + } + + + public function loadOption_value($id=0) + { + PHPWS_Core::initModClass('vshop', 'vShop_Option_value.php'); + + if ($id) { + $this->option_value = new vShop_Option_value($id); + } elseif (isset($_REQUEST['option_value_id'])) { + $this->option_value = new vShop_Option_value($_REQUEST['option_value_id']); + // } elseif (isset($_REQUEST['id'])) { + // $this->option_value = new vShop_Option_value($_REQUEST['id']); + } elseif (isset($_REQUEST['option_value'])) { + $this->option_value = new vShop_Option_value($_REQUEST['option_value']); + } else { + $this->option_value = new vShop_Option_value; + } + //print_r($this->option_value->set_id); exit; + //print_r($this->option_set); exit; + if (empty($this->option_set)) { + if (isset($this->option_value->set_id)) { + $this->loadOption_set($this->option_value->set_id); + } elseif (isset($_REQUEST['option_set_id'])) { + $this->loadOption_set($_REQUEST['option_set_id']); + $this->option_value->set_id = $_REQUEST['option_set_id']; + } else { + $this->loadOption_set(); + $this->option_value->set_id = $this->option_set->id; + } + } + } + + public function loadOrder($id=0) { *************** *** 841,844 **** --- 1007,1059 ---- + public function postOption_set() + { + $this->loadOption_set(); + + if (empty($_POST['title'])) { + $errors[] = dgettext('vshop', 'You must give this option set a title.'); + } else { + $this->option_set->setTitle($_POST['title']); + } + + if (!empty($_POST['type']) ) { + $this->option_set->setType((int)$_POST['type']); + } + + if (isset($errors)) { + $this->message = implode('<br />', $errors); + $this->loadForm('edit_option_set'); + return false; + } else { + return true; + } + + } + + + public function postOption_value() + { + $this->loadOption_value(); + //print_r($_POST); exit; + if (empty($_POST['title'])) { + $errors[] = dgettext('vshop', 'You must give this option value a title.'); + } else { + $this->option_value->setTitle($_POST['title']); + } + + $this->option_value->setSet_id($_POST['set_id']); + $this->option_value->setSort($_POST['sort']); + + if (isset($errors)) { + $this->message = implode('<br />', $errors); + $this->loadForm('edit_option_value'); + return false; + } else { + return true; + } + + } + + public function postSettings() { Index: vShop_Tax.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/vshop/class/vShop_Tax.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** vShop_Tax.php 25 Nov 2008 15:19:30 -0000 1.1.1.1 --- vShop_Tax.php 5 Dec 2008 15:22:52 -0000 1.2 *************** *** 165,169 **** $links = array(); ! if (Current_User::allow('vshop', 'setting')) { $vars['aop'] = 'edit_tax'; $links[] = PHPWS_Text::secureLink(dgettext('vshop', 'Edit'), 'vshop', $vars); --- 165,169 ---- $links = array(); ! if (Current_User::allow('vshop', 'settings')) { $vars['aop'] = 'edit_tax'; $links[] = PHPWS_Text::secureLink(dgettext('vshop', 'Edit'), 'vshop', $vars); --- NEW FILE: vShop_Option_value.php --- <?php /** * vshop - phpwebsite module * * See docs/AUTHORS and docs/COPYRIGHT for relevant info. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * @version $Id: vShop_Option_value.php,v 1.1 2008/12/05 15:22:52 verdonv Exp $ * @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net> */ class vShop_Option_value { public $id = 0; public $set_id = null; public $sort = 0; public $title = null; public $_error = null; public function __construct($id=0) { if (!$id) { return; } $this->id = (int)$id; $this->init(); } public function init() { $db = new PHPWS_DB('vshop_option_values'); $result = $db->loadObject($this); if (PEAR::isError($result)) { $this->_error = & $result; $this->id = 0; } elseif (!$result) { $this->id = 0; } } public function setTitle($title) { $this->title = strip_tags($title); } public function setSet_id($set_id) { $this->set_id = (int)$set_id; } public function setSort($sort) { //print_r($sort); exit; $this->sort = (int)$sort; } public function getTitle($print=false) { if (empty($this->title)) { return null; } if ($print) { return PHPWS_Text::parseOutput($this->title); } else { return $this->title; } } public function getSet($print=false) { if (empty($this->set_id)) { return null; } if ($print) { PHPWS_Core::initModClass('vshop', 'vShop_Option_set.php'); $set = new vShop_Option_set($this->set_id); return $set->viewLink(); } else { return $this->set_id; } } public function view() { if (!$this->id) { PHPWS_Core::errorPage(404); } $tpl['OPTION_VALUE_LINKS'] = $this->links(); $tpl['TITLE'] = $this->getTitle(true); $tpl['SET'] = $this->getSet(true); return PHPWS_Template::process($tpl, 'vshop', 'view_option_value.tpl'); } public function links() { $links = array(); if (Current_User::allow('vshop', 'settings')) { $vars['option_value_id'] = $this->id; $vars['aop'] = 'edit_option_value'; $links[] = PHPWS_Text::secureLink(dgettext('vshop', 'Edit option value'), 'vshop', $vars); } // $links = array_merge($links, vShop::navLinks()); if($links) return implode(' | ', $links); } public function delete() { if (!$this->id) { return; } $db = new PHPWS_DB('vshop_option_values'); $db->addWhere('id', $this->id); PHPWS_Error::logIfError($db->delete()); } public function rowTag() { // $vars['id'] = $this->id; $vars['option_value_id'] = $this->id; $links = array(); if (Current_User::allow('vshop', 'settings')) { $vars['aop'] = 'edit_option_value'; $links[] = PHPWS_Text::secureLink(dgettext('vshop', 'Edit'), 'vshop', $vars); $vars['aop'] = 'delete_option_value'; $js['ADDRESS'] = PHPWS_Text::linkAddress('vshop', $vars, true); $js['QUESTION'] = sprintf(dgettext('vshop', 'Are you sure you want to delete the option value %s?'), $this->getTitle()); $js['LINK'] = dgettext('vshop', 'Delete'); $links[] = javascript('confirm', $js); } $tpl['TITLE'] = $this->viewLink(); $tpl['SET'] = $this->getSet(true); $tpl['SORT'] = $this->sort; if($links) $tpl['ACTION'] = implode(' | ', $links); return $tpl; } public function viewTpl() { $vars['option_value_id'] = $this->id; $vars['option_set_id'] = $this->set_id; $links = array(); // $links[] = $this->addLink(true) . ' ' . $this->addLink(); if (Current_User::allow('vshop', 'settings')) { $vars['aop'] = 'edit_option_value'; $links[] = PHPWS_Text::secureLink(dgettext('vshop', 'Edit'), 'vshop', $vars); } if (Current_User::allow('vshop', 'edit_items')) { $vars['aop'] = 'delete_option_value'; $js['ADDRESS'] = PHPWS_Text::linkAddress('vshop', $vars, true); $js['QUESTION'] = sprintf(dgettext('vshop', 'Are you sure you want to delete the value %s?'), $this->getTitle()); $js['LINK'] = dgettext('vshop', 'Delete'); $links[] = javascript('confirm', $js); } $tpl['VALUE_TITLE'] = $this->viewLink(); if($links) $tpl['VALUE_LINKS'] = implode(' | ', $links); return $tpl; } public function save() { $db = new PHPWS_DB('vshop_option_values'); //print_r($db); exit; // $db->setTestMode(); //print_r($this); exit; $result = $db->saveObject($this); //print_r($result); exit; if (PEAR::isError($result)) { return $result; } } public function viewLink() { $vars['aop'] = 'view_option_value'; $vars['option_value'] = $this->id; return PHPWS_Text::moduleLink(dgettext('vshop', $this->title), 'vshop', $vars); } } ?> Index: vShop_Forms.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/vshop/class/vShop_Forms.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** vShop_Forms.php 3 Dec 2008 22:17:42 -0000 1.4 --- vShop_Forms.php 5 Dec 2008 15:22:52 -0000 1.5 *************** *** 59,62 **** --- 59,67 ---- break; + case 'settings': + $this->vshop->panel->setCurrentTab('settings'); + $this->editSettings(); + break; + case 'new_tax': case 'edit_tax': *************** *** 72,78 **** break; ! case 'settings': ! $this->vshop->panel->setCurrentTab('settings'); ! $this->editSettings(); break; --- 77,104 ---- break; ! case 'new_option_set': ! case 'edit_option_set': ! if (empty($this->vshop->option_set)) { ! $this->vshop->loadOption_set(); ! } ! $this->editOptionSet(); ! break; ! ! case 'option_sets': ! $this->vshop->panel->setCurrentTab('option_sets'); ! $this->listOptionSets(); ! break; ! ! case 'new_option_value': ! case 'edit_option_value': ! if (empty($this->vshop->option_value)) { ! $this->vshop->loadOption_value(); ! } ! $this->editOptionValue(); ! break; ! ! case 'option_values': ! $this->vshop->panel->setCurrentTab('option_values'); ! $this->listOptionValues(); break; *************** *** 132,135 **** --- 158,166 ---- } + if (Current_User::allow('vshop', 'settings')){ + $tags['option_sets'] = array('title'=>dgettext('vshop', 'Option Sets'), 'link'=>$link); + $tags['option_values'] = array('title'=>dgettext('rolodex', 'Option Values'), 'link'=>$link); + } + $panel = new PHPWS_Panel('vshop-settings-panel'); $panel->quickSetTabs($tags); *************** *** 272,275 **** --- 303,369 ---- + public function listOptionSets() + { + if (Current_User::allow('vshop', 'settings') && isset($_REQUEST['uop'])) { + $link[] = PHPWS_Text::secureLink(dgettext('vshop', 'Add new option set'), 'vshop', array('aop'=>'new_option_set')); + MiniAdmin::add('vshop', $link); + } + + $ptags['TITLE_HEADER'] = dgettext('vshop', 'Name'); + $ptags['TYPE_HEADER'] = dgettext('vshop', 'Type'); + $ptags['VALUES_HEADER'] = dgettext('vshop', 'Values'); + + PHPWS_Core::initModClass('vshop', 'vShop_Option_set.php'); + PHPWS_Core::initCoreClass('DBPager.php'); + $pager = new DBPager('vshop_option_sets', 'vShop_Option_set'); + $pager->setModule('vshop'); + + $pager->setOrder('title', 'asc', true); + $pager->setTemplate('list_option_sets.tpl'); + $pager->addRowTags('rowTag'); + $num = $pager->getTotalRows(); + if ($num == '0') { + $vars['aop'] = 'menu'; + $vars['tab'] = 'settings'; + $vars2['aop'] = 'new_option_set'; + $ptags['EMPTY_MESSAGE'] = sprintf(dgettext('vshop', 'Check your %s then create a %s to begin'), PHPWS_Text::secureLink(dgettext('vshop', 'Settings'), 'vshop', $vars), PHPWS_Text::secureLink(dgettext('vshop', 'New Option Set'), 'vshop', $vars2)); + } + if (Current_User::allow('vshop', 'settings', null, null, true)) { + $vars['aop'] = 'new_option_set'; + $ptags['ADD_LINK'] = PHPWS_Text::secureLink(dgettext('vshop', 'Add Option Set'), 'vshop', $vars); + } + $pager->addPageTags($ptags); + $pager->addToggle('class="toggle1"'); + $pager->cacheQueries(); + + $this->vshop->content = $pager->get(); + $this->vshop->title = sprintf(dgettext('vshop', '%s Option Sets'), PHPWS_Text::parseOutput(PHPWS_Settings::get('vshop', 'mod_title'))); + } + + + public function listOptionValues() + { + + $ptags['TITLE_HEADER'] = dgettext('vshop', 'Name'); + $ptags['SET_HEADER'] = dgettext('vshop', 'Set'); + $ptags['SORT_HEADER'] = dgettext('vshop', 'Sort'); + + PHPWS_Core::initModClass('vshop', 'vShop_Option_value.php'); + PHPWS_Core::initCoreClass('DBPager.php'); + $pager = new DBPager('vshop_option_values', 'vShop_Option_value'); + $pager->setModule('vshop'); + + $pager->setOrder('title', 'asc', true); + $pager->setTemplate('list_option_values.tpl'); + $pager->addRowTags('rowTag'); + $pager->addPageTags($ptags); + $pager->addToggle('class="toggle1"'); + $pager->cacheQueries(); + + $this->vshop->content = $pager->get(); + $this->vshop->title = sprintf(dgettext('vshop', '%s Option Values'), PHPWS_Text::parseOutput(PHPWS_Settings::get('vshop', 'mod_title'))); + } + + public function listOrders($completed=1,$cancelled=0) { *************** *** 438,441 **** --- 532,537 ---- $tpl['INFO_LABEL'] = dgettext('vshop', 'Item details'); + + $this->vshop->content = PHPWS_Template::process($tpl, 'vshop', 'edit_item.tpl'); } *************** *** 482,485 **** --- 578,663 ---- + public function editOptionSet() + { + $form = new PHPWS_Form; + $option_set = & $this->vshop->option_set; + require PHPWS_SOURCE_DIR . 'mod/vshop/inc/option_types.php'; + + $form->addHidden('module', 'vshop'); + $form->addHidden('aop', 'post_option_set'); + if ($option_set->id) { + $this->vshop->title = dgettext('vshop', 'Update option set'); + $form->addHidden('option_set_id', $option_set->id); + $form->addSubmit(dgettext('vshop', 'Update')); + } else { + $this->vshop->title = dgettext('vshop', 'Add new option set'); + $form->addSubmit(dgettext('vshop', 'Add')); + } + + $form->addText('title', $option_set->title); + $form->setSize('title', 40); + $form->setRequired('title'); + $form->setLabel('title', dgettext('vshop', 'Title')); + + $form->addSelect('type', $types); + $form->setLabel('type', dgettext('vshop', 'Element type')); + $form->setMatch('type', $option_set->type); + + $tpl = $form->getTemplate(); + $tpl['INFO_LABEL'] = dgettext('vshop', 'Option set details'); + + $this->vshop->content = PHPWS_Template::process($tpl, 'vshop', 'edit_option_set.tpl'); + } + + + public function editOptionValue() + { + $form = new PHPWS_Form; + $option_value = & $this->vshop->option_value; + //print_r($option_value); exit; + // require PHPWS_SOURCE_DIR . 'mod/vshop/inc/zones.php'; + + $form->addHidden('module', 'vshop'); + $form->addHidden('aop', 'post_option_value'); + if ($option_value->id) { + $this->vshop->title = dgettext('vshop', 'Update option set value'); + $form->addHidden('option_value_id', $option_value->id); + $form->addSubmit(dgettext('vshop', 'Update')); + } else { + $this->vshop->title = dgettext('vshop', 'Add new option set value'); + $form->addSubmit(dgettext('vshop', 'Add')); + } + + $form->addText('title', $option_value->title); + $form->setSize('title', 40); + $form->setRequired('title'); + $form->setLabel('title', dgettext('vshop', 'Title')); + + PHPWS_Core::initModClass('vshop', 'vShop_Option_set.php'); + $db = new PHPWS_DB('vshop_option_sets'); + $db->addColumn('id'); + $db->addColumn('title'); + $result = $db->getObjects('vShop_Option_set'); + if ($result) { + foreach ($result as $set) { + $choices[$set->id] = $set->title; + } + $form->addSelect('set_id', $choices); + $form->setLabel('set_id', dgettext('vshop', 'Option Set')); + $form->setMatch('set_id', $option_value->set_id); + } + + $form->addText('sort', $option_value->sort); + $form->setSize('sort', 3); + $form->setRequired('sort'); + $form->setLabel('sort', dgettext('vshop', 'Sort order')); + + $tpl = $form->getTemplate(); + $tpl['INFO_LABEL'] = dgettext('vshop', 'Option set value details'); + + $this->vshop->content = PHPWS_Template::process($tpl, 'vshop', 'edit_option_value.tpl'); + } + + public function editOrder() { |
Update of /cvsroot/phpwebsite-comm/modules/vshop/templates In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13083/templates Added Files: edit_option_set.tpl edit_option_value.tpl list_option_sets.tpl list_option_values.tpl view_option_set.tpl view_option_value.tpl Log Message: initial 0.7.0 work --- NEW FILE: edit_option_value.tpl --- {START_FORM} <fieldset> <legend><strong>{INFO_LABEL}</strong></legend> <p><strong>{TITLE_LABEL}</strong><br />{TITLE}</p> <p>{SET_ID} <strong>{SET_ID_LABEL}</strong></p> <p>{SORT} <strong>{SORT_LABEL}</strong></p> </fieldset> {SUBMIT} {END_FORM} --- NEW FILE: edit_option_set.tpl --- {START_FORM} <fieldset> <legend><strong>{INFO_LABEL}</strong></legend> <p><strong>{TITLE_LABEL}</strong><br />{TITLE}</p> <p>{TYPE} <strong>{TYPE_LABEL}</strong></p> </fieldset> {SUBMIT} {END_FORM} --- NEW FILE: view_option_set.tpl --- <div id="vshop-option_set"> <div align="right">{OPTION_SET_LINKS}</div> <h3>{SET_LABEL}</h3> <div> <strong>{TITLE_LABEL}</strong> {TITLE}<br /> <strong>{TYPE_LABEL}</strong> {TYPE}<br /> </div> <br /> <h3>{VALUES_LABEL}</h3> <!-- BEGIN values --> <div> {VALUE_TITLE} <!-- BEGIN value_links -->* {VALUE_LINKS}<!-- END value_links --><br /> </div> <!-- END values --> <br /> </div> --- NEW FILE: view_option_value.tpl --- <div id="vshop-option_value"> <div align="right">{OPTION_VALUE_LINKS}</div> <strong>{TITLE}</strong> <p>{TYPE}</p> </div> --- NEW FILE: list_option_sets.tpl --- <!-- BEGIN add_link --><div align="right">{ADD_LINK}</div><!-- END add_link --> <table width="99%" cellpadding="4"> <tr> <th>{TITLE_HEADER} {TITLE_SORT}</th> <th>{TYPE_HEADER} {TYPE_SORT}</th> <th>{VALUES_HEADER}</th> <th> </th> </tr> <!-- BEGIN listrows --> <tr {TOGGLE}> <td>{TITLE}</td> <td>{TYPE}</td> <td>{VALUES}</td> <td>{ACTION}</td> </tr> <!-- END listrows --> </table> {EMPTY_MESSAGE} <div class="align-center"> {TOTAL_ROWS}<br /> {PAGE_LABEL} {PAGES}<br /> {LIMIT_LABEL} {LIMITS} </div> --- NEW FILE: list_option_values.tpl --- <!-- BEGIN add_link --><div align="right">{ADD_LINK}</div><!-- END add_link --> <table width="99%" cellpadding="4"> <tr> <th>{TITLE_HEADER} {TITLE_SORT}</th> <th>{SET_HEADER} {SET_ID_SORT}</th> <th>{SORT_HEADER} {SORT_SORT}</th> <th> </th> </tr> <!-- BEGIN listrows --> <tr {TOGGLE}> <td>{TITLE}</td> <td>{SET}</td> <td>{SORT}</td> <td>{ACTION}</td> </tr> <!-- END listrows --> </table> {EMPTY_MESSAGE} <div class="align-center"> {TOTAL_ROWS}<br /> {PAGE_LABEL} {PAGES}<br /> {LIMIT_LABEL} {LIMITS} </div> |
|
From: Verdon V. <ve...@us...> - 2008-12-05 15:22:58
|
Update of /cvsroot/phpwebsite-comm/modules/vshop/boost In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13083/boost Modified Files: boost.php install.sql uninstall.php update.php Added Files: sql_update_070.sql Log Message: initial 0.7.0 work --- NEW FILE: sql_update_070.sql --- -- vshop - phpwebsite module -- @version $Id: sql_update_070.sql,v 1.1 2008/12/05 15:22:49 verdonv Exp $ -- @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net> CREATE TABLE vshop_option_sets ( id int not null default 0, title varchar(255), type int not null default 0, PRIMARY KEY (id) ); CREATE TABLE vshop_option_values ( id int not null default 0, set_id int not null default 0, sort int not null default 0, title varchar(255), PRIMARY KEY (id) ); CREATE TABLE vshop_attributes ( id int not null default 0, set_id int not null default 0, value_id int not null default 0, item_id int not null default 0, price_mod decimal(11,2) not null default 0.00, price_prefix varchar(1), weight_mod decimal(8,2) not null default 0.00, weight_prefix varchar(1), PRIMARY KEY (id) ); Index: uninstall.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/vshop/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 25 Nov 2008 15:19:28 -0000 1.1.1.1 --- uninstall.php 5 Dec 2008 15:22:49 -0000 1.2 *************** *** 29,32 **** --- 29,35 ---- PHPWS_DB::dropTable('vshop_taxes'); PHPWS_DB::dropTable('vshop_orders'); + PHPWS_DB::dropTable('vshop_option_sets'); + PHPWS_DB::dropTable('vshop_option_values'); + PHPWS_DB::dropTable('vshop_attributes'); $content[] = dgettext('vshop', 'vShop tables dropped.'); Index: install.sql =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/vshop/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 25 Nov 2008 15:19:28 -0000 1.1.1.1 --- install.sql 5 Dec 2008 15:22:49 -0000 1.2 *************** *** 58,59 **** --- 58,87 ---- PRIMARY KEY (id) ); + + CREATE TABLE vshop_option_sets ( + id int not null default 0, + title varchar(255), + type int not null default 0, + PRIMARY KEY (id) + ); + + CREATE TABLE vshop_option_values ( + id int not null default 0, + set_id int not null default 0, + sort int not null default 0, + title varchar(255), + PRIMARY KEY (id) + ); + + CREATE TABLE vshop_attributes ( + id int not null default 0, + set_id int not null default 0, + value_id int not null default 0, + item_id int not null default 0, + price_mod decimal(11,2) not null default 0.00, + price_prefix varchar(1), + weight_mod decimal(8,2) not null default 0.00, + weight_prefix varchar(1), + PRIMARY KEY (id) + ); + Index: boost.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/vshop/boost/boost.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** boost.php 2 Dec 2008 19:43:12 -0000 1.2 --- boost.php 5 Dec 2008 15:22:49 -0000 1.3 *************** *** 24,28 **** $proper_name = 'vShop'; ! $version = '0.6.0'; $register = false; $unregister = false; --- 24,28 ---- $proper_name = 'vShop'; ! $version = '0.7.0'; $register = false; $unregister = false; Index: update.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/vshop/boost/update.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** update.php 3 Dec 2008 20:37:45 -0000 1.2 --- update.php 5 Dec 2008 15:22:49 -0000 1.3 *************** *** 49,52 **** --- 49,75 ---- + case version_compare($currentVersion, '0.7.0', '<'): + $result = PHPWS_DB::importFile(PHPWS_SOURCE_DIR . 'mod/vshop/boost/sql_update_070.sql'); + if (PEAR::isError($result)) { + PHPWS_Error::log($result); + $content[] = '+ Unable to add the option sets and values, and attributes tables.'; + return false; + } else { + $content[] = '+ added the option sets and values, and attributes tables.'; + $content[] = '<pre>'; + + $files = array('templates/list_option_sets.tpl', + 'templates/list_option_values.tpl', + 'templates/edit_settings.tpl' + ); + vshopUpdateFiles($files, $content); + + $content[] = '0.7.0 changes + ---------------- + + added support for product attributes + + </pre>'; + } + |
|
From: Verdon V. <ve...@us...> - 2008-12-05 15:22:58
|
Update of /cvsroot/phpwebsite-comm/modules/vshop/inc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13083/inc Added Files: option_types.php Log Message: initial 0.7.0 work --- NEW FILE: option_types.php --- <?php /** * vshop - phpwebsite module * * See docs/AUTHORS and docs/COPYRIGHT for relevant info. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * @version $Id: option_types.php,v 1.1 2008/12/05 15:22:53 verdonv Exp $ * @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net> */ $types = array( 1=>dgettext('vshop', 'Select list'), 2=>dgettext('vshop', 'Radio buttons'), 3=>dgettext('vshop', 'Checkboxes') ); ?> |
|
From: Verdon V. <ve...@us...> - 2008-12-05 15:22:58
|
Update of /cvsroot/phpwebsite-comm/modules/vshop/docs In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13083/docs Modified Files: CHANGELOG TODO Log Message: initial 0.7.0 work Index: TODO =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/vshop/docs/TODO,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** TODO 25 Nov 2008 15:19:31 -0000 1.1.1.1 --- TODO 5 Dec 2008 15:22:52 -0000 1.2 *************** *** 17,21 **** * done * add IP address to order * done * thanks screen after succesful checkout process ! should I set default texts in settings file? --- 17,21 ---- * done * add IP address to order * done * thanks screen after succesful checkout process ! * done * PROBLEMS WITH ID AND OPTION_NAME_ID BEING THE SAME WHEN MAKING OPTION VALUES should I set default texts in settings file? *************** *** 24,25 **** --- 24,27 ---- further improve notification messages improve thanks screen after succesful checkout process + + CLEAN UP ORPHANS WHEN DELETING OPTION SETS, VALUES, ITEMS, ??? \ No newline at end of file Index: CHANGELOG =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/vshop/docs/CHANGELOG,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CHANGELOG 3 Dec 2008 22:17:42 -0000 1.4 --- CHANGELOG 5 Dec 2008 15:22:52 -0000 1.5 *************** *** 1,2 **** --- 1,6 ---- + Version 0.7.0 -- Dec 2008 + ------------------------------------------------------------------ + + added support for product attributes + Version 0.6.0 -- Dec 2008 ------------------------------------------------------------------ |
|
From: Verdon V. <ve...@us...> - 2008-12-03 22:17:52
|
Update of /cvsroot/phpwebsite-comm/modules/vshop/class In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32766/class Modified Files: vShop.php vShop_Forms.php Log Message: added notices to status updates Index: vShop.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/vshop/class/vShop.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** vShop.php 3 Dec 2008 20:37:49 -0000 1.3 --- vShop.php 3 Dec 2008 22:17:42 -0000 1.4 *************** *** 309,312 **** --- 309,316 ---- $this->order->save(); $this->forwardMessage(sprintf(dgettext('vshop', 'Order %s status updated.'), $this->order->id)); + if (isset($_POST['notice'])) { + $this->sendNotice($this->order->id, 'customer', 'status'); + $this->sendNotice($this->order->id, 'admin', 'status'); + } $url = 'index.php?module=vshop&aop=menu&tab=orders'; $js['location'] = $url; *************** *** 1264,1268 **** $message .= sprintf(dgettext('vshop', 'Your order id# %s at %s has been updated.'), $id, $shop_name) . "\n\n"; $message .= "\n\n"; ! } } elseif ($to == 'admin') { $sendto = sprintf('%s<%s>', $shop_name, $shop_email); --- 1268,1277 ---- $message .= sprintf(dgettext('vshop', 'Your order id# %s at %s has been updated.'), $id, $shop_name) . "\n\n"; $message .= "\n\n"; ! } elseif ($type == 'status') { ! $subject = dgettext('vshop', 'Your order status has been updated.'); ! $message .= sprintf(dgettext('vshop', 'Your order id# %s at %s has been updated. '), $id, $shop_name) . "\n\n"; ! $message .= sprintf(dgettext('vshop', 'The order status has been changed to %s.'), $this->order->getStatus(true)) . "\n\n"; ! $message .= "\n\n"; ! } } elseif ($to == 'admin') { $sendto = sprintf('%s<%s>', $shop_name, $shop_email); *************** *** 1282,1285 **** --- 1291,1299 ---- $message .= sprintf(dgettext('vshop', 'Order id# %s has been updated at %s.'), $id, $shop_name) . "\n\n"; $message .= "\n\n"; + } elseif ($type == 'status') { + $subject = dgettext('vshop', 'An order status has been updated.'); + $message .= sprintf(dgettext('vshop', 'Order id# %s at %s has been updated. '), $id, $shop_name) . "\n\n"; + $message .= sprintf(dgettext('vshop', 'The order status has been changed to %s.'), $this->order->getStatus(true)) . "\n\n"; + $message .= "\n\n"; } } Index: vShop_Forms.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/vshop/class/vShop_Forms.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** vShop_Forms.php 3 Dec 2008 20:37:49 -0000 1.3 --- vShop_Forms.php 3 Dec 2008 22:17:42 -0000 1.4 *************** *** 500,509 **** $form = new PHPWS_Form('set_status'); require PHPWS_SOURCE_DIR . 'mod/vshop/inc/statuses.php'; $form->addHidden('module', 'vshop'); $form->addHidden('aop', 'update_status'); $form->addHidden('order_id', $order->id); $form->addSelect('status', $statuses); $form->setMatch('status', $order->status); ! $form->setLabel('status', sprintf(dgettext('vshop', 'Order %s status'), $order->id)); $form->addSubmit(dgettext('vshop', 'Update')); --- 500,516 ---- $form = new PHPWS_Form('set_status'); require PHPWS_SOURCE_DIR . 'mod/vshop/inc/statuses.php'; + $form->addHidden('module', 'vshop'); $form->addHidden('aop', 'update_status'); $form->addHidden('order_id', $order->id); + $form->addSelect('status', $statuses); $form->setMatch('status', $order->status); ! $form->setLabel('status', dgettext('vshop', 'Order status')); ! ! $form->addCheckbox('notice', 1); ! $form->setMatch('notice', 1); ! $form->setLabel('notice', dgettext('vshop', 'Send notification?')); ! $form->addSubmit(dgettext('vshop', 'Update')); *************** *** 613,621 **** $form->addTextField('shipping_minimum', number_format(PHPWS_Settings::get('vshop', 'shipping_minimum'), 2, '.', ',')); ! $form->setLabel('shipping_minimum', dgettext('vshop', 'Minimum shipping charge (0 to disable)')); $form->setSize('shipping_minimum', 6); $form->addTextField('shipping_maximum', number_format(PHPWS_Settings::get('vshop', 'shipping_maximum'), 2, '.', ',')); ! $form->setLabel('shipping_maximum', dgettext('vshop', 'Free shipping if total is over (0 to disable)')); $form->setSize('shipping_maximum', 6); --- 620,628 ---- $form->addTextField('shipping_minimum', number_format(PHPWS_Settings::get('vshop', 'shipping_minimum'), 2, '.', ',')); ! $form->setLabel('shipping_minimum', dgettext('vshop', 'Minimum shipping charge of x.xx (0 to disable)')); $form->setSize('shipping_minimum', 6); $form->addTextField('shipping_maximum', number_format(PHPWS_Settings::get('vshop', 'shipping_maximum'), 2, '.', ',')); ! $form->setLabel('shipping_maximum', dgettext('vshop', 'Free shipping if total is over xx.xx (0 to disable)')); $form->setSize('shipping_maximum', 6); |
