Changeset - r42:e7c378036e33
Parent rev.
Child rev.
[Not reviewed]
default
0 1 0
Wolfgang Scherer (ws) - 7 years ago 2018-02-28 15:34:15
wolfgang.scherer@gmx.de
index.php: quoting for final message fixed.
1 file changed with 13 insertions and 10 deletions:
index.php
13
10
0 comments (0 inline, 0 general)
index.php
➞
Show inline comments
 
@@ -299,131 +299,134 @@ if ($vacation_setup || $vacation_setup_r
 
        sprintf($VACATION_FORWARD_ENTRY, implode(' ', $vacation_args)));
 

			




	
	
	
		
 
    if ( $vacation_setup_raw ) {

			




	
	
	
		
 
        $vacation_msg = isset($_REQUEST['message']) ? trim($_REQUEST['message']) : '';

			




	
	
	
		
 
        $message_parts = message_split($vacation_msg);

			




	
	
	
		
 
        $vacation_headers = header_clean($message_parts[0]);

			




	
	
	
		
 
        $vacation_body = $message_parts[1];

			




	
	
	
		
 
        $vacation_subject = header_field_body($vacation_headers, 'subject');

			




	
	
	
		
 
        header_set($vacation_headers, 'X-WSV-Format: raw');

			




	
	
	
		
 
        $x_wsv_raw = True;

			




	
	
	
		
 
    } else {

			




	
	
	
		
 
        $vacation_subject = isset($_REQUEST['subject']) ? trim($_REQUEST['subject']) : '';

			




	
	
	
		
 
        $vacation_body = isset($_REQUEST['body']) ? trim($_REQUEST['body']) : '';

			




	
	
	
		
 
        $vacation_headers = Array();

			




	
	
	
		
 
        $x_wsv_raw = False;

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    while (True) {

			




	
	
	
		
 
        if ($vacation_del_log) {

			




	
	
	
		
 
            $cmd = sprintf(

			




	
	
	
		
 
                '%s -u %s %s %s %s',

			




	
	
	
		
 
                $SUDO_CMD, $user, $SUDO_OPT_H, $VACATION_CMD, $VACATION_INIT_OPTS);

			




	
	
	
		
 
            // fprintf($stderr, "\$cmd: %s<br>\n", $cmd);

			




	
	
	
		
 
            system($cmd);

			




	
	
	
		
 

			




	
	
	
		
 
            $pipe_cmd = sprintf(

			




	
	
	
		
 
                '%s -u %s %s %s %s',

			




	
	
	
		
 
                $SUDO_CMD, $user, $SUDO_OPT_H, $VACATION_CMD, $VACATION_EXLCUDE_OPTS);

			




	
	
	
		
 
            // fprintf($stderr, "\$pipe_cmd: %s<br>\n", $pipe_cmd);

			




	
	
	
		
 
            $vacation_excl_pipe = popen($pipe_cmd, 'w');

			




	
	
	
		
 
            fwrite($vacation_excl_pipe, sprintf("%s%s\n", $user, $DOMAIN_SUFFIX));

			




	
	
	
		
 
            if (!empty($user_alias)) {

			




	
	
	
		
 
                fwrite($vacation_excl_pipe, sprintf("%s%s\n", $user_alias, $DOMAIN_SUFFIX));

			




	
	
	
		
 
            }

			




	
	
	
		
 
            pclose($vacation_excl_pipe);

			




	
	
	
		
 
            break;

			




	
	
	
		
 
        }

			




	
	
	
		
 

			




	
	
	
		
 
        if (empty ($vacation_subject)) {

			




	
	
	
		
 
            error_msg(get_text('error_no_subject'));

			




	
	
	
		
 
            break;

			




	
	
	
		
 
        }

			




	
	
	
		
 
        if (!$is_admin && !empty($vacation_forward_to) && !in_array($vacation_forward_to, $user_names)) {

			




	
	
	
		
 
            error_msg(sprintf('%s (%s)!', get_text('error_unknown_forward'), $vacation_forward_to));

			




	
	
	
		
 
            break;

			




	
	
	
		
 
        }

			




	
	
	
		
 
        // Actually set it

			




	
	
	
		
 

			




	
	
	
		
 
        if (!$FOOTER || $vacation_setup_raw || $x_wsv_raw) {

			




	
	
	
		
 
            $vacation_body_full = $vacation_body;

			




	
	
	
		
 
        } else {

			




	
	
	
		
 
            $vacation_body_full = str_replace("\n", "\r\n", str_replace("\r", "", rtrim(rtrim($vacation_body)."\n\n".$FOOTER)));

			




	
	
	
		
 
        }

			




	
	
	
		
 

			




	
	
	
		
 
        // Prepare vacation(1) message

			




	
	
	
		
 
        if (!empty($vacation_forward_to)) {

			




	
	
	
		
 
            header_set($vacation_headers, sprintf('X-WSV-Forward-To: %s', $vacation_forward_to));

			




	
	
	
		
 
        }

			




	
	
	
		
 
        if ( $vacation_setup_raw ) {

			




	
	
	
		
 
            $vacation_msg = message_join($vacation_headers, $vacation_body);

			




	
	
	
		
 
            $vacation_msg_in = message_join($vacation_headers, $vacation_body);

			




	
	
	
		
 
            $vacation_msg = message_join($vacation_headers, $vacation_body_full);

			




	
	
	
		
 
            // echo "<pre>"; // |:debug:|

			




	
	
	
		
 
            // var_dump($vacation_headers);

			




	
	
	
		
 
            // var_dump($vacation_body);

			




	
	
	
		
 
            // echo $vacation_msg;

			




	
	
	
		
 
            // echo "</pre>";

			




	
	
	
		
 
        } else {

			




	
	
	
		
 
            $vacation_msg = vacation_join($vacation_subject, $vacation_body, $vacation_headers);

			




	
	
	
		
 
            $vacation_msg_in = vacation_join($vacation_subject, $vacation_body, $vacation_headers);

			




	
	
	
		
 
            $vacation_msg = vacation_join($vacation_subject, $vacation_body_full, $vacation_headers);

			




	
	
	
		
 
        }

			




	
	
	
		
 
        $pipe_cmd = sprintf(

			




	
	
	
		
 
            '%s -u %s %s %s %s',

			




	
	
	
		
 
            $SUDO_CMD, $user, $SUDO_OPT_H, $WRITE_TO_CMD, $vacation_msg_in_file);

			




	
	
	
		
 
        // fprintf($stderr, "\$pipe_cmd: %s<br>\n", $pipe_cmd);

			




	
	
	
		
 

			




	
	
	
		
 
        $vacation_msg_pipe = popen($pipe_cmd, 'w');

			




	
	
	
		
 
        fwrite($vacation_msg_pipe, $vacation_msg);

			




	
	
	
		
 
        fwrite($vacation_msg_pipe, $vacation_msg_in);

			




	
	
	
		
 
        pclose($vacation_msg_pipe);

			




	
	
	
		
 

			




	
	
	
		
 
        $pipe_cmd = sprintf(

			




	
	
	
		
 
            '%s -u %s %s %s %s',

			




	
	
	
		
 
            $SUDO_CMD, $user, $SUDO_OPT_H, $WRITE_TO_CMD, $vacation_msg_file);

			




	
	
	
		
 
        // fprintf($stderr, "\$pipe_cmd: %s<br>\n", $pipe_cmd);

			




	
	
	
		
 

			




	
	
	
		
 
        $vacation_msg_pipe = popen($pipe_cmd, 'w');

			




	
	
	
		
 
        if (!$FOOTER || $vacation_setup_raw || $x_wsv_raw) {

			




	
	
	
		
 
            $full_msg = $vacation_msg;

			




	
	
	
		
 
        } else {

			




	
	
	
		
 
            $full_msg = rtrim(rtrim($vacation_msg)."\n".$FOOTER)."\n";

			




	
	
	
		
 
        }

			




	
	
	
		
 
        fwrite($vacation_msg_pipe, $full_msg);

			




	
	
	
		
 
        fwrite($vacation_msg_pipe, $vacation_msg);

			




	
	
	
		
 
        pclose($vacation_msg_pipe);

			




	
	
	
		
 

			




	
	
	
		
 
        // Initialize vacation(1) if necessary.

			




	
	
	
		
 
        if (!test_readable($vacation_db_file, $user)) {

			




	
	
	
		
 
            $cmd = sprintf(

			




	
	
	
		
 
                '%s -u %s %s %s %s',

			




	
	
	
		
 
                $SUDO_CMD, $user, $SUDO_OPT_H, $VACATION_CMD, $VACATION_INIT_OPTS);

			




	
	
	
		
 
            // fprintf($stderr, "\$cmd: %s<br>\n", $cmd);

			




	
	
	
		
 
            system($cmd);

			




	
	
	
		
 

			




	
	
	
		
 
            $pipe_cmd = sprintf(

			




	
	
	
		
 
                '%s -u %s %s %s %s',

			




	
	
	
		
 
                $SUDO_CMD, $user, $SUDO_OPT_H, $VACATION_CMD, $VACATION_EXLCUDE_OPTS);

			




	
	
	
		
 
            // fprintf($stderr, "\$pipe_cmd: %s<br>\n", $pipe_cmd);

			




	
	
	
		
 
            $vacation_excl_pipe = popen($pipe_cmd, 'w');

			




	
	
	
		
 
            fwrite($vacation_excl_pipe, sprintf("%s%s\n", $user, $DOMAIN_SUFFIX));

			




	
	
	
		
 
            if (!empty($user_alias)) {

			




	
	
	
		
 
                fwrite($vacation_excl_pipe, sprintf("%s%s\n", $user_alias, $DOMAIN_SUFFIX));

			




	
	
	
		
 
            }

			




	
	
	
		
 
            pclose($vacation_excl_pipe);

			




	
	
	
		
 
        }

			




	
	
	
		
 

			




	
	
	
		
 
        // Write or remove .forward file

			




	
	
	
		
 
        if ($forward_active) {

			




	
	
	
		
 
            $expanded_forward_settings = $forward_settings;

			




	
	
	
		
 
            if (!empty($expanded_forward_settings[1])) {

			




	
	
	
		
 
                $expanded_forward_settings[1] .= $DOMAIN_SUFFIX;

			




	
	
	
		
 
            }

			




	
	
	
		
 
            $use_fs = Array();

			




	
	
	
		
 
            foreach ($expanded_forward_settings as $fs) {

			




	
	
	
		
 
                if (empty($fs)) {

			




	
	
	
		
 
                    continue;

			




	
	
	
		
 
                }

			




	
	
	
		
 
                $use_fs[] = $fs;

			




	
	
	
		
 
            }

			




	
	
	
		
 
            $pipe_cmd = sprintf(

			




	
	
	
		
 
                '%s -u %s %s %s %s',

			




	
	
	
		
 
                $SUDO_CMD, $user, $SUDO_OPT_H, $WRITE_TO_CMD, $forward_file);

			




	
	
	
		
 
            // fprintf($stderr, "\$pipe_cmd: %s<br>\n", $pipe_cmd);

			




	
	
	
		
 
            $forward_file_pipe = popen($pipe_cmd, 'w');

			




	
	
	
		
 
            fwrite($forward_file_pipe, implode(", ", $use_fs)."\n");

			




	
	
	
		
 
            pclose($forward_file_pipe);

			




	
	
	
		
 
            if (!empty($VACATION_FORWARD_EXT_ENTRY)) {

			




	
	
	
		
 
                foreach ($FORWARD_EXTENSIONS as $fe) {

			




	
	
	
		
 
                    $pipe_cmd = sprintf(

			




	
	
	
		
 
                        '%s -u %s %s %s %s%s',

			




	
	
	
		
 
                        $SUDO_CMD, $user, $SUDO_OPT_H, $WRITE_TO_CMD, $forward_file, $fe);

			




	
	
	
		
 
                    // fprintf($stderr, "\$pipe_cmd: %s<br>\n", $pipe_cmd);

			




	
	
		
 
@@ -540,97 +543,97 @@ if ($forward_active) {

			




	
	
	
		
 
$trow[] = $user_control;

			




	
	
	
		
 

			




	
	
	
		
 
$form[] = sprintf('<tr><td style="text-align: center;">%s</td></tr>', implode($trow, '</td><td style="text-align: center;">'));

			




	
	
	
		
 
$form[] = '</table></div><br />';

			




	
	
	
		
 

			




	
	
	
		
 
$text_rows = 10;

			




	
	
	
		
 
// $text_rows = 3;                // |:debug:|

			




	
	
	
		
 

			




	
	
	
		
 
if ( !$x_wsv_raw )

			




	
	
	
		
 
{

			




	
	
	
		
 
    $form[] = sshl(get_text('automatic_mode'));

			




	
	
	
		
 

			




	
	
	
		
 
    // subject

			




	
	
	
		
 
    $form[] = sprintf('<span class="label">%s<sup>*</sup>:</span>', get_text('subject'));

			




	
	
	
		
 
    $form[] = (

			




	
	
	
		
 
        '<input type="text" name="subject" value="' . htmlspecialchars($vacation_subject, ENT_COMPAT, "UTF-8")

			




	
	
	
		
 
        .'" size="49" style="width: 440px;" /><br />');

			




	
	
	
		
 

			




	
	
	
		
 
    // message

			




	
	
	
		
 
    $form[] = sprintf('<span class="label">%s<sup>*</sup>:</span>', get_text('body'));

			




	
	
	
		
 
    $form[] = (

			




	
	
	
		
 
        '<textarea name="body" cols="56" rows="'.$text_rows.'"'

			




	
	
	
		
 
        .' style="vertical-align: top; width: 440px;">' . htmlspecialchars($vacation_body, ENT_NOQUOTES, "UTF-8") . '</textarea><br />');

			




	
	
	
		
 

			




	
	
	
		
 
    // actions

			




	
	
	
		
 
    $form[] = '<hr class="sep"/>';

			




	
	
	
		
 
    $form[] = '<span class="label">&nbsp;</span>';

			




	
	
	
		
 
    $form[] = sprintf('<input type="submit" name="save" value="%s" />', get_text('save'));

			




	
	
	
		
 
    //$form[] = ' ' . get_text('enable_encoding');

			




	
	
	
		
 
    $form[] = '<hr class="sep"/>';

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
if ($x_wsv_raw || $EXPERT_ENABLED)

			




	
	
	
		
 
{

			




	
	
	
		
 
    if ( $x_wsv_raw ) {

			




	
	
	
		
 
        $text_rows = 15;

			




	
	
	
		
 
        $id = null;

			




	
	
	
		
 
    } else {

			




	
	
	
		
 
        $text_rows = 5;

			




	
	
	
		
 
        $id = 'expert-mode';

			




	
	
	
		
 
    }

			




	
	
	
		
 
    $form[] = sshl(get_text('expert_mode'), $id);

			




	
	
	
		
 
#    $form[] = sshl('<a href="#">'.get_text('expert_mode').'</a>', 'expert-mode-head');

			




	
	
	
		
 
    $form[] = '<div>';

			




	
	
	
		
 
    // raw message

			




	
	
	
		
 
    $form[] = sprintf('<span class="label">%s<sup>*</sup>:</span>', get_text('message'));

			




	
	
	
		
 
    $form[] = (

			




	
	
	
		
 
        '<textarea name="message" cols="56" rows="'.$text_rows.'"'

			




	
	
	
		
 
        .' style="vertical-align: top; width: 440px;">' . htmlspecialchars($vacation_msg, ENT_NOQUOTES, "UTF-8") . '</textarea><br />');

			




	
	
	
		
 
        .' style="vertical-align: top; width: 440px;">' . htmlspecialchars($vacation_msg_in, ENT_NOQUOTES, "UTF-8") . '</textarea><br />');

			




	
	
	
		
 

			




	
	
	
		
 
    $form[] = '<span class="label">&nbsp;</span>';

			




	
	
	
		
 
    $form[] = (

			




	
	
	
		
 
        '<span style="display: inline-block; width: 440px; margin-top: 5px; font-size: 8pt;">'

			




	
	
	
		
 
        . get_text('explain_expert')

			




	
	
	
		
 
        .'</span><br />');

			




	
	
	
		
 

			




	
	
	
		
 
    $form[] = '<hr class="sep"/>';

			




	
	
	
		
 
    $form[] = '<span class="label">&nbsp;</span>';

			




	
	
	
		
 
    $form[] = sprintf('<input type="submit" name="raw" value="%s" />', get_text('save'));

			




	
	
	
		
 
    //$form[] = ' ' . get_text('disable_encoding');

			




	
	
	
		
 
    $form[] = '<hr class="sep"/>';

			




	
	
	
		
 
    $form[] = '</div>';

			




	
	
	
		
 

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
//$form[] = '<span class="label">&nbsp;</span>';

			




	
	
	
		
 
$form[] = (

			




	
	
	
		
 
    '<span style="display: inline-block; width: 550px;"><sup>*</sup>'

			




	
	
	
		
 
    . get_text('explain_subject')

			




	
	
	
		
 
    .'</span><br />');

			




	
	
	
		
 

			




	
	
	
		
 
// --------------------------------------------------

			




	
	
	
		
 
// |||:sec:||| Vacation History

			




	
	
	
		
 
// --------------------------------------------------

			




	
	
	
		
 

			




	
	
	
		
 
$vacation_list_cmd = sprintf(

			




	
	
	
		
 
    '%s -u %s %s %s -l', $SUDO_CMD, $user, $SUDO_OPT_H, $VACATION_CMD);

			




	
	
	
		
 
// echo ('<pre>'."\n");

			




	
	
	
		
 
// echo ($vacation_list_cmd);

			




	
	
	
		
 
// echo ('</pre>'."\n");

			




	
	
	
		
 
// fprintf($stderr, "\$vacation_list_cmd: %s<br>\n", $vacation_list_cmd);

			




	
	
	
		
 
$vacation_ausgabe = popen ($vacation_list_cmd, 'r');

			




	
	
	
		
 
$vacation_list = stream_get_contents($vacation_ausgabe);

			




	
	
	
		
 
pclose($vacation_ausgabe);

			




	
	
	
		
 

			




	
	
	
		
 
if (!empty ($vacation_list)) {

			




	
	
	
		
 
    $form[] = shl(get_text('reply_history'));

			




	
	
	
		
 
    // $form[] = '<hr class="sep"/>';

			




	
	
	
		
 
    $form[] = '<pre>';

			




	
	
	
		
 
    $form[] = $vacation_list;

			




	
	
	
		
 
    $form[] = '</pre>';

			




	
	
	
		
 
    $form[] = '<hr class="sep"/>';

			




	
	
	
		
 
    $form[] = '<span class="label">&nbsp;</span>';

			




	
	
	
		
 
    $form[] = sprintf('<input type="submit" name="delete" value="%s" /><br />', get_text('delete'));

			




	
	
	
		
 
    if ($is_admin) {

			




	
	
	
		
 
        $form[] = ('<hr class="sep"/>');

			




	
	
	
		
 
    }

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: mail.sw-amt.ws-1440
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2022 by various authors & licensed under GPLv3.
            – Support