Update of /cvsroot/phpwebsite-comm/modules/rolodex/class In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10816/class Modified Files: RDX_Feature.php RDX_Forms.php RDX_Location.php RDX_Member.php RDX_Mypage.php RDX_Runtime.php Rolodex.php Log Message: 1.3 work for phpws 1.6 compatibility Index: RDX_Forms.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Forms.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** RDX_Forms.php 9 Oct 2008 19:40:47 -0000 1.25 --- RDX_Forms.php 20 Nov 2008 22:49:33 -0000 1.26 *************** *** 25,31 **** class Rolodex_Forms { ! var $rolodex = null; ! function get($type) { switch ($type) { --- 25,31 ---- class Rolodex_Forms { ! public $rolodex = null; ! public function get($type) { switch ($type) { *************** *** 136,140 **** ! function settingsPanel() { PHPWS_Core::initModClass('controlpanel', 'Panel.php'); --- 136,140 ---- ! public function settingsPanel() { PHPWS_Core::initModClass('controlpanel', 'Panel.php'); *************** *** 163,167 **** ! function listMembers($approved=null, $expired=false, $location=null, $feature=null, $category=null) { //print_r($_REQUEST); exit; --- 163,167 ---- ! public function listMembers($approved=null, $expired=false, $location=null, $feature=null, $category=null) { //print_r($_REQUEST); exit; *************** *** 414,418 **** ! function listLocations() { $ptags['TITLE_HEADER'] = dgettext('rolodex', 'Title'); --- 414,418 ---- ! public function listLocations() { $ptags['TITLE_HEADER'] = dgettext('rolodex', 'Title'); *************** *** 453,457 **** ! function listFeatures() { $ptags['TITLE_HEADER'] = dgettext('rolodex', 'Title'); --- 453,457 ---- ! public function listFeatures() { $ptags['TITLE_HEADER'] = dgettext('rolodex', 'Title'); *************** *** 490,494 **** ! function listCategories() { --- 490,494 ---- ! public function listCategories() { *************** *** 514,518 **** ! function listCatsRow($value) { $db = new PHPWS_DB('category_items'); --- 514,518 ---- ! public function listCatsRow($value) { $db = new PHPWS_DB('category_items'); *************** *** 535,539 **** ! function advSearchForm() { $form = new PHPWS_Form('rolodex_adv_search'); --- 535,539 ---- ! public function advSearchForm() { $form = new PHPWS_Form('rolodex_adv_search'); *************** *** 572,576 **** ! function editSettings() { --- 572,576 ---- ! public function editSettings() { *************** *** 827,831 **** ! function selectUser() { --- 827,831 ---- ! public function selectUser() { *************** *** 863,867 **** ! function editMember($admin=true) { //print_r($this->rolodex->member); --- 863,867 ---- ! public function editMember($admin=true) { //print_r($this->rolodex->member); *************** *** 1157,1161 **** ! function editLocation() { $form = new PHPWS_Form('rolodex_location'); --- 1157,1161 ---- ! public function editLocation() { $form = new PHPWS_Form('rolodex_location'); *************** *** 1201,1205 **** ! function editFeature() { $form = new PHPWS_Form('rolodex_feature'); --- 1201,1205 ---- ! public function editFeature() { $form = new PHPWS_Form('rolodex_feature'); *************** *** 1245,1249 **** ! function contactMember() { if (isset($_POST['name'])) { --- 1245,1249 ---- ! public function contactMember() { if (isset($_POST['name'])) { *************** *** 1315,1319 **** ! function confirmGraphic() { PHPWS_Core::initCoreClass('Captcha.php'); --- 1315,1319 ---- ! public function confirmGraphic() { PHPWS_Core::initCoreClass('Captcha.php'); *************** *** 1322,1326 **** ! function utilities() { --- 1322,1326 ---- ! public function utilities() { *************** *** 1353,1357 **** ! function showInfo() { --- 1353,1357 ---- ! public function showInfo() { *************** *** 1375,1379 **** /* not in use */ ! function categories() { --- 1375,1379 ---- /* not in use */ ! public function categories() { Index: RDX_Runtime.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Runtime.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** RDX_Runtime.php 9 Oct 2008 19:40:47 -0000 1.4 --- RDX_Runtime.php 20 Nov 2008 22:49:33 -0000 1.5 *************** *** 27,31 **** { ! function showBlock() { if (PHPWS_Settings::get('rolodex', 'show_block')) { if (PHPWS_Settings::get('rolodex', 'block_on_home_only')) { --- 27,31 ---- { ! public function showBlock() { if (PHPWS_Settings::get('rolodex', 'show_block')) { if (PHPWS_Settings::get('rolodex', 'block_on_home_only')) { *************** *** 40,44 **** } ! function showRolodexBlock() { $db = new PHPWS_DB('rolodex_member'); --- 40,44 ---- } ! public function showRolodexBlock() { $db = new PHPWS_DB('rolodex_member'); Index: RDX_Mypage.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Mypage.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** RDX_Mypage.php 25 Jun 2008 02:48:43 -0000 1.8 --- RDX_Mypage.php 20 Nov 2008 22:49:33 -0000 1.9 *************** *** 27,31 **** class Rolodex_Mypage { ! function main() { Rolodex_Mypage::action($tpl['TITLE'], $tpl['CONTENT']); --- 27,31 ---- class Rolodex_Mypage { ! public function main() { Rolodex_Mypage::action($tpl['TITLE'], $tpl['CONTENT']); *************** *** 73,77 **** /* nothing below here used yet, maybe use in future */ ! function action(&$title, &$content) { if (isset($_REQUEST['uop'])) --- 73,77 ---- /* nothing below here used yet, maybe use in future */ ! public function action(&$title, &$content) { if (isset($_REQUEST['uop'])) *************** *** 87,91 **** ! function searchForm() { $form = new PHPWS_Form('rolodex_search'); --- 87,91 ---- ! public function searchForm() { $form = new PHPWS_Form('rolodex_search'); *************** *** 105,109 **** } ! function sendMessage(&$result, $success_msg, $error_msg) { $_SESSION['rolodex_message'] = (PHPWS_Error::logIfError($result) ? $error_msg : $success_msg); --- 105,109 ---- } ! public function sendMessage(&$result, $success_msg, $error_msg) { $_SESSION['rolodex_message'] = (PHPWS_Error::logIfError($result) ? $error_msg : $success_msg); *************** *** 111,115 **** } ! function sendMessageOnly($msg) { $_SESSION['rolodex_message'] = $msg; --- 111,115 ---- } ! public function sendMessageOnly($msg) { $_SESSION['rolodex_message'] = $msg; *************** *** 117,121 **** } ! function getMessage() { if (isset($_SESSION['rolodex_message'])) --- 117,121 ---- } ! public function getMessage() { if (isset($_SESSION['rolodex_message'])) Index: RDX_Location.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Location.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** RDX_Location.php 26 Jul 2008 20:57:18 -0000 1.6 --- RDX_Location.php 20 Nov 2008 22:49:33 -0000 1.7 *************** *** 25,36 **** class Rolodex_Location { ! var $id = 0; ! var $title = null; ! var $description = null; ! var $image_id = 0; ! var $_error = null; ! function Rolodex_Location($id=0) { if (!$id) { --- 25,36 ---- class Rolodex_Location { ! public $id = 0; ! public $title = null; ! public $description = null; ! public $image_id = 0; ! public $_error = null; ! public function __construct($id=0) { if (!$id) { *************** *** 43,47 **** ! function init() { $db = new PHPWS_DB('rolodex_location'); --- 43,47 ---- ! public function init() { $db = new PHPWS_DB('rolodex_location'); *************** *** 56,60 **** ! function setTitle($title) { $this->title = strip_tags($title); --- 56,60 ---- ! public function setTitle($title) { $this->title = strip_tags($title); *************** *** 62,66 **** ! function setDescription($description) { $this->description = PHPWS_Text::parseInput($description); --- 62,66 ---- ! public function setDescription($description) { $this->description = PHPWS_Text::parseInput($description); *************** *** 68,72 **** ! function setImage_id($image_id) { $this->image_id = $image_id; --- 68,72 ---- ! public function setImage_id($image_id) { $this->image_id = $image_id; *************** *** 75,79 **** ! function getTitle($print=false) { if (empty($this->title)) { --- 75,79 ---- ! public function getTitle($print=false) { if (empty($this->title)) { *************** *** 89,93 **** ! function getDescription($print=false) { if (empty($this->description)) { --- 89,93 ---- ! public function getDescription($print=false) { if (empty($this->description)) { *************** *** 103,107 **** ! function getListDescription($length=60){ if (empty($this->description)) { return ''; --- 103,107 ---- ! public function getListDescription($length=60){ if (empty($this->description)) { return ''; *************** *** 111,115 **** ! function getQtyMembers() { $db = new PHPWS_DB('rolodex_location_items'); --- 111,115 ---- ! public function getQtyMembers() { $db = new PHPWS_DB('rolodex_location_items'); *************** *** 120,124 **** ! function getFile() { if (!$this->image_id) { --- 120,124 ---- ! public function getFile() { if (!$this->image_id) { *************** *** 129,133 **** ! function delete() { if (!$this->id) { --- 129,133 ---- ! public function delete() { if (!$this->id) { *************** *** 145,149 **** ! function rowTag() { $vars['location'] = $this->id; --- 145,149 ---- ! public function rowTag() { $vars['location'] = $this->id; *************** *** 168,172 **** ! function locationLinks() { $links = array(); --- 168,172 ---- ! public function locationLinks() { $links = array(); *************** *** 184,188 **** ! function save() { $db = new PHPWS_DB('rolodex_location'); --- 184,188 ---- ! public function save() { $db = new PHPWS_DB('rolodex_location'); *************** *** 195,199 **** ! function viewLink() { // return PHPWS_Text::rewriteLink($this->title, 'rolodex', $this->id); --- 195,199 ---- ! public function viewLink() { // return PHPWS_Text::rewriteLink($this->title, 'rolodex', $this->id); Index: Rolodex.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/Rolodex.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Rolodex.php 9 Oct 2008 19:40:47 -0000 1.21 --- Rolodex.php 20 Nov 2008 22:49:33 -0000 1.22 *************** *** 29,44 **** class Rolodex { ! var $forms = null; ! var $panel = null; ! var $title = null; ! var $message = null; ! var $content = null; ! var $member = null; ! var $location = null; ! var $feature = null; ! var $category = null; ! function adminMenu() { if (!Current_User::allow('rolodex')) { --- 29,44 ---- class Rolodex { ! public $forms = null; ! public $panel = null; ! public $title = null; ! public $message = null; ! public $content = null; ! public $member = null; ! public $location = null; ! public $feature = null; ! public $category = null; ! public function adminMenu() { if (!Current_User::allow('rolodex')) { *************** *** 344,353 **** ! function sendMessage() { PHPWS_Core::reroute('index.php?module=rolodex&uop=message'); } ! function forwardMessage($message, $title=null) { $_SESSION['RDX_Message']['message'] = $message; --- 344,353 ---- ! public function sendMessage() { PHPWS_Core::reroute('index.php?module=rolodex&uop=message'); } ! public function forwardMessage($message, $title=null) { $_SESSION['RDX_Message']['message'] = $message; *************** *** 358,362 **** ! function loadMessage() { if (isset($_SESSION['RDX_Message'])) { --- 358,362 ---- ! public function loadMessage() { if (isset($_SESSION['RDX_Message'])) { *************** *** 370,374 **** ! function userMenu($action=null) { $javascript = false; --- 370,374 ---- ! public function userMenu($action=null) { $javascript = false; *************** *** 633,637 **** ! function loadForm($type) { PHPWS_Core::initModClass('rolodex', 'RDX_Forms.php'); --- 633,637 ---- ! public function loadForm($type) { PHPWS_Core::initModClass('rolodex', 'RDX_Forms.php'); *************** *** 642,646 **** ! function loadMember($user_id=0) { PHPWS_Core::initModClass('rolodex', 'RDX_Member.php'); --- 642,646 ---- ! public function loadMember($user_id=0) { PHPWS_Core::initModClass('rolodex', 'RDX_Member.php'); *************** *** 658,662 **** ! function loadLocation($id=0) { PHPWS_Core::initModClass('rolodex', 'RDX_Location.php'); --- 658,662 ---- ! public function loadLocation($id=0) { PHPWS_Core::initModClass('rolodex', 'RDX_Location.php'); *************** *** 676,680 **** ! function loadFeature($id=0) { PHPWS_Core::initModClass('rolodex', 'RDX_Feature.php'); --- 676,680 ---- ! public function loadFeature($id=0) { PHPWS_Core::initModClass('rolodex', 'RDX_Feature.php'); *************** *** 694,698 **** ! function loadCategory($id=0) { PHPWS_Core::initModClass('categories', 'Category.php'); --- 694,698 ---- ! public function loadCategory($id=0) { PHPWS_Core::initModClass('categories', 'Category.php'); *************** *** 711,715 **** ! function loadPanel() { PHPWS_Core::initModClass('controlpanel', 'Panel.php'); --- 711,715 ---- ! public function loadPanel() { PHPWS_Core::initModClass('controlpanel', 'Panel.php'); *************** *** 750,754 **** ! function postSettings() { --- 750,754 ---- ! public function postSettings() { *************** *** 1013,1017 **** ! function postMember() { $this->loadMember(); --- 1013,1017 ---- ! public function postMember() { $this->loadMember(); *************** *** 1269,1273 **** ! function postLocation() { $this->loadLocation(); --- 1269,1273 ---- ! public function postLocation() { $this->loadLocation(); *************** *** 1297,1301 **** ! function postFeature() { $this->loadFeature(); --- 1297,1301 ---- ! public function postFeature() { $this->loadFeature(); *************** *** 1325,1329 **** ! function checkMessage() { $this->loadMember(); --- 1325,1329 ---- ! public function checkMessage() { $this->loadMember(); *************** *** 1366,1370 **** ! function sendMail() { $this->loadMember(); --- 1366,1370 ---- ! public function sendMail() { $this->loadMember(); *************** *** 1390,1394 **** ! function resetExpired($interval) { $expires = mktime(0, 0, 0, date("m"), date("d")+$interval, date("Y")); --- 1390,1394 ---- ! public function resetExpired($interval) { $expires = mktime(0, 0, 0, date("m"), date("d")+$interval, date("Y")); *************** *** 1399,1403 **** ! function deleteExpired() { PHPWS_Core::initModClass('rolodex', 'RDX_Member.php'); --- 1399,1403 ---- ! public function deleteExpired() { PHPWS_Core::initModClass('rolodex', 'RDX_Member.php'); *************** *** 1415,1419 **** ! function setAllComments($num) { $db = new PHPWS_DB('rolodex_member'); --- 1415,1419 ---- ! public function setAllComments($num) { $db = new PHPWS_DB('rolodex_member'); *************** *** 1423,1427 **** ! function setAllComments_annon($num) { PHPWS_Core::initModClass('rolodex', 'RDX_Member.php'); --- 1423,1427 ---- ! public function setAllComments_annon($num) { PHPWS_Core::initModClass('rolodex', 'RDX_Member.php'); *************** *** 1443,1447 **** ! function search_index_all() { --- 1443,1447 ---- ! public function search_index_all() { *************** *** 1475,1479 **** ! function search_remove_all() { --- 1475,1479 ---- ! public function search_remove_all() { *************** *** 1492,1496 **** ! function exportCSV($approved=null, $expired=false) { --- 1492,1496 ---- ! public function exportCSV($approved=null, $expired=false) { *************** *** 1558,1562 **** ! function navLinks() { --- 1558,1562 ---- ! public function navLinks() { *************** *** 1599,1603 **** } ! function alpha_click() { --- 1599,1603 ---- } ! public function alpha_click() { *************** *** 1659,1663 **** * @access public */ ! function alphabet($letter_case=NULL) { if ($letter_case == "lower") { --- 1659,1663 ---- * @access public */ ! public function alphabet($letter_case=NULL) { if ($letter_case == "lower") { *************** *** 1682,1686 **** * @access public */ ! function getItemForm($type='location', $match=null, $select_name='location', $multiple=true) { --- 1682,1686 ---- * @access public */ ! public function getItemForm($type='location', $match=null, $select_name='location', $multiple=true) { *************** *** 1700,1703 **** --- 1700,1704 ---- } + $items = null; if ($result) { foreach ($result as $item) { *************** *** 1735,1739 **** ! function getItemSelect($type='location', $match=null, $select_name='location', $multiple=true, $count=true) { --- 1736,1740 ---- ! public function getItemSelect($type='location', $match=null, $select_name='location', $multiple=true, $count=true) { *************** *** 1789,1793 **** ! function getCatSelect($match=null, $select_name='categories', $multiple=true, $count=true) { --- 1790,1794 ---- ! public function getCatSelect($match=null, $select_name='categories', $multiple=true, $count=true) { Index: RDX_Member.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Member.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** RDX_Member.php 9 Oct 2008 19:40:47 -0000 1.18 --- RDX_Member.php 20 Nov 2008 22:49:33 -0000 1.19 *************** *** 29,95 **** /* new demographics fields */ ! var $tollfree_phone = null; ! var $business_name = null; /* stock demographics fields */ ! var $courtesy_title = null; ! var $honorific = null; ! var $first_name = null; ! var $last_name = null; [...1526 lines suppressed...] $str = str_replace("\r\n", '; ', $str); --- 2075,2079 ---- ! public function stripLF($str) { $str = str_replace("\r\n", '; ', $str); *************** *** 2078,2082 **** ! function sendNotification($new=true) { --- 2083,2087 ---- ! public function sendNotification($new=true) { Index: RDX_Feature.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Feature.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** RDX_Feature.php 26 Jul 2008 20:57:18 -0000 1.6 --- RDX_Feature.php 20 Nov 2008 22:49:33 -0000 1.7 *************** *** 25,36 **** class Rolodex_Feature { ! var $id = 0; ! var $title = null; ! var $description = null; ! var $image_id = 0; ! var $_error = null; ! function Rolodex_Feature($id=0) { if (!$id) { --- 25,36 ---- class Rolodex_Feature { ! public $id = 0; ! public $title = null; ! public $description = null; ! public $image_id = 0; ! public $_error = null; ! public function __construct($id=0) { if (!$id) { *************** *** 43,47 **** ! function init() { $db = new PHPWS_DB('rolodex_feature'); --- 43,47 ---- ! public function init() { $db = new PHPWS_DB('rolodex_feature'); *************** *** 56,60 **** ! function setTitle($title) { $this->title = strip_tags($title); --- 56,60 ---- ! public function setTitle($title) { $this->title = strip_tags($title); *************** *** 62,66 **** ! function setDescription($description) { $this->description = PHPWS_Text::parseInput($description); --- 62,66 ---- ! public function setDescription($description) { $this->description = PHPWS_Text::parseInput($description); *************** *** 68,72 **** ! function setImage_id($image_id) { $this->image_id = $image_id; --- 68,72 ---- ! public function setImage_id($image_id) { $this->image_id = $image_id; *************** *** 75,79 **** ! function getTitle($print=false) { if (empty($this->title)) { --- 75,79 ---- ! public function getTitle($print=false) { if (empty($this->title)) { *************** *** 89,93 **** ! function getDescription($print=false) { if (empty($this->description)) { --- 89,93 ---- ! public function getDescription($print=false) { if (empty($this->description)) { *************** *** 103,107 **** ! function getListDescription($length=60) { if (empty($this->description)) { --- 103,107 ---- ! public function getListDescription($length=60) { if (empty($this->description)) { *************** *** 112,116 **** ! function getQtyMembers() { $db = new PHPWS_DB('rolodex_feature_items'); --- 112,116 ---- ! public function getQtyMembers() { $db = new PHPWS_DB('rolodex_feature_items'); *************** *** 121,125 **** ! function getFile() { if (!$this->image_id) { --- 121,125 ---- ! public function getFile() { if (!$this->image_id) { *************** *** 130,134 **** ! function delete() { if (!$this->id) { --- 130,134 ---- ! public function delete() { if (!$this->id) { *************** *** 146,150 **** ! function rowTag() { $vars['feature'] = $this->id; --- 146,150 ---- ! public function rowTag() { $vars['feature'] = $this->id; *************** *** 169,173 **** ! function featureLinks() { $links = array(); --- 169,173 ---- ! public function featureLinks() { $links = array(); *************** *** 185,189 **** ! function save() { $db = new PHPWS_DB('rolodex_feature'); --- 185,189 ---- ! public function save() { $db = new PHPWS_DB('rolodex_feature'); *************** *** 196,200 **** ! function viewLink() { // return PHPWS_Text::rewriteLink($this->title, 'rolodex', $this->id); --- 196,200 ---- ! public function viewLink() { // return PHPWS_Text::rewriteLink($this->title, 'rolodex', $this->id); |