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

        * what to use for html input fields
        * These are passed to sprintf, with label, fieldname, title, placeholder and current value, in that order
        */
       'screens'         => array (
          'login form' => "<h1>Login</h1>\n<form class='login_form' action='%s' method='post'>\n%s\n<input type='submit' value='Login'></form>\n",
-         'edit form'  => "<form class='login_form' action='%s' method='post'>\n%s\n<input type='submit' id='btnUpdate' name='btnUpdate' value='Update'>\n</form>",
+         'edit form'  => "<form class='login_form' action='%s' method='post'>\n%s\n<input type='submit' name='btnUpdate' value='Update'>\n</form>",
          'loginScreen' => "<div class='login_field'>\n<input class='login_field' type='text' name='username' placeholder='Username' required autofocus>\n</div>\n<div class='login_field'>\n<input class='login_field' type='password' name='password' placeholder='Password' required>\n</div>",
          'adminScreen' => "<input type='hidden' name='doAdmin' value='1'>\n",
          'validateScript' => '',
          ),
       'html input fields' => array(
+    *
     */
    protected function validate( $username, $password, $connection ) {
       $result = $connection->getPassword( $username );
       if ( password_verify( $password, $result['pass'] ) ) {
-         $result = $connection->getRecord( $username );
+         $result = $connection->getARecord( array( 'login' => $username ) );
          $this->data['id'] = $result['id'];
          foreach ( $this->configuration['tables']['users']['fields'] as $key => $record ) {
             if ( $key != 'pass' )
                $this->data[$key] = $result[$key];
+         }
     * @return string HTML containing all of the INPUT records a user can edit
     */
    public function editScreen( $connection ) {
       $return = array();
       $return[] = $this->configuration['screens']['adminScreen'];
-      $return[] = "<input type='hidden' name='id' value=" . $this->workingOn['id'] . "'>\n";
+      $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
          // also skip if it is our record
          if ( isset( $record['restrict'] ) && ( $this->data['id'] == $this->workingOn['id'] ) )
             continue;
          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 ) ) ) {
+      if ( ! isset($id) || $id == $this->data['id'] ) { // we're working on ourself
          $this->workingOn = $this->data;
+      } elseif ( $id == -1 ) { // a new user
+         $this->workingOn = $this->emptyWorkingOn();
+      } else { // this is an existing user
+         $this->workingOn = $connection->getARecord( array( 'id' => $id ) );
+      }
+   } // initWorkingOn
-   }
    /**
     * 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
     * @param string $nextPage The URL of the page to be used in the link
+    *
     * @return string This may be an HTML table or a single screen
     */
    public function admin ( $connection, $nextScript = null ) {
+      /*
+       * Entering for first time,
+       *    admin=1, $workingOn not set
+       *    update workingOn
+       *    display screen
+       * entering after selecting a user
+       *    doAdmin=1, id=#, $workingOn[id] <> id
+       *    update workingOn
+       *    display screen
+       * Have pressed update button
+       *    update
+       */
       $nextScript = $this->getNextScript( $nextScript );
-      // set workingOn if not set
+      $id = isset($_REQUEST['id']) ? $_REQUEST['id'] : null;
-      if ( ! $this->workingOn || isset($_REQUEST['id']) )
+      if ( ! $this->workingOn || $this->workingOn['id'] !== $id ) {
-         $this->initWorkingOn( $connection, isset($_REQUEST['id']) ? $_REQUEST['id'] : null );
+         $this->initWorkingOn( $connection, $id );
-      // 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( $connection );
          if ( $this->data['admin'] ) {
             $return .= $this->allUsersHTML( $connection );
+         }
          return sprintf( $this->configuration['screens']['edit form'],
             $nextScript,
             $return
             );
-      } else { // we are processing
+      } elseif ( $_SERVER['REQUEST_METHOD'] === 'POST' ) { // they submitted the form
          $return = $this->addEdit( $connection );
+         /*
+          * if ( $this->workingOn['id'] == $this->data['id'] ) // we just updated us, reload record
+            $this->data = $connection->getARecord( array( 'id' => $this->data['id'] ) );
+         */
          unset( $this->workingOn );
          return $return;
-      } // else
+      }
    } // admin
 } // class Users
 ?>

Subversion Repositories php_users

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