@@ -200,7 +200,7 @@ |
||
200 | 200 | * Connect to a POP3 server. |
201 | 201 | * @access public |
202 | 202 | * @param string $host |
203 | - * @param integer|boolean $port |
|
203 | + * @param integer $port |
|
204 | 204 | * @param integer $tval |
205 | 205 | * @return boolean |
206 | 206 | */ |
@@ -663,6 +663,12 @@ discard block |
||
663 | 663 | } |
664 | 664 | } |
665 | 665 | |
666 | +/** |
|
667 | + * @param string $body |
|
668 | + * @param integer $pos |
|
669 | + * @param string $trans_image_path |
|
670 | + * @param boolean $block_external_images |
|
671 | + */ |
|
666 | 672 | function tln_fixstyle($body, $pos, $trans_image_path, $block_external_images) |
667 | 673 | { |
668 | 674 | // workaround for </style> in between comments |
@@ -788,6 +794,9 @@ discard block |
||
788 | 794 | return array($content, $newpos); |
789 | 795 | } |
790 | 796 | |
797 | +/** |
|
798 | + * @param string $trans_image_path |
|
799 | + */ |
|
791 | 800 | function tln_body2div($attary, $trans_image_path) |
792 | 801 | { |
793 | 802 | $divattary = array('class' => "'bodyclass'"); |
@@ -828,8 +837,8 @@ discard block |
||
828 | 837 | * |
829 | 838 | * @param string $body The HTML you wish to filter |
830 | 839 | * @param array $tag_list see description above |
831 | - * @param array $rm_tags_with_content see description above |
|
832 | - * @param array $self_closing_tags see description above |
|
840 | + * @param string[] $rm_tags_with_content see description above |
|
841 | + * @param string[] $self_closing_tags see description above |
|
833 | 842 | * @param boolean $force_tag_closing see description above |
834 | 843 | * @param array $rm_attnames see description above |
835 | 844 | * @param array $bad_attvals see description above |
@@ -617,42 +617,42 @@ discard block |
||
617 | 617 | // first, disallow 8 bit characters and control characters |
618 | 618 | if (preg_match('/[\0-\37\200-\377]+/',$attvalue)) { |
619 | 619 | switch ($attname) { |
620 | - case 'href': |
|
621 | - $attvalue = $sQuote . 'http://invalid-stuff-detected.example.com' . $sQuote; |
|
622 | - break; |
|
623 | - default: |
|
624 | - $attvalue = $sQuote . $trans_image_path . $sQuote; |
|
625 | - break; |
|
620 | + case 'href': |
|
621 | + $attvalue = $sQuote . 'http://invalid-stuff-detected.example.com' . $sQuote; |
|
622 | + break; |
|
623 | + default: |
|
624 | + $attvalue = $sQuote . $trans_image_path . $sQuote; |
|
625 | + break; |
|
626 | 626 | } |
627 | 627 | } else { |
628 | 628 | $aUrl = parse_url($attvalue); |
629 | 629 | if (isset($aUrl['scheme'])) { |
630 | 630 | switch(strtolower($aUrl['scheme'])) { |
631 | - case 'mailto': |
|
632 | - case 'http': |
|
633 | - case 'https': |
|
634 | - case 'ftp': |
|
635 | - if ($attname != 'href') { |
|
636 | - if ($block_external_images == true) { |
|
631 | + case 'mailto': |
|
632 | + case 'http': |
|
633 | + case 'https': |
|
634 | + case 'ftp': |
|
635 | + if ($attname != 'href') { |
|
636 | + if ($block_external_images == true) { |
|
637 | + $attvalue = $sQuote . $trans_image_path . $sQuote; |
|
638 | + } else { |
|
639 | + if (!isset($aUrl['path'])) { |
|
637 | 640 | $attvalue = $sQuote . $trans_image_path . $sQuote; |
638 | - } else { |
|
639 | - if (!isset($aUrl['path'])) { |
|
640 | - $attvalue = $sQuote . $trans_image_path . $sQuote; |
|
641 | - } |
|
642 | 641 | } |
643 | - } else { |
|
644 | - $attvalue = $sQuote . $attvalue . $sQuote; |
|
645 | 642 | } |
646 | - break; |
|
647 | - case 'outbind': |
|
648 | - $attvalue = $sQuote . $attvalue . $sQuote; |
|
649 | - break; |
|
650 | - case 'cid': |
|
643 | + } else { |
|
651 | 644 | $attvalue = $sQuote . $attvalue . $sQuote; |
652 | - break; |
|
653 | - default: |
|
654 | - $attvalue = $sQuote . $trans_image_path . $sQuote; |
|
655 | - break; |
|
645 | + } |
|
646 | + break; |
|
647 | + case 'outbind': |
|
648 | + $attvalue = $sQuote . $attvalue . $sQuote; |
|
649 | + break; |
|
650 | + case 'cid': |
|
651 | + $attvalue = $sQuote . $attvalue . $sQuote; |
|
652 | + break; |
|
653 | + default: |
|
654 | + $attvalue = $sQuote . $trans_image_path . $sQuote; |
|
655 | + break; |
|
656 | 656 | } |
657 | 657 | } else { |
658 | 658 | if (!isset($aUrl['path']) || $aUrl['path'] != $trans_image_path) { |
@@ -673,53 +673,53 @@ discard block |
||
673 | 673 | for ($i=$pos,$iCount=strlen($body);$i<$iCount;++$i) { |
674 | 674 | $char = $body{$i}; |
675 | 675 | switch ($char) { |
676 | - case '<': |
|
677 | - $sToken = $char; |
|
678 | - break; |
|
679 | - case '/': |
|
680 | - if ($sToken == '<') { |
|
681 | - $sToken .= $char; |
|
682 | - $bEndTag = true; |
|
683 | - } else { |
|
684 | - $content .= $char; |
|
685 | - } |
|
686 | - break; |
|
687 | - case '>': |
|
688 | - if ($bEndTag) { |
|
689 | - $sToken .= $char; |
|
690 | - if (preg_match('/\<\/\s*style\s*\>/i',$sToken,$aMatch)) { |
|
691 | - $newpos = $i + 1; |
|
692 | - $bSucces = true; |
|
693 | - break 2; |
|
694 | - } else { |
|
695 | - $content .= $sToken; |
|
696 | - } |
|
697 | - $bEndTag = false; |
|
698 | - } else { |
|
699 | - $content .= $char; |
|
700 | - } |
|
701 | - break; |
|
702 | - case '!': |
|
703 | - if ($sToken == '<') { |
|
704 | - // possible comment |
|
705 | - if (isset($body{$i+2}) && substr($body,$i,3) == '!--') { |
|
706 | - $i = strpos($body,'-->',$i+3); |
|
707 | - if ($i === false) { // no end comment |
|
708 | - $i = strlen($body); |
|
709 | - } |
|
710 | - $sToken = ''; |
|
711 | - } |
|
676 | + case '<': |
|
677 | + $sToken = $char; |
|
678 | + break; |
|
679 | + case '/': |
|
680 | + if ($sToken == '<') { |
|
681 | + $sToken .= $char; |
|
682 | + $bEndTag = true; |
|
683 | + } else { |
|
684 | + $content .= $char; |
|
685 | + } |
|
686 | + break; |
|
687 | + case '>': |
|
688 | + if ($bEndTag) { |
|
689 | + $sToken .= $char; |
|
690 | + if (preg_match('/\<\/\s*style\s*\>/i',$sToken,$aMatch)) { |
|
691 | + $newpos = $i + 1; |
|
692 | + $bSucces = true; |
|
693 | + break 2; |
|
712 | 694 | } else { |
713 | - $content .= $char; |
|
695 | + $content .= $sToken; |
|
714 | 696 | } |
715 | - break; |
|
716 | - default: |
|
717 | - if ($bEndTag) { |
|
718 | - $sToken .= $char; |
|
719 | - } else { |
|
720 | - $content .= $char; |
|
697 | + $bEndTag = false; |
|
698 | + } else { |
|
699 | + $content .= $char; |
|
700 | + } |
|
701 | + break; |
|
702 | + case '!': |
|
703 | + if ($sToken == '<') { |
|
704 | + // possible comment |
|
705 | + if (isset($body{$i+2}) && substr($body,$i,3) == '!--') { |
|
706 | + $i = strpos($body,'-->',$i+3); |
|
707 | + if ($i === false) { // no end comment |
|
708 | + $i = strlen($body); |
|
709 | + } |
|
710 | + $sToken = ''; |
|
721 | 711 | } |
722 | - break; |
|
712 | + } else { |
|
713 | + $content .= $char; |
|
714 | + } |
|
715 | + break; |
|
716 | + default: |
|
717 | + if ($bEndTag) { |
|
718 | + $sToken .= $char; |
|
719 | + } else { |
|
720 | + $content .= $char; |
|
721 | + } |
|
722 | + break; |
|
723 | 723 | } |
724 | 724 | } |
725 | 725 | if ($bSucces == FALSE){ |
@@ -799,17 +799,17 @@ discard block |
||
799 | 799 | $quotchar = substr($attvalue, 0, 1); |
800 | 800 | $attvalue = str_replace($quotchar, "", $attvalue); |
801 | 801 | switch ($attname){ |
802 | - case 'background': |
|
803 | - $styledef .= "background-image: url('$trans_image_path'); "; |
|
804 | - break; |
|
805 | - case 'bgcolor': |
|
806 | - $has_bgc_stl = true; |
|
807 | - $styledef .= "background-color: $attvalue; "; |
|
808 | - break; |
|
809 | - case 'text': |
|
810 | - $has_txt_stl = true; |
|
811 | - $styledef .= "color: $attvalue; "; |
|
812 | - break; |
|
802 | + case 'background': |
|
803 | + $styledef .= "background-image: url('$trans_image_path'); "; |
|
804 | + break; |
|
805 | + case 'bgcolor': |
|
806 | + $has_bgc_stl = true; |
|
807 | + $styledef .= "background-color: $attvalue; "; |
|
808 | + break; |
|
809 | + case 'text': |
|
810 | + $has_txt_stl = true; |
|
811 | + $styledef .= "color: $attvalue; "; |
|
812 | + break; |
|
813 | 813 | } |
814 | 814 | } |
815 | 815 | // Outlook defines a white bgcolor and no text color. This can lead to |
@@ -18,6 +18,9 @@ discard block |
||
18 | 18 | public $credentials = array(); |
19 | 19 | public $state = SASL_NTLM_STATE_START; |
20 | 20 | |
21 | + /** |
|
22 | + * @param stdClass $client |
|
23 | + */ |
|
21 | 24 | public function initialize(&$client) |
22 | 25 | { |
23 | 26 | if (!function_exists($function = "mcrypt_encrypt") |
@@ -63,6 +66,9 @@ discard block |
||
63 | 66 | ); |
64 | 67 | } |
65 | 68 | |
69 | + /** |
|
70 | + * @param string $challenge |
|
71 | + */ |
|
66 | 72 | public function NTLMResponse($challenge, $password) |
67 | 73 | { |
68 | 74 | $unicode = $this->ASCIIToUnicode($password); |
@@ -85,6 +91,9 @@ discard block |
||
85 | 91 | return $response; |
86 | 92 | } |
87 | 93 | |
94 | + /** |
|
95 | + * @param string $ntlm_response |
|
96 | + */ |
|
88 | 97 | public function typeMsg3($ntlm_response, $user, $domain, $workstation) |
89 | 98 | { |
90 | 99 | $domain_unicode = $this->ASCIIToUnicode($domain); |
@@ -159,26 +159,26 @@ |
||
159 | 159 | public function step(&$client, $response, &$message, &$interactions) |
160 | 160 | { |
161 | 161 | switch ($this->state) { |
162 | - case SASL_NTLM_STATE_IDENTIFY_DOMAIN: |
|
163 | - $message = $this->typeMsg1($this->credentials["realm"], $this->credentials["workstation"]); |
|
164 | - $this->state = SASL_NTLM_STATE_RESPOND_CHALLENGE; |
|
165 | - break; |
|
166 | - case SASL_NTLM_STATE_RESPOND_CHALLENGE: |
|
167 | - $ntlm_response = $this->NTLMResponse(substr($response, 24, 8), $this->credentials["password"]); |
|
168 | - $message = $this->typeMsg3( |
|
169 | - $ntlm_response, |
|
170 | - $this->credentials["user"], |
|
171 | - $this->credentials["realm"], |
|
172 | - $this->credentials["workstation"] |
|
173 | - ); |
|
174 | - $this->state = SASL_NTLM_STATE_DONE; |
|
175 | - break; |
|
176 | - case SASL_NTLM_STATE_DONE: |
|
177 | - $client->error = "NTLM authentication was finished without success"; |
|
178 | - return (SASL_FAIL); |
|
179 | - default: |
|
180 | - $client->error = "invalid NTLM authentication step state"; |
|
181 | - return (SASL_FAIL); |
|
162 | + case SASL_NTLM_STATE_IDENTIFY_DOMAIN: |
|
163 | + $message = $this->typeMsg1($this->credentials["realm"], $this->credentials["workstation"]); |
|
164 | + $this->state = SASL_NTLM_STATE_RESPOND_CHALLENGE; |
|
165 | + break; |
|
166 | + case SASL_NTLM_STATE_RESPOND_CHALLENGE: |
|
167 | + $ntlm_response = $this->NTLMResponse(substr($response, 24, 8), $this->credentials["password"]); |
|
168 | + $message = $this->typeMsg3( |
|
169 | + $ntlm_response, |
|
170 | + $this->credentials["user"], |
|
171 | + $this->credentials["realm"], |
|
172 | + $this->credentials["workstation"] |
|
173 | + ); |
|
174 | + $this->state = SASL_NTLM_STATE_DONE; |
|
175 | + break; |
|
176 | + case SASL_NTLM_STATE_DONE: |
|
177 | + $client->error = "NTLM authentication was finished without success"; |
|
178 | + return (SASL_FAIL); |
|
179 | + default: |
|
180 | + $client->error = "invalid NTLM authentication step state"; |
|
181 | + return (SASL_FAIL); |
|
182 | 182 | } |
183 | 183 | return (SASL_CONTINUE); |
184 | 184 | } |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | * @param $breadcrumb |
33 | 33 | * An array containing the breadcrumb links. |
34 | 34 | * @return |
35 | - * A string containing the breadcrumb output. |
|
35 | + string A string containing the breadcrumb output. |
|
36 | 36 | */ |
37 | 37 | function zen_breadcrumb($breadcrumb) { |
38 | 38 | // Determine if we are to display the breadcrumb. |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | * See http://juicystudio.com/article/screen-readers-display-none.php |
88 | 88 | * and http://www.w3.org/TR/WCAG-TECHS/H42.html for more information. |
89 | 89 | * @return |
90 | - * A string containing an unordered list of links. |
|
90 | + string A string containing an unordered list of links. |
|
91 | 91 | */ |
92 | 92 | function zen_links($links, $attributes = array('class' => 'links'), $heading = '') { |
93 | 93 | global $language; |
@@ -600,10 +600,10 @@ discard block |
||
600 | 600 | * Do not pass one string containing multiple classes as they will be |
601 | 601 | * incorrectly concatenated with dashes, i.e. "one two" will become "one-two". |
602 | 602 | * |
603 | - * @param $class |
|
603 | + * @param string $class |
|
604 | 604 | * The class name to clean. |
605 | 605 | * @return |
606 | - * The cleaned class name. |
|
606 | + string The cleaned class name. |
|
607 | 607 | */ |
608 | 608 | function drupal_html_class($class) { |
609 | 609 | // By default, we filter using Drupal's coding standards. |
@@ -633,7 +633,7 @@ discard block |
||
633 | 633 | * @param $id |
634 | 634 | * The ID to clean. |
635 | 635 | * @return |
636 | - * The cleaned ID. |
|
636 | + string The cleaned ID. |
|
637 | 637 | */ |
638 | 638 | function drupal_html_id($id) { |
639 | 639 | $id = strtr(drupal_strtolower($id), array(' ' => '-', '_' => '-', '[' => '-', ']' => '')); |
@@ -382,16 +382,16 @@ discard block |
||
382 | 382 | // Store the menu item since it has some useful information. |
383 | 383 | $vars['menu_item'] = menu_get_item(); |
384 | 384 | switch ($vars['menu_item']['page_callback']) { |
385 | - case 'views_page': |
|
386 | - // Is this a Views page? |
|
387 | - $vars['classes_array'][] = 'page-views'; |
|
388 | - break; |
|
389 | - case 'page_manager_page_execute': |
|
390 | - case 'page_manager_node_view': |
|
391 | - case 'page_manager_contact_site': |
|
392 | - // Is this a Panels page? |
|
393 | - $vars['classes_array'][] = 'page-panels'; |
|
394 | - break; |
|
385 | + case 'views_page': |
|
386 | + // Is this a Views page? |
|
387 | + $vars['classes_array'][] = 'page-views'; |
|
388 | + break; |
|
389 | + case 'page_manager_page_execute': |
|
390 | + case 'page_manager_node_view': |
|
391 | + case 'page_manager_contact_site': |
|
392 | + // Is this a Panels page? |
|
393 | + $vars['classes_array'][] = 'page-panels'; |
|
394 | + break; |
|
395 | 395 | } |
396 | 396 | } |
397 | 397 | |
@@ -428,31 +428,31 @@ discard block |
||
428 | 428 | function zen_preprocess_node(&$vars, $hook) { |
429 | 429 | // Create the build_mode variable. |
430 | 430 | switch ($vars['node']->build_mode) { |
431 | - case NODE_BUILD_NORMAL: |
|
432 | - if ($vars['node']->build_mode === NODE_BUILD_NORMAL) { |
|
433 | - $vars['build_mode'] = $vars['teaser'] ? 'teaser' : 'full'; |
|
434 | - } |
|
435 | - else { |
|
436 | - $vars['build_mode'] = $vars['node']->build_mode; |
|
437 | - } |
|
438 | - break; |
|
439 | - case NODE_BUILD_PREVIEW: |
|
440 | - $vars['build_mode'] = 'preview'; |
|
441 | - break; |
|
442 | - case NODE_BUILD_SEARCH_INDEX: |
|
443 | - $vars['build_mode'] = 'search_index'; |
|
444 | - break; |
|
445 | - case NODE_BUILD_SEARCH_RESULT: |
|
446 | - $vars['build_mode'] = 'search_result'; |
|
447 | - break; |
|
448 | - case NODE_BUILD_RSS: |
|
449 | - $vars['build_mode'] = 'rss'; |
|
450 | - break; |
|
451 | - case NODE_BUILD_PRINT: |
|
452 | - $vars['build_mode'] = 'print'; |
|
453 | - break; |
|
454 | - default: |
|
431 | + case NODE_BUILD_NORMAL: |
|
432 | + if ($vars['node']->build_mode === NODE_BUILD_NORMAL) { |
|
433 | + $vars['build_mode'] = $vars['teaser'] ? 'teaser' : 'full'; |
|
434 | + } |
|
435 | + else { |
|
455 | 436 | $vars['build_mode'] = $vars['node']->build_mode; |
437 | + } |
|
438 | + break; |
|
439 | + case NODE_BUILD_PREVIEW: |
|
440 | + $vars['build_mode'] = 'preview'; |
|
441 | + break; |
|
442 | + case NODE_BUILD_SEARCH_INDEX: |
|
443 | + $vars['build_mode'] = 'search_index'; |
|
444 | + break; |
|
445 | + case NODE_BUILD_SEARCH_RESULT: |
|
446 | + $vars['build_mode'] = 'search_result'; |
|
447 | + break; |
|
448 | + case NODE_BUILD_RSS: |
|
449 | + $vars['build_mode'] = 'rss'; |
|
450 | + break; |
|
451 | + case NODE_BUILD_PRINT: |
|
452 | + $vars['build_mode'] = 'print'; |
|
453 | + break; |
|
454 | + default: |
|
455 | + $vars['build_mode'] = $vars['node']->build_mode; |
|
456 | 456 | } |
457 | 457 | |
458 | 458 | // Create the user_picture variable. |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | * Set database connection for boincimport |
133 | 133 | * |
134 | 134 | * @return |
135 | - * 1 if can connect to BOINC database. |
|
135 | + integer 1 if can connect to BOINC database. |
|
136 | 136 | * |
137 | 137 | * BEWARE: if you test using db_connect and the connection |
138 | 138 | * fails, the process will die() which is a bit too much since we only |
@@ -162,6 +162,7 @@ discard block |
||
162 | 162 | /** |
163 | 163 | * Check if the module is enabled. |
164 | 164 | * |
165 | + * @param string $module |
|
165 | 166 | * @return array |
166 | 167 | * $out['html'] = formatted html. |
167 | 168 | * $out['result'] = boolean. |
@@ -300,125 +300,125 @@ |
||
300 | 300 | } |
301 | 301 | |
302 | 302 | switch ($form_state['values']['import']) { |
303 | - case 'users': |
|
304 | - boincimport_users(); |
|
305 | - break; |
|
306 | - |
|
307 | - case 'teams': |
|
308 | - boincimport_teams(); |
|
309 | - if (!variable_get('boincimport_import_team_successful', 0)) { |
|
310 | - $_SESSION['boincimport_stage_selected'] = 'teams'; |
|
311 | - } |
|
312 | - else { |
|
313 | - $_SESSION['boincimport_stage_selected'] = 'friends'; |
|
314 | - } |
|
315 | - break; |
|
303 | + case 'users': |
|
304 | + boincimport_users(); |
|
305 | + break; |
|
316 | 306 | |
317 | - case 'friends': |
|
318 | - boincimport_friends(); |
|
319 | - if (!variable_get('boincimport_import_friend_successful', 0)) { |
|
320 | - $_SESSION['boincimport_stage_selected'] = 'friends'; |
|
321 | - } |
|
322 | - else { |
|
323 | - $_SESSION['boincimport_stage_selected'] = 'preferences'; |
|
324 | - } |
|
325 | - break; |
|
307 | + case 'teams': |
|
308 | + boincimport_teams(); |
|
309 | + if (!variable_get('boincimport_import_team_successful', 0)) { |
|
310 | + $_SESSION['boincimport_stage_selected'] = 'teams'; |
|
311 | + } |
|
312 | + else { |
|
313 | + $_SESSION['boincimport_stage_selected'] = 'friends'; |
|
314 | + } |
|
315 | + break; |
|
326 | 316 | |
327 | - case 'preferences': |
|
328 | - boincimport_preferences(); |
|
329 | - if (!variable_get('boincimport_import_preferences_successful', 0)) { |
|
330 | - $_SESSION['boincimport_stage_selected'] = 'preferences'; |
|
331 | - } |
|
332 | - else { |
|
333 | - $_SESSION['boincimport_stage_selected'] = 'private messages'; |
|
334 | - } |
|
335 | - break; |
|
317 | + case 'friends': |
|
318 | + boincimport_friends(); |
|
319 | + if (!variable_get('boincimport_import_friend_successful', 0)) { |
|
320 | + $_SESSION['boincimport_stage_selected'] = 'friends'; |
|
321 | + } |
|
322 | + else { |
|
323 | + $_SESSION['boincimport_stage_selected'] = 'preferences'; |
|
324 | + } |
|
325 | + break; |
|
336 | 326 | |
337 | - case 'private messages': |
|
338 | - boincimport_private_msgs(); |
|
339 | - if (!variable_get('boincimport_import_private_msg_successful', 0)) { |
|
340 | - $_SESSION['boincimport_stage_selected'] = 'private messages'; |
|
341 | - } |
|
342 | - else { |
|
343 | - $_SESSION['boincimport_stage_selected'] = 'categories'; |
|
344 | - } |
|
345 | - break; |
|
327 | + case 'preferences': |
|
328 | + boincimport_preferences(); |
|
329 | + if (!variable_get('boincimport_import_preferences_successful', 0)) { |
|
330 | + $_SESSION['boincimport_stage_selected'] = 'preferences'; |
|
331 | + } |
|
332 | + else { |
|
333 | + $_SESSION['boincimport_stage_selected'] = 'private messages'; |
|
334 | + } |
|
335 | + break; |
|
346 | 336 | |
347 | - case 'categories': |
|
348 | - boincimport_forum_categories(); |
|
349 | - if (!variable_get('boincimport_import_category_successful', 0)) { |
|
350 | - $_SESSION['boincimport_stage_selected'] = 'categories'; |
|
351 | - } |
|
352 | - else { |
|
353 | - $_SESSION['boincimport_stage_selected'] = 'topics'; |
|
354 | - } |
|
355 | - break; |
|
337 | + case 'private messages': |
|
338 | + boincimport_private_msgs(); |
|
339 | + if (!variable_get('boincimport_import_private_msg_successful', 0)) { |
|
340 | + $_SESSION['boincimport_stage_selected'] = 'private messages'; |
|
341 | + } |
|
342 | + else { |
|
343 | + $_SESSION['boincimport_stage_selected'] = 'categories'; |
|
344 | + } |
|
345 | + break; |
|
356 | 346 | |
357 | - case 'topics': |
|
358 | - boincimport_forum_topics(); |
|
359 | - if (!variable_get('boincimport_import_topic_successful', 0)) { |
|
360 | - $_SESSION['boincimport_stage_selected'] = 'topics'; |
|
361 | - } |
|
362 | - else { |
|
363 | - $_SESSION['boincimport_stage_selected'] = 'posts'; |
|
364 | - } |
|
365 | - break; |
|
347 | + case 'categories': |
|
348 | + boincimport_forum_categories(); |
|
349 | + if (!variable_get('boincimport_import_category_successful', 0)) { |
|
350 | + $_SESSION['boincimport_stage_selected'] = 'categories'; |
|
351 | + } |
|
352 | + else { |
|
353 | + $_SESSION['boincimport_stage_selected'] = 'topics'; |
|
354 | + } |
|
355 | + break; |
|
356 | + |
|
357 | + case 'topics': |
|
358 | + boincimport_forum_topics(); |
|
359 | + if (!variable_get('boincimport_import_topic_successful', 0)) { |
|
360 | + $_SESSION['boincimport_stage_selected'] = 'topics'; |
|
361 | + } |
|
362 | + else { |
|
363 | + $_SESSION['boincimport_stage_selected'] = 'posts'; |
|
364 | + } |
|
365 | + break; |
|
366 | 366 | |
367 | - case 'posts': |
|
368 | - boincimport_forum_posts(); |
|
369 | - if (!variable_get('boincimport_import_post_successful', 0)) { |
|
370 | - $_SESSION['boincimport_stage_selected'] = 'posts'; |
|
371 | - } |
|
372 | - else { |
|
373 | - $_SESSION['boincimport_stage_selected'] = 'url'; |
|
374 | - } |
|
375 | - break; |
|
367 | + case 'posts': |
|
368 | + boincimport_forum_posts(); |
|
369 | + if (!variable_get('boincimport_import_post_successful', 0)) { |
|
370 | + $_SESSION['boincimport_stage_selected'] = 'posts'; |
|
371 | + } |
|
372 | + else { |
|
373 | + $_SESSION['boincimport_stage_selected'] = 'url'; |
|
374 | + } |
|
375 | + break; |
|
376 | 376 | |
377 | - case 'team forums': |
|
378 | - boincimport_team_forums(); |
|
379 | - if (!variable_get('boincimport_team_forum_successful', 0)) { |
|
380 | - $_SESSION['boincimport_stage_selected'] = 'team forums'; |
|
381 | - } |
|
382 | - else { |
|
383 | - $_SESSION['boincimport_stage_selected'] = 'team topics'; |
|
384 | - } |
|
385 | - break; |
|
377 | + case 'team forums': |
|
378 | + boincimport_team_forums(); |
|
379 | + if (!variable_get('boincimport_team_forum_successful', 0)) { |
|
380 | + $_SESSION['boincimport_stage_selected'] = 'team forums'; |
|
381 | + } |
|
382 | + else { |
|
383 | + $_SESSION['boincimport_stage_selected'] = 'team topics'; |
|
384 | + } |
|
385 | + break; |
|
386 | 386 | |
387 | - case 'team topics': |
|
388 | - boincimport_team_forum_topics(); |
|
389 | - if (!variable_get('boincimport_team_topic_successful', 0)) { |
|
390 | - $_SESSION['boincimport_stage_selected'] = 'team topics'; |
|
391 | - } |
|
392 | - else { |
|
393 | - $_SESSION['boincimport_stage_selected'] = 'team posts'; |
|
394 | - } |
|
395 | - break; |
|
387 | + case 'team topics': |
|
388 | + boincimport_team_forum_topics(); |
|
389 | + if (!variable_get('boincimport_team_topic_successful', 0)) { |
|
390 | + $_SESSION['boincimport_stage_selected'] = 'team topics'; |
|
391 | + } |
|
392 | + else { |
|
393 | + $_SESSION['boincimport_stage_selected'] = 'team posts'; |
|
394 | + } |
|
395 | + break; |
|
396 | 396 | |
397 | - case 'team posts': |
|
398 | - boincimport_team_forum_posts(); |
|
399 | - if (!variable_get('boincimport_team_post_successful', 0)) { |
|
400 | - $_SESSION['boincimport_stage_selected'] = 'team posts'; |
|
401 | - } |
|
402 | - else { |
|
403 | - $_SESSION['boincimport_stage_selected'] = 'url'; |
|
404 | - } |
|
405 | - break; |
|
397 | + case 'team posts': |
|
398 | + boincimport_team_forum_posts(); |
|
399 | + if (!variable_get('boincimport_team_post_successful', 0)) { |
|
400 | + $_SESSION['boincimport_stage_selected'] = 'team posts'; |
|
401 | + } |
|
402 | + else { |
|
403 | + $_SESSION['boincimport_stage_selected'] = 'url'; |
|
404 | + } |
|
405 | + break; |
|
406 | 406 | |
407 | - case 'url': |
|
408 | - boincimport_replace_urls(); |
|
409 | - if (!variable_get('boincimport_replace_url_successful', 0)) { |
|
410 | - $_SESSION['boincimport_stage_selected'] = 'url'; |
|
411 | - } |
|
412 | - else { |
|
413 | - drupal_set_message('Congratulations. Import Finished'); |
|
414 | - drupal_set_message('Please visit the '. l('Post migration configuration', 'admin/boinc/import/post_configuration') .' page'); |
|
415 | - watchdog('boincimport', 'Import process is complete', array(), WATCHDOG_INFO); |
|
416 | - unset($_SESSION['boincimport_stage_selected']); |
|
417 | - } |
|
418 | - break; |
|
419 | - default: |
|
420 | - $_SESSION['boincimport_stage_selected'] = 'users'; |
|
421 | - break; |
|
407 | + case 'url': |
|
408 | + boincimport_replace_urls(); |
|
409 | + if (!variable_get('boincimport_replace_url_successful', 0)) { |
|
410 | + $_SESSION['boincimport_stage_selected'] = 'url'; |
|
411 | + } |
|
412 | + else { |
|
413 | + drupal_set_message('Congratulations. Import Finished'); |
|
414 | + drupal_set_message('Please visit the '. l('Post migration configuration', 'admin/boinc/import/post_configuration') .' page'); |
|
415 | + watchdog('boincimport', 'Import process is complete', array(), WATCHDOG_INFO); |
|
416 | + unset($_SESSION['boincimport_stage_selected']); |
|
417 | + } |
|
418 | + break; |
|
419 | + default: |
|
420 | + $_SESSION['boincimport_stage_selected'] = 'users'; |
|
421 | + break; |
|
422 | 422 | } |
423 | 423 | } |
424 | 424 |
@@ -422,6 +422,9 @@ |
||
422 | 422 | /* |
423 | 423 | * |
424 | 424 | */ |
425 | +/** |
|
426 | + * @param integer $credit |
|
427 | + */ |
|
425 | 428 | function boincstats_credit_to_ghours($credit) { |
426 | 429 | return $credit / (100 * 365); |
427 | 430 | } |
@@ -179,6 +179,10 @@ |
||
179 | 179 | |
180 | 180 | function left($value,$NbChar) { return substr($value,0,$NbChar); } |
181 | 181 | function right($value,$NbChar) { return substr($value,strlen($value)-$NbChar,$NbChar); } |
182 | + |
|
183 | + /** |
|
184 | + * @param integer $NbChar |
|
185 | + */ |
|
182 | 186 | function mid($value,$Depart,$NbChar) { return substr($value,$Depart-1,$NbChar); } |
183 | 187 | } |
184 | 188 | ?> |
185 | 189 | \ No newline at end of file |
@@ -181,6 +181,9 @@ discard block |
||
181 | 181 | } |
182 | 182 | } |
183 | 183 | |
184 | + /** |
|
185 | + * @param string $string |
|
186 | + */ |
|
184 | 187 | function checksum( $string ) |
185 | 188 | { |
186 | 189 | $checksum = 0; |
@@ -195,6 +198,11 @@ discard block |
||
195 | 198 | |
196 | 199 | function left($value,$NbChar) { return substr($value,0,$NbChar); } |
197 | 200 | function right($value,$NbChar) { return substr($value,strlen($value)-$NbChar,$NbChar); } |
201 | + |
|
202 | + /** |
|
203 | + * @param integer $Depart |
|
204 | + * @param integer $NbChar |
|
205 | + */ |
|
198 | 206 | function mid($value,$Depart,$NbChar) { return substr($value,$Depart-1,$NbChar); } |
199 | 207 | } |
200 | 208 | ?> |
201 | 209 | \ No newline at end of file |
@@ -47,6 +47,10 @@ discard block |
||
47 | 47 | { return(md5($Marker.serialize($Data->Data))); } |
48 | 48 | |
49 | 49 | /* Write the generated picture to the cache */ |
50 | + |
|
51 | + /** |
|
52 | + * @param pImage $pChartObject |
|
53 | + */ |
|
50 | 54 | function writeToCache($ID,$pChartObject) |
51 | 55 | { |
52 | 56 | /* Compute the paths */ |
@@ -81,6 +85,10 @@ discard block |
||
81 | 85 | } |
82 | 86 | |
83 | 87 | /* Remove object older than the specified TS */ |
88 | + |
|
89 | + /** |
|
90 | + * @param integer $Expiry |
|
91 | + */ |
|
84 | 92 | function removeOlderThan($Expiry) |
85 | 93 | { $this->dbRemoval(array("Expiry"=>$Expiry)); } |
86 | 94 | |
@@ -235,6 +243,9 @@ discard block |
||
235 | 243 | return(TRUE); |
236 | 244 | } |
237 | 245 | |
246 | + /** |
|
247 | + * @param string $Destination |
|
248 | + */ |
|
238 | 249 | function saveFromCache($ID,$Destination) |
239 | 250 | { |
240 | 251 | /* Get the raw picture from the cache */ |