pass to view only valid vars

evilbloodydemon · evilbloodydemon · commit 20ab919d15e9 · 2010-07-29T16:48:48.000+04:00
diff --git a/src/org/cakephp/netbeans/editor/CakePhpEditorExtender.java b/src/org/cakephp/netbeans/editor/CakePhpEditorExtender.java
@@ -133,10 +133,7 @@ public void visit(MethodInvocation node) {
             if(e instanceof Scalar) {
                 Scalar s = (Scalar)e;
                 if(s.getScalarType() == Scalar.Type.STRING) {
-                    viewVarName = s.getStringValue();
-                    if(!viewVarName.isEmpty()) {
-                        viewVarName = viewVarName.substring(1, viewVarName.length() - 1).trim();
-                    }
+                    viewVarName = prepareViewVar(s.getStringValue());
                 }
             }
 
@@ -145,9 +142,19 @@ public void visit(MethodInvocation node) {
                     && CakePhpUtils.isControllerName(className)
                     && !viewVarName.isEmpty()) {
                 synchronized (fields) {
-                    fields.add(new PhpVariable("$" + viewVarName, new PhpClass("HtmlHelper", "HtmlHelper")));
+                    fields.add(new PhpVariable("$" + viewVarName, new PhpClass("stdClass", "stdClass")));
                 }
             }
         }
+        
+        private String prepareViewVar(String viewVarName) {
+            if(!viewVarName.isEmpty()) {
+                viewVarName = viewVarName.substring(1, viewVarName.length() - 1).trim();
+                if(!viewVarName.matches("[A-Za-z][A-Za-z0-9]*")) {
+                    viewVarName = "";
+                }
+            }
+            return viewVarName;
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -133,10 +133,7 @@ public void visit(MethodInvocation node) {`
`133`	`133`	`if(e instanceof Scalar) {`
`134`	`134`	`Scalar s = (Scalar)e;`
`135`	`135`	`if(s.getScalarType() == Scalar.Type.STRING) {`
`136`		`- viewVarName = s.getStringValue();`
`137`		`- if(!viewVarName.isEmpty()) {`
`138`		`- viewVarName = viewVarName.substring(1, viewVarName.length() - 1).trim();`
`139`		`- }`
	`136`	`+ viewVarName = prepareViewVar(s.getStringValue());`
`140`	`137`	`}`
`141`	`138`	`}`
`142`	`139`
`@@ -145,9 +142,19 @@ public void visit(MethodInvocation node) {`
`145`	`142`	`&& CakePhpUtils.isControllerName(className)`
`146`	`143`	`&& !viewVarName.isEmpty()) {`
`147`	`144`	`synchronized (fields) {`
`148`		`- fields.add(new PhpVariable("$" + viewVarName, new PhpClass("HtmlHelper", "HtmlHelper")));`
	`145`	`+ fields.add(new PhpVariable("$" + viewVarName, new PhpClass("stdClass", "stdClass")));`
`149`	`146`	`}`
`150`	`147`	`}`
`151`	`148`	`}`
	`149`	`+`
	`150`	`+ private String prepareViewVar(String viewVarName) {`
	`151`	`+ if(!viewVarName.isEmpty()) {`
	`152`	`+ viewVarName = viewVarName.substring(1, viewVarName.length() - 1).trim();`
	`153`	`+ if(!viewVarName.matches("[A-Za-z][A-Za-z0-9]*")) {`
	`154`	`+ viewVarName = "";`
	`155`	`+ }`
	`156`	`+ }`
	`157`	`+ return viewVarName;`
	`158`	`+ }`
`152`	`159`	`}`
`153`	`160`	`}`