From 1865e6b6459e3c58348bc1feb514f776db508ad9 Mon Sep 17 00:00:00 2001 From: Rap RIV Date: Tue, 23 Jun 2020 10:36:26 +0400 Subject: [PATCH] Replace : Yii::app()->session["costum"] to $this->costum --- data/alldeal.json | 8 ++++- views/tpls/acceptAndAdmin.php | 4 +-- .../tpls/forms/costum/community/emailist.php | 6 ++-- views/tpls/forms/costum/community/wizard.php | 10 +++--- .../tpls/forms/costum/deal/stepOperateur.php | 8 ++--- views/tpls/forms/cplx/list.php | 14 ++++---- views/tpls/forms/cplx/multiList.php | 30 ++++++++-------- views/tpls/forms/cplx/stepValidation.php | 10 +++--- views/tpls/forms/cplx/subList.php | 6 ++-- .../tpls/forms/cplx/validationFromOffres.php | 34 +++++++++---------- views/tpls/forms/docs/README.md | 4 +-- views/tpls/forms/docs/openForm.org | 2 +- views/tpls/forms/sommom/reglementationesp.php | 14 ++++---- views/tpls/forms/sommom/wizard.php | 18 +++++----- 14 files changed, 87 insertions(+), 81 deletions(-) diff --git a/data/alldeal.json b/data/alldeal.json index b324e78..d192607 100644 --- a/data/alldeal.json +++ b/data/alldeal.json @@ -1,6 +1,12 @@ //parent form { - "parent" : Ne pas oublié de rattacher le parent, + + "parent" : { + "5e3bb97569086421758b465a" : { + "type" : "projects", + "name" : "DEAL" + } + }, "hasStepValidations" : 1, "id" : "dealForm", "source" : { diff --git a/views/tpls/acceptAndAdmin.php b/views/tpls/acceptAndAdmin.php index a58b35a..f19436e 100644 --- a/views/tpls/acceptAndAdmin.php +++ b/views/tpls/acceptAndAdmin.php @@ -11,8 +11,8 @@ costum.col = "session["costum"]["contextType"] ?>"; costum.ctrl = "session["costum"]["contextType"]) ?>"; - var configDynForm = session['costum']['dynForm']); ?>; - var tplsList = session['costum']['tpls'])) ? Yii::app()->session['costum']['tpls']:null); ?>; + var configDynForm = costum['dynForm']); ?>; + var tplsList = costum['tpls'])) ? $this->costum['tpls']:null); ?>; //contains all dynform definitions for complexe inputs //it also carries sub dynforms, when an input needs extra parameters to diff --git a/views/tpls/forms/costum/community/emailist.php b/views/tpls/forms/costum/community/emailist.php index 67b581f..352186f 100644 --- a/views/tpls/forms/costum/community/emailist.php +++ b/views/tpls/forms/costum/community/emailist.php @@ -14,14 +14,14 @@ $editBtnL = (Yii::app()->session["userId"] == $answer["user"]) ? " Ajouter une ligne " : ""; - $editParamsBtn = ($canEdit) ? " " : ""; + $editParamsBtn = ($canEdit) ? " " : ""; $paramsData = [ "mail_type" => "" ]; - if( isset(Yii::app()->session["costum"]["form"]["params"][$kunik]["mail_type"]) ) - $paramsData["mail_type"] = Yii::app()->session["costum"]["form"]["params"][$kunik]["mail_type"]; + if( isset($this->costum["form"]["params"][$kunik]["mail_type"]) ) + $paramsData["mail_type"] = $this->costum["form"]["params"][$kunik]["mail_type"]; $properties = [ diff --git a/views/tpls/forms/costum/community/wizard.php b/views/tpls/forms/costum/community/wizard.php index 65806e0..c8f3a36 100644 --- a/views/tpls/forms/costum/community/wizard.php +++ b/views/tpls/forms/costum/community/wizard.php @@ -12,10 +12,10 @@ $paramsData = [ "title" => "", "tags" => "structags" ]; -if( isset(Yii::app()->session["costum"]["tpls"][$keyTpl]) ) { +if( isset($this->costum["tpls"][$keyTpl]) ) { foreach ($paramsData as $i => $v) { - if( isset(Yii::app()->session["costum"]["tpls"][$keyTpl][$i]) ) - $paramsData[$i] = Yii::app()->session["costum"]["tpls"][$keyTpl][$i]; + if( isset($this->costum["tpls"][$keyTpl][$i]) ) + $paramsData[$i] = $this->costum["tpls"][$keyTpl][$i]; } } @@ -59,8 +59,8 @@ var formInputsHere = formInputs; { echo '

'.@$form["name"].'

'; echo "
"; - if(isset(Yii::app()->session["costum"]["cms"][$form["id"]."desc"])) - echo htmlentities(Yii::app()->session["costum"]["cms"][$form["id"]."desc"]); + if(isset($this->costum["cms"][$form["id"]."desc"])) + echo htmlentities($this->costum["cms"][$form["id"]."desc"]); else echo "* section description"; if($canEdit) diff --git a/views/tpls/forms/costum/deal/stepOperateur.php b/views/tpls/forms/costum/deal/stepOperateur.php index a5a87d9..a31e85f 100644 --- a/views/tpls/forms/costum/deal/stepOperateur.php +++ b/views/tpls/forms/costum/deal/stepOperateur.php @@ -7,15 +7,15 @@ if( $mode != "pdf" ){ $isFinanceur=false; if(Authorisation::isInterfaceAdmin()) $isFinanceur=true; - if(isset(Yii::app()->session["costum"][$this->costum["slug"]]["financorOf"])){ + if(isset($this->costum[$this->costum["slug"]]["financorOf"])){ $isFinanceur=true; - $financorOf=Yii::app()->session["costum"][$this->costum["slug"]]["financorOf"]; + $financorOf=$this->costum[$this->costum["slug"]]["financorOf"]; $financorOf["thumbImg"]=(isset($financorOf["profilThumbImageUrl"])) ? Yii::app()->createUrl($financorOf["profilThumbImageUrl"]) : Yii::app()->getModule( Yii::app()->params["module"]["parent"] )->getAssetsUrl()."/images/thumb/default_organizations.jpg"; } $isOperator = false; - if(isset(Yii::app()->session["costum"][$this->costum["slug"]]["operatorOf"])){ + if(isset($this->costum[$this->costum["slug"]]["operatorOf"])){ $isOperator= true; - $operatorOf=Yii::app()->session["costum"][$this->costum["slug"]]["operatorOf"]; + $operatorOf=$this->costum[$this->costum["slug"]]["operatorOf"]; $operatorOf["thumbImg"]=(isset($operatorOf["profilThumbImageUrl"])) ? Yii::app()->createUrl($operatorOf["profilThumbImageUrl"]) : Yii::app()->getModule( Yii::app()->params["module"]["parent"] )->getAssetsUrl()."/images/thumb/default_organizations.jpg"; } diff --git a/views/tpls/forms/cplx/list.php b/views/tpls/forms/cplx/list.php index d3ea5bb..957967f 100644 --- a/views/tpls/forms/cplx/list.php +++ b/views/tpls/forms/cplx/list.php @@ -11,7 +11,7 @@ } } } - if(isset(Yii::app()->session["costum"]["form"]["params"][$kunik]['num_row']) and Yii::app()->session["costum"]["form"]["params"][$kunik]['num_row'] == "0" and isset(Yii::app()->session["costum"]["form"]["params"][$kunik]["nbmax"]) and ((int)Yii::app()->session["costum"]["form"]["params"][$kunik]["nbmax"]) <= $i){ + if(isset($this->costum["form"]["params"][$kunik]['num_row']) and $this->costum["form"]["params"][$kunik]['num_row'] == "0" and isset($this->costum["form"]["params"][$kunik]["nbmax"]) and ((int)$this->costum["form"]["params"][$kunik]["nbmax"]) <= $i){ $show = false; } $editBtnL=""; @@ -19,16 +19,16 @@ $editBtnL = (Yii::app()->session["userId"] == $answer["user"]) ? " Ajouter une ligne " : ""; } - $editParamsBtn = ($canEdit) ? " " : ""; + $editParamsBtn = ($canEdit) ? " " : ""; $paramsData = [ "nbmax" => "2", "num_row" => ["limité","illimité"] ]; - if( isset(Yii::app()->session["costum"]["form"]["params"][$kunik]["nbmax"]) ) - $paramsData["nbmax"] = Yii::app()->session["costum"]["form"]["params"][$kunik]["nbmax"]; - if( isset(Yii::app()->session["costum"]["form"]["params"][$kunik]["limited"]) ) - $paramsData["num_row"] = Yii::app()->session["costum"]["form"]["params"][$kunik]["num_row"]; + if( isset($this->costum["form"]["params"][$kunik]["nbmax"]) ) + $paramsData["nbmax"] = $this->costum["form"]["params"][$kunik]["nbmax"]; + if( isset($this->costum["form"]["params"][$kunik]["limited"]) ) + $paramsData["num_row"] = $this->costum["form"]["params"][$kunik]["num_row"]; $properties = [ @@ -125,7 +125,7 @@ inputType : "select", label : "Limitation", options : sectionDyf.ParamsData.num_row, - value : "session["costum"]["form"]["params"][$kunik]['num_row'])) ? Yii::app()->session["costum"]["form"]["params"][$kunik]['num_row'] : ''; ?>" + value : "costum["form"]["params"][$kunik]['num_row'])) ? $this->costum["form"]["params"][$kunik]['num_row'] : ''; ?>" }, nbmax : { diff --git a/views/tpls/forms/cplx/multiList.php b/views/tpls/forms/cplx/multiList.php index a1be4bc..e6918e5 100644 --- a/views/tpls/forms/cplx/multiList.php +++ b/views/tpls/forms/cplx/multiList.php @@ -21,30 +21,30 @@ $cnt++; } } - if(isset(Yii::app()->session["costum"]["form"]["params"][$kunik]['num_row']) and Yii::app()->session["costum"]["form"]["params"][$kunik]['num_row'] == "0" and isset(Yii::app()->session["costum"]["form"]["params"][$kunik]["nbmax"]) and ((int)Yii::app()->session["costum"]["form"]["params"][$kunik]["nbmax"]) <= $i){ + if(isset($this->costum["form"]["params"][$kunik]['num_row']) and $this->costum["form"]["params"][$kunik]['num_row'] == "0" and isset($this->costum["form"]["params"][$kunik]["nbmax"]) and ((int)$this->costum["form"]["params"][$kunik]["nbmax"]) <= $i){ $show = false; } $editBtnL=""; - $editParamsBtn = ($canEdit) ? " " : ""; + $editParamsBtn = ($canEdit) ? " " : ""; $paramsData = [ "nbmax" => "2", "num_row" => ["limité","illimité"], "nblist_max" => "2" ,"num_list" => ["limité","illimité"], "width" => ["1" => "1","2" => "2","2" => "2","3" => "3"] ]; - if( isset(Yii::app()->session["costum"]["form"]["params"][$kunik]["nbmax"]) ) - $paramsData["nbmax"] = Yii::app()->session["costum"]["form"]["params"][$kunik]["nbmax"]; - if( isset(Yii::app()->session["costum"]["form"]["params"][$kunik]["limited"]) ) - $paramsData["num_row"] = Yii::app()->session["costum"]["form"]["params"][$kunik]["num_row"]; - if( isset(Yii::app()->session["costum"]["form"]["params"][$kunik]["nblist_max"]) ) - $paramsData["nblist_max"] = Yii::app()->session["costum"]["form"]["params"][$kunik]["nblist_max"]; - if( isset(Yii::app()->session["costum"]["form"]["params"][$kunik]["num_list"]) ) - $paramsData["num_list"] = Yii::app()->session["costum"]["form"]["params"][$kunik]["num_list"]; - if( isset(Yii::app()->session["costum"]["form"]["params"][$kunik]["width"]) ) - $paramsData["width"] = Yii::app()->session["costum"]["form"]["params"][$kunik]["width"]; + if( isset($this->costum["form"]["params"][$kunik]["nbmax"]) ) + $paramsData["nbmax"] = $this->costum["form"]["params"][$kunik]["nbmax"]; + if( isset($this->costum["form"]["params"][$kunik]["limited"]) ) + $paramsData["num_row"] = $this->costum["form"]["params"][$kunik]["num_row"]; + if( isset($this->costum["form"]["params"][$kunik]["nblist_max"]) ) + $paramsData["nblist_max"] = $this->costum["form"]["params"][$kunik]["nblist_max"]; + if( isset($this->costum["form"]["params"][$kunik]["num_list"]) ) + $paramsData["num_list"] = $this->costum["form"]["params"][$kunik]["num_list"]; + if( isset($this->costum["form"]["params"][$kunik]["width"]) ) + $paramsData["width"] = $this->costum["form"]["params"][$kunik]["width"]; $cssRow = "6"; - if( isset(Yii::app()->session["costum"]["form"]["params"][$kunik]["width"]) ){ + if( isset($this->costum["form"]["params"][$kunik]["width"]) ){ if($paramsData["width"] == "1"){ $cssRow = "12"; }elseif ($paramsData["width"] == "2"){ @@ -202,7 +202,7 @@ inputType : "select", label : "Limitation", options : sectionDyf.ParamsData.num_row, - value : "session["costum"]["form"]["params"][$kunik]['num_row'])) ? Yii::app()->session["costum"]["form"]["params"][$kunik]['num_row'] : ''; ?>" + value : "costum["form"]["params"][$kunik]['num_row'])) ? $this->costum["form"]["params"][$kunik]['num_row'] : ''; ?>" }, nbmax : { @@ -214,7 +214,7 @@ inputType : "text", label : "Nombre d'element par ligne", options : sectionDyf.ParamsData.width, - value : "session["costum"]["form"]["params"][$kunik]['width'])) ? Yii::app()->session["costum"]["form"]["params"][$kunik]['width'] : ''; ?>" + value : "costum["form"]["params"][$kunik]['width'])) ? $this->costum["form"]["params"][$kunik]['width'] : ''; ?>" } }, save : function () { diff --git a/views/tpls/forms/cplx/stepValidation.php b/views/tpls/forms/cplx/stepValidation.php index 35abd10..a1af1fa 100644 --- a/views/tpls/forms/cplx/stepValidation.php +++ b/views/tpls/forms/cplx/stepValidation.php @@ -93,18 +93,18 @@ if( $mode != "pdf" ){ session["costum"][$el['costum']['slug']]["hasRoles"][0]); + // var_dump($this->costum[$el['costum']['slug']]["hasRoles"][0]); // var_dump($paramsData['canValidRoles']); if( (!isset($answer["validation"][$form['id']]) || (isset( $answer["validation"][ $form['id'] ]["valid"] ) && $answer["validation"][ $form['id'] ]["valid"] == "notValid")) && //isset( $answ) && - isset( Yii::app()->session["costum"][$el['costum']['slug']]["hasRoles"][0]) && - in_array(Yii::app()->session["costum"][$el['costum']['slug']]["hasRoles"][0], $paramsData['canRequestRoles']) ) + isset( $this->costum[$el['costum']['slug']]["hasRoles"][0]) && + in_array($this->costum[$el['costum']['slug']]["hasRoles"][0], $paramsData['canRequestRoles']) ) echo 'Étape terminé , Demander la Validation'; else if( isset( $answer["validation"][ $form['id'] ]["valid"] ) && $answer["validation"][ $form['id'] ]["valid"] == "request" && - isset( Yii::app()->session["costum"][$el['costum']['slug']]["hasRoles"][0] ) && - in_array(Yii::app()->session["costum"][$el['costum']['slug']]["hasRoles"][0], $paramsData['canValidRoles']) ) + isset( $this->costum[$el['costum']['slug']]["hasRoles"][0] ) && + in_array($this->costum[$el['costum']['slug']]["hasRoles"][0], $paramsData['canValidRoles']) ) echo 'Valider cette Étape'; else { if(isset( $answer["validation"][ $form['id'] ] ) && diff --git a/views/tpls/forms/cplx/subList.php b/views/tpls/forms/cplx/subList.php index 3672a02..27d5586 100644 --- a/views/tpls/forms/cplx/subList.php +++ b/views/tpls/forms/cplx/subList.php @@ -6,7 +6,7 @@ session["userId"] == $answer["user"]) ? " Ajouter une ligne " : ""; -$editParamsBtn = ($canEdit) ? " " : ""; +$editParamsBtn = ($canEdit) ? " " : ""; $paramsData = [ "role" => [ @@ -14,8 +14,8 @@ $paramsData = [ "graphiste" ] ]; -if( isset(Yii::app()->session["costum"]["form"]["params"][$kunik]["role"]) ) - $paramsData["role"] = Yii::app()->session["costum"]["form"]["params"][$kunik]["role"]; +if( isset($this->costum["form"]["params"][$kunik]["role"]) ) + $paramsData["role"] = $this->costum["form"]["params"][$kunik]["role"]; $properties = [ "titre_sous_action" => [ diff --git a/views/tpls/forms/cplx/validationFromOffres.php b/views/tpls/forms/cplx/validationFromOffres.php index 6d99645..c7423e2 100644 --- a/views/tpls/forms/cplx/validationFromOffres.php +++ b/views/tpls/forms/cplx/validationFromOffres.php @@ -1,8 +1,8 @@ session["costum"]["form"]["params"][$kunik]["offresCopy"]) ) - $copy = Yii::app()->session["costum"]["form"]["params"][$kunik]["offresCopy"]; + if( isset($this->costum["form"]["params"][$kunik]["offresCopy"]) ) + $copy = $this->costum["form"]["params"][$kunik]["offresCopy"]; //var_dump($copy); $copyT = explode(".", $copy); $copyF = $copyT[0]; @@ -25,7 +25,7 @@ $editBtnL = ""; -$editParamsBtn = ($canEdit) ? " " : ""; +$editParamsBtn = ($canEdit) ? " " : ""; $paramsData = [ @@ -39,22 +39,22 @@ $paramsData = [ ] ]; -if( isset(Yii::app()->session["costum"]["form"]["params"][$kunik]) ) { - if( isset(Yii::app()->session["costum"]["form"]["params"][$offresKey]["group"]) ) - $paramsData["group"] = Yii::app()->session["costum"]["form"]["params"][$offresKey]["group"]; - if( isset(Yii::app()->session["costum"]["form"]["params"][$offresKey]["nature"]) ) - $paramsData["nature"] = Yii::app()->session["costum"]["form"]["params"][$offresKey]["nature"]; - if( isset(Yii::app()->session["costum"]["form"]["params"][$offresKey]["amounts"]) ) - $paramsData["amounts"] = Yii::app()->session["costum"]["form"]["params"][$kunik]["amounts"]; +if( isset($this->costum["form"]["params"][$kunik]) ) { + if( isset($this->costum["form"]["params"][$offresKey]["group"]) ) + $paramsData["group"] = $this->costum["form"]["params"][$offresKey]["group"]; + if( isset($this->costum["form"]["params"][$offresKey]["nature"]) ) + $paramsData["nature"] = $this->costum["form"]["params"][$offresKey]["nature"]; + if( isset($this->costum["form"]["params"][$offresKey]["amounts"]) ) + $paramsData["amounts"] = $this->costum["form"]["params"][$kunik]["amounts"]; } -$communityLinks = Element::getCommunityByTypeAndId(Yii::app()->session["costum"]["contextType"],Yii::app()->session["costum"]["contextId"]); +$communityLinks = Element::getCommunityByTypeAndId($this->costum["contextType"],$this->costum["contextId"]); $organizations = Link::groupFindByType( Organization::COLLECTION,$communityLinks,["name","links"] ); $orgs = []; foreach ($organizations as $id => $or) { - $roles = $or["links"]["memberOf"][Yii::app()->session["costum"]["contextId"]]["roles"]; + $roles = $or["links"]["memberOf"][$this->costum["contextId"]]["roles"]; if( $paramsData["limitRoles"] && !empty($roles)) { foreach ($roles as $i => $r) { @@ -98,7 +98,7 @@ $properties["votes"] = [

">

session["costum"]["form"]["params"][$kunik]["offresCopy"]) ) + if( !isset($this->costum["form"]["params"][$kunik]["offresCopy"]) ) echo "
THIS FIELD HAS TO BE CONFIGURED FIRST ".$editParamsBtn.""; ?> @@ -274,13 +274,13 @@ echo "

Décision Gl session["costum"]["form"]["params"]["financement"]["tpl"])){ - //if( Yii::app()->session["costum"]["form"]["params"]["financement"]["tpl"] == "tpls.forms.equioffres" ) - $this->renderPartial( "costum.views.".Yii::app()->session["costum"]["form"]["params"]["financement"]["tpl"] , +if( isset($this->costum["form"]["params"]["financement"]["tpl"])){ + //if( $this->costum["form"]["params"]["financement"]["tpl"] == "tpls.forms.equioffres" ) + $this->renderPartial( "costum.views.".$this->costum["form"]["params"]["financement"]["tpl"] , [ "totalFin" => $total, "totalBudg" => Yii::app()->session["totaloffres"]["totaloffres"] ] ); // else - // $this->renderPartial( "costum.views.".Yii::app()->session["costum"]["form"]["params"]["financement"]["tpl"]); + // $this->renderPartial( "costum.views.".$this->costum["form"]["params"]["financement"]["tpl"]); } ?> diff --git a/views/tpls/forms/docs/README.md b/views/tpls/forms/docs/README.md index a5d7f8a..27c512f 100644 --- a/views/tpls/forms/docs/README.md +++ b/views/tpls/forms/docs/README.md @@ -7,8 +7,8 @@ uses a classic costum engine with a json associated editable blocks in the *costumTpl* are made editable like this ``` session["costum"]["cms"]["title1"])){ - echo htmlentities(Yii::app()->session["costum"]["cms"]["title1"]); +if(isset($this->costum["cms"]["title1"])){ + echo htmlentities($this->costum["cms"]["title1"]); } else { ?> Open Form "; diff --git a/views/tpls/forms/docs/openForm.org b/views/tpls/forms/docs/openForm.org index 6e19ca7..0671b63 100644 --- a/views/tpls/forms/docs/openForm.org +++ b/views/tpls/forms/docs/openForm.org @@ -43,7 +43,7 @@ isMultiForms initValues : contains any dyfinputs initial data answerObj : contains answer data for the current form ** to edit costum page pieces - var configDynForm = session['costum']['dynForm']); ?>; + var configDynForm = costum['dynForm']); ?>; ** information and structure of the form in this page var formInputs = ; diff --git a/views/tpls/forms/sommom/reglementationesp.php b/views/tpls/forms/sommom/reglementationesp.php index ad97a40..6d1c44f 100644 --- a/views/tpls/forms/sommom/reglementationesp.php +++ b/views/tpls/forms/sommom/reglementationesp.php @@ -6,7 +6,7 @@ Ajouter une ligne Ajouter un organisme " : ""; - $editParamsBtn = ($canEdit) ? " " : ""; + $editParamsBtn = ($canEdit) ? " " : ""; $paramsData = [ "type" => [ @@ -52,8 +52,8 @@ } } - if( isset(Yii::app()->session["costum"]["form"]["params"][$kunik]["ocean"]) ) - $paramsData["ocean"] = Yii::app()->session["costum"]["form"]["params"][$kunik]["ocean"]; + if( isset($this->costum["form"]["params"][$kunik]["ocean"]) ) + $paramsData["ocean"] = $this->costum["form"]["params"][$kunik]["ocean"]; $l = PHDB::findOne(Lists::COLLECTION, array('name' => 'cetaces')); $i=1; @@ -121,14 +121,14 @@ foreach ($properties as $k => $v) { if( isset($v["label"])){ - if( isset(Yii::app()->session["costum"]["form"]["params"][$kunik]["labels"][$k]) ) - $properties[$k]["label"] = Yii::app()->session["costum"]["form"]["params"][$kunik]["labels"][$k]; + if( isset($this->costum["form"]["params"][$kunik]["labels"][$k]) ) + $properties[$k]["label"] = $this->costum["form"]["params"][$kunik]["labels"][$k]; $propertiesParams["labels"][$k] = $properties[$k]["label"]; } if( isset($v["placeholder"])){ - if(isset(Yii::app()->session["costum"]["form"]["params"][$kunik]["placeholders"][$k]) ) - $properties[$k]["placeholder"] = Yii::app()->session["costum"]["form"]["params"][$kunik]["placeholders"][$k]; + if(isset($this->costum["form"]["params"][$kunik]["placeholders"][$k]) ) + $properties[$k]["placeholder"] = $this->costum["form"]["params"][$kunik]["placeholders"][$k]; $propertiesParams["placeholders"][$k] = $properties[$k]["placeholder"]; } } diff --git a/views/tpls/forms/sommom/wizard.php b/views/tpls/forms/sommom/wizard.php index c8ad0c1..50e614d 100644 --- a/views/tpls/forms/sommom/wizard.php +++ b/views/tpls/forms/sommom/wizard.php @@ -12,10 +12,10 @@ $paramsData = [ "title" => "", "tags" => "structags" ]; -if( isset(Yii::app()->session["costum"]["tpls"][$keyTpl]) ) { +if( isset($this->costum["tpls"][$keyTpl]) ) { foreach ($paramsData as $i => $v) { - if( isset(Yii::app()->session["costum"]["tpls"][$keyTpl][$i]) ) - $paramsData[$i] = Yii::app()->session["costum"]["tpls"][$keyTpl][$i]; + if( isset($this->costum["tpls"][$keyTpl][$i]) ) + $paramsData[$i] = $this->costum["tpls"][$keyTpl][$i]; } } @@ -56,15 +56,15 @@ if( isset(Yii::app()->session["costum"]["tpls"][$keyTpl]) ) { $d = ''; $lbl = "?"; - // if(isset(Yii::app()->session["costum"]["form"]["hasStepValidations"]) ) + // if(isset($this->costum["form"]["hasStepValidations"]) ) // $lbl = ""; - if( (!isset($answer["step"]) && !isset(Yii::app()->session["costum"]["form"]["hasStepValidations"])) || + if( (!isset($answer["step"]) && !isset($this->costum["form"]["hasStepValidations"])) || $k == 0 || (isset($answer["step"]) && $answer["step"] == "all" ) || - (isset(Yii::app()->session["costum"]["form"]["hasStepValidations"]) && isset($answer["step"]) && $k <= array_search($answer["step"], $formList) ) || - ( isset(Yii::app()->session["costum"]["form"]["hasStepValidations"]) && !isset($answer["step"]) && $k <= Yii::app()->session["costum"]["form"]["hasStepValidations"] ) ) + (isset($this->costum["form"]["hasStepValidations"]) && isset($answer["step"]) && $k <= array_search($answer["step"], $formList) ) || + ( isset($this->costum["form"]["hasStepValidations"]) && !isset($answer["step"]) && $k <= $this->costum["form"]["hasStepValidations"] ) ) { $d = 'class="done"'; $lbl = $k; @@ -101,8 +101,8 @@ var formInputsHere = formInputs; { echo '

'.@$form["name"].'

'; echo "
"; - if(isset(Yii::app()->session["costum"]["cms"][$form["id"]."desc"])) - echo htmlentities(Yii::app()->session["costum"]["cms"][$form["id"]."desc"]); + if(isset($this->costum["cms"][$form["id"]."desc"])) + echo htmlentities($this->costum["cms"][$form["id"]."desc"]); else echo "* section description"; if($canEdit) -- GitLab