Merge branch 'testing' into 0.9.x

This commit is contained in:
Evan Prodromou 2010-08-03 15:57:05 -07:00
commit f9a4728fcc
2 changed files with 271 additions and 0 deletions

View File

@ -83,6 +83,21 @@ class AdsensePlugin extends UAPPlugin
public $adScript = 'http://pagead2.googlesyndication.com/pagead/show_ads.js'; public $adScript = 'http://pagead2.googlesyndication.com/pagead/show_ads.js';
public $client = null; public $client = null;
function initialize()
{
parent::initialize();
// A little bit of chicanery so we avoid overwriting values that
// are passed in with the constructor
foreach (array('mediumRectangle', 'rectangle', 'leaderboard', 'wideSkyscraper', 'adScript', 'client') as $setting) {
$value = common_config('adsense', strtolower($setting));
if (!empty($value)) { // not found
$this->$setting = $value;
}
}
}
/** /**
* Show a medium rectangle 'ad' * Show a medium rectangle 'ad'
* *
@ -157,4 +172,37 @@ class AdsensePlugin extends UAPPlugin
$action->script($this->adScript); $action->script($this->adScript);
} }
function onRouterInitialized($m)
{
$m->connect('admin/adsense',
array('action' => 'adsenseadminpanel'));
return true;
}
function onAutoload($cls)
{
$dir = dirname(__FILE__);
switch ($cls)
{
case 'AdsenseadminpanelAction':
require_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
return false;
default:
return true;
}
}
function onEndAdminPanelNav($menu) {
if (AdminPanelAction::canAdmin('adsense')) {
// TRANS: Menu item title/tooltip
$menu_title = _('Adsense configuration');
// TRANS: Menu item for site administration
$menu->out->menuItem(common_local_url('adsenseadminpanel'), _('Adsense'),
$menu_title, $action_name == 'adsenseadminpanel', 'nav_adsense_admin_panel');
}
return true;
}
} }

View File

@ -0,0 +1,223 @@
<?php
/**
* StatusNet, the distributed open-source microblogging tool
*
* Adsense administration panel
*
* PHP version 5
*
* LICENCE: This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 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 Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @category Adsense
* @package StatusNet
* @author Evan Prodromou <evan@status.net>
* @copyright 2010 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
if (!defined('STATUSNET')) {
exit(1);
}
/**
* Administer adsense settings
*
* @category Adsense
* @package StatusNet
* @author Evan Prodromou <evan@status.net>
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
class AdsenseadminpanelAction extends AdminPanelAction
{
/**
* Returns the page title
*
* @return string page title
*/
function title()
{
return _('Adsense');
}
/**
* Instructions for using this form.
*
* @return string instructions
*/
function getInstructions()
{
return _('Adsense settings for this StatusNet site');
}
/**
* Show the site admin panel form
*
* @return void
*/
function showForm()
{
$form = new AdsenseAdminPanelForm($this);
$form->show();
return;
}
/**
* Save settings from the form
*
* @return void
*/
function saveSettings()
{
static $settings = array('adsense' => array('adScript', 'client', 'mediumRectangle', 'rectangle', 'leaderboard', 'wideSkyscraper'));
$values = array();
foreach ($settings as $section => $parts) {
foreach ($parts as $setting) {
$values[$section][$setting] = $this->trimmed($setting);
}
}
// This throws an exception on validation errors
$this->validate($values);
// assert(all values are valid);
$config = new Config();
$config->query('BEGIN');
foreach ($settings as $section => $parts) {
foreach ($parts as $setting) {
Config::save($section, $setting, $values[$section][$setting]);
}
}
$config->query('COMMIT');
return;
}
function validate(&$values)
{
}
}
/**
* Form for the adsense admin panel
*/
class AdsenseAdminPanelForm extends AdminForm
{
/**
* ID of the form
*
* @return int ID of the form
*/
function id()
{
return 'form_adsense_admin_panel';
}
/**
* class of the form
*
* @return string class of the form
*/
function formClass()
{
return 'form_adsense';
}
/**
* Action of the form
*
* @return string URL of the action
*/
function action()
{
return common_local_url('adsenseadminpanel');
}
/**
* Data elements of the form
*
* @return void
*/
function formData()
{
$this->out->elementStart('fieldset', array('id' => 'adsense_admin'));
$this->out->elementStart('ul', 'form_data');
$this->li();
$this->input('client',
_('Client ID'),
_('Google client ID'),
'adsense');
$this->unli();
$this->li();
$this->input('adScript',
_('Ad Script URL'),
_('Script URL (advanced)'),
'adsense');
$this->unli();
$this->li();
$this->input('mediumRectangle',
_('Medium rectangle'),
_('Medium rectangle slot code'),
'adsense');
$this->unli();
$this->li();
$this->input('rectangle',
_('Rectangle'),
_('Rectangle slot code'),
'adsense');
$this->unli();
$this->li();
$this->input('leaderboard',
_('Leaderboard'),
_('Leaderboard slot code'),
'adsense');
$this->unli();
$this->li();
$this->input('wideSkyscraper',
_('Skyscraper'),
_('Wide skyscraper slot code'),
'adsense');
$this->unli();
$this->out->elementEnd('ul');
}
/**
* Action elements
*
* @return void
*/
function formActions()
{
$this->out->submit('submit', _('Save'), 'submit', null, _('Save AdSense settings'));
}
}