Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1706) +++ branches/2.8.x/CHANGELOG (revision 1707) @@ -13,6 +13,10 @@ +29 Aug-2012 Build 1707 Dietmar Woellbrink (Luisehahne) +! update folder admin/pages, admin/skel/htt +! change multi-dimensional arrays (variables) to similar arrays +! change default templates, change code to new templates 29 Aug-2012 Build 1706 Dietmar Woellbrink (Luisehahne) # fixed save page option 27 Aug-2012 Build 1705 Dietmar Woellbrink (Luisehahne) Index: branches/2.8.x/wb/admin/skel/themes/htt/pages.htt =================================================================== --- branches/2.8.x/wb/admin/skel/themes/htt/pages.htt (revision 1706) +++ branches/2.8.x/wb/admin/skel/themes/htt/pages.htt (revision 1707) @@ -1,5 +1,5 @@ -
+

{HEADING_ADD_PAGE}

{FTAN} Index: branches/2.8.x/wb/admin/skel/themes/htt/pages_modify.htt =================================================================== --- branches/2.8.x/wb/admin/skel/themes/htt/pages_modify.htt (revision 1706) +++ branches/2.8.x/wb/admin/skel/themes/htt/pages_modify.htt (revision 1707) @@ -1,25 +1,21 @@ - - + - + - +

{HEADING_MODIFY_PAGE}

ID: {PAGE_ID}ID: {PAGE_ID} {TEXT_CURRENT_PAGE}: {PAGE_TITLE} - - - {TEXT_CHANGE_SETTINGS} - - - - {TEXT_MANAGE_SECTIONS} - -
- - {LAST_MODIFIED} {MODIFIED_BY} ({MODIFIED_BY_USERNAME}), {MODIFIED_WHEN} - - + - {SETTINGS_LINK_BEFORE}{TEXT_CHANGE_SETTINGS}{SETTINGS_LINK_AFTER} + + - {SECTIONS_LINK_BEFORE}{TEXT_MANAGE_SECTIONS}{SECTIONS_LINK_AFTER} + +
+ + {TEXT_LAST_MODIFIED} {MODIFIED_BY} ({MODIFIED_BY_USERNAME}), {MODIFIED_WHEN} +
\ No newline at end of file Index: branches/2.8.x/wb/admin/skel/themes/htt/pages_sections.htt =================================================================== --- branches/2.8.x/wb/admin/skel/themes/htt/pages_sections.htt (revision 1706) +++ branches/2.8.x/wb/admin/skel/themes/htt/pages_sections.htt (revision 1707) @@ -1,21 +1,26 @@
- - - - - + + + + +

{HEADING_MANAGE_SECTIONS}

ID: {PAGE_ID}{TEXT_CURRENT_PAGE}: {PAGE_TITLE} - - - {HEADING_MODIFY_PAGE} - - - {TEXT_CHANGE_SETTINGS} -

{HEADING_MANAGE_SECTIONS}

ID: {PAGE_ID}{TEXT_CURRENT_PAGE}:{PAGE_TITLE} + - + {MODIFY_LINK_BEFORE}{HEADING_MODIFY_PAGE}{MODIFY_LINK_AFTER} + + - {SETTINGS_LINK_BEFORE}{TEXT_CHANGE_SETTINGS}{SETTINGS_LINK_AFTER} + +
+ + {TEXT_LAST_MODIFIED} {MODIFIED_BY} ({MODIFIED_BY_USERNAME}), {MODIFIED_WHEN} + +
{FTAN} - + @@ -33,9 +38,9 @@ {VAR_SECTION_ID} - + - + - + - + - +
{TEXT_TYPE}{LINK_MODIFY_URL_VAR_MODUL_NAME}   {TEXT_CALENDAR} {TEXT_DELETE_DATE} {TEXT_CALENDAR} {TEXT_DELETE_DATE} @@ -56,7 +61,7 @@ {VAR_MOVE_UP_URL}{VAR_MOVE_DOWN_URL} Index: branches/2.8.x/wb/admin/skel/themes/htt/pages_settings.htt =================================================================== --- branches/2.8.x/wb/admin/skel/themes/htt/pages_settings.htt (revision 1706) +++ branches/2.8.x/wb/admin/skel/themes/htt/pages_settings.htt (revision 1707) @@ -1,5 +1,7 @@ + + @@ -8,9 +10,9 @@ {TEXT_CURRENT_PAGE}: {PAGE_TITLE} - - {TEXT_MODIFY_PAGE} - - - {TEXT_MANAGE_SECTIONS} + {MODIFY_LINK_BEFORE}{TEXT_MODIFY_PAGE}{MODIFY_LINK_AFTER} + + - {SECTIONS_LINK_BEFORE}{TEXT_MANAGE_SECTIONS}{SECTIONS_LINK_AFTER}
@@ -27,13 +29,13 @@
{TEXT_SECTION_GENERAL}
- + +
- @@ -41,13 +43,12 @@
- + +
- @@ -55,9 +56,8 @@
- @@ -64,18 +64,18 @@
-
- + +
- + +
{TEXT_SECTION_ORGANISATION}
- @@ -83,8 +83,8 @@
- @@ -92,8 +92,8 @@
- @@ -100,8 +100,8 @@
- @@ -111,8 +111,8 @@
{TEXT_SECTION_CONTENT}
- @@ -120,8 +120,8 @@
- @@ -129,8 +129,8 @@
- @@ -139,8 +139,8 @@
{TEXT_SECTION_SECURITY}
- @@ -151,6 +151,7 @@
+
{TEXT_ADMINISTRATORS}
{TEXT_GROUP}
@@ -173,6 +174,7 @@
+
{TEXT_ALLOWED_VIEWERS}
Index: branches/2.8.x/wb/admin/pages/settings.php =================================================================== --- branches/2.8.x/wb/admin/pages/settings.php (revision 1706) +++ branches/2.8.x/wb/admin/pages/settings.php (revision 1707) @@ -3,9 +3,8 @@ * * @category admin * @package pages - * @author WebsiteBaker Project - * @copyright 2004-2009, Ryan Djurovich - * @copyright 2009-2011, Website Baker Org. e.V. + * @author Ryan Djurovich, WebsiteBaker Project + * @copyright 2009-2012, WebsiteBaker Org. e.V. * @link http://www.websitebaker2.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x @@ -118,12 +117,12 @@ // Convert the unix ts for modified_when to human a readable form if($aCurrentPage['modified_when'] != 0) { $modified_ts = gmdate(TIME_FORMAT.', '.DATE_FORMAT, $aCurrentPage['modified_when']+TIMEZONE); - }else { + } else { $modified_ts = 'Unknown'; } // Setup template object, parse vars to it, then parse it // Create new template object - $oTpl = new Template(dirname($admin->correct_theme_source('pages_settings.htt')), 'keep'); + $oTpl = new Template(dirname($admin->correct_theme_source('pages_settings.htt')),'keep' ); $oTpl->set_file('page', 'pages_settings.htt'); $oTpl->set_block('page', 'main_block', 'main'); $oTpl->set_var('FTAN', $admin->getFTAN()); @@ -141,15 +140,44 @@ 'WB_URL' => WB_URL, 'THEME_URL' => THEME_URL )); + + if( $admin->get_permission('pages_modify') ) + { + $oTpl->set_var(array( + 'MODIFY_LINK_BEFORE' => '', + 'MODIFY_LINK_AFTER' => '', + 'DISPLAY_MANAGE_MODIFY' => 'link', + )); + } else { + $oTpl->set_var(array( + 'MODIFY_LINK_BEFORE' => '', + 'MODIFY_LINK_AFTER' => '', + 'DISPLAY_MANAGE_MODIFY' => 'link', + )); + } + + /*-- workout if we should show the "manage sections" link ------------------------------*/ $sql = 'SELECT COUNT(*) FROM `'.TABLE_PREFIX.'sections` ' . 'WHERE `page_id`='.$page_id.' AND `module`=\'menu_link\''; $bIsMenuLink = (intval($database->get_one($sql)) != 0); - $oTpl->set_block('main_block', 'show_manage_sections_block', 'show_manage_sections'); - if(!$bIsMenuLink && (MANAGE_SECTIONS == true)) { - $oTpl->parse('show_manage_sections', 'show_manage_sections_block', true); +// $oTpl->set_block('main_block', 'show_manage_sections_block', 'show_manage_sections'); +// if(!$bIsMenuLink && (MANAGE_SECTIONS == true) && $admin->get_permission('pages_add') ) + if((MANAGE_SECTIONS == true) && $admin->get_permission('pages_add') ) + { +// $oTpl->parse('show_manage_sections', 'show_manage_sections_block', true); + $oTpl->set_var(array( + 'SECTIONS_LINK_BEFORE' => '', + 'SECTIONS_LINK_AFTER' => '', + 'DISPLAY_MANAGE_SECTIONS' => 'link', + )); }else { - $oTpl->set_block('show_manage_sections', ''); +// $oTpl->set_block('show_manage_sections', ''); + $oTpl->set_var(array( + 'SECTIONS_LINK_BEFORE' => '', + 'SECTIONS_LINK_AFTER' => '', + 'DISPLAY_MANAGE_SECTIONS' => 'link', + )); } /*-- collect page-icons for select boxes -----------------------------------------------*/ @@ -159,7 +187,14 @@ $sTemplate = ($aCurrentPage['template'] == '' ? DEFAULT_TEMPLATE : $aCurrentPage['template']); $sIconDir = str_replace('\\', '/', ((defined('PAGE_ICON_DIR') && PAGE_ICON_DIR != '') ? PAGE_ICON_DIR : MEDIA_DIRECTORY)); $sIconDir = str_replace('/*', '/'.$sTemplate, $sIconDir); - $oTpl->set_var('ICON_DIR', WB_REL.$sIconDir); +// $oTpl->set_var('ICON_DIR', WB_REL.$sIconDir); + $sHelp = replaceVars($mLang->HELP_PAGE_IMAGE_DIR, array('icon_dir'=>WB_REL.$sIconDir ) ); + + $oTpl->set_var('p_page_icon_dir', p($sHelp,$mLang->TEXT_PAGE_ICON_DIR)); + $oTpl->set_var('p_menu_icon0_dir', p($sHelp,$mLang->TEXT_MENU_ICON_0_DIR)); + $oTpl->set_var('p_menu_icon1_dir', p($sHelp,$mLang->TEXT_MENU_ICON_1_DIR)); + $oTpl->set_var('p_menu_page_code', p($mLang->HELP_PAGE_CODE,$mLang->TEXT_PAGE_CODE)); + if(is_readable(WB_PATH.$sIconDir)) { $oIterator = new DirectoryIterator(WB_PATH.$sIconDir); foreach ($oIterator as $fileinfo) { @@ -173,29 +208,40 @@ } /*-- show page-icon select box ---------------------------------------------------------*/ $oTpl->set_block('main_block', 'page_icon_list_block', 'page_icon_list'); - foreach($aPageIcons as $value) { - $aIcon = $value; - $aIcon['SELECTED'] = ($aCurrentPage['page_icon'] == $aIcon['VALUE'] ? $sSelected : ''); - $oTpl->set_var($aIcon); - $oTpl->parse('page_icon_list', 'page_icon_list_block', true); + if(sizeof($aPageIcons)>0){ + foreach($aPageIcons as $value) { + $aIcon = $value; + $aIcon['SELECTED'] = ($aCurrentPage['page_icon'] == $aIcon['VALUE'] ? $sSelected : ''); + $oTpl->set_var($aIcon); + $oTpl->parse('page_icon_list', 'page_icon_list_block', true); + } + } else { + $oTpl->parse('page_icon_list', ''); } /*-- show menu-icon-0 select box -------------------------------------------------------*/ $oTpl->set_block('main_block', 'menu_icon0_list_block', 'menu_icon0_list'); - foreach($aPageIcons as $value) { - $aIcon = $value; - $aIcon['SELECTED'] = ($aCurrentPage['menu_icon_0'] == $aIcon['VALUE'] ? $sSelected : ''); - $oTpl->set_var($aIcon); - $oTpl->parse('menu_icon0_list', 'menu_icon0_list_block', true); + if(sizeof($aPageIcons)>0){ + foreach($aPageIcons as $value) { + $aIcon = $value; + $aIcon['SELECTED'] = ($aCurrentPage['menu_icon_0'] == $aIcon['VALUE'] ? $sSelected : ''); + $oTpl->set_var($aIcon); + $oTpl->parse('menu_icon0_list', 'menu_icon0_list_block', true); + } + } else { + $oTpl->parse('menu_icon0_list', ''); } /*-- show menu-icon-1 select box -------------------------------------------------------*/ $oTpl->set_block('main_block', 'menu_icon1_list_block', 'menu_icon1_list'); - foreach($aPageIcons as $value) { - $aIcon = $value; - $aIcon['SELECTED'] = ($aCurrentPage['menu_icon_1'] == $aIcon['VALUE'] ? $sSelected : ''); - $oTpl->set_var($aIcon); - $oTpl->parse('menu_icon1_list', 'menu_icon1_list_block', true); + if(sizeof($aPageIcons)>0){ + foreach($aPageIcons as $value) { + $aIcon = $value; + $aIcon['SELECTED'] = ($aCurrentPage['menu_icon_1'] == $aIcon['VALUE'] ? $sSelected : ''); + $oTpl->set_var($aIcon); + $oTpl->parse('menu_icon1_list', 'menu_icon1_list_block', true); + } + } else { + $oTpl->parse('menu_icon1_list', ''); } - /*-- show visibility select box --------------------------------------------------------*/ $aVisibility = array(); $aVisibility['PUBLIC_SELECTED'] = ($aCurrentPage['visibility'] == 'public' ? $sSelected : ''); @@ -263,11 +309,14 @@ } /*-- admin user list block -------------------------------------------------------------*/ +// admin_group_show_list_block + $oTpl->set_block('main_block', 'admin_group_show_list_block', 'admin_group_show_list'); + $aAdminUsers = ($aCurrentPage['admin_users'] == '' ? array() : explode(',', $aCurrentPage['admin_users'])); $aAdminUsers = explode(',', $aCurrentPage['admin_users']); - $oTpl->set_block('main_block', 'admin_user_list_block', 'admin_user_list'); + $oTpl->set_block('admin_group_show_list_block', 'admin_user_list_block', 'admin_user_list'); $sAllowedAdminUsers = trim(implode(',',$aAdminUsers)); $sAllowedAdminUsers = $sAllowedAdminUsers ? $sAllowedAdminUsers : '-1'; $sql = 'SELECT `user_id`, `display_name` ' @@ -285,7 +334,13 @@ $oTpl->parse('admin_user_list', 'admin_user_list_block', true); } } + if($admin->ami_group_member('1')) { + $oTpl->parse('admin_group_show_list', 'admin_group_show_list_block', true); + } else { + $oTpl->parse('admin_group_show_list', '', true); + } + /*-- viewer users list block -----------------------------------------------------------*/ $aViewingUsers = ($aCurrentPage['viewing_users'] == '' ? array() @@ -339,8 +394,7 @@ { // workout field is set but module missing $oTpl->set_var('TEXT_PAGE_CODE', - ''.$mLang->TEXT_PAGE_CODE.'' + ''.$mLang->TEXT_PAGE_CODE.'' ); /*-- begin recursive function page_code list ---------------------------------------*/ function page_code_list($parent) @@ -531,3 +585,49 @@ $oTpl->pparse('output', 'page'); // Print admin footer $admin->print_footer(); + +function p($text,$lang) +{ + global $admin; + $retVal = 'onmouseover="return overlib('; + $retVal .= '\''.$text.'\','; + $retVal .= 'CAPTION,\''.$lang.'\','; + $retVal .= 'FGCOLOR,\'#ffffff\','; + $retVal .= 'BGCOLOR,\'#557c9e\','; + $retVal .= 'BORDER,1,'; + $retVal .= 'WIDTH,'; + $retVal .= 'HEIGHT,'; + $retVal .= 'STICKY,'; + $retVal .= 'CAPTIONSIZE,\'13px\','; + $retVal .= 'CLOSETEXT,\'X\','; + $retVal .= 'CLOSESIZE,\'14px\','; + $retVal .= 'CLOSECOLOR,\'#ffffff\','; + $retVal .= 'TEXTSIZE,\'12px\','; + $retVal .= 'VAUTO,'; + $retVal .= 'HAUTO,'; + $retVal .= 'MOUSEOFF,'; + $retVal .= 'WRAP,'; + $retVal .= 'CELLPAD,5'; + $retVal .= ')" onmouseout="return nd()"'; +// $retVal .= ''; + + return $retVal; +} + +/** +* replace varnames with values in a string +* +* @param string $subject: stringvariable with vars placeholder +* @param array $replace: values to replace vars placeholder +* @return string +*/ +function replaceVars($subject = '', $replace = null ) +{ + if(is_array($replace)==true) + { + foreach ($replace as $key => $value) { + $subject = str_replace("{{".$key."}}", $value, $subject); + } + } + return $subject; +} Index: branches/2.8.x/wb/admin/pages/index.php =================================================================== --- branches/2.8.x/wb/admin/pages/index.php (revision 1706) +++ branches/2.8.x/wb/admin/pages/index.php (revision 1707) @@ -4,7 +4,7 @@ * @category admin * @package pages * @author Ryan Djurovich, WebsiteBaker Project - * @copyright 2009-2011, Website Baker Org. e.V. + * @copyright 2009-2012, Website Baker Org. e.V. * @link http://www.websitebaker2.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x @@ -24,10 +24,11 @@ // Include the WB functions file require_once(WB_PATH.'/framework/functions.php'); // eggsurplus: add child pages for a specific page -?> - +/**/ + + ?> + numRows(); - ?> -
  • -

    • {HEADING_MODIFY_PAGE_SETTINGS}

    - -
    + + + $row = $row ? 0 : 1; + +/* +// look and set vars for first run + $iOldLevel = !isset($iOldLevel) ? $page['level'] : $iOldLevel; + $iOldLevel = $iOldLevel < $page['level'] ? $iOldLevel : $page['level']; +// look for new sub + if(!isset($aRowLevel[$page['level']])) + { + $row = !$row ? 0 : $aRowLevel[$iOldLevel]; + $aRowLevel[$page['level']] = $row ? $row : 0; + $iOldLevel = $page['level']; +// look level before + } elseif($iLevel!=$iOldLevel) { + $aRowLevel[$page['level']] = $aRowLevel[$iOldLevel] ? $aRowLevel[$iOldLevel] : $row ; + $iOldLevel = $page['level']; +// normal change + } else { + $aRowLevel[$page['level']] = $aRowLevel[$iLevel] ? $aRowLevel[$iLevel] : $row ; + $iLevel = $page['level']; + } +// set and save level + $aRowLevel[$page['level']] = $aRowLevel[$page['level']] ? 0 : 1; +// final set $row + $row = $aRowLevel[$page['level']]; +*/ + ?> +
  • + + + - get_permission('pages_modify') == true && $can_modify == true) { ?> + get_permission('pages_modify') == true && $can_modify == true) { ?> - + - + - + ?> - + ?>
    - - + + ?> + + + + + + + ?> - - - <?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['PUBLIC']; ?> - - <?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['PRIVATE']; ?> - - <?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['REGISTERED']; ?> - - <?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['HIDDEN']; ?> - - <?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['NONE']; ?> - - <?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['DELETED']; ?> + + + + <?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['PUBLIC']; ?> + + <?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['PRIVATE']; ?> + + <?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['REGISTERED']; ?> + + <?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['HIDDEN']; ?> + + <?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['NONE']; ?> + + <?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['DELETED']; ?> '.($page['menu_title']).''; ?> + echo ''.($page['menu_title']).''; ?> + - - <?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['PUBLIC']; ?> - - <?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['PRIVATE']; ?> - - <?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['REGISTERED']; ?> - - <?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['HIDDEN']; ?> - - <?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['NONE']; ?> - - <?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['DELETED']; ?> + + + <?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['PUBLIC']; ?> + + <?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['PRIVATE']; ?> + + <?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['REGISTERED']; ?> + + <?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['HIDDEN']; ?> + + <?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['NONE']; ?> + + <?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['DELETED']; ?> + echo ''.($page['menu_title']).''; ?> + - + - + + - - - <?php echo $TEXT['VIEW']; ?> + + + <?php echo $TEXT['VIEW']; ?> - + - - get_permission('pages_settings') == true && $can_modify == true) { ?> - - <?php echo $TEXT['SETTINGS']; ?> + + get_permission('pages_settings') == true && $can_modify == true) { ?> + + <?php echo $TEXT['SETTINGS']; ?> - - - - <?php echo $TEXT['RESTORE']; ?> + + + + <?php echo $TEXT['RESTORE']; ?> - + get_permission('pages_modify')==true && $can_modify==true) + if( (MANAGE_SECTIONS == true) && $admin->get_permission('pages_add')==true && $can_modify==true) { $sql = 'SELECT `publ_start`, `publ_end` FROM `'.TABLE_PREFIX.'sections` '; $sql .= 'WHERE `page_id` = '.$page['page_id'].' AND `module` != \'menu_link\' '; @@ -231,60 +268,59 @@ if($mdate_display==1) { $file=$admin->page_is_active($page)?"clock_16.png":"clock_red_16.png"; - ?> - - " alt="" /> + ?> + + " alt="" /> - - - <?php echo $HEADING['MANAGE_SECTIONS']; ?> - - - + + + <?php echo $HEADING['MANAGE_SECTIONS']; ?> + + + - - - get_permission('pages_settings') == true && $can_modify == true) { ?> - - <?php echo $TEXT['MOVE_UP']; ?> + + + get_permission('pages_settings') == true && $can_modify == true) { ?> + + <?php echo $TEXT['MOVE_UP']; ?> - - - + + + - - - get_permission('pages_settings') == true && $can_modify == true) { ?> - - <?php echo $TEXT['MOVE_DOWN']; ?> + + + get_permission('pages_settings') == true && $can_modify == true) { ?> + + <?php echo $TEXT['MOVE_DOWN']; ?> - - - + + + - get_permission('pages_delete') == true && $can_modify == true) { // add IdKey ?> - - <?php echo $TEXT['DELETE']; ?> + get_permission('pages_delete') == true && $can_modify == true) { // add IdKey ?> + + <?php echo $TEXT['DELETE']; ?> - + - get_permission('pages_add')) == (true && $can_modify == true) && ($page['visibility'] != 'deleted')) { ?> - - Add Child Page + get_permission('pages_add')) == true && ($can_modify == true) && ($page['visibility'] != 'deleted')) { ?> + + Add Child Page - +
    get_permission('pages_view') == true) { - ?> + ?>
    - +
    -

    +

    - +
    - : + : - : + : - ID: + PID - : + :
    @@ -342,18 +378,18 @@ } else { $editable_pages = 0; } - ?>
    + ?>
    - +
    correct_theme_source('pages.htt'))); +$template = new Template(dirname($admin->correct_theme_source('pages.htt')),'keep'); // $template->debug = true; $template->set_file('page', 'pages.htt'); $template->set_block('page', 'main_block', 'main'); @@ -475,7 +511,7 @@ // Get user perms $admin_groups = explode(',', str_replace('_', '', $page['admin_groups'])); $admin_users = explode(',', str_replace('_', '', $page['admin_users'])); - + $in_group = FALSE; foreach($admin->get_groups_id() as $cur_gid) { if (in_array($cur_gid, $admin_groups)) { @@ -571,7 +607,7 @@ 'TEXT_ADMINISTRATORS' => $TEXT['ADMINISTRATORS'], 'TEXT_PRIVATE_VIEWERS' => $TEXT['PRIVATE_VIEWERS'], 'TEXT_REGISTERED_VIEWERS' => $TEXT['REGISTERED_VIEWERS'], - 'INTRO_LINK' => $MESSAGE['PAGES']['INTRO_LINK'], + 'INTRO_LINK' => $MESSAGE['PAGES_INTRO_LINK'], ) ); Index: branches/2.8.x/wb/admin/pages/languages/EN.php =================================================================== --- branches/2.8.x/wb/admin/pages/languages/EN.php (revision 1706) +++ branches/2.8.x/wb/admin/pages/languages/EN.php (revision 1707) @@ -18,14 +18,16 @@ $TEXT['HIDDEN'] = 'Hidden'; $TEXT['KEYWORDS'] = 'Keywords'; $TEXT['LANGUAGE'] = 'Language'; +$TEXT['LAST_MODIFIED'] = 'Last modified by'; $TEXT['MANAGE_SECTIONS'] = 'Manage Sections'; $TEXT['MENU'] = 'Menu'; $TEXT['MENU_TITLE'] = 'Menu Title'; $TEXT['MODIFY'] = 'Modify'; +$TEXT['MODIFY_PAGE'] = 'Modify page'; $TEXT['NEW_WINDOW'] = 'New Window'; $TEXT['NO_SELECTION'] = 'no selection'; $TEXT['NONE'] = 'None'; -$TEXT['PAGE_CODE'] = 'Pagecode (language link)'; +$TEXT['PAGE_CODE'] = 'PageLanguageCode'; $TEXT['PAGE_TITLE'] = 'Page Title'; $TEXT['PARENT'] = 'Parent'; $TEXT['PLEASE_SELECT'] = 'Please select'; @@ -49,7 +51,25 @@ $TEXT['SECTION_CONTENT'] = 'Content'; $TEXT['SECTION_SECURITY'] = 'Security'; $TEXT['PAGE_ICON'] = 'Page image'; +$TEXT['PAGE_ICON_DIR'] = 'Folder Page image'; $TEXT['MENU_ICON_0'] = 'Menu image normal'; +$TEXT['MENU_ICON_0_DIR'] = 'Folder Menu image normal'; $TEXT['MENU_ICON_1'] = 'Menu image hover'; +$TEXT['MENU_ICON_1_DIR'] = 'Folder Menu image hover'; +$TEXT['SEO_TITLE'] = 'Seotitle'; -$MESSAGE['PAGES_LAST_MODIFIED'] = 'Last modification by'; \ No newline at end of file +$MESSAGE['PAGES_LAST_MODIFIED'] = 'Last modification by'; + + +$HELP['PAGE_IMAGE_DIR'] = '

    The topical side picture path is
    {{icon_dir}}.

    '; +$HELP['PAGE_IMAGE_DIR'] .='

    As a system administrator you can change the folder for side pictures and menu pictures under options extendet options in server setting.

    '; +$HELP['PAGE_IMAGE_DIR'] .='

    Example::
    /media/banner

    '; +$HELP['PAGE_IMAGE_DIR'] .='

     

    '; + +$HELP['PAGE_CODE'] = '

    If you see this field, you have registered the module for the multilingual facility.

    '; +$HELP['PAGE_CODE'] .= '

    The first step is to be provided a side tree like in the help described

    '; +$HELP['PAGE_CODE'] .= '

    Multilingual Websites

    '; +$HELP['PAGE_CODE'] .= '

    The side linguistic tree is provided from the provided sides of the standard language (Options).

    '; +$HELP['PAGE_CODE'] .= '

    They can update any time the side linguistic tree by click on the title! The assigned sides remain unchanged.

    '; +$HELP['PAGE_CODE'] .= '

    If you have put a side into another language, confirm from this list the matching entry of the standard language

    '; +$HELP['PAGE_CODE'] .= '

    Example:
    Created page in sub DE: Impressum choose Default Language EN: Imprint

    '; \ No newline at end of file Index: branches/2.8.x/wb/admin/pages/languages/DE.php =================================================================== --- branches/2.8.x/wb/admin/pages/languages/DE.php (revision 1706) +++ branches/2.8.x/wb/admin/pages/languages/DE.php (revision 1707) @@ -5,8 +5,8 @@ * deutsch * ****************************************************************************************/ -$HEADING['MODIFY_PAGE'] = 'Seite ändern'; -$HEADING['MODIFY_PAGE_SETTINGS'] = 'Seitenoptionen ändern'; +$HEADING['MODIFY_PAGE'] = 'Seite ändern'; +$HEADING['MODIFY_PAGE_SETTINGS'] = 'Seitenoptionen ändern'; $TEXT['ADMINISTRATORS'] = 'Administratoren'; $TEXT['ALLOWED_VIEWERS'] = 'Zugelassene Besucher'; @@ -16,25 +16,25 @@ $TEXT['ENABLED'] = 'Eingeschaltet'; $TEXT['GROUP'] = 'Gruppen'; $TEXT['HIDDEN'] = 'Versteckt'; -$TEXT['KEYWORDS'] = 'Schlüsselwörter'; +$TEXT['KEYWORDS'] = 'Schlüsselwörter'; $TEXT['LANGUAGE'] = 'Sprache'; -$TEXT['LAST_MODIFIED'] = 'Letzte Änderung durch'; +$TEXT['LAST_MODIFIED'] = 'Letzte Änderung durch'; $TEXT['MANAGE_SECTIONS'] = 'Abschnitte verwalten'; -$TEXT['MENU'] = 'Menü'; -$TEXT['MENU_TITLE'] = 'Menütitel'; -$TEXT['MODIFY'] = 'Ändern'; -$TEXT['MODIFY_PAGE'] = 'Seite ändern'; +$TEXT['MENU'] = 'Menü'; +$TEXT['MENU_TITLE'] = 'Menütitel'; +$TEXT['MODIFY'] = 'Ändern'; +$TEXT['MODIFY_PAGE'] = 'Seite ändern'; $TEXT['NEW_WINDOW'] = 'Neues Fenster'; $TEXT['NO_SELECTION'] = 'keine Auswahl'; $TEXT['NONE'] = 'Keine'; -$TEXT['PAGE_CODE'] = 'Seitencode (Sprachlink)'; +$TEXT['PAGE_CODE'] = 'Seitensprachcode'; $TEXT['PAGE_TITLE'] = 'Seitentitel'; -$TEXT['PARENT'] = 'Übergeordnete Seite'; -$TEXT['PLEASE_SELECT'] = 'Bitte auswählen'; +$TEXT['PARENT'] = 'Übergeordnete Seite'; +$TEXT['PLEASE_SELECT'] = 'Bitte auswählen'; $TEXT['PRIVATE'] = 'Privat'; -$TEXT['PUBLIC'] = 'Öffentlich'; +$TEXT['PUBLIC'] = 'Öffentlich'; $TEXT['REGISTERED'] = 'registriert'; -$TEXT['RESET'] = 'Zurücksetzen'; +$TEXT['RESET'] = 'Zurücksetzen'; $TEXT['SAME_WINDOW'] = 'Gleiches Fenster'; $TEXT['SAVE'] = 'Speichern'; $TEXT['SEARCHING'] = 'Suchfunktion'; @@ -51,7 +51,24 @@ $TEXT['SECTION_CONTENT'] = 'Inhalt'; $TEXT['SECTION_SECURITY'] = 'Sicherheit'; $TEXT['PAGE_ICON'] = 'Seitenbild'; +$TEXT['PAGE_ICON_DIR'] = 'Verzeichnis Seitenbilder'; $TEXT['MENU_ICON_0'] = 'Menübild normal'; +$TEXT['MENU_ICON_0_DIR'] = 'Verzeichnis Menübild normal'; $TEXT['MENU_ICON_1'] = 'Menübild hover'; +$TEXT['MENU_ICON_1_DIR'] = 'Verzeichnis Menübild hover'; +$TEXT['SEO_TITLE'] = 'Seotitel'; +$MESSAGE['PAGES_LAST_MODIFIED'] = 'Letze Änderung durch'; -$MESSAGE['PAGES_LAST_MODIFIED'] = 'Letze Änderung durch'; +$HELP['PAGE_IMAGE_DIR'] = '

    Der aktuelle Seitenbildpfad ist
    {{icon_dir}}.

    '; +$HELP['PAGE_IMAGE_DIR'] .='

    Als Systemadministrator können Sie das Verzeichnis für Seiten-/Menuebilder unter Optionen Erweiterte Optionen in Servereinstellung ändern.

    '; +$HELP['PAGE_IMAGE_DIR'] .='

    Beispiel:
    /media/banner

    '; +$HELP['PAGE_IMAGE_DIR'] .='

     

    '; + +$HELP['PAGE_CODE'] = '

    Wenn Sie dieses Feld sehen, haben Sie das Modul für die Mehrsprachigkeit registriert.

    '; +$HELP['PAGE_CODE'] .= '

    Der erste Schritt ist einen Seitenbaum, wie in der WebsiteBaker Hilfe beschrieben, zu erstellen

    '; +$HELP['PAGE_CODE'] .= '

    Link: Mehrsprachige Webseiten

    '; +$HELP['PAGE_CODE'] .= '

    Der Seitensprachbaum wird aus den erstellten Seiten der Standardsprache (Standardeinstellungen in Optionen) erstellt.

    '; +$HELP['PAGE_CODE'] .= '

    Sie können jederzeit den Standard Seitensprachbaum durch Klick auf den Titeltext aktualisieren! Die zugewiesenen Seiten bleiben unverändert.

    '; +$HELP['PAGE_CODE'] .= '

    Wenn sie eine Seite in einer anderen Sprache angelegt haben, bestätigen Sie aus dieser Liste den dazugehörigen Eintrag der Standardsprache.

    '; +$HELP['PAGE_CODE'] .= '

    Beispiel:
    Erstellte Seite im Zweig EN: Imprint zuweisen an Standardsprache DE: Impressum

    '; + Index: branches/2.8.x/wb/admin/pages/modify.php =================================================================== --- branches/2.8.x/wb/admin/pages/modify.php (revision 1706) +++ branches/2.8.x/wb/admin/pages/modify.php (revision 1707) @@ -3,9 +3,8 @@ * * @category admin * @package pages - * @author WebsiteBaker Project - * @copyright 2004-2009, Ryan Djurovich - * @copyright 2009-2011, Website Baker Org. e.V. + * @author Ryan Djurovich, WebsiteBaker Project + * @copyright 2009-2012, WebsiteBaker Org. e.V. * @link http://www.websitebaker2.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x @@ -14,7 +13,7 @@ * @filesource $HeadURL$ * @lastmodified $Date$ * -*/ + */ /* */ // Create new admin object @@ -48,7 +47,7 @@ // Get perms if(!$admin->get_page_permission($page_id,'admin')) { - $admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']); + $admin->print_error($MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS']); } $sectionId = isset($_GET['wysiwyg']) ? htmlspecialchars($admin->get_get('wysiwyg')) : NULL; @@ -67,7 +66,7 @@ // $ftan_module = $GLOBALS['ftan_module']; // Setup template object, parse vars to it, then parse it // Create new template object -$template = new Template(dirname($admin->correct_theme_source('pages_modify.htt'))); +$template = new Template(dirname($admin->correct_theme_source('pages_modify.htt')),'keep'); // $template->debug = true; $template->set_file('page', 'pages_modify.htt'); $template->set_block('page', 'main_block', 'main'); @@ -88,7 +87,9 @@ 'MODIFIED_BY' => $user['display_name'], 'MODIFIED_BY_USERNAME' => $user['username'], 'MODIFIED_WHEN' => $modified_ts, - 'LAST_MODIFIED' => $MESSAGE['PAGES']['LAST_MODIFIED'], +// 'LAST_MODIFIED' => $MESSAGE['PAGES_LAST_MODIFIED'], + 'TEXT_LAST_MODIFIED' => $TEXT['LAST_UPDATED_BY'], + 'TEXT_MANAGE_SECTIONS' => $HEADING['MANAGE_SECTIONS'] )); $template->set_block('main_block', 'show_modify_block', 'show_modify'); @@ -103,10 +104,49 @@ } // Work-out if we should show the "manage sections" link -$sql = 'SELECT `section_id` FROM `'.TABLE_PREFIX.'sections` WHERE `page_id` = '.(int)$page_id.' '; -$sql .= 'AND `module` = "menu_link"'; -$query_sections = $database->query($sql); +//$sql = 'SELECT `section_id` FROM `'.TABLE_PREFIX.'sections` WHERE `page_id` = '.(int)$page_id.' '; +//$sql .= 'AND `module` = "menu_link"'; +//$query_sections = $database->query($sql); +if( $admin->get_permission('pages_settings') ) +{ + $template->set_var(array( + 'SETTINGS_LINK_BEFORE' => '', + 'SETTINGS_LINK_AFTER' => '', + 'DISPLAY_MANAGE_SETTINGS' => 'link', + )); +} else { + $template->set_var(array( + 'SETTINGS_LINK_BEFORE' => '', + 'SETTINGS_LINK_AFTER' => '', + 'DISPLAY_MANAGE_SECTIONS' => 'link', + )); +} + +/*-- workout if we should show the "manage sections" link ------------------------------*/ + $sql = 'SELECT COUNT(*) FROM `'.TABLE_PREFIX.'sections` ' + . 'WHERE `page_id`='.$page_id.' AND `module`=\'menu_link\''; + $bIsMenuLink = (intval($database->get_one($sql)) != 0); +// $oTpl->set_block('main_block', 'show_manage_sections_block', 'show_manage_sections'); +// if(!$bIsMenuLink && (MANAGE_SECTIONS == true) && $admin->get_permission('pages_add') ) + if((MANAGE_SECTIONS == true) && $admin->get_permission('pages_add') ) + { +// $oTpl->parse('show_manage_sections', 'show_manage_sections_block', true); + $template->set_var(array( + 'SECTIONS_LINK_BEFORE' => '', + 'SECTIONS_LINK_AFTER' => '', + 'DISPLAY_MANAGE_SECTIONS' => 'link', + )); + }else { +// $oTpl->set_block('show_manage_sections', ''); + $template->set_var(array( + 'SECTIONS_LINK_BEFORE' => '', + 'SECTIONS_LINK_AFTER' => '', + 'DISPLAY_MANAGE_SECTIONS' => 'link', + )); + } + +/* $template->set_block('main_block', 'show_section_block', 'show_section'); if($query_sections->numRows() > 0) { @@ -124,7 +164,7 @@ $template->set_var('DISPLAY_MANAGE_SECTIONS', 'display:none;'); } - +*/ // Insert language TEXT $template->set_var(array( 'TEXT_CURRENT_PAGE' => $TEXT['CURRENT_PAGE'], Index: branches/2.8.x/wb/admin/pages/sections.php =================================================================== --- branches/2.8.x/wb/admin/pages/sections.php (revision 1706) +++ branches/2.8.x/wb/admin/pages/sections.php (revision 1707) @@ -3,9 +3,8 @@ * * @category admin * @package pages - * @author WebsiteBaker Project - * @copyright 2004-2009, Ryan Djurovich - * @copyright 2009-2011, Website Baker Org. e.V. + * @author Ryan Djurovich, WebsiteBaker Project + * @copyright 2009-2012, WebsiteBaker Org. e.V. * @link http://www.websitebaker2.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x @@ -149,7 +148,7 @@ if((!$in_old_group) && !is_numeric(array_search($admin->get_user_id(), $old_admin_users))) { $admin->print_header(); - $admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']); + $admin->print_error($MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS']); } // Get page details @@ -165,10 +164,19 @@ if($results->numRows() == 0) { // $admin->print_header(); - $admin->print_error($MESSAGE['PAGES']['NOT_FOUND']); + $admin->print_error($MESSAGE['PAGES_NOT_FOUND']); } $results_array = $results->fetchRow(); + // Get display name of person who last modified the page + $user=$admin->get_user_details($results_array['modified_by']); + // Convert the unix ts for modified_when to human a readable form + if($results_array['modified_when'] != 0) { + $modified_ts = gmdate(TIME_FORMAT.', '.DATE_FORMAT, $results_array['modified_when']+TIMEZONE); + } else { + $modified_ts = 'Unknown'; + } + // Set module permissions $module_permissions = $_SESSION['MODULE_PERMISSIONS']; @@ -218,6 +226,7 @@ 'PAGE_TITLE' => ($results_array['page_title']), 'MENU_TITLE' => ($results_array['menu_title']), 'TEXT_CURRENT_PAGE' => $TEXT['CURRENT_PAGE'], + 'TEXT_LAST_MODIFIED' => $TEXT['LAST_UPDATED_BY'], 'HEADING_MANAGE_SECTIONS' => $HEADING['MANAGE_SECTIONS'], 'HEADING_MODIFY_PAGE' => $HEADING['MODIFY_PAGE'], 'TEXT_CHANGE_SETTINGS' => $TEXT['CHANGE_SETTINGS'], @@ -228,12 +237,46 @@ 'TEXT_PUBL_START_DATE' => $TEXT{'PUBL_START_DATE'}, 'TEXT_PUBL_END_DATE' => $TEXT['PUBL_END_DATE'], 'TEXT_ACTIONS' => $TEXT['ACTIONS'], + 'MODIFIED_BY' => $user['display_name'], + 'MODIFIED_BY_USERNAME' => $user['username'], + 'MODIFIED_WHEN' => $modified_ts, 'ADMIN_URL' => ADMIN_URL, 'WB_URL' => WB_URL, 'THEME_URL' => THEME_URL ) ); +// check modify page permission + if( $admin->get_permission('pages_modify') ) + { + $tpl->set_var(array( + 'MODIFY_LINK_BEFORE' => '', + 'MODIFY_LINK_AFTER' => '', + 'DISPLAY_MANAGE_MODIFY' => 'link', + )); + } else { + $tpl->set_var(array( + 'MODIFY_LINK_BEFORE' => '', + 'MODIFY_LINK_AFTER' => '', + 'DISPLAY_MANAGE_MODIFY' => 'link', + )); + } +// check settings page permission + if( $admin->get_permission('pages_settings') ) + { + $tpl->set_var(array( + 'SETTINGS_LINK_BEFORE' => '', + 'SETTINGS_LINK_AFTER' => '', + 'DISPLAY_MANAGE_SETTINGS' => 'link', + )); + } else { + $tpl->set_var(array( + 'SETTINGS_LINK_BEFORE' => '', + 'SETTINGS_LINK_AFTER' => '', + 'DISPLAY_MANAGE_SECTIONS' => 'link', + )); + } + // Insert variables $tpl->set_var(array( 'PAGE_ID' => $results_array['page_id'], Index: branches/2.8.x/wb/admin/pages/add.php =================================================================== --- branches/2.8.x/wb/admin/pages/add.php (revision 1706) +++ branches/2.8.x/wb/admin/pages/add.php (revision 1707) @@ -3,9 +3,8 @@ * * @category admin * @package pages - * @author WebsiteBaker Project - * @copyright 2004-2009, Ryan Djurovich - * @copyright 2009-2011, Website Baker Org. e.V. + * @author Ryan Djurovich, WebsiteBaker Project + * @copyright 2009-2012, WebsiteBaker Org. e.V. * @link http://www.websitebaker2.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x @@ -53,24 +52,24 @@ if ($parent!=0) { if (!$admin->get_page_permission($parent,'admin')) { - $admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']); + $admin->print_error($MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS']); } } elseif (!$admin->get_permission('pages_add_l0','system')) { - $admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']); -} + $admin->print_error($MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS']); +} // check module permissions: if (!$admin->get_permission($module, 'module')) { - $admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']); -} + $admin->print_error($MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS']); +} // Validate data if($title == '' || substr($title,0,1)=='.') { - $admin->print_error($MESSAGE['PAGES']['BLANK_PAGE_TITLE']); + $admin->print_error($MESSAGE['PAGES_BLANK_PAGE_TITLE']); } // Check to see if page created has needed permissions @@ -82,11 +81,11 @@ if (in_array($adm_group, $admin->get_groups_id())) { $admin_perm_ok = true; - } + } } if ($admin_perm_ok == false) { - $admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']); + $admin->print_error($MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS']); } $admin_perm_ok = false; foreach ($viewing_groups as $view_group) @@ -98,7 +97,7 @@ } if ($admin_perm_ok == false) { - $admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']); + $admin->print_error($MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS']); } } @@ -134,7 +133,7 @@ $get_same_page = $database->query("SELECT page_id FROM ".TABLE_PREFIX."pages WHERE link = '$link'"); if($get_same_page->numRows() > 0 OR file_exists(WB_PATH.PAGES_DIRECTORY.$link.PAGE_EXTENSION) OR file_exists(WB_PATH.PAGES_DIRECTORY.$link.'/')) { - $admin->print_error($MESSAGE['PAGES']['PAGE_EXISTS']); + $admin->print_error($MESSAGE['PAGES_PAGE_EXISTS']); } // Include the ordering class @@ -238,7 +237,7 @@ if($database->is_error()) { $admin->print_error($database->get_error()); } else { - $admin->print_success($MESSAGE['PAGES']['ADDED'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); + $admin->print_success($MESSAGE['PAGES_ADDED'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); } // Print admin footer Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1706) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1707) @@ -51,5 +51,5 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.3'); -if(!defined('REVISION')) define('REVISION', '1706'); +if(!defined('REVISION')) define('REVISION', '1707'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/pages/index.php =================================================================== --- branches/2.8.x/wb/pages/index.php (revision 1706) +++ branches/2.8.x/wb/pages/index.php (nonexistent) @@ -1,26 +0,0 @@ - - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - -header('Location: ../index.php'); Property changes on: branches/2.8.x/wb/pages/index.php ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property