Name

src/freedombone-controlpanel

@@ -36,13 +36,13 @@ export TEXTDOMAINDIR="/usr/share/locale"
 UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
 for f in $UTILS_FILES
 do
-  source $f
+    source $f
 done
 
 APP_FILES=/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-*
 for f in $APP_FILES
 do
-  source $f
+    source $f
 done
 
 COMPLETION_FILE=$HOME/${PROJECT_NAME}-completed.txt
@@ -161,7 +161,7 @@ function passwords_show_apps {
 
 function view_or_change_passwords {
     passwords_select_user
-    if [ ! $SELECTED_USER ]; then
+    if [ ! $SELECTED_USERNAME ]; then
         return
     fi
     detect_installed_apps
@@ -170,7 +170,7 @@ function view_or_change_passwords {
         return
     fi
 
-    CURR_PASSWORD=$(${PROJECT_NAME}-pass -u ${SELECTED_USER} -a ${SELECTED_APP})
+    CURR_PASSWORD=$(${PROJECT_NAME}-pass -u ${SELECTED_USERNAME} -a ${SELECTED_APP})
 
     data=$(tempfile 2>/dev/null)
     trap "rm -f $data" 0 1 2 5 15
@@ -183,8 +183,8 @@ function view_or_change_passwords {
             CURR_PASSWORD=$(<$data)
             if [ ${#CURR_PASSWORD} -gt 8 ]; then
                 if [[ $(function_exists change_password_${SELECTED_APP}) == "1" ]]; then
-                    ${PROJECT_NAME}-pass -u ${SELECTED_USER} -a ${SELECTED_APP} -p ${CURR_PASSWORD}
-                    change_password_${SELECTED_APP} ${SELECTED_USER} "${CURR_PASSWORD}"
+                    ${PROJECT_NAME}-pass -u ${SELECTED_USERNAME} -a ${SELECTED_APP} -p ${CURR_PASSWORD}
+                    change_password_${SELECTED_APP} ${SELECTED_USERNAME} "${CURR_PASSWORD}"
                     dialog --title $"Change password" \
                            --msgbox $"The password was changed" 6 40
                 fi
@@ -1875,9 +1875,9 @@ function menu_app_settings {
     appnames+=("Exit")
 
     choice=$(dialog --stdout --backtitle $"Freedombone" \
-                     --title $"Change Settings for an App" \
-                     --radiolist $'Choose:' \
-                     16 40 20 $applist)
+                    --title $"Change Settings for an App" \
+                    --radiolist $'Choose:' \
+                    16 40 20 $applist)
 
     if [ $? -eq 0 ]; then
         app_index=$[choice-1]