kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Updating / debugging action class implementation

This commit is contained in:
Steven Mondji-Lerider 2013-08-14 13:17:16 +00:00
parent 1ca1a6a248
commit ab74a22ca4
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bureau/class/m_action.php
View File

@ -19,9 +19,15 @@
----------------------------------------------------------------------
*/
/**
*
* @copyright AlternC-Team 2002-2013 http://alternc.org/
*/
* This class manage actions to be performed on the file system on behalf of alternc Classes
* It primary use is to store the actions to be performed ( creating file or folder, deleting, setting permissions etc..) in the action sql table.
* The script /usr/lib/alternc/do_actions.php handled by cron and incron is then used to perform those actions.
*
* Copyleft {@link http://alternc.org/ AlternC Team}
*
* @copyright AlternC-Team 2013-8-13 http://alternc.org/
*
*/
class m_action {
/*---------------------------------------------------------------------------*/
/** Constructor
@ -85,9 +91,19 @@ class m_action {
/*
* function archiving a directory ( upon account deletion )
* @param: $archive : directory to archive within the archive_del_data global variable folder if set.
* If archive_del_data is not set we delete the folder.
* @param: $dir : sub_directory of the archive directory
*/
function archive($archive,$dir) {
function archive($archivei,$dir="html") {
global $cuid,$db,$err;
$arch=variable_get('archive_del_data');
if(empty($arch)) {
$this->del($archive);
return true;
}
$BACKUP_DIR=$arch;
$db->query("select login from membres where uid=$cuid;");
$db->next_record();
if (!$db->Record["login"]) {
@ -96,11 +112,11 @@ class m_action {
}
$uidlogin=$cuid."-".$db->Record["login"];
$BACKUP_DIR="/tmp/backup/";
//utiliser la function move après avoir construit le chemin
//The path will look like /<archive_del_data>/YYYY-MM/<uid>-<login>/<folder>
$today=getdate();
$dest=$BACKUP_DIR.'/'.$today["year"].'-'.$today["mon"].'/'.$uidlogin.'/'.$dir;
$this->move($archive,$dest);
return true;
}
/*

24
bureau/class/m_admin.php
View File

@ -62,6 +62,7 @@ class m_admin {
4 => _("Domain can be installed, no check at all"),
5 => _("Domain can be installed, force NO DNS hosting"),
);
$archive=variable_get('archive_del_data','','If folder specified html folder of deleted user is archived, else it is deleted. ');
}
function hook_menu() {
@ -682,27 +683,10 @@ EOF;
// WE MUST call m_dom before all others because of conflicts ...
$dom->hook_admin_del_member();
// TODO: old hook method, FIXME: remove when unused
/*
foreach($classes as $c) {
if (method_exists($GLOBALS[$c],"alternc_del_member")) {
$GLOBALS[$c]->alternc_del_member();
}
}
*/
/*
* New way of deleting or backup delted user html folders using action class
*/
$archive=variable_get('archive_del_data');
# New way of deleting or backup delted user html folders using action class
$path=getuserpath($tt['login']);
if($archive == 1 ){
#echo("archive");
$action->archive($path,"html");
}else{
#echo("del");
$action->del($path);
}
$action->archive($path);
$hooks->invoke("alternc_del_member");
$hooks->invoke("hook_admin_del_member");