chamilo /
chamilo-lms
@@ -22,14 +22,14 @@ discard block |
||
| 22 | 22 | $tbl_announcement_group = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS_GROUPS); |
| 23 | 23 | $userGroup = new UserGroup(); |
| 24 | 24 | |
| 25 | - $temp_user_groups = $userGroup->get_groups_by_user(api_get_user_id(),0); |
|
| 25 | + $temp_user_groups = $userGroup->get_groups_by_user(api_get_user_id(), 0); |
|
| 26 | 26 | $groups = array(); |
| 27 | 27 | foreach ($temp_user_groups as $user_group) { |
| 28 | 28 | $groups = array_merge($groups, array($user_group['id'])); |
| 29 | 29 | $groups = array_merge($groups, $userGroup->get_parent_groups($user_group['id'])); |
| 30 | 30 | } |
| 31 | 31 | |
| 32 | - $groups_string = '('.implode($groups,',').')'; |
|
| 32 | + $groups_string = '('.implode($groups, ',').')'; |
|
| 33 | 33 | $now = api_get_utc_datetime(); |
| 34 | 34 | $sql = "SELECT *, DATE_FORMAT(date_start,'%d-%m-%Y %h:%i:%s') AS display_date |
| 35 | 35 | FROM $db_table |
@@ -104,13 +104,13 @@ discard block |
||
| 104 | 104 | * @param string $user_id |
| 105 | 105 | * @return string |
| 106 | 106 | */ |
| 107 | - public static function display_all_announcements($visible, $id = -1, $start = 0,$user_id='') |
|
| 107 | + public static function display_all_announcements($visible, $id = -1, $start = 0, $user_id = '') |
|
| 108 | 108 | { |
| 109 | 109 | $user_selected_language = api_get_interface_language(); |
| 110 | - $start = intval($start); |
|
| 110 | + $start = intval($start); |
|
| 111 | 111 | $userGroup = new UserGroup(); |
| 112 | 112 | $tbl_announcement_group = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS_GROUPS); |
| 113 | - $temp_user_groups = $userGroup->get_groups_by_user(api_get_user_id(),0); |
|
| 113 | + $temp_user_groups = $userGroup->get_groups_by_user(api_get_user_id(), 0); |
|
| 114 | 114 | $groups = array(); |
| 115 | 115 | foreach ($temp_user_groups as $user_group) { |
| 116 | 116 | $groups = array_merge($groups, array($user_group['id'])); |
@@ -118,10 +118,10 @@ discard block |
||
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | // Checks if tables exists to not break platform not updated |
| 121 | - $groups_string = '('.implode($groups,',').')'; |
|
| 121 | + $groups_string = '('.implode($groups, ',').')'; |
|
| 122 | 122 | |
| 123 | 123 | $db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS); |
| 124 | - $now = api_get_utc_datetime(); |
|
| 124 | + $now = api_get_utc_datetime(); |
|
| 125 | 125 | |
| 126 | 126 | $sql = "SELECT * FROM ".$db_table." |
| 127 | 127 | WHERE |
@@ -152,10 +152,10 @@ discard block |
||
| 152 | 152 | $sql .= " AND access_url_id IN ('1', '$current_access_url_id')"; |
| 153 | 153 | } |
| 154 | 154 | |
| 155 | - if(!isset($_GET['start']) || $_GET['start'] == 0) { |
|
| 155 | + if (!isset($_GET['start']) || $_GET['start'] == 0) { |
|
| 156 | 156 | $sql .= " ORDER BY date_start DESC LIMIT ".$start.",20"; |
| 157 | 157 | } else { |
| 158 | - $sql .= " ORDER BY date_start DESC LIMIT ".($start+1).",20"; |
|
| 158 | + $sql .= " ORDER BY date_start DESC LIMIT ".($start + 1).",20"; |
|
| 159 | 159 | } |
| 160 | 160 | $announcements = Database::query($sql); |
| 161 | 161 | $content = ''; |
@@ -207,13 +207,13 @@ discard block |
||
| 207 | 207 | */ |
| 208 | 208 | public static function display_arrow($user_id) |
| 209 | 209 | { |
| 210 | - $start = (int)$_GET['start']; |
|
| 211 | - $nb_announcement = SystemAnnouncementManager :: count_nb_announcement($start,$user_id); |
|
| 212 | - $next = ((int)$_GET['start']+19); |
|
| 213 | - $prev = ((int)$_GET['start']-19); |
|
| 210 | + $start = (int) $_GET['start']; |
|
| 211 | + $nb_announcement = SystemAnnouncementManager :: count_nb_announcement($start, $user_id); |
|
| 212 | + $next = ((int) $_GET['start'] + 19); |
|
| 213 | + $prev = ((int) $_GET['start'] - 19); |
|
| 214 | 214 | $content = ''; |
| 215 | - if(!isset($_GET['start']) || $_GET['start'] == 0) { |
|
| 216 | - if($nb_announcement > 20) { |
|
| 215 | + if (!isset($_GET['start']) || $_GET['start'] == 0) { |
|
| 216 | + if ($nb_announcement > 20) { |
|
| 217 | 217 | $content .= '<a href="news_list.php?start='.$next.'">'.get_lang('NextBis').' >> </a>'; |
| 218 | 218 | } |
| 219 | 219 | } else { |
@@ -322,15 +322,15 @@ discard block |
||
| 322 | 322 | $sendEmailTest = false |
| 323 | 323 | ) { |
| 324 | 324 | $original_content = $content; |
| 325 | - $a_dateS = explode(' ',$date_start); |
|
| 326 | - $a_arraySD = explode('-',$a_dateS[0]); |
|
| 327 | - $a_arraySH = explode(':',$a_dateS[1]); |
|
| 328 | - $date_start_to_compare = array_merge($a_arraySD,$a_arraySH); |
|
| 325 | + $a_dateS = explode(' ', $date_start); |
|
| 326 | + $a_arraySD = explode('-', $a_dateS[0]); |
|
| 327 | + $a_arraySH = explode(':', $a_dateS[1]); |
|
| 328 | + $date_start_to_compare = array_merge($a_arraySD, $a_arraySH); |
|
| 329 | 329 | |
| 330 | - $a_dateE = explode(' ',$date_end); |
|
| 331 | - $a_arrayED = explode('-',$a_dateE[0]); |
|
| 332 | - $a_arrayEH = explode(':',$a_dateE[1]); |
|
| 333 | - $date_end_to_compare = array_merge($a_arrayED,$a_arrayEH); |
|
| 330 | + $a_dateE = explode(' ', $date_end); |
|
| 331 | + $a_arrayED = explode('-', $a_dateE[0]); |
|
| 332 | + $a_arrayEH = explode(':', $a_dateE[1]); |
|
| 333 | + $date_end_to_compare = array_merge($a_arrayED, $a_arrayEH); |
|
| 334 | 334 | |
| 335 | 335 | $db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS); |
| 336 | 336 | |
@@ -504,15 +504,15 @@ discard block |
||
| 504 | 504 | $send_mail = 0, |
| 505 | 505 | $sendEmailTest = false |
| 506 | 506 | ) { |
| 507 | - $a_dateS = explode(' ',$date_start); |
|
| 508 | - $a_arraySD = explode('-',$a_dateS[0]); |
|
| 509 | - $a_arraySH = explode(':',$a_dateS[1]); |
|
| 510 | - $date_start_to_compare = array_merge($a_arraySD,$a_arraySH); |
|
| 507 | + $a_dateS = explode(' ', $date_start); |
|
| 508 | + $a_arraySD = explode('-', $a_dateS[0]); |
|
| 509 | + $a_arraySH = explode(':', $a_dateS[1]); |
|
| 510 | + $date_start_to_compare = array_merge($a_arraySD, $a_arraySH); |
|
| 511 | 511 | |
| 512 | - $a_dateE = explode(' ',$date_end); |
|
| 513 | - $a_arrayED = explode('-',$a_dateE[0]); |
|
| 514 | - $a_arrayEH = explode(':',$a_dateE[1]); |
|
| 515 | - $date_end_to_compare = array_merge($a_arrayED,$a_arrayEH); |
|
| 512 | + $a_dateE = explode(' ', $date_end); |
|
| 513 | + $a_arrayED = explode('-', $a_dateE[0]); |
|
| 514 | + $a_arrayEH = explode(':', $a_dateE[1]); |
|
| 515 | + $date_end_to_compare = array_merge($a_arrayED, $a_arrayEH); |
|
| 516 | 516 | |
| 517 | 517 | $langsql = is_null($lang) ? 'NULL' : "'".Database::escape_string($lang)."'"; |
| 518 | 518 | $db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS); |
@@ -536,8 +536,8 @@ discard block |
||
| 536 | 536 | return false; |
| 537 | 537 | } |
| 538 | 538 | |
| 539 | - $start = api_get_utc_datetime($date_start); |
|
| 540 | - $end = api_get_utc_datetime($date_end); |
|
| 539 | + $start = api_get_utc_datetime($date_start); |
|
| 540 | + $end = api_get_utc_datetime($date_end); |
|
| 541 | 541 | |
| 542 | 542 | $title = Database::escape_string($title); |
| 543 | 543 | $content = Database::escape_string($content); |
@@ -560,7 +560,7 @@ discard block |
||
| 560 | 560 | $sendEmailTest |
| 561 | 561 | ); |
| 562 | 562 | } else { |
| 563 | - if ($send_mail==1) { |
|
| 563 | + if ($send_mail == 1) { |
|
| 564 | 564 | SystemAnnouncementManager::send_system_announcement_by_email( |
| 565 | 565 | $title, |
| 566 | 566 | $content, |
@@ -655,7 +655,7 @@ discard block |
||
| 655 | 655 | global $charset; |
| 656 | 656 | |
| 657 | 657 | $title = api_html_entity_decode(stripslashes($title), ENT_QUOTES, $charset); |
| 658 | - $content = api_html_entity_decode(stripslashes(str_replace(array('\r\n', '\n', '\r'),'', $content)), ENT_QUOTES, $charset); |
|
| 658 | + $content = api_html_entity_decode(stripslashes(str_replace(array('\r\n', '\n', '\r'), '', $content)), ENT_QUOTES, $charset); |
|
| 659 | 659 | $now = api_get_utc_datetime(); |
| 660 | 660 | |
| 661 | 661 | if ($sendEmailTest) { |
@@ -678,7 +678,7 @@ discard block |
||
| 678 | 678 | $sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition WHERE status = '5' "; |
| 679 | 679 | } |
| 680 | 680 | |
| 681 | - if ($teacher<> 0 AND $student <> 0) { |
|
| 681 | + if ($teacher <> 0 AND $student <> 0) { |
|
| 682 | 682 | $sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition WHERE 1 = 1 "; |
| 683 | 683 | } |
| 684 | 684 | |
@@ -696,7 +696,7 @@ discard block |
||
| 696 | 696 | // Expiration date |
| 697 | 697 | $sql .= " AND (expiration_date = '' OR expiration_date IS NULL OR expiration_date > '$now') "; |
| 698 | 698 | |
| 699 | - if ((empty($teacher) or $teacher == '0') AND (empty($student) or $student == '0')) { |
|
| 699 | + if ((empty($teacher) or $teacher == '0') AND (empty($student) or $student == '0')) { |
|
| 700 | 700 | return true; |
| 701 | 701 | } |
| 702 | 702 | |
@@ -707,7 +707,7 @@ discard block |
||
| 707 | 707 | |
| 708 | 708 | $message_sent = false; |
| 709 | 709 | |
| 710 | - while ($row = Database::fetch_array($result,'ASSOC')) { |
|
| 710 | + while ($row = Database::fetch_array($result, 'ASSOC')) { |
|
| 711 | 711 | MessageManager::send_message_simple($row['user_id'], $title, $content); |
| 712 | 712 | $message_sent = true; |
| 713 | 713 | } |
@@ -727,7 +727,7 @@ discard block |
||
| 727 | 727 | $cut_size = 500; |
| 728 | 728 | $now = api_get_utc_datetime(); |
| 729 | 729 | |
| 730 | - $sql = "SELECT * FROM " . $table . " |
|
| 730 | + $sql = "SELECT * FROM ".$table." |
|
| 731 | 731 | WHERE |
| 732 | 732 | (lang = '$user_selected_language' OR lang = '') AND |
| 733 | 733 | ('$now' >= date_start AND '$now' <= date_end) "; |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | define('TYPE_POS', 0x42);
|
| 15 | 15 | define('START_BLOCK_POS', 0x74);
|
| 16 | 16 | define('SIZE_POS', 0x78);
|
| 17 | -define('IDENTIFIER_OLE', pack("CCCCCCCC",0xd0,0xcf,0x11,0xe0,0xa1,0xb1,0x1a,0xe1));
|
|
| 17 | +define('IDENTIFIER_OLE', pack("CCCCCCCC", 0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1));
|
|
| 18 | 18 | |
| 19 | 19 | //echo 'ROOT_START_BLOCK_POS = '.ROOT_START_BLOCK_POS."\n"; |
| 20 | 20 | |
@@ -25,10 +25,10 @@ discard block |
||
| 25 | 25 | |
| 26 | 26 | function GetInt4d($data, $pos) |
| 27 | 27 | {
|
| 28 | - $value = ord($data[$pos]) | (ord($data[$pos+1]) << 8) | (ord($data[$pos+2]) << 16) | (ord($data[$pos+3]) << 24); |
|
| 29 | - if ($value>=4294967294) |
|
| 28 | + $value = ord($data[$pos]) | (ord($data[$pos + 1]) << 8) | (ord($data[$pos + 2]) << 16) | (ord($data[$pos + 3]) << 24); |
|
| 29 | + if ($value >= 4294967294) |
|
| 30 | 30 | {
|
| 31 | - $value=-2; |
|
| 31 | + $value = -2; |
|
| 32 | 32 | } |
| 33 | 33 | return $value; |
| 34 | 34 | } |
@@ -38,15 +38,15 @@ discard block |
||
| 38 | 38 | var $data = ''; |
| 39 | 39 | |
| 40 | 40 | |
| 41 | - function OLERead(){
|
|
| 41 | + function OLERead() {
|
|
| 42 | 42 | |
| 43 | 43 | |
| 44 | 44 | } |
| 45 | 45 | |
| 46 | - function read($sFileName){
|
|
| 46 | + function read($sFileName) {
|
|
| 47 | 47 | |
| 48 | 48 | // check if file exist and is readable (Darko Miljanovic) |
| 49 | - if(!is_readable($sFileName)) {
|
|
| 49 | + if (!is_readable($sFileName)) {
|
|
| 50 | 50 | $this->error = 1; |
| 51 | 51 | return false; |
| 52 | 52 | } |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | $bbdBlocks = $this->numBigBlockDepotBlocks; |
| 83 | 83 | |
| 84 | 84 | if ($this->numExtensionBlocks != 0) {
|
| 85 | - $bbdBlocks = (BIG_BLOCK_SIZE - BIG_BLOCK_DEPOT_BLOCKS_POS)/4; |
|
| 85 | + $bbdBlocks = (BIG_BLOCK_SIZE - BIG_BLOCK_DEPOT_BLOCKS_POS) / 4; |
|
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | for ($i = 0; $i < $bbdBlocks; $i++) {
|
@@ -116,9 +116,9 @@ discard block |
||
| 116 | 116 | for ($i = 0; $i < $this->numBigBlockDepotBlocks; $i++) {
|
| 117 | 117 | $pos = ($bigBlockDepotBlocks[$i] + 1) * BIG_BLOCK_SIZE; |
| 118 | 118 | //echo "pos = $pos"; |
| 119 | - for ($j = 0 ; $j < BIG_BLOCK_SIZE / 4; $j++) {
|
|
| 119 | + for ($j = 0; $j < BIG_BLOCK_SIZE / 4; $j++) {
|
|
| 120 | 120 | $this->bigBlockChain[$index] = GetInt4d($this->data, $pos); |
| 121 | - $pos += 4 ; |
|
| 121 | + $pos += 4; |
|
| 122 | 122 | $index++; |
| 123 | 123 | } |
| 124 | 124 | } |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | $pos = 0; |
| 168 | 168 | $data = ''; |
| 169 | 169 | |
| 170 | - while ($block != -2) {
|
|
| 170 | + while ($block != -2) {
|
|
| 171 | 171 | $pos = ($block + 1) * BIG_BLOCK_SIZE; |
| 172 | 172 | $data = $data.substr($this->data, $pos, BIG_BLOCK_SIZE); |
| 173 | 173 | //echo "pos = $pos data=$data\n"; |
@@ -176,13 +176,13 @@ discard block |
||
| 176 | 176 | return $data; |
| 177 | 177 | } |
| 178 | 178 | |
| 179 | - function __readPropertySets(){
|
|
| 179 | + function __readPropertySets() {
|
|
| 180 | 180 | $offset = 0; |
| 181 | 181 | //var_dump($this->entry); |
| 182 | 182 | while ($offset < strlen($this->entry)) {
|
| 183 | 183 | $d = substr($this->entry, $offset, PROPERTY_STORAGE_BLOCK_SIZE); |
| 184 | 184 | |
| 185 | - $nameSize = ord($d[SIZE_OF_NAME_POS]) | (ord($d[SIZE_OF_NAME_POS+1]) << 8); |
|
| 185 | + $nameSize = ord($d[SIZE_OF_NAME_POS]) | (ord($d[SIZE_OF_NAME_POS + 1]) << 8); |
|
| 186 | 186 | |
| 187 | 187 | $type = ord($d[TYPE_POS]); |
| 188 | 188 | //$maxBlock = strlen($d) / BIG_BLOCK_SIZE - 1; |
@@ -191,13 +191,13 @@ discard block |
||
| 191 | 191 | $size = GetInt4d($d, SIZE_POS); |
| 192 | 192 | |
| 193 | 193 | $name = ''; |
| 194 | - for ($i = 0; $i < $nameSize ; $i++) {
|
|
| 194 | + for ($i = 0; $i < $nameSize; $i++) {
|
|
| 195 | 195 | $name .= $d[$i]; |
| 196 | 196 | } |
| 197 | 197 | |
| 198 | 198 | $name = str_replace("\x00", "", $name);
|
| 199 | 199 | |
| 200 | - $this->props[] = array ( |
|
| 200 | + $this->props[] = array( |
|
| 201 | 201 | 'name' => $name, |
| 202 | 202 | 'type' => $type, |
| 203 | 203 | 'startBlock' => $startBlock, |
@@ -220,8 +220,8 @@ discard block |
||
| 220 | 220 | } |
| 221 | 221 | |
| 222 | 222 | |
| 223 | - function getWorkBook(){
|
|
| 224 | - if ($this->props[$this->wrkbook]['size'] < SMALL_BLOCK_THRESHOLD){
|
|
| 223 | + function getWorkBook() {
|
|
| 224 | + if ($this->props[$this->wrkbook]['size'] < SMALL_BLOCK_THRESHOLD) {
|
|
| 225 | 225 | // getSmallBlockStream(PropertyStorage ps) |
| 226 | 226 | |
| 227 | 227 | $rootdata = $this->__readData($this->props[$this->rootentry]['startBlock']); |
@@ -240,7 +240,7 @@ discard block |
||
| 240 | 240 | return $streamData; |
| 241 | 241 | |
| 242 | 242 | |
| 243 | - }else{
|
|
| 243 | + } else {
|
|
| 244 | 244 | |
| 245 | 245 | $numBlocks = $this->props[$this->wrkbook]['size'] / BIG_BLOCK_SIZE; |
| 246 | 246 | if ($this->props[$this->wrkbook]['size'] % BIG_BLOCK_SIZE != 0) {
|
@@ -25,50 +25,50 @@ discard block |
||
| 25 | 25 | * @see OLE, Spreadsheet_Excel_Writer |
| 26 | 26 | */ |
| 27 | 27 | |
| 28 | -define('SPREADSHEET_EXCEL_READER_BIFF8', 0x600); |
|
| 29 | -define('SPREADSHEET_EXCEL_READER_BIFF7', 0x500); |
|
| 30 | -define('SPREADSHEET_EXCEL_READER_WORKBOOKGLOBALS', 0x5); |
|
| 31 | -define('SPREADSHEET_EXCEL_READER_WORKSHEET', 0x10); |
|
| 32 | - |
|
| 33 | -define('SPREADSHEET_EXCEL_READER_TYPE_BOF', 0x809); |
|
| 34 | -define('SPREADSHEET_EXCEL_READER_TYPE_EOF', 0x0a); |
|
| 35 | -define('SPREADSHEET_EXCEL_READER_TYPE_BOUNDSHEET', 0x85); |
|
| 36 | -define('SPREADSHEET_EXCEL_READER_TYPE_DIMENSION', 0x200); |
|
| 37 | -define('SPREADSHEET_EXCEL_READER_TYPE_ROW', 0x208); |
|
| 38 | -define('SPREADSHEET_EXCEL_READER_TYPE_DBCELL', 0xd7); |
|
| 39 | -define('SPREADSHEET_EXCEL_READER_TYPE_FILEPASS', 0x2f); |
|
| 40 | -define('SPREADSHEET_EXCEL_READER_TYPE_NOTE', 0x1c); |
|
| 41 | -define('SPREADSHEET_EXCEL_READER_TYPE_TXO', 0x1b6); |
|
| 42 | -define('SPREADSHEET_EXCEL_READER_TYPE_RK', 0x7e); |
|
| 43 | -define('SPREADSHEET_EXCEL_READER_TYPE_RK2', 0x27e); |
|
| 44 | -define('SPREADSHEET_EXCEL_READER_TYPE_MULRK', 0xbd); |
|
| 45 | -define('SPREADSHEET_EXCEL_READER_TYPE_MULBLANK', 0xbe); |
|
| 46 | -define('SPREADSHEET_EXCEL_READER_TYPE_INDEX', 0x20b); |
|
| 47 | -define('SPREADSHEET_EXCEL_READER_TYPE_SST', 0xfc); |
|
| 48 | -define('SPREADSHEET_EXCEL_READER_TYPE_EXTSST', 0xff); |
|
| 49 | -define('SPREADSHEET_EXCEL_READER_TYPE_CONTINUE', 0x3c); |
|
| 50 | -define('SPREADSHEET_EXCEL_READER_TYPE_LABEL', 0x204); |
|
| 51 | -define('SPREADSHEET_EXCEL_READER_TYPE_LABELSST', 0xfd); |
|
| 52 | -define('SPREADSHEET_EXCEL_READER_TYPE_NUMBER', 0x203); |
|
| 53 | -define('SPREADSHEET_EXCEL_READER_TYPE_NAME', 0x18); |
|
| 54 | -define('SPREADSHEET_EXCEL_READER_TYPE_ARRAY', 0x221); |
|
| 55 | -define('SPREADSHEET_EXCEL_READER_TYPE_STRING', 0x207); |
|
| 56 | -define('SPREADSHEET_EXCEL_READER_TYPE_FORMULA', 0x406); |
|
| 57 | -define('SPREADSHEET_EXCEL_READER_TYPE_FORMULA2', 0x6); |
|
| 58 | -define('SPREADSHEET_EXCEL_READER_TYPE_FORMAT', 0x41e); |
|
| 59 | -define('SPREADSHEET_EXCEL_READER_TYPE_XF', 0xe0); |
|
| 60 | -define('SPREADSHEET_EXCEL_READER_TYPE_BOOLERR', 0x205); |
|
| 61 | -define('SPREADSHEET_EXCEL_READER_TYPE_UNKNOWN', 0xffff); |
|
| 28 | +define('SPREADSHEET_EXCEL_READER_BIFF8', 0x600); |
|
| 29 | +define('SPREADSHEET_EXCEL_READER_BIFF7', 0x500); |
|
| 30 | +define('SPREADSHEET_EXCEL_READER_WORKBOOKGLOBALS', 0x5); |
|
| 31 | +define('SPREADSHEET_EXCEL_READER_WORKSHEET', 0x10); |
|
| 32 | + |
|
| 33 | +define('SPREADSHEET_EXCEL_READER_TYPE_BOF', 0x809); |
|
| 34 | +define('SPREADSHEET_EXCEL_READER_TYPE_EOF', 0x0a); |
|
| 35 | +define('SPREADSHEET_EXCEL_READER_TYPE_BOUNDSHEET', 0x85); |
|
| 36 | +define('SPREADSHEET_EXCEL_READER_TYPE_DIMENSION', 0x200); |
|
| 37 | +define('SPREADSHEET_EXCEL_READER_TYPE_ROW', 0x208); |
|
| 38 | +define('SPREADSHEET_EXCEL_READER_TYPE_DBCELL', 0xd7); |
|
| 39 | +define('SPREADSHEET_EXCEL_READER_TYPE_FILEPASS', 0x2f); |
|
| 40 | +define('SPREADSHEET_EXCEL_READER_TYPE_NOTE', 0x1c); |
|
| 41 | +define('SPREADSHEET_EXCEL_READER_TYPE_TXO', 0x1b6); |
|
| 42 | +define('SPREADSHEET_EXCEL_READER_TYPE_RK', 0x7e); |
|
| 43 | +define('SPREADSHEET_EXCEL_READER_TYPE_RK2', 0x27e); |
|
| 44 | +define('SPREADSHEET_EXCEL_READER_TYPE_MULRK', 0xbd); |
|
| 45 | +define('SPREADSHEET_EXCEL_READER_TYPE_MULBLANK', 0xbe); |
|
| 46 | +define('SPREADSHEET_EXCEL_READER_TYPE_INDEX', 0x20b); |
|
| 47 | +define('SPREADSHEET_EXCEL_READER_TYPE_SST', 0xfc); |
|
| 48 | +define('SPREADSHEET_EXCEL_READER_TYPE_EXTSST', 0xff); |
|
| 49 | +define('SPREADSHEET_EXCEL_READER_TYPE_CONTINUE', 0x3c); |
|
| 50 | +define('SPREADSHEET_EXCEL_READER_TYPE_LABEL', 0x204); |
|
| 51 | +define('SPREADSHEET_EXCEL_READER_TYPE_LABELSST', 0xfd); |
|
| 52 | +define('SPREADSHEET_EXCEL_READER_TYPE_NUMBER', 0x203); |
|
| 53 | +define('SPREADSHEET_EXCEL_READER_TYPE_NAME', 0x18); |
|
| 54 | +define('SPREADSHEET_EXCEL_READER_TYPE_ARRAY', 0x221); |
|
| 55 | +define('SPREADSHEET_EXCEL_READER_TYPE_STRING', 0x207); |
|
| 56 | +define('SPREADSHEET_EXCEL_READER_TYPE_FORMULA', 0x406); |
|
| 57 | +define('SPREADSHEET_EXCEL_READER_TYPE_FORMULA2', 0x6); |
|
| 58 | +define('SPREADSHEET_EXCEL_READER_TYPE_FORMAT', 0x41e); |
|
| 59 | +define('SPREADSHEET_EXCEL_READER_TYPE_XF', 0xe0); |
|
| 60 | +define('SPREADSHEET_EXCEL_READER_TYPE_BOOLERR', 0x205); |
|
| 61 | +define('SPREADSHEET_EXCEL_READER_TYPE_UNKNOWN', 0xffff); |
|
| 62 | 62 | define('SPREADSHEET_EXCEL_READER_TYPE_NINETEENFOUR', 0x22); |
| 63 | -define('SPREADSHEET_EXCEL_READER_TYPE_MERGEDCELLS', 0xE5); |
|
| 63 | +define('SPREADSHEET_EXCEL_READER_TYPE_MERGEDCELLS', 0xE5); |
|
| 64 | 64 | |
| 65 | -define('SPREADSHEET_EXCEL_READER_UTCOFFSETDAYS' , 25569); |
|
| 65 | +define('SPREADSHEET_EXCEL_READER_UTCOFFSETDAYS', 25569); |
|
| 66 | 66 | define('SPREADSHEET_EXCEL_READER_UTCOFFSETDAYS1904', 24107); |
| 67 | -define('SPREADSHEET_EXCEL_READER_MSINADAY', 86400); |
|
| 67 | +define('SPREADSHEET_EXCEL_READER_MSINADAY', 86400); |
|
| 68 | 68 | //define('SPREADSHEET_EXCEL_READER_MSINADAY', 24 * 60 * 60); |
| 69 | 69 | |
| 70 | 70 | //define('SPREADSHEET_EXCEL_READER_DEF_NUM_FORMAT', "%.2f"); |
| 71 | -define('SPREADSHEET_EXCEL_READER_DEF_NUM_FORMAT', "%s"); |
|
| 71 | +define('SPREADSHEET_EXCEL_READER_DEF_NUM_FORMAT', "%s"); |
|
| 72 | 72 | |
| 73 | 73 | |
| 74 | 74 | /* |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | * @var array |
| 202 | 202 | * @access public |
| 203 | 203 | */ |
| 204 | - var $dateFormats = array ( |
|
| 204 | + var $dateFormats = array( |
|
| 205 | 205 | 0xe => "d/m/Y", |
| 206 | 206 | 0xf => "d-M-Y", |
| 207 | 207 | 0x10 => "d-M", |
@@ -222,26 +222,26 @@ discard block |
||
| 222 | 222 | * @access public |
| 223 | 223 | */ |
| 224 | 224 | var $numberFormats = array( |
| 225 | - 0x1 => "%1.0f", // "0" |
|
| 226 | - 0x2 => "%1.2f", // "0.00", |
|
| 227 | - 0x3 => "%1.0f", //"#,##0", |
|
| 228 | - 0x4 => "%1.2f", //"#,##0.00", |
|
| 229 | - 0x5 => "%1.0f", /*"$#,##0;($#,##0)",*/ |
|
| 230 | - 0x6 => '$%1.0f', /*"$#,##0;($#,##0)",*/ |
|
| 231 | - 0x7 => '$%1.2f', //"$#,##0.00;($#,##0.00)", |
|
| 232 | - 0x8 => '$%1.2f', //"$#,##0.00;($#,##0.00)", |
|
| 233 | - 0x9 => '%1.0f%%', // "0%" |
|
| 234 | - 0xa => '%1.2f%%', // "0.00%" |
|
| 235 | - 0xb => '%1.2f', // 0.00E00", |
|
| 236 | - 0x25 => '%1.0f', // "#,##0;(#,##0)", |
|
| 237 | - 0x26 => '%1.0f', //"#,##0;(#,##0)", |
|
| 238 | - 0x27 => '%1.2f', //"#,##0.00;(#,##0.00)", |
|
| 239 | - 0x28 => '%1.2f', //"#,##0.00;(#,##0.00)", |
|
| 240 | - 0x29 => '%1.0f', //"#,##0;(#,##0)", |
|
| 241 | - 0x2a => '$%1.0f', //"$#,##0;($#,##0)", |
|
| 242 | - 0x2b => '%1.2f', //"#,##0.00;(#,##0.00)", |
|
| 243 | - 0x2c => '$%1.2f', //"$#,##0.00;($#,##0.00)", |
|
| 244 | - 0x30 => '%1.0f'); //"##0.0E0"; |
|
| 225 | + 0x1 => "%1.0f", // "0" |
|
| 226 | + 0x2 => "%1.2f", // "0.00", |
|
| 227 | + 0x3 => "%1.0f", //"#,##0", |
|
| 228 | + 0x4 => "%1.2f", //"#,##0.00", |
|
| 229 | + 0x5 => "%1.0f", /*"$#,##0;($#,##0)",*/ |
|
| 230 | + 0x6 => '$%1.0f', /*"$#,##0;($#,##0)",*/ |
|
| 231 | + 0x7 => '$%1.2f', //"$#,##0.00;($#,##0.00)", |
|
| 232 | + 0x8 => '$%1.2f', //"$#,##0.00;($#,##0.00)", |
|
| 233 | + 0x9 => '%1.0f%%', // "0%" |
|
| 234 | + 0xa => '%1.2f%%', // "0.00%" |
|
| 235 | + 0xb => '%1.2f', // 0.00E00", |
|
| 236 | + 0x25 => '%1.0f', // "#,##0;(#,##0)", |
|
| 237 | + 0x26 => '%1.0f', //"#,##0;(#,##0)", |
|
| 238 | + 0x27 => '%1.2f', //"#,##0.00;(#,##0.00)", |
|
| 239 | + 0x28 => '%1.2f', //"#,##0.00;(#,##0.00)", |
|
| 240 | + 0x29 => '%1.0f', //"#,##0;(#,##0)", |
|
| 241 | + 0x2a => '$%1.0f', //"$#,##0;($#,##0)", |
|
| 242 | + 0x2b => '%1.2f', //"#,##0.00;(#,##0.00)", |
|
| 243 | + 0x2c => '$%1.2f', //"$#,##0.00;($#,##0.00)", |
|
| 244 | + 0x30 => '%1.0f'); //"##0.0E0"; |
|
| 245 | 245 | |
| 246 | 246 | // }}} |
| 247 | 247 | // {{{ Spreadsheet_Excel_Reader() |
@@ -253,7 +253,7 @@ discard block |
||
| 253 | 253 | */ |
| 254 | 254 | function Spreadsheet_Excel_Reader() |
| 255 | 255 | { |
| 256 | - $this->_ole =& new OLERead(); |
|
| 256 | + $this->_ole = & new OLERead(); |
|
| 257 | 257 | $this->setUTFEncoder('iconv'); |
| 258 | 258 | } |
| 259 | 259 | |
@@ -290,8 +290,7 @@ discard block |
||
| 290 | 290 | $this->_encoderFunction = function_exists('iconv') ? 'iconv' : ''; |
| 291 | 291 | } elseif ($encoder == 'mb') { |
| 292 | 292 | $this->_encoderFunction = function_exists('mb_convert_encoding') ? |
| 293 | - 'mb_convert_encoding' : |
|
| 294 | - ''; |
|
| 293 | + 'mb_convert_encoding' : ''; |
|
| 295 | 294 | } |
| 296 | 295 | } |
| 297 | 296 | |
@@ -376,9 +375,9 @@ discard block |
||
| 376 | 375 | $res = $this->_ole->read($sFileName); |
| 377 | 376 | |
| 378 | 377 | // oops, something goes wrong (Darko Miljanovic) |
| 379 | - if($res === false) { |
|
| 378 | + if ($res === false) { |
|
| 380 | 379 | // check error code |
| 381 | - if($this->_ole->error == 1) { |
|
| 380 | + if ($this->_ole->error == 1) { |
|
| 382 | 381 | // bad file |
| 383 | 382 | //die('The filename ' . $sFileName . ' is not readable'); |
| 384 | 383 | Display::display_header(''); |
@@ -437,11 +436,11 @@ discard block |
||
| 437 | 436 | { |
| 438 | 437 | $pos = 0; |
| 439 | 438 | |
| 440 | - $code = ord($this->data[$pos]) | ord($this->data[$pos+1])<<8; |
|
| 441 | - $length = ord($this->data[$pos+2]) | ord($this->data[$pos+3])<<8; |
|
| 439 | + $code = ord($this->data[$pos]) | ord($this->data[$pos + 1]) << 8; |
|
| 440 | + $length = ord($this->data[$pos + 2]) | ord($this->data[$pos + 3]) << 8; |
|
| 442 | 441 | |
| 443 | - $version = ord($this->data[$pos + 4]) | ord($this->data[$pos + 5])<<8; |
|
| 444 | - $substreamType = ord($this->data[$pos + 6]) | ord($this->data[$pos + 7])<<8; |
|
| 442 | + $version = ord($this->data[$pos + 4]) | ord($this->data[$pos + 5]) << 8; |
|
| 443 | + $substreamType = ord($this->data[$pos + 6]) | ord($this->data[$pos + 7]) << 8; |
|
| 445 | 444 | //echo "Start parse code=".base_convert($code,10,16)." version=".base_convert($version,10,16)." substreamType=".base_convert($substreamType,10,16).""."\n"; |
| 446 | 445 | |
| 447 | 446 | if (($version != SPREADSHEET_EXCEL_READER_BIFF8) && |
@@ -449,15 +448,15 @@ discard block |
||
| 449 | 448 | return false; |
| 450 | 449 | } |
| 451 | 450 | |
| 452 | - if ($substreamType != SPREADSHEET_EXCEL_READER_WORKBOOKGLOBALS){ |
|
| 451 | + if ($substreamType != SPREADSHEET_EXCEL_READER_WORKBOOKGLOBALS) { |
|
| 453 | 452 | return false; |
| 454 | 453 | } |
| 455 | 454 | |
| 456 | 455 | //print_r($rec); |
| 457 | 456 | $pos += $length + 4; |
| 458 | 457 | |
| 459 | - $code = ord($this->data[$pos]) | ord($this->data[$pos+1])<<8; |
|
| 460 | - $length = ord($this->data[$pos+2]) | ord($this->data[$pos+3])<<8; |
|
| 458 | + $code = ord($this->data[$pos]) | ord($this->data[$pos + 1]) << 8; |
|
| 459 | + $length = ord($this->data[$pos + 2]) | ord($this->data[$pos + 3]) << 8; |
|
| 461 | 460 | |
| 462 | 461 | while ($code != SPREADSHEET_EXCEL_READER_TYPE_EOF) { |
| 463 | 462 | switch ($code) { |
@@ -465,33 +464,33 @@ discard block |
||
| 465 | 464 | //echo "Type_SST\n"; |
| 466 | 465 | $spos = $pos + 4; |
| 467 | 466 | $limitpos = $spos + $length; |
| 468 | - $uniqueStrings = $this->_GetInt4d($this->data, $spos+4); |
|
| 467 | + $uniqueStrings = $this->_GetInt4d($this->data, $spos + 4); |
|
| 469 | 468 | $spos += 8; |
| 470 | 469 | for ($i = 0; $i < $uniqueStrings; $i++) { |
| 471 | 470 | // Read in the number of characters |
| 472 | 471 | if ($spos == $limitpos) { |
| 473 | - $opcode = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8; |
|
| 474 | - $conlength = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8; |
|
| 472 | + $opcode = ord($this->data[$spos]) | ord($this->data[$spos + 1]) << 8; |
|
| 473 | + $conlength = ord($this->data[$spos + 2]) | ord($this->data[$spos + 3]) << 8; |
|
| 475 | 474 | if ($opcode != 0x3c) { |
| 476 | 475 | return -1; |
| 477 | 476 | } |
| 478 | 477 | $spos += 4; |
| 479 | 478 | $limitpos = $spos + $conlength; |
| 480 | 479 | } |
| 481 | - $numChars = ord($this->data[$spos]) | (ord($this->data[$spos+1]) << 8); |
|
| 480 | + $numChars = ord($this->data[$spos]) | (ord($this->data[$spos + 1]) << 8); |
|
| 482 | 481 | //echo "i = $i pos = $pos numChars = $numChars "; |
| 483 | 482 | $spos += 2; |
| 484 | 483 | $optionFlags = ord($this->data[$spos]); |
| 485 | 484 | $spos++; |
| 486 | - $asciiEncoding = (($optionFlags & 0x01) == 0) ; |
|
| 487 | - $extendedString = ( ($optionFlags & 0x04) != 0); |
|
| 485 | + $asciiEncoding = (($optionFlags & 0x01) == 0); |
|
| 486 | + $extendedString = (($optionFlags & 0x04) != 0); |
|
| 488 | 487 | |
| 489 | 488 | // See if string contains formatting information |
| 490 | - $richString = ( ($optionFlags & 0x08) != 0); |
|
| 489 | + $richString = (($optionFlags & 0x08) != 0); |
|
| 491 | 490 | |
| 492 | 491 | if ($richString) { |
| 493 | 492 | // Read in the crun |
| 494 | - $formattingRuns = ord($this->data[$spos]) | (ord($this->data[$spos+1]) << 8); |
|
| 493 | + $formattingRuns = ord($this->data[$spos]) | (ord($this->data[$spos + 1]) << 8); |
|
| 495 | 494 | $spos += 2; |
| 496 | 495 | } |
| 497 | 496 | |
@@ -501,20 +500,20 @@ discard block |
||
| 501 | 500 | $spos += 4; |
| 502 | 501 | } |
| 503 | 502 | |
| 504 | - $len = ($asciiEncoding)? $numChars : $numChars*2; |
|
| 503 | + $len = ($asciiEncoding) ? $numChars : $numChars * 2; |
|
| 505 | 504 | if ($spos + $len < $limitpos) { |
| 506 | 505 | $retstr = substr($this->data, $spos, $len); |
| 507 | 506 | $spos += $len; |
| 508 | - }else{ |
|
| 507 | + } else { |
|
| 509 | 508 | // found countinue |
| 510 | 509 | $retstr = substr($this->data, $spos, $limitpos - $spos); |
| 511 | 510 | $bytesRead = $limitpos - $spos; |
| 512 | 511 | $charsLeft = $numChars - (($asciiEncoding) ? $bytesRead : ($bytesRead / 2)); |
| 513 | 512 | $spos = $limitpos; |
| 514 | 513 | |
| 515 | - while ($charsLeft > 0){ |
|
| 516 | - $opcode = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8; |
|
| 517 | - $conlength = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8; |
|
| 514 | + while ($charsLeft > 0) { |
|
| 515 | + $opcode = ord($this->data[$spos]) | ord($this->data[$spos + 1]) << 8; |
|
| 516 | + $conlength = ord($this->data[$spos + 2]) | ord($this->data[$spos + 3]) << 8; |
|
| 518 | 517 | if ($opcode != 0x3c) { |
| 519 | 518 | return -1; |
| 520 | 519 | } |
@@ -527,10 +526,10 @@ discard block |
||
| 527 | 526 | $retstr .= substr($this->data, $spos, $len); |
| 528 | 527 | $charsLeft -= $len; |
| 529 | 528 | $asciiEncoding = true; |
| 530 | - }elseif (!$asciiEncoding && ($option != 0)){ |
|
| 529 | + }elseif (!$asciiEncoding && ($option != 0)) { |
|
| 531 | 530 | $len = min($charsLeft * 2, $limitpos - $spos); // min($charsLeft, $conlength); |
| 532 | 531 | $retstr .= substr($this->data, $spos, $len); |
| 533 | - $charsLeft -= $len/2; |
|
| 532 | + $charsLeft -= $len / 2; |
|
| 534 | 533 | $asciiEncoding = false; |
| 535 | 534 | }elseif (!$asciiEncoding && ($option == 0)) { |
| 536 | 535 | // Bummer - the string starts off as Unicode, but after the |
@@ -541,7 +540,7 @@ discard block |
||
| 541 | 540 | } |
| 542 | 541 | $charsLeft -= $len; |
| 543 | 542 | $asciiEncoding = false; |
| 544 | - }else{ |
|
| 543 | + } else { |
|
| 545 | 544 | $newstr = ''; |
| 546 | 545 | for ($j = 0; $j < strlen($retstr); $j++) { |
| 547 | 546 | $newstr = $retstr[$j].chr(0); |
@@ -549,7 +548,7 @@ discard block |
||
| 549 | 548 | $retstr = $newstr; |
| 550 | 549 | $len = min($charsLeft * 2, $limitpos - $spos); // min($charsLeft, $conlength); |
| 551 | 550 | $retstr .= substr($this->data, $spos, $len); |
| 552 | - $charsLeft -= $len/2; |
|
| 551 | + $charsLeft -= $len / 2; |
|
| 553 | 552 | $asciiEncoding = false; |
| 554 | 553 | //echo "Izavrat\n"; |
| 555 | 554 | } |
@@ -561,7 +560,7 @@ discard block |
||
| 561 | 560 | //$retstr = ($asciiEncoding) ? $retstr : $this->_encodeUTF16($retstr); |
| 562 | 561 | $retstr = ($asciiEncoding) ? $this->_encodeUTF16($retstr, true) : $this->_encodeUTF16($retstr); |
| 563 | 562 | // echo "Str $i = $retstr\n"; |
| 564 | - if ($richString){ |
|
| 563 | + if ($richString) { |
|
| 565 | 564 | $spos += 4 * $formattingRuns; |
| 566 | 565 | } |
| 567 | 566 | |
@@ -572,7 +571,7 @@ discard block |
||
| 572 | 571 | //if ($retstr == 'Derby'){ |
| 573 | 572 | // echo "bb\n"; |
| 574 | 573 | //} |
| 575 | - $this->sst[]=$retstr; |
|
| 574 | + $this->sst[] = $retstr; |
|
| 576 | 575 | } |
| 577 | 576 | /*$continueRecords = array(); |
| 578 | 577 | while ($this->getNextCode() == Type_CONTINUE) { |
@@ -592,18 +591,18 @@ discard block |
||
| 592 | 591 | //echo "Type_NAME\n"; |
| 593 | 592 | break; |
| 594 | 593 | case SPREADSHEET_EXCEL_READER_TYPE_FORMAT: |
| 595 | - $indexCode = ord($this->data[$pos+4]) | ord($this->data[$pos+5]) << 8; |
|
| 594 | + $indexCode = ord($this->data[$pos + 4]) | ord($this->data[$pos + 5]) << 8; |
|
| 596 | 595 | |
| 597 | 596 | if ($version == SPREADSHEET_EXCEL_READER_BIFF8) { |
| 598 | - $numchars = ord($this->data[$pos+6]) | ord($this->data[$pos+7]) << 8; |
|
| 599 | - if (ord($this->data[$pos+8]) == 0){ |
|
| 600 | - $formatString = substr($this->data, $pos+9, $numchars); |
|
| 597 | + $numchars = ord($this->data[$pos + 6]) | ord($this->data[$pos + 7]) << 8; |
|
| 598 | + if (ord($this->data[$pos + 8]) == 0) { |
|
| 599 | + $formatString = substr($this->data, $pos + 9, $numchars); |
|
| 601 | 600 | } else { |
| 602 | - $formatString = substr($this->data, $pos+9, $numchars*2); |
|
| 601 | + $formatString = substr($this->data, $pos + 9, $numchars * 2); |
|
| 603 | 602 | } |
| 604 | 603 | } else { |
| 605 | - $numchars = ord($this->data[$pos+6]); |
|
| 606 | - $formatString = substr($this->data, $pos+7, $numchars*2); |
|
| 604 | + $numchars = ord($this->data[$pos + 6]); |
|
| 605 | + $formatString = substr($this->data, $pos + 7, $numchars * 2); |
|
| 607 | 606 | } |
| 608 | 607 | |
| 609 | 608 | $this->formatRecords[$indexCode] = $formatString; |
@@ -611,7 +610,7 @@ discard block |
||
| 611 | 610 | break; |
| 612 | 611 | case SPREADSHEET_EXCEL_READER_TYPE_XF: |
| 613 | 612 | //global $dateFormats, $numberFormats; |
| 614 | - $indexCode = ord($this->data[$pos+6]) | ord($this->data[$pos+7]) << 8; |
|
| 613 | + $indexCode = ord($this->data[$pos + 6]) | ord($this->data[$pos + 7]) << 8; |
|
| 615 | 614 | //echo "\nType.XF ".count($this->formatRecords['xfrecords'])." $indexCode "; |
| 616 | 615 | if (array_key_exists($indexCode, $this->dateFormats)) { |
| 617 | 616 | //echo "isdate ".$dateFormats[$indexCode]; |
@@ -625,9 +624,9 @@ discard block |
||
| 625 | 624 | 'type' => 'number', |
| 626 | 625 | 'format' => $this->numberFormats[$indexCode] |
| 627 | 626 | ); |
| 628 | - }else{ |
|
| 627 | + } else { |
|
| 629 | 628 | $isdate = FALSE; |
| 630 | - if ($indexCode > 0){ |
|
| 629 | + if ($indexCode > 0) { |
|
| 631 | 630 | if (isset($this->formatRecords[$indexCode])) |
| 632 | 631 | $formatstr = $this->formatRecords[$indexCode]; |
| 633 | 632 | //echo '.other.'; |
@@ -641,12 +640,12 @@ discard block |
||
| 641 | 640 | } |
| 642 | 641 | } |
| 643 | 642 | |
| 644 | - if ($isdate){ |
|
| 643 | + if ($isdate) { |
|
| 645 | 644 | $this->formatRecords['xfrecords'][] = array( |
| 646 | 645 | 'type' => 'date', |
| 647 | 646 | 'format' => $formatstr, |
| 648 | 647 | ); |
| 649 | - }else{ |
|
| 648 | + } else { |
|
| 650 | 649 | $this->formatRecords['xfrecords'][] = array( |
| 651 | 650 | 'type' => 'other', |
| 652 | 651 | 'format' => '', |
@@ -658,24 +657,24 @@ discard block |
||
| 658 | 657 | break; |
| 659 | 658 | case SPREADSHEET_EXCEL_READER_TYPE_NINETEENFOUR: |
| 660 | 659 | //echo "Type.NINETEENFOUR\n"; |
| 661 | - $this->nineteenFour = (ord($this->data[$pos+4]) == 1); |
|
| 660 | + $this->nineteenFour = (ord($this->data[$pos + 4]) == 1); |
|
| 662 | 661 | break; |
| 663 | 662 | case SPREADSHEET_EXCEL_READER_TYPE_BOUNDSHEET: |
| 664 | 663 | //echo "Type.BOUNDSHEET\n"; |
| 665 | - $rec_offset = $this->_GetInt4d($this->data, $pos+4); |
|
| 666 | - $rec_typeFlag = ord($this->data[$pos+8]); |
|
| 667 | - $rec_visibilityFlag = ord($this->data[$pos+9]); |
|
| 668 | - $rec_length = ord($this->data[$pos+10]); |
|
| 669 | - |
|
| 670 | - if ($version == SPREADSHEET_EXCEL_READER_BIFF8){ |
|
| 671 | - $chartype = ord($this->data[$pos+11]); |
|
| 672 | - if ($chartype == 0){ |
|
| 673 | - $rec_name = substr($this->data, $pos+12, $rec_length); |
|
| 664 | + $rec_offset = $this->_GetInt4d($this->data, $pos + 4); |
|
| 665 | + $rec_typeFlag = ord($this->data[$pos + 8]); |
|
| 666 | + $rec_visibilityFlag = ord($this->data[$pos + 9]); |
|
| 667 | + $rec_length = ord($this->data[$pos + 10]); |
|
| 668 | + |
|
| 669 | + if ($version == SPREADSHEET_EXCEL_READER_BIFF8) { |
|
| 670 | + $chartype = ord($this->data[$pos + 11]); |
|
| 671 | + if ($chartype == 0) { |
|
| 672 | + $rec_name = substr($this->data, $pos + 12, $rec_length); |
|
| 674 | 673 | } else { |
| 675 | - $rec_name = $this->_encodeUTF16(substr($this->data, $pos+12, $rec_length*2)); |
|
| 674 | + $rec_name = $this->_encodeUTF16(substr($this->data, $pos + 12, $rec_length * 2)); |
|
| 676 | 675 | } |
| 677 | - }elseif ($version == SPREADSHEET_EXCEL_READER_BIFF7){ |
|
| 678 | - $rec_name = substr($this->data, $pos+11, $rec_length); |
|
| 676 | + }elseif ($version == SPREADSHEET_EXCEL_READER_BIFF7) { |
|
| 677 | + $rec_name = substr($this->data, $pos + 11, $rec_length); |
|
| 679 | 678 | } |
| 680 | 679 | $this->boundsheets[] = array('name'=>$rec_name, |
| 681 | 680 | 'offset'=>$rec_offset); |
@@ -686,14 +685,14 @@ discard block |
||
| 686 | 685 | |
| 687 | 686 | //echo "Code = ".base_convert($r['code'],10,16)."\n"; |
| 688 | 687 | $pos += $length + 4; |
| 689 | - $code = ord($this->data[$pos]) | ord($this->data[$pos+1])<<8; |
|
| 690 | - $length = ord($this->data[$pos+2]) | ord($this->data[$pos+3])<<8; |
|
| 688 | + $code = ord($this->data[$pos]) | ord($this->data[$pos + 1]) << 8; |
|
| 689 | + $length = ord($this->data[$pos + 2]) | ord($this->data[$pos + 3]) << 8; |
|
| 691 | 690 | |
| 692 | 691 | //$r = &$this->nextRecord(); |
| 693 | 692 | //echo "1 Code = ".base_convert($r['code'],10,16)."\n"; |
| 694 | 693 | } |
| 695 | 694 | |
| 696 | - foreach ($this->boundsheets as $key=>$val){ |
|
| 695 | + foreach ($this->boundsheets as $key=>$val) { |
|
| 697 | 696 | $this->sn = $key; |
| 698 | 697 | $this->_parsesheet($val['offset']); |
| 699 | 698 | } |
@@ -712,30 +711,30 @@ discard block |
||
| 712 | 711 | { |
| 713 | 712 | $cont = true; |
| 714 | 713 | // read BOF |
| 715 | - $code = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8; |
|
| 716 | - $length = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8; |
|
| 714 | + $code = ord($this->data[$spos]) | ord($this->data[$spos + 1]) << 8; |
|
| 715 | + $length = ord($this->data[$spos + 2]) | ord($this->data[$spos + 3]) << 8; |
|
| 717 | 716 | |
| 718 | - $version = ord($this->data[$spos + 4]) | ord($this->data[$spos + 5])<<8; |
|
| 719 | - $substreamType = ord($this->data[$spos + 6]) | ord($this->data[$spos + 7])<<8; |
|
| 717 | + $version = ord($this->data[$spos + 4]) | ord($this->data[$spos + 5]) << 8; |
|
| 718 | + $substreamType = ord($this->data[$spos + 6]) | ord($this->data[$spos + 7]) << 8; |
|
| 720 | 719 | |
| 721 | 720 | if (($version != SPREADSHEET_EXCEL_READER_BIFF8) && ($version != SPREADSHEET_EXCEL_READER_BIFF7)) { |
| 722 | 721 | return -1; |
| 723 | 722 | } |
| 724 | 723 | |
| 725 | - if ($substreamType != SPREADSHEET_EXCEL_READER_WORKSHEET){ |
|
| 724 | + if ($substreamType != SPREADSHEET_EXCEL_READER_WORKSHEET) { |
|
| 726 | 725 | return -2; |
| 727 | 726 | } |
| 728 | 727 | //echo "Start parse code=".base_convert($code,10,16)." version=".base_convert($version,10,16)." substreamType=".base_convert($substreamType,10,16).""."\n"; |
| 729 | 728 | $spos += $length + 4; |
| 730 | 729 | //var_dump($this->formatRecords); |
| 731 | 730 | //echo "code $code $length"; |
| 732 | - while($cont) { |
|
| 731 | + while ($cont) { |
|
| 733 | 732 | //echo "mem= ".memory_get_usage()."\n"; |
| 734 | 733 | // $r = &$this->file->nextRecord(); |
| 735 | 734 | $lowcode = ord($this->data[$spos]); |
| 736 | 735 | if ($lowcode == SPREADSHEET_EXCEL_READER_TYPE_EOF) break; |
| 737 | - $code = $lowcode | ord($this->data[$spos+1])<<8; |
|
| 738 | - $length = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8; |
|
| 736 | + $code = $lowcode | ord($this->data[$spos + 1]) << 8; |
|
| 737 | + $length = ord($this->data[$spos + 2]) | ord($this->data[$spos + 3]) << 8; |
|
| 739 | 738 | $spos += 4; |
| 740 | 739 | $this->sheets[$this->sn]['maxrow'] = $this->_rowoffset - 1; |
| 741 | 740 | $this->sheets[$this->sn]['maxcol'] = $this->_coloffset - 1; |
@@ -746,29 +745,29 @@ discard block |
||
| 746 | 745 | case SPREADSHEET_EXCEL_READER_TYPE_DIMENSION: |
| 747 | 746 | //echo 'Type_DIMENSION '; |
| 748 | 747 | if (!isset($this->numRows)) { |
| 749 | - if (($length == 10) || ($version == SPREADSHEET_EXCEL_READER_BIFF7)){ |
|
| 750 | - $this->sheets[$this->sn]['numRows'] = ord($this->data[$spos+2]) | ord($this->data[$spos+3]) << 8; |
|
| 751 | - $this->sheets[$this->sn]['numCols'] = ord($this->data[$spos+6]) | ord($this->data[$spos+7]) << 8; |
|
| 748 | + if (($length == 10) || ($version == SPREADSHEET_EXCEL_READER_BIFF7)) { |
|
| 749 | + $this->sheets[$this->sn]['numRows'] = ord($this->data[$spos + 2]) | ord($this->data[$spos + 3]) << 8; |
|
| 750 | + $this->sheets[$this->sn]['numCols'] = ord($this->data[$spos + 6]) | ord($this->data[$spos + 7]) << 8; |
|
| 752 | 751 | } else { |
| 753 | - $this->sheets[$this->sn]['numRows'] = ord($this->data[$spos+4]) | ord($this->data[$spos+5]) << 8; |
|
| 754 | - $this->sheets[$this->sn]['numCols'] = ord($this->data[$spos+10]) | ord($this->data[$spos+11]) << 8; |
|
| 752 | + $this->sheets[$this->sn]['numRows'] = ord($this->data[$spos + 4]) | ord($this->data[$spos + 5]) << 8; |
|
| 753 | + $this->sheets[$this->sn]['numCols'] = ord($this->data[$spos + 10]) | ord($this->data[$spos + 11]) << 8; |
|
| 755 | 754 | } |
| 756 | 755 | } |
| 757 | 756 | //echo 'numRows '.$this->numRows.' '.$this->numCols."\n"; |
| 758 | 757 | break; |
| 759 | 758 | case SPREADSHEET_EXCEL_READER_TYPE_MERGEDCELLS: |
| 760 | - $cellRanges = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8; |
|
| 759 | + $cellRanges = ord($this->data[$spos]) | ord($this->data[$spos + 1]) << 8; |
|
| 761 | 760 | for ($i = 0; $i < $cellRanges; $i++) { |
| 762 | - $fr = ord($this->data[$spos + 8*$i + 2]) | ord($this->data[$spos + 8*$i + 3])<<8; |
|
| 763 | - $lr = ord($this->data[$spos + 8*$i + 4]) | ord($this->data[$spos + 8*$i + 5])<<8; |
|
| 764 | - $fc = ord($this->data[$spos + 8*$i + 6]) | ord($this->data[$spos + 8*$i + 7])<<8; |
|
| 765 | - $lc = ord($this->data[$spos + 8*$i + 8]) | ord($this->data[$spos + 8*$i + 9])<<8; |
|
| 761 | + $fr = ord($this->data[$spos + 8 * $i + 2]) | ord($this->data[$spos + 8 * $i + 3]) << 8; |
|
| 762 | + $lr = ord($this->data[$spos + 8 * $i + 4]) | ord($this->data[$spos + 8 * $i + 5]) << 8; |
|
| 763 | + $fc = ord($this->data[$spos + 8 * $i + 6]) | ord($this->data[$spos + 8 * $i + 7]) << 8; |
|
| 764 | + $lc = ord($this->data[$spos + 8 * $i + 8]) | ord($this->data[$spos + 8 * $i + 9]) << 8; |
|
| 766 | 765 | //$this->sheets[$this->sn]['mergedCells'][] = array($fr + 1, $fc + 1, $lr + 1, $lc + 1); |
| 767 | 766 | if ($lr - $fr > 0) { |
| 768 | - $this->sheets[$this->sn]['cellsInfo'][$fr+1][$fc+1]['rowspan'] = $lr - $fr + 1; |
|
| 767 | + $this->sheets[$this->sn]['cellsInfo'][$fr + 1][$fc + 1]['rowspan'] = $lr - $fr + 1; |
|
| 769 | 768 | } |
| 770 | 769 | if ($lc - $fc > 0) { |
| 771 | - $this->sheets[$this->sn]['cellsInfo'][$fr+1][$fc+1]['colspan'] = $lc - $fc + 1; |
|
| 770 | + $this->sheets[$this->sn]['cellsInfo'][$fr + 1][$fc + 1]['colspan'] = $lc - $fc + 1; |
|
| 772 | 771 | } |
| 773 | 772 | } |
| 774 | 773 | //echo "Merged Cells $cellRanges $lr $fr $lc $fc\n"; |
@@ -776,16 +775,16 @@ discard block |
||
| 776 | 775 | case SPREADSHEET_EXCEL_READER_TYPE_RK: |
| 777 | 776 | case SPREADSHEET_EXCEL_READER_TYPE_RK2: |
| 778 | 777 | //echo 'SPREADSHEET_EXCEL_READER_TYPE_RK'."\n"; |
| 779 | - $row = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8; |
|
| 780 | - $column = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8; |
|
| 778 | + $row = ord($this->data[$spos]) | ord($this->data[$spos + 1]) << 8; |
|
| 779 | + $column = ord($this->data[$spos + 2]) | ord($this->data[$spos + 3]) << 8; |
|
| 781 | 780 | $rknum = $this->_GetInt4d($this->data, $spos + 6); |
| 782 | 781 | $numValue = $this->_GetIEEE754($rknum); |
| 783 | 782 | //echo $numValue." "; |
| 784 | 783 | if ($this->isDate($spos)) { |
| 785 | 784 | list($string, $raw) = $this->createDate($numValue); |
| 786 | - }else{ |
|
| 785 | + } else { |
|
| 787 | 786 | $raw = $numValue; |
| 788 | - if (isset($this->_columnsFormat[$column + 1])){ |
|
| 787 | + if (isset($this->_columnsFormat[$column + 1])) { |
|
| 789 | 788 | $this->curformat = $this->_columnsFormat[$column + 1]; |
| 790 | 789 | } |
| 791 | 790 | $string = sprintf($this->curformat, $numValue * $this->multiplier); |
@@ -795,27 +794,27 @@ discard block |
||
| 795 | 794 | //echo "Type_RK $row $column $string $raw {$this->curformat}\n"; |
| 796 | 795 | break; |
| 797 | 796 | case SPREADSHEET_EXCEL_READER_TYPE_LABELSST: |
| 798 | - $row = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8; |
|
| 799 | - $column = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8; |
|
| 800 | - $xfindex = ord($this->data[$spos+4]) | ord($this->data[$spos+5])<<8; |
|
| 801 | - $index = $this->_GetInt4d($this->data, $spos + 6); |
|
| 797 | + $row = ord($this->data[$spos]) | ord($this->data[$spos + 1]) << 8; |
|
| 798 | + $column = ord($this->data[$spos + 2]) | ord($this->data[$spos + 3]) << 8; |
|
| 799 | + $xfindex = ord($this->data[$spos + 4]) | ord($this->data[$spos + 5]) << 8; |
|
| 800 | + $index = $this->_GetInt4d($this->data, $spos + 6); |
|
| 802 | 801 | //var_dump($this->sst); |
| 803 | 802 | $this->addcell($row, $column, $this->sst[$index]); |
| 804 | 803 | //echo "LabelSST $row $column $string\n"; |
| 805 | 804 | break; |
| 806 | 805 | case SPREADSHEET_EXCEL_READER_TYPE_MULRK: |
| 807 | - $row = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8; |
|
| 808 | - $colFirst = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8; |
|
| 809 | - $colLast = ord($this->data[$spos + $length - 2]) | ord($this->data[$spos + $length - 1])<<8; |
|
| 806 | + $row = ord($this->data[$spos]) | ord($this->data[$spos + 1]) << 8; |
|
| 807 | + $colFirst = ord($this->data[$spos + 2]) | ord($this->data[$spos + 3]) << 8; |
|
| 808 | + $colLast = ord($this->data[$spos + $length - 2]) | ord($this->data[$spos + $length - 1]) << 8; |
|
| 810 | 809 | $columns = $colLast - $colFirst + 1; |
| 811 | - $tmppos = $spos+4; |
|
| 810 | + $tmppos = $spos + 4; |
|
| 812 | 811 | for ($i = 0; $i < $columns; $i++) { |
| 813 | 812 | $numValue = $this->_GetIEEE754($this->_GetInt4d($this->data, $tmppos + 2)); |
| 814 | - if ($this->isDate($tmppos-4)) { |
|
| 813 | + if ($this->isDate($tmppos - 4)) { |
|
| 815 | 814 | list($string, $raw) = $this->createDate($numValue); |
| 816 | - }else{ |
|
| 815 | + } else { |
|
| 817 | 816 | $raw = $numValue; |
| 818 | - if (isset($this->_columnsFormat[$colFirst + $i + 1])){ |
|
| 817 | + if (isset($this->_columnsFormat[$colFirst + $i + 1])) { |
|
| 819 | 818 | $this->curformat = $this->_columnsFormat[$colFirst + $i + 1]; |
| 820 | 819 | } |
| 821 | 820 | $string = sprintf($this->curformat, $numValue * $this->multiplier); |
@@ -831,15 +830,15 @@ discard block |
||
| 831 | 830 | |
| 832 | 831 | break; |
| 833 | 832 | case SPREADSHEET_EXCEL_READER_TYPE_NUMBER: |
| 834 | - $row = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8; |
|
| 835 | - $column = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8; |
|
| 833 | + $row = ord($this->data[$spos]) | ord($this->data[$spos + 1]) << 8; |
|
| 834 | + $column = ord($this->data[$spos + 2]) | ord($this->data[$spos + 3]) << 8; |
|
| 836 | 835 | $tmp = unpack("ddouble", substr($this->data, $spos + 6, 8)); // It machine machine dependent |
| 837 | 836 | if ($this->isDate($spos)) { |
| 838 | 837 | list($string, $raw) = $this->createDate($tmp['double']); |
| 839 | 838 | // $this->addcell(DateRecord($r, 1)); |
| 840 | - }else{ |
|
| 839 | + } else { |
|
| 841 | 840 | //$raw = $tmp['']; |
| 842 | - if (isset($this->_columnsFormat[$column + 1])){ |
|
| 841 | + if (isset($this->_columnsFormat[$column + 1])) { |
|
| 843 | 842 | $this->curformat = $this->_columnsFormat[$column + 1]; |
| 844 | 843 | } |
| 845 | 844 | $raw = $this->createNumber($spos); |
@@ -852,16 +851,16 @@ discard block |
||
| 852 | 851 | break; |
| 853 | 852 | case SPREADSHEET_EXCEL_READER_TYPE_FORMULA: |
| 854 | 853 | case SPREADSHEET_EXCEL_READER_TYPE_FORMULA2: |
| 855 | - $row = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8; |
|
| 856 | - $column = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8; |
|
| 857 | - if ((ord($this->data[$spos+6])==0) && (ord($this->data[$spos+12])==255) && (ord($this->data[$spos+13])==255)) { |
|
| 854 | + $row = ord($this->data[$spos]) | ord($this->data[$spos + 1]) << 8; |
|
| 855 | + $column = ord($this->data[$spos + 2]) | ord($this->data[$spos + 3]) << 8; |
|
| 856 | + if ((ord($this->data[$spos + 6]) == 0) && (ord($this->data[$spos + 12]) == 255) && (ord($this->data[$spos + 13]) == 255)) { |
|
| 858 | 857 | //String formula. Result follows in a STRING record |
| 859 | 858 | //echo "FORMULA $row $column Formula with a string<br>\n"; |
| 860 | - } elseif ((ord($this->data[$spos+6])==1) && (ord($this->data[$spos+12])==255) && (ord($this->data[$spos+13])==255)) { |
|
| 859 | + } elseif ((ord($this->data[$spos + 6]) == 1) && (ord($this->data[$spos + 12]) == 255) && (ord($this->data[$spos + 13]) == 255)) { |
|
| 861 | 860 | //Boolean formula. Result is in +2; 0=false,1=true |
| 862 | - } elseif ((ord($this->data[$spos+6])==2) && (ord($this->data[$spos+12])==255) && (ord($this->data[$spos+13])==255)) { |
|
| 861 | + } elseif ((ord($this->data[$spos + 6]) == 2) && (ord($this->data[$spos + 12]) == 255) && (ord($this->data[$spos + 13]) == 255)) { |
|
| 863 | 862 | //Error formula. Error code is in +2; |
| 864 | - } elseif ((ord($this->data[$spos+6])==3) && (ord($this->data[$spos+12])==255) && (ord($this->data[$spos+13])==255)) { |
|
| 863 | + } elseif ((ord($this->data[$spos + 6]) == 3) && (ord($this->data[$spos + 12]) == 255) && (ord($this->data[$spos + 13]) == 255)) { |
|
| 865 | 864 | //Formula result is a null string. |
| 866 | 865 | } else { |
| 867 | 866 | // result is a number, so first 14 bytes are just like a _NUMBER record |
@@ -869,9 +868,9 @@ discard block |
||
| 869 | 868 | if ($this->isDate($spos)) { |
| 870 | 869 | list($string, $raw) = $this->createDate($tmp['double']); |
| 871 | 870 | // $this->addcell(DateRecord($r, 1)); |
| 872 | - }else{ |
|
| 871 | + } else { |
|
| 873 | 872 | //$raw = $tmp['']; |
| 874 | - if (isset($this->_columnsFormat[$column + 1])){ |
|
| 873 | + if (isset($this->_columnsFormat[$column + 1])) { |
|
| 875 | 874 | $this->curformat = $this->_columnsFormat[$column + 1]; |
| 876 | 875 | } |
| 877 | 876 | $raw = $this->createNumber($spos); |
@@ -884,9 +883,9 @@ discard block |
||
| 884 | 883 | } |
| 885 | 884 | break; |
| 886 | 885 | case SPREADSHEET_EXCEL_READER_TYPE_BOOLERR: |
| 887 | - $row = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8; |
|
| 888 | - $column = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8; |
|
| 889 | - $string = ord($this->data[$spos+6]); |
|
| 886 | + $row = ord($this->data[$spos]) | ord($this->data[$spos + 1]) << 8; |
|
| 887 | + $column = ord($this->data[$spos + 2]) | ord($this->data[$spos + 3]) << 8; |
|
| 888 | + $string = ord($this->data[$spos + 6]); |
|
| 890 | 889 | $this->addcell($row, $column, $string); |
| 891 | 890 | //echo 'Type_BOOLERR '."\n"; |
| 892 | 891 | break; |
@@ -895,9 +894,9 @@ discard block |
||
| 895 | 894 | case SPREADSHEET_EXCEL_READER_TYPE_MULBLANK: |
| 896 | 895 | break; |
| 897 | 896 | case SPREADSHEET_EXCEL_READER_TYPE_LABEL: |
| 898 | - $row = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8; |
|
| 899 | - $column = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8; |
|
| 900 | - $this->addcell($row, $column, substr($this->data, $spos + 8, ord($this->data[$spos + 6]) | ord($this->data[$spos + 7])<<8)); |
|
| 897 | + $row = ord($this->data[$spos]) | ord($this->data[$spos + 1]) << 8; |
|
| 898 | + $column = ord($this->data[$spos + 2]) | ord($this->data[$spos + 3]) << 8; |
|
| 899 | + $this->addcell($row, $column, substr($this->data, $spos + 8, ord($this->data[$spos + 6]) | ord($this->data[$spos + 7]) << 8)); |
|
| 901 | 900 | |
| 902 | 901 | // $this->addcell(LabelRecord($r)); |
| 903 | 902 | break; |
@@ -929,7 +928,7 @@ discard block |
||
| 929 | 928 | function isDate($spos) |
| 930 | 929 | { |
| 931 | 930 | //$xfindex = GetInt2d(, 4); |
| 932 | - $xfindex = ord($this->data[$spos+4]) | ord($this->data[$spos+5]) << 8; |
|
| 931 | + $xfindex = ord($this->data[$spos + 4]) | ord($this->data[$spos + 5]) << 8; |
|
| 933 | 932 | //echo 'check is date '.$xfindex.' '.$this->formatRecords['xfrecords'][$xfindex]['type']."\n"; |
| 934 | 933 | //var_dump($this->formatRecords['xfrecords'][$xfindex]); |
| 935 | 934 | if ($this->formatRecords['xfrecords'][$xfindex]['type'] == 'date') { |
@@ -940,10 +939,10 @@ discard block |
||
| 940 | 939 | if ($this->formatRecords['xfrecords'][$xfindex]['type'] == 'number') { |
| 941 | 940 | $this->curformat = $this->formatRecords['xfrecords'][$xfindex]['format']; |
| 942 | 941 | $this->rectype = 'number'; |
| 943 | - if (($xfindex == 0x9) || ($xfindex == 0xa)){ |
|
| 942 | + if (($xfindex == 0x9) || ($xfindex == 0xa)) { |
|
| 944 | 943 | $this->multiplier = 100; |
| 945 | 944 | } |
| 946 | - }else{ |
|
| 945 | + } else { |
|
| 947 | 946 | $this->curformat = $this->_defaultFormat; |
| 948 | 947 | $this->rectype = 'unknown'; |
| 949 | 948 | } |
@@ -968,15 +967,15 @@ discard block |
||
| 968 | 967 | { |
| 969 | 968 | if ($numValue > 1) { |
| 970 | 969 | $utcDays = $numValue - ($this->nineteenFour ? SPREADSHEET_EXCEL_READER_UTCOFFSETDAYS1904 : SPREADSHEET_EXCEL_READER_UTCOFFSETDAYS); |
| 971 | - $utcValue = round(($utcDays+1) * SPREADSHEET_EXCEL_READER_MSINADAY); |
|
| 972 | - $string = date ($this->curformat, $utcValue); |
|
| 970 | + $utcValue = round(($utcDays + 1) * SPREADSHEET_EXCEL_READER_MSINADAY); |
|
| 971 | + $string = date($this->curformat, $utcValue); |
|
| 973 | 972 | $raw = $utcValue; |
| 974 | 973 | } else { |
| 975 | 974 | $raw = $numValue; |
| 976 | 975 | $hours = floor($numValue * 24); |
| 977 | 976 | $mins = floor($numValue * 24 * 60) - $hours * 60; |
| 978 | 977 | $secs = floor($numValue * SPREADSHEET_EXCEL_READER_MSINADAY) - $hours * 60 * 60 - $mins * 60; |
| 979 | - $string = date ($this->curformat, mktime($hours, $mins, $secs)); |
|
| 978 | + $string = date($this->curformat, mktime($hours, $mins, $secs)); |
|
| 980 | 979 | } |
| 981 | 980 | |
| 982 | 981 | return array($string, $raw); |
@@ -988,15 +987,15 @@ discard block |
||
| 988 | 987 | $rknumlow = $this->_GetInt4d($this->data, $spos + 6); |
| 989 | 988 | //for ($i=0; $i<8; $i++) { echo ord($this->data[$i+$spos+6]) . " "; } echo "<br>"; |
| 990 | 989 | $sign = ($rknumhigh & 0x80000000) >> 31; |
| 991 | - $exp = ($rknumhigh & 0x7ff00000) >> 20; |
|
| 990 | + $exp = ($rknumhigh & 0x7ff00000) >> 20; |
|
| 992 | 991 | $mantissa = (0x100000 | ($rknumhigh & 0x000fffff)); |
| 993 | 992 | $mantissalow1 = ($rknumlow & 0x80000000) >> 31; |
| 994 | 993 | $mantissalow2 = ($rknumlow & 0x7fffffff); |
| 995 | - $value = $mantissa / pow( 2 , (20- ($exp - 1023))); |
|
| 996 | - if ($mantissalow1 != 0) $value += 1 / pow (2 , (21 - ($exp - 1023))); |
|
| 997 | - $value += $mantissalow2 / pow (2 , (52 - ($exp - 1023))); |
|
| 994 | + $value = $mantissa / pow(2, (20 - ($exp - 1023))); |
|
| 995 | + if ($mantissalow1 != 0) $value += 1 / pow(2, (21 - ($exp - 1023))); |
|
| 996 | + $value += $mantissalow2 / pow(2, (52 - ($exp - 1023))); |
|
| 998 | 997 | //echo "Sign = $sign, Exp = $exp, mantissahighx = $mantissa, mantissalow1 = $mantissalow1, mantissalow2 = $mantissalow2<br>\n"; |
| 999 | - if ($sign) {$value = -1 * $value;} |
|
| 998 | + if ($sign) {$value = -1 * $value; } |
|
| 1000 | 999 | return $value; |
| 1001 | 1000 | } |
| 1002 | 1001 | |
@@ -1036,8 +1035,8 @@ discard block |
||
| 1036 | 1035 | $sign = ($rknum & 0x80000000) >> 31; |
| 1037 | 1036 | $exp = ($rknum & 0x7ff00000) >> 20; |
| 1038 | 1037 | $mantissa = (0x100000 | ($rknum & 0x000ffffc)); |
| 1039 | - $value = $mantissa / pow( 2 , (20- ($exp - 1023))); |
|
| 1040 | - if ($sign) {$value = -1 * $value;} |
|
| 1038 | + $value = $mantissa / pow(2, (20 - ($exp - 1023))); |
|
| 1039 | + if ($sign) {$value = -1 * $value; } |
|
| 1041 | 1040 | //end of changes by mmp |
| 1042 | 1041 | |
| 1043 | 1042 | } |
@@ -1058,7 +1057,7 @@ discard block |
||
| 1058 | 1057 | $string = api_convert_encoding($string, $this->_defaultEncoding, $from); |
| 1059 | 1058 | return $string; |
| 1060 | 1059 | } |
| 1061 | - $string = api_convert_encoding($string, $this->_defaultEncoding, 'UTF-16LE'); |
|
| 1060 | + $string = api_convert_encoding($string, $this->_defaultEncoding, 'UTF-16LE'); |
|
| 1062 | 1061 | return $string; |
| 1063 | 1062 | /* |
| 1064 | 1063 | * Default behaviour |
@@ -1076,10 +1075,10 @@ discard block |
||
| 1076 | 1075 | |
| 1077 | 1076 | function _GetInt4d($data, $pos) |
| 1078 | 1077 | { |
| 1079 | - $value = ord($data[$pos]) | (ord($data[$pos+1]) << 8) | (ord($data[$pos+2]) << 16) | (ord($data[$pos+3]) << 24); |
|
| 1080 | - if ($value>=4294967294) |
|
| 1078 | + $value = ord($data[$pos]) | (ord($data[$pos + 1]) << 8) | (ord($data[$pos + 2]) << 16) | (ord($data[$pos + 3]) << 24); |
|
| 1079 | + if ($value >= 4294967294) |
|
| 1081 | 1080 | { |
| 1082 | - $value=-2; |
|
| 1081 | + $value = -2; |
|
| 1083 | 1082 | } |
| 1084 | 1083 | return $value; |
| 1085 | 1084 | } |
@@ -42,16 +42,16 @@ discard block |
||
| 42 | 42 | * |
| 43 | 43 | * @see HTML_QuickForm::errorMessage() |
| 44 | 44 | */ |
| 45 | -define('QUICKFORM_OK', 1); |
|
| 46 | -define('QUICKFORM_ERROR', -1); |
|
| 47 | -define('QUICKFORM_INVALID_RULE', -2); |
|
| 48 | -define('QUICKFORM_NONEXIST_ELEMENT', -3); |
|
| 49 | -define('QUICKFORM_INVALID_FILTER', -4); |
|
| 50 | -define('QUICKFORM_UNREGISTERED_ELEMENT', -5); |
|
| 51 | -define('QUICKFORM_INVALID_ELEMENT_NAME', -6); |
|
| 52 | -define('QUICKFORM_INVALID_PROCESS', -7); |
|
| 53 | -define('QUICKFORM_DEPRECATED', -8); |
|
| 54 | -define('QUICKFORM_INVALID_DATASOURCE', -9); |
|
| 45 | +define('QUICKFORM_OK', 1); |
|
| 46 | +define('QUICKFORM_ERROR', -1); |
|
| 47 | +define('QUICKFORM_INVALID_RULE', -2); |
|
| 48 | +define('QUICKFORM_NONEXIST_ELEMENT', -3); |
|
| 49 | +define('QUICKFORM_INVALID_FILTER', -4); |
|
| 50 | +define('QUICKFORM_UNREGISTERED_ELEMENT', -5); |
|
| 51 | +define('QUICKFORM_INVALID_ELEMENT_NAME', -6); |
|
| 52 | +define('QUICKFORM_INVALID_PROCESS', -7); |
|
| 53 | +define('QUICKFORM_DEPRECATED', -8); |
|
| 54 | +define('QUICKFORM_INVALID_DATASOURCE', -9); |
|
| 55 | 55 | /**#@-*/ |
| 56 | 56 | |
| 57 | 57 | // }}} |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | * @param bool $trackSubmit (optional)Whether to track if the form was submitted by adding a special hidden field |
| 230 | 230 | * @access public |
| 231 | 231 | */ |
| 232 | - public function __construct($formName='', $method='post', $action='', $target='', $attributes=null, $trackSubmit = false) |
|
| 232 | + public function __construct($formName = '', $method = 'post', $action = '', $target = '', $attributes = null, $trackSubmit = false) |
|
| 233 | 233 | { |
| 234 | 234 | parent::__construct($attributes); |
| 235 | 235 | $method = (strtoupper($method) == 'GET') ? 'get' : 'post'; |
@@ -246,9 +246,9 @@ discard block |
||
| 246 | 246 | 'id' => $form_id |
| 247 | 247 | ) + $target; |
| 248 | 248 | $this->updateAttributes($attributes); |
| 249 | - if (!$trackSubmit || isset($_REQUEST['_qf__' . $formName])) { |
|
| 249 | + if (!$trackSubmit || isset($_REQUEST['_qf__'.$formName])) { |
|
| 250 | 250 | if (1 == get_magic_quotes_gpc()) { |
| 251 | - $this->_submitValues = $this->_recursiveFilter('stripslashes', 'get' == $method? $_GET: $_POST); |
|
| 251 | + $this->_submitValues = $this->_recursiveFilter('stripslashes', 'get' == $method ? $_GET : $_POST); |
|
| 252 | 252 | foreach ($_FILES as $keyFirst => $valFirst) { |
| 253 | 253 | foreach ($valFirst as $keySecond => $valSecond) { |
| 254 | 254 | if ('name' == $keySecond) { |
@@ -259,14 +259,14 @@ discard block |
||
| 259 | 259 | } |
| 260 | 260 | } |
| 261 | 261 | } else { |
| 262 | - $this->_submitValues = 'get' == $method? $_GET: $_POST; |
|
| 262 | + $this->_submitValues = 'get' == $method ? $_GET : $_POST; |
|
| 263 | 263 | $this->_submitFiles = $_FILES; |
| 264 | 264 | } |
| 265 | 265 | $this->_flagSubmitted = count($this->_submitValues) > 0 || count($this->_submitFiles) > 0; |
| 266 | 266 | } |
| 267 | 267 | if ($trackSubmit) { |
| 268 | - unset($this->_submitValues['_qf__' . $formName]); |
|
| 269 | - $this->addElement('hidden', '_qf__' . $formName, null); |
|
| 268 | + unset($this->_submitValues['_qf__'.$formName]); |
|
| 269 | + $this->addElement('hidden', '_qf__'.$formName, null); |
|
| 270 | 270 | } |
| 271 | 271 | |
| 272 | 272 | if (preg_match('/^([0-9]+)([a-zA-Z]*)$/', ini_get('upload_max_filesize'), $matches)) { |
@@ -345,7 +345,7 @@ discard block |
||
| 345 | 345 | */ |
| 346 | 346 | public static function registerRule($ruleName, $type, $data1, $data2 = null) |
| 347 | 347 | { |
| 348 | - $registry =& HTML_QuickForm_RuleRegistry::singleton(); |
|
| 348 | + $registry = & HTML_QuickForm_RuleRegistry::singleton(); |
|
| 349 | 349 | $registry->registerRule($ruleName, $type, $data1, $data2); |
| 350 | 350 | } // end func registerRule |
| 351 | 351 | |
@@ -360,7 +360,7 @@ discard block |
||
| 360 | 360 | * @access public |
| 361 | 361 | * @return boolean |
| 362 | 362 | */ |
| 363 | - function elementExists($element=null) |
|
| 363 | + function elementExists($element = null) |
|
| 364 | 364 | { |
| 365 | 365 | return isset($this->_elementIndex[$element]); |
| 366 | 366 | } // end func elementExists |
@@ -385,7 +385,7 @@ discard block |
||
| 385 | 385 | function setDatasource(&$datasource, $defaultsFilter = null, $constantsFilter = null) |
| 386 | 386 | { |
| 387 | 387 | if (is_object($datasource)) { |
| 388 | - $this->_datasource =& $datasource; |
|
| 388 | + $this->_datasource = & $datasource; |
|
| 389 | 389 | if (is_callable(array($datasource, 'defaultValues'))) { |
| 390 | 390 | $this->setDefaults($datasource->defaultValues($this), $defaultsFilter); |
| 391 | 391 | } |
@@ -496,7 +496,7 @@ discard block |
||
| 496 | 496 | if (!$this->elementExists('MAX_FILE_SIZE')) { |
| 497 | 497 | $this->addElement('hidden', 'MAX_FILE_SIZE', $this->_maxFileSize); |
| 498 | 498 | } else { |
| 499 | - $el =& $this->getElement('MAX_FILE_SIZE'); |
|
| 499 | + $el = & $this->getElement('MAX_FILE_SIZE'); |
|
| 500 | 500 | $el->updateAttributes(array('value' => $this->_maxFileSize)); |
| 501 | 501 | } |
| 502 | 502 | } // end func setMaxFileSize |
@@ -634,7 +634,7 @@ discard block |
||
| 634 | 634 | $elementObject->onQuickFormEvent('updateValue', null, $this); |
| 635 | 635 | } else { |
| 636 | 636 | $args = func_get_args(); |
| 637 | - $elementObject =& $this->_loadElement('addElement', $element, array_slice($args, 1)); |
|
| 637 | + $elementObject = & $this->_loadElement('addElement', $element, array_slice($args, 1)); |
|
| 638 | 638 | if (PEAR::isError($elementObject)) { |
| 639 | 639 | return $elementObject; |
| 640 | 640 | } |
@@ -646,7 +646,7 @@ discard block |
||
| 646 | 646 | isset($this->_elementIndex[$elementName]) |
| 647 | 647 | ) { |
| 648 | 648 | if ($this->_elements[$this->_elementIndex[$elementName]]->getType() == $elementObject->getType()) { |
| 649 | - $this->_elements[] =& $elementObject; |
|
| 649 | + $this->_elements[] = & $elementObject; |
|
| 650 | 650 | $elKeys = array_keys($this->_elements); |
| 651 | 651 | $this->_duplicateIndex[$elementName][] = end($elKeys); |
| 652 | 652 | } else { |
@@ -661,7 +661,7 @@ discard block |
||
| 661 | 661 | return $error; |
| 662 | 662 | } |
| 663 | 663 | } else { |
| 664 | - $this->_elements[] =& $elementObject; |
|
| 664 | + $this->_elements[] = & $elementObject; |
|
| 665 | 665 | $elKeys = array_keys($this->_elements); |
| 666 | 666 | $this->_elementIndex[$elementName] = end($elKeys); |
| 667 | 667 | } |
@@ -695,7 +695,7 @@ discard block |
||
| 695 | 695 | function &insertElementBefore(&$element, $nameAfter) |
| 696 | 696 | { |
| 697 | 697 | if (!empty($this->_duplicateIndex[$nameAfter])) { |
| 698 | - $error = PEAR::raiseError(null, QUICKFORM_INVALID_ELEMENT_NAME, null, E_USER_WARNING, 'Several elements named "' . $nameAfter . '" exist in HTML_QuickForm::insertElementBefore().', 'HTML_QuickForm_Error', true); |
|
| 698 | + $error = PEAR::raiseError(null, QUICKFORM_INVALID_ELEMENT_NAME, null, E_USER_WARNING, 'Several elements named "'.$nameAfter.'" exist in HTML_QuickForm::insertElementBefore().', 'HTML_QuickForm_Error', true); |
|
| 699 | 699 | return $error; |
| 700 | 700 | } elseif (!$this->elementExists($nameAfter)) { |
| 701 | 701 | $error = PEAR::raiseError(null, QUICKFORM_NONEXIST_ELEMENT, null, E_USER_WARNING, "Element '$nameAfter' does not exist in HTML_QuickForm::insertElementBefore()", 'HTML_QuickForm_Error', true); |
@@ -717,7 +717,7 @@ discard block |
||
| 717 | 717 | for ($i = end($elKeys); $i >= $targetIdx; $i--) { |
| 718 | 718 | if (isset($this->_elements[$i])) { |
| 719 | 719 | $currentName = $this->_elements[$i]->getName(); |
| 720 | - $this->_elements[$i + 1] =& $this->_elements[$i]; |
|
| 720 | + $this->_elements[$i + 1] = & $this->_elements[$i]; |
|
| 721 | 721 | if ($this->_elementIndex[$currentName] == $i) { |
| 722 | 722 | $this->_elementIndex[$currentName] = $i + 1; |
| 723 | 723 | } else { |
@@ -728,7 +728,7 @@ discard block |
||
| 728 | 728 | } |
| 729 | 729 | } |
| 730 | 730 | // Put the element in place finally |
| 731 | - $this->_elements[$targetIdx] =& $element; |
|
| 731 | + $this->_elements[$targetIdx] = & $element; |
|
| 732 | 732 | if (!$duplicate) { |
| 733 | 733 | $this->_elementIndex[$elementName] = $targetIdx; |
| 734 | 734 | } else { |
@@ -759,12 +759,12 @@ discard block |
||
| 759 | 759 | * @access public |
| 760 | 760 | * @throws HTML_QuickForm_Error |
| 761 | 761 | */ |
| 762 | - function &addGroup($elements, $name=null, $groupLabel='', $separator=null, $appendName = true) |
|
| 762 | + function &addGroup($elements, $name = null, $groupLabel = '', $separator = null, $appendName = true) |
|
| 763 | 763 | { |
| 764 | 764 | static $anonGroups = 1; |
| 765 | 765 | |
| 766 | 766 | if (0 == strlen($name)) { |
| 767 | - $name = 'qf_group_' . $anonGroups++; |
|
| 767 | + $name = 'qf_group_'.$anonGroups++; |
|
| 768 | 768 | $appendName = false; |
| 769 | 769 | } |
| 770 | 770 | $group = & $this->addElement('group', $name, $groupLabel, $elements, $separator, $appendName); |
@@ -821,7 +821,7 @@ discard block |
||
| 821 | 821 | if (is_array($value)) { |
| 822 | 822 | $value[] = $v; |
| 823 | 823 | } else { |
| 824 | - $value = (null === $value)? $v: array($value, $v); |
|
| 824 | + $value = (null === $value) ? $v : array($value, $v); |
|
| 825 | 825 | } |
| 826 | 826 | } |
| 827 | 827 | } |
@@ -844,7 +844,7 @@ discard block |
||
| 844 | 844 | { |
| 845 | 845 | $value = null; |
| 846 | 846 | if (isset($this->_submitValues[$elementName]) || isset($this->_submitFiles[$elementName])) { |
| 847 | - $value = isset($this->_submitValues[$elementName])? $this->_submitValues[$elementName]: array(); |
|
| 847 | + $value = isset($this->_submitValues[$elementName]) ? $this->_submitValues[$elementName] : array(); |
|
| 848 | 848 | if (is_array($value) && isset($this->_submitFiles[$elementName])) { |
| 849 | 849 | foreach ($this->_submitFiles[$elementName] as $k => $v) { |
| 850 | 850 | $value = HTML_QuickForm::arrayMerge($value, $this->_reindexFiles($this->_submitFiles[$elementName][$k], $k)); |
@@ -859,34 +859,34 @@ discard block |
||
| 859 | 859 | array('\\', '\''), array('\\\\', '\\\''), |
| 860 | 860 | substr($elementName, 0, $pos) |
| 861 | 861 | ); |
| 862 | - $idx = "['" . str_replace( |
|
| 862 | + $idx = "['".str_replace( |
|
| 863 | 863 | array('\\', '\'', ']', '['), array('\\\\', '\\\'', '', "']['"), |
| 864 | 864 | substr($elementName, $pos + 1, -1) |
| 865 | - ) . "']"; |
|
| 865 | + )."']"; |
|
| 866 | 866 | if (isset($this->_submitValues[$base])) { |
| 867 | 867 | $value = eval("return (isset(\$this->_submitValues['{$base}']{$idx})) ? \$this->_submitValues['{$base}']{$idx} : null;"); |
| 868 | 868 | } |
| 869 | 869 | |
| 870 | 870 | if ((is_array($value) || null === $value) && isset($this->_submitFiles[$base])) { |
| 871 | 871 | $props = array('name', 'type', 'size', 'tmp_name', 'error'); |
| 872 | - $code = "if (!isset(\$this->_submitFiles['{$base}']['name']{$idx})) {\n" . |
|
| 873 | - " return null;\n" . |
|
| 874 | - "} else {\n" . |
|
| 872 | + $code = "if (!isset(\$this->_submitFiles['{$base}']['name']{$idx})) {\n". |
|
| 873 | + " return null;\n". |
|
| 874 | + "} else {\n". |
|
| 875 | 875 | " \$v = array();\n"; |
| 876 | 876 | foreach ($props as $prop) { |
| 877 | 877 | $code .= " \$v = HTML_QuickForm::arrayMerge(\$v, \$this->_reindexFiles(\$this->_submitFiles['{$base}']['{$prop}']{$idx}, '{$prop}'));\n"; |
| 878 | 878 | } |
| 879 | - $fileValue = eval($code . " return \$v;\n}\n"); |
|
| 879 | + $fileValue = eval($code." return \$v;\n}\n"); |
|
| 880 | 880 | if (null !== $fileValue) { |
| 881 | - $value = null === $value? $fileValue: HTML_QuickForm::arrayMerge($value, $fileValue); |
|
| 881 | + $value = null === $value ? $fileValue : HTML_QuickForm::arrayMerge($value, $fileValue); |
|
| 882 | 882 | } |
| 883 | 883 | } |
| 884 | 884 | } |
| 885 | 885 | |
| 886 | 886 | // This is only supposed to work for groups with appendName = false |
| 887 | 887 | if (null === $value && 'group' == $this->getElementType($elementName)) { |
| 888 | - $group =& $this->getElement($elementName); |
|
| 889 | - $elements =& $group->getElements(); |
|
| 888 | + $group = & $this->getElement($elementName); |
|
| 889 | + $elements = & $group->getElements(); |
|
| 890 | 890 | foreach (array_keys($elements) as $key) { |
| 891 | 891 | $name = $group->getElementName($key); |
| 892 | 892 | // prevent endless recursion in case of radios and such |
@@ -1049,7 +1049,7 @@ discard block |
||
| 1049 | 1049 | $error = PEAR::raiseError(null, QUICKFORM_NONEXIST_ELEMENT, null, E_USER_WARNING, "Element '$elementName' does not exist in HTML_QuickForm::removeElement()", 'HTML_QuickForm_Error', true); |
| 1050 | 1050 | return $error; |
| 1051 | 1051 | } |
| 1052 | - $el =& $this->_elements[$this->_elementIndex[$elementName]]; |
|
| 1052 | + $el = & $this->_elements[$this->_elementIndex[$elementName]]; |
|
| 1053 | 1053 | unset($this->_elements[$this->_elementIndex[$elementName]]); |
| 1054 | 1054 | if (empty($this->_duplicateIndex[$elementName])) { |
| 1055 | 1055 | unset($this->_elementIndex[$elementName]); |
@@ -1148,7 +1148,7 @@ discard block |
||
| 1148 | 1148 | $this->_rules[$element] = array(); |
| 1149 | 1149 | } |
| 1150 | 1150 | if ($validation == 'client') { |
| 1151 | - $this->updateAttributes(array('onsubmit' => 'try { var myValidator = validate_' . $this->_attributes['id'] . '; } catch(e) { return true; } return myValidator(this);')); |
|
| 1151 | + $this->updateAttributes(array('onsubmit' => 'try { var myValidator = validate_'.$this->_attributes['id'].'; } catch(e) { return true; } return myValidator(this);')); |
|
| 1152 | 1152 | } |
| 1153 | 1153 | $this->_rules[$element][] = array( |
| 1154 | 1154 | 'type' => $type, |
@@ -1181,20 +1181,20 @@ discard block |
||
| 1181 | 1181 | * @access public |
| 1182 | 1182 | * @throws HTML_QuickForm_Error |
| 1183 | 1183 | */ |
| 1184 | - function addGroupRule($group, $arg1, $type='', $format=null, $howmany=0, $validation = 'server', $reset = false) |
|
| 1184 | + function addGroupRule($group, $arg1, $type = '', $format = null, $howmany = 0, $validation = 'server', $reset = false) |
|
| 1185 | 1185 | { |
| 1186 | 1186 | if (!$this->elementExists($group)) { |
| 1187 | 1187 | return PEAR::raiseError(null, QUICKFORM_NONEXIST_ELEMENT, null, E_USER_WARNING, "Group '$group' does not exist in HTML_QuickForm::addGroupRule()", 'HTML_QuickForm_Error', true); |
| 1188 | 1188 | } |
| 1189 | 1189 | |
| 1190 | - $groupObj =& $this->getElement($group); |
|
| 1190 | + $groupObj = & $this->getElement($group); |
|
| 1191 | 1191 | if (is_array($arg1)) { |
| 1192 | 1192 | $required = 0; |
| 1193 | 1193 | foreach ($arg1 as $elementIndex => $rules) { |
| 1194 | 1194 | $elementName = $groupObj->getElementName($elementIndex); |
| 1195 | 1195 | foreach ($rules as $rule) { |
| 1196 | 1196 | $format = (isset($rule[2])) ? $rule[2] : null; |
| 1197 | - $validation = (isset($rule[3]) && 'client' == $rule[3])? 'client': 'server'; |
|
| 1197 | + $validation = (isset($rule[3]) && 'client' == $rule[3]) ? 'client' : 'server'; |
|
| 1198 | 1198 | $reset = isset($rule[4]) && $rule[4]; |
| 1199 | 1199 | $type = $rule[1]; |
| 1200 | 1200 | if (false === ($newName = $this->isRuleRegistered($type, true))) { |
@@ -1218,7 +1218,7 @@ discard block |
||
| 1218 | 1218 | $required++; |
| 1219 | 1219 | } |
| 1220 | 1220 | if ('client' == $validation) { |
| 1221 | - $this->updateAttributes(array('onsubmit' => 'try { var myValidator = validate_' . $this->_attributes['id'] . '; } catch(e) { return true; } return myValidator(this);')); |
|
| 1221 | + $this->updateAttributes(array('onsubmit' => 'try { var myValidator = validate_'.$this->_attributes['id'].'; } catch(e) { return true; } return myValidator(this);')); |
|
| 1222 | 1222 | } |
| 1223 | 1223 | } |
| 1224 | 1224 | } |
@@ -1255,7 +1255,7 @@ discard block |
||
| 1255 | 1255 | $this->_required[] = $group; |
| 1256 | 1256 | } |
| 1257 | 1257 | if ($validation == 'client') { |
| 1258 | - $this->updateAttributes(array('onsubmit' => 'try { var myValidator = validate_' . $this->_attributes['id'] . '; } catch(e) { return true; } return myValidator(this);')); |
|
| 1258 | + $this->updateAttributes(array('onsubmit' => 'try { var myValidator = validate_'.$this->_attributes['id'].'; } catch(e) { return true; } return myValidator(this);')); |
|
| 1259 | 1259 | } |
| 1260 | 1260 | } |
| 1261 | 1261 | } // end func addGroupRule |
@@ -1312,10 +1312,10 @@ discard block |
||
| 1312 | 1312 | if (false === strpos($elName, '[')) { |
| 1313 | 1313 | $this->_submitValues[$elName] = $this->_recursiveFilter($filter, $value); |
| 1314 | 1314 | } else { |
| 1315 | - $idx = "['" . str_replace( |
|
| 1315 | + $idx = "['".str_replace( |
|
| 1316 | 1316 | array('\\', '\'', ']', '['), array('\\\\', '\\\'', '', "']['"), |
| 1317 | 1317 | $elName |
| 1318 | - ) . "']"; |
|
| 1318 | + )."']"; |
|
| 1319 | 1319 | eval("\$this->_submitValues{$idx} = \$this->_recursiveFilter(\$filter, \$value);"); |
| 1320 | 1320 | } |
| 1321 | 1321 | } |
@@ -1435,7 +1435,7 @@ discard block |
||
| 1435 | 1435 | } |
| 1436 | 1436 | $ruleName = false; |
| 1437 | 1437 | if (is_object($name) && is_a($name, 'html_quickform_rule')) { |
| 1438 | - $ruleName = !empty($name->name)? $name->name: strtolower(get_class($name)); |
|
| 1438 | + $ruleName = !empty($name->name) ? $name->name : strtolower(get_class($name)); |
|
| 1439 | 1439 | } elseif (is_string($name) && class_exists($name)) { |
| 1440 | 1440 | $parent = strtolower($name); |
| 1441 | 1441 | do { |
@@ -1446,7 +1446,7 @@ discard block |
||
| 1446 | 1446 | } while ($parent = get_parent_class($parent)); |
| 1447 | 1447 | } |
| 1448 | 1448 | if ($ruleName) { |
| 1449 | - $registry =& HTML_QuickForm_RuleRegistry::singleton(); |
|
| 1449 | + $registry = & HTML_QuickForm_RuleRegistry::singleton(); |
|
| 1450 | 1450 | $registry->registerRule($ruleName, null, $name); |
| 1451 | 1451 | } |
| 1452 | 1452 | return $ruleName; |
@@ -1570,7 +1570,7 @@ discard block |
||
| 1570 | 1570 | return false; |
| 1571 | 1571 | } |
| 1572 | 1572 | |
| 1573 | - $registry =& HTML_QuickForm_RuleRegistry::singleton(); |
|
| 1573 | + $registry = & HTML_QuickForm_RuleRegistry::singleton(); |
|
| 1574 | 1574 | |
| 1575 | 1575 | foreach ($this->_rules as $target => $rules) { |
| 1576 | 1576 | $submitValue = $this->getSubmitValue($target); |
@@ -1601,10 +1601,10 @@ discard block |
||
| 1601 | 1601 | array('\\', '\''), array('\\\\', '\\\''), |
| 1602 | 1602 | substr($target, 0, $pos) |
| 1603 | 1603 | ); |
| 1604 | - $idx = "['" . str_replace( |
|
| 1604 | + $idx = "['".str_replace( |
|
| 1605 | 1605 | array('\\', '\'', ']', '['), array('\\\\', '\\\'', '', "']['"), |
| 1606 | 1606 | substr($target, $pos + 1, -1) |
| 1607 | - ) . "']"; |
|
| 1607 | + )."']"; |
|
| 1608 | 1608 | eval("\$isUpload = isset(\$this->_submitFiles['{$base}']['name']{$idx});"); |
| 1609 | 1609 | } |
| 1610 | 1610 | if ($isUpload && (!isset($submitValue['error']) || UPLOAD_ERR_NO_FILE == $submitValue['error'])) { |
@@ -1624,7 +1624,7 @@ discard block |
||
| 1624 | 1624 | $result = $registry->validate($rule['type'], $submitValue, $rule['format'], false); |
| 1625 | 1625 | } |
| 1626 | 1626 | |
| 1627 | - if (!$result || (!empty($rule['howmany']) && $rule['howmany'] > (int)$result)) { |
|
| 1627 | + if (!$result || (!empty($rule['howmany']) && $rule['howmany'] > (int) $result)) { |
|
| 1628 | 1628 | if (isset($rule['group'])) { |
| 1629 | 1629 | $this->_errors[$rule['group']] = $rule['message']; |
| 1630 | 1630 | } else { |
@@ -1659,7 +1659,7 @@ discard block |
||
| 1659 | 1659 | * @access public |
| 1660 | 1660 | * @throws HTML_QuickForm_Error |
| 1661 | 1661 | */ |
| 1662 | - function freeze($elementList=null) |
|
| 1662 | + function freeze($elementList = null) |
|
| 1663 | 1663 | { |
| 1664 | 1664 | if (!isset($elementList)) { |
| 1665 | 1665 | $this->_freezeAll = true; |
@@ -1680,7 +1680,7 @@ discard block |
||
| 1680 | 1680 | } |
| 1681 | 1681 | |
| 1682 | 1682 | if (!empty($elementList)) { |
| 1683 | - return PEAR::raiseError(null, QUICKFORM_NONEXIST_ELEMENT, null, E_USER_WARNING, "Nonexistant element(s): '" . implode("', '", array_keys($elementList)) . "' in HTML_QuickForm::freeze()", 'HTML_QuickForm_Error', true); |
|
| 1683 | + return PEAR::raiseError(null, QUICKFORM_NONEXIST_ELEMENT, null, E_USER_WARNING, "Nonexistant element(s): '".implode("', '", array_keys($elementList))."' in HTML_QuickForm::freeze()", 'HTML_QuickForm_Error', true); |
|
| 1684 | 1684 | } |
| 1685 | 1685 | return true; |
| 1686 | 1686 | } // end func freeze |
@@ -1736,7 +1736,7 @@ discard block |
||
| 1736 | 1736 | function accept(&$renderer) { |
| 1737 | 1737 | $renderer->startForm($this); |
| 1738 | 1738 | foreach (array_keys($this->_elements) as $key) { |
| 1739 | - $element =& $this->_elements[$key]; |
|
| 1739 | + $element = & $this->_elements[$key]; |
|
| 1740 | 1740 | $elementName = $element->getName(); |
| 1741 | 1741 | $required = ($this->isElementRequired($elementName) && !$element->isFrozen()); |
| 1742 | 1742 | $error = $this->getElementError($elementName); |
@@ -1782,7 +1782,7 @@ discard block |
||
| 1782 | 1782 | if (!is_null($in_data)) { |
| 1783 | 1783 | $this->addElement('html', $in_data); |
| 1784 | 1784 | } |
| 1785 | - $renderer =& $this->defaultRenderer(); |
|
| 1785 | + $renderer = & $this->defaultRenderer(); |
|
| 1786 | 1786 | $this->accept($renderer); |
| 1787 | 1787 | |
| 1788 | 1788 | return $renderer->toHtml(); |
@@ -1804,7 +1804,7 @@ discard block |
||
| 1804 | 1804 | return ''; |
| 1805 | 1805 | } |
| 1806 | 1806 | |
| 1807 | - $registry =& HTML_QuickForm_RuleRegistry::singleton(); |
|
| 1807 | + $registry = & HTML_QuickForm_RuleRegistry::singleton(); |
|
| 1808 | 1808 | $test = array(); |
| 1809 | 1809 | $js_escape = array( |
| 1810 | 1810 | "\r" => '\r', |
@@ -1820,30 +1820,30 @@ discard block |
||
| 1820 | 1820 | if ('client' == $rule['validation']) { |
| 1821 | 1821 | unset($element); |
| 1822 | 1822 | |
| 1823 | - $dependent = isset($rule['dependent']) && is_array($rule['dependent']); |
|
| 1823 | + $dependent = isset($rule['dependent']) && is_array($rule['dependent']); |
|
| 1824 | 1824 | $rule['message'] = strtr($rule['message'], $js_escape); |
| 1825 | 1825 | |
| 1826 | 1826 | if (isset($rule['group'])) { |
| 1827 | - $group =& $this->getElement($rule['group']); |
|
| 1827 | + $group = & $this->getElement($rule['group']); |
|
| 1828 | 1828 | // No JavaScript validation for frozen elements |
| 1829 | 1829 | if ($group->isFrozen()) { |
| 1830 | 1830 | continue 2; |
| 1831 | 1831 | } |
| 1832 | - $elements =& $group->getElements(); |
|
| 1832 | + $elements = & $group->getElements(); |
|
| 1833 | 1833 | foreach (array_keys($elements) as $key) { |
| 1834 | 1834 | if ($elementName == $group->getElementName($key)) { |
| 1835 | - $element =& $elements[$key]; |
|
| 1835 | + $element = & $elements[$key]; |
|
| 1836 | 1836 | break; |
| 1837 | 1837 | } |
| 1838 | 1838 | } |
| 1839 | 1839 | } elseif ($dependent) { |
| 1840 | - $element = array(); |
|
| 1841 | - $element[] =& $this->getElement($elementName); |
|
| 1840 | + $element = array(); |
|
| 1841 | + $element[] = & $this->getElement($elementName); |
|
| 1842 | 1842 | foreach ($rule['dependent'] as $elName) { |
| 1843 | - $element[] =& $this->getElement($elName); |
|
| 1843 | + $element[] = & $this->getElement($elName); |
|
| 1844 | 1844 | } |
| 1845 | 1845 | } else { |
| 1846 | - $element =& $this->getElement($elementName); |
|
| 1846 | + $element = & $this->getElement($elementName); |
|
| 1847 | 1847 | } |
| 1848 | 1848 | // No JavaScript validation for frozen elements |
| 1849 | 1849 | if (is_object($element) && $element->isFrozen()) { |
@@ -1862,23 +1862,23 @@ discard block |
||
| 1862 | 1862 | } |
| 1863 | 1863 | if (count($test) > 0) { |
| 1864 | 1864 | return |
| 1865 | - "\n<script type=\"text/javascript\">\n" . |
|
| 1866 | - "//<![CDATA[\n" . |
|
| 1867 | - "function validate_" . $this->_attributes['id'] . "(frm) {\n" . |
|
| 1868 | - " var value = '';\n" . |
|
| 1869 | - " var errFlag = new Array();\n" . |
|
| 1870 | - " var _qfGroups = {};\n" . |
|
| 1871 | - " _qfMsg = '';\n\n" . |
|
| 1872 | - join("\n", $test) . |
|
| 1873 | - "\n if (_qfMsg != '') {\n" . |
|
| 1874 | - " _qfMsg = '" . strtr($this->_jsPrefix, $js_escape) . "' + _qfMsg;\n" . |
|
| 1875 | - " _qfMsg = _qfMsg + '\\n" . strtr($this->_jsPostfix, $js_escape) . "';\n" . |
|
| 1876 | - " alert(_qfMsg);\n" . |
|
| 1877 | - " return false;\n" . |
|
| 1878 | - " }\n" . |
|
| 1879 | - " return true;\n" . |
|
| 1880 | - "}\n" . |
|
| 1881 | - "//]]>\n" . |
|
| 1865 | + "\n<script type=\"text/javascript\">\n". |
|
| 1866 | + "//<![CDATA[\n". |
|
| 1867 | + "function validate_".$this->_attributes['id']."(frm) {\n". |
|
| 1868 | + " var value = '';\n". |
|
| 1869 | + " var errFlag = new Array();\n". |
|
| 1870 | + " var _qfGroups = {};\n". |
|
| 1871 | + " _qfMsg = '';\n\n". |
|
| 1872 | + join("\n", $test). |
|
| 1873 | + "\n if (_qfMsg != '') {\n". |
|
| 1874 | + " _qfMsg = '".strtr($this->_jsPrefix, $js_escape)."' + _qfMsg;\n". |
|
| 1875 | + " _qfMsg = _qfMsg + '\\n".strtr($this->_jsPostfix, $js_escape)."';\n". |
|
| 1876 | + " alert(_qfMsg);\n". |
|
| 1877 | + " return false;\n". |
|
| 1878 | + " }\n". |
|
| 1879 | + " return true;\n". |
|
| 1880 | + "}\n". |
|
| 1881 | + "//]]>\n". |
|
| 1882 | 1882 | "</script>"; |
| 1883 | 1883 | } |
| 1884 | 1884 | return ''; |
@@ -1897,7 +1897,7 @@ discard block |
||
| 1897 | 1897 | */ |
| 1898 | 1898 | function getSubmitValues($mergeFiles = false) |
| 1899 | 1899 | { |
| 1900 | - return $mergeFiles? HTML_QuickForm::arrayMerge($this->_submitValues, $this->_submitFiles): $this->_submitValues; |
|
| 1900 | + return $mergeFiles ? HTML_QuickForm::arrayMerge($this->_submitValues, $this->_submitFiles) : $this->_submitValues; |
|
| 1901 | 1901 | } // end func getSubmitValues |
| 1902 | 1902 | |
| 1903 | 1903 | // }}} |
@@ -1951,7 +1951,7 @@ discard block |
||
| 1951 | 1951 | if (is_array($value)) { |
| 1952 | 1952 | $value[] = $v; |
| 1953 | 1953 | } else { |
| 1954 | - $value = (null === $value)? $v: array($value, $v); |
|
| 1954 | + $value = (null === $value) ? $v : array($value, $v); |
|
| 1955 | 1955 | } |
| 1956 | 1956 | } |
| 1957 | 1957 | } |
@@ -164,8 +164,8 @@ discard block |
||
| 164 | 164 | */ |
| 165 | 165 | function HTML_Table($attributes = null, $tabOffset = 0, $useTGroups = false) |
| 166 | 166 | { |
| 167 | - parent::__construct($attributes, (int)$tabOffset); |
|
| 168 | - $this->_useTGroups = (boolean)$useTGroups; |
|
| 167 | + parent::__construct($attributes, (int) $tabOffset); |
|
| 168 | + $this->_useTGroups = (boolean) $useTGroups; |
|
| 169 | 169 | $this->addBody(); |
| 170 | 170 | if ($this->_useTGroups) { |
| 171 | 171 | $this->_thead = new HTML_Table_Storage($tabOffset, $this->_useTGroups); |
@@ -272,12 +272,12 @@ discard block |
||
| 272 | 272 | function _adjustTbodyCount($body, $method) |
| 273 | 273 | { |
| 274 | 274 | if ($this->_autoGrow) { |
| 275 | - while ($this->_tbodyCount <= (int)$body) { |
|
| 275 | + while ($this->_tbodyCount <= (int) $body) { |
|
| 276 | 276 | $this->addBody(); |
| 277 | 277 | } |
| 278 | 278 | } else { |
| 279 | - return PEAR::raiseError('Invalid body reference[' . |
|
| 280 | - $body . '] in HTML_Table::' . $method); |
|
| 279 | + return PEAR::raiseError('Invalid body reference['. |
|
| 280 | + $body.'] in HTML_Table::'.$method); |
|
| 281 | 281 | } |
| 282 | 282 | } |
| 283 | 283 | |
@@ -939,26 +939,26 @@ discard block |
||
| 939 | 939 | $tBodyMaxColCount = max($tBodyColCounts); |
| 940 | 940 | } |
| 941 | 941 | if ($this->_comment) { |
| 942 | - $strHtml .= $tabs . "<!-- $this->_comment -->" . $lnEnd; |
|
| 942 | + $strHtml .= $tabs."<!-- $this->_comment -->".$lnEnd; |
|
| 943 | 943 | } |
| 944 | 944 | if ($this->getRowCount() > 0 && $tBodyMaxColCount > 0) { |
| 945 | 945 | $strHtml .= |
| 946 | - $tabs . '<table' . $this->_getAttrString($this->_attributes) . '>' . $lnEnd; |
|
| 946 | + $tabs.'<table'.$this->_getAttrString($this->_attributes).'>'.$lnEnd; |
|
| 947 | 947 | if (!empty($this->_caption)) { |
| 948 | 948 | $attr = $this->_caption['attr']; |
| 949 | 949 | $contents = $this->_caption['contents']; |
| 950 | - $strHtml .= $tabs . $tab . '<caption' . $this->_getAttrString($attr) . '>'; |
|
| 950 | + $strHtml .= $tabs.$tab.'<caption'.$this->_getAttrString($attr).'>'; |
|
| 951 | 951 | if (is_array($contents)) { |
| 952 | 952 | $contents = implode(', ', $contents); |
| 953 | 953 | } |
| 954 | 954 | $strHtml .= $contents; |
| 955 | - $strHtml .= '</caption>' . $lnEnd; |
|
| 955 | + $strHtml .= '</caption>'.$lnEnd; |
|
| 956 | 956 | } |
| 957 | 957 | if (!empty($this->_colgroup)) { |
| 958 | 958 | foreach ($this->_colgroup as $g => $col) { |
| 959 | 959 | $attr = $this->_colgroup[$g]['attr']; |
| 960 | 960 | $contents = $this->_colgroup[$g]['contents']; |
| 961 | - $strHtml .= $tabs . $tab . '<colgroup' . $this->_getAttrString($attr) . '>'; |
|
| 961 | + $strHtml .= $tabs.$tab.'<colgroup'.$this->_getAttrString($attr).'>'; |
|
| 962 | 962 | if (!empty($contents)) { |
| 963 | 963 | $strHtml .= $lnEnd; |
| 964 | 964 | if (!is_array($contents)) { |
@@ -966,11 +966,11 @@ discard block |
||
| 966 | 966 | } |
| 967 | 967 | foreach ($contents as $a => $colAttr) { |
| 968 | 968 | $attr = $this->_parseAttributes($colAttr); |
| 969 | - $strHtml .= $tabs . $tab . $tab . '<col' . $this->_getAttrString($attr) . ' />' . $lnEnd; |
|
| 969 | + $strHtml .= $tabs.$tab.$tab.'<col'.$this->_getAttrString($attr).' />'.$lnEnd; |
|
| 970 | 970 | } |
| 971 | - $strHtml .= $tabs . $tab; |
|
| 971 | + $strHtml .= $tabs.$tab; |
|
| 972 | 972 | } |
| 973 | - $strHtml .= '</colgroup>' . $lnEnd; |
|
| 973 | + $strHtml .= '</colgroup>'.$lnEnd; |
|
| 974 | 974 | } |
| 975 | 975 | } |
| 976 | 976 | if ($this->_useTGroups) { |
@@ -986,31 +986,31 @@ discard block |
||
| 986 | 986 | if ($this->_thead !== null) { |
| 987 | 987 | $this->_thead->setColCount($maxColCount); |
| 988 | 988 | if ($this->_thead->getRowCount() > 0) { |
| 989 | - $strHtml .= $tabs . $tab . '<thead' . |
|
| 990 | - $this->_getAttrString($this->_thead->_attributes) . |
|
| 991 | - '>' . $lnEnd; |
|
| 989 | + $strHtml .= $tabs.$tab.'<thead'. |
|
| 990 | + $this->_getAttrString($this->_thead->_attributes). |
|
| 991 | + '>'.$lnEnd; |
|
| 992 | 992 | $strHtml .= $this->_thead->toHtml($tabs, $tab); |
| 993 | - $strHtml .= $tabs . $tab . '</thead>' . $lnEnd; |
|
| 993 | + $strHtml .= $tabs.$tab.'</thead>'.$lnEnd; |
|
| 994 | 994 | } |
| 995 | 995 | } |
| 996 | 996 | if ($this->_tfoot !== null) { |
| 997 | 997 | $this->_tfoot->setColCount($maxColCount); |
| 998 | 998 | if ($this->_tfoot->getRowCount() > 0) { |
| 999 | - $strHtml .= $tabs . $tab . '<tfoot' . |
|
| 1000 | - $this->_getAttrString($this->_tfoot->_attributes) . |
|
| 1001 | - '>' . $lnEnd; |
|
| 999 | + $strHtml .= $tabs.$tab.'<tfoot'. |
|
| 1000 | + $this->_getAttrString($this->_tfoot->_attributes). |
|
| 1001 | + '>'.$lnEnd; |
|
| 1002 | 1002 | $strHtml .= $this->_tfoot->toHtml($tabs, $tab); |
| 1003 | - $strHtml .= $tabs . $tab . '</tfoot>' . $lnEnd; |
|
| 1003 | + $strHtml .= $tabs.$tab.'</tfoot>'.$lnEnd; |
|
| 1004 | 1004 | } |
| 1005 | 1005 | } |
| 1006 | 1006 | for ($i = 0; $i < $this->_tbodyCount; $i++) { |
| 1007 | 1007 | $this->_tbodies[$i]->setColCount($maxColCount); |
| 1008 | 1008 | if ($this->_tbodies[$i]->getRowCount() > 0) { |
| 1009 | - $strHtml .= $tabs . $tab . '<tbody' . |
|
| 1010 | - $this->_getAttrString($this->_tbodies[$i]->_attributes) . |
|
| 1011 | - '>' . $lnEnd; |
|
| 1009 | + $strHtml .= $tabs.$tab.'<tbody'. |
|
| 1010 | + $this->_getAttrString($this->_tbodies[$i]->_attributes). |
|
| 1011 | + '>'.$lnEnd; |
|
| 1012 | 1012 | $strHtml .= $this->_tbodies[$i]->toHtml($tabs, $tab); |
| 1013 | - $strHtml .= $tabs . $tab . '</tbody>' . $lnEnd; |
|
| 1013 | + $strHtml .= $tabs.$tab.'</tbody>'.$lnEnd; |
|
| 1014 | 1014 | } |
| 1015 | 1015 | } |
| 1016 | 1016 | } else { |
@@ -1019,7 +1019,7 @@ discard block |
||
| 1019 | 1019 | $strHtml .= $this->_tbodies[$i]->toHtml($tabs, $tab); |
| 1020 | 1020 | } |
| 1021 | 1021 | } |
| 1022 | - $strHtml .= $tabs . '</table>' . $lnEnd; |
|
| 1022 | + $strHtml .= $tabs.'</table>'.$lnEnd; |
|
| 1023 | 1023 | } |
| 1024 | 1024 | return $strHtml; |
| 1025 | 1025 | } |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | foreach ($attributes as $key => $value) { |
| 144 | 144 | // Modified by Ivan Tcholakov, 16-MAR-2010 |
| 145 | 145 | $value = @htmlspecialchars($value, ENT_COMPAT, $charset); |
| 146 | - $strAttr .= ' ' . $key . '= "' . $value. '"'; |
|
| 146 | + $strAttr .= ' '.$key.'= "'.$value.'"'; |
|
| 147 | 147 | } |
| 148 | 148 | } |
| 149 | 149 | return $strAttr; |
@@ -170,10 +170,10 @@ discard block |
||
| 170 | 170 | return $ret; |
| 171 | 171 | |
| 172 | 172 | } elseif (is_string($attributes)) { |
| 173 | - $preg = "/(([A-Za-z_:]|[^\\x00-\\x7F])([A-Za-z0-9_:.-]|[^\\x00-\\x7F])*)" . |
|
| 173 | + $preg = "/(([A-Za-z_:]|[^\\x00-\\x7F])([A-Za-z0-9_:.-]|[^\\x00-\\x7F])*)". |
|
| 174 | 174 | "([ \\n\\t\\r]+)?(=([ \\n\\t\\r]+)?(\"[^\"]*\"|'[^']*'|[^ \\n\\t\\r]*))?/"; |
| 175 | 175 | if (preg_match_all($preg, $attributes, $regs)) { |
| 176 | - for ($counter=0; $counter<count($regs[1]); $counter++) { |
|
| 176 | + for ($counter = 0; $counter < count($regs[1]); $counter++) { |
|
| 177 | 177 | $name = $regs[1][$counter]; |
| 178 | 178 | $check = $regs[0][$counter]; |
| 179 | 179 | $value = $regs[7][$counter]; |
@@ -288,7 +288,7 @@ discard block |
||
| 288 | 288 | //return ('' != $value? htmlspecialchars($value): ' ') . |
| 289 | 289 | // $this->_getPersistantData(); |
| 290 | 290 | |
| 291 | - $value = ('' != $value ? @htmlspecialchars($value, ENT_COMPAT, HTML_Common::charset()): ' ') . |
|
| 291 | + $value = ('' != $value ? @htmlspecialchars($value, ENT_COMPAT, HTML_Common::charset()) : ' '). |
|
| 292 | 292 | $this->_getPersistantData(); |
| 293 | 293 | return '<span class="freeze">'.$value.'</span>'; |
| 294 | 294 | // |
@@ -309,11 +309,11 @@ discard block |
||
| 309 | 309 | return ''; |
| 310 | 310 | } else { |
| 311 | 311 | $id = $this->getAttribute('id'); |
| 312 | - return '<input' . $this->_getAttrString(array( |
|
| 312 | + return '<input'.$this->_getAttrString(array( |
|
| 313 | 313 | 'type' => 'hidden', |
| 314 | 314 | 'name' => $this->getName(), |
| 315 | 315 | 'value' => $this->getValue() |
| 316 | - ) + (isset($id)? array('id' => $id): array())) . ' />'; |
|
| 316 | + ) + (isset($id) ? array('id' => $id) : array())).' />'; |
|
| 317 | 317 | } |
| 318 | 318 | } |
| 319 | 319 | |
@@ -344,7 +344,7 @@ discard block |
||
| 344 | 344 | * @access public |
| 345 | 345 | * @return void |
| 346 | 346 | */ |
| 347 | - function setPersistantFreeze($persistant=false) |
|
| 347 | + function setPersistantFreeze($persistant = false) |
|
| 348 | 348 | { |
| 349 | 349 | $this->_persistantFreeze = $persistant; |
| 350 | 350 | } //end func setPersistantFreeze |
@@ -414,10 +414,10 @@ discard block |
||
| 414 | 414 | if (isset($values[$elementName])) { |
| 415 | 415 | return $values[$elementName]; |
| 416 | 416 | } elseif (strpos($elementName, '[')) { |
| 417 | - $myVar = "['" . str_replace( |
|
| 417 | + $myVar = "['".str_replace( |
|
| 418 | 418 | array('\\', '\'', ']', '['), array('\\\\', '\\\'', '', "']['"), |
| 419 | 419 | $elementName |
| 420 | - ) . "']"; |
|
| 420 | + )."']"; |
|
| 421 | 421 | return eval("return (isset(\$values$myVar)) ? \$values$myVar : null;"); |
| 422 | 422 | } else { |
| 423 | 423 | return null; |
@@ -480,7 +480,7 @@ discard block |
||
| 480 | 480 | * @access public |
| 481 | 481 | * @return void |
| 482 | 482 | */ |
| 483 | - function accept(&$renderer, $required=false, $error=null) |
|
| 483 | + function accept(&$renderer, $required = false, $error = null) |
|
| 484 | 484 | { |
| 485 | 485 | $renderer->renderElement($this, $required, $error); |
| 486 | 486 | } |
@@ -499,7 +499,7 @@ discard block |
||
| 499 | 499 | static $idx = 1; |
| 500 | 500 | |
| 501 | 501 | if (!$this->getAttribute('id')) { |
| 502 | - $this->updateAttributes(array('id' => 'qf_' . substr(md5(microtime() . $idx++), 0, 6))); |
|
| 502 | + $this->updateAttributes(array('id' => 'qf_'.substr(md5(microtime().$idx++), 0, 6))); |
|
| 503 | 503 | } |
| 504 | 504 | } |
| 505 | 505 | |
@@ -543,10 +543,10 @@ discard block |
||
| 543 | 543 | return array($name => $value); |
| 544 | 544 | } else { |
| 545 | 545 | $valueAry = array(); |
| 546 | - $myIndex = "['" . str_replace( |
|
| 546 | + $myIndex = "['".str_replace( |
|
| 547 | 547 | array('\\', '\'', ']', '['), array('\\\\', '\\\'', '', "']['"), |
| 548 | 548 | $name |
| 549 | - ) . "']"; |
|
| 549 | + )."']"; |
|
| 550 | 550 | eval("\$valueAry$myIndex = \$value;"); |
| 551 | 551 | return $valueAry; |
| 552 | 552 | } |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | * @access public |
| 84 | 84 | * @return void |
| 85 | 85 | */ |
| 86 | - function HTML_QuickForm_hierselect($elementName=null, $elementLabel=null, $attributes=null, $separator=null) |
|
| 86 | + function HTML_QuickForm_hierselect($elementName = null, $elementLabel = null, $attributes = null, $separator = null) |
|
| 87 | 87 | { |
| 88 | 88 | $this->HTML_QuickForm_element($elementName, $elementLabel, $attributes); |
| 89 | 89 | $this->_persistantFreeze = true; |
@@ -154,8 +154,8 @@ discard block |
||
| 154 | 154 | // setDefaults has probably been called before this function |
| 155 | 155 | // check if all elements have been created |
| 156 | 156 | $totalNbElements = count($this->_options); |
| 157 | - for ($i = $this->_nbElements; $i < $totalNbElements; $i ++) { |
|
| 158 | - $this->_elements[] =& new HTML_QuickForm_select($i, null, array(), $this->getAttributes()); |
|
| 157 | + for ($i = $this->_nbElements; $i < $totalNbElements; $i++) { |
|
| 158 | + $this->_elements[] = & new HTML_QuickForm_select($i, null, array(), $this->getAttributes()); |
|
| 159 | 159 | $this->_nbElements++; |
| 160 | 160 | } |
| 161 | 161 | } |
@@ -209,8 +209,8 @@ discard block |
||
| 209 | 209 | // setDefaults has probably been called before this function |
| 210 | 210 | // check if all elements have been created |
| 211 | 211 | $totalNbElements = 2; |
| 212 | - for ($i = $this->_nbElements; $i < $totalNbElements; $i ++) { |
|
| 213 | - $this->_elements[] =& new HTML_QuickForm_select($i, null, array(), $this->getAttributes()); |
|
| 212 | + for ($i = $this->_nbElements; $i < $totalNbElements; $i++) { |
|
| 213 | + $this->_elements[] = & new HTML_QuickForm_select($i, null, array(), $this->getAttributes()); |
|
| 214 | 214 | $this->_nbElements++; |
| 215 | 215 | } |
| 216 | 216 | } |
@@ -233,12 +233,12 @@ discard block |
||
| 233 | 233 | foreach (array_keys($this->_elements) AS $key) { |
| 234 | 234 | $array = eval("return isset(\$this->_options[{$key}]{$toLoad})? \$this->_options[{$key}]{$toLoad}: null;"); |
| 235 | 235 | if (is_array($array)) { |
| 236 | - $select =& $this->_elements[$key]; |
|
| 236 | + $select = & $this->_elements[$key]; |
|
| 237 | 237 | $select->_options = array(); |
| 238 | 238 | $select->loadArray($array); |
| 239 | 239 | |
| 240 | - $value = is_array($v = $select->getValue()) ? $v[0] : key($array); |
|
| 241 | - $toLoad .= '[\'' . str_replace(array('\\', '\''), array('\\\\', '\\\''), $value) . '\']'; |
|
| 240 | + $value = is_array($v = $select->getValue()) ? $v[0] : key($array); |
|
| 241 | + $toLoad .= '[\''.str_replace(array('\\', '\''), array('\\\\', '\\\''), $value).'\']'; |
|
| 242 | 242 | } |
| 243 | 243 | } |
| 244 | 244 | } // end func _setOptions |
@@ -277,7 +277,7 @@ discard block |
||
| 277 | 277 | function _createElements() |
| 278 | 278 | { |
| 279 | 279 | for ($i = 0; $i < $this->_nbElements; $i++) { |
| 280 | - $this->_elements[] =& new HTML_QuickForm_select($i, null, array(), $this->getAttributes()); |
|
| 280 | + $this->_elements[] = & new HTML_QuickForm_select($i, null, array(), $this->getAttributes()); |
|
| 281 | 281 | } |
| 282 | 282 | } // end func _createElements |
| 283 | 283 | |
@@ -292,10 +292,10 @@ discard block |
||
| 292 | 292 | $keys = array_keys($this->_elements); |
| 293 | 293 | $onChange = array(); |
| 294 | 294 | for ($i = 0; $i < count($keys) - 1; $i++) { |
| 295 | - $select =& $this->_elements[$keys[$i]]; |
|
| 295 | + $select = & $this->_elements[$keys[$i]]; |
|
| 296 | 296 | $onChange[$i] = $select->getAttribute('onchange'); |
| 297 | 297 | $select->updateAttributes( |
| 298 | - array('onchange' => '_hs_swapOptions(this.form, \'' . $this->_escapeString($this->getName()) . '\', ' . $keys[$i] . ');' . $onChange[$i]) |
|
| 298 | + array('onchange' => '_hs_swapOptions(this.form, \''.$this->_escapeString($this->getName()).'\', '.$keys[$i].');'.$onChange[$i]) |
|
| 299 | 299 | ); |
| 300 | 300 | } |
| 301 | 301 | |
@@ -433,37 +433,36 @@ discard block |
||
| 433 | 433 | for ($i = 1; $i < $this->_nbElements; $i++) { |
| 434 | 434 | $jsParts[] = $this->_convertArrayToJavascript($this->_options[$i]); |
| 435 | 435 | } |
| 436 | - $this->_js .= "\n_hs_options['" . $this->_escapeString($this->getName()) . "'] = [\n" . |
|
| 437 | - implode(",\n", $jsParts) . |
|
| 436 | + $this->_js .= "\n_hs_options['".$this->_escapeString($this->getName())."'] = [\n". |
|
| 437 | + implode(",\n", $jsParts). |
|
| 438 | 438 | "\n];\n"; |
| 439 | 439 | // default value; if we don't actually have any values yet just use |
| 440 | 440 | // the first option (for single selects) or empty array (for multiple) |
| 441 | 441 | $values = array(); |
| 442 | 442 | foreach (array_keys($this->_elements) as $key) { |
| 443 | 443 | if (is_array($v = $this->_elements[$key]->getValue())) { |
| 444 | - $values[] = count($v) > 1? $v: $v[0]; |
|
| 444 | + $values[] = count($v) > 1 ? $v : $v[0]; |
|
| 445 | 445 | } else { |
| 446 | 446 | // XXX: accessing the supposedly private _options array |
| 447 | - $values[] = $this->_elements[$key]->getMultiple() || empty($this->_elements[$key]->_options[0])? |
|
| 448 | - array(): |
|
| 449 | - $this->_elements[$key]->_options[0]['attr']['value']; |
|
| 447 | + $values[] = $this->_elements[$key]->getMultiple() || empty($this->_elements[$key]->_options[0]) ? |
|
| 448 | + array() : $this->_elements[$key]->_options[0]['attr']['value']; |
|
| 450 | 449 | } |
| 451 | 450 | } |
| 452 | - $this->_js .= "_hs_defaults['" . $this->_escapeString($this->getName()) . "'] = " . |
|
| 453 | - $this->_convertArrayToJavascript($values, false) . ";\n"; |
|
| 451 | + $this->_js .= "_hs_defaults['".$this->_escapeString($this->getName())."'] = ". |
|
| 452 | + $this->_convertArrayToJavascript($values, false).";\n"; |
|
| 454 | 453 | } |
| 455 | 454 | include_once('HTML/QuickForm/Renderer/Default.php'); |
| 456 | - $renderer =& new HTML_QuickForm_Renderer_Default(); |
|
| 455 | + $renderer = & new HTML_QuickForm_Renderer_Default(); |
|
| 457 | 456 | $renderer->setElementTemplate('{element}'); |
| 458 | 457 | parent::accept($renderer); |
| 459 | 458 | |
| 460 | 459 | if (!empty($onChange)) { |
| 461 | - $keys = array_keys($this->_elements); |
|
| 460 | + $keys = array_keys($this->_elements); |
|
| 462 | 461 | for ($i = 0; $i < count($keys) - 1; $i++) { |
| 463 | 462 | $this->_elements[$keys[$i]]->updateAttributes(array('onchange' => $onChange[$i])); |
| 464 | 463 | } |
| 465 | 464 | } |
| 466 | - return (empty($this->_js)? '': "<script type=\"text/javascript\">\n//<![CDATA[\n" . $this->_js . "//]]>\n</script>") . |
|
| 465 | + return (empty($this->_js) ? '' : "<script type=\"text/javascript\">\n//<![CDATA[\n".$this->_js."//]]>\n</script>"). |
|
| 467 | 466 | $renderer->toHtml(); |
| 468 | 467 | } // end func toHtml |
| 469 | 468 | |
@@ -491,12 +490,12 @@ discard block |
||
| 491 | 490 | $onReset = $caller->getAttribute('onreset'); |
| 492 | 491 | if (strlen($onReset)) { |
| 493 | 492 | if (strpos($onReset, '_hs_setupOnReset')) { |
| 494 | - $caller->updateAttributes(array('onreset' => str_replace('_hs_setupOnReset(this, [', "_hs_setupOnReset(this, ['" . $this->_escapeString($this->getName()) . "', ", $onReset))); |
|
| 493 | + $caller->updateAttributes(array('onreset' => str_replace('_hs_setupOnReset(this, [', "_hs_setupOnReset(this, ['".$this->_escapeString($this->getName())."', ", $onReset))); |
|
| 495 | 494 | } else { |
| 496 | - $caller->updateAttributes(array('onreset' => "var temp = function() { {$onReset} } ; if (!temp()) { return false; } ; if (typeof _hs_setupOnReset != 'undefined') { return _hs_setupOnReset(this, ['" . $this->_escapeString($this->getName()) . "']); } ")); |
|
| 495 | + $caller->updateAttributes(array('onreset' => "var temp = function() { {$onReset} } ; if (!temp()) { return false; } ; if (typeof _hs_setupOnReset != 'undefined') { return _hs_setupOnReset(this, ['".$this->_escapeString($this->getName())."']); } ")); |
|
| 497 | 496 | } |
| 498 | 497 | } else { |
| 499 | - $caller->updateAttributes(array('onreset' => "if (typeof _hs_setupOnReset != 'undefined') { return _hs_setupOnReset(this, ['" . $this->_escapeString($this->getName()) . "']); } ")); |
|
| 498 | + $caller->updateAttributes(array('onreset' => "if (typeof _hs_setupOnReset != 'undefined') { return _hs_setupOnReset(this, ['".$this->_escapeString($this->getName())."']); } ")); |
|
| 500 | 499 | } |
| 501 | 500 | } |
| 502 | 501 | return $ret; |
@@ -521,7 +520,7 @@ discard block |
||
| 521 | 520 | } else { |
| 522 | 521 | $items = array(); |
| 523 | 522 | foreach ($array as $key => $val) { |
| 524 | - $item = $assoc? "'" . $this->_escapeString($key) . "': ": ''; |
|
| 523 | + $item = $assoc ? "'".$this->_escapeString($key)."': " : ''; |
|
| 525 | 524 | if (is_array($val)) { |
| 526 | 525 | $item .= $this->_convertArrayToJavascript($val, $assoc); |
| 527 | 526 | } else { |
@@ -531,7 +530,7 @@ discard block |
||
| 531 | 530 | } |
| 532 | 531 | } |
| 533 | 532 | $js = implode(', ', $items); |
| 534 | - return $assoc? '{ ' . $js . ' }': '[' . $js . ']'; |
|
| 533 | + return $assoc ? '{ '.$js.' }' : '['.$js.']'; |
|
| 535 | 534 | } |
| 536 | 535 | |
| 537 | 536 | // }}} |
@@ -551,7 +550,7 @@ discard block |
||
| 551 | 550 | } elseif (is_int($val) || is_double($val)) { |
| 552 | 551 | return $val; |
| 553 | 552 | } elseif (is_string($val)) { |
| 554 | - return "'" . $this->_escapeString($val) . "'"; |
|
| 553 | + return "'".$this->_escapeString($val)."'"; |
|
| 555 | 554 | } elseif (is_null($val)) { |
| 556 | 555 | return 'null'; |
| 557 | 556 | } else { |
@@ -572,7 +571,7 @@ discard block |
||
| 572 | 571 | */ |
| 573 | 572 | function _escapeString($str) |
| 574 | 573 | { |
| 575 | - return strtr($str,array( |
|
| 574 | + return strtr($str, array( |
|
| 576 | 575 | "\r" => '\r', |
| 577 | 576 | "\n" => '\n', |
| 578 | 577 | "\t" => '\t', |
@@ -247,7 +247,7 @@ |
||
| 247 | 247 | unset($attr['name']); |
| 248 | 248 | |
| 249 | 249 | $html = $this->_getTabs() |
| 250 | - . '<span' . $this->_getAttrString($attr) . '>' |
|
| 250 | + . '<span'.$this->_getAttrString($attr).'>' |
|
| 251 | 251 | . htmlspecialchars($captcha) |
| 252 | 252 | . '</span>'; |
| 253 | 253 | return $html; |
