/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-07 08:05:14 UTC
  • mfrom: (53.2.2 lenasys)
  • Revision ID: gustav.hartvigsson@gmail.com-20130507080514-u53zto672m0t19wl
merded the new salting stuff for the user passwords and stuff...

Show diffs side-by-side

added added

removed removed

Lines of Context:
codeigniter/application/controllers/codeviewer.php
14
14
        /**
15
15
        * This shows the codeviewer page
16
16
        */
17
 
        public function show($course, $example, $page){
 
17
        public function show($cid, $category, $subcategory, $example){
18
18
                $this->load->model('codeviewer/Codeviewer_model');
19
19
 
20
 
                $editorHTML = $this->Codeviewer_model->getCode($course, $example, $page);
 
20
                $editorHTML = $this->Codeviewer_model->getCode($cid, $category, $subcategory, $example);
21
21
 
22
 
                $doc = $this->Codeviewer_model->getDoc($course, $example, $page);
 
22
                $doc = $this->Codeviewer_model->getDoc($cid, $category, $subcategory, $example);
23
23
 
24
24
                // This loads the view. It's stored in application/views/codeviewer/codeviewer.php
25
25
                // Do note that application/views should not be in the first argument of view()