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: Verdon V. <ve...@us...> - 2008-12-03 22:17:52
|
Update of /cvsroot/phpwebsite-comm/modules/vshop/docs In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32766/docs Modified Files: CHANGELOG Log Message: added notices to status updates Index: CHANGELOG =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/vshop/docs/CHANGELOG,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CHANGELOG 3 Dec 2008 20:37:49 -0000 1.3 --- CHANGELOG 3 Dec 2008 22:17:42 -0000 1.4 *************** *** 7,10 **** --- 7,11 ---- + added ability to have free shipping on orders over $xx.xx + added ability to change order status from within list view + + added notifications to order status updates |
|
From: Verdon V. <ve...@us...> - 2008-12-03 22:17:49
|
Update of /cvsroot/phpwebsite-comm/modules/vshop/templates In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32766/templates Modified Files: set_status.tpl Log Message: added notices to status updates Index: set_status.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/vshop/templates/set_status.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** set_status.tpl 3 Dec 2008 20:37:49 -0000 1.1 --- set_status.tpl 3 Dec 2008 22:17:43 -0000 1.2 *************** *** 3,8 **** <div class="box-content"> {START_FORM} ! {STATUS} {SUBMIT} ! <br /><br /> {CLOSE} {END_FORM} --- 3,9 ---- <div class="box-content"> {START_FORM} ! {STATUS} {SUBMIT}<br /> ! {NOTICE} {NOTICE_LABEL}<br /> ! <br /> {CLOSE} {END_FORM} |
|
From: Verdon V. <ve...@us...> - 2008-12-03 20:38:03
|
Update of /cvsroot/phpwebsite-comm/modules/vshop/docs In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23489/docs Modified Files: CHANGELOG Log Message: added ability to quick-edit order status Index: CHANGELOG =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/vshop/docs/CHANGELOG,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CHANGELOG 2 Dec 2008 19:43:15 -0000 1.2 --- CHANGELOG 3 Dec 2008 20:37:49 -0000 1.3 *************** *** 6,9 **** --- 6,10 ---- + added ability to set minimum shipping charge + added ability to have free shipping on orders over $xx.xx + + added ability to change order status from within list view |
|
From: Verdon V. <ve...@us...> - 2008-12-03 20:38:03
|
Update of /cvsroot/phpwebsite-comm/modules/vshop/templates In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23489/templates Added Files: set_status.tpl Log Message: added ability to quick-edit order status --- NEW FILE: set_status.tpl --- <div class="box"> <div class="box-title"><h1>{TITLE}</h1></div> <div class="box-content"> {START_FORM} {STATUS} {SUBMIT} <br /><br /> {CLOSE} {END_FORM} </div> </div> |
|
From: Verdon V. <ve...@us...> - 2008-12-03 20:38:03
|
Update of /cvsroot/phpwebsite-comm/modules/vshop/class In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23489/class Modified Files: vShop.php vShop_Forms.php vShop_Order.php Log Message: added ability to quick-edit order status Index: vShop.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/vshop/class/vShop.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** vShop.php 2 Dec 2008 19:43:15 -0000 1.2 --- vShop.php 3 Dec 2008 20:37:49 -0000 1.3 *************** *** 290,293 **** --- 290,317 ---- $this->loadForm('orders'); break; + + case 'set_status': + if (!Current_User::authorized('vshop', 'edit_orders')) { + Current_User::disallow(); + } + $this->loadOrder(); + PHPWS_Core::initModClass('vshop', 'vShop_Forms.php'); + $content = vShop_Forms::setStatus($this->order); + Layout::nakedDisplay($content); + break; + + case 'update_status': + if (!Current_User::authorized('vshop', 'edit_orders')) { + Current_User::disallow(); + } + $this->loadOrder(); + $this->order->status = (int)$_POST['status']; + $this->order->save(); + $this->forwardMessage(sprintf(dgettext('vshop', 'Order %s status updated.'), $this->order->id)); + $url = 'index.php?module=vshop&aop=menu&tab=orders'; + $js['location'] = $url; + javascript('close_refresh', $js); + break; + *************** *** 583,586 **** --- 607,611 ---- $this->forms = new vShop_Forms; $this->forms->vshop = & $this; + //print_r($this->forms->vshop); exit; $this->forms->get($type); } *************** *** 1316,1319 **** --- 1341,1345 ---- + } ?> \ No newline at end of file Index: vShop_Order.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/vshop/class/vShop_Order.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** vShop_Order.php 25 Nov 2008 15:19:30 -0000 1.1.1.1 --- vShop_Order.php 3 Dec 2008 20:37:49 -0000 1.2 *************** *** 405,409 **** $tpl['ORDERED'] = $this->getOrder_date(true); $tpl['UPDATED'] = $this->getUpdate_date(true); ! $tpl['STATUS'] = $this->getStatus(true); if($links) --- 405,423 ---- $tpl['ORDERED'] = $this->getOrder_date(true); $tpl['UPDATED'] = $this->getUpdate_date(true); ! ! if (javascriptEnabled()) { ! $js_vars['label'] = $this->getStatus(true); ! $js_vars['width'] = 400; ! $js_vars['height'] = 250; ! ! $vars['aop'] = 'set_status'; ! ! $js_vars['address'] = PHPWS_Text::linkAddress('vshop', $vars, true); ! $link = javascript('open_window', $js_vars); ! ! $tpl['STATUS'] = $link; ! } else { ! $tpl['STATUS'] = $this->getStatus(true); ! } if($links) Index: vShop_Forms.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/vshop/class/vShop_Forms.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** vShop_Forms.php 2 Dec 2008 19:43:15 -0000 1.2 --- vShop_Forms.php 3 Dec 2008 20:37:49 -0000 1.3 *************** *** 78,82 **** case 'edit_order': ! if (empty($this->vshop->edit_order)) { $this->vshop->loadOrder(); } --- 78,82 ---- case 'edit_order': ! if (empty($this->vshop->order)) { $this->vshop->loadOrder(); } *************** *** 84,87 **** --- 84,95 ---- break; + case 'set_status': + if (empty($this->vshop->order)) { + $this->vshop->loadOrder(); + } + //print_r($this->vshop->order); exit; + $this->setStatus(); + break; + case 'orders': $this->vshop->panel->setCurrentTab('orders'); *************** *** 487,490 **** --- 495,520 ---- + public function setStatus($order) + { + + $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')); + + $tpl = $form->getTemplate(); + $tpl['TITLE'] = sprintf(dgettext('vshop', 'Order %s Status'), $order->id); + $tpl['CLOSE'] = sprintf('<input type="button" value="%s" onclick="window.close();" />', dgettext('vshop', 'Cancel')); + $content = PHPWS_Template::process($tpl, 'vshop', 'set_status.tpl'); + + return $content; + } + + public function editSettings() { |
|
From: Verdon V. <ve...@us...> - 2008-12-03 20:38:03
|
Update of /cvsroot/phpwebsite-comm/modules/vshop/boost In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23489/boost Modified Files: update.php Log Message: added ability to quick-edit order status Index: update.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/vshop/boost/update.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** update.php 2 Dec 2008 19:43:12 -0000 1.1 --- update.php 3 Dec 2008 20:37:45 -0000 1.2 *************** *** 32,35 **** --- 32,36 ---- $files = array('templates/edit_item.tpl', + 'templates/set_status.tpl', 'templates/edit_settings.tpl' ); *************** *** 43,46 **** --- 44,48 ---- + added ability to set minimum shipping charge + added ability to have free shipping on orders over $xx.xx + + added ability to change order status from within list view </pre>'; |
|
From: Verdon V. <ve...@us...> - 2008-12-02 19:43:24
|
Update of /cvsroot/phpwebsite-comm/modules/vshop/docs In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8998/docs Modified Files: CHANGELOG Log Message: 0.6.0 changes Index: CHANGELOG =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/vshop/docs/CHANGELOG,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** CHANGELOG 25 Nov 2008 15:19:31 -0000 1.1.1.1 --- CHANGELOG 2 Dec 2008 19:43:15 -0000 1.2 *************** *** 1,2 **** --- 1,11 ---- + Version 0.6.0 -- Dec 2008 + ------------------------------------------------------------------ + + added is_array checks to links() array_merge in dept and item class + + added currency and symbol to checkout and confirmation screens + + added ability to change an item's dept + + added ability to set minimum shipping charge + + added ability to have free shipping on orders over $xx.xx + + Version 0.5.0 -- Aug-Nov 2008 ------------------------------------------------------------------ |
|
From: Verdon V. <ve...@us...> - 2008-12-02 19:43:24
|
Update of /cvsroot/phpwebsite-comm/modules/vshop/templates In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8998/templates Modified Files: edit_item.tpl edit_settings.tpl Log Message: 0.6.0 changes Index: edit_item.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/vshop/templates/edit_item.tpl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** edit_item.tpl 25 Nov 2008 15:19:31 -0000 1.1.1.1 --- edit_item.tpl 2 Dec 2008 19:43:16 -0000 1.2 *************** *** 2,5 **** --- 2,6 ---- <fieldset> <legend><strong>{INFO_LABEL}</strong></legend> + <p><strong>{DEPT_ID_LABEL}</strong><br />{DEPT_ID}</p> <p><strong>{TITLE_LABEL}</strong><br />{TITLE}</p> <p><strong>{DESCRIPTION_LABEL}</strong><br />{DESCRIPTION}</p> Index: edit_settings.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/vshop/templates/edit_settings.tpl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** edit_settings.tpl 25 Nov 2008 15:19:31 -0000 1.1.1.1 --- edit_settings.tpl 2 Dec 2008 19:43:16 -0000 1.2 *************** *** 41,44 **** --- 41,46 ---- <p>{SHIPPING_FLAT}{SHIPPING_FLAT_LABEL}</p> <p>{SHIPPING_PERCENT}{SHIPPING_PERCENT_LABEL}</p> + <p>{SHIPPING_MINIMUM} {SHIPPING_MINIMUM_LABEL}</p> + <p>{SHIPPING_MAXIMUM} {SHIPPING_MAXIMUM_LABEL}</p> {SAVE} {END_FORM} |
|
From: Verdon V. <ve...@us...> - 2008-12-02 19:43:24
|
Update of /cvsroot/phpwebsite-comm/modules/vshop/class In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8998/class Modified Files: vShop.php vShop_Dept.php vShop_Forms.php vShop_Item.php Log Message: 0.6.0 changes Index: vShop_Item.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/vshop/class/vShop_Item.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** vShop_Item.php 25 Nov 2008 15:19:30 -0000 1.1.1.1 --- vShop_Item.php 2 Dec 2008 19:43:15 -0000 1.2 *************** *** 321,325 **** } ! $links = array_merge($links, vShop::navLinks()); if($links) --- 321,327 ---- } ! if (is_array(vShop::navLinks())) { ! $links = array_merge($links, vShop::navLinks()); ! } if($links) Index: vShop_Dept.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/vshop/class/vShop_Dept.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** vShop_Dept.php 25 Nov 2008 15:19:29 -0000 1.1.1.1 --- vShop_Dept.php 2 Dec 2008 19:43:15 -0000 1.2 *************** *** 228,232 **** } ! $links = array_merge($links, vShop::navLinks()); if($links) --- 228,234 ---- } ! if (is_array(vShop::navLinks())) { ! $links = array_merge($links, vShop::navLinks()); ! } if($links) Index: vShop.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/vshop/class/vShop.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** vShop.php 25 Nov 2008 15:19:29 -0000 1.1.1.1 --- vShop.php 2 Dec 2008 19:43:15 -0000 1.2 *************** *** 931,934 **** --- 931,952 ---- } + if (!empty($_POST['shipping_minimum'])) { + $shipping_minimum = (float)$_POST['shipping_minimum']; + if ($shipping_minimum > 0) { + PHPWS_Settings::set('vshop', 'shipping_minimum', $shipping_minimum); + } + } else { + PHPWS_Settings::reset('vshop', 'shipping_minimum'); + } + + if ( !empty($_POST['shipping_maximum']) ) { + $shipping_maximum = (float)$_POST['shipping_maximum']; + if ($shipping_maximum > 0) { + PHPWS_Settings::set('vshop', 'shipping_maximum', $shipping_maximum); + } + } else { + PHPWS_Settings::reset('vshop', 'shipping_maximum'); + } + isset($_POST['secure_checkout']) ? PHPWS_Settings::set('vshop', 'secure_checkout', 1) : *************** *** 1123,1127 **** } ! /* if shipping is by item */ if (PHPWS_Settings::get('vshop', 'shipping_calculation') == 1) { $shipping_calculation = dgettext('vshop', 'Free shipping'); --- 1141,1145 ---- } ! /* if shipping is free */ if (PHPWS_Settings::get('vshop', 'shipping_calculation') == 1) { $shipping_calculation = dgettext('vshop', 'Free shipping'); *************** *** 1145,1148 **** --- 1163,1180 ---- } + /* check for shipping min and max */ + if (PHPWS_Settings::get('vshop', 'shipping_minimum') > 0) { + if ($total_shipping < PHPWS_Settings::get('vshop', 'shipping_minimum')) { + $total_shipping = PHPWS_Settings::get('vshop', 'shipping_minimum'); + $shipping_calculation = sprintf(dgettext('vshop', 'Minimum shipping of %s'), number_format(PHPWS_Settings::get('vshop', 'shipping_minimum'), 2, '.', ',')); + } + } + if (PHPWS_Settings::get('vshop', 'shipping_maximum') > 0) { + if ($total_items > PHPWS_Settings::get('vshop', 'shipping_maximum')) { + $total_shipping = 0.00; + $shipping_calculation = sprintf(dgettext('vshop', 'Free shipping on items over %s'), number_format(PHPWS_Settings::get('vshop', 'shipping_maximum'), 2, '.', ',')); + } + } + /* add our totals to the array */ $order_array['total_items'] = $total_items; Index: vShop_Forms.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/vshop/class/vShop_Forms.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** vShop_Forms.php 25 Nov 2008 15:19:30 -0000 1.1.1.1 --- vShop_Forms.php 2 Dec 2008 19:43:15 -0000 1.2 *************** *** 348,352 **** $form->addHidden('module', 'vshop'); $form->addHidden('aop', 'post_item'); ! $form->addHidden('dept_id', $dept->id); if ($item->id) { $this->vshop->title = sprintf(dgettext('vshop', 'Update %s item'), $dept->title); --- 348,352 ---- $form->addHidden('module', 'vshop'); $form->addHidden('aop', 'post_item'); ! if ($item->id) { $this->vshop->title = sprintf(dgettext('vshop', 'Update %s item'), $dept->title); *************** *** 358,361 **** --- 358,375 ---- } + PHPWS_Core::initModClass('vshop', 'vShop_Dept.php'); + $db = new PHPWS_DB('vshop_depts'); + $db->addColumn('id'); + $db->addColumn('title'); + $result = $db->getObjects('vShop_Dept'); + if ($result) { + foreach ($result as $dept) { + $choices[$dept->id] = $dept->title; + } + $form->addSelect('dept_id', $choices); + $form->setLabel('dept_id', dgettext('vshop', 'Department')); + $form->setMatch('dept_id', $item->dept_id); + } + $form->addText('title', $item->title); $form->setSize('title', 40); *************** *** 568,571 **** --- 582,593 ---- $form->setSize('shipping_percent', 3); + $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); + $form->addMultiple('pay_methods', $pay_methods); $form->setRequired('pay_methods'); *************** *** 712,716 **** } $tpl['TOTAL_LABEL'] = dgettext('vshop', 'Total'); ! $tpl['TOTAL'] = number_format($total_items, 2, '.', ','); return PHPWS_Template::process($tpl, 'vshop', 'checkout_cart.tpl'); } --- 734,749 ---- } $tpl['TOTAL_LABEL'] = dgettext('vshop', 'Total'); ! // $tpl['TOTAL'] = number_format($total_items, 2, '.', ','); ! if (PHPWS_Settings::get('vshop', 'curr_symbol_pos') == 1) { ! $tpl['TOTAL'] = PHPWS_Settings::get('vshop', 'currency_symbol') . number_format($total_items, 2, '.', ','); ! if (PHPWS_Settings::get('vshop', 'display_currency')) { ! $tpl['TOTAL'] .= ' ' . PHPWS_Settings::get('vshop', 'currency'); ! } ! } else { ! $tpl['TOTAL'] = number_format($total_items, 2, '.', ',') . PHPWS_Settings::get('vshop', 'currency_symbol'); ! if (PHPWS_Settings::get('vshop', 'display_currency')) { ! $tpl['TOTAL'] .= ' ' . PHPWS_Settings::get('vshop', 'currency'); ! } ! } return PHPWS_Template::process($tpl, 'vshop', 'checkout_cart.tpl'); } *************** *** 868,872 **** $tpl['FINAL_LABEL'] = dgettext('vshop', 'Total Due'); ! $tpl['FINAL'] = number_format($order_data['total_grand'], 2, '.', ','); if ($formatted) { --- 901,916 ---- $tpl['FINAL_LABEL'] = dgettext('vshop', 'Total Due'); ! // $tpl['FINAL'] = number_format($order_data['total_grand'], 2, '.', ','); ! if (PHPWS_Settings::get('vshop', 'curr_symbol_pos') == 1) { ! $tpl['FINAL'] = PHPWS_Settings::get('vshop', 'currency_symbol') . number_format($order_data['total_grand'], 2, '.', ','); ! if (PHPWS_Settings::get('vshop', 'display_currency')) { ! $tpl['FINAL'] .= ' ' . PHPWS_Settings::get('vshop', 'currency'); ! } ! } else { ! $tpl['FINAL'] = number_format($order_data['total_grand'], 2, '.', ',') . PHPWS_Settings::get('vshop', 'currency_symbol'); ! if (PHPWS_Settings::get('vshop', 'display_currency')) { ! $tpl['FINAL'] .= ' ' . PHPWS_Settings::get('vshop', 'currency'); ! } ! } if ($formatted) { |
|
From: Verdon V. <ve...@us...> - 2008-12-02 19:43:24
|
Update of /cvsroot/phpwebsite-comm/modules/vshop/boost In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8998/boost Modified Files: boost.php Added Files: update.php Log Message: 0.6.0 changes Index: boost.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/vshop/boost/boost.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** boost.php 25 Nov 2008 15:19:28 -0000 1.1.1.1 --- boost.php 2 Dec 2008 19:43:12 -0000 1.2 *************** *** 24,28 **** $proper_name = 'vShop'; ! $version = '0.5.0'; $register = false; $unregister = false; --- 24,28 ---- $proper_name = 'vShop'; ! $version = '0.6.0'; $register = false; $unregister = false; --- NEW FILE: update.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: update.php,v 1.1 2008/12/02 19:43:12 verdonv Exp $ * @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net> */ function vshop_update(&$content, $currentVersion) { // $home_dir = PHPWS_Boost::getHomeDir(); switch ($currentVersion) { case version_compare($currentVersion, '0.6.0', '<'): $content[] = '<pre>'; $files = array('templates/edit_item.tpl', 'templates/edit_settings.tpl' ); vshopUpdateFiles($files, $content); $content[] = '0.6.0 changes ---------------- + added is_array checks to links() array_merge in dept and item class + added currency and symbol to checkout and confirmation screens + added ability to change an item\'s dept + added ability to set minimum shipping charge + added ability to have free shipping on orders over $xx.xx </pre>'; } // end switch return true; } function vshopUpdateFiles($files, &$content) { if (PHPWS_Boost::updateFiles($files, 'vshop')) { $content[] = '--- Updated the following files:'; } else { $content[] = '--- Unable to update the following files:'; } $content[] = " " . implode("\n ", $files); } ?> |
|
From: Verdon V. <ve...@us...> - 2008-12-02 19:43:24
|
Update of /cvsroot/phpwebsite-comm/modules/vshop/inc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8998/inc Modified Files: settings.php Log Message: 0.6.0 changes Index: settings.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/vshop/inc/settings.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** settings.php 25 Nov 2008 15:19:31 -0000 1.1.1.1 --- settings.php 2 Dec 2008 19:43:15 -0000 1.2 *************** *** 43,46 **** --- 43,48 ---- $settings['shipping_flat'] = 10; $settings['shipping_percent'] = 2; + $settings['shipping_minimum'] = 0; + $settings['shipping_maximum'] = 0; $settings['payment_methods'] = array('vShop_Cheque'); $settings['secure_checkout'] = 0; |
|
From: Verdon V. <ve...@us...> - 2008-11-27 19:15:51
|
Update of /cvsroot/phpwebsite-comm/modules/podcaster/templates In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32646/templates Modified Files: info.tpl Log Message: 1.2.0 changes Index: info.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/templates/info.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** info.tpl 9 Feb 2008 19:01:13 -0000 1.4 --- info.tpl 27 Nov 2008 19:15:38 -0000 1.5 *************** *** 1,9 **** <fieldset> <legend><strong>{TITLE}</strong></legend> ! <!-- BEGIN info_1 --><p><strong>{INFO_1_LABEL}</strong> {INFO_1}</p><!-- END info_1 --> ! <!-- BEGIN info_2 --><p><strong>{INFO_2_LABEL}</strong> {INFO_2}</p><!-- END info_2 --> ! <!-- BEGIN info_3 --><p><strong>{INFO_3_LABEL}</strong> {INFO_3}</p><!-- END info_3 --> ! <!-- BEGIN info_4 --><p><strong>{INFO_4_LABEL}</strong> {INFO_4}</p><!-- END info_4 --> ! <!-- BEGIN info_5 --><p><strong>{INFO_5_LABEL}</strong> {INFO_5}</p><!-- END info_5 --> ! <!-- BEGIN donate --><p>{DONATE}</p><!-- END donate --> </fieldset> --- 1,5 ---- <fieldset> <legend><strong>{TITLE}</strong></legend> ! <p>{INFO}</p> ! <p>{DONATE}</p> </fieldset> |
|
From: Verdon V. <ve...@us...> - 2008-11-27 19:15:50
|
Update of /cvsroot/phpwebsite-comm/modules/podcaster/boost In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32646/boost Modified Files: boost.php dependency.xml update.php Log Message: 1.2.0 changes Index: dependency.xml =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/boost/dependency.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** dependency.xml 17 Mar 2008 19:07:08 -0000 1.5 --- dependency.xml 27 Nov 2008 19:15:38 -0000 1.6 *************** *** 4,8 **** <title>core</title> <properName>phpWebSite Core</properName> ! <version>1.8.0</version> <url>http://phpwebsite.appstate.edu/downloads/modules/base/</url> </module> --- 4,8 ---- <title>core</title> <properName>phpWebSite Core</properName> ! <version>1.9.0</version> <url>http://phpwebsite.appstate.edu/downloads/modules/base/</url> </module> *************** *** 10,14 **** <title>filecabinet</title> <properName>File Cabinet</properName> ! <version>2.0.0</version> <url>http://phpwebsite.appstate.edu/downloads/modules/filecabinet/</url> </module> --- 10,14 ---- <title>filecabinet</title> <properName>File Cabinet</properName> ! <version>2.2.0</version> <url>http://phpwebsite.appstate.edu/downloads/modules/filecabinet/</url> </module> *************** *** 16,20 **** <title>search</title> <properName>Search</properName> ! <version>0.3.2</version> <url>http://phpwebsite.appstate.edu/downloads/modules/search/</url> </module> --- 16,20 ---- <title>search</title> <properName>Search</properName> ! <version>0.4.0</version> <url>http://phpwebsite.appstate.edu/downloads/modules/search/</url> </module> Index: boost.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/boost/boost.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** boost.php 9 Feb 2008 19:01:09 -0000 1.4 --- boost.php 27 Nov 2008 19:15:38 -0000 1.5 *************** *** 24,28 **** $proper_name = 'Podcaster'; ! $version = '1.1.0'; $import_sql = true; $version_http = 'http://verdon.ca/downloads/modules/podcaster/check.xml'; --- 24,28 ---- $proper_name = 'Podcaster'; ! $version = '1.2.0'; $import_sql = true; $version_http = 'http://verdon.ca/downloads/modules/podcaster/check.xml'; Index: update.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/boost/update.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** update.php 17 Mar 2008 19:07:08 -0000 1.14 --- update.php 27 Nov 2008 19:15:38 -0000 1.15 *************** *** 185,188 **** --- 185,268 ---- + case version_compare($currentVersion, '1.2.0', '<'): + $content[] = '<pre>'; + + /* remove the old init file */ + $initfile = PHPWS_SOURCE_DIR . 'mod/podcaster/inc/init.php'; + if (is_file($initfile)) { + if (!@unlink($initfile)) { + $content[] = 'FAILED TO DELETE mod/podcaster/inc/init.php + YOU MUST REMOVE THIS FILE YOURSELF + '; + } else { + $content[] = '- Removed mod/podcaster/inc/init.php + It has been replaced with mod/podcaster/inc/runtime.php + '; + } + } + + /* update files */ + $files = array('templates/info.tpl' + ); + podcasterUpdateFiles($files, $content); + + /* update channel keys */ + $error = false; + PHPWS_Core::initModClass('podcaster', 'PCR_Channel.php'); + $db = new PHPWS_DB('podcaster_channel'); + $channels = $db->getObjects('Podcaster_Channel'); + if (PEAR::isError($channels)) { + PHPWS_Error::log($channels); + $error = true; + } + foreach ($channels as $channel) { + $result = $channel->saveKey(); + if (PEAR::isError($result)) { + PHPWS_Error::log($result); + $error = true; + } + } + if ($error) { + $content[] = '- There was a problem updating your Channel keys + Please save each channel to force an update of the key file.'; + } else { + $content[] = '- Channel keys successfully updated'; + } + + /* update episode keys */ + $error = false; + PHPWS_Core::initModClass('podcaster', 'PCR_Episode.php'); + $db = new PHPWS_DB('podcaster_episode'); + $episodes = $db->getObjects('Podcaster_Episode'); + if (PEAR::isError($episodes)) { + PHPWS_Error::log($episodes); + $error = true; + } + foreach ($episodes as $episode) { + $result = $episode->saveKey(); + if (PEAR::isError($result)) { + PHPWS_Error::log($result); + $error = true; + } + } + if ($error) { + $content[] = '- There was a problem updating your Episode keys + Please save each episode to force an update of the key file.'; + } else { + $content[] = '- Episode keys successfully updated'; + } + + + $content[] = ' + 1.2.0 changes + ---------------- + + Moved readme content to README file + + Made phpws 1.6 compatible + + Replaced inc/init.php with inc/runtime.php + + Now restrict read me tab to diety users only + + </pre>'; + + } // end switch |
|
From: Verdon V. <ve...@us...> - 2008-11-27 19:15:49
|
Update of /cvsroot/phpwebsite-comm/modules/podcaster/class In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32646/class Modified Files: PCR_Channel.php PCR_Episode.php PCR_Forms.php Podcaster.php Log Message: 1.2.0 changes Index: PCR_Episode.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/class/PCR_Episode.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PCR_Episode.php 17 Mar 2008 15:53:53 -0000 1.4 --- PCR_Episode.php 27 Nov 2008 19:15:38 -0000 1.5 *************** *** 115,121 **** if ($icon) { $link = '<a href="./index.php?module=podcaster&id=' . $this->channel_id . '&uop=view_rss"><img src="./images/mod/podcaster/rss_sm.png" width="14" height="14" border="0" alt="' . dgettext('podcaster', 'Subscribe RSS') . '" title="' . dgettext('podcaster', 'Subscribe RSS') . '" /></a>'; ! return $link . ' ' . PHPWS_Text::rewriteLink($channel->title, 'podcaster', $this->channel_id); } else { ! return PHPWS_Text::rewriteLink($channel->title, 'podcaster', $this->channel_id); } } else { --- 115,121 ---- if ($icon) { $link = '<a href="./index.php?module=podcaster&id=' . $this->channel_id . '&uop=view_rss"><img src="./images/mod/podcaster/rss_sm.png" width="14" height="14" border="0" alt="' . dgettext('podcaster', 'Subscribe RSS') . '" title="' . dgettext('podcaster', 'Subscribe RSS') . '" /></a>'; ! return $link . ' ' . $channel->viewLink(); } else { ! return $channel->viewLink(); } } else { *************** *** 332,336 **** $key->setItemId($this->id); $key->setEditPermission('edit_episode'); ! if (MOD_REWRITE_ENABLED) { $key->setUrl('podcaster/' . $this->channel_id . '/' . $this->id); --- 332,337 ---- $key->setItemId($this->id); $key->setEditPermission('edit_episode'); ! $key->setUrl($this->viewLink(true)); ! /* if (MOD_REWRITE_ENABLED) { $key->setUrl('podcaster/' . $this->channel_id . '/' . $this->id); *************** *** 338,342 **** $key->setUrl('index.php?module=podcaster&uop=view_episode&episode_id=' . $this->id); } ! if ($this->approved) { $key->active = (int)$this->active; --- 339,343 ---- $key->setUrl('index.php?module=podcaster&uop=view_episode&episode_id=' . $this->id); } ! */ if ($this->approved) { $key->active = (int)$this->active; *************** *** 436,445 **** ! function viewLink() { ! // $vars['uop'] = 'view_episode'; ! // $vars['episode_id'] = $this->id; ! // return PHPWS_Text::moduleLink($this->title, 'podcaster', $vars); ! return PHPWS_Text::rewriteLink($this->title, 'podcaster', $this->channel_id, $this->id); } --- 437,452 ---- ! public function viewLink($bare=false) { ! PHPWS_Core::initCoreClass('Link.php'); ! $link = new PHPWS_Link($this->title, 'podcaster', array('channel'=>$this->channel_id, 'episode'=>$this->id)); ! $link->rewrite = MOD_REWRITE_ENABLED; ! ! if ($bare) { ! return $link->getAddress(); ! } else { ! return $link->get(); ! } ! } Index: Podcaster.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/class/Podcaster.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Podcaster.php 9 Feb 2008 19:01:10 -0000 1.5 --- Podcaster.php 27 Nov 2008 19:15:38 -0000 1.6 *************** *** 258,261 **** --- 258,263 ---- } elseif (isset($_REQUEST['id'])) { $this->channel = new Podcaster_Channel($_REQUEST['id']); + } elseif (isset($_REQUEST['channel'])) { + $this->channel = new Podcaster_Channel($_REQUEST['channel']); } else { $this->channel = new Podcaster_Channel; *************** *** 271,274 **** --- 273,278 ---- } elseif (isset($_REQUEST['episode_id'])) { $this->episode = new Podcaster_Episode($_REQUEST['episode_id']); + } elseif (isset($_REQUEST['episode'])) { + $this->episode = new Podcaster_Episode($_REQUEST['episode']); } else { $this->episode = new Podcaster_Episode; *************** *** 399,403 **** 'link'=>$link); } ! if (Current_User::isUnrestricted('podcaster')) { $tags['info'] = array('title'=>dgettext('podcaster', 'Read me'), 'link'=>$link); --- 403,407 ---- 'link'=>$link); } ! if (Current_User::isDeity()) { $tags['info'] = array('title'=>dgettext('podcaster', 'Read me'), 'link'=>$link); Index: PCR_Forms.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/class/PCR_Forms.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** PCR_Forms.php 17 Mar 2008 19:07:12 -0000 1.8 --- PCR_Forms.php 27 Nov 2008 19:15:38 -0000 1.9 *************** *** 358,372 **** { $tpl['TITLE'] = dgettext('podcaster', 'Important Information'); ! $tpl['INFO_1_LABEL'] = dgettext('podcaster', 'About this module:'); ! $tpl['INFO_1'] = dgettext('podcaster', 'This is the second release of podcaster for the new 1.x series phpwebsite. This release takes advantage of the new File Cabinet 2.0 features, and media upload/embed tools are now built right in. Support for PDF and other documents types has also been added. Podcaster is now searchable with the search module, and new access module and short url features are implimented.'); ! $tpl['INFO_2_LABEL'] = dgettext('podcaster', 'A note on media types:'); ! $tpl['INFO_2'] = dgettext('podcaster', 'You may specify at a channel level what media type you will allow for all episodes in that channel. Ideally, you should determine this before adding episodes to a channel, though it can be changed at any time.'); ! $tpl['INFO_3_LABEL'] = dgettext('podcaster', 'A note on restricted users:'); ! $tpl['INFO_3'] = dgettext('podcaster', 'If you are allowing restricted users to add podcast episodes, you will also need to allow them to upload to the appropriate folder(s) in File Cabinet.'); ! $tpl['INFO_4_LABEL'] = dgettext('podcaster', 'A note on permissons:'); ! $tpl['INFO_4'] = dgettext('podcaster', 'Honestly, I\'m still working on understanding the new system completely. I\'ve done a basic security audit and although I am sure there is no gross holes, I\'m sure I may have something wrong too ;-) I wanted to get this rewrite out asap and will do a more thorough permissioning review for the next podcaster release.'); ! $tpl['INFO_5_LABEL'] = null; ! $tpl['INFO_5'] = null; $tpl['DONATE'] = sprintf(dgettext('podcaster', 'If you would like to help out with the ongoing development of Podcaster, or other modules by Verdon Vaillancourt, %s click here to donate %s (opens in new browser window).'), '<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=donations%40verdon%2eca&item_name=Podcaster%20Module%20Development&no_shipping=0&no_note=1&tax=0¤cy_code=USD&lc=CA&bn=PP%2dDonationsBF&charset=UTF%2d8" target="new">', '</a>'); --- 358,372 ---- { + $filename = 'mod/podcaster/docs/README'; + if (@fopen($filename, "rb")) { + $handle = fopen($filename, "rb"); + $readme = fread($handle, filesize($filename)); + fclose($handle); + } else { + $readme = dgettext('podcaster', 'Sorry, the readme file does not exist.'); + } + $tpl['TITLE'] = dgettext('podcaster', 'Important Information'); ! $tpl['INFO'] = $readme; $tpl['DONATE'] = sprintf(dgettext('podcaster', 'If you would like to help out with the ongoing development of Podcaster, or other modules by Verdon Vaillancourt, %s click here to donate %s (opens in new browser window).'), '<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=donations%40verdon%2eca&item_name=Podcaster%20Module%20Development&no_shipping=0&no_note=1&tax=0¤cy_code=USD&lc=CA&bn=PP%2dDonationsBF&charset=UTF%2d8" target="new">', '</a>'); Index: PCR_Channel.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/class/PCR_Channel.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PCR_Channel.php 17 Mar 2008 15:53:53 -0000 1.5 --- PCR_Channel.php 27 Nov 2008 19:15:38 -0000 1.6 *************** *** 510,520 **** $key->setItemId($this->id); $key->setEditPermission('edit_channel'); ! ! if (MOD_REWRITE_ENABLED) { ! $key->setUrl('podcaster/' . $this->id); ! } else { ! $key->setUrl('index.php?module=podcaster&id=' . $this->id); ! } ! $key->active = (int)$this->active; $key->setTitle($this->title); --- 510,514 ---- $key->setItemId($this->id); $key->setEditPermission('edit_channel'); ! $key->setUrl($this->viewLink(true)); $key->active = (int)$this->active; $key->setTitle($this->title); *************** *** 536,542 **** ! function viewLink() { ! return PHPWS_Text::rewriteLink($this->title, 'podcaster', $this->id); } --- 530,546 ---- ! public function viewLink($bare=false) { ! PHPWS_Core::initCoreClass('Link.php'); ! // $link = new PHPWS_Link($this->title, 'podcaster', array('id'=>$this->id)); ! $link = new PHPWS_Link($this->title, 'podcaster', array('channel'=>$this->id)); ! $link->rewrite = MOD_REWRITE_ENABLED; ! ! if ($bare) { ! return $link->getAddress(); ! } else { ! return $link->get(); ! } ! } |
|
From: Verdon V. <ve...@us...> - 2008-11-27 19:15:49
|
Update of /cvsroot/phpwebsite-comm/modules/podcaster/docs In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32646/docs Modified Files: CHANGELOG Log Message: 1.2.0 changes Index: CHANGELOG =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/docs/CHANGELOG,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** CHANGELOG 17 Mar 2008 19:07:14 -0000 1.8 --- CHANGELOG 27 Nov 2008 19:15:38 -0000 1.9 *************** *** 1,2 **** --- 1,10 ---- + Version 1.2.0 -- Nov 2008 + ------------------------------------------------------------------ + + Moved readme content to README file + + Made phpws 1.6 compatible + + Replaced inc/init.php with inc/runtime.php + + Now restrict read me tab to diety users only + + Version 1.1.0 -- Mar 2008 ------------------------------------------------------------------ |
|
From: Verdon V. <ve...@us...> - 2008-11-27 19:15:49
|
Update of /cvsroot/phpwebsite-comm/modules/podcaster In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32646 Modified Files: index.php Log Message: 1.2.0 changes Index: index.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/index.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** index.php 17 Mar 2008 15:53:48 -0000 1.3 --- index.php 27 Nov 2008 19:15:35 -0000 1.4 *************** *** 30,41 **** $podcaster = new Podcaster; - if (isset($_GET['var1'])) { - $_REQUEST['id'] = $_GET['id'] = (int)$_GET['var1']; - } - - if (isset($_GET['var2'])) { - $_REQUEST['episode_id'] = $_GET['episode_id'] = (int)$_GET['var2']; - } - if (isset($_REQUEST['aop'])) { $podcaster->adminMenu(); --- 30,33 ---- *************** *** 46,49 **** --- 38,45 ---- } elseif (isset($_REQUEST['id'])) { $podcaster->userMenu('view_channel'); + } elseif (isset($_REQUEST['channel']) && isset($_REQUEST['episode'])) { + $podcaster->userMenu('view_episode'); + } elseif (isset($_REQUEST['channel'])) { + $podcaster->userMenu('view_channel'); } else { PHPWS_Core::home(); |
|
From: Verdon V. <ve...@us...> - 2008-11-27 19:15:49
|
Update of /cvsroot/phpwebsite-comm/modules/podcaster/inc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32646/inc Added Files: runtime.php Removed Files: init.php Log Message: 1.2.0 changes --- init.php DELETED --- --- NEW FILE: runtime.php --- <?php /** * podcaster - 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: runtime.php,v 1.5 2008/11/27 19:15:38 verdonv Exp $ * @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net> */ PHPWS_Core::initModClass('podcaster', 'PCR_Runtime.php'); PCR_Runtime::showBlock(); ?> |
|
From: Verdon V. <ve...@us...> - 2008-11-26 14:53:41
|
Update of /cvsroot/phpwebsite-comm/modules/finc/locale/en_US/LC_MESSAGES In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11757/locale/en_US/LC_MESSAGES Modified Files: finc.po Log Message: updated lang file Index: finc.po =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/finc/locale/en_US/LC_MESSAGES/finc.po,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** finc.po 19 May 2008 23:36:27 -0000 1.1.1.1 --- finc.po 26 Nov 2008 14:53:38 -0000 1.2 *************** *** 25,29 **** "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-05-19 19:27-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" --- 25,29 ---- "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-11-26 09:51-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" *************** *** 33,39 **** "Content-Transfer-Encoding: 8bit\n" - msgid "About this module:" - msgstr "" - msgid "Activate" msgstr "" --- 33,36 ---- *************** *** 52,58 **** msgstr "" - msgid "Caution" - msgstr "" - #, php-format msgid "Check your %s then create a %s to begin" --- 49,52 ---- *************** *** 153,156 **** --- 147,153 ---- msgstr "" + msgid "Sorry, the readme file does not exist." + msgstr "" + msgid "Sorry, the specified file does not exist." msgstr "" *************** *** 163,180 **** msgstr "" - msgid "" - "This is the first release of finc for the new 1.x series phpwebsite. It's " - "pretty simple and there may not be any further releases, unless bugs are " - "found. I wrote this for a specific need I had and thought it may be of use " - "to others also." - msgstr "" - - msgid "" - "This module could be dangerous. You are expected to have some idea of what " - "you are doing, if you are going to use it. It could be used to do nasty or " - "stupid things. I have intentionally not included file upload abilites to it. " - "If you do not have access to the server, you should not be using this." - msgstr "" - msgid "Title" msgstr "" --- 160,163 ---- |
|
From: Verdon V. <ve...@us...> - 2008-11-26 14:42:10
|
Update of /cvsroot/phpwebsite-comm/modules/finc/class In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10782/class Modified Files: FINC_File.php FINC_Forms.php Log Message: 1.1.0 updates Index: FINC_File.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/finc/class/FINC_File.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** FINC_File.php 19 May 2008 23:36:26 -0000 1.1.1.1 --- FINC_File.php 26 Nov 2008 14:42:03 -0000 1.2 *************** *** 182,186 **** $vars['aop'] = 'delete_file'; $js['ADDRESS'] = PHPWS_Text::linkAddress('finc', $vars, true); ! $js['QUESTION'] = sprintf(dgettext('finc', 'Are you sure you want to delete the file %s?\n\nOnly the databse record will be destroyed. You will still have to physically remove "%s" from your file system.'), $this->getTitle(), $this->getPath()); $js['LINK'] = dgettext('finc', 'Delete'); $links[] = javascript('confirm', $js); --- 182,186 ---- $vars['aop'] = 'delete_file'; $js['ADDRESS'] = PHPWS_Text::linkAddress('finc', $vars, true); ! $js['QUESTION'] = sprintf(dgettext('finc', 'Are you sure you want to delete the file %s?\n\nOnly the databse record will be destroyed. You will still have to physically remove "%s" from your file system.'), $this->getTitle(true), $this->getPath()); $js['LINK'] = dgettext('finc', 'Delete'); $links[] = javascript('confirm', $js); *************** *** 224,234 **** $key->setItemName('file'); $key->setItemId($this->id); ! ! if (MOD_REWRITE_ENABLED) { ! $key->setUrl('finc/' . $this->id); ! } else { ! $key->setUrl('index.php?module=finc&id=' . $this->id); ! } ! $key->active = (int)$this->active; $key->setTitle($this->title); --- 224,228 ---- $key->setItemName('file'); $key->setItemId($this->id); ! $key->setUrl($this->viewLink(true)); $key->active = (int)$this->active; $key->setTitle($this->title); *************** *** 250,258 **** ! function viewLink() { ! return PHPWS_Text::rewriteLink($this->title, 'finc', $this->id); ! } --- 244,260 ---- ! function viewLink($bare=false) { ! PHPWS_Core::initCoreClass('Link.php'); ! $link = new PHPWS_Link($this->title, 'finc', array('id'=>$this->id)); ! $link->rewrite = MOD_REWRITE_ENABLED; ! ! if ($bare) { ! return $link->getAddress(); ! } else { ! return $link->get(); ! } + } Index: FINC_Forms.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/finc/class/FINC_Forms.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** FINC_Forms.php 19 May 2008 23:36:26 -0000 1.1.1.1 --- FINC_Forms.php 26 Nov 2008 14:42:03 -0000 1.2 *************** *** 165,179 **** { $tpl['TITLE'] = dgettext('finc', 'Important Information'); ! $tpl['INFO_1_LABEL'] = dgettext('finc', 'About this module:'); ! $tpl['INFO_1'] = dgettext('finc', 'This is the first release of finc for the new 1.x series phpwebsite. It\'s pretty simple and there may not be any further releases, unless bugs are found. I wrote this for a specific need I had and thought it may be of use to others also.'); ! $tpl['INFO_2_LABEL'] = dgettext('finc', 'Caution'); ! $tpl['INFO_2'] = dgettext('finc', 'This module could be dangerous. You are expected to have some idea of what you are doing, if you are going to use it. It could be used to do nasty or stupid things. I have intentionally not included file upload abilites to it. If you do not have access to the server, you should not be using this.'); ! $tpl['INFO_3_LABEL'] = null; ! $tpl['INFO_3'] = null; ! $tpl['INFO_4_LABEL'] = null; ! $tpl['INFO_4'] = null; ! $tpl['INFO_5_LABEL'] = null; ! $tpl['INFO_5'] = null; $tpl['DONATE'] = sprintf(dgettext('finc', 'If you would like to help out with the ongoing development of finc, or other modules by Verdon Vaillancourt, %s click here to donate %s (opens in new browser window).'), '<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=donations%40verdon%2eca&item_name=Finc%20Module%20Development&no_shipping=0&no_note=1&tax=0¤cy_code=USD&lc=CA&bn=PP%2dDonationsBF&charset=UTF%2d8" target="new">', '</a>'); --- 165,179 ---- { + $filename = 'mod/finc/docs/README'; + if (@fopen($filename, "rb")) { + $handle = fopen($filename, "rb"); + $readme = fread($handle, filesize($filename)); + fclose($handle); + } else { + $readme = dgettext('finc', 'Sorry, the readme file does not exist.'); + } + $tpl['TITLE'] = dgettext('finc', 'Important Information'); ! $tpl['INFO'] = $readme; $tpl['DONATE'] = sprintf(dgettext('finc', 'If you would like to help out with the ongoing development of finc, or other modules by Verdon Vaillancourt, %s click here to donate %s (opens in new browser window).'), '<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=donations%40verdon%2eca&item_name=Finc%20Module%20Development&no_shipping=0&no_note=1&tax=0¤cy_code=USD&lc=CA&bn=PP%2dDonationsBF&charset=UTF%2d8" target="new">', '</a>'); |
|
From: Verdon V. <ve...@us...> - 2008-11-26 14:42:10
|
Update of /cvsroot/phpwebsite-comm/modules/finc/boost In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10782/boost Modified Files: about.html boost.php dependency.xml Added Files: update.php Log Message: 1.1.0 updates Index: dependency.xml =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/finc/boost/dependency.xml,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** dependency.xml 19 May 2008 23:36:26 -0000 1.1.1.1 --- dependency.xml 26 Nov 2008 14:42:03 -0000 1.2 *************** *** 4,8 **** <title>core</title> <properName>phpWebSite Core</properName> ! <version>1.8.0</version> <url>http://phpwebsite.appstate.edu/downloads/modules/base/</url> </module> --- 4,8 ---- <title>core</title> <properName>phpWebSite Core</properName> ! <version>1.9.0</version> <url>http://phpwebsite.appstate.edu/downloads/modules/base/</url> </module> Index: about.html =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/finc/boost/about.html,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** about.html 19 May 2008 23:36:26 -0000 1.1.1.1 --- about.html 26 Nov 2008 14:42:03 -0000 1.2 *************** *** 9,13 **** <h3>By Verdon Vaillancourt</h3> ! <p>Finc is a module that allows you to iclude the contents of a file on the server, and puts it in a content box.</p> <p class="align-center padded"><input type="button" onclick="window.close()" value="Close" /></p> </body> --- 9,13 ---- <h3>By Verdon Vaillancourt</h3> ! <p>Finc is a module that allows you to include the contents of a file on the server, and puts it in a content box. It also creates a phpws key for the include, so that it can be categorized, menued easily, and so on.</p> <p class="align-center padded"><input type="button" onclick="window.close()" value="Close" /></p> </body> Index: boost.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/finc/boost/boost.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** boost.php 20 May 2008 12:47:43 -0000 1.2 --- boost.php 26 Nov 2008 14:42:03 -0000 1.3 *************** *** 24,28 **** $proper_name = 'Finc'; ! $version = '1.0.0'; $import_sql = true; $file_dir = true; --- 24,28 ---- $proper_name = 'Finc'; ! $version = '1.1.0'; $import_sql = true; $file_dir = true; --- NEW FILE: update.php --- <?php /** * finc - 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: update.php,v 1.1 2008/11/26 14:42:03 verdonv Exp $ * @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net> */ function finc_update(&$content, $currentVersion) { $home_dir = PHPWS_Boost::getHomeDir(); switch ($currentVersion) { case version_compare($currentVersion, '1.1.0', '<'): $content[] = '<pre>'; $files = array('templates/info.tpl'); fincUpdateFiles($files, $content); $content[] = '1.1.0 changes ---------------- + Setting up </pre>'; } // end switch return true; } function fincUpdateFiles($files, &$content) { if (PHPWS_Boost::updateFiles($files, 'finc')) { $content[] = '--- Updated the following files:'; } else { $content[] = '--- Unable to update the following files:'; } $content[] = " " . implode("\n ", $files); } ?> |
|
From: Verdon V. <ve...@us...> - 2008-11-26 14:42:10
|
Update of /cvsroot/phpwebsite-comm/modules/finc/docs In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10782/docs Modified Files: CHANGELOG Added Files: README Log Message: 1.1.0 updates --- NEW FILE: README --- <p>This is the first release of finc for the new 1.x series phpwebsite. It's pretty simple and there may not be any further releases, unless bugs are found. I wrote this for a specific need I had and thought it may be of use to others also.</p> <p>Caution: This module could be dangerous. You are expected to have some idea of what you are doing, if you are going to use it. It could be used to do nasty or stupid things. I have intentionally not included file upload abilites to it. If you do not have access to the server, you should not be using this.</p> Index: CHANGELOG =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/finc/docs/CHANGELOG,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** CHANGELOG 19 May 2008 23:36:26 -0000 1.1.1.1 --- CHANGELOG 26 Nov 2008 14:42:03 -0000 1.2 *************** *** 3,4 **** --- 3,11 ---- May 17 - 19 + Initial writing of mod + + Version 1.1.0 -- Nov 2008 + ------------------------------------------------------------------ + + Updated about file + + Made phpws 1.6 compatible + + Moved readme text to README file + |
|
From: Verdon V. <ve...@us...> - 2008-11-26 14:42:10
|
Update of /cvsroot/phpwebsite-comm/modules/finc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10782 Modified Files: index.php Log Message: 1.1.0 updates Index: index.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/finc/index.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** index.php 19 May 2008 23:36:26 -0000 1.1.1.1 --- index.php 26 Nov 2008 14:42:00 -0000 1.2 *************** *** 31,38 **** $finc = new Finc; - if (isset($_GET['var1'])) { - $_REQUEST['id'] = $_GET['id'] = (int)$_GET['var1']; - } - if (isset($_REQUEST['aop'])) { $finc->adminMenu(); --- 31,34 ---- |
|
From: Verdon V. <ve...@us...> - 2008-11-26 14:42:10
|
Update of /cvsroot/phpwebsite-comm/modules/finc/templates In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10782/templates Modified Files: info.tpl Log Message: 1.1.0 updates Index: info.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/finc/templates/info.tpl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** info.tpl 19 May 2008 23:36:27 -0000 1.1.1.1 --- info.tpl 26 Nov 2008 14:42:03 -0000 1.2 *************** *** 1,9 **** <fieldset> <legend><strong>{TITLE}</strong></legend> ! <!-- BEGIN info_1 --><p><strong>{INFO_1_LABEL}</strong> {INFO_1}</p><!-- END info_1 --> ! <!-- BEGIN info_2 --><p><strong>{INFO_2_LABEL}</strong> {INFO_2}</p><!-- END info_2 --> ! <!-- BEGIN info_3 --><p><strong>{INFO_3_LABEL}</strong> {INFO_3}</p><!-- END info_3 --> ! <!-- BEGIN info_4 --><p><strong>{INFO_4_LABEL}</strong> {INFO_4}</p><!-- END info_4 --> ! <!-- BEGIN info_5 --><p><strong>{INFO_5_LABEL}</strong> {INFO_5}</p><!-- END info_5 --> ! <!-- BEGIN donate --><p>{DONATE}</p><!-- END donate --> </fieldset> --- 1,5 ---- <fieldset> <legend><strong>{TITLE}</strong></legend> ! <p>{INFO}</p> ! <p>{DONATE}</p> </fieldset> |
|
From: Greg M. <bli...@us...> - 2008-11-25 16:07:23
|
Update of /cvsroot/phpwebsite-comm/CVSROOT In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16461 Modified Files: avail Log Message: Giving Verdon access to vshop module. Index: avail =================================================================== RCS file: /cvsroot/phpwebsite-comm/CVSROOT/avail,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** avail 23 Aug 2008 03:14:30 -0000 1.74 --- avail 25 Nov 2008 16:07:12 -0000 1.75 *************** *** 37,40 **** --- 37,41 ---- avail|blindman1344|modules/twitter avail|gbrackett|modules/uplink + avail|verdonv|modules/vshop avail|techelephant|modules/wapstat avail|verdonv|modules/whatsnew |
|
From: Verdon V. <ve...@us...> - 2008-11-24 04:12:13
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/boost In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32073/boost Modified Files: update.php Log Message: fix captch Index: update.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/boost/update.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** update.php 22 Nov 2008 21:01:00 -0000 1.18 --- update.php 24 Nov 2008 04:11:56 -0000 1.19 *************** *** 196,202 **** $content[] = '<pre>'; ! $file = PHPWS_SOURCE_DIR . 'mod/rolodex/inc/init.php'; ! if (is_file($file)) { ! if (!@unlink($file)) { $content[] = 'FAILED TO DELETE mod/rolodex/inc/init.php YOU MUST REMOVE THIS FILE YOURSELF --- 196,202 ---- $content[] = '<pre>'; ! $initfile = PHPWS_SOURCE_DIR . 'mod/rolodex/inc/init.php'; ! if (is_file($initfile)) { ! if (!@unlink($initfile)) { $content[] = 'FAILED TO DELETE mod/rolodex/inc/init.php YOU MUST REMOVE THIS FILE YOURSELF *************** *** 209,212 **** --- 209,216 ---- } + $files = array('templates/message_member.tpl' + ); + rolodexUpdateFiles($files, $content); + $content[] = '1.3.0 changes ---------------- *************** *** 215,218 **** --- 219,223 ---- + Begin rewriting to php5 standards + Moved readme content to docs/readme + + Updated CAPTCHA support </pre>'; |
