Merge remote branch 'gitorious/0.9.x' into 0.9.x

diff --git a/plugins/OpenX/OpenXPlugin.php b/plugins/OpenX/OpenXPlugin.php
index 59485f25d840f41c54c80aacdfb5d5b17bb7dbad..3206e4c71148b9f6b19a898ec12c804afae4d340 100644 (file)
--- a/plugins/OpenX/OpenXPlugin.php
+++ b/plugins/OpenX/OpenXPlugin.php
@@ -80,6 +80,22 @@ class OpenXPlugin extends UAPPlugin
 {
     public $adScript = 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') as $setting) {
+            $value = common_config('openx', $setting);
+            if (!empty($value)) { // not found
+                $this->$setting = $value;
+            }
+        }
+
+        return true;
+    }
+
     /**
      * Show a medium rectangle 'ad'
      *
@@ -162,4 +178,37 @@ ENDOFSCRIPT;
         $action->inlineScript(sprintf($scr, $this->adScript, $zone));
         return true;
     }
-}
\ No newline at end of file
+
+    function onRouterInitialized($m)
+    {
+        $m->connect('admin/openx',
+                    array('action' => 'openxadminpanel'));
+
+        return true;
+    }
+
+    function onAutoload($cls)
+    {
+        $dir = dirname(__FILE__);
+
+        switch ($cls)
+        {
+        case 'OpenxadminpanelAction':
+            require_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
+            return false;
+        default:
+            return true;
+        }
+    }
+
+    function onEndAdminPanelNav($menu) {
+        if (AdminPanelAction::canAdmin('openx')) {
+            // TRANS: Menu item title/tooltip
+            $menu_title = _m('OpenX configuration');
+            // TRANS: Menu item for site administration
+            $menu->out->menuItem(common_local_url('openxadminpanel'), _m('OpenX'),
+                                 $menu_title, $action_name == 'openxadminpanel', 'nav_openx_admin_panel');
+        }
+        return true;
+    }
+}

diff --git a/plugins/OpenX/openxadminpanel.php b/plugins/OpenX/openxadminpanel.php
new file mode 100644 (file)
index 0000000..a6c6c81
--- /dev/null
+++ b/plugins/OpenX/openxadminpanel.php
@@ -0,0 +1,204 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * OpenX 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  OpenX
+ * @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 openx settings
+ *
+ * @category OpenX
+ * @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 OpenXadminpanelAction extends AdminPanelAction
+{
+    /**
+     * Returns the page title
+     *
+     * @return string page title
+     */
+    function title()
+    {
+        return _m('TITLE', 'OpenX');
+    }
+
+    /**
+     * Instructions for using this form.
+     *
+     * @return string instructions
+     */
+    function getInstructions()
+    {
+        return _m('OpenX settings for this StatusNet site');
+    }
+
+    /**
+     * Show the site admin panel form
+     *
+     * @return void
+     */
+    function showForm()
+    {
+        $form = new OpenXAdminPanelForm($this);
+        $form->show();
+        return;
+    }
+
+    /**
+     * Save settings from the form
+     *
+     * @return void
+     */
+    function saveSettings()
+    {
+        static $settings = array('openx' => array('adScript', '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 openx admin panel
+ */
+class OpenXAdminPanelForm extends AdminForm
+{
+    /**
+     * ID of the form
+     *
+     * @return int ID of the form
+     */
+    function id()
+    {
+        return 'form_openx_admin_panel';
+    }
+
+    /**
+     * class of the form
+     *
+     * @return string class of the form
+     */
+    function formClass()
+    {
+        return 'form_openx';
+    }
+
+    /**
+     * Action of the form
+     *
+     * @return string URL of the action
+     */
+    function action()
+    {
+        return common_local_url('openxadminpanel');
+    }
+
+    /**
+     * Data elements of the form
+     *
+     * @return void
+     */
+    function formData()
+    {
+        $this->out->elementStart('fieldset', array('id' => 'openx_admin'));
+        $this->out->elementStart('ul', 'form_data');
+        $this->li();
+        $this->input('adScript',
+                     _m('Ad script URL'),
+                     _m('Script URL'),
+                     'openx');
+        $this->unli();
+        $this->li();
+        $this->input('mediumRectangle',
+                     _m('Medium rectangle'),
+                     _m('Medium rectangle zone'),
+                     'openx');
+        $this->unli();
+        $this->li();
+        $this->input('rectangle',
+                     _m('Rectangle'),
+                     _m('Rectangle zone'),
+                     'openx');
+        $this->unli();
+        $this->li();
+        $this->input('leaderboard',
+                     _m('Leaderboard'),
+                     _m('Leaderboard zone'),
+                     'openx');
+        $this->unli();
+        $this->li();
+        $this->input('wideSkyscraper',
+                     _m('Skyscraper'),
+                     _m('Wide skyscraper zone'),
+                     'openx');
+        $this->unli();
+        $this->out->elementEnd('ul');
+    }
+
+    /**
+     * Action elements
+     *
+     * @return void
+     */
+    function formActions()
+    {
+        $this->out->submit('submit', _m('Save'), 'submit', null, _m('Save OpenX settings'));
+    }
+}