WebSVN – php_users – Diff – /trunk/Users.class.php

    /** @var string[] $errors Contains errors that can occur */
    protected $errors = array();
    /** @var string[] $workingOn During administration, contains the record being modified */
    protected $workingOn = array();
+   public function data() {
+      return $this->data;
+   }
    /**
     * constructor for an instance of the class
+    *
     * Anything in $customFields will be recursively merged with $configuration, overwriting
     * as necessary.
          $this->data['id'] = $result['id'];
          foreach ( $this->configuration['tables']['users']['fields'] as $key => $record ) {
             if ( $key != 'pass' )
                $this->data[$key] = $result[$key];
+         }
+         return true;
       } else {
          $this->errors[] = 'Login Failed: Unknown username or password';
          foreach ( $this->configuration['tables']['users']['fields'] as $key => $record ) {
             $this->data[$key] = null;
+         }
+         return false;
+      }
    } // validate
    /**
     * Get all users from data source and put them in an HTML list
+    *
     * NOTE: this will not create the form; the form is created someplace else
+    *
     * @return string HTML containing all of the INPUT records a user can edit
     */
-   public function editScreen() {
+   public function editScreen( $connection ) {
       $return = array();
       $return[] = $this->configuration['screens']['adminScreen'];
       $return[] = "<input type='hidden' name='id' value=" . $this->workingOn['id'] . "'>\n";
       foreach ( $this->configuration['tables']['users']['fields'] as $field => $record ) {
          // if this field is restricted and we are not admin, just skip it
          } // else
       } // foreach
       return $new;
+   }
+   protected function addEdit( $connection ) {
+      $data = array();
+      foreach ( $this->configuration['tables']['users']['fields'] as $field => $record ) {
+         // if this field is restricted it is our record, skip it
+         if ( isset( $record['restrict'] ) && ( $this->data['id'] == $this->workingOn['id'] ) )
+            continue;
+         $htmlFieldName = $this->configuration['input prefix'] . $field;
+         $temp = '';
+         switch ( $record['html type'] ) {
+            case 'password':
+               if ( ! empty( $_REQUEST[$htmlFieldName] ) ) {
+                  $data[$field] = password_hash( $_REQUEST[$htmlFieldName], PASSWORD_DEFAULT );
+                  if ( isset( $this->configuration['tables']['users']['fields']['last password change'] ) ) {
+                     $data['last password change'] = date("YmdHis");
+                  }
+               }
+               break;
+            case 'boolean' :
+               if ( $this->workingOn['id'] == -1 || ( isset( $_REQUEST[$htmlFieldName] ) != $this->workingOn[$field] ) ) {
+                  $data[$field] = isset( $_REQUEST[$htmlFieldName] ) ? 1 : 0;
+               }
+               break;
+            default : // text, textarea, other things like this
+               if ( $this->workingOn['id'] == -1 || ( isset( $_REQUEST[$htmlFieldName] ) && $_REQUEST[$htmlFieldName] !== $this->workingOn[$field] ) ) {
+                  $data[$field] = $_REQUEST[$htmlFieldName];
+                  if ( isset( $record['filter'] ) && preg_match( $record['filter'], $data[$field] ) !== 1 ) {
+                     $this->errors[] = sprintf( "Invalid characters in %s, %s", $record['label'], $record['instructions'] );
+                     unset( $data[$field] );
+                  }
+               }
+               break;
+         } // switch
+      } // foreach
+      if ( count($this->errors) ) { // we have some errors
+         $this->errors[] = 'Record not updated';
+         return 'Error';
+      }
+      if ( $data ) {
+         $data['id'] = $this->workingOn['id'];
+         $return = $connection->update( $data ) ? "Updated" : "Failed";
+         if ( $this->workingOn['id'] == $this->data['id'] ) // we just updated us, reload record
+            $this->data = $connection->getARecord( array( 'id' => $this->data['id'] ) );
+      } else {
+         $return = "No changes";
+      }
+   }
+   protected function initWorkingOn( $connection, $id ) {
+      if ( ! isset($id) ) {
+         // we're working on ourself
+         $this->workingOn = $this->data;
+      } elseif ( isset($id ) && $this->workingOn['id'] != $id ) {
+         // we're working on a different user
+         if ( $id == -1 ) { // we are adding a new user
+            $this->workingOn = $this->emptyWorkingOn();
+         } else { // this is an existing user
+            $this->workingOn = $connection->getARecord( array( 'id' => $id ) );
+         }
+      }
+      // default to working on ourself
+      if ( ! ( isset( $this->workingOn ) && count( $this->workingOn ) ) ) {
+         $this->workingOn = $this->data;
+      }
+   }
    /**
     * Sets up the admin function which allows users to edit themselves and, optionally, others
+    *
     * This should be called the first time, then repeatedly called until it is done
     * (it returns the string "Updated", "Failed" or "No changes".
+    *
     * @return string This may be an HTML table or a single screen
     */
    public function admin ( $connection, $nextScript = null ) {
       $nextScript = $this->getNextScript( $nextScript );
-      if ( ! isset($_REQUEST['id']) ) {
-         // we're working on ourself
+      // set workingOn if not set
-         $this->workingOn = $this->data;
-      } elseif ( isset($_REQUEST['id'] ) && $this->workingOn['id'] != $_REQUEST['id'] ) {
-         // we're working on a different user
-         if ( $_REQUEST['id'] == -1 ) { // we are adding a new user
-            $this->workingOn = $this->emptyWorkingOn();
+      if ( ! $this->workingOn || isset($_REQUEST['id']) )
-         } else { // this is an existing user
-            $this->workingOn = $connection->getARecord( array( 'id' => $_REQUEST['id'] ) );
+         $this->initWorkingOn( $connection, isset($_REQUEST['id']) ? $_REQUEST['id'] : null );
-         }
-      }
-      // default to working on ourself
-      if ( ! ( isset( $this->workingOn ) && count( $this->workingOn ) ) ) {
-         $this->workingOn = $this->data;
-      }
       // we have no data, so we should create a form for them to enter something
       if ( ! isset( $_REQUEST[$this->configuration['input prefix'] . $this->configuration['tables']['users']['form test']] ) ) {
          // create the screen
-         $return = $this->editScreen();
+         $return = $this->editScreen( $connection );
          if ( $this->data['admin'] ) {
             $return .= $this->allUsersHTML( $connection );
+         }
          return sprintf( $this->configuration['screens']['edit form'],
             $nextScript,
             $return
             );
       } else { // we are processing
-         $data = array();
-         foreach ( $this->configuration['tables']['users']['fields'] as $field => $record ) {
-            // if this field is restricted it is our record, skip it
-            if ( isset( $record['restrict'] ) && ( $this->data['id'] == $this->workingOn['id'] ) )
-               continue;
-            $htmlFieldName = $this->configuration['input prefix'] . $field;
-            $temp = '';
-            switch ( $record['html type'] ) {
-               case 'password':
-                  if ( ! empty( $_REQUEST[$htmlFieldName] ) ) {
-                     $data[$field] = password_hash( $_REQUEST[$htmlFieldName], PASSWORD_DEFAULT );
-                     if ( isset( $this->configuration['tables']['users']['fields']['last password change'] ) ) {
-                        $data['last password change'] = date("YmdHis");
-                     }
-                  }
-                  break;
-               case 'boolean' :
-                  if ( $this->workingOn['id'] == -1 || ( isset( $_REQUEST[$htmlFieldName] ) != $this->workingOn[$field] ) ) {
-                     $data[$field] = isset( $_REQUEST[$htmlFieldName] ) ? 1 : 0;
-                  }
-                  break;
-               default : // text, textarea, other things like this
-                  if ( $this->workingOn['id'] == -1 || ( isset( $_REQUEST[$htmlFieldName] ) && $_REQUEST[$htmlFieldName] !== $this->workingOn[$field] ) ) {
-                     $data[$field] = $_REQUEST[$htmlFieldName];
-                     if ( isset( $record['filter'] ) && preg_match( $record['filter'], $data[$field] ) !== 1 ) {
-                        $this->errors[] = sprintf( "Invalid characters in %s, %s", $record['label'], $record['instructions'] );
-                        unset( $data[$field] );
-                     }
-                  }
-                  break;
-            } // switch
-         } // foreach
-         if ( count($this->errors) ) { // we have some errors
-            $this->errors[] = 'Record not updated';
-            return 'Error';
-         }
-         if ( $data ) {
-            $data['id'] = $this->workingOn['id'];
+         $return = $this->addEdit( $connection );
-            $return = $connection->update( $data ) ? "Updated" : "Failed";
-            if ( $this->workingOn['id'] == $this->data['id'] ) // we just updated us, reload record
-               $this->data = $connection->getARecord( array( 'id' => $this->data['id'] ) );
-         } else {
-            $return = "No changes";
-         }
          unset( $this->workingOn );
          return $return;
       } // else
    } // admin

Subversion Repositories php_users

(root)/trunk/Users.class.php – Rev 16 → 17