Commit fac56b68 authored by Robert Lyon's avatar Robert Lyon
Browse files

Bug 1635503: Code tidying up - indentation / comments 



behatnotneeded

Change-Id: Ie11eca7384a9bda6d23de13f3b29a7c334ba378b
Signed-off-by: default avatarRobert Lyon <robertl@catalyst.net.nz>
parent a5e3533f

htdocs/module/framework/frameworkmanager.php

+2 −3
Original line number Diff line number Diff line
@@ -95,5 +95,4 @@ function frameworkconfig_submit(Pieform $form, $values) { 
    else {

        $form->json_reply(PIEFORM_ERR, array('message' => get_string('settingssavefailed')));

    }



}

htdocs/module/framework/frameworks.php

+80 −80
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ if ($uploadmatrix) { 
    $smarty->display('module:framework:uploadframework.tpl');

    exit;

}



else if ($upload) {

    //jsoneditor page:

    //get existing frameworks.
@@ -162,11 +161,11 @@ else if ($upload) { 
    $smarty->display('module:framework:jsoneditor.tpl');

    exit;

}



//for overview page

else {

    //for overview page

    $active_tab = 'overview';

}



$frameworks = Framework::get_frameworks('any');

if ($frameworks) {

    foreach ($frameworks as $framework) {
@@ -231,10 +230,10 @@ else { 
    }

}





//on frameworks page (rubbish bin icon)

function framework_delete_submit(Pieform $form, $values) {

    global $SESSION;



    $framework = new Framework($values['framework']);

    if (!$framework->is_in_collections()) {

        $framework->delete();
@@ -246,6 +245,7 @@ else { 


    redirect('/module/framework/frameworks.php');

}



//edit framework on main page

function framework_config_submit(Pieform $form, $values) {

    redirect(get_config('wwwroot') . 'module/framework/frameworkmanager.php?id=' . $values['framework']);

htdocs/module/framework/js/editor.js

+362 −362

File changed.

Preview size limit exceeded, changes collapsed.

htdocs/module/framework/lib.php

+66 −68
Original line number Diff line number Diff line
@@ -406,8 +406,6 @@ class Framework { 
                }

            }

        }





        db_commit();

    }

htdocs/module/framework/matrix.php

+2 −1
Original line number Diff line number Diff line
@@ -104,7 +104,8 @@ $smarty = smarty( 
    $javascript,

    $headers,

    array('View' => 'view',

          'Collection' => 'collection'),

        'Collection' => 'collection'

    ),

    array(

        'sidebars' => false,

        'skin' => $skin

htdocs/module/framework/framework.json.php

+6 −6

File changed.

Contains only whitespace changes.