cseufert / hamle

php/autoload.php

Spacing +5 added lines, -5 removed lines

@@ -34,11 +34,11 @@
  * @param string $class Class name to be autoloaded

  */

 spl_autoload_register(function($class) {

-  if(strpos($class, "Seufert\\Hamle\\") === 0) {

+  if (strpos($class, "Seufert\\Hamle\\") === 0) {

     $s = DIRECTORY_SEPARATOR;

-    $class = str_replace("\\",$s,substr($class,14));

-    $path = __DIR__.$s."hamle".$s."$class.php";

-    if(is_file($path)) include_once($path);

+    $class = str_replace("\\", $s, substr($class, 14));

+    $path = __DIR__ . $s . "hamle" . $s . "$class.php";

+    if (is_file($path)) include_once($path);

   }

-},true,true);

+},true, true);

 

php/hamle/Field.php

Spacing +3 added lines, -3 removed lines

@@ -124,7 +124,7 @@ 
   function getInputAttStatic(&$atts, &$type, &$content) {

     $atts['id'] = $atts['name'] = $this->form . "_" . $this->name;

     $atts['type'] = "text";

-    $atts['class'][] = str_replace(['Seufert\\','\\'],['','_'],get_class($this));

+    $atts['class'][] = str_replace(['Seufert\\', '\\'], ['', '_'], get_class($this));

   }

 

   function getInputAttDynamic(&$atts, &$type, &$content) {

@@ -142,7 +142,7 @@ 
   }

 

   function getLabelAttStatic(&$atts, &$type, &$content) {

-    $atts['class'][] = str_replace(['Seufert\\','\\'],['','_'],get_class($this));

+    $atts['class'][] = str_replace(['Seufert\\', '\\'], ['', '_'], get_class($this));

     $atts["for"] = $this->form . "_" . $this->name;

     $content = array($this->opt['label']);

   }

@@ -151,7 +151,7 @@ 
   }

 

   function getHintAttStatic(&$atts, &$type, &$content) {

-    $atts['class'][] = str_replace(['Seufert\\','\\'],['','_'],get_class($this));

+    $atts['class'][] = str_replace(['Seufert\\', '\\'], ['', '_'], get_class($this));

     $atts['class'][] = "hamleFormHint";

   }

 

php/hamle/Tag/Form.php

Spacing +5 added lines, -5 removed lines

@@ -61,7 +61,7 @@ 
     foreach ($labelTags as $tag)
       if ($tag instanceOf Html)
         foreach ($tag->source as $source) {
-          if(isset($fields[$source]))
+          if (isset($fields[$source]))
             $fields[$source]->getLabelAttStatic($tag->opt, $tag->type, $tag->content);
           else
             $tag->opt['style'] = "display:none;";
@@ -70,7 +70,7 @@ 
     foreach ($inputTags as $tag)
       if ($tag instanceOf Html)
         foreach ($tag->source as $source) {
-          if(isset($fields[$source]))
+          if (isset($fields[$source]))
             $fields[$source]->getHintAttStatic($tag->opt, $tag->type, $tag->content);
           else
             $tag->opt['style'] = "display:none;";
@@ -79,7 +79,7 @@ 
     foreach ($inputTags as $tag)
       if ($tag instanceOf Html)
         foreach ($tag->source as $source) {
-          if(isset($fields[$source])) {
+          if (isset($fields[$source])) {
             $fields[$source]->getInputAttStatic($tag->opt, $tag->type, $tag->content);
             unset($fields[$source]);
           } else
@@ -87,10 +87,10 @@ 
         }
     foreach ($fields as $n => $f) {
       if (!$f instanceOf Button) {
-        $this->addChild($label = new DynHtml("label", [],[],"",$n));
+        $this->addChild($label = new DynHtml("label", [], [], "", $n));
         $f->getLabelAttStatic($label->opt, $label->type, $label->content);
       }
-      $this->addChild($input = new DynHtml("input", [],[],"",$n));
+      $this->addChild($input = new DynHtml("input", [], [], "", $n));
       $f->getInputAttStatic($input->opt, $input->type, $input->content);
     }
     return "<form " . implode(" ", $out) . "><?php \$form = " . $this->var->toPHP() . "; \$form->process(); ?>";

php/hamle/Tag/Snippet.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 
   static function decodeClassId($s) {
     $out = $m = array();
-    if(preg_match('/^[a-zA-Z0-9\_]+/', $s, $m))
+    if (preg_match('/^[a-zA-Z0-9\_]+/', $s, $m))
       $out['type'] = $m[0];
     preg_match_all('/[#\.][a-zA-Z0-9\-\_]+/m', $s, $m);
     if (isset($m[0])) foreach ($m[0] as $s) {

php/hamle/Tag/Html.php

Spacing +4 added lines, -4 removed lines

@@ -42,17 +42,17 @@
   function __construct($tag, $class = array(), $attr = array(), $id = "") {
     parent::__construct();
     $this->opt = $attr;
-    if(isset($attr['class']) && !is_array($attr['class']))
-      $this->opt['class'] = $attr['class']?explode(" ",$attr['class']):array();
+    if (isset($attr['class']) && !is_array($attr['class']))
+      $this->opt['class'] = $attr['class'] ? explode(" ", $attr['class']) : array();
     $this->source = array();
     $this->type = $tag ? $tag : "div";
-    if($class) {
+    if ($class) {
       if (isset($this->opt['class']))
         $this->opt['class'] = array_merge($this->opt['class'], $class);
       else
         $this->opt['class'] = $class;
     }
-    if($id) $this->opt['id'] = $id;
+    if ($id) $this->opt['id'] = $id;
   }
 
   function renderStTag() {

php/hamle/Form.php

Spacing +12 added lines, -12 removed lines

@@ -44,7 +44,7 @@ 
    * Fills the $this->fields array with hamleFields

    */

   function setup() {

-    throw new Exception\RunTime("You must configure the form in the setup ".

+    throw new Exception\RunTime("You must configure the form in the setup " .

       "function, by adding fields to the \$this->fields array");

   }

   

@@ -54,7 +54,7 @@ 
     $this->setup();

     $fields = $this->_fields;

     $this->_fields = array();

-    foreach($fields as $v) {

+    foreach ($fields as $v) {

       $this->_fields[$v->name] = $v;

       $v->form($this->_name);

     }

@@ -64,23 +64,23 @@ 
   

   function process() {

     $clicked = "";

-    foreach($this->_fields as $f)

-      if($f instanceOf Field\Button)

-        if($f->isClicked())

+    foreach ($this->_fields as $f)

+      if ($f instanceOf Field\Button)

+        if ($f->isClicked())

           $clicked = $f;

-    foreach($this->_fields as $f)

-      $f->doProcess($clicked?true:false);

-    if($clicked)

+    foreach ($this->_fields as $f)

+      $f->doProcess($clicked ? true : false);

+    if ($clicked)

       try {

         $this->onSubmit($clicked);

-      } catch(Exception\FormInvalid $e) {

+      } catch (Exception\FormInvalid $e) {

         $this->hint = $e->getMessage();

       }

   }

   

   function isValid() {

     $valid = true;

-    foreach($this->_fields as $f)

+    foreach ($this->_fields as $f)

       $valid = $f->valid && $valid;

     return $valid;

   }

@@ -95,7 +95,7 @@ 
     return $this->_fields;

   }

   function getField($n) {

-    if(!isset($this->_fields[$n]))

+    if (!isset($this->_fields[$n]))

       throw new Exception\NoKey("unable to find form field ($n)");

     return $this->_fields[$n];

   }

@@ -104,7 +104,7 @@ 
   }

   

   function getHTMLProp() {

-    return array('action'=>'','method'=>'post','name'=>$this->_name,

+    return array('action'=>'', 'method'=>'post', 'name'=>$this->_name,

                                         'enctype'=>'multipart/form-data');

   }

 

php/hamle/Text/FuncSub.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 
   function __construct($s) {
     $m = array();
-    if (!preg_match('/^ +([><]) +('.self::REGEX_FUNCSEL . '+)(.*)$/', $s, $m))
+    if (!preg_match('/^ +([><]) +(' . self::REGEX_FUNCSEL . '+)(.*)$/', $s, $m))
       throw new ParseError("Unable to read \$ sub func in '$s'");
     if ($m[1] == "<") $this->dir = Hamle\Hamle::REL_PARENT;
     elseif ($m[1] == ">") $this->dir = Hamle\Hamle::REL_CHILD;

php/hamle/Text/Complex.php

Spacing +6 added lines, -6 removed lines

@@ -34,9 +34,9 @@ 
   protected $filter;
 
   function __construct($s) {
-    if(FALSE !== $pos = strpos($s,'|')) {
-      $this->filter = new Filter(substr($s, $pos+1), $this);
-      $s = substr($s,0,$pos);
+    if (FALSE !== $pos = strpos($s, '|')) {
+      $this->filter = new Filter(substr($s, $pos + 1), $this);
+      $s = substr($s, 0, $pos);
     }
     $s = explode("->", $s);
     if (!$s[0]) throw new ParseError("Unable to parse Complex Expression");
@@ -51,12 +51,12 @@ 
   }
 
   function toHTML($escape = false) {
-    if($escape)
-      return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
+    if ($escape)
+      return "<?=htmlspecialchars(" . $this->toPHP() . ")?>";
     return "<?=" . $this->toPHP() . "?>";
   }
   function toPHP() {
-    return $this->filter?$this->filter->toPHP():$this->toPHPVar();
+    return $this->filter ? $this->filter->toPHP() : $this->toPHPVar();
   }
   function toPHPVar() {
     if ($this->sel) {

php/hamle/Text/SimpleVar.php

Spacing +6 added lines, -6 removed lines

@@ -33,22 +33,22 @@
   protected $filter;
 
   function __construct($s) {
-    if(FALSE !== $pos = strpos($s,'|')) {
-      $this->var = substr($s,1,$pos-1);
-      $this->filter = new Filter(substr($s, $pos+1), $this);
+    if (FALSE !== $pos = strpos($s, '|')) {
+      $this->var = substr($s, 1, $pos - 1);
+      $this->filter = new Filter(substr($s, $pos + 1), $this);
     } else {
       $this->var = substr($s, 1);
     }
   }
 
   function toHTML($escape = false) {
-    if($escape)
-      return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
+    if ($escape)
+      return "<?=htmlspecialchars(" . $this->toPHP() . ")?>";
     return "<?=" . $this->toPHP() . "?>";
   }
 
   function toPHP() {
-    return $this->filter?$this->filter->toPHP():$this->toPHPVar();
+    return $this->filter ? $this->filter->toPHP() : $this->toPHPVar();
   }
 
   function toPHPVar() {