Changeset 181

Timestamp:

06/18/08 20:00:00 (3 months ago)

Author:

llaumgui

Message:

 

Location:

ez_publish/myutils/trunk

Files:

• autoloads/ezp_extension.php (added)
• classes/myutilsfunction.php (modified) (4 diffs)
• cronjobs/_planet.php (deleted)
• cronjobs/planet.php (modified) (12 diffs)
• settings/curl.ini.append.php (added)

ez_publish/myutils/trunk/classes/myutilsfunction.php

@@ -35 +35 @@
          * Permet de nettoyer une string avec tidy
          *
-         * @param unknown_type $str
+         * @param string $str
          */
         static function cleanTidy( &$str ) {
@@ -42 +42 @@
                 {
                         $tidy           = new tidy;
-                        /* Mettre dans un ini */
+                        /* Mettre dans un ini pour faire plus propre */
                         $config   = array(      'show-body-only'     => true,
                                                                 'output-xhtml'       => true,
@@ -57 +57 @@
 
         /**
-         * Enter description here...
+         * Recopie de la fonction eZHTTPTool::getDataByURL mais avec des options cURL en plus...
          *
          * @param unknown_type $url
@@ -71 +71 @@
                         
                         /* Ajout d'un timeout sur cURL*/
-                        /* Mettre dans un ini */
-                        curl_setopt( $ch, CURLOPT_TIMEOUT, 15 );
+                        $iniCurl                = eZINI::instance( "curl.ini" );
+                        curl_setopt( $ch, CURLOPT_LOW_SPEED_TIME,  $iniCurl->variable( 'cURLOption', 'CURLOPT_LOW_SPEED_TIME' ) );
+                        curl_setopt( $ch, CURLOPT_TIMEOUT,  $iniCurl->variable( 'cURLOption', 'CURLOPT_TIMEOUT' ) );
+                        
+                        
                         if ( $justCheckURL )
                         {

ez_publish/myutils/trunk/cronjobs/planet.php

@@ -37 +37 @@
 //include_once( "lib/ezdb/classes/ezdb.php" );
 //include_once( "lib/ezutils/classes/ezhttptool.php" );
-
-//For ezUser, we would make this the ezUser class id but otherwise just pick and choose.
+//include_once( "extension/myutils/classes/myutilsfunction.php" );
+
+
 
 $iniPlanet              = eZINI::instance( "planet.ini" );
@@ -45 +46 @@
 $rssImportArray = $rssImportArray->children ();
 
-/*$rssImportArray->subTree(     array(  'Depth' => 1,
-                                                                        'SortBy => array( 'priority', true() )
-                                                                );*/
-
 
 // Loop through all configured and active rss imports. If something goes wrong while processing them, continue to next import
@@ -57 +54 @@
         $rssImportDataMap               = $rssImport->dataMap();
     $rssSource                          = $rssImportDataMap['location_rss']->content();
+    
     if( empty($rssSource))
     {
@@ -70 +68 @@
             }
         
-            $xmlData = eZHTTPTool::getDataByURL( $rssSource );
+            $xmlData = myUtilsFunctions::getDataByURL( $rssSource );
             if ( $xmlData === false )
             {
@@ -140 +138 @@
 eZStaticCache::executeActions();
 
-/*!
-  Parse RSS 1.0 feed
-
-  \param DOM root node
-  \param RSS Import item
-  \param cli
-*/
+
+
+/**
+ * Parse RSS 1.0 feed
+ * @param DOM root node
+ * @param RSS Import item
+ * @param cli
+ */
 function rssImport1( $root, $rssImport, $cli )
 {
@@ -167 +166 @@
         $cli->output( 'RSSImport '.$rssImport->attribute( 'name' ).': End. '.$addCount.' objects added' );
     }
-
-}
-
-/*!
-  Parse RSS 2.0 feed
-
-  \param DOM root node
-  \param RSS Import item
-  \param cli
-*/
+}
+
+
+
+/**
+ * Parse RSS 2.0 feed
+ * @param DOM root node
+ * @param RSS Import item
+ * @param cli
+ */
 function rssImport2( $root, $rssImport, $cli )
 {
@@ -196 +195 @@
         $cli->output( 'RSSImport '.$rssImport->attribute( 'name' ).': End. '.$addCount.' objects added' );
     }
-
-}
-
-/*!
- Import specifiec rss item into content tree
-
- \param RSS item xml element
- \param $rssImport Object
- \param cli
- \param channel
-
- \return 1 if object added, 0 if not
-*/
+}
+
+
+
+/**
+ * Import specifiec rss item into content tree
+ * @param RSS item xml element
+ * @param $rssImport Object
+ * @param cli
+ * @param channel
+ * @return 1 if object added, 0 if not
+ */
 function importRSSItem( $item, $rssImport, $cli, $channel )
 {
@@ -424 +422 @@
 }
 
+
+/**
+ * 
+ *
+ * @param array $importDescriptionArray
+ * @param DOM $xmlDomNode
+ * @return unknown
+ */
 function recursiveFindRSSElementValue( $importDescriptionArray, $xmlDomNode )
 {
@@ -459 +465 @@
 }
 
+
+
+/**
+ * Enter description here...
+ *
+ * @param unknown_type $objectAttribute
+ * @param unknown_type $value
+ */
 function setObjectAttributeValue( $objectAttribute, $value )
 {
@@ -501 +515 @@
 }
 
+
+
+/**
+ * Enter description here...
+ *
+ * @param unknown_type $attribute
+ * @param unknown_type $attributeValue
+ * @param unknown_type $link
+ */
 function setEZXMLAttribute( $attribute, $attributeValue, $link = false )
 {
@@ -525 +548 @@
 
 
+
+/**
+ * Enter description here...
+ *
+ * @param unknown_type $attribute
+ * @param unknown_type $attributeValue
+ * @param unknown_type $link
+ */
 function setEZTXTAttribute( $attribute, $attributeValue, $link = false )
 {
-        /* Nettoyage tidy */
-        if ( class_exists( 'tidy' ) )
-        {
-                $tidy           = new tidy;
-                $config   = array(      'show-body-only'     => true,
-                                                        'output-xhtml'       => true,
-                                                        'wrap'               => 0,
-                                                        'alt-text'           => ""
-                               );
-                $tidy->parseString( $attributeValue, $config, 'utf8' );
-                $tidy->cleanRepair();
-                $attributeValue = $tidy;
-        }
+        myUtilsFunctions::cleanTidy( $attributeValue );
         
         /* Liens relatifs dans un flux RSS ! */
@@ -549 +568 @@
 }
 
-
 ?>