kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix 2 bugs : didn't allow %% in folder names, and fix issue when using & in redirect urls

This commit is contained in:
Benjamin Sonntag 2011-10-07 14:07:03 +00:00
parent a6a6ed44cd
commit 4d391d2354
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/functions_hosting.sh
View File

@ -83,18 +83,25 @@ host_create() {
local TMP_FILE=$(mktemp "/tmp/alternc_host.XXXXXX") local TMP_FILE=$(mktemp "/tmp/alternc_host.XXXXXX")
cp "$TEMPLATE" "$TMP_FILE" cp "$TEMPLATE" "$TMP_FILE"
# Substitute special characters :
FQDN2="`echo $FQDN | sed -e 's/\\\\/\\\\\\\\/g' -e 's/#/\\\\#/g' -e 's/&/\\\\\\&/g'`"
DOCUMENT_ROOT2="`echo $DOCUMENT_ROOT | sed -e 's/\\\\/\\\\\\\\/g' -e 's/#/\\\\#/g' -e 's/&/\\\\\\&/g'`"
ACCOUNT_ROOT2="`echo $ACCOUNT_ROOT | sed -e 's/\\\\/\\\\\\\\/g' -e 's/#/\\\\#/g' -e 's/&/\\\\\\&/g'`"
REDIRECT2="`echo $REDIRECT | sed -e 's/\\\\/\\\\\\\\/g' -e 's/#/\\\\#/g' -e 's/&/\\\\\\&/g'`"
# Put the good value in the conf file # Put the good value in the conf file
sed -i \ sed -i \
-e "s#%%fqdn%%#$FQDN#g" \ -e "s#%%fqdn%%#$FQDN2#g" \
-e "s#%%document_root%%#$DOCUMENT_ROOT#g" \ -e "s#%%document_root%%#$DOCUMENT_ROOT2#g" \
-e "s#%%account_root%%#$ACCOUNT_ROOT#g" \ -e "s#%%account_root%%#$ACCOUNT_ROOT2#g" \
-e "s#%%redirect%%#$REDIRECT#g" \ -e "s#%%redirect%%#$REDIRECT2#g" \
$TMP_FILE $TMP_FILE
# Check if all is right in the conf file # Check if all is right in the conf file
# If not, put a debug message # If not, put a debug message
local ISNOTGOOD=$(grep "%%" "$TMP_FILE") # NO : redirect and document_root COULD contains legitimate %% expressions (...)
[ "$ISNOTGOOD" ] && (echo "# There was a probleme in the generation : $ISNOTGOOD" > "$TMP_FILE" ; return 44 ) # local ISNOTGOOD=$(grep "%%" "$TMP_FILE")
# [ "$ISNOTGOOD" ] && (echo "# There was a probleme in the generation : $ISNOTGOOD" > "$TMP_FILE" ; return 44 )
# Put the conf file in prod # Put the conf file in prod
mkdir -p "$(dirname "$FILE_TARGET")" mkdir -p "$(dirname "$FILE_TARGET")"