| 修訂 | 28 (tree) |
|---|---|
| 時間 | 2008-10-06 13:55:20 |
| 作者 | junkikuchi |
動的なページに一部対応した
trunk/application/models/Lpo.php (diff) trunk/application/models/Account.php (diff) trunk/application/controllers/LpoController.php (diff) trunk/application/views/scripts/lpo/beacon.phtml (diff)| @@ -17,6 +17,26 @@ | ||
| 17 | 17 | $data['created'] = new Zend_Db_Expr('now()'); |
| 18 | 18 | $data['updated'] = new Zend_Db_Expr('now()'); |
| 19 | 19 | |
| 20 | + if( | |
| 21 | + array_key_exists('landing_url', $data) && | |
| 22 | + $data['landing_url'] != 'http://' | |
| 23 | + ) { | |
| 24 | + $_url = parse_url($data['landing_url']); | |
| 25 | + if(!array_key_exists('path', $_url)) { | |
| 26 | + $data['landing_url'] = $data['landing_url'] . '/'; | |
| 27 | + } | |
| 28 | + } | |
| 29 | + | |
| 30 | + if( | |
| 31 | + array_key_exists('conversion_url', $data) && | |
| 32 | + $data['conversion_url'] != 'http://' | |
| 33 | + ) { | |
| 34 | + $_url = parse_url($data['conversion_url']); | |
| 35 | + if(!array_key_exists('path', $_url)) { | |
| 36 | + $data['conversion_url'] = $data['conversion_url'] . '/'; | |
| 37 | + } | |
| 38 | + } | |
| 39 | + | |
| 20 | 40 | return parent::insert($data); |
| 21 | 41 | } |
| 22 | 42 |
| @@ -23,6 +43,26 @@ | ||
| 23 | 43 | public function update($data, $where) { |
| 24 | 44 | $data['updated'] = new Zend_Db_Expr('now()'); |
| 25 | 45 | |
| 46 | + if( | |
| 47 | + array_key_exists('landing_url', $data) && | |
| 48 | + $data['landing_url'] != 'http://' | |
| 49 | + ) { | |
| 50 | + $_url = parse_url($data['landing_url']); | |
| 51 | + if(!array_key_exists('path', $_url)) { | |
| 52 | + $data['landing_url'] = $data['landing_url'] . '/'; | |
| 53 | + } | |
| 54 | + } | |
| 55 | + | |
| 56 | + if( | |
| 57 | + array_key_exists('conversion_url', $data) && | |
| 58 | + $data['conversion_url'] != 'http://' | |
| 59 | + ) { | |
| 60 | + $_url = parse_url($data['conversion_url']); | |
| 61 | + if(!array_key_exists('path', $_url)) { | |
| 62 | + $data['conversion_url'] = $data['conversion_url'] . '/'; | |
| 63 | + } | |
| 64 | + } | |
| 65 | + | |
| 26 | 66 | return parent::update($data, $where); |
| 27 | 67 | } |
| 28 | 68 | } |
| @@ -75,6 +75,8 @@ | ||
| 75 | 75 | public function getContentRows($url, $ref) { |
| 76 | 76 | $ret = array(); |
| 77 | 77 | |
| 78 | + $db = Zend_Db_Table_Abstract::getDefaultAdapter(); | |
| 79 | + | |
| 78 | 80 | $lpo_t = new Lpo(); |
| 79 | 81 | foreach( |
| 80 | 82 | $this->findDependentRowset( |
| @@ -82,7 +84,13 @@ | ||
| 82 | 84 | null, |
| 83 | 85 | $lpo_t->select() |
| 84 | 86 | ->where('status = ?', 'active') |
| 85 | - ->where('landing_url = ?', $url) | |
| 87 | + ->where( | |
| 88 | + sprintf( | |
| 89 | + 'landing_url = %s OR landing_url = %s', | |
| 90 | + $db->quote($url), | |
| 91 | + $db->quote(array_shift(explode('?', $url))) | |
| 92 | + ) | |
| 93 | + ) | |
| 86 | 94 | ->order('name') |
| 87 | 95 | ) as $lpo |
| 88 | 96 | ) { |
| @@ -66,7 +66,7 @@ | ||
| 66 | 66 | $this->getResponse()->setHeader('P3P', "CP='UNI CUR OUR'"); |
| 67 | 67 | |
| 68 | 68 | $key = $this->getRequest()->getParam('id'); |
| 69 | - $url = array_shift(explode('?', $this->getRequest()->getParam('url'))); | |
| 69 | + $url = $this->getRequest()->getParam('url'); | |
| 70 | 70 | $ref = $this->getRequest()->getParam('ref'); |
| 71 | 71 | |
| 72 | 72 | $this->view->callback = $this->getRequest()->getParam('callback'); |
| @@ -81,6 +81,7 @@ | ||
| 81 | 81 | |
| 82 | 82 | /* conversion */ |
| 83 | 83 | if(!empty($session->landing)) { |
| 84 | + $db = Zend_Db_Table_Abstract::getDefaultAdapter(); | |
| 84 | 85 | $lpo_t = new Lpo(); |
| 85 | 86 | foreach( |
| 86 | 87 | $acct->findDependentRowset( |
| @@ -88,7 +89,13 @@ | ||
| 88 | 89 | null, |
| 89 | 90 | $lpo_t->select() |
| 90 | 91 | ->where('status = ?', 'active') |
| 91 | - ->where('conversion_url = ?', $url) | |
| 92 | + ->where( | |
| 93 | + sprintf( | |
| 94 | + 'conversion_url = %s OR conversion_url = %s', | |
| 95 | + $db->quote($url), | |
| 96 | + $db->quote(array_shift(explode('?', $url))) | |
| 97 | + ) | |
| 98 | + ) | |
| 92 | 99 | ) as $val |
| 93 | 100 | ) { |
| 94 | 101 | if(array_key_exists($val->id, $session->landing)) { |
