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: Greg M. <bli...@us...> - 2008-01-23 04:04:18
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18355/docs Modified Files: INSTALL Log Message: Using new addRadioAssoc form function. Index: INSTALL =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/docs/INSTALL,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** INSTALL 13 Oct 2007 17:16:01 -0000 1.11 --- INSTALL 23 Jan 2008 04:04:21 -0000 1.12 *************** *** 5,10 **** ===== IMPORTANT ===== ! This version of Featured Photo requires phpWebSite 1.3.2 or higher. You ! have to install phpWebSite >= 1.3.2 first - earlier versions of phpWebSite will not work. If you are running phpWebSite 0.10.x, grab the latest 0.x.x version of this module. --- 5,10 ---- ===== IMPORTANT ===== ! This version of Featured Photo requires phpWebSite 1.4.0 or higher. You ! have to install phpWebSite >= 1.4.0 first - earlier versions of phpWebSite will not work. If you are running phpWebSite 0.10.x, grab the latest 0.x.x version of this module. |
|
From: Greg M. <bli...@us...> - 2008-01-23 04:04:17
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18355/class Modified Files: manager.php Log Message: Using new addRadioAssoc form function. Index: manager.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/class/manager.php,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** manager.php 22 Jan 2008 03:22:33 -0000 1.31 --- manager.php 23 Jan 2008 04:04:20 -0000 1.32 *************** *** 400,405 **** $form->setSize('title', 50); ! $mode_labels = array(dgettext('featuredphoto', 'Increment'), dgettext('featuredphoto', 'Random')); ! $mode_ids = array(0, 1); if (empty($block->id)) --- 400,405 ---- $form->setSize('title', 50); ! $modes[0] = dgettext('featuredphoto', 'Increment'); ! $modes[1] = dgettext('featuredphoto', 'Random'); if (empty($block->id)) *************** *** 419,427 **** { PHPWS_Core::initModClass('filecabinet', 'Image.php'); ! ! $mode_labels = array(dgettext('featuredphoto', 'Increment'), ! dgettext('featuredphoto', 'Random'), ! dgettext('featuredphoto', 'Fixed on the image')); ! $mode_ids = array(0, 1, 2); foreach ($photos as $photo) --- 419,423 ---- { PHPWS_Core::initModClass('filecabinet', 'Image.php'); ! $modes[2] = dgettext('featuredphoto', 'Fixed on the image'); foreach ($photos as $photo) *************** *** 435,440 **** } ! $form->addRadio('mode', $mode_ids); ! $form->setLabel('mode', $mode_labels); $form->setMatch('mode', $block->mode); $form->addTplTag('MODE_LABEL', dgettext('featuredphoto', 'Mode')); --- 431,435 ---- } ! $form->addRadioAssoc('mode', $modes); $form->setMatch('mode', $block->mode); $form->addTplTag('MODE_LABEL', dgettext('featuredphoto', 'Mode')); |
|
From: Eloi G. <ada...@us...> - 2008-01-22 04:55:31
|
Update of /cvsroot/phpwebsite-comm/modules/article/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7828/class Modified Files: AM_Actions.php AM_Lists.php Article.php Log Message: Users' Displaynames are now stored&shown instead of their system usernames Search Menu now matches on Users' Displaynames, not their Usernames Index: AM_Lists.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/AM_Lists.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** AM_Lists.php 17 Oct 2007 04:35:30 -0000 1.15 --- AM_Lists.php 22 Jan 2008 04:55:04 -0000 1.16 *************** *** 29,33 **** break; case 2: // "Articles Belonging To:" ! $db->addWhere('created_username', $s_arr['owner_name']); break; default: // "All Articles" --- 29,44 ---- break; case 2: // "Articles Belonging To:" ! // Search for userids belonging to this name fragment ! $db1 = new PHPWS_DB('users'); ! $db1->addColumn('id'); ! // Not sure if we want this $db1->addWhere('display_name', '%'.$s_arr['owner_name'].'%', 'LIKE'); ! $db1->addWhere('display_name', $s_arr['owner_name']); ! $result = $db1->select('col'); ! if (!PHPWS_Error::logIfError($result) && !empty($result)) { ! if (count($result)==1) ! $db->addWhere('created_id', $result[0]); ! else ! $db->addWhere('created_id', $result, 'IN'); ! } break; default: // "All Articles" Index: AM_Actions.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/AM_Actions.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** AM_Actions.php 26 Oct 2007 07:25:35 -0000 1.11 --- AM_Actions.php 22 Jan 2008 04:55:04 -0000 1.12 *************** *** 58,63 **** //$new_article->is_new_article = true; ! if (Current_User::getUsername()) { ! $new_article->created_username = $new_article->updated_username = Current_User::getUsername(); $new_article->created_id = $new_article->updated_id = Current_User::getId(); } --- 58,63 ---- //$new_article->is_new_article = true; ! if (Current_User::getDisplayName()) { ! $new_article->created_username = $new_article->updated_username = Current_User::getDisplayName(); $new_article->created_id = $new_article->updated_id = Current_User::getId(); } Index: Article.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/Article.php,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** Article.php 17 Dec 2007 02:24:52 -0000 1.50 --- Article.php 22 Jan 2008 04:55:04 -0000 1.51 *************** *** 101,106 **** { // Load Default values. ! if (Current_User::getUsername()) { ! $this->created_username = $this->updated_username = Current_User::getUsername(); $this->created_id = $this->updated_id = Current_User::getId(); } --- 101,106 ---- { // Load Default values. ! if (Current_User::getDisplayName()) { ! $this->created_username = $this->updated_username = Current_User::getDisplayName(); $this->created_id = $this->updated_id = Current_User::getId(); } *************** *** 882,886 **** $message = sprintf(dgettext('article', 'This article is currently being edited by %1$s. Try again in about %2$s minutes' ! , Current_User::getUsername($this->edituser), floor($timeleft / 60))); PHPWS_User::disallow($message); return false; --- 882,886 ---- $message = sprintf(dgettext('article', 'This article is currently being edited by %1$s. Try again in about %2$s minutes' ! , Current_User::getDisplayName($this->edituser), floor($timeleft / 60))); PHPWS_User::disallow($message); return false; |
|
From: Eloi G. <ada...@us...> - 2008-01-22 04:55:05
|
Update of /cvsroot/phpwebsite-comm/modules/article/inc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7828/inc Modified Files: A_mail.php A_update.php Log Message: Users' Displaynames are now stored&shown instead of their system usernames Search Menu now matches on Users' Displaynames, not their Usernames Index: A_update.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/A_update.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** A_update.php 9 Jul 2007 00:18:58 -0000 1.8 --- A_update.php 22 Jan 2008 04:55:07 -0000 1.9 *************** *** 11,15 **** * @return none */ ! $this->updated_username = Current_User::getUsername(); $this->updated_date = time(); --- 11,15 ---- * @return none */ ! $this->updated_username = Current_User::getDisplayName(); $this->updated_date = time(); Index: A_mail.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/A_mail.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** A_mail.php 16 Sep 2007 23:15:52 -0000 1.11 --- A_mail.php 22 Jan 2008 04:55:07 -0000 1.12 *************** *** 110,114 **** $tags['R_MAIL_HELP'] = dgettext('article', 'Separate multiple addresses with commas. Maximum 200 characters.'); $tags['S_NAME_LABEL'] = dgettext('article', 'Your Full Name: (optional)'); ! $tags['S_NAME'] = '<input type="text" name="ART_s_name" value="'.Current_User::getUsername().'" maxlength="155" style="width:50%" />'; $tags['S_MAIL_LABEL'] = dgettext('article', 'Your Email Address').':'; $tags['S_MAIL_ADDR'] = '<input type="text" name="ART_s_email" value="'.Current_User::getEmail().'" maxlength="100" style="width:50%" />'; --- 110,114 ---- $tags['R_MAIL_HELP'] = dgettext('article', 'Separate multiple addresses with commas. Maximum 200 characters.'); $tags['S_NAME_LABEL'] = dgettext('article', 'Your Full Name: (optional)'); ! $tags['S_NAME'] = '<input type="text" name="ART_s_name" value="'.Current_User::getDisplayName().'" maxlength="155" style="width:50%" />'; $tags['S_MAIL_LABEL'] = dgettext('article', 'Your Email Address').':'; $tags['S_MAIL_ADDR'] = '<input type="text" name="ART_s_email" value="'.Current_User::getEmail().'" maxlength="100" style="width:50%" />'; |
|
From: Eloi G. <ada...@us...> - 2008-01-22 04:55:03
|
Update of /cvsroot/phpwebsite-comm/modules/article/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7828/docs Modified Files: Changes.txt Log Message: Users' Displaynames are now stored&shown instead of their system usernames Search Menu now matches on Users' Displaynames, not their Usernames Index: Changes.txt =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/docs/Changes.txt,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** Changes.txt 26 Oct 2007 07:27:45 -0000 1.30 --- Changes.txt 22 Jan 2008 04:55:05 -0000 1.31 *************** *** 1,3 **** --- 1,9 ---- ======================== + Changes in version 4.0.7 + ======================== + + Users' Displaynames are now stored&shown instead of their system usernames + + Search Menu now matches on Users' Displaynames, not their Usernames + + ======================== Changes in version 4.0.6 ======================== |
|
From: Greg M. <bli...@us...> - 2008-01-22 03:26:23
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8904/docs Modified Files: COPYRIGHT Log Message: It is now 2008 Index: COPYRIGHT =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/docs/COPYRIGHT,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** COPYRIGHT 2 Oct 2007 03:01:44 -0000 1.4 --- COPYRIGHT 22 Jan 2008 03:26:26 -0000 1.5 *************** *** 1,4 **** Featured Photo Module ! Copyright (C) 2004-2007 by the following: Greg Meiste <bli...@NO...> --- 1,4 ---- Featured Photo Module ! Copyright (C) 2004-2008 by the following: Greg Meiste <bli...@NO...> |
|
From: Greg M. <bli...@us...> - 2008-01-22 03:23:09
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7357/class Modified Files: manager.php Log Message: Added Flickr library and settings Index: manager.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/class/manager.php,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** manager.php 8 Oct 2007 03:25:49 -0000 1.30 --- manager.php 22 Jan 2008 03:22:33 -0000 1.31 *************** *** 59,62 **** --- 59,63 ---- PHPWS_Core::initModClass('controlpanel', 'Panel.php'); $linkBase = 'index.php?module=featuredphoto'; + $tabs['manageBlocks'] = array ('title'=>dgettext('featuredphoto', 'Manage Photo Blocks'), 'link'=> $linkBase); if (Current_User::allow('featuredphoto', 'edit_blocks')) *************** *** 64,67 **** --- 65,72 ---- $tabs['newBlock'] = array ('title'=>dgettext('featuredphoto', 'New Photo Block'), 'link'=> $linkBase); } + if (Current_User::allow('featuredphoto', 'edit_settings')) + { + $tabs['editSettings'] = array ('title'=>dgettext('featuredphoto', 'Settings'), 'link'=> $linkBase); + } $panel = new PHPWS_Panel('featuredphoto'); *************** *** 288,291 **** --- 293,308 ---- /******************** END PHOTO CASES *********************/ + /****************** BEGIN SETTINGS CASES ******************/ + + case 'editSettings': + $title = dgettext('featuredphoto', 'Settings'); + $content = FeaturedPhoto_Manager::editSettings(); + break; + + case 'postSettings': + FeaturedPhoto_Manager::postSettings(); + break; + + /******************* END SETTINGS CASES *******************/ } *************** *** 590,593 **** --- 607,686 ---- } + function editSettings() + { + FeaturedPhoto_Manager::checkPermission('edit_settings'); + + $form = new PHPWS_Form; + $form->addHidden('module', 'featuredphoto'); + $form->addHidden('action', 'postSettings'); + + $form->addCheck('flickr_support'); + $form->setMatch('flickr_support', PHPWS_Settings::get('featuredphoto', 'flickr_support')); + $form->setLabel('flickr_support', dgettext('featuredphoto', 'Enable Flickr Support')); + + $form->addText('flickr_api_key', PHPWS_Settings::get('featuredphoto', 'flickr_api_key')); + $form->setLabel('flickr_api_key', dgettext('featuredphoto', 'Flickr API Key')); + $form->setSize('flickr_api_key', 50, 200); + + $form->addText('flickr_username', PHPWS_Settings::get('featuredphoto', 'flickr_username')); + $form->setLabel('flickr_username', dgettext('featuredphoto', 'Flickr Username')); + $form->setSize('flickr_username', 50, 200); + + $form->addSubmit('submit', dgettext('featuredphoto', 'Update Settings')); + + $template = $form->getTemplate(); + $template['FLICKR_NOTICE'] = dgettext('featuredphoto', + 'This module uses the Flickr API but is not endorsed or certified by Flickr.'); + + return PHPWS_Template::process($template, 'featuredphoto', 'settings.tpl'); + } + + function postSettings() + { + FeaturedPhoto_Manager::checkPermission('edit_settings'); + + $success_msg = dgettext('featuredphoto', 'Your settings have been successfully saved.'); + $error_saving_msg = dgettext('featuredphoto', 'Error saving the settings. Check error log for details.'); + $error_inputs_msg = dgettext('featuredphoto', 'Please specify both API key and username.'); + $error_flickr_msg = dgettext('featuredphoto', 'Error from Flickr. Check error log for details.'); + $ret_msg = &$success_msg; + + $api_key = trim($_POST['flickr_api_key']); + $username = trim($_POST['flickr_username']); + + PHPWS_Settings::set('featuredphoto', 'flickr_support', 0 ); + PHPWS_Settings::set('featuredphoto', 'flickr_api_key', $api_key ); + PHPWS_Settings::set('featuredphoto', 'flickr_username', $username); + + if (isset($_POST['flickr_support'])) + { + if (!empty($api_key) && !empty($username)) + { + PHPWS_Core::initModClass('featuredphoto', 'lib/Flickr.php'); + + $f = new PHPWS_Flickr($api_key); + if (!PHPWS_Error::logIfError($f->people_findByUsername($username))) + { + PHPWS_Settings::set('featuredphoto', 'flickr_support', 1); + } + else + { + $ret_msg = &$error_flickr_msg; + } + } + else + { + $ret_msg = &$error_inputs_msg; + } + } + + if (PHPWS_Error::logIfError(PHPWS_Settings::save('featuredphoto'))) + { + $ret_msg = &$error_saving_msg; + } + + FeaturedPhoto_Manager::sendMessage($ret_msg, 'editSettings'); + } + }// END CLASS FeaturedPhoto_Manager |
|
From: Greg M. <bli...@us...> - 2008-01-22 03:23:04
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7357/boost Modified Files: permission.php Log Message: Added Flickr library and settings Index: permission.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/boost/permission.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** permission.php 7 Oct 2007 17:23:40 -0000 1.6 --- permission.php 22 Jan 2008 03:22:32 -0000 1.7 *************** *** 34,37 **** --- 34,39 ---- $permissions['pin_blocks'] = dgettext('featuredphoto', 'Pin Photo Blocks'); + $permissions['edit_settings'] = dgettext('featuredphoto', 'Edit Settings'); + $item_permissions = TRUE; |
|
From: Greg M. <bli...@us...> - 2008-01-22 03:22:35
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7357/templates Added Files: settings.tpl Log Message: Added Flickr library and settings --- NEW FILE: settings.tpl --- {START_FORM} <fieldset><legend><strong>{FLICKR_SUPPORT} {FLICKR_SUPPORT_LABEL}</strong></legend> <p><em>{FLICKR_NOTICE}</em></p> <p><a href="http://www.flickr.com/services/api/misc.api_keys.html">{FLICKR_API_KEY_LABEL}</a><br />{FLICKR_API_KEY}</p> <p>{FLICKR_USERNAME_LABEL}<br />{FLICKR_USERNAME}</p> </fieldset> {SUBMIT} {END_FORM} |
|
From: Greg M. <bli...@us...> - 2008-01-22 03:22:34
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/inc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7357/inc Modified Files: init.php Added Files: errorDefines.php settings.php Log Message: Added Flickr library and settings --- NEW FILE: errorDefines.php --- <?php /** * featuredphoto * * 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 * * @author Greg Meiste <blindman1344 at users dot sourceforge dot net> * @version $Id: errorDefines.php,v 1.1 2008/01/22 03:22:37 blindman1344 Exp $ */ define('FEATUREDPHOTO_FLICKR_CMD_SEND_FAIL', -1); define('FEATUREDPHOTO_FLICKR_CMD_RESP_FAIL', -2); ?> Index: init.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/inc/init.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** init.php 25 Jun 2006 16:09:45 -0000 1.2 --- init.php 22 Jan 2008 03:22:37 -0000 1.3 *************** *** 24,27 **** --- 24,28 ---- PHPWS_Core::configRequireOnce('featuredphoto', 'config.php'); + PHPWS_Core::requireInc('featuredphoto', 'errorDefines.php'); PHPWS_Core::initModClass('featuredphoto', 'runtime.php'); --- NEW FILE: settings.php --- <?php /** * featuredphoto * * 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 * * @author Greg Meiste <blindman1344 at users dot sourceforge dot net> * @version $Id: settings.php,v 1.1 2008/01/22 03:22:37 blindman1344 Exp $ */ $settings = array('flickr_support' => 0, 'flickr_api_key' => '', 'flickr_username' => ''); ?> |
|
From: Greg M. <bli...@us...> - 2008-01-22 03:22:34
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/class/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7357/class/lib Added Files: Flickr.php Log Message: Added Flickr library and settings --- NEW FILE: Flickr.php --- <?php /** * phpWebSite Flickr * * Based on phpFlickr 2.2.0 written by Dan Coulter (da...@da...) and released * under GNU Lesser General Public License (http://www.gnu.org/copyleft/lgpl.html). * For more information about phpFlickr, visit http://www.phpflickr.com. * * This file strips out unneeded functionality from phpFlickr and was made usable * by phpWebSite. * * @author Greg Meiste <bli...@NO...> * @version $Id: Flickr.php,v 1.1 2008/01/22 03:22:34 blindman1344 Exp $ */ require_once 'HTTP/Request.php'; /** * The Flickr URL for REST requests. */ define('PHPWS_FLICKR_REST_URL', 'http://api.flickr.com/services/rest/'); class PHPWS_Flickr { /** * Flickr API Key * @var string */ var $_api_key; /** * Instance of HTTP_Request * @var HTTP_Request */ var $_req; /** * Constructor * * @access public * @param string API key (http://www.flickr.com/services/api/misc.api_keys.html) to use for requests */ function PHPWS_Flickr($api_key) { $this->_api_key = $api_key; // All calls to the API are done via the POST method using the PEAR::HTTP_Request package. $this->_req = new HTTP_Request(PHPWS_FLICKR_REST_URL); $this->_req->setMethod(HTTP_REQUEST_METHOD_POST); } /** * Clean nodes * * @access private * @param array The array to clean * @return mixed Results of the cleaning */ function _clean_text_nodes($arr) { if (!is_array($arr) || (count($arr) == 0)) { return $arr; } else if (count($arr) == 1 && array_key_exists('_content', $arr)) { return $arr['_content']; } else { foreach ($arr as $key => $element) { $arr[$key] = $this->_clean_text_nodes($element); } return($arr); } } /** * Issue a request to Flickr. Will be pulled from cache if available. * * @access private * @param string Flickr API method (http://www.flickr.com/services/api) * @param array Array of arguments for the method * @return mixed Parsed response on success, PHPWS_Error on failure */ function _request($method, $args=array()) { // Clear POST data from previous request $this->_req->clearPostData(); // Process arguments $args = array_merge(array('method'=>$method, 'format'=>'php_serial', 'api_key'=>$this->_api_key), $args); ksort($args); // Generate the cache key $cache_key = serialize($args); $response = PHPWS_Cache::get($cache_key); if (empty($response)) { $auth_sig = ''; foreach ($args as $key => $data) { $auth_sig .= $key . $data; $this->_req->addPostData($key, $data); } // Attempt to send the request to Flickr $this->_req->addHeader('Connection', 'Keep-Alive'); if (!$this->_req->sendRequest()) { return PHPWS_Error::get(FEATUREDPHOTO_FLICKR_CMD_SEND_FAIL, 'featuredphoto', 'PHPWS_Flickr::_request'); } $response = $this->_req->getResponseBody(); PHPWS_Cache::save($cache_key, $response); } $parsed_response = $this->_clean_text_nodes(unserialize($response)); if ($parsed_response['stat'] == 'fail') { // Don't keep a failure in the cache PHPWS_Cache::remove($cache_key); $msg = $parsed_response['code'] . ' - ' . $parsed_response['message']; return PHPWS_Error::get(FEATUREDPHOTO_FLICKR_CMD_RESP_FAIL, 'featuredphoto', 'PHPWS_Flickr::_request', $msg); } return $parsed_response; } /** * Build a photo's Flickr URL. * * @access public * @note This function will always return a URL, but it doesn't guarantee the file size exists! * * @param array Photo data returned from an API call * @param string Desired photo size (square, thumbnail, small, medium, large, original) * @return string URL to photo */ function build_photo_url($photo, $size='medium') { $sizes = array('square' => '_s', 'thumbnail' => '_t', 'small' => '_m', 'medium' => '', 'large' => '_b', 'original' => '_o'); $size = strtolower($size); if (!array_key_exists($size, $sizes)) { $size = 'medium'; } $url = 'http://farm' . $photo['farm'] . '.static.flickr.com/' . $photo['server'] . '/' . $photo['id'] . '_'; if ($size == 'original') { $url .= $photo['originalsecret'] . '_o' . '.' . $photo['originalformat']; } else { $url .= $photo['secret'] . $sizes[$size] . '.jpg'; } return $url; } /** * Lookup the Flickr NSID using the username * * @access public * @note http://www.flickr.com/services/api/flickr.people.findByUsername.html * @return mixed User node on success, PHPWS_Error on failure */ function people_findByUsername($username) { $resp = $this->_request('flickr.people.findByUsername', array('username'=>$username)); return (PEAR::isError($resp) ? $resp : $resp['user']); } /** * Get a user's public photos * * @access public * @note http://www.flickr.com/services/api/flickr.people.getPublicPhotos.html * @return mixed Photos node on success, PHPWS_Error on failure */ function people_getPublicPhotos($user_id, $extras=NULL, $per_page=NULL, $page=NULL) { if (is_array($extras)) { $extras = implode(',', $extras); } $resp = $this->_request('flickr.people.getPublicPhotos', array('user_id'=>$user_id, 'extras'=>$extras, 'per_page'=>$per_page, 'page'=>$page)); return (PEAR::isError($resp) ? $resp : $resp['photos']); } /** * Retrieve a photo's information * * @access public * @note http://www.flickr.com/services/api/flickr.photos.getInfo.html * @return mixed Photo node on success, PHPWS_Error on failure */ function photos_getInfo($photo_id, $secret=NULL) { $resp = $this->_request('flickr.photos.getInfo', array('photo_id'=>$photo_id, 'secret'=>$secret)); return (PEAR::isError($resp) ? $resp : $resp['photo']); } /** * Get a listing of a user's photo sets * * @access public * @note http://www.flickr.com/services/api/flickr.photosets.getList.html * @return mixed Photosets node on success, PHPWS_Error on failure */ function photosets_getList($user_id=NULL) { $resp = $this->_request('flickr.photosets.getList', array('user_id' => $user_id)); return (PEAR::isError($resp) ? $resp : $resp['photosets']); } /** * Get the photos in a photo set * * @access public * @note http://www.flickr.com/services/api/flickr.photosets.getPhotos.html * @return mixed Photoset node on success, PHPWS_Error on failure */ function photosets_getPhotos($photoset_id, $extras=NULL, $privacy_filter=NULL, $per_page=NULL, $page=NULL) { $resp = $this->_request('flickr.photosets.getPhotos', array('photoset_id'=>$photoset_id, 'extras'=>$extras, 'privacy_filter'=>$privacy_filter, 'per_page'=>$per_page, 'page'=>$page)); return (PEAR::isError($resp) ? $resp : $resp['photoset']); } /** * Get the friendly URL of the user's photos * * @access public * @note http://www.flickr.com/services/api/flickr.urls.getUserPhotos.html * @return mixed URL to user's photos on success, PHPWS_Error on failure */ function urls_getUserPhotos($user_id=NULL) { $resp = $this->_request('flickr.urls.getUserPhotos', array('user_id'=>$user_id)); return (PEAR::isError($resp) ? $resp : $resp['user']['url']); } } ?> |
|
From: Greg M. <bli...@us...> - 2008-01-22 03:22:33
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/conf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7357/conf Added Files: error.php Log Message: Added Flickr library and settings --- NEW FILE: error.php --- <?php /** * featuredphoto * * 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 * * @author Greg Meiste <blindman1344 at users dot sourceforge dot net> * @version $Id: error.php,v 1.1 2008/01/22 03:22:36 blindman1344 Exp $ */ $errors[FEATUREDPHOTO_FLICKR_CMD_SEND_FAIL] = dgettext('featuredphoto', 'Problem sending command to the server'); $errors[FEATUREDPHOTO_FLICKR_CMD_RESP_FAIL] = dgettext('featuredphoto', 'Flickr returned failure'); ?> |
|
From: Greg M. <bli...@us...> - 2008-01-22 03:20:00
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/class/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6225/lib Log Message: Directory /cvsroot/phpwebsite-comm/modules/featuredphoto/class/lib added to the repository |
|
From: Verdon V. <ve...@us...> - 2008-01-11 18:01:45
|
Update of /cvsroot/phpwebsite-comm/modules/podcaster/locale/en_US/LC_MESSAGES In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7538/locale/en_US/LC_MESSAGES Modified Files: podcaster.po Log Message: getting ready for 1.0.5 itunes cats changes Index: podcaster.po =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/locale/en_US/LC_MESSAGES/podcaster.po,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** podcaster.po 6 Jan 2008 04:29:40 -0000 1.3 --- podcaster.po 11 Jan 2008 18:01:40 -0000 1.4 *************** *** 25,29 **** "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-01-05 19:22-0500\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-01-11 12:56-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" *************** *** 33,37 **** "Content-Transfer-Encoding: 8bit\n" ! msgid "Read me" msgstr "" --- 33,37 ---- "Content-Transfer-Encoding: 8bit\n" ! msgid "A note on caching:" msgstr "" *************** *** 128,134 **** msgstr "" - msgid "Complete official list" - msgstr "" - msgid "Continue" msgstr "" --- 128,131 ---- *************** *** 354,357 **** --- 351,357 ---- msgstr "" + msgid "Read me" + msgstr "" + msgid "Require approval for new episodes" msgstr "" *************** *** 385,388 **** --- 385,395 ---- msgid "" + "There is a typo in the core class Cache.php that although fixed in svn, the " + "fix hasn't been released as of Jan 6 2008. If your channel RSS feeds don't " + "seem to refresh after the cache duration, try disabling the cache in the " + "Settings tab." + msgstr "" + + msgid "" "This is the first rewriting of podcaster for the new 1.x series phpwebsite. " "Although I believe it to be pretty stable, there are still a few things that " *************** *** 440,449 **** "directory. They are limited and specific. Although it is OK to leave this " "field empty, choosing the correct categories is good for your feed and may " ! "be used by other podcast directories and readers too. I have not polished " ! "the interface for choosing iTunes categories yet. It will come in the next " ! "version of podcaster. For now, you must carefully enter these yourself when " ! "creating a channel. I have provided a few examples in the categories field, " ! "and you can click on the link in the channel settings area of an add/edit " ! "channel form, to see a complete official list that you can copy and paste " ! "from." msgstr "" --- 447,450 ---- "directory. They are limited and specific. Although it is OK to leave this " "field empty, choosing the correct categories is good for your feed and may " ! "be used by other podcast directories and readers too." msgstr "" |
|
From: Verdon V. <ve...@us...> - 2008-01-11 15:53:26
|
Update of /cvsroot/phpwebsite-comm/modules/podcaster/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24652/boost Modified Files: update.php Log Message: getting ready for 1.0.5 itunes cats changes Index: update.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/boost/update.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** update.php 10 Jan 2008 15:37:13 -0000 1.11 --- update.php 11 Jan 2008 15:53:26 -0000 1.12 *************** *** 121,126 **** $content[] = '1.0.5 changes ---------------- ! + Added db and class for iTunes categories + Improved iTunes categories functions in channel and form class </pre>'; --- 121,127 ---- $content[] = '1.0.5 changes ---------------- ! + Added database table and class for iTunes categories + Improved iTunes categories functions in channel and form class + + YOU MUST RESET ITUNES CATEGORIES IF UPGRADING </pre>'; |
|
From: Verdon V. <ve...@us...> - 2008-01-11 15:53:25
|
Update of /cvsroot/phpwebsite-comm/modules/podcaster/inc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24652/inc Modified Files: init.php Log Message: getting ready for 1.0.5 itunes cats changes Index: init.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/inc/init.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** init.php 11 Jan 2008 05:05:20 -0000 1.2 --- init.php 11 Jan 2008 15:53:27 -0000 1.3 *************** *** 19,23 **** * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ! * @version $id: $ * @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net> */ --- 19,23 ---- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ! * @version $Id$ * @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net> */ |
|
From: Verdon V. <ve...@us...> - 2008-01-11 15:51:58
|
Update of /cvsroot/phpwebsite-comm/modules/podcaster/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23915 Modified Files: CHANGELOG Log Message: getting ready for 1.0.5 itunes cats changes Index: CHANGELOG =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/docs/CHANGELOG,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CHANGELOG 9 Jan 2008 21:41:14 -0000 1.4 --- CHANGELOG 11 Jan 2008 15:51:57 -0000 1.5 *************** *** 2,7 **** ------------------------------------------------------------------ Jan 09 2008 ! + Added db and class for iTunes categories + Improved iTunes categories functions in channel and form class --- 2,8 ---- ------------------------------------------------------------------ Jan 09 2008 ! + Added database table and class for iTunes categories + Improved iTunes categories functions in channel and form class + + YOU MUST RESET ITUNES CATEGORIES IF UPGRADING |
|
From: Verdon V. <ve...@us...> - 2008-01-11 15:50:38
|
Update of /cvsroot/phpwebsite-comm/modules/podcaster/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23532 Removed Files: ChangeLog Log Message: getting ready for 1.0.5 itunes cats changes --- ChangeLog DELETED --- |
|
From: Verdon V. <ve...@us...> - 2008-01-11 05:05:46
|
Update of /cvsroot/phpwebsite-comm/modules/podcaster/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16121/boost Modified Files: sql_update_105.sql Log Message: getting ready for 1.0.5 itunes cats changes Index: sql_update_105.sql =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/boost/sql_update_105.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** sql_update_105.sql 10 Jan 2008 00:37:37 -0000 1.1 --- sql_update_105.sql 11 Jan 2008 05:05:16 -0000 1.2 *************** *** 1,4 **** -- podcaster - phpwebsite module ! -- @version $Id $ -- @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net> --- 1,4 ---- -- podcaster - phpwebsite module ! -- @version $Id$ -- @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net> |
|
From: Verdon V. <ve...@us...> - 2008-01-11 05:05:18
|
Update of /cvsroot/phpwebsite-comm/modules/podcaster/inc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16121/inc Modified Files: init.php Log Message: getting ready for 1.0.5 itunes cats changes Index: init.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/inc/init.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** init.php 6 Jan 2008 00:34:48 -0000 1.1 --- init.php 11 Jan 2008 05:05:20 -0000 1.2 *************** *** 19,23 **** * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ! * @version $id $ * @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net> */ --- 19,23 ---- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ! * @version $id: $ * @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net> */ |
|
From: Verdon V. <ve...@us...> - 2008-01-11 05:05:18
|
Update of /cvsroot/phpwebsite-comm/modules/podcaster/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16121/class Modified Files: PCR_Category.php PCR_Runtime.php Log Message: getting ready for 1.0.5 itunes cats changes Index: PCR_Runtime.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/class/PCR_Runtime.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PCR_Runtime.php 7 Jan 2008 03:41:54 -0000 1.2 --- PCR_Runtime.php 11 Jan 2008 05:05:19 -0000 1.3 *************** *** 19,23 **** * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ! * @version $Id $ * @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net> */ --- 19,23 ---- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ! * @version $Id$ * @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net> */ Index: PCR_Category.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/class/PCR_Category.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PCR_Category.php 9 Jan 2008 21:41:12 -0000 1.1 --- PCR_Category.php 11 Jan 2008 05:05:19 -0000 1.2 *************** *** 19,23 **** * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ! * @version $Id $ * @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net> */ --- 19,23 ---- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ! * @version $Id$ * @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net> */ |
|
From: Verdon V. <ve...@us...> - 2008-01-10 15:37:14
|
Update of /cvsroot/phpwebsite-comm/modules/podcaster/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14192/boost Modified Files: update.php Log Message: getting ready for 1.0.5 itunes cats changes Index: update.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/boost/update.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** update.php 10 Jan 2008 00:37:37 -0000 1.10 --- update.php 10 Jan 2008 15:37:13 -0000 1.11 *************** *** 114,117 **** --- 114,122 ---- $content[] = '<pre>'; + $files = array('templates/edit_channel.tpl', + 'templates/info.tpl' + ); + podcasterUpdateFiles($files, $content); + $content[] = '1.0.5 changes ---------------- |
|
From: Verdon V. <ve...@us...> - 2008-01-10 00:47:50
|
Update of /cvsroot/phpwebsite-comm/modules/podcaster/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18347/boost Modified Files: boost.php Log Message: getting ready for 1.0.5 itunes cats changes Index: boost.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/boost/boost.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** boost.php 6 Jan 2008 00:34:42 -0000 1.2 --- boost.php 10 Jan 2008 00:47:51 -0000 1.3 *************** *** 24,28 **** $proper_name = 'Podcaster'; ! $version = '1.0.4'; $import_sql = true; $version_http = 'http://verdon.ca/downloads/modules/podcaster/check.xml'; --- 24,28 ---- $proper_name = 'Podcaster'; ! $version = '1.0.5'; $import_sql = true; $version_http = 'http://verdon.ca/downloads/modules/podcaster/check.xml'; |
|
From: Verdon V. <ve...@us...> - 2008-01-10 00:41:55
|
Update of /cvsroot/phpwebsite-comm/modules/podcaster/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16181/docs Modified Files: TODO Log Message: getting ready for 1.0.5 itunes cats changes Index: TODO =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/docs/TODO,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** TODO 6 Jan 2008 00:34:45 -0000 1.7 --- TODO 10 Jan 2008 00:41:57 -0000 1.8 *************** *** 7,18 **** A: take another look at restricted vs unrestricted correct usage - Q: bullet-proof iTunes category entry - A: next version (1.1?) - Q: put logic in (channel level?) to specify multimedia or document in episode class ! A: future version (1.1 or 1.2?) Q: embedd multimedia javascript app ! A: waiting for filecabinet changes Q: review episode save key and short url --- 7,15 ---- A: take another look at restricted vs unrestricted correct usage Q: put logic in (channel level?) to specify multimedia or document in episode class ! A: future version (1.1 or 1.2?) BUT I may not have to for filecabinet 1.5 Q: embedd multimedia javascript app ! A: waiting for filecabinet changes (fc 1.5) Q: review episode save key and short url |
|
From: Verdon V. <ve...@us...> - 2008-01-10 00:37:39
|
Update of /cvsroot/phpwebsite-comm/modules/podcaster/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14691/boost Modified Files: uninstall.php update.php Added Files: sql_update_105.sql Log Message: getting ready for 1.0.5 itunes cats changes Index: uninstall.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/boost/uninstall.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** uninstall.php 2 Jan 2008 04:24:01 -0000 1.2 --- uninstall.php 10 Jan 2008 00:37:37 -0000 1.3 *************** *** 38,41 **** --- 38,42 ---- PHPWS_DB::dropTable('podcaster_channel'); PHPWS_DB::dropTable('podcaster_episode'); + PHPWS_DB::dropTable('podcaster_category'); $content[] = dgettext('podcaster', 'Podcaster tables dropped, no media to delete.'); return true; *************** *** 55,58 **** --- 56,60 ---- PHPWS_DB::dropTable('podcaster_channel'); PHPWS_DB::dropTable('podcaster_episode'); + PHPWS_DB::dropTable('podcaster_category'); $content[] = sprintf(dgettext('podcaster', 'Podcaster tables dropped, %s media file(s) deleted.'), $num); return true; *************** *** 61,64 **** --- 63,67 ---- PHPWS_DB::dropTable('podcaster_channel'); PHPWS_DB::dropTable('podcaster_episode'); + PHPWS_DB::dropTable('podcaster_category'); $content[] = dgettext('podcaster', 'Podcaster tables dropped.'); return true; --- NEW FILE: sql_update_105.sql --- -- podcaster - phpwebsite module -- @version $Id $ -- @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net> CREATE TABLE podcaster_category ( id int NOT NULL default 0, title varchar(255) NOT NULL, parent_id int NOT NULL default 0, PRIMARY KEY (id) ); INSERT INTO podcaster_category (id, title, parent_id) VALUES (10, 'Arts', 0), (11, 'Design', 10), (12, 'Fashion & Beauty', 10), (13, 'Food', 10), (14, 'Literature', 10), (15, 'Performing Arts', 10), (16, 'Visual Arts', 10), (20, 'Business', 0), (21, 'Business News', 20), (22, 'Careers', 20), (23, 'Investing', 20), (24, 'Management & Marketing', 20), (25, 'Shopping', 20), (30, 'Comedy', 0), (40, 'Education', 0), (41, 'Education Technology', 40), (42, 'Higher Education', 40), (43, 'K-12', 40), (44, 'Language Courses', 40), (45, 'Training', 40), (50, 'Games & Hobbies', 0), (51, 'Automotive', 50), (52, 'Aviation', 50), (53, 'Hobbies', 50), (54, 'Other Games', 50), (55, 'Video Games', 50), (60, 'Government & Organizations', 0), (61, 'Local', 60), (62, 'National', 60), (63, 'Non-Profit', 60), (64, 'Regional', 60), (70, 'Health', 0), (71, 'Alternative Health', 70), (72, 'Fitness & Nutrition', 70), (73, 'Self-Help', 70), (74, 'Sexuality', 70), (80, 'Kids & Family', 0), (90, 'Music', 0), (100, 'News & Politics', 0), (110, 'Religion & Spirituality', 0), (111, 'Buddhism', 110), (112, 'Christianity', 110), (113, 'Hinduism', 110), (114, 'Islam', 110), (115, 'Judaism', 110), (116, 'Other', 110), (117, 'Spirituality', 110), (120, 'Science & Medicine', 0), (121, 'Medicine', 120), (122, 'Natural Sciences', 120), (123, 'Social Sciences', 120), (130, 'Society & Culture', 0), (131, 'History', 130), (132, 'Personal Journals', 130), (133, 'Philosophy', 130), (134, 'Places & Travel', 130), (140, 'Sports & Recreation', 0), (141, 'Amateur', 140), (142, 'College & High School', 140), (143, 'Outdoor', 140), (144, 'Professional', 140), (150, 'Technology', 0), (151, 'Gadgets', 150), (152, 'Tech News', 150), (153, 'Podcasting', 150), (154, 'Software How-To', 150), (160, 'TV & Film', 0); Index: update.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/podcaster/boost/update.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** update.php 9 Jan 2008 21:41:10 -0000 1.9 --- update.php 10 Jan 2008 00:37:37 -0000 1.10 *************** *** 106,112 **** case version_compare($currentVersion, '1.0.5', '<'): ! $content[] = '<pre>'; ! ! $content[] = '1.0.5 changes ---------------- + Added db and class for iTunes categories --- 106,118 ---- case version_compare($currentVersion, '1.0.5', '<'): ! $result = PHPWS_DB::importFile(PHPWS_SOURCE_DIR . 'mod/podcaster/boost/sql_update_105.sql'); ! if (PEAR::isError($result)) { ! PHPWS_Error::log($result); ! $content[] = '+ Unable to import new iTunes categories table.'; ! return false; ! } else { ! $content[] = '<pre>'; ! ! $content[] = '1.0.5 changes ---------------- + Added db and class for iTunes categories *************** *** 114,117 **** --- 120,124 ---- </pre>'; + } |
