@@ -1,7 +1,7 @@ discard block |
||
| 1 | 1 | <div id="colOne"> |
| 2 | 2 | |
| 3 | 3 | <div class="box"> |
| 4 | - <h2>#<?php e($product->get('number')); ?> <?php e($product->get('name')); ?></h2> |
|
| 4 | + <h2>#<?php e($product->get('number')); ?> <?php e($product->get('name')); ?></h2> |
|
| 5 | 5 | <ul class="options"> |
| 6 | 6 | <?php if ($product->get('locked') != 1) { ?> |
| 7 | 7 | <li><a href="<?php e(url(null, array('edit'))); ?>"><?php e(t('Edit')); ?></a></li> |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | <td> |
| 40 | 40 | <?php |
| 41 | 41 | // getting settings |
| 42 | - $unit_choises = Product::getUnits(); |
|
| 42 | + $unit_choises = Product::getUnits(); |
|
| 43 | 43 | e(t($unit_choises[$product->get('unit_id')]['combined'])); |
| 44 | 44 | ?> |
| 45 | 45 | </td> |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | } else { |
| 94 | 94 | $account = Account::factory($year, $product->get('state_account_id')); |
| 95 | 95 | if ($account->get('name')) { |
| 96 | - e($account->get('number') . ' ' . $account->get('name')); |
|
| 96 | + e($account->get('number').' '.$account->get('name')); |
|
| 97 | 97 | } else { |
| 98 | 98 | echo t('Not set'); |
| 99 | 99 | } |
@@ -165,10 +165,10 @@ discard block |
||
| 165 | 165 | <td><?php e($variation->getNumber()); ?></td> |
| 166 | 166 | <td><?php e($variation->getName()); ?></td> |
| 167 | 167 | <td><?php e($variation->getDetail()->getPrice($product)->getAsLocal('da_dk', 2)); ?> </td> |
| 168 | - <td><?php e($product->get('weight')+$variation->getDetail()->getWeightDifference()); ?></td> |
|
| 168 | + <td><?php e($product->get('weight') + $variation->getDetail()->getWeightDifference()); ?></td> |
|
| 169 | 169 | <?php if ($kernel->user->hasModuleAccess("stock") and $product->get('stock')) : ?> |
| 170 | 170 | <td><?php e($variation->getStock($product)->get('actual_stock')); ?></td> |
| 171 | - <td><a href="<?php e(url('variation/' . $variation->getId())); ?>"><?php e(t('Details')); ?></a></td> |
|
| 171 | + <td><a href="<?php e(url('variation/'.$variation->getId())); ?>"><?php e(t('Details')); ?></a></td> |
|
| 172 | 172 | <?php endif; ?> |
| 173 | 173 | |
| 174 | 174 | </tr> |
@@ -197,9 +197,9 @@ discard block |
||
| 197 | 197 | $related = $product->getRelatedProducts(); |
| 198 | 198 | if (!empty($related) and count($related) > 0) { |
| 199 | 199 | foreach ($related as $p) { |
| 200 | - echo '<li>'. $p['name']; |
|
| 200 | + echo '<li>'.$p['name']; |
|
| 201 | 201 | if ($p['locked'] == 0) { |
| 202 | - echo ' <a class="delete" href="'.url('related', array('delete', 'del_related' => $p['related_id'])) .'">'.t('remove').'</a>'; |
|
| 202 | + echo ' <a class="delete" href="'.url('related', array('delete', 'del_related' => $p['related_id'])).'">'.t('remove').'</a>'; |
|
| 203 | 203 | } |
| 204 | 204 | echo '</li>'; |
| 205 | 205 | } |
@@ -254,7 +254,7 @@ discard block |
||
| 254 | 254 | <?php $category_type = new Intraface_Category_Type('shop', $shop->getId()); ?> |
| 255 | 255 | <h3><?php e($shop->getName()); ?></h3> |
| 256 | 256 | <ul class="options"> |
| 257 | - <li><a href="<?php e(url('shop/'. $shop->getId() . '/categories/', array('product_id' => $product->getId()))); ?>"><?php e(t('Add product to categories')); ?></a></li> |
|
| 257 | + <li><a href="<?php e(url('shop/'.$shop->getId().'/categories/', array('product_id' => $product->getId()))); ?>"><?php e(t('Add product to categories')); ?></a></li> |
|
| 258 | 258 | </ul> |
| 259 | 259 | <?php |
| 260 | 260 | $category = new Intraface_Category($kernel, $db, $category_type); |
@@ -6,7 +6,7 @@ discard block |
||
| 6 | 6 | </tr> |
| 7 | 7 | <tr> |
| 8 | 8 | <td><?php e(t('Number')); ?></td> |
| 9 | - <td><?php e($product->get('number')); ?></td> |
|
| 9 | + <td><?php e($product->get('number')); ?></td> |
|
| 10 | 10 | </tr> |
| 11 | 11 | <tr> |
| 12 | 12 | <td><?php e(t('Name')); ?></td> |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | <td><?php e($variation->getNumber()); ?></td> |
| 88 | 88 | <td><?php e($variation->getName()); ?></td> |
| 89 | 89 | <td><?php e($variation->getDetail()->getPrice($product)->getAsLocal('da_dk', 2)); ?> </td> |
| 90 | - <td><?php e($product->get('weight')+$variation->getDetail()->getWeightDifference()); ?></td> |
|
| 90 | + <td><?php e($product->get('weight') + $variation->getDetail()->getWeightDifference()); ?></td> |
|
| 91 | 91 | <?php if ($kernel->user->hasModuleAccess("stock") and $product->get('stock')) : ?> |
| 92 | 92 | <td><?php e($variation->getStock($product)->get('actual_stock')); ?></td> |
| 93 | 93 | <?php endif; ?> |
@@ -65,7 +65,7 @@ |
||
| 65 | 65 | <tr> |
| 66 | 66 | <td> |
| 67 | 67 | <?php if ($p['has_variation']) : ?> |
| 68 | - <a href="<?php e(url($p['id'] . '/selectvariation', array('set_quantity' => $context->quantity, 'multiple' => $context->multiple))); ?>" /><?php echo '<img class="variation" src="/images/icons/silk/table_multiple.png" title="'.t("See the product's variations").'"/> '; ?></a> |
|
| 68 | + <a href="<?php e(url($p['id'].'/selectvariation', array('set_quantity' => $context->quantity, 'multiple' => $context->multiple))); ?>" /><?php echo '<img class="variation" src="/images/icons/silk/table_multiple.png" title="'.t("See the product's variations").'"/> '; ?></a> |
|
| 69 | 69 | <?php elseif ($context->multiple && $context->quantity) : ?> |
| 70 | 70 | <input id="<?php e($p['id']); ?>" type="text" name="selected[<?php e($p['id']); ?>]" value="<?php if (isset($selected_products[$p['id']])) : |
| 71 | 71 | e($selected_products[$p['id']]); |
@@ -152,7 +152,7 @@ |
||
| 152 | 152 | $year->loadActiveYear(); |
| 153 | 153 | |
| 154 | 154 | $account = new Account($year); |
| 155 | - $accounts = $account->getList('sale'); |
|
| 155 | + $accounts = $account->getList('sale'); |
|
| 156 | 156 | |
| 157 | 157 | ?> |
| 158 | 158 | <fieldset> |
@@ -53,7 +53,7 @@ |
||
| 53 | 53 | 'product' => $product |
| 54 | 54 | ); |
| 55 | 55 | |
| 56 | - $smarty = $this->template->create(dirname(__FILE__) . '/tpl/selectproductvariation'); |
|
| 56 | + $smarty = $this->template->create(dirname(__FILE__).'/tpl/selectproductvariation'); |
|
| 57 | 57 | return $smarty->render($this, $data); |
| 58 | 58 | } |
| 59 | 59 | |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | |
| 26 | 26 | $data = array('groups' => $groups); |
| 27 | 27 | |
| 28 | - $smarty = $this->template->create(dirname(__FILE__) . '/tpl/attributegroups'); |
|
| 28 | + $smarty = $this->template->create(dirname(__FILE__).'/tpl/attributegroups'); |
|
| 29 | 29 | return $smarty->render($this, $data); |
| 30 | 30 | } |
| 31 | 31 | |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | function renderHtmlCreate() |
| 55 | 55 | { |
| 56 | 56 | $data = array(); |
| 57 | - $smarty = $this->template->create(dirname(__FILE__) . '/tpl/attributegroup-edit'); |
|
| 57 | + $smarty = $this->template->create(dirname(__FILE__).'/tpl/attributegroup-edit'); |
|
| 58 | 58 | return $smarty->render($this, $data); |
| 59 | 59 | } |
| 60 | 60 | |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | private function load() |
| 78 | 78 | { |
| 79 | 79 | $db = new DB_Sql; |
| 80 | - $db->query("SELECT id, list_id, subject, text, deadline, sent_to_receivers, status FROM newsletter_archieve WHERE id = " . $this->id . " AND active = 1 LIMIT 1"); |
|
| 80 | + $db->query("SELECT id, list_id, subject, text, deadline, sent_to_receivers, status FROM newsletter_archieve WHERE id = ".$this->id." AND active = 1 LIMIT 1"); |
|
| 81 | 81 | |
| 82 | 82 | $db2 = new DB_Sql; |
| 83 | 83 | if ($db->nextRecord()) { |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | return false; |
| 119 | 119 | } |
| 120 | 120 | $db = new DB_Sql; |
| 121 | - $db->query("UPDATE newsletter_archieve SET active = 0 WHERE id = " . $this->get("id") . " AND intranet_id = " . $this->list->getIntranet()->getId() . " AND locked = 0"); |
|
| 121 | + $db->query("UPDATE newsletter_archieve SET active = 0 WHERE id = ".$this->get("id")." AND intranet_id = ".$this->list->getIntranet()->getId()." AND locked = 0"); |
|
| 122 | 122 | |
| 123 | 123 | return true; |
| 124 | 124 | } |
@@ -148,10 +148,10 @@ discard block |
||
| 148 | 148 | $sql_end = ', date_created = NOW()'; |
| 149 | 149 | } else { |
| 150 | 150 | $sql_type = "UPDATE"; |
| 151 | - $sql_end = " WHERE id = " . $this->id; |
|
| 151 | + $sql_end = " WHERE id = ".$this->id; |
|
| 152 | 152 | } |
| 153 | 153 | $db = new DB_Sql; |
| 154 | - $sql = $sql_type . " newsletter_archieve |
|
| 154 | + $sql = $sql_type." newsletter_archieve |
|
| 155 | 155 | SET subject = '".$var['subject']."', |
| 156 | 156 | text = '".$var['text']."', |
| 157 | 157 | intranet_id = ".$this->list->getIntranet()->getId().", |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | private function updateSent($receivers) |
| 182 | 182 | { |
| 183 | 183 | $db = new DB_Sql; |
| 184 | - $db->query("UPDATE newsletter_archieve SET status = 1, sent_to_receivers = '".(int)$receivers."' WHERE id = " . $this->id . " AND intranet_id = " . $this->list->getIntranet()->getId()); |
|
| 184 | + $db->query("UPDATE newsletter_archieve SET status = 1, sent_to_receivers = '".(int)$receivers."' WHERE id = ".$this->id." AND intranet_id = ".$this->list->getIntranet()->getId()); |
|
| 185 | 185 | return true; |
| 186 | 186 | } |
| 187 | 187 | |
@@ -222,7 +222,7 @@ discard block |
||
| 222 | 222 | $db = MDB2::singleton(DB_DSN); |
| 223 | 223 | |
| 224 | 224 | if (PEAR::isError($db)) { |
| 225 | - throw new Exception($result->getMessage() . $result->getUserInfo()); |
|
| 225 | + throw new Exception($result->getMessage().$result->getUserInfo()); |
|
| 226 | 226 | } |
| 227 | 227 | |
| 228 | 228 | $i = 0; |
@@ -259,19 +259,19 @@ discard block |
||
| 259 | 259 | '".$name."', |
| 260 | 260 | 8, |
| 261 | 261 | 2, |
| 262 | - ".$this->get('id') . ", |
|
| 263 | - '".$this->get('deadline'). "', |
|
| 264 | - " .$this->list->getIntranet()->getId(). " , |
|
| 265 | - " .$subscriber['contact_id']. " , |
|
| 262 | + ".$this->get('id').", |
|
| 263 | + '".$this->get('deadline')."', |
|
| 264 | + " .$this->list->getIntranet()->getId()." , |
|
| 265 | + " .$subscriber['contact_id']." , |
|
| 266 | 266 | " .$this->list->kernel->user->get('id').", |
| 267 | 267 | ".$subject.", |
| 268 | 268 | ".$body.")"; |
| 269 | 269 | |
| 270 | 270 | if ($i == 40) { |
| 271 | - $result = $db->exec($sql . implode($params, ',')); |
|
| 271 | + $result = $db->exec($sql.implode($params, ',')); |
|
| 272 | 272 | |
| 273 | 273 | if (PEAR::isError($result)) { |
| 274 | - $error[] = $result->getMessage() . $result->getUserInfo(); |
|
| 274 | + $error[] = $result->getMessage().$result->getUserInfo(); |
|
| 275 | 275 | return false; |
| 276 | 276 | } |
| 277 | 277 | |
@@ -285,11 +285,11 @@ discard block |
||
| 285 | 285 | |
| 286 | 286 | // If the number of contacts can be divided evenly into 40 there will be no more params here. |
| 287 | 287 | if (count($params) > 0) { |
| 288 | - $result = $db->exec($sql . implode($params, ',')); |
|
| 288 | + $result = $db->exec($sql.implode($params, ',')); |
|
| 289 | 289 | } |
| 290 | 290 | |
| 291 | 291 | if (PEAR::isError($result)) { |
| 292 | - $error[] = $result->getMessage() . $result->getUserInfo(); |
|
| 292 | + $error[] = $result->getMessage().$result->getUserInfo(); |
|
| 293 | 293 | } |
| 294 | 294 | |
| 295 | 295 | if (!empty($error)) { |
@@ -321,7 +321,7 @@ discard block |
||
| 321 | 321 | { |
| 322 | 322 | $list = array(); |
| 323 | 323 | $db = new DB_Sql; |
| 324 | - $db->query("SELECT * FROM newsletter_archieve WHERE active = 1 AND list_id = " . $this->list->get('id') . " ORDER BY deadline DESC"); |
|
| 324 | + $db->query("SELECT * FROM newsletter_archieve WHERE active = 1 AND list_id = ".$this->list->get('id')." ORDER BY deadline DESC"); |
|
| 325 | 325 | $i = 0; |
| 326 | 326 | while ($db->nextRecord()) { |
| 327 | 327 | $list[$i]['subject'] = $db->f('subject'); |
@@ -49,11 +49,11 @@ |
||
| 49 | 49 | <tbody> |
| 50 | 50 | <?php foreach ($context->getSubscribers() as $s) : ?> |
| 51 | 51 | <tr> |
| 52 | - <td><a href="<?php e(url('../../../../contact/' . $s['contact_id'])); ?>"><?php e($s['contact_name']); ?></a></td> |
|
| 52 | + <td><a href="<?php e(url('../../../../contact/'.$s['contact_id'])); ?>"><?php e($s['contact_name']); ?></a></td> |
|
| 53 | 53 | <td><?php e($s['contact_email']); ?></td> |
| 54 | 54 | <td><?php e($s['dk_date_submitted']); ?></td> |
| 55 | 55 | <td> |
| 56 | - <?php if ($s['optin'] == 0 and $s['date_optin_email_sent'] < date('Y-m-d', time() - 60 * 60 * 24 * 3)) : ?> |
|
| 56 | + <?php if ($s['optin'] == 0 and $s['date_optin_email_sent'] < date('Y-m-d', time() - 60*60*24*3)) : ?> |
|
| 57 | 57 | <a href="<?php e(url($s['id'], array('remind' => 'true', 'use_stored' => 'true'))); ?>"><?php e(t('Remind')); ?></a> |
| 58 | 58 | <?php elseif ($s['optin'] == 0) : ?> |
| 59 | 59 | <?php e(t('Not opted in')); ?> |
@@ -68,7 +68,7 @@ |
||
| 68 | 68 | |
| 69 | 69 | |
| 70 | 70 | <div style="clear: both;"> |
| 71 | - <p><?php e(t('Either you are using this link')); ?> <strong><?php e('http://' . $context->getKernel()->setting->get('intranet', 'contact.login_url') . '/' .$context->getKernel()->intranet->get('identifier') . '/login'); ?></strong> <?php e(t('or you can write your own')); ?>:</p> |
|
| 71 | + <p><?php e(t('Either you are using this link')); ?> <strong><?php e('http://'.$context->getKernel()->setting->get('intranet', 'contact.login_url').'/'.$context->getKernel()->intranet->get('identifier').'/login'); ?></strong> <?php e(t('or you can write your own')); ?>:</p> |
|
| 72 | 72 | <label for="optin_link"><?php e(t('Link for the optin page')); ?></label><br /> |
| 73 | 73 | <input type="text" name="optin_link" value="<?php if (!empty($value['optin_link'])) { |
| 74 | 74 | e($value['optin_link']); |