diff options
author | prashantsinalkar | 2016-04-13 15:05:42 +0530 |
---|---|---|
committer | prashantsinalkar | 2016-04-13 15:05:42 +0530 |
commit | 6a228171041526a1b4df158850793d0519364dc4 (patch) | |
tree | 75f9e1057953799db0f5a1e9e8b4ae74a9fad06a | |
parent | eca8f561732132738af6cf3be1a4557bc05b0a6a (diff) | |
download | scilab_textbook_companion-6a228171041526a1b4df158850793d0519364dc4.tar.gz scilab_textbook_companion-6a228171041526a1b4df158850793d0519364dc4.tar.bz2 scilab_textbook_companion-6a228171041526a1b4df158850793d0519364dc4.zip |
added url to hyperlink filter to reference
-rwxr-xr-x | manage_proposal.inc | 6 | ||||
-rwxr-xr-x | textbook_companion.module | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/manage_proposal.inc b/manage_proposal.inc index 648faac..0cd070d 100755 --- a/manage_proposal.inc +++ b/manage_proposal.inc @@ -270,9 +270,13 @@ function proposal_approval_form($form,&$form_state) '#markup' => $row->scilab_version, '#title' => t('Scilab Version'), ); + /************************** reference link filter *******************/ + $url = '~(?:(https?)://([^\s<]+)|(www\.[^\s<]+?\.[^\s<]+))(?<![\.,:])~i'; + $reference = preg_replace($url, '<a href="$0" target="_blank" title="$0">$0</a>', $row->reference); +/******************************/ $form['reference'] = array( '#type' => 'item', - '#markup' => $row->reference, + '#markup' => $reference, '#title' => t('References'), ); $form['reason'] = array( diff --git a/textbook_companion.module b/textbook_companion.module index aaa60dc..847d0bc 100755 --- a/textbook_companion.module +++ b/textbook_companion.module @@ -3496,8 +3496,6 @@ function book_proposal_nonaicte_form_validate($form, &$form_state) if (!preg_match('/^\d+(?:\.\d+)+/', $form_state['values']['version'])) form_set_error('version', t('Please enter correct version in speacifed format')); - - if($form_state['values']['country']=='Others'){ if($form_state['values']['other_country']== ''){ |