Changeset 3

Show
Ignore:
Timestamp:
04/05/07 16:19:31 (3 years ago)
Author:
blaze
Message:

Use DB-names from sams.conf in Web-interface.

Location:
trunk/php
Files:
69 modified

Legend:

Unmodified
Added
Removed
  • trunk/php/admin.php

    r2 r3  
    3838//function UserAuthenticate($user,$passwd) 
    3939//{ 
     40//  global $SAMSConf; 
     41// 
    4042//  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); 
    4446 
    4547//  $result=mysql_query("SELECT * FROM passwd WHERE user=\"$user\"&&pass=\"$passwd\" "); 
     
    128130function CheckUserPassword($user,$passwd) 
    129131{ 
    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); 
    132136 
    133137  $result=mysql_query("SELECT * FROM passwd WHERE user=\"$user\"&&pass=\"$passwd\" "); 
     
    163167function SaveUserName($passwd,$number) 
    164168{ 
    165   global $adminname; 
     169  global $adminname, $SAMSConf; 
     170   
    166171  $newpasswd=crypt($passwd,"00"); 
    167172  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); 
    170175 
    171176  $result=mysql_query("SELECT * FROM passwd WHERE pass=\"$newpasswd\" "); 
     
    194199function UserPasswordTest($username,$passwd) 
    195200{ 
     201  global $SAMSConf; 
     202   
    196203  $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); 
    199206 
    200207  $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  
    4545  $eddate=$DATE->EndDate(); 
    4646 
    47   db_connect("squidlog") or exit(); 
    48   mysql_select_db("squidlog"); 
     47  db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 
     48  mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 
    4949 
    5050  $pdfFile->AddPage(); 
     
    7878  while($row=mysql_fetch_array($result)) 
    7979       { 
    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]\""); 
    8181         $row_2=mysql_fetch_array($result_2); 
    8282          
     
    126126  $eddate=$DATE->EndDate(); 
    127127 
    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 "); 
    132132  while($row=mysql_fetch_array($result)) 
    133133       { 
     
    146146              $pdfFile->SetFont('Nimbus','',11); 
    147147              //$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"); 
    149149              while($row2=mysql_fetch_array($result2)) 
    150150                { 
     
    171171              $ycount+=20; 
    172172           
    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"; 
    174174              $result3=mysql_query($query); 
    175175              while($row3=mysql_fetch_array($result3)) 
     
    217217  $eddate=$DATE->EndDate(); 
    218218 
    219   db_connect("squidlog") or exit(); 
    220   mysql_select_db("squidlog"); 
     219  db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 
     220  mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 
    221221   
    222222  $imagefile = "$SAMSConf->ICONSET/usergroup_48.jpg"; 
     
    260260   
    261261           } 
    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]\""); 
    263263         $row_2=mysql_fetch_array($result_2); 
    264264         pdf_show_xy($pdfFile, $count+1, 50, $ycount);   
     
    324324  $eddate=$DATE->EndDate(); 
    325325 
    326   db_connect("squidctrl") or exit(); 
    327   mysql_select_db("squidctrl"); 
     326  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     327  mysql_select_db($SAMSConf->MYSQLDATABASE); 
    328328 
    329329  $imagefile = "$SAMSConf->ICONSET/user.jpg"; 
     
    336336  pdf_set_parameter($pdfFile, "FontOutline", "Nimbus=$fontdir/Nimbus.ttf"); 
    337337                  
    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\" "); 
    339339  while($row=mysql_fetch_array($result)) 
    340340       { 
     
    344344              pdf_begin_page($pdfFile, 595, 842); 
    345345               
    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"); 
    347347              while($row2=mysql_fetch_array($result2)) 
    348348                { 
  • trunk/php/lframe_users.php

    r2 r3  
    4848      else 
    4949        { 
    50           $result=mysql_query("SELECT * FROM squidctrl.groups ORDER BY nick"); 
     50          $result=mysql_query("SELECT * FROM ".$SAMSConf->MYSQLDATABASE.".groups ORDER BY nick"); 
    5151        }   
    5252      while($row=mysql_fetch_array($result)) 
  • trunk/php/messages/EN/blocked.php

    r2 r3  
    2424  require('../../mysqltools.php'); 
    2525  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); 
    2828  $result=mysql_query("SELECT denied_to FROM sams "); 
    2929  $row=mysql_fetch_array($result); 
  • trunk/php/messages/KOI8-R/blocked.php

    r2 r3  
    2525  $SAMSConf=new SAMSCONFIG(); 
    2626   
    27   db_connect("squidctrl") or exit(); 
    28   mysql_select_db("squidctrl"); 
     27  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     28  mysql_select_db($SAMSConf->MYSQLDATABASE); 
    2929  $result=mysql_query("SELECT denied_to FROM sams "); 
    3030  $row=mysql_fetch_array($result); 
  • trunk/php/messages/WIN1251/blocked.php

    r2 r3  
    2323  require('../../mysqltools.php'); 
    2424  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); 
    2727  $result=mysql_query("SELECT denied_to FROM sams "); 
    2828  $row=mysql_fetch_array($result); 
  • trunk/php/mysqltools.php

    r2 r3  
    137137  function ReadSAMSSettings() 
    138138    { 
    139       $result=mysql_query("SELECT * FROM squidctrl.sams"); 
     139      $result=mysql_query("SELECT * FROM ".$this->MYSQLDATABASE.".sams"); 
    140140      $row=mysql_fetch_array($result); 
    141141       
     
    150150      $this->SEPARATOR=$row['separator']; 
    151151  
    152       $result=mysql_query("SELECT * FROM squidctrl.globalsettings"); 
     152      $result=mysql_query("SELECT * FROM ".$this->MYSQLDATABASE.".globalsettings"); 
    153153      $row=mysql_fetch_array($result); 
    154154      $this->LANG=$row['lang']; 
     
    163163      $this->PDFLIB=$row['createpdf']; 
    164164 
    165       $result=mysql_query("SELECT MAX(id) FROM squidctrl.proxyes "); 
     165      $result=mysql_query("SELECT MAX(id) FROM ".$this->MYSQLDATABASE.".proxyes "); 
    166166      $row=mysql_fetch_array($result); 
    167167      $this->PROXYCOUNT=$row[0]+1; 
     
    172172      else   
    173173        $this->SWITCHTO=1; 
    174       mysql_query("USE squidctrl"); 
     174      mysql_query("USE ".$this->MYSQLDATABASE); 
    175175    } 
    176176  function SAMSCONFIG() 
     
    274274function ReturnGroupNick($groupname) 
    275275{ 
    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\""); 
    279281  $row=mysql_fetch_array($result); 
    280282  return($row['nick']); 
  • trunk/php/src/_usersbuttom_1_ldap.php

    r2 r3  
    8282  global $WBINFOPATH; 
    8383  global $LANG; 
     84  global $SAMSConf; 
    8485  $lang="./lang/lang.$LANG"; 
    8586  require($lang); 
     
    9091   PageTop("user.jpg"," $usersbuttom_1_domain_AddUsersFromDomainForm_1 LDAP"); 
    9192 
    92   db_connect("squidctrl") or exit(); 
    93   mysql_select_db("squidctrl"); 
     93  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     94  mysql_select_db($SAMSConf->MYSQLDATABASE); 
    9495 
    9596  $server = "127.0.0.1"; // ÉÍÑ ËÏÎÔÒÏÌÅÒÁ ÄÏÍÅÎÁ 
  • trunk/php/src/adminbuttom_3_addadm.php

    r2 r3  
    2020   
    2121  $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); 
    2424 
    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') "); 
    2626  UpdateLog("$SAMSConf->adminname","$adminbuttom_3_addadm_AddAdmin_1 $newuser","04"); 
    2727  PageTop("puser_open.gif","$adminbuttom_3_addadm_AddAdmin_2 $newuser"); 
  • trunk/php/src/adminbuttom_4_chpasswd.php

    r2 r3  
    2323  if(strstr($username,$SAMSConf->adminname)||strstr("Admin",$SAMSConf->adminname)) 
    2424    { 
    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\" "); 
    2828       if($result>0) 
    2929          PageTop("user_48.jpg","$adminbuttom_4_chpasswd_ChangeAdminPasswd_1 $username $adminbuttom_4_chpasswd_ChangeAdminPasswd_2"); 
  • trunk/php/src/adminbuttom_5_deladmin.php

    r2 r3  
    2020  if(strstr("Admin",$SAMSConf->adminname)||strstr("auditor",$SAMSConf->adminname)) 
    2121    { 
    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       
    2526      $result=mysql_query("DELETE FROM passwd WHERE user=\"$username\" "); 
    2627      PageTop("user_48.jpg","$adminbuttom_5_deladmin_DeleteAdmin_1 $username $adminbuttom_5_deladmin_DeleteAdmin_2"); 
     
    5253      print("<INPUT TYPE=\"HIDDEN\" NAME=\"filename\" value=\"adminbuttom_5_deladmin.php\">\n"); 
    5354      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) 
    5657          or print("Error\n"); 
    5758      $result2=mysql_query("SELECT * FROM passwd WHERE user!=\"Admin\"&&user!=\"auditor\""); 
  • trunk/php/src/auth.php

    r2 r3  
    127127function CheckUserPassword($user,$passwd) 
    128128{ 
    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); 
    135136 
    136137  $result=mysql_query("SELECT * FROM passwd WHERE user=\"$user\"&&pass=\"$passwd\" "); 
     
    191192function UserAuthenticate($user,$passwd) 
    192193{ 
     194  global $SAMSConf; 
     195   
    193196  //$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); 
    196199 
    197200  $result=mysql_query("SELECT * FROM passwd WHERE user=\"$user\"&&pass=\"$passwd\" "); 
     
    210213  $newpasswd=crypt($passwd,"00"); 
    211214  //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); 
    214217 
    215218  $result=mysql_query("SELECT * FROM passwd WHERE pass=\"$newpasswd\" "); 
     
    242245function UserPasswordTest($username,$passwd) 
    243246{ 
     247  global $SAMSConf; 
     248   
    244249  $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); 
    247252 
    248253  $result=mysql_query("SELECT * FROM passwd  WHERE user=\"$username\" "); 
  • trunk/php/src/backupbuttom_1_savebase.php

    r2 r3  
    1515   if($SAMSConf->access!=2)     {       exit;     } 
    1616   
    17 db_connect("squidctrl") or exit(); 
    18   mysql_select_db("squidctrl") 
     17  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     18  mysql_select_db($SAMSConf->MYSQLDATABASE) 
    1919       or print("Error\n"); 
    2020 
     
    2626  if(($fout=gzopen("data/$filename","w9"))!=NULL) 
    2727    { 
    28        gzwrite($fout,"# SQUIDCTRL DUMP 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"); 
    3030       $result=mysql_query("SHOW TABLES"); 
    3131       while($row=mysql_fetch_array($result)) //ÂÅÒÅÍ ÓÐÉÓÏË ÔÁÂÌÉà
     
    6969  else if(($fout=fopen("data/$filename","w9"))!=NULL) 
    7070    { 
    71        fwrite($fout,"# SQUIDCTRL DUMP 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"); 
    7373       $result=mysql_query("SHOW TABLES"); 
    7474       while($row=mysql_fetch_array($result)) //ÂÅÒÅÍ ÓÐÉÓÏË ÔÁÂÌÉà
  • trunk/php/src/backupbuttom_2_loadbase.php

    r2 r3  
    2727  PageTop("usergroup_48.jpg","$backupbuttom_2_loadbase_CountUserTraffic_1 1.$smon.$syea - $eday.$smon.$syea $backupbuttom_2_loadbase_CountUserTraffic_2"); 
    2828 
    29   db_connect("squidlog") or exit(); 
    30   mysql_select_db("squidlog"); 
     29  db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 
     30  mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 
    3131 
    3232  $result=mysql_query("CREATE TEMPORARY TABLE cache_ SELECT sum(size),user,domain FROM cache WHERE date>=\"$sdate\"&&date<=\"$edate\" GROUP BY user,domain"); 
     
    3434  while($row=mysql_fetch_array($result)) 
    3535       { 
    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]\" "); 
    3737       } 
    3838  UpdateLog("$SAMSConf->adminname","$backupbuttom_2_loadbase_CountUserTraffic_3","01"); 
     
    4343function RestoreBackUp() 
    4444{ 
    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"]; 
    5051 
    5152   $SAMSConf->access=UserAccess(); 
    5253   if($SAMSConf->access!=2)     {       exit;     } 
    5354   
    54    db_connect("squidctrl") or exit(); 
    55    mysql_select_db("squidctrl"); 
     55   db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     56   mysql_select_db($SAMSConf->MYSQLDATABASE); 
    5657  if(($finp=gzopen("data/loadsamsdb.sql.gz","r"))!=NULL) 
    5758    { 
  • trunk/php/src/configbuttom_1_prop.php

    r2 r3  
    116116  if($checkdns=="on") 
    117117    $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); 
    120120  $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\" "); 
    121121  $SAMSConf->LoadConfig(); 
     
    180180           print("</SCRIPT>\n"); 
    181181 
    182   db_connect("squidctrl") or exit(); 
    183   mysql_select_db("squidctrl"); 
     182  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     183  mysql_select_db($SAMSConf->MYSQLDATABASE); 
    184184  $result=mysql_query("SELECT * FROM sams"); 
    185185  $row=mysql_fetch_array($result); 
  • trunk/php/src/configtray.php

    r2 r3  
    110110function SysInfo() 
    111111{ 
     112   global $SAMSConf; 
     113    
    112114   PageTop("stat_48.jpg","System Information"); 
    113115 
     
    145147   print("<TH width=\"33%\" >Traffic\n"); 
    146148    
    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\" "); 
    148150  $row=mysql_fetch_array($result); 
    149151   print("<TR>\n"); 
     
    157159   RTableCell($aaa,33); 
    158160    
    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\" "); 
    160162  $row=mysql_fetch_array($result); 
    161163   print("<TR>\n"); 
  • trunk/php/src/dbbuttom_1_dbcheck.php

    r2 r3  
    6969  print("</TABLE> "); 
    7070 
    71   db_connect("squidlog") or exit(); 
    72   mysql_select_db("squidlog"); 
     71  db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 
     72  mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 
    7373  //$result=mysql_query("check table cache"); 
    7474 
  • trunk/php/src/dbbuttom_6_statdb.php

    r2 r3  
    2121  print("<TD width=20% bgcolor=beige align=right><font size=-1><b>$dbbuttom_6_statdb_DBStat_3</b></TD>"); 
    2222 
    23   $result=mysql_query("SELECT count(size) FROM squidctrl.squidusers "); 
     23  $result=mysql_query("SELECT count(size) FROM ".$SAMSConf->MYSQLDATABASE.".squidusers "); 
    2424  $row=mysql_fetch_array($result); 
    2525  print("<TR>"); 
     
    2727  TableCell("$row[0]"); 
    2828 
    29   $result=mysql_query("select * FROM squidctrl.groups "); 
     29  $result=mysql_query("select * FROM ".$SAMSConf->MYSQLDATABASE.".groups "); 
    3030  while($row=mysql_fetch_array($result)) 
    3131       { 
    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]\" "); 
    3333         $row2=mysql_fetch_array($result2); 
    3434         print("<TR>"); 
     
    3737       } 
    3838 
    39   $result=mysql_query("SELECT count(url) FROM squidctrl.urls "); 
     39  $result=mysql_query("SELECT count(url) FROM ".$SAMSConf->MYSQLDATABASE.".urls "); 
    4040  $row=mysql_fetch_array($result); 
    4141  print("<TR>"); 
     
    4343  TableCell("$row[0]"); 
    4444 
    45   $result=mysql_query("select * FROM squidctrl.redirect "); 
     45  $result=mysql_query("select * FROM ".$SAMSConf->MYSQLDATABASE.".redirect "); 
    4646  while($row=mysql_fetch_array($result)) 
    4747       { 
    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]\""); 
    4949         $row2=mysql_fetch_array($result2); 
    5050         print("<TR>"); 
     
    5353       } 
    5454 
    55   $result=mysql_query("SELECT count(size) FROM squidlog.cache "); 
     55  $result=mysql_query("SELECT count(size) FROM ".$SAMSConf->SQUIDCTRLDATABASE.".cache "); 
    5656  $row=mysql_fetch_array($result); 
    5757  print("<TR>"); 
     
    5959  TableCell("$row[0]"); 
    6060 
    61   $result=mysql_query("select * FROM squidctrl.squidusers ORDER BY nick"); 
     61  $result=mysql_query("select * FROM ".$SAMSConf->MYSQLDATABASE.".squidusers ORDER BY nick"); 
    6262  while($row=mysql_fetch_array($result)) 
    6363       { 
    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]\" "); 
    6565         $row2=mysql_fetch_array($result2); 
    6666         print("<TR>"); 
     
    118118       print("<TD> \n"); 
    119119       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) 
    122122            or print("Error\n"); 
    123123       $result=mysql_query("SELECT nick,domain FROM squidusers"); 
     
    146146       print("<TD> \n"); 
    147147       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) 
    150150            or print("Error\n"); 
    151151       $result=mysql_query("SELECT * FROM urlreplace"); 
     
    165165       print("<TD ALIGN=\"CENTER\" bgcolor=beige width=35%><font size=-1><b>URL</b></TD>"); 
    166166       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 "); 
    168168       while($row=mysql_fetch_array($result)) 
    169169            { 
  • trunk/php/src/dbbuttom_7_chname.php

    r2 r3  
    3434  PageTop("user.jpg"," $dbbuttom_7_chname_ChUser_1 <BR><FONT COLOR=\"BLUE\">$olddomain/$olduser -> $newdomain/$newuser</FONT><BR> $sdate - $edate"); 
    3535  //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) 
    3838       or print("Error\n"); 
    3939  $result=mysql_query("UPDATE cache SET user=\"$newuser\",domain=\"$newdomain\" WHERE user=\"$olduser\"&&domain=\"$olddomain\"&&date>=\"$sdate\"&&date<=\"$edate\" "); 
     
    5555   if($SAMSConf->access!=2)     {      exit;    } 
    5656   
    57   db_connect("squidctrl") or exit(); 
    58   mysql_select_db("squidctrl"); 
     57  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     58  mysql_select_db($SAMSConf->MYSQLDATABASE); 
    5959 
    6060  PageTop("user.jpg","$dbbuttom_7_chname_ChUserForm_1"); 
     
    7575  print("<SELECT NAME=\"fromuser\" ID=\"fromuser\" SIZE=1 TABINDEX=30 >\n"); 
    7676 
    77   db_connect("squidctrl") or exit(); 
    78   mysql_select_db("squidctrl") 
     77  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     78  mysql_select_db($SAMSConf->MYSQLDATABASE) 
    7979       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"); 
    8181  while($row=mysql_fetch_array($result)) 
    8282      { 
     
    9191  print("<SELECT NAME=\"touser\" ID=\"touser\" SIZE=1 TABINDEX=30 >\n"); 
    9292 
    93   db_connect("squidctrl") or exit(); 
    94   mysql_select_db("squidctrl") 
     93  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     94  mysql_select_db($SAMSConf->MYSQLDATABASE) 
    9595       or print("Error\n"); 
    9696  $result=mysql_query("SELECT nick,domain FROM squidusers ORDER BY nick"); 
  • trunk/php/src/groupbuttom_0_prop.php

    r2 r3  
    99{ 
    1010  global $SAMSConf; 
     11   
    1112  $SAMSConf->access=UserAccess(); 
    1213  if($SAMSConf->access!=2)     {       exit;     } 
     
    1516  if(isset($_GET["nick"])) $nick=$_GET["nick"]; 
    1617 
    17   db_connect("squidctrl") or exit(); 
    18   mysql_select_db("squidctrl"); 
     18  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     19  mysql_select_db($SAMSConf->MYSQLDATABASE); 
    1920  $result=mysql_query("DELETE FROM sconfig WHERE sname=\"$sname\" "); 
    2021 
  • trunk/php/src/groupbuttom_1_traffic.php

    r2 r3  
    2222  $eddate=$DATE->EndDate(); 
    2323 
    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); 
    2727 
    2828  $aaa=ReturnGroupNick($groupname); 
    2929   
    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"); 
    3131  $count=0; 
    3232  while ($row=mysql_fetch_array($result)) 
     
    5959  $eddate=$DATE->EndDate(); 
    6060 
    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); 
    6464 
    6565  $aaa=ReturnGroupNick($groupname); 
     
    9696  print("<TH>$groupbuttom_1_traffic_GroupTrafficPeriod_4"); 
    9797 
    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"); 
    100100  while ($row=mysql_fetch_array($result)) 
    101101       { 
     
    157157  if(isset($_GET["groupname"])) $groupname=$_GET["groupname"]; 
    158158 
    159   db_connect("squidctrl") or exit(); 
    160   mysql_select_db("squidctrl"); 
     159  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     160  mysql_select_db($SAMSConf->MYSQLDATABASE); 
    161161  $result=mysql_query("SELECT * FROM groups WHERE name=\"$groupname\" "); 
    162162  $row=mysql_fetch_array($result); 
  • trunk/php/src/groupbuttom_2_file.php

    r2 r3  
    3939 
    4040  $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); 
    4343 
    4444  print("<TABLE CLASS=samstable>"); 
     
    5050  $count=0; 
    5151 
    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"; 
    5353  $result=mysql_query($query); 
    5454  while($row=mysql_fetch_array($result)) 
     
    9191  if(isset($_GET["groupname"])) $groupname=$_GET["groupname"]; 
    9292 
    93   db_connect("squidctrl") or exit(); 
    94   mysql_select_db("squidctrl"); 
     93  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     94  mysql_select_db($SAMSConf->MYSQLDATABASE); 
    9595  $result=mysql_query("SELECT * FROM groups WHERE name=\"$groupname\" "); 
    9696  $row=mysql_fetch_array($result); 
  • trunk/php/src/groupbuttom_3_site.php

    r2 r3  
    7070  print("<TH>URL"); 
    7171 
    72   mysql_select_db("squidlog"); 
     72  mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 
    7373  $result=mysql_query("SELECT date,user,size,url FROM cache WHERE date>=\"$sdate\"&&date<=\"$edate\"&&url like \"%$site%\" ORDER BY size desc limit 250"); 
    7474 
     
    130130  print("<TH>URL"); 
    131131 
    132   db_connect("squidlog") or exit(); 
    133   mysql_select_db("squidctrl"); 
     132  db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 
     133  mysql_select_db($SAMSConf->MYSQLDATABASE); 
    134134  $result=mysql_query("SELECT * FROM squidusers WHERE squidusers.group=\"$groupname\""); 
    135135 
     
    145145  $filesize=($filesize*$SAMSConf->KBSIZE)-1; 
    146146 
    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\""); 
    150150  $result=mysql_query("UPDATE cache_ SET url=SUBSTRING_INDEX(url,'/',3) "); 
    151151 
     
    185185 
    186186  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); 
    189189  $result=mysql_query("SELECT * FROM groups WHERE name=\"$groupname\" "); 
    190190  $row=mysql_fetch_array($result); 
  • trunk/php/src/grouptray.php

    r2 r3  
    4141function UserGroupForm() 
    4242{ 
     43  global $SAMSConf; 
    4344   
    44   global $SAMSConf; 
    4545  $lang="./lang/lang.$SAMSConf->LANG"; 
    4646  require($lang); 
     
    4949  if(isset($_GET["groupname"])) $groupname=$_GET["groupname"]; 
    5050 
    51   db_connect("squidctrl") or exit(); 
    52   mysql_select_db("squidctrl") 
     51  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     52  mysql_select_db($SAMSConf->MYSQLDATABASE) 
    5353       or print("Error\n"); 
    5454  $ga=0; 
     
    174174  print("</SCRIPT> \n"); 
    175175 
    176   db_connect("squidctrl") or exit(); 
    177   mysql_select_db("squidctrl"); 
     176  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     177  mysql_select_db($SAMSConf->MYSQLDATABASE); 
    178178  $result=mysql_query("SELECT * FROM groups WHERE name=\"$groupname\" "); 
    179179  $row=mysql_fetch_array($result); 
  • trunk/php/src/localbuttom_1_savelist.php

    r2 r3  
    1212  require($lang); 
    1313 
    14   db_connect("squidctrl") or exit(); 
    15   mysql_select_db("squidctrl") 
     14  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     15  mysql_select_db($SAMSConf->MYSQLDATABASE) 
    1616       or print("Error\n"); 
    1717 
  • trunk/php/src/localbuttom_2_loadlist.php

    r2 r3  
    2424 
    2525  $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) 
    2828       or print("Error\n"); 
    2929  while(feof($finp)==0) 
  • trunk/php/src/locallisttray.php

    r2 r3  
    1515  $count=0; 
    1616 
    17   db_connect("squidctrl") or exit(); 
    18   mysql_select_db("squidctrl") 
     17  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     18  mysql_select_db($SAMSConf->MYSQLDATABASE) 
    1919       or print("Error\n"); 
    2020 
  • trunk/php/src/logbuttom_1.php

    r2 r3  
    2424   
    2525  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); 
    2828 
    2929  if($username=="on") 
  • trunk/php/src/logbuttom_2.php

    r2 r3  
    2525       NewDateSelect(0,""); 
    2626       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); 
    2929 
    3030  $result=mysql_query("SELECT * FROM log WHERE code=\"01\"&&date>=\"$sdate\"&&date<=\"$edate\" "); 
  • trunk/php/src/logbuttom_3.php

    r2 r3  
    2727 
    2828   
    29   db_connect("squidctrl") or exit(); 
    30   mysql_select_db("squidctrl"); 
     29  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     30  mysql_select_db($SAMSConf->MYSQLDATABASE); 
    3131 
    3232  $result=mysql_query("SELECT * FROM log WHERE code=\"02\"&&date>=\"$sdate\"&&date<=\"$edate\" "); 
  • trunk/php/src/logbuttom_4.php

    r2 r3  
    2626       print("</FORM>\n"); 
    2727   
    28   db_connect("squidctrl") or exit(); 
    29   mysql_select_db("squidctrl"); 
     28  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     29  mysql_select_db($SAMSConf->MYSQLDATABASE); 
    3030 
    3131  $result=mysql_query("SELECT * FROM log WHERE code=\"04\"&&date>=\"$sdate\"&&date<=\"$edate\" "); 
  • trunk/php/src/logbuttom_5.php

    r2 r3  
    2727       print("</FORM>\n"); 
    2828   
    29   db_connect("squidctrl") or exit(); 
    30   mysql_select_db("squidctrl"); 
     29  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     30  mysql_select_db($SAMSConf->MYSQLDATABASE); 
    3131 
    3232  $result=mysql_query("SELECT * FROM log WHERE code=\"10\"&&date>=\"$sdate\"&&date<=\"$edate\"  "); 
  • trunk/php/src/logbuttom_9_delete.php

    r2 r3  
    1919   if($SAMSConf->access!=2)     {       exit;     } 
    2020   
    21   db_connect("squidctrl") or exit(); 
    22   mysql_select_db("squidctrl") 
     21  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     22  mysql_select_db($SAMSConf->MYSQLDATABASE) 
    2323       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\""); 
    2525  print("<H3>õÄÁÌÅÎÙ ÌÏÇÉ</H3> $traffic_2 $bdate $traffic_3 $eddate "); 
    2626//  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  
    1111function UpdateLog($username,$value,$code) 
    1212{ 
     13  global $SAMSConf; 
     14   
    1315  $year=date("Y")*1; 
    1416  $month=date("m")*1; 
     
    1921  $sec=date("s")*1; 
    2022  $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); 
    2325  $result=mysql_query("INSERT INTO log SET user=\"$username\",date=\"$date\",time=\"$time\",value=\"$value\",code=\"$code\" "); 
    2426} 
  • trunk/php/src/monitorbuttom_1.php

    r2 r3  
    1616  printf("setTimeout('Refr();',5000);\n"); 
    1717  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); 
    2020 
    2121  $result=mysql_query("SELECT * FROM squidusers ORDER BY nick"); 
  • trunk/php/src/monitorbuttom_2.php

    r2 r3  
    1616  printf("setTimeout('Refr();',5000);\n"); 
    1717  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); 
    2020 
    2121  $result=mysql_query("SELECT * FROM squidusers ORDER BY size DESC"); 
  • trunk/php/src/newgrpbuttom_1_adldap.php

    r2 r3  
    5050   if($SAMSConf->access!=2)     {       exit;     } 
    5151   
    52   db_connect("squidctrl") or exit(); 
    53   mysql_select_db("squidctrl"); 
     52  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     53  mysql_select_db($SAMSConf->MYSQLDATABASE); 
    5454 
    5555  PageTop("user.jpg"," $newgroupbuttom_1_adldap_AddGroupsFromAdLDAPForm_1"); 
  • trunk/php/src/proxybuttom_1_down.php

    r2 r3  
    5353      print("<TH width=60%>$shutdown_proxy_proxybuttom_1_down_1"); 
    5454      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"); 
    5656       while($row=mysql_fetch_array($result)) 
    5757           { 
  • trunk/php/src/redirbuttom_4_redirstat.php

    r2 r3  
    2121  $eddate=$DATE->EndDate(); 
    2222 
    23   db_connect("squidctrl") or exit(); 
    24   mysql_select_db("squidctrl"); 
     23  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     24  mysql_select_db($SAMSConf->MYSQLDATABASE); 
    2525 
    2626  PageTop("user.jpg","óÔÁÔÉÓÔÉËÁ ÓÐÉÓËÁ ÐÅÒÅÎÁÐÒÁ×ÌÅÎÉÑ ÚÁÐÒÏÓÏ× <BR><FONT COLOR=\"BLUE\">$row[name]</FONT>"); 
     
    4444  $filesize=$filesize*$SAMSConf->KBSIZE; 
    4545   
    46   $result=mysql_query("SELECT * FROM squidctrl.urls WHERE type=\"$id\" "); 
     46  $result=mysql_query("SELECT * FROM ".$SAMSConf->MYSQLDATABASE.".urls WHERE type=\"$id\" "); 
    4747  while($row=mysql_fetch_array($result)) 
    4848       { 
    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]%\" "); 
    5050         $row2=mysql_fetch_array($result2); 
    5151         print("<TR>"); 
     
    7070  if(isset($_GET["id"])) $id=$_GET["id"]; 
    7171 
    72   db_connect("squidctrl") or exit(); 
    73   mysql_select_db("squidctrl"); 
     72  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     73  mysql_select_db($SAMSConf->MYSQLDATABASE); 
    7474  $result=mysql_query("SELECT * FROM redirect WHERE filename=\"$id\" "); 
    7575  $row=mysql_fetch_array($result); 
  • trunk/php/src/shablonbuttom_1_prop.php

    r2 r3  
    6464     $emin="00"; 
    6565 
    66   db_connect("squidctrl") or exit(); 
    67   mysql_select_db("squidctrl"); 
     66  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     67  mysql_select_db($SAMSConf->MYSQLDATABASE); 
    6868  $result=mysql_query("DELETE FROM sconfig WHERE sname=\"$sname\" "); 
    6969 
  • trunk/php/src/shablontray.php

    r2 r3  
    1818   if($SAMSConf->access!=2)     {       exit;     } 
    1919   
    20   db_connect("squidctrl") or exit(); 
    21   mysql_select_db("squidctrl") 
     20  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     21  mysql_select_db($SAMSConf->MYSQLDATABASE) 
    2222       or print("Error\n"); 
    2323  $result=mysql_query("SELECT * FROM shablons WHERE shablons.name=\"$id\" "); 
     
    7575  if($SAMSConf->access==2) 
    7676    { 
    77       db_connect("squidctrl") or exit(); 
    78       mysql_select_db("squidctrl"); 
     77      db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     78      mysql_select_db($SAMSConf->MYSQLDATABASE); 
    7979      $result=mysql_query("SELECT * FROM shablons WHERE name=\"$id\" "); 
    8080      $row=mysql_fetch_array($result); 
  • trunk/php/src/squidbuttom_0_reconfig.php

    r2 r3  
    8181      print("<TH width=60%>$squidbuttom_0_reconfig_ReconfigSquidForm_3"); 
    8282      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"); 
    8484       while($row=mysql_fetch_array($result)) 
    8585           { 
  • trunk/php/src/squidbuttom_1_savebase.php

    r2 r3  
    2121   if($SAMSConf->access!=2)     {       exit;     } 
    2222   
    23   db_connect("squidlog") or exit(); 
    24   mysql_select_db("squidlog") 
     23  db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 
     24  mysql_select_db($SAMSConf->SQUIDCTRLDATABASE) 
    2525       or print("Error\n"); 
    2626 
     
    3030  $fout=gzopen("data/$filename","w9"); 
    3131  gzwrite($fout,"# SQUIDLOG DUMP FOR MYSQL DATABASE\n\n"); 
    32   gzwrite($fout," USE squidlog; \n"); 
     32  gzwrite($fout," USE ".$SAMSConf->SQUIDCTRLDATABASE."; \n"); 
    3333   
    3434  //ÚÁÐÉÓÙ×ÁÅÍ squidlog.cache 
  • trunk/php/src/squidbuttom_2_loadbase.php

    r2 r3  
    1414   
    1515  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); 
    1818  $finp=gzopen("data/loadsquid.sql","r"); 
    1919  while(gzeof($finp)==0) 
  • trunk/php/src/squidbuttom_3_delete.php

    r2 r3  
    1919   if($SAMSConf->access!=2)     {       exit;     } 
    2020   
    21   db_connect("squidlog") or exit(); 
    22   mysql_select_db("squidlog") 
     21  db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 
     22  mysql_select_db($SAMSConf->SQUIDCTRLDATABASE) 
    2323       or print("Error\n"); 
    2424  $result=mysql_query("DELETE FROM cache WHERE date>=\"$sdate\"&&date<=\"$edate\""); 
  • trunk/php/src/squidbuttom_4_addcache.php

    r2 r3  
    1818          { 
    1919            //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\" "); 
    2121          } 
    2222    } 
     
    4444  $usergroup=trim($usergroup); 
    4545 
    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 "); 
    4949      $row=mysql_fetch_array($result); 
    5050      $id=$row[0]+1; 
     
    6969  if($SAMSConf->access==2) 
    7070    { 
    71  //      db_connect("squidctrl") or exit(); 
    72  //      mysql_select_db("squidctrl") 
     71 //      db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     72 //      mysql_select_db($SAMSConf->MYSQLDATABASE) 
    7373 //           or print("Error\n"); 
    7474      PageTop("proxyes_48.jpg","$CacheForm_squidbuttom_4_addcache_1"); 
     
    8282      print("<TH width=60%>$CacheForm_squidbuttom_4_addcache_3"); 
    8383      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"); 
    8585       while($row=mysql_fetch_array($result)) 
    8686           { 
  • trunk/php/src/urllistfunction.php

    r2 r3  
    3535   if($SAMSConf->access!=2)     {       exit;     } 
    3636   
    37   db_connect("squidctrl") or exit(); 
    38   mysql_select_db("squidctrl") 
     37  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     38  mysql_select_db($SAMSConf->MYSQLDATABASE) 
    3939       or print("Error\n"); 
    4040  $result=mysql_query("UPDATE urls SET url=\"$url\" WHERE url=\"$oldvalue\"&&type=\"$type\" "); 
     
    122122   if($SAMSConf->access!=2)     {       exit;     } 
    123123 
    124   db_connect("squidctrl") or exit(); 
    125   mysql_select_db("squidctrl") 
     124  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     125  mysql_select_db($SAMSConf->MYSQLDATABASE) 
    126126       or print("Error\n"); 
    127127  $result=mysql_query("DELETE FROM urls WHERE type=\"$type\" "); 
     
    151151      if($SAMSConf->access!=2)     {       exit;     } 
    152152   
    153       db_connect("squidctrl") or exit(); 
    154       mysql_select_db("squidctrl") 
     153      db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     154      mysql_select_db($SAMSConf->MYSQLDATABASE) 
    155155           or print("Error\n"); 
    156156      $result=mysql_query("INSERT INTO urls SET url=\"$url\",type=\"$type\" "); 
     
    179179 
    180180  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) 
    183183       or print("Error\n"); 
    184184  print("<h1>URL=$url / $type $deletedurl</h1>"); 
  • trunk/php/src/userbuttom_1_prop.php

    r2 r3  
    2929   if($SAMSConf->access!=2)     {      exit;    } 
    3030   
    31   db_connect("squidctrl") or exit(); 
    32   mysql_select_db("squidctrl"); 
     31  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     32  mysql_select_db($SAMSConf->MYSQLDATABASE); 
    3333  if($gauditor=="on") 
    3434     $gauditor=1; 
     
    7878   if($SAMSConf->access!=2)     {      exit;    } 
    7979   
    80   db_connect("squidctrl") or exit(); 
    81   mysql_select_db("squidctrl"); 
     80  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     81  mysql_select_db($SAMSConf->MYSQLDATABASE); 
    8282  $result=mysql_query("SELECT * FROM squidusers WHERE id=\"$userid\" "); 
    8383  $row=mysql_fetch_array($result); 
     
    140140  print("<SELECT NAME=\"usergroup\" ID=\"groupname\" SIZE=1 TABINDEX=30 >\n"); 
    141141 
    142   db_connect("squidctrl") or exit(); 
    143   mysql_select_db("squidctrl") 
     142  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     143  mysql_select_db($SAMSConf->MYSQLDATABASE) 
    144144       or print("Error\n"); 
    145145  $result2=mysql_query("SELECT name,nick FROM groups"); 
  • trunk/php/src/userbuttom_2_traffic.php

    r2 r3  
    2424  if(isset($_GET["userdomain"])) $userdomain=$_GET["userdomain"]; 
    2525 
    26   db_connect("squidlog") or exit(); 
    27   mysql_select_db("squidlog"); 
     26  db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 
     27  mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 
    2828 
    2929  $stime=gmmktime (0, 0, 1, $DATE->smon, $DATE->sday, $DATE->syea); 
     
    8484  $eddate=$DATE->EndDate(); 
    8585 
    86   db_connect("squidlog") or exit(); 
    87   mysql_select_db("squidlog"); 
     86  db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 
     87  mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 
    8888   
    8989  PageTop("user.jpg","$traffic_1 <FONT COLOR=\"BLUE\"> $username</FONT><BR>$userbuttom_2_traffic_UserTrafficPeriod_2"); 
     
    168168  if(isset($_GET["userid"])) $userid=$_GET["userid"]; 
    169169 
    170   db_connect("squidctrl") or exit(); 
    171   mysql_select_db("squidctrl"); 
     170  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     171  mysql_select_db($SAMSConf->MYSQLDATABASE); 
    172172  $result=mysql_query("SELECT * FROM squidusers WHERE id=\"$userid\" "); 
    173173  $row=mysql_fetch_array($result); 
  • trunk/php/src/userbuttom_3_file.php

    r2 r3  
    2727  $eddate=$DATE->EndDate(); 
    2828 
    29   db_connect("squidlog") or exit(); 
    30   mysql_select_db("squidlog"); 
     29  db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 
     30  mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 
    3131 
    3232  PageTop("user.jpg","$traffic_1 <FONT COLOR=\"BLUE\">$username</FONT><BR>$userbuttom_3_file_UserFileSizePeriod_1 $filesize kb"); 
     
    8080  if(isset($_GET["userid"])) $userid=$_GET["userid"]; 
    8181 
    82   db_connect("squidctrl") or exit(); 
    83   mysql_select_db("squidctrl"); 
     82  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     83  mysql_select_db($SAMSConf->MYSQLDATABASE); 
    8484  $result=mysql_query("SELECT * FROM squidusers WHERE id=\"$userid\" "); 
    8585  $row=mysql_fetch_array($result); 
  • trunk/php/src/userbuttom_4_site.php

    r2 r3  
    7272  print("<TH>URL"); 
    7373 
    74   mysql_select_db("squidlog"); 
     74  mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 
    7575  $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"); 
    7676  $counter=0; 
     
    117117  $eyea=$DATE->eyea; 
    118118 
    119   db_connect("squidlog") or exit(); 
    120   mysql_select_db("squidlog"); 
     119  db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 
     120  mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 
    121121 
    122122  PageTop("user.jpg","$traffic_1 <FONT COLOR=\"BLUE\">$username</FONT><BR>$userbuttom_4_site_UserSitesPeriod_2"); 
     
    199199  if(isset($_GET["userid"])) $userid=$_GET["userid"]; 
    200200 
    201   db_connect("squidctrl") or exit(); 
    202   mysql_select_db("squidctrl"); 
     201  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     202  mysql_select_db($SAMSConf->MYSQLDATABASE); 
    203203  $result=mysql_query("SELECT * FROM squidusers WHERE id=\"$userid\" "); 
    204204  $row=mysql_fetch_array($result); 
  • trunk/php/src/userbuttom_4_time.php

    r2 r3  
    4141    
    4242   
    43   db_connect("squidlog") or exit(); 
    44   mysql_select_db("squidlog"); 
     43  db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 
     44  mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 
    4545   
    4646  $count=0; 
     
    5858   
    5959  $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"; 
    6161  $result=mysql_query("$query"); 
    6262  while($row=mysql_fetch_array($result)) 
     
    126126    
    127127   
    128   db_connect("squidlog") or exit(); 
    129   mysql_select_db("squidlog"); 
     128  db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 
     129  mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 
    130130   
    131131  PageTop("user.jpg","$traffic_1 <FONT COLOR=\"BLUE\">$username</FONT><BR>$URLTimeForm_userbuttom_4_time_1"); 
     
    158158  $result=mysql_query("$query"); 
    159159   
    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"; 
    161161  $result=mysql_query("$query"); 
    162162//  print("query=$query<BR>result = $result"); 
    163163   
    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"; 
    165165  $result=mysql_query("$query"); 
    166166  //print("result = $result"); 
     
    206206  if(isset($_GET["userid"])) $userid=$_GET["userid"]; 
    207207 
    208   db_connect("squidctrl") or exit(); 
    209   mysql_select_db("squidctrl"); 
     208  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     209  mysql_select_db($SAMSConf->MYSQLDATABASE); 
    210210  $result=mysql_query("SELECT * FROM squidusers WHERE id=\"$userid\" "); 
    211211  $row=mysql_fetch_array($result); 
  • trunk/php/src/userbuttom_5_clear.php

    r2 r3  
    1818  if(isset($_GET["userid"])) $userid=$_GET["userid"]; 
    1919 
    20   db_connect("squidctrl") or exit(); 
    21   mysql_select_db("squidctrl"); 
     20  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     21  mysql_select_db($SAMSConf->MYSQLDATABASE); 
    2222  $result=mysql_query("UPDATE squidusers SET size=\"0\",hit=\"0\" WHERE id=\"$userid\" "); 
    2323  $result=mysql_query("SELECT * FROM squidusers WHERE id=\"$userid\" "); 
  • trunk/php/src/userbuttom_6_chpasswd.php

    r2 r3  
    2323   
    2424  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\" "); 
    2828  if($SAMSConf->AUTH=="ncsa") 
    2929         $result=mysql_query("INSERT INTO reconfig SET service=\"squid\",action=\"reconfig\" "); 
     
    4040  if(isset($_GET["userid"])) $userid=$_GET["userid"]; 
    4141    
    42   db_connect("squidctrl") or exit(); 
    43   mysql_select_db("squidctrl"); 
     42  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     43  mysql_select_db($SAMSConf->MYSQLDATABASE); 
    4444  $result=mysql_query("SELECT * FROM squidusers WHERE id=\"$userid\" "); 
    4545  $row=mysql_fetch_array($result); 
  • trunk/php/src/userbuttom_9_delete.php

    r2 r3  
    2424  print("</SCRIPT> \n"); 
    2525   
    26   db_connect("squidctrl") or exit(); 
    27   mysql_select_db("squidctrl"); 
     26  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     27  mysql_select_db($SAMSConf->MYSQLDATABASE); 
    2828  $result=mysql_query("SELECT * FROM squidusers WHERE id=\"$userid\" "); 
    2929  $row=mysql_fetch_array($result); 
  • trunk/php/src/usersbuttom_1_adldap.php

    r2 r3  
    9595  if($SAMSConf->access!=2)     {       exit;     } 
    9696   
    97   db_connect("squidctrl") or exit(); 
    98   mysql_select_db("squidctrl"); 
     97  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     98  mysql_select_db($SAMSConf->MYSQLDATABASE); 
    9999 
    100100  PageTop("user.jpg"," $usersbuttom_1_domain_AddUsersFromDomainForm_1 Active Directory "); 
     
    209209    print("<TD>\n"); 
    210210    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) 
    213213       or print("Error\n"); 
    214214    $result=mysql_query("SELECT * FROM shablons"); 
  • trunk/php/src/usersbuttom_1_domain.php

    r2 r3  
    101101   if($SAMSConf->access!=2)     {       exit;     } 
    102102   
    103   db_connect("squidctrl") or exit(); 
    104   mysql_select_db("squidctrl"); 
     103  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     104  mysql_select_db($SAMSConf->MYSQLDATABASE); 
    105105 
    106106  PageTop("user.jpg"," $usersbuttom_1_domain_AddUsersFromDomainForm_1"); 
     
    196196  print("<TD>\n"); 
    197197  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) 
    200200       or print("Error\n"); 
    201201  $result=mysql_query("SELECT * FROM shablons"); 
     
    224224   if($SAMSConf->access!=2)     {       exit;     } 
    225225   
    226   db_connect("squidctrl") or exit(); 
    227   mysql_select_db("squidctrl"); 
     226  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     227  mysql_select_db($SAMSConf->MYSQLDATABASE); 
    228228 
    229229  PageTop("user.jpg"," $usersbuttom_1_domain_AddUsersFromDomainForm_1"); 
     
    309309  print("<TD>\n"); 
    310310  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) 
    313313       or print("Error\n"); 
    314314  $result=mysql_query("SELECT * FROM shablons"); 
  • trunk/php/src/usersbuttom_1_ncsa.php

    r2 r3  
    121121  print("<TD>\n"); 
    122122  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) 
    125125       or print("Error\n"); 
    126126  $result=mysql_query("SELECT * FROM shablons"); 
  • trunk/php/src/usersbuttom_1_useradd.php

    r2 r3  
    1414   if($SAMSConf->access!=2)     {       exit;     } 
    1515 
    16   db_connect("squidctrl") or exit(); 
    17   mysql_select_db("squidctrl"); 
     16  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     17  mysql_select_db($SAMSConf->MYSQLDATABASE); 
    1818 
    1919  if($SAMSConf->AUTH=="ntlm") 
     
    149149  $usergroup=trim($usergroup); 
    150150 
    151   db_connect("squidctrl") or exit(); 
    152   mysql_select_db("squidctrl"); 
     151  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     152  mysql_select_db($SAMSConf->MYSQLDATABASE); 
    153153  if($SAMSConf->AUTH=="ncsa"||$SAMSConf->AUTH=="ip") 
    154154    { 
     
    293293       print("<SELECT NAME=\"usergroup\" ID=\"groupname\" SIZE=1 TABINDEX=30 >\n"); 
    294294 
    295        db_connect("squidctrl") or exit(); 
    296        mysql_select_db("squidctrl") 
     295       db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     296       mysql_select_db($SAMSConf->MYSQLDATABASE) 
    297297            or print("Error\n"); 
    298298       $result=mysql_query("SELECT name,nick FROM groups"); 
     
    340340       print("<TD>\n"); 
    341341       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) 
    344344            or print("Error\n"); 
    345345       $result=mysql_query("SELECT * FROM shablons"); 
  • trunk/php/src/usersbuttom_2_traffic.php

    r2 r3  
    2424  $eddate=$DATE->EndDate(); 
    2525 
    26   db_connect("squidlog") or exit(); 
    27   mysql_select_db("squidlog"); 
     26  db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 
     27  mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 
    2828 
    2929  $pdfFile=pdf_new(); 
     
    6363  while($row=mysql_fetch_array($result)) 
    6464       { 
    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]\""); 
    6666         $row_2=mysql_fetch_array($result_2); 
    6767         pdf_show_xy($pdfFile, $count+1, 50, $ycount);   
     
    116116  $eddate=$DATE->EndDate(); 
    117117 
    118   db_connect("squidlog") or exit(); 
    119   mysql_select_db("squidlog"); 
     118  db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 
     119  mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 
    120120 
    121121  $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"); 
     
    125125  while($row=mysql_fetch_array($result)) 
    126126       { 
    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]\""); 
    128128         $row_2=mysql_fetch_array($result_2); 
    129129          
     
    153153  $eddate=$DATE->EndDate(); 
    154154 
    155   db_connect("squidlog") or exit(); 
    156   mysql_select_db("squidlog"); 
     155  db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 
     156  mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 
    157157 
    158158  PageTop("usergroup_48.jpg","$usersbuttom_2_traffic_UsersTrafficPeriod_1<BR>$usersbuttom_2_traffic_UsersTrafficPeriod_2"); 
     
    201201       { 
    202202         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]\""); 
    204204         $row_2=mysql_fetch_array($result_2); 
    205205         LTableCell($count,8); 
  • trunk/php/src/usersbuttom_3_file.php

    r2 r3  
    3636  printf("<BR><B>$traffic_2 $bdate $traffic_3 $eddate</B> "); 
    3737 
    38   db_connect("squidlog") or exit(); 
    39   mysql_select_db("squidlog"); 
     38  db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 
     39  mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 
    4040 
    4141  if($_GET["check"]==1) 
     
    5353      $count=0; 
    5454//      $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"); 
    5656      while($row=mysql_fetch_array($result)) 
    5757         { 
     
    128128  if($SAMSConf->access!=2)     {      exit;    } 
    129129   
    130   db_connect("squidctrl") or exit(); 
    131   mysql_select_db("squidctrl"); 
     130  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     131  mysql_select_db($SAMSConf->MYSQLDATABASE); 
    132132  $result=mysql_query("SELECT * FROM squidusers WHERE id=\"$userid\" "); 
    133133  $row=mysql_fetch_array($result); 
  • trunk/php/src/usersbuttom_4_percent.php

    r2 r3  
    2121  $eddate=$DATE->EndDate(); 
    2222 
    23 db_connect("squidlog") or exit(); 
    24 mysql_select_db("squidlog"); 
     23db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 
     24mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 
    2525 
    2626$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"); 
     
    6363  $eddate=$DATE->EndDate(); 
    6464 
    65   db_connect("squidlog") or exit(); 
    66   mysql_select_db("squidlog"); 
     65  db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 
     66  mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 
    6767 
    6868$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"); 
     
    7373$percent=$all/100; 
    7474   
    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"); 
    7676  $count=0; 
    7777  while($row=mysql_fetch_array($result)) 
     
    118118    printf("<P><IMG SRC=\"main.php?show=exe&function=userspercenttrafficgb&filename=usersbuttom_4_percent.php&gb=1&sdate=$sdate&edate=$edate \"><P>"); 
    119119   
    120 db_connect("squidlog") or exit(); 
    121 mysql_select_db("squidlog"); 
     120db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 
     121mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 
    122122 
    123123$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"); 
     
    138138 
    139139//$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"); 
    141141$ap=0; 
    142142$count=1; 
     
    195195print("<TH>%"); 
    196196 
    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"); 
    198198$count=1; 
    199199while($row=mysql_fetch_array($result)) 
  • trunk/php/src/usersbuttom_5_recalc.php

    r2 r3  
    2727  PageTop("usergroup_48.jpg","$usersbuttom_5_recalc_RecalcUsersTraffic_1 1.$smon.$syea ÐÏ $eday.$smon.$syea $usersbuttom_5_recalc_RecalcUsersTraffic_"); 
    2828 
    29   db_connect("squidlog") or exit(); 
    30   mysql_select_db("squidlog"); 
     29  db_connect($SAMSConf->SQUIDCTRLDATABASE) or exit(); 
     30  mysql_select_db($SAMSConf->SQUIDCTRLDATABASE); 
    3131   
    3232  $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"); 
     
    4040         if($row[3]>0) 
    4141            $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]\" "); 
    4343       } 
    4444  UpdateLog("$SAMSConf->adminname","$usersbuttom_5_recalc_RecalcUsersTraffic_3","01"); 
  • trunk/php/src/usersbuttom_6_clear.php

    r2 r3  
    1616  if($SAMSConf->access==2) 
    1717    { 
    18       db_connect("squidctrl") or exit(); 
    19       mysql_select_db("squidctrl"); 
     18      db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     19      mysql_select_db($SAMSConf->MYSQLDATABASE); 
    2020      $result=mysql_query("UPDATE squidusers SET size=\"0\",hit=\"0\" "); 
    2121      UpdateLog("$SAMSConf->adminname","$usersbuttom_6_clear_ClearUsersTrafficCounter","01"); 
  • trunk/php/src/userstray.php

    r2 r3  
    6363  if(isset($_GET["groupname"])) $groupname=$_GET["groupname"]; 
    6464 
    65   db_connect("squidctrl") or exit(); 
    66   mysql_select_db("squidctrl") 
     65  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     66  mysql_select_db($SAMSConf->MYSQLDATABASE) 
    6767       or print("Error\n"); 
    6868  $result=mysql_query("SELECT * FROM groups WHERE groups.name=\"$groupname\" "); 
     
    9999  $count=0; 
    100100   
    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"); 
    103103   
    104104  while($row=mysql_fetch_array($result)) 
  • trunk/php/src/usertray.php

    r2 r3  
    7070             $SAMSConf->domainusername=$userdomain; 
    7171        
    72            db_connect("squidctrl") or exit(); 
    73            mysql_select_db("squidctrl"); 
     72           db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     73           mysql_select_db($SAMSConf->MYSQLDATABASE); 
    7474           $result=mysql_query("SELECT nick,passwd,domain,gauditor,squidusers.group,autherrorc,autherrort FROM squidusers WHERE nick=\"$SAMSConf->domainusername\" "); 
    7575           $row=mysql_fetch_array($result); 
     
    8282  if($SAMSConf->AUTH=="ip"||$SAMSConf->AUTH=="ncsa") 
    8383    { 
    84        db_connect("squidctrl") or exit(); 
    85        mysql_select_db("squidctrl"); 
     84       db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     85       mysql_select_db($SAMSConf->MYSQLDATABASE); 
    8686       $result=mysql_query("SELECT nick,passwd,domain,gauditor,squidusers.group,autherrorc,autherrort,id FROM squidusers WHERE nick=\"$userdomain\"&&passwd=\"$password\" "); 
    8787       $row=mysql_fetch_array($result); 
     
    208208          } 
    209209          
    210        db_connect("squidctrl") or exit(); 
    211        mysql_select_db("squidctrl"); 
     210       db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     211       mysql_select_db($SAMSConf->MYSQLDATABASE); 
    212212       $result=mysql_query("SELECT nick,passwd,domain,gauditor,squidusers.group,autherrorc,autherrort FROM squidusers WHERE id=\"$id\" "); 
    213213       $row=mysql_fetch_array($result); 
     
    219219  if($SAMSConf->AUTH=="ip"||$SAMSConf->AUTH=="ncsa") 
    220220    { 
    221       db_connect("squidctrl") or exit(); 
    222        mysql_select_db("squidctrl"); 
     221      db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     222       mysql_select_db($SAMSConf->MYSQLDATABASE); 
    223223        
    224224       $result2=mysql_query("SELECT nick,id FROM squidusers WHERE id=\"$id\" "); 
     
    425425  require($lang); 
    426426 
    427   db_connect("squidctrl") or exit(); 
    428   mysql_select_db("squidctrl"); 
     427  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     428  mysql_select_db($SAMSConf->MYSQLDATABASE); 
    429429 
    430430  $result=mysql_query("SELECT * FROM squidusers WHERE id=\"$userid\"&&squidusers.group=\"$usergroup\" "); 
  • trunk/php/src/webconfigbuttom_1_prop.php

    r2 r3  
    3535  if($showgraph=="on") 
    3636    $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); 
    3939  $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\" "); 
    4040  $SAMSConf->LoadConfig(); 
     
    5757  print("<P>\n"); 
    5858 
    59   db_connect("squidctrl") or exit(); 
    60   mysql_select_db("squidctrl"); 
     59  db_connect($SAMSConf->MYSQLDATABASE) or exit(); 
     60  mysql_select_db($SAMSConf->MYSQLDATABASE); 
    6161  $result=mysql_query("SELECT * FROM globalsettings"); 
    6262  $row=mysql_fetch_array($result); 
  • trunk/php/src/webconfigtray.php

    r2 r3  
    110110function SysInfo() 
    111111{ 
     112   global $SAMSConf; 
     113    
    112114   PageTop("stat_48.jpg","System Information"); 
    113115 
     
    145147   print("<TH width=\"33%\" >Traffic\n"); 
    146148    
    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\" "); 
    148150  $row=mysql_fetch_array($result); 
    149151   print("<TR>\n"); 
     
    157159   RTableCell($aaa,33); 
    158160    
    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\" "); 
    160162  $row=mysql_fetch_array($result); 
    161163   print("<TR>\n");