Changeset 348 for trunk


Ignore:
Timestamp:
Mar 18, 2009 6:19:02 PM (15 years ago)
Author:
quinn
Message:
 
Location:
trunk/lib
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/lib/App.inc.php

    r344 r348  
    106106        'log_filename' => 'app_log',
    107107
    108         // Don't email or sms duplicate messages that happen more often than this value in sceonds.
     108        // Don't email or sms duplicate messages that happen more often than this value (in seconds).
    109109        'log_multiple_timeout' => 60,
    110110
    … …  
    129129        'log_to_sms_address' => null,
    130130
    131         // Temp directory to store files that will indicate if a message has bee sent recently. Used by logMsg() for message throtteling.
    132         'log_msg_temp_dir' => '/tmp',
     131        // Temporary files directory.
     132        'tmp_dir' => '/tmp',
    133133
    134134        // A key for calculating simple cryptographic signatures. Set using as an environment variables in the httpd.conf with 'SetEnv SIGNING_KEY <key>'.
    … …  
    557557        // Create tmp files so that we don't email and sms redundantly.
    558558        $site_hash = md5(SITE_BASE);
    559         $temp_dir = $this->getParam('log_msg_temp_dir') . "/codebase_msgs_$site_hash/";
     559        $temp_dir = $this->getParam('tmp_dir') . "/codebase_msgs_$site_hash/";
    560560        $temp_file = $temp_dir . $msg_id;
    561561        if (!is_dir($temp_dir)) {

  • trunk/lib/TemplateGlue.inc.php

    r337 r348  
    109109        foreach ($blank as $key=>$val) {
    110110            $selected = ($preselected == $val) ? ' selected="selected"' : '';
    111             ?><option value="<?php echo $key; ?>"<?php echo $selected; ?>><?php echo oTxt($val); ?></option>
     111            ?><option value="<?php echo oTxt($key); ?>"<?php echo $selected; ?>><?php echo oTxt($val); ?></option>
    112112            <?php
    113113        }
    … …  
    115115    foreach ($values as $v) {
    116116        $selected = ($v == $preselected) ? ' selected' : '';
    117         ?><option value="<?php echo $v; ?>"<?php echo $selected; ?>><?php echo oTxt($v); ?></option>
     117        ?><option value="<?php echo oTxt($v); ?>"<?php echo $selected; ?>><?php echo oTxt($v); ?></option>
    118118        <?php
    119119    }
    … …  
    136136    foreach ($values as $v) {
    137137        $selected = ($v == $preselected) ? ' checked="checked"' : '';
    138         ?><input type="radio" name="<?php echo $name ?>" id="<?php echo $v; ?>" value="<?php echo $v; ?>"<?php echo $selected; ?> /><label for="<?php echo $v; ?>"><?php echo oTxt($v); ?></label>
     138        ?><input type="radio" name="<?php echo oTxt($name) ?>" id="<?php echo oTxt($v); ?>" value="<?php echo oTxt($v); ?>"<?php echo $selected; ?> /> <label class="sc-label-secondary"><?php echo oTxt($v); ?></label>
    139139        <?php
    140140    }
    … …  
    208208            $html_name = $db_col . '[' . $v . ']';
    209209        }
    210         ?><td><input type="checkbox" name="<?php echo $html_name ?>" id="<?php echo $html_name ?>"<?php echo $checked; ?> /><label for="<?php echo $html_name ?>"><?php echo oTxt($v); ?></label></td>
     210        ?><td><input type="checkbox" name="<?php echo oTxt($html_name); ?>" id="<?php echo oTxt($html_name); ?>"<?php echo $checked; ?> /><label for="<?php echo oTxt($html_name); ?>" class="sc-label-secondary"><?php echo oTxt($v); ?></label></td>
    211211        <?php
    212212    }
    … …  
    280280        }
    281281        // Print a cell with basic named checkboxes.
    282         ?><td><input type="radio" name="<?php echo $db_col; ?>" id="<?php echo $db_col . '-' . $v; ?>" value="<?php echo $v ?>"<?php echo $checked; ?> /><label class="sc-label-secondary" for="<?php echo $db_col . '-' . $v ?>"><?php echo oTxt($v); ?></label></td>
     282        ?><td><input type="radio" name="<?php echo oTxt($db_col); ?>" id="<?php echo oTxt($db_col . '-' . $v); ?>" value="<?php echo oTxt($v); ?>"<?php echo $checked; ?> /><label class="sc-label-secondary" for="<?php echo oTxt($db_col . '-' . $v); ?>"><?php echo oTxt($v); ?></label></td>
    283283        <?php
    284284    }

  • trunk/lib/Utilities.inc.php

    r340 r348  
    851851        exec(sprintf("/bin/echo '%s' | /usr/bin/sudo %s -r - --welcome-msg=%s --admin-notify=n '%s'", escapeshellarg($email), escapeshellarg($add_members), $welcome_msg, escapeshellarg($list)), $stdout, $return_code);
    852852        if (0 == $return_code) {
    853             $app->logMsg(sprintf('Mailman add member success for list: %s, user: %s', $list, $email, $stdout), LOG_INFO, __FILE__, __LINE__);
     853            $app->logMsg(sprintf('Mailman add member success for list: %s, user: %s', $list, $email), LOG_INFO, __FILE__, __LINE__);
    854854            return true;
    855855        } else {
    … …  
    883883        exec(sprintf("/usr/bin/sudo %s %s --noadminack '%s' '%s'", escapeshellarg($remove_members), $userack, escapeshellarg($list), escapeshellarg($email)), $stdout, $return_code);
    884884        if (0 == $return_code) {
    885             $app->logMsg(sprintf('Mailman remove member success for list: %s, user: %s', $list, $email, $stdout), LOG_INFO, __FILE__, __LINE__);
     885            $app->logMsg(sprintf('Mailman remove member success for list: %s, user: %s', $list, $email), LOG_INFO, __FILE__, __LINE__);
    886886            return true;
    887887        } else {
Note: See TracChangeset for help on using the changeset viewer.