Changeset 1149
- Timestamp:
- 05/12/08 19:45:58
(5 months ago)
- Author:
- rats
- Message:
* Fixed #1244: Use of uninitialized value in concatenation - in file engine/ispcp-htuser-mngr
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r1148 |
r1149 |
|
| 101 | 101 | FROM |
|---|
| 102 | 102 | domain |
|---|
| 103 | | LIMIT 0,1 |
|---|
| 104 | | "; |
|---|
| | 103 | LIMIT 0,1"; |
|---|
| 105 | 104 | |
|---|
| 106 | 105 | ($rs, $rdata) = doSQL($sql); |
|---|
| … | … | |
| 433 | 432 | my $id = $_; |
|---|
| 434 | 433 | |
|---|
| 435 | | #$sql = "select uname from htaccess_users where id = $id"; |
|---|
| 436 | | $sql = "SELECT uname, count(htaccess.user_id) as c FROM htaccess_users LEFT JOIN htaccess ON htaccess_users.id=htaccess.user_id WHERE htaccess_users.id=$id GROUP BY htaccess.user_id"; |
|---|
| | 434 | $sql = " |
|---|
| | 435 | SELECT |
|---|
| | 436 | uname, count(htaccess.user_id) as c |
|---|
| | 437 | FROM |
|---|
| | 438 | htaccess_users |
|---|
| | 439 | LEFT JOIN |
|---|
| | 440 | htaccess |
|---|
| | 441 | ON |
|---|
| | 442 | htaccess_users.id=htaccess.user_id |
|---|
| | 443 | WHERE |
|---|
| | 444 | htaccess_users.id = '$id' |
|---|
| | 445 | GROUP BY |
|---|
| | 446 | htaccess.user_id"; |
|---|
| 437 | 447 | |
|---|
| 438 | 448 | ($rs, $rdata) = doSQL($sql); |
|---|
| … | … | |
| 457 | 467 | my $id = $_; |
|---|
| 458 | 468 | |
|---|
| 459 | | $sql = "select count(dmn_id) from htaccess where dmn_id = $id and path='$path'"; |
|---|
| | 469 | $sql = "SELECT count(dmn_id) FROM htaccess WHERE dmn_id = '$id' AND path = '$path'"; |
|---|
| 460 | 470 | |
|---|
| 461 | 471 | ($rs, $rdata) = doSQL($sql); |
|---|
| … | … | |
| 544 | 554 | my $id = $_; |
|---|
| 545 | 555 | |
|---|
| 546 | | $sql = "select uname, upass from htaccess_users where id = $id"; |
|---|
| | 556 | $sql = "SELECT uname, upass FROM htaccess_users WHERE id = '$id'"; |
|---|
| 547 | 557 | |
|---|
| 548 | 558 | ($rs, $rdata) = doSQL($sql); |
|---|
| … | … | |
| 588 | 598 | push_el(\@main::el, 'htuser_add_user_to_group_data()', 'Starting...'); |
|---|
| 589 | 599 | |
|---|
| 590 | | my $sql = "select uname,upass from htaccess_users where id = $uid and dmn_id = $dmn_id"; |
|---|
| | 600 | my $sql = "SELECT uname,upass FROM htaccess_users WHERE id = '$uid' AND dmn_id = '$dmn_id'"; |
|---|
| 591 | 601 | |
|---|
| 592 | 602 | ($rs, $rdata) = doSQL($sql); |
|---|
| … | … | |
| 663 | 673 | my $group_id = $_; |
|---|
| 664 | 674 | |
|---|
| 665 | | $sql = <<SQL_QUERY; |
|---|
| 666 | | select |
|---|
| | 675 | $sql = " |
|---|
| | 676 | SELECT |
|---|
| 667 | 677 | ugroup, members |
|---|
| 668 | | from |
|---|
| | 678 | FROM |
|---|
| 669 | 679 | htaccess_groups |
|---|
| 670 | | where |
|---|
| 671 | | id = $group_id |
|---|
| 672 | | and |
|---|
| 673 | | dmn_id = $dmn_id |
|---|
| 674 | | SQL_QUERY |
|---|
| | 680 | WHERE |
|---|
| | 681 | id = '$group_id' |
|---|
| | 682 | AND |
|---|
| | 683 | dmn_id = '$dmn_id'"; |
|---|
| 675 | 684 | |
|---|
| 676 | 685 | ($rs, $rdata) = doSQL($sql); |
|---|
| … | … | |
| 759 | 768 | my $group_id = $_; |
|---|
| 760 | 769 | |
|---|
| 761 | | $sql = "select ugroup, members, count(htaccess.id) as c from htaccess_groups left join htaccess on htaccess.group_id=htaccess_groups.id where htaccess_groups.id = $group_id and htaccess_groups.dmn_id = $dmn_id group by htaccess.group_id"; |
|---|
| | 770 | $sql = " |
|---|
| | 771 | SELECT |
|---|
| | 772 | ugroup, members, COUNT(htaccess.id) AS c |
|---|
| | 773 | FROM |
|---|
| | 774 | htaccess_groups |
|---|
| | 775 | LEFT JOIN |
|---|
| | 776 | htaccess ON htaccess.group_id = htaccess_groups.id |
|---|
| | 777 | WHERE |
|---|
| | 778 | htaccess_groups.id = '$group_id' |
|---|
| | 779 | AND |
|---|
| | 780 | htaccess_groups.dmn_id = '$dmn_id' |
|---|
| | 781 | GROUP BY |
|---|
| | 782 | htaccess.group_id"; |
|---|
| 762 | 783 | |
|---|
| 763 | 784 | ($rs, $rdata) = doSQL($sql); |
|---|
| … | … | |
| 775 | 796 | my ($uname, $ucounter) = (undef, undef); |
|---|
| 776 | 797 | |
|---|
| 777 | | $sql = "select uname from htaccess_users where id = $id"; |
|---|
| | 798 | $sql = "SELECT uname FROM htaccess_users WHERE id = '$id'"; |
|---|
| 778 | 799 | |
|---|
| 779 | 800 | ($rs, $rdata) = doSQL($sql); |
|---|
| … | … | |
| 789 | 810 | return $rs if ($rs != 0); |
|---|
| 790 | 811 | |
|---|
| 791 | | $sql = "SELECT uname, count(htaccess.user_id) as c FROM htaccess_users LEFT JOIN htaccess ON htaccess_users.id=htaccess.user_id WHERE htaccess_users.id=$id GROUP BY htaccess.user_id"; |
|---|
| | 812 | $sql = " |
|---|
| | 813 | SELECT |
|---|
| | 814 | uname, COUNT(htaccess.user_id) AS c |
|---|
| | 815 | FROM |
|---|
| | 816 | htaccess_users |
|---|
| | 817 | LEFT JOIN |
|---|
| | 818 | htaccess ON htaccess_users.id = htaccess.user_id |
|---|
| | 819 | WHERE |
|---|
| | 820 | htaccess_users.id = '$id' |
|---|
| | 821 | GROUP BY |
|---|
| | 822 | htaccess.user_id"; |
|---|
| 792 | 823 | |
|---|
| 793 | 824 | ($rs, $rdata) = doSQL($sql); |
|---|
| … | … | |
| 813 | 844 | my $id = $_; |
|---|
| 814 | 845 | |
|---|
| 815 | | $sql = "select count(dmn_id) from htaccess where dmn_id = $id and path='$path'"; |
|---|
| | 846 | $sql = "SELECT COUNT(dmn_id) FROM htaccess WHERE dmn_id = '$id' AND path = '$path'"; |
|---|
| 816 | 847 | |
|---|
| 817 | 848 | ($rs, $rdata) = doSQL($sql); |
|---|
| … | … | |
| 862 | 893 | push_el(\@main::el, 'htuser_mngr_engine()', 'Starting...'); |
|---|
| 863 | 894 | |
|---|
| 864 | | my $sql = undef; |
|---|
| 865 | | |
|---|
| 866 | 895 | # |
|---|
| 867 | 896 | # user management; |
|---|
| 868 | 897 | # |
|---|
| 869 | 898 | |
|---|
| 870 | | $sql = <<SQL_QUERY; |
|---|
| 871 | | select |
|---|
| | 899 | my $id = $main::htuser_task_id; |
|---|
| | 900 | my $sql = " |
|---|
| | 901 | SELECT |
|---|
| 872 | 902 | t1.dmn_id, |
|---|
| 873 | 903 | t2.domain_name, |
|---|
| … | … | |
| 879 | 909 | t2.domain_uid, |
|---|
| 880 | 910 | t2.domain_gid |
|---|
| 881 | | from |
|---|
| | 911 | FROM |
|---|
| 882 | 912 | htaccess as t1, |
|---|
| 883 | 913 | domain as t2 |
|---|
| 884 | | where |
|---|
| 885 | | t1.id = $main::htuser_task_id |
|---|
| 886 | | and |
|---|
| | 914 | WHERE |
|---|
| | 915 | t1.id = '$id' |
|---|
| | 916 | AND |
|---|
| 887 | 917 | t1.user_id != 0 |
|---|
| 888 | | and |
|---|
| 889 | | t1.dmn_id = t2.domain_id |
|---|
| 890 | | SQL_QUERY |
|---|
| | 918 | AND |
|---|
| | 919 | t1.dmn_id = t2.domain_id"; |
|---|
| 891 | 920 | |
|---|
| 892 | 921 | ($rs, $rows) = doSQL($sql); |
|---|
| … | … | |
| 900 | 929 | # |
|---|
| 901 | 930 | |
|---|
| 902 | | $sql = <<SQL_QUERY; |
|---|
| 903 | | |
|---|
| 904 | | select |
|---|
| | 931 | $id = $main::htuser_task_id; |
|---|
| | 932 | $sql = " |
|---|
| | 933 | SELECT |
|---|
| 905 | 934 | t1.dmn_id, |
|---|
| 906 | 935 | t2.domain_name, |
|---|
| … | … | |
| 912 | 941 | t2.domain_uid, |
|---|
| 913 | 942 | t2.domain_gid |
|---|
| 914 | | from |
|---|
| | 943 | FROM |
|---|
| 915 | 944 | htaccess as t1, |
|---|
| 916 | 945 | domain as t2 |
|---|
| 917 | | where |
|---|
| 918 | | t1.id = $main::htuser_task_id |
|---|
| 919 | | and |
|---|
| | 946 | WHERE |
|---|
| | 947 | t1.id = '$id' |
|---|
| | 948 | AND |
|---|
| 920 | 949 | t1.group_id != 0 |
|---|
| 921 | | and |
|---|
| 922 | | t1.dmn_id = t2.domain_id |
|---|
| 923 | | |
|---|
| 924 | | SQL_QUERY |
|---|
| | 950 | AND |
|---|
| | 951 | t1.dmn_id = t2.domain_id"; |
|---|
| 925 | 952 | |
|---|
| 926 | 953 | ($rs, $rows) = doSQL($sql); |
|---|
| … | … | |
| 952 | 979 | sys_command_rs("touch $htaccess_group_cf"); |
|---|
| 953 | 980 | |
|---|
| 954 | | my $htaccess_users_file_name = |
|---|
| 955 | | |
|---|
| 956 | | $main::cfg{'HTACCESS_USERS_FILE_NAME'}; |
|---|
| 957 | | |
|---|
| 958 | | my $htaccess_groups_file_name = |
|---|
| 959 | | |
|---|
| 960 | | $main::cfg{'HTACCESS_GROUPS_FILE_NAME'}; |
|---|
| 961 | | |
|---|
| 962 | | my $apache_www_dir = |
|---|
| 963 | | |
|---|
| 964 | | $main::cfg{'APACHE_WWW_DIR'}; |
|---|
| 965 | | |
|---|
| 966 | | my $htaccess_users_file = |
|---|
| 967 | | |
|---|
| 968 | | "$apache_www_dir/$dmn_name/$htaccess_users_file_name"; |
|---|
| 969 | | |
|---|
| 970 | | my $htaccess_groups_file = |
|---|
| 971 | | |
|---|
| 972 | | "$apache_www_dir/$dmn_name/$htaccess_groups_file_name"; |
|---|
| 973 | | |
|---|
| 974 | | my $htaccess_file = |
|---|
| 975 | | |
|---|
| 976 | | "$apache_www_dir/$dmn_name/$path/.htaccess"; |
|---|
| | 981 | my $htaccess_users_file_name = $main::cfg{'HTACCESS_USERS_FILE_NAME'}; |
|---|
| | 982 | |
|---|
| | 983 | my $htaccess_groups_file_name = $main::cfg{'HTACCESS_GROUPS_FILE_NAME'}; |
|---|
| | 984 | |
|---|
| | 985 | my $apache_www_dir = $main::cfg{'APACHE_WWW_DIR'}; |
|---|
| | 986 | |
|---|
| | 987 | my $htaccess_users_file = "$apache_www_dir/$dmn_name/$htaccess_users_file_name"; |
|---|
| | 988 | |
|---|
| | 989 | my $htaccess_groups_file = "$apache_www_dir/$dmn_name/$htaccess_groups_file_name"; |
|---|
| | 990 | |
|---|
| | 991 | my $htaccess_file = "$apache_www_dir/$dmn_name/$path/.htaccess"; |
|---|
| 977 | 992 | |
|---|
| 978 | 993 | } |
|---|
| … | … | |
| 984 | 999 | if ($rs == 0) { |
|---|
| 985 | 1000 | |
|---|
| 986 | | $sql = "update htaccess set status='ok' where id = $htuser_id"; |
|---|
| | 1001 | $sql = "UPDATE htaccess SET status = 'ok' WHERE id = $htuser_id"; |
|---|
| 987 | 1002 | |
|---|
| 988 | 1003 | } else { |
|---|
| … | … | |
| 992 | 1007 | $msg =~ s/\'/\\\'/g; |
|---|
| 993 | 1008 | |
|---|
| 994 | | $sql = "update htaccess set status='$sub_name | $msg' where id = $htuser_id;"; |
|---|
| | 1009 | $sql = "UPDATE htaccess SET status= '$sub_name | $msg' WHERE id = '$htuser_id';"; |
|---|
| 995 | 1010 | |
|---|
| 996 | 1011 | } |
|---|
| … | … | |
| 1006 | 1021 | if ($rs == 0) { |
|---|
| 1007 | 1022 | |
|---|
| 1008 | | $sql = "delete from htaccess where id = $htuser_id"; |
|---|
| | 1023 | $sql = "DELETE FROM htaccess WHERE id = '$htuser_id'"; |
|---|
| 1009 | 1024 | |
|---|
| 1010 | 1025 | } else { |
|---|
| … | … | |
| 1014 | 1029 | $msg =~ s/\'/\\\'/g; |
|---|
| 1015 | 1030 | |
|---|
| 1016 | | $sql = "update htaccess set status='$sub_name | $msg' where id = $htuser_id;"; |
|---|
| | 1031 | $sql = "UPDATE htaccess SET status = '$sub_name | $msg' WHERE id = $htuser_id;"; |
|---|
| 1017 | 1032 | |
|---|
| 1018 | 1033 | } |
|---|
| … | … | |
| 1085 | 1100 | if ($rs == 0) { |
|---|
| 1086 | 1101 | |
|---|
| 1087 | | $sql = "update htaccess set status='ok' where id = $htuser_id"; |
|---|
| | 1102 | $sql = "UPDATE htaccess SET status = 'ok' WHERE id = '$htuser_id';"; |
|---|
| 1088 | 1103 | |
|---|
| 1089 | 1104 | } else { |
|---|
| … | … | |
| 1093 | 1108 | $msg =~ s/\'/\\\'/g; |
|---|
| 1094 | 1109 | |
|---|
| 1095 | | $sql = "update htaccess set status='$sub_name | $msg' where id = $htuser_id;"; |
|---|
| | 1110 | $sql = "UPDATE htaccess SET status = '$sub_name | $msg' WHERE id = '$htuser_id';"; |
|---|
| 1096 | 1111 | |
|---|
| 1097 | 1112 | } |
|---|
| … | … | |
| 1107 | 1122 | if ($rs == 0) { |
|---|
| 1108 | 1123 | |
|---|
| 1109 | | $sql = "delete from htaccess where id = $htuser_id"; |
|---|
| | 1124 | $sql = "DELETE FROM htaccess WHERE id = '$htuser_id';"; |
|---|
| 1110 | 1125 | |
|---|
| 1111 | 1126 | } else { |
|---|
| … | … | |
| 1115 | 1130 | $msg =~ s/\'/\\\'/g; |
|---|
| 1116 | 1131 | |
|---|
| 1117 | | $sql = "update htaccess set status='$sub_name | $msg' where id = $htuser_id;"; |
|---|
| | 1132 | $sql = "UPDATE htaccess SET status = '$sub_name | $msg' WHERE id = '$htuser_id';"; |
|---|
| 1118 | 1133 | |
|---|
| 1119 | 1134 | } |
|---|
| … | … | |
| 1135 | 1150 | my $htaccess_data = @$rdata[0]; |
|---|
| 1136 | 1151 | |
|---|
| 1137 | | $sql = "select uname, upass, dmn_id, status, id from htaccess_users where dmn_id = '".@$htaccess_data[0]."' and status != 'ok' "; |
|---|
| | 1152 | $sql = " |
|---|
| | 1153 | SELECT |
|---|
| | 1154 | uname, upass, dmn_id, status, id |
|---|
| | 1155 | FROM |
|---|
| | 1156 | htaccess_users |
|---|
| | 1157 | WHERE |
|---|
| | 1158 | dmn_id = '".@$htaccess_data[0]."' |
|---|
| | 1159 | AND |
|---|
| | 1160 | status != 'ok';"; |
|---|
| 1138 | 1161 | |
|---|
| 1139 | 1162 | ($rs, $rows) = doSQL($sql); |
|---|
| … | … | |
| 1167 | 1190 | return $rs if ($rs != 0); |
|---|
| 1168 | 1191 | |
|---|
| 1169 | | $sql = "update htaccess_users set status='ok' where id = @$query_user[4]"; |
|---|
| | 1192 | $sql = "UPDATE htaccess_users SET status = 'ok' WHERE id = '".@$query_user[4]."';"; |
|---|
| 1170 | 1193 | |
|---|
| 1171 | 1194 | } elsif ($htpasswd_status eq 'delete') { |
|---|
| … | … | |
| 1176 | 1199 | return $rs if ($rs != 0); |
|---|
| 1177 | 1200 | |
|---|
| 1178 | | $sql = "delete from htaccess_users where id = @$query_user[4]"; |
|---|
| | 1201 | $sql = "DELETE FROM htaccess_users WHERE id = '".@$query_user[4]."';"; |
|---|
| 1179 | 1202 | |
|---|
| 1180 | 1203 | } elsif ($htpasswd_status eq 'toadd') { |
|---|
| … | … | |
| 1185 | 1208 | return $rs if ($rs != 0); |
|---|
| 1186 | 1209 | |
|---|
| 1187 | | $sql = "update htaccess_users set status='ok' where id = @$query_user[4]"; |
|---|
| | 1210 | $sql = "UPDATE htaccess_users SET status = 'ok' WHERE id = '".@$query_user[4]."';"; |
|---|
| 1188 | 1211 | |
|---|
| 1189 | 1212 | } elsif ($htpasswd_status eq 'ok') { |
|---|
| 1190 | | |
|---|
| | 1213 | ## TODO: ? |
|---|
| 1191 | 1214 | |
|---|
| 1192 | 1215 | } else { |
|---|
| … | … | |
| 1194 | 1217 | push_el(\@main::el, 'htuser-usermanagement()', 'Failure modifying user in Domain '.$htpasswd_dnm.' : '.$htpasswd_name); |
|---|
| 1195 | 1218 | |
|---|
| 1196 | | $sql = "update htaccess_users set status='failure' where id = @$query_user[4]"; |
|---|
| | 1219 | $sql = "UPDATE htaccess_users SET status='failure' WHERE id = '".@$query_user[4]."';"; |
|---|
| 1197 | 1220 | |
|---|
| 1198 | 1221 | } |
|---|
|
