Added a function to merge language files.

tbrehm

2008-09-21 8dd29e227f44e2379a0a72a4f60130b24e54a14b

 server/plugins-available/shelluser_base_plugin.inc.php

@@ -89,15 +89,16 @@
         $command = 'usermod';
         $command .= ' --home '.escapeshellcmd($data['new']['dir']);
         $command .= ' --gid '.escapeshellcmd($data['new']['pgroup']);
         $command .= ' --non-unique ';
         // $command .= ' --non-unique ';
         $command .= ' --password '.escapeshellcmd($data['new']['password']);
         $command .= ' --shell '.escapeshellcmd($data['new']['shell']);
         $command .= ' --uid '.escapeshellcmd($uid);
         // $command .= ' --uid '.escapeshellcmd($uid);
         $command .= ' --login '.escapeshellcmd($data['new']['username']);
         $command .= ' '.escapeshellcmd($data['old']['username']);
         
         exec($command);
         $app->log("Updated shelluser: ".$data['new']['username'],LOGLEVEL_DEBUG);
         // $app->log("Updated shelluser: $command ",LOGLEVEL_DEBUG);
         $app->log("Updated shelluser: ".$data['old']['username'],LOGLEVEL_DEBUG);
         
      } else {
         $app->log("UID = $uid for shelluser:".$data['new']['username']." not allowed.",LOGLEVEL_ERROR);