Project

General

Profile

« Previous | Next » 

Revision 1511

Added by Dietmar about 13 years ago

fixed strict notice warning in class.wb
change editor for intropage to editarea
add missing slash in themes

View differences:

branches/2.8.x/CHANGELOG
12 12 

  		




  13
  13
  
    
=============================== FEATURES FREEZE ================================


  		




  14
  14
  
    
----------------------------------- Fixes 2.8.2 --------------------------------


  		




  
  15
  
    
14 Sep-2011 Build 1511 Dietmar Woellbrink (Luisehahne)


  		




  
  16
  
    
# fixed strict notice warning in class.wb


  		




  
  17
  
    
! change editor for intropage to editarea


  		




  
  18
  
    
! add missing slash in themes


  		




  15
  19
  
    
14 Sep-2011 Build 1510 Werner v.d.Decken(DarkViper)


  		




  16
  20
  
    
+ new constant 'DO_NOT_TRACK' set to true if a client sends the DNT-Header


  		




  17
  21
  
    
07 Sep-2011 Build 1509 Dietmar Woellbrink (Luisehahne)


  		












  

    
      branches/2.8.x/wb/admin/pages/intro.php
    
  





  18
  18
  
    

  		




  19
  19
  
    
// Create new admin object


  		




  20
  20
  
    
require('../../config.php');


  		




  
  21
  
    

  		




  21
  22
  
    
require_once(WB_PATH.'/framework/class.admin.php');


  		




  22
  23
  
    
$admin = new admin('Pages', 'pages_intro');


  		




  23
  24
  
    
$content = '';


  		




  
  25
  
    

  		




  24
  26
  
    
$filename = WB_PATH.PAGES_DIRECTORY.'/intro'.PAGE_EXTENSION;


  		




  
  27
  
    

  		




  25
  28
  
    
if(file_exists($filename) && filesize($filename) > 0) {


  		




  26
  
  
    
$content = file_get_contents( $filename ) ;


  		




  
  29
  
    
	$content = file_get_contents( $filename ) ;


  		




  
  30
  
    
} else {


  		




  
  31
  
    
	$content = file_get_contents( ADMIN_PATH.'/pages/html.php' ) ;


  		




  27
  32
  
    
}


  		




  28
  33
  
    

  		




  29
  
  
    

  		




  30
  
  
    
if(!isset($_GET['wysiwyg']) OR $_GET['wysiwyg'] != 'no') {


  		




  31
  
  
    
	if (!defined('WYSIWYG_EDITOR') OR WYSIWYG_EDITOR=="none" OR !file_exists(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php')) {


  		




  32
  
  
    
		function show_wysiwyg_editor($name,$id,$content,$width,$height) {


  		




  33
  
  
    
			echo '<textarea name="'.$name.'" id="'.$id.'" style="width: '.$width.'; height: '.$height.';">'.$content.'</textarea>';


  		




  34
  
  
    
		}


  		




  35
  
  
    
	} else {


  		




  36
  
  
    
		$id_list=array('content');


  		




  37
  
  
    
		require(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php');


  		




  38
  
  
    
	}


  		




  
  34
  
    
require_once(WB_PATH . '/include/editarea/wb_wrapper_edit_area.php');


  		




  
  35
  
    
$toolbar = 'search, fullscreen, |, undo, redo, |, select_font, syntax_selection,|,word_wrap, highlight, reset_highlight, |,charmap, |, help';


  		




  
  36
  
    
echo registerEditArea ('content','php',true,'both',true,true,600,450,$toolbar);


  		




  
  37
  
    
function show_wysiwyg_editor($name,$id,$content,$width,$height) {


  		




  
  38
  
    
	echo '<textarea name="'.$name.'" id="'.$id.'" style="width: '.$width.'; height: '.$height.';">'.$content.'</textarea>';


  		




  39
  39
  
    
}


  		




  40
  40
  
    
?>


  		




  41
  
  
    

  		




  42
  
  
    

  		




  43
  41
  
    
<form action="intro2.php" method="post">


  		




  44
  42
  
    
<?php print $admin->getFTAN(); ?>


  		




  45
  43
  
    
<input type="hidden" name="page_id" value="{PAGE_ID}" />


  		




  46
  
  
    

  		




  47
  
  
    
<?php


  		




  48
  
  
    
show_wysiwyg_editor('content','content',$content,'100%','500px');


  		




  49
  
  
    
?>


  		




  50
  
  
    

  		




  51
  44
  
    
<table cellpadding="0" cellspacing="0" border="0" class="form_submit">


  		




  52
  
  
    
<tr>


  		




  53
  
  
    
	<td class="left">


  		




  54
  
  
    
		<input type="submit" value="<?php echo $TEXT['SAVE'];?>" class="submit" />


  		




  55
  
  
    
	</td>


  		




  56
  
  
    
	<td class="right">


  		




  57
  
  
    
		<input type="button" value="<?php echo $TEXT['CANCEL'];?>" onclick="javascript: window.location = 'index.php';" class="submit" />


  		




  58
  
  
    
	</td>


  		




  59
  
  
    
</tr>


  		




  
  45
  
    
	<tr>


  		




  
  46
  
    
		<td colspan="2">


  		




  
  47
  
    
		<?php


  		




  
  48
  
    
			show_wysiwyg_editor('content','content',$content,'100%','500px');


  		




  
  49
  
    
		?>


  		




  
  50
  
    
		</td>


  		




  
  51
  
    
	</tr>


  		




  
  52
  
    
	<tr>


  		




  
  53
  
    
		<td class="left">


  		




  
  54
  
    
			<input type="submit" value="<?php echo $TEXT['SAVE'];?>" class="submit" />


  		




  
  55
  
    
		</td>


  		




  
  56
  
    
		<td class="right">


  		




  
  57
  
    
			<input type="button" value="<?php echo $TEXT['CANCEL'];?>" onclick="javascript: window.location = 'index.php';" class="submit" />


  		




  
  58
  
    
		</td>


  		




  
  59
  
    
	</tr>


  		




  60
  60
  
    
</table>


  		




  61
  61
  
    

  		




  62
  62
  
    
</form>


  		




  63
  63
  
    
<?php


  		




  64
  64
  
    
// Print admin footer


  		




  65
  65
  
    
$admin->print_footer();


  		




  66
  
  
    

  		




  67
  
  
    
?>


  		












  

    
      branches/2.8.x/wb/admin/pages/html.php
    
  





  
  1
  
    
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"


  		




  
  2
  
    
    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">


  		




  
  3
  
    
<?php


  		




  
  4
  
    
/**


  		




  
  5
  
    
 *


  		




  
  6
  
    
 * @author     WebsiteBaker Project


  		




  
  7
  
    
 * @copyright  GNU General Public License


  		




  
  8
  
    
 * @license    http://www.gnu.org/licenses/gpl.html


  		




  
  9
  
    
 * @version    1.1.0


  		




  
  10
  
    
 * @platform   Website Baker 2.8.2+


  		




  
  11
  
    
 *


  		




  
  12
  
    
 *


  		




  
  13
  
    
 * This html default only loaded if intro.php is not created


  		




  
  14
  
    
 *


  		




  
  15
  
    
 */


  		




  
  16
  
    

  		




  
  17
  
    
// TEMPLATE CODE STARTS BELOW


  		




  
  18
  
    
?><html xmlns="http://www.w3.org/1999/xhtml">


  		




  
  19
  
    
<head>


  		




  
  20
  
    
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />


  		




  
  21
  
    
	<meta name="language" content="en" />


  		




  
  22
  
    
<!-- meta information for search engines -->


  		




  
  23
  
    
	<title></title>


  		




  
  24
  
    
	<meta http-equiv="imagetoolbar" content="no" />


  		




  
  25
  
    
	<meta name="description" content="" />


  		




  
  26
  
    
	<meta name="keywords" content="" />


  		




  
  27
  
    
	<meta name="author" content="WebsiteBaker Org e.V." />


  		




  
  28
  
    
	<meta name="robots" content="index,follow" />


  		




  
  29
  
    
	<meta http-equiv="Content-Encoding" content="gzip" />


  		




  
  30
  
    
	<meta http-equiv="Accept-Encoding" content="gzip, deflate" />


  		




  
  31
  
    
<!-- site stylesheet (site colors and layout definitions) -->


  		




  
  32
  
    
	<link rel="stylesheet" type="text/css" href="" media="screen,projection" />


  		




  
  33
  
    
	<script src="" type="text/javascript"></script>


  		




  
  34
  
    
</head>


  		




  
  35
  
    
<body>


  		




  
  36
  
    
	<div class="content">


  		




  
  37
  
    
		<h3>Put your content here</h3>


  		




  
  38
  
    
	</div>


  		




  
  39
  
    
</body>


  		




  
  40
  
    
</html>


  		




  0
  41
  
    

  		












  

    
      branches/2.8.x/wb/admin/pages/intro2.php
    
  





  31
  31
  
    
	header("Location: intro".PAGE_EXTENSION."");


  		




  32
  32
  
    
	exit(0);


  		




  33
  33
  
    
} else {


  		




  34
  
  
    
	$content = $_POST['content'];


  		




  
  34
  
    
	$content = $admin->strip_slashes($_POST['content']);


  		




  35
  35
  
    
}


  		




  36
  36
  
    

  		




  37
  
  
    
$content = $admin->strip_slashes($content);


  		




  
  37
  
    
// $content = $admin->strip_slashes($content);


  		




  38
  38
  
    

  		




  39
  39
  
    
// Include the WB functions file


  		




  40
  40
  
    
require_once(WB_PATH.'/framework/functions.php');


  		












  

    
      branches/2.8.x/wb/admin/interface/version.php
    
  





  52
  52
  
    

  		




  53
  53
  
    
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)


  		




  54
  54
  
    
if(!defined('VERSION')) define('VERSION', '2.8.2');


  		




  55
  
  
    
if(!defined('REVISION')) define('REVISION', '1510');


  		




  
  55
  
    
if(!defined('REVISION')) define('REVISION', '1511');


  		












  

    
      branches/2.8.x/wb/framework/class.wb.php
    
  





  235
  235
  
    

  		




  236
  236
  
    
	// Get the current users id


  		




  237
  237
  
    
	function get_user_id() {


  		




  238
  
  
    
		return $_SESSION['USER_ID'];


  		




  
  238
  
    
		return $this->get_session('USER_ID');


  		




  239
  239
  
    
	}


  		




  240
  240
  
    

  		




  241
  241
  
    
	// Get the current users group id


  		




  242
  242
  
    
	function get_group_id() {


  		




  243
  
  
    
		return $_SESSION['GROUP_ID'];


  		




  
  243
  
    
		return $this->get_session('GROUP_ID');


  		




  244
  244
  
    
	}


  		




  245
  245
  
    

  		




  246
  246
  
    
	// Get the current users group ids


  		




  247
  247
  
    
	function get_groups_id() {


  		




  248
  
  
    
		return explode(",", $_SESSION['GROUPS_ID']);


  		




  
  248
  
    
		return explode(",", $this->get_session('GROUPS_ID'));


  		




  249
  249
  
    
	}


  		




  250
  250
  
    

  		




  251
  251
  
    
	// Get the current users group name


  		




  252
  252
  
    
	function get_group_name() {


  		




  253
  
  
    
		return implode(",", $_SESSION['GROUP_NAME']);


  		




  
  253
  
    
		return implode(",", $this->get_session('GROUP_NAME'));


  		




  254
  254
  
    
	}


  		




  255
  255
  
    

  		




  256
  256
  
    
	// Get the current users group name


  		




  257
  257
  
    
	function get_groups_name() {


  		




  258
  
  
    
		return $_SESSION['GROUP_NAME'];


  		




  
  258
  
    
		return $this->get_session('GROUP_NAME');


  		




  259
  259
  
    
	}


  		




  260
  260
  
    

  		




  261
  261
  
    
	// Get the current users username


  		




  262
  262
  
    
	function get_username() {


  		




  263
  
  
    
		return $_SESSION['USERNAME'];


  		




  
  263
  
    
		return $this->get_session('USERNAME');


  		




  264
  264
  
    
	}


  		




  265
  265
  
    

  		




  266
  266
  
    
	// Get the current users display name


  		




  267
  267
  
    
	function get_display_name() {


  		




  268
  
  
    
		return ($_SESSION['DISPLAY_NAME']);


  		




  
  268
  
    
		return $this->get_session('DISPLAY_NAME');


  		




  269
  269
  
    
	}


  		




  270
  270
  
    

  		




  271
  271
  
    
	// Get the current users email address


  		




  272
  272
  
    
	function get_email() {


  		




  273
  
  
    
		return $_SESSION['EMAIL'];


  		




  
  273
  
    
		return $this->get_session('EMAIL');


  		




  274
  274
  
    
	}


  		




  275
  275
  
    

  		




  276
  276
  
    
	// Get the current users home folder


  		




  277
  277
  
    
	function get_home_folder() {


  		




  278
  
  
    
		return $_SESSION['HOME_FOLDER'];


  		




  
  278
  
    
		return $this->get_session('HOME_FOLDER');


  		




  279
  279
  
    
	}


  		




  280
  280
  
    

  		




  281
  281
  
    
	// Get the current users timezone


  		












  

    
      branches/2.8.x/wb/templates/wb_theme/templates/login_forgot.htt
    
  





  54
  54
  
    
		<a href="{LOGIN_URL}">{TEXT_NEED_TO_LOGIN}</a>


  		




  55
  55
  
    
		<br />


  		




  56
  56
  
    
		<br />


  		




  57
  
  
    
		<a href="{WB_URL}">{TEXT_HOME}</a>


  		




  
  57
  
    
		<a href="{WB_URL}/">{TEXT_HOME}</a>


  		




  58
  58
  
    
	</center>


  		




  59
  59
  
    

  		




  60
  60
  
    
	</td>


  		












  

    
      branches/2.8.x/wb/templates/wb_theme/templates/login.htt
    
  





  70
  70
  
    
		<br />


  		




  71
  71
  
    
		<br />


  		




  72
  72
  
    
		<br />


  		




  73
  
  
    
		<a href="{WB_URL}">{TEXT_HOME}</a>


  		




  
  73
  
    
		<a href="{WB_URL}/">{TEXT_HOME}</a>


  		




  74
  74
  
    
	</center>


  		




  75
  75
  
    

  		




  76
  76
  
    
	</td>


  		












  

    
      branches/2.8.x/wb/templates/argos_theme/templates/login_forgot.htt
    
  





  47
  47
  
    
		<a href="{LOGIN_URL}">{TEXT_NEED_TO_LOGIN}</a>


  		




  48
  48
  
    
		<br />


  		




  49
  49
  
    
		<br />


  		




  50
  
  
    
		<a href="{WB_URL}">{TEXT_HOME}</a>


  		




  
  50
  
    
		<a href="{WB_URL}/">{TEXT_HOME}</a>


  		




  51
  51
  
    
	</center>


  		




  52
  52
  
    

  		




  53
  53
  
    
	</td>


  		












  

    
      branches/2.8.x/wb/templates/argos_theme/templates/login.htt
    
  





  63
  63
  
    
		<br />


  		




  64
  64
  
    
        <br />


  		




  65
  65
  
    
        <br />


  		




  66
  
  
    
        <a href="{WB_URL}">{TEXT_HOME}</a>


  		




  
  66
  
    
        <a href="{WB_URL}/">{TEXT_HOME}</a>


  		




  67
  67
  
    
      </center>


  		




  68
  68
  
    
    </td>


  		




  69
  69
  
    
  </tr>


  		












Also available in:  Unified diff