Commit ba5ca3837803838078dae1fe95e66b8012574d59
1 parent
363cacdd
Exists in
master
and in
112 other branches
Cleanup old config variables
Showing
3 changed files
with
7 additions
and
24 deletions
Show diff stats
php/classes/AmdaClient.php
| ... | ... | @@ -18,13 +18,10 @@ class AmdaClient { |
| 18 | 18 | |
| 19 | 19 | $this->updateOnly = $updateOnly; |
| 20 | 20 | |
| 21 | - //AKKA - New DDPATH dir with the new kernel | |
| 22 | - $DDPATH = DDRES_DIR; | |
| 23 | - | |
| 24 | - /* wsdl location depends on DDServer AMDA is connected to | |
| 21 | + /* wsdl location depends on DDServer AMDA is connected to | |
| 25 | 22 | * DDServer is defined in DD.res |
| 26 | 23 | */ |
| 27 | - $SERVER = file($DDPATH."/DD.res"); | |
| 24 | + $SERVER = file(DDRES_DIR."/DD.res"); | |
| 28 | 25 | if (!file_exists(DATAPATH."wsdl.location")) { |
| 29 | 26 | $msg = "No WSDL location file -> Nothing done".PHP_EOL; |
| 30 | 27 | error_log($msg, 1, email); |
| ... | ... |
php/classes/UserMgr.php
| ... | ... | @@ -575,7 +575,7 @@ define('JOBPATH', USERPATH.'jobs/'); |
| 575 | 575 | |
| 576 | 576 | $this->IP = $this->getIPclient(); |
| 577 | 577 | |
| 578 | - $cmdCheckUser = DDBIN."Check_User ".$this->IP." ".$this->user." 1> /dev/null 2> /dev/null"; | |
| 578 | + $cmdCheckUser = KERNELBIN."Check_User ".$this->IP." ".$this->user." 1> /dev/null 2> /dev/null"; | |
| 579 | 579 | system($cmdCheckUser, $res); |
| 580 | 580 | return $res; |
| 581 | 581 | } |
| ... | ... | @@ -584,7 +584,7 @@ define('JOBPATH', USERPATH.'jobs/'); |
| 584 | 584 | |
| 585 | 585 | $this->IP = $this->getIPclient(); |
| 586 | 586 | |
| 587 | - $loginCommd = DDBIN."DD_htmllogin ".$this->user." ".$this->passwd." ".$this->IP; | |
| 587 | + $loginCommd = KERNELBIN."DD_htmllogin ".$this->user." ".$this->passwd." ".$this->IP; | |
| 588 | 588 | system($loginCommd, $res); |
| 589 | 589 | |
| 590 | 590 | return $res; |
| ... | ... |
php/config.php
| ... | ... | @@ -162,28 +162,14 @@ define('plotsXml', BASE_PATH.'public/WebServices/XML/AmdaPlots.xml'); |
| 162 | 162 | $SERVER_NAME = $_SERVER['SERVER_NAME'] ? $_SERVER['SERVER_NAME'] : gethostname(); |
| 163 | 163 | define('wsdl_AMDA', "http://".$SERVER_NAME.APACHE_ALIAS."public/wsdl/Methods_AMDA.wsdl"); |
| 164 | 164 | |
| 165 | -// All DD scripts ini | |
| 166 | -define('DDLIBHOME',DDHOME.'DDLIB/'); | |
| 165 | +// AKKA - KERNELBIN is now the new kernel bin dir | |
| 166 | +define('KERNELBIN',NEWKERNEL_INSTALL_DIR.'bin/'); | |
| 167 | 167 | |
| 168 | -// AKKA - DDBIN is now the new kernel bin dir | |
| 169 | -define('DDBIN',NEWKERNEL_INSTALL_DIR.'bin/'); | |
| 170 | - | |
| 171 | -if ($is64) { | |
| 172 | - define('DDLIB',DDLIBHOME.'lib64/'); | |
| 173 | - define('DDPROJLIB',DDHOME.'AMDALIB/lib64/'); | |
| 174 | -} | |
| 175 | -else { | |
| 176 | - define('DDLIB',DDLIBHOME.'lib/'); | |
| 177 | - define('DDPROJLIB',DDHOME.'AMDALIB/lib/'); | |
| 178 | -} | |
| 179 | - | |
| 180 | 168 | putenv("LD_LIBRARY_PATH=".SYS_LIBS.":".DDLIB.":".CEFLIB.":".CDFLIB); |
| 181 | 169 | putenv("PATH=./:".DDBIN.":".SYS_BIN.":".BASE_PATH."php/bin"); |
| 182 | 170 | |
| 183 | -//AKKA - New DDPATH dir with the new kernel | |
| 171 | +//AKKA - Put env variable DDPATH for DD_htmllogin and Check_User executable | |
| 184 | 172 | putenv("DDPATH=".DDRES_DIR); |
| 185 | - | |
| 186 | -putenv("AMDANGLIB=".OLD_CLASSPATH); | |
| 187 | 173 | |
| 188 | 174 | set_include_path(".:".CLASSPATH.":".OLD_CLASSPATH); |
| 189 | 175 | |
| ... | ... |