- Timestamp:
- 10/25/10 21:43:09 (19 months ago)
- Location:
- branches/nightwing-backfire/nightwing/www/cgi-bin/nw_config
- Files:
-
- 2 removed
- 2 modified
-
basicSettings.cgi (modified) (8 diffs)
-
basicSettingsFunctions.cgi (modified) (8 diffs)
-
changeRootPass.sh (deleted)
-
saveAndReboot.cgi (deleted)
Legend:
- Unmodified
- Added
- Removed
-
branches/nightwing-backfire/nightwing/www/cgi-bin/nw_config/basicSettings.cgi
r534 r537 3 3 # To: Lugro-Mesh 4 4 . /www/cgi-bin/nw_config/basicSettingsFunctions.cgi 5 echo -e "Content-type: text/html\n\n" 5 6 6 7 #{ … … 53 54 if [ ! -z $WEB_ROOT_PASSWORD ] 54 55 then 55 case_root_pw $WEB_ROOT_PASSWORD 56 if [ $? -ne 0 ] 57 then 58 ACCUM=$ACCUM"<br>""ERROR: ROOT_PASSWORD<br>" 59 else 60 ACCUM=$ACCUM"<br>""OK: ROOT_PASSWORD" 61 fi 56 ACCUM=$ACCUM$(case_root_pw $WEB_ROOT_PASSWORD) 62 57 fi 63 58 64 59 if [ ! -z $WEB_WPA2_PASSPHASE ] 65 60 then 66 wpa2_pass_change $WEB_WPA2_PASSPHASE61 ACCUM=$ACCUM$(wpa2_pass_change $WEB_WPA2_PASSPHASE) 67 62 if [ $? -ne 0 ] 68 63 then … … 75 70 if [ ! -z $WEB_WEB_ADMIN_USER ] 76 71 then 77 case_httpd_user_change $WEB_WEB_ADMIN_USER78 if [ $? - ne0 ]72 ACCUM=$ACCUM$(case_httpd_user_change $WEB_WEB_ADMIN_USER) 73 if [ $? -eq 0 ] 79 74 then 80 ACCUM=$ACCUM"<br>" "ERROR: WEB_ADMIN_USER<br>"81 else82 ACCUM=$ACCUM"<br>" "OK: WEB_ADMIN_USER"83 75 HTTP_REINICIAR=1 84 76 fi … … 87 79 if [ ! -z $WEB_WEB_ADMIN_PASS ] 88 80 then 89 case_httpd_pass_change $WEB_WEB_ADMIN_PASS81 ACCUM=$ACCUM$(case_httpd_pass_change $WEB_WEB_ADMIN_PASS) 90 82 if [ $? -ne 0 ] 91 83 then … … 99 91 if [ ! -z $HTTP_REINICIAR ] 100 92 then 93 echo "HTTP rebooting: " 101 94 /etc/init.d/uhttp stop;sleep 1;/etc/init.d/uhttp start 95 if [ $? -eq 0 ] 96 then 97 echo "OK<br>" 98 else 99 echo "KO<br>" 100 fi 102 101 fi 103 102 104 103 if [ ! -z $WEB_WIFIDOG_ACCESS ] 105 104 then 106 case_wifi_dog_pass $WEB_WIFIDOG_ACCESS105 ACCUM=$ACCUM$(case_wifi_dog_pass $WEB_WIFIDOG_ACCESS) 107 106 fi 108 107 109 108 if [ ! -z $WEB_HOSTNAME ] 110 109 then 111 case_hostname $WEB_HOSTNAME110 ACCUM=$ACCUM$(case_hostname $WEB_HOSTNAME) 112 111 fi 113 112 114 113 if [ ! -z $WEB_TRAFFIC_SHAPING_STATUS ] 115 114 then 116 case_ts $WEB_TRAFFIC_SHAPING_STATUS115 ACCUM=$ACCUM$(case_ts $WEB_TRAFFIC_SHAPING_STATUS) 117 116 fi 118 117 119 118 if [ ! -z $WEB_TRAFFIC_SHAPING_HOWMUCH ] 120 119 then 121 ap_share $WEB_TRAFFIC_SHAPING_HOWMUCH120 ACCUM=$ACCUM$(ap_share $WEB_TRAFFIC_SHAPING_HOWMUCH) 122 121 fi 123 122 124 123 if [ ! -z $WEB_WIRELESS_MODE ] 125 124 then 126 wifi_mode $WEB_WIRELESS_MODE125 ACCUM=$ACCUM$(wifi_mode $WEB_WIRELESS_MODE) 127 126 fi 128 127 … … 130 129 then 131 130 reboot 132 ACCUM=$ACCUM"<br>" "OK: REBOOTING"131 ACCUM=$ACCUM"<br>""REBOOTING....<br>" 133 132 fi 134 133 135 134 # our html code 136 echo -e "Content-type: text/html\n\n"137 138 135 cat << HEADER 139 136 $(cat /www/cgi-bin/nw_config/header_html) … … 143 140 <div id="box"> 144 141 $(if [ -z $ACCUM ]; then echo "Ningun Campo Seleccionado"; else echo $ACCUM; fi) 145 $ACCUM146 142 </div> 147 143 BODY … … 150 146 $(cat /www/cgi-bin/nw_config/footer_html) 151 147 FOOTER 148 -
branches/nightwing-backfire/nightwing/www/cgi-bin/nw_config/basicSettingsFunctions.cgi
r536 r537 12 12 WIFIDOG_CHANGE="wifidog.node.change" 13 13 14 case_cambio_pass () 15 { 16 17 password=$1 18 19 fifo_in="/tmp/empty.in" # input fifo 20 fifo_out="/tmp/empty.out" # output 21 22 # ----------------------------------------------------------------------------- 23 cmd=passwd 24 #cmd="./testPass.sh" 25 tmp="/tmp/empty.tmp" # tempfile to store results 26 27 empty -f -L $tmp -i $fifo_in -o $fifo_out $cmd 28 if [ $? -eq 0 ]; then 29 if [ -w $fifo_in -a -r $fifo_out ] 30 then 31 empty -w -v -i $fifo_out -o $fifo_in -t 5 assword: "$password\n" > /dev/null 2>&1 32 empty -w -v -i $fifo_out -o $fifo_in -t 5 Retype "$password\n" > /dev/null 2>&1 33 killall empty > /dev/null 2>&1 34 killall passwd > /dev/null 2>&1 35 echo "Root's password changed" 36 else 37 echo "Error: Can't find I/O fifos!" 38 exit 1 39 fi 40 else 41 echo "Error: Can't start empty in daemon mode" 42 exit 1 43 fi 44 rm $fifo_in 45 rm $fifo_out 46 exit 0 47 48 } 49 14 50 case_root_pw () 15 51 { 16 CMD=./changeRootPass.sh17 52 PASSWORD="$1" 18 53 if [ ${#PASSWORD} -gt 7 -a ${#PASSWORD} -lt 64 ] 19 54 then 20 $CMD$PASSWORD21 if [ $? !=0 ]55 case_cambio_pass $PASSWORD 56 if [ $? -ne 0 ] 22 57 then 23 echo " <p><b> Error al cambiar el password de root</b></p>"24 return158 echo "Root's password didn't change" 59 exit 1 25 60 else 26 echo " <p><b> Password de root cambiado OK</b></p>"27 return061 echo "Root's password changed<br>" 62 exit 0 28 63 fi 29 64 else 30 echo " <h1>Hey! Coloca otro password, solo se permite numeros y letras</h1>"31 return165 echo "Hey!, root's password too short<br>" 66 exit 1 32 67 fi 33 68 } … … 37 72 HTTPPASS="$1" 38 73 HTTPUSER="$(awk -F: '{print $2}' /etc/httpd.conf)" 39 if [ [ "${#HTTPPASS}" -gt 7 && "${#HTTPPASS}" -lt 64 ]];74 if [ ${#HTTPPASS} -gt 7 -a ${#HTTPPASS} -lt 64 ]; 40 75 then 41 76 echo "/:$HTTPUSER:$(httpd -m $HTTPPASS)" > /etc/httpd.conf 42 return 0 77 echo "WEB Password Changed<br>" 78 exit 0 43 79 else 44 echo " Passphrases with length wrong. $NOCHANGED_MSG"45 return180 echo "WEB Passphrases with length wrong.<br>" 81 exit 1 46 82 fi 47 83 } … … 49 85 case_httpd_user_change () 50 86 { 51 echo "Enter user name. Requires a user name of 1 to 8 characters:" 52 HTTPUSER2=$1 87 HTTPUSER2="$1" 53 88 if [ ${#HTTPUSER2} -gt 0 -a ${#HTTPUSER2} -lt 9 ] 54 89 then 55 90 echo "/:$HTTPUSER2:$(awk -F: '{print $3}' /etc/httpd.conf)" > /etc/httpd.conf 91 echo "WEB user changed<br>" 56 92 return 0 57 93 else 58 echo " User name with length wrong. $NOCHANGED_MSG"94 echo "Enter user name. Requires a user name of 1 to 8 characters<br>" 59 95 return 1 60 96 fi … … 64 100 { 65 101 WPA2PASS=$1 66 if [ [ "${#WPA2PASS}" -gt 7 && "${#WPA2PASS}" -lt 64 ]];102 if [ ${#WPA2PASS} -gt 7 -a ${#WPA2PASS} -lt 64 ]; 67 103 then 68 104 uci set $W_PRIVATE_KEY="$WPA2PASS" 69 105 uci commit wireless 106 echo "WPA2 Password Changed<br>" 70 107 return 0 71 108 else 72 echo " Passphrases with length wrong. $NOCHANGED_MSG"109 echo "WPA2 Passphrases with length wrong.<br>" 73 110 return 1 74 111 fi … … 80 117 uci set $WMODE="$MODE" 81 118 uci commit wireless 119 echo "Wireless Mode Changed<br>" 82 120 } 83 121 … … 100 138 sleep 2 101 139 /usr/bin/nw_ts_1 start 140 echo "Traffic Shaping Value, Changed<br>" 141 else 142 echo "Traffic Shaping Value, No Changed<br>" 102 143 fi 103 144 else 104 echo "The new value must be greater than zero and not null "145 echo "The new value must be greater than zero and not null<br>" 105 146 fi 106 147 else 107 echo "New value is not a number. "148 echo "New value is not a number.<br>" 108 149 fi 109 150 } … … 117 158 if [ $(uci get $NODE_TS) == 0 ] 118 159 then 119 echo "<p> Habilitando Traffic Shapping</p>"120 160 uci set $NODE_TS="1" 121 161 uci commit nwnode 122 162 /usr/bin/nw_ts_1 start 163 echo "Habilitando Traffic Shapping<br>" 123 164 else 124 echo "<p> Dehabilitando Traffic Shapping</p>"125 165 uci set $NODE_TS="0" 126 166 uci commit nwnode 127 167 /usr/bin/nw_ts_1 stop 168 echo "Dehabilitando Traffic Shapping<br>" 128 169 fi 129 170 fi … … 135 176 uci set $HOSTNAME="$NEW_HOSTNAME" 136 177 uci commit 178 echo "Hostname Changed<br>" 137 179 } 138 180 139 181 case_wifi_dog_pass () 140 182 { 141 uci set $WIFIDOG_PASSWD= $1183 uci set $WIFIDOG_PASSWD="$1" 142 184 uci set $WIFIDOG_CHANGE=1 143 185 uci commit 186 echo "WiFiDog Pass Changed<br>" 144 187 } 188
