Proxy support added to Wernis RSS feed
authorRoland Häder <roland@mxchange.org>
Fri, 12 Sep 2008 12:19:18 +0000 (12:19 +0000)
committerRoland Häder <roland@mxchange.org>
Fri, 12 Sep 2008 12:19:18 +0000 (12:19 +0000)
.gitattributes
inc/modules/guest/what-my_weblog.php [deleted file]
inc/modules/guest/what-wernis_portal.php
inc/rdf.class.php
templates/de/html/admin/admin_config_wernis.tpl

index c58bab2..ee112d0 100644 (file)
@@ -403,7 +403,6 @@ inc/modules/guest/what-impressum.php -text
 inc/modules/guest/what-infos.php -text
 inc/modules/guest/what-login.php -text
 inc/modules/guest/what-mediadata.php -text
-inc/modules/guest/what-my_weblog.php -text
 inc/modules/guest/what-rallyes.php -text
 inc/modules/guest/what-register.php -text
 inc/modules/guest/what-sponsor_agb.php -text
diff --git a/inc/modules/guest/what-my_weblog.php b/inc/modules/guest/what-my_weblog.php
deleted file mode 100644 (file)
index b4c6f50..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/************************************************************************
- * MXChange v0.2.1                                    Start: 10/19/2003 *
- * ================                             Last change: 10/19/2003 *
- *                                                                      *
- * -------------------------------------------------------------------- *
- * File              : what-                                            *
- * -------------------------------------------------------------------- *
- * Short description :                                                  *
- * -------------------------------------------------------------------- *
- * Kurzbeschreibung  :                                                  *
- * -------------------------------------------------------------------- *
- *                                                                      *
- * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
- * For more information visit: http://www.mxchange.org                  *
- *                                                                      *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 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 General Public License for more details.                         *
- *                                                                      *
- * You should have received a copy of the GNU General Public License    *
- * along with this program; if not, write to the Free Software          *
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
- * MA  02110-1301  USA                                                  *
- ************************************************************************/
-
-// Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-       require($INC);
-}
-
-// Special file
-require_once (PATH."inc/rdf.class.php");
-
-// Add description as navigation point
-ADD_DESCR("guest", basename(__FILE__));
-
-OUTPUT_HTML("<DIV style=\"padding-left: 10px; padding-right: 10px\">");
-$rdf = new fase4_rdf;
-$rdf->use_dynamic_display(false);
-$rdf->set_CacheDir(PATH."cache/");
-$rdf->set_salt(SITE_KEY);
-$rdf->set_Options(
-       array(
-               "textinput" => "hidden",
-               "sitelink"  => "http://blog.mxchange.org"
-       )
-);
-$rdf->set_max_item(10);
-$rdf->parse_RDF("http://blog.mxchange.org/feed/");
-$rdf->finish();
-$rdf->clear_cache();
-OUTPUT_HTML("</DIV>");
-
-//
-?>
index 7a5df08..c48232b 100644 (file)
@@ -47,8 +47,9 @@ ADD_DESCR("guest", basename(__FILE__));
 OUTPUT_HTML("<DIV style=\"padding-left: 10px; padding-right: 10px\">");
 $rdf = new fase4_rdf;
 $rdf->use_dynamic_display(false);
-$rdf->set_CacheDir(PATH."cache/");
+$rdf->set_CacheDir(PATH."inc/cache/");
 $rdf->set_salt(SITE_KEY);
+$rdf->set_max_item(10);
 $rdf->set_Options(
        array(
                "textinput" => "hidden",
@@ -57,10 +58,22 @@ $rdf->set_Options(
                "reflink"   => "/ref.php?refid=",
        )
 );
-$rdf->set_max_item(10);
+
+// Use proxy?
+if ((!empty($_CONFIG['proxy_host'])) && (!empty($_CONFIG['proxy_port']))) {
+       // Set proxy data
+       $rdf->set_proxy($_CONFIG['proxy_host'], $_CONFIG['proxy_port']);
+
+       // Use auth?
+       if (!empty($_CONFIG['proxy_username'])) {
+               // Set auth data
+               $rdf->set_proxy_auth($_CONFIG['proxy_username'], $_CONFIG['proxy_password']);
+       } // END  - if
+} // END - if
+
 $rdf->parse_RDF("http://www.wds66.com/rss.xml");
 $rdf->finish();
-$rdf->clear_cache();
+// DISABLED: $rdf->clear_cache();
 OUTPUT_HTML("</DIV>");
 
 //
index f0efb0c..350976f 100644 (file)
@@ -447,16 +447,16 @@ class fase4_rdf {
     * This Method avtually parses the XML data.
     *
     * @access    private
-       * @author    Stefan Saasen <s@fase4.com>
+    * @author    Stefan Saasen <s@fase4.com>
     * @param     string $data    RDF File XML Data
-       * @see           _clear_Items()
+    * @see       _clear_Items()
     */
     function _parse_xRDF( $data )
     {
         $this->_clear_Items();
         $xml_parser = xml_parser_create();
         xml_set_object($xml_parser,$this);
-               xml_parser_set_option($xml_parser,XML_OPTION_CASE_FOLDING,0);
+        xml_parser_set_option($xml_parser,XML_OPTION_CASE_FOLDING,0);
         xml_set_element_handler($xml_parser, "_startElement", "_endElement");
         xml_set_character_data_handler($xml_parser, "_parseData");
         if (!xml_parse($xml_parser, trim($data))) {
@@ -619,16 +619,16 @@ class fase4_rdf {
             $this->_parse_mode = "all";
         }
 
-        if( !isset( $this->_depth[$parser] ) ) {
-            $this->_depth[$parser] = 0;
+        if( !isset( $this->_depth[$this->get_parser_id($parser)] ) ) {
+            $this->_depth[$this->get_parser_id($parser)] = 0;
         }
-        $this->_depth[$parser]++;
+        $this->_depth[$this->get_parser_id($parser)]++;
         array_push($this->_tags, $name);
 
-        if( !isset( $this->_cdepth[$parser] ) ) {
-            $this->_cdepth[$parser] = 0;
+        if( !isset( $this->_cdepth[$this->get_parser_id($parser)] ) ) {
+            $this->_cdepth[$this->get_parser_id($parser)] = 0;
         }
-        $this->_cdepth[$parser]++;
+        $this->_cdepth[$this->get_parser_id($parser)]++;
         array_push($this->_ctags, $name);
     }   // END _startElement()
 
@@ -686,9 +686,9 @@ class fase4_rdf {
     */
     function _endElement($parser, $name) {
         array_pop($this->_tags);
-        $this->_depth[$parser]--;
+        $this->_depth[$this->get_parser_id($parser)]--;
         array_pop($this->_ctags);
-        $this->_cdepth[$parser]--;
+        $this->_cdepth[$this->get_parser_id($parser)]--;
         $this->_item["link"] = trim($this->_item["link"]);
           if ((!empty($this->_display_opt["refid"])) && (!empty($this->_item["link"])))
           {
@@ -850,6 +850,27 @@ class fase4_rdf {
         return $this->_array_textinput;
     }
 
+       /**
+       * Getter for parser id from resource
+       *
+       * @access private
+       * @author       Roland Haeder <webmaster@mxchange.org>
+       * @return       int
+       */
+       function get_parser_id ($parser) {
+               // Default is zero
+               $id = 0;
+
+               // Is it a resource?
+               if (is_resource($parser)) {
+                       // Cast the resource into id
+                       $id = (int) $parser;
+               } // END - if
+
+               // Return the id
+               return $id;
+       }
+
     /**
     * This Method returns the data from <image />.
     *
@@ -890,17 +911,17 @@ class fase4_rdf {
         if ($clean) {
             $text = preg_replace("/^\s+/", "", $text)."\n";
                 if($this->_parse_mode == "all") {
-                        if ( isset($this->_item[$this->_tags[$this->_depth[$parser]]]) &&
-                            $this->_item[$this->_tags[$this->_depth[$parser]]] ) {
-                           $this->_item[$this->_tags[$this->_depth[$parser]]] .= $text;
+                        if ( isset($this->_item[$this->_tags[$this->_depth[$this->get_parser_id($parser)]]]) &&
+                            $this->_item[$this->_tags[$this->_depth[$this->get_parser_id($parser)]]] ) {
+                           $this->_item[$this->_tags[$this->_depth[$this->get_parser_id($parser)]]] .= $text;
                         } else {
-                           $this->_item[$this->_tags[$this->_depth[$parser]]] = $text;
+                           $this->_item[$this->_tags[$this->_depth[$this->get_parser_id($parser)]]] = $text;
                         }
                 } elseif (isset($this->_parse_mode) && $this->_parse_mode == "channel") {
-                        if ( isset($this->_citem[$this->_ctags[$this->_cdepth[$parser]]]) ) {
-                           $this->_citem[$this->_ctags[$this->_cdepth[$parser]]] .= $text;
+                        if ( isset($this->_citem[$this->_ctags[$this->_cdepth[$this->get_parser_id($parser)]]]) ) {
+                           $this->_citem[$this->_ctags[$this->_cdepth[$this->get_parser_id($parser)]]] .= $text;
                         } else {
-                           $this->_citem[$this->_ctags[$this->_cdepth[$parser]]] = $text;
+                           $this->_citem[$this->_ctags[$this->_cdepth[$this->get_parser_id($parser)]]] = $text;
                         }
                 }
         }
@@ -1140,7 +1161,8 @@ class fase4_rdf {
     {
         $dir = dir($this->_cache_dir);
         while($file=$dir->read()) {
-            if($file!="." && $file!="..")  {
+            // Exclude directories
+            if (is_file($dir->path.$file) && substr($file, -6, 6) != ".cache")  {
                 if(!@unlink($dir->path.$file)) {
                     $this->_throw_exception(
                     "Unable to unlink ".$dir->path.$file
index 6c875cb..9f45d20 100644 (file)
@@ -41,8 +41,8 @@
                <TD width="300" align="right">{--WERNIS_ADMIN_REFID--}:</TD>
                <TD class="seperator" width="10">&nbsp;</TD>
                <TD width="270"><INPUT type="text" name="wernis_refid"
-                       class="admin_normal" value="$content[refid]" size="25"
-                       maxlength="255" /></TD>
+                       class="admin_normal" value="$content[refid]" size="5"
+                       maxlength="20" /></TD>
        </TR>
        <TR>
                <TD colspan="3" class="bottom2 seperator" height="5">&nbsp;</TD>