Changeset 2765402
- Timestamp:
- 08/02/2022 09:17:02 PM (4 years ago)
- Location:
- vampire-character/trunk
- Files:
-
- 14 edited
-
css/style-plugin.css (modified) (5 diffs)
-
inc/android.php (modified) (2 diffs)
-
inc/chargen.php (modified) (4 diffs)
-
inc/classes.php (modified) (4 diffs)
-
inc/email.php (modified) (1 diff)
-
inc/install.php (modified) (3 diffs)
-
inc/printable.php (modified) (8 diffs)
-
inc/profile.php (modified) (3 diffs)
-
inc/shortcodes.php (modified) (5 diffs)
-
inc/viewcharacter.php (modified) (25 diffs)
-
inc/xpfunctions.php (modified) (13 diffs)
-
lib/fpdf.php (modified) (2 diffs)
-
readme.txt (modified) (2 diffs)
-
vampire-character.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
vampire-character/trunk/css/style-plugin.css
r2392602 r2765402 137 137 /* =Character Sheet 138 138 -------------------------------------------------------------- */ 139 139 140 #csheet td { 140 141 padding:1px; … … 147 148 #csheet h4 {text-align:center;} 148 149 149 #csheet td.vtmdotwide.vtmdot_10 {150 text-align:left;151 }152 153 #csheet td.vtm_colfull {width:auto;}154 #csheet td.vtm_colwide {width:66%;}155 #csheet td.vtm_colnarrow {width:33%;}156 150 157 151 #csheet td.vtmcol_key { … … 169 163 text-align:center; 170 164 width:40%; 171 } 172 173 #csheet td.vtmdot_10.vtmdotwide { 174 text-align:left; 175 } 176 177 178 /* 165 } 179 166 div#csheet { 180 167 float: left; … … 182 169 display: block; 183 170 } 171 172 #csheet div.vtmsection table { 173 border: none; 174 } 175 176 @media (min-width:480px) { 177 178 #csheet div.vtmsubsection { 179 width:49.5%; 180 display: inline-block; 181 vertical-align: top; 182 } 183 #csheet div.vtmsubsection_wide { 184 width:100%; 185 display: inline-block; 186 vertical-align: top; 187 } 188 } 189 @media (min-width:800px) { 190 191 #csheet div.vtmsubsection { 192 width:32.5%; 193 display: inline-block; 194 vertical-align: top; 195 } 196 #csheet div.vtmsubsection_wide { 197 width:65.5%; 198 display: inline-block; 199 vertical-align: top; 200 } 201 } 202 203 /* OLD */ 204 /* 205 206 #csheet td.vtm_colfull {width:auto;} 207 #csheet td.vtm_colwide {width:66%;} 208 #csheet td.vtm_colnarrow {width:33%;} 209 210 #csheet td.vtmdotwide.vtmdot_10 { 211 text-align:left; 212 }#csheet td.vtmdot_10.vtmdotwide { 213 text-align:left; 214 } 215 */ 216 217 /* 218 184 219 185 220 */ … … 305 340 outline: 0; 306 341 } 307 #vtmid_xpst .vtm_colfull {width:auto;}342 /*#vtmid_xpst .vtm_colfull {width:auto;} 308 343 #vtmid_xpst .vtm_colwide {width:50%;} 309 #vtmid_xpst .vtm_colnarrow {width:33%;} 344 #vtmid_xpst .vtm_colnarrow {width:33%;}*/ 345 346 #vtmid_xpst div.vtmsubsection table { 347 border: none; 348 } 349 350 @media (min-width:480px) { 351 352 #vtmid_xpst div.vtmsubsection { 353 width:49.5%; 354 display: inline-block; 355 vertical-align: top; 356 } 357 #vtmid_xpst div.vtmsubsection_wide { 358 width:100%; 359 display: inline-block; 360 vertical-align: top; 361 } 362 } 363 @media (min-width:800px) { 364 365 #vtmid_xpst div.vtmsubsection { 366 width:32.5%; 367 display: inline-block; 368 vertical-align: top; 369 } 370 #vtmid_xpst div.vtmsubsection_wide { 371 width:65.5%; 372 display: inline-block; 373 vertical-align: top; 374 } 375 } 310 376 311 377 #vtmid_xpst td.vtmdot_10 {width:50%;} -
vampire-character/trunk/inc/android.php
r2392602 r2765402 1 1 <?php 2 2 /* --------------------------------------------------------------- 3 <CHARACTER>4 <NAME>Character Name</NAME>5 <PLAYER>Player Name</PLAYER>6 <GENERATION>Generation</GENERATION>7 3 8 </CHARACTER>9 4 ------------------------------------------------------------------ */ 10 5 … … 17 12 18 13 if( $_SERVER['REQUEST_URI'] == vtm_get_config('ANDROID_LINK') && is_user_logged_in() ) { 19 $character = vtm_establishCharacter( 'Ugly Duckling');14 $character = vtm_establishCharacter(); 20 15 $characterID = vtm_establishCharacterID($character); 21 16 $mycharacter = new vtmclass_character(); 22 17 $mycharacter->load($characterID); 23 18 24 header("Content-type: text/xml"); 25 echo "<?xml version='1.0' encoding='ISO-8859-1'?>\n"; 26 27 echo "<CHARACTER>\n"; 28 29 /* Character Info */ 30 echo vtm_output_xlmtag("NAME", $mycharacter->name); 31 echo vtm_output_xlmtag("PLAYER", $mycharacter->player); 32 echo vtm_output_xlmtag("GENERATION", $mycharacter->generation); 33 echo vtm_output_xlmtag("PUBLIC_CLAN", $mycharacter->clan); 34 echo vtm_output_xlmtag("PRIVATE_CLAN", $mycharacter->private_clan); 35 echo vtm_output_xlmtag("CURRENT_XP", $mycharacter->current_experience); 36 echo vtm_output_xlmtag("PENDING_XP", $mycharacter->pending_experience); 37 echo vtm_output_xlmtag("CURRENT_WP", $mycharacter->current_willpower); 38 echo vtm_output_xlmtag("WILLPOWER", $mycharacter->willpower); 39 echo vtm_output_xlmtag("BLOODPOOL", $mycharacter->bloodpool); 40 echo vtm_output_xlmtag("BLOOD_PER_ROUND", $mycharacter->blood_per_round); 41 echo vtm_output_xlmtag("PATH_OF_ENLIGHTENMENT", $mycharacter->path_of_enlightenment); 42 echo vtm_output_xlmtag("PATH_LEVEL", $mycharacter->path_rating); 43 echo vtm_output_xlmtag("DOB", $mycharacter->date_of_birth); 44 echo vtm_output_xlmtag("DOE", $mycharacter->date_of_embrace); 45 echo vtm_output_xlmtag("SIRE", $mycharacter->sire); 46 echo vtm_output_xlmtag("CONCEPT", $mycharacter->concept); 47 echo vtm_output_xlmtag("CLAN_FLAW", $mycharacter->clan_flaw); 48 49 if (vtm_get_config('USE_NATURE_DEMEANOUR') == 'Y') { 50 echo vtm_output_xlmtag("NATURE", $mycharacter->nature); 51 echo vtm_output_xlmtag("DEMEANOUR", $mycharacter->demeanour); 52 } 53 54 /* Attributes */ 55 echo "\t<ATTRIBUTES>\n"; 56 echo "\t\t<PHYSICAL>\n"; 57 foreach ($mycharacter->getAttributes("Physical") as $attribute) { 58 echo "\t\t\t<ATTRIBUTE>\n"; 59 echo vtm_output_xlmtag("NAME", $attribute->name); 60 echo vtm_output_xlmtag("LEVEL", $attribute->level); 61 echo vtm_output_xlmtag("PENDINGXP", $attribute->pending); 62 echo vtm_output_xlmtag("ORDER", $attribute->ordering); 63 echo vtm_output_xlmtag("SPECIALITY", $attribute->specialty); 64 echo "\t\t\t</ATTRIBUTE>\n"; 65 } 66 echo "\t\t</PHYSICAL>\n"; 67 echo "\t\t<SOCIAL>\n"; 68 foreach ($mycharacter->getAttributes("Social") as $attribute) { 69 echo "\t\t\t<ATTRIBUTE>\n"; 70 echo vtm_output_xlmtag("NAME", $attribute->name); 71 echo vtm_output_xlmtag("LEVEL", $attribute->level); 72 echo vtm_output_xlmtag("PENDINGXP", $attribute->pending); 73 echo vtm_output_xlmtag("ORDER", $attribute->ordering); 74 echo vtm_output_xlmtag("SPECIALITY", $attribute->specialty); 75 echo "\t\t\t</ATTRIBUTE>\n"; 76 } 77 echo "\t\t</SOCIAL>\n"; 78 echo "\t\t<MENTAL>\n"; 79 foreach ($mycharacter->getAttributes("Mental") as $attribute) { 80 echo "\t\t\t<ATTRIBUTE>\n"; 81 echo vtm_output_xlmtag("NAME", $attribute->name); 82 echo vtm_output_xlmtag("LEVEL", $attribute->level); 83 echo vtm_output_xlmtag("PENDINGXP", $attribute->pending); 84 echo vtm_output_xlmtag("ORDER", $attribute->ordering); 85 echo vtm_output_xlmtag("SPECIALITY", $attribute->specialty); 86 echo "\t\t\t</ATTRIBUTE>\n"; 87 } 88 echo "\t\t</MENTAL>\n"; 89 echo "\t</ATTRIBUTES>\n"; 90 91 /* Abilities */ 92 $abilities = $mycharacter->getAbilities(); 93 echo "\t<ABILITIES>\n"; 94 foreach ($abilities as $ability) { 95 echo "\t\t<ABILITY>\n"; 96 echo vtm_output_xlmtag("NAME", $ability->skillname); 97 echo vtm_output_xlmtag("LEVEL", $ability->level); 98 echo vtm_output_xlmtag("PENDINGXP", $ability->pending); 99 echo vtm_output_xlmtag("GROUPING", $ability->grouping); 100 echo vtm_output_xlmtag("SPECIALITY", $ability->specialty); 101 echo "\t\t</ABILITY>\n"; 102 } 103 echo "\t</ABILITIES>\n"; 104 105 /* Backgrounds */ 106 $backgrounds = $mycharacter->getBackgrounds(); 107 echo "\t<BACKGROUNDS>\n"; 108 foreach ($backgrounds as $background) { 109 echo "\t\t<BACKGROUND>\n"; 110 echo vtm_output_xlmtag("NAME", $background->background); 111 echo vtm_output_xlmtag("LEVEL", $background->level); 112 echo vtm_output_xlmtag("SECTOR", $background->sector); 113 echo vtm_output_xlmtag("COMMENT", $background->comment); 114 echo "\t\t</BACKGROUND>\n"; 115 } 116 echo "\t</BACKGROUNDS>\n"; 117 118 /* Disciplines */ 119 $disciplines = $mycharacter->getDisciplines(); 120 echo "\t<DISCIPLINES>\n"; 121 foreach ($disciplines as $discipline) { 122 echo "\t\t<DISCIPLINE>\n"; 123 echo vtm_output_xlmtag("NAME", $discipline->name); 124 echo vtm_output_xlmtag("LEVEL", $discipline->level); 125 echo vtm_output_xlmtag("PENDINGXP", $discipline->pending); 126 echo "\t\t</DISCIPLINE>\n"; 127 } 128 echo "\t</DISCIPLINES>\n"; 129 130 /* Merits and Flaws */ 131 $merits = $mycharacter->meritsandflaws; 132 echo "\t<MERITSANDFLAWS>\n"; 133 foreach ($merits as $merit) { 134 echo "\t\t<MERITFLAW>\n"; 135 echo vtm_output_xlmtag("NAME", $merit->name); 136 echo vtm_output_xlmtag("LEVEL", $merit->level); 137 echo vtm_output_xlmtag("PENDINGXP", $merit->pending); 138 echo vtm_output_xlmtag("COMMENT", $merit->comment); 139 echo "\t\t</MERITFLAW>\n"; 140 } 141 echo "\t</MERITSANDFLAWS>\n"; 142 143 /* Virtues */ 144 $virtues = $mycharacter->getAttributes("Virtue"); 145 echo "\t<VIRTUES>\n"; 146 foreach ($virtues as $virtue) { 147 echo "\t\t<VIRTUE>\n"; 148 echo vtm_output_xlmtag("NAME", $virtue->name); 149 echo vtm_output_xlmtag("LEVEL", $virtue->level); 150 echo vtm_output_xlmtag("PENDINGXP", $virtue->pending); 151 echo vtm_output_xlmtag("ORDER", $virtue->ordering); 152 echo "\t\t</VIRTUE>\n"; 153 } 154 echo "\t</VIRTUES>\n"; 155 156 /* Rituals */ 157 $rituals = $mycharacter->rituals; 158 echo "\t<RITUALS>\n"; 159 foreach ($rituals as $majikdiscipline => $rituallist) { 160 foreach ($rituallist as $ritual) { 161 echo "\t\t<RITUAL>\n"; 162 echo vtm_output_xlmtag("NAME", $ritual['name']); 163 echo vtm_output_xlmtag("LEVEL", $ritual['level']); 164 echo vtm_output_xlmtag("PENDINGXP", $ritual['pending']); 165 echo vtm_output_xlmtag("DISCIPLINE", $majikdiscipline); 166 echo "\t\t</RITUAL>\n"; 167 } 168 } 169 echo "\t</RITUALS>\n"; 170 171 172 /* Combo Disciplines */ 173 $combodisciplines = $mycharacter->combo_disciplines; 174 echo "\t<COMBODISCIPLINES>\n"; 175 if (count($combodisciplines) > 0) { 176 foreach ($combodisciplines as $discipline) { 177 echo vtm_output_xlmtag("DISCIPLINE", $discipline); 178 } 179 } 180 echo "\t</COMBODISCIPLINES>\n"; 181 182 /* NEED TO ADD PATHS */ 183 184 echo "</CHARACTER>\n"; 19 header('Content-Type: application/json; charset=utf-8'); 20 echo json_encode($mycharacter); 185 21 186 22 exit; 187 23 } 188 }189 190 function vtm_output_xlmtag ($tagname, $value) {191 return (empty($value) ? "" : "\t\t\t\t<$tagname>$value</$tagname>\n");192 24 } 193 25 -
vampire-character/trunk/inc/chargen.php
r2446519 r2765402 700 700 $output .= "</td></tr> 701 701 <tr> 702 <td class='vtmcol_key'>Concept* :</td>702 <td class='vtmcol_key'>Concept* (200 characters):</td> 703 703 <td>\n"; 704 704 if ($submitted) 705 705 $output .= $concept; 706 706 else 707 $output .= "<textarea name='concept' rows=' 3' cols='50'>$concept</textarea>\n";707 $output .= "<textarea name='concept' rows='2' cols='50' maxlength='200'>$concept</textarea>\n"; 708 708 $output .= "</td></tr> 709 709 </table>\n"; … … 1577 1577 $doe_year = isset($_POST['year_doe']) ? $_POST['year_doe'] : (isset($doe) ? $doe_array[0] : ''); 1578 1578 1579 // Date of Embrace1579 // Sire 1580 1580 $sire = $wpdb->get_var($wpdb->prepare("SELECT SIRE FROM " . VTM_TABLE_PREFIX . "CHARACTER WHERE ID = %s", $vtmglobal['characterID'])); 1581 1581 $sire = isset($_POST['sire']) ? $_POST['sire'] : $sire; 1582 // Pronouns 1583 $pronouns = $wpdb->get_var($wpdb->prepare("SELECT PRONOUNS FROM " . VTM_TABLE_PREFIX . "CHARACTER WHERE ID = %s", $vtmglobal['characterID'])); 1584 $pronouns = isset($_POST['pronouns']) ? $_POST['pronouns'] : $pronouns; 1582 1585 1583 1586 $output .= "<h4>Calculated Values</h4>\n"; … … 1658 1661 $output .= "<h4>Miscellaneous</h4>\n"; 1659 1662 $output .= "<table>\n"; 1663 $output .= "<tr><td>Character Pronouns:</td><td>\n"; 1664 if ($submitted) 1665 $output .= vtm_formatOutput($pronouns); 1666 else 1667 $output .= "<input type='text' name='pronouns' value='" . vtm_formatOutput($pronouns) . "' />\n"; 1668 $output .= "</td></tr>\n"; 1660 1669 $output .= "<tr><td>Name of your Sire:</td><td>\n"; 1661 1670 if ($submitted) … … 2568 2577 'DATE_OF_EMBRACE' => $doe, 2569 2578 'GENERATION_ID' => $_POST['generationID'], 2579 'PRONOUNS' => $_POST['pronouns'], 2570 2580 'ROAD_OR_PATH_RATING' => isset($_POST['pathrating']) ? $_POST['pathrating'] : 0, 2571 2581 ); -
vampire-character/trunk/inc/classes.php
r2392602 r2765402 43 43 var $char_status_comment; 44 44 var $char_status; 45 var $pronouns; 45 46 var $offices; 46 47 var $history; … … 84 85 chara.concept concept, 85 86 chara.email, 86 chara.get_newsletter newsletter 87 chara.get_newsletter newsletter, 88 chara.pronouns 87 89 FROM " . VTM_TABLE_PREFIX . "CHARACTER chara, 88 90 " . VTM_TABLE_PREFIX . "PLAYER player, … … 136 138 $this->email = $result[0]->email; 137 139 $this->newsletter = $result[0]->newsletter != '' ? $result[0]->newsletter : 'Y'; 140 $this->pronouns = $result[0]->pronouns; 138 141 } else { 139 142 $this->name = 'No character selected'; … … 158 161 $this->date_of_embrace = ''; 159 162 $this->char_status_comment = ''; 163 $this->pronouns = ''; 160 164 $this->path_of_enlightenment = ''; 161 165 $this->concept = ''; -
vampire-character/trunk/inc/email.php
r2392602 r2765402 36 36 37 37 } 38 else {38 elseif ($method != 'mail') { 39 39 echo "<p>Unknown mail transport method '$method'</p>"; 40 40 } -
vampire-character/trunk/inc/install.php
r2446519 r2765402 8 8 global $vtm_character_version; 9 9 global $vtm_character_db_version; 10 $vtm_character_version = "2. 8";11 $vtm_character_db_version = "8 2";10 $vtm_character_version = "2.11"; 11 $vtm_character_db_version = "83"; 12 12 13 13 function vtm_update_db_check() { … … 723 723 VISIBLE varchar(1) NOT NULL, 724 724 DELETED varchar(1) NOT NULL, 725 PRONOUNS tinytext NOT NULL, 725 726 PRIMARY KEY (ID) 726 727 ) ENGINE=INNODB;"; … … 1874 1875 } 1875 1876 } 1877 1876 1878 1877 1879 add_action('activated_plugin','save_error'); -
vampire-character/trunk/inc/printable.php
r2392602 r2765402 24 24 $dividertextsize = 12; 25 25 $dividerrowheight = 9; 26 $overrun = 18; 26 27 27 28 $dotmaximum = 5; /* get this from character */ … … 81 82 global $textrowheight; 82 83 global $vtmglobal; 83 84 global $overrun; 84 85 85 86 $mycharacter = new vtmclass_character(); … … 231 232 } 232 233 } 234 $loopoverrun = 6; 233 235 $rows = 3; 234 236 if ($rows < $discrows) $rows = $discrows; … … 237 239 238 240 for ($i=0;$i<$rows;$i++) { 241 239 242 240 243 if (isset($backgrounds[$i]->sector)) … … 267 270 array_push($data, "Backgrounds", "Disciplines", "Secondary Abilities"); 268 271 269 $pdf->FullWidthTableRow($data); 270 } 272 273 if ($i >= $loopoverrun && count($backgrounds) >= $loopoverrun && $i >= $discrows && $i >= count($secondary)) { 274 $data = array ( 275 count($backgrounds) > $i ? "See Extended Backgrounds..." : '', 276 '', 277 '', 278 '', 279 280 '', 281 '', 282 '', 283 '', 284 285 '', 286 '', 287 '', 288 '', 289 ); 290 $loopoverrun = $overrun - $i; 291 $pdf->FullWidthTableRow($data); 292 break; 293 } else { 294 $pdf->FullWidthTableRow($data); 295 } 296 } 297 271 298 272 299 $pdf->Divider(); … … 279 306 $merits = $mycharacter->meritsandflaws; 280 307 if (count($merits) > 0) { 281 $ pdf->SingleColumnHeading("Merits and Flaws");308 $xnext = $pdf->SingleColumnHeading("Merits and Flaws"); 282 309 310 $i = 0; 283 311 foreach ($merits as $merit) { 284 312 $string = $merit->name; … … 289 317 $string .= " pending"; 290 318 $pdf->SingleColumnText($string); 319 $i++; 320 if ($i == $loopoverrun) { 321 $pdf->SingleColumnText("See Extended Backgrounds for more..."); 322 break; 323 } 291 324 } 292 325 } 293 326 294 $xnext = $pdf->SingleColumnHeading('Current Experience');295 $pdf->SingleColumnCell(($mycharacter->current_experience - $mycharacter->pending_experience) . " ( " . $mycharacter->spent_experience . " spent on character )");327 //$xnext = $pdf->SingleColumnHeading('Current Experience'); 328 //$pdf->SingleColumnCell(($mycharacter->current_experience - $mycharacter->pending_experience) . " ( " . $mycharacter->spent_experience . " spent on character )"); 296 329 297 330 $ybottom = $pdf->GetY(); … … 361 394 ) 362 395 ); 396 $pdf->BasicInfoTableRow( array( 397 'Current Experience', $mycharacter->current_experience - $mycharacter->pending_experience, 398 'Experience Spent', $mycharacter->spent_experience, 399 '', '' 400 ) 401 ); 363 402 $pdf->Ln(); 364 403 if (!empty($mycharacter->concept)) { -
vampire-character/trunk/inc/profile.php
r2392602 r2765402 260 260 261 261 } 262 263 // Update Pronouns 264 if (isset($_POST['Pronouns'])) { 265 $result = $wpdb->update(VTM_TABLE_PREFIX . "CHARACTER", 266 array('PRONOUNS' => $_POST['Pronouns']), 267 array('ID' => $characterID) 268 ); 269 if (!$result && $result !== 0){ 270 echo "<p style='color:red'>Could not save pronouns</p>"; 271 } else { 272 $output .= "<p>Changed pronouns</p>"; 273 } 274 $mycharacter->pronouns = $_POST['Pronouns']; 275 276 } 262 277 } else { 263 278 $displayName = $mycharacter->name; … … 308 323 $output .= " (" . vtm_formatOutput($mycharacter->char_status_comment) . ")"; 309 324 } 325 $output .= "</td></tr>"; 326 327 // Pronouns 328 $output .= "<tr><td class=\"gvcol_1 gvcol_key\">Character Pronouns:</td><td class=\"gvcol_2 gvcol_val\">" . vtm_formatOutput($mycharacter->pronouns); 310 329 $output .= "</td></tr>"; 311 330 … … 499 518 $output .= "</form>"; 500 519 } 501 $output .= "</div>\n"; 520 521 // Pronouna 522 $output .= "</div><div class='vtmext_section vtmprofile'>"; 523 $output .= "<h4>Set Character Pronouns</h4>\n"; 524 $output .= "<form id='set_pronouns' method='post'>"; 525 $output .= "<input type='text' size=20 maxlength=20 name=\"Pronouns\" value=\"" . vtm_formatOutput($mycharacter->pronouns) . "\">"; 526 $output .= " <input id='set_vtm_pronouns' name='set_vtm_pronouns' type='submit' value='Save' />"; 527 $output .= "</form>"; 502 528 503 529 -
vampire-character/trunk/inc/shortcodes.php
r2392602 r2765402 100 100 "heading" => 1, 101 101 "charactertype" => 'all', 102 "pronouns" => 1, 102 103 ), $atts) 103 104 ); … … 133 134 cgstatus.name as chargenstat, 134 135 sects.name as sect, 135 ctype.name as charactertype 136 ctype.name as charactertype, 137 chara.pronouns as pronouns 136 138 FROM 137 139 " . VTM_TABLE_PREFIX . "CHARACTER chara, … … 186 188 cgstatus.name as chargenstat, 187 189 sects.name as sect, 188 ctype.name as charactertype 190 ctype.name as charactertype, 191 chara.pronouns as pronouns 189 192 FROM 190 193 " . VTM_TABLE_PREFIX . "CHARACTER chara … … 361 364 if ($name == 'office') $output .= "<th>Office</th>"; 362 365 if ($name == 'sect') $output .= "<th>Affiliation</th>"; 366 if ($name == 'pronouns') $output .= "<th>Pronouns</th>"; 363 367 } 364 368 $output .= "</tr>\n"; … … 383 387 } 384 388 if ($name == 'sect') $output .= "<td class='gvcol_$col gvcol_val'>" . vtm_formatOutput($tablerow->sect) . "</td>"; 389 if ($name == 'pronouns') $output .= "<td class='gvcol_$col gvcol_val'>" . vtm_formatOutput($tablerow->pronouns) . "</td>"; 385 390 $col++; 386 391 } -
vampire-character/trunk/inc/viewcharacter.php
r2392602 r2765402 28 28 $maxrating = $mycharacter->max_rating > 5 ? 10 : 5; 29 29 30 /* 30 31 if ($vtmglobal['config']->WEB_COLUMNS == 1) 31 32 $divder = "<tr><td class='vtmhr'><hr /></td></tr>"; // divider 32 33 else 33 34 $divder = "<tr><td class='vtmhr' colspan=" . $vtmglobal['config']->WEB_COLUMNS . "><hr /></td></tr>"; // divider 35 */ 36 $divder = "<hr />"; 34 37 35 38 $content = "<div class='gvplugin vtmpage_" . $vtmglobal['config']->WEB_PAGEWIDTH . "' id=\"csheet\">"; 36 39 37 40 //---- TOP CHARACTER INFO ---- 38 $c_tableleft = "< table><tbody>41 $c_tableleft = "<div class='vtmsubsection'><table><tbody> 39 42 <tr><td class='vtmcol_key'>Character</td><td>". vtm_formatOutput($mycharacter->name) . "</td></tr> 40 43 <tr><td class='vtmcol_key'>Domain</td><td>" . vtm_formatOutput($mycharacter->domain) . "</td></tr> 41 44 <tr><td class='vtmcol_key'>Sect</td><td>" . vtm_formatOutput($mycharacter->sect) . "</td></tr> 42 </tbody></table> ";43 $c_tablemid = "< table><tbody>45 </tbody></table></div>"; 46 $c_tablemid = "<div class='vtmsubsection'><table><tbody> 44 47 <tr><td class='vtmcol_key'>Clan</td><td>" . vtm_formatOutput($mycharacter->private_clan) . "</td></tr> 45 48 <tr><td class='vtmcol_key'>Public Clan</td><td>" . vtm_formatOutput($mycharacter->clan) . "</td></tr> 46 49 <tr><td class='vtmcol_key'>Sire</td><td>" . vtm_formatOutput($mycharacter->sire) . "</td></tr> 47 </tbody></table> ";50 </tbody></table></div>"; 48 51 if ($vtmglobal['config']->USE_NATURE_DEMEANOUR == 'Y') { 49 $c_tableright = "< table><tbody>52 $c_tableright = "<div class='vtmsubsection'><table><tbody> 50 53 <tr><td class='vtmcol_key'>Generation</td><td>" . vtm_formatOutput($mycharacter->generation) . "</td></tr> 51 54 <tr><td class='vtmcol_key'>Nature</td><td>" . vtm_formatOutput($mycharacter->nature) . "</td></tr> 52 55 <tr><td class='vtmcol_key'>Demeanour</td><td>" . vtm_formatOutput($mycharacter->demeanour) . "</td></tr> 53 </tbody></table> ";54 } else { 55 $c_tableright = "< table><tbody>56 </tbody></table></div>"; 57 } else { 58 $c_tableright = "<div class='vtmsubsection'><table><tbody> 56 59 <tr><td class='vtmcol_key'>Generation</td><td>" . vtm_formatOutput($mycharacter->generation) . "</td></tr> 57 60 <tr><td class='vtmcol_key'>Date of Birth</td><td>" . vtm_formatOutput($mycharacter->date_of_birth) . "</td></tr> 58 61 <tr><td class='vtmcol_key'>Date of Embrace</td><td>" . vtm_formatOutput($mycharacter->date_of_embrace) . "</td></tr> 59 </tbody></table>"; 60 } 61 62 $content .= "<table>\n"; 63 if ($vtmglobal['config']->WEB_COLUMNS == 3) { 62 </tbody></table></div>"; 63 } 64 65 $content .= "<div class='vtmsection'>\n"; 66 $content .= "$c_tableleft\n$c_tablemid\n$c_tableright\n"; 67 $content .= "</div><!-- end section -->\n"; 68 69 /*if ($vtmglobal['config']->WEB_COLUMNS == 3) { 64 70 $content .= "<tr> 65 71 <td class='vtm_colnarrow'>$c_tableleft</td> … … 72 78 <tr><td class='vtm_colfull'>$c_tablemid</td></tr> 73 79 <tr><td class='vtm_colfull'>$c_tableright</td></tr>"; 74 } 80 }*/ 75 81 $content .= $divder; 76 82 … … 80 86 $mental = $mycharacter->getAttributes("Mental"); 81 87 82 $c_tableleft = "< table><tr><td colspan=3><h4>Physical</h4></td></tr>";88 $c_tableleft = "<div class='vtmsubsection'><table><tr><td colspan=3><h4>Physical</h4></td></tr>"; 83 89 for ($i=0;$i<3;$i++) { 84 90 $statname = isset($physical[$i]->name) ? vtm_formatOutput($physical[$i]->name) : ''; … … 92 98 </tr>"; 93 99 } 94 $c_tableleft .= "</table> ";95 $c_tablemid = "< table><tr><td colspan=3><h4>Social</h4></td></tr>";100 $c_tableleft .= "</table></div>\n"; 101 $c_tablemid = "<div class='vtmsubsection'><table><tr><td colspan=3><h4>Social</h4></td></tr>"; 96 102 for ($i=0;$i<3;$i++) { 97 103 $statname = isset($social[$i]->name) ? vtm_formatOutput($social[$i]->name) : ''; … … 105 111 </tr>"; 106 112 } 107 $c_tablemid .= "</table> ";108 $c_tableright = "< table><tr><td colspan=3><h4>Mental</h4></td></tr>";113 $c_tablemid .= "</table></div>\n"; 114 $c_tableright = "<div class='vtmsubsection'><table><tr><td colspan=3><h4>Mental</h4></td></tr>"; 109 115 for ($i=0;$i<3;$i++) { 110 116 $statname = isset($mental[$i]->name) ? vtm_formatOutput($mental[$i]->name) : ''; … … 118 124 </tr>"; 119 125 } 120 $c_tableright .= "</table>"; 121 122 123 if ($vtmglobal['config']->WEB_COLUMNS == 3) { 126 $c_tableright .= "</table></div>\n"; 127 128 $content .= "<div class='vtmsection'>\n"; 129 $content .= "$c_tableleft\n$c_tablemid\n$c_tableright\n"; 130 $content .= "</div><!-- end section -->\n"; 131 132 /*if ($vtmglobal['config']->WEB_COLUMNS == 3) { 124 133 $content .= " 125 134 <tr><td colspan=3><h3>Attributes</h3></td></tr> … … 135 144 <tr><td class='vtm_colfull'>$c_tablemid</td></tr> 136 145 <tr><td class='vtm_colfull'>$c_tableright</td></tr>"; 137 } 146 }*/ 138 147 139 148 //---- ABILITIES ---- … … 144 153 $knowledge = $mycharacter->getAbilities("Knowledges"); 145 154 146 $c_tableleft = "< table><tr><td colspan=3><h4>Talents</h4></td></tr>";155 $c_tableleft = "<div class='vtmsubsection'><table><tr><td colspan=3><h4>Talents</h4></td></tr>"; 147 156 for ($i=0;$i<count($talent);$i++) { 148 157 $max = max($talent[$i]->level, $maxrating); … … 154 163 </tr>"; 155 164 } 156 $c_tableleft .= "</table> ";157 $c_tablemid = "< table><tr><td colspan=3><h4>Skills</h4></td></tr>";165 $c_tableleft .= "</table></div>\n"; 166 $c_tablemid = "<div class='vtmsubsection'><table><tr><td colspan=3><h4>Skills</h4></td></tr>"; 158 167 for ($i=0;$i<count($skill);$i++) { 159 168 $max = max($skill[$i]->level, $maxrating); … … 165 174 </tr>"; 166 175 } 167 $c_tablemid .= "</table> ";168 $c_tableright = "< table><tr><td colspan=3><h4>Knowledges</h4></td></tr>";176 $c_tablemid .= "</table></div>\n"; 177 $c_tableright = "<div class='vtmsubsection'><table><tr><td colspan=3><h4>Knowledges</h4></td></tr>"; 169 178 for ($i=0;$i<count($knowledge);$i++) { 170 179 $max = max($knowledge[$i]->level, $maxrating); … … 176 185 </tr>"; 177 186 } 178 $c_tableright .= "</table> ";179 180 if ($vtmglobal['config']->WEB_COLUMNS == 3) {187 $c_tableright .= "</table></div>\n"; 188 189 /*if ($vtmglobal['config']->WEB_COLUMNS == 3) { 181 190 $content .= " 182 191 <tr><td colspan=3><h3>Abilities</h3></td></tr> … … 192 201 <tr><td class='vtm_colfull'>$c_tablemid</td></tr> 193 202 <tr><td class='vtm_colfull'>$c_tableright</td></tr>"; 194 } 203 }*/ 204 $content .= "<div class='vtmsection'>\n"; 205 $content .= "$c_tableleft\n$c_tablemid\n$c_tableright\n"; 206 $content .= "</div><!-- end section -->\n"; 207 195 208 196 209 //---- BACKGROUND, DISCIPLINES AND OTHER TRAITS ---- … … 213 226 $secondary = array_merge($mycharacter->getAbilities($group), $secondary); 214 227 215 $c_tableleft = "< table><tr><td colspan=3><h4>Backgrounds</h4></td></tr>";228 $c_tableleft = "<div class='vtmsubsection'><table><tr><td colspan=3><h4>Backgrounds</h4></td></tr>"; 216 229 for ($i=0;$i<count($backgrounds);$i++) { 217 230 $max = max($backgrounds[$i]->level, $maxrating); … … 222 235 </tr>"; 223 236 } 224 $c_tableleft .= "</table> ";225 $c_tablemid = "< table><tr><td colspan=3><h4>Disciplines</h4></td></tr>";237 $c_tableleft .= "</table></div>\n"; 238 $c_tablemid = "<div class='vtmsubsection'><table><tr><td colspan=3><h4>Disciplines</h4></td></tr>"; 226 239 for ($i=0;$i<count($disciplines);$i++) { 227 240 $max = max($disciplines[$i]->level, $maxrating); … … 239 252 $c_tablemid .= "<tr><td colspan=3>" . vtm_formatOutput($disc) . "</td></tr>"; 240 253 } 241 $c_tablemid .= "</table> ";242 $c_tableright = "< table><tr><td colspan=3><h4>Other Traits</h4></td></tr>";254 $c_tablemid .= "</table></div>\n"; 255 $c_tableright = "<div class='vtmsubsection'><table><tr><td colspan=3><h4>Other Traits</h4></td></tr>"; 243 256 for ($i=0;$i<count($secondary);$i++) { 244 257 $max = max($secondary[$i]->level, $maxrating); … … 250 263 </tr>"; 251 264 } 252 $c_tableright .= "</table> ";253 254 if ($vtmglobal['config']->WEB_COLUMNS == 3) {265 $c_tableright .= "</table></div>\n"; 266 267 /*if ($vtmglobal['config']->WEB_COLUMNS == 3) { 255 268 $content .= " 256 269 <tr> … … 264 277 <tr><td class='vtm_colfull'>$c_tablemid</td></tr>$divder 265 278 <tr><td class='vtm_colfull'>$c_tableright</td></tr>"; 266 } 279 }*/ 280 $content .= "<div class='vtmsection'>\n"; 281 $content .= "$c_tableleft\n$c_tablemid\n$c_tableright\n"; 282 $content .= "</div><!-- end section -->\n"; 283 267 284 268 285 //---- MERITS, FLAWS, VIRTUES, WILLPOWER, PATH AND BLOOD ---- … … 272 289 $virtues = $mycharacter->getAttributes("Virtue"); 273 290 274 $c_tableleft = "< table><tr><td><h4>Merits and Flaws</h4></td></tr>";291 $c_tableleft = "<div class='vtmsubsection_wide'><table><tr><td><h4>Merits and Flaws</h4></td></tr>"; 275 292 $c_tableleft .= "<tr>"; 276 293 if (count($merits) > 0) { … … 287 304 $c_tableleft .= "<td> </td>"; 288 305 } 289 $c_tableleft .= "</tr></table> ";290 $c_tableright = "< table><tr><td colspan=3><h4>Virtues</h4></td></tr>";306 $c_tableleft .= "</tr></table></div>\n"; 307 $c_tableright = "<div class='vtmsubsection'><table><tr><td colspan=3><h4>Virtues</h4></td></tr>"; 291 308 for ($i=0;$i<3;$i++) { 292 309 $statname = isset($virtues[$i]->name) ? vtm_formatOutput($virtues[$i]->name) : ''; … … 307 324 $c_tableright .= "<tr><td colspan=3><h4>Bloodpool</h4></td></tr>"; 308 325 $c_tableright .= "<tr><td colspan=3 class='vtmdot_10 vtmdotwide'>" . vtm_numberToBoxes($mycharacter->bloodpool,0) . "</td></tr>\n"; 309 $c_tableright .= "</table> ";310 311 if ($vtmglobal['config']->WEB_COLUMNS == 3) {326 $c_tableright .= "</table></div>\n"; 327 328 /*if ($vtmglobal['config']->WEB_COLUMNS == 3) { 312 329 $content .= " 313 330 <tr> … … 319 336 <tr><td class='vtm_colfull'>$c_tableleft</td></tr> 320 337 <tr><td class='vtm_colfull'>$c_tableright</td></tr>"; 321 } 338 }*/ 339 $content .= "<div class='vtmsection'>\n"; 340 $content .= "$c_tableleft\n$c_tableright\n"; 341 $content .= "</div><!-- end section -->\n"; 322 342 323 343 … … 329 349 $majikpaths_secondary = $mycharacter->secondary_paths; 330 350 331 $c_tableleft = "< table><tr><td><h4>Rituals</h4></td></tr>";351 $c_tableleft = "<div class='vtmsubsection_wide'><table><tr><td><h4>Rituals</h4></td></tr>"; 332 352 $c_tableleft .= "<tr>"; 333 353 if (count($rituals) > 0) { … … 344 364 $c_tableleft .= "<td> </td>"; 345 365 } 346 $c_tableleft .= "</tr></table> ";347 $c_tableright = "< table><tr><td><h4>Paths</h4></td></tr>";366 $c_tableleft .= "</tr></table></div>\n"; 367 $c_tableright = "<div class='vtmsubsection'><table><tr><td><h4>Paths</h4></td></tr>"; 348 368 $c_tableright .= "<tr>"; 349 369 … … 370 390 $c_tableright .= " "; 371 391 } 372 $c_tableright .= "</tr></table> ";373 374 375 if ($vtmglobal['config']->WEB_COLUMNS == 3) {392 $c_tableright .= "</tr></table></div>\n"; 393 394 395 /*if ($vtmglobal['config']->WEB_COLUMNS == 3) { 376 396 $content .= " 377 397 <tr> … … 383 403 <tr><td class='vtm_colfull'>$c_tableleft</td></tr>$divder 384 404 <tr><td class='vtm_colfull'>$c_tableright</td></tr>"; 385 } 386 387 $content .= "</table>"; 405 }*/ 406 $content .= "<div class='vtmsection'>\n"; 407 $content .= "$c_tableleft\n$c_tableright\n"; 408 $content .= "</div><!-- end section -->\n"; 409 410 //$content .= "</table>"; */ 388 411 $content .= "</div>\n"; 389 412 -
vampire-character/trunk/inc/xpfunctions.php
r2392602 r2765402 1631 1631 $levelsdata = isset($_REQUEST[$type . '_level']) ? $_REQUEST[$type . '_level'] : array(); 1632 1632 1633 if ($type == 'path' || $type == 'ritual' || $type == 'merit') {1633 /*if ($type == 'path' || $type == 'ritual' || $type == 'merit') { 1634 1634 $columns = min(2, $vtmglobal['config']->WEB_COLUMNS); 1635 1635 } else { … … 1640 1640 case 2: $colclass = 'vtm_colwide'; break; 1641 1641 case 3: $colclass = 'vtm_colnarrow'; break; 1642 }*/ 1643 if ($type == 'path' || $type == 'ritual' || $type == 'merit') { 1644 $colclass = 'vtmsubsection_wide'; 1645 } else { 1646 $colclass = 'vtmsubsection'; 1642 1647 } 1643 1648 … … 1651 1656 $extracols = 0; 1652 1657 $col = 0; 1653 $rowoutput = "";1658 $rowoutput = array(); // rowoutput[group][title], rowoutput[group][rows] = 1654 1659 if (count($allxpdata)>0) { 1655 1660 $id = 0; … … 1735 1740 if ($grp != $xpdata->grp) { 1736 1741 $grpcount++; 1737 if (empty($grp)) { 1738 $rowoutput .= "<tr><td class='$colclass'>\n<table>\n<tr><th class='$colclass' colspan=3>{$xpdata->grp}</th></tr>\n"; 1742 $rowoutput[$xpdata->grp]['title'] = "<table>\n<tr><th colspan=3>{$xpdata->grp}</th></tr>\n"; 1743 1744 /*if (empty($grp)) { 1745 $rowoutput .= "<div class='$colclass'>\n<table>\n<tr><th colspan=3>{$xpdata->grp}</th></tr>\n"; 1739 1746 $col++; 1740 1747 } … … 1744 1751 } 1745 1752 else { 1746 $rowoutput .= "</table> \n</td><tdclass='$colclass'>\n<table>\n<tr><th class='$colclass' colspan=3>{$xpdata->grp}</th></tr>\n";1753 $rowoutput .= "</table></div>\n<div class='$colclass'>\n<table>\n<tr><th class='$colclass' colspan=3>{$xpdata->grp}</th></tr>\n"; 1747 1754 $col++; 1748 } 1755 }*/ 1749 1756 $grp = $xpdata->grp; 1750 1757 } … … 1780 1787 //dots row 1781 1788 $xpcost = 0; 1782 $rowoutput .= "<tr><td class='vtmcol_key'><span"; 1789 1790 $rowoutput[$grp]['rows'][$id] = "<tr><td class='vtmcol_key'><span"; 1783 1791 if ($xpcomment) 1784 $rowoutput .= " title='$xpcomment' class='vtmxp_spec' ";1785 $rowoutput .= ">$name</span></td>\n";1786 $rowoutput .= "<td class='vtmdot_$tmp_max2display vtmdots'>";1792 $rowoutput[$grp]['rows'][$id] .= " title='$xpcomment' class='vtmxp_spec' "; 1793 $rowoutput[$grp]['rows'][$id] .= ">$name</span></td>\n"; 1794 $rowoutput[$grp]['rows'][$id] .= "<td class='vtmdot_$tmp_max2display vtmdots'>"; 1787 1795 for ($i=1;$i<=$tmp_max2display;$i++) { 1788 1796 1789 1797 if ($xpdata->curr_level >= $i) 1790 $rowoutput .= "<img alt='*' src='$fulldoturl'>";1798 $rowoutput[$grp]['rows'][$id] .= "<img alt='*' src='$fulldoturl'>"; 1791 1799 elseif ($maxRating < $i) 1792 $rowoutput .= "<img alt='O' src='$emptydoturl'>";1800 $rowoutput[$grp]['rows'][$id] .= "<img alt='O' src='$emptydoturl'>"; 1793 1801 elseif ($xpdata->pending_level) 1794 1802 if ($xpdata->pending_level >= $i) 1795 $rowoutput .= "<img alt='X' src='$pendingdoturl'>";1803 $rowoutput[$grp]['rows'][$id] .= "<img alt='X' src='$pendingdoturl'>"; 1796 1804 elseif ($type == 'merit' && $xpdata->next_level < 0 && $xpdata->xp_cost) 1797 $rowoutput .= "<img alt='X' src='$pendingdoturl'>";1805 $rowoutput[$grp]['rows'][$id] .= "<img alt='X' src='$pendingdoturl'>"; 1798 1806 else 1799 $rowoutput .= "<img alt='O' src='$emptydoturl'>";1807 $rowoutput[$grp]['rows'][$id] .= "<img alt='O' src='$emptydoturl'>"; 1800 1808 elseif ($type == 'path' && $xpdata->item_id == $xpdata->primary_path_id) { 1801 1809 // no spending xp on primary paths 1802 $rowoutput .= "<img alt='O' src='$emptydoturl'>";1810 $rowoutput[$grp]['rows'][$id] .= "<img alt='O' src='$emptydoturl'>"; 1803 1811 } 1804 1812 elseif ($type == 'path' && $maxRating < 5 && $maxRating == $i) { … … 1806 1814 // is less than max and if the new rating is equal to the 1807 1815 // primary path rating 1808 $rowoutput .= "<img alt='O' src='$emptydoturl'>";1816 $rowoutput[$grp]['rows'][$id] .= "<img alt='O' src='$emptydoturl'>"; 1809 1817 } 1810 1818 elseif ($type == 'combo' || $type == 'ritual') { … … 1813 1821 if ($xp_avail >= $xpcost) { 1814 1822 1815 $rowoutput .= "<input type='CHECKBOX' name='$checkboxname:{$xpcost}[level]' value='{$xpdata->next_level}' id='vtmcb_{$type}_$id' ";1823 $rowoutput[$grp]['rows'][$id] .= "<input type='CHECKBOX' name='$checkboxname:{$xpcost}[level]' value='{$xpdata->next_level}' id='vtmcb_{$type}_$id' "; 1816 1824 if (isset($levelsdata[$id])) 1817 $rowoutput .= "checked";1818 $rowoutput .= "><label for='vtmcb_{$type}_$id' title='[ ]'> </label>";1825 $rowoutput[$grp]['rows'][$id] .= "checked"; 1826 $rowoutput[$grp]['rows'][$id] .= "><label for='vtmcb_{$type}_$id' title='[ ]'> </label>"; 1819 1827 } else 1820 $rowoutput .= "<img alt='O' src='$emptydoturl'>";1828 $rowoutput[$grp]['rows'][$id] .= "<img alt='O' src='$emptydoturl'>"; 1821 1829 1822 1830 } … … 1826 1834 if($xpcost) { 1827 1835 if ($xp_avail >= $xpcost) { 1828 $rowoutput .= "<input type='CHECKBOX' name='$checkboxname:{$xpcost}[level]' value='{$xpdata->next_level}' id='vtmcb_{$type}_$id' ";1836 $rowoutput[$grp]['rows'][$id] .= "<input type='CHECKBOX' name='$checkboxname:{$xpcost}[level]' value='{$xpdata->next_level}' id='vtmcb_{$type}_$id' "; 1829 1837 if (isset($levelsdata[$id])) 1830 $rowoutput .= "checked";1831 $rowoutput .= "><label for='vtmcb_{$type}_$id' title='[ ]'> </label>";1838 $rowoutput[$grp]['rows'][$id] .= "checked"; 1839 $rowoutput[$grp]['rows'][$id] .= "><label for='vtmcb_{$type}_$id' title='[ ]'> </label>"; 1832 1840 } else 1833 $rowoutput .= "<img alt='O' src='$emptydoturl'>";1841 $rowoutput[$grp]['rows'][$id] .= "<img alt='O' src='$emptydoturl'>"; 1834 1842 1835 1843 } else 1836 $rowoutput .= "<img alt='O' src='$fulldoturl'>";1844 $rowoutput[$grp]['rows'][$id] .= "<img alt='O' src='$fulldoturl'>"; 1837 1845 } else { 1838 1846 if ($xp_avail >= $xpcost) { 1839 $rowoutput .= "<input type='CHECKBOX' name='$checkboxname:{$xpcost}[level]' value='{$xpdata->next_level}' id='vtmcb_{$type}_$id' ";1847 $rowoutput[$grp]['rows'][$id] .= "<input type='CHECKBOX' name='$checkboxname:{$xpcost}[level]' value='{$xpdata->next_level}' id='vtmcb_{$type}_$id' "; 1840 1848 if (isset($levelsdata[$id])) 1841 $rowoutput .= "checked";1842 $rowoutput .= "><label for='vtmcb_{$type}_$id' title='[ ]'> </label>";1849 $rowoutput[$grp]['rows'][$id] .= "checked"; 1850 $rowoutput[$grp]['rows'][$id] .= "><label for='vtmcb_{$type}_$id' title='[ ]'> </label>"; 1843 1851 } else 1844 $rowoutput .= "<img alt='O' src='$emptydoturl'>";1852 $rowoutput[$grp]['rows'][$id] .= "<img alt='O' src='$emptydoturl'>"; 1845 1853 } 1846 1854 } … … 1852 1860 1853 1861 if ($xpcost == 0) { 1854 $rowoutput .= "<img alt='O' src='$emptydoturl'>";1862 $rowoutput[$grp]['rows'][$id] .= "<img alt='O' src='$emptydoturl'>"; 1855 1863 } 1856 1864 elseif ($xp_avail >= $xpcost) { … … 1860 1868 //$rowoutput .= "<input type='hidden' name='{$type}_cost[" . $id . "]' value='" . $xpcost . "' >"; 1861 1869 //$rowoutput .= "<input type='hidden' name='{$type}_comment[" . $id . "]' value='$comment' >"; 1862 $rowoutput .= "<input type='CHECKBOX' name='$checkboxname:{$xpcost}[level]' value='$i' id='vtmcb_{$type}_$id' ";1870 $rowoutput[$grp]['rows'][$id] .= "<input type='CHECKBOX' name='$checkboxname:{$xpcost}[level]' value='$i' id='vtmcb_{$type}_$id' "; 1863 1871 if (isset($levelsdata[$id]) && $i == $levelsdata[$id]) 1864 $rowoutput .= "checked";1865 $rowoutput .= "><label for='vtmcb_{$type}_$id' title='[ ]'> </label>";1872 $rowoutput[$grp]['rows'][$id] .= "checked"; 1873 $rowoutput[$grp]['rows'][$id] .= "><label for='vtmcb_{$type}_$id' title='[ ]'> </label>"; 1866 1874 } 1867 1875 else 1868 $rowoutput .= "<img alt='O' src='$emptydoturl'>";1876 $rowoutput[$grp]['rows'][$id] .= "<img alt='O' src='$emptydoturl'>"; 1869 1877 } 1870 1878 else 1871 $rowoutput .= "<img alt='O' src='$emptydoturl'>";1879 $rowoutput[$grp]['rows'][$id] .= "<img alt='O' src='$emptydoturl'>"; 1872 1880 } 1873 1881 } … … 1877 1885 $xpcost = ($xpdata->next_level <= $maxRating) ? $xpdata->xp_cost . "xp" : ""; 1878 1886 if ($xpdata->has_pending) 1879 $rowoutput .= "<td class='vtmxp_cost'><input class='vtmxp_clear' type='submit' name='cancel[{$xpdata->pending_id}]' value='Del'></td>";1887 $rowoutput[$grp]['rows'][$id] .= "<td class='vtmxp_cost'><input class='vtmxp_clear' type='submit' name='cancel[{$xpdata->pending_id}]' value='Del'></td>"; 1880 1888 elseif ($xpdata->xp_cost == 0) { 1881 $rowoutput .= "<td class='vtmxp_cost'> </td>";1889 $rowoutput[$grp]['rows'][$id] .= "<td class='vtmxp_cost'> </td>"; 1882 1890 } 1883 1891 elseif ($type == 'path' && $xpdata->item_id == $xpdata->primary_path_id) { 1884 $rowoutput .= "<td class='vtmxp_cost'> </td>";1892 $rowoutput[$grp]['rows'][$id] .= "<td class='vtmxp_cost'> </td>"; 1885 1893 } 1886 1894 else 1887 $rowoutput .= "<td class='vtmxp_cost'>$xpcost</td>";1895 $rowoutput[$grp]['rows'][$id] .= "<td class='vtmxp_cost'>$xpcost</td>"; 1888 1896 1889 $id++; 1890 if ($id == count($allxpdata)) { 1897 /*if ($id == count($allxpdata)) { 1891 1898 $remaining = $grpcount % $columns; 1892 1899 if ($remaining) { 1893 1900 $extracols = $columns - $remaining; 1894 1901 } 1895 } 1896 1897 $rowoutput .= "</tr>\n"; 1902 }*/ 1903 1904 $rowoutput[$grp]['rows'][$id] .= "</tr>\n"; 1905 $id++; 1898 1906 1899 1907 } 1900 1908 } 1901 1909 1902 if ($extracols > 0) {1910 /*if ($extracols > 0) { 1903 1911 $rowoutput .= "</table></td>"; 1904 1912 for ($i = 1 ; $i <= $extracols ; $i++) { … … 1908 1916 } 1909 1917 elseif ($rowoutput != "") 1910 $rowoutput .= "</table></td></tr>\n"; 1911 1912 if (!empty($rowoutput)) { 1913 $output = "<table>\n"; 1914 $output .= "$rowoutput\n"; 1915 $output .= "</table>\n"; 1918 $rowoutput .= "</table></td></tr>\n";*/ 1919 1920 if (vtm_count($rowoutput) > 0) { 1921 $output = "<div>"; 1922 foreach ($rowoutput as $grp => $section) { 1923 $output .= "<div class='$colclass'>\n"; 1924 $output .= $section['title']; 1925 foreach ($section['rows'] as $id => $row) { 1926 $output .= $row; 1927 } 1928 $output .= "</table>\n"; 1929 $output .= "</div>\n"; 1930 } 1931 $output .= "</div>"; 1916 1932 } else { 1917 1933 $output = ""; -
vampire-character/trunk/lib/fpdf.php
r2392602 r2765402 23 23 protected $CurOrientation; // current orientation 24 24 protected $StdPageSizes; // standard page sizes 25 protected $DefPageSize; // default page size26 25 protected $CurPageSize; // current page size 27 26 protected $CurRotation; // current page rotation … … 1041 1040 $this->Error('mbstring overloading must be disabled'); 1042 1041 // Ensure runtime magic quotes are disabled 1043 if(get_magic_quotes_runtime()) 1044 @set_magic_quotes_runtime(0); 1042 if (version_compare(PHP_VERSION, '5.3.0', '<')) { 1043 if(get_magic_quotes_runtime()) 1044 @set_magic_quotes_runtime(0); 1045 } 1045 1046 } 1046 1047 -
vampire-character/trunk/readme.txt
r2446519 r2765402 4 4 Requires at least: 5.2.4 5 5 Tested up to: 5.6.1 6 Stable tag: 2.1 06 Stable tag: 2.11 7 7 Requires PHP: 5.6 8 8 License: GPLv2 or later … … 135 135 136 136 == Changelog == 137 138 = 2.11 = 139 140 * Bug fix: Fixed email error when using default wordpress 'mail' config 141 * Bug fix: PDF character sheet format doesn't get messed up when it has large numbers of background 142 * Bug fix: PDF library updated for PHP7 143 * Bug fix: input box for character gen concept limited to 200 characters to stop database save failing when user enters more than that 144 * Improvements: Character sheet and XP spend page are now viewable on mobile devices 145 * New feature: Added support for specifying character pronouns 146 137 147 138 148 = 2.10 = -
vampire-character/trunk/vampire-character.php
r2392602 r2765402 4 4 Description: Management of Characters and Players 5 5 Author: Jane Houston 6 Version: 2. 96 Version: 2.11 7 7 Author URI: http://www.mieow.co.uk 8 8 */
Note: See TracChangeset
for help on using the changeset viewer.