/lenasys/trunk

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/lenasys/trunk

« back to all changes in this revision

Viewing changes to codeigniter/application/controllers/codeviewer.php

  • Committer: Gustav Hatvigsson
  • Date: 2013-05-28 12:53:57 UTC
  • mfrom: (115.1.1 lenasys)
  • Revision ID: gustav.hartvigsson@gmail.com-20130528125357-0k9epehx87w0g9zm
Merged Anderssons:s changes:
#1171772

Show diffs side-by-side

added added

removed removed

Lines of Context:
codeigniter/application/controllers/codeviewer.php
19
19
        /**
20
20
        * This shows the codeviewer page
21
21
        */
22
 
        public function show($cid, $category, $subcategory, $example){
23
 
                $headTagData['cssFiles'] = array('headTag', 'header', 'codeviewer');
24
 
                $headTagData['jsFiles'] = array('ace/ace', 'header');
25
 
        
26
 
                $this->load->model('codeviewer/Codeviewer_model');
27
 
 
28
 
                $editorHTML = $this->Codeviewer_model->getCode($cid, $category, $subcategory, $example);
29
 
        
30
 
                $this->load->model('user');
31
 
                
32
 
                $userInfo = array(
33
 
                        'userType' => $this->user->getUserType(),
34
 
                        'userName' => $this->user->getUserName()
35
 
                );
36
 
                
37
 
                $this->load->helper('form');
38
 
                
39
 
                // $doc = $this->Codeviewer_model->getDoc($cid, $category, $subcategory, $example);
40
 
 
41
 
                // This loads the view. It's stored in application/views/codeviewer/codeviewer.php
42
 
                // Do note that application/views should not be in the first argument of view()
43
 
                // The second argument is data to be shown in the view. "editors" => "test" would
44
 
                // generate an $editors variable in the view containing "test"
45
 
                $this->load->view('headTag', array('headTagData' => $headTagData));
46
 
                $this->load->view('header', $userInfo);
47
 
                $this->load->view('codeviewer/codeviewer', array("editors" => $editorHTML));
 
22
        public function show($cid = null, $category = null, $subcategory = null, $example = null){
 
23
                if(!is_null($cid) && !is_null($category) && !is_null($subcategory) && !is_null($example)){
 
24
                        $headTagData['cssFiles'] = array('headTag', 'header', 'codeviewer');
 
25
                        $headTagData['jsFiles'] = array('ace/ace', 'header');
 
26
                        $this->load->model('user');                     
 
27
                        $userInfo = array(
 
28
                                'userType' => $this->user->getUserType(),
 
29
                                'userName' => $this->user->getUserName()
 
30
                        );
 
31
                        $this->load->view('headTag', array('headTagData' => $headTagData));
 
32
                        $this->load->view('header', $userInfo);
 
33
                        $this->load->model('codeviewer/Codeviewer_model');
 
34
                        $editorHTML = $this->Codeviewer_model->getCode($cid, $category, $subcategory, $example);
 
35
                        $this->load->helper('form');
 
36
                        // $doc = $this->Codeviewer_model->getDoc($cid, $category, $subcategory, $example);
 
37
                        // This loads the view. It's stored in application/views/codeviewer/codeviewer.php
 
38
                        // Do note that application/views should not be in the first argument of view()
 
39
                        // The second argument is data to be shown in the view. "editors" => "test" would
 
40
                        // generate an $editors variable in the view containing "test"
 
41
                        $this->load->view('codeviewer/codeviewer', array("editors" => $editorHTML));
 
42
                } else {
 
43
                        /*Redirects to the startpage if no arguments are supplied.*/
 
44
                        redirect('/');
 
45
                }
48
46
        }
49
47
}