Project

General

Profile

« Previous | Next » 

Revision d6f53204

Added by Ermal Luçi about 16 years ago

Fix some typos in wizard.php code introduced by previous commit.
Add 'displayname' even to option fields of select.
Convert traffic_shaper_wizard to use display better names with the introduced 'displayname'

View differences:

usr/local/www/wizard.php
285 285 
		    if ($field['type'] == "input") {
286 286 
			if ($field['displayname']) {
287 287 
				echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
288 
                                echo $field['displayname']);
288 
                                echo $field['displayname'];
289 289 
                                echo ":</td>\n";
290 290 
			} else if(!$field['dontdisplayname']) {
291 291 
				echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
......
305 305 
		    } else if ($field['type'] == "inputalias") {
306 306 
			if ($field['displayname']) {
307 307 
                                echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
308 
                                echo $field['displayname']);
308 
                                echo $field['displayname'];
309 309 
                                echo ":</td>\n";
310 310 
			} else if(!$field['dontdisplayname']) {
311 311 
				echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
......
387 387 
		    } else if ($field['type'] == "select") {
388 388 
			if ($field['displayname']) {
389 389 
                                echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
390 
                                echo $field['displayname']);
390 
                                echo $field['displayname'];
391 391 
                                echo ":</td>\n";
392 392 
			} else if(!$field['dontdisplayname']) {
393 393 
				echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
......
408 408 
			foreach ($field['options']['option'] as $opt) {
409 409 
				$selected = "";
410 410 
				if($value == $opt['value']) $selected = " SELECTED";
411 
			    echo "\t<option name='" . $opt['name'] . "' value='" . $opt['value'] . "'" . $selected . ">" . $opt['name'] . "</option>\n";
411 
			    echo "\t<option name='" . $opt['name'] . "' value='" . $opt['value'] . "'" . $selected . ">";
412 
				if ($opt['displayname'])
413 
					echo $opt['displayname'];
414 
				else
415 
					echo $opt['name'];
416 
				echo "</option>\n";
412 417 
			}
413 418 
			echo "</select>\n";
414 419 
		    } else if ($field['type'] == "textarea") {
415 420 
			if ($field['displayname']) {
416 421 
                                echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
417 
                                echo $field['displayname']);
422 
                                echo $field['displayname'];
418 423 
                                echo ":</td>\n";
419 424 
			} else if(!$field['dontdisplayname']) {
420 425 
				echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
......
434 439 
		    } else if ($field['type'] == "subnet_select") {
435 440 
			if ($field['displayname']) {
436 441 
                                echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
437 
                                echo $field['displayname']);
442 
                                echo $field['displayname'];
438 443 
                                echo ":</td>\n";
439 444 
			} else if(!$field['dontdisplayname']) {
440 445 
				echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
......
454 459 
		    } else if ($field['type'] == "timezone_select") {
455 460 
			if ($field['displayname']) {
456 461 
                                echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
457 
                                echo $field['displayname']);
462 
                                echo $field['displayname'];
458 463 
                                echo ":</td>\n";
459 464 
			} else if(!$field['dontdisplayname']) {
460 465 
				echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
......
475 480 
		    } else if ($field['type'] == "checkbox") {
476 481 
			if ($field['displayname']) {
477 482 
                                echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
478 
                                echo $field['displayname']);
483 
                                echo $field['displayname'];
479 484 
                                echo ":</td>\n";
480 485 
			} else if(!$field['dontdisplayname']) {
481 486 
				echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
usr/local/www/wizards/traffic_shaper_wizard.inc
50 50 

  		




  51
  51
  
    
		$numberofinterfaces = 0;


  		




  52
  52
  
    
		$iflist = array();


  		




  53
  
  
    
		foreach ($config['interfaces'] as $if => $ifdesc) {


  		




  54
  
  
    
			if (!is_altq_capable($ifdesc['if']))


  		




  55
  
  
    
				continue;


  		




  56
  
  
    
			if (!isset($ifdesc['enable']) && $if != "lan" && $if != "wan")


  		




  
  53
  
    
		$iflisttmp = get_configured_interface_with_descr();


  		




  
  54
  
    
		foreach ($iflisttmp as $if => $ifdesc) {


  		




  
  55
  
    
			if (!is_altq_capable(get_real_interface($if)))


  		




  57
  56
  
    
				continue;


  		




  58
  57
  
    
			if ($if == "lan")


  		




  59
  58
  
    
				continue;


  		




  60
  59
  
    
			$numberofinterfaces++;


  		




  61
  
  
    
			$iflist[] = $if;


  		




  
  60
  
    
			$iflist[$if] = $ifdesc;


  		




  62
  61
  
    
		}


  		




  63
  62
  
    
		$numberofconnections = intval($config['ezshaper']['step1']['numberofconnections']);


  		




  64
  63
  
    
		if ($numberofconnections > $numberofinterfaces) {


  		




  ......




  78
  77
  
    
		*/


  		




  79
  78
  
    
		$fields = array();


  		




  80
  79
  
    

  		




  81
  
  
    
			$field = array();


  		




  82
  
  
    
			$field['name'] = "Setup LAN scheduler";


  		




  83
  
  
    
			$field['type'] = "listtopic";


  		




  84
  
  
    
			$fields[] = $field;


  		




  85
  
  
    
			$field = array();


  		




  86
  
  
    
    	    $field['name'] = "downloadscheduler";


  		




  
  80
  
    
		$field = array();


  		




  
  81
  
    
		$field['name'] = "Setup LAN scheduler";


  		




  
  82
  
    
		$field['type'] = "listtopic";


  		




  
  83
  
    
		$fields[] = $field;


  		




  
  84
  
    
		$field = array();


  		




  
  85
  
    
		$field['displayname'] = "Download Scheduler";


  		




  
  86
  
    
		$field['name'] = "downloadscheduler";


  		




  87
  87
  
    
        	$field['type'] = "select";


  		




  88
  88
  
    
	        $field['typehint'] = "Queueing discipline to apply on the download of this connection.";


  		




  89
  
  
    
    	    $field['options']['option'] = array();


  		




  90
  
  
    
   			    $opts = array();


  		




  91
  
  
    
            	$opts['name'] = "HFSC";


  		




  92
  
  
    
	            $opts['value'] = "HFSC";


  		




  93
  
  
    
    	    $field['options']['option'][] = $opts;


  		




  94
  
  
    
        	    $opts = array();


  		




  95
  
  
    
	            $opts['name'] = "CBQ";


  		




  96
  
  
    
    	        $opts['value'] = "CBQ";


  		




  97
  
  
    
        	$field['options']['option'][] = $opts;


  		




  98
  
  
    
	            $opts = array();


  		




  99
  
  
    
    	        $opts['name'] = "PRIQ";


  		




  100
  
  
    
        	    $opts['value'] = "PRIQ";


  		




  101
  
  
    
	        $field['options']['option'][] = $opts;


  		




  102
  
  
    
    	    $field['bindstofield'] = "ezshaper->step2->downloadscheduler";


  		




  103
  
  
    
        $fields[] = $field;


  		




  104
  
  
    
	


  		




  105
  
  
    
			$field = array();


  		




  106
  
  
    
            $field['name'] = "Setup connections speeds";


  		




  107
  
  
    
            $field['type'] = "listtopic";


  		




  108
  
  
    
        $fields[] = $field;


  		




  
  89
  
    
		$field['options']['option'] = array();


  		




  
  90
  
    
			$opts = array();


  		




  
  91
  
    
			$opts['name'] = "HFSC";


  		




  
  92
  
    
			$opts['value'] = "HFSC";


  		




  
  93
  
    
		$field['options']['option'][] = $opts;


  		




  
  94
  
    
			$opts = array();


  		




  
  95
  
    
			$opts['name'] = "CBQ";


  		




  
  96
  
    
			$opts['value'] = "CBQ";


  		




  
  97
  
    
		$field['options']['option'][] = $opts;


  		




  
  98
  
    
			$opts = array();


  		




  
  99
  
    
			$opts['name'] = "PRIQ";


  		




  
  100
  
    
			$opts['value'] = "PRIQ";


  		




  
  101
  
    
		$field['options']['option'][] = $opts;


  		




  
  102
  
    
		$field['bindstofield'] = "ezshaper->step2->downloadscheduler";


  		




  
  103
  
    
		$fields[] = $field;


  		




  
  104
  
    
		$field = array();


  		




  
  105
  
    
		$field['name'] = "Setup connections speeds";


  		




  
  106
  
    
		$field['type'] = "listtopic";


  		




  
  107
  
    
		$fields[] = $field;


  		




  109
  108
  
    

  		




  110
  109
  
    
		for ($i = 0; $i < $numberofconnections; $i++) {


  		




  111
  110
  
    
			$field = array();


  		




  
  111
  
    
			$field['displayname'] = "Interface";


  		




  112
  112
  
    
			$field['name'] = "conn{$i}interface";


  		




  113
  113
  
    
			$field['type'] = "select";


  		




  114
  114
  
    
			$field['typehint'] = "Interface of this connection.";


  		




  115
  115
  
    
			$field['options']['option'] = array();


  		




  116
  
  
    
			foreach ($iflist as $ifname) {


  		




  117
  
  
    
					$opts = array();


  		




  118
  
  
    
					$opts['name'] = $ifname;


  		




  119
  
  
    
					$opts['value'] = $ifname;


  		




  
  116
  
    
			foreach ($iflist as $ifname => $ifdescr) {


  		




  
  117
  
    
				$opts = array();


  		




  
  118
  
    
				$opts['displayname'] = $ifdescr;


  		




  
  119
  
    
				$opts['name'] = $ifname;


  		




  
  120
  
    
				$opts['value'] = $ifname;


  		




  120
  121
  
    
				$field['options']['option'][] = $opts;


  		




  121
  122
  
    
			}


  		




  122
  123
  
    
			$field['bindstofield'] = "ezshaper->step2->conn{$i}interface";


  		




  123
  
  
    
		$fields[] = $field;


  		




  
  124
  
    
			$fields[] = $field;


  		




  124
  125
  
    

  		




  
  126
  
    
			$field['displayname'] = "Upload Scheduler";


  		




  125
  127
  
    
			$field['name'] = "conn{$i}uploadscheduler";


  		




  126
  128
  
    
			$field['type'] = "select";


  		




  127
  129
  
    
			$field['typehint'] = "Queueing discipline to apply on the upload of this connection.";


  		




  ......




  139
  141
  
    
			$opts['value'] = "PRIQ";


  		




  140
  142
  
    
			$field['options']['option'][] = $opts;


  		




  141
  143
  
    
			$field['bindstofield'] = "ezshaper->step2->conn{$i}uploadscheduler";


  		




  142
  
  
    
		$fields[] = $field;


  		




  
  144
  
    
			$fields[] = $field;


  		




  143
  145
  
    

  		




  144
  146
  
    
			$field = array();


  		




  
  147
  
    
			$field['displayname'] = "Connection Upload";


  		




  145
  148
  
    
			$field['name'] = "conn{$i}upload";


  		




  146
  149
  
    
			$field['type'] = "input";


  		




  147
  150
  
    
			$field['bindstofield'] = "ezshaper->step2->conn{$i}upload";


  		




  148
  151
  
    
			$field['combinefieldsbegin'] = "true";


  		




  149
  
  
    
		$fields[] = $field;


  		




  
  152
  
    
			$fields[] = $field;


  		




  150
  153
  
    

  		




  151
  154
  
    
			$field = array();


  		




  152
  155
  
    
			$field['combinefieldsend'] = "true";	


  		




  ......




  154
  157
  
    
			$field['dontcombinecells'] = "true";


  		




  155
  158
  
    
			$field['name'] = "conn{$i}uploadspeed";


  		




  156
  159
  
    
			$field['typehint'] = "Upload bandwidth on this connection.";


  		




  157
  
  
    
            $field['type'] = "select";


  		




  158
  
  
    
            $field['options']['option'] = array();


  		




  159
  
  
    
     	       $opts = array();


  		




  160
  
  
    
               $opts['value'] = "Kb";


  		




  161
  
  
    
               $opts['name'] = "Kbit/s";


  		




  162
  
  
    
            $field['options']['option'][] = $opts;


  		




  163
  
  
    
               $opts = array();


  		




  164
  
  
    
               $opts['value'] = "Mb";


  		




  165
  
  
    
               $opts['name'] = "Mbit/s";


  		




  166
  
  
    
            $field['options']['option'][] = $opts;


  		




  167
  
  
    
               $opts = array();


  		




  168
  
  
    
               $opts['value'] = "Gb";


  		




  169
  
  
    
               $opts['name'] = "Gbit/s";


  		




  170
  
  
    
            $field['options']['option'][] = $opts;


  		




  171
  
  
    
            $field['bindstofield'] = "ezshaper->step2->conn{$i}uploadspeed";


  		




  172
  
  
    
		$fields[] = $field;


  		




  
  160
  
    
			$field['type'] = "select";


  		




  
  161
  
    
			$field['options']['option'] = array();


  		




  
  162
  
    
			$opts = array();


  		




  
  163
  
    
			$opts['value'] = "Kb";


  		




  
  164
  
    
			$opts['name'] = "Kbit/s";


  		




  
  165
  
    
			$field['options']['option'][] = $opts;


  		




  
  166
  
    
			$opts = array();


  		




  
  167
  
    
			$opts['value'] = "Mb";


  		




  
  168
  
    
			$opts['name'] = "Mbit/s";


  		




  
  169
  
    
			$field['options']['option'][] = $opts;


  		




  
  170
  
    
			$opts = array();


  		




  
  171
  
    
			$opts['value'] = "Gb";


  		




  
  172
  
    
			$opts['name'] = "Gbit/s";


  		




  
  173
  
    
			$field['options']['option'][] = $opts;


  		




  
  174
  
    
			$field['bindstofield'] = "ezshaper->step2->conn{$i}uploadspeed";


  		




  
  175
  
    
			$fields[] = $field;


  		




  173
  176
  
    

  		




  174
  177
  
    
			$field = array();


  		




  
  178
  
    
			$field['displayname'] = "Connection Download";


  		




  175
  179
  
    
			$field['name'] = "conn{$i}download";


  		




  176
  180
  
    
			$field['type'] = "input";


  		




  177
  181
  
    
			$field['bindstofield'] = "ezshaper->step2->conn{$i}download";


  		




  178
  182
  
    
			$field['combinefieldsbegin'] = "true";


  		




  179
  
  
    
		$fields[] = $field;


  		




  
  183
  
    
			$fields[] = $field;


  		




  180
  184
  
    

  		




  181
  185
  
    
			$field = array();


  		




  182
  
  
    
            $field['combinefieldsend'] = "true";


  		




  183
  
  
    
            $field['dontdisplayname'] = "true";


  		




  184
  
  
    
            $field['dontcombinecells'] = "true";


  		




  185
  
  
    
            $field['name'] = "conn{$i}downloadspeed";


  		




  
  186
  
    
			$field['combinefieldsend'] = "true";


  		




  
  187
  
    
			$field['dontdisplayname'] = "true";


  		




  
  188
  
    
			$field['dontcombinecells'] = "true";


  		




  
  189
  
    
			$field['name'] = "conn{$i}downloadspeed";


  		




  186
  190
  
    
			$field['typehint'] = "Download bandwidth on this connection.";


  		




  187
  
  
    
            $field['type'] = "select";


  		




  188
  
  
    
            $field['options']['option'] = array();


  		




  189
  
  
    
       	    	$opts = array();


  		




  190
  
  
    
                $opts['value'] = "Kb";


  		




  191
  
  
    
                $opts['name'] = "Kbit/s";


  		




  192
  
  
    
            $field['options']['option'][] = $opts;


  		




  193
  
  
    
                $opts = array();


  		




  194
  
  
    
                $opts['value'] = "Mb";


  		




  195
  
  
    
                $opts['name'] = "Mbit/s";


  		




  196
  
  
    
            $field['options']['option'][] = $opts;


  		




  197
  
  
    
                $opts = array();


  		




  198
  
  
    
                $opts['value'] = "Gb";


  		




  199
  
  
    
                $opts['name'] = "Gbit/s";


  		




  200
  
  
    
            $field['options']['option'][] = $opts;


  		




  201
  
  
    
            $field['bindstofield'] = "ezshaper->step2->conn{$i}downloadspeed";


  		




  202
  
  
    
        $fields[] = $field;


  		




  
  191
  
    
			$field['type'] = "select";


  		




  
  192
  
    
			$field['options']['option'] = array();


  		




  
  193
  
    
			$opts = array();


  		




  
  194
  
    
			$opts['value'] = "Kb";


  		




  
  195
  
    
			$opts['name'] = "Kbit/s";


  		




  
  196
  
    
			$field['options']['option'][] = $opts;


  		




  
  197
  
    
			$opts = array();


  		




  
  198
  
    
			$opts['value'] = "Mb";


  		




  
  199
  
    
			$opts['name'] = "Mbit/s";


  		




  
  200
  
    
			$field['options']['option'][] = $opts;


  		




  
  201
  
    
			$opts = array();


  		




  
  202
  
    
			$opts['value'] = "Gb";


  		




  
  203
  
    
			$opts['name'] = "Gbit/s";


  		




  
  204
  
    
			$field['options']['option'][] = $opts;


  		




  
  205
  
    
			$field['bindstofield'] = "ezshaper->step2->conn{$i}downloadspeed";


  		




  
  206
  
    
			$fields[] = $field;


  		




  203
  207
  
    
		}


  		




  204
  
  
    
			$field = array();


  		




  205
  
  
    
			$field['name'] = "Next";


  		




  206
  
  
    
			$field['type'] = "submit";


  		




  
  208
  
    
		$field = array();


  		




  
  209
  
    
		$field['name'] = "Next";


  		




  
  210
  
    
		$field['type'] = "submit";


  		




  207
  211
  
    
		$fields[] = $field;


  		




  208
  212
  
    

  		




  209
  213
  
    
}


  		




  ......




  336
  340
  
    
			


  		




  337
  341
  
    
		for ($i = 0; $i < $numberofconnections; $i++) {


  		




  338
  342
  
    
			$field = array();


  		




  
  343
  
    
			$field['displayname'] = "Connection upload";


  		




  339
  344
  
    
                        $field['name'] = "conn{$i}upload";


  		




  340
  345
  
    
                        $field['type'] = "input";


  		




  341
  346
  
    
                        $field['bindstofield'] = "ezshaper->step3->conn{$i}upload";


  		












Also available in:  Unified diff