Project

General

Profile

« Previous | Next » 

Revision 1579

Added by Dietmar over 12 years ago

remove unneeded input fields in form settings

View differences:

modify_settings.php
53 53
	$setting['email_to'] = ($setting['email_to'] != '' ? $setting['email_to'] : emailAdmin());
54 54
	$setting['email_subject'] = ($setting['email_subject']  != '') ? $setting['email_subject'] : '';
55 55
	$setting['success_email_subject'] = ($setting['success_email_subject']  != '') ? $setting['success_email_subject'] : '';
56
	$setting['success_email_from'] = ($setting['success_email_from'] != '' ? $setting['success_email_from'] : SERVER_EMAIL);
56
	$setting['success_email_from'] = $admin->add_slashes(SERVER_EMAIL);
57 57
	$setting['success_email_fromname'] = ($setting['success_email_fromname'] != '' ? $setting['success_email_fromname'] : WBMAILER_DEFAULT_SENDERNAME);
58 58
	$setting['success_email_subject'] = ($setting['success_email_subject']  != '') ? $setting['success_email_subject'] : '';
59 59
}
......
141 141
			<input type="text" name="email_to" style="width: 98%;" maxlength="255" value="<?php echo str_replace($raw, $friendly, ($setting['email_to'])); ?>" />
142 142
		</td>
143 143
	</tr>
144

  
144 145
	<tr>
145
		<td class="frm-setting_name"><?php echo $TEXT['EMAIL'].' '.$MOD_FORM['FROM']; ?>:</td>
146
		<td class="frm-setting_value">
147
			<select name="email_from_field" style="width: 98%;">
148
			<option value="" onclick="javascript: document.getElementById('email_from').style.display = 'block';"><?php echo $TEXT['CUSTOM']; ?>:</option>
149
			<?php
150
			$selected = false;
151
			$email_from_value = str_replace($raw, $friendly, ($setting['email_from']));
152
			// $query_email_fields = $database->query("SELECT field_id,title FROM ".TABLE_PREFIX."mod_form_fields WHERE section_id = '$section_id' AND ( type = 'textfield' OR  type = 'email' ) ORDER BY position ASC");
153
			$sql  = 'SELECT `field_id`, `title` FROM `'.TABLE_PREFIX.'mod_form_fields` ';
154
			$sql .= 'WHERE `section_id` = '.(int)$section_id.' ';
155
			$sql .= '  AND ( `type` = \'textfield\' OR  `type` = \'email\' )';
156
			$sql .= 'ORDER BY `position` ASC ';
157
			if($query_email_fields = $database->query($sql)) {
158
				if($query_email_fields->numRows() > 0) {
159
					while($field = $query_email_fields->fetchRow(MYSQL_ASSOC)) {
160
						?>
161
						<option value="field<?php echo $field['field_id']; ?>"<?php if($email_from_value == 'field'.$field['field_id']) { echo ' selected'; $selected = true; } ?> onclick="javascript: document.getElementById('email_from').style.display = 'none';">
162
							<?php echo $TEXT['FIELD'].': '.$field['title']; ?>
163
						</option>
164
						<?php
165
					}
166
				}
167
			}
168
			?>
169
			</select>
170
			<input type="text" name="email_from" id="email_from" style="width: 98%; display: <?php if(isset($selected) AND $selected == true) { echo 'none'; } else { echo 'block'; } ?>;" maxlength="255" value="<?php if(substr($email_from_value, 0, 5) != 'field') { echo $email_from_value; } ?>" />
171
		</td>
172
	</tr>
173
	<tr>
174 146
		<td class="frm-setting_name"><?php echo $TEXT['DISPLAY_NAME']; ?>:</td>
175 147
		<td class="frm-setting_value">
176
			<select name="email_fromname_field" style="width: 98%;">
177
			<option value="" onclick="javascript: document.getElementById('email_fromname').style.display = 'block';" ><?php echo $TEXT['CUSTOM']; ?>:</option>
178
<?php
179
			$selected = false;
180
			$email_fromname_value = str_replace($raw, $friendly, ($setting['email_fromname']));
181
			if($query_email_fields->rewind()) {
182
				if($query_email_fields->numRows() > 0) {
183
						//!-- LOOP email_from_name -->
184
					while($fieldFrom = $query_email_fields->fetchRow(MYSQL_ASSOC)) {
185
?>
186
						<option value="field<?php echo $fieldFrom['field_id']; ?>"<?php if($email_fromname_value == 'field'.$fieldFrom['field_id']) { echo ' selected'; $selected = true; } ?>  onclick="javascript: document.getElementById('email_fromname').style.display = 'none';">
187
							<?php echo $TEXT['FIELD'].': '.$fieldFrom['title']; ?>
188
						</option>
189
<?php
190
					}
191
						//!-- ENDLOOP  -->
192
				}
193
			}
194
?>
195
			</select>
196
			<input type="text" name="email_fromname" id="email_fromname" style="width: 98%; display: <?php if(isset($selected) AND $selected == true) { echo 'none'; } else { echo 'block'; } ?>;" maxlength="255" value="<?php if(substr($email_fromname_value, 0, 5) != 'field') { echo $email_fromname_value; } ?>" />
148
			<input type="text" name="email_fromname" id="email_fromname" style="width: 98%;  ?>;" maxlength="255" value="<?php  echo $setting['success_email_fromname'];  ?>" />
197 149
		</td>
198 150
	</tr>
199 151
	<tr>
......
221 173
			$success_email_to = str_replace($raw, $friendly, ($setting['success_email_to']));
222 174
			$sql  = 'SELECT `field_id`, `title` FROM `'.TABLE_PREFIX.'mod_form_fields` ';
223 175
			$sql .= 'WHERE `section_id` = '.(int)$section_id.' ';
224
			$sql .= '  AND ( `type` = \'textfield\' OR  `type` = \'email\' )';
176
			$sql .= '  AND ( `type` = \'email\' AND required = \'1\' )';
225 177
			$sql .= 'ORDER BY `position` ASC ';
226 178
			if($query_email_fields = $database->query($sql)) {
227 179
				if($query_email_fields->numRows() > 0) {
......
238 190
			</select>
239 191
		</td>
240 192
	</tr>
193

  
241 194
	<tr>
242
		<td class="frm-setting_name"><?php echo $TEXT['EMAIL'].' '.$MOD_FORM['FROM']; ?>:</td>
243
		<td class="frm-setting_value">
244
			<input type="text" name="success_email_from" style="width: 98%;" maxlength="255" value="<?php echo str_replace($raw, $friendly, ($setting['success_email_from'])); ?>" />
245
		</td>
246
	</tr>
247
	<tr>
248 195
		<td class="frm-setting_name"><?php echo $TEXT['DISPLAY_NAME']; ?>:</td>
249 196
		<td class="frm-setting_value">
250 197
			<?php $setting['success_email_fromname'] = ($setting['success_email_fromname'] != '' ? $setting['success_email_fromname'] : WBMAILER_DEFAULT_SENDERNAME); ?>

Also available in: Unified diff