Index: trunk/admin/help/topics/in-portal@configuration_search.txt =================================================================== diff -u -N --- trunk/admin/help/topics/in-portal@configuration_search.txt (revision 0) +++ trunk/admin/help/topics/in-portal@configuration_search.txt (revision 36) @@ -0,0 +1,10 @@ +This section allows the administrator to configure the front end search options, and the advanced search options. + At the top, this section lists all fields, representing category attributes. Next to each field, there is a �Simple Search' checkbox, which includes this field in the simple search query. By default, only the �Name' and the �Description' fields are included. In general, it makes sense to include only the fields, which may contain text in them, otherwise when a visitor searches for a text keyword, the non-textual fields will be not searchable. Next there is a �Weight' text box, in which the administrator can designate the importance of each field during a search. The fields with a larger weight will be more important then the fields with the lower weight. This is used when calculating the category relevance to the search keyword, for sorting of the results. The last column is the �Advanced Search' check. It designated whether a particular field should be displayed on the �Advanced Search' page, and should the visitors be able to search on it. By default, all fields are included. + Below the list of fields are the Category Relevance settings. + + Below, the same forms repeat for user fields and for category custom fields, along with their respective relevance settings. Some of the search settings are not used in the current version � they are reserved for a future use. \ No newline at end of file Index: trunk/kernel/include/usersession.php =================================================================== diff -u -N -r35 -r36 --- trunk/kernel/include/usersession.php (.../usersession.php) (revision 35) +++ trunk/kernel/include/usersession.php (.../usersession.php) (revision 36) @@ -37,6 +37,7 @@ { //echo "with cookies"; if( !isset($_SERVER['HTTP_REFERER']) ) $_SERVER['HTTP_REFERER'] = ''; + if(strlen($id) && (strstr($_SERVER['HTTP_REFERER'], $_SERVER['SERVER_NAME'].$objConfig->Get("Site_Path")) || $_GET['destform'] == 'popup' || $_GET['continue_sess'] == 1)) { $this->Set("SessionKey",$id); Index: trunk/admin/include/sections.php =================================================================== diff -u -N -r34 -r36 --- trunk/admin/include/sections.php (.../sections.php) (revision 34) +++ trunk/admin/include/sections.php (.../sections.php) (revision 36) @@ -448,7 +448,7 @@ return $o; } - function section_header($envar,$navbar=NULL,$extra_title=NULL) + function section_header($envar,$navbar=NULL,$extra_title=NULL, $no_help = false) { global $pathtoroot; global $pathtolocal; @@ -461,11 +461,11 @@ $node = $this->GetCurrentSection(); if(is_object($node)) { - $helpURL = $adminURL."/help/help.php?env=$envar&dstform=popup"; + $helpURL = $adminURL.'/help/help.php?'.( substr($envar,0,3) == 'env' ? '' : 'env=').$envar.'&destform=popup'; $node_key = $node->Get('key'); $o = ""; //background="'.$imagesURL.'/tabnav_left.jpg" - $o .= '
'; + if($no_help == false) $o .= '
'; $o .= ''; $o .= '"; - $o .= "
'; @@ -499,8 +499,8 @@ $o .= "::".$navbar.""; $o .= ""; - $o .= "
"; + if($no_help == false) $o .= ""; + $o .= ""; } return $o; } Index: trunk/admin/help/topics/in-portal@configure_categories.txt =================================================================== diff -u -N --- trunk/admin/help/topics/in-portal@configure_categories.txt (revision 0) +++ trunk/admin/help/topics/in-portal@configure_categories.txt (revision 36) @@ -0,0 +1,12 @@ +This section allows the administrator to define the default values for various In-portal platform settings. + \ No newline at end of file Index: trunk/admin/help/topics/in-portal@edituser_items.txt =================================================================== diff -u -N --- trunk/admin/help/topics/in-portal@edituser_items.txt (revision 0) +++ trunk/admin/help/topics/in-portal@edituser_items.txt (revision 36) @@ -0,0 +1 @@ +This tab lists all items owned by the user. Each item's name and type is displayed. It is not possible to add or remove items on this tab � it must be done through the "Edit" form of each specific item. The link on the item's name will pop up the "Edit" form as a short cut. \ No newline at end of file Index: trunk/admin/help/topics/in-portal@edituser_permissions.txt =================================================================== diff -u -N --- trunk/admin/help/topics/in-portal@edituser_permissions.txt (revision 0) +++ trunk/admin/help/topics/in-portal@edituser_permissions.txt (revision 36) @@ -0,0 +1,14 @@ +The permissions tab allows the administrator to assign individual permissions to the user. This is recommended only for exceptional situations, as it complicates user permission management. The standard way of assigning permissions, is to configure a group with the desired set of permissions, and then assign the user to it. + The permissions are broken down by type, one for the In-portal administrative console permissions, and one for the front-end. The �Inherited' check box specifies that a particular permission is inherited from a group that this user belongs to, and therefore cannot be defined for this user. The �Access' check box shows whether a permission is set or unset for the current user. Next to the check box, you will also see a green or a red circle. These circles indicate the active permission state for the user � red means unset, and the green � set. This is especially useful in for the inherited permissions � you do not have to look up all of the groups this user belongs to, to find out what the value of a particular permission is.

The list of the administrative console permissions is as follows: + + The list of the front-end permissions is as follows: + \ No newline at end of file Index: trunk/admin/help/topics/in-portal@configuration_custom.txt =================================================================== diff -u -N --- trunk/admin/help/topics/in-portal@configuration_custom.txt (revision 0) +++ trunk/admin/help/topics/in-portal@configuration_custom.txt (revision 36) @@ -0,0 +1,11 @@ +This section allows the administrator to manage the category custom fields. The category custom fields are useful when you need to store additional information about the categories. In the earlier example about a directory of cars, the categories may have such custom fields, as the engine displacement range, price range, years of manufacturing of the model, etc. All custom fields will be automatically used in the administrative console, in the Category Management section. You will need to edit the theme templates for them to appear on the front-end. + \ No newline at end of file Index: trunk/admin/help/topics/in-portal@edituser_permission.txt =================================================================== diff -u -N --- trunk/admin/help/topics/in-portal@edituser_permission.txt (revision 0) +++ trunk/admin/help/topics/in-portal@edituser_permission.txt (revision 36) @@ -0,0 +1,14 @@ +The permissions tab allows the administrator to assign individual permissions to the user. This is recommended only for exceptional situations, as it complicates user permission management. The standard way of assigning permissions, is to configure a group with the desired set of permissions, and then assign the user to it. + The permissions are broken down by type, one for the In-portal administrative console permissions, and one for the front-end. The �Inherited' check box specifies that a particular permission is inherited from a group that this user belongs to, and therefore cannot be defined for this user. The �Access' check box shows whether a permission is set or unset for the current user. Next to the check box, you will also see a green or a red circle. These circles indicate the active permission state for the user � red means unset, and the green � set. This is especially useful in for the inherited permissions � you do not have to look up all of the groups this user belongs to, to find out what the value of a particular permission is.

The list of the administrative console permissions is as follows: + + The list of the front-end permissions is as follows: + \ No newline at end of file Index: trunk/admin/include/elements.php =================================================================== diff -u -N -r13 -r36 --- trunk/admin/include/elements.php (.../elements.php) (revision 13) +++ trunk/admin/include/elements.php (.../elements.php) (revision 36) @@ -198,6 +198,50 @@ } }//Page Header +// HELP Page Header +function int_help_header() +{ + global $pathtoroot; + global $pathtolocal; + global $section; + global $objSections; + global $rootURL; + global $localURL; + global $adminURL; + global $envar; + global $admin; + global $metatag; + + $style_sheet_global = $adminURL."/include/style.css"; + $style_sheet_local = $localURL."admin/include/style.css"; + + $ExtraTitle = htmlentities($ExtraTitle); + + // TOOLBAR: + print "In-Portal - Help"; + print ""; + print ""; + print ""; + load_module_styles(); + require_once ($pathtoroot.$admin."/include/mainscript.php"); + + print ""; + + + if(strlen($section)>0) + { + $objSections->SetCurrentSection($section); + $sec = $objSections->GetCurrentSection(); + + if ($sec->Get("notitle") != 1) print $objSections->page_title(); + + if ($sec->Get("nonavbar") != 1) //Section Navigatior + print $objSections->section_header($envar,$NavBarText,$ExtraTitle, true); + + } +}// HELP Page Header + + function int_SectionHeader($toolbar=NULL,$onLoad=NULL,$NavBarText=NULL,$ExtraTitle=NULL) { global $pathtoroot; Index: trunk/admin/help/topics/in-portal@editgroup_permissions.txt =================================================================== diff -u -N --- trunk/admin/help/topics/in-portal@editgroup_permissions.txt (revision 0) +++ trunk/admin/help/topics/in-portal@editgroup_permissions.txt (revision 36) @@ -0,0 +1,15 @@ +The permissions tab allows the administrator to assign permissions to the group. This is the recommended way of managing user permissions. + The permissions are broken down by type, one for the In-portal administrative console permissions, and one for the front-end. The "Access" check box shows whether a permission is set or unset for the current group. Next to the check box, you will also see a green or a red circle. These circles indicate the active permission state for the group � red means unset, and the green � set.

The list of the administrative console permissions is as follows: + + The list of the front-end permissions is as follows: + + \ No newline at end of file Index: trunk/admin/help/topics/in-portal@edituser_groups.txt =================================================================== diff -u -N --- trunk/admin/help/topics/in-portal@edituser_groups.txt (revision 0) +++ trunk/admin/help/topics/in-portal@edituser_groups.txt (revision 36) @@ -0,0 +1,2 @@ +This tab allows the administrator to assign the user to one or more groups. It also lists all groups to which the user is currently assigned, along with the user count in each group. + To assign a new group, click on the �Add User to Group' button (user icon with a green arrow to the right). This button will pop-up a group selector. \ No newline at end of file Index: trunk/admin/help/topics/in-portal@editgroup_users.txt =================================================================== diff -u -N --- trunk/admin/help/topics/in-portal@editgroup_users.txt (revision 0) +++ trunk/admin/help/topics/in-portal@editgroup_users.txt (revision 36) @@ -0,0 +1 @@ +This tab lists all group members. It also allows to add a new member to the group and to remove the existing members. To add a new member, click on the �Add User to Group' button. A new page with a list of all users will pop up. \ No newline at end of file Index: trunk/admin/include/mainscript.php =================================================================== diff -u -N -r34 -r36 --- trunk/admin/include/mainscript.php (.../mainscript.php) (revision 34) +++ trunk/admin/include/mainscript.php (.../mainscript.php) (revision 36) @@ -409,19 +409,23 @@ return false; } -function CreatePopup(window_name, url) +function CreatePopup(window_name, url, width, height) { // creates a popup window & returns it - if(url == null) url = ''; - return window.open(url,window_name,'width=750,height=400,status=yes,resizable=yes,menubar=no,scrollbars=yes,toolbar=no'); + if(url == null && typeof(url) == 'undefined' ) url = ''; + if(width == null && typeof(width) == 'undefined' ) width = 750; + if(height == null && typeof(height) == 'undefined' ) height = 400; + + + return window.open(url,window_name,'width='+width+',height='+height+',status=yes,resizable=yes,menubar=no,scrollbars=yes,toolbar=no'); } function ShowHelp(section) { var frm = document.getElementById('help_form'); frm.section.value = section; frm.method = 'POST'; - CreatePopup('HelpPopup'); + CreatePopup('HelpPopup','$rootURL$admin/help/blank.html', null, 600); frm.target = 'HelpPopup'; frm.submit(); } Index: trunk/admin/help/topics/in-portal@user_groups.txt =================================================================== diff -u -N --- trunk/admin/help/topics/in-portal@user_groups.txt (revision 0) +++ trunk/admin/help/topics/in-portal@user_groups.txt (revision 36) @@ -0,0 +1 @@ +This section lists all user groups and allows the administrator to manage them. It also displays the member count for each group. \ No newline at end of file Index: trunk/admin/help/topics/in-portal@editcategory_custom.txt =================================================================== diff -u -N --- trunk/admin/help/topics/in-portal@editcategory_custom.txt (revision 0) +++ trunk/admin/help/topics/in-portal@editcategory_custom.txt (revision 36) @@ -0,0 +1,2 @@ +The custom tab displays all custom fields defined for categories, and allows the administrator to edit them. The custom fields are set up on the Custom Settings page, described in the section V.2.1.5 of this manual. + The only information that can be entered for a custom field is the "Value". \ No newline at end of file Index: trunk/kernel/include/modules.php =================================================================== diff -u -N -r13 -r36 --- trunk/kernel/include/modules.php (.../modules.php) (revision 13) +++ trunk/kernel/include/modules.php (.../modules.php) (revision 36) @@ -307,15 +307,14 @@ $env_arr = explode('-', $_GET['env']); $get_session_key = $env_arr[0]; - if(!$objSession->ValidSession() || ($objSession->GetSessionKey() != $get_session_key && $_POST['adminlogin'] != 1)) { if ($_GET['expired'] == 1) { $login_error = admin_language("la_text_sess_expired"); } return FALSE; //echo "Expired
"; } - + if ($objSession->HasSystemPermission("ADMIN") == 1) return TRUE; Index: trunk/admin/help/topics/in-portal@editcategory_general.txt =================================================================== diff -u -N --- trunk/admin/help/topics/in-portal@editcategory_general.txt (revision 0) +++ trunk/admin/help/topics/in-portal@editcategory_general.txt (revision 36) @@ -0,0 +1,13 @@ + \ No newline at end of file Index: trunk/admin/help/topics/in-portal@edituser_image.txt =================================================================== diff -u -N --- trunk/admin/help/topics/in-portal@edituser_image.txt (revision 0) +++ trunk/admin/help/topics/in-portal@edituser_image.txt (revision 36) @@ -0,0 +1,13 @@ + Index: trunk/admin/help/topics/in-portal@editcategory_images.txt =================================================================== diff -u -N --- trunk/admin/help/topics/in-portal@editcategory_images.txt (revision 0) +++ trunk/admin/help/topics/in-portal@editcategory_images.txt (revision 36) @@ -0,0 +1,15 @@ + + This tab contains all images associated with the category. To create a new image, click on the �New' button (the icon like the Windows GIF icon with a little sun). This will open a new page where you fill out the image details. + \ No newline at end of file Index: trunk/admin/help/topics/in-portal@user_list.txt =================================================================== diff -u -N --- trunk/admin/help/topics/in-portal@user_list.txt (revision 0) +++ trunk/admin/help/topics/in-portal@user_list.txt (revision 36) @@ -0,0 +1 @@ +This section lists all In-portal users. It allows managing users, setting primary group for a user, approving and disabling users, banning users and sending out mass emails to the users. \ No newline at end of file Index: trunk/admin/help/topics/in-portal@configuration_email.txt =================================================================== diff -u -N --- trunk/admin/help/topics/in-portal@configuration_email.txt (revision 0) +++ trunk/admin/help/topics/in-portal@configuration_email.txt (revision 36) @@ -0,0 +1,2 @@ + + This section lists all possible In-portal platform category events. Each event has a description, a type � �User' or �Admin', a status � �Enabled', �Front-end Only', and a �From/To User'. The description hints about when the event occurs. The type indicates whether the email notification will be sent to the front-end user, or the administrator. The status �Enabled' signifies that the email notifications for this event are enabled for both the front-end and the administrative console. The Front-end Only' status means that the notifications will be sent only when the event occurs on the front end. The �Disabled' status means no notifications will be sent when this event occurs. The �From/To User' field specifies the �From' email for front-end user notifications, and the �To' email for the administrative notifications. The other, matching pair of addresses (�To' for the front, and �From' for the admin) is automatically determined by the system based on who initiated the event. The event notification status can be changed by clicking on the toolbar buttons � �Enable' to enable the notification, �Disable' to disable it, and �Front Only' (icon with a monitor) to set to �Front-end Only' status. \ No newline at end of file Index: trunk/admin/include/tabs.js =================================================================== diff -u -N -r13 -r36 --- trunk/admin/include/tabs.js (.../tabs.js) (revision 13) +++ trunk/admin/include/tabs.js (.../tabs.js) (revision 36) @@ -185,7 +185,6 @@ { var full_env = env; if(env_str != null) full_env += env_str; - if(full_env.substr(0,3)!="env") full_env = 'env='+full_env; Index: trunk/admin/help/blank.html =================================================================== diff -u -N --- trunk/admin/help/blank.html (revision 0) +++ trunk/admin/help/blank.html (revision 36) @@ -0,0 +1,8 @@ + + + Loading Help + + + + + \ No newline at end of file Index: trunk/admin/help/topics/in-portal@edituser_general.txt =================================================================== diff -u -N --- trunk/admin/help/topics/in-portal@edituser_general.txt (revision 0) +++ trunk/admin/help/topics/in-portal@edituser_general.txt (revision 36) @@ -0,0 +1,18 @@ +This form contains all of the user information. + \ No newline at end of file Index: trunk/admin/help/topics/in-portal@edituser_custom.txt =================================================================== diff -u -N --- trunk/admin/help/topics/in-portal@edituser_custom.txt (revision 0) +++ trunk/admin/help/topics/in-portal@edituser_custom.txt (revision 36) @@ -0,0 +1,3 @@ +The custom tab displays all custom fields defined for users, and allows the administrator to edit them. The custom fields are set up on the Custom Fields page, described in the section V.2.2.5 of this manual. + The only information that can be entered for a custom field is the "Value". + \ No newline at end of file Index: trunk/admin/help/topics/in-portal@editcategory_relations.txt =================================================================== diff -u -N --- trunk/admin/help/topics/in-portal@editcategory_relations.txt (revision 0) +++ trunk/admin/help/topics/in-portal@editcategory_relations.txt (revision 36) @@ -0,0 +1,8 @@ +This page contains a list of all relations of this category. To create a new relation, click the �New' button (two opposite green arrows with a sun). This will pop up a category picker, where you can choose one category. + \ No newline at end of file Index: trunk/admin/help/topics/in-portal@editgroup_general.txt =================================================================== diff -u -N --- trunk/admin/help/topics/in-portal@editgroup_general.txt (revision 0) +++ trunk/admin/help/topics/in-portal@editgroup_general.txt (revision 36) @@ -0,0 +1,5 @@ +The general tab lists all general group information. + \ No newline at end of file Index: trunk/admin/help/help.php =================================================================== diff -u -N -r13 -r36 --- trunk/admin/help/help.php (.../help.php) (revision 13) +++ trunk/admin/help/help.php (.../help.php) (revision 36) @@ -63,6 +63,8 @@ $rootURL="http://".ThisDomain().$objConfig->Get("Site_Path"); +$baseURL = $_SERVER['DOCUMENT_ROOT'].$path_char.$objConfig->Get("Site_Path"); + $admin = $objConfig->Get("AdminDirectory"); if(!strlen($admin)) $admin = "admin"; @@ -78,23 +80,51 @@ //require_once ($pathtolocal."admin/include/navmenu.php"); require_once($pathtoroot.$admin."/toolbar.php"); +$section = $_REQUEST["section"]; -$m = GetModuleArray(); -foreach($m as $key=>$value) +$envar = BuildEnv(); +int_help_header(); + +$topic_path = $baseURL.$admin.'/help/topics/'.str_replace(':','@',$section).'.txt'; + +// for debugging: save new help content +if( GetVar('action') == 'save_help' ) { - $path = $pathtoroot.$value."admin/include/subitems.php"; - if(file_exists($path)) - { - //echo ""; - include_once($path); - } + error_reporting(E_ALL); + $fp = fopen($topic_path, 'w'); + fwrite($fp, stripslashes(GetVar('help_content')) ); + fclose($fp); } -$section = $_GET["section"]; +$help_data = file_exists($topic_path) ? file_get_contents($topic_path) : GetVar('help_content'); -$envar = BuildEnv(); -int_header(); ?> -

Not Implemented

- - + + + + +
+
+ '.str_replace(':','@',$section).'.txt
' : admin_language('la_help_in_progress'); + + ?> +
+ +

+
+ + + +
+ +
+ \ No newline at end of file Index: trunk/admin/help/topics/in-portal@edituser_images.txt =================================================================== diff -u -N --- trunk/admin/help/topics/in-portal@edituser_images.txt (revision 0) +++ trunk/admin/help/topics/in-portal@edituser_images.txt (revision 36) @@ -0,0 +1 @@ +This tab contains all images associated with the user. To create a new image, click on the �New' button (the icon like the Windows GIF icon with a little sun). This will open a new page where you fill out the image details. \ No newline at end of file Index: trunk/admin/help/topics/in-portal@site.txt =================================================================== diff -u -N --- trunk/admin/help/topics/in-portal@site.txt (revision 0) +++ trunk/admin/help/topics/in-portal@site.txt (revision 36) @@ -0,0 +1 @@ +This section will provide you with a page-by-page walkthrough of the administrative console of the In-portal platform, describing the purpose of each page and the fields on it. \ No newline at end of file Index: trunk/admin/include/style.css =================================================================== diff -u -N -r34 -r36 --- trunk/admin/include/style.css (.../style.css) (revision 34) +++ trunk/admin/include/style.css (.../style.css) (revision 36) @@ -427,4 +427,10 @@ .link { cursor: hand; +} + +.help_box +{ + padding: 5px 10px 5px 10px; + } \ No newline at end of file Index: trunk/admin/help/topics/in-portal@editcategory_permissions.txt =================================================================== diff -u -N --- trunk/admin/help/topics/in-portal@editcategory_permissions.txt (revision 0) +++ trunk/admin/help/topics/in-portal@editcategory_permissions.txt (revision 36) @@ -0,0 +1,10 @@ +This tab allows you to control the permissions of the current category. The first list displays all groups, which have permissions already associated with this category. If a group is not shown, that means that its permissions will be inherited from the parent category. To add a new group definition, click on the �New Permission' button (icon with a yellow lock and a little sun). A new page will pop-up, prompting you to select the group which you want to add. Only those groups will be shown which don't yet exist in the group list. + Once you add or edit a group, you will be directed to the page defining the permissions. The permissions are broken down by type, one for the In-portal platform permissions, and one for each of the installed modules. The �Inherited' check box specifies that a particular permission is inherited from the parent, and therefore cannot be defined for this category. The �Access' check box shows whether a permission is set or unset in the current category. Next to the check box, you will also see a green or a red circle. These circles indicate the active permission state for the category � red means unset, and the green � set. This is especially useful in for the inherited permissions � you don't have to look up the parent category to find out what the value of a particular permission is. The last column, �Inherited From', shows the category name and full path that defines the permission for the current category. It may be an immediate parent, or any other grandparent category in the tree � all the way up to the �Home' category. The �Home' category does not have the inheritance options, since it is the highest category in the tree, and does not have any other category to inherit the settings from. The list of In-portal platform permissions is as follows: + \ No newline at end of file