Skip to content

Commit 4585cf2

Browse files
committed
Enhanced update script, mail plugin.
Updated ToDo item list.
1 parent 94a020d commit 4585cf2

File tree

4 files changed

+36
-5
lines changed

4 files changed

+36
-5
lines changed

TODO.txt

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ remove done tasks or assign yourself to a task.
1010
Installer
1111
--------------------------------------
1212

13+
- Load and update system config from file into sql database during installation.
14+
1315

1416
Server
1517
--------------------------------------
@@ -55,7 +57,9 @@ Sites (web) module
5557
this as a new tab named "SSL" to the exiting domain settings form.
5658

5759
- Add a "httpd includes" field to the options tab of the domain settings form
58-
like it is implemented in ISPConfig 2.
60+
like it is implemented in ISPConfig 2.
61+
62+
- Make sure that changes in the domain name do not break the configuration.
5963

6064

6165
BE-Designer module
@@ -65,6 +69,19 @@ WARNING: Please do not use the BE Designer at the moment, the serializing functi
6569
of the module editor may break some of the existing modules.
6670

6771

72+
Remoting framework
73+
--------------------------------------
74+
75+
76+
77+
Interface
78+
--------------------------------------
79+
80+
- Enhance the list function to allow soorting by column
81+
82+
- Enhance the paging in lists (e.g. like this: [1 2 3 4 ... 10])
83+
84+
6885
General tasks
6986
--------------------------------------
7087

install/lib/installer_base.lib.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@ public function install_ispconfig()
623623
if ($dh = opendir($dir)) {
624624
while (($file = readdir($dh)) !== false) {
625625
if($file != '.' && $file != '..') {
626-
symlink($install_dir.'/server/plugins-available/'.$file, $install_dir.'/server/plugins-enabled/'.$file);
626+
if(!is_link($install_dir.'/server/plugins-enabled/'.$file)) symlink($install_dir.'/server/plugins-available/'.$file, $install_dir.'/server/plugins-enabled/'.$file);
627627
}
628628
}
629629
closedir($dh);

install/update.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,18 @@
3030

3131

3232
//** ISPConfig 3 installer.
33+
//** The banner on the command line
34+
echo "\n\n".str_repeat('-',80)."\n";
35+
echo " _____ ___________ _____ __ _
36+
|_ _/ ___| ___ \ / __ \ / _(_)
37+
| | \ `--.| |_/ / | / \/ ___ _ __ | |_ _ __ _
38+
| | `--. \ __/ | | / _ \| '_ \| _| |/ _` |
39+
_| |_/\__/ / | | \__/\ (_) | | | | | | | (_| |
40+
\___/\____/\_| \____/\___/|_| |_|_| |_|\__, |
41+
__/ |
42+
|___/ ";
43+
echo "\n".str_repeat('-',80)."\n";
44+
echo "\n\n>> Update \n\n";
3345

3446

3547
//** Include the library with the basic installer functions

server/plugins-available/mail_plugin.inc.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,15 @@ function onLoad() {
4545
Register for the events
4646
*/
4747

48+
//* Mailboxes
4849
$app->plugins->registerEvent('mail_user_insert',$this->plugin_name,'user_insert');
4950
$app->plugins->registerEvent('mail_user_update',$this->plugin_name,'user_update');
5051
$app->plugins->registerEvent('mail_user_delete',$this->plugin_name,'user_delete');
5152

53+
//* Mail Domains
54+
//$app->plugins->registerEvent('mail_domain_insert',$this->plugin_name,'domain_insert');
55+
//$app->plugins->registerEvent('mail_domain_update',$this->plugin_name,'domain_update');
56+
//$app->plugins->registerEvent('mail_domain_delete',$this->plugin_name,'domain_delete');
5257

5358
}
5459

@@ -62,7 +67,6 @@ function user_insert($event_name,$data) {
6267
exec('chown '.$mail_config['mailuser_name'].':'.$mail_config['mailuser_group'].' '.escapeshellcmd($data['new']['maildir']));
6368
$app->log('Created Maildir: '.$data['new']['maildir'],LOGLEVEL_DEBUG);
6469
}
65-
6670
}
6771

6872
function user_update($event_name,$data) {
@@ -86,7 +90,6 @@ function user_update($event_name,$data) {
8690
rmdir($data['old']['maildir']);
8791
$app->log('Moved Maildir from: '.$data['old']['maildir'].' to '.$data['new']['maildir'],LOGLEVEL_DEBUG);
8892
}
89-
9093
}
9194

9295
function user_delete($event_name,$data) {
@@ -99,7 +102,6 @@ function user_delete($event_name,$data) {
99102
} else {
100103
$app->log('Possible security violation when deleting the maildir: '.$data['old']['maildir'],LOGLEVEL_ERROR);
101104
}
102-
103105
}
104106

105107

0 commit comments

Comments
 (0)