Page MenuHomeIn-Portal Phabricator
Files F772970

in-portal
No OneTemporary
Actions

File Metadata

Created
Sat, Feb 1, 9:59 PM

in-portal
View Options

Index: trunk/kernel/admin/include/toolbar/main_import.php
===================================================================
--- trunk/kernel/admin/include/toolbar/main_import.php (revision 337)
+++ trunk/kernel/admin/include/toolbar/main_import.php (revision 338)
@@ -1,111 +1,109 @@
<?php
// import scripts definitions: begin
global $import_scripts, $var, $objSession, $ro_perm;
$import_scripts = GetImportScripts();
// import scripts definitions: end
$ro_perm = $objSession->HasSystemPermission("SYSTEM_ACCESS.READONLY");
?>
<script language="javascript" type="text/javascript">
<?php
if(!$ro_perm)
{
?>
function PageOnLoad(step_no)
{
if( step_no == 1 )
{
// uncheck "agree" checkbox if toolbar button is disabled
var cb = document.getElementById('agree');
var next_btn = document.getElementById('moveright');
if(cb.checked == true && next_btn.getAttribute('ButtonState') == 'disabled')
cb.checked = false;
}
}
function UsedAgreed()
{
return document.getElementById('agree').checked ? 1 : 0;
}
function ImportRedirect(form, import_id)
{
if( import_id === false ) return false;
var frm = document.getElementById(form);
frm.import_id.value = import_id;
frm.submit();
}
function CheckFinalForm(form)
{
// checks if all required fields are filled
var frm = document.getElementById(form);
<?php
- $required = Array('user_admin','user_regular','init_cat');
$import_script = GetImportScript( $objSession->GetVariable('ImportScriptID') );
if( ($import_script !== false) && strlen($import_script['required_fields']) > 0 )
- {
- $script_required = explode(',', $import_script['required_fields']);
- $required = array_merge($required, $script_required);
- }
+ $required = explode(',', $import_script['required_fields']);
+ else
+ $required = Array();
echo "var required_fields = Array('".implode("','", $required)."');\n";
?>
var form_is_valid = true;
if(frm)
{
var i = 0;
var field_count = required_fields.length;
for(i = 0; i < field_count; i++)
form_is_valid &= frm.elements[ required_fields[i] ].value.length ? true : false;
}
else
return false;
return form_is_valid;
}
function import_submit(formname,formaction,action)
{
f = document.getElementById(formname);
if(f)
{
f.action = formaction;
f.Action.value = HasParam(action) ? action : 'Import';
f.submit();
}
}
function SetPercent(step_id, new_percent, additional, time_str)
{
var step_element = document.getElementById(step_id);
step_element.innerHTML = new_percent;
var add_element = document.getElementById(step_id+'_additional');
add_element.innerHTML = additional;
var time_element = document.getElementById('total_time');
time_element.innerHTML = time_str;
}
<?php
}
?>
function ChoiseMade(form, radio_name)
{
// checks if user has selected enabled radio button
var frm = document.getElementById(form);
if(frm)
{
var i = 0;
var element_count = frm.elements.length;
for(i = 0; i < element_count; i++)
if(frm[i].type == 'radio' && frm[i].name == radio_name)
if(frm[i].checked == true)
return frm[i].value;
return false;
}
}
</script>
\ No newline at end of file
Property changes on: trunk/kernel/admin/include/toolbar/main_import.php
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: trunk/admin/users/group_select.php
===================================================================
--- trunk/admin/users/group_select.php (revision 337)
+++ trunk/admin/users/group_select.php (revision 338)
@@ -1,251 +1,247 @@
<?php
##############################################################
##In-portal ##
##############################################################
## In-portal ##
## Intechnic Corporation ##
## All Rights Reserved, 1998-2002 ##
## ##
## No portion of this code may be copied, reproduced or ##
## otherwise redistributed without proper written ##
## consent of Intechnic Corporation. Violation will ##
## result in revocation of the license and support ##
## privileges along maximum prosecution allowed by law. ##
##############################################################
if(!strlen($pathtoroot))
{
$path=dirname(realpath($_SERVER['SCRIPT_FILENAME']));
if(strlen($path))
{
/* determine the OS type for path parsing */
$pos = strpos($path,":");
if ($pos === false)
{
$gOS_TYPE="unix";
$pathchar = "/";
}
else
{
$gOS_TYPE="win";
$pathchar="\\";
}
$p = $path.$pathchar;
/*Start looking for the root flag file */
while(!strlen($pathtoroot) && strlen($p))
{
$sub = substr($p,strlen($pathchar)*-1);
if($sub==$pathchar)
{
$filename = $p."root.flg";
}
else
$filename = $p.$pathchar."root.flg";
if(file_exists($filename))
{
$pathtoroot = $p;
}
else
{
$parent = realpath($p.$pathchar."..".$pathchar);
if($parent!=$p)
{
$p = $parent;
}
else
$p = "";
}
}
if(!strlen($pathtoroot))
$pathtoroot = ".".$pathchar;
}
else
{
$pathtoroot = ".".$pathchar;
}
}
$sub = substr($pathtoroot,strlen($pathchar)*-1);
if($sub!=$pathchar)
{
$pathtoroot = $pathtoroot.$pathchar;
}
//echo $pathtoroot;
require_once($pathtoroot."kernel/startup.php");
$rootURL="http://".ThisDomain().$objConfig->Get("Site_Path");
$admin = $objConfig->Get("AdminDirectory");
if(!strlen($admin))
$admin = "admin";
$localURL=$rootURL."kernel/";
$adminURL = $rootURL.$admin;
$imagesURL = $adminURL."/images";
//admin only util
$pathtolocal = $pathtoroot."kernel/";
require_once ($pathtoroot.$admin."/include/elements.php");
require_once ($pathtoroot."kernel/admin/include/navmenu.php");
require_once ($pathtolocal."admin/include/navmenu.php");
require_once($pathtoroot.$admin."/toolbar.php");
require_once($pathtoroot.$admin."/listview/listview.php");
$pathtolocal = $pathtoroot;
//Set Section
$section = 'in-portal:groupselect';
//Set Environment Variable
$envar = "env=" . BuildEnv();
//Display header
$objListToolBar = new clsToolBar();
$objListToolBar->Set("section",$section);
$objListToolBar->Set("load_menu_func","");
$objListToolBar->Set("CheckClass","GroupChecks");
$listImages = array();
//$img, $alt, $link, $onMouseOver, $onMouseOut, $onClick
$objListToolBar->Add("select", "la_ToolTip_Select","#","swap('select','toolbar/tool_select_f2.gif');",
"swap('select', 'toolbar/tool_select.gif');",
"SelectSubmit();",
"tool_select.gif");
$objListToolBar->Add("cancel", "la_ToolTip_Stop","#","swap('cancel','toolbar/tool_stop_f2.gif');",
"swap('cancel', 'toolbar/tool_stop.gif');","window.close();","tool_stop.gif");
$objListToolBar->Add("divider");
$objListToolBar->Add("viewmenubutton", "la_ToolTip_View","#","swap('viewmenubutton','toolbar/tool_view_f2.gif'); ",
"swap('viewmenubutton', 'toolbar/tool_view.gif');",
"ShowViewMenu();","tool_view.gif");
$objListToolBar->AddToInitScript($listImages);
$objListToolBar->AddToInitScript("fwLoadMenus();");
$order = $objConfig->Get("GroupSelect_SortOrder");
-$SelectorType="checkbox";
-if($_GET["Selector"])
- $SelectorType=$_GET["Selector"];
+$SelectorType = GetVar('Selector');
+if(!$SelectorType) $SelectorType = 'checkbox';
+$source = GetVar('source');
-if(strlen($_GET["source"])>0)
+if($source)
{
- switch($_GET["source"])
+ switch($source)
{
case "addcategory_permissions":
$SelectorType = "radio";
$ado = GetADODBConnection();
$sql = "SELECT Distinct(GroupId) FROM ".GetTablePrefix()."Permissions WHERE CatId=".$_GET["CatId"];
//$sql = "SELECT Distinct(p.GroupId) FROM ".GetTablePrefix()."Permissions AS p LEFT JOIN ".GetTablePrefix()."PortalGroup AS pg ON p.GroupId = pg.GroupId WHERE p.CatId=".$_GET["CatId"]." AND pg.Personal=0";
//echo "SQL 1: $sql<br>";
$rs = $ado->Execute($sql);
$inlist = array();
while($rs && !$rs->EOF)
{
array_push($inlist,$rs->fields["GroupId"]);
$rs->MoveNext();
}
if(count($inlist)>0)
{
$catlist = implode(",",$inlist);
$field = $objConfig->Get("GroupSelect_SortField");
if(!strlen($field))
$field = "Name";
$orderby = trim($field." ".$order);
$sql = "SELECT * FROM ".GetTablePrefix()."PortalGroup WHERE GroupId NOT IN (".$catlist.") AND Personal = 0 ORDER BY $orderby";
//echo "SQL 4: $sql<br>";
$objGroups->Query_Item($sql);
}
else
$objGroups->LoadGroups("Personal = 0",trim($objConfig->Get("GroupSelect_SortField")." ".$order));
break;
case "adduser_groups":
$SelectorType = "radio";
$ado = GetADODBConnection();
$sql = sprintf('SELECT GroupId FROM '.GetTablePrefix().'UserGroup WHERE PortalUserId = %s', $_GET["UserId"]);
$inlist = $ado->GetCol($sql);
if($inlist !== false)
{
$catlist = implode(',', $inlist);
$field = $objConfig->Get("GroupSelect_SortField");
if( !strlen($field) ) $field = "Name";
$orderby = $field." ".$order;
$sql = "SELECT * FROM ".GetTablePrefix()."PortalGroup WHERE GroupId NOT IN (".$catlist.") ORDER BY $orderby";
$objGroups->Query_Item($sql);
}
else
$objGroups->LoadGroups('',trim($objConfig->Get("GroupSelect_SortField")." ".$order));
break;
default:
$objGroups->LoadGroups('',trim($objConfig->Get("GroupSelect_SortField")." ".$order));
break;
}
}
else
{
//echo "Loading Groups..<br>\n";
$objGroups->LoadGroups("",trim($objConfig->Get("GroupSelect_SortField")." ".$order));
}
$objListView = new clsListView($objListToolBar,$objGroups);
$objListView->IdField = "ResourceId";
$objListView->PageLinkTemplate = $pathtoroot.$admin."/templates/user_page_link.tpl";
$objListView->ColumnHeaders->Add("Name", admin_language("la_prompt_Name"),1,0,$order,"width=\"20%\"","GroupSelect_SortField","GroupSelect_SortOrder","Name");
$objListView->ColumnHeaders->Add("Description", admin_language("la_prompt_Description"),1,0,$order,"width=\"30%\"","GroupSelect_SortField","GroupSelect_SortOrder","Description");
$objListView->ColumnHeaders->SetSort($objConfig->Get("GroupSelect_SortField"),$order);
-
-
$objListView->PrintToolBar = FALSE;
$objListView->CurrentPageVar = "Page_Grouplist";
$objListView->PerPageVar = "Perpage_Grouplist";
$objListView->CheckboxName = "itemlist[]";
-$objListView->TotalItemCount = $itemcount;
-$objListView->SelectorType=$SelectorType;
-
-
+$objListView->TotalItemCount = $objGroups->QueryItemCount;
+$objListView->SelectorType = $SelectorType;
+$title = 'Select Group';
int_header($objListToolBar,NULL,$title);
-if(strlen($_GET["values"]))
-{
- $current_value = explode(",",$_GET["values"]);
-}
+$values = GetVar('values');
+if($values) $current_value = explode(',', $values);
+
?>
<FORM method="POST" ACTION="" NAME="grouplistform" ID="grouplistform">
<?php
print $objListView->PrintList();
?>
<input type="hidden" name="Action" value="">
</FORM>
<!-- CODE FOR VIEW MENU -->
<form method="post" action="<?php echo $_SERVER["PHP_SELF"]."?".$_SERVER["QUERY_STRING"]; ?>" name="viewmenu">
<input type="hidden" name="fieldname" value="">
<input type="hidden" name="varvalue" value="">
<input type="hidden" name="varvalue2" value="">
<input type="hidden" name="Action" value="">
</form>
<script src="<?php echo $adminURL; ?>/listview/listview.js"></script>
<script>
initSelectiorContainers();
<?php echo $objListToolBar->Get("CheckClass").".setImages();"; ?>
</script>
<!-- END CODE-->
<?php int_footer(); ?>
Property changes on: trunk/admin/users/group_select.php
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: trunk/admin/import/step4.php
===================================================================
--- trunk/admin/import/step4.php (revision 337)
+++ trunk/admin/import/step4.php (revision 338)
@@ -1,210 +1,224 @@
<?php
if(!strlen($pathtoroot))
{
$path=dirname(realpath($_SERVER['SCRIPT_FILENAME']));
if(strlen($path))
{
/* determine the OS type for path parsing */
$pos = strpos($path,":");
if ($pos === false)
{
$gOS_TYPE="unix";
$pathchar = "/";
}
else
{
$gOS_TYPE="win";
$pathchar="\\";
}
$p = $path.$pathchar;
/*Start looking for the root flag file */
while(!strlen($pathtoroot) && strlen($p))
{
$sub = substr($p,strlen($pathchar)*-1);
if($sub==$pathchar)
{
$filename = $p."root.flg";
}
else
$filename = $p.$pathchar."root.flg";
if(file_exists($filename))
{
$pathtoroot = $p;
}
else
{
$parent = realpath($p.$pathchar."..".$pathchar);
if($parent!=$p)
{
$p = $parent;
}
else
$p = "";
}
}
if(!strlen($pathtoroot))
$pathtoroot = ".".$pathchar;
}
else
{
$pathtoroot = ".".$pathchar;
}
}
$sub = substr($pathtoroot,strlen($pathchar)*-1);
if($sub!=$pathchar)
{
$pathtoroot = $pathtoroot.$pathchar;
}
//echo $pathtoroot;
//echo $pathtoroot;
require_once($pathtoroot."kernel/startup.php");
$rootURL="http://".ThisDomain().$objConfig->Get("Site_Path");
$admin = $objConfig->Get("AdminDirectory");
if(!strlen($admin))
$admin = "admin";
$localURL=$rootURL."kernel/";
$adminURL = $rootURL.$admin;
$imagesURL = $adminURL."/images";
//admin only util
$pathtolocal = $pathtoroot."kernel/";
require_once ($pathtoroot.$admin."/include/elements.php");
require_once ($pathtoroot."kernel/admin/include/navmenu.php");
require_once ($pathtolocal."admin/include/navmenu.php");
require_once($pathtoroot.$admin."/toolbar.php");
//Set Section
$section = "in-portal:main_import";
//Set Environment Variable
$envar = "env=" . BuildEnv();
$sec = $objSections->GetSection($section);
$objCatToolBar = new clsToolBar();
//check if the previous input is correct
if( $_POST["Action"] == 'checkconn')
{
// save supplied connection info
$objSession->SetVariable("import_sql_type", $_POST["db_sql_type"]);
$objSession->SetVariable("import_server", $_POST["db_server"]);
$objSession->SetVariable("import_db", $_POST["db_db"]);
$objSession->SetVariable("import_user", $_POST["db_user"]);
$objSession->SetVariable("import_pass", $_POST["db_pass"]);
$objSession->SetVariable("error_importing", '');
// get them for using here
$db_sql_type = $objSession->GetVariable("import_sql_type");
$db_server = $objSession->GetVariable("import_server");
$db_db = $objSession->GetVariable("import_db");
$db_user = $objSession->GetVariable("import_user");
$db_pass = $objSession->GetVariable("import_pass");
// check supplied connection
$linkconn = ADONewConnection($db_sql_type);
if( !$linkconn->PConnect($db_server, $db_user, $db_pass, $db_db) || !$db_server || !$db_db )
{
$objSession->SetVariable("error_importing","Error: The connection to the DB failed please check your settings");
header('Location: step3.php?'.$envar);
}
unset($linkconn);
}
-
+
$import_script = GetImportScript( $objSession->GetVariable('ImportScriptID') );
$var = "?env=".BuildEnv();
// Previous Button
$MouseOver = "swap('moveleft','toolbar/tool_prev_f2.gif');";
$MouseOut = "swap('moveleft', 'toolbar/tool_prev.gif');";
$link = $adminURL."/import/step3.php".$var;
$objCatToolBar->Add("moveleft",admin_language("la_ToolTip_Previous")." ".admin_language("la_Text_Step"),$link,$MouseOver,$MouseOut,"","tool_prev.gif");
// Next Button
$MouseOver = "swap('moveright','toolbar/tool_next_f2.gif');";
$MouseOut = "swap('moveright', 'toolbar/tool_next.gif');";
$formaction = $rootURL.$import_script['module'].'/'.$admin.'/import/'.$import_script['url'].'.php?'.$envar;
$onClick = "if( !CheckFinalForm('import_form') ) alert('Please fill in all of the fields'); else import_submit('import_form','$formaction',''); ";
$objCatToolBar->Add("moveright",admin_language("la_ToolTip_Next")." ".admin_language("la_Text_Step"),'#',$MouseOver,$MouseOut,$onClick,"tool_next.gif");
// Header
$title = admin_language("la_performing_import")." - ".admin_language("la_Step")." 4";
int_header($objCatToolBar,NULL,$title);
?>
<form id="import_form" name="import_form" method="post" action="<?php echo $_SERVER["PHP_SELF"]."?".$envar; ?>">
<input type="hidden" name="Action" value="m_save_import_config">
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
<?php int_subsection_title("Matching Fields - Intechnic In-Portal "); ?>
<!-- script common fields: begin -->
<?php
if( $import_script['id'] == 'in-link' )
{
?>
<tr <?php echo int_table_color(); ?>>
<td width="60%" valign="top"><span class="text"><?php echo admin_language("la_prompt_AdminId"); ?></span></td>
<td>
<b><?php echo $objSession->GetVariable("user_admin_names"); ?></b>
<input type="hidden" name="user_admin" size="15" class="text" value="<?php echo $objSession->GetVariable("user_admin_values"); ?>">
<input type="hidden" name="grouplist1" value="<?php echo $objSession->GetVariable('grouplist1'); ?>">
<a href="#"><img src="../images/icon_users_sm.gif" style="cursor:hand;" border="0" onclick="OpenGroupSelector('<?php echo $envar; ?>&en=0&destform=import_form&destfield=grouplist1&Selector=radio');"></a>
</td>
</tr>
<?php
}
?>
<tr <?php echo int_table_color(); ?>>
<td width="60%" valign="top"><span class="text"><?php echo admin_language("la_prompt_RegUserId"); ?></span></td>
<td>
<b><?php echo $objSession->GetVariable("user_regular_names"); ?></b>
<input type="hidden" name="user_regular" size="15" class="text" value="<?php echo $objSession->GetVariable("user_regular_values"); ?>">
<input type="hidden" name="grouplist2" value="<?php echo $objSession->GetVariable('grouplist2'); ?>">
<a href="#"><img src="../images/icon_users_sm.gif" style="cursor:hand;" border="0" onclick="OpenGroupSelector('<?php echo $envar; ?>&en=0&destform=import_form&destfield=grouplist2&Selector=radio');"></a>
</td>
</tr>
<tr <?php echo int_table_color(); ?>>
<td width="60%" valign="top"><span class="text"><?php
echo admin_language("la_prompt_InitImportCat");
$catid = $objSession->GetVariable('categoryid');
$path = prompt_language($objConfig->Get("Root_Name"));
if($catid > 0)
{
$c = $objCatList->GetItemByField('ResourceId', $catid);
$path .= "&gt;".$c->GetCachedNavBar();
}
?>
</td>
<td>
<b><?php echo $path; ?></b>
<input type="hidden" name="init_cat" size="15" class="text" value="<?php echo $objSession->GetVariable("categoryid"); ?>">
<a href="#"><img src="<?php echo $imagesURL; ?>/folder.gif" style="cursor:hand;" border="0" ONCLICK="OpenCatSelector('<?php echo $envar; ?>&source=inlinkimport4&continue_sess=1&destform=import_form&destfield=categorylist&Selector=radio');"></a>
<input type="hidden" name="categorylist" value="<?php echo $objSession->GetVariable('categorylist'); ?>">
</td>
</tr>
<!-- script common fields: end -->
<!-- script spefific fields: begin -->
<?php
if( $import_script['id'] == 'in-link' )
{
+ if( GetVar('link_image') ) $objSession->SetVariable('link_image', GetVar('link_image') );
?>
<tr <?php echo int_table_color(); ?>>
<td width="60%" valign="top"><span class="text"><?php echo admin_language("la_prompt_Import_ImageName"); ?></span></td>
<td>
- <input type="text" name="link_image" class="text" size="30" value="<?php echo $objSession->GetVariable("link_image"); ?>">
+ <input type="text" name="link_image" class="text" size="30" value="<?php echo $objSession->GetVariable('link_image'); ?>">
+ </td>
+ </tr>
+<?php
+ }
+
+ if( $import_script['module'] == 'in-bulletin' )
+ {
+ if( GetVar('bb_prefix') ) $objSession->SetVariable('import_table_prefix', GetVar('bb_prefix') );
+?>
+ <tr <?php echo int_table_color(); ?>>
+ <td width="60%" valign="top"><span class="text"><?php echo admin_language("la_prompt_Import_Prefix"); ?></span></td>
+ <td>
+ <input type="text" name="bb_prefix" class="text" size="30" value="<?php echo $objSession->GetVariable('import_table_prefix'); ?>">
</td>
</tr>
<?php
}
?>
<!-- script spefific fields: end -->
</table>
</form>
<?php
int_footer();
?>
Property changes on: trunk/admin/import/step4.php
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property

Event Timeline

In-Portal CMS · In-Portal Community Pages · In-Portal Issue Tracker · In-Portal Repository Browser · Quality Assurance · In-Portal CI Server