Index: trunk/admin/category/addcategory_custom.php =================================================================== diff -u -r701 -r777 --- trunk/admin/category/addcategory_custom.php (.../addcategory_custom.php) (revision 701) +++ trunk/admin/category/addcategory_custom.php (.../addcategory_custom.php) (revision 777) @@ -183,12 +183,18 @@ $field =& $objCustomFields->GetItemRefByIndex($i); $fieldid = $field->Get("CustomFieldId"); + $CF=$field->GetAdminUI(); + if(is_object($cfield = $objCustomFields->GetItemByField("FieldName",substr($CF->name,1),FALSE))) + if(is_object($cv=$objCustomDataList->GetDataItem($cfield->Get("CustomFieldId")))) + $CF->default_value = $cv->Get("Value"); + $f = $objCustomDataList->GetDataItem($fieldid); $fieldname = "CustomData[$fieldid]"; + if(is_object($f)) { - $val_field = "Get("Value"))."\" name=\"$fieldname\">"; - $field->Set("Value", $val_field); +// $val_field = "Get("Value"))."\" name=\"$fieldname\">"; + $field->Set("Value", $CF->ItemFormElement()); if ($field->Get('Prompt') != '') { $field->Set("FieldLabel", admin_language($field->Get('Prompt'))); } @@ -200,7 +206,7 @@ else { $val_field = ""; - $field->Set("Value", $val_field); + $field->Set("Value", $CF->ItemFormElement()); if ($field->Get('Prompt') != '') { $field->Set("FieldLabel", admin_language($field->Get('Prompt'))); } @@ -246,11 +252,13 @@ "> +
+
" name="viewmenu"> Index: trunk/admin/users/adduser_custom.php =================================================================== diff -u -r738 -r777 --- trunk/admin/users/adduser_custom.php (.../adduser_custom.php) (revision 738) +++ trunk/admin/users/adduser_custom.php (.../adduser_custom.php) (revision 777) @@ -161,20 +161,26 @@ $field =& $objCustomFields->GetItemRefByIndex($i); $fieldid = $field->Get("CustomFieldId"); + $CF=$field->GetAdminUI(); + if(is_object($cfield = $objCustomFields->GetItemByField("FieldName",substr($CF->name,1),FALSE))) + if(is_object($cv=$objCustomDataList->GetDataItem($cfield->Get("CustomFieldId")))) + $CF->default_value = $cv->Get("Value"); + + $f = $objCustomDataList->GetDataItem($fieldid); $fieldname = "CustomData[$fieldid]"; $field->Set('FieldLabel', admin_language($field->Get('Prompt')) ); if(is_object($f)) { $val_field = "Get("Value"))."\" name=\"$fieldname\">"; - $field->Set("Value", $val_field); + $field->Set("Value", $CF->ItemFormElement()); $field->Set("DataId",$f->Get("CustomDataId")); } else { $val_field = ""; - $field->Set("Value", $val_field); + $field->Set("Value", $CF->ItemFormElement()); $field->Set("DataId",0); } } @@ -216,6 +222,7 @@ "> +
Index: trunk/admin/category/addcategory.php =================================================================== diff -u -r667 -r777 --- trunk/admin/category/addcategory.php (.../addcategory.php) (revision 667) +++ trunk/admin/category/addcategory.php (.../addcategory.php) (revision 777) @@ -1,747 +1,380 @@ Get("Site_Path"); - $admin = $objConfig->Get("AdminDirectory"); - if(!strlen($admin)) - $admin = "admin"; - $localURL=$rootURL."kernel/"; - $adminURL = $rootURL.$admin; - $imagesURL = $adminURL."/images"; - //$pathtolocal = $pathtoroot."in-news/"; - - 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"); - - unset($objEditItems); - - if($_REQUEST['item']) - { - // smulate like normal edit button pressed - $tmp_cat =& $objCatList->GetItemByField('ResourceId', $_REQUEST['item']); - $_POST['catlist'][] = $tmp_cat->UniqueId(); - } - - $objEditItems = new clsCatList(); - $objEditItems->SourceTable = $objSession->GetEditTable("Category"); - $objCustomFields = new clsCustomFieldList(1); - $objCustomDataList = new clsCustomDataList(); - $objRelList = new clsRelationshipList(); - $objImages = new clsImageList(); - - //Multiedit init - if ($_GET["new"] == 1) - { - $c = new clsCategory(NULL); - $c->Set("CreatedOn", time()); - $c->Set("EndOn", time()); - $c->Set("ParentId",$objCatList->CurrentCategoryID()); - $c->Set("NewItem",2); //auto - $c->Set("Status",2); //pending - $en = 0; - $action = "m_add_category"; - $objCatList->CreateEmptyEditTable("CategoryId"); - $objRelList->CreateEmptyEditTable("RelationshipId"); - $objCustomDataList->CreateEmptyEditTable("CustomDataId"); - $objImages->CreateEmptyEditTable("ResourceId"); - - $TitleVerb = prompt_language("la_Text_Adding"); - } - else - { - if(isset($_POST["catlist"])) - { - $cats = $_POST["catlist"]; - $objCatList->CopyToEditTable("CategoryId",$cats); - $objEditItems->Query_Item("SELECT * FROM ".$objEditItems->SourceTable); - /* make a copy of the relationship records */ - $ids = $objEditItems->GetResourceIDList(); - $objRelList->CopyToEditTable("SourceId", $ids); - $objCustomDataList->CopyToEditTable("ResourceId",$ids); - $objImages->CopyToEditTable("ResourceId", $ids); - $c = $objEditItems->GetItemByIndex(0); - $itemcount=$objEditItems->NumItems(); - $en = 0; - } - else - { - if($_GET["item"]) - { - /*shortcut to edit link */ - $objCatList->CopyToEditTable("ResourceId",$_GET["item"]); - $backurl = $_GET["return"]; - } - - //Multiedit init - $en = (int)$_GET["en"]; - $objEditItems->Query_Item("SELECT * FROM ".$objEditItems->SourceTable); - - //$ids = $objEditItems->GetResourceIDList(); - //$objRelList->CopyToEditTable("SourceId", $ids); - //$objCustomDataList->CopyToEditTable("ResourceId",$ids); - //$objImages->CopyToEditTable("ResourceId", $ids); - - $itemcount=$objEditItems->NumItems(); - $c = $objEditItems->GetItemByIndex($en); - } - - if($itemcount>1) - { - if ($en+1 == $itemcount) - $en_next = -1; - else - $en_next = $en+1; - - if ($en == 0) - $en_prev = -1; - else - $en_prev = $en-1; - } - - $action = "m_edit_category"; - $TitleVerb = prompt_language("la_Text_Editing"); - } - - $envar = "env=" . BuildEnv() . "&en=$en"; - $section = 'in-portal:editcategory_general'; - - if (strlen($c->Get("Name"))) - $editing_category_title = "'".$c->Get("Name")."' "; - else - $editing_category_title = ""; - - $title = $TitleVerb." ".prompt_language("la_Text_Category")." $editing_category_title- ".prompt_language("la_tab_General"); - - //$saveURL = $admin."/browse.php"; - $saveURL = $admin."/category/category_maint.php"; - $cancelURL = $admin."/".$objSession->GetVariable('ReturnScript'); - - //Display header - $sec = $objSections->GetSection($section); - - $objCatToolBar = new clsToolBar(); - $objCatToolBar->Add("img_save", "la_Save","#","swap('img_save','toolbar/tool_select_f2.gif');", "swap('img_save', 'toolbar/tool_select.gif');","edit_submit('category','CatEditStatus','$saveURL',1,'');","tool_select.gif"); - $objCatToolBar->Add("img_cancel", "la_Cancel","#","swap('img_cancel','toolbar/tool_cancel_f2.gif');", "swap('img_cancel', 'toolbar/tool_cancel.gif');","edit_submit('category','CatEditStatus','$cancelURL',2,'');","tool_cancel.gif"); - - if ( isset($en_prev) || isset($en_next) ) - { - $url = $RootUrl.$admin."/category/addcategory.php"; - $StatusField = "CatEditStatus"; - $form = "category"; - MultiEditButtons($objCatToolBar,$en_next,$en_prev,$form,$StatusField,$url,$sec->Get("OnClick"),'','la_PrevCategory','la_NextCategory'); - } - - int_header($objCatToolBar,NULL,$title); - $c->Data=inp_htmlize($c->Data); - if ($objSession->GetVariable("HasChanges") == 1) { - ?> - - - -
- -
- - > - - - - Get("CategoryId") > 0 ) { ?> - > - - - - > - - - - - > - - - - > - - - - - > - - - - - > - - - - - > - - - - - > - - - - > - - - - - > - - - - GetFieldUIList(TRUE); - if($CustomFieldUI->NumItems()>0) - { - $objCustomDataList->SourceTable = $objSession->GetEditTable("CustomMetaData"); - if((int)$c->Get("ResourceId")>0) - { - $objCustomDataList->LoadResource($c->Get("ResourceId")); - } - $headings = $CustomFieldUI->GetHeadingList(); - //echo "
";print_r($objCustomFields); echo "
"; - for($i=0;$i<=count($headings);$i++) - { - $h = $headings[$i]; - if(strlen($h)) - { - int_subsection_title(prompt_language($h)); - $Items = $CustomFieldUI->GetHeadingItems($h); - foreach($Items as $f) - { - $n = substr($f->name,1); - - $cfield = $objCustomFields->GetItemByField("FieldName",$n,FALSE); - if(is_object($cfield)) - { - $cv = $objCustomDataList->GetDataItem($cfield->Get("CustomFieldId")); - if(is_object($cv)) - { - $f->default_value = $cv->Get("Value"); - } - } - print "\n"; - print " \n"; - print " "; - if(is_object($f->NextItem)) - { - $n = $f->NextItem; - print " "; - } - else - print " \n"; - print "\n"; - } - } - } - } - ?> "> - "> - - - - -
- -
- -
Get("CategoryId"); ?> 
- "> -
-
- - - - 		- -
- Get("Status") == 1) echo "checked"; ?>> - Get("Status") == 2) echo "checked"; ?>> - Get("Status") == 0) echo "checked"; ?>> -  
- Get("NewItem") == 2) echo "checked"; ?>> - Get("NewItem") == 1) echo "checked"; ?>> - Get("NewItem") == 0) echo "checked"; ?>> - -  
- Get("EditorsPick") == 1) echo "checked"; ?>> -  
"> 
- "> - - - DBG: '.date('M d. Y H:i:s', $c->get('Modified') ); ?> -
- "> -  
- -  
".$f->GetPrompt()."".$f->ItemFormElement()."".$n->ItemFormElement()." 
- - - -
- -
\ No newline at end of file Index: trunk/kernel/action.php =================================================================== diff -u -r697 -r777 --- trunk/kernel/action.php (.../action.php) (revision 697) +++ trunk/kernel/action.php (.../action.php) (revision 777) @@ -803,7 +803,7 @@ { $original_cats = new clsCatList(); $original_cat = $original_cats->GetItemByField('CategoryId', GetVar('CategoryId')); - if( $original_cat->Get('Name') != $_POST['cat_name'] ) + if( $original_cat->Get('Name') != stripslashes($_POST['cat_name'] )) $objSession->SetVariable('PermCache_UpdateRequired', 1); unset($original_cat, $original_cats); } @@ -838,6 +838,29 @@ break; case "m_edit_custom_data": + $id = $_POST["ItemId"]; + + $objCustomEdit = new clsCustomDataList($objSession->GetEditTable("CustomMetaData")); + $objCustomEdit->LoadResource($id); + $CustomFields = new clsCustomFieldList($_POST['CustomType']); + $DataChanged = FALSE; + foreach($_POST as $key=>$value) + { + if(substr($key,0,1)=="_") + { + $field = substr($key,1); + $cvalue = $CustomFields->GetItemByField("FieldName",$field,FALSE); + + if(is_object($cvalue)) + { + $objCustomEdit->SetFieldValue($cvalue->Get("CustomFieldId"),$id,$value); + $DataChanged = TRUE; + } + } + } + if($DataChanged) + $objCustomEdit->SaveData(); +/* $id = $_POST["ItemId"]; $objEditData = new clsCustomDataList(); //$objSession->GetEditTable("CustomMetaData")); $objEditData->SetTable('edit'); @@ -865,6 +888,7 @@ } } $objEditData->SetTable('live'); +*/ break; case "m_customfield_edit": if($ro_perm) break;