Merge pull request #2 from FluxionNetwork/master

merge

.gitattributes

@@ -0,0 +1,191 @@
+## GITATTRIBUTES FOR WEB PROJECTS
+#
+# These settings are for any web project.
+#
+# Details per file setting:
+#   text    These files should be normalized (i.e. convert CRLF to LF).
+#   binary  These files are binary and should be left untouched.
+#
+# Note that binary is a macro for -text -diff.
+######################################################################
+
+## AUTO-DETECT
+##   Handle line endings automatically for files detected as
+##   text and leave all files detected as binary untouched.
+##   This will handle all files NOT defined below.
+* text=auto
+
+languages/* text eol=lf
+
+## SOURCE CODE
+*.bat      text eol=crlf
+*.coffee   text
+*.css      text
+*.htm      text
+*.html     text
+*.inc      text
+*.ini      text
+*.js       text
+*.json     text
+*.jsx      text
+*.less     text
+*.od       text
+*.onlydata text
+*.php      text
+*.pl       text
+*.py       text
+*.rb       text
+*.sass     text
+*.scm      text
+*.scss     text
+*.sh       text eol=lf
+*.sql      text
+*.styl     text
+*.tag      text
+*.ts       text
+*.tsx      text
+*.xml      text
+*.xhtml    text
+
+## DOCKER
+*.dockerignore    text
+Dockerfile    text
+
+## DOCUMENTATION
+*.markdown   text
+*.md         text
+*.mdwn       text
+*.mdown      text
+*.mkd        text
+*.mkdn       text
+*.mdtxt      text
+*.mdtext     text
+*.txt        text
+AUTHORS      text
+CHANGELOG    text
+CHANGES      text
+CONTRIBUTING text
+COPYING      text
+copyright    text
+*COPYRIGHT*  text
+INSTALL      text
+license      text
+LICENSE      text
+NEWS         text
+readme       text
+*README*     text
+TODO         text
+
+## TEMPLATES
+*.dot        text
+*.ejs        text
+*.haml       text
+*.handlebars text
+*.hbs        text
+*.hbt        text
+*.jade       text
+*.latte      text
+*.mustache   text
+*.njk        text
+*.phtml      text
+*.tmpl       text
+*.tpl        text
+*.twig       text
+
+## LINTERS
+.csslintrc    text
+.eslintrc     text
+.jscsrc       text
+.jshintrc     text
+.jshintignore text
+.stylelintrc  text
+
+## CONFIGS
+*.bowerrc      text
+*.cnf          text
+*.conf         text
+*.config       text
+.browserslistrc    text
+.editorconfig  text
+.gitattributes text
+.gitconfig     text
+.gitignore     text
+.htaccess      text
+*.npmignore    text
+*.yaml         text
+*.yml          text
+browserslist   text
+Makefile       text
+makefile       text
+
+## HEROKU
+Procfile    text
+.slugignore text
+
+## GRAPHICS
+*.ai   binary
+*.bmp  binary
+*.eps  binary
+*.gif  binary
+*.ico  binary
+*.jng  binary
+*.jp2  binary
+*.jpg  binary
+*.jpeg binary
+*.jpx  binary
+*.jxr  binary
+*.pdf  binary
+*.png  binary
+*.psb  binary
+*.psd  binary
+*.svg  text
+*.svgz binary
+*.tif  binary
+*.tiff binary
+*.wbmp binary
+*.webp binary
+
+## AUDIO
+*.kar  binary
+*.m4a  binary
+*.mid  binary
+*.midi binary
+*.mp3  binary
+*.ogg  binary
+*.ra   binary
+
+## VIDEO
+*.3gpp binary
+*.3gp  binary
+*.as   binary
+*.asf  binary
+*.asx  binary
+*.fla  binary
+*.flv  binary
+*.m4v  binary
+*.mng  binary
+*.mov  binary
+*.mp4  binary
+*.mpeg binary
+*.mpg  binary
+*.swc  binary
+*.swf  binary
+*.webm binary
+
+## ARCHIVES
+*.7z  binary
+*.gz  binary
+*.rar binary
+*.tar binary
+*.zip binary
+
+## FONTS
+*.ttf   binary
+*.eot   binary
+*.otf   binary
+*.woff  binary
+*.woff2 binary
+
+## EXECUTABLES
+*.exe binary
+*.pyc binary

fluxion.sh

@@ -134,7 +134,7 @@ trap exitmode SIGINT SIGHUP
 source lib/exitmode.sh
 
 #Languages for the web interface
-source language/source
+source language/source.sh
 
 # Design
 function top(){
@@ -1352,7 +1352,7 @@ function ConnectionRESET {
                         echo
                         totallines=46 # number of selection lines to print
                         itemprinted=0
-			
+
                         for line in $( seq 1 $((totallines/2+1)) ); do
                         	for column in {0..1}; do
                                 	n=$line
@@ -1416,8 +1416,8 @@ function ConnectionRESET {
                             	done
                             	echo
                         done
-                        
-			
+
+
 			echo
                         echo -n "#? "
                         read webconf

language/source.sh

@@ -21,10 +21,10 @@ source $WORK_DIR/sites/neutra/por
 source $WORK_DIR/sites/neutra/rus
 
 #TR
-source $WORK_DIR/sites/neutra/tr 
+source $WORK_DIR/sites/neutra/tr
 
 #RO
-source $WORK_DIR/sites/neutra/ro 
+source $WORK_DIR/sites/neutra/ro
 
 #HU
 source $WORK_DIR/sites/neutra/hu
@@ -33,10 +33,10 @@ source $WORK_DIR/sites/neutra/hu
 source $WORK_DIR/sites/neutra/ara
 
 #CN
-source $WORK_DIR/sites/neutra/cn 
+source $WORK_DIR/sites/neutra/cn
 
 #GR
-source $WORK_DIR/sites/neutra/gr 
+source $WORK_DIR/sites/neutra/gr
 
 #CZ
 source $WORK_DIR/sites/neutra/cz
@@ -47,7 +47,7 @@ source $WORK_DIR/sites/neutra/no
 #BG
 source $WORK_DIR/sites/neutra/bg
 
-#SRB 
+#SRB
 source $WORK_DIR/sites/neutra/srb
 
 #PL
@@ -62,13 +62,13 @@ source $WORK_DIR/sites/neutra/nl
 #DAN
 source $WORK_DIR/sites/neutra/dan
 
-#TH 
+#TH
 source $WORK_DIR/sites/neutra/th
 
-#HE 
+#HE
 source $WORK_DIR/sites/neutra/he
 
-#Portuguese 
+#Portuguese
 source $WORK_DIR/sites/neutra/por
 
 # SVN