Changeset 3
- Timestamp:
- 04/05/07 16:19:31 (3 years ago)
- Location:
- trunk/php
- Files:
-
- 69 modified
-
admin.php (modified) (4 diffs)
-
config.php (modified) (1 diff)
-
createpdf.php (modified) (10 diffs)
-
lframe_users.php (modified) (1 diff)
-
messages/EN/blocked.php (modified) (1 diff)
-
messages/KOI8-R/blocked.php (modified) (1 diff)
-
messages/WIN1251/blocked.php (modified) (1 diff)
-
mysqltools.php (modified) (5 diffs)
-
src/_usersbuttom_1_ldap.php (modified) (2 diffs)
-
src/adminbuttom_3_addadm.php (modified) (1 diff)
-
src/adminbuttom_4_chpasswd.php (modified) (1 diff)
-
src/adminbuttom_5_deladmin.php (modified) (2 diffs)
-
src/auth.php (modified) (4 diffs)
-
src/backupbuttom_1_savebase.php (modified) (3 diffs)
-
src/backupbuttom_2_loadbase.php (modified) (3 diffs)
-
src/configbuttom_1_prop.php (modified) (2 diffs)
-
src/configtray.php (modified) (3 diffs)
-
src/dbbuttom_1_dbcheck.php (modified) (1 diff)
-
src/dbbuttom_6_statdb.php (modified) (9 diffs)
-
src/dbbuttom_7_chname.php (modified) (4 diffs)
-
src/groupbuttom_0_prop.php (modified) (2 diffs)
-
src/groupbuttom_1_traffic.php (modified) (4 diffs)
-
src/groupbuttom_2_file.php (modified) (3 diffs)
-
src/groupbuttom_3_site.php (modified) (4 diffs)
-
src/grouptray.php (modified) (3 diffs)
-
src/localbuttom_1_savelist.php (modified) (1 diff)
-
src/localbuttom_2_loadlist.php (modified) (1 diff)
-
src/locallisttray.php (modified) (1 diff)
-
src/logbuttom_1.php (modified) (1 diff)
-
src/logbuttom_2.php (modified) (1 diff)
-
src/logbuttom_3.php (modified) (1 diff)
-
src/logbuttom_4.php (modified) (1 diff)
-
src/logbuttom_5.php (modified) (1 diff)
-
src/logbuttom_9_delete.php (modified) (1 diff)
-
src/logfunction.php (modified) (2 diffs)
-
src/monitorbuttom_1.php (modified) (1 diff)
-
src/monitorbuttom_2.php (modified) (1 diff)
-
src/newgrpbuttom_1_adldap.php (modified) (1 diff)
-
src/proxybuttom_1_down.php (modified) (1 diff)
-
src/redirbuttom_4_redirstat.php (modified) (3 diffs)
-
src/shablonbuttom_1_prop.php (modified) (1 diff)
-
src/shablontray.php (modified) (2 diffs)
-
src/squidbuttom_0_reconfig.php (modified) (1 diff)
-
src/squidbuttom_1_savebase.php (modified) (2 diffs)
-
src/squidbuttom_2_loadbase.php (modified) (1 diff)
-
src/squidbuttom_3_delete.php (modified) (1 diff)
-
src/squidbuttom_4_addcache.php (modified) (4 diffs)
-
src/urllistfunction.php (modified) (4 diffs)
-
src/userbuttom_1_prop.php (modified) (3 diffs)
-
src/userbuttom_2_traffic.php (modified) (3 diffs)
-
src/userbuttom_3_file.php (modified) (2 diffs)
-
src/userbuttom_4_site.php (modified) (3 diffs)
-
src/userbuttom_4_time.php (modified) (5 diffs)
-
src/userbuttom_5_clear.php (modified) (1 diff)
-
src/userbuttom_6_chpasswd.php (modified) (2 diffs)
-
src/userbuttom_9_delete.php (modified) (1 diff)
-
src/usersbuttom_1_adldap.php (modified) (2 diffs)
-
src/usersbuttom_1_domain.php (modified) (4 diffs)
-
src/usersbuttom_1_ncsa.php (modified) (1 diff)
-
src/usersbuttom_1_useradd.php (modified) (4 diffs)
-
src/usersbuttom_2_traffic.php (modified) (6 diffs)
-
src/usersbuttom_3_file.php (modified) (3 diffs)
-
src/usersbuttom_4_percent.php (modified) (6 diffs)
-
src/usersbuttom_5_recalc.php (modified) (2 diffs)
-
src/usersbuttom_6_clear.php (modified) (1 diff)
-
src/userstray.php (modified) (2 diffs)
-
src/usertray.php (modified) (5 diffs)
-
src/webconfigbuttom_1_prop.php (modified) (2 diffs)
-
src/webconfigtray.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/php/admin.php
r2 r3 38 38 //function UserAuthenticate($user,$passwd) 39 39 //{ 40 // global $SAMSConf; 41 // 40 42 // print("<h1>UserAuthenticate</h1>"); 41 //$newpasswd=crypt($passwd,"00");42 // db_connect( "squidctrl") or exit();43 // mysql_select_db( "squidctrl");43 // $newpasswd=crypt($passwd,"00"); 44 // db_connect($SAMSConf->MYSQLDATABASE) or exit(); 45 // mysql_select_db($SAMSConf->MYSQLDATABASE); 44 46 45 47 // $result=mysql_query("SELECT * FROM passwd WHERE user=\"$user\"&&pass=\"$passwd\" "); … … 128 130 function CheckUserPassword($user,$passwd) 129 131 { 130 db_connect("squidctrl") or exit(); 131 mysql_select_db("squidctrl"); 132 global $SAMSConf; 133 134 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 135 mysql_select_db($SAMSConf->MYSQLDATABASE); 132 136 133 137 $result=mysql_query("SELECT * FROM passwd WHERE user=\"$user\"&&pass=\"$passwd\" "); … … 163 167 function SaveUserName($passwd,$number) 164 168 { 165 global $adminname; 169 global $adminname, $SAMSConf; 170 166 171 $newpasswd=crypt($passwd,"00"); 167 172 print("passwd=$newpasswd="); 168 db_connect( "squidctrl") or exit();169 mysql_select_db( "squidctrl");173 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 174 mysql_select_db($SAMSConf->MYSQLDATABASE); 170 175 171 176 $result=mysql_query("SELECT * FROM passwd WHERE pass=\"$newpasswd\" "); … … 194 199 function UserPasswordTest($username,$passwd) 195 200 { 201 global $SAMSConf; 202 196 203 $newpasswd=crypt($passwd,"00"); 197 db_connect( "squidctrl") or exit();198 mysql_select_db( "squidctrl");204 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 205 mysql_select_db($SAMSConf->MYSQLDATABASE); 199 206 200 207 $result=mysql_query("SELECT * FROM passwd WHERE user=\"$username\" "); -
trunk/php/config.php
r2 r3 1 <?php $configfile="/etc/sams. conf"; ?>1 <?php $configfile="/etc/sams.dev.conf"; ?> -
trunk/php/createpdf.php
r2 r3 45 45 $eddate=$DATE->EndDate(); 46 46 47 db_connect( "squidlog") or exit();48 mysql_select_db( "squidlog");47 db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 48 mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 49 49 50 50 $pdfFile->AddPage(); … … 78 78 while($row=mysql_fetch_array($result)) 79 79 { 80 $result_2=mysql_query("SELECT * FROM squidctrl.squidusers WHERE squidctrl.squidusers.nick=\"$row[user]\"&&squidctrl.squidusers.domain=\"$row[domain]\"");80 $result_2=mysql_query("SELECT * FROM ".$SAMSConf->MYSQLDATABASE.".squidusers WHERE ".$SAMSConf->MYSQLDATABASE.".squidusers.nick=\"$row[user]\"&&".$SAMSConf->MYSQLDATABASE.".squidusers.domain=\"$row[domain]\""); 81 81 $row_2=mysql_fetch_array($result_2); 82 82 … … 126 126 $eddate=$DATE->EndDate(); 127 127 128 db_connect( "squidctrl") or exit();129 mysql_select_db( "squidctrl");130 131 $result=mysql_query("SELECT * FROM squidctrl.squidusers ");128 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 129 mysql_select_db($SAMSConf->MYSQLDATABASE); 130 131 $result=mysql_query("SELECT * FROM ".$SAMSConf->MYSQLDATABASE.".squidusers "); 132 132 while($row=mysql_fetch_array($result)) 133 133 { … … 146 146 $pdfFile->SetFont('Nimbus','',11); 147 147 //$pdfFile->SetFont('SUSESerif-Roman','',11); 148 $result2=mysql_query("SELECT sum(cachesum.size),cachesum.date,cachesum.user,cachesum.domain,sum(cachesum.hit) FROM squidlog.cachesum WHERE cachesum.user=\"$row[nick]\" &&cachesum.date>=\"$sdate\" &&cachesum.date<=\"$edate\" &&cachesum.domain=\"$row[domain]\" GROUP BY date");148 $result2=mysql_query("SELECT sum(cachesum.size),cachesum.date,cachesum.user,cachesum.domain,sum(cachesum.hit) FROM ".$SAMSConf->SQUIDCTRLDATABASE.".cachesum WHERE cachesum.user=\"$row[nick]\" &&cachesum.date>=\"$sdate\" &&cachesum.date<=\"$edate\" &&cachesum.domain=\"$row[domain]\" GROUP BY date"); 149 149 while($row2=mysql_fetch_array($result2)) 150 150 { … … 171 171 $ycount+=20; 172 172 173 $query="select trim(leading \"http://\" from substring_index(url,'/',3)) as norm_url,sum(size) as url_size,sum(hit) as hit_size from squidlog.cache where user=\"$row[nick]\"&&domain=\"$row[domain]\"&&date>=\"$sdate\"&&date<=\"$edate\" group by norm_url order by url_size desc limit 50";173 $query="select trim(leading \"http://\" from substring_index(url,'/',3)) as norm_url,sum(size) as url_size,sum(hit) as hit_size from ".$SAMSConf->SQUIDCTRLDATABASE.".cache where user=\"$row[nick]\"&&domain=\"$row[domain]\"&&date>=\"$sdate\"&&date<=\"$edate\" group by norm_url order by url_size desc limit 50"; 174 174 $result3=mysql_query($query); 175 175 while($row3=mysql_fetch_array($result3)) … … 217 217 $eddate=$DATE->EndDate(); 218 218 219 db_connect( "squidlog") or exit();220 mysql_select_db( "squidlog");219 db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 220 mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 221 221 222 222 $imagefile = "$SAMSConf->ICONSET/usergroup_48.jpg"; … … 260 260 261 261 } 262 $result_2=mysql_query("SELECT * FROM squidctrl.squidusers WHERE squidctrl.squidusers.nick=\"$row[user]\"&&squidctrl.squidusers.domain=\"$row[domain]\"");262 $result_2=mysql_query("SELECT * FROM ".$SAMSConf->MYSQLDATABASE.".squidusers WHERE ".$SAMSConf->MYSQLDATABASE.".squidusers.nick=\"$row[user]\"&&".$SAMSConf->MYSQLDATABASE.".squidusers.domain=\"$row[domain]\""); 263 263 $row_2=mysql_fetch_array($result_2); 264 264 pdf_show_xy($pdfFile, $count+1, 50, $ycount); … … 324 324 $eddate=$DATE->EndDate(); 325 325 326 db_connect( "squidctrl") or exit();327 mysql_select_db( "squidctrl");326 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 327 mysql_select_db($SAMSConf->MYSQLDATABASE); 328 328 329 329 $imagefile = "$SAMSConf->ICONSET/user.jpg"; … … 336 336 pdf_set_parameter($pdfFile, "FontOutline", "Nimbus=$fontdir/Nimbus.ttf"); 337 337 338 $result=mysql_query("SELECT * FROM squidctrl.squidusers WHERE squidusers.size>\"0\" ");338 $result=mysql_query("SELECT * FROM ".$SAMSConf->MYSQLDATABASE.".squidusers WHERE squidusers.size>\"0\" "); 339 339 while($row=mysql_fetch_array($result)) 340 340 { … … 344 344 pdf_begin_page($pdfFile, 595, 842); 345 345 346 $result2=mysql_query("SELECT sum(cachesum.size),cachesum.date,cachesum.user,cachesum.domain,sum(cachesum.hit) FROM squidlog.cachesum WHERE cachesum.user=\"$row[nick]\" &&cachesum.date>=\"$sdate\" &&cachesum.date<=\"$edate\" &&cachesum.domain=\"$row[domain]\" GROUP BY date");346 $result2=mysql_query("SELECT sum(cachesum.size),cachesum.date,cachesum.user,cachesum.domain,sum(cachesum.hit) FROM ".$SAMSConf->SQUIDCTRLDATABASE.".cachesum WHERE cachesum.user=\"$row[nick]\" &&cachesum.date>=\"$sdate\" &&cachesum.date<=\"$edate\" &&cachesum.domain=\"$row[domain]\" GROUP BY date"); 347 347 while($row2=mysql_fetch_array($result2)) 348 348 { -
trunk/php/lframe_users.php
r2 r3 48 48 else 49 49 { 50 $result=mysql_query("SELECT * FROM squidctrl.groups ORDER BY nick");50 $result=mysql_query("SELECT * FROM ".$SAMSConf->MYSQLDATABASE.".groups ORDER BY nick"); 51 51 } 52 52 while($row=mysql_fetch_array($result)) -
trunk/php/messages/EN/blocked.php
r2 r3 24 24 require('../../mysqltools.php'); 25 25 LoadConfig(); 26 db_connect( "squidctrl") or exit();27 mysql_select_db( "squidctrl");26 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 27 mysql_select_db($SAMSConf->MYSQLDATABASE); 28 28 $result=mysql_query("SELECT denied_to FROM sams "); 29 29 $row=mysql_fetch_array($result); -
trunk/php/messages/KOI8-R/blocked.php
r2 r3 25 25 $SAMSConf=new SAMSCONFIG(); 26 26 27 db_connect( "squidctrl") or exit();28 mysql_select_db( "squidctrl");27 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 28 mysql_select_db($SAMSConf->MYSQLDATABASE); 29 29 $result=mysql_query("SELECT denied_to FROM sams "); 30 30 $row=mysql_fetch_array($result); -
trunk/php/messages/WIN1251/blocked.php
r2 r3 23 23 require('../../mysqltools.php'); 24 24 LoadConfig(); 25 db_connect( "squidctrl") or exit();26 mysql_select_db( "squidctrl");25 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 26 mysql_select_db($SAMSConf->MYSQLDATABASE); 27 27 $result=mysql_query("SELECT denied_to FROM sams "); 28 28 $row=mysql_fetch_array($result); -
trunk/php/mysqltools.php
r2 r3 137 137 function ReadSAMSSettings() 138 138 { 139 $result=mysql_query("SELECT * FROM squidctrl.sams");139 $result=mysql_query("SELECT * FROM ".$this->MYSQLDATABASE.".sams"); 140 140 $row=mysql_fetch_array($result); 141 141 … … 150 150 $this->SEPARATOR=$row['separator']; 151 151 152 $result=mysql_query("SELECT * FROM squidctrl.globalsettings");152 $result=mysql_query("SELECT * FROM ".$this->MYSQLDATABASE.".globalsettings"); 153 153 $row=mysql_fetch_array($result); 154 154 $this->LANG=$row['lang']; … … 163 163 $this->PDFLIB=$row['createpdf']; 164 164 165 $result=mysql_query("SELECT MAX(id) FROM squidctrl.proxyes ");165 $result=mysql_query("SELECT MAX(id) FROM ".$this->MYSQLDATABASE.".proxyes "); 166 166 $row=mysql_fetch_array($result); 167 167 $this->PROXYCOUNT=$row[0]+1; … … 172 172 else 173 173 $this->SWITCHTO=1; 174 mysql_query("USE squidctrl");174 mysql_query("USE ".$this->MYSQLDATABASE); 175 175 } 176 176 function SAMSCONFIG() … … 274 274 function ReturnGroupNick($groupname) 275 275 { 276 // db_connect("squidlog") or exit(); 277 // mysql_select_db("squidctrl"); 278 $result=mysql_query("SELECT * FROM squidctrl.groups WHERE name=\"$groupname\""); 276 global $SAMSConf; 277 278 // db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 279 // mysql_select_db($SAMSConf->MYSQLDATABASE); 280 $result=mysql_query("SELECT * FROM ".$SAMSConf->MYSQLDATABASE.".groups WHERE name=\"$groupname\""); 279 281 $row=mysql_fetch_array($result); 280 282 return($row['nick']); -
trunk/php/src/_usersbuttom_1_ldap.php
r2 r3 82 82 global $WBINFOPATH; 83 83 global $LANG; 84 global $SAMSConf; 84 85 $lang="./lang/lang.$LANG"; 85 86 require($lang); … … 90 91 PageTop("user.jpg"," $usersbuttom_1_domain_AddUsersFromDomainForm_1 LDAP"); 91 92 92 db_connect( "squidctrl") or exit();93 mysql_select_db( "squidctrl");93 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 94 mysql_select_db($SAMSConf->MYSQLDATABASE); 94 95 95 96 $server = "127.0.0.1"; // ÉÍÑ ËÏÎÔÒÏÌÅÒÁ ÄÏÍÅÎÁ -
trunk/php/src/adminbuttom_3_addadm.php
r2 r3 20 20 21 21 $passwd=crypt($newpasswd,"00"); 22 db_connect( "squidctrl") or exit();23 mysql_select_db( "squidctrl");22 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 23 mysql_select_db($SAMSConf->MYSQLDATABASE); 24 24 25 $result=mysql_query("INSERT INTO squidctrl.passwd VALUES('$newuser','$passwd','1') ");25 $result=mysql_query("INSERT INTO ".$SAMSConf->MYSQLDATABASE.".passwd VALUES('$newuser','$passwd','1') "); 26 26 UpdateLog("$SAMSConf->adminname","$adminbuttom_3_addadm_AddAdmin_1 $newuser","04"); 27 27 PageTop("puser_open.gif","$adminbuttom_3_addadm_AddAdmin_2 $newuser"); -
trunk/php/src/adminbuttom_4_chpasswd.php
r2 r3 23 23 if(strstr($username,$SAMSConf->adminname)||strstr("Admin",$SAMSConf->adminname)) 24 24 { 25 db_connect( "squidctrl") or exit();26 mysql_select_db( "squidctrl");27 $result=mysql_query("UPDATE squidctrl.passwd SET pass=\"$passwd\" WHERE user=\"$username\" ");25 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 26 mysql_select_db($SAMSConf->MYSQLDATABASE); 27 $result=mysql_query("UPDATE ".$SAMSConf->MYSQLDATABASE.".passwd SET pass=\"$passwd\" WHERE user=\"$username\" "); 28 28 if($result>0) 29 29 PageTop("user_48.jpg","$adminbuttom_4_chpasswd_ChangeAdminPasswd_1 $username $adminbuttom_4_chpasswd_ChangeAdminPasswd_2"); -
trunk/php/src/adminbuttom_5_deladmin.php
r2 r3 20 20 if(strstr("Admin",$SAMSConf->adminname)||strstr("auditor",$SAMSConf->adminname)) 21 21 { 22 db_connect("squidctrl") or exit(); 23 mysql_select_db("squidctrl") 24 or print("Error\n"); 22 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 23 mysql_select_db($SAMSConf->MYSQLDATABASE) 24 or print("Error\n"); 25 25 26 $result=mysql_query("DELETE FROM passwd WHERE user=\"$username\" "); 26 27 PageTop("user_48.jpg","$adminbuttom_5_deladmin_DeleteAdmin_1 $username $adminbuttom_5_deladmin_DeleteAdmin_2"); … … 52 53 print("<INPUT TYPE=\"HIDDEN\" NAME=\"filename\" value=\"adminbuttom_5_deladmin.php\">\n"); 53 54 print("<SELECT NAME=\"username\" >\n"); 54 db_connect( "squidctrl") or exit();55 mysql_select_db( "squidctrl")55 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 56 mysql_select_db($SAMSConf->MYSQLDATABASE) 56 57 or print("Error\n"); 57 58 $result2=mysql_query("SELECT * FROM passwd WHERE user!=\"Admin\"&&user!=\"auditor\""); -
trunk/php/src/auth.php
r2 r3 127 127 function CheckUserPassword($user,$passwd) 128 128 { 129 // db_connect("squidctrl") or exit(); 130 global $SAMSConf; 131 $lang="./lang/lang.$SAMSConf->LANG"; 132 require($lang); 133 134 mysql_select_db("squidctrl"); 129 global $SAMSConf; 130 131 // db_connect($SAMSConf->MYSQLDATABASE) or exit(); 132 $lang="./lang/lang.$SAMSConf->LANG"; 133 require($lang); 134 135 mysql_select_db($SAMSConf->MYSQLDATABASE); 135 136 136 137 $result=mysql_query("SELECT * FROM passwd WHERE user=\"$user\"&&pass=\"$passwd\" "); … … 191 192 function UserAuthenticate($user,$passwd) 192 193 { 194 global $SAMSConf; 195 193 196 //$newpasswd=crypt($passwd,"00"); 194 db_connect( "squidctrl") or exit();195 mysql_select_db( "squidctrl");197 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 198 mysql_select_db($SAMSConf->MYSQLDATABASE); 196 199 197 200 $result=mysql_query("SELECT * FROM passwd WHERE user=\"$user\"&&pass=\"$passwd\" "); … … 210 213 $newpasswd=crypt($passwd,"00"); 211 214 //print("passwd=$newpasswd="); 212 db_connect( "squidctrl") or exit();213 mysql_select_db( "squidctrl");215 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 216 mysql_select_db($SAMSConf->MYSQLDATABASE); 214 217 215 218 $result=mysql_query("SELECT * FROM passwd WHERE pass=\"$newpasswd\" "); … … 242 245 function UserPasswordTest($username,$passwd) 243 246 { 247 global $SAMSConf; 248 244 249 $newpasswd=crypt($passwd,"00"); 245 db_connect( "squidctrl") or exit();246 mysql_select_db( "squidctrl");250 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 251 mysql_select_db($SAMSConf->MYSQLDATABASE); 247 252 248 253 $result=mysql_query("SELECT * FROM passwd WHERE user=\"$username\" "); -
trunk/php/src/backupbuttom_1_savebase.php
r2 r3 15 15 if($SAMSConf->access!=2) { exit; } 16 16 17 db_connect("squidctrl") or exit();18 mysql_select_db( "squidctrl")17 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 18 mysql_select_db($SAMSConf->MYSQLDATABASE) 19 19 or print("Error\n"); 20 20 … … 26 26 if(($fout=gzopen("data/$filename","w9"))!=NULL) 27 27 { 28 gzwrite($fout,"# SQUIDCTRLDUMP FOR MYSQL DATABASE\n");29 gzwrite($fout,"USE squidctrl;\n");28 gzwrite($fout,"# ".$SAMSConf->MYSQLDATABASE." DUMP FOR MYSQL DATABASE\n"); 29 gzwrite($fout,"USE ".$SAMSConf->MYSQLDATABASE.";\n"); 30 30 $result=mysql_query("SHOW TABLES"); 31 31 while($row=mysql_fetch_array($result)) //ÂÅÒÅÍ ÓÐÉÓÏË ÔÁÂÌÉÃ … … 69 69 else if(($fout=fopen("data/$filename","w9"))!=NULL) 70 70 { 71 fwrite($fout,"# SQUIDCTRLDUMP FOR MYSQL DATABASE\n");72 fwrite($fout,"USE squidctrl;\n");71 fwrite($fout,"# ".$SAMSConf->MYSQLDATABASE." DUMP FOR MYSQL DATABASE\n"); 72 fwrite($fout,"USE ".$SAMSConf->MYSQLDATABASE.";\n"); 73 73 $result=mysql_query("SHOW TABLES"); 74 74 while($row=mysql_fetch_array($result)) //ÂÅÒÅÍ ÓÐÉÓÏË ÔÁÂÌÉÃ -
trunk/php/src/backupbuttom_2_loadbase.php
r2 r3 27 27 PageTop("usergroup_48.jpg","$backupbuttom_2_loadbase_CountUserTraffic_1 1.$smon.$syea - $eday.$smon.$syea $backupbuttom_2_loadbase_CountUserTraffic_2"); 28 28 29 db_connect( "squidlog") or exit();30 mysql_select_db( "squidlog");29 db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 30 mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 31 31 32 32 $result=mysql_query("CREATE TEMPORARY TABLE cache_ SELECT sum(size),user,domain FROM cache WHERE date>=\"$sdate\"&&date<=\"$edate\" GROUP BY user,domain"); … … 34 34 while($row=mysql_fetch_array($result)) 35 35 { 36 $result2=mysql_query("UPDATE squidctrl.squidusers SET size=\"$row[0]\" WHERE nick=\"$row[user]\"&&domain=\"$row[domain]\" ");36 $result2=mysql_query("UPDATE ".$SAMSConf->MYSQLDATABASE.".squidusers SET size=\"$row[0]\" WHERE nick=\"$row[user]\"&&domain=\"$row[domain]\" "); 37 37 } 38 38 UpdateLog("$SAMSConf->adminname","$backupbuttom_2_loadbase_CountUserTraffic_3","01"); … … 43 43 function RestoreBackUp() 44 44 { 45 46 if(isset($_GET["groups"])) $groups=$_GET["groups"]; 47 if(isset($_GET["users"])) $users=$_GET["users"]; 48 if(isset($_GET["lists"])) $lists=$_GET["lists"]; 49 if(isset($_GET["shablons"])) $shablons=$_GET["shablons"]; 45 global $SAMSConf; 46 47 if(isset($_GET["groups"])) $groups=$_GET["groups"]; 48 if(isset($_GET["users"])) $users=$_GET["users"]; 49 if(isset($_GET["lists"])) $lists=$_GET["lists"]; 50 if(isset($_GET["shablons"])) $shablons=$_GET["shablons"]; 50 51 51 52 $SAMSConf->access=UserAccess(); 52 53 if($SAMSConf->access!=2) { exit; } 53 54 54 db_connect( "squidctrl") or exit();55 mysql_select_db( "squidctrl");55 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 56 mysql_select_db($SAMSConf->MYSQLDATABASE); 56 57 if(($finp=gzopen("data/loadsamsdb.sql.gz","r"))!=NULL) 57 58 { -
trunk/php/src/configbuttom_1_prop.php
r2 r3 116 116 if($checkdns=="on") 117 117 $checkdns="Y"; 118 db_connect( "squidctrl") or exit();119 mysql_select_db( "squidctrl");118 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 119 mysql_select_db($SAMSConf->MYSQLDATABASE); 120 120 $result=mysql_query("UPDATE sams SET loglevel=\"$loglevel\",sams.separator=\"0$plus$at$slashe$slashe\",checkdns=\"$checkdns\", realsize=\"$traffic\",nameencode=\"$nameencode\",sleep=\"$sleep\",count_clean=\"$count_clean\",parser_on=\"$parser_on\",parser=\"$parser\",parser_time=\"$parser_time\",bigd=\"$bigdomain\",bigu=\"$bigusername\",ntlmdomain=\"$ntlmdomain\",delaypool=\"$delaypool\",redirect_to=\"$redirect_to\",denied_to=\"$denied_to\",redirector=\"$redirector\",auth=\"$auth\", wbinfopath=\"$wbinfopath\", defaultdomain=\"$defaultdomain\", squidbase=\"$squidbase\", udscript=\"$udscript\", adminaddr=\"$adminaddr\" "); 121 121 $SAMSConf->LoadConfig(); … … 180 180 print("</SCRIPT>\n"); 181 181 182 db_connect( "squidctrl") or exit();183 mysql_select_db( "squidctrl");182 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 183 mysql_select_db($SAMSConf->MYSQLDATABASE); 184 184 $result=mysql_query("SELECT * FROM sams"); 185 185 $row=mysql_fetch_array($result); -
trunk/php/src/configtray.php
r2 r3 110 110 function SysInfo() 111 111 { 112 global $SAMSConf; 113 112 114 PageTop("stat_48.jpg","System Information"); 113 115 … … 145 147 print("<TH width=\"33%\" >Traffic\n"); 146 148 147 $result=mysql_query("SELECT sum(size),sum(hit) FROM squidlog.cachesum WHERE date>=\"$sdate\"&&date<=\"$edate\" ");149 $result=mysql_query("SELECT sum(size),sum(hit) FROM ".$SAMSConf->SQUIDCTRLDATABASE.".cachesum WHERE date>=\"$sdate\"&&date<=\"$edate\" "); 148 150 $row=mysql_fetch_array($result); 149 151 print("<TR>\n"); … … 157 159 RTableCell($aaa,33); 158 160 159 $result=mysql_query("SELECT sum(size),sum(hit) FROM squidlog.cachesum WHERE date=\"$edate\" ");161 $result=mysql_query("SELECT sum(size),sum(hit) FROM ".$SAMSConf->SQUIDCTRLDATABASE.".cachesum WHERE date=\"$edate\" "); 160 162 $row=mysql_fetch_array($result); 161 163 print("<TR>\n"); -
trunk/php/src/dbbuttom_1_dbcheck.php
r2 r3 69 69 print("</TABLE> "); 70 70 71 db_connect( "squidlog") or exit();72 mysql_select_db( "squidlog");71 db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 72 mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 73 73 //$result=mysql_query("check table cache"); 74 74 -
trunk/php/src/dbbuttom_6_statdb.php
r2 r3 21 21 print("<TD width=20% bgcolor=beige align=right><font size=-1><b>$dbbuttom_6_statdb_DBStat_3</b></TD>"); 22 22 23 $result=mysql_query("SELECT count(size) FROM squidctrl.squidusers ");23 $result=mysql_query("SELECT count(size) FROM ".$SAMSConf->MYSQLDATABASE.".squidusers "); 24 24 $row=mysql_fetch_array($result); 25 25 print("<TR>"); … … 27 27 TableCell("$row[0]"); 28 28 29 $result=mysql_query("select * FROM squidctrl.groups ");29 $result=mysql_query("select * FROM ".$SAMSConf->MYSQLDATABASE.".groups "); 30 30 while($row=mysql_fetch_array($result)) 31 31 { 32 $result2=mysql_query("SELECT count(size) FROM squidctrl.squidusers WHERE squidusers.group=\"$row[name]\" ");32 $result2=mysql_query("SELECT count(size) FROM ".$SAMSConf->MYSQLDATABASE.".squidusers WHERE squidusers.group=\"$row[name]\" "); 33 33 $row2=mysql_fetch_array($result2); 34 34 print("<TR>"); … … 37 37 } 38 38 39 $result=mysql_query("SELECT count(url) FROM squidctrl.urls ");39 $result=mysql_query("SELECT count(url) FROM ".$SAMSConf->MYSQLDATABASE.".urls "); 40 40 $row=mysql_fetch_array($result); 41 41 print("<TR>"); … … 43 43 TableCell("$row[0]"); 44 44 45 $result=mysql_query("select * FROM squidctrl.redirect ");45 $result=mysql_query("select * FROM ".$SAMSConf->MYSQLDATABASE.".redirect "); 46 46 while($row=mysql_fetch_array($result)) 47 47 { 48 $result2=mysql_query("select count(url) FROM squidctrl.urls WHERE type=\"$row[filename]\"");48 $result2=mysql_query("select count(url) FROM ".$SAMSConf->MYSQLDATABASE.".urls WHERE type=\"$row[filename]\""); 49 49 $row2=mysql_fetch_array($result2); 50 50 print("<TR>"); … … 53 53 } 54 54 55 $result=mysql_query("SELECT count(size) FROM squidlog.cache ");55 $result=mysql_query("SELECT count(size) FROM ".$SAMSConf->SQUIDCTRLDATABASE.".cache "); 56 56 $row=mysql_fetch_array($result); 57 57 print("<TR>"); … … 59 59 TableCell("$row[0]"); 60 60 61 $result=mysql_query("select * FROM squidctrl.squidusers ORDER BY nick");61 $result=mysql_query("select * FROM ".$SAMSConf->MYSQLDATABASE.".squidusers ORDER BY nick"); 62 62 while($row=mysql_fetch_array($result)) 63 63 { 64 $result2=mysql_query("SELECT count(size) FROM squidlog.cache WHERE cache.user=\"$row[nick]\"&&cache.domain=\"$row[domain]\" ");64 $result2=mysql_query("SELECT count(size) FROM ".$SAMSConf->SQUIDCTRLDATABASE.".cache WHERE cache.user=\"$row[nick]\"&&cache.domain=\"$row[domain]\" "); 65 65 $row2=mysql_fetch_array($result2); 66 66 print("<TR>"); … … 118 118 print("<TD> \n"); 119 119 print("<SELECT NAME=\"username\" SIZE=1 TABINDEX=30 >\n"); 120 db_connect( "squidctrl") or exit();121 mysql_select_db( "squidctrl")120 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 121 mysql_select_db($SAMSConf->MYSQLDATABASE) 122 122 or print("Error\n"); 123 123 $result=mysql_query("SELECT nick,domain FROM squidusers"); … … 146 146 print("<TD> \n"); 147 147 print("<SELECT NAME=\"username\" SIZE=1 TABINDEX=30 >\n"); 148 db_connect( "squidctrl") or exit();149 mysql_select_db( "squidctrl")148 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 149 mysql_select_db($SAMSConf->MYSQLDATABASE) 150 150 or print("Error\n"); 151 151 $result=mysql_query("SELECT * FROM urlreplace"); … … 165 165 print("<TD ALIGN=\"CENTER\" bgcolor=beige width=35%><font size=-1><b>URL</b></TD>"); 166 166 print("<TD ALIGN=\"CENTER\" bgcolor=beige width=35%><font size=-1><b>$dbbuttom_6_statdb_ShowReplaceURLTable_8 URL</b></TD>"); 167 $result=mysql_query("select * FROM squidctrl.urlreplace ");167 $result=mysql_query("select * FROM ".$SAMSConf->MYSQLDATABASE.".urlreplace "); 168 168 while($row=mysql_fetch_array($result)) 169 169 { -
trunk/php/src/dbbuttom_7_chname.php
r2 r3 34 34 PageTop("user.jpg"," $dbbuttom_7_chname_ChUser_1 <BR><FONT COLOR=\"BLUE\">$olddomain/$olduser -> $newdomain/$newuser</FONT><BR> $sdate - $edate"); 35 35 //print("<h3> </h3>"); 36 db_connect( "squidlog") or exit();37 mysql_select_db( "squidlog")36 db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 37 mysql_select_db($SAMSConf->SQUIDCTRLDATABASE) 38 38 or print("Error\n"); 39 39 $result=mysql_query("UPDATE cache SET user=\"$newuser\",domain=\"$newdomain\" WHERE user=\"$olduser\"&&domain=\"$olddomain\"&&date>=\"$sdate\"&&date<=\"$edate\" "); … … 55 55 if($SAMSConf->access!=2) { exit; } 56 56 57 db_connect( "squidctrl") or exit();58 mysql_select_db( "squidctrl");57 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 58 mysql_select_db($SAMSConf->MYSQLDATABASE); 59 59 60 60 PageTop("user.jpg","$dbbuttom_7_chname_ChUserForm_1"); … … 75 75 print("<SELECT NAME=\"fromuser\" ID=\"fromuser\" SIZE=1 TABINDEX=30 >\n"); 76 76 77 db_connect( "squidctrl") or exit();78 mysql_select_db( "squidctrl")77 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 78 mysql_select_db($SAMSConf->MYSQLDATABASE) 79 79 or print("Error\n"); 80 $result=mysql_query("SELECT user,domain FROM squidlog.cachesum GROUP BY user,domain ORDER BY user");80 $result=mysql_query("SELECT user,domain FROM ".$SAMSConf->SQUIDCTRLDATABASE.".cachesum GROUP BY user,domain ORDER BY user"); 81 81 while($row=mysql_fetch_array($result)) 82 82 { … … 91 91 print("<SELECT NAME=\"touser\" ID=\"touser\" SIZE=1 TABINDEX=30 >\n"); 92 92 93 db_connect( "squidctrl") or exit();94 mysql_select_db( "squidctrl")93 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 94 mysql_select_db($SAMSConf->MYSQLDATABASE) 95 95 or print("Error\n"); 96 96 $result=mysql_query("SELECT nick,domain FROM squidusers ORDER BY nick"); -
trunk/php/src/groupbuttom_0_prop.php
r2 r3 9 9 { 10 10 global $SAMSConf; 11 11 12 $SAMSConf->access=UserAccess(); 12 13 if($SAMSConf->access!=2) { exit; } … … 15 16 if(isset($_GET["nick"])) $nick=$_GET["nick"]; 16 17 17 db_connect( "squidctrl") or exit();18 mysql_select_db( "squidctrl");18 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 19 mysql_select_db($SAMSConf->MYSQLDATABASE); 19 20 $result=mysql_query("DELETE FROM sconfig WHERE sname=\"$sname\" "); 20 21 -
trunk/php/src/groupbuttom_1_traffic.php
r2 r3 22 22 $eddate=$DATE->EndDate(); 23 23 24 db_connect( "squidlog") or exit();25 db_connect( "squidctrl") or exit();26 mysql_select_db( "squidlog");24 db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 25 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 26 mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 27 27 28 28 $aaa=ReturnGroupNick($groupname); 29 29 30 $result=mysql_query("SELECT user,cachesum.domain,sum(cachesum.hit),sum(cachesum.size) as sizeall FROM squidlog.cachesum , squidctrl.squidusers as tu WHERE tu.nick=cachesum.user && tu.domain=cachesum.domain && tu.group=\"$groupname\" && date>=\"$sdate\"&&date<=\"$edate\" group by user order by sizeall desc");30 $result=mysql_query("SELECT user,cachesum.domain,sum(cachesum.hit),sum(cachesum.size) as sizeall FROM ".$SAMSConf->SQUIDCTRLDATABASE.".cachesum , ".$SAMSConf->MYSQLDATABASE.".squidusers as tu WHERE tu.nick=cachesum.user && tu.domain=cachesum.domain && tu.group=\"$groupname\" && date>=\"$sdate\"&&date<=\"$edate\" group by user order by sizeall desc"); 31 31 $count=0; 32 32 while ($row=mysql_fetch_array($result)) … … 59 59 $eddate=$DATE->EndDate(); 60 60 61 db_connect( "squidlog") or exit();62 db_connect( "squidctrl") or exit();63 mysql_select_db( "squidlog");61 db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 62 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 63 mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 64 64 65 65 $aaa=ReturnGroupNick($groupname); … … 96 96 print("<TH>$groupbuttom_1_traffic_GroupTrafficPeriod_4"); 97 97 98 //$result=mysql_query("SELECT user,cachesum.domain,sum(cachesum.hit),sum(cachesum.size) as sizeall FROM squidlog.cachesum , squidctrl.squidusers as tu WHERE tu.nick=cachesum.user && tu.domain=cachesum.domain && tu.group=\"$groupname\" && date>=\"$sdate\"&&date<=\"$edate\" group by user order by sizeall desc");99 $result=mysql_query("SELECT cachesum.user,cachesum.domain,sum(cachesum.hit),sum(cachesum.size) as sizeall, tu.name, tu.family, cachesum.domain FROM squidlog.cachesum, squidctrl.squidusers as tu WHERE tu.nick=cachesum.user && tu.domain=cachesum.domain && tu.group=\"$groupname\" && date>=\"$sdate\"&&date<=\"$edate\" group by user order by sizeall desc");98 //$result=mysql_query("SELECT user,cachesum.domain,sum(cachesum.hit),sum(cachesum.size) as sizeall FROM ".$SAMSConf->SQUIDCTRLDATABASE.".cachesum , ".$SAMSConf->MYSQLDATABASE.".squidusers as tu WHERE tu.nick=cachesum.user && tu.domain=cachesum.domain && tu.group=\"$groupname\" && date>=\"$sdate\"&&date<=\"$edate\" group by user order by sizeall desc"); 99 $result=mysql_query("SELECT cachesum.user,cachesum.domain,sum(cachesum.hit),sum(cachesum.size) as sizeall, tu.name, tu.family, cachesum.domain FROM ".$SAMSConf->SQUIDCTRLDATABASE.".cachesum, ".$SAMSConf->MYSQLDATABASE.".squidusers as tu WHERE tu.nick=cachesum.user && tu.domain=cachesum.domain && tu.group=\"$groupname\" && date>=\"$sdate\"&&date<=\"$edate\" group by user order by sizeall desc"); 100 100 while ($row=mysql_fetch_array($result)) 101 101 { … … 157 157 if(isset($_GET["groupname"])) $groupname=$_GET["groupname"]; 158 158 159 db_connect( "squidctrl") or exit();160 mysql_select_db( "squidctrl");159 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 160 mysql_select_db($SAMSConf->MYSQLDATABASE); 161 161 $result=mysql_query("SELECT * FROM groups WHERE name=\"$groupname\" "); 162 162 $row=mysql_fetch_array($result); -
trunk/php/src/groupbuttom_2_file.php
r2 r3 39 39 40 40 $filesize=($filesize*$SAMSConf->KBSIZE)-1; 41 db_connect( "squidlog") or exit();42 mysql_select_db( "squidlog");41 db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 42 mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 43 43 44 44 print("<TABLE CLASS=samstable>"); … … 50 50 $count=0; 51 51 52 $query="SELECT cache.user,cache.date,cache.size,cache.url, tu.name, tu.family, cache.domain FROM cache , squidctrl.squidusers AS tu WHERE tu.nick=cache.user&&tu.domain=cache.domain&&tu.group=\"$groupname\"&&date>=\"$sdate\"&&date<=\"$edate\"&&cache.size>=\"$filesize\" order by cache.size desc limit 250";52 $query="SELECT cache.user,cache.date,cache.size,cache.url, tu.name, tu.family, cache.domain FROM cache , ".$SAMSConf->MYSQLDATABASE.".squidusers AS tu WHERE tu.nick=cache.user&&tu.domain=cache.domain&&tu.group=\"$groupname\"&&date>=\"$sdate\"&&date<=\"$edate\"&&cache.size>=\"$filesize\" order by cache.size desc limit 250"; 53 53 $result=mysql_query($query); 54 54 while($row=mysql_fetch_array($result)) … … 91 91 if(isset($_GET["groupname"])) $groupname=$_GET["groupname"]; 92 92 93 db_connect( "squidctrl") or exit();94 mysql_select_db( "squidctrl");93 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 94 mysql_select_db($SAMSConf->MYSQLDATABASE); 95 95 $result=mysql_query("SELECT * FROM groups WHERE name=\"$groupname\" "); 96 96 $row=mysql_fetch_array($result); -
trunk/php/src/groupbuttom_3_site.php
r2 r3 70 70 print("<TH>URL"); 71 71 72 mysql_select_db( "squidlog");72 mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 73 73 $result=mysql_query("SELECT date,user,size,url FROM cache WHERE date>=\"$sdate\"&&date<=\"$edate\"&&url like \"%$site%\" ORDER BY size desc limit 250"); 74 74 … … 130 130 print("<TH>URL"); 131 131 132 db_connect( "squidlog") or exit();133 mysql_select_db( "squidctrl");132 db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 133 mysql_select_db($SAMSConf->MYSQLDATABASE); 134 134 $result=mysql_query("SELECT * FROM squidusers WHERE squidusers.group=\"$groupname\""); 135 135 … … 145 145 $filesize=($filesize*$SAMSConf->KBSIZE)-1; 146 146 147 db_connect( "squidlog") or exit();148 mysql_select_db( "squidlog");149 $result=mysql_query("CREATE TEMPORARY TABLE cache_ SELECT tc.* FROM squidlog.cache AS tc, squidctrl.squidusers AS tu WHERE tc.user = tu.nick AND tc.domain = tu.domain AND tu.group=\"$groupname\" AND tc.date>=\"$sdate\" AND tc.date<=\"$edate\"");147 db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 148 mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 149 $result=mysql_query("CREATE TEMPORARY TABLE cache_ SELECT tc.* FROM ".$SAMSConf->SQUIDCTRLDATABASE.".cache AS tc, ".$SAMSConf->MYSQLDATABASE."squidusers AS tu WHERE tc.user = tu.nick AND tc.domain = tu.domain AND tu.group=\"$groupname\" AND tc.date>=\"$sdate\" AND tc.date<=\"$edate\""); 150 150 $result=mysql_query("UPDATE cache_ SET url=SUBSTRING_INDEX(url,'/',3) "); 151 151 … … 185 185 186 186 if(isset($_GET["groupname"])) $groupname=$_GET["groupname"]; 187 db_connect( "squidctrl") or exit();188 mysql_select_db( "squidctrl");187 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 188 mysql_select_db($SAMSConf->MYSQLDATABASE); 189 189 $result=mysql_query("SELECT * FROM groups WHERE name=\"$groupname\" "); 190 190 $row=mysql_fetch_array($result); -
trunk/php/src/grouptray.php
r2 r3 41 41 function UserGroupForm() 42 42 { 43 global $SAMSConf; 43 44 44 global $SAMSConf;45 45 $lang="./lang/lang.$SAMSConf->LANG"; 46 46 require($lang); … … 49 49 if(isset($_GET["groupname"])) $groupname=$_GET["groupname"]; 50 50 51 db_connect( "squidctrl") or exit();52 mysql_select_db( "squidctrl")51 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 52 mysql_select_db($SAMSConf->MYSQLDATABASE) 53 53 or print("Error\n"); 54 54 $ga=0; … … 174 174 print("</SCRIPT> \n"); 175 175 176 db_connect( "squidctrl") or exit();177 mysql_select_db( "squidctrl");176 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 177 mysql_select_db($SAMSConf->MYSQLDATABASE); 178 178 $result=mysql_query("SELECT * FROM groups WHERE name=\"$groupname\" "); 179 179 $row=mysql_fetch_array($result); -
trunk/php/src/localbuttom_1_savelist.php
r2 r3 12 12 require($lang); 13 13 14 db_connect( "squidctrl") or exit();15 mysql_select_db( "squidctrl")14 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 15 mysql_select_db($SAMSConf->MYSQLDATABASE) 16 16 or print("Error\n"); 17 17 -
trunk/php/src/localbuttom_2_loadlist.php
r2 r3 24 24 25 25 $finp=fopen("data/urllist.txt","r"); 26 db_connect( "squidctrl") or exit();27 mysql_select_db( "squidctrl")26 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 27 mysql_select_db($SAMSConf->MYSQLDATABASE) 28 28 or print("Error\n"); 29 29 while(feof($finp)==0) -
trunk/php/src/locallisttray.php
r2 r3 15 15 $count=0; 16 16 17 db_connect( "squidctrl") or exit();18 mysql_select_db( "squidctrl")17 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 18 mysql_select_db($SAMSConf->MYSQLDATABASE) 19 19 or print("Error\n"); 20 20 -
trunk/php/src/logbuttom_1.php
r2 r3 24 24 25 25 PageTop("log_48.jpg","$log_1"); 26 db_connect( "squidctrl") or exit();27 mysql_select_db( "squidctrl");26 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 27 mysql_select_db($SAMSConf->MYSQLDATABASE); 28 28 29 29 if($username=="on") -
trunk/php/src/logbuttom_2.php
r2 r3 25 25 NewDateSelect(0,""); 26 26 print("</FORM>\n"); 27 db_connect( "squidctrl") or exit();28 mysql_select_db( "squidctrl");27 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 28 mysql_select_db($SAMSConf->MYSQLDATABASE); 29 29 30 30 $result=mysql_query("SELECT * FROM log WHERE code=\"01\"&&date>=\"$sdate\"&&date<=\"$edate\" "); -
trunk/php/src/logbuttom_3.php
r2 r3 27 27 28 28 29 db_connect( "squidctrl") or exit();30 mysql_select_db( "squidctrl");29 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 30 mysql_select_db($SAMSConf->MYSQLDATABASE); 31 31 32 32 $result=mysql_query("SELECT * FROM log WHERE code=\"02\"&&date>=\"$sdate\"&&date<=\"$edate\" "); -
trunk/php/src/logbuttom_4.php
r2 r3 26 26 print("</FORM>\n"); 27 27 28 db_connect( "squidctrl") or exit();29 mysql_select_db( "squidctrl");28 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 29 mysql_select_db($SAMSConf->MYSQLDATABASE); 30 30 31 31 $result=mysql_query("SELECT * FROM log WHERE code=\"04\"&&date>=\"$sdate\"&&date<=\"$edate\" "); -
trunk/php/src/logbuttom_5.php
r2 r3 27 27 print("</FORM>\n"); 28 28 29 db_connect( "squidctrl") or exit();30 mysql_select_db( "squidctrl");29 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 30 mysql_select_db($SAMSConf->MYSQLDATABASE); 31 31 32 32 $result=mysql_query("SELECT * FROM log WHERE code=\"10\"&&date>=\"$sdate\"&&date<=\"$edate\" "); -
trunk/php/src/logbuttom_9_delete.php
r2 r3 19 19 if($SAMSConf->access!=2) { exit; } 20 20 21 db_connect( "squidctrl") or exit();22 mysql_select_db( "squidctrl")21 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 22 mysql_select_db($SAMSConf->MYSQLDATABASE) 23 23 or print("Error\n"); 24 $result=mysql_query("DELETE FROM squidctrl.log WHERE date>=\"$sdate\"&&date<=\"$edate\"");24 $result=mysql_query("DELETE FROM ".$SAMSConf->MYSQLDATABASE.".log WHERE date>=\"$sdate\"&&date<=\"$edate\""); 25 25 print("<H3>õÄÁÌÅÎÙ ÌÏÇÉ</H3> $traffic_2 $bdate $traffic_3 $eddate "); 26 26 // UpdateLog("$SAMSConf->adminname","$squidbuttom_3_delete_ClearSquidLog_1 $traffic_2 $sday.$smon.$syea $traffic_3 $eday.$emon.$eyea","03"); -
trunk/php/src/logfunction.php
r2 r3 11 11 function UpdateLog($username,$value,$code) 12 12 { 13 global $SAMSConf; 14 13 15 $year=date("Y")*1; 14 16 $month=date("m")*1; … … 19 21 $sec=date("s")*1; 20 22 $time="$hour:$min:$sec"; 21 db_connect( "squidctrl") or exit();22 mysql_select_db( "squidctrl");23 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 24 mysql_select_db($SAMSConf->MYSQLDATABASE); 23 25 $result=mysql_query("INSERT INTO log SET user=\"$username\",date=\"$date\",time=\"$time\",value=\"$value\",code=\"$code\" "); 24 26 } -
trunk/php/src/monitorbuttom_1.php
r2 r3 16 16 printf("setTimeout('Refr();',5000);\n"); 17 17 printf("</SCRIPT>\n"); 18 db_connect( "squidlog") or exit();19 mysql_select_db( "squidctrl");18 db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 19 mysql_select_db($SAMSConf->MYSQLDATABASE); 20 20 21 21 $result=mysql_query("SELECT * FROM squidusers ORDER BY nick"); -
trunk/php/src/monitorbuttom_2.php
r2 r3 16 16 printf("setTimeout('Refr();',5000);\n"); 17 17 printf("</SCRIPT>\n"); 18 db_connect( "squidlog") or exit();19 mysql_select_db( "squidctrl");18 db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 19 mysql_select_db($SAMSConf->MYSQLDATABASE); 20 20 21 21 $result=mysql_query("SELECT * FROM squidusers ORDER BY size DESC"); -
trunk/php/src/newgrpbuttom_1_adldap.php
r2 r3 50 50 if($SAMSConf->access!=2) { exit; } 51 51 52 db_connect( "squidctrl") or exit();53 mysql_select_db( "squidctrl");52 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 53 mysql_select_db($SAMSConf->MYSQLDATABASE); 54 54 55 55 PageTop("user.jpg"," $newgroupbuttom_1_adldap_AddGroupsFromAdLDAPForm_1"); -
trunk/php/src/proxybuttom_1_down.php
r2 r3 53 53 print("<TH width=60%>$shutdown_proxy_proxybuttom_1_down_1"); 54 54 print("<TH width=20%>$shutdown_proxy_proxybuttom_1_down_2"); 55 $result=mysql_query("SELECT id,description FROM squidctrl.proxyes ORDER BY id");55 $result=mysql_query("SELECT id,description FROM ".$SAMSConf->MYSQLDATABASE.".proxyes ORDER BY id"); 56 56 while($row=mysql_fetch_array($result)) 57 57 { -
trunk/php/src/redirbuttom_4_redirstat.php
r2 r3 21 21 $eddate=$DATE->EndDate(); 22 22 23 db_connect( "squidctrl") or exit();24 mysql_select_db( "squidctrl");23 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 24 mysql_select_db($SAMSConf->MYSQLDATABASE); 25 25 26 26 PageTop("user.jpg","óÔÁÔÉÓÔÉËÁ ÓÐÉÓËÁ ÐÅÒÅÎÁÐÒÁ×ÌÅÎÉÑ ÚÁÐÒÏÓÏ× <BR><FONT COLOR=\"BLUE\">$row[name]</FONT>"); … … 44 44 $filesize=$filesize*$SAMSConf->KBSIZE; 45 45 46 $result=mysql_query("SELECT * FROM squidctrl.urls WHERE type=\"$id\" ");46 $result=mysql_query("SELECT * FROM ".$SAMSConf->MYSQLDATABASE.".urls WHERE type=\"$id\" "); 47 47 while($row=mysql_fetch_array($result)) 48 48 { 49 $result2=mysql_query("SELECT count(*) FROM squidlog.cache WHERE date>=\"$sdate\"&&date<=\"$edate\"&&url LIKE \"%$row[url]%\" ");49 $result2=mysql_query("SELECT count(*) FROM ".$SAMSConf->SQUIDCTRLDATABASE.".cache WHERE date>=\"$sdate\"&&date<=\"$edate\"&&url LIKE \"%$row[url]%\" "); 50 50 $row2=mysql_fetch_array($result2); 51 51 print("<TR>"); … … 70 70 if(isset($_GET["id"])) $id=$_GET["id"]; 71 71 72 db_connect( "squidctrl") or exit();73 mysql_select_db( "squidctrl");72 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 73 mysql_select_db($SAMSConf->MYSQLDATABASE); 74 74 $result=mysql_query("SELECT * FROM redirect WHERE filename=\"$id\" "); 75 75 $row=mysql_fetch_array($result); -
trunk/php/src/shablonbuttom_1_prop.php
r2 r3 64 64 $emin="00"; 65 65 66 db_connect( "squidctrl") or exit();67 mysql_select_db( "squidctrl");66 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 67 mysql_select_db($SAMSConf->MYSQLDATABASE); 68 68 $result=mysql_query("DELETE FROM sconfig WHERE sname=\"$sname\" "); 69 69 -
trunk/php/src/shablontray.php
r2 r3 18 18 if($SAMSConf->access!=2) { exit; } 19 19 20 db_connect( "squidctrl") or exit();21 mysql_select_db( "squidctrl")20 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 21 mysql_select_db($SAMSConf->MYSQLDATABASE) 22 22 or print("Error\n"); 23 23 $result=mysql_query("SELECT * FROM shablons WHERE shablons.name=\"$id\" "); … … 75 75 if($SAMSConf->access==2) 76 76 { 77 db_connect( "squidctrl") or exit();78 mysql_select_db( "squidctrl");77 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 78 mysql_select_db($SAMSConf->MYSQLDATABASE); 79 79 $result=mysql_query("SELECT * FROM shablons WHERE name=\"$id\" "); 80 80 $row=mysql_fetch_array($result); -
trunk/php/src/squidbuttom_0_reconfig.php
r2 r3 81 81 print("<TH width=60%>$squidbuttom_0_reconfig_ReconfigSquidForm_3"); 82 82 print("<TH width=20%>$squidbuttom_0_reconfig_ReconfigSquidForm_4"); 83 $result=mysql_query("SELECT id,description FROM squidctrl.proxyes ORDER BY id");83 $result=mysql_query("SELECT id,description FROM ".$SAMSConf->MYSQLDATABASE.".proxyes ORDER BY id"); 84 84 while($row=mysql_fetch_array($result)) 85 85 { -
trunk/php/src/squidbuttom_1_savebase.php
r2 r3 21 21 if($SAMSConf->access!=2) { exit; } 22 22 23 db_connect( "squidlog") or exit();24 mysql_select_db( "squidlog")23 db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 24 mysql_select_db($SAMSConf->SQUIDCTRLDATABASE) 25 25 or print("Error\n"); 26 26 … … 30 30 $fout=gzopen("data/$filename","w9"); 31 31 gzwrite($fout,"# SQUIDLOG DUMP FOR MYSQL DATABASE\n\n"); 32 gzwrite($fout," USE squidlog; \n");32 gzwrite($fout," USE ".$SAMSConf->SQUIDCTRLDATABASE."; \n"); 33 33 34 34 //ÚÁÐÉÓÙ×ÁÅÍ squidlog.cache -
trunk/php/src/squidbuttom_2_loadbase.php
r2 r3 14 14 15 15 copy($_FILES['userfile']['tmp_name'],"data/loadsquid.sql"); 16 db_connect( "squidlog") or exit();17 mysql_select_db( "squidlog");16 db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 17 mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 18 18 $finp=gzopen("data/loadsquid.sql","r"); 19 19 while(gzeof($finp)==0) -
trunk/php/src/squidbuttom_3_delete.php
r2 r3 19 19 if($SAMSConf->access!=2) { exit; } 20 20 21 db_connect( "squidlog") or exit();22 mysql_select_db( "squidlog")21 db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 22 mysql_select_db($SAMSConf->SQUIDCTRLDATABASE) 23 23 or print("Error\n"); 24 24 $result=mysql_query("DELETE FROM cache WHERE date>=\"$sdate\"&&date<=\"$edate\""); -
trunk/php/src/squidbuttom_4_addcache.php
r2 r3 18 18 { 19 19 //echo "remove cache $row[id] $row[description]<BR>"; 20 $result2=mysql_query("DELETE FROM squidctrl.proxyes WHERE id=\"$id\" ");20 $result2=mysql_query("DELETE FROM ".$SAMSConf->MYSQLDATABASE.".proxyes WHERE id=\"$id\" "); 21 21 } 22 22 } … … 44 44 $usergroup=trim($usergroup); 45 45 46 db_connect( "squidctrl") or exit();47 mysql_select_db( "squidctrl");48 $result=mysql_query("SELECT MAX(id) FROM squidctrl.proxyes ");46 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 47 mysql_select_db($SAMSConf->MYSQLDATABASE); 48 $result=mysql_query("SELECT MAX(id) FROM ".$SAMSConf->MYSQLDATABASE.".proxyes "); 49 49 $row=mysql_fetch_array($result); 50 50 $id=$row[0]+1; … … 69 69 if($SAMSConf->access==2) 70 70 { 71 // db_connect( "squidctrl") or exit();72 // mysql_select_db( "squidctrl")71 // db_connect($SAMSConf->MYSQLDATABASE) or exit(); 72 // mysql_select_db($SAMSConf->MYSQLDATABASE) 73 73 // or print("Error\n"); 74 74 PageTop("proxyes_48.jpg","$CacheForm_squidbuttom_4_addcache_1"); … … 82 82 print("<TH width=60%>$CacheForm_squidbuttom_4_addcache_3"); 83 83 print("<TH width=20%>$CacheForm_squidbuttom_4_addcache_4"); 84 $result=mysql_query("SELECT id,description FROM squidctrl.proxyes ORDER BY id");84 $result=mysql_query("SELECT id,description FROM ".$SAMSConf->MYSQLDATABASE.".proxyes ORDER BY id"); 85 85 while($row=mysql_fetch_array($result)) 86 86 { -
trunk/php/src/urllistfunction.php
r2 r3 35 35 if($SAMSConf->access!=2) { exit; } 36 36 37 db_connect( "squidctrl") or exit();38 mysql_select_db( "squidctrl")37 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 38 mysql_select_db($SAMSConf->MYSQLDATABASE) 39 39 or print("Error\n"); 40 40 $result=mysql_query("UPDATE urls SET url=\"$url\" WHERE url=\"$oldvalue\"&&type=\"$type\" "); … … 122 122 if($SAMSConf->access!=2) { exit; } 123 123 124 db_connect( "squidctrl") or exit();125 mysql_select_db( "squidctrl")124 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 125 mysql_select_db($SAMSConf->MYSQLDATABASE) 126 126 or print("Error\n"); 127 127 $result=mysql_query("DELETE FROM urls WHERE type=\"$type\" "); … … 151 151 if($SAMSConf->access!=2) { exit; } 152 152 153 db_connect( "squidctrl") or exit();154 mysql_select_db( "squidctrl")153 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 154 mysql_select_db($SAMSConf->MYSQLDATABASE) 155 155 or print("Error\n"); 156 156 $result=mysql_query("INSERT INTO urls SET url=\"$url\",type=\"$type\" "); … … 179 179 180 180 print("type=$type url=$url"); 181 db_connect( "squidctrl") or exit();182 mysql_select_db( "squidctrl")181 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 182 mysql_select_db($SAMSConf->MYSQLDATABASE) 183 183 or print("Error\n"); 184 184 print("<h1>URL=$url / $type $deletedurl</h1>"); -
trunk/php/src/userbuttom_1_prop.php
r2 r3 29 29 if($SAMSConf->access!=2) { exit; } 30 30 31 db_connect( "squidctrl") or exit();32 mysql_select_db( "squidctrl");31 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 32 mysql_select_db($SAMSConf->MYSQLDATABASE); 33 33 if($gauditor=="on") 34 34 $gauditor=1; … … 78 78 if($SAMSConf->access!=2) { exit; } 79 79 80 db_connect( "squidctrl") or exit();81 mysql_select_db( "squidctrl");80 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 81 mysql_select_db($SAMSConf->MYSQLDATABASE); 82 82 $result=mysql_query("SELECT * FROM squidusers WHERE id=\"$userid\" "); 83 83 $row=mysql_fetch_array($result); … … 140 140 print("<SELECT NAME=\"usergroup\" ID=\"groupname\" SIZE=1 TABINDEX=30 >\n"); 141 141 142 db_connect( "squidctrl") or exit();143 mysql_select_db( "squidctrl")142 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 143 mysql_select_db($SAMSConf->MYSQLDATABASE) 144 144 or print("Error\n"); 145 145 $result2=mysql_query("SELECT name,nick FROM groups"); -
trunk/php/src/userbuttom_2_traffic.php
r2 r3 24 24 if(isset($_GET["userdomain"])) $userdomain=$_GET["userdomain"]; 25 25 26 db_connect( "squidlog") or exit();27 mysql_select_db( "squidlog");26 db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 27 mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 28 28 29 29 $stime=gmmktime (0, 0, 1, $DATE->smon, $DATE->sday, $DATE->syea); … … 84 84 $eddate=$DATE->EndDate(); 85 85 86 db_connect( "squidlog") or exit();87 mysql_select_db( "squidlog");86 db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 87 mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 88 88 89 89 PageTop("user.jpg","$traffic_1 <FONT COLOR=\"BLUE\"> $username</FONT><BR>$userbuttom_2_traffic_UserTrafficPeriod_2"); … … 168 168 if(isset($_GET["userid"])) $userid=$_GET["userid"]; 169 169 170 db_connect( "squidctrl") or exit();171 mysql_select_db( "squidctrl");170 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 171 mysql_select_db($SAMSConf->MYSQLDATABASE); 172 172 $result=mysql_query("SELECT * FROM squidusers WHERE id=\"$userid\" "); 173 173 $row=mysql_fetch_array($result); -
trunk/php/src/userbuttom_3_file.php
r2 r3 27 27 $eddate=$DATE->EndDate(); 28 28 29 db_connect( "squidlog") or exit();30 mysql_select_db( "squidlog");29 db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 30 mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 31 31 32 32 PageTop("user.jpg","$traffic_1 <FONT COLOR=\"BLUE\">$username</FONT><BR>$userbuttom_3_file_UserFileSizePeriod_1 $filesize kb"); … … 80 80 if(isset($_GET["userid"])) $userid=$_GET["userid"]; 81 81 82 db_connect( "squidctrl") or exit();83 mysql_select_db( "squidctrl");82 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 83 mysql_select_db($SAMSConf->MYSQLDATABASE); 84 84 $result=mysql_query("SELECT * FROM squidusers WHERE id=\"$userid\" "); 85 85 $row=mysql_fetch_array($result); -
trunk/php/src/userbuttom_4_site.php
r2 r3 72 72 print("<TH>URL"); 73 73 74 mysql_select_db( "squidlog");74 mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 75 75 $result=mysql_query("SELECT date,user,size,url FROM cache WHERE date>=\"$sdate\"&&date<=\"$edate\"&&user=\"$username\"&&url like \"%$site%\" ORDER BY size desc limit 250"); 76 76 $counter=0; … … 117 117 $eyea=$DATE->eyea; 118 118 119 db_connect( "squidlog") or exit();120 mysql_select_db( "squidlog");119 db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 120 mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 121 121 122 122 PageTop("user.jpg","$traffic_1 <FONT COLOR=\"BLUE\">$username</FONT><BR>$userbuttom_4_site_UserSitesPeriod_2"); … … 199 199 if(isset($_GET["userid"])) $userid=$_GET["userid"]; 200 200 201 db_connect( "squidctrl") or exit();202 mysql_select_db( "squidctrl");201 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 202 mysql_select_db($SAMSConf->MYSQLDATABASE); 203 203 $result=mysql_query("SELECT * FROM squidusers WHERE id=\"$userid\" "); 204 204 $row=mysql_fetch_array($result); -
trunk/php/src/userbuttom_4_time.php
r2 r3 41 41 42 42 43 db_connect( "squidlog") or exit();44 mysql_select_db( "squidlog");43 db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 44 mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 45 45 46 46 $count=0; … … 58 58 59 59 $acount=0; 60 $query="SELECT HOUR(time) as hour,MINUTE(time) as minute,SUM(size) as size,SUM(hit) as hit FROM squidlog.cache WHERE cache.user=\"$username\"&&cache.domain=\"$userdomain\"&&cache.date=\"$sdate\"&&HOUR(time)>=$shou&&HOUR(time)<$ehou GROUP BY hour,minute";60 $query="SELECT HOUR(time) as hour,MINUTE(time) as minute,SUM(size) as size,SUM(hit) as hit FROM ".$SAMSConf->SQUIDCTRLDATABASE.".cache WHERE cache.user=\"$username\"&&cache.domain=\"$userdomain\"&&cache.date=\"$sdate\"&&HOUR(time)>=$shou&&HOUR(time)<$ehou GROUP BY hour,minute"; 61 61 $result=mysql_query("$query"); 62 62 while($row=mysql_fetch_array($result)) … … 126 126 127 127 128 db_connect( "squidlog") or exit();129 mysql_select_db( "squidlog");128 db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 129 mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 130 130 131 131 PageTop("user.jpg","$traffic_1 <FONT COLOR=\"BLUE\">$username</FONT><BR>$URLTimeForm_userbuttom_4_time_1"); … … 158 158 $result=mysql_query("$query"); 159 159 160 $query="CREATE TEMPORARY TABLE squidlog.cache_ SELECT date,time,HOUR(time) as hour,MINUTE(time) as minute,user,domain,trim(leading \"http://\" from substring_index(url,'/',3)) as norm_url FROM squidlog.cache WHERE cache.user=\"$username\"&&cache.domain=\"$userdomain\"&&cache.date=\"$sdate\"&&HOUR(time)>=$shou&&HOUR(time)<$ehou ORDER BY hour,minute,url";160 $query="CREATE TEMPORARY TABLE ".$SAMSConf->SQUIDCTRLDATABASE.".cache_ SELECT date,time,HOUR(time) as hour,MINUTE(time) as minute,user,domain,trim(leading \"http://\" from substring_index(url,'/',3)) as norm_url FROM ".$SAMSConf->SQUIDCTRLDATABASE.".cache WHERE cache.user=\"$username\"&&cache.domain=\"$userdomain\"&&cache.date=\"$sdate\"&&HOUR(time)>=$shou&&HOUR(time)<$ehou ORDER BY hour,minute,url"; 161 161 $result=mysql_query("$query"); 162 162 // print("query=$query<BR>result = $result"); 163 163 164 $query=" SELECT * FROM squidlog.cache_ GROUP BY hour,minute,norm_url";164 $query=" SELECT * FROM ".$SAMSConf->SQUIDCTRLDATABASE.".cache_ GROUP BY hour,minute,norm_url"; 165 165 $result=mysql_query("$query"); 166 166 //print("result = $result"); … … 206 206 if(isset($_GET["userid"])) $userid=$_GET["userid"]; 207 207 208 db_connect( "squidctrl") or exit();209 mysql_select_db( "squidctrl");208 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 209 mysql_select_db($SAMSConf->MYSQLDATABASE); 210 210 $result=mysql_query("SELECT * FROM squidusers WHERE id=\"$userid\" "); 211 211 $row=mysql_fetch_array($result); -
trunk/php/src/userbuttom_5_clear.php
r2 r3 18 18 if(isset($_GET["userid"])) $userid=$_GET["userid"]; 19 19 20 db_connect( "squidctrl") or exit();21 mysql_select_db( "squidctrl");20 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 21 mysql_select_db($SAMSConf->MYSQLDATABASE); 22 22 $result=mysql_query("UPDATE squidusers SET size=\"0\",hit=\"0\" WHERE id=\"$userid\" "); 23 23 $result=mysql_query("SELECT * FROM squidusers WHERE id=\"$userid\" "); -
trunk/php/src/userbuttom_6_chpasswd.php
r2 r3 23 23 24 24 PageTop("userpasswd_48.jpg"," $userbuttom_6_chpasswd_ChUserPasswd_1 <BR><FONT COLOR=\"BLUE\">$row[nick]</FONT>"); 25 db_connect( "squidctrl") or exit();26 mysql_select_db( "squidctrl");27 $result=mysql_query("UPDATE squidctrl.squidusers SET passwd=\"$newpasswd\" WHERE id=\"$userid\" ");25 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 26 mysql_select_db($SAMSConf->MYSQLDATABASE); 27 $result=mysql_query("UPDATE ".$SAMSConf->MYSQLDATABASE.".squidusers SET passwd=\"$newpasswd\" WHERE id=\"$userid\" "); 28 28 if($SAMSConf->AUTH=="ncsa") 29 29 $result=mysql_query("INSERT INTO reconfig SET service=\"squid\",action=\"reconfig\" "); … … 40 40 if(isset($_GET["userid"])) $userid=$_GET["userid"]; 41 41 42 db_connect( "squidctrl") or exit();43 mysql_select_db( "squidctrl");42 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 43 mysql_select_db($SAMSConf->MYSQLDATABASE); 44 44 $result=mysql_query("SELECT * FROM squidusers WHERE id=\"$userid\" "); 45 45 $row=mysql_fetch_array($result); -
trunk/php/src/userbuttom_9_delete.php
r2 r3 24 24 print("</SCRIPT> \n"); 25 25 26 db_connect( "squidctrl") or exit();27 mysql_select_db( "squidctrl");26 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 27 mysql_select_db($SAMSConf->MYSQLDATABASE); 28 28 $result=mysql_query("SELECT * FROM squidusers WHERE id=\"$userid\" "); 29 29 $row=mysql_fetch_array($result); -
trunk/php/src/usersbuttom_1_adldap.php
r2 r3 95 95 if($SAMSConf->access!=2) { exit; } 96 96 97 db_connect( "squidctrl") or exit();98 mysql_select_db( "squidctrl");97 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 98 mysql_select_db($SAMSConf->MYSQLDATABASE); 99 99 100 100 PageTop("user.jpg"," $usersbuttom_1_domain_AddUsersFromDomainForm_1 Active Directory "); … … 209 209 print("<TD>\n"); 210 210 print("<SELECT NAME=\"usershablon\" ID=\"usershablon\" SIZE=1 TABINDEX=30 >\n"); 211 db_connect( "squidctrl") or exit();212 mysql_select_db( "squidctrl")211 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 212 mysql_select_db($SAMSConf->MYSQLDATABASE) 213 213 or print("Error\n"); 214 214 $result=mysql_query("SELECT * FROM shablons"); -
trunk/php/src/usersbuttom_1_domain.php
r2 r3 101 101 if($SAMSConf->access!=2) { exit; } 102 102 103 db_connect( "squidctrl") or exit();104 mysql_select_db( "squidctrl");103 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 104 mysql_select_db($SAMSConf->MYSQLDATABASE); 105 105 106 106 PageTop("user.jpg"," $usersbuttom_1_domain_AddUsersFromDomainForm_1"); … … 196 196 print("<TD>\n"); 197 197 print("<SELECT NAME=\"usershablon\" ID=\"usershablon\" SIZE=1 TABINDEX=30 >\n"); 198 db_connect( "squidctrl") or exit();199 mysql_select_db( "squidctrl")198 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 199 mysql_select_db($SAMSConf->MYSQLDATABASE) 200 200 or print("Error\n"); 201 201 $result=mysql_query("SELECT * FROM shablons"); … … 224 224 if($SAMSConf->access!=2) { exit; } 225 225 226 db_connect( "squidctrl") or exit();227 mysql_select_db( "squidctrl");226 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 227 mysql_select_db($SAMSConf->MYSQLDATABASE); 228 228 229 229 PageTop("user.jpg"," $usersbuttom_1_domain_AddUsersFromDomainForm_1"); … … 309 309 print("<TD>\n"); 310 310 print("<SELECT NAME=\"usershablon\" ID=\"usershablon\" SIZE=1 TABINDEX=30 >\n"); 311 db_connect( "squidctrl") or exit();312 mysql_select_db( "squidctrl")311 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 312 mysql_select_db($SAMSConf->MYSQLDATABASE) 313 313 or print("Error\n"); 314 314 $result=mysql_query("SELECT * FROM shablons"); -
trunk/php/src/usersbuttom_1_ncsa.php
r2 r3 121 121 print("<TD>\n"); 122 122 print("<SELECT NAME=\"usershablon\" ID=\"usershablon\" SIZE=1 TABINDEX=30 >\n"); 123 db_connect( "squidctrl") or exit();124 mysql_select_db( "squidctrl")123 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 124 mysql_select_db($SAMSConf->MYSQLDATABASE) 125 125 or print("Error\n"); 126 126 $result=mysql_query("SELECT * FROM shablons"); -
trunk/php/src/usersbuttom_1_useradd.php
r2 r3 14 14 if($SAMSConf->access!=2) { exit; } 15 15 16 db_connect( "squidctrl") or exit();17 mysql_select_db( "squidctrl");16 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 17 mysql_select_db($SAMSConf->MYSQLDATABASE); 18 18 19 19 if($SAMSConf->AUTH=="ntlm") … … 149 149 $usergroup=trim($usergroup); 150 150 151 db_connect( "squidctrl") or exit();152 mysql_select_db( "squidctrl");151 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 152 mysql_select_db($SAMSConf->MYSQLDATABASE); 153 153 if($SAMSConf->AUTH=="ncsa"||$SAMSConf->AUTH=="ip") 154 154 { … … 293 293 print("<SELECT NAME=\"usergroup\" ID=\"groupname\" SIZE=1 TABINDEX=30 >\n"); 294 294 295 db_connect( "squidctrl") or exit();296 mysql_select_db( "squidctrl")295 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 296 mysql_select_db($SAMSConf->MYSQLDATABASE) 297 297 or print("Error\n"); 298 298 $result=mysql_query("SELECT name,nick FROM groups"); … … 340 340 print("<TD>\n"); 341 341 print("<SELECT NAME=\"usershablon\" ID=\"usershablon\" SIZE=1 TABINDEX=30 onChange=\"SetQuote()\">\n"); 342 db_connect( "squidctrl") or exit();343 mysql_select_db( "squidctrl")342 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 343 mysql_select_db($SAMSConf->MYSQLDATABASE) 344 344 or print("Error\n"); 345 345 $result=mysql_query("SELECT * FROM shablons"); -
trunk/php/src/usersbuttom_2_traffic.php
r2 r3 24 24 $eddate=$DATE->EndDate(); 25 25 26 db_connect( "squidlog") or exit();27 mysql_select_db( "squidlog");26 db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 27 mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 28 28 29 29 $pdfFile=pdf_new(); … … 63 63 while($row=mysql_fetch_array($result)) 64 64 { 65 $result_2=mysql_query("SELECT * FROM squidctrl.squidusers WHERE squidctrl.squidusers.nick=\"$row[user]\"&&squidctrl.squidusers.domain=\"$row[domain]\"");65 $result_2=mysql_query("SELECT * FROM ".$SAMSConf->MYSQLDATABASE.".squidusers WHERE ".$SAMSConf->MYSQLDATABASE.".squidusers.nick=\"$row[user]\"&&".$SAMSConf->MYSQLDATABASE.".squidusers.domain=\"$row[domain]\""); 66 66 $row_2=mysql_fetch_array($result_2); 67 67 pdf_show_xy($pdfFile, $count+1, 50, $ycount); … … 116 116 $eddate=$DATE->EndDate(); 117 117 118 db_connect( "squidlog") or exit();119 mysql_select_db( "squidlog");118 db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 119 mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 120 120 121 121 $result=mysql_query("SELECT sum(size) as all_sum,sum(hit),user,domain FROM cachesum WHERE date>=\"$sdate\"&&date<=\"$edate\" group by user,domain order by all_sum desc"); … … 125 125 while($row=mysql_fetch_array($result)) 126 126 { 127 $result_2=mysql_query("SELECT * FROM squidctrl.squidusers WHERE squidctrl.squidusers.nick=\"$row[user]\"&&squidctrl.squidusers.domain=\"$row[domain]\"");127 $result_2=mysql_query("SELECT * FROM ".$SAMSConf->MYSQLDATABASE.".squidusers WHERE ".$SAMSConf->MYSQLDATABASE.".squidusers.nick=\"$row[user]\"&&".$SAMSConf->MYSQLDATABASE.".squidusers.domain=\"$row[domain]\""); 128 128 $row_2=mysql_fetch_array($result_2); 129 129 … … 153 153 $eddate=$DATE->EndDate(); 154 154 155 db_connect( "squidlog") or exit();156 mysql_select_db( "squidlog");155 db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 156 mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 157 157 158 158 PageTop("usergroup_48.jpg","$usersbuttom_2_traffic_UsersTrafficPeriod_1<BR>$usersbuttom_2_traffic_UsersTrafficPeriod_2"); … … 201 201 { 202 202 print("<TR>"); 203 $result_2=mysql_query("SELECT * FROM squidctrl.squidusers WHERE squidctrl.squidusers.nick=\"$row[user]\"&&squidctrl.squidusers.domain=\"$row[domain]\"");203 $result_2=mysql_query("SELECT * FROM ".$SAMSConf->MYSQLDATABASE.".squidusers WHERE ".$SAMSConf->MYSQLDATABASE.".squidusers.nick=\"$row[user]\"&&".$SAMSConf->MYSQLDATABASE.".squidusers.domain=\"$row[domain]\""); 204 204 $row_2=mysql_fetch_array($result_2); 205 205 LTableCell($count,8); -
trunk/php/src/usersbuttom_3_file.php
r2 r3 36 36 printf("<BR><B>$traffic_2 $bdate $traffic_3 $eddate</B> "); 37 37 38 db_connect( "squidlog") or exit();39 mysql_select_db( "squidlog");38 db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 39 mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 40 40 41 41 if($_GET["check"]==1) … … 53 53 $count=0; 54 54 // $result=mysql_query("SELECT user,date,size,url FROM cache WHERE cache.date>=\"$sdate\"&&cache.date<=\"$edate\"&&size>\"$filesize\" ORDER BY size DESC limit 250"); 55 $result=mysql_query("SELECT cache.user,cache.date,cache.size,cache.url,squidusers.name,squidusers.family,cache.domain FROM squidlog.cache LEFT JOIN squidctrl.squidusers ON cache.user=squidusers.nick WHERE cache.date>=\"$sdate\"&&cache.date<=\"$edate\"&&cache.size>\"$filesize\" ORDER BY size DESC limit 250");55 $result=mysql_query("SELECT cache.user,cache.date,cache.size,cache.url,squidusers.name,squidusers.family,cache.domain FROM ".$SAMSConf->SQUIDCTRLDATABASE.".cache LEFT JOIN ".$SAMSConf->MYSQLDATABASE.".squidusers ON cache.user=squidusers.nick WHERE cache.date>=\"$sdate\"&&cache.date<=\"$edate\"&&cache.size>\"$filesize\" ORDER BY size DESC limit 250"); 56 56 while($row=mysql_fetch_array($result)) 57 57 { … … 128 128 if($SAMSConf->access!=2) { exit; } 129 129 130 db_connect( "squidctrl") or exit();131 mysql_select_db( "squidctrl");130 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 131 mysql_select_db($SAMSConf->MYSQLDATABASE); 132 132 $result=mysql_query("SELECT * FROM squidusers WHERE id=\"$userid\" "); 133 133 $row=mysql_fetch_array($result); -
trunk/php/src/usersbuttom_4_percent.php
r2 r3 21 21 $eddate=$DATE->EndDate(); 22 22 23 db_connect( "squidlog") or exit();24 mysql_select_db( "squidlog");23 db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 24 mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 25 25 26 26 $cresult=mysql_query("CREATE TEMPORARY TABLE cache_ SELECT user,domain,sum(size) as user_size FROM cachesum WHERE date>=\"$sdate\"&&date<=\"$edate\" group by user"); … … 63 63 $eddate=$DATE->EndDate(); 64 64 65 db_connect( "squidlog") or exit();66 mysql_select_db( "squidlog");65 db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 66 mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 67 67 68 68 $cresult=mysql_query("CREATE TEMPORARY TABLE cache_ SELECT user,domain,sum(size) as user_size FROM cachesum WHERE date>=\"$sdate\"&&date<=\"$edate\" group by user"); … … 73 73 $percent=$all/100; 74 74 75 $result=mysql_query("SELECT groups.nick,sum(user_size) as grp_size FROM squidctrl.squidusers,squidctrl.groups,cache_ where cache_.user=squidusers.nick && squidusers.group=groups.name group by groups.nick order by grp_size DESC");75 $result=mysql_query("SELECT groups.nick,sum(user_size) as grp_size FROM ".$SAMSConf->MYSQLDATABASE.".squidusers,".$SAMSConf->MYSQLDATABASE.".groups,cache_ where cache_.user=squidusers.nick && squidusers.group=groups.name group by groups.nick order by grp_size DESC"); 76 76 $count=0; 77 77 while($row=mysql_fetch_array($result)) … … 118 118 printf("<P><IMG SRC=\"main.php?show=exe&function=userspercenttrafficgb&filename=usersbuttom_4_percent.php&gb=1&sdate=$sdate&edate=$edate \"><P>"); 119 119 120 db_connect( "squidlog") or exit();121 mysql_select_db( "squidlog");120 db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 121 mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 122 122 123 123 $cresult=mysql_query("CREATE TEMPORARY TABLE cache_ SELECT user,domain,sum(size) as user_size FROM cachesum WHERE date>=\"$sdate\"&&date<=\"$edate\" group by user"); … … 138 138 139 139 //$result=mysql_query("SELECT cache_.user,cache_.domain,cache_.user_size,round(cache_.user_size/$percent,2) as percent from cache_ order by cache_.user_size desc"); 140 $result=mysql_query("SELECT cache_.user,cache_.domain,cache_.user_size,round(cache_.user_size/$percent,2) as percent,squidusers.name,squidusers.family,cache_.domain from cache_ LEFT JOIN squidctrl.squidusers ON cache_.user=squidusers.nick order by cache_.user_size desc");140 $result=mysql_query("SELECT cache_.user,cache_.domain,cache_.user_size,round(cache_.user_size/$percent,2) as percent,squidusers.name,squidusers.family,cache_.domain from cache_ LEFT JOIN ".$SAMSConf->MYSQLDATABASE.".squidusers ON cache_.user=squidusers.nick order by cache_.user_size desc"); 141 141 $ap=0; 142 142 $count=1; … … 195 195 print("<TH>%"); 196 196 197 $result=mysql_query("SELECT groups.nick,sum(user_size) as grp_size FROM squidctrl.squidusers,squidctrl.groups,cache_ where cache_.user=squidusers.nick && squidusers.group=groups.name group by groups.nick order by grp_size DESC");197 $result=mysql_query("SELECT groups.nick,sum(user_size) as grp_size FROM ".$SAMSConf->MYSQLDATABASE.".squidusers,".$SAMSConf->MYSQLDATABASE.".groups,cache_ where cache_.user=squidusers.nick && squidusers.group=groups.name group by groups.nick order by grp_size DESC"); 198 198 $count=1; 199 199 while($row=mysql_fetch_array($result)) -
trunk/php/src/usersbuttom_5_recalc.php
r2 r3 27 27 PageTop("usergroup_48.jpg","$usersbuttom_5_recalc_RecalcUsersTraffic_1 1.$smon.$syea ÐÏ $eday.$smon.$syea $usersbuttom_5_recalc_RecalcUsersTraffic_"); 28 28 29 db_connect( "squidlog") or exit();30 mysql_select_db( "squidlog");29 db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 30 mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 31 31 32 32 $result=mysql_query("CREATE TEMPORARY TABLE cache_ SELECT sum(size),user,domain,sum(hit) FROM cache WHERE date>=\"$sdate\"&&date<=\"$edate\" GROUP BY user,domain"); … … 40 40 if($row[3]>0) 41 41 $thit=$row[3]; 42 $result2=mysql_query("UPDATE squidctrl.squidusers SET size=\"$tsize\",hit=\"$thit\" WHERE nick=\"$row[user]\"&&domain=\"$row[domain]\" ");42 $result2=mysql_query("UPDATE ".$SAMSConf->MYSQLDATABASE.".squidusers SET size=\"$tsize\",hit=\"$thit\" WHERE nick=\"$row[user]\"&&domain=\"$row[domain]\" "); 43 43 } 44 44 UpdateLog("$SAMSConf->adminname","$usersbuttom_5_recalc_RecalcUsersTraffic_3","01"); -
trunk/php/src/usersbuttom_6_clear.php
r2 r3 16 16 if($SAMSConf->access==2) 17 17 { 18 db_connect( "squidctrl") or exit();19 mysql_select_db( "squidctrl");18 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 19 mysql_select_db($SAMSConf->MYSQLDATABASE); 20 20 $result=mysql_query("UPDATE squidusers SET size=\"0\",hit=\"0\" "); 21 21 UpdateLog("$SAMSConf->adminname","$usersbuttom_6_clear_ClearUsersTrafficCounter","01"); -
trunk/php/src/userstray.php
r2 r3 63 63 if(isset($_GET["groupname"])) $groupname=$_GET["groupname"]; 64 64 65 db_connect( "squidctrl") or exit();66 mysql_select_db( "squidctrl")65 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 66 mysql_select_db($SAMSConf->MYSQLDATABASE) 67 67 or print("Error\n"); 68 68 $result=mysql_query("SELECT * FROM groups WHERE groups.name=\"$groupname\" "); … … 99 99 $count=0; 100 100 101 //$result=mysql_query("SELECT squidusers.*,groups.nick AS gnick FROM squidusers LEFT JOIN squidctrl.groups ON groups.name=squidusers.group ORDER BY squidusers.group,squidusers.nick");102 $result=mysql_query("SELECT squidusers.*,groups.nick AS gnick, shablons.period, year(shablons.clrdate) as year, month(shablons.clrdate) as month, dayofmonth(shablons.clrdate) as day FROM squidusers LEFT JOIN squidctrl.groups ON groups.name=squidusers.group LEFT JOIN squidctrl.shablons ON squidusers.shablon=shablons.name ORDER BY squidusers.group,squidusers.nick");101 //$result=mysql_query("SELECT squidusers.*,groups.nick AS gnick FROM squidusers LEFT JOIN ".$SAMSConf->MYSQLDATABASE.".groups ON groups.name=squidusers.group ORDER BY squidusers.group,squidusers.nick"); 102 $result=mysql_query("SELECT squidusers.*,groups.nick AS gnick, shablons.period, year(shablons.clrdate) as year, month(shablons.clrdate) as month, dayofmonth(shablons.clrdate) as day FROM squidusers LEFT JOIN ".$SAMSConf->MYSQLDATABASE.".groups ON groups.name=squidusers.group LEFT JOIN ".$SAMSConf->MYSQLDATABASE.".shablons ON squidusers.shablon=shablons.name ORDER BY squidusers.group,squidusers.nick"); 103 103 104 104 while($row=mysql_fetch_array($result)) -
trunk/php/src/usertray.php
r2 r3 70 70 $SAMSConf->domainusername=$userdomain; 71 71 72 db_connect( "squidctrl") or exit();73 mysql_select_db( "squidctrl");72 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 73 mysql_select_db($SAMSConf->MYSQLDATABASE); 74 74 $result=mysql_query("SELECT nick,passwd,domain,gauditor,squidusers.group,autherrorc,autherrort FROM squidusers WHERE nick=\"$SAMSConf->domainusername\" "); 75 75 $row=mysql_fetch_array($result); … … 82 82 if($SAMSConf->AUTH=="ip"||$SAMSConf->AUTH=="ncsa") 83 83 { 84 db_connect( "squidctrl") or exit();85 mysql_select_db( "squidctrl");84 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 85 mysql_select_db($SAMSConf->MYSQLDATABASE); 86 86 $result=mysql_query("SELECT nick,passwd,domain,gauditor,squidusers.group,autherrorc,autherrort,id FROM squidusers WHERE nick=\"$userdomain\"&&passwd=\"$password\" "); 87 87 $row=mysql_fetch_array($result); … … 208 208 } 209 209 210 db_connect( "squidctrl") or exit();211 mysql_select_db( "squidctrl");210 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 211 mysql_select_db($SAMSConf->MYSQLDATABASE); 212 212 $result=mysql_query("SELECT nick,passwd,domain,gauditor,squidusers.group,autherrorc,autherrort FROM squidusers WHERE id=\"$id\" "); 213 213 $row=mysql_fetch_array($result); … … 219 219 if($SAMSConf->AUTH=="ip"||$SAMSConf->AUTH=="ncsa") 220 220 { 221 db_connect( "squidctrl") or exit();222 mysql_select_db( "squidctrl");221 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 222 mysql_select_db($SAMSConf->MYSQLDATABASE); 223 223 224 224 $result2=mysql_query("SELECT nick,id FROM squidusers WHERE id=\"$id\" "); … … 425 425 require($lang); 426 426 427 db_connect( "squidctrl") or exit();428 mysql_select_db( "squidctrl");427 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 428 mysql_select_db($SAMSConf->MYSQLDATABASE); 429 429 430 430 $result=mysql_query("SELECT * FROM squidusers WHERE id=\"$userid\"&&squidusers.group=\"$usergroup\" "); -
trunk/php/src/webconfigbuttom_1_prop.php
r2 r3 35 35 if($showgraph=="on") 36 36 $showgraph="Y"; 37 db_connect( "squidctrl") or exit();38 mysql_select_db( "squidctrl");37 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 38 mysql_select_db($SAMSConf->MYSQLDATABASE); 39 39 $result=mysql_query("UPDATE globalsettings SET createpdf=\"$createpdf\",showname=\"$showname\",showutree=\"$showutree\",iconset=\"$iconset\",lang=\"$lang\", urlaccess=\"$urlaccess\",useraccess=\"$useraccess\",kbsize=\"$kbsize\",mbsize=\"$mbsize\",showgraph=\"$showgraph\" "); 40 40 $SAMSConf->LoadConfig(); … … 57 57 print("<P>\n"); 58 58 59 db_connect( "squidctrl") or exit();60 mysql_select_db( "squidctrl");59 db_connect($SAMSConf->MYSQLDATABASE) or exit(); 60 mysql_select_db($SAMSConf->MYSQLDATABASE); 61 61 $result=mysql_query("SELECT * FROM globalsettings"); 62 62 $row=mysql_fetch_array($result); -
trunk/php/src/webconfigtray.php
r2 r3 110 110 function SysInfo() 111 111 { 112 global $SAMSConf; 113 112 114 PageTop("stat_48.jpg","System Information"); 113 115 … … 145 147 print("<TH width=\"33%\" >Traffic\n"); 146 148 147 $result=mysql_query("SELECT sum(size),sum(hit) FROM squidlog.cachesum WHERE date>=\"$sdate\"&&date<=\"$edate\" ");149 $result=mysql_query("SELECT sum(size),sum(hit) FROM ".$SAMSConf->SQUIDCTRLDATABASE.".cachesum WHERE date>=\"$sdate\"&&date<=\"$edate\" "); 148 150 $row=mysql_fetch_array($result); 149 151 print("<TR>\n"); … … 157 159 RTableCell($aaa,33); 158 160 159 $result=mysql_query("SELECT sum(size),sum(hit) FROM squidlog.cachesum WHERE date=\"$edate\" ");161 $result=mysql_query("SELECT sum(size),sum(hit) FROM ".$SAMSConf->SQUIDCTRLDATABASE.".cachesum WHERE date=\"$edate\" "); 160 162 $row=mysql_fetch_array($result); 161 163 print("<TR>\n");
