Changeset 275

Timestamp:

08/01/08 18:11:54 (4 months ago)

Author:

Seldaek

Message:

fixes #45

Files:

• trunk/Phergie/Plugin/Abstract/Base.php (modified) (1 diff)
• trunk/Phergie/Plugin/Abstract/Cron.php (modified) (2 diffs)
• trunk/Phergie/Plugin/FeedTicker.php (modified) (2 diffs)
• trunk/Phergie/Plugin/Php.php (modified) (2 diffs)
• trunk/Phergie/Plugin/UrbanDictionary.php (modified) (3 diffs)
• trunk/Phergie/Plugin/Url.php (modified) (2 diffs)

trunk/Phergie/Plugin/Abstract/Base.php

@@ -211 +211 @@
-    {
-        $this->client->debug('<' . strtolower($this->name) . '> ' . $message, $displayDebug);
-    }
-
-    /**
-     * Returns a TinyURL version of a given URL.
-     *
-     * @param string $url URL to convert
-     * @return string
-     */
-    public function tinyUrl($url)
-    {
-        $tiny = $url;
-        if (strlen($url) > 30) {
-            $opts = array(
-                'http' => array(
-                    'timeout' => 4,
-                    'method' => 'POST',
-                    'header' => 'Content-type: application/x-www-form-urlencoded',
-                    'content' => http_build_query(array(
-                        'url' => $url
-                    ))
-                )
-            );
-            $context = stream_context_create($opts);
-            $tiny = @file_get_contents('http://tinyurl.com/api-create.php', false, $context);
-            if (empty($tiny)) {
-                $tiny = $url;
-            }
-        }
-
-        return $tiny;
-    }
-

trunk/Phergie/Plugin/Abstract/Cron.php

@@ -8 +8 @@
- * delayed.
- */
-Base
+Command
-{
-    /**
@@ -54 +54 @@
-        if (time() > $this->nextCall) {
-            $this->run();
-
+ 
-        }
-    }

trunk/Phergie/Plugin/FeedTicker.php

@@ -153 +153 @@
-    public static function checkDependencies(Phergie_Driver_Abstract $client, array $plugins)
-    {
+        $errors = array();
+
-        if (!extension_loaded('SimpleXML')) {
-return
+$errors[] =
-        }
-
-
+
+
+
+
+
-    }
-
@@ -278 +283 @@
-                    $article[0] = $this->decode($article[0], 40);
-                    // Convert link with TinyURL if required
-$this->tinyUrl
+Phergie_Plugin_TinyUrl::get
-                    // Decode and trim feed title
-                    $article[3] = $this->decode($article[3], 20);

trunk/Phergie/Plugin/Php.php

@@ -24 +24 @@
-     */
-    protected $errorStatus = false;
+
+    /**
+     * Returns whether or not the plugin's dependencies are met.
+     *
+     * @param Phergie_Driver_Abstract $client Client instance
+     * @param array $plugins List of short names for plugins that the
+     *                       bootstrap file intends to instantiate
+     * @see Phergie_Plugin_Abstract_Base::checkDependencies()
+     * @return bool TRUE if dependencies are met, FALSE otherwise
+     */
+    public static function checkDependencies(Phergie_Driver_Abstract $client, array $plugins)
+    {
+        if (self::staticPluginLoaded('TinyUrl', $client, $plugins)) {
+            return 'TinyUrl plugin must be enabled';
+        }
+
+        return true;
+    }
-
-    /**
@@ -63 +81 @@
-            $tmp = file_get_contents('http://php.net/manual/en/function.' . $name . '.php');
-            if (!$this->errorStatus && strpos($tmp, '<p class="refpurpose dc-title">') !== false) {
-$this->tinyUrl
+Phergie_Plugin_TinyUrl::get
-               if (preg_match('/<div class="methodsynopsis dc-description">(.*?)<\/div>/mis', $tmp, $m)) {
-                  $contents .= $this->decode($m[1]);

trunk/Phergie/Plugin/UrbanDictionary.php

@@ -7 +7 @@
-class Phergie_Plugin_UrbanDictionary extends Phergie_Plugin_Abstract_Command
-{
+    /**
+     * Returns whether or not the plugin's dependencies are met.
+     *
+     * @param Phergie_Driver_Abstract $client Client instance
+     * @param array $plugins List of short names for plugins that the
+     *                       bootstrap file intends to instantiate
+     * @see Phergie_Plugin_Abstract_Base::checkDependencies()
+     * @return bool TRUE if dependencies are met, FALSE otherwise
+     */
+    public static function checkDependencies(Phergie_Driver_Abstract $client, array $plugins)
+    {
+        if (self::staticPluginLoaded('TinyUrl', $client, $plugins)) {
+            return 'TinyUrl plugin must be enabled';
+        }
+
+        return true;
+    }
+
-    /**
-     * Handles Urban Dictionary definition requests.
@@ -22 +40 @@
-
-        if (strpos($contents, '<i>' . $term . '</i> isn\'t defined') !== false) {
-$this->tinyUrl
+Phergie_Plugin_TinyUrl::get
-            $this->doNotice($target, $term . ' is not defined yet [ ' . $url . ' ]');
-        } else {
@@ -34 +52 @@
-            $contents = $term . ': ' . trim(preg_replace('/[\r\n\t ]+/', ' ', $contents));
-
-$this->tinyUrl
+Phergie_Plugin_TinyUrl::get
-
-            /**

trunk/Phergie/Plugin/Url.php

@@ -126 +126 @@
-
-    /**
+     * Returns whether or not the plugin's dependencies are met.
+     *
+     * @param Phergie_Driver_Abstract $client Client instance
+     * @param array $plugins List of short names for plugins that the
+     *                       bootstrap file intends to instantiate
+     * @see Phergie_Plugin_Abstract_Base::checkDependencies()
+     * @return bool TRUE if dependencies are met, FALSE otherwise
+     */
+    public static function checkDependencies(Phergie_Driver_Abstract $client, array $plugins)
+    {
+        if (self::staticPluginLoaded('TinyUrl', $client, $plugins)) {
+            return 'TinyUrl plugin must be enabled';
+        }
+
+        return true;
+    }
+
+    /**
-     * Obtains configuration settings
-     *
@@ -232 +250 @@
-
-                // Convert url
-$this->tinyUrl
+Phergie_Plugin_TinyUrl::get
-
-                // Prevent spamfest