diff --git a/doc/html/namespaceRedMatrix.html b/doc/html/namespaceRedMatrix.html index b28ba8dc6..2861c646a 100644 --- a/doc/html/namespaceRedMatrix.html +++ b/doc/html/namespaceRedMatrix.html @@ -4,7 +4,7 @@ -The Red Matrix: RedMatrix Namespace Reference +The Red Matrix: Redmatrix Namespace Reference @@ -85,7 +85,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
@@ -106,13 +106,13 @@ $(document).ready(function(){initNavTree('namespaceRedMatrix.html','');});
Namespaces
-
RedMatrix Namespace Reference
+
Redmatrix Namespace Reference
- +

Namespaces

namespace  RedDAV
namespace  Import
 
diff --git a/doc/html/namespaceRedMatrix.js b/doc/html/namespaceRedMatrix.js index 930158787..161035822 100644 --- a/doc/html/namespaceRedMatrix.js +++ b/doc/html/namespaceRedMatrix.js @@ -1,4 +1,4 @@ -var namespaceRedMatrix = +var namespaceRedmatrix = [ - [ "RedDAV", "namespaceRedMatrix_1_1RedDAV.html", "namespaceRedMatrix_1_1RedDAV" ] + [ "Import", "namespaceRedmatrix_1_1Import.html", "namespaceRedmatrix_1_1Import" ] ]; \ No newline at end of file diff --git a/doc/html/namespaceRedmatrix.html b/doc/html/namespaceRedmatrix.html deleted file mode 100644 index 2861c646a..000000000 --- a/doc/html/namespaceRedmatrix.html +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - -The Red Matrix: Redmatrix Namespace Reference - - - - - - - - - - - - - -
-
- - - - - - - -
-
The Red Matrix -
-
-
- - - - - -
-
- -
-
-
- -
- -
- All Classes Namespaces Files Functions Variables Pages
- - -
- -
- -
-
-Namespaces
-
-
Redmatrix Namespace Reference
-
-
- - - - -

-Namespaces

namespace  Import
 
-
-
- diff --git a/doc/html/namespaceRedmatrix.js b/doc/html/namespaceRedmatrix.js deleted file mode 100644 index 161035822..000000000 --- a/doc/html/namespaceRedmatrix.js +++ /dev/null @@ -1,4 +0,0 @@ -var namespaceRedmatrix = -[ - [ "Import", "namespaceRedmatrix_1_1Import.html", "namespaceRedmatrix_1_1Import" ] -]; \ No newline at end of file diff --git a/include/Contact.php b/include/Contact.php index 64779d45f..4fd43db44 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -207,6 +207,7 @@ function account_remove($account_id,$local = true,$unset_session=true) { intval($account_id) ); + if ($unset_session) { unset($_SESSION['authenticated']); unset($_SESSION['uid']); @@ -216,6 +217,28 @@ function account_remove($account_id,$local = true,$unset_session=true) { return $r; } +// recursively delete a directory +function rrmdir($path) +{ + if (is_dir($path) === true) + { + $files = array_diff(scandir($path), array('.', '..')); + + foreach ($files as $file) + { + rrmdir(realpath($path) . '/' . $file); + } + + return rmdir($path); + } + + else if (is_file($path) === true) + { + return unlink($path); + } + + return false; +} function channel_remove($channel_id, $local = true, $unset_session=true) { @@ -311,6 +334,19 @@ function channel_remove($channel_id, $local = true, $unset_session=true) { dbesc($channel['channel_hash']) ); } + + //remove from file system + $r = q("select channel_address from channel where channel_id = %d limit 1", + intval($channel_id) + ); + if($r) + $channel_address = $r[0]['channel_address'] ; + if ($channel_address !== '') { + $f = 'store/' . $channel_address.'/'; + logger ('delete '. $f); + if(is_dir($f)) + @rrmdir($f); + } proc_run('php','include/directory.php',$channel_id);