From 2a71571b4eb8ef185d76bafea19bf34800069fb7 Mon Sep 17 00:00:00 2001 From: Björn Geiger Date: Thu, 29 Sep 2011 14:23:49 +0200 Subject: beim event move und resize werden nun auch die filter angepasst --- application/configs/application.ini.dist | 1 + application/controllers/EventController.php | 209 ++++++++++------------------ install.sh | 6 +- 3 files changed, 74 insertions(+), 142 deletions(-) diff --git a/application/configs/application.ini.dist b/application/configs/application.ini.dist index 3b56d48..3453ad4 100755 --- a/application/configs/application.ini.dist +++ b/application/configs/application.ini.dist @@ -28,6 +28,7 @@ pbs2.deletebootmenu = /resource/deletebootmenu/apikey/ pbs2.addfilter = /resource/addfilter/apikey/ pbs2.addfilterentry = /resource/addfilterentry/apikey/ pbs2.deletefilter = /resource/deletefilter/apikey/ +pbs2.changefilterentry = /resource/changefilterentry/apikey/ pbs2.getperson = /resource/getperson/apikey/ pbs2.getmembership = /resource/getmembership/apikey/ pbs2.getgroup = /resource/getgroup/apikey/ diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php index 9d59a0a..7e09c37 100755 --- a/application/controllers/EventController.php +++ b/application/controllers/EventController.php @@ -631,83 +631,46 @@ class EventController extends Zend_Controller_Action if ($evid!="null") { $this->eventMapper->find($evid,$event); //locate the event in the DB + $oldStartTime = date('H:i', strtotime($event->getStart())); + $oldStartDate = date('Y-m-d', strtotime($event->getStart())); + $newStartTime = date('H:i', strtotime(substr($evstart, 0, 24))); + $newStartDate = date('Y-m-d', strtotime(substr($evstart, 0, 24))); $event->setStart(date('Y-m-d H:i:s', strtotime(substr($evstart, 0, 24)))); + $oldEndTime = date('H:i', strtotime($event->getEnd())); + $oldEndDate = date('Y-m-d', strtotime($event->getEnd())); + $newEndTime = date('H:i', strtotime(substr($evend, 0, 24))); + $newEndDate = date('Y-m-d', strtotime(substr($evend, 0, 24))); if($evend!="null"){ $event->setEnd(date('Y-m-d H:i:s', strtotime(substr($evend, 0, 24)))); } - if($event->getPbs_bootmenuID()) { - $bootmenuApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['deletebootmenu'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', "bootmenuid=" . $event->getPbs_bootmenuID()); - unset($bootmenuApiResult); - } + $this->eventMapper->save($event); //save the event with the new data if($event->getPbs_filterID()) { - $filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['deletefilter'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', "filterid=" . $event->getPbs_filterID()); - unset($filterApiResult); - } - $bootmenuApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['addbootmenu'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $bootmenuquery); - $bootmenuXMLString = $bootmenuApiResult['http-body']; - $bootmenuXML = new SimpleXMLElement($bootmenuXMLString); - $bootmenuID = sprintf("%s", $bootmenuXML->bootmenu->id); - $event->setPbs_bootmenuID($bootmenuID); - $filterquery = "bootmenuID=" . $event->getPbs_bootmenuID() . "&title=" . $event->getTitle() . "&description=Poolctrl Filter für " . $event->getTitle() . "&created= " . time() . "&priority=100"; - $filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['addfilter'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterquery); - $filterXMLString = $filterApiResult['http-body']; - $filterXML = new SimpleXMLElement($filterXMLString); - $filterID = sprintf("%s", $filterXML->filter->id); - $event->setPbs_filterID($filterID); - $startTime = date('H:i', strtotime($event->getStart())); - if($event->getEnd()) { - $endTime = date('H:i', strtotime($event->getEnd())); - } else { - $endTime = date('H:i', strtotime($event->getStart() + 900)); - } - $filterentriesquery1 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=7&filtervalue=" . $startTime . "&filtervalue2=" . $endTime; - $filterentriesApiResult1 = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery1); - $filterentriesXMLString1 = $filterentriesApiResult1['http-body']; - $filterentriesXML1 = new SimpleXMLElement($filterentriesXMLString1); - $filterentriesID1 = sprintf("%s", $filterentriesXML1->filterentry->id); - $filterentriesquery2 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=3&filtervalue=" . $event->getPbs_poolID(); - $filterentriesApiResult2 = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery2); - $filterentriesXMLString2 = $filterentriesApiResult2['http-body']; - $filterentriesXML2 = new SimpleXMLElement($filterentriesXMLString2); - $filterentriesID2 = sprintf("%s", $filterentriesXML2->filterentry->id); - if(!$event->getRepeat()) { - $startDate = date('Y-m-d', strtotime($event->getStart())); - if($event->getEnd()) { - $endDate = date('Y-m-d', strtotime($event->getEnd())); - } else { - $endDate = date('Y-m-d', strtotime($event->getStart())); - } - $filterentriesquery3 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . $startDate . "&filtervalue2=" . $endDate; - $filterentriesApiResult3 = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery3); - $filterentriesXMLString3 = $filterentriesApiResult3['http-body']; - $filterentriesXML3 = new SimpleXMLElement($filterentriesXMLString3); - $filterentriesID3 = sprintf("%s", $filterentriesXML3->filterentry->id); - } else { - $repeattype = new Application_Model_Repeattype(); - $repeattypeMapper->find($event->getRepeattype(), $repeattype); - if($repeattype->getTitle() == 'Once a week') { - $weekday = date('N', strtotime($event->getStart())); - $filterentriesquery3 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=10&filtervalue=" . $weekday . "&filtervalue2=" . $weekday; - $filterentriesApiResult3 = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery3); - $filterentriesXMLString3 = $filterentriesApiResult3['http-body']; - $filterentriesXML3 = new SimpleXMLElement($filterentriesXMLString3); - $filterentriesID3 = sprintf("%s", $filterentriesXML3->filterentry->id); - $oneweektime = 7 * 24 * 60 * 60; - } else { - $startDate = date('Y-m-d', strtotime($event->getStart())); - if($event->getEnd()) { - $endDate = date('Y-m-d', strtotime($event->getEnd())); + if($event->getRepeat()) { + $repeattypeMapper = new Application_Model_RepeattypeMapper(); + $repeattype = new Application_Model_Repeattype(); + $repeattypeMapper->find($event->getRepeattype(), $repeattype); + if($repeattype == "Once a week") { + $filterentriesquery1 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=7&filtervalue=" . $newStartTime . "&filtervalue2=" . $newEndTime; + $filterentriesApiResult1 = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery1); + $filterentriesquery2 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . $newStartDate . "&filtervalue2=" . $newEndDate; + $filterentriesApiResult2 = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery1); } else { - $endDate = date('Y-m-d', strtotime($event->getStart())); + $filterentriesQuerie = "filterid=" . $event->getPbs_filterID() . "&oldvalue1=" . $oldStartDate . "&oldvalue2=" . $oldEndDate . "&value1=" . $newStartDate . "&value2=" . $newEndDate; + $filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['changefilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesQuerie); + unset($filterApiResult); + $filterentriesQuerie = "filterid=" . $event->getPbs_filterID() . "&oldvalue1=" . $oldStartTime . "&oldvalue2=" . $oldEndTime . "&value1=" . $newStartTime . "&value2=" . $newEndTime; + $filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['changefilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesQuerie); + unset($filterApiResult); } - $filterentriesquery3 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . $startDate . "&filtervalue2=" . $endDate; - $filterentriesApiResult3 = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery3); - $filterentriesXMLString3 = $filterentriesApiResult3['http-body']; - $filterentriesXML3 = new SimpleXMLElement($filterentriesXMLString3); - $filterentriesID3 = sprintf("%s", $filterentriesXML3->filterentry->id); + } else { + $filterentriesQuerie = "filterid=" . $event->getPbs_filterID() . "&oldvalue1=" . $oldStartDate . "&oldvalue2=" . $oldEndDate . "&value1=" . $newStartDate . "&value2=" . $newEndDate; + $filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['changefilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesQuerie); + unset($filterApiResult); + $filterentriesQuerie = "filterid=" . $event->getPbs_filterID() . "&oldvalue1=" . $oldStartTime . "&oldvalue2=" . $oldEndTime . "&value1=" . $newStartTime . "&value2=" . $newEndTime; + $filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['changefilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesQuerie); + unset($filterApiResult); } } - $this->eventMapper->save($event); //save the event with the new data } } @@ -736,12 +699,38 @@ class EventController extends Zend_Controller_Action try { foreach($events as $event) { //1min = 60sec, 1d = 86400sec + $oldStartTime = date('H:i', strtotime($event->getStart())); + $oldStartDate = date('Y-m-d', strtotime($event->getStart())); + $newStartTime = date('H:i', strtotime(substr($evstart, 0, 24))); + $newStartDate = date('Y-m-d', strtotime(substr($evstart, 0, 24))); + $oldEndTime = date('H:i', strtotime($event->getEnd())); + $oldEndDate = date('Y-m-d', strtotime($event->getEnd())); + $newEndTime = date('H:i', strtotime(substr($evend, 0, 24))); + $newEndDate = date('Y-m-d', strtotime(substr($evend, 0, 24))); $eventStart = date('Y-m-d H:i:s', intval(strtotime($event->getStart())) + intval($evmindelta*60) + intval($evdaydelta*86400)); $eventEnd = date('Y-m-d H:i:s', intval(strtotime($event->getEnd())) + intval($evmindelta*60) + intval($evdaydelta*86400)); $event->setStart($eventStart); $event->setEnd($eventEnd); $event->setPbs_poolID($poolID); - + if($event->getPbs_filterID()) { + if($event->getRepeat()) { + $repeattypeMapper = new Application_Model_RepeattypeMapper(); + $repeattype = new Application_Model_Repeattype(); + $repeattypeMapper->find($event->getRepeattype(), $repeattype); + if($repeattype == "Once a week") { + $oldStartDate = date("N", strototime($oldStartDate)); + $oldEndDate = ''; + $newStartDate = date("N", strototime($newStartDate)); + $newEndDate = ''; + } + } + $filterentriesQuerie = "filterid=" . $event->getPbs_filterID() . "&oldvalue1=" . $oldStartDate . "&oldvalue2=" . $oldEndDate . "&value1=" . $newStartDate . "&value2=" . $newEndDate; + $filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['changefilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesQuerie); + unset($filterApiResult); + $filterentriesQuerie = "filterid=" . $event->getPbs_filterID() . "&oldvalue1=" . $oldStartTime . "&oldvalue2=" . $oldEndTime . "&value1=" . $newStartTime . "&value2=" . $newEndTime; + $filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['changefilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesQuerie); + unset($filterApiResult); + } $this->eventMapper->save($event); //save the event with the new data } } catch (Zend_Exception $e) { @@ -773,81 +762,18 @@ class EventController extends Zend_Controller_Action if ($evid!=null) { $this->eventMapper->find($evid,$event); //locate the event in the DB + $oldStartTime = date('H:i', strtotime($event->getStart())); + $newStartTime = $oldStartTime; + $oldEndTime = date('H:i', strtotime($event->getEnd())); + $newEndTime = date('H:i', strtotime(substr($evend, 0, 24))); $event->setEnd(date('Y-m-d H:i:s', strtotime(substr($evend, 0, 24)))); $event->setPbs_poolID($poolID); - if($event->getPbs_bootmenuID()) { - $bootmenuApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['deletebootmenu'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', "bootmenuid=" . $event->getPbs_bootmenuID()); - unset($bootmenuApiResult); - } + $this->eventMapper->save($event); //save the event with the new data if($event->getPbs_filterID()) { - $filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['deletefilter'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', "filterid=" . $event->getPbs_filterID()); + $filterentriesQuerie = "filterid=" . $event->getPbs_filterID() . "&oldvalue1=" . $oldStartTime . "&oldvalue2=" . $oldEndTime . "&value1=" . $newStartTime . "&value2=" . $newEndTime; + $filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['changefilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesQuerie); unset($filterApiResult); } - $bootmenuApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['addbootmenu'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $bootmenuquery); - $bootmenuXMLString = $bootmenuApiResult['http-body']; - $bootmenuXML = new SimpleXMLElement($bootmenuXMLString); - $bootmenuID = sprintf("%s", $bootmenuXML->bootmenu->id); - $event->setPbs_bootmenuID($bootmenuID); - $filterquery = "bootmenuID=" . $event->getPbs_bootmenuID() . "&title=" . $event->getTitle() . "&description=Poolctrl Filter für " . $event->getTitle() . "&created= " . time() . "&priority=100"; - $filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['addfilter'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterquery); - $filterXMLString = $filterApiResult['http-body']; - $filterXML = new SimpleXMLElement($filterXMLString); - $filterID = sprintf("%s", $filterXML->filter->id); - $event->setPbs_filterID($filterID); - $startTime = date('H:i', strtotime($event->getStart())); - if($event->getEnd()) { - $endTime = date('H:i', strtotime($event->getEnd())); - } else { - $endTime = date('H:i', strtotime($event->getStart() + 900)); - } - $filterentriesquery1 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=7&filtervalue=" . $startTime . "&filtervalue2=" . $endTime; - $filterentriesApiResult1 = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery1); - $filterentriesXMLString1 = $filterentriesApiResult1['http-body']; - $filterentriesXML1 = new SimpleXMLElement($filterentriesXMLString1); - $filterentriesID1 = sprintf("%s", $filterentriesXML1->filterentry->id); - $filterentriesquery2 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=3&filtervalue=" . $event->getPbs_poolID(); - $filterentriesApiResult2 = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery2); - $filterentriesXMLString2 = $filterentriesApiResult2['http-body']; - $filterentriesXML2 = new SimpleXMLElement($filterentriesXMLString2); - $filterentriesID2 = sprintf("%s", $filterentriesXML2->filterentry->id); - if(!$event->getRepeat()) { - $startDate = date('Y-m-d', strtotime($event->getStart())); - if($event->getEnd()) { - $endDate = date('Y-m-d', strtotime($event->getEnd())); - } else { - $endDate = date('Y-m-d', strtotime($event->getStart())); - } - $filterentriesquery3 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . $startDate . "&filtervalue2=" . $endDate; - $filterentriesApiResult3 = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery3); - $filterentriesXMLString3 = $filterentriesApiResult3['http-body']; - $filterentriesXML3 = new SimpleXMLElement($filterentriesXMLString3); - $filterentriesID3 = sprintf("%s", $filterentriesXML3->filterentry->id); - } else { - $repeattype = new Application_Model_Repeattype(); - $repeattypeMapper->find($event->getRepeattype(), $repeattype); - if($repeattype->getTitle() == 'Once a week') { - $weekday = date('N', strtotime($event->getStart())); - $filterentriesquery3 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=10&filtervalue=" . $weekday . "&filtervalue2=" . $weekday; - $filterentriesApiResult3 = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery3); - $filterentriesXMLString3 = $filterentriesApiResult3['http-body']; - $filterentriesXML3 = new SimpleXMLElement($filterentriesXMLString3); - $filterentriesID3 = sprintf("%s", $filterentriesXML3->filterentry->id); - $oneweektime = 7 * 24 * 60 * 60; - } else { - $startDate = date('Y-m-d', strtotime($event->getStart())); - if($event->getEnd()) { - $endDate = date('Y-m-d', strtotime($event->getEnd())); - } else { - $endDate = date('Y-m-d', strtotime($event->getStart())); - } - $filterentriesquery3 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . $startDate . "&filtervalue2=" . $endDate; - $filterentriesApiResult3 = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery3); - $filterentriesXMLString3 = $filterentriesApiResult3['http-body']; - $filterentriesXML3 = new SimpleXMLElement($filterentriesXMLString3); - $filterentriesID3 = sprintf("%s", $filterentriesXML3->filterentry->id); - } - } - $this->eventMapper->save($event); //save the event with the new data } } @@ -877,6 +803,11 @@ class EventController extends Zend_Controller_Action $eventEnd = date('Y-m-d H:i:s', intval(strtotime($event->getEnd())) + intval($evmindelta*60)); $event->setEnd($eventEnd); $event->setPbs_poolID($poolID); + if($event->getPbs_filterID()) { + $filterentriesQuerie = "filterid=" . $event->getPbs_filterID() . "&oldvalue1=" . $oldStartTime . "&oldvalue2=" . $oldEndTime . "&value1=" . $newStartTime . "&value2=" . $newEndTime; + $filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['changefilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesQuerie); + unset($filterApiResult); + } $this->eventMapper->save($event); //save the event with the new data } } catch (Zend_Exception $e) { diff --git a/install.sh b/install.sh index c9b1d07..c33987c 100755 --- a/install.sh +++ b/install.sh @@ -15,7 +15,7 @@ echo "Copying to /var/www/" sourceDir=$(readlink -f $(dirname $(readlink -f $0))) echo -n "enter vhost name: " read vhost_name -sed -e "36s/\$/$vhost_name/" -i $targetDir/application/configs/application.ini +sed -e "37s/\$/$vhost_name/" -i $targetDir/application/configs/application.ini targetDir="/var/www/$vhost_name" mkdir -p $targetDir cp -R $sourceDir/* $targetDir @@ -72,12 +72,12 @@ sed -e "21s/\$/$pbs2_host/" -i $targetDir/application/configs/application.ini echo -n "Please enter host of gearman server [localhost]: " read gearman_server_host [ "x" = "x$gearman_server_host" ] && gearman_server_host="localhost" -sed -e "39s/\$/$gearman_server_host/" -i $targetDir/application/configs/application.ini +sed -e "40s/\$/$gearman_server_host/" -i $targetDir/application/configs/application.ini echo -n "Please enter port of gearman server [4730]: " read gearman_server_port [ "x" = "x$gearman_server_port" ] && gearman_server_port="4730" -sed -e "40s/\$/$gearman_server_port/" -i $targetDir/application/configs/application.ini +sed -e "41s/\$/$gearman_server_port/" -i $targetDir/application/configs/application.ini echo "Create database and tables" cat $targetDir/setup/poolctrl.sql | sed -e "s,##poolctrl##,$db_name," > /tmp/poolctrl.sql -- cgit v1.2.3-55-g7522