Enano CMS (1.1.x): comparison includes/template.php

equal deleted inserted replaced

-:90b7a52bea45
+:b0a4d179be85
 $this->toolbar_menu = '';
 $this->additional_headers = '';
 $this->plugin_blocks = Array();
 $this->theme_loaded = false;
-$this->fading_button = '<div style="background-image: url('.scriptPath.'/images/about-powered-enano-hover.png); background-repeat: no-repeat; width: 88px; height: 31px; margin: 0 auto;">
+$this->fading_button = '<div style="background-image: url('.scriptPath.'/images/about-powered-enano-hover.png); background-repeat: no-repeat; width: 88px; height: 31px; margin: 0 auto 5px auto;">
 <a href="http://enanocms.org/" onclick="window.open(this.href); return false;"><img style="border-width: 0;" alt=" " src="'.scriptPath.'/images/about-powered-enano.png" onmouseover="domOpacity(this, 100, 0, 500);" onmouseout="domOpacity(this, 0, 100, 500);" /></a>
 </div>';
 $this->theme_list = Array();
 $this->named_theme_list = Array();
 function init_vars()
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 global $email;
+global $lang;
 dc_here("template: initializing all variables");
 if(!$this->theme || !$this->style)
 {
 // Get the "article" button text (depends on namespace)
 switch($paths->namespace) {
 case "Article":
 default:
-$ns = 'article';
+$ns = $lang->get('onpage_lbl_page_article');
 break;
 case "Admin":
-$ns = 'administration page';
+$ns = $lang->get('onpage_lbl_page_admin');
 break;
 case "System":
-$ns = 'system message';
+$ns = $lang->get('onpage_lbl_page_system');
 break;
 case "File":
-$ns = 'uploaded file';
+$ns = $lang->get('onpage_lbl_page_file');
 break;
 case "Help":
-$ns = 'documentation page';
+$ns = $lang->get('onpage_lbl_page_help');
 break;
 case "User":
-$ns = 'user page';
+$ns = $lang->get('onpage_lbl_page_user');
 break;
 case "Special":
-$ns = 'special page';
+$ns = $lang->get('onpage_lbl_page_special');
 break;
 case "Template":
-$ns = 'template';
+$ns = $lang->get('onpage_lbl_page_template');
 break;
 case "Project":
-$ns = 'project page';
+$ns = $lang->get('onpage_lbl_page_project');
 break;
 case "Category":
-$ns = 'category';
+$ns = $lang->get('onpage_lbl_page_category');
 break;
 }
 $this->namespace_string = $ns;
+unset($ns);
 $code = $plugins->setHook('page_type_string_set');
 foreach ( $code as $cmd )
 {
 eval($cmd);
 }
 $db->free_result();
 $n = ( $session->get_permissions('mod_comments') ) ? (string)$nc : (string)$na;
 if ( $session->get_permissions('mod_comments') && $nu > 0 )
 {
-$n .= ' total/'.$nu.' unapp.';
+$subst = array(
+'num_comments' => $nc,
+'num_unapp' => $nu
+);
+$btn_text = $lang->get('onpage_btn_discussion_unapp', $subst);
+}
+else
+{
+$subst = array(
+'num_comments' => $nc
+);
+$btn_text = $lang->get('onpage_btn_discussion', $subst);
 }
 $button->assign_vars(array(
 'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { void(ajaxComments()); return false; }" title="View the comments that other users have posted about this page (alt-c)" accesskey="c"',
 'PARENTFLAGS' => 'id="mdgToolbar_discussion"',
 'HREF' => makeUrl($paths->page, 'do=comments', true),
-'TEXT' => 'discussion ('.$n.')',
+'TEXT' => $btn_text,
 ));
 $tb .= $button->run();
 }
 // Edit button
 {
 $button->assign_vars(array(
 'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { void(ajaxEditor()); return false; }" title="Edit the contents of this page (alt-e)" accesskey="e"',
 'PARENTFLAGS' => 'id="mdgToolbar_edit"',
 'HREF' => makeUrl($paths->page, 'do=edit', true),
-'TEXT' => 'edit this page'
+'TEXT' => $lang->get('onpage_btn_edit')
 ));
 $tb .= $button->run();
 // View source button
 }
 else if($session->get_permissions('view_source') && ( !$session->get_permissions('edit_page') || !$session->get_permissions('even_when_protected') && $paths->page_protected ) && $paths->namespace != 'Special' && $paths->namespace != 'Admin')
 {
 $button->assign_vars(array(
 'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { void(ajaxViewSource()); return false; }" title="View the source code (wiki markup) that this page uses (alt-e)" accesskey="e"',
 'PARENTFLAGS' => 'id="mdgToolbar_edit"',
 'HREF' => makeUrl($paths->page, 'do=viewsource', true),
-'TEXT' => 'view source'
+'TEXT' => $lang->get('onpage_btn_viewsource')
 ));
 $tb .= $button->run();
 }
 // History button
 if ( $session->get_permissions('read') /* && $paths->wiki_mode */ && $paths->page_exists && $paths->namespace != 'Special' && $paths->namespace != 'Admin' && $session->get_permissions('history_view') )
 {
 $button->assign_vars(array(
 'FLAGS'       => 'onclick="if ( !KILL_SWITCH ) { void(ajaxHistory()); return false; }" title="View a log of actions taken on this page (alt-h)" accesskey="h"',
 'PARENTFLAGS' => 'id="mdgToolbar_history"',
 'HREF'        => makeUrl($paths->page, 'do=history', true),
-'TEXT'        => 'history'
+'TEXT'        => $lang->get('onpage_btn_history')
 ));
 $tb .= $button->run();
 }
 $menubtn = $this->makeParserText($tplvars['toolbar_menu_button']);
 if ( $session->get_permissions('read') && $paths->page_exists && ( $session->get_permissions('rename') && ( $paths->page_protected && $session->get_permissions('even_when_protected') || !$paths->page_protected ) ) && $paths->namespace != 'Special' && $paths->namespace != 'Admin' )
 {
 $menubtn->assign_vars(array(
 'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { void(ajaxRename()); return false; }" title="Change the display name of this page (alt-r)" accesskey="r"',
 'HREF'  => makeUrl($paths->page, 'do=rename', true),
-'TEXT'  => 'rename',
+'TEXT'  => $lang->get('onpage_btn_rename'),
 ));
 $this->toolbar_menu .= $menubtn->run();
 }
 // Vote-to-delete button
 if ( $paths->wiki_mode && $session->get_permissions('vote_delete') && $paths->page_exists && $paths->namespace != 'Special' && $paths->namespace != 'Admin')
 {
 $menubtn->assign_vars(array(
 'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { void(ajaxDelVote()); return false; }" title="Vote to have this page deleted (alt-d)" accesskey="d"',
 'HREF'  => makeUrl($paths->page, 'do=delvote', true),
-'TEXT'  => 'vote to delete this page',
+'TEXT'  => $lang->get('onpage_btn_votedelete'),
 ));
 $this->toolbar_menu .= $menubtn->run();
 }
 // Clear-votes button
 if ( $session->get_permissions('read') && $paths->wiki_mode && $paths->page_exists && $paths->namespace != 'Special' && $paths->namespace != 'Admin' && $session->get_permissions('vote_reset') && $paths->cpage['delvotes'] > 0)
 {
 $menubtn->assign_vars(array(
 'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { void(ajaxResetDelVotes()); return false; }" title="Vote to have this page deleted (alt-y)" accesskey="y"',
 'HREF'  => makeUrl($paths->page, 'do=resetvotes', true),
-'TEXT'  => 'reset deletion votes',
+'TEXT'  => $lang->get('onpage_btn_votedelete_reset'),
 ));
 $this->toolbar_menu .= $menubtn->run();
 }
 // Printable page button
 if ( $paths->page_exists && $paths->namespace != 'Special' && $paths->namespace != 'Admin' )
 {
 $menubtn->assign_vars(array(
 'FLAGS' => 'title="View a version of this page that is suitable for printing"',
 'HREF'  => makeUrl($paths->page, 'printable=yes', true),
-'TEXT'  => 'view printable version',
+'TEXT'  => $lang->get('onpage_btn_printable'),
 ));
 $this->toolbar_menu .= $menubtn->run();
 }
 // Protect button
 if($session->get_permissions('read') && $paths->wiki_mode && $paths->page_exists && $paths->namespace != 'Special' && $paths->namespace != 'Admin' && $session->get_permissions('protect'))
 {
 $label = $this->makeParserText($tplvars['toolbar_label']);
-$label->assign_vars(array('TEXT' => 'protection:'));
+$label->assign_vars(array('TEXT' => $lang->get('onpage_lbl_protect')));
 $t0 = $label->run();
 $ctmp = '';
 if ( $paths->cpage['protected'] == 1 )
 {
 $ctmp=' style="text-decoration: underline;"';
 }
 $menubtn->assign_vars(array(
 'FLAGS' => 'accesskey="i" onclick="if ( !KILL_SWITCH ) { ajaxProtect(1); return false; }" id="protbtn_1" title="Prevents all non-administrators from editing this page. [alt-i]"'.$ctmp,
 'HREF'  => makeUrl($paths->page, 'do=protect&level=1', true),
-'TEXT'  => 'on'
+'TEXT'  => $lang->get('onpage_btn_protect_on')
 ));
 $t1 = $menubtn->run();
 $ctmp = '';
 if ( $paths->cpage['protected'] == 0 )
 $ctmp=' style="text-decoration: underline;"';
 }
 $menubtn->assign_vars(array(
 'FLAGS' => 'accesskey="o" onclick="if ( !KILL_SWITCH ) { ajaxProtect(0); return false; }" id="protbtn_0" title="Allows everyone to edit this page. [alt-o]"'.$ctmp,
 'HREF'  => makeUrl($paths->page, 'do=protect&level=0', true),
-'TEXT'  => 'off'
+'TEXT'  => $lang->get('onpage_btn_protect_off')
 ));
 $t2 = $menubtn->run();
 $ctmp = '';
 if ( $paths->cpage['protected'] == 2 )
 $ctmp = ' style="text-decoration: underline;"';
 }
 $menubtn->assign_vars(array(
 'FLAGS' => 'accesskey="p" onclick="if ( !KILL_SWITCH ) { ajaxProtect(2); return false; }" id="protbtn_2" title="Allows only users who have been registered for 4 days to edit this page. [alt-p]"'.$ctmp,
 'HREF'  => makeUrl($paths->page, 'do=protect&level=2', true),
-'TEXT'  => 'semi'
+'TEXT'  => $lang->get('onpage_btn_protect_semi')
 ));
 $t3 = $menubtn->run();
 $this->toolbar_menu .= '        <table border="0" cellspacing="0" cellpadding="0">
 <tr>
 // Wiki mode button
 if($session->get_permissions('read') && $paths->page_exists && $session->get_permissions('set_wiki_mode') && $paths->namespace != 'Special' && $paths->namespace != 'Admin')
 {
 // label at start
 $label = $this->makeParserText($tplvars['toolbar_label']);
-$label->assign_vars(array('TEXT' => 'page wiki mode:'));
+$label->assign_vars(array('TEXT' => $lang->get('onpage_lbl_wikimode')));
 $t0 = $label->run();
 // on button
 $ctmp = '';
 if ( $paths->cpage['wiki_mode'] == 1 )
 $ctmp = ' style="text-decoration: underline;"';
 }
 $menubtn->assign_vars(array(
 'FLAGS' => /* 'onclick="if ( !KILL_SWITCH ) { ajaxSetWikiMode(1); return false; }" id="wikibtn_1" title="Forces wiki functions to be allowed on this page."'. */ $ctmp,
 'HREF' => makeUrl($paths->page, 'do=setwikimode&level=1', true),
-'TEXT' => 'on'
+'TEXT' => $lang->get('onpage_btn_wikimode_on')
 ));
 $t1 = $menubtn->run();
 // off button
 $ctmp = '';
 $ctmp=' style="text-decoration: underline;"';
 }
 $menubtn->assign_vars(array(
 'FLAGS' => /* 'onclick="if ( !KILL_SWITCH ) { ajaxSetWikiMode(0); return false; }" id="wikibtn_0" title="Forces wiki functions to be disabled on this page."'. */ $ctmp,
 'HREF' => makeUrl($paths->page, 'do=setwikimode&level=0', true),
-'TEXT' => 'off'
+'TEXT' => $lang->get('onpage_btn_wikimode_off')
 ));
 $t2 = $menubtn->run();
 // global button
 $ctmp = '';
 $ctmp=' style="text-decoration: underline;"';
 }
 $menubtn->assign_vars(array(
 'FLAGS' => /* 'onclick="if ( !KILL_SWITCH ) { ajaxSetWikiMode(2); return false; }" id="wikibtn_2" title="Causes this page to use the global wiki mode setting (default)"'. */ $ctmp,
 'HREF' => makeUrl($paths->page, 'do=setwikimode&level=2', true),
-'TEXT' => 'global'
+'TEXT' => $lang->get('onpage_btn_wikimode_global')
 ));
 $t3 = $menubtn->run();
 // Tack it onto the list of buttons that are already there...
 $this->toolbar_menu .= '        <table border="0" cellspacing="0" cellpadding="0">
 if ( $session->get_permissions('read') && $session->get_permissions('clear_logs') && $paths->namespace != 'Special' && $paths->namespace != 'Admin' )
 {
 $menubtn->assign_vars(array(
 'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { void(ajaxClearLogs()); return false; }" title="Remove all edit and action logs for this page from the database. IRREVERSIBLE! (alt-l)" accesskey="l"',
 'HREF'  => makeUrl($paths->page, 'do=flushlogs', true),
-'TEXT'  => 'clear page logs',
+'TEXT'  => $lang->get('onpage_btn_clearlogs'),
 ));
 $this->toolbar_menu .= $menubtn->run();
 }
 // Delete page button
 if ( $session->get_permissions('read') && $session->get_permissions('delete_page') && $paths->page_exists && $paths->namespace != 'Special' && $paths->namespace != 'Admin' )
 {
-$s = 'delete this page';
+$s = $lang->get('onpage_btn_deletepage');
 if ( $paths->cpage['delvotes'] == 1 )
 {
-$s .= ' (<b>'.$paths->cpage['delvotes'].'</b> vote)';
+$subst = array(
+'num_votes' => $paths->cpage['delvotes'],
+'plural' => ''
+);
+$s .= $lang->get('onpage_btn_deletepage_votes', $subst);
 }
 else if ( $paths->cpage['delvotes'] > 1 )
 {
-$s .= ' (<b>'.$paths->cpage['delvotes'].'</b> votes)';
+$subst = array(
+'num_votes' => $paths->cpage['delvotes'],
+'plural' => $lang->get('meta_plural')
+);
+$s .= $lang->get('onpage_btn_deletepage_votes', $subst);
 }
 $menubtn->assign_vars(array(
 'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { void(ajaxDeletePage()); return false; }" title="Delete this page. This is always reversible unless the logs are cleared. (alt-k)" accesskey="k"',
 'HREF'  => makeUrl($paths->page, 'do=deletepage', true),
 }
 if ( $a && $session->get_permissions('read') && $paths->page_exists && $paths->namespace != 'Special' && $paths->namespace != 'Admin' )
 {
 // label at start
 $label = $this->makeParserText($tplvars['toolbar_label']);
-$label->assign_vars(array('TEXT' => 'page password:'));
+$label->assign_vars(array('TEXT' => $lang->get('onpage_lbl_password')));
 $t0 = $label->run();
 $menubtn->assign_vars(array(
 'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { void(ajaxSetPassword()); return false; }" title="Require a password in order for this page to be viewed"',
 'HREF'  => '#',
-'TEXT'  => 'set',
+'TEXT'  => $lang->get('onpage_btn_password_set'),
 ));
 $t = $menubtn->run();
 $this->toolbar_menu .= '<table border="0" cellspacing="0" cellpadding="0"><tr><td>'.$t0.'</td><td><input type="password" id="mdgPassSetField" size="10" /></td><td>'.$t.'</td></tr></table>';
 }
 if($session->get_permissions('edit_acl') || $session->user_level >= USER_LEVEL_ADMIN)
 {
 $menubtn->assign_vars(array(
 'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { return ajaxOpenACLManager(); }" title="Manage who can do what with this page (alt-m)" accesskey="m"',
 'HREF'  => makeUrl($paths->page, 'do=aclmanager', true),
-'TEXT'  => 'manage page access',
+'TEXT'  => $lang->get('onpage_btn_acl'),
 ));
 $this->toolbar_menu .= $menubtn->run();
 }
 // Administer page button
 if ( $session->user_level >= USER_LEVEL_ADMIN && $paths->page_exists && $paths->namespace != 'Special' && $paths->namespace != 'Admin' )
 {
 $menubtn->assign_vars(array(
 'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { void(ajaxAdminPage()); return false; }" title="Administrative options for this page" accesskey="g"',
 'HREF'  => makeUrlNS('Special', 'Administration', 'module='.$paths->nslist['Admin'].'PageManager', true),
-'TEXT'  => 'administrative options',
+'TEXT'  => $lang->get('onpage_btn_admin'),
 ));
 $this->toolbar_menu .= $menubtn->run();
 }
 if ( strlen($this->toolbar_menu) > 0 )
 {
 $button->assign_vars(array(
 'FLAGS'       => 'id="mdgToolbar_moreoptions" onclick="if ( !KILL_SWITCH ) { return false; }" title="Additional options for working with this page"',
 'PARENTFLAGS' => '',
 'HREF'        => makeUrl($paths->page, 'do=moreoptions', true),
-'TEXT'        => 'more options'
+'TEXT'        => $lang->get('onpage_btn_moreoptions')
 ));
 $tb .= $button->run();
 }
 $is_opera = (isset($_SERVER['HTTP_USER_AGENT']) && strstr($_SERVER['HTTP_USER_AGENT'], 'Opera')) ? true : false;
 $p = ( isset($_GET['printable']) ) ? '/printable' : '';
 // Add the e-mail address client code to the header
 $this->add_header($email->jscode());
+// Add language file
+$lang_uri = makeUrlNS('Special', 'LangExportJSON/' . $lang->lang_id, false, true);
+$this->add_header("<script type=\"text/javascript\" src=\"$lang_uri\"></script>");
 // Generate the code for the Log out and Change theme sidebar buttons
 // Once again, the new template parsing system can be used here
 $parser = $this->makeParserText($tplvars['sidebar_button']);
 $parser->assign_vars(Array(
 'HREF'=>makeUrlNS('Special', 'Logout'),
 'FLAGS'=>'onclick="if ( !KILL_SWITCH ) { mb_logout(); return false; }"',
-'TEXT'=>'Log out',
+'TEXT'=>$lang->get('sidebar_btn_logout'),
 ));
 $logout_link = $parser->run();
 $parser->assign_vars(Array(
 'HREF'=>makeUrlNS('Special', 'Login/' . $paths->page),
 'FLAGS'=>'onclick="if ( !KILL_SWITCH ) { ajaxStartLogin(); return false; }"',
-'TEXT'=>'Log in',
+'TEXT'=>$lang->get('sidebar_btn_login'),
 ));
 $login_link = $parser->run();
 $parser->assign_vars(Array(
 'HREF'=>makeUrlNS('Special', 'ChangeStyle/'.$paths->page),
 'FLAGS'=>'onclick="if ( !KILL_SWITCH ) { ajaxChangeStyle(); return false; }"',
-'TEXT'=>'Change theme',
+'TEXT'=>$lang->get('sidebar_btn_changestyle'),
 ));
 $theme_link = $parser->run();
 $parser->assign_vars(Array(
 'HREF'=>makeUrlNS('Special', 'Administration'),
 'FLAGS'=>'onclick="if ( !KILL_SWITCH ) { void(ajaxStartAdminLogin()); return false; }"',
-'TEXT'=>'Administration',
+'TEXT'=>$lang->get('sidebar_btn_administration'),
 ));
 $admin_link = $parser->run();
 $SID = ($session->sid_super) ? $session->sid_super : '';
 // if($t['theme_id'] == $session->theme) $js_dynamic .= ' selected="selected"';
 $js_dynamic .= '>'.$t['theme_name'].'</option>';
 }
 }
 $js_dynamic .= '\';
-var ENANO_CURRENT_THEME = \''. $session->theme .'\';';
+var ENANO_CURRENT_THEME = \''. $session->theme .'\';
+var ENANO_LANG_ID = ' . $lang->lang_id . ';
+var ENANO_PAGE_TYPE = "' . addslashes($this->namespace_string) . '";';
 foreach($paths->nslist as $k => $c)
 {
 $js_dynamic .= "namespace_list['{$k}'] = '$c';";
 }
 $js_dynamic .= "\n    //]]>\n    </script>";
 }
 function header($simple = false)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
+global $lang;
 ob_start();
 if(!$this->theme_loaded)
 {
 $this->load_theme($session->theme, $session->style);
 }
 if ( !$simple && $session->sw_timed_out )
 {
 $login_link = makeUrlNS('Special', 'Login/' . $paths->fullpage, 'level=' . $session->user_level, true);
 echo '<div class="usermessage">';
-echo '<b>Your administrative session has timed out.</b> <a href="' . $login_link . '">Log in again</a>';
+echo $lang->get('user_msg_elev_timed_out', array( 'login_link' => $login_link ));
 echo '</div>';
 }
 if ( $this->site_disabled && $session->user_level >= USER_LEVEL_ADMIN && ( $paths->page != $paths->nslist['Special'] . 'Administration' ) )
 {
 $admin_link = makeUrlNS('Special', 'Administration', 'module=' . $paths->nslist['Admin'] . 'GeneralConfig', true);
 // $md5 will be set by the cached file
 // This makes sure that a cached copy of the template is used only if its MD5
 // matches the MD5 of the file that the compiled file was compiled from.
 if ( isset($md5) && $md5 == md5($text) )
 {
-return str_replace('\\"', '"', $tpl_text);
+return $this->compile_template_text_post(str_replace('\\"', '"', $tpl_text));
 }
 }
 // We won't use the cached copy here
 $text = file_get_contents($tpl_file_fullpath);
 // $tpl_text actually will contain the compiled code
 fwrite($h, '<?php ' . $notice . ' $md5 = \'' . $md5 . '\'; $tpl_text = \'' . $text_escaped . '\'; ?>');
 fclose($h);
 }
-return $text; //('<pre>'.htmlspecialchars($text).'</pre>');
+return $this->compile_template_text_post($text); //('<pre>'.htmlspecialchars($text).'</pre>');
 }
 /**
 * Compiles (parses) some template code with the current master set of variables and booleans.
 */
 function compile_template_text($text)
 {
 // this might do something else in the future, possibly cache large templates
-return $this->compile_tpl_code($text);
+return $this->compile_template_text_post($this->compile_tpl_code($text));
 }
 /**
 * For convenience - compiles AND parses some template code.
 * @param string Text to process
 */
 function parse($text)
 {
 $text = $this->compile_template_text($text);
+$text = $this->compile_template_text_post($text);
 return eval($text);
+}
+/**
+* Post-processor for template code. Basically what this does is it localizes {lang:foo} blocks.
+* @param string Mostly-processed TPL code
+* @return string
+*/
+function compile_template_text_post($text)
+{
+global $lang;
+preg_match_all('/\{lang:([a-z0-9]+_[a-z0-9_]+)\}/', $text, $matches);
+foreach ( $matches[1] as $i => $string_id )
+{
+$string = $lang->get($string_id);
+$string = str_replace('\\', '\\\\', $string);
+$string = str_replace('\'', '\\\'', $string);
+$text = str_replace_once($matches[0][$i], $string, $text);
+}
+return $text;
 }
 // Steps to turn this:
 //   [[Project:Community Portal]]
 // into this:
 */
 function tplWikiFormat($message, $filter_links = false, $filename = 'elements.tpl')
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
+global $lang;
 $filter_links = false;
 $tplvars = $this->extract_vars($filename);
 if($session->sid_super) $as = htmlspecialchars(urlSeparator).'auth='.$session->sid_super;
 else $as = '';
 error_reporting(E_ALL);
 else $c = $links[2][$i];
 $message = str_replace('{CONDITIONAL:'.$i.':'.$random_id.'}', $c, $message);
 }
 }
+preg_match_all('/\{lang:([a-z0-9]+_[a-z0-9_]+)\}/', $message, $matches);
+foreach ( $matches[1] as $i => $string_id )
+{
+$string = $lang->get($string_id);
+$string = str_replace('\\', '\\\\', $string);
+$string = str_replace('\'', '\\\'', $string);
+$message = str_replace_once($matches[0][$i], $string, $message);
+}
 /*
 * HTML RENDERER
 */
 // Images
 // External links
 // $message = preg_replace('#\[(http|ftp|irc):\/\/([a-z0-9\/:_\.\?&%\#@_\\\\-]+?) ([^\]]+)\\]#', '<a href="\\1://\\2">\\3</a><br style="display: none;" />', $message);
 // $message = preg_replace('#\[(http|ftp|irc):\/\/([a-z0-9\/:_\.\?&%\#@_\\\\-]+?)\\]#', '<a href="\\1://\\2">\\1://\\2</a><br style="display: none;" />', $message);
-preg_match_all('/\[((https?|ftp|irc):\/\/([^@\]"\':]+)?((([a-z0-9-]+\.)*)[a-z0-9-]+)(\/[A-z0-9_%\|~`!\!@#\$\^&\*\(\):;\.,\/-]*(\?(([a-z0-9_-]+)(=[A-z0-9_%\|~`\!@#\$\^&\*\(\):;\.,\/-\[\]]+)?((&([a-z0-9_-]+)(=[A-z0-9_%\|~`!\!@#\$\^&\*\(\):;\.,\/-]+)?)*))?)?)?) ([^\]]+)\]/is', $message, $ext_link);
+preg_match_all('/\[((https?|ftp|irc):\/\/([^@\s\]"\':]+)?((([a-z0-9-]+\.)*)[a-z0-9-]+)(\/[A-z0-9_%\|~`!\!@#\$\^&\*\(\):;\.,\/-]*(\?(([a-z0-9_-]+)(=[A-z0-9_%\|~`\!@#\$\^&\*\(\):;\.,\/-\[\]]+)?((&([a-z0-9_-]+)(=[A-z0-9_%\|~`!\!@#\$\^&\*\(\):;\.,\/-]+)?)*))?)?)?) ([^\]]+)\]/is', $message, $ext_link);
+// die('<pre>' . htmlspecialchars( print_r($ext_link, true) ) . '</pre>');
 for ( $i = 0; $i < count($ext_link[0]); $i++ )
 {
 $text_parser->assign_vars(Array(
 'HREF'  => $ext_link[1][$i],
 'TEXT'  => $ext_link[16][$i]
 ));
 $message = str_replace($ext_link[0][$i], $text_parser->run(), $message);
 }
-preg_match_all('/\[((https?|ftp|irc):\/\/([^@\]"\':]+)?((([a-z0-9-]+\.)*)[a-z0-9-]+)(\/[A-z0-9_%\|~`!\!@#\$\^&\*\(\):;\.,\/-]*(\?(([a-z0-9_-]+)(=[A-z0-9_%\|~`\!@#\$\^&\*\(\):;\.,\/-\[\]]+)?((&([a-z0-9_-]+)(=[A-z0-9_%\|~`!\!@#\$\^&\*\(\):;\.,\/-]+)?)*))?)?)?)\]/is', $message, $ext_link);
+preg_match_all('/\[((https?|ftp|irc):\/\/([^@\s\]"\':]+)?((([a-z0-9-]+\.)*)[a-z0-9-]+)(\/[A-z0-9_%\|~`!\!@#\$\^&\*\(\):;\.,\/-]*(\?(([a-z0-9_-]+)(=[A-z0-9_%\|~`\!@#\$\^&\*\(\):;\.,\/-\[\]]+)?((&([a-z0-9_-]+)(=[A-z0-9_%\|~`!\!@#\$\^&\*\(\):;\.,\/-]+)?)*))?)?)?)\]/is', $message, $ext_link);
 for ( $i = 0; $i < count($ext_link[0]); $i++ )
 {
 $text_parser->assign_vars(Array(
 'HREF'  => $ext_link[1][$i],
 // SourceForge/W3C buttons
 $ob = Array();
 $admintitle = ( $session->user_level >= USER_LEVEL_ADMIN ) ? 'title="You may disable this button in the admin panel under General Configuration."' : '';
 if(getConfig('sflogo_enabled')=='1')
 {
-$ob[] = '<a style="text-align: center;" href="http://sourceforge.net/" onclick="if ( !KILL_SWITCH ) { window.open(this.href);return false; }"><img style="border-width: 0px;" alt="SourceForge.net Logo" src="http://sflogo.sourceforge.net/sflogo.php?group_id='.getConfig('sflogo_groupid').'&amp;type='.getConfig('sflogo_type').'" /></a>';
+$sflogo_secure = ( isset($_SERVER['HTTPS']) ) ? 'https' : 'http';
+$ob[] = '<a style="text-align: center;" href="http://sourceforge.net/" onclick="if ( !KILL_SWITCH ) { window.open(this.href);return false; }"><img style="border-width: 0px;" alt="SourceForge.net Logo" src="' . $sflogo_secure . '://sflogo.sourceforge.net/sflogo.php?group_id='.getConfig('sflogo_groupid').'&amp;type='.getConfig('sflogo_type').'" /></a>';
 }
 if(getConfig('w3c_v32')     =='1') $ob[] = '<a style="text-align: center;" href="http://validator.w3.org/check?uri=referer" onclick="if ( !KILL_SWITCH ) { window.open(this.href);return false; }"><img style="border: 0px solid #FFFFFF;" alt="Valid HTML 3.2"  src="http://www.w3.org/Icons/valid-html32" /></a>';
 if(getConfig('w3c_v40')     =='1') $ob[] = '<a style="text-align: center;" href="http://validator.w3.org/check?uri=referer" onclick="if ( !KILL_SWITCH ) { window.open(this.href);return false; }"><img style="border: 0px solid #FFFFFF;" alt="Valid HTML 4.0"  src="http://www.w3.org/Icons/valid-html40" /></a>';
 if(getConfig('w3c_v401')    =='1') $ob[] = '<a style="text-align: center;" href="http://validator.w3.org/check?uri=referer" onclick="if ( !KILL_SWITCH ) { window.open(this.href);return false; }"><img style="border: 0px solid #FFFFFF;" alt="Valid HTML 4.01" src="http://www.w3.org/Icons/valid-html401" /></a>';
 if(getConfig('w3c_vxhtml10')=='1') $ob[] = '<a style="text-align: center;" href="http://validator.w3.org/check?uri=referer" onclick="if ( !KILL_SWITCH ) { window.open(this.href);return false; }"><img style="border: 0px solid #FFFFFF;" alt="Valid XHTML 1.0" src="http://www.w3.org/Icons/valid-xhtml10" /></a>';

changeset 228	b0a4d179be85
parent 195	eec079676fe7
parent 227	0eca1498a77b
child 231	b11a2f1353c0