| @@ -123,7 +123,7 @@ | ||
| 123 | 123 | |
| 124 | 124 | function loadItem($id = 0) | 
| 125 | 125 |      { | 
| 126 | - $this->item = new ProcurementItem($this, (int)$id); | |
| 126 | + $this->item = new ProcurementItem($this, (int)$id); | |
| 127 | 127 | } | 
| 128 | 128 | |
| 129 | 129 | function update($input) | 
| @@ -33,11 +33,11 @@ | ||
| 33 | 33 | $this->document->setTitle($shop->name); | 
| 34 | 34 | |
| 35 | 35 |          $this->document->options = array($this->url('../') => 'Close', | 
| 36 | -                                         $this->url(null, array('edit')) => 'Edit', | |
| 37 | -                                         $this->url('featuredproducts') => 'Choose featured products', | |
| 38 | -                                         $this->url('categories') => 'Product categories', | |
| 39 | -                                         $this->url('basketevaluation') => 'Basket evaluation', | |
| 40 | -                                         $this->url('paymentmethods') => 'Payment methods'); | |
| 36 | +                                            $this->url(null, array('edit')) => 'Edit', | |
| 37 | +                                            $this->url('featuredproducts') => 'Choose featured products', | |
| 38 | +                                            $this->url('categories') => 'Product categories', | |
| 39 | +                                            $this->url('basketevaluation') => 'Basket evaluation', | |
| 40 | +                                            $this->url('paymentmethods') => 'Payment methods'); | |
| 41 | 41 | |
| 42 | 42 | $basketevaluation = new Intraface_modules_shop_BasketEvaluation($this->mdb2, $this->getKernel()->intranet, $shop); | 
| 43 | 43 | $evaluations = $basketevaluation->getList(); | 
| @@ -77,8 +77,8 @@ | ||
| 77 | 77 | |
| 78 | 78 | function __construct(k_TemplateFactory $template, Doctrine_Connection_Common $doctrine) | 
| 79 | 79 |      { | 
| 80 | - $this->template = $template; | |
| 81 | - $this->doctrine = $doctrine; | |
| 80 | + $this->template = $template; | |
| 81 | + $this->doctrine = $doctrine; | |
| 82 | 82 | } | 
| 83 | 83 | |
| 84 | 84 | function map($name) | 
| @@ -332,24 +332,24 @@ | ||
| 332 | 332 | public static function getUnits($key = null) | 
| 333 | 333 |      { | 
| 334 | 334 |          $units = array(1 => array('singular' => '', | 
| 335 | - 'plural' => '', | |
| 336 | - 'combined' => ''), | |
| 337 | -                       2 => array('singular' => 'unit', | |
| 338 | - 'plural' => 'units', | |
| 339 | - 'combined' => 'unit(s)'), | |
| 340 | -                       3 => array('singular' => 'day', | |
| 341 | - 'plural' => 'days', | |
| 342 | - 'combined' => 'day(s)'), | |
| 343 | -                       4 => array('singular' => 'month (singular)', | |
| 344 | - 'plural' => 'month (plural)', | |
| 345 | - 'combined' => 'month (combined)'), | |
| 346 | -                       5 => array('singular' => 'year', | |
| 347 | - 'plural' => 'years', | |
| 348 | - 'combined' => 'year(s)'), | |
| 349 | -                       6 => array('singular' => 'hour', | |
| 350 | - 'plural' => 'hours', | |
| 351 | - 'combined' => 'hour(s)') | |
| 352 | - ); | |
| 335 | + 'plural' => '', | |
| 336 | + 'combined' => ''), | |
| 337 | +                        2 => array('singular' => 'unit', | |
| 338 | + 'plural' => 'units', | |
| 339 | + 'combined' => 'unit(s)'), | |
| 340 | +                        3 => array('singular' => 'day', | |
| 341 | + 'plural' => 'days', | |
| 342 | + 'combined' => 'day(s)'), | |
| 343 | +                        4 => array('singular' => 'month (singular)', | |
| 344 | + 'plural' => 'month (plural)', | |
| 345 | + 'combined' => 'month (combined)'), | |
| 346 | +                        5 => array('singular' => 'year', | |
| 347 | + 'plural' => 'years', | |
| 348 | + 'combined' => 'year(s)'), | |
| 349 | +                        6 => array('singular' => 'hour', | |
| 350 | + 'plural' => 'hours', | |
| 351 | + 'combined' => 'hour(s)') | |
| 352 | + ); | |
| 353 | 353 | |
| 354 | 354 |          if ($key === null) { | 
| 355 | 355 | return $units; | 
| @@ -319,23 +319,23 @@ | ||
| 319 | 319 |      { | 
| 320 | 320 | $units = array( | 
| 321 | 321 |              1 => array('singular' => '', | 
| 322 | - 'plural' => '', | |
| 323 | - 'combined' => ''), | |
| 322 | + 'plural' => '', | |
| 323 | + 'combined' => ''), | |
| 324 | 324 |              2 => array('singular' => 'unit', | 
| 325 | - 'plural' => 'units', | |
| 326 | - 'combined' => 'unit(s)'), | |
| 325 | + 'plural' => 'units', | |
| 326 | + 'combined' => 'unit(s)'), | |
| 327 | 327 |              3 => array('singular' => 'day', | 
| 328 | - 'plural' => 'days', | |
| 329 | - 'combined' => 'day(s)'), | |
| 328 | + 'plural' => 'days', | |
| 329 | + 'combined' => 'day(s)'), | |
| 330 | 330 |              4 => array('singular' => 'month (singular)', | 
| 331 | - 'plural' => 'month (plural)', | |
| 332 | - 'combined' => 'month (combined)'), | |
| 331 | + 'plural' => 'month (plural)', | |
| 332 | + 'combined' => 'month (combined)'), | |
| 333 | 333 |              5 => array('singular' => 'year', | 
| 334 | - 'plural' => 'years', | |
| 335 | - 'combined' => 'year(s)'), | |
| 334 | + 'plural' => 'years', | |
| 335 | + 'combined' => 'year(s)'), | |
| 336 | 336 |              6 => array('singular' => 'hour', | 
| 337 | - 'plural' => 'hours', | |
| 338 | - 'combined' => 'hour(s)') | |
| 337 | + 'plural' => 'hours', | |
| 338 | + 'combined' => 'hour(s)') | |
| 339 | 339 | ); | 
| 340 | 340 | |
| 341 | 341 |          if ($key === null) { | 
| @@ -4,7 +4,7 @@ | ||
| 4 | 4 | function map($name) | 
| 5 | 5 |      { | 
| 6 | 6 |          if (is_numeric($name)) { | 
| 7 | - return 'Intraface_modules_cms_Controller_TemplateSectionEdit'; | |
| 7 | + return 'Intraface_modules_cms_Controller_TemplateSectionEdit'; | |
| 8 | 8 |          } elseif ($name == 'create') { | 
| 9 | 9 | return 'Intraface_modules_cms_Controller_TemplateSectionEdit'; | 
| 10 | 10 | } | 
| @@ -42,7 +42,7 @@ discard block | ||
| 42 | 42 |          } elseif ($this->getElement()->get('type') == 'filelist') { | 
| 43 | 43 |              return $append_file = new AppendFile($this->getKernel(), 'cms_element_filelist', $this->getElement()->get('id')); | 
| 44 | 44 |          } elseif ($this->getElement()->get('type') == 'picture') { | 
| 45 | -             return new AppendFile($this->getKernel(), 'cms_element_picture', $this->getElement()->get('id')); | |
| 45 | +                return new AppendFile($this->getKernel(), 'cms_element_picture', $this->getElement()->get('id')); | |
| 46 | 46 | } | 
| 47 | 47 |          throw new Exception('No valid fileappender present'); | 
| 48 | 48 | } | 
| @@ -121,9 +121,9 @@ discard block | ||
| 121 | 121 |                  if ($element->get('type') == 'picture') { | 
| 122 | 122 |                      return new k_SeeOther($this->url('filehandler/selectfile', array('images' => 1))); | 
| 123 | 123 |                  } elseif ($element->get('type') == 'gallery') { | 
| 124 | -                     return new k_SeeOther($this->url('filehandler/selectfile', array('images' => 1, 'multiple_choice' => 1))); | |
| 124 | +                        return new k_SeeOther($this->url('filehandler/selectfile', array('images' => 1, 'multiple_choice' => 1))); | |
| 125 | 125 |                  } elseif ($element->get('type') == 'filelist') { | 
| 126 | -                     return new k_SeeOther($this->url('filehandler/selectfile', array('images' => 0, 'multiple_choice' => 1))); | |
| 126 | +                        return new k_SeeOther($this->url('filehandler/selectfile', array('images' => 0, 'multiple_choice' => 1))); | |
| 127 | 127 |                  } else { | 
| 128 | 128 |                      throw new Exception("Det er ikke en gyldig elementtype til at lave redirect fra"); | 
| 129 | 129 | } | 
| @@ -86,7 +86,7 @@ | ||
| 86 | 86 | |
| 87 | 87 | return $this->eval; | 
| 88 | 88 | } | 
| 89 | - **/ | |
| 89 | + **/ | |
| 90 | 90 | |
| 91 | 91 | /** | 
| 92 | 92 | * @todo does what? | 
| @@ -20,18 +20,18 @@ | ||
| 20 | 20 | // @todo should add the template for intranet | 
| 21 | 21 |          //$this->actAs('Intraface_Doctrine_Template_Intranet'); | 
| 22 | 22 |          $options = array('created' =>  array('name'          => 'date_created',    // Name of created column | 
| 23 | - 'type' => 'timestamp', // Doctrine column data type | |
| 24 | - 'options' => array(), // Array of options for column | |
| 25 | - 'format' => 'Y-m-d H:i:s', // Format of date used with PHP date() function(default) | |
| 26 | - 'disabled' => false, // Disable the created column(default) | |
| 27 | - 'expression' => 'NOW()'), // Update column with database expression(default=false) | |
| 28 | -                         'updated' =>  array('name'          => 'date_updated',    // Name of updated column(default) | |
| 29 | - 'type' => 'timestamp', // Doctrine column data type(default) | |
| 30 | - 'options' => array(), // Array of options for column(default) | |
| 31 | - 'format' => 'Y-m-d H:i:s', // Format of date used with PHP date() function(default) | |
| 32 | - 'disabled' => false, // Disable the updated column(default) | |
| 33 | - 'expression' => 'NOW()', // Use a database expression to set column(default=false) | |
| 34 | - 'onInsert' => true)); // Whether or not to set column onInsert(default) | |
| 23 | + 'type' => 'timestamp', // Doctrine column data type | |
| 24 | + 'options' => array(), // Array of options for column | |
| 25 | + 'format' => 'Y-m-d H:i:s', // Format of date used with PHP date() function(default) | |
| 26 | + 'disabled' => false, // Disable the created column(default) | |
| 27 | + 'expression' => 'NOW()'), // Update column with database expression(default=false) | |
| 28 | +                            'updated' =>  array('name'          => 'date_updated',    // Name of updated column(default) | |
| 29 | + 'type' => 'timestamp', // Doctrine column data type(default) | |
| 30 | + 'options' => array(), // Array of options for column(default) | |
| 31 | + 'format' => 'Y-m-d H:i:s', // Format of date used with PHP date() function(default) | |
| 32 | + 'disabled' => false, // Disable the updated column(default) | |
| 33 | + 'expression' => 'NOW()', // Use a database expression to set column(default=false) | |
| 34 | + 'onInsert' => true)); // Whether or not to set column onInsert(default) | |
| 35 | 35 | |
| 36 | 36 |          $this->actAs('Timestampable', $options); | 
| 37 | 37 | |