Merge branch 'dev' into 'dev'

Changed password field type to password, as part of Shinobi-Systems/ShinobiCE#20

See merge request Shinobi-Systems/Shinobi!108

INSTALL/CentOS - Quick Install.sh

@@ -164,6 +164,10 @@ fi
 #Create default configuration file
 if [ ! -e "./conf.json" ]; then
     cp conf.sample.json conf.json
+	
+    #Generate a random Cron key for the config file
+    cronKey=$(< /dev/urandom tr -dc A-Za-z0-9 | head -c${1:-30})
+    sed -i -e 's/change_this_to_something_very_random__just_anything_other_than_this/'"$cronKey"'/g' conf.json
 fi
 
 if [ ! -e "./super.json" ]; then

INSTALL/centos.sh

@@ -5,9 +5,16 @@ echo "========================================================="
 echo "To answer yes type the letter (y) in lowercase and press ENTER."
 echo "Default is no (N). Skip any components you already have or don't need."
 echo "============="
+  
+#Create default configuration file
 if [ ! -e "./conf.json" ]; then
     cp conf.sample.json conf.json
+	
+    #Generate a random Cron key for the config file
+    cronKey=$(< /dev/urandom tr -dc A-Za-z0-9 | head -c${1:-30})
+    sed -i -e 's/change_this_to_something_very_random__just_anything_other_than_this/'"$cronKey"'/g' conf.json
 fi
+
 if [ ! -e "./super.json" ]; then
     echo "Default Superuser : admin@shinobi.video"
     echo "Default Password : admin"

web/pages/blocks/probe.ejs

@@ -69,7 +69,7 @@
                   </div>
                   <div class="form-group">
                     <label><div><span><%-lang['Camera Password']%></span></div>
-                        <div><input class="form-control" name="pass"></div>
+                        <div><input class="form-control" type="password" name="pass"></div>
                     </label>
                   </div>
                   <div class="form-group text-right">