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-07-12 00:25:08
|
Update of /cvsroot/phpwebsite-comm/modules/poll/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21136/class Modified Files: admin.php Log Message: Removed calls to help module which weren't working anyway. Index: admin.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/poll/class/admin.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** admin.php 22 Feb 2008 04:00:35 -0000 1.8 --- admin.php 12 Jul 2008 00:24:45 -0000 1.9 *************** *** 225,230 **** } - PHPWS_Core::initModClass('help', 'Help.php'); - $form = new PHPWS_Form; $form->addHidden('module', 'poll'); --- 225,228 ---- *************** *** 299,309 **** $form->addCheck('users_only'); $form->setMatch('users_only', $poll->users_only); ! $form->addTplTag('USERS_ONLY_LABEL', ! PHPWS_Help::show_link('poll', 'users_only', dgettext('poll', 'Users Only'))); $form->addCheck('allow_comments'); $form->setMatch('allow_comments', $poll->allow_comments); ! $form->addTplTag('ALLOW_COMMENTS_LABEL', ! PHPWS_Help::show_link('poll', 'allow_comments', dgettext('poll', 'Allow Comments'))); $template = $form->getTemplate(); --- 297,305 ---- $form->addCheck('users_only'); $form->setMatch('users_only', $poll->users_only); ! $form->setLabel('users_only', dgettext('poll', 'Users Only')); $form->addCheck('allow_comments'); $form->setMatch('allow_comments', $poll->allow_comments); ! $form->setLabel('allow_comments', dgettext('poll', 'Allow Comments')); $template = $form->getTemplate(); |
|
From: Greg M. <bli...@us...> - 2008-07-12 00:24:41
|
Update of /cvsroot/phpwebsite-comm/modules/poll/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21136/docs Modified Files: ChangeLog Log Message: Removed calls to help module which weren't working anyway. Index: ChangeLog =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/poll/docs/ChangeLog,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ChangeLog 22 Feb 2008 04:00:36 -0000 1.8 --- ChangeLog 12 Jul 2008 00:24:48 -0000 1.9 *************** *** 5,8 **** --- 5,9 ---- *cvs + Removed calls to help module which weren't working anyway. Corrected a few phrases that were not being translated. |
|
From: Greg M. <bli...@us...> - 2008-07-12 00:24:39
|
Update of /cvsroot/phpwebsite-comm/modules/poll/conf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21136/conf Removed Files: help.ini Log Message: Removed calls to help module which weren't working anyway. --- help.ini DELETED --- |
|
From: Greg M. <bli...@us...> - 2008-07-11 17:43:05
|
Update of /cvsroot/phpwebsite-comm/modules/openid/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31164/class Modified Files: OpenID_Detect.php OpenID_MyPage.php Log Message: Finishing 1.0.2 Index: OpenID_Detect.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/openid/class/OpenID_Detect.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** OpenID_Detect.php 10 Feb 2008 16:17:06 -0000 1.1 --- OpenID_Detect.php 11 Jul 2008 17:42:42 -0000 1.2 *************** *** 89,93 **** if (isset($result)) { ! if ($result->status != '200') { $errors[] = dgettext('openid', 'HTTP Fetching: Unexpected HTTP status code.'); --- 89,93 ---- if (isset($result)) { ! if (($result->status != '200') && ($result->status != '206')) { $errors[] = dgettext('openid', 'HTTP Fetching: Unexpected HTTP status code.'); Index: OpenID_MyPage.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/openid/class/OpenID_MyPage.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OpenID_MyPage.php 9 Feb 2008 22:19:05 -0000 1.2 --- OpenID_MyPage.php 11 Jul 2008 17:42:42 -0000 1.3 *************** *** 45,49 **** $tags = $form->getTemplate(); $tags['TITLE'] = dgettext('openid', 'OpenID Identifiers'); - $tags['OPENID'] = dgettext('openid', 'OpenID'); $tags['ACTION'] = dgettext('openid', 'Action'); --- 45,48 ---- *************** *** 55,60 **** --- 54,61 ---- $pager->addRowFunction(array('OpenID_MyPage', 'getRowTpl')); $pager->setDefaultOrder('openid_identifier', 'desc'); + $pager->addSortHeader('openid_identifier', dgettext('openid', 'OpenID')); $pager->setEmptyMessage(dgettext('openid', 'No OpenID identifiers linked to this account.')); $pager->addWhere('user_id', Current_User::getId()); + $pager->cacheQueries(); $content = $pager->get(); |
|
From: Greg M. <bli...@us...> - 2008-07-11 17:43:04
|
Update of /cvsroot/phpwebsite-comm/modules/openid/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31164/boost Modified Files: boost.php dependency.xml update.php Log Message: Finishing 1.0.2 Index: dependency.xml =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/openid/boost/dependency.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** dependency.xml 11 Jul 2008 16:23:27 -0000 1.2 --- dependency.xml 11 Jul 2008 17:42:40 -0000 1.3 *************** *** 4,8 **** <title>core</title> <properName>phpWebSite Core</properName> ! <version>1.5.0</version> <url>http://phpwebsite.appstate.edu/downloads/modules/base/</url> </module> --- 4,8 ---- <title>core</title> <properName>phpWebSite Core</properName> ! <version>1.8.2</version> <url>http://phpwebsite.appstate.edu/downloads/modules/base/</url> </module> Index: boost.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/openid/boost/boost.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** boost.php 24 May 2008 14:53:54 -0000 1.2 --- boost.php 11 Jul 2008 17:42:40 -0000 1.3 *************** *** 24,28 **** $proper_name = 'OpenID'; ! $version = '1.0.1'; $register = FALSE; $unregister = FALSE; --- 24,28 ---- $proper_name = 'OpenID'; ! $version = '1.0.2'; $register = FALSE; $unregister = FALSE; Index: update.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/openid/boost/update.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** update.php 24 May 2008 14:53:54 -0000 1.2 --- update.php 11 Jul 2008 17:42:40 -0000 1.3 *************** *** 30,33 **** --- 30,41 ---- $content[] = '- Changed module priority so it starts sooner.'; $content[] = '- Now using PHP OpenID 2.0.1 library.'; + + case version_compare($currentVersion, '1.0.2', '<'): + $files = array('templates/my_page.tpl'); + openid_update_files($files, $content); + + $content[] = '- Now using PHP OpenID 2.1.1 library.'; + $content[] = '- Added calls to cacheQueries and addSortHeader when using DBPager.'; + $content[] = '- Added remove_user.php to support new User mod feature.'; } |
|
From: Greg M. <bli...@us...> - 2008-07-11 17:42:38
|
Update of /cvsroot/phpwebsite-comm/modules/openid/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31164/templates Modified Files: my_page.tpl Log Message: Finishing 1.0.2 Index: my_page.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/openid/templates/my_page.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** my_page.tpl 6 Feb 2008 04:40:27 -0000 1.1 --- my_page.tpl 11 Jul 2008 17:42:44 -0000 1.2 *************** *** 8,12 **** <table cellpadding="4" cellspacing="1" width="100%"> <tr> ! <th>{OPENID} {OPENID_IDENTIFIER_SORT}</th> <th>{ACTION}</th> </tr> --- 8,12 ---- <table cellpadding="4" cellspacing="1" width="100%"> <tr> ! <th>{OPENID_IDENTIFIER_SORT}</th> <th>{ACTION}</th> </tr> |
|
From: Greg M. <bli...@us...> - 2008-07-11 17:42:36
|
Update of /cvsroot/phpwebsite-comm/modules/openid/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31164/docs Modified Files: ChangeLog Log Message: Finishing 1.0.2 Index: ChangeLog =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/openid/docs/ChangeLog,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ChangeLog 11 Jul 2008 16:23:33 -0000 1.4 --- ChangeLog 11 Jul 2008 17:42:43 -0000 1.5 *************** *** 3,8 **** ! *cvs RFE #1988287: Added remove_user.php to support new User mod feature. --- 3,10 ---- ! *openid-1.0.2 (11 Jul 2008) + Now using PHP OpenID 2.1.1 library. + Added calls to cacheQueries and addSortHeader when using DBPager. RFE #1988287: Added remove_user.php to support new User mod feature. |
|
From: Greg M. <bli...@us...> - 2008-07-11 17:32:59
|
Update of /cvsroot/phpwebsite-comm/modules/openid/class/Auth In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26802 Modified Files: OpenID.php Log Message: Upgrade to PHP OpenID 2.1.1 Index: OpenID.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/openid/class/Auth/OpenID.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OpenID.php 4 Feb 2008 04:54:31 -0000 1.1.1.1 --- OpenID.php 11 Jul 2008 17:32:36 -0000 1.2 *************** *** 14,20 **** * @package OpenID * @author JanRain, Inc. <op...@ja...> ! * @copyright 2005 Janrain, Inc. ! * @license http://www.gnu.org/copyleft/lesser.html LGPL */ /** --- 14,25 ---- * @package OpenID * @author JanRain, Inc. <op...@ja...> ! * @copyright 2005-2008 Janrain, Inc. ! * @license http://www.apache.org/licenses/LICENSE-2.0 Apache ! */ ! ! /** ! * The library version string */ + define('Auth_OpenID_VERSION', '2.1.1'); /** *************** *** 24,27 **** --- 29,33 ---- require_once "Auth/Yadis/ParanoidHTTPFetcher.php"; require_once "Auth/OpenID/BigMath.php"; + require_once "Auth/OpenID/URINorm.php"; /** *************** *** 203,211 **** return true; } else { ! if (Auth_OpenID::ensureDir(dirname($dir_name))) { ! return is_dir($dir_name) || @mkdir($dir_name); ! } else { ! return false; } } } --- 209,220 ---- return true; } else { ! $parent_dir = dirname($dir_name); ! ! // Terminal case; there is no parent directory to create. ! if ($parent_dir == $dir_name) { ! return true; } + + return (Auth_OpenID::ensureDir($parent_dir) && @mkdir($dir_name)); } } *************** *** 345,380 **** /** - * Turn a string into an ASCII string. - * - * Replace non-ascii characters with a %-encoded, UTF-8 - * encoding. This function will fail if the input is a string and - * there are non-7-bit-safe characters. It is assumed that the - * caller will have already translated the input into a Unicode - * character sequence, according to the encoding of the HTTP POST - * or GET. - * - * Do not escape anything that is already 7-bit safe, so we do the - * minimal transform on the identity URL - * - * @access private - */ - function quoteMinimal($s) - { - $res = array(); - for ($i = 0; $i < strlen($s); $i++) { - $c = $s[$i]; - if ($c >= "\x80") { - for ($j = 0; $j < count(utf8_encode($c)); $j++) { - array_push($res, sprintf("%02X", ord($c[$j]))); - } - } else { - array_push($res, $c); - } - } - - return implode('', $res); - } - - /** * Implements python's urlunparse, which is not available in PHP. * Given the specified components of a URL, this function rebuilds --- 354,357 ---- *************** *** 438,497 **** function normalizeUrl($url) { ! if ($url === null) { ! return null; ! } ! ! assert(is_string($url)); ! ! $old_url = $url; ! $url = trim($url); ! ! if (strpos($url, "://") === false) { ! $url = "http://" . $url; ! } ! ! $parsed = @parse_url($url); ! if ($parsed === false) { return null; } ! $defaults = array( ! 'scheme' => '', ! 'host' => '', ! 'path' => '', ! 'query' => '', ! 'fragment' => '', ! 'port' => '' ! ); ! ! $parsed = array_merge($defaults, $parsed); ! ! if (($parsed['scheme'] == '') || ! ($parsed['host'] == '')) { ! if ($parsed['path'] == '' && ! $parsed['query'] == '') { return null; } ! ! $url = 'http://' + $url; ! $parsed = parse_url($url); ! ! $parsed = array_merge($defaults, $parsed); } ! $tail = array_map(array('Auth_OpenID', 'quoteMinimal'), ! array($parsed['path'], ! $parsed['query'])); ! if ($tail[0] == '') { ! $tail[0] = '/'; } ! ! $url = Auth_OpenID::urlunparse($parsed['scheme'], $parsed['host'], ! $parsed['port'], $tail[0], $tail[1]); ! ! assert(is_string($url)); ! ! return $url; } --- 415,440 ---- function normalizeUrl($url) { ! @$parsed = parse_url($url); ! if (!$parsed) { return null; } ! if (isset($parsed['scheme']) && ! isset($parsed['host'])) { ! $scheme = strtolower($parsed['scheme']); ! if (!in_array($scheme, array('http', 'https'))) { return null; } ! } else { ! $url = 'http://' . $url; } ! $normalized = Auth_OpenID_urinorm($url); ! if ($normalized === null) { ! return null; } ! list($defragged, $frag) = Auth_OpenID::urldefrag($normalized); ! return $defragged; } *************** *** 574,577 **** --- 517,552 ---- } } + + /** + * Wrap PHP's standard error_log functionality. Use this to + * perform all logging. It will interpolate any additional + * arguments into the format string before logging. + * + * @param string $format_string The sprintf format for the message + */ + function log($format_string) + { + $args = func_get_args(); + $message = call_user_func_array('sprintf', $args); + error_log($message); + } + + function autoSubmitHTML($form, $title="OpenId transaction in progress") + { + return("<html>". + "<head><title>". + $title . + "</title></head>". + "<body onload='document.forms[0].submit();'>". + $form . + "<script>". + "var elements = document.forms[0].elements;". + "for (var i = 0; i < elements.length; i++) {". + " elements[i].style.display = \"none\";". + "}". + "</script>". + "</body>". + "</html>"); + } } ?> |
|
From: Greg M. <bli...@us...> - 2008-07-11 17:32:36
|
Update of /cvsroot/phpwebsite-comm/modules/openid/class/Auth/Yadis In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26802/Yadis Modified Files: HTTPFetcher.php Misc.php ParanoidHTTPFetcher.php ParseHTML.php PlainHTTPFetcher.php XRDS.php XRI.php XRIRes.php Yadis.php Log Message: Upgrade to PHP OpenID 2.1.1 Index: ParseHTML.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/openid/class/Auth/Yadis/ParseHTML.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** ParseHTML.php 4 Feb 2008 04:54:31 -0000 1.1.1.1 --- ParseHTML.php 11 Jul 2008 17:32:40 -0000 1.2 *************** *** 10,15 **** * @package OpenID * @author JanRain, Inc. <op...@ja...> ! * @copyright 2005 Janrain, Inc. ! * @license http://www.gnu.org/copyleft/lesser.html LGPL */ --- 10,15 ---- * @package OpenID * @author JanRain, Inc. <op...@ja...> ! * @copyright 2005-2008 Janrain, Inc. ! * @license http://www.apache.org/licenses/LICENSE-2.0 Apache */ *************** *** 42,46 **** * @access private */ ! var $_attr_find = '\b([-\w]+)=(".*?"|\'.*?\'|.+?)[\s>]'; function Auth_Yadis_ParseHTML() --- 42,46 ---- * @access private */ ! var $_attr_find = '\b([-\w]+)=(".*?"|\'.*?\'|.+?)[\/\s>]'; function Auth_Yadis_ParseHTML() Index: XRDS.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/openid/class/Auth/Yadis/XRDS.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** XRDS.php 4 Feb 2008 04:54:31 -0000 1.1.1.1 --- XRDS.php 11 Jul 2008 17:32:40 -0000 1.2 *************** *** 10,15 **** * @package OpenID * @author JanRain, Inc. <op...@ja...> ! * @copyright 2005 Janrain, Inc. ! * @license http://www.gnu.org/copyleft/lesser.html LGPL */ --- 10,15 ---- * @package OpenID * @author JanRain, Inc. <op...@ja...> ! * @copyright 2005-2008 Janrain, Inc. ! * @license http://www.apache.org/licenses/LICENSE-2.0 Apache */ Index: ParanoidHTTPFetcher.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/openid/class/Auth/Yadis/ParanoidHTTPFetcher.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ParanoidHTTPFetcher.php 24 May 2008 14:45:29 -0000 1.2 --- ParanoidHTTPFetcher.php 11 Jul 2008 17:32:40 -0000 1.3 *************** *** 10,15 **** * @package OpenID * @author JanRain, Inc. <op...@ja...> ! * @copyright 2005 Janrain, Inc. ! * @license http://www.gnu.org/copyleft/lesser.html LGPL */ --- 10,15 ---- * @package OpenID * @author JanRain, Inc. <op...@ja...> ! * @copyright 2005-2008 Janrain, Inc. ! * @license http://www.apache.org/licenses/LICENSE-2.0 Apache */ *************** *** 19,22 **** --- 19,24 ---- require_once "Auth/Yadis/HTTPFetcher.php"; + require_once "Auth/OpenID.php"; + /** * A paranoid {@link Auth_Yadis_HTTPFetcher} class which uses CURL *************** *** 51,56 **** function _writeData($ch, $data) { ! $this->data .= $data; ! return strlen($data); } --- 53,62 ---- function _writeData($ch, $data) { ! if (strlen($this->data) > 1024*Auth_OpenID_FETCHER_MAX_RESPONSE_KB) { ! return 0; ! } else { ! $this->data .= $data; ! return strlen($data); ! } } *************** *** 72,76 **** function get($url, $extra_headers = null) { ! if ($this->isHTTPS($url) && !$this->supportsSSL()) { return null; } --- 78,82 ---- function get($url, $extra_headers = null) { ! if (!$this->canFetchURL($url)) { return null; } *************** *** 85,88 **** --- 91,102 ---- $c = curl_init(); + + if ($c === false) { + Auth_OpenID::log( + "curl_init returned false; could not " . + "initialize for URL '%s'", $url); + return null; + } + if (defined('CURLOPT_NOSIGNAL')) { curl_setopt($c, CURLOPT_NOSIGNAL, true); *************** *** 90,93 **** --- 104,109 ---- if (!$this->allowedURL($url)) { + Auth_OpenID::log("Fetching URL not allowed: %s", + $url); return null; } *************** *** 102,107 **** --- 118,133 ---- } + $cv = curl_version(); + if(is_array($cv)) { + $curl_user_agent = 'curl/'.$cv['version']; + } else { + $curl_user_agent = $cv; + } + curl_setopt($c, CURLOPT_USERAGENT, + Auth_OpenID_USER_AGENT.' '.$curl_user_agent); curl_setopt($c, CURLOPT_TIMEOUT, $off); curl_setopt($c, CURLOPT_URL, $url); + curl_setopt($c, CURLOPT_RANGE, + "0-".(1024 * Auth_OpenID_FETCHER_MAX_RESPONSE_KB)); curl_exec($c); *************** *** 112,115 **** --- 138,144 ---- if (!$code) { + Auth_OpenID::log("Got no response code when fetching %s", $url); + Auth_OpenID::log("CURL error (%s): %s", + curl_errno($c), curl_error($c)); return null; } *************** *** 125,134 **** foreach ($headers as $header) { ! if (preg_match("/:/", $header)) { ! list($name, $value) = explode(": ", $header, 2); $new_headers[$name] = $value; } } return new Auth_Yadis_HTTPResponse($url, $code, $new_headers, $body); --- 154,167 ---- foreach ($headers as $header) { ! if (strpos($header, ': ')) { ! list($name, $value) = explode(': ', $header, 2); $new_headers[$name] = $value; } } + Auth_OpenID::log( + "Successfully fetched '%s': GET response code %s", + $url, $code); + return new Auth_Yadis_HTTPResponse($url, $code, $new_headers, $body); *************** *** 143,155 **** function post($url, $body, $extra_headers = null) { ! $this->reset(); ! ! if ($this->isHTTPS($url) && !$this->supportsSSL()) { return null; } ! if (!$this->allowedURL($url)) { ! return null; ! } $c = curl_init(); --- 176,184 ---- function post($url, $body, $extra_headers = null) { ! if (!$this->canFetchURL($url)) { return null; } ! $this->reset(); $c = curl_init(); *************** *** 171,174 **** --- 200,204 ---- if (!$code) { + Auth_OpenID::log("Got no response code when fetching %s", $url); return null; } *************** *** 178,190 **** curl_close($c); ! if ($extra_headers === null) { ! $new_headers = null; ! } else { ! $new_headers = $extra_headers; ! } foreach ($this->headers as $header) { ! if (preg_match("/:/", $header)) { ! list($name, $value) = explode(": ", $header, 2); $new_headers[$name] = $value; } --- 208,216 ---- curl_close($c); ! $new_headers = $extra_headers; foreach ($this->headers as $header) { ! if (strpos($header, ': ')) { ! list($name, $value) = explode(': ', $header, 2); $new_headers[$name] = $value; } *************** *** 192,195 **** --- 218,224 ---- } + Auth_OpenID::log("Successfully fetched '%s': POST response code %s", + $url, $code); + return new Auth_Yadis_HTTPResponse($url, $code, $new_headers, $body); Index: PlainHTTPFetcher.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/openid/class/Auth/Yadis/PlainHTTPFetcher.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PlainHTTPFetcher.php 4 Feb 2008 04:54:31 -0000 1.1.1.1 --- PlainHTTPFetcher.php 11 Jul 2008 17:32:40 -0000 1.2 *************** *** 11,16 **** * @package OpenID * @author JanRain, Inc. <op...@ja...> ! * @copyright 2005 Janrain, Inc. ! * @license http://www.gnu.org/copyleft/lesser.html LGPL */ --- 11,16 ---- * @package OpenID * @author JanRain, Inc. <op...@ja...> ! * @copyright 2005-2008 Janrain, Inc. ! * @license http://www.apache.org/licenses/LICENSE-2.0 Apache */ *************** *** 37,45 **** function get($url, $extra_headers = null) { ! if ($this->isHTTPS($url) && !$this->supportsSSL()) { ! return null; ! } ! ! if (!$this->allowedURL($url)) { return null; } --- 37,41 ---- function get($url, $extra_headers = null) { ! if (!$this->canFetchURL($url)) { return null; } *************** *** 68,71 **** --- 64,71 ---- } + if (!array_key_exists('path', $parts)) { + $parts['path'] = '/'; + } + $host = $parts['host']; *************** *** 74,78 **** } ! $user_agent = "PHP Yadis Library Fetcher"; $headers = array( --- 74,78 ---- } ! $user_agent = Auth_OpenID_USER_AGENT; $headers = array( *************** *** 84,87 **** --- 84,89 ---- "Host: ".$parts['host']. ($specify_port ? ":".$parts['port'] : ""), + "Range: 0-". + (1024*Auth_OpenID_FETCHER_MAX_RESPONSE_KB), "Port: ".$parts['port']); *************** *** 106,111 **** $data = ""; ! while (!feof($sock)) { $data .= fgets($sock, 1024); } --- 108,116 ---- $data = ""; ! $kilobytes = 0; ! while (!feof($sock) && ! $kilobytes < Auth_OpenID_FETCHER_MAX_RESPONSE_KB ) { $data .= fgets($sock, 1024); + $kilobytes += 1; } *************** *** 133,138 **** foreach ($headers as $header) { if (preg_match("/:/", $header)) { ! list($name, $value) = explode(": ", $header, 2); ! $new_headers[$name] = $value; } --- 138,147 ---- foreach ($headers as $header) { if (preg_match("/:/", $header)) { ! $parts = explode(": ", $header, 2); ! ! if (count($parts) == 2) { ! list($name, $value) = $parts; ! $new_headers[$name] = $value; ! } } *************** *** 144,152 **** function post($url, $body, $extra_headers = null) { ! if ($this->isHTTPS($url) && !$this->supportsSSL()) { ! return null; ! } ! ! if (!$this->allowedURL($url)) { return null; } --- 153,157 ---- function post($url, $body, $extra_headers = null) { ! if (!$this->canFetchURL($url)) { return null; } Index: Misc.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/openid/class/Auth/Yadis/Misc.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Misc.php 4 Feb 2008 04:54:31 -0000 1.1.1.1 --- Misc.php 11 Jul 2008 17:32:40 -0000 1.2 *************** *** 6,11 **** * @package OpenID * @author JanRain, Inc. <op...@ja...> ! * @copyright 2005 Janrain, Inc. ! * @license http://www.gnu.org/copyleft/lesser.html LGPL */ --- 6,11 ---- * @package OpenID * @author JanRain, Inc. <op...@ja...> ! * @copyright 2005-2008 Janrain, Inc. ! * @license http://www.apache.org/licenses/LICENSE-2.0 Apache */ Index: XRIRes.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/openid/class/Auth/Yadis/XRIRes.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** XRIRes.php 4 Feb 2008 04:54:31 -0000 1.1.1.1 --- XRIRes.php 11 Jul 2008 17:32:40 -0000 1.2 *************** *** 45,49 **** $url = $this->queryURL($xri, $service_type); $response = $this->fetcher->get($url); ! if ($response->status != 200) { continue; } --- 45,49 ---- $url = $this->queryURL($xri, $service_type); $response = $this->fetcher->get($url); ! if ($response->status != 200 and $response->status != 206) { continue; } *************** *** 70,72 **** } ! ?> \ No newline at end of file --- 70,72 ---- } ! ?> Index: Yadis.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/openid/class/Auth/Yadis/Yadis.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Yadis.php 4 Feb 2008 04:54:31 -0000 1.1.1.1 --- Yadis.php 11 Jul 2008 17:32:40 -0000 1.2 *************** *** 10,15 **** * @package OpenID * @author JanRain, Inc. <op...@ja...> ! * @copyright 2005 Janrain, Inc. ! * @license http://www.gnu.org/copyleft/lesser.html LGPL */ --- 10,15 ---- * @package OpenID * @author JanRain, Inc. <op...@ja...> ! * @copyright 2005-2008 Janrain, Inc. ! * @license http://www.apache.org/licenses/LICENSE-2.0 Apache */ *************** *** 106,110 **** { // Was the Yadis protocol's indirection used? ! return $this->normalized_uri == $this->xrds_uri; } --- 106,110 ---- { // Was the Yadis protocol's indirection used? ! return $this->normalized_uri != $this->xrds_uri; } *************** *** 118,121 **** --- 118,163 ---- /** + * + * Perform the Yadis protocol on the input URL and return an iterable + * of resulting endpoint objects. + * + * input_url: The URL on which to perform the Yadis protocol + * + * @return: The normalized identity URL and an iterable of endpoint + * objects generated by the filter function. + * + * xrds_parse_func: a callback which will take (uri, xrds_text) and + * return an array of service endpoint objects or null. Usually + * array('Auth_OpenID_ServiceEndpoint', 'fromXRDS'). + * + * discover_func: if not null, a callback which should take (uri) and + * return an Auth_Yadis_Yadis object or null. + */ + function Auth_Yadis_getServiceEndpoints($input_url, $xrds_parse_func, + $discover_func=null, $fetcher=null) + { + if ($discover_func === null) { + $discover_function = array('Auth_Yadis_Yadis', 'discover'); + } + + $yadis_result = call_user_func_array($discover_func, + array($input_url, $fetcher)); + + if ($yadis_result === null) { + return array($input_url, array()); + } + + $endpoints = call_user_func_array($xrds_parse_func, + array($yadis_result->normalized_uri, + $yadis_result->response_text)); + + if ($endpoints === null) { + $endpoints = array(); + } + + return array($yadis_result->normalized_uri, $endpoints); + } + + /** * This is the core of the PHP Yadis library. This is the only class * a user needs to use to perform Yadis discovery. This class *************** *** 282,288 **** $request_uri = $uri; ! $headers = array("Accept: " . Auth_Yadis_CONTENT_TYPE); ! if (!$fetcher) { $fetcher = Auth_Yadis_Yadis::getHTTPFetcher($timeout); } --- 324,331 ---- $request_uri = $uri; ! $headers = array("Accept: " . Auth_Yadis_CONTENT_TYPE . ! ', text/html; q=0.3, application/xhtml+xml; q=0.5'); ! if ($fetcher === null) { $fetcher = Auth_Yadis_Yadis::getHTTPFetcher($timeout); } *************** *** 290,294 **** $response = $fetcher->get($uri, $headers); ! if (!$response || ($response->status != 200)) { $result->fail(); return $result; --- 333,338 ---- $response = $fetcher->get($uri, $headers); ! if (!$response || ($response->status != 200 and ! $response->status != 206)) { $result->fail(); return $result; *************** *** 319,323 **** $response = $fetcher->get($yadis_location); ! if ($response->status != 200) { $result->fail(); return $result; --- 363,368 ---- $response = $fetcher->get($yadis_location); ! if ((!$response) || ($response->status != 200 and ! $response->status != 206)) { $result->fail(); return $result; *************** *** 335,337 **** } ! ?> \ No newline at end of file --- 380,382 ---- } ! ?> Index: XRI.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/openid/class/Auth/Yadis/XRI.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** XRI.php 4 Feb 2008 04:54:31 -0000 1.1.1.1 --- XRI.php 11 Jul 2008 17:32:40 -0000 1.2 *************** *** 6,11 **** * @package OpenID * @author JanRain, Inc. <op...@ja...> ! * @copyright 2005 Janrain, Inc. ! * @license http://www.gnu.org/copyleft/lesser.html LGPL */ --- 6,11 ---- * @package OpenID * @author JanRain, Inc. <op...@ja...> ! * @copyright 2005-2008 Janrain, Inc. ! * @license http://www.apache.org/licenses/LICENSE-2.0 Apache */ *************** *** 16,20 **** function Auth_Yadis_getDefaultProxy() { ! return 'http://proxy.xri.net/'; } --- 16,20 ---- function Auth_Yadis_getDefaultProxy() { ! return 'http://xri.net/'; } *************** *** 200,204 **** } ! $canonicalID = $canonicalID_nodes[count($canonicalID_nodes) - 1]; $canonicalID = Auth_Yadis_XRI($parser->content($canonicalID)); --- 200,204 ---- } ! $canonicalID = $canonicalID_nodes[0]; $canonicalID = Auth_Yadis_XRI($parser->content($canonicalID)); *************** *** 209,219 **** $parent_sought = substr($childID, 0, strrpos($childID, '!')); ! $parent_list = array(); ! ! foreach ($parser->evalXPath('xrd:CanonicalID', $xrd) as $c) { ! $parent_list[] = Auth_Yadis_XRI($parser->content($c)); } ! if (!in_array($parent_sought, $parent_list)) { // raise XRDSFraud. return false; --- 209,219 ---- $parent_sought = substr($childID, 0, strrpos($childID, '!')); ! $parentCID = $parser->evalXPath('xrd:CanonicalID', $xrd); ! if (!$parentCID) { ! return false; } + $parentCID = Auth_Yadis_XRI($parser->content($parentCID[0])); ! if (strcasecmp($parent_sought, $parentCID)) { // raise XRDSFraud. return false; *************** *** 232,234 **** } ! ?> \ No newline at end of file --- 232,234 ---- } ! ?> Index: HTTPFetcher.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/openid/class/Auth/Yadis/HTTPFetcher.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** HTTPFetcher.php 24 May 2008 14:45:29 -0000 1.2 --- HTTPFetcher.php 11 Jul 2008 17:32:39 -0000 1.3 *************** *** 10,16 **** * @package OpenID * @author JanRain, Inc. <op...@ja...> ! * @copyright 2005 Janrain, Inc. ! * @license http://www.gnu.org/copyleft/lesser.html LGPL */ class Auth_Yadis_HTTPResponse { --- 10,25 ---- * @package OpenID * @author JanRain, Inc. <op...@ja...> ! * @copyright 2005-2008 Janrain, Inc. ! * @license http://www.apache.org/licenses/LICENSE-2.0 Apache ! */ ! ! /** ! * Require logging functionality */ + require_once "Auth/OpenID.php"; + + define('Auth_OpenID_FETCHER_MAX_RESPONSE_KB', 1024); + define('Auth_OpenID_USER_AGENT', + 'php-openid/'.Auth_OpenID_VERSION.' (php/'.phpversion().')'); class Auth_Yadis_HTTPResponse { *************** *** 38,41 **** --- 47,74 ---- /** + * Return whether a URL can be fetched. Returns false if the URL + * scheme is not allowed or is not supported by this fetcher + * implementation; returns true otherwise. + * + * @return bool + */ + function canFetchURL($url) + { + if ($this->isHTTPS($url) && !$this->supportsSSL()) { + Auth_OpenID::log("HTTPS URL unsupported fetching %s", + $url); + return false; + } + + if (!$this->allowedURL($url)) { + Auth_OpenID::log("URL fetching not allowed for '%s'", + $url); + return false; + } + + return true; + } + + /** * Return whether a URL should be allowed. Override this method to * conform to your local policy. |
|
From: Greg M. <bli...@us...> - 2008-07-11 16:23:54
|
Update of /cvsroot/phpwebsite-comm/modules/openid/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31841/class Modified Files: OpenID_Runtime.php Log Message: Adding remove_user.php to support new User mod feature. Index: OpenID_Runtime.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/openid/class/OpenID_Runtime.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** OpenID_Runtime.php 11 Feb 2008 02:11:51 -0000 1.3 --- OpenID_Runtime.php 11 Jul 2008 16:23:31 -0000 1.4 *************** *** 93,108 **** Layout::add(PHPWS_Template::process($tags, 'openid', 'user.tpl')); } - - function clean() - { - if (Current_User::isLogged() && (@$_REQUEST['module'] == 'users') && (@$_REQUEST['action'] == 'admin') && - (@$_REQUEST['command'] == 'deleteUser') && isset($_REQUEST['user_id'])) - { - /* User being deleted. Remove from OpenID mapping table. */ - $db = new PHPWS_DB('openid_mapping'); - $db->addWhere('user_id', $_REQUEST['user_id']); - PHPWS_Error::logIfError($db->delete()); - } - } } --- 93,96 ---- |
|
From: Greg M. <bli...@us...> - 2008-07-11 16:23:54
|
Update of /cvsroot/phpwebsite-comm/modules/openid/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31841/boost Modified Files: dependency.xml Log Message: Adding remove_user.php to support new User mod feature. Index: dependency.xml =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/openid/boost/dependency.xml,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** dependency.xml 4 Feb 2008 04:54:31 -0000 1.1.1.1 --- dependency.xml 11 Jul 2008 16:23:27 -0000 1.2 *************** *** 7,9 **** --- 7,15 ---- <url>http://phpwebsite.appstate.edu/downloads/modules/base/</url> </module> + <module> + <title>users</title> + <properName>Users</properName> + <version>2.5.0</version> + <url>http://phpwebsite.appstate.edu/downloads/modules/users/</url> + </module> </dependency> |
|
From: Greg M. <bli...@us...> - 2008-07-11 16:23:31
|
Update of /cvsroot/phpwebsite-comm/modules/openid/inc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31841/inc Modified Files: close.php Added Files: remove_user.php Log Message: Adding remove_user.php to support new User mod feature. --- NEW FILE: remove_user.php --- <?php /** * OpenID module for phpWebSite * * See docs/CREDITS for copyright information * * 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: remove_user.php,v 1.1 2008/07/11 16:23:34 blindman1344 Exp $ */ function openid_remove_user($user_id) { $db = new PHPWS_DB('openid_mapping'); $db->addWhere('user_id', $user_id); PHPWS_Error::logIfError($db->delete()); } ?> Index: close.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/openid/inc/close.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** close.php 11 Feb 2008 02:11:54 -0000 1.2 --- close.php 11 Jul 2008 16:23:34 -0000 1.3 *************** *** 25,29 **** OpenID_Runtime::delegate(); OpenID_Runtime::show(); - OpenID_Runtime::clean(); ?> \ No newline at end of file --- 25,28 ---- |
|
From: Greg M. <bli...@us...> - 2008-07-11 16:23:31
|
Update of /cvsroot/phpwebsite-comm/modules/openid/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31841/docs Modified Files: ChangeLog INSTALL Log Message: Adding remove_user.php to support new User mod feature. Index: INSTALL =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/openid/docs/INSTALL,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** INSTALL 4 Feb 2008 04:54:30 -0000 1.1.1.1 --- INSTALL 11 Jul 2008 16:23:33 -0000 1.2 *************** *** 5,10 **** ===== IMPORTANT ===== ! This version of the OpenID module requires phpWebSite 1.2.0 or higher. You ! have to install phpWebSite >= 1.2.0 first - earlier versions of phpWebSite will not work. --- 5,10 ---- ===== IMPORTANT ===== ! This version of the OpenID module requires phpWebSite 1.5.2 or higher. You ! have to install phpWebSite >= 1.5.2 first - earlier versions of phpWebSite will not work. Index: ChangeLog =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/openid/docs/ChangeLog,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ChangeLog 24 May 2008 14:53:55 -0000 1.3 --- ChangeLog 11 Jul 2008 16:23:33 -0000 1.4 *************** *** 3,6 **** --- 3,10 ---- + *cvs + + RFE #1988287: Added remove_user.php to support new User mod feature. + *openid-1.0.1 (24 May 2008) |
|
From: Verdon V. <ve...@us...> - 2008-07-07 21:02:00
|
Update of /cvsroot/phpwebsite-comm/modules/sitemap/inc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27962/inc Modified Files: settings.php Log Message: 0.5.0 updates Index: settings.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/sitemap/inc/settings.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** settings.php 1 Jul 2008 03:44:01 -0000 1.2 --- settings.php 7 Jul 2008 21:01:37 -0000 1.3 *************** *** 31,34 **** --- 31,36 ---- $settings['cache_timeout'] = 3600; $settings['allow_feed'] = 1; + $settings['addkeys'] = 1; + $settings['include_fc'] = 0; ?> \ No newline at end of file |
|
From: Verdon V. <ve...@us...> - 2008-07-07 21:01:59
|
Update of /cvsroot/phpwebsite-comm/modules/sitemap/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27962/docs Modified Files: CHANGELOG Log Message: 0.5.0 updates Index: CHANGELOG =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/sitemap/docs/CHANGELOG,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CHANGELOG 1 Jul 2008 11:07:28 -0000 1.3 --- CHANGELOG 7 Jul 2008 21:01:36 -0000 1.4 *************** *** 4,8 **** + Initial writing of mod - Version 0.2.0 -- June 2008 ------------------------------------------------------------------ --- 4,7 ---- *************** *** 13,17 **** + General code tidy up - Version 0.3.0 -- June 2008 ------------------------------------------------------------------ --- 12,15 ---- *************** *** 26,27 **** --- 24,34 ---- + Added missing info tab template + Version 0.5.0 -- July 2008 + ------------------------------------------------------------------ + July 07 + + Separated getMenuItems to its own function so I could.. + + Added ability to get other non-menu keyed items into sitemap + + Added option to include file cabinet keyed items yes/no + + A bit of code tidy up + + Added english lang file + |
|
From: Verdon V. <ve...@us...> - 2008-07-07 21:01:58
|
Update of /cvsroot/phpwebsite-comm/modules/sitemap/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27962/class Modified Files: SM_Forms.php Sitemap.php Log Message: 0.5.0 updates Index: Sitemap.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/sitemap/class/Sitemap.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Sitemap.php 1 Jul 2008 03:43:59 -0000 1.2 --- Sitemap.php 7 Jul 2008 21:01:35 -0000 1.3 *************** *** 179,182 **** --- 179,190 ---- PHPWS_Settings::set('sitemap', 'allow_feed', 0); + isset($_POST['addkeys']) ? + PHPWS_Settings::set('sitemap', 'addkeys', 1) : + PHPWS_Settings::set('sitemap', 'addkeys', 0); + + isset($_POST['include_fc']) ? + PHPWS_Settings::set('sitemap', 'include_fc', 1) : + PHPWS_Settings::set('sitemap', 'include_fc', 0); + $cache_timeout = (int)$_POST['cache_timeout']; if ((int)$cache_timeout <= 7200) { *************** *** 281,285 **** } ! $content = $this->buildXML($menus, $lastmod); if (PHPWS_Settings::get('sitemap', 'cache_timeout') > 0) { PHPWS_Cache::save($cache_key, $content); --- 289,293 ---- } ! $content = $this->buildXML($menus, $lastmod, PHPWS_Settings::get('sitemap', 'addkeys')); if (PHPWS_Settings::get('sitemap', 'cache_timeout') > 0) { PHPWS_Cache::save($cache_key, $content); *************** *** 303,307 **** $lastmod = null; } ! $content = $this->buildXML($menus, $lastmod); if ($_REQUEST['build_type']) { /* save to server */ --- 311,320 ---- $lastmod = null; } ! if (isset($_REQUEST['addkeys'])) { ! $addkeys = $_REQUEST['addkeys']; ! } else { ! $addkeys = null; ! } ! $content = $this->buildXML($menus, $lastmod, $addkeys); if ($_REQUEST['build_type']) { /* save to server */ *************** *** 321,329 **** } ! function buildXML($menus, $lastmod=null) { ! $final = null; $content = null; if (!empty($menus) && is_array($menus)) { --- 334,421 ---- } ! function buildXML($menus, $lastmod=null, $addkeys=null) { ! $menuitems = array(); ! $otheritems = array(); $content = null; + + /* get the menu items */ + if (!empty($menus) && is_array($menus)) { + $menuitems = $this->getMenuItems($menus); + // print_r($menuitems); //exit; + } + + /* get other keyed items */ + if ($addkeys) { + $otheritems = $this->getOtherItems(); + // print_r($otheritems); //exit; + /* compare the arrays for dupes and return the cleaned array */ + $menuitems = array_udiff($menuitems, $otheritems, array($this, 'compareURL')); + // print_r($menuitems); exit; + } + + /* merge the two arrays */ + $allitems = array_merge($menuitems, $otheritems); + // print_r($allitems); exit; + + if (!empty($allitems) && is_array($allitems)) { + + /* make a template array of what's left */ + foreach ($allitems as $link) { + + /* loc */ + $link_tpl['LOC'] = htmlspecialchars($link['url']); + + /* lastmod */ + if (PHPWS_Settings::get('sitemap', 'use_lastmod')) { + if ($link['key_id']) { + $link_tpl['LASTMOD'] = date("Y-m-d", $link['update_date']); + } else { + $link_tpl['LASTMOD'] = $lastmod; + } + } + + /* changefreq */ + if (PHPWS_Settings::get('sitemap', 'use_change')) { + $link_tpl['CHANGE_FREQ'] = $this->getChangeFreq(PHPWS_Settings::get('sitemap', 'change_freq')); + } + /* priority */ + if (PHPWS_Settings::get('sitemap', 'use_priority')) { + $basep = 0.5; + if (!$link['parent']) { + $basep = $basep + 0.5; + } + if (($link['link_order'] > 1) && ($link['link_order'] < 5)) { + if ($link['link_order'] == 2) { + $basep = $basep - 0.1; + } elseif ($link['link_order'] == 3) { + $basep = $basep - 0.2; + } elseif ($link['link_order'] == 4) { + $basep = $basep - 0.3; + } + } elseif ($link['link_order'] > 4) { + $basep = $basep - 0.4; + } + $link_tpl['USE_PRIORITY'] = $basep; + } + + $tpl['links-listing'][] = $link_tpl; + } + + + // print_r($tpl['links-listing']); exit; + $content = PHPWS_Template::process($tpl, 'sitemap', 'sitemap.tpl'); + return $content; + + } else { + return false; + } + } + + + function getMenuItems($menus) + { + $final = null; if (!empty($menus) && is_array($menus)) { *************** *** 374,378 **** if (PHPWS_Settings::get('sitemap', 'local_only')) { if (!$link['local']) { ! $link = null; } } --- 466,471 ---- if (PHPWS_Settings::get('sitemap', 'local_only')) { if (!$link['local']) { ! // $link = null; ! $tidy = null; } } *************** *** 381,388 **** if (PHPWS_Settings::get('sitemap', 'respect_privs')) { if ($link['key_id'] && !$link['active']) { ! $link = null; } if ($link['key_id'] && $link['restricted']) { ! $link = null; } } --- 474,483 ---- if (PHPWS_Settings::get('sitemap', 'respect_privs')) { if ($link['key_id'] && !$link['active']) { ! // $link = null; ! $tidy = null; } if ($link['key_id'] && $link['restricted']) { ! // $link = null; ! $tidy = null; } } *************** *** 397,462 **** } ! $final[$link['id']] = $link; } ! /* filter out the null ones and get the cleaned array */ $final = array_filter($final); ! /* make a template array of what's left */ ! foreach ($final as $link) { ! /* loc */ ! $link_tpl['LOC'] = htmlspecialchars($link['url']); ! /* lastmod */ ! if (PHPWS_Settings::get('sitemap', 'use_lastmod')) { ! if ($link['key_id']) { ! $link_tpl['LASTMOD'] = date("Y-m-d", $link['update_date']); ! } else { ! $link_tpl['LASTMOD'] = $lastmod; ! } } ! /* changefreq */ ! if (PHPWS_Settings::get('sitemap', 'use_change')) { ! $link_tpl['CHANGE_FREQ'] = $this->getChangeFreq(PHPWS_Settings::get('sitemap', 'change_freq')); } ! ! /* priority */ ! if (PHPWS_Settings::get('sitemap', 'use_priority')) { ! $basep = 0.5; ! if (!$link['parent']) { ! $basep = $basep + 0.5; ! } ! if (($link['link_order'] > 1) && ($link['link_order'] < 5)) { ! if ($link['link_order'] == 2) { ! $basep = $basep - 0.1; ! } elseif ($link['link_order'] == 3) { ! $basep = $basep - 0.2; ! } elseif ($link['link_order'] == 4) { ! $basep = $basep - 0.3; ! } ! } elseif ($link['link_order'] > 4) { ! $basep = $basep - 0.4; ! } ! $link_tpl['USE_PRIORITY'] = $basep; } ! ! $tpl['links-listing'][] = $link_tpl; } ! // print_r(array_filter($template['links'])); exit; ! // print_r($tpl['links']); exit; ! $content = PHPWS_Template::process($tpl, 'sitemap', 'sitemap.tpl'); ! return $content; ! ! } else { ! return false; } } function getChangeFreq($id) { --- 492,604 ---- } + $tidy['url'] = $link['url']; + $tidy['key_id'] = $link['key_id']; + $tidy['update_date'] = $link['update_date']; + $tidy['parent'] = $link['parent']; + $tidy['link_order'] = $link['link_order']; ! $final[] = $tidy; } ! /* filter out the null ones and get the cleaned array */ $final = array_filter($final); + //print_r($final); exit; + + return $final; + } else { + return false; + } + } + + + function getOtherItems() + { + $final = null; + $db = new PHPWS_DB('phpws_key'); + + if (!PHPWS_Settings::get('sitemap', 'include_fc')) { + $db->addWhere('module', 'filecabinet', '!='); + } + $db->addOrder('id'); + $db->setIndexBy('id'); + // $db->setTestMode(); + $result = $db->select(); + + if (empty($result) || PHPWS_Error::logIfError($result)) { + return false; + } + + /* pre-process the menu links */ + foreach ($result as $link) { ! $link['local'] = 1; ! /* get rid of leading .'s */ ! if ($link['url'][0] == '.') { ! $link['url'] = substr($link['url'], 1); ! } ! ! /* get rid of leading /'s */ ! if ($link['url'][0] == '/') { ! $link['url'] = substr($link['url'], 1); ! } ! ! /* check for local vs remote */ ! if ($this->checkURL($link['url'])) { ! $link['local'] = 0; ! } ! /* optionally remove remote links */ ! if (PHPWS_Settings::get('sitemap', 'local_only')) { ! if (!$link['local']) { ! // $link = null; ! $tidy = null; } + } ! /* optionally remove private and non-active keyed items */ ! if (PHPWS_Settings::get('sitemap', 'respect_privs')) { ! if (!$link['active']) { ! // $link = null; ! $tidy = null; } ! if ($link['restricted']) { ! // $link = null; ! $tidy = null; } ! } ! ! /* now put the http part on local links */ ! if ($link['local']) { ! $pre = 'http://' . $_SERVER['HTTP_HOST']; ! if (dirname($_SERVER['PHP_SELF']) !== '/') { ! $pre .= dirname($_SERVER['PHP_SELF']); ! } ! $link['url'] = $pre . '/' . $link['url']; } + $tidy['url'] = $link['url']; + $tidy['key_id'] = $link['id']; + $tidy['update_date'] = $link['update_date']; + $tidy['parent'] = -1; + $tidy['link_order'] = 5; ! $final[] = $tidy; } + + /* filter out the null ones and get the cleaned array */ + $final = array_filter($final); + //print_r($final); exit; + + return $final; } + function compareURL($a, $b) + { + return strcmp($a['url'], $b['url']); + } + + function getChangeFreq($id) { Index: SM_Forms.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/sitemap/class/SM_Forms.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SM_Forms.php 1 Jul 2008 03:43:59 -0000 1.2 --- SM_Forms.php 7 Jul 2008 21:01:35 -0000 1.3 *************** *** 72,75 **** --- 72,79 ---- } + $form->addCheckbox('addkeys', 1); + $form->setMatch('addkeys', PHPWS_Settings::get('sitemap', 'addkeys')); + $form->setLabel('addkeys', dgettext('sitemap', 'Include keyed items not in menus in your sitemap')); + $form->addRadio('build_type', array(0, 1)); $form->setLabel('build_type', array(dgettext('sitemap', 'Download'), sprintf(dgettext('sitemap', 'Save to server (%s)'), PHPWS_Core::getHomeHttp() . 'sitemap.xml'))); *************** *** 128,131 **** --- 132,143 ---- $form->setLabel('allow_feed', dgettext('sitemap', 'Allow live xml feed*** of all non-restricted menus')); + $form->addCheckbox('addkeys', 1); + $form->setMatch('addkeys', PHPWS_Settings::get('sitemap', 'addkeys')); + $form->setLabel('addkeys', dgettext('sitemap', 'Include keyed items not in menus in your sitemap')); + + $form->addCheckbox('include_fc', 1); + $form->setMatch('include_fc', PHPWS_Settings::get('sitemap', 'include_fc')); + $form->setLabel('include_fc', dgettext('sitemap', 'Include file cabinet items within keyed items')); + $form->addText('cache_timeout', PHPWS_Settings::get('sitemap', 'cache_timeout')); $form->setSize('cache_timeout', 4, 4); |
|
From: Verdon V. <ve...@us...> - 2008-07-07 21:01:57
|
Update of /cvsroot/phpwebsite-comm/modules/sitemap/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27962/boost Modified Files: boost.php Added Files: update.php Log Message: 0.5.0 updates Index: boost.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/sitemap/boost/boost.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** boost.php 1 Jul 2008 11:07:27 -0000 1.3 --- boost.php 7 Jul 2008 21:01:33 -0000 1.4 *************** *** 24,28 **** $proper_name = 'Sitemap'; ! $version = '0.4.0'; $register = false; $import_sql = false; --- 24,28 ---- $proper_name = 'Sitemap'; ! $version = '0.5.0'; $register = false; $import_sql = false; --- NEW FILE: update.php --- <?php /** * sitemap - phpwebsite module * * See docs/AUTHORS and docs/COPYRIGHT for relevant info. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * @version $Id: update.php,v 1.1 2008/07/07 21:01:33 verdonv Exp $ * @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net> */ function sitemap_update(&$content, $currentVersion) { $home_dir = PHPWS_Boost::getHomeDir(); switch ($currentVersion) { case version_compare($currentVersion, '0.5.0', '<'): $content[] = '<pre>'; $files = array('templates/edit_settings.tpl', 'templates/map_settings.tpl' ); sitemapUpdateFiles($files, $content); $content[] = '0.5.0 changes ---------------- + Separated getMenuItems to its own function so I could.. + Added ability to get other non-menu keyed items into sitemap + Added option to include file cabinet keyed items yes/no + A bit of code tidy up + Added english lang file </pre>'; } // end switch return true; } function sitemapUpdateFiles($files, &$content) { if (PHPWS_Boost::updateFiles($files, 'sitemap')) { $content[] = '--- Updated the following files:'; } else { $content[] = '--- Unable to update the following files:'; } $content[] = " " . implode("\n ", $files); } ?> |
|
From: Verdon V. <ve...@us...> - 2008-07-07 21:01:34
|
Update of /cvsroot/phpwebsite-comm/modules/sitemap/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27962/templates Modified Files: edit_settings.tpl map_settings.tpl Log Message: 0.5.0 updates Index: map_settings.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/sitemap/templates/map_settings.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** map_settings.tpl 1 Jul 2008 03:44:03 -0000 1.2 --- map_settings.tpl 7 Jul 2008 21:01:41 -0000 1.3 *************** *** 3,6 **** --- 3,7 ---- <legend><strong>{OPTIONS_LABEL}</strong></legend> <p>{MENU_SELECT_LABEL}<br />{MENU_SELECT}</p> + <p>{ADDKEYS} {ADDKEYS_LABEL}</p> <!-- BEGIN lastmod_default --><p>{LASTMOD_DEFAULT} {LASTMOD_DEFAULT_LABEL}</p><!-- END lastmod_default --> <p>{BUILD_TYPE_1}{BUILD_TYPE_1_LABEL} {BUILD_TYPE_2}{BUILD_TYPE_2_LABEL}</p> Index: edit_settings.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/sitemap/templates/edit_settings.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** edit_settings.tpl 1 Jul 2008 03:44:03 -0000 1.2 --- edit_settings.tpl 7 Jul 2008 21:01:41 -0000 1.3 *************** *** 9,12 **** --- 9,14 ---- <p>{USE_PRIORITY} {USE_PRIORITY_LABEL}</p> <p>{ALLOW_FEED} {ALLOW_FEED_LABEL}</p> + <p>{ADDKEYS} {ADDKEYS_LABEL}</p> + <p>     {INCLUDE_FC} {INCLUDE_FC_LABEL}</p> <p>{CACHE_TIMEOUT} {CACHE_TIMEOUT_LABEL}</p> <p class="smaller">{FOOTNOTE_1}</p> |
|
From: Verdon V. <ve...@us...> - 2008-07-07 21:01:33
|
Update of /cvsroot/phpwebsite-comm/modules/sitemap/locale/en_US/LC_MESSAGES In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27962/locale/en_US/LC_MESSAGES Added Files: sitemap.po Log Message: 0.5.0 updates --- NEW FILE: sitemap.po --- # sitemap - phpwebsite module # # See docs/AUTHORS and docs/COPYRIGHT for relevant info. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # @version $Id: sitemap.po,v 1.1 2008/07/07 21:01:39 verdonv Exp $ # @author Verdon Vaillancourt <verdonv at users dot sourceforge dot net> # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-07 16:42-0400\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" #, php-format msgid "* More information on the Sitemap protocal is available %s" msgstr "" msgid "" "** I do a rough calculation to achieve this. Everything starts as the " "average 0.5. I add 0.5 to top-level itmes. I then subtract 0.1 for each step " "down the menu order. Nothing is scored above 1.0 or below 0.1." msgstr "" msgid "" "*** The feed respects the settings above. Lastmod date of non-keyed items " "will be null." msgstr "" msgid "About this module:" msgstr "" msgid "Add optional* change frequency to sitemap" msgstr "" msgid "Add optional* lastmod date to sitemap" msgstr "" msgid "Add optional* priority** to sitemap" msgstr "" msgid "Allow live xml feed*** of all non-restricted menus" msgstr "" msgid "Build" msgstr "" msgid "" "Cache duration in seconds for xml feed (0-7200, set to 0 to disable cache)" msgstr "" msgid "Change frequency" msgstr "" msgid "Create sitemap file" msgstr "" msgid "Download" msgstr "" msgid "Error occurred when creating file." msgstr "" msgid "Exclude remote URLs" msgstr "" msgid "File created successfully." msgstr "" #, php-format msgid "" "First, review the settings. Then, you can either download a sitemap file for " "using later, save a sitemap file to the server at %s, or allow a live and " "dynamic sitemap feed at %s" msgstr "" msgid "General Settings" msgstr "" msgid "Generate Map" msgstr "" msgid "Generates sitemap.xml files for search engines." msgstr "" msgid "How to use it:" msgstr "" #, php-format msgid "" "If you would like to help out with the ongoing development of sitemap, or " "other modules by Verdon Vaillancourt, %s click here to donate %s (opens in " "new browser window)." msgstr "" msgid "Important Information" msgstr "" msgid "Include file cabinet items within keyed items" msgstr "" msgid "Include keyed items not in menus in your sitemap" msgstr "" msgid "Lastmod date for non-keyed items (YYYY-MM-DD) or leave empty" msgstr "" msgid "No menus created." msgstr "" msgid "No menus." msgstr "" msgid "Options" msgstr "" msgid "Read me" msgstr "" msgid "Respect keyed menu item permissions" msgstr "" msgid "Save settings" msgstr "" #, php-format msgid "Save to server (%s)" msgstr "" msgid "Select one or more menus to include in your sitemap." msgstr "" msgid "Settings" msgstr "" msgid "Sitemap" msgstr "" #, php-format msgid "" "Sitemap is used to generate a sitmap.xml file, following the standards at %" "s. These sitemap files are used by google and other popular search engines " "to help them index your website. Sitemap does this by gathering all the " "links from one or more of your menus, filtering and preparing according to " "your settings, and then writing the xml for you." msgstr "" msgid "Sitemap settings saved." msgstr "" msgid "" "This is the second release of sitemap for the new 1.x series phpwebsite. I " "wrote this for a specific need I had and thought it may be of use to others " "also." msgstr "" msgid "What it does:" msgstr "" msgid "here" msgstr "" msgid "link" msgstr "" msgid "links" msgstr "" |
|
From: Verdon V. <ve...@us...> - 2008-07-07 21:00:28
|
Update of /cvsroot/phpwebsite-comm/modules/sitemap/locale/en_US/LC_MESSAGES In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27565/locale/en_US/LC_MESSAGES Log Message: Directory /cvsroot/phpwebsite-comm/modules/sitemap/locale/en_US/LC_MESSAGES added to the repository |
|
From: Verdon V. <ve...@us...> - 2008-07-07 21:00:14
|
Update of /cvsroot/phpwebsite-comm/modules/sitemap/locale/en_US In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27530/locale/en_US Log Message: Directory /cvsroot/phpwebsite-comm/modules/sitemap/locale/en_US added to the repository |
|
From: Verdon V. <ve...@us...> - 2008-07-07 20:59:07
|
Update of /cvsroot/phpwebsite-comm/modules/sitemap/locale In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27089/locale Log Message: Directory /cvsroot/phpwebsite-comm/modules/sitemap/locale added to the repository |
|
From: Verdon V. <ve...@us...> - 2008-07-07 14:06:09
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31273/boost Modified Files: update.php Log Message: 1.0 cleanup Index: update.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/boost/update.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** update.php 7 Jul 2008 13:30:04 -0000 1.9 --- update.php 7 Jul 2008 14:06:16 -0000 1.10 *************** *** 134,137 **** --- 134,142 ---- + Added View icon to member viewLink(icon=false) + Added option to have admin notification of all member edits + + Added Settings link to navLinks() if not already an admin mode + + Consolidated list by location/feature/category views into + main browse/list function + + Cleaned out a lot of old code from old view by lists + + Template tweaks </pre>'; |
|
From: Verdon V. <ve...@us...> - 2008-07-07 13:54:57
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26504/class Modified Files: RDX_Forms.php Log Message: 1.0 cleanup Index: RDX_Forms.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Forms.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** RDX_Forms.php 7 Jul 2008 13:30:15 -0000 1.17 --- RDX_Forms.php 7 Jul 2008 13:55:01 -0000 1.18 *************** *** 1266,1274 **** $tpl['TITLE'] = dgettext('rolodex', 'Important Information'); $tpl['INFO_1_LABEL'] = dgettext('rolodex', 'About this module:'); ! $tpl['INFO_1'] = dgettext('rolodex', 'This is a second beta release of this module. Many features have been added and it is getting close to final release. Please see docs/CHANGELOG for details.'); ! $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=5927" target="new">', '</a>'); ! $tpl['INFO_3_LABEL'] = null; ! $tpl['INFO_3'] = null; $tpl['INFO_4_LABEL'] = null; $tpl['INFO_4'] = null; --- 1266,1274 ---- $tpl['TITLE'] = dgettext('rolodex', 'Important Information'); $tpl['INFO_1_LABEL'] = dgettext('rolodex', 'About this module:'); ! $tpl['INFO_1'] = dgettext('rolodex', 'This is the first full release of Rolodex for phpwebsite (phpws). Rolodex is a new module for phpws 1.5 or better. It is a complete rewrite of my earlier module phpwsbusinesses, for the earlier series of phpws. If you were familiar with that module, you will be familiar with many of Rolodex\'s features.'); ! $tpl['INFO_2_LABEL'] = null; ! $tpl['INFO_2'] = dgettext('rolodex', 'Roldex brings many new features and is even more configurable than phpwsbusinesses. Rolodex also takes full advantage of the new phpws core Demographics module. This module allows the sharing of user demographic information across all modules in a phpws.'); ! $tpl['INFO_3_LABEL'] = dgettext('rolodex', 'Bugs:'); ! $tpl['INFO_3'] = 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=5969" target="new">', '</a>'); $tpl['INFO_4_LABEL'] = null; $tpl['INFO_4'] = null; |
|
From: Verdon V. <ve...@us...> - 2008-07-07 13:54:57
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/locale/en_US/LC_MESSAGES In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26504/locale/en_US/LC_MESSAGES Modified Files: rolodex.po Log Message: 1.0 cleanup Index: rolodex.po =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/locale/en_US/LC_MESSAGES/rolodex.po,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** rolodex.po 17 Jun 2008 13:27:38 -0000 1.2 --- rolodex.po 7 Jul 2008 13:55:03 -0000 1.3 *************** *** 25,29 **** "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-06-17 08:46-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" --- 25,29 ---- "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-07-07 09:49-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" *************** *** 34,37 **** --- 34,41 ---- #, php-format + msgid " - %s" + msgstr "" + + #, php-format msgid "%s Advanced Search" msgstr "" *************** *** 86,89 **** --- 90,96 ---- msgstr "" + msgid "Address to display on browse list views" + msgstr "" + msgid "Advanced" msgstr "" *************** *** 102,105 **** --- 109,115 ---- msgstr "" + msgid "All fields are required." + msgstr "" + msgid "Allow anonymous comments" msgstr "" *************** *** 120,129 **** msgstr "" - msgid "An error occurred when accessing this feature's members." - msgstr "" - - msgid "An error occurred when accessing this location's members." - msgstr "" - msgid "" "Are you sure you want to delete all expired members?\\nEach user's " --- 130,133 ---- *************** *** 150,153 **** --- 154,160 ---- msgstr "" + msgid "Both" + msgstr "" + msgid "Browse all members" msgstr "" *************** *** 159,162 **** --- 166,172 ---- msgstr "" + msgid "Business" + msgstr "" + msgid "Business Address 1" msgstr "" *************** *** 189,192 **** --- 199,208 ---- msgstr "" + msgid "Business phone" + msgstr "" + + msgid "Business phone numbers" + msgstr "" + msgid "Business/Organization" msgstr "" *************** *** 223,226 **** --- 239,245 ---- msgstr "" + msgid "Clears filters and searches all records." + msgstr "" + msgid "Comments Settings" msgstr "" *************** *** 229,232 **** --- 248,260 ---- msgstr "" + msgid "Compose message" + msgstr "" + + msgid "Confirm Graphic" + msgstr "" + + msgid "Confirm text" + msgstr "" + msgid "Contact" msgstr "" *************** *** 242,245 **** --- 270,276 ---- msgstr "" + msgid "Contact link type" + msgstr "" + msgid "Continue" msgstr "" *************** *** 295,301 **** msgstr "" - msgid "Day phone" - msgstr "" - msgid "Deactivate" msgstr "" --- 326,329 ---- *************** *** 325,328 **** --- 353,368 ---- msgstr "" + msgid "Display categories" + msgstr "" + + msgid "Display features" + msgstr "" + + msgid "Display locations" + msgstr "" + + msgid "Display phone numbers" + msgstr "" + msgid "E-Mail" msgstr "" *************** *** 349,352 **** --- 389,395 ---- msgstr "" + msgid "Email link" + msgstr "" + msgid "" "Enable anonymous comment settings on profiles (required for the next Force " *************** *** 415,418 **** --- 458,464 ---- msgstr "" + msgid "Featured Member" + msgstr "" + msgid "Features" msgstr "" *************** *** 439,442 **** --- 485,491 ---- msgstr "" + msgid "Home" + msgstr "" + msgid "Home Address 1" msgstr "" *************** *** 460,463 **** --- 509,518 ---- msgstr "" + msgid "Home phone" + msgstr "" + + msgid "Home phone numbers" + msgstr "" + msgid "Honorific" msgstr "" *************** *** 488,495 **** msgstr "" ! msgid "List all features" ! msgstr "" ! ! msgid "List all locations" msgstr "" --- 543,547 ---- msgstr "" ! msgid "List Settings" msgstr "" *************** *** 546,552 **** --- 598,614 ---- msgstr "" + msgid "Message" + msgstr "" + + msgid "Message sent succesfully." + msgstr "" + msgid "Miscellaneous" msgstr "" + #, php-format + msgid "Modified %s Profile" + msgstr "" + msgid "Most Recent Member" msgstr "" *************** *** 576,579 **** --- 638,644 ---- msgstr "" + msgid "None" + msgstr "" + msgid "Not Active" msgstr "" *************** *** 586,590 **** msgstr "" ! msgid "Phone numbers" msgstr "" --- 651,655 ---- msgstr "" ! msgid "Please provide a message." msgstr "" *************** *** 592,595 **** --- 657,669 ---- msgstr "" + msgid "Please provide a subject." + msgstr "" + + msgid "Please provide your email address." + msgstr "" + + msgid "Please provide your name." + msgstr "" + #, php-format msgid "" *************** *** 598,601 **** --- 672,678 ---- msgstr "" + msgid "Please type the word seen in the image." + msgstr "" + msgid "Position title" msgstr "" *************** *** 625,631 **** msgstr "" - msgid "Random Member" - msgstr "" - msgid "Read me" msgstr "" --- 702,705 ---- *************** *** 662,665 **** --- 736,746 ---- msgstr "" + msgid "" + "Roldex brings many new features and is even more configurable than " + "phpwsbusinesses. Rolodex also takes full advantage of the new phpws core " + "Demographics module. This module allows the sharing of user demographic " + "information across all modules in a phpws." + msgstr "" + msgid "Rolodex" msgstr "" *************** *** 709,718 **** --- 790,822 ---- msgstr "" + #, php-format + msgid "Search within %s." + msgstr "" + + msgid "Select checkbox to also include field in list view" + msgstr "" + + msgid "" + "Select one or more of the available options below to filter a list of " + "members. It is possible to get too specific. If your search returns an empty " + "list, try selecting fewer criteria." + msgstr "" + msgid "Semi-private" msgstr "" + msgid "Send Message" + msgstr "" + + #, php-format + msgid "Send a message to %s" + msgstr "" + msgid "Send notification of pending applications" msgstr "" + msgid "Send notification upon all member edits (not those done by an admin)" + msgstr "" + msgid "Settings" msgstr "" *************** *** 759,762 **** --- 863,869 ---- msgstr "" + msgid "Subject" + msgstr "" + msgid "Submit" msgstr "" *************** *** 768,771 **** --- 875,882 ---- msgstr "" + #, php-format + msgid "The %s profile for %s has been modified at %s." + msgstr "" + msgid "The admin contact email address for this module" msgstr "" *************** *** 775,778 **** --- 886,894 ---- msgstr "" + msgid "" + "The following settings respect the privacy settings above and do not over-" + "ride them." + msgstr "" + msgid "There was a problem deleting the image." msgstr "" *************** *** 789,799 **** msgstr "" msgid "There were no expired records to delete." msgstr "" msgid "" ! "This is a second beta release of this module. Many features have " ! "been added and it is getting close to final release. Please see " ! "docs/CHANGELOG for details." msgstr "" --- 905,924 ---- msgstr "" + msgid "There was a problem sending the message." + msgstr "" + msgid "There were no expired records to delete." msgstr "" msgid "" ! "This is the first full release of Rolodex for phpwebsite (phpws). Rolodex is " ! "a new module for phpws 1.5 or better. It is a complete rewrite of my earlier " ! "module phpwsbusinesses, for the earlier series of phpws. If you were " ! "familiar with that module, you will be familiar with many of Rolodex's " ! "features." ! msgstr "" ! ! #, php-format ! msgid "This message from %s was sent via %s." msgstr "" *************** *** 801,804 **** --- 926,942 ---- msgstr "" + msgid "" + "To select more than one itme from any given list, click on the first item " + "then hold your control key and click on the next. Use shift-click to select " + "a range of items. Mac users, use command-click and shift-click." + msgstr "" + + msgid "" + "To use the category, location, or feature lists, select an item from the " + "list and click on the \"+\" symbool to add the selection to this profile. To " + "remove a selection, click on the name of the item in the box below the " + "select menu." + msgstr "" + msgid "Toll-free phone" msgstr "" *************** *** 835,838 **** --- 973,979 ---- msgstr "" + msgid "Use graphical confirmation on contact form (CAPTCHA)" + msgstr "" + msgid "User options" msgstr "" *************** *** 844,847 **** --- 985,991 ---- msgstr "" + msgid "View Details" + msgstr "" + msgid "View private members" msgstr "" *************** *** 850,853 **** --- 994,1000 ---- msgstr "" + msgid "Web form" + msgstr "" + msgid "Web site" msgstr "" *************** *** 882,883 **** --- 1029,1039 ---- msgid "You must give this location a title." msgstr "" + + msgid "Your email" + msgstr "" + + msgid "Your email address is improperly formatted." + msgstr "" + + msgid "Your name" + msgstr "" |
