Pārlūkot izejas kodu

Switch query sequence

Bob Mottram 7 gadus atpakaļ
vecāks
revīzija
aee80c4fb9
1 mainītis faili ar 3 papildinājumiem un 3 dzēšanām
  1. 3
    3
      src/freedombone-utils-gnusocialtools

+ 3
- 3
src/freedombone-utils-gnusocialtools Parādīt failu

@@ -563,6 +563,9 @@ function gnusocial_block_user_script {
563 563
     echo "nickname=\$(echo \"\$remove_user\" | awk -F '@' '{print \$1}')" >> /usr/bin/gnusocial-delete-user
564 564
     echo "remove_domain=\$(echo \"\$remove_user\" | awk -F '@' '{print \$2}')" >> /usr/bin/gnusocial-delete-user
565 565
     echo '' >> /usr/bin/gnusocial-delete-user
566
+    echo "database_query=\"delete from notice where content REGEXP '\@\${remove_user}';\"" >> /usr/bin/gnusocial-delete-user
567
+    echo 'mysql -u root --password="$MARIADB_PASSWORD" -e "$database_query" $database_name' >> /usr/bin/gnusocial-delete-user
568
+    echo '' >> /usr/bin/gnusocial-delete-user
566 569
     echo 'database_query="select profile.id from profile where nickname = '"'"'${nickname}'"'"' and profileurl like '"'"'%${remove_domain}%'"'"';"' >> /usr/bin/gnusocial-delete-user
567 570
     echo 'declare -a ids=$(mysql -u root --password="$MARIADB_PASSWORD" << EOF' >> /usr/bin/gnusocial-delete-user
568 571
     echo 'use $database_name;' >> /usr/bin/gnusocial-delete-user
@@ -611,9 +614,6 @@ function gnusocial_block_user_script {
611 614
     echo '' >> /usr/bin/gnusocial-delete-user
612 615
     echo '      database_query="delete from qvitternotification where to_profile_id=${id} or from_profile_id=${id};"' >> /usr/bin/gnusocial-delete-user
613 616
     echo '      mysql -u root --password="$MARIADB_PASSWORD" -e "$database_query" $database_name' >> /usr/bin/gnusocial-delete-user
614
-    echo '' >> /usr/bin/gnusocial-delete-user
615
-    echo "      database_query=\"delete from notice where content REGEXP '\@\${remove_user}';\"" >> /usr/bin/gnusocial-delete-user
616
-    echo '      mysql -u root --password="$MARIADB_PASSWORD" -e "$database_query" $database_name' >> /usr/bin/gnusocial-delete-user
617 617
     echo '  fi' >> /usr/bin/gnusocial-delete-user
618 618
     echo '  ctr=$((ctr + 1))' >> /usr/bin/gnusocial-delete-user
619 619
     echo 'done' >> /usr/bin/gnusocial-delete-user