Project

General

Profile

« Previous | Next » 

Revision 2092

Added by darkviper almost 11 years ago

! several files: remove multiple ;;
! uninstall language deactivated
- droplet: iSectionPicker
+ droplet: SectionPicker

View differences:

branches/2.8.x/CHANGELOG
11 11
! = Update/Change
12 12
===============================================================================
13 13

  
14
20 Jan-2014 Build 2090 Manuela v.d.Decken(DarkViper)
14
20 Jan-2014 Build 2092 Manuela v.d.Decken(DarkViper)
15
! several files:  remove multiple ;;
16
! uninstall language deactivated
17
- droplet: iSectionPicker
18
+ droplet: SectionPicker
19
20 Jan-2014 Build 2091 Manuela v.d.Decken(DarkViper)
15 20
! several Files: corrected case sensitivity of ::getInstance()
21
19 Jan-2014 Build 2090 Manuela v.d.Decken(DarkViper)
22
! UpgradeHelper: added method delTree()
23
+ templates/WbTheme
24
! all upgrade/install and all other files needed to change defaults
25
# modules/MultiLingual/update_keys.php  inactive lines of code removed
16 26
19 Jan-2014 Build 2089 Manuela v.d.Decken(DarkViper)
17
! UpgradeHelper: added method delTree()
18 27
- templates/argos_theme
19 28
- templates/allcss
20 29
- templates/wb_theme
21
+ templates/WbTheme
22
! all upgrade/install and all other files needed to change defaults
23
# modules/MultiLingual/update_keys.php  inactive lines of code removed
24 30
19 Jan-2014 Build 2088 Manuela v.d.Decken(DarkViper)
25 31
# news/delete_post invalid arguments for AccessFile corrected
26 32
! search/search.php  read settings optimized
branches/2.8.x/wb/admin/skel/themes/htt/__languages.htt
1
<!-- BEGIN main_block -->
2

  
3
<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
4
	<tr style="background:#f0f0f0;">
5
		<td align="left">{HEADING_CHANGE_TEMPLATE_NOTICE}</td>
6
		<td align="right">
7
			{URL_TEMPLATES}
8
			-
9
			{URL_MODULES}
10
			-
11
			{URL_ADVANCED}
12
		</td>
13
     </tr>
14
</table>
15

  
16
<form name="install" enctype="multipart/form-data" action="install.php" method="post" class="{DISPLAY_INSTALL} left">
17
{FTAN}
18
  <h2>{HEADING_INSTALL_LANGUAGE}</h2>
19
  <table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
20
    <tr>
21
      <td>
22
        <input type="file" name="userfile" size="60" />
23
        <script type="text/javascript">
24
		document.install.userfile.focus();
25
		</script><br /><br />
26
		<span style="visibility: hidden;">
27
        <input type="checkbox" name="overwrite" value="false"  />
28
		{MESSAGE_ADDON_OVERWRITE_NEWER_FILES}
29
		</span>
30

  
31
      </td>
32
      <td width="110" align="left">
33
        <input type="submit" name="submit" value="{TEXT_INSTALL}" style="width: 100px;" /><br /><br />
34
      </td>
35
    </tr>
36
  </table>
37
  <br />
38
</form>
39
<form name="uninstall" action="uninstall.php" method="post" class="{DISPLAY_UNINSTALL} left">
40
{FTAN}
41
  <h2>{HEADING_UNINSTALL_LANGUAGE}</h2>
42
  <table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
43
    <tr>
44
      <td>
45
        <select name="code" style="width: 97%;">
46
		<option value="" selected="selected">{TEXT_PLEASE_SELECT}...</option>
47
		<!-- BEGIN language_list_block -->
48
			<option value="{VALUE}">{NAME}</option>
49
          <!-- END language_list_block -->
50
        </select>
51
      </td>
52
      <td width="110">
53
        <input type="submit" name="submit" value="{TEXT_UNINSTALL}" style="width: 100px;" />
54
      </td>
55
    </tr>
56
  </table>
57
  <br />
58
</form>
59
<form name="details" action="details.php" method="post" class="{DISPLAY_LIST}">
60
{FTAN}
61
  <h2>{HEADING_LANGUAGE_DETAILS}</h2>
62
  <table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
63
    <tr>
64
      <td>
65
        <select name="code" style="width: 97%;">
66
		<option value="" selected="selected">{TEXT_PLEASE_SELECT}...</option>
67
		<!-- BEGIN language_list_block -->
68
			<option value="{VALUE}">{NAME}</option>
69
          <!-- END language_list_block -->
70
        </select>
71
      </td>
72
      <td width="110">
73
        <input type="submit" name="submit" value="{TEXT_VIEW_DETAILS}" style="width: 100px;" />
74
      </td>
75
    </tr>
76
  </table>
77
  <br />
78
</form>
79
<!-- END main_block -->
branches/2.8.x/wb/admin/skel/themes/htt/languages.htt
36 36
  </table>
37 37
  <br />
38 38
</form>
39
<form name="uninstall" action="uninstall.php" method="post" class="{DISPLAY_UNINSTALL} left">
40
{FTAN}
41
  <h2>{HEADING_UNINSTALL_LANGUAGE}</h2>
42
  <table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
43
    <tr>
44
      <td>
45
        <select name="code" style="width: 97%;">
46
		<option value="" selected="selected">{TEXT_PLEASE_SELECT}...</option>
47
		<!-- BEGIN language_list_block -->
48
			<option value="{VALUE}">{NAME}</option>
49
          <!-- END language_list_block -->
50
        </select>
51
      </td>
52
      <td width="110">
53
        <input type="submit" name="submit" value="{TEXT_UNINSTALL}" style="width: 100px;" />
54
      </td>
55
    </tr>
56
  </table>
57
  <br />
58
</form>
39

  
40

  
59 41
<form name="details" action="details.php" method="post" class="{DISPLAY_LIST}">
60 42
{FTAN}
61 43
  <h2>{HEADING_LANGUAGE_DETAILS}</h2>
branches/2.8.x/wb/admin/interface/version.php
51 51

  
52 52
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
53 53
if(!defined('VERSION')) define('VERSION', '2.8.4');
54
if(!defined('REVISION')) define('REVISION', '2090');
54
if(!defined('REVISION')) define('REVISION', '2092');
55 55
if(!defined('SP')) define('SP', '');
branches/2.8.x/wb/admin/addons/languages/NL.php
64 64
$MESSAGE['GENERIC_SECURITY_ACCESS'] = 'Veiligheidsrisico! Toegang geweigerd!';
65 65
$MESSAGE['GENERIC_SECURITY_OFFENSE'] = 'Veiligheidsrisico! Data-opslag geweigerd!';
66 66
$MESSAGE['GENERIC_UNINSTALLED'] = 'De&iuml;nstallatie voltooid';
67
$MESSAGE['GENERIC_UPGRADED'] = 'Upgrade voltooid';;
67
$MESSAGE['GENERIC_UPGRADED'] = 'Upgrade voltooid';
68 68
$MESSAGE['MEDIA_BLANK_NAME'] = 'U heeft geen nieuwe naam opgegeven';
69 69
$MESSAGE['MEDIA_CANNOT_DELETE_DIR'] = 'Kan geselecteerde map niet verwijderen';
70 70

  
branches/2.8.x/wb/languages/HU.php
377 377
$TEXT['VISIBILITY'] = 'Megjelen&eacute;s';
378 378
$TEXT['WBMAILER_DEFAULT_SENDER_MAIL'] = 'K&uuml;ld&agrave;email';
379 379
$TEXT['WBMAILER_DEFAULT_SENDER_NAME'] = 'K&uuml;ld&agrave;szem&eacute;ly';
380
$TEXT['WBMAILER_DEFAULT_SETTINGS_NOTICE'] = 'K&eacute;rlek add meg az alap&eacute;rtelmezett "K&uuml;ld&agrave;email" c&iacute;met &eacute;s a "K&uuml;ld&agrave;szem&eacute;ly" mez-?-?. Aj&aacute;nlott az al&aacute;bbi foszn&aacute;lata: &lt;strong&gt;admin@tedomained.hu&lt;/strong&gt;. N&eacute;mely szolg&aacute;ltat&oacute; (e.g. &lt;em&gt;mail.com&lt;/em&gt;) Visszautas&iacute;thatja a leveleket az olyan k&uuml;ld&agrave;c&iacute;mt-?-? mint &lt;@mail.com&lt;/em&gt; ez az&eacute;rt van hogy megakad&aacute;lyozz&aacute;k a SPAM k&uuml;ld&eacute;st.&lt;br /&gt;&lt;br /&gt;Az alap&eacute;rtelmezett &eacute;rt&eacute;kek csak akkor &eacute;rv&eacute;nyesek,ha nincs m&aacute;s megadva aker-ben. Ha a szervered t&aacute;mogatja &lt;acronym title="Simple mail transfer protocol"&gt;SMTP&lt;/acronym&gt;protokolt, akkor haszn&aacute;lhatod ezt az opci&oacute;t lev&eacute;l k&uuml;ld&eacute;;hez.';
380
$TEXT['WBMAILER_DEFAULT_SETTINGS_NOTICE'] = 'K&eacute;rlek add meg az alap&eacute;rtelmezett "K&uuml;ld&agrave;email" c&iacute;met &eacute;s a "K&uuml;ld&agrave;szem&eacute;ly" mez-?-?. Aj&aacute;nlott az al&aacute;bbi foszn&aacute;lata: &lt;strong&gt;admin@tedomained.hu&lt;/strong&gt;. N&eacute;mely szolg&aacute;ltat&oacute; (e.g. &lt;em&gt;mail.com&lt;/em&gt;) Visszautas&iacute;thatja a leveleket az olyan k&uuml;ld&agrave;c&iacute;mt-?-? mint &lt;@mail.com&lt;/em&gt; ez az&eacute;rt van hogy megakad&aacute;lyozz&aacute;k a SPAM k&uuml;ld&eacute;st.&lt;br /&gt;&lt;br /&gt;Az alap&eacute;rtelmezett &eacute;rt&eacute;kek csak akkor &eacute;rv&eacute;nyesek,ha nincs m&aacute;s megadva aker-ben. Ha a szervered t&aacute;mogatja &lt;acronym title="Simple mail transfer protocol"&gt;SMTP&lt;/acronym&gt;protokolt, akkor haszn&aacute;lhatod ezt az opci&oacute;t lev&eacute;l k&uuml;ld&eacute;hez.';
381 381
$TEXT['WBMAILER_FUNCTION'] = 'Mail Rutin';
382 382
$TEXT['WBMAILER_NOTICE'] = '&lt;strong&gt;SMTP Mailer Be&aacute;ll&iacute;t&aacute;sok:&lt;/strong&gt;&lt;br /&gt;Ezek a be&aacute;ll&iacute;t&aacute;sok csak akkor sz&uuml;ks&eacute;gesek, ha emailt akarsz k&uuml;ldeni &lt;acro="Simple mail transfer protocol"&gt;SMTP&lt;/acronym&gt; protokollon kereszt&uuml;l. Ha nem tudod az SMTP kiszolg&aacute;l&oacute;dat, vagy nem vagy biztos a k&ouml;vetlem&eacute;nyekben, akkoszer-?-¦en maradj az alap be&aacute;ll&iacute;t&aacute;sn&aacute;l: PHP MAIL.';
383 383
$TEXT['WBMAILER_PHP'] = 'PHP MAIL';
branches/2.8.x/wb/modules/droplets/example/iSectionPicker.php
1
//:Load the view.php from any other section-module, including the frontend.css
2
//:Use [[iSectionPicker?sid=123]]
3
global $database, $wb, $section_id,$page_id,$module;
4
$content = '';
5
$sid = isset($sid) ? intval($sid) : 0;
6
if( $sid ) {
7
	$oldSid = $section_id; // save old sectionID
8
	$sql  = 'SELECT `module` FROM `'.TABLE_PREFIX.'sections` ';
9
	$sql .= 'WHERE `section_id`='.$sid;
10
	if (($module = $database->get_one($sql))) {
11
		if (is_readable(WB_PATH.'/modules/'.$module.'/view.php')) {
12
			$_sFrontendCss = '/modules/'.$module.'/frontend.css';
13
			if(is_readable(WB_PATH.$_sFrontendCss)) {
14
				$_sSearch = preg_quote(WB_URL.'/modules/'.$module.'/frontend.css', '/');
15
				if(preg_match('/<link[^>]*?href\s*=\s*\"'.$_sSearch.'\".*?\/>/si', $wb_page_data)) {
16
					$_sFrontendCss = '';
17
				}else {
18
					$_sFrontendCss = '<link href="'.WB_URL.$_sFrontendCss.'" rel="stylesheet" type="text/css" media="screen" />';
19
				}
20
			} else { $_sFrontendCss = ''; }
21
			$section_id = $sid;
22
			ob_start();
23
			$sectionAnchor = (defined('SEC_ANCHOR') && SEC_ANCHOR!='') ? SEC_ANCHOR : 'Sec';
24
			echo PHP_EOL.'<div id="'.$sectionAnchor.$sSectionIdPrefix.'" class="section m_'.$module.'" >'.PHP_EOL;
25
			require(WB_PATH.'/modules/'.$module.'/view.php');
26
			echo PHP_EOL.'</div><!-- '.$module.$section_id.' -->'.PHP_EOL;
27
			$content = $_sFrontendCss.ob_get_clean();
28
			$section_id = $oldSid; // restore old sectionID
29
		}
30
	}
31
}
32
return $content;
33 0

  
branches/2.8.x/wb/modules/droplets/example/iLoginBox.php
3 3
//:Absolute or relative url possible
4 4
//:Remember to enable frontend login in your website settings.
5 5

  
6
	$mLang = Translate::getinstance();
6
	$oLang = Translate::getInstance();
7 7
	if( !(isset($wb) && is_object($wb)) ) { $wb = new frontend(); }
8 8
	if( !(isset($admin) && is_object($admin)) ) { $admin= new admin('##skip##'); }
9 9
	$page_id = PAGE_ID == 0 ? $wb->default_page_id : PAGE_ID;
......
22 22
		$return_value .= '<input type="hidden" name="redirect" value="'.$redirect_url.'" />'."\n";
23 23

  
24 24
		$return_value .= '<fieldset>'."\n";
25
		$return_value .= '<h1>'.$mLang->TEXT_LOGIN.'</h1>'."\n";
26
		$return_value .= '<label for="username">'.$mLang->TEXT_USERNAME.':</label>'."\n";
25
		$return_value .= '<h1>'.$oLang->TEXT_LOGIN.'</h1>'."\n";
26
		$return_value .= '<label for="username">'.$oLang->TEXT_USERNAME.':</label>'."\n";
27 27
		$return_value .= '<p><input type="text" name="username" id="username"  /></p>'."\n";
28
		$return_value .= '<label for="password">'.$mLang->TEXT_PASSWORD.':</label>'."\n";
28
		$return_value .= '<label for="password">'.$oLang->TEXT_PASSWORD.':</label>'."\n";
29 29
		$return_value .= '<p><input type="password" name="password" id="password"/></p>'."\n";
30
		$return_value .= '<p><input type="submit" id="submit" value="'.$mLang->TEXT_LOGIN.'" class="dbutton" /></p>'."\n";
30
		$return_value .= '<p><input type="submit" id="submit" value="'.$oLang->TEXT_LOGIN.'" class="dbutton" /></p>'."\n";
31 31
		$return_value .= '<ul class="login-advance">'."\n";
32
		$return_value .= '<li class="forgot"><a href="'.FORGOT_URL.'"><span>'.$mLang->TEXT_FORGOT_DETAILS.'</span></a></li>'."\n";
32
		$return_value .= '<li class="forgot"><a href="'.FORGOT_URL.'"><span>'.$oLang->TEXT_FORGOT_DETAILS.'</span></a></li>'."\n";
33 33

  
34 34
		if (intval(FRONTEND_SIGNUP) > 0)
35 35
		{
36
			$return_value .= '<li class="sign"><a href="'.SIGNUP_URL.'">'.$mLang->TEXT_SIGNUP.'</a></li>'."\n";
36
			$return_value .= '<li class="sign"><a href="'.SIGNUP_URL.'">'.$oLang->TEXT_SIGNUP.'</a></li>'."\n";
37 37
		}
38 38
		$return_value .= '</ul>'."\n";
39 39
		$return_value .= '</fieldset>'."\n";
......
44 44
	{
45 45
		$return_value .= '<form action="'.LOGOUT_URL.'" method="post" class="login-table">'."\n";
46 46
		$return_value .= '<fieldset>'."\n";
47
		$return_value .= '<h1>'.$mLang->TEXT_LOGGED_IN.'</h1>'."\n";
48
		$return_value .= '<label>'.$mLang->TEXT_WELCOME_BACK.', '.$wb->get_display_name().'</label>'."\n";
49
		$return_value .= '<p><input type="submit" name="submit" value="'.$mLang->MENU_LOGOUT.'" class="dbutton" /></p>'."\n";
47
		$return_value .= '<h1>'.$oLang->TEXT_LOGGED_IN.'</h1>'."\n";
48
		$return_value .= '<label>'.$oLang->TEXT_WELCOME_BACK.', '.$wb->get_display_name().'</label>'."\n";
49
		$return_value .= '<p><input type="submit" name="submit" value="'.$oLang->MENU_LOGOUT.'" class="dbutton" /></p>'."\n";
50 50
		$return_value .= '<ul class="logout-advance">'."\n";
51 51
		if ($wb->ami_group_member('1')||$admin->get_permission('preferences'))
52 52
		{
53
			$return_value .= '<li class="preference"><a href="'.PREFERENCES_URL.'" title="'.$mLang->MENU_PREFERENCES.'">'.$mLang->MENU_PREFERENCES.'</a></li>'."\n";
53
			$return_value .= '<li class="preference"><a href="'.PREFERENCES_URL.'" title="'.$oLang->MENU_PREFERENCES.'">'.$oLang->MENU_PREFERENCES.'</a></li>'."\n";
54 54
		}
55 55

  
56 56
		//change ot the group that should get special links
57 57
		if ($wb->ami_group_member('1')||$admin->get_permission('admintools'))
58 58
		{
59
			$return_admin .= '<li class="admin"><a target="_blank" href="'.ADMIN_URL.'/index.php" title="'.$mLang->TEXT_ADMINISTRATION.'" class="blank_target">'.$mLang->TEXT_ADMINISTRATION.'</a></li>'."\n";
59
			$return_admin .= '<li class="admin"><a target="_blank" href="'.ADMIN_URL.'/index.php" title="'.$oLang->TEXT_ADMINISTRATION.'" class="blank_target">'.$oLang->TEXT_ADMINISTRATION.'</a></li>'."\n";
60 60
			//you can add more links for your users like userpage, lastchangedpages or something
61 61
			//$return_value .= $return_admin;
62 62
		}
63 63
		//change ot the group that should get special links
64 64
		if( $admin->get_permission('pages_modify') && $admin->get_page_permission( PAGE_ID ) )
65 65
		{
66
			$return_value .= '<li class="modify"><a target="_blank" href="'.ADMIN_URL.'/pages/modify.php?page_id='.$page_id.'" title="'.$mLang->HEADING_MODIFY_PAGE.'" class="blank_target">'.$mLang->HEADING_MODIFY_PAGE.'</a></li>'."\n";
66
			$return_value .= '<li class="modify"><a target="_blank" href="'.ADMIN_URL.'/pages/modify.php?page_id='.$page_id.'" title="'.$oLang->HEADING_MODIFY_PAGE.'" class="blank_target">'.$oLang->HEADING_MODIFY_PAGE.'</a></li>'."\n";
67 67
		}
68 68
		$return_value .= '<li>&nbsp;'.'</li>'."\n";
69 69
		$return_value .= '</ul>'."\n";
branches/2.8.x/wb/modules/droplets/example/SectionPicker.php
1
//:Load the view.php from any other section-module, including the frontend.css
2
//:Use [[SectionPicker?sid=123]]
3
global $database, $wb, $TEXT, $DGTEXT,$section_id,$page_id;
4
$content = '';
5
$sid = isset($sid) ? intval($sid) : 0;
6
if( $sid ) {
7
	$oldSid = $section_id; // save old sectionID
8
	$sql  = 'SELECT `module` FROM `'.TABLE_PREFIX.'sections` ';
9
	$sql .= 'WHERE `section_id`='.$sid;
10
	if (($module = $database->get_one($sql))) {
11
		if (is_readable(WB_PATH.'/modules/'.$module.'/view.php')) {
12
			$_sFrontendCss = '/modules/'.$module.'/frontend.css';
13
			if(is_readable(WB_PATH.$_sFrontendCss)) {
14
				$_sSearch = preg_quote(WB_URL.'/modules/'.$module.'/frontend.css', '/');
15
				if(preg_match('/<link[^>]*?href\s*=\s*\"'.$_sSearch.'\".*?\/>/si', $wb_page_data)) {
16
					$_sFrontendCss = '';
17
				}else {
18
					$_sFrontendCss = '<link href="'.WB_URL.$_sFrontendCss.'" rel="stylesheet" type="text/css" media="screen" />';
19
				}
20
			} else { $_sFrontendCss = ''; }
21
			$section_id = $sid;
22
			ob_start();
23
            $sectionAnchor = (defined('SEC_ANCHOR') && SEC_ANCHOR!='') ? SEC_ANCHOR.$section_id : 'section_'.$section_id;
24
            echo PHP_EOL.'<div id="'.$sectionAnchor.'" class="wb_'.$module.'" >'.PHP_EOL;
25
            require(WB_PATH.'/modules/'.$module.'/view.php');
26
            echo PHP_EOL.'</div><!-- '.$module.$section_id.' -->'.PHP_EOL;
27
			$content = $_sFrontendCss.ob_get_clean();
28
			$section_id = $oldSid; // restore old sectionID
29
		}
30
	}
31
}
32
return $content;

Also available in: Unified diff