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-05-24 14:45:24
|
Update of /cvsroot/phpwebsite-comm/modules/openid/class/Auth/Yadis In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24754/Auth/Yadis Modified Files: HTTPFetcher.php Manager.php ParanoidHTTPFetcher.php Log Message: Update to 2.0.1 PHP OpenID library Index: ParanoidHTTPFetcher.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/openid/class/Auth/Yadis/ParanoidHTTPFetcher.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** ParanoidHTTPFetcher.php 4 Feb 2008 04:54:31 -0000 1.1.1.1 --- ParanoidHTTPFetcher.php 24 May 2008 14:45:29 -0000 1.2 *************** *** 61,65 **** { $v = curl_version(); ! return in_array('https', $v['protocols']); } --- 61,71 ---- { $v = curl_version(); ! if(is_array($v)) { ! return in_array('https', $v['protocols']); ! } elseif (is_string($v)) { ! return preg_match('/OpenSSL/i', $v); ! } else { ! return 0; ! } } *************** *** 149,153 **** $c = curl_init(); ! curl_setopt($c, CURLOPT_NOSIGNAL, true); curl_setopt($c, CURLOPT_POST, true); curl_setopt($c, CURLOPT_POSTFIELDS, $body); --- 155,162 ---- $c = curl_init(); ! if (defined('CURLOPT_NOSIGNAL')) { ! curl_setopt($c, CURLOPT_NOSIGNAL, true); ! } ! curl_setopt($c, CURLOPT_POST, true); curl_setopt($c, CURLOPT_POSTFIELDS, $body); Index: Manager.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/openid/class/Auth/Yadis/Manager.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Manager.php 4 Feb 2008 04:54:31 -0000 1.1.1.1 --- Manager.php 24 May 2008 14:45:29 -0000 1.2 *************** *** 362,366 **** * High-level usage pattern is to call .getNextService(discover) in * order to find the next available service for this user for this ! * session. Once a request completes, call .finish() to clean up the * session state. * --- 362,366 ---- * High-level usage pattern is to call .getNextService(discover) in * order to find the next available service for this user for this ! * session. Once a request completes, call .cleanup() to clean up the * session state. * *************** *** 411,415 **** if (!$manager || (!$manager->services)) { $this->destroyManager(); - $http_response = array(); list($yadis_url, $services) = call_user_func($discover_cb, --- 411,414 ---- Index: HTTPFetcher.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/openid/class/Auth/Yadis/HTTPFetcher.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** HTTPFetcher.php 4 Feb 2008 04:54:31 -0000 1.1.1.1 --- HTTPFetcher.php 24 May 2008 14:45:29 -0000 1.2 *************** *** 86,90 **** { foreach ($headers as $line) { ! if (strpos($line, "Location: ") === 0) { $parts = explode(" ", $line, 2); return $parts[1]; --- 86,90 ---- { foreach ($headers as $line) { ! if (strpos(strtolower($line), "location: ") === 0) { $parts = explode(" ", $line, 2); return $parts[1]; |
|
From: Greg M. <bli...@us...> - 2008-05-24 14:45:23
|
Update of /cvsroot/phpwebsite-comm/modules/openid/class/Auth/OpenID In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24754/Auth/OpenID Modified Files: AX.php Association.php Consumer.php DiffieHellman.php FileStore.php Nonce.php Parse.php SQLStore.php SReg.php TrustRoot.php Log Message: Update to 2.0.1 PHP OpenID library Index: Consumer.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/openid/class/Auth/OpenID/Consumer.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Consumer.php 4 Feb 2008 04:54:33 -0000 1.1.1.1 --- Consumer.php 24 May 2008 14:45:24 -0000 1.2 *************** *** 519,523 **** class Auth_OpenID_PlainTextConsumerSession { var $session_type = 'no-encryption'; ! var $allowed_assoc_types = array('HMAC-SHA1'); function getRequest() --- 519,523 ---- class Auth_OpenID_PlainTextConsumerSession { var $session_type = 'no-encryption'; ! var $allowed_assoc_types = array('HMAC-SHA1', 'HMAC-SHA256'); function getRequest() Index: SQLStore.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/openid/class/Auth/OpenID/SQLStore.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** SQLStore.php 4 Feb 2008 04:54:31 -0000 1.1.1.1 --- SQLStore.php 24 May 2008 14:45:25 -0000 1.2 *************** *** 482,486 **** global $Auth_OpenID_SKEW; ! if ( abs($timestamp - mktime()) > $Auth_OpenID_SKEW ) { return False; } --- 482,486 ---- global $Auth_OpenID_SKEW; ! if ( abs($timestamp - time()) > $Auth_OpenID_SKEW ) { return False; } Index: Nonce.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/openid/class/Auth/OpenID/Nonce.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Nonce.php 4 Feb 2008 04:54:32 -0000 1.1.1.1 --- Nonce.php 24 May 2008 14:45:25 -0000 1.2 *************** *** 75,79 **** if ($now === null) { ! $now = gmmktime(); } --- 75,79 ---- if ($now === null) { ! $now = time(); } *************** *** 97,105 **** 6, Auth_OpenID_Nonce_CHRS); if ($when === null) { ! // It's safe to call mktime() with no arguments; it returns a // GMT unix timestamp on PHP 4 and PHP 5. gmmktime() with no // args returns a local unix timestamp on PHP 4, so don't use // that. ! $when = mktime(); } $time_str = gmstrftime(Auth_OpenID_Nonce_TIME_FMT, $when); --- 97,105 ---- 6, Auth_OpenID_Nonce_CHRS); if ($when === null) { ! // It's safe to call time() with no arguments; it returns a // GMT unix timestamp on PHP 4 and PHP 5. gmmktime() with no // args returns a local unix timestamp on PHP 4, so don't use // that. ! $when = time(); } $time_str = gmstrftime(Auth_OpenID_Nonce_TIME_FMT, $when); Index: SReg.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/openid/class/Auth/OpenID/SReg.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** SReg.php 4 Feb 2008 04:54:32 -0000 1.1.1.1 --- SReg.php 24 May 2008 14:45:25 -0000 1.2 *************** *** 23,27 **** * * $sreg_req = Auth_OpenID_SRegRequest::fromOpenIDRequest( ! * $checkid_request->message); * // [ get the user's approval and data, informing the user that * // the fields in sreg_response were requested ] --- 23,27 ---- * * $sreg_req = Auth_OpenID_SRegRequest::fromOpenIDRequest( ! * $checkid_request); * // [ get the user's approval and data, informing the user that * // the fields in sreg_response were requested ] Index: FileStore.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/openid/class/Auth/OpenID/FileStore.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** FileStore.php 4 Feb 2008 04:54:32 -0000 1.1.1.1 --- FileStore.php 24 May 2008 14:45:24 -0000 1.2 *************** *** 367,371 **** } ! if ( abs($timestamp - mktime()) > $Auth_OpenID_SKEW ) { return False; } --- 367,371 ---- } ! if ( abs($timestamp - time()) > $Auth_OpenID_SKEW ) { return False; } Index: AX.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/openid/class/Auth/OpenID/AX.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** AX.php 4 Feb 2008 04:54:33 -0000 1.1.1.1 --- AX.php 24 May 2008 14:45:24 -0000 1.2 *************** *** 807,811 **** * Auth_OpenID_AX_Error on error. */ ! function getExtensionArgs(&$request) { $aliases = new Auth_OpenID_NamespaceMap(); --- 807,811 ---- * Auth_OpenID_AX_Error on error. */ ! function getExtensionArgs($request=null) { $aliases = new Auth_OpenID_NamespaceMap(); Index: TrustRoot.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/openid/class/Auth/OpenID/TrustRoot.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** TrustRoot.php 4 Feb 2008 04:54:32 -0000 1.1.1.1 --- TrustRoot.php 24 May 2008 14:45:25 -0000 1.2 *************** *** 357,361 **** list($rp_url_after_redirects, $endpoints) = Auth_OpenID_discoverWithYadis($relying_party_url, ! &$fetcher, 'Auth_OpenID_extractReturnURL', $discover_function); --- 357,361 ---- list($rp_url_after_redirects, $endpoints) = Auth_OpenID_discoverWithYadis($relying_party_url, ! $fetcher, 'Auth_OpenID_extractReturnURL', $discover_function); Index: Association.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/openid/class/Auth/OpenID/Association.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Association.php 4 Feb 2008 04:54:32 -0000 1.1.1.1 --- Association.php 24 May 2008 14:45:24 -0000 1.2 *************** *** 65,68 **** --- 65,73 ---- ); + var $_macs = array( + 'HMAC-SHA1' => 'Auth_OpenID_HMACSHA1', + 'HMAC-SHA256' => 'Auth_OpenID_HMACSHA256' + ); + /** * This is an alternate constructor (factory method) used by the *************** *** 83,89 **** * * @param assoc_type This is the type of association this ! * instance represents. The only valid value of this field at ! * this time is 'HMAC-SHA1', but new types may be defined in the ! * future. * * @return association An {@link Auth_OpenID_Association} --- 88,94 ---- * * @param assoc_type This is the type of association this ! * instance represents. The only valid values of this field at ! * this time is 'HMAC-SHA1' and 'HMAC-SHA256', but new types may ! * be defined in the future. * * @return association An {@link Auth_OpenID_Association} *************** *** 120,126 **** * * @param string $assoc_type This is the type of association this ! * instance represents. The only valid value of this field at ! * this time is 'HMAC-SHA1', but new types may be defined in the ! * future. */ function Auth_OpenID_Association( --- 125,131 ---- * * @param string $assoc_type This is the type of association this ! * instance represents. The only valid values of this field at ! * this time is 'HMAC-SHA1' and 'HMAC-SHA256', but new types may ! * be defined in the future. */ function Auth_OpenID_Association( *************** *** 259,263 **** { $kv = Auth_OpenID_KVForm::fromArray($pairs); ! return Auth_OpenID_HMACSHA1($this->secret, $kv); } --- 264,272 ---- { $kv = Auth_OpenID_KVForm::fromArray($pairs); ! ! /* Invalid association types should be caught at constructor */ ! $callback = $this->_macs[$this->assoc_type]; ! ! return call_user_func_array($callback, array($this->secret, $kv)); } Index: DiffieHellman.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/openid/class/Auth/OpenID/DiffieHellman.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** DiffieHellman.php 4 Feb 2008 04:54:32 -0000 1.1.1.1 --- DiffieHellman.php 24 May 2008 14:45:24 -0000 1.2 *************** *** 91,115 **** } - /** - * Generate the arguments for an OpenID Diffie-Hellman association - * request - */ - function getAssocArgs() - { - $cpub = $this->lib->longToBase64($this->getPublicKey()); - $args = array( - 'openid.dh_consumer_public' => $cpub, - 'openid.session_type' => 'DH-SHA1' - ); - - if ($this->lib->cmp($this->mod, Auth_OpenID_getDefaultMod()) || - $this->lib->cmp($this->gen, Auth_OpenID_getDefaultGen())) { - $args['openid.dh_modulus'] = $this->lib->longToBase64($this->mod); - $args['openid.dh_gen'] = $this->lib->longToBase64($this->gen); - } - - return $args; - } - function usingDefaultValues() { --- 91,94 ---- Index: Parse.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/openid/class/Auth/OpenID/Parse.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Parse.php 4 Feb 2008 04:54:32 -0000 1.1.1.1 --- Parse.php 24 May 2008 14:45:25 -0000 1.2 *************** *** 106,109 **** --- 106,112 ---- var $_attr_find = '\b(\w+)=("[^"]*"|\'[^\']*\'|[^\'"\s\/<>]+)'; + var $_open_tag_expr = "<%s\b"; + var $_close_tag_expr = "<((\/%s\b)|(%s[^>\/]*\/))>"; + function Auth_OpenID_Parse() { *************** *** 137,140 **** --- 140,145 ---- function tagMatcher($tag_name, $close_tags = null) { + $expr = $this->_tag_expr; + if ($close_tags) { $options = implode("|", array_merge(array($tag_name), $close_tags)); *************** *** 144,159 **** } ! $expr = sprintf($this->_tag_expr, $tag_name, $closer); return sprintf("/%s/%s", $expr, $this->_re_flags); } ! function htmlFind() { ! return $this->tagMatcher('html'); } function headFind() { ! return $this->tagMatcher('head', array('body')); } --- 149,195 ---- } ! $expr = sprintf($expr, $tag_name, $closer); return sprintf("/%s/%s", $expr, $this->_re_flags); } ! function openTag($tag_name) { ! $expr = sprintf($this->_open_tag_expr, $tag_name); ! return sprintf("/%s/%s", $expr, $this->_re_flags); ! } ! ! function closeTag($tag_name) ! { ! $expr = sprintf($this->_close_tag_expr, $tag_name, $tag_name); ! return sprintf("/%s/%s", $expr, $this->_re_flags); ! } ! ! function htmlBegin($s) ! { ! $matches = array(); ! $result = preg_match($this->openTag('html'), $s, ! $matches, PREG_OFFSET_CAPTURE); ! if ($result === false || !$matches) { ! return false; ! } ! // Return the offset of the first match. ! return $matches[0][1]; ! } ! ! function htmlEnd($s) ! { ! $matches = array(); ! $result = preg_match($this->closeTag('html'), $s, ! $matches, PREG_OFFSET_CAPTURE); ! if ($result === false || !$matches) { ! return false; ! } ! // Return the offset of the first match. ! return $matches[count($matches) - 1][1]; } function headFind() { ! return $this->tagMatcher('head', array('body', 'html')); } *************** *** 195,209 **** $html); ! // Try to find the <HTML> tag. ! $html_re = $this->htmlFind(); ! $html_matches = array(); ! if (!preg_match($html_re, $stripped, $html_matches)) { return array(); } // Try to find the <HEAD> tag. $head_re = $this->headFind(); $head_matches = array(); ! if (!preg_match($head_re, $html_matches[0], $head_matches)) { return array(); } --- 231,252 ---- $html); ! $html_begin = $this->htmlBegin($stripped); ! $html_end = $this->htmlEnd($stripped); ! ! if ($html_begin === false) { return array(); } + if ($html_end === false) { + $html_end = strlen($stripped); + } + + $stripped = substr($stripped, $html_begin, + $html_end - $html_begin); + // Try to find the <HEAD> tag. $head_re = $this->headFind(); $head_matches = array(); ! if (!preg_match($head_re, $stripped, $head_matches)) { return array(); } |
|
From: Verdon V. <ve...@us...> - 2008-05-20 12:47:41
|
Update of /cvsroot/phpwebsite-comm/modules/finc/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20056/boost Modified Files: boost.php Log Message: tweaks and fixes to prepare for release Index: boost.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/finc/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 19 May 2008 23:36:26 -0000 1.1.1.1 --- boost.php 20 May 2008 12:47:43 -0000 1.2 *************** *** 24,28 **** $proper_name = 'Finc'; ! $version = '0.0.1'; $import_sql = true; $file_dir = true; --- 24,28 ---- $proper_name = 'Finc'; ! $version = '1.0.0'; $import_sql = true; $file_dir = true; |
|
From: Greg M. <bli...@us...> - 2008-05-20 12:46:53
|
Update of /cvsroot/phpwebsite-comm/CVSROOT In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19651 Modified Files: avail Log Message: Adding Verdon to new finc module. Index: avail =================================================================== RCS file: /cvsroot/phpwebsite-comm/CVSROOT/avail,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** avail 2 Mar 2008 00:14:59 -0000 1.69 --- avail 20 May 2008 12:46:52 -0000 1.70 *************** *** 9,12 **** --- 9,13 ---- avail|ykuendig|modules/explorer avail|blindman1344|modules/featuredphoto + avail|verdonv|modules/finc avail|blindman1344|modules/fortune avail|datamgmt|modules/googlesvcs |
|
From: Verdon V. <ve...@us...> - 2008-04-02 20:08:51
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23030/class Modified Files: RDX_Forms.php Rolodex.php Log Message: more category suppport Index: RDX_Forms.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Forms.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** RDX_Forms.php 31 Mar 2008 20:14:55 -0000 1.6 --- RDX_Forms.php 2 Apr 2008 20:08:52 -0000 1.7 *************** *** 207,210 **** --- 207,212 ---- /* get the final content */ $this->rolodex->content = $pager->get(); + + // $this->rolodex->content .= Categories::getCategoryList('rolodex'); /* set the list/page title */ *************** *** 741,744 **** --- 743,756 ---- + function categories() + { + + $tpl['CATLIST'] = Categories::getCategoryList('rolodex'); + + $this->rolodex->title = sprintf(dgettext('rolodex', '%s Categories'), PHPWS_Settings::get('rolodex', 'module_title')); + $this->rolodex->content = PHPWS_Template::process($tpl, 'rolodex', 'categories.tpl'); + } + + } ?> \ No newline at end of file Index: Rolodex.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/Rolodex.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Rolodex.php 31 Mar 2008 19:42:45 -0000 1.4 --- Rolodex.php 2 Apr 2008 20:08:52 -0000 1.5 *************** *** 273,276 **** --- 273,288 ---- break; + case 'categories': + if (!PHPWS_Settings::get('rolodex', 'allow_anon') && !Current_User::getId()) { + $this->title = PHPWS_Settings::get('rolodex', 'module_title'); + $this->content = dgettext('rolodex', 'Sorry, anonymous member viewing is not allowed. You will need to login to view this directory.'); + } else { + PHPWS_Core::initModClass('rolodex', 'RDX_Forms.php'); + $this->forms = new Rolodex_Forms; + $this->forms->rolodex = & $this; + $this->forms->categories(); + } + break; + case 'export': PHPWS_Core::initModClass('rolodex', 'RDX_Member.php'); *************** *** 1055,1058 **** --- 1067,1071 ---- $alpha[] .= PHPWS_Text::moduleLink(dgettext('rolodex', 'Other'), "rolodex", $vars) . "\n"; $alpha[] .= PHPWS_Text::moduleLink(dgettext('rolodex', 'All'), "rolodex", array('uop'=>'list')) . "\n"; + $alpha[] .= PHPWS_Text::moduleLink(dgettext('rolodex', 'Categories'), "rolodex", array('uop'=>'categories')) . "\n"; } elseif (@$_REQUEST['aop'] == "list_expired") { $vars['aop'] = 'list_expired'; *************** *** 1060,1063 **** --- 1073,1077 ---- $alpha[] .= PHPWS_Text::moduleLink(dgettext('rolodex', 'Other'), "rolodex", $vars) . "\n"; $alpha[] .= PHPWS_Text::moduleLink(dgettext('rolodex', 'All'), "rolodex", array('aop'=>'list_expired')) . "\n"; + $alpha[] .= PHPWS_Text::moduleLink(dgettext('rolodex', 'Categories'), "rolodex", array('uop'=>'categories')) . "\n"; } else { $vars['uop'] = 'list'; *************** *** 1065,1068 **** --- 1079,1083 ---- $alpha[] .= PHPWS_Text::moduleLink(dgettext('rolodex', 'Other'), "rolodex", $vars) . "\n"; $alpha[] .= PHPWS_Text::moduleLink(dgettext('rolodex', 'All'), "rolodex", array('uop'=>'list')) . "\n"; + $alpha[] .= PHPWS_Text::moduleLink(dgettext('rolodex', 'Categories'), "rolodex", array('uop'=>'categories')) . "\n"; } |
|
From: Verdon V. <ve...@us...> - 2008-04-02 20:08:51
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23030/templates Added Files: categories.tpl Log Message: more category suppport --- NEW FILE: categories.tpl --- {CATLIST} |
|
From: Verdon V. <ve...@us...> - 2008-03-31 20:14:53
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6992/class Modified Files: RDX_Forms.php Log Message: tweaks and fixes to prepare for beta release Index: RDX_Forms.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Forms.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** RDX_Forms.php 31 Mar 2008 19:42:45 -0000 1.5 --- RDX_Forms.php 31 Mar 2008 20:14:55 -0000 1.6 *************** *** 727,731 **** $tpl['INFO_1'] = dgettext('rolodex', 'This is an early beta release of this module. There is not much documentation yet, but it will come.'); $tpl['INFO_2_LABEL'] = dgettext('rolodex', 'Bugs:'); ! $tpl['INFO_2'] = sprintf(dgettext('rolodex', 'Please report any bugs or observations of this beta release in %s this post at phpwsforums.com %s'), '<a href="">', '</a>'); $tpl['INFO_3_LABEL'] = null; $tpl['INFO_3'] = null; --- 727,731 ---- $tpl['INFO_1'] = dgettext('rolodex', 'This is an early beta release of this module. There is not much documentation yet, but it will come.'); $tpl['INFO_2_LABEL'] = dgettext('rolodex', 'Bugs:'); ! $tpl['INFO_2'] = sprintf(dgettext('rolodex', 'Please report any bugs or observations of this beta release in %s this post at phpwsforums.com %s'), '<a href="http://phpwsforums.com/showthread.php?t=5655" target="new">', '</a>'); $tpl['INFO_3_LABEL'] = null; $tpl['INFO_3'] = null; |
|
From: Verdon V. <ve...@us...> - 2008-03-31 19:54:58
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31863/templates Added Files: info.tpl search.tpl Log Message: tweaks and fixes to prepare for beta release --- NEW FILE: search.tpl --- {START_FORM} <p>{PAGER_C_SEARCH_LABEL} {PAGER_C_SEARCH}</p> {GO} {END_FORM} --- NEW FILE: info.tpl --- <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> |
|
From: Verdon V. <ve...@us...> - 2008-03-31 19:54:57
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/locale In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31863/locale Removed Files: .DS_Store Log Message: tweaks and fixes to prepare for beta release --- .DS_Store DELETED --- |
|
From: Verdon V. <ve...@us...> - 2008-03-31 19:54:57
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/locale/en_US In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31863/locale/en_US Removed Files: .DS_Store Log Message: tweaks and fixes to prepare for beta release --- .DS_Store DELETED --- |
|
From: Verdon V. <ve...@us...> - 2008-03-31 19:54:57
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/locale/en_US/LC_MESSAGES In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31863/locale/en_US/LC_MESSAGES Removed Files: .DS_Store Log Message: tweaks and fixes to prepare for beta release --- .DS_Store DELETED --- |
|
From: Verdon V. <ve...@us...> - 2008-03-31 19:43:15
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27211/boost Modified Files: dependency.xml Log Message: tweaks and fixes to prepare for beta release Index: dependency.xml =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/boost/dependency.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** dependency.xml 4 Feb 2008 19:29:42 -0000 1.2 --- dependency.xml 31 Mar 2008 19:42:44 -0000 1.3 *************** *** 4,8 **** <title>core</title> <properName>phpWebSite Core</properName> ! <version>1.7.2</version> <url>http://phpwebsite.appstate.edu/downloads/modules/base/</url> </module> --- 4,8 ---- <title>core</title> <properName>phpWebSite Core</properName> ! <version>1.8.0</version> <url>http://phpwebsite.appstate.edu/downloads/modules/base/</url> </module> *************** *** 10,14 **** <title>filecabinet</title> <properName>File Cabinet</properName> ! <version>1.4.2</version> <url>http://phpwebsite.appstate.edu/downloads/modules/filecabinet/</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> *************** *** 16,20 **** <title>demographics</title> <properName>Demographics</properName> ! <version>1.0.0</version> <url>http://phpwebsite.appstate.edu/downloads/modules/demographics/</url> </module> --- 16,20 ---- <title>demographics</title> <properName>Demographics</properName> ! <version>1.1.0</version> <url>http://phpwebsite.appstate.edu/downloads/modules/demographics/</url> </module> |
|
From: Verdon V. <ve...@us...> - 2008-03-31 19:43:15
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27211/class Modified Files: RDX_Forms.php RDX_Member.php RDX_Mypage.php Rolodex.php Log Message: tweaks and fixes to prepare for beta release Index: RDX_Forms.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Forms.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** RDX_Forms.php 8 Feb 2008 19:38:48 -0000 1.4 --- RDX_Forms.php 31 Mar 2008 19:42:45 -0000 1.5 *************** *** 93,96 **** --- 93,101 ---- break; + case 'info': + $this->rolodex->panel->setCurrentTab('info'); + $this->showInfo(); + break; + } *************** *** 237,240 **** --- 242,253 ---- $form->setLabel('req_approval', dgettext('rolodex', 'Require approval for new profiles')); + $form->addCheckbox('send_notification', 1); + $form->setMatch('send_notification', PHPWS_Settings::get('rolodex', 'send_notification')); + $form->setLabel('send_notification', dgettext('rolodex', 'Send notification of pending applications')); + + $form->addText('admin_contact', PHPWS_Settings::get('rolodex', 'admin_contact')); + $form->setSize('admin_contact', 30); + $form->setLabel('admin_contact', dgettext('rolodex', 'The admin contact email address for this module')); + $form->addCheckbox('comments_enable', 1); $form->setMatch('comments_enable', PHPWS_Settings::get('rolodex', 'comments_enable')); *************** *** 277,280 **** --- 290,297 ---- $form->setMatch('privacy_export', PHPWS_Settings::get('rolodex', 'privacy_export')); + $form->addRadio('privacy_use_search', array(0, 1)); + $form->setLabel('privacy_use_search', array(dgettext('rolodex', 'No'), dgettext('rolodex', 'Yes'))); + $form->setMatch('privacy_use_search', PHPWS_Settings::get('rolodex', 'privacy_use_search')); + $form->addCheckbox('enable_expiry', 1); $form->setMatch('enable_expiry', PHPWS_Settings::get('rolodex', 'enable_expiry')); *************** *** 358,361 **** --- 375,379 ---- $tpl['PRIVACY_BUSINESS_TITLE'] = dgettext('rolodex', 'Business address'); $tpl['PRIVACY_EXPORT_TITLE'] = dgettext('rolodex', 'CSV Export'); + $tpl['PRIVACY_USE_SEARCH_TITLE'] = dgettext('rolodex', 'Register records in search module'); $tpl['COMMENTS_GROUP_LABEL'] = dgettext('rolodex', 'Comments Settings'); $tpl['PRIVACY_GROUP_LABEL'] = dgettext('rolodex', 'Privacy Settings'); *************** *** 648,672 **** $tpl = $form->getTemplate(); ! /* begin experiment with cats */ ! $key = new Key($member->key_id); ! PHPWS_Core::initModClass('categories', 'Categories.php'); ! if (javascriptEnabled()) { ! $js_vars['label'] = dgettext('categories', 'Categorize'); ! $js_vars['width'] = 640; ! $js_vars['height'] = 250; ! ! $vars['action'] = 'admin'; ! $vars['subaction'] = 'set_item_category'; ! $vars['key_id'] = $key->id; ! ! $js_vars['address'] = PHPWS_Text::linkAddress('categories', $vars, TRUE); ! $link = javascript('open_window', $js_vars); ! $tpl['CATS'] = $link; ! } else { ! $content = Categories::showForm($key); ! $tpl['CATS'] = $content; ! } ! /* end experiment with cats */ ! if (Current_User::allow('rolodex', 'edit_member')) { --- 666,670 ---- $tpl = $form->getTemplate(); ! $tpl['CATEGORIES'] = Categories::getForm($match=$member->get_categories(), $select_name='categories', $multiple=true); if (Current_User::allow('rolodex', 'edit_member')) { *************** *** 696,699 **** --- 694,698 ---- $tpl['MISC_GROUP_LABEL'] = dgettext('rolodex', 'Miscellaneous'); $tpl['EXPIRATION_GROUP_LABEL'] = dgettext('rolodex', 'Expiration utilities'); + $tpl['SEARCH_GROUP_LABEL'] = dgettext('rolodex', 'Search utilities'); $tpl['COMMENTS_GROUP_LABEL'] = dgettext('rolodex', 'Comments utilities'); *************** *** 707,710 **** --- 706,712 ---- $tpl['DELETE_EXPIRED'] = javascript('confirm', $js); + $tpl['SEARCH_INDEX_ALL'] = PHPWS_Text::secureLink(dgettext('rolodex', 'Register all current rolodex records to the search module'), 'rolodex', array('aop'=>'search_index_all')); + $tpl['SEARCH_REMOVE_ALL'] = PHPWS_Text::secureLink(dgettext('rolodex', 'Remove all current rolodex records from the search module'), 'rolodex', array('aop'=>'search_remove_all')); + $tpl['ALL_COMMENTS_YES'] = PHPWS_Text::secureLink(dgettext('rolodex', 'Reset "Allow comments" on all records to yes'), 'rolodex', array('aop'=>'all_comments_yes')); *************** *** 718,721 **** --- 720,743 ---- + function showInfo() + { + + $tpl['TITLE'] = dgettext('rolodex', 'Important Information'); + $tpl['INFO_1_LABEL'] = dgettext('rolodex', 'About this module:'); + $tpl['INFO_1'] = dgettext('rolodex', 'This is an early beta release of this module. There is not much documentation yet, but it will come.'); + $tpl['INFO_2_LABEL'] = dgettext('rolodex', 'Bugs:'); + $tpl['INFO_2'] = sprintf(dgettext('rolodex', 'Please report any bugs or observations of this beta release in %s this post at phpwsforums.com %s'), '<a href="">', '</a>'); + $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('rolodex', 'If you would like to help out with the ongoing development of Rolodex, 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=Rolodex%20Module%20Development&no_shipping=0&no_note=1&tax=0¤cy_code=USD&lc=CA&bn=PP%2dDonationsBF&charset=UTF%2d8" target="new">', '</a>'); + + $this->rolodex->title = dgettext('rolodex', 'Read me'); + $this->rolodex->content = PHPWS_Template::process($tpl, 'rolodex', 'info.tpl'); + } + } Index: Rolodex.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/Rolodex.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Rolodex.php 8 Feb 2008 19:38:48 -0000 1.3 --- Rolodex.php 31 Mar 2008 19:42:45 -0000 1.4 *************** *** 61,66 **** Current_User::disallow(); } if ($this->postSettings()) { ! $this->forwardMessage(dgettext('rolodex', 'Rolodex settings saved.')); PHPWS_Core::reroute('index.php?module=rolodex&aop=menu'); } else { --- 61,77 ---- Current_User::disallow(); } + $oldsearch = PHPWS_Settings::get('rolodex', 'privacy_use_search'); if ($this->postSettings()) { ! $msg = dgettext('rolodex', 'Rolodex settings saved.') . '<br />'; ! if ($oldsearch != PHPWS_Settings::get('rolodex', 'privacy_use_search')) { ! if (PHPWS_Settings::get('rolodex', 'privacy_use_search')) { ! if ($this->search_index_all()) ! $msg .= dgettext('rolodex', 'All current member records have been indexed with the search module.'); ! } else { ! if ($this->search_remove_all()) ! $msg .= dgettext('rolodex', 'All current member records have been removed from the search module.'); ! } ! } ! $this->forwardMessage($msg); PHPWS_Core::reroute('index.php?module=rolodex&aop=menu'); } else { *************** *** 99,103 **** $this->loadMember(); $this->member->active = 1; ! $this->member->saveMember(); $this->message = dgettext('rolodex', 'Rolodex member activated.'); $this->loadForm('list'); --- 110,115 ---- $this->loadMember(); $this->member->active = 1; ! $this->member->save(); ! $this->member->saveKey(); $this->message = dgettext('rolodex', 'Rolodex member activated.'); $this->loadForm('list'); *************** *** 110,114 **** $this->loadMember(); $this->member->active = 0; ! $this->member->saveMember(); $this->message = dgettext('rolodex', 'Rolodex member deactivated.'); $this->loadForm('list'); --- 122,127 ---- $this->loadMember(); $this->member->active = 0; ! $this->member->save(); ! $this->member->saveKey(); $this->message = dgettext('rolodex', 'Rolodex member deactivated.'); $this->loadForm('list'); *************** *** 132,135 **** --- 145,168 ---- break; + case 'search_index_all': + if (PHPWS_Settings::get('rolodex', 'privacy_use_search')) { + $this->search_index_all(); + $this->message = dgettext('rolodex', 'All current member records have been indexed with the search module.'); + } else { + $this->message = dgettext('rolodex', 'Search indexing is disabled in Rolodex settings. You must enable it there before you may perform this action.'); + } + $this->loadForm('utilities'); + break; + + case 'search_remove_all': + if (PHPWS_Settings::get('rolodex', 'privacy_use_search')) { + $this->message = dgettext('rolodex', 'Search indexing is enabled in Rolodex settings. You must disable it there before you may perform this action.'); + } else { + $this->search_remove_all(); + $this->message = dgettext('rolodex', 'All current member records have been removed from the search module.'); + } + $this->loadForm('utilities'); + break; + case 'all_comments_yes': $this->setAllComments(1); *************** *** 412,415 **** --- 445,462 ---- PHPWS_Settings::set('rolodex', 'req_approval', 0); + isset($_POST['send_notification']) ? + PHPWS_Settings::set('rolodex', 'send_notification', 1) : + PHPWS_Settings::set('rolodex', 'send_notification', 0); + + if (isset($_POST['admin_contact']) && ($_POST['admin_contact']) !== '') { + if (PHPWS_Text::isValidInput($_POST['admin_contact'], 'email')) { + PHPWS_Settings::set('rolodex', 'admin_contact', $_POST['admin_contact']); + } else { + $errors[] = dgettext('rolodex', 'Check your admin contact e-mail address for formatting errors.'); + } + } else { + PHPWS_Settings::set('rolodex', 'admin_contact', null); + } + if (isset($_POST['comments_enable'])) { if (isset($_POST['comments_enforce'])) { *************** *** 445,448 **** --- 492,496 ---- PHPWS_Settings::set('rolodex', 'privacy_business', $_POST['privacy_business']); PHPWS_Settings::set('rolodex', 'privacy_export', $_POST['privacy_export']); + PHPWS_Settings::set('rolodex', 'privacy_use_search', $_POST['privacy_use_search']); isset($_POST['enable_expiry']) ? *************** *** 544,547 **** --- 592,596 ---- { $this->loadMember(); + // print_r($_POST); exit; if (isset($_POST['courtesy_title'])) { *************** *** 585,594 **** $errors[] = dgettext('rolodex', 'Check your contact e-mail address for formatting errors.'); } } ! if (isset($_POST['website']) && ($_POST['website']) !== '') { ! if (!$this->member->setWebsite($_POST['website'])) { $errors[] = dgettext('rolodex', 'Check your website address for formatting errors.'); } } --- 634,648 ---- $errors[] = dgettext('rolodex', 'Check your contact e-mail address for formatting errors.'); } + } else { + $this->member->contact_email = null; } ! if (!empty($_POST['website'])) { ! $link = PHPWS_Text::checkLink($_POST['website']); ! if (!$this->member->setWebsite($link)) { $errors[] = dgettext('rolodex', 'Check your website address for formatting errors.'); } + } else { + $this->member->website = null; } *************** *** 719,723 **** $image->setMaxWidth(COMMENT_MAX_AVATAR_WIDTH); $image->setMaxHeight(COMMENT_MAX_AVATAR_HEIGHT); ! if (!$image->importPost('avatar')) { if (isset($image->_errors)) { foreach ($image->_errors as $oError) { --- 773,777 ---- $image->setMaxWidth(COMMENT_MAX_AVATAR_WIDTH); $image->setMaxHeight(COMMENT_MAX_AVATAR_HEIGHT); ! if (!$image->importPost('avatar', false, true)) { if (isset($image->_errors)) { foreach ($image->_errors as $oError) { *************** *** 753,757 **** $image->setMaxWidth(PHPWS_Settings::get('rolodex', 'max_img_width')); $image->setMaxHeight(PHPWS_Settings::get('rolodex', 'max_img_height')); ! if (!$image->importPost('image')) { if (isset($image->_errors)) { foreach ($image->_errors as $oError) { --- 807,811 ---- $image->setMaxWidth(PHPWS_Settings::get('rolodex', 'max_img_width')); $image->setMaxHeight(PHPWS_Settings::get('rolodex', 'max_img_height')); ! if (!$image->importPost('image', false, true)) { if (isset($image->_errors)) { foreach ($image->_errors as $oError) { *************** *** 860,863 **** --- 914,965 ---- + function search_index_all() + { + + PHPWS_Core::initModClass('rolodex', 'RDX_Member.php'); + $db = new PHPWS_DB('rolodex_member'); + $db->addColumn('demographics.user_id'); + $db->addColumn('demographics.first_name'); + $db->addColumn('demographics.last_name'); + $db->addColumn('demographics.business_name'); + $db->addColumn('rolodex_member.description'); + $db->addColumn('rolodex_member.key_id'); + $db->addWhere('rolodex_member.user_id', 'demographics.user_id'); + $db->addOrder('demographics.user_id'); + $result = $db->select(); + if (!empty($result)) { + if (PHPWS_Error::logIfError($result)) { + return false; + } + foreach ($result as $member) { + $search = new Search($member['key_id']); + $search->resetKeywords(); + $name = $member['first_name'] . ' ' . $member['last_name']; + $search->addKeywords($name); + $search->addKeywords($member['business_name']); + $search->addKeywords($member['description']); + PHPWS_Error::logIfError($search->save()); + } + } + return true; + } + + + function search_remove_all() + { + + PHPWS_Core::initModClass('search', 'Search.php'); + $db = new PHPWS_DB('search'); + $db->addWhere('module', 'rolodex'); + $result = $db->delete(); + + if (!empty($result)) { + if (PHPWS_Error::logIfError($result)) { + return false; + } + } + return true; + } + function exportCSV($approved=null, $expired=false) *************** *** 927,931 **** ! function alpha_click() { $alphabet = $this->alphabet(); --- 1029,1034 ---- ! function alpha_click() ! { $alphabet = $this->alphabet(); Index: RDX_Mypage.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Mypage.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RDX_Mypage.php 8 Feb 2008 19:38:48 -0000 1.2 --- RDX_Mypage.php 31 Mar 2008 19:42:45 -0000 1.3 *************** *** 41,45 **** $vars['uop'] = 'edit_member'; $links[] = PHPWS_Text::secureLink(dgettext('rolodex', 'Edit my profile'), 'rolodex', $vars); - $tpl['CONTENT'] = implode(' | ', $links); } else { $vars['user_id'] = Current_User::getId(); --- 41,44 ---- *************** *** 51,56 **** $links[] = PHPWS_Text::secureLink(dgettext('rolodex', 'Add my profile'), 'rolodex', $vars); } - $tpl['CONTENT'] = implode(' | ', $links); } } --- 50,58 ---- $links[] = PHPWS_Text::secureLink(dgettext('rolodex', 'Add my profile'), 'rolodex', $vars); } } + $vars2['uop'] = 'list'; + $links[] = PHPWS_Text::moduleLink(dgettext('rolodex', 'Browse members'), 'rolodex', $vars2); + $tpl['CONTENT'] = implode(' | ', $links); + $tpl['CONTENT'] .= Rolodex_Mypage::searchForm(); } *************** *** 77,80 **** --- 79,99 ---- + function searchForm() + { + $form = new PHPWS_Form('rolodex_search'); + $form->addHidden('module', 'rolodex'); + $form->addHidden('uop', 'list'); + $form->addHidden('search', ''); + $form->addHidden('limit', '10'); + $form->addHidden('orderby', 'demographics.last_name'); + $form->addHidden('orderby_dir', 'asc'); + $form->addText('pager_c_search'); + $form->setSize('pager_c_search', 25); + $form->setLabel('pager_c_search', sprintf(dgettext('rolodex', 'Search %s'), PHPWS_Settings::get('rolodex', 'module_title'))); + $form->addSubmit('go', dgettext('rolodex', 'Search')); + $tpl = $form->getTemplate(); + return PHPWS_Template::process($tpl, 'rolodex', 'search.tpl'); + } + function sendMessage(&$result, $success_msg, $error_msg) { Index: RDX_Member.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Member.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RDX_Member.php 8 Feb 2008 19:38:48 -0000 1.3 --- RDX_Member.php 31 Mar 2008 19:42:45 -0000 1.4 *************** *** 85,88 **** --- 85,91 ---- /* I might need this for the advanced join in list but am unsure */ var $title = null; + + /* to hold the categories */ + // var $_categories = null; *************** *** 99,102 **** --- 102,118 ---- + function get_categories($print=false) + { + if ($print) { + $result = Categories::getSimpleLinks($this->key_id, true); + } else { + $db = new PHPWS_DB('category_items'); + $db->addWhere('key_id', (int)$this->key_id); + $db->addColumn('cat_id'); + $result = $db->select('col'); + } + return $result; + } + function setAvatar($avatar_url) { *************** *** 1036,1039 **** --- 1052,1060 ---- $tpl['DESCRIPTION'] = PHPWS_Text::parseTag($this->getDescription(true)); $tpl['IMAGE'] = $this->getImage(true); + + if ($this->get_categories(true)) { + $tpl['CATEGORY_LINKS'] = implode(', ', $this->get_categories(true)); + $tpl['CATEGORY_LINKS_LABEL'] = dgettext('rolodex', 'Category(s)'); + } $tpl['PROFILE_GROUP_LABEL'] = dgettext('rolodex', 'Profile'); *************** *** 1080,1083 **** --- 1101,1105 ---- $tpl['HOME_LABEL'] = dgettext('rolodex', 'Home address'); } + $tpl['MAILING_GOOGLE_MAP'] = $this->getGoogleMap('mailing'); } *************** *** 1092,1095 **** --- 1114,1118 ---- $tpl['BUSINESS_LABEL'] = dgettext('rolodex', 'Business address'); } + $tpl['BUSINESS_GOOGLE_MAP'] = $this->getGoogleMap('business'); } *************** *** 1224,1228 **** return PHPWS_Text::rewriteLink($this->getDisplay_name(), 'rolodex', $this->user_id); } ! function deleteMember() --- 1247,1292 ---- return PHPWS_Text::rewriteLink($this->getDisplay_name(), 'rolodex', $this->user_id); } ! ! ! function getGoogleMap($location='mailing') { ! ! if ($location == 'mailing') { ! if (!empty($this->mailing_address_1)) ! $address[] = $this->mailing_address_1; ! if (!empty($this->mailing_address_2)) ! $address[] = $this->mailing_address_2; ! if (!empty($this->mailing_city)) ! $address[] = $this->mailing_city; ! if (!empty($this->mailing_state)) ! $address[] = $this->mailing_state; ! if (!empty($this->mailing_country)) ! $address[] = $this->mailing_country; ! if (!empty($this->mailing_zip_code)) ! $address[] = $this->mailing_zip_code; ! } else { ! if (!empty($this->business_address_1)) ! $address[] = $this->business_address_1; ! if (!empty($this->business_address_2)) ! $address[] = $this->business_address_2; ! if (!empty($this->business_city)) ! $address[] = $this->business_city; ! if (!empty($this->business_state)) ! $address[] = $this->business_state; ! if (!empty($this->business_country)) ! $address[] = $this->business_country; ! if (!empty($this->business_zip_code)) ! $address[] = $this->business_zip_code; ! } ! ! if ($address) { ! $string = urlencode(htmlentities(implode(",", $address))); ! $googlemap = sprintf('<a class="url" href="http://maps.google.com/maps?f=q&q=%s">%s</a>', $string, dgettext('rolodex', 'Get Google Map')); ! } else { ! $googlemap = null; ! } ! ! return $googlemap; ! } ! function deleteMember() *************** *** 1282,1285 **** --- 1346,1352 ---- if (PHPWS_Settings::get('rolodex', 'req_approval') && !Current_User::allow('rolodex', 'edit_member')) { $this->active = 0; + if (PHPWS_Settings::get('rolodex', 'send_notification') && PHPWS_Settings::get('rolodex', 'admin_contact')) { + $this->sendNotification(); + } } } *************** *** 1320,1331 **** } ! ! $search = new Search($this->key_id); ! $search->resetKeywords(); ! $search->addKeywords($this->getDisplay_name()); ! $search->addKeywords($this->description); ! $result = $search->save(); ! if (PEAR::isError($result)) { ! return $result; } --- 1387,1413 ---- } ! if (PHPWS_Settings::get('rolodex', 'privacy_use_search')) { ! $search = new Search($this->key_id); ! $search->resetKeywords(); ! $search->addKeywords($this->getDisplay_name()); ! $search->addKeywords($this->description); ! $result = $search->save(); ! if (PEAR::isError($result)) { ! return $result; ! } ! } ! ! if (isset($_POST['categories'])) { ! $db = new PHPWS_DB('category_items'); ! $db->addWhere('key_id', (int)$this->key_id); ! PHPWS_Error::logIfError($db->delete()); ! PHPWS_Core::initModClass('categories', 'Action.php'); ! foreach ($_POST['categories'] as $var => $val) { ! Categories_Action::addCategoryItem($val, $this->key_id); ! } ! } else { ! $db = new PHPWS_DB('category_items'); ! $db->addWhere('key_id', (int)$this->key_id); ! PHPWS_Error::logIfError($db->delete()); } *************** *** 1567,1570 **** --- 1649,1672 ---- + function sendNotification() + { + + $page_title = $_SESSION['Layout_Settings']->getPageTitle(true); + $site_contact = PHPWS_User::getUserSetting('site_contact'); + $url = PHPWS_Core::getHomeHttp(); + $message = sprintf(dgettext('rolodex', 'You have a new %s application from %s waiting for your review at %s.'), PHPWS_Settings::get('rolodex', 'module_title'), $this->getDisplay_name(), $url); + + PHPWS_Core::initCoreClass('Mail.php'); + $mail = new PHPWS_Mail; + $mail->addSendTo(PHPWS_Settings::get('rolodex', 'admin_contact')); + $mail->setSubject(sprintf(dgettext('rolodex', 'Pending %s Application'), PHPWS_Settings::get('rolodex', 'module_title'))); + $mail->setFrom(sprintf('%s<%s>', $page_title, $site_contact)); + $mail->setMessageBody($message); + + return $mail->send(); + + } + + /** |
|
From: Verdon V. <ve...@us...> - 2008-03-31 19:43:15
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27211/docs Modified Files: TODO Log Message: tweaks and fixes to prepare for beta release Index: TODO =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/docs/TODO,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TODO 8 Feb 2008 19:38:50 -0000 1.3 --- TODO 31 Mar 2008 19:42:46 -0000 1.4 *************** *** 5,12 **** ! send some kind of needs approval message on new submissions ! readme tab ! what to do about categories think about where to put export link (use isDataVisible check on it) further refine avatar and image routines - they work now, but --- 5,11 ---- ! categories view of some sort think about where to put export link (use isDataVisible check on it) + enhance rolodex mypage tab further refine avatar and image routines - they work now, but *************** *** 15,21 **** or some other means to force a refresh when uploading a new image? - Hmmm... unable to remove email or website data once it is in a record - - is it 'cause they are used in other mods, like comments? - consider option to delete demographics records when uninstalling rolodex consider option to delete demographics record when deleting rolodex member --- 14,17 ---- *************** *** 28,36 **** ##################### ! UPDATE DEPENDENCY FILE WHEN NEW VERSIONS ARE AVAILABLE ! - CORE ? ! - FILECABINET ? ! - DEMOGRAPHICS 1.1.0 ##################### --- 24,32 ---- + CREATE CHECK FILE AT + http://verdon.ca/downloads/modules/rolodex/check.xml ##################### ! ! UPDATE CHANGELOG ##################### |
|
From: Verdon V. <ve...@us...> - 2008-03-31 19:43:15
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27211 Modified Files: index.php Log Message: tweaks and fixes to prepare for beta release Index: index.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/index.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** index.php 4 Feb 2008 03:09:14 -0000 1.1.1.1 --- index.php 31 Mar 2008 19:42:40 -0000 1.2 *************** *** 29,32 **** --- 29,37 ---- PHPWS_Core::initModClass('rolodex', 'Rolodex.php'); $rolodex = new Rolodex; + + if (isset($_GET['var1'])) { + $_REQUEST['id'] = $_GET['id'] = (int)$_GET['var1']; + } + if (isset($_REQUEST['aop'])) { $rolodex->adminMenu(); |
|
From: Verdon V. <ve...@us...> - 2008-03-31 19:42:51
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27211/templates Modified Files: edit_member.tpl edit_settings.tpl utilities.tpl view_member.tpl Log Message: tweaks and fixes to prepare for beta release Index: view_member.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/templates/view_member.tpl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** view_member.tpl 4 Feb 2008 03:09:18 -0000 1.1.1.1 --- view_member.tpl 31 Mar 2008 19:42:49 -0000 1.2 *************** *** 1,5 **** <div style="text-align: right;">{MEMBER_LINKS}</div> <div id="rolodex-member"> ! <div style="float: right; margin: 0 0 .2em .5em;">{IMAGE}</div> <p> {COURTESY_TITLE} {FIRST_NAME} {MIDDLE_INITIAL} {LAST_NAME} {HONORIFIC}<br /> --- 1,5 ---- <div style="text-align: right;">{MEMBER_LINKS}</div> <div id="rolodex-member"> ! <!-- BEGIN image --><div style="float: right; margin: 0 0 .2em .5em;">{IMAGE}</div><!-- END image --> <p> {COURTESY_TITLE} {FIRST_NAME} {MIDDLE_INITIAL} {LAST_NAME} {HONORIFIC}<br /> *************** *** 7,37 **** {BUSINESS_NAME} </p> ! <p>{DESCRIPTION}</p> <br style="clear: right;" /> <fieldset> <legend><strong>{CONTACT_GROUP_LABEL}</strong></legend> <p> ! <!-- BEGIN contact_email -->{CONTACT_EMAIL_LABEL}: {CONTACT_EMAIL}<br /><!-- END contact_email --> ! <!-- BEGIN website -->{WEBSITE_LABEL}: {WEBSITE}<br /><!-- END website --> ! <!-- BEGIN day_phone -->{DAY_PHONE_LABEL}: {DAY_PHONE} {DAY_PHONE_EXT_LABEL}: {DAY_PHONE_EXT}<br /><!-- END day_phone --> ! <!-- BEGIN fax_number -->{FAX_NUMBER_LABEL}: {FAX_NUMBER}<br /><!-- END fax_number --> ! <!-- BEGIN tollfree_phone -->{TOLLFREE_PHONE_LABEL}: {TOLLFREE_PHONE}<!-- END tollfree_phone --> </p> <legend><strong>{HOME_LABEL}</strong></legend> <p> ! <!-- BEGIN mailing_address_1 -->{MAILING_ADDRESS_1}<br /><!-- END mailing_address_1 --> ! <!-- BEGIN mailing_address_2 -->{MAILING_ADDRESS_2}<br /><!-- END mailing_address_2 --> ! <!-- BEGIN mailing_city -->{MAILING_CITY},<!-- END mailing_city --> <!-- BEGIN mailing_state -->{MAILING_STATE}<br /><!-- END mailing_state --> ! <!-- BEGIN mailing_country -->{MAILING_COUNTRY}<!-- END mailing_country --> <!-- BEGIN mailing_zip_code -->{MAILING_ZIP_CODE}<br /><!-- END mailing_zip_code --> </p> <legend><strong>{BUSINESS_LABEL}</strong></legend> <p> ! <!-- BEGIN business_address_1 -->{BUSINESS_ADDRESS_1}<br /><!-- END business_address_1 --> ! <!-- BEGIN business_address_2 -->{BUSINESS_ADDRESS_2}<br /><!-- END business_address_2 --> ! <!-- BEGIN business_city -->{BUSINESS_CITY},<!-- END business_city --> <!-- BEGIN business_state -->{BUSINESS_STATE}<br /><!-- END business_state --> ! <!-- BEGIN business_country -->{BUSINESS_COUNTRY}<!-- END business_country --> <!-- BEGIN business_zip_code -->{BUSINESS_ZIP_CODE}<br /><!-- END business_zip_code --> </p> </fieldset> ! <p><!-- BEGIN date_created_label --><strong>{DATE_CREATED_LABEL}:</strong> {DATE_CREATED} <!-- END date_created_label --><!-- BEGIN date_updated_label --><strong>{DATE_UPDATED_LABEL}:</strong> {DATE_UPDATED} <!-- END date_updated_label --><!-- BEGIN date_expires_label --><strong>{DATE_EXPIRES_LABEL}:</strong> {DATE_EXPIRES}<!-- END date_expires_label --></p> <!-- BEGIN custom1_label --><p><strong>{CUSTOM1_LABEL}:</strong> {CUSTOM1}</p><!-- END custom1_label --> <!-- BEGIN custom2_label --><p><strong>{CUSTOM2_LABEL}:</strong> {CUSTOM2}</p><!-- END custom2_label --> --- 7,40 ---- {BUSINESS_NAME} </p> ! <!-- BEGIN description --><p>{DESCRIPTION}</p><!-- END description --> <br style="clear: right;" /> + <!-- BEGIN category_links --><p>{CATEGORY_LINKS_LABEL}: {CATEGORY_LINKS}</p><!-- END category_links --> <fieldset> <legend><strong>{CONTACT_GROUP_LABEL}</strong></legend> <p> ! <!-- BEGIN contact_email -->{CONTACT_EMAIL_LABEL}: {CONTACT_EMAIL}<!-- END contact_email --> ! <!-- BEGIN website --><br />{WEBSITE_LABEL}: {WEBSITE}<!-- END website --> ! <!-- BEGIN day_phone --><br />{DAY_PHONE_LABEL}: {DAY_PHONE} {DAY_PHONE_EXT_LABEL}: {DAY_PHONE_EXT}<!-- END day_phone --> ! <!-- BEGIN fax_number --><br />{FAX_NUMBER_LABEL}: {FAX_NUMBER}<!-- END fax_number --> ! <!-- BEGIN tollfree_phone --><br />{TOLLFREE_PHONE_LABEL}: {TOLLFREE_PHONE}<!-- END tollfree_phone --> </p> <legend><strong>{HOME_LABEL}</strong></legend> <p> ! <!-- BEGIN mailing_address_1 -->{MAILING_ADDRESS_1}<!-- END mailing_address_1 --> ! <!-- BEGIN mailing_address_2 --><br />{MAILING_ADDRESS_2}<!-- END mailing_address_2 --> ! <!-- BEGIN mailing_city --><br />{MAILING_CITY},<!-- END mailing_city --> <!-- BEGIN mailing_state -->{MAILING_STATE}<!-- END mailing_state --> ! <!-- BEGIN mailing_country --><br />{MAILING_COUNTRY}<!-- END mailing_country --> <!-- BEGIN mailing_zip_code -->{MAILING_ZIP_CODE}<!-- END mailing_zip_code --> ! <!-- BEGIN mailing_google_map --><br />{MAILING_GOOGLE_MAP}<!-- END mailing_google_map --> </p> <legend><strong>{BUSINESS_LABEL}</strong></legend> <p> ! <!-- BEGIN business_address_1 -->{BUSINESS_ADDRESS_1}<!-- END business_address_1 --> ! <!-- BEGIN business_address_2 --><br />{BUSINESS_ADDRESS_2}<!-- END business_address_2 --> ! <!-- BEGIN business_city --><br />{BUSINESS_CITY},<!-- END business_city --> <!-- BEGIN business_state -->{BUSINESS_STATE}<!-- END business_state --> ! <!-- BEGIN business_country --><br />{BUSINESS_COUNTRY}<!-- END business_country --> <!-- BEGIN business_zip_code -->{BUSINESS_ZIP_CODE}<!-- END business_zip_code --> ! <!-- BEGIN business_google_map --><br />{BUSINESS_GOOGLE_MAP}<!-- END business_google_map --> </p> </fieldset> ! <p><!-- BEGIN date_created_label --><strong>{DATE_CREATED_LABEL}:</strong> {DATE_CREATED}<!-- END date_created_label --><!-- BEGIN date_updated_label --> <strong>{DATE_UPDATED_LABEL}:</strong> {DATE_UPDATED}<!-- END date_updated_label --><!-- BEGIN date_expires_label --> <strong>{DATE_EXPIRES_LABEL}:</strong> {DATE_EXPIRES}<!-- END date_expires_label --></p> <!-- BEGIN custom1_label --><p><strong>{CUSTOM1_LABEL}:</strong> {CUSTOM1}</p><!-- END custom1_label --> <!-- BEGIN custom2_label --><p><strong>{CUSTOM2_LABEL}:</strong> {CUSTOM2}</p><!-- END custom2_label --> Index: utilities.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/templates/utilities.tpl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** utilities.tpl 4 Feb 2008 03:09:18 -0000 1.1.1.1 --- utilities.tpl 31 Mar 2008 19:42:49 -0000 1.2 *************** *** 9,12 **** --- 9,17 ---- </fieldset> <fieldset> + <legend><strong>{SEARCH_GROUP_LABEL}</strong></legend> + <p>{SEARCH_INDEX_ALL}</p> + <p>{SEARCH_REMOVE_ALL}</p> + </fieldset> + <fieldset> <legend><strong>{COMMENTS_GROUP_LABEL}</strong></legend> <p>{ALL_COMMENTS_YES}</p> Index: edit_member.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/templates/edit_member.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** edit_member.tpl 8 Feb 2008 19:38:51 -0000 1.2 --- edit_member.tpl 31 Mar 2008 19:42:49 -0000 1.3 *************** *** 48,52 **** <fieldset> <legend><strong>{SETTINGS_GROUP_LABEL}</strong></legend> ! <p>{CATS}</p> <p>{ALLOW_COMMENTS} {ALLOW_COMMENTS_LABEL}</p> <p>{ALLOW_ANON} {ALLOW_ANON_LABEL}</p> --- 48,52 ---- <fieldset> <legend><strong>{SETTINGS_GROUP_LABEL}</strong></legend> ! <p>{CATEGORIES}</p> <p>{ALLOW_COMMENTS} {ALLOW_COMMENTS_LABEL}</p> <p>{ALLOW_ANON} {ALLOW_ANON_LABEL}</p> Index: edit_settings.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/templates/edit_settings.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** edit_settings.tpl 4 Feb 2008 04:16:25 -0000 1.2 --- edit_settings.tpl 31 Mar 2008 19:42:49 -0000 1.3 *************** *** 6,9 **** --- 6,11 ---- <p>{SORTBY_TITLE} {SORTBY_1}{SORTBY_1_LABEL} {SORTBY_2}{SORTBY_2_LABEL}</p> <p>{REQ_APPROVAL} {REQ_APPROVAL_LABEL}</p> + <p>{SEND_NOTIFICATION} {SEND_NOTIFICATION_LABEL}</p> + <p>{ADMIN_CONTACT} {ADMIN_CONTACT_LABEL}</p> <p>{SHOW_BLOCK} {SHOW_BLOCK_LABEL} - {BLOCK_ORDER_BY_RAND_1}{BLOCK_ORDER_BY_RAND_1_LABEL} {BLOCK_ORDER_BY_RAND_2}{BLOCK_ORDER_BY_RAND_2_LABEL} - {BLOCK_ON_HOME_ONLY} {BLOCK_ON_HOME_ONLY_LABEL}</p> <p>{ENABLE_EXPIRY} {ENABLE_EXPIRY_LABEL} - {EXPIRY_INTERVAL} {EXPIRY_INTERVAL_LABEL}</p> *************** *** 24,27 **** --- 26,30 ---- <p>{PRIVACY_BUSINESS_TITLE} - {PRIVACY_BUSINESS_1}{PRIVACY_BUSINESS_1_LABEL} {PRIVACY_BUSINESS_2}{PRIVACY_BUSINESS_2_LABEL} {PRIVACY_BUSINESS_3}{PRIVACY_BUSINESS_3_LABEL}</p> <p>{PRIVACY_EXPORT_TITLE} - {PRIVACY_EXPORT_1}{PRIVACY_EXPORT_1_LABEL} {PRIVACY_EXPORT_2}{PRIVACY_EXPORT_2_LABEL} {PRIVACY_EXPORT_3}{PRIVACY_EXPORT_3_LABEL}</p> + <p>{PRIVACY_USE_SEARCH_TITLE} - {PRIVACY_USE_SEARCH_1}{PRIVACY_USE_SEARCH_1_LABEL} {PRIVACY_USE_SEARCH_2}{PRIVACY_USE_SEARCH_2_LABEL}</p> </fieldset> <fieldset> |
|
From: Verdon V. <ve...@us...> - 2008-03-31 19:42:47
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/inc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27211/inc Modified Files: settings.php Log Message: tweaks and fixes to prepare for beta release Index: settings.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/inc/settings.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** settings.php 4 Feb 2008 04:16:24 -0000 1.2 --- settings.php 31 Mar 2008 19:42:48 -0000 1.3 *************** *** 27,30 **** --- 27,32 ---- $settings['sortby'] = 1; $settings['req_approval'] = 1; + $settings['send_notification'] = 0; + $settings['admin_contact'] = null; $settings['comments_enable'] = 0; $settings['comments_enforce'] = 0; *************** *** 37,40 **** --- 39,43 ---- $settings['privacy_business'] = 0; $settings['privacy_export'] = 2; + $settings['privacy_use_search'] = 1; $settings['enable_expiry'] = 0; $settings['expiry_interval'] = 365; |
|
From: Greg M. <bli...@us...> - 2008-03-30 14:18:45
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24414/docs Modified Files: ChangeLog INSTALL Log Message: Now works with File Cabinet 2.0 Index: INSTALL =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/docs/INSTALL,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** INSTALL 23 Jan 2008 04:04:21 -0000 1.12 --- INSTALL 30 Mar 2008 14:18:19 -0000 1.13 *************** *** 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. --- 5,10 ---- ===== IMPORTANT ===== ! This version of Featured Photo requires phpWebSite 1.5.0 or higher. You ! have to install phpWebSite >= 1.5.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. *************** *** 14,19 **** Then follow the install instructions found in the INSTALL file included in ! the docs directory of that download. Once this is done then you can start ! installing Featured Photo. --- 14,23 ---- Then follow the install instructions found in the INSTALL file included in ! the docs directory of that download. ! ! In addition, for upgrades only, you must have Featured Photo 1.1.0 or later ! installed. Upgrades from 1.0.x are no longer supported. ! ! Once this is done then you can start installing Featured Photo. Index: ChangeLog =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/docs/ChangeLog,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** ChangeLog 20 Feb 2008 04:28:04 -0000 1.30 --- ChangeLog 30 Mar 2008 14:18:18 -0000 1.31 *************** *** 5,10 **** ========================== PHPWEBSITE 1.X.X RELEASES ========================== ! *cvs Corrected a few phrases that were not being translated. --- 5,11 ---- ========================== PHPWEBSITE 1.X.X RELEASES ========================== ! *featuredphoto-1.2.1 (30 Mar 2008) + Support File Cabinet 2.0 (phpWebSite 1.5.0 or later now required) Corrected a few phrases that were not being translated. |
|
From: Greg M. <bli...@us...> - 2008-03-30 14:18:43
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/conf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24414/conf Modified Files: config.php Log Message: Now works with File Cabinet 2.0 Index: config.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/conf/config.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** config.php 8 Oct 2007 03:25:50 -0000 1.3 --- config.php 30 Mar 2008 14:18:17 -0000 1.4 *************** *** 28,36 **** define('FEATUREDPHOTO_DEFAULT_BLOCK_TEMPLATE', 'default.tpl'); - /* - * Set to true if only folders created by the Featured Photo module should - * appear in Image Manager. - */ - define('FEATUREDPHOTO_MOD_FOLDERS_ONLY', false); - ?> \ No newline at end of file --- 28,30 ---- |
|
From: Greg M. <bli...@us...> - 2008-03-30 14:18:42
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24414/class Modified Files: manager.php photo.php Log Message: Now works with File Cabinet 2.0 Index: manager.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/class/manager.php,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** manager.php 20 Feb 2008 04:28:00 -0000 1.40 --- manager.php 30 Mar 2008 14:18:16 -0000 1.41 *************** *** 429,438 **** if (!PHPWS_Error::logIfError($photos) && ($photos != NULL)) { ! PHPWS_Core::initModClass('filecabinet', 'Image.php'); foreach ($photos as $photo) { ! $image = new PHPWS_Image($photo['image_id']); ! $current_photos[$photo['id']] = $image->title; } } --- 429,438 ---- if (!PHPWS_Error::logIfError($photos) && ($photos != NULL)) { ! PHPWS_Core::initModClass('filecabinet', 'Cabinet.php'); foreach ($photos as $photo) { ! $image = Cabinet::getFile($photo['image_id']); ! $current_photos[$photo['id']] = $image->_source->title; } } *************** *** 632,652 **** $form->addHidden('block_id', $photo->getBlockId()); ! $form->addTplTag('IMAGE_LABEL', dgettext('featuredphoto', 'Click photo to start Image Manager')); ! $manager = Cabinet::imageManager($photo->getImageId(), 'image_id', ! $block->getTnWidth(), $block->getTnHeight(), ! FEATUREDPHOTO_MOD_FOLDERS_ONLY); ! if ($manager) ! { ! $form->addTplTag('IMAGE_MANAGER', $manager->get()); ! if (empty($photo->id)) ! { ! $form->addSubmit('submit', dgettext('featuredphoto', 'Save New Photo')); ! } ! else ! { ! $form->addHidden('photo_id', $photo->getId()); ! $form->addSubmit('submit', dgettext('featuredphoto', 'Update Photo')); ! } } --- 632,649 ---- $form->addHidden('block_id', $photo->getBlockId()); ! $manager = Cabinet::fileManager('image_id', $photo->getImageId()); ! $manager->maxImageWidth($block->getTnWidth()); ! $manager->maxImageHeight($block->getTnHeight()); ! $manager->imageOnly(false, false); ! $form->addTplTag('IMAGE_MANAGER', $manager->get()); ! if (empty($photo->id)) ! { ! $form->addSubmit('submit', dgettext('featuredphoto', 'Save New Photo')); ! } ! else ! { ! $form->addHidden('photo_id', $photo->getId()); ! $form->addSubmit('submit', dgettext('featuredphoto', 'Update Photo')); } Index: photo.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/class/photo.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** photo.php 30 Sep 2007 22:48:46 -0000 1.15 --- photo.php 30 Mar 2008 14:18:16 -0000 1.16 *************** *** 131,148 **** function view() { ! PHPWS_Core::initModClass('filecabinet', 'Image.php'); ! ! $image = new PHPWS_Image($this->getImageId()); ! ! /* Need to check if image is still valid. */ ! if (!$image->id) ! { ! $image->logErrors(); ! return null; ! } ! $tags['NAME'] = $image->title; ! $tags['CAPTION'] = $image->getDescription(); ! $tags['IMAGE'] = $image->getTag(); return PHPWS_Template::process($tags, 'featuredphoto', 'photo/view.tpl'); --- 131,141 ---- function view() { ! PHPWS_Core::initModClass('filecabinet', 'Cabinet.php'); ! $image = Cabinet::getFile($this->getImageId()); ! $image->allowCaption(false); ! $tags['NAME'] = $image->_source->title; ! $tags['CAPTION'] = PHPWS_Text::parseOutput($image->_source->description); ! $tags['IMAGE'] = $image->parentLinked(); return PHPWS_Template::process($tags, 'featuredphoto', 'photo/view.tpl'); *************** *** 151,157 **** function getListTags() { ! PHPWS_Core::initModClass('filecabinet', 'Image.php'); ! $image = new PHPWS_Image($this->getImageId()); $vars['photo_id'] = $this->getId(); --- 144,150 ---- function getListTags() { ! PHPWS_Core::initModClass('filecabinet', 'Cabinet.php'); ! $image = Cabinet::getFile($this->getImageId()); $vars['photo_id'] = $this->getId(); *************** *** 175,180 **** $template['ACTION'] = implode(' | ', $links); ! $template['NAME'] = $image->title; ! $template['SIZE'] = $image->getSize(true); $template['ACTIVE'] = $this->getActive(); --- 168,173 ---- $template['ACTION'] = implode(' | ', $links); ! $template['NAME'] = $image->_source->title; ! $template['SIZE'] = $image->_source->getSize(true); $template['ACTIVE'] = $this->getActive(); |
|
From: Greg M. <bli...@us...> - 2008-03-30 14:18:42
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24414/boost Modified Files: boost.php dependency.xml update.php Log Message: Now works with File Cabinet 2.0 Index: dependency.xml =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/boost/dependency.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** dependency.xml 23 Jan 2008 04:04:17 -0000 1.5 --- dependency.xml 30 Mar 2008 14:18:12 -0000 1.6 *************** *** 10,14 **** <title>filecabinet</title> <properName>File Cabinet</properName> ! <version>1.3.0</version> <url>http://phpwebsite.appstate.edu/downloads/modules/filecabinet/</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> Index: boost.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/boost/boost.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** boost.php 27 Jan 2008 21:27:15 -0000 1.10 --- boost.php 30 Mar 2008 14:18:12 -0000 1.11 *************** *** 24,28 **** $proper_name = 'Featured Photo'; ! $version = '1.2.0'; $register = FALSE; $unregister = FALSE; --- 24,28 ---- $proper_name = 'Featured Photo'; ! $version = '1.2.1'; $register = FALSE; $unregister = FALSE; Index: update.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/boost/update.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** update.php 27 Jan 2008 21:27:15 -0000 1.19 --- update.php 30 Mar 2008 14:18:12 -0000 1.20 *************** *** 27,161 **** switch ($currentVersion) { - case version_compare($currentVersion, '1.0.1', '<'): - $content[] = '- Fixed parse error on PHP4 hosts.'; - - case version_compare($currentVersion, '1.0.2', '<'): - $content[] = '- Added en_US translation to conversion script.'; - - case version_compare($currentVersion, '1.0.3', '<'): - $content[] = '- Fixed conversion script.'; - $content[] = '- Removed ampersands from constructors.'; - - case version_compare($currentVersion, '1.0.4', '<'): - $files = array('templates/photo/view.tpl'); - featuredphoto_update_files($files, $content); - - $content[] = '- Alternate text to images can now be translated.'; - $content[] = '- Default info file added for conversions.'; - $content[] = '- Title attribute added to images.'; - case version_compare($currentVersion, '1.1.0', '<'): ! $db = new PHPWS_DB('featuredphoto_photos'); ! ! /* First, need to add new column to photo table. */ ! if (PHPWS_Error::logIfError($db->addTableColumn('image_id', 'INT NOT NULL', 'block_id'))) ! { ! $content[] = '- Unable to create table column image_id in featuredphoto_photos table'; ! return false; ! } ! ! /* Move photos over to Image Manager. */ ! $db->reset(); ! $db->addOrder('id'); ! $photos = $db->select(); ! if (!PHPWS_Error::logIfError($photos) && ($photos != NULL)) ! { ! PHPWS_Core::initModClass('filecabinet', 'Image.php'); ! PHPWS_Core::initModClass('filecabinet', 'Folder.php'); ! PHPWS_Core::initCoreClass('File.php'); ! ! $folder = new Folder(); ! $folder->setTitle(dgettext('featuredphoto', 'Featured Photo')); ! $folder->setDescription(dgettext('featuredphoto', 'Featured Photo module images.')); ! $folder->module_created = 'featuredphoto'; ! $folder->ftype = IMAGE_FOLDER; ! $folder->save(); ! ! foreach ($photos as $photo) ! { ! $db->reset(); ! $db->addWhere('id', $photo['id']); ! ! /* Copy full size image first. */ ! PHPWS_File::fileCopy('images/featuredphoto/' . $photo['filename'], $folder->getFullDirectory(), $photo['filename'], 0, 0); ! $info = getimagesize($folder->getFullDirectory() . $photo['filename']); ! ! $image = new PHPWS_Image(); ! $image->folder_id = $folder->id; ! $image->setDirectory($folder->getFullDirectory()); ! $image->setFilename($photo['filename']); ! $image->setTitle($photo['name']); ! $image->setDescription($photo['caption']); ! $image->setSize($photo['size']); ! $image->width = $info[0]; ! $image->height = $info[1]; ! $image->file_type = $info['mime']; ! $image->save(true, false, true); ! ! /* If applicable, copy thumbnail. */ ! if ($photo['filename'] != $photo['tn_filename']) ! { ! PHPWS_File::fileCopy('images/featuredphoto/' . $photo['tn_filename'], $folder->getFullDirectory(), $photo['tn_filename'], 0, 0); ! $tn_info = getimagesize($folder->getFullDirectory() . $photo['tn_filename']); ! ! $tn_image = new PHPWS_Image(); ! $tn_image->folder_id = $folder->id; ! $tn_image->setDirectory($folder->getFullDirectory()); ! $tn_image->setFilename($photo['tn_filename']); ! $tn_image->setTitle($photo['name']); ! $tn_image->setDescription($photo['caption']); ! $tn_image->setSize(filesize($folder->getFullDirectory() . $photo['tn_filename'])); ! $tn_image->width = $tn_info[0]; ! $tn_image->height = $tn_info[1]; ! $tn_image->file_type = $tn_info['mime']; ! $tn_image->parent_id = $image->id; ! $tn_image->url = 'parent'; ! $tn_image->save(true, false, true); ! ! $db->addValue('image_id', $tn_image->id); ! } ! else ! { ! $db->addValue('image_id', $image->id); ! } ! ! PHPWS_Error::logIfError($db->update()); ! } ! } ! ! /* Now we can remove old photo info from Featured Photo table. */ ! PHPWS_Error::logIfError($db->dropTableColumn('name')); ! PHPWS_Error::logIfError($db->dropTableColumn('caption')); ! PHPWS_Error::logIfError($db->dropTableColumn('credit')); ! PHPWS_Error::logIfError($db->dropTableColumn('filename')); ! PHPWS_Error::logIfError($db->dropTableColumn('width')); ! PHPWS_Error::logIfError($db->dropTableColumn('height')); ! PHPWS_Error::logIfError($db->dropTableColumn('size')); ! PHPWS_Error::logIfError($db->dropTableColumn('tn_filename')); ! PHPWS_Error::logIfError($db->dropTableColumn('tn_width')); ! PHPWS_Error::logIfError($db->dropTableColumn('tn_height')); ! PHPWS_Error::logIfError($db->dropTableColumn('created')); ! ! /* Update the block table. */ ! PHPWS_Error::logIfError($db->setTable('featuredphoto_blocks')); ! PHPWS_Error::logIfError($db->dropTableColumn('resize_width')); ! PHPWS_Error::logIfError($db->dropTableColumn('resize_height')); ! PHPWS_Error::logIfError($db->dropTableColumn('tpl_large')); ! if (PHPWS_Error::logIfError($db->renameTableColumn('tpl_small', 'template'))) ! { ! $content[] = '- Unable to rename table column tpl_small in featuredphoto_blocks table'; ! return false; ! } ! ! /* Update the templates and config file. */ ! $files = array('templates/photo/view.tpl', 'templates/photo/list.tpl', ! 'templates/photo/edit.tpl', 'templates/block/edit.tpl', ! 'conf/config.php'); ! featuredphoto_update_files($files, $content); ! ! $content[] = '- Updated to new translation functions introduced in phpWebSite 1.2.0.'; ! $content[] = '- Cleaned up look of the about file.'; ! $content[] = '- Now using Image Manager from File Cabinet to manage photos.'; ! $content[] = '- Switch to use new logIfError() function in the core.'; case version_compare($currentVersion, '1.2.0', '<'): --- 27,33 ---- switch ($currentVersion) { case version_compare($currentVersion, '1.1.0', '<'): ! $content[] = '- This package will not update versions prior to 1.1.0.'; ! return false; case version_compare($currentVersion, '1.2.0', '<'): *************** *** 180,183 **** --- 52,70 ---- $content[] = '- Added Flickr support.'; $content[] = '- Added German translation.'; + + case version_compare($currentVersion, '1.2.1', '<'): + PHPWS_Core::initModClass('filecabinet', 'Cabinet.php'); + if (!Cabinet::convertImagesToFileAssoc('featuredphoto_photos', 'image_id')) + { + $content[] = '- Could not convert images to new File Cabinet format.'; + return false; + } + + /* Update the templates and config file. */ + $files = array('templates/photo/view.tpl', 'templates/photo/edit.tpl', 'conf/config.php'); + featuredphoto_update_files($files, $content); + + $content[] = '- Support File Cabinet 2.0.'; + $content[] = '- Corrected a few phrases that were not being translated.'; } |
|
From: Greg M. <bli...@us...> - 2008-03-30 14:18:18
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/templates/photo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24414/templates/photo Modified Files: edit.tpl view.tpl Log Message: Now works with File Cabinet 2.0 Index: view.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/templates/photo/view.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** view.tpl 30 Sep 2007 16:56:27 -0000 1.4 --- view.tpl 30 Mar 2008 14:18:21 -0000 1.5 *************** *** 2,5 **** <br /><br /> ! <b>{NAME}</b><br /> ! {CAPTION} \ No newline at end of file --- 2,5 ---- <br /><br /> ! <b>{NAME}</b> ! <!-- BEGIN caption --><br />{CAPTION}<!-- END caption --> Index: edit.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/templates/photo/edit.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** edit.tpl 30 Sep 2007 16:56:27 -0000 1.2 --- edit.tpl 30 Mar 2008 14:18:21 -0000 1.3 *************** *** 3,9 **** <div class="top-label"> <div class="padded"> - <label>{IMAGE_LABEL}</label> <!-- BEGIN image-error --> ! <div class="featuredphoto-error">{IMAGE_ERROR}</div> <!-- END image-error --> <div>{IMAGE_MANAGER}</div> --- 3,8 ---- <div class="top-label"> <div class="padded"> <!-- BEGIN image-error --> ! <div class="error">{IMAGE_ERROR}</div> <!-- END image-error --> <div>{IMAGE_MANAGER}</div> |
|
From: Greg M. <bli...@us...> - 2008-03-30 14:18:18
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/locale/en_US/LC_MESSAGES In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24414/locale/en_US/LC_MESSAGES Modified Files: featuredphoto.po Log Message: Now works with File Cabinet 2.0 Index: featuredphoto.po =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/locale/en_US/LC_MESSAGES/featuredphoto.po,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** featuredphoto.po 20 Feb 2008 04:28:05 -0000 1.4 --- featuredphoto.po 30 Mar 2008 14:18:20 -0000 1.5 *************** *** 22,26 **** "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-02-19 22:26-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" --- 22,26 ---- "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-03-29 18:27-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" *************** *** 72,78 **** msgstr "" - msgid "Click photo to start Image Manager" - msgstr "" - msgid "Delete" msgstr "" --- 72,75 ---- |
|
From: Greg M. <bli...@us...> - 2008-03-29 20:03:09
|
Update of /cvsroot/phpwebsite-comm/modules/wiki/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6952/docs Modified Files: ChangeLog Log Message: Support new mod_rewrite method introduced in phpWebSite 1.5.0 Index: ChangeLog =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/wiki/docs/ChangeLog,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** ChangeLog 3 Jan 2008 17:18:44 -0000 1.45 --- ChangeLog 29 Mar 2008 20:01:56 -0000 1.46 *************** *** 5,8 **** --- 5,12 ---- ========================== PHPWEBSITE 1.X.X RELEASES ========================== + *wiki-1.1.1 (29 Mar 2008) + + Support new mod_rewrite method introduced in phpWebSite 1.5.0. + *wiki-1.1.0 (03 Jan 2008) |
|
From: Greg M. <bli...@us...> - 2008-03-29 20:03:08
|
Update of /cvsroot/phpwebsite-comm/modules/wiki/locale/en_US/LC_MESSAGES In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6952/locale/en_US/LC_MESSAGES Modified Files: wiki.po Log Message: Support new mod_rewrite method introduced in phpWebSite 1.5.0 Index: wiki.po =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/wiki/locale/en_US/LC_MESSAGES/wiki.po,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wiki.po 29 May 2007 02:43:23 -0000 1.2 --- wiki.po 29 Mar 2008 20:01:57 -0000 1.3 *************** *** 22,31 **** "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-05-28 21:41-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" "MIME-Version: 1.0\n" ! "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" --- 22,31 ---- "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-03-29 14:48-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" "MIME-Version: 1.0\n" ! "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" *************** *** 270,273 **** --- 270,276 ---- msgstr "" + msgid "No images found." + msgstr "" + msgid "No interwiki links to convert." msgstr "" |
