Changeset 8 in ExiteCMS8

Timestamp:

01/10/11 00:17:02 (17 months ago)

Author:

WanWizard

Message:

merged upstream changes in the fuel core

Location:

trunk/fuel

Files:

• core/classes/file.php (modified) (1 diff)
• core/classes/request.php (modified) (1 diff)
• core/classes/validation.php (modified) (11 diffs)
• packages/activerecord/classes/model.php (modified) (2 diffs)
• packages/oil/classes/generate.php (modified) (3 diffs)
• packages/oil/classes/package.php (modified) (1 diff)
• packages/oil/views/scaffold/actions/create.php (modified) (2 diffs)
• packages/oil/views/scaffold/actions/edit.php (modified) (1 diff)

trunk/fuel/core/classes/file.php

@@ -381 +381 @@
         if ( ! is_file($path))
         {
-            echo $path.PHP_EOL;
             throw new \Exception('Cannot delete file: given path "'.$path.'" is not a file.');
         }

trunk/fuel/core/classes/request.php

@@ -151 +151 @@
                         return $controller->output;
                     }
+
+                    \Output::send_headers();
                     exit($controller->output);
                 }

trunk/fuel/core/classes/validation.php

@@ -419 +419 @@
     {
         // first try direct match
-        if ($val === $compare || ( ! $strict && $val == $compare))
+        if (empty($val) || $val === $compare || ( ! $strict && $val == $compare))
         {
             return true;
@@ -449 +449 @@
     public function _validation_match_pattern($val, $pattern)
     {
-        return preg_match($pattern, $val) > 0;
+        return empty($val) || preg_match($pattern, $val) > 0;
     }
 
@@ -462 +462 @@
     public function _validation_match_field($val, $field)
     {
-        return $this->input($field) === $val;
+        return empty($val) || $this->input($field) === $val;
     }
 
@@ -474 +474 @@
     public function _validation_min_length($val, $length)
     {
-        return (MBSTRING ? mb_strlen($val) : strlen($val)) >= $length;
+        return empty($val) || (MBSTRING ? mb_strlen($val) : strlen($val)) >= $length;
     }
 
@@ -486 +486 @@
     public function _validation_max_length($val, $length)
     {
-        return (MBSTRING ? mb_strlen($val) : strlen($val)) <= $length;
+        return empty($val) || (MBSTRING ? mb_strlen($val) : strlen($val)) <= $length;
     }
 
@@ -498 +498 @@
     public function _validation_exact_length($val, $length)
     {
-        return (MBSTRING ? mb_strlen($val) : strlen($val)) == $length;
+        return empty($val) || (MBSTRING ? mb_strlen($val) : strlen($val)) == $length;
     }
 
@@ -568 +568 @@
     public function _validation_valid_string($val, $flags = array('alpha', 'utf8'))
     {
+        if (empty($val))
+        {
+            return true;
+        }
+
         if ( ! is_array($flags))
         {
@@ -600 +605 @@
         }
 
-        $pattern  = '/^([';
-        $pattern .= ! in_array('uppercase', $flags) && in_array('alpha', $flags) ? 'a-z' : '';
+        $pattern = ! in_array('uppercase', $flags) && in_array('alpha', $flags) ? 'a-z' : '';
         $pattern .= ! in_array('lowercase', $flags) && in_array('alpha', $flags) ? 'A-Z' : '';
         $pattern .= in_array('numeric', $flags) ? '0-9' : '';
@@ -610 +614 @@
         $pattern .= in_array('punctuation', $flags) ? "\.,\!\?:;" : '';
         $pattern .= in_array('dashes', $flags) ? '_\-' : '';
-        $pattern .= '])+$/';
+        $pattern = empty($pattern) ? '/^(.*)$/' : ('/^(['.$pattern.'])+$/');
         $pattern .= in_array('utf8', $flags) ? 'u' : '';
 
@@ -625 +629 @@
     public function _validation_numeric_min($val, $min_val)
     {
-        return floatval($val) >= floatval($min_val);
+        return empty($val) || floatval($val) >= floatval($min_val);
     }
 
@@ -637 +641 @@
     public function _validation_numeric_max($val, $max_val)
     {
-        return floatval($val) <= floatval($max_val);
+        return empty($val) || floatval($val) <= floatval($max_val);
     }
 }

trunk/fuel/packages/activerecord/classes/model.php

@@ -410 +410 @@
             $this->associations[$assoc_name]->set_ids($value, $this);
         }
+        else
+        {
+            throw new \Exception("attribute called '$name' doesn't exist", Exception::AttributeNotFound);
+        }
     }
 
@@ -667 +671 @@
             foreach ($this->columns as $column)
             {
-                if ($column == $this->primary_key OR ! in_array($column, $this->columns))
+                if ($column == $this->primary_key)
                 {
                     continue;

trunk/fuel/packages/oil/classes/generate.php

@@ -76 +76 @@
         if (self::write($filepath, $controller))
         {
-            \Cli::write('Created controller: ' . $filepath);
+            \Cli::write("\t".'Created controller: ' . \Fuel::clean_path($filepath));
         }
     }
@@ -106 +106 @@
         if (self::write($filepath, $model))
         {
-            \Cli::write('Created model: ' . \Fuel::clean_path($filepath));
+            \Cli::write("\t".'Created model: ' . \Fuel::clean_path($filepath));
         }
 
@@ -151 +151 @@
             if (self::write($view_file, $view))
             {
-                \Cli::write("\tCreated view: " . $view_file);
+                \Cli::write("\t".'Created view: ' . \Fuel::clean_path($view_file));
             }
         }

trunk/fuel/packages/oil/classes/package.php

@@ -98 +98 @@
         }
 
-        \Cli::write('Uninstalling package "' . $package . '"', 'yellow');
+        \Cli::write('Package "' . $package . '" was uninstalled.', 'yellow');
 
         \File::delete_dir($package_folder);

trunk/fuel/packages/oil/views/scaffold/actions/create.php

@@ -1 +1 @@
         if ($_POST)
         {
-            $<?php echo $singular; ?> = <?php echo $model; ?>::factory($_POST);
+            $<?php echo $singular; ?> = <?php echo $model; ?>::factory(array(
+<?php foreach ($fields as $field): ?>
+                '<?php echo $field['name']; ?>' => Input::post('<?php echo $field['name']; ?>'),
+<?php endforeach; ?>
+            ));
 
             if ($<?php echo $singular; ?> and $<?php echo $singular; ?>->save())
             {
-                Session::set_flash('notice', 'Added ' . $<?php echo $singular; ?> . ' #' . $<?php echo $singular; ?>->id);
+                Session::set_flash('notice', 'Added ' . $<?php echo $singular; ?> . ' #' . $<?php echo $singular; ?>->id . '.');
 
                 Output::redirect('<?php echo $plural; ?>');
@@ -12 +16 @@
             else
             {
-                Session::set_flash('notice', 'Could not save ' . $<?php echo $singular; ?> . ' #' . $id);
+                Session::set_flash('notice', 'Could not save <?php echo $singular; ?>.');
             }
-
         }
 

trunk/fuel/packages/oil/views/scaffold/actions/edit.php

@@ -3 +3 @@
         if ($_POST)
         {
-            if ($<?php echo $singular; ?>->update($_POST))
+<?php foreach ($fields as $field): ?>
+            $<?php echo $singular; ?>-><?php echo $field['name']; ?> = Input::post('<?php echo $field['name']; ?>');
+<?php endforeach; ?>
+
+            if ($<?php echo $singular; ?>->save())
             {
                 Session::set_flash('notice', 'Updated ' . $<?php echo $singular; ?> . ' #' . $<?php echo $singular; ?>->id);