diff --git a/doc/html/classRedmatrix_1_1Import_1_1Import-members.html b/doc/html/classRedmatrix_1_1Import_1_1Import-members.html index 061fc11a4..2be66a2ea 100644 --- a/doc/html/classRedmatrix_1_1Import_1_1Import-members.html +++ b/doc/html/classRedmatrix_1_1Import_1_1Import-members.html @@ -87,7 +87,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
@@ -106,27 +106,27 @@ $(document).ready(function(){initNavTree('classRedmatrix_1_1Import_1_1Import.htm
-
Redmatrix\Import\Import Member List
+
RedMatrix\Import\Import Member List
-

This is the complete list of members for Redmatrix\Import\Import, including all inherited members.

+

This is the complete list of members for RedMatrix\Import\Import, including all inherited members.

- - - - - - - - - - - - - - - + + + + + + + + + + + + + + +
$credentialsRedmatrix\Import\Import
$itemlistRedmatrix\Import\Import
$itemsRedmatrix\Import\Import
$src_itemsRedmatrix\Import\Import
convert_child($child)Redmatrix\Import\Import
convert_item($item_ident)Redmatrix\Import\Import
convert_taxonomy($item_ident)Redmatrix\Import\Import
get_children($item_ident)Redmatrix\Import\Import
get_credentials()Redmatrix\Import\Import
get_item($item_ident)Redmatrix\Import\Import
get_item_ident($item)Redmatrix\Import\Import
get_itemlist()Redmatrix\Import\Import
get_taxonomy($item_ident)Redmatrix\Import\Import
run()Redmatrix\Import\Import
store($item, $update=false)Redmatrix\Import\Import
$credentialsRedMatrix\Import\Importprivate
$itemlistRedMatrix\Import\Importprotected
$itemsRedMatrix\Import\Importprotected
$src_itemsRedMatrix\Import\Importprotected
convert_child($child)RedMatrix\Import\Import
convert_item($item_ident)RedMatrix\Import\Import
convert_taxonomy($item_ident)RedMatrix\Import\Import
get_children($item_ident)RedMatrix\Import\Import
get_credentials()RedMatrix\Import\Import
get_item($item_ident)RedMatrix\Import\Import
get_item_ident($item)RedMatrix\Import\Import
get_itemlist()RedMatrix\Import\Import
get_taxonomy($item_ident)RedMatrix\Import\Import
run()RedMatrix\Import\Import
store($item, $update=false)RedMatrix\Import\Import
diff --git a/doc/html/classRedmatrix_1_1Import_1_1Import.html b/doc/html/classRedmatrix_1_1Import_1_1Import.html index 6eec161c2..2119780c3 100644 --- a/doc/html/classRedmatrix_1_1Import_1_1Import.html +++ b/doc/html/classRedmatrix_1_1Import_1_1Import.html @@ -4,7 +4,7 @@ -The Red Matrix: Redmatrix\Import\Import Class Reference +The Red Matrix: RedMatrix\Import\Import Class Reference @@ -87,7 +87,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
@@ -107,56 +107,60 @@ $(document).ready(function(){initNavTree('classRedmatrix_1_1Import_1_1Import.htm
Public Member Functions | -Public Attributes | -List of all members
+Protected Attributes | +Private Attributes | +List of all members
-
Redmatrix\Import\Import Class Reference
+
RedMatrix\Import\Import Class Reference
- - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + +

Public Member Functions

 get_credentials ()
 
 get_itemlist ()
 
 get_item_ident ($item)
 
 get_item ($item_ident)
 
 get_taxonomy ($item_ident)
 
 get_children ($item_ident)
 
 convert_item ($item_ident)
 
 convert_taxonomy ($item_ident)
 
 convert_child ($child)
 
 store ($item, $update=false)
 
 run ()
 
 get_credentials ()
 
 get_itemlist ()
 
 get_item_ident ($item)
 
 get_item ($item_ident)
 
 get_taxonomy ($item_ident)
 
 get_children ($item_ident)
 
 convert_item ($item_ident)
 
 convert_taxonomy ($item_ident)
 
 convert_child ($child)
 
 store ($item, $update=false)
 
 run ()
 
- - - - - - - - - + + + + + + + +

-Public Attributes

 $credentials = null
 
 $itemlist = null
 
 $src_items = null
 
 $items = null
 

+Protected Attributes

 $itemlist = null
 
 $src_items = null
 
 $items = null
 
+ + +

+Private Attributes

 $credentials = null
 

Member Function Documentation

- +
- + @@ -165,16 +169,16 @@ Public Attributes
Redmatrix\Import\Import::convert_child RedMatrix\Import\Import::convert_child (   $child)
-

Referenced by Redmatrix\Import\Import\run().

+

Referenced by RedMatrix\Import\Import\run().

- +
- + @@ -183,16 +187,16 @@ Public Attributes
Redmatrix\Import\Import::convert_item RedMatrix\Import\Import::convert_item (   $item_ident)
-

Referenced by Redmatrix\Import\Import\run().

+

Referenced by RedMatrix\Import\Import\run().

- +
- + @@ -201,16 +205,16 @@ Public Attributes
Redmatrix\Import\Import::convert_taxonomy RedMatrix\Import\Import::convert_taxonomy (   $item_ident)
-

Referenced by Redmatrix\Import\Import\run().

+

Referenced by RedMatrix\Import\Import\run().

- +
- + @@ -219,16 +223,16 @@ Public Attributes
Redmatrix\Import\Import::get_children RedMatrix\Import\Import::get_children (   $item_ident)
-

Referenced by Redmatrix\Import\Import\run().

+

Referenced by RedMatrix\Import\Import\run().

- +
- + @@ -236,16 +240,16 @@ Public Attributes
Redmatrix\Import\Import::get_credentials RedMatrix\Import\Import::get_credentials ( )
-

Referenced by Redmatrix\Import\Import\run().

+

Referenced by RedMatrix\Import\Import\run().

- +
- + @@ -254,16 +258,16 @@ Public Attributes
Redmatrix\Import\Import::get_item RedMatrix\Import\Import::get_item (   $item_ident)
-

Referenced by Redmatrix\Import\Import\run().

+

Referenced by RedMatrix\Import\Import\run().

- +
- + @@ -274,12 +278,12 @@ Public Attributes - +
Redmatrix\Import\Import::get_item_ident RedMatrix\Import\Import::get_item_ident (   $item)
- + @@ -287,16 +291,16 @@ Public Attributes
Redmatrix\Import\Import::get_itemlist RedMatrix\Import\Import::get_itemlist ( )
-

Referenced by Redmatrix\Import\Import\run().

+

Referenced by RedMatrix\Import\Import\run().

- +
- + @@ -305,16 +309,16 @@ Public Attributes
Redmatrix\Import\Import::get_taxonomy RedMatrix\Import\Import::get_taxonomy (   $item_ident)
-

Referenced by Redmatrix\Import\Import\run().

+

Referenced by RedMatrix\Import\Import\run().

- +
- + @@ -324,12 +328,12 @@ Public Attributes - +
Redmatrix\Import\Import::run RedMatrix\Import\Import::run ( )
- + @@ -351,50 +355,86 @@ Public Attributes

Member Data Documentation

- +
+
Redmatrix\Import\Import::store RedMatrix\Import\Import::store (   $item,
+ + + + +
- +
Redmatrix\Import\Import::$credentials = nullRedMatrix\Import\Import::$credentials = null
+ 		+private
+
+ +

Referenced by RedMatrix\Import\Import\get_credentials().

+ +
+
+ +
+
+ + + + + +
+ + + + +
RedMatrix\Import\Import::$itemlist = null
+ 		+protected
+
+ +

Referenced by RedMatrix\Import\Import\get_itemlist().

+ +
+
+ +
+
+ + + + + +
+ + + + +
RedMatrix\Import\Import::$items = null
+ 		+protected
- +
+ + + + + +
- - -
Redmatrix\Import\Import::$itemlist = null
-
- -
- - -
-
- - - - -
Redmatrix\Import\Import::$items = null
-
- -
-
- -
-
- - - +
Redmatrix\Import\Import::$src_items = nullRedMatrix\Import\Import::$src_items = null
+
+protected
diff --git a/doc/html/classRedmatrix_1_1Import_1_1Import.js b/doc/html/classRedmatrix_1_1Import_1_1Import.js index 2a0e2eef0..03e429289 100644 --- a/doc/html/classRedmatrix_1_1Import_1_1Import.js +++ b/doc/html/classRedmatrix_1_1Import_1_1Import.js @@ -1,18 +1,18 @@ -var classRedmatrix_1_1Import_1_1Import = +var classRedMatrix_1_1Import_1_1Import = [ - [ "convert_child", "classRedmatrix_1_1Import_1_1Import.html#ad9c6677ea07c496d81914b97aeb5fba5", null ], - [ "convert_item", "classRedmatrix_1_1Import_1_1Import.html#add4d39232c883b59634595be14441336", null ], - [ "convert_taxonomy", "classRedmatrix_1_1Import_1_1Import.html#a5a54b41c30aed8ac9ca6e486fd0b4b97", null ], - [ "get_children", "classRedmatrix_1_1Import_1_1Import.html#a832a4cc0d33d0eea29cb450004054580", null ], - [ "get_credentials", "classRedmatrix_1_1Import_1_1Import.html#a76dd522e47a48d80e1678211230f2ff5", null ], - [ "get_item", "classRedmatrix_1_1Import_1_1Import.html#ae705dd1deb245b1d06baa73062330e43", null ], - [ "get_item_ident", "classRedmatrix_1_1Import_1_1Import.html#a4420d6acf6ba2f3723c655251b12abef", null ], - [ "get_itemlist", "classRedmatrix_1_1Import_1_1Import.html#a1af46c9f88257635f362d6027ea710c3", null ], - [ "get_taxonomy", "classRedmatrix_1_1Import_1_1Import.html#ab1e4a1d404b5a5a9c518c205d1428154", null ], - [ "run", "classRedmatrix_1_1Import_1_1Import.html#af432ecbc45b812a03d58dfb378a212f7", null ], - [ "store", "classRedmatrix_1_1Import_1_1Import.html#a70f9dd767d877530a7da7c6bd821e080", null ], - [ "$credentials", "classRedmatrix_1_1Import_1_1Import.html#afd251e6e5a18516bac4d1a40435602f1", null ], - [ "$itemlist", "classRedmatrix_1_1Import_1_1Import.html#a2f69f16ecb7de1fb1daffbc38e68c9f1", null ], - [ "$items", "classRedmatrix_1_1Import_1_1Import.html#a31d73d48e1aa93319159c692d0197a3a", null ], - [ "$src_items", "classRedmatrix_1_1Import_1_1Import.html#ac578e85e4c491bf9e09fbbfa33f9d6b7", null ] + [ "convert_child", "classRedMatrix_1_1Import_1_1Import.html#a5434325afb2c633c52540127d717800a", null ], + [ "convert_item", "classRedMatrix_1_1Import_1_1Import.html#a107703a43a1b0ceb2af7ae470cb3f218", null ], + [ "convert_taxonomy", "classRedMatrix_1_1Import_1_1Import.html#addf6e53dacd971eaab49be4b17a767d6", null ], + [ "get_children", "classRedMatrix_1_1Import_1_1Import.html#a57561904b0f127e0d9a3e2c33688daf8", null ], + [ "get_credentials", "classRedMatrix_1_1Import_1_1Import.html#a24134929d9a8a682da2036a0bf326367", null ], + [ "get_item", "classRedMatrix_1_1Import_1_1Import.html#a27987a41cb703a796f1821baeb4774a2", null ], + [ "get_item_ident", "classRedMatrix_1_1Import_1_1Import.html#a772c28edf36aaf8e66007a95004c4059", null ], + [ "get_itemlist", "classRedMatrix_1_1Import_1_1Import.html#a855cd5a79b95d269ae8737fae774e3bc", null ], + [ "get_taxonomy", "classRedMatrix_1_1Import_1_1Import.html#ae3c6472bea1a44025bc2e152604eb20c", null ], + [ "run", "classRedMatrix_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c", null ], + [ "store", "classRedMatrix_1_1Import_1_1Import.html#a33ed595de044c0ec1cd84cca719e31dc", null ], + [ "$credentials", "classRedMatrix_1_1Import_1_1Import.html#a864aac9fadb4846f5d9f840e8e0f440f", null ], + [ "$itemlist", "classRedMatrix_1_1Import_1_1Import.html#ad0d2bdc3b388220479063915b4f5c2fc", null ], + [ "$items", "classRedMatrix_1_1Import_1_1Import.html#a0a05dac405ccc5b617b7b7b3c8ed783c", null ], + [ "$src_items", "classRedMatrix_1_1Import_1_1Import.html#a88c2eeba8d0cba3e7c12a2c45ba0fbc6", null ] ]; \ No newline at end of file diff --git a/doc/html/namespaceRedmatrix_1_1Import.html b/doc/html/namespaceRedmatrix_1_1Import.html index b21ffdff2..a0ab85227 100644 --- a/doc/html/namespaceRedmatrix_1_1Import.html +++ b/doc/html/namespaceRedmatrix_1_1Import.html @@ -4,7 +4,7 @@ -The Red Matrix: Redmatrix\Import Namespace Reference +The Red Matrix: RedMatrix\Import Namespace Reference @@ -85,7 +85,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
@@ -106,13 +106,13 @@ $(document).ready(function(){initNavTree('namespaceRedmatrix_1_1Import.html','')
Classes
-
Redmatrix\Import Namespace Reference
+
RedMatrix\Import Namespace Reference
- +

Classes

class  Import
class  Import
 
diff --git a/doc/html/namespaceRedmatrix_1_1Import.js b/doc/html/namespaceRedmatrix_1_1Import.js index 74692ac3b..c26a05140 100644 --- a/doc/html/namespaceRedmatrix_1_1Import.js +++ b/doc/html/namespaceRedmatrix_1_1Import.js @@ -1,4 +1,4 @@ -var namespaceRedmatrix_1_1Import = +var namespaceRedMatrix_1_1Import = [ - [ "Import", "classRedmatrix_1_1Import_1_1Import.html", "classRedmatrix_1_1Import_1_1Import" ] + [ "Import", "classRedMatrix_1_1Import_1_1Import.html", "classRedMatrix_1_1Import_1_1Import" ] ]; \ No newline at end of file diff --git a/mod/parse_url.php b/mod/parse_url.php index 340e1a67e..23d608411 100644 --- a/mod/parse_url.php +++ b/mod/parse_url.php @@ -307,7 +307,14 @@ function parse_url_content(&$a) { $max_images = intval($max_images); foreach ($siteinfo["images"] as $imagedata) { - $image .= '[img='.$imagedata["width"].'x'.$imagedata["height"].']'.$imagedata["src"].'[/img]' . "\n"; + if ($url) { + $image .= sprintf('[url=%s]', $url); + } + $image .= '[img='.$imagedata["width"].'x'.$imagedata["height"].']'.$imagedata["src"].'[/img]'; + if ($url) { + $image .= '[/url]'; + } + $image .= "\n"; $total_images ++; if($max_images && $max_images >= $total_images) break;