From 4a0150026b5b503b64471673c8621c857a38df57 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sat, 27 Dec 2014 22:37:10 +0100 Subject: [PATCH 01/14] merge --- ...RedMatrix_1_1Import_1_1Import-members.html | 36 +- .../classRedMatrix_1_1Import_1_1Import.html | 447 ------------------ .../classRedMatrix_1_1Import_1_1Import.js | 18 - ...Redmatrix_1_1Import_1_1Import-members.html | 132 ------ .../classRedmatrix_1_1Import_1_1Import.js | 18 - doc/html/namespaceRedMatrix_1_1Import.html | 120 ----- doc/html/namespaceRedMatrix_1_1Import.js | 4 - 7 files changed, 18 insertions(+), 757 deletions(-) delete mode 100644 doc/html/classRedMatrix_1_1Import_1_1Import.html delete mode 100644 doc/html/classRedMatrix_1_1Import_1_1Import.js delete mode 100644 doc/html/classRedmatrix_1_1Import_1_1Import-members.html delete mode 100644 doc/html/classRedmatrix_1_1Import_1_1Import.js delete mode 100644 doc/html/namespaceRedMatrix_1_1Import.html delete mode 100644 doc/html/namespaceRedMatrix_1_1Import.js diff --git a/doc/html/classRedMatrix_1_1Import_1_1Import-members.html b/doc/html/classRedMatrix_1_1Import_1_1Import-members.html index 2be66a2ea..061fc11a4 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\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
$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
diff --git a/doc/html/classRedMatrix_1_1Import_1_1Import.html b/doc/html/classRedMatrix_1_1Import_1_1Import.html deleted file mode 100644 index 2119780c3..000000000 --- a/doc/html/classRedMatrix_1_1Import_1_1Import.html +++ /dev/null @@ -1,447 +0,0 @@ - - - - - - -The Red Matrix: RedMatrix\Import\Import Class Reference - - - - - - - - - - - - - -
-
- - - - - - - -
-
The Red Matrix -
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Public Member Functions | -Protected Attributes | -Private Attributes | -List of all members
-
-
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 ()
 
- - - - - - - -

-Protected Attributes

 $itemlist = null
 
 $src_items = null
 
 $items = null
 
- - - -

-Private Attributes

 $credentials = null
 
-

Member Function Documentation

- -
-
- - - - - - - - -
RedMatrix\Import\Import::convert_child ( $child)
-
- -

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

- -
-
- -
-
- - - - - - - - -
RedMatrix\Import\Import::convert_item ( $item_ident)
-
- -

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

- -
-
- -
-
- - - - - - - - -
RedMatrix\Import\Import::convert_taxonomy ( $item_ident)
-
- -

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

- -
-
- -
-
- - - - - - - - -
RedMatrix\Import\Import::get_children ( $item_ident)
-
- -

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

- -
-
- -
-
- - - - - - - -
RedMatrix\Import\Import::get_credentials ()
-
- -

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

- -
-
- -
-
- - - - - - - - -
RedMatrix\Import\Import::get_item ( $item_ident)
-
- -

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

- -
-
- -
-
- - - - - - - - -
RedMatrix\Import\Import::get_item_ident ( $item)
-
- -
-
- -
-
- - - - - - - -
RedMatrix\Import\Import::get_itemlist ()
-
- -

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

- -
-
- -
-
- - - - - - - - -
RedMatrix\Import\Import::get_taxonomy ( $item_ident)
-
- -

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

- -
-
- -
-
- - - - - - - -
RedMatrix\Import\Import::run ()
-
- -
-
- -
-
- - - - - - - - - - - - - - - - - - -
RedMatrix\Import\Import::store ( $item,
 $update = false 
)
-
- -
-
-

Member Data Documentation

- -
-
- - - - - -
- - - - -
RedMatrix\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::$src_items = null
- 		-protected
-
- -
-
-
The documentation for this class was generated from the following file: -
-
- diff --git a/doc/html/classRedMatrix_1_1Import_1_1Import.js b/doc/html/classRedMatrix_1_1Import_1_1Import.js deleted file mode 100644 index 03e429289..000000000 --- a/doc/html/classRedMatrix_1_1Import_1_1Import.js +++ /dev/null @@ -1,18 +0,0 @@ -var classRedMatrix_1_1Import_1_1Import = -[ - [ "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/classRedmatrix_1_1Import_1_1Import-members.html b/doc/html/classRedmatrix_1_1Import_1_1Import-members.html deleted file mode 100644 index 061fc11a4..000000000 --- a/doc/html/classRedmatrix_1_1Import_1_1Import-members.html +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - -The Red Matrix: Member List - - - - - - - - - - - - - -
-
- - - - - - - -
-
The Red Matrix -
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-
Redmatrix\Import\Import Member List
-
-
- -

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
-
- diff --git a/doc/html/classRedmatrix_1_1Import_1_1Import.js b/doc/html/classRedmatrix_1_1Import_1_1Import.js deleted file mode 100644 index 2a0e2eef0..000000000 --- a/doc/html/classRedmatrix_1_1Import_1_1Import.js +++ /dev/null @@ -1,18 +0,0 @@ -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 ] -]; \ No newline at end of file diff --git a/doc/html/namespaceRedMatrix_1_1Import.html b/doc/html/namespaceRedMatrix_1_1Import.html deleted file mode 100644 index a0ab85227..000000000 --- a/doc/html/namespaceRedMatrix_1_1Import.html +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - -The Red Matrix: RedMatrix\Import Namespace Reference - - - - - - - - - - - - - -
-
- - - - - - - -
-
The Red Matrix -
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Classes
-
-
RedMatrix\Import Namespace Reference
-
-
- - - - -

-Classes

class  Import
 
-
-
- diff --git a/doc/html/namespaceRedMatrix_1_1Import.js b/doc/html/namespaceRedMatrix_1_1Import.js deleted file mode 100644 index c26a05140..000000000 --- a/doc/html/namespaceRedMatrix_1_1Import.js +++ /dev/null @@ -1,4 +0,0 @@ -var namespaceRedMatrix_1_1Import = -[ - [ "Import", "classRedMatrix_1_1Import_1_1Import.html", "classRedMatrix_1_1Import_1_1Import" ] -]; \ No newline at end of file From 43f143a211c75138d09ceb89acc48ea7d5c31ca9 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 11 Jan 2015 16:12:36 +0100 Subject: [PATCH 02/14] Fix for issue #763 Error creating new channel within the limits of the subscription plan --- include/account.php | 26 ++++++++++++++++++++++++++ include/identity.php | 2 +- mod/manage.php | 2 +- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/include/account.php b/include/account.php index 8df44acba..88036e2ef 100644 --- a/include/account.php +++ b/include/account.php @@ -590,6 +590,32 @@ function service_class_allows($uid,$property,$usage = false) { } } +// like service_class_allows but queries by account rather than channel +function account_service_class_allows($aid,$property,$usage = false) { + $a = get_app(); + $r = q("select account_service_class as service_class from account where account_id = %d limit 1", + intval($aid) + ); + if($r !== false and count($r)) { + $service_class = $r[0]['service_class']; + } + + if(! x($service_class)) + return true; // everything is allowed + + $arr = get_config('service_class',$service_class); + if(! is_array($arr) || (! count($arr))) + return true; + + if($usage === false) + return ((x($arr[$property])) ? (bool) $arr[$property] : true); + else { + if(! array_key_exists($property,$arr)) + return true; + return (((intval($usage)) < intval($arr[$property])) ? true : false); + } +} + function service_class_fetch($uid,$property) { $a = get_app(); diff --git a/include/identity.php b/include/identity.php index 7ae8e48f6..1b761d768 100644 --- a/include/identity.php +++ b/include/identity.php @@ -34,7 +34,7 @@ function identity_check_service_class($account_id) { $ret['total_identities'] = intval($r[0]['total']); - if(! service_class_allows($account_id,'total_identities',$r[0]['total'])) { + if(! account_service_class_allows($account_id,'total_identities',$r[0]['total'])) { $result['message'] .= upgrade_message(); return $result; } diff --git a/mod/manage.php b/mod/manage.php index 00c6db7f0..6fb835696 100644 --- a/mod/manage.php +++ b/mod/manage.php @@ -131,7 +131,7 @@ function manage_content(&$a) { intval(get_account_id()), intval(PAGE_REMOVED) ); - $limit = service_class_fetch(local_user(),'total_identities'); + $limit = account_service_class_fetch(get_account_id(),'total_identities'); if($limit !== false) { $channel_usage_message = sprintf( t("You have created %1$.0f of %2$.0f allowed channels."), $r[0]['total'], $limit); } From f957208600efa6af91abc3f9370c9cb1f57516a1 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 11 Jan 2015 19:19:18 +0100 Subject: [PATCH 03/14] fix accidentally removed file --- doc/classRedmatrix_1_1Import_1_1Import.html | 446 ++++++++++++++++++++ 1 file changed, 446 insertions(+) create mode 100644 doc/classRedmatrix_1_1Import_1_1Import.html diff --git a/doc/classRedmatrix_1_1Import_1_1Import.html b/doc/classRedmatrix_1_1Import_1_1Import.html new file mode 100644 index 000000000..3920dd3d9 --- /dev/null +++ b/doc/classRedmatrix_1_1Import_1_1Import.html @@ -0,0 +1,446 @@ + + + + + + +The Red Matrix: RedMatrix\Import\Import Class Reference + + + + + + + + + + + + + +
+
+ + + + + + + +
+
The Red Matrix +
+
+
+ + + + + +
+
+ +
+
+
+ +
+ + + + +
+ +
+ +
+
+Public Member Functions | +Protected Attributes | +Private Attributes | +List of all members
+
+
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 ()
 
+ + + + + + + +

+Protected Attributes

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

+Private Attributes

 $credentials = null
 
+

Member Function Documentation

+ +
+
+ + + + + + + + +
RedMatrix\Import\Import::convert_child ( $child)
+
+ +

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

+ +
+
+ +
+
+ + + + + + + + +
RedMatrix\Import\Import::convert_item ( $item_ident)
+
+ +

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

+ +
+
+ +
+
+ + + + + + + + +
RedMatrix\Import\Import::convert_taxonomy ( $item_ident)
+
+ +

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

+ +
+
+ +
+
+ + + + + + + + +
RedMatrix\Import\Import::get_children ( $item_ident)
+
+ +

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

+ +
+
+ +
+
+ + + + + + + +
RedMatrix\Import\Import::get_credentials ()
+
+ +

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

+ +
+
+ +
+
+ + + + + + + + +
RedMatrix\Import\Import::get_item ( $item_ident)
+
+ +

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

+ +
+
+ +
+
+ + + + + + + + +
RedMatrix\Import\Import::get_item_ident ( $item)
+
+ +
+
+ +
+
+ + + + + + + +
RedMatrix\Import\Import::get_itemlist ()
+
+ +

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

+ +
+
+ +
+
+ + + + + + + + +
RedMatrix\Import\Import::get_taxonomy ( $item_ident)
+
+ +

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

+ +
+
+ +
+
+ + + + + + + +
RedMatrix\Import\Import::run ()
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
RedMatrix\Import\Import::store ( $item,
 $update = false 
)
+
+ +
+
+

Member Data Documentation

+ +
+
+ + + + + +
+ + + + +
RedMatrix\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::$src_items = null
+ 		+protected
+
+ +
+
+
The documentation for this class was generated from the following file: +
+
From 487d201ea8df8ea9f2cc22e8065a5f9bafc77490 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 11 Jan 2015 19:23:15 +0100 Subject: [PATCH 04/14] . --- doc/classRedmatrix_1_1Import_1_1Import.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/classRedmatrix_1_1Import_1_1Import.html b/doc/classRedmatrix_1_1Import_1_1Import.html index 3920dd3d9..0ee9373f2 100644 --- a/doc/classRedmatrix_1_1Import_1_1Import.html +++ b/doc/classRedmatrix_1_1Import_1_1Import.html @@ -443,4 +443,4 @@ Private Attributes
  • include/Import/Importer.php
    • - + \ No newline at end of file From c89db830ebf063921991ad6c1f4d0ebccde084bc Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 11 Jan 2015 19:31:20 +0100 Subject: [PATCH 05/14] . --- ...Redmatrix_1_1Import_1_1Import-members.html | 131 ++++++++++++++++++ 1 file changed, 131 insertions(+) create mode 100644 doc/classRedmatrix_1_1Import_1_1Import-members.html diff --git a/doc/classRedmatrix_1_1Import_1_1Import-members.html b/doc/classRedmatrix_1_1Import_1_1Import-members.html new file mode 100644 index 000000000..736a303d8 --- /dev/null +++ b/doc/classRedmatrix_1_1Import_1_1Import-members.html @@ -0,0 +1,131 @@ + + + + + + +The Red Matrix: Member List + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +
    RedMatrix\Import\Import Member List
    +
    +
    + +

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

    + + + + + + + + + + + + + + + + +
    $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
    +
    \ No newline at end of file From 5beec923b462cbb6a4653b5387998787ed8f45b7 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 11 Jan 2015 19:38:43 +0100 Subject: [PATCH 06/14] put back in --- doc/classRedMatrix_1_1Import_1_1Import.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 doc/classRedMatrix_1_1Import_1_1Import.js diff --git a/doc/classRedMatrix_1_1Import_1_1Import.js b/doc/classRedMatrix_1_1Import_1_1Import.js new file mode 100644 index 000000000..03e429289 --- /dev/null +++ b/doc/classRedMatrix_1_1Import_1_1Import.js @@ -0,0 +1,18 @@ +var classRedMatrix_1_1Import_1_1Import = +[ + [ "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 From ab07857d9c8762fb00998761866262e012bab791 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 11 Jan 2015 19:41:22 +0100 Subject: [PATCH 07/14] put back in --- doc/namespaceRedMatrix_1_1Import.js | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 doc/namespaceRedMatrix_1_1Import.js diff --git a/doc/namespaceRedMatrix_1_1Import.js b/doc/namespaceRedMatrix_1_1Import.js new file mode 100644 index 000000000..44cbbb54c --- /dev/null +++ b/doc/namespaceRedMatrix_1_1Import.js @@ -0,0 +1,4 @@ +-var namespaceRedMatrix_1_1Import = +-[ +- [ "Import", "classRedMatrix_1_1Import_1_1Import.html", "classRedMatrix_1_1Import_1_1Import" ] +-]; From 1f02700618937a7334101045621f448ac867663e Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 11 Jan 2015 19:44:18 +0100 Subject: [PATCH 08/14] Revert "put back in" This reverts commit ab07857d9c8762fb00998761866262e012bab791. --- doc/namespaceRedMatrix_1_1Import.js | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 doc/namespaceRedMatrix_1_1Import.js diff --git a/doc/namespaceRedMatrix_1_1Import.js b/doc/namespaceRedMatrix_1_1Import.js deleted file mode 100644 index 44cbbb54c..000000000 --- a/doc/namespaceRedMatrix_1_1Import.js +++ /dev/null @@ -1,4 +0,0 @@ --var namespaceRedMatrix_1_1Import = --[ -- [ "Import", "classRedMatrix_1_1Import_1_1Import.html", "classRedMatrix_1_1Import_1_1Import" ] --]; From f2ef89e697635e8f948c9aa6a118ee65675b8358 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 11 Jan 2015 19:47:05 +0100 Subject: [PATCH 09/14] Revert "put back in" This reverts commit 5beec923b462cbb6a4653b5387998787ed8f45b7. --- doc/classRedMatrix_1_1Import_1_1Import.js | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 doc/classRedMatrix_1_1Import_1_1Import.js diff --git a/doc/classRedMatrix_1_1Import_1_1Import.js b/doc/classRedMatrix_1_1Import_1_1Import.js deleted file mode 100644 index 03e429289..000000000 --- a/doc/classRedMatrix_1_1Import_1_1Import.js +++ /dev/null @@ -1,18 +0,0 @@ -var classRedMatrix_1_1Import_1_1Import = -[ - [ "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 From 63f189b453e043048e04264da5c2daec0f9c9494 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 11 Jan 2015 22:23:30 +0100 Subject: [PATCH 10/14] Correct --- ...RedMatrix_1_1Import_1_1Import-members.html | 37 +++++++++---------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/doc/html/classRedMatrix_1_1Import_1_1Import-members.html b/doc/html/classRedMatrix_1_1Import_1_1Import-members.html index 061fc11a4..da46c97f2 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,26 @@ $(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
    - From 4e7e555a75039bcda3448d2a201f90604b34df9b Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 11 Jan 2015 22:30:59 +0100 Subject: [PATCH 11/14] corrcetion --- doc/html/classRedmatrix_1_1Import_1_1Import.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/html/classRedmatrix_1_1Import_1_1Import.js b/doc/html/classRedmatrix_1_1Import_1_1Import.js index 03e429289..6d01249e1 100644 --- a/doc/html/classRedmatrix_1_1Import_1_1Import.js +++ b/doc/html/classRedmatrix_1_1Import_1_1Import.js @@ -15,4 +15,4 @@ var classRedMatrix_1_1Import_1_1Import = [ "$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 +]; From f245a090239dd0b883a98f8d71c354885346a8df Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 11 Jan 2015 22:36:30 +0100 Subject: [PATCH 12/14] Correction --- doc/html/classRedMatrix_1_1Import_1_1Import-members.html | 2 +- doc/html/classRedmatrix_1_1Import_1_1Import.html | 3 +-- doc/html/classRedmatrix_1_1Import_1_1Import.js | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/doc/html/classRedMatrix_1_1Import_1_1Import-members.html b/doc/html/classRedMatrix_1_1Import_1_1Import-members.html index da46c97f2..736a303d8 100644 --- a/doc/html/classRedMatrix_1_1Import_1_1Import-members.html +++ b/doc/html/classRedMatrix_1_1Import_1_1Import-members.html @@ -128,4 +128,4 @@ $(document).ready(function(){initNavTree('classRedMatrix_1_1Import_1_1Import.htm run()RedMatrix\Import\Import store($item, $update=false)RedMatrix\Import\Import - + \ No newline at end of file diff --git a/doc/html/classRedmatrix_1_1Import_1_1Import.html b/doc/html/classRedmatrix_1_1Import_1_1Import.html index 2119780c3..0ee9373f2 100644 --- a/doc/html/classRedmatrix_1_1Import_1_1Import.html +++ b/doc/html/classRedmatrix_1_1Import_1_1Import.html @@ -443,5 +443,4 @@ Private Attributes
  • include/Import/Importer.php
    • - - + \ No newline at end of file diff --git a/doc/html/classRedmatrix_1_1Import_1_1Import.js b/doc/html/classRedmatrix_1_1Import_1_1Import.js index 6d01249e1..03e429289 100644 --- a/doc/html/classRedmatrix_1_1Import_1_1Import.js +++ b/doc/html/classRedmatrix_1_1Import_1_1Import.js @@ -15,4 +15,4 @@ var classRedMatrix_1_1Import_1_1Import = [ "$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 From f6ec519686371d1d41511439645542eacff78818 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 11 Jan 2015 22:54:16 +0100 Subject: [PATCH 13/14] Correction --- doc/html/classRedmatrix_1_1Import_1_1Import.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/html/classRedmatrix_1_1Import_1_1Import.html b/doc/html/classRedmatrix_1_1Import_1_1Import.html index 0ee9373f2..3920dd3d9 100644 --- a/doc/html/classRedmatrix_1_1Import_1_1Import.html +++ b/doc/html/classRedmatrix_1_1Import_1_1Import.html @@ -443,4 +443,4 @@ Private Attributes
  • include/Import/Importer.php
    • - \ No newline at end of file + From 1e6fd907950d7834007b7d06dc6b6bd82347fa5b Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 11 Jan 2015 22:59:50 +0100 Subject: [PATCH 14/14] Correction --- doc/html/classRedmatrix_1_1Import_1_1Import.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/html/classRedmatrix_1_1Import_1_1Import.js b/doc/html/classRedmatrix_1_1Import_1_1Import.js index 03e429289..6d01249e1 100644 --- a/doc/html/classRedmatrix_1_1Import_1_1Import.js +++ b/doc/html/classRedmatrix_1_1Import_1_1Import.js @@ -15,4 +15,4 @@ var classRedMatrix_1_1Import_1_1Import = [ "$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 +];