Changeset 20840

Timestamp:

10/06/08 17:36:44 (5 years ago)

Author:

sabel

Message:

update addon

Location:

events/phpframework/sabel/trunk

Files:

• addon/acl/config/Controller.php (modified) (1 diff)
• addon/form/Addon.php (modified) (1 diff)
• addon/form/Object.php (modified) (2 diffs)
• addon/form/Processor.php (deleted)
• app/index/controllers/Register.php (modified) (1 diff)
• app/index/controllers/User.php (modified) (1 diff)
• app/logics/Register.php (modified) (2 diffs)
• tests/unit/logics/Register.php (modified) (4 diffs)

events/phpframework/sabel/trunk/addon/acl/config/Controller.php

@@ -24 +24 @@
     if ($this->isPublic()) return true;
     
-    $spec   = array("(", ")", "&", "|");
-    $buf    = array();
-    $rule   = $this->isAllow;
-    $length = strlen($rule);
-    
-    $prev = "";
-    $next = "";
-    
-    for ($i = 0; $i < $length; $i++) {
-      $next = (isset($rule{$i + 1})) ? $rule{$i + 1} : "";
-      $cur  = $rule{$i};
-      
-      if ($i === 0) {
-        if ($cur === "(") {
-          $buf[] = "(";
-        } else {
-          $buf[] = '"' . $cur;
-        }
-      } elseif (in_array($prev, $spec) &&
-                !in_array($cur, $spec)) {
-        $buf[] = '"' . $cur;
-      } elseif (in_array($next, $spec) &&
-                !in_array($cur, $spec)) {
-        $buf[] = $rule{$i} . '"';
-      } else {
-        $buf[] = $rule{$i};
-      }
-      
-      $prev = $rule{$i};
-    }
-    
-    $rule = implode("", $buf);
-    $length = strlen($rule);
-    if ($rule{$length - 1} !== ")") {
-      $rule .= '"';
-    }
-    
+    $s = microtime();
+    $rule = preg_replace('/[a-z]+/', '"$0"', $this->isAllow);
     foreach ($roles as $role) {
       $rule = str_replace('"' . $role . '"', "true", $rule);
     }
     
-    $rule = preg_replace('/"[a-z]+"/', 'false', $rule);
-    $rule = str_replace(array("|", "&"), array("||", "&&"), $rule);
+    $rule = str_replace(
+      array( "|",  "&"),
+      array("||", "&&"),
+      preg_replace('/"[a-z]+"/', 'false', $rule)
+    );
+    
     eval ('$match = ' . $rule . ';');
     

events/phpframework/sabel/trunk/addon/form/Addon.php

@@ -16 +16 @@
   public function execute($bus)
   {
-    $bus->getProcessorList()
-        ->insertPrevious("action", "form", new Form_Processor("form"));
+    
   }
 }

events/phpframework/sabel/trunk/addon/form/Object.php

@@ -299 +299 @@
   }
   
+  public function apply(array $values, array $allowCols = array())
+  {
+    if (empty($values)) return $this;
+    
+    if (empty($allowCols)) {
+      $allowCols = $this->getAllowColumns();
+    }
+    
+    $model = $this->model;
+    $mdlName = $model->getName();
+    
+    foreach ($values as $key => $value) {
+      if (strpos($key, self::NAME_SEPARATOR) === false) continue;
+      list ($name, $colName) = explode(self::NAME_SEPARATOR, $key);
+      if ($name !== $mdlName) continue;
+      
+      if ($colName === "sbl_datetime" || $colName === "sbl_date") {
+        list ($k, ) = each($value);
+        if (!in_array($k, $allowCols, true)) continue;
+      } elseif (!in_array($colName, $allowCols, true)) {
+        continue;
+      }
+      
+      if ($colName === "sbl_datetime") {
+        foreach ($value as $key => $date) {
+          if (!isset($date["second"])) $date["second"] = "00";
+          if ($this->isDatetimeValuesCompleted($date)) {
+            $model->__set($key, $date["year"]   . "-" .
+                                $date["month"]  . "-" .
+                                $date["day"]    . " " .
+                                $date["hour"]   . ":" .
+                                $date["minute"] . ":" .
+                                $date["second"]);
+          } else {
+            $model->__set($key, null);
+          }
+        }
+      } elseif ($colName === "sbl_date") {
+        foreach ($value as $key => $date) {
+          if ($this->isDatetimeValuesCompleted($date, false)) {
+            $model->__set($key, "{$date["year"]}-{$date["month"]}-{$date["day"]}");
+          } else {
+            $model->__set($key, null);
+          }
+        }
+      } else {
+        $model->__set($colName, $value);
+      }
+    }
+    
+    return $this;
+  }
+  
+  protected function isDatetimeValuesCompleted($values, $isDatetime = true)
+  {
+    $keys = array("year", "month", "day");
+    
+    if ($isDatetime) {
+      $keys = array_merge($keys, array("hour", "minute", "second"));
+    }
+    
+    foreach ($keys as $key) {
+      if (!isset($values[$key]) || $values[$key] === "") return false;
+    }
+    
+    return true;
+  }
+  
   protected function createInputName($name)
   {
@@ -304 +372 @@
   }
   
-  private function getHtmlWriter($name, $inputName, $id = null, $class = null)
+  protected function getHtmlWriter($name, $inputName, $id = null, $class = null)
   {
     if ($name !== "" && !in_array($name, $this->allowCols, true)) {

events/phpframework/sabel/trunk/app/index/controllers/Register.php

@@ -24 +24 @@
   {
     $this->userForm = new Form_Object("User");
-    $this->form->applyPostValues($this->userForm, array("user_name", "password", "email"));
+    $this->userForm->apply(
+      $this->request->fetchPostValues(), array("user_name", "password", "email")
+    );
     
     $result = $this->register->preregister($this->userForm->getModel());

events/phpframework/sabel/trunk/app/index/controllers/User.php

@@ -58 +58 @@
     if (!$this->request->isPost()) return;
     
-    $this->form->applyPostValues($this->settingsForm, array("user_name", "email", "private_flag"));
+    $this->settingsForm->apply(
+      $this->request->fetchPostValues(), array("user_name", "email", "private_flag")
+    );
+    
     $result = $this->getLogic("user")->updateSettings($this->settingsForm->getModel());
     

events/phpframework/sabel/trunk/app/logics/Register.php

@@ -21 +21 @@
     $result = new Logics_Result();
     $aUser->created_at = $aUser->updated_at = now();
-    $aUser->password = md5($aUser->password);
     
     if ($errors = $this->validateModel($aUser)) {
@@ -28 +27 @@
     
     $actKey = md5hash();
+    $aUser->password = md5($aUser->password);
+    
     if (ENVIRONMENT === DEVELOPMENT) {
       $aUser->save();

events/phpframework/sabel/trunk/tests/unit/logics/Register.php

@@ -17 +17 @@
     $result = $register->preregister($aUser);
     $this->isTrue($result->isFailure());
-    $this->eq(2, count($result->getErrors()));
+    $this->eq(3, count($result->getErrors()));
     /*  ---------------------- */
     
@@ -23 +23 @@
     $aUser = new User();
     $aUser->user_name = "test1";
+    $aUser->password = "test";
     $aUser->email = "abc@example.com";
     $result = $register->preregister($aUser);
@@ -31 +32 @@
     $aUser = new User();
     $aUser->user_name = "user";
+    $aUser->password = "user";
     $aUser->email = "user@example.com";
     $result = $register->preregister($aUser);
@@ -53 +55 @@
     $aUser = new User();
     $aUser->user_name = "sabel";
+    $aUser->password = "sabel";
     $aUser->email = "sabel@example.com";
     $register->preregister($aUser);