Menu
▾
▴
[phpws-comm-commits] modules/ads/class ad.php, 1.14, 1.15 admin.php, 1.20, 1.21 advertiser.php, 1.8, 1.9 campaign.php, 1.11, 1.12
|
From: Greg M. <bli...@us...> - 2008-06-22 20:04:43
|
Update of /cvsroot/phpwebsite-comm/modules/ads/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25678/class Modified Files: ad.php admin.php advertiser.php campaign.php Log Message: No longer save username in advertisers table. DBPager queries now cached. Index: campaign.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/ads/class/campaign.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** campaign.php 22 Jun 2008 15:55:07 -0000 1.11 --- campaign.php 22 Jun 2008 20:04:19 -0000 1.12 *************** *** 104,109 **** { $db = new PHPWS_DB('ads_advertisers'); ! $db->addWhere('id', $this->advertiser_id); ! $db->addColumn('username'); $result = $db->select('col'); if (($result[0] != Current_User::getUsername()) && !Current_User::authorized('ads')) --- 104,110 ---- { $db = new PHPWS_DB('ads_advertisers'); ! $db->addWhere('ads_advertisers.id', $this->advertiser_id); ! $db->addWhere('users.id', 'ads_advertisers.user_id'); ! $db->addColumn('users.username'); $result = $db->select('col'); if (($result[0] != Current_User::getUsername()) && !Current_User::authorized('ads')) *************** *** 153,158 **** { $db = new PHPWS_DB('ads_advertisers'); ! $db->addWhere('id', $this->advertiser_id); ! $db->addColumn('username'); $result = $db->select('col'); if (($result[0] != Current_User::getUsername()) && !Current_User::authorized('ads')) --- 154,160 ---- { $db = new PHPWS_DB('ads_advertisers'); ! $db->addWhere('ads_advertisers.id', $this->advertiser_id); ! $db->addWhere('users.id', 'ads_advertisers.user_id'); ! $db->addColumn('users.username'); $result = $db->select('col'); if (($result[0] != Current_User::getUsername()) && !Current_User::authorized('ads')) Index: admin.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/ads/class/admin.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** admin.php 29 Mar 2008 17:01:25 -0000 1.20 --- admin.php 22 Jun 2008 20:04:19 -0000 1.21 *************** *** 336,340 **** case 'manageCampaigns': ! $title = sprintf(dgettext('ads', 'Manage Campaigns: %s'), $advertiser->getUsername()); $content = Ads_Admin::listCampaigns($_GET['advertiser_id']); break; --- 336,340 ---- case 'manageCampaigns': ! $title = sprintf(dgettext('ads', 'Manage Campaigns: %s'), $advertiser->getDisplayName()); $content = Ads_Admin::listCampaigns($_GET['advertiser_id']); break; *************** *** 680,683 **** --- 680,684 ---- $pager->setDefaultOrder('title', 'asc'); $pager->setEmptyMessage(dgettext('ads', 'No zones found.')); + $pager->cacheQueries(); return $pager->get(); *************** *** 729,733 **** $form->addText('username'); $form->setLabel('username', dgettext('ads', 'Username')); ! $form->setSize('username', 30, 30); $form->addText('business'); --- 730,734 ---- $form->addText('username'); $form->setLabel('username', dgettext('ads', 'Username')); ! $form->setSize('username', 30, 255); $form->addText('business'); *************** *** 762,766 **** { $advertiser->setUserId($result[0]); - $advertiser->setUsername($_POST['username']); $advertiser->setBusiness($_POST['business']); $advertiser->setCreated(mktime()); --- 763,766 ---- *************** *** 777,781 **** PHPWS_Core::initCoreClass('DBPager.php'); ! $pageTags['USERNAME'] = dgettext('ads', 'Username'); $pageTags['BUSINESS'] = dgettext('ads', 'Business Name'); $pageTags['CREATED'] = dgettext('ads', 'Advertising Since'); --- 777,781 ---- PHPWS_Core::initCoreClass('DBPager.php'); ! $pageTags['DISPLAY_NAME'] = dgettext('ads', 'Username'); $pageTags['BUSINESS'] = dgettext('ads', 'Business Name'); $pageTags['CREATED'] = dgettext('ads', 'Advertising Since'); *************** *** 787,793 **** $pager->addPageTags($pageTags); $pager->addRowTags('getTpl'); ! $pager->setSearch('username', 'business'); $pager->setDefaultOrder('business', 'asc'); $pager->setEmptyMessage(dgettext('ads', 'No advertisers found.')); return $pager->get(); --- 787,795 ---- $pager->addPageTags($pageTags); $pager->addRowTags('getTpl'); ! $pager->setSearch('business'); $pager->setDefaultOrder('business', 'asc'); $pager->setEmptyMessage(dgettext('ads', 'No advertisers found.')); + $pager->joinResult('user_id', 'users', 'id', 'display_name', 'display_name'); + $pager->cacheQueries(); return $pager->get(); *************** *** 877,880 **** --- 879,883 ---- $pager->addWhere('advertiser_id', $advertiser_id); $pager->setEmptyMessage(dgettext('ads', 'No campaigns found.')); + $pager->cacheQueries(); return $pager->get(); *************** *** 1075,1078 **** --- 1078,1082 ---- $pager->addWhere('campaign_id', $campaign_id); $pager->setEmptyMessage(dgettext('ads', 'No ads found.')); + $pager->cacheQueries(); return $pager->get(); Index: advertiser.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/ads/class/advertiser.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** advertiser.php 22 Jun 2008 15:55:07 -0000 1.8 --- advertiser.php 22 Jun 2008 20:04:19 -0000 1.9 *************** *** 25,33 **** class Ads_Advertiser { ! var $id = 0; ! var $user_id = 0; ! var $username = NULL; ! var $business = NULL; ! var $created = 0; --- 25,35 ---- class Ads_Advertiser { ! var $id = 0; ! var $user_id = 0; ! var $business = NULL; ! var $created = 0; ! ! /* Joined variables. */ ! var $display_name = NULL; *************** *** 63,76 **** } - function setUsername($username) - { - $this->username = $username; - } - - function getUsername() - { - return $this->username; - } - function setBusiness($business) { --- 65,68 ---- *************** *** 93,96 **** --- 85,101 ---- } + function getDisplayName() + { + if (empty($this->display_name)) + { + $db = new PHPWS_DB('users'); + $db->addWhere('users.id', $this->user_id); + $db->addColumn('username'); + $this->display_name = $db->select('one'); + } + + return $this->display_name; + } + function save() { *************** *** 161,165 **** $template['ACTION'] = implode(' | ', $links); ! $template['USERNAME'] = $this->getUsername(); $template['BUSINESS'] = $this->getBusiness(); $template['CREATED'] = $this->getCreated(); --- 166,170 ---- $template['ACTION'] = implode(' | ', $links); ! $template['DISPLAY_NAME'] = $this->getDisplayName(); $template['BUSINESS'] = $this->getBusiness(); $template['CREATED'] = $this->getCreated(); Index: ad.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/ads/class/ad.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ad.php 22 Jun 2008 15:55:07 -0000 1.14 --- ad.php 22 Jun 2008 20:04:19 -0000 1.15 *************** *** 259,263 **** $db->addWhere('ads_campaigns.id', $this->campaign_id); $db->addWhere('ads_advertisers.id', 'ads_campaigns.advertiser_id'); ! $db->addColumn('ads_advertisers.username'); $result = $db->select('col'); if (($result[0] != Current_User::getUsername()) && !Current_User::authorized('ads')) --- 259,264 ---- $db->addWhere('ads_campaigns.id', $this->campaign_id); $db->addWhere('ads_advertisers.id', 'ads_campaigns.advertiser_id'); ! $db->addWhere('users.id', 'ads_advertisers.user_id'); ! $db->addColumn('users.username'); $result = $db->select('col'); if (($result[0] != Current_User::getUsername()) && !Current_User::authorized('ads')) *************** *** 313,317 **** $db->addWhere('ads_campaigns.id', $this->campaign_id); $db->addWhere('ads_advertisers.id', 'ads_campaigns.advertiser_id'); ! $db->addColumn('ads_advertisers.username'); $result = $db->select('col'); if (($result[0] != Current_User::getUsername()) && !Current_User::authorized('ads')) --- 314,319 ---- $db->addWhere('ads_campaigns.id', $this->campaign_id); $db->addWhere('ads_advertisers.id', 'ads_campaigns.advertiser_id'); ! $db->addWhere('users.id', 'ads_advertisers.user_id'); ! $db->addColumn('users.username'); $result = $db->select('col'); if (($result[0] != Current_User::getUsername()) && !Current_User::authorized('ads')) |