WordPress.org
Get WordPress

Plugin Directory

Changeset 2180668


Ignore:
Timestamp:
10/26/2019 03:00:21 PM (6 years ago)
Author:
magent
Message:

Updated for PHP7 for complaint that objects aren't countable, Text improvement for basic info page to make it more obvious that wordpress login is character-specific, used <a> tags for email links.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • vampire-character/trunk/inc/chargen.php

    r2056057 r2180668  
    330330   
    331331    $output = "";
    332     //print_r($_POST);
    333332   
    334333    $laststep = isset($_POST['step']) ? $_POST['step'] : '';
    … …  
    342341   
    343342    $thisstep = array_shift($chargenstep);
    344     // $progress    = isset($_POST['progress']) ? $_POST['progress'] : array('0' => 1);
    345     // $emailconfirm = isset($_GET['confirm']);
    346        
    347     // if ($vtmglobal['characterID'] == -1) {
    348         // $output .= "<div class='vtm_error'><p>Invalid Reference</p>";
    349         // if (isset($_POST['chargen_reference']) && $_POST['chargen_reference'] != '') {
    350             // $split = explode("/",$_POST['chargen_reference']);
    351             // if ($split[3] != '0000') {
    352                 // $output .= "<p>Check that you are logged
    353                 // in under the same account that you originally created the character under.</p>";
    354             // }
    355         // }
    356         // $output .= "</div>\n";
    357         // $step = 0;
    358         // $chargenstatus = '';
    359     // } else {
    360         // $step = vtm_get_step();
    361         // $sql = $wpdb->prepare("SELECT cgs.NAME FROM " . VTM_TABLE_PREFIX . "CHARACTER c, " . VTM_TABLE_PREFIX . "CHARGEN_STATUS cgs WHERE c.ID = %s AND c.CHARGEN_STATUS_ID = cgs.ID",$vtmglobal['characterID']);
    362         // //echo "<p>SQL: $sql</p>\n";
    363         // $chargenstatus = $wpdb->get_var($sql);
    364        
    365         // if ($emailconfirm) {
    366             // $split = explode("/",$_GET['reference']);
    367             // $chid = $split[0] * 1;
    368             // $result = $wpdb->update(VTM_TABLE_PREFIX . "CHARACTER_GENERATION",
    369                     // array('EMAIL_CONFIRMED' => 'Y'),
    370                     // array('CHARACTER_ID' => $chid)
    371                 // );
    372        
    373             // if ($result)
    374                 // echo "<p style='color:green'>Email address confirmed</p>\n";
    375             // else if ($result !== 0) {
    376                 // $wpdb->print_error();
    377                 // echo "<p style='color:red'>Could not confirm email address</p>\n";
    378             // }
    379         // }
    380     // }
    381    
    382     // if ($step > 0 && isset($chargenstatus)) {
    383         // $output .= "<p><strong>Character Generation Status:</strong> $chargenstatus, <strong>Character Reference:</strong> " . vtm_get_chargen_reference() . "</p>\n";
    384     // }
    385343   
    386344    $output .= "<form id='chargen_form' method='post' autocomplete='off'>\n";
    387345   
    388346    // validate & save data from last step
    389     // if ($chargenstatus == "Submitted") {
    390         // $progress[$laststep] = 1;
    391     // } else {
    392347    $dataok = vtm_validate_chargen($laststep);
    393         if ($dataok) {
    394             $vtmglobal['characterID'] = vtm_save_progress($laststep);
    395             //$progress[$laststep] = 1;
    396        
    397         }
    398         else {
    399             $thisstep = $laststep;
    400             //$progress[$laststep] = 0;
    401         }
    402        
    403         if (!isset($vtmglobal['flow'][$thisstep]['function'])) {
    404             $thisstep = 'basic_info';
    405         }
    406         // setup progress
    407         //for ($i = 0 ; $i <= 10 ; $i++) {
    408         //  $val = isset($progress[$i]) ? $progress[$i] : 0;
    409         //  $output .= "<input type='hidden' name='progress[$i]' value='$val' />\n";
    410         //}
    411     // }
     348    if ($dataok) {
     349        $vtmglobal['characterID'] = vtm_save_progress($laststep);
     350   
     351    }
     352    else {
     353        $thisstep = $laststep;
     354    }
     355   
     356    if (!isset($vtmglobal['flow'][$thisstep]['function'])) {
     357        $thisstep = 'basic_info';
     358    }
    412359   
    413360    // output flow buttons
    … …  
    729676    }   
    730677    $output .= "<tr>
    731             <td class='vtmcol_key'>Login name*:</td>
     678            <td class='vtmcol_key'>Character Login name*:</td>
    732679            <td>\n";
    733680    if ($submitted)
    … …  
    21552102    $output .= "<table>";
    21562103    foreach ($result as $template) {
    2157         $output .= "<tr><td><input type='radio' id='seltempl{{$template->ID}}' name='chargen_template' value='{$template->ID}' /></td>";
     2104        $output .= "<tr><td><input type='radio' id='seltempl{{$template->ID}}' name='chargen_template' value='{$template->ID}' ";
     2105       
     2106        if (sizeof($result) == 1 || $template->ID == $result[0]->ID) {
     2107            $output .= 'checked="checked"';
     2108        }
     2109       
     2110        $output .= "/></td>";
    21582111        $output .= "<td><label for='seltempl{{$template->ID}}'>" . vtm_formatOutput($template->NAME) . "</label></td>";
    21592112        $output .= "<td>" . vtm_formatOutput($template->DESCRIPTION) . "</td></tr>";
    … …  
    35223475        $rating = $wpdb->get_var($wpdb->prepare("SELECT ROAD_OR_PATH_RATING FROM " . VTM_TABLE_PREFIX . "CHARACTER WHERE ID = %s", $vtmglobal['characterID']));
    35233476        $currentclanid = $wpdb->get_var($wpdb->prepare("SELECT PRIVATE_CLAN_ID FROM " . VTM_TABLE_PREFIX . "CHARACTER WHERE ID = %s", $vtmglobal['characterID']));
    3524         $discspends = count($wpdb->get_var($wpdb->prepare("SELECT ID
     3477        $discspends = vtm_count($wpdb->get_var($wpdb->prepare("SELECT ID
    35253478                        FROM " . VTM_TABLE_PREFIX . "PENDING_FREEBIE_SPEND
    35263479                        WHERE CHARACTER_ID = %s AND (ITEMTABLE='DISCIPLINE' OR ITEMTABLE = 'PATH')", $vtmglobal['characterID'])));
    3527         $discspends += count($wpdb->get_var($wpdb->prepare("SELECT ID
     3480        $discspends += vtm_count($wpdb->get_var($wpdb->prepare("SELECT ID
    35283481                        FROM " . VTM_TABLE_PREFIX . "PENDING_XP_SPEND
    35293482                        WHERE CHARACTER_ID = %s AND (ITEMTABLE='DISCIPLINE' OR ITEMTABLE = 'PATH')", $vtmglobal['characterID'])));
    3530         $discspends += count($wpdb->get_var($wpdb->prepare("SELECT ID
     3483        $discspends += vtm_count($wpdb->get_var($wpdb->prepare("SELECT ID
    35313484                        FROM " . VTM_TABLE_PREFIX . "CHARACTER_DISCIPLINE
    35323485                        WHERE CHARACTER_ID = %s", $vtmglobal['characterID'])));
    3533         $discspends += count($wpdb->get_var($wpdb->prepare("SELECT ID
     3486        $discspends += vtm_count($wpdb->get_var($wpdb->prepare("SELECT ID
    35343487                        FROM " . VTM_TABLE_PREFIX . "CHARACTER_PATH
    35353488                        WHERE CHARACTER_ID = %s", $vtmglobal['characterID'])));
    … …  
    43554308    // return character ID
    43564309
     4310    // Returning to character generation via a reference?
    43574311    if (isset($_POST['chargen_reference']) && $_POST['chargen_reference'] != '') {
    43584312        $charref = $_POST['chargen_reference'];
    … …  
    43674321            $sql = "SELECT PLAYER_ID FROM " . VTM_TABLE_PREFIX . "CHARACTER WHERE ID = %s";
    43684322            $result = $wpdb->get_row($wpdb->prepare($sql, $id));
    4369             if (count($result) == 0 || $result->PLAYER_ID != $pid)
     4323            if (!$result || $result->PLAYER_ID != $pid)
    43704324                $id = -1;
    43714325       
    … …  
    44094363        }
    44104364    }
     4365    // Character generation in progress?
    44114366    elseif (isset($_POST['characterID']) && $_POST['characterID'] > 0) {
    44124367        $id = $_POST['characterID'];
    44134368    }
     4369    // Is logged in user a Storyteller, getting to the page via a URL link?
    44144370    elseif (isset($_GET['characterID']) && $_GET['characterID'] > 0 && vtm_isST()) {
    44154371        $id = $_GET['characterID'];
    4416     }
     4372    }
     4373    // Logged in with an account that already has a character?
    44174374    elseif (isset($vtmglobal['characterID']) && $vtmglobal['characterID'] > 0) {
    4418         $id = $vtmglobal['characterID'];
    4419     }
     4375        //$id = $vtmglobal['characterID'];
     4376        $id = 0;
     4377    }
     4378    // New character to be generated
    44204379    else {
    44214380        $id = 0;
    … …  
    53995358    " . stripslashes($concept) . "</p>
    54005359   
    5401     <p>Click this link to confirm your email address and to return to character generation: $url</p>";
     5360    <p>Click this link to confirm your email address and to return to character generation: <a href='$url'>$url</a></p>";
    54025361   
    54035362    //echo "<pre>$userbody</pre>\n";
    … …  
    62406199   
    62416200    $currentclanid = $wpdb->get_var($wpdb->prepare("SELECT PRIVATE_CLAN_ID FROM " . VTM_TABLE_PREFIX . "CHARACTER WHERE ID = %s", $vtmglobal['characterID']));
    6242     $discspends = count($wpdb->get_var($wpdb->prepare("SELECT ID
     6201    $discspends = vtm_count($wpdb->get_var($wpdb->prepare("SELECT ID
    62436202                        FROM " . VTM_TABLE_PREFIX . "PENDING_FREEBIE_SPEND
    62446203                        WHERE CHARACTER_ID = %s AND (ITEMTABLE='DISCIPLINE' OR ITEMTABLE = 'PATH')", $vtmglobal['characterID'])));
    6245     $discspends += count($wpdb->get_var($wpdb->prepare("SELECT ID
     6204    $discspends += vtm_count($wpdb->get_var($wpdb->prepare("SELECT ID
    62466205                        FROM " . VTM_TABLE_PREFIX . "PENDING_XP_SPEND
    62476206                        WHERE CHARACTER_ID = %s AND (ITEMTABLE='DISCIPLINE' OR ITEMTABLE = 'PATH')", $vtmglobal['characterID'])));
    6248     $discspends += count($wpdb->get_var($wpdb->prepare("SELECT ID
     6207    $discspends += vtm_count($wpdb->get_var($wpdb->prepare("SELECT ID
    62496208                        FROM " . VTM_TABLE_PREFIX . "CHARACTER_DISCIPLINE
    62506209                        WHERE CHARACTER_ID = %s", $vtmglobal['characterID'])));
    6251     $discspends += count($wpdb->get_var($wpdb->prepare("SELECT ID
     6210    $discspends += vtm_count($wpdb->get_var($wpdb->prepare("SELECT ID
    62526211                        FROM " . VTM_TABLE_PREFIX . "CHARACTER_PATH
    62536212                        WHERE CHARACTER_ID = %s", $vtmglobal['characterID'])));
Note: See TracChangeset for help on using the changeset viewer.